Test

sirn-se · Jul 4, 2024 · ffbef85 · ffbef85
1 parent e51f316
commit ffbef85
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 5 deletions.
diff --git a/src/Server.php b/src/Server.php
@@ -439,7 +439,9 @@ public function disconnect(): void
             $this->dispatch('disconnect', [$this, $connection]);
         }
         $this->connections = [];
-        $this->server->close();
+        if ($this->server) {
+            $this->server->close();
+        }
         $this->server = $this->streams = null;
         $this->logger->info('[server] Server disconnected');
     }

diff --git a/tests/suites/server/ServerTest.php b/tests/suites/server/ServerTest.php
@@ -400,12 +400,15 @@ public function testShutdown(): void
         $server->addMiddleware(new CloseHandler());
 
         $server->onHandshake(function ($server, $connection, $request, $response) {
-            $server->shutdown();
+            if ($connection->getName() == 'fake-connection-2') {
+                $server->shutdown();
+            }
         });
 
         $this->expectWsServerSetup(scheme: 'tcp', port: 8000);
+
+        // Accept connection 1
         $this->expectWsSelectConnections(['@server']);
-        // Accept connection
         $this->expectSocketServerAccept();
         $this->expectSocketStream();
         $this->expectSocketStreamGetMetadata();
@@ -419,15 +422,43 @@ public function testShutdown(): void
         $this->expectSocketStreamGetRemoteName();
         $this->expectSocketStreamSetTimeout();
         $this->expectWsServerPerformHandshake();
+        $this->expectSocketStreamIsConnected();
+
+        // Accept connection 2
+        $this->expectWsSelectConnections(['@server']);
+        $this->expectSocketServerAccept();
+        $this->expectSocketStream();
+        $this->expectSocketStreamGetMetadata();
+        $this->expectSocketStreamGetRemoteName()->setReturn(function () {
+            return 'fake-connection-2';
+        });
+        $this->expectStreamCollectionAttach();
+        $this->expectSocketStreamGetLocalName()->setReturn(function () {
+            return 'fake-connection-2';
+        });
+        $this->expectSocketStreamGetRemoteName();
+        $this->expectSocketStreamSetTimeout();
+        $this->expectWsServerPerformHandshake();
+
+        // Send close connection 1
+        $this->expectSocketStreamIsWritable();
+        $this->expectSocketStreamWrite();
+        $this->expectSocketStreamIsReadable();
+        $this->expectSocketStreamCloseWrite();
+        $this->expectSocketStreamGetMetadata();
 
+        // Send close connection 2
         $this->expectSocketStreamIsWritable();
         $this->expectSocketStreamWrite();
         $this->expectSocketStreamIsReadable();
         $this->expectSocketStreamCloseWrite();
         $this->expectSocketStreamGetMetadata();
 
         $this->expectSocketStreamIsConnected();
-        $this->expectWsSelectConnections(['fake-connection-1']);
+        $this->expectSocketStreamIsConnected();
+        $this->expectWsSelectConnections(['fake-connection-1', 'fake-connection-2']);
+
+        // Receive close ack connection 1
         $this->expectSocketStreamRead()->addAssert(function (string $method, array $params) {
             $this->assertEquals(2, $params[0]);
         })->setReturn(function () {
@@ -440,15 +471,50 @@ public function testShutdown(): void
         });
         $this->expectSocketStreamIsWritable();
         $this->expectSocketStreamClose();
+
+        // Receive close ack connection 2
+        $this->expectSocketStreamRead()->addAssert(function (string $method, array $params) {
+            $this->assertEquals(2, $params[0]);
+        })->setReturn(function () {
+            return base64_decode('iIA=');
+        });
+        $this->expectSocketStreamRead()->addAssert(function (string $method, array $params) {
+            $this->assertEquals(4, $params[0]);
+        })->setReturn(function () {
+            return base64_decode('RExLFw==');
+        });
+        $this->expectSocketStreamIsWritable();
+        $this->expectSocketStreamClose();
+
+        // Connection detacher
+        $this->expectSocketStreamIsConnected();
+        $this->expectStreamCollectionDetach();
         $this->expectSocketStreamIsConnected();
         $this->expectStreamCollectionDetach();
+
         $this->expectSocketServerClose();
 
         $server->start();
-
         unset($server);
     }
 
+    public function testShutdownEmpty(): void
+    {
+        $this->expectStreamFactory();
+        $server = new Server(8000);
+        $server->setStreamFactory(new StreamFactory());
+        $server->addMiddleware(new CloseHandler());
+
+        $server->onTick(function ($server) {
+            $server->shutdown();
+        });
+        $this->expectWsServerSetup(scheme: 'tcp', port: 8000);
+        $this->expectWsSelectConnections([]);
+        $this->expectSocketServerClose();
+
+        $server->start();
+    }
+
     public function testAlreadyStarted(): void
     {
         $this->expectStreamFactory();