Limit to one connection, other corrections, touch #456.

lib/server/server.js

@@ -23,7 +23,7 @@ import multer from 'multer';
 
 import errorHandler from './error.js';
 import rateLimit from './rate_limit.js';
-import webSocket from './web_socket.js';
+import { init as webSocketInit } from './web_socket.js';
 import { log, logWithStack } from '../logger.js';
 import { __dirname } from '../utils.js';
 
@@ -118,8 +118,10 @@ export const startServer = async (serverConfig) => {
           `[server] Started HTTP server on ${serverConfig.host}:${serverConfig.port}.`
         );
 
-        // Start a WebSocket connection
-        webSocket.init({ ...httpServer.address(), protocol: 'http' });
+        if (activeServers.size === 1) {
+          // Start a WebSocket connection
+          webSocketInit({ ...httpServer.address(), protocol: 'http' });
+        }
       });
     }
 
@@ -164,8 +166,10 @@ export const startServer = async (serverConfig) => {
             `[server] Started HTTPS server on ${serverConfig.host}:${serverConfig.ssl.port}.`
           );
 
-          // Start a WebSocket connection
-          webSocket.init({ ...httpsServer.address(), protocol: 'https' });
+          if (activeServers.size === 1) {
+            // Start a WebSocket connection
+            webSocketInit({ ...httpsServer.address(), protocol: 'https' });
+          }
         });
       }
     }

lib/server/web_socket.js

@@ -31,7 +31,7 @@ const webSocketClients = new Map();
  * @param {object} address - Object that contains, address and port of enabled
  * HTTP or HTTPS server.
  */
-function init(address) {
+export function init(address) {
   webSocketOptions = getOptions().webSocket;
   if (webSocketOptions.enable === true) {
     // Options for the WebSocket connection
@@ -55,7 +55,7 @@ function init(address) {
     // Options for the WebSocket client
     const clientOptions = {
       id: uuid(),
-      reconnect: false,
+      reconnect: webSocketOptions.reconnect,
       reconnectTry: 0,
       reconnectInterval: null,
       pingTimeout: null
@@ -156,9 +156,6 @@ function connect(webSocketUrl, connectionOptions, clientOptions) {
         reconnect(webSocketUrl, connectionOptions, clientOptions);
       }
     }, webSocketOptions.pingTimeout);
-
-    // Register timeout for the later clearing
-    addTimer(clientOptions.pingTimeout);
   });
 }
 

package.json

@@ -66,7 +66,7 @@
     "eslint-plugin-prettier": "^5.1.3",
     "husky": "^9.0.11",
     "jest": "^29.7.0",
-    "lint-staged": "^15.2.6",
+    "lint-staged": "^15.2.7",
     "nodemon": "^3.1.3",
     "prettier": "^3.3.2",
     "rollup": "^4.18.0"