修正options配置无效问题.

LonelySally · Sep 9, 2020 · d94bf39 · d94bf39
1 parent b64724a
commit d94bf39
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/src/concerns/InteractsWithServer.php b/src/concerns/InteractsWithServer.php
@@ -28,14 +28,6 @@ trait InteractsWithServer
      */
     public function run(): void
     {
-        $this->getServer()->set([
-            'task_enable_coroutine' => true,
-            'send_yield'            => true,
-            'reload_async'          => true,
-            'enable_coroutine'      => true,
-            'max_request'           => 0,
-            'task_max_request'      => 0,
-        ]);
         $this->initialize();
         $this->triggerEvent('init');
 

diff --git a/src/config/swoole.php b/src/config/swoole.php
@@ -22,6 +22,12 @@
             'package_max_length'    => 20 * 1024 * 1024,
             'buffer_output_size'    => 10 * 1024 * 1024,
             'socket_buffer_size'    => 128 * 1024 * 1024,
+            'task_enable_coroutine' => true,
+            'send_yield'            => true,
+            'reload_async'          => true,
+            'enable_coroutine'      => true,
+            'task_max_request'      => 1000,
+            'max_request'           => 1000,
         ],
     ],
     'websocket'  => [

diff --git a/src/websocket/Pusher.php b/src/websocket/Pusher.php
@@ -169,7 +169,7 @@ protected function getWebsocketConnections(): array
      */
     protected function shouldPushToDescriptor(int $fd): bool
     {
-        if (!$this->server->exist($fd)) {
+        if (!$this->server->isEstablished($fd)) {
             return false;
         }
 

diff --git a/src/websocket/socketio/Handler.php b/src/websocket/socketio/Handler.php
@@ -26,25 +26,26 @@ public function __construct(Server $server, Config $config)
     /**
      * "onOpen" listener.
      *
-     * @param int     $fd
+     * @param int $fd
      * @param Request $request
      */
     public function onOpen($fd, Request $request)
     {
         if (!$request->param('sid')) {
-            $payload        = json_encode(
+            $payload = json_encode(
                 [
-                    'sid'          => base64_encode(uniqid()),
-                    'upgrades'     => [],
+                    'sid' => base64_encode(uniqid()),
+                    'upgrades' => [],
                     'pingInterval' => $this->config->get('swoole.websocket.ping_interval'),
-                    'pingTimeout'  => $this->config->get('swoole.websocket.ping_timeout'),
+                    'pingTimeout' => $this->config->get('swoole.websocket.ping_timeout'),
                 ]
             );
-            $initPayload    = Packet::OPEN . $payload;
+            $initPayload = Packet::OPEN . $payload;
             $connectPayload = Packet::MESSAGE . Packet::CONNECT;
-
-            $this->server->push($fd, $initPayload);
-            $this->server->push($fd, $connectPayload);
+            if ($this->server->isEstablished($fd)) {
+                $this->server->push($fd, $initPayload);
+                $this->server->push($fd, $connectPayload);
+            }
         }
     }
 
@@ -81,7 +82,7 @@ public function onClose($fd, $reactorId)
     protected function checkHeartbeat($fd, $packet)
     {
         $packetLength = strlen($packet);
-        $payload      = '';
+        $payload = '';
 
         if ($isPing = Packet::isSocketType($packet, 'ping')) {
             $payload .= Packet::PONG;
@@ -91,7 +92,7 @@ protected function checkHeartbeat($fd, $packet)
             $payload .= substr($packet, 1, $packetLength - 1);
         }
 
-        if ($isPing) {
+        if ($isPing && $this->server->isEstablished($fd)) {
             $this->server->push($fd, $payload);
         }
     }