improve isWebsocketPushPacket function

Author: albertcht

src/Concerns/InteractsWithWebsocket.php

@@ -135,6 +135,23 @@ public function onClose($server, $fd, $reactorId)
         }
     }
 
+    /**
+     * Indicates if a packet is websocket push action.
+     *
+     * @param mixed
+     */
+    protected function isWebsocketPushPacket($packet)
+    {
+        if ( !is_array($packet)) {
+            return false;
+        }
+
+        return $this->isWebsocket
+            && array_key_exists('action', $packet)
+            && $packet['action'] === Websocket::PUSH_ACTION;
+    }
+
+
     /**
      * Push websocket message to clients.
      *

src/Server/Manager.php

@@ -230,12 +230,8 @@ public function onTask($server, $taskId, $srcWorkerId, $data)
 
         try {
             // push websocket message
-            if (is_array($data)) {
-                if ($this->isWebsocket
-                    && array_key_exists('action', $data)
-                    && $data['action'] === Websocket::PUSH_ACTION) {
-                    $this->pushMessage($server, $data['data'] ?? []);
-                }
+            if ($this->isWebsocketPushPacket($data)) {
+                $this->pushMessage($server, $data['data'] ?? []);
             // push async task to queue
             } elseif (is_string($data)) {
                 $decoded = json_decode($data, true);

tests/Server/ManagerTest.php

@@ -2,6 +2,7 @@
 
 namespace SwooleTW\Http\Tests\Server;
 
+use Exception;
 use Mockery as m;
 use Swoole\Table;
 use Swoole\Http\Request;
@@ -574,6 +575,9 @@ protected function getContainer($server = null, $config = null)
         $container->singleton('swoole.server', function () use ($server) {
             return $server;
         });
+        $container->singleton(ExceptionHandler::class, function () {
+            return new DummyExceptionHandler;
+        });
 
         return $container;
     }
@@ -623,3 +627,27 @@ protected function mockMethod($name, \Closure $function, $namespace = null)
         parent::mockMethod($name, $function, 'SwooleTW\Http\Server');
     }
 }
+
+class DummyExceptionHandler implements ExceptionHandler {
+    public function report(Exception $e)
+    {
+        $this->dump($e);
+    }
+
+    public function render($request, Exception $e)
+    {
+        $this->dump($e);
+    }
+
+    public function renderForConsole($output, Exception $e)
+    {
+        $this->dump($e);
+    }
+
+    protected function dump($e)
+    {
+        echo "\n Server Error: ";
+        echo $e->getMessage();
+        die;
+    }
+}