fix tcp package over 65535

README.md

@@ -97,6 +97,7 @@ try {
     $conn->disConnect();
 } catch (\Exception $e) {
     echo $e->getMessage(), PHP_EOL;
+}
 ````
 
 ![运行效果图](assets/effect.gif)

src/sample/socket.php

@@ -6,14 +6,17 @@
 
 require_once __DIR__. '/../../vendor/autoload.php';
 
+ini_set('display_errors', 'On');
+error_reporting(E_ALL);
+
 try {
     $conn = new CanalConnector();
     $conn->connect("127.0.0.1", 11111, 10, 1800, 1800);
     $conn->checkValid();
     $conn->subscribe("example", ".*\\..*");
 
     while (true) {
-        $message = $conn->get(10);
+        $message = $conn->get(100);
         $entries = $message->getEntries();
         if ($entries) {
             foreach ($entries as $entry) {

src/socket/CanalConnector.php

@@ -117,7 +117,8 @@ public function checkValid($username="", $password="")
     private function readNextPacket()
     {
         $data = $this->socket->read($this->packetLen);
-        return $this->socket->read(unpack("N", $data)[1]);
+        $dataLen = unpack("N", $data)[1];
+        return $this->socket->read($dataLen);
     }
 
     /**

src/socket/TcpClient.php

@@ -208,7 +208,7 @@ public function close()
      * @return string Binary data
      * @throws \Exception
      */
-    public function readAll($len)
+    public function read($len)
     {
         if ($this->sendTimeoutSet_) {
             stream_set_timeout($this->handle_, 0, $this->recvTimeout * 1000000);
@@ -241,33 +241,6 @@ public function readAll($len)
         }
     }
 
-    /**
-     * Read from the socket
-     *
-     * @param int $len
-     *  How many bytes
-     * @return string Binary data
-     * @throws \Exception
-     *
-     */
-    public function read($len)
-    {
-        if ($this->sendTimeoutSet_) {
-            stream_set_timeout($this->handle_, 0, $this->recvTimeout * 1000000);
-            $this->sendTimeoutSet_ = false;
-        }
-        $data = fread($this->handle_, $len);
-        if ($data === false || $data === '') {
-            $md = stream_get_meta_data($this->handle_);
-            if ($md['timed_out']) {
-                throw new \Exception('TSocket: timed out reading ' . $len . ' bytes from ' . $this->host_ . ':' . $this->port_);
-            } else {
-                throw new \Exception('TSocket: Could not read ' . $len . ' bytes from ' . $this->host_ . ':' . $this->port_);
-            }
-        }
-        return $data;
-    }
-
     /**
      * @param string|false $buf Binary data
      * @throws \Exception