romtuck/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(node): reconnect stale gateway ws

Browse Source
This commit is contained in:
Nimrod Gutman 2026-01-26 09:31:57 +02:00
parent 9688454a30
commit eabf9a09dd
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
apps/shared/MoltbotKit/Sources/MoltbotKit/GatewayChannel.swift
View File

@ -211,7 +211,22 @@ public actor GatewayChannelActor {
}
public func connect() async throws {
if self.connected, self.task?.state == .running { return }
if self.connected, self.task?.state == .running {
let staleStatus = self.staleConnectionStatus()
if staleStatus.isStale {
if let deltaMs = staleStatus.deltaMs {
self.logger.error(
"gateway ws stale; reconnecting deltaMs=\(Int(deltaMs)) thresholdMs=\(Int(staleStatus.thresholdMs))")
} else {
self.logger.error(
"gateway ws stale; reconnecting lastTick=missing thresholdMs=\(Int(staleStatus.thresholdMs))")
}
self.connected = false
self.task?.cancel(with: .goingAway, reason: nil)
} else {
return
}
}
if self.isConnecting {
try await withCheckedThrowingContinuation { cont in
self.connectWaiters.append(cont)
@ -328,8 +343,8 @@ public actor GatewayChannelActor {
} else if let password = self.password {
params["auth"] = ProtoAnyCodable(["password": ProtoAnyCodable(password)])
}
let signedAtMs = Int(Date().timeIntervalSince1970 * 1000)
let connectNonce = try await self.waitForConnectChallenge()
let signedAtMs = Int(Date().timeIntervalSince1970 * 1000)
let scopesValue = scopes.joined(separator: ",")
var payloadParts = [
connectNonce == nil ? "v1" : "v2",
@ -554,6 +569,15 @@ public actor GatewayChannelActor {
}
}
private func staleConnectionStatus() -> (isStale: Bool, deltaMs: Double?, thresholdMs: Double) {
let thresholdMs = self.tickIntervalMs * 2
guard let lastTick else {
return (true, nil, thresholdMs)
}
let deltaMs = Date().timeIntervalSince(lastTick) * 1000
return (deltaMs > thresholdMs, deltaMs, thresholdMs)
}
private func scheduleReconnect() async {
guard self.shouldReconnect else { return }
let delay = self.backoffMs / 1000

1
apps/shared/MoltbotKit/Sources/MoltbotKit/GatewayNodeSession.swift
View File

@ -107,7 +107,6 @@ public actor GatewayNodeSession {
do {
try await channel.connect()
await onConnected()
} catch {
await onDisconnected(error.localizedDescription)
throw error