fix initialization for websocket room

Author: albertcht

src/Concerns/InteractsWithWebsocket.php

@@ -40,6 +40,11 @@ trait InteractsWithWebsocket
      */
     protected $payloadParser;
 
+    /**
+     * @var SwooleTW\Http\Websocket\Rooms\RoomContract
+     */
+    protected $websocketRoom;
+
     /**
      * Websocket server events.
      *
@@ -217,6 +222,7 @@ protected function prepareWebsocket()
         if ($isWebsocket) {
             $this->events = array_merge($this->events ?? [], $this->wsEvents);
             $this->isServerWebsocket = true;
+            $this->prepareWebsocketRoom();
             $this->setPayloadParser(new $parser);
         }
     }
@@ -250,6 +256,20 @@ protected function prepareWebsocketHandler()
         $this->setWebsocketHandler($this->app->make($handlerClass));
     }
 
+    /**
+     * Prepare websocket room.
+     */
+    protected function prepareWebsocketRoom()
+    {
+        $config = $this->container->make('config');
+        $driver = $config->get('swoole_websocket.default');
+        $websocketConfig = $config->get("swoole_websocket.settings.{$driver}");
+        $className = $config->get("swoole_websocket.drivers.{$driver}");
+
+        $this->websocketRoom = new $className($websocketConfig);
+        $this->websocketRoom->prepare();
+    }
+
     /**
      * Set websocket handler.
      *
@@ -290,17 +310,8 @@ protected function createRoom(string $class, array $settings): RoomContract
      */
     protected function bindRoom(): void
     {
-        $this->app->singleton(RoomContract::class, function (Container $container) {
-            $config = $container->make('config');
-            $driver = $config->get('swoole_websocket.default');
-            $settings = $config->get("swoole_websocket.settings.{$driver}");
-            $className = $config->get("swoole_websocket.drivers.{$driver}");
-
-            // create room instance and initialize
-            $room = $this->createRoom($className, $settings);
-            $room->prepare();
-
-            return $room;
+        $this->app->singleton(RoomContract::class, function (Container $app) {
+            return $this->websocketRoom;
         });
 
         $this->app->alias(RoomContract::class, 'swoole.room');

src/Websocket/Rooms/TableRoom.php

@@ -45,7 +45,7 @@ public function prepare(): RoomContract
     }
 
     /**
-     * Add multiple socket fds to a room.
+     * Add a socket fd to multiple rooms.
      *
      * @param int fd
      * @param array|string rooms
@@ -72,7 +72,7 @@ public function add(int $fd, $roomNames)
     }
 
     /**
-     * Delete multiple socket fds from a room.
+     * Delete a socket fd from multiple rooms.
      *
      * @param int fd
      * @param array|string rooms
@@ -95,7 +95,7 @@ public function delete(int $fd, $roomNames = [])
             $removeRooms[] = $room;
         }
 
-        $this->setRooms($fd, collect($allRooms)->diff($removeRooms)->values()->toArray());
+        $this->setRooms($fd, array_values(array_diff($allRooms, $removeRooms)));
     }
 
     /**