新增请求UUID

easy-swoole · Dec 23, 2020 · f7e9efd · f7e9efd
1 parent e707557
commit f7e9efd
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 1 deletion.
diff --git a/src/Client.php b/src/Client.php
@@ -83,6 +83,7 @@ function exec(float $timeout = 3.0)
                     $pack->setModule($module);
                     $pack->setAction($action);
                     $pack->setArg($requestContext->getArg());
+                    $pack->setRequestUUID($requestContext->getRequestUUID());
                     $client = new TcpClient($this->config->getMaxPackageSize(),$timeout);
                     if(!$client->connect($node)){
                         $res->setStatus(Response::STATUS_CONNECT_TIMEOUT);
@@ -101,7 +102,7 @@ function exec(float $timeout = 3.0)
         $left = $timeout;
         while ((time() < $start + $timeout) && $all > 0){
             $t = microtime(true);
-            $ret = $channel->pop($left + 1);
+            $ret = $channel->pop($left + 0.01);
             if($ret){
                 $all--;
                 $this->execCallback($ret['response'],$ret['context']);

diff --git a/src/Client/RequestContext.php b/src/Client/RequestContext.php
@@ -5,6 +5,7 @@
 
 
 use EasySwoole\Rpc\Server\ServiceNode;
+use EasySwoole\Utility\Random;
 
 class RequestContext
 {
@@ -20,6 +21,20 @@ class RequestContext
     private $onFail;
     /** @var ServiceNode|null */
     private $serviceNode;
+    /** @var string */
+    private $requestUUID;
+
+    public function __construct()
+    {
+        $this->requestUUID = Random::makeUUIDV4();
+    }
+    /**
+     * @return string
+     */
+    public function getRequestUUID(): string
+    {
+        return $this->requestUUID;
+    }
 
     /**
      * @return string

diff --git a/src/Protocol/Request.php b/src/Protocol/Request.php
@@ -16,6 +16,8 @@ class Request extends SplBean
     protected $action;
     /** @var mixed */
     protected $arg;
+    /** @var string */
+    protected $requestUUID;
 
     /**
      * @return string|null
@@ -80,4 +82,20 @@ public function setArg($arg): void
     {
         $this->arg = $arg;
     }
+
+    /**
+     * @return string
+     */
+    public function getRequestUUID(): string
+    {
+        return $this->requestUUID;
+    }
+
+    /**
+     * @param string $requestUUID
+     */
+    public function setRequestUUID(string $requestUUID): void
+    {
+        $this->requestUUID = $requestUUID;
+    }
 }
diff --git a/src/Protocol/Response.php b/src/Protocol/Response.php
@@ -5,6 +5,7 @@
 
 
 use EasySwoole\Spl\SplBean;
+use EasySwoole\Utility\Random;
 
 class Response extends SplBean
 {
@@ -26,6 +27,8 @@ class Response extends SplBean
     protected $result;
     /** @var mixed $msg */
     protected $msg;
+    /** @var string */
+    protected $responseUUID;
 
     public static function status2msg(int $status)
     {
@@ -122,4 +125,11 @@ public function setResult($result): self
         $this->result = $result;
         return $this;
     }
+
+    protected function initialize(): void
+    {
+        if(empty($this->responseUUID)){
+            $this->responseUUID = Random::makeUUIDV4();
+        }
+    }
 }