fix: reconnect traffic/log websocket on clean disconnect

ClashFX Team · ClashFX Team · commit a7ff626751c9 · 2026-05-26T18:35:31.000+08:00
The disconnect handler previously early-returned when error was nil,
silently swallowing every clean close (sleep/wake, NAT timeout,
server-initiated close, network change). Once a clean disconnect
happened the menu bar speed indicator froze on the last received
values indefinitely.

Schedule the existing exponential-backoff retry on every disconnect,
log a 'clean' label when no error was supplied, and cap the backoff
at 64s so a long outage cannot push the next attempt hours away.

Also switch the socket identity check from == to === and ignore
disconnects from stale sockets (one whose reference was already
replaced inside requestTrafficInfo/requestLog during a reconnect
cycle) — previously the old traffic socket's delayed disconnect
callback fell into the else branch and scheduled a spurious
loggingWebSocket retry.
diff --git a/ClashFX/General/ApiRequest.swift b/ClashFX/General/ApiRequest.swift
@@ -70,6 +70,7 @@ class ApiRequest {
     private var loggingWebSocketRetryDelay: TimeInterval = 1
     private var trafficWebSocketRetryTimer: Timer?
     private var loggingWebSocketRetryTimer: Timer?
+    private static let maxRetryDelaySeconds: TimeInterval = 64
 
     private var alamoFireManager: Session
 
@@ -566,34 +567,44 @@ extension ApiRequest: WebSocketDelegate {
     }
 
     func websocketDidDisconnect(socket: WebSocketClient, error: Error?) {
-        guard let err = error else {
-            return
+        if let err = error {
+            Logger.log(err.localizedDescription, level: .error)
         }
 
-        Logger.log(err.localizedDescription, level: .error)
-
         guard let webSocket = socket as? WebSocket else { return }
 
-        if webSocket == trafficWebSocket {
-            Logger.log("trafficWebSocket did disconnect", level: .debug)
-            trafficWebSocketRetryTimer?.invalidate()
-            trafficWebSocketRetryTimer =
-                Timer.scheduledTimer(withTimeInterval: trafficWebSocketRetryDelay, repeats: false, block: {
-                    [weak self] _ in
-                    if self?.trafficWebSocket?.isConnected == true { return }
-                    self?.requestTrafficInfo()
-                })
-            trafficWebSocketRetryDelay *= 2
+        let errDesc = error?.localizedDescription ?? "clean"
+        if webSocket === trafficWebSocket {
+            Logger.log("trafficWebSocket did disconnect (\(errDesc))", level: .debug)
+            scheduleTrafficRetry()
+        } else if webSocket === loggingWebSocket {
+            Logger.log("loggingWebSocket did disconnect (\(errDesc))", level: .debug)
+            scheduleLogRetry()
         } else {
-            Logger.log("loggingWebSocket did disconnect", level: .debug)
-            loggingWebSocketRetryTimer =
-                Timer.scheduledTimer(withTimeInterval: loggingWebSocketRetryDelay, repeats: false, block: {
-                    [weak self] _ in
-                    if self?.loggingWebSocket?.isConnected == true { return }
-                    self?.requestLog()
-                })
-            loggingWebSocketRetryDelay *= 2
+            Logger.log("stale websocket disconnect ignored (\(errDesc))", level: .debug)
+        }
+    }
+
+    private func scheduleTrafficRetry() {
+        trafficWebSocketRetryTimer?.invalidate()
+        trafficWebSocketRetryTimer = Timer.scheduledTimer(
+            withTimeInterval: trafficWebSocketRetryDelay, repeats: false
+        ) { [weak self] _ in
+            if self?.trafficWebSocket?.isConnected == true { return }
+            self?.requestTrafficInfo()
+        }
+        trafficWebSocketRetryDelay = min(trafficWebSocketRetryDelay * 2, Self.maxRetryDelaySeconds)
+    }
+
+    private func scheduleLogRetry() {
+        loggingWebSocketRetryTimer?.invalidate()
+        loggingWebSocketRetryTimer = Timer.scheduledTimer(
+            withTimeInterval: loggingWebSocketRetryDelay, repeats: false
+        ) { [weak self] _ in
+            if self?.loggingWebSocket?.isConnected == true { return }
+            self?.requestLog()
         }
+        loggingWebSocketRetryDelay = min(loggingWebSocketRetryDelay * 2, Self.maxRetryDelaySeconds)
     }
 
     func websocketDidReceiveMessage(socket: WebSocketClient, text: String) {
