Stop awaiting heartbeat at disconnect

dc-Ragnarok · Apr 24, 2024 · 4d5ee34 · 4d5ee34
1 parent b12be30
commit 4d5ee34
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/Gateway/Connection.php b/src/Gateway/Connection.php
@@ -184,6 +184,8 @@ public function connect(string $url): ExtendedPromiseInterface
 
     public function disconnect(int $code, string $reason): void
     {
+        $this->cancelHeartbeatAcknowledgement();
+
         $this->websocket->close($code, $reason);
     }
 
@@ -226,7 +228,14 @@ private function expectHeartbeatAcknowledgement(): void
 
     public function acknowledgeHeartbeat(): void
     {
-        $this->loop->cancelTimer($this->unacknowledgedHeartbeatTimer);
+        $this->cancelHeartbeatAcknowledgement();
+    }
+
+    private function cancelHeartbeatAcknowledgement(): void
+    {
+        if (isset($this->unacknowledgedHeartbeatTimer)) {
+            $this->loop->cancelTimer($this->unacknowledgedHeartbeatTimer);
+        }
     }
 
     public function startAutomaticHeartbeats(int $ms): void