feat: do not call empty handler on ping message

basis-company · Jun 9, 2023 · 8384a31 · 8384a31
1 parent 2670283
commit 8384a31
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -271,7 +271,12 @@ public function process(null|int|float $timeout = 0)
         switch (trim($line)) {
             case 'PING':
                 $this->logger?->debug('receive ' . $line);
-                return $this->send(new Pong([]));
+                $this->send(new Pong([]));
+                $now = microtime(true);
+                if ($now >= $max) {
+                    return null;
+                }
+                return $this->process($max - $now);
 
             case 'PONG':
                 $this->logger?->debug('receive ' . $line);

diff --git a/src/Consumer/Consumer.php b/src/Consumer/Consumer.php
@@ -144,7 +144,7 @@ public function handle(Closure $handler, Closure $emptyHandler = null): int
                 break;
             }
 
-            if ($iteration && $runtime->empty) {
+            if ($iteration && $runtime->empty && !$expires) {
                 usleep((int) floor($this->getDelay() * 1_000_000));
             }
         }