Merge pull request #569 from ulue/dev2

fix some error

Author: inhere

src/bean/src/Container.php

@@ -592,7 +592,9 @@ public function isSingleton(string $name): bool
      */
     public function destroyRequest(string $id): void
     {
-        unset($this->requestPool[$id]);
+        if (isset($this->requestPool[$id])) {
+            unset($this->requestPool[$id]);
+        }
     }
 
     /**
@@ -602,7 +604,9 @@ public function destroyRequest(string $id): void
      */
     public function destroySession(string $sid): void
     {
-        unset($this->sessionPool[$sid]);
+        if (isset($this->sessionPool[$sid])) {
+            unset($this->sessionPool[$sid]);
+        }
     }
 
     /**

src/bean/src/Listener/DestroyRequestListener.php

@@ -22,11 +22,11 @@ class DestroyRequestListener implements EventHandlerInterface
      */
     public function handle(EventInterface $event): void
     {
-        $id = (string)$event->getParam(0, '');
-        if (empty($id)) {
+        $id = $event->getParam(0, '');
+        if (!$id) {
             return;
         }
 
-        BeanFactory::destroyRequest($id);
+        BeanFactory::destroyRequest((string)$id);
     }
 }

src/framework/src/Listener/CoroutineCompleteListener.php

@@ -12,6 +12,7 @@
 use Swoft\Event\EventInterface;
 use Swoft\Log\Logger;
 use Swoft\SwoftEvent;
+use Throwable;
 use function bean;
 use function sgo;
 
@@ -47,24 +48,28 @@ public function handle(EventInterface $event): void
      */
     private function coroutineComplete(): void
     {
-        // Wait
-        Context::getWaitGroup()->wait();
-
         /* @var Logger $logger */
         $logger = bean('logger');
 
-        // Add notice log
-        if ($logger->isEnable()) {
-            $logger->appendNoticeLog();
-        }
+        try {
+            // Wait coroutine
+            Context::getWaitGroup()->wait();
 
-        // Coroutine destroy
-        Swoft::trigger(SwoftEvent::COROUTINE_DESTROY);
+            // Add notice log
+            if ($logger->isEnable()) {
+                $logger->appendNoticeLog();
+            }
 
-        // Destroy request bean
-        Swoft::trigger(BeanEvent::DESTROY_REQUEST, $this, Co::tid());
+            // Coroutine destroy
+            Swoft::trigger(SwoftEvent::COROUTINE_DESTROY);
+        } catch (Throwable $e) {
+            $logger->error('run coroutine complete handle error: ' . $e->getMessage());
+        } finally { // Use finally ensure context destroy
+            // Destroy request bean
+            Swoft::trigger(BeanEvent::DESTROY_REQUEST, $this, Co::tid());
 
-        // Destroy context
-        Context::destroy();
+            // Destroy context
+            Context::destroy();
+        }
     }
 }

src/websocket-server/src/Swoole/MessageListener.php

@@ -31,6 +31,7 @@
 use Swoole\Websocket\Server;
 use Throwable;
 use function server;
+use const WEBSOCKET_OPCODE_CLOSE;
 
 /**
  * Class MessageListener
@@ -55,14 +56,22 @@ class MessageListener implements MessageInterface
     public function onMessage(Server $server, Frame $frame): void
     {
         $fd  = $frame->fd;
-        $sid = (string)$fd;
+
+        // Fix: if setting: 'open_websocket_close_frame' => true
+        if ($frame->opcode === WEBSOCKET_OPCODE_CLOSE) {
+            CLog::info('Close ws#%d connection by close opcode message, reason: %s', $fd, $frame->reason);
+            // Swoft::getBean(CloseListener::class)->onClose($server, $fd, 0);
+            // NOTICE: swoole will auto call close event.
+            return;
+        }
 
         server()->log("Message: conn#{$fd} received message data", [], 'debug');
 
         $request  = Request::new($frame);
         $response = Response::new($fd);
 
         /** @var WsMessageContext $ctx */
+        $sid = (string)$fd;
         $ctx = WsMessageContext::new($request, $response);
 
         // Storage context