[Gateway] Fix heartbeat reconnect issue

Azoy · Aug 30, 2020 · ca066c5 · ca066c5
1 parent 6cd52bc
commit ca066c5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/Sources/Sword/Gateway/GatewayHandler.swift b/Sources/Sword/Gateway/GatewayHandler.swift
@@ -33,7 +33,7 @@ extension Shard {
 
     /// OP: 11
     case .heartbeatACK:
-      self.wasAcked = true
+      self.heartbeatQueue.sync { self.acksMissed = 0 }
 
     /// OP: 10
     case .hello:

diff --git a/Sources/Sword/Gateway/Heartbeat.swift b/Sources/Sword/Gateway/Heartbeat.swift
@@ -22,19 +22,19 @@ extension Gateway {
       return
     }
 
+    guard self.acksMissed < 3 else {
+      print("[Sword] Did not receive ACK from server, reconnecting...")
+      self.reconnect()
+      return
+    }
+
+    self.acksMissed += 1
+
+    self.send(self.heartbeatPayload.encode(), presence: false)
+
     self.heartbeatQueue.asyncAfter(
       deadline: .now() + .milliseconds(interval)
     ) { [unowned self] in
-      guard self.wasAcked else {
-        print("[Sword] Did not receive ACK from server, reconnecting...")
-        self.reconnect()
-        return
-      }
-
-      self.wasAcked = false
-
-      self.send(self.heartbeatPayload.encode(), presence: false)
-
       self.heartbeat(at: interval)
     }
   }

diff --git a/Sources/Sword/Gateway/Shard.swift b/Sources/Sword/Gateway/Shard.swift
@@ -61,8 +61,8 @@ class Shard: Gateway {
   /// Parent class
   unowned let sword: Sword
 
-  /// Whether or not this shard was last acked
-  var wasAcked = true
+  /// Number of missed heartbeat ACKs
+  var acksMissed = 0
 
   // MARK: Initializer
 
@@ -259,6 +259,7 @@ class Shard: Gateway {
     #endif
 
     self.isConnected = false
+    self.acksMissed = 0
 
     self.sword.log("Disconnected from gateway... Resuming session")
 
@@ -307,6 +308,7 @@ class Shard: Gateway {
 
     self.isConnected = false
     self.isReconnecting = false
+    self.acksMissed = 0
 
     self.sword.log("Stopping gateway connection...")
   }