chore: update tests

Author: ChiragAgg5k

.github/workflows/tests.yml

@@ -46,4 +46,4 @@ jobs:
           sleep 10
 
       - name: Run Tests
-        run: docker compose exec tests vendor/bin/phpunit
+        run: docker compose exec tests vendor/bin/phpunit --debug

src/WebSocket/Client.php

@@ -225,4 +225,46 @@ private function emit(string $event, mixed $data = null): void
             $handler($data);
         }
     }
+
+    public function receive(): ?string
+    {
+        if (!$this->connected) {
+            throw new \RuntimeException('Not connected to WebSocket server');
+        }
+
+        $frame = $this->client->recv($this->timeout);
+
+        if ($frame === false) {
+            if ($this->client->errCode === SWOOLE_ERROR_CLIENT_NO_CONNECTION) {
+                $this->handleClose();
+                return null;
+            }
+            throw new \RuntimeException(
+                "Failed to receive data: {$this->client->errCode} - {$this->client->errMsg}"
+            );
+        }
+
+        if ($frame === "") {
+            return null;
+        }
+
+        if ($frame instanceof Frame) {
+            switch ($frame->opcode) {
+                case WEBSOCKET_OPCODE_TEXT:
+                    return $frame->data;
+                case WEBSOCKET_OPCODE_CLOSE:
+                    $this->handleClose();
+                    return null;
+                case WEBSOCKET_OPCODE_PING:
+                    $this->emit('ping', $frame->data);
+                    $this->client->push('', WEBSOCKET_OPCODE_PONG);
+                    return null;
+                case WEBSOCKET_OPCODE_PONG:
+                    $this->emit('pong', $frame->data);
+                    return null;
+            }
+        }
+
+        return null;
+    }
 }

tests/e2e/AdapterTest.php

@@ -3,13 +3,13 @@
 namespace Utopia\WebSocket\Tests;
 
 use PHPUnit\Framework\TestCase;
-use WebSocket\Client as WebSocketClient;
+use Utopia\WebSocket\Client;
 
 class AdapterTest extends TestCase
 {
-    private function getWebsocket(string $host, int $port): WebSocketClient
+    private function getWebsocket(string $host, int $port): Client
     {
-        return new WebSocketClient('ws://' . $host . ':' . $port, [
+        return new Client('ws://' . $host . ':' . $port, [
             'timeout' => 10,
         ]);
     }

tests/e2e/ClientTest.php

@@ -14,18 +14,10 @@ private function getClient(string $host, int $port): Client
         ]);
     }
 
-    public function testSwoole(): void
-    {
-        $this->testClient('swoole', 80);
-    }
-
-    public function testWorkerman(): void
-    {
-        $this->testClient('workerman', 80);
-    }
-
-    private function testClient(string $host, int $port): void
+    public function testClient(): void
     {
+        $host = 'swoole';
+        $port = 80;
         $client = $this->getClient($host, $port);
 
         $messageReceived = false;
@@ -37,8 +29,11 @@ private function testClient(string $host, int $port): void
         $client->connect();
         $client->send('ping');
 
-        // Wait for response
-        \Swoole\Event::wait();
+        $startTime = time();
+        while (!$messageReceived && (time() - $startTime) < 10) {
+            \Swoole\Event::wait();
+        }
+
         $this->assertTrue($messageReceived);
         $this->assertTrue($client->isConnected());
 
@@ -81,13 +76,19 @@ private function testClient(string $host, int $port): void
         $clientA->onMessage($broadcastHandler);
         $clientB->onMessage($broadcastHandler);
 
+        $startTime = time();
         $clientA->send('broadcast');
-        \Swoole\Event::wait();
+        while ($broadcastCount < 3 && (time() - $startTime) < 10) {
+            \Swoole\Event::wait();
+        }
         $this->assertEquals(3, $broadcastCount);
 
         $broadcastCount = 0;
+        $startTime = time();
         $clientB->send('broadcast');
-        \Swoole\Event::wait();
+        while ($broadcastCount < 3 && (time() - $startTime) < 10) {
+            \Swoole\Event::wait();
+        }
         $this->assertEquals(3, $broadcastCount);
 
         // Test disconnection