Merge branch 'develop' into 'master'

Develop

See merge request prey/js/prey-node-client!1315

Author: Javier Acuna

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [v1.13.24](https://github.com/prey/prey-node-client/tree/v1.13.24) (2026-01-09)
+[Full Changelog](https://github.com/prey/prey-node-client/compare/v1.13.23..v1.13.24)
+
+- Fix: Fixes an issue where WebSocket connections failed to reconnect after the system woke from sleep mode. ([SoraKenji](https://github.com/SoraKenji))
+
 ## [v1.13.23](https://github.com/prey/prey-node-client/tree/v1.13.23) (2026-01-06)
 [Full Changelog](https://github.com/prey/prey-node-client/compare/v1.13.22..v1.13.23)
 

lib/agent/control-panel/websockets/index.js

@@ -42,10 +42,7 @@ let countNotConnectionProxy = 0;
 let pongReceived = false;
 let timerSendLocation;
 let lastLocationTime;
-let reconnectAttempts = 0;
 let reconnectTimerId = null;
-const reconnectBaseDelay = 1000; // 1s
-const reconnectMaxDelay = 30000; // 30s
 let isReconnecting = false;
 
 const startupTimeout = 5000;
@@ -235,6 +232,22 @@ const processNextMessage = () => {
   }
 };
 
+const commandProcessedStoredFn = (commandId) => {
+    if (commandIdToStructure.has(commandId)) {
+      const structure = commandIdToStructure.get(commandId);
+      logger.debug(`Command ${commandId} completed, releasing structure: ${structure}`);
+
+      // Clear the timeout since command completed successfully
+      if (structureTimeouts.has(structure)) {
+        clearTimeout(structureTimeouts.get(structure));
+        structureTimeouts.delete(structure);
+      }
+
+      processingStructures.delete(structure);
+      commandIdToStructure.delete(commandId);
+    }
+};
+
 // Start the message processor
 const startMessageProcessor = () => {
   if (processorIntervalId) {
@@ -245,21 +258,7 @@ const startMessageProcessor = () => {
 
   // Listen to command completion events to unblock structures
   if (hooks) {
-    hooks.on('command_processed_or_stored', (commandId) => {
-      if (commandIdToStructure.has(commandId)) {
-        const structure = commandIdToStructure.get(commandId);
-        logger.debug(`Command ${commandId} completed, releasing structure: ${structure}`);
-
-        // Clear the timeout since command completed successfully
-        if (structureTimeouts.has(structure)) {
-          clearTimeout(structureTimeouts.get(structure));
-          structureTimeouts.delete(structure);
-        }
-
-        processingStructures.delete(structure);
-        commandIdToStructure.delete(commandId);
-      }
-    });
+    hooks.on('command_processed_or_stored', commandProcessedStoredFn);
   }
 
   processorIntervalId = setInterval(processNextMessage, MESSAGE_PROCESS_DELAY);
@@ -275,7 +274,7 @@ const stopMessageProcessor = () => {
 
   // Clean up event listener
   if (hooks && typeof hooks.removeListener === 'function') {
-    hooks.removeListener('command_processed_or_stored');
+    hooks.removeListener('command_processed_or_stored', commandProcessedStoredFn);
   }
 
   // Clear all pending timeouts
@@ -416,16 +415,14 @@ const validationConnectionsProxy = () => {
 };
 
 const computeReconnectDelay = () => {
-  const jitter = Math.floor(Math.random() * 1000);
-  const delay = Math.min(reconnectBaseDelay * (2 ** reconnectAttempts) + jitter, reconnectMaxDelay);
-  return delay;
+  const jitter = Math.floor(Math.random() * 4000);
+  return jitter;
 };
 
 const scheduleReconnect = (reason, immediate = false) => {
-  if (!exports.re_schedule) return;
+  logger.info(`trying to reconnect with ${reason} and immediate=${immediate}`);
   if (isReconnecting) return;
   isReconnecting = true;
-  reconnectAttempts += 1;
   clearAndResetIntervals();
   validationConnectionsProxy();
 
@@ -455,7 +452,7 @@ const scheduleReconnect = (reason, immediate = false) => {
       logger.warn('isReconnecting stuck true, resetting');
       isReconnecting = false;
     }
-  }, reconnectMaxDelay + 10000);
+  }, 5000);
 };
 
 const restartWebsocketCall = () => {
@@ -607,16 +604,15 @@ const webSocketSettings = () => {
   notifyAckInterval = setInterval(retryAckResponses, 4 * 1000);
   getStatusInterval = setInterval(getStatusByInterval, 5 * 60 * 1000);
   timeOutCancelIntervalHearBeat = setTimeout(() => {
-    setIntervalWSStatus = setInterval(exports.heartbeat, 30 * 1000);
-  }, 90 * 1000);
+    setIntervalWSStatus = setInterval(exports.heartbeat, 10 * 1000);
+  }, 60 * 1000);
   const proxy = config.getData('try_proxy');
   let protocol = config.getData('control-panel.protocol');
   const host = config.getData('control-panel.host');
   const deviceKey = keys.get().device;
   const apiKey = keys.get().api;
 
   protocol = protocol === 'https' ? 'wss' : 'ws';
-
   if (!keys.get().device) {
     propagateError(errors.get('NO_DEVICE_KEY'));
     exports.unload();
@@ -639,15 +635,16 @@ const webSocketSettings = () => {
     logger.info('Setting up proxy');
   }
   gettingStatus = true;
-  if (!(!ws || !ws.readyState || ws.readyState !== 1)) ws.terminate();
+  if (!(!ws || !ws.readyState || ws.readyState !== 1)) {
+    ws.terminate();
+  }
   statusTrigger.get_status((_err, status) => {
     gettingStatus = false;
     // Create websocket
     ws = new WebSocket(`${protocol}://${url}`, options);
     ws.on('open', () => {
       logger.debug('ws.open: connection established');
       // successful connect: reset reconnect attempts
-      reconnectAttempts = 0;
       if (reconnectTimerId) {
         clearTimeout(reconnectTimerId);
         reconnectTimerId = null;
@@ -926,7 +923,6 @@ exports.load = (cb) => {
 exports.unload = (cb) => {
   logger.debug('exports.unload: shutting down websocket module');
   clearAndResetIntervals(true);
-  exports.re_schedule = false;
   if (ws) ws.terminate();
   clearTimeout(pingTimeout);
   hooks.remove('connected');

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "prey",
-  "version": "1.13.23",
+  "version": "1.13.24",
   "author": "Engineering <[email protected]>",
   "keywords": [
     "prey",