Optimized code.

Author: limingxinleo

publish/redis.php

@@ -15,11 +15,15 @@
         'host' => env('REDIS_HOST', 'localhost'),
         'auth' => env('REDIS_AUTH', null),
         'port' => (int) env('REDIS_PORT', 6379),
-        'cluster' => env('REDIS_CLUSTER', false),
         'db' => (int) env('REDIS_DB', 0),
         'timeout' => 0.0,
         'reserved' => null,
         'retry_interval' => 0,
+        'cluster' => [
+            'enable' => (bool) env('REDIS_ENABLE_CLUSTER', false),
+            'name' => null,
+            'seeds' => [],
+        ],
         'pool' => [
             'min_connections' => 1,
             'max_connections' => 10,

src/Pool/PoolFactory.php

@@ -14,7 +14,6 @@
 
 use Hyperf\Di\Container;
 use Psr\Container\ContainerInterface;
-use Swoole\Coroutine\Channel;
 
 class PoolFactory
 {

src/Pool/RedisPool.php

@@ -49,9 +49,6 @@ public function __construct(ContainerInterface $container, string $name)
         parent::__construct($container, $options);
     }
 
-    /**
-     * @return string
-     */
     public function getName(): string
     {
         return $this->name;

src/RedisConnection.php

@@ -18,6 +18,9 @@
 use Hyperf\Pool\Pool;
 use Psr\Container\ContainerInterface;
 
+/**
+ * @method select(int $db)
+ */
 class RedisConnection extends BaseConnection implements ConnectionInterface
 {
     /**
@@ -32,9 +35,13 @@ class RedisConnection extends BaseConnection implements ConnectionInterface
         'host' => 'localhost',
         'port' => 6379,
         'auth' => null,
-        'cluster' => false,
         'db' => 0,
         'timeout' => 0.0,
+        'cluster' => [
+            'enable' => false,
+            'name' => null,
+            'seeds' => [],
+        ],
         'options' => [],
     ];
 
@@ -75,24 +82,18 @@ public function reconnect(): bool
         $host = $this->config['host'];
         $port = $this->config['port'];
         $auth = $this->config['auth'];
-        $cluster = $this->config['cluster'];
         $db = $this->config['db'];
         $timeout = $this->config['timeout'];
+        $cluster = $this->config['cluster']['enable'] ?? false;
 
         $redis = null;
         if ($cluster !== true) {
-            // Normal Redis (Non-cluster)
             $redis = new \Redis();
             if (! $redis->connect($host, $port, $timeout)) {
                 throw new ConnectionException('Connection reconnect failed.');
             }
         } else {
-            // Redis Cluster 
-            try {
-                $redis = new \RedisCluster(null, [$host . ':' . $port], $timeout);
-            } catch (\Throwable $e) {
-                throw new ConnectionException('Connection reconnect failed. ' . $e->getMessage());
-            }
+            $redis = $this->createRedisCluster();
         }
 
         $options = $this->config['options'] ?? [];
@@ -138,4 +139,19 @@ public function setDatabase(?int $database): void
     {
         $this->database = $database;
     }
+
+    protected function createRedisCluster()
+    {
+        try {
+            $seeds = $this->config['cluster']['seeds'] ?? [];
+            $name = $this->config['cluster']['name'] ?? null;
+            $timeout = $this->config['timeout'] ?? null;
+
+            $redis = new \RedisCluster($name, $seeds, $timeout);
+        } catch (\Throwable $e) {
+            throw new ConnectionException('Connection reconnect failed. ' . $e->getMessage());
+        }
+
+        return $redis;
+    }
 }

src/RedisFactory.php

@@ -32,7 +32,7 @@ public function __construct(ConfigInterface $config)
     }
 
     /**
-     * @return \Redis
+     * @return \Redis|RedisProxy
      */
     public function get(string $poolName)
     {

tests/RedisConnectionTest.php

@@ -45,9 +45,13 @@ public function testRedisConnectionConfig()
             'host' => 'redis',
             'port' => 16379,
             'auth' => 'redis',
-            'cluster' => false,
             'db' => 0,
             'timeout' => 0.0,
+            'cluster' => [
+                'enable' => false,
+                'name' => null,
+                'seeds' => [],
+            ],
             'options' => [],
             'pool' => [
                 'min_connections' => 1,
@@ -108,7 +112,6 @@ private function getRedisPool()
                     'host' => 'redis',
                     'auth' => 'redis',
                     'port' => 16379,
-                    'cluster' => false,
                     'pool' => [
                         'min_connections' => 1,
                         'max_connections' => 30,

tests/RedisProxyTest.php

@@ -78,7 +78,6 @@ private function getRedis($optinos = [])
                     'host' => 'localhost',
                     'auth' => null,
                     'port' => 6379,
-                    'cluster' => false,
                     'db' => 0,
                     'options' => $optinos,
                     'pool' => [

tests/RedisTest.php

@@ -77,7 +77,6 @@ private function getRedis()
                     'host' => 'localhost',
                     'auth' => null,
                     'port' => 6379,
-                    'cluster' => false,
                     'db' => 0,
                     'pool' => [
                         'min_connections' => 1,

tests/Stub/RedisConnectionStub.php

@@ -47,17 +47,11 @@ public function select($db)
         $this->db = $db;
     }
 
-    /**
-     * @return array
-     */
     public function getConfig(): array
     {
         return $this->config;
     }
 
-    /**
-     * @return null|int
-     */
     public function getDatabase(): ?int
     {
         return $this->database;