add eof testing

Author: JanHuang

examples/client/async.php

@@ -11,12 +11,12 @@
 
 class Cli extends \FastD\Swoole\Client
 {
-    public function connect(swoole_client $client)
+    public function onConnect(swoole_client $client)
     {
         $client->send('hello');
     }
 
-    public function receive(swoole_client $client, $data)
+    public function onReceive(swoole_client $client, $data)
     {
         echo $data;
         $client->close();

examples/client/tcp.php

@@ -3,7 +3,11 @@
 include __DIR__ . '/../../vendor/autoload.php';
 
 $client = new \FastD\Swoole\Client('tcp://127.0.0.1:9527');
-
+$client->configure([
+    'open_eof_check' => true,
+    'package_eof' => "\r\n",
+    'package_max_length' => 1024 * 1024 * 2,
+]);
 echo $client->send('hello');
 
 

examples/tcp/server.php

@@ -16,6 +16,12 @@
  */
 class DemoServer extends TCP
 {
+    public function doConnect(swoole_server $server, $fd, $from_id)
+    {
+        parent::doConnect($server, $fd, $from_id);
+        $server->send($fd, 'connect');
+    }
+
     public function doWork(swoole_server $server, $fd, $data, $from_id)
     {
         echo $fd;

src/Client.php

@@ -11,6 +11,8 @@
 
 
 use FastD\Http\Cookie;
+use LogicException;
+use RuntimeException;
 use swoole_client;
 use swoole_http_client;
 
@@ -109,7 +111,7 @@ public function createRequest($url, $async = false, $keep = false)
                 $socketType = SWOOLE_SOCK_UDP;
                 break;
             default:
-                throw new \LogicException("Don't support schema ".$info['scheme']);
+                throw new LogicException("Don't support schema ".$info['scheme']);
         }
 
         $this->path = isset($info['path']) ? $info['path'] : '/';
@@ -274,43 +276,38 @@ public function configure($configure)
      * @param swoole_client $client
      * @return mixed
      */
-    public function connect(swoole_client $client)
-    {
-    }
+    public function onConnect(swoole_client $client) {}
 
     /**
      * @param swoole_client $client
      * @param string $data
      * @return mixed
      */
-    public function receive(swoole_client $client, $data)
-    {
-    }
+    public function onReceive(swoole_client $client, $data) {}
 
     /**
      * @param swoole_client $client
      * @return mixed
      */
-    public function error(swoole_client $client)
-    {
-    }
+    public function onError(swoole_client $client) {}
 
     /**
      * @param swoole_client $client
      * @return mixed
      */
-    public function close(swoole_client $client)
-    {
-    }
+    public function onClose(swoole_client $client) {}
 
     /**
      * @param string|array $data
      * @return mixed
      */
     public function send($data = '')
     {
+        if (null === $this->client) {
+            throw new LogicException('Please call the createRequest method first');
+        }
         if ( ! $this->client->connect($this->host, $this->port, $this->timeout)) {
-            throw new \RuntimeException(socket_strerror($this->client->errCode));
+            throw new RuntimeException(socket_strerror($this->client->errCode));
         }
 
         $this->client->send($this->wrapBody($data));
@@ -326,16 +323,16 @@ public function send($data = '')
     public function start()
     {
         $this->client->on("connect", function ($client) {
-            call_user_func_array([$this, 'connect'], [$client]);
+            call_user_func_array([$this, 'onConnect'], [$client]);
         });
         $this->client->on("receive", function ($client, $data) {
-            call_user_func_array([$this, 'receive'], [$client, $data]);
+            call_user_func_array([$this, 'onReceive'], [$client, $data]);
         });
         $this->client->on("error", function ($client) {
-            call_user_func_array([$this, 'error'], [$client]);
+            call_user_func_array([$this, 'onError'], [$client]);
         });
         $this->client->on("close", function ($client) {
-            call_user_func_array([$this, 'close'], [$client]);
+            call_user_func_array([$this, 'onClose'], [$client]);
         });
         $this->client->connect($this->host, $this->port, $this->timeout);
     }