Merge pull request #243 from swooletw/develop

Develop
swooletw · Mar 9, 2019 · 0f716e2 · 0f716e2
2 parents 43c9266 + 4d28803
commit 0f716e2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/src/Concerns/InteractsWithWebsocket.php b/src/Concerns/InteractsWithWebsocket.php
@@ -12,6 +12,7 @@
 use SwooleTW\Http\Server\Facades\Server;
 use SwooleTW\Http\Websocket\HandlerContract;
 use Illuminate\Contracts\Container\Container;
+use Swoole\WebSocket\Server as WebsocketServer;
 use SwooleTW\Http\Websocket\Rooms\RoomContract;
 use SwooleTW\Http\Exceptions\WebsocketNotSetInConfigException;
 
@@ -129,7 +130,7 @@ public function onMessage($server, $frame)
      */
     public function onClose($server, $fd, $reactorId)
     {
-        if (! $this->isServerWebsocket($fd) || ! $server instanceof Websocket) {
+        if (! $this->isServerWebsocket($fd) || ! $server instanceof WebsocketServer) {
             return;
         }
 
@@ -229,7 +230,7 @@ protected function prepareWebsocket()
      */
     protected function isServerWebsocket(int $fd): bool
     {
-        return $this->container->make(Server::class)
+        return (bool) $this->container->make(Server::class)
             ->connection_info($fd)['websocket_status'] ?? false;
     }
 

diff --git a/src/Websocket/Pusher.php b/src/Websocket/Pusher.php
@@ -221,7 +221,7 @@ public function shouldBroadcast(): bool
      */
     public function isServerWebsocket(int $fd): bool
     {
-        return $this->server->connection_info($fd)['websocket_status'] ?? false;
+        return (bool) $this->server->connection_info($fd)['websocket_status'] ?? false;
     }
 
     /**
@@ -245,8 +245,11 @@ protected function getWebsocketConnections(): array
      */
     public function shouldPushToDescriptor(int $fd): bool
     {
-        return $this->server->exist($fd)
-            && ($this->broadcast && $this->sender !== (int) $fd);
+        if (! $this->server->exist($fd)) {
+            return false;
+        }
+
+        return $this->broadcast ? $this->sender !== (int) $fd : true;
     }
 
     /**

diff --git a/tests/Websocket/PusherTest.php b/tests/Websocket/PusherTest.php
@@ -115,7 +115,7 @@ public function testShouldPushToDescriptor()
         $server = m::mock(Server::class);
         $server->shouldReceive('exist')
             ->with($fd = 1)
-            ->twice()
+            ->times(3)
             ->andReturn(true);
 
         $pusher = Pusher::make([
@@ -141,5 +141,17 @@ public function testShouldPushToDescriptor()
         ], $server);
 
         $this->assertFalse($pusher->shouldPushToDescriptor($fd));
+
+        $pusher = Pusher::make([
+            'opcode' => 1,
+            'sender' => 1,
+            'fds' => [],
+            'broadcast' => false,
+            'assigned' => false,
+            'event' => 'event',
+            'message' => 'message'
+        ], $server);
+
+        $this->assertTrue($pusher->shouldPushToDescriptor($fd));
     }
 }