Optimized codes of redis-subscriber (#690)

Co-authored-by: Deeka Wong <[email protected]>
friendsofhyperf · Jul 21, 2024 · 41da346 · 41da346
1 parent 8dd5d07
commit 41da346
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/src/CommandInvoker.php b/src/CommandInvoker.php
@@ -73,7 +73,7 @@ public function interrupt(): bool
         return true;
     }
 
-    public function ping(int $timeout = 1): string|bool
+    public function ping(float $timeout = 1): string|bool
     {
         $this->connection->send(CommandBuilder::build('ping'));
         return $this->pingChannel->pop($timeout);
@@ -84,6 +84,7 @@ public function ping(int $timeout = 1): string|bool
      */
     protected function receive(Connection $connection): void
     {
+        /** @var array|null $buffer */
         $buffer = null;
 
         while (true) {
@@ -129,7 +130,7 @@ protected function receive(Connection $connection): void
                 $message = new Message();
                 $message->channel = $buffer[4];
                 $message->payload = $buffer[6];
-                $timerID = $this->timer->after(30, function () use ($message) {
+                $timerID = $this->timer->after(30.0, function () use ($message) {
                     $this->logger?->error(sprintf('Message channel (%s) is 30 seconds full, disconnected', $message->channel));
                     $this->interrupt();
                 });
@@ -156,7 +157,7 @@ protected function receive(Connection $connection): void
                 $message->pattern = $buffer[4];
                 $message->channel = $buffer[6];
                 $message->payload = $buffer[8];
-                $timerID = $this->timer->after(30, function () use ($message) {
+                $timerID = $this->timer->after(30.0, function () use ($message) {
                     $this->logger?->error(sprintf('Message channel (%s) is 30 seconds full, disconnected', $message->channel));
                     $this->interrupt();
                 });

diff --git a/src/Connection.php b/src/Connection.php
@@ -41,6 +41,7 @@ public function send(string $data): bool
         if ($size === false) {
             throw new SocketException('Failed to send data to the socket.');
         }
+
         if ($len !== $size) {
             throw new SocketException('The sending data is incomplete, it may be that the socket has been closed by the peer.');
         }

diff --git a/src/Subscriber.php b/src/Subscriber.php
@@ -41,10 +41,7 @@ public function __construct(
      */
     public function subscribe(string ...$channels): void
     {
-        $channels = array_map(function ($channel) {
-            return $this->prefix . $channel;
-        }, $channels);
-
+        $channels = array_map(fn ($channel) => $this->prefix . $channel, $channels);
         $result = $this->commandInvoker->invoke(['subscribe', ...$channels], count($channels));
 
         foreach ($result as $value) {
@@ -62,10 +59,7 @@ public function subscribe(string ...$channels): void
      */
     public function unsubscribe(string ...$channels): void
     {
-        $channels = array_map(function ($channel) {
-            return $this->prefix . $channel;
-        }, $channels);
-
+        $channels = array_map(fn ($channel) => $this->prefix . $channel, $channels);
         $result = $this->commandInvoker->invoke(['unsubscribe', ...$channels], count($channels));
 
         foreach ($result as $value) {
@@ -83,10 +77,7 @@ public function unsubscribe(string ...$channels): void
      */
     public function psubscribe(string ...$channels): void
     {
-        $channels = array_map(function ($channel) {
-            return $this->prefix . $channel;
-        }, $channels);
-
+        $channels = array_map(fn ($channel) => $this->prefix . $channel, $channels);
         $result = $this->commandInvoker->invoke(['psubscribe', ...$channels], count($channels));
 
         foreach ($result as $value) {
@@ -104,10 +95,7 @@ public function psubscribe(string ...$channels): void
      */
     public function punsubscribe(string ...$channels): void
     {
-        $channels = array_map(function ($channel) {
-            return $this->prefix . $channel;
-        }, $channels);
-
+        $channels = array_map(fn ($channel) => $this->prefix . $channel, $channels);
         $result = $this->commandInvoker->invoke(['punsubscribe', ...$channels], count($channels));
 
         foreach ($result as $value) {
@@ -138,7 +126,7 @@ public function close(): void
     /**
      * @throws SocketException
      */
-    public function ping(int $timeout = 1): string|bool
+    public function ping(float $timeout = 1): string|bool
     {
         return $this->commandInvoker->ping($timeout);
     }