Merge pull request jakubkulhan#126 from roman-huliak/patch-1

Call HB if communication is still active
MTijn · Dec 12, 2022 · cd7067e · cd7067e
2 parents ee8777b + 1e56537
commit cd7067e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Bunny/Client.php b/src/Bunny/Client.php
@@ -189,7 +189,10 @@ public function run($maxSeconds = null)
             } else {
                 if (($frame = $this->reader->consumeFrame($this->readBuffer)) === null) {
                     $now = microtime(true);
-                    $nextStreamSelectTimeout = $nextHeartbeat = ($this->lastWrite ?: $now) + $this->options["heartbeat"];
+                    $nextStreamSelectTimeout = ($this->lastWrite ?: $now) + $this->options["heartbeat"];
+                    if (!isset($nextHeartbeat)) {
+                        $nextHeartbeat = $now + $this->options["heartbeat"];
+                    }
                     if ($stopTime !== null && $stopTime < $nextStreamSelectTimeout) {
                         $nextStreamSelectTimeout = $stopTime;
                     }
@@ -224,6 +227,7 @@ public function run($maxSeconds = null)
                     $now = microtime(true);
 
                     if ($now >= $nextHeartbeat) {
+                        $nextHeartbeat = $now + $this->options["heartbeat"];
                         $this->writer->appendFrame(new HeartbeatFrame(), $this->writeBuffer);
                         $this->flushWriteBuffer();