update

Author: chaz6chez

composer.json

@@ -29,13 +29,14 @@
 		"phpunit/phpunit": "^9.6 | ^10.0",
 		"phpstan/phpstan": "^1.11",
 		"friendsofphp/php-cs-fixer": "^3.58",
-		"illuminate/redis": "^9.0 | ^10.0 | ^11.0 | ^12.0",
-		"workerman/redis": "^2.0"
+		"workerman/redis": "^2.0",
+		"workbunny/webman-shared-cache": "^0.6"
 	},
 	"suggest": {
 		"ext-uuid": "For unique socket id. ",
-		"illuminate/redis": "For redis storage. ",
-		"workerman/redis": "For redis channel. "
+		"webman/redis": "For redis storage. ",
+		"workerman/redis": "For redis channel. ",
+		"workbunny/webman-shared-cache": "For shared storage / channel. "
 	},
 	"autoload": {
 		"psr-4": {

src/Channels/RedisChannel.php

@@ -12,6 +12,8 @@
 
 class RedisChannel implements ChannelInterface
 {
+    public static bool $test = false;
+
     /**
      * @var Client|null
      */
@@ -38,7 +40,7 @@ public function __construct(?string $redisChannel)
         if (!$config = config('redis')["plugin.workbunny.webman-push-server.$redisChannel"] ?? []) {
             throw new InvalidArgumentException("Redis channel [$redisChannel] not found. ");
         }
-        try {
+        if (!static::$test) {
             $client = new Client(sprintf('redis://%s:%s', $config['host'], $config['port']), $config['options'] ?? []);
             $client->connect();
             if ($passport = $config['password'] ?? null) {
@@ -48,10 +50,6 @@ public function __construct(?string $redisChannel)
                 $client->select($database);
             }
             $this->_subClient = $client;
-        } catch (\RuntimeException $e) {
-            if ($e->getMessage() !== 'Timer can only be used in workerman running environment') {
-                throw $e;
-            }
         }
         $this->_pubClient = Redis::connection("plugin.workbunny.webman-push-server.$redisChannel")->client();
     }

src/Traits/ChannelMethods.php

@@ -35,8 +35,8 @@ trait ChannelMethods
     public static function channelConnect(string $channelKey = 'default'): ChannelInterface
     {
         if (!(static::$channels[$channelKey] ?? null)) {
-            $handler = config("workbunny.webman-push-server.channel.$channelKey.handler");
-            $channel = config("workbunny.webman-push-server.channel.$channelKey.channel");
+            $handler = config("plugin.workbunny.webman-push-server.channel.$channelKey.handler");
+            $channel = config("plugin.workbunny.webman-push-server.channel.$channelKey.channel");
             $handler = is_a($handler, ChannelInterface::class, true) ? new $handler($channel) : new RedisChannel(
                 // 兼容旧版及其他可能的可选项
                 $channelKey === 'default' ?

src/Traits/StorageMethods.php

@@ -43,7 +43,7 @@ trait StorageMethods
     public static function getStorageClient(): StorageInterface
     {
         if(!self::$_storageClient instanceof StorageInterface){
-            $handler = config('workbunny.webman-push-server.storage.handler');
+            $handler = config('plugin.workbunny.webman-push-server.storage.handler');
             $handler = is_a($handler, StorageInterface::class, true) ? new $handler : new RedisStorage();
             self::$_storageClient = $handler;
         }

tests/BaseTestCase.php

@@ -18,6 +18,7 @@
 use Webman\Config;
 use Webman\Route;
 use Workbunny\WebmanPushServer\ApiServer;
+use Workbunny\WebmanPushServer\Channels\RedisChannel;
 use Workbunny\WebmanPushServer\PushServer;
 
 
@@ -75,12 +76,13 @@ class_exists($bootstrap) and
                 }
             }
         }
-        // 取消workerman Timer中存在的pcntl_alarm(1)，避免测试用例无法运行完整
-        pcntl_alarm(0);
-
         // 模拟启动服务
         static::$pushServer = new PushServer();
         static::$apiServer = new ApiServer();
+        // 开启测试模式
+        RedisChannel::$test = true;
+        // 取消workerman Timer中存在的pcntl_alarm(1)，避免测试用例无法运行完整
+        pcntl_alarm(0);
         parent::setUpBeforeClass(); // TODO: Change the autogenerated stub
     }