fix: tcp package length type error

swoft-cloud · Jul 18, 2019 · e804f2c · e804f2c
1 parent 129f9ea
commit e804f2c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/tcp-server/src/Swoole/ReceiveListener.php b/src/tcp-server/src/Swoole/ReceiveListener.php
@@ -43,7 +43,7 @@ public function onReceive(Server $server, int $fd, int $reactorId, string $data)
         $response = Response::new($fd);
         $request  = Request::new($fd, $data, $reactorId);
 
-        server()->log("Receive: conn#{$fd} begin init context, received data: {$data}", [], 'debug');
+        server()->log("Receive: conn#{$fd} received client request, begin init context", [], 'debug');
 
         $sid = (string)$fd;
         $ctx = TcpReceiveContext::new($fd, $request, $response);

diff --git a/src/tcp/src/Protocol.php b/src/tcp/src/Protocol.php
@@ -165,7 +165,7 @@ public function unpack(string $data): Package
     {
         [$head, $body] = $this->unpackData($data);
 
-        return $this->getPacker($head['type'])->decode($body);
+        return $this->getPacker((string)$head['type'])->decode($body);
     }
 
     /**
@@ -199,7 +199,7 @@ public function unpackResponse(string $data): Response
     {
         [$head, $body] = $this->unpackData($data);
 
-        return $this->getPacker($head['type'])->decodeResponse($body);
+        return $this->getPacker((string)$head['type'])->decodeResponse($body);
     }
 
     /**
@@ -236,8 +236,10 @@ public function packBody(string $body): string
         // Use length check
         $format = self::HEADER_PACK_FORMAT;
 
+        // TODO
         // Args sort please see self::HEADER_UNPACK_FORMAT
-        return pack($format, 0, $this->type, strlen($body), 0) . $body;
+        // return pack($format, 0, $this->type, strlen($body), 0) . $body;
+        return pack($format, 0, 0, strlen($body), 0) . $body;
     }
 
     /**