@xh/hoist 74.0.0-SNAPSHOT.1748890930922 → 74.0.0-SNAPSHOT.1749036244810

package/CHANGELOG.md

@@ -14,6 +14,8 @@
 ### 🐞 Bug Fixes
 * Improved `ViewManagerModel.settleTime` by delegating to individual `PersistenceProviders`.
 * Fixed bug where grid column state could become unintentionally dirty when columns were hidden.
+* Improved `WebsocketService` heartbeat detection to auto-reconnect when the socket reports as open
+  and heartbeats can be sent, but no heartbeat acknowledgements are being received from the server.
 
 ## v73.0.1 - 2025-05-19
 

package/build/types/svc/WebSocketService.d.ts

@@ -45,6 +45,8 @@ export declare class WebSocketService extends HoistService {
     private _timer;
     private _socket;
     private _subsByTopic;
+    private _lastHeartbeatSent;
+    private _lastHeartbeatReceived;
     constructor();
     initAsync(): Promise<void>;
     /**
@@ -70,7 +72,9 @@ export declare class WebSocketService extends HoistService {
     getFormattedTelemetry(): PlainObject;
     private connect;
     private disconnect;
+    private reconnect;
     private heartbeatOrReconnect;
+    private get heartbeatWasUnacknowledged();
     private onServerInstanceChange;
     onOpen(ev: any): void;
     onClose(ev: any): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xh/hoist",
-  "version": "74.0.0-SNAPSHOT.1748890930922",
+  "version": "74.0.0-SNAPSHOT.1749036244810",
   "description": "Hoist add-on for building and deploying React Applications.",
   "repository": "github:xh/hoist-react",
   "homepage": "https://xh.io",

package/svc/WebSocketService.ts

@@ -70,6 +70,9 @@ export class WebSocketService extends HoistService {
     private _socket: WebSocket;
     private _subsByTopic: Record<string, WebSocketSubscription[]> = {};
 
+    private _lastHeartbeatSent: number = null;
+    private _lastHeartbeatReceived: number = null;
+
     constructor() {
         super();
         makeObservable(this);
@@ -177,6 +180,10 @@ export class WebSocketService extends HoistService {
                 if (s === this._socket) this.onMessage(data);
             };
             this._socket = s;
+
+            // Reset heartbeat tracking - any prior values no longer relevant.
+            this._lastHeartbeatReceived = null;
+            this._lastHeartbeatSent = null;
         } catch (e) {
             this.logError('Failure creating WebSocket', e);
         }
@@ -192,24 +199,41 @@ export class WebSocketService extends HoistService {
         this.updateConnectedStatus();
     }
 
+    private reconnect() {
+        this.disconnect();
+        this.connect();
+    }
+
     private heartbeatOrReconnect() {
         this.updateConnectedStatus();
-        if (this.connected) {
-            this.sendMessage({topic: this.HEARTBEAT_TOPIC, data: 'ping'});
-            this.noteTelemetryEvent('heartbeatSent');
-        } else {
-            this.logWarn('Heartbeat found websocket not connected - attempting to reconnect...');
+
+        // If there is a problem, attempt to reconnect and come back on the next cycle.
+        const {connected, heartbeatWasUnacknowledged} = this;
+        if (!connected || heartbeatWasUnacknowledged) {
+            this.logWarn(
+                `Heartbeat found ${!connected ? 'websocket not connected' : 'last heartbeat not acknowledged'} - attempting to reconnect...`
+            );
             this.noteTelemetryEvent('heartbeatReconnectAttempt');
-            this.disconnect();
-            this.connect();
+            this.reconnect();
+            return;
         }
+
+        // If all looks OK, send a heartbeat message.
+        this.sendMessage({topic: this.HEARTBEAT_TOPIC, data: 'ping'});
+        this.noteTelemetryEvent('heartbeatSent');
+        this._lastHeartbeatSent = Date.now();
+    }
+
+    // We expect the server to respond immediately to every heartbeat. There will be a tiny window
+    // while the message is round-tripping, but that's not material to our check on HEARTBEAT_INTERVAL.
+    private get heartbeatWasUnacknowledged() {
+        return this._lastHeartbeatSent > this._lastHeartbeatReceived;
     }
 
     private onServerInstanceChange() {
         this.logWarn('Server instance changed - attempting to connect to new instance.');
         this.noteTelemetryEvent('instanceChangeReconnectAttempt');
-        this.disconnect();
-        this.connect();
+        this.reconnect();
     }
 
     //------------------------
@@ -256,6 +280,7 @@ export class WebSocketService extends HoistService {
                     XH.clientHealthService.sendReportAsync();
                     break;
                 case this.HEARTBEAT_TOPIC:
+                    this._lastHeartbeatReceived = Date.now();
                     this.noteTelemetryEvent('heartbeatReceived');
                     break;
             }