Merge pull request #698 from EdgeApp/paul/fixChangeServer

Paul/fix change server

Author: samholmes

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- fixed: Change-server websocket reconnects reliably after disconnection
+
 ## 2.40.0 (2026-01-26)
 
 - added: Added change-server subscription timeout fallback.

src/core/currency/change-server-connection.ts

@@ -26,6 +26,8 @@ export function connectChangeServer(
   callbacks: ChangeServerCallbacks
 ): ChangeServerConnection {
   let ws: WebSocket
+  let closing = false
+  let reconnectTimeoutId: ReturnType<typeof setTimeout> | undefined
   function makeWs(): void {
     ws = new WebSocket(url)
     ws.binaryType = 'arraybuffer'
@@ -38,15 +40,17 @@ export function connectChangeServer(
       out.connected = false
       codec.handleClose()
       callbacks.handleDisconnect()
+      // Reconnect after 5 seconds, unless intentionally closed:
+      reconnectTimeoutId = setTimeout(() => {
+        if (!closing) {
+          makeWs()
+        }
+      }, 5000)
     })
 
     ws.addEventListener('error', errEvent => {
       console.error('changeServer websocket error:', errEvent)
       ws.close()
-      // Reconnect after 5 seconds:
-      setTimeout(() => {
-        makeWs()
-      }, 5000)
     })
 
     ws.addEventListener('open', () => {
@@ -87,6 +91,11 @@ export function connectChangeServer(
     },
 
     close() {
+      closing = true
+      if (reconnectTimeoutId != null) {
+        clearTimeout(reconnectTimeoutId)
+        reconnectTimeoutId = undefined
+      }
       ws.close()
     },
 

src/core/currency/currency-pixie.ts

@@ -292,7 +292,8 @@ export const currency: TamePixie<RootProps> = combinePixies({
                 .subscribe(subscribeParams)
                 .catch(err => {
                   input.props.log(`Failed to subscribe: ${String(err)}`)
-                  return [0] as SubscribeResult[]
+                  // Return failure result for each subscription in the batch:
+                  return subscribeParams.map(() => 0 as SubscribeResult)
                 })
               results.push(...r)
             }