fix

workbunny · Oct 1, 2024 · 91b7b8d · 91b7b8d
1 parent c2bff90
commit 91b7b8d
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 346 deletions.
diff --git a/src/CoroutineServerInterface.php b/src/CoroutineServerInterface.php
diff --git a/src/CoroutineServerMethods.php b/src/CoroutineServerMethods.php
diff --git a/src/CoroutineWebServer.php b/src/CoroutineWebServer.php
@@ -70,7 +70,7 @@ public function onConnect($connection, ...$params): void
                 call_user_func($call, $connection, ...$params);
             });
         }
-        if (!$this->_connectionChannels[$id = spl_object_hash($connection)] ?? null) {
+        if (!($this->_connectionChannels[$id = spl_object_hash($connection)] ?? null)) {
             $this->_connectionChannels[$id] = new Channel(\config('plugin.workbunny.webman-coroutine.app.channel_size', 1));
         }
     }

diff --git a/src/CoroutineWorkerInterface.php b/src/CoroutineWorkerInterface.php
diff --git a/src/CoroutineWorkerMethods.php b/src/CoroutineWorkerMethods.php
diff --git a/src/Factory.php b/src/Factory.php
@@ -7,7 +7,6 @@
 
 namespace Workbunny\WebmanCoroutine;
 
-use Webman\Http\Request;
 use Workbunny\WebmanCoroutine\Events\SwooleEvent;
 use Workbunny\WebmanCoroutine\Events\SwowEvent;
 use Workbunny\WebmanCoroutine\Handlers\DefaultHandler;
@@ -17,8 +16,6 @@
 use Workbunny\WebmanCoroutine\Handlers\SwooleWorkerman5Handler;
 use Workbunny\WebmanCoroutine\Handlers\SwowHandler;
 use Workbunny\WebmanCoroutine\Handlers\SwowWorkerman5Handler;
-use Workerman\Connection\ConnectionInterface;
-use Workerman\Worker;
 
 /**
  *  工厂化启动器
@@ -181,41 +178,4 @@ public static function init(?string $eventLoopClass): void
             );
         }
     }
-
-    /**
-     * 根据当前环境运行处理器
-     *
-     * @param CoroutineServerInterface $app 实现CoroutineServerInterface
-     * @param mixed|ConnectionInterface $connection 连接资源
-     * @param mixed|Request $request 请求体
-     * @param string|null $eventLoopClass null:根据环境获取事件循环类
-     * @return mixed
-     */
-    public static function run(CoroutineServerInterface $app, mixed $connection, mixed $request, ?string $eventLoopClass = null): mixed
-    {
-        self::init($eventLoopClass);
-        // 获取当前处理器
-        /** @var HandlerInterface $handlerClass */
-        $handlerClass = self::getCurrentHandler();
-
-        return $handlerClass::onMessage($app, $connection, $request);
-    }
-
-    /**
-     * 根据当前环境运行处理器
-     *
-     * @param CoroutineWorkerInterface $app 实现CoroutineWorkerInterface
-     * @param mixed|Worker|null $worker worker对象
-     * @param string|null $eventLoopClass null:根据环境获取事件循环类
-     * @return mixed
-     */
-    public static function start(CoroutineWorkerInterface $app, mixed $worker = null, ?string $eventLoopClass = null): mixed
-    {
-        self::init($eventLoopClass);
-        // 获取当前处理器
-        /** @var HandlerInterface $handlerClass */
-        $handlerClass = self::getCurrentHandler();
-
-        return $handlerClass::onWorkerStart($app, $worker);
-    }
 }
diff --git a/src/Utils/Channel/Handlers/DefaultChannel.php b/src/Utils/Channel/Handlers/DefaultChannel.php
@@ -31,10 +31,7 @@ public function __destruct()
 
     public function pop(int $timeout = -1): mixed
     {
-        if ($this->_queue) {
-            return $this->_queue->dequeue();
-        }
-        return false;
+        return $this->_queue->dequeue();
     }
 
     /** @inheritdoc
@@ -43,29 +40,26 @@ public function pop(int $timeout = -1): mixed
      */
     public function push(mixed $data, int $timeout = -1): bool
     {
-        if ($this->_queue) {
-            $this->_queue->enqueue($data);
-            return true;
-        }
-        return false;
+        $this->_queue->enqueue($data);
+        return true;
     }
 
     /** @inheritdoc  */
     public function isEmpty(): bool
     {
-        return $this->_queue?->isEmpty() ?: true;
+        return $this->_queue->isEmpty();
     }
 
     /** @inheritdoc  */
     public function isFull(): bool
     {
-        return !($this->_capacity < 0) && $this->_capacity <= intval($this->_queue?->count());
+        return !($this->capacity() < 0) && $this->capacity() <= intval($this->_queue?->count());
     }
 
     /** @inheritdoc  */
     public function close(): void
     {
-        $this->_queue = null;
+        $this->_queue = new \SplQueue();
     }
 
     /** @inheritdoc  */