fix #76

Author: yunwuxin

src/concerns/InteractsWithWebsocket.php

@@ -87,20 +87,23 @@ public function onMessage(TcpConnection $connection, Frame $frame)
 
     public function onClose(TcpConnection $connection)
     {
-        $this->runInSandbox(function (App $app, Websocket $websocket) use ($connection) {
-            $handler = $app->make(HandlerInterface::class);
-            try {
-                $handler->onClose();
-            } catch (Throwable $e) {
-                $this->logServerError($e);
-            }
+        $this->runInSandbox(function (App $app) use ($connection) {
+            if ($app->exists(Websocket::class)) {
+                $websocket = $app->make(Websocket::class);
+                $handler   = $app->make(HandlerInterface::class);
+                try {
+                    $handler->onClose();
+                } catch (Throwable $e) {
+                    $this->logServerError($e);
+                }
 
-            // leave all rooms
-            $websocket->leave();
+                // leave all rooms
+                $websocket->leave();
 
-            unset($this->messageSender[$connection->id]);
+                unset($this->messageSender[$connection->id]);
 
-            $websocket->setConnected(false);
+                $websocket->setConnected(false);
+            }
         }, $connection);
     }
 

tests/feature/WebsocketTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use GuzzleHttp\Client;
 use React\EventLoop\Loop;
 use Symfony\Component\Process\Process;
 use function Ratchet\Client\connect;
@@ -28,6 +29,24 @@
     $process->stop();
 });
 
+beforeEach(function () {
+    $this->httpClient = new Client([
+        'base_uri'    => 'http://127.0.0.1:8080',
+        'cookies'     => true,
+        'http_errors' => false,
+        'timeout'     => 1,
+    ]);
+});
+
+it('http', function () {
+    $response = $this->httpClient->get('/');
+
+    expect($response->getStatusCode())
+        ->toBe(200)
+        ->and($response->getBody()->getContents())
+        ->toBe('hello world');
+});
+
 it('websocket', function () {
     $connected = 0;
     $messages  = [];