much harsher heartbeat handling

Author: jogramming

gateway.go

@@ -922,7 +922,7 @@ func (g *GatewayConnection) startWorkers() error {
 		receivedAck: true,
 		sequence:    new(int64),
 		onNoAck: func() {
-			g.log(LogError, "No heartbeat ack received since sending last heartbeast, reconnecting...")
+			g.log(LogError, "No heartbeat ack received since sending last heartbeast, reconnecting... ip: %s", g.conn.RemoteAddr)
 			err := g.ReconnectUnlessClosed(false)
 			if err != nil {
 				g.log(LogError, "Failed reconnecting to the gateway: %v", err)

wsapi.go

@@ -158,19 +158,16 @@ func (wh *wsHeartBeater) Run(interval time.Duration) {
 		case <-ticker.C:
 
 			wh.Lock()
+			timeSinceAck := time.Since(wh.lastAck)
 			hasReceivedAck := wh.receivedAck
 			wh.receivedAck = false
-			wh.missedAcks++
-			missed := wh.missedAcks
-
-			wh.lastSend = time.Now()
 			wh.Unlock()
 
-			if !hasReceivedAck && wh.onNoAck != nil && missed > 4 {
+			if !hasReceivedAck && timeSinceAck >= interval {
 				wh.onNoAck()
+			} else {
+				wh.SendBeat()
 			}
-
-			wh.SendBeat()
 		case <-wh.stop:
 			return
 		}