node-red-contrib-mobius-flow-base 3.4.0-beta.2 → 3.5.2

package/.github/workflows/build_publish.yml

@@ -41,13 +41,7 @@ jobs:
         run: |
           npm install -g yarn
           yarn install
-          tsc && mkdir -p dist/nodes
-          cp src/nodes/*.js dist/nodes/
-          cp src/nodes/*.html dist/nodes/
-          cp -r src/nodes/icons dist/nodes/
-          mkdir -p dist/nodes/common
-          cp src/mobsearch.js dist/nodes/common/
-          cp src/node-red-ui-funcs.js dist/
+          yarn build
         env:
           GH_PKG_READ_TOKEN: ${{ secrets.GH_PKG_READ_TOKEN }}
 

package/dist/engine-api-client.js

@@ -80,6 +80,11 @@ class EngineApiClient extends engine_api_calls_1.EngineApiCalls {
             this.tokens = response.data;
             this.loggedIn = true;
             console.log(`(${this.hostname}) -> Logged in to Mobius Engine API`);
+            // Clear any previous refresh loop so repeated logins don't stack intervals
+            if (this.refreshLoop) {
+                clearInterval(this.refreshLoop);
+                this.refreshLoop = null;
+            }
             this.refreshLoop = setInterval(this.refresh, 1000 * 60 * 5);
             this.EngineWebSocket.connectToWebSocket(this.tokens.token);
         }

package/dist/engine-websocket.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { EventEmitter } from "stream";
 type WebSocketTopics = "authorize" | "subscribe" | "unsubscribe" | "connected" | "authorized" | "object-cov" | "resource-cov" | "service-status" | "broadcast-command" | "error" | "ping" | "pong";
 interface EngineWebSocketInterface {
@@ -27,6 +28,8 @@ export declare class EngineWebSocket extends EventEmitter implements EngineWebSo
     constructor(hostname: string, protocol: "http" | "https");
     connectToWebSocket: (token: string) => void;
     private sendWebSocketMessage;
+    private clearTimers;
+    private teardownSocket;
     private sendPingMessage;
     registerCallback: (topic: WebSocketTopics, callback: Function) => void;
     clearAllCallbacks: () => void;

package/dist/engine-websocket.js

@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EngineWebSocket = void 0;
 const stream_1 = require("stream");
 const ws_1 = __importDefault(require("ws"));
+const maxPendingWebSocketMessages = 1000;
 class EngineWebSocket extends stream_1.EventEmitter {
-    webSocket;
+    webSocket = null;
     pendingWebSocketMessages = [];
     pendingWebSocketMessageInterval = null;
     pingInterval = null;
@@ -24,16 +25,23 @@ class EngineWebSocket extends stream_1.EventEmitter {
     }
     connectToWebSocket = (token) => {
         this.authToken = token;
+        // Tear down any previous socket and timers so repeated logins/reconnects
+        // cannot accumulate sockets, ping intervals or reconnect intervals
+        this.teardownSocket();
         let webSocketProtocol = "wss";
         if (this.protocol === "http") {
             webSocketProtocol = "ws";
         }
-        this.webSocket = new ws_1.default(`${webSocketProtocol}://${this.hostname}/api/engine/v1/mobius/subscribe/connect`);
-        this.webSocket.onopen = () => {
+        const ws = new ws_1.default(`${webSocketProtocol}://${this.hostname}/api/engine/v1/mobius/subscribe/connect`);
+        this.webSocket = ws;
+        ws.onopen = () => {
+            if (this.webSocket !== ws) {
+                return;
+            }
             this.attemptReconnect = true;
             console.log(`(${this.hostname}) -> Engine API Subscription WebSocket Client Connected`);
+            this.clearTimers();
             this.pingInterval = setInterval(this.sendPingMessage, 30000);
-            clearInterval(this.reconnectInterval);
             this.sendWebSocketMessage({
                 topic: "authorize",
                 payload: `Bearer ${this.authToken}`,
@@ -45,16 +53,14 @@ class EngineWebSocket extends stream_1.EventEmitter {
                 }
             }, 1000);
         };
-        this.webSocket.onclose = () => {
-            console.log(`(${this.hostname}) -> Engine API Subscription WebSocket Client Closed`);
-            if (this.pingInterval) {
-                clearInterval(this.pingInterval);
+        ws.onclose = () => {
+            if (this.webSocket !== ws) {
+                // A newer socket has replaced this one; don't touch current state
+                return;
             }
+            console.log(`(${this.hostname}) -> Engine API Subscription WebSocket Client Closed`);
             this.webSocket = null;
-            clearInterval(this.reconnectInterval);
-            if (this.pendingWebSocketMessageInterval) {
-                clearInterval(this.pendingWebSocketMessageInterval);
-            }
+            this.clearTimers();
             if (this.attemptReconnect) {
                 this.reconnectInterval = setInterval(() => {
                     this.reconnect();
@@ -62,7 +68,10 @@ class EngineWebSocket extends stream_1.EventEmitter {
             }
             this.emit("disconnected");
         };
-        this.webSocket.onmessage = (message) => {
+        ws.onmessage = (message) => {
+            if (this.webSocket !== ws) {
+                return;
+            }
             try {
                 if (message.data) {
                     const parsedMessage = JSON.parse(message.data);
@@ -73,7 +82,7 @@ class EngineWebSocket extends stream_1.EventEmitter {
                 console.log(`(${this.hostname}) -> Error parsing message: ${e.code}, ${e.message ? e.message : ""}`);
             }
         };
-        this.webSocket.on("error", (e) => {
+        ws.on("error", (e) => {
             if (e.code === "ECONNREFUSED") {
                 this.emit("disconnected");
             }
@@ -93,6 +102,42 @@ class EngineWebSocket extends stream_1.EventEmitter {
         }
         else {
             this.pendingWebSocketMessages.push(message);
+            if (this.pendingWebSocketMessages.length > maxPendingWebSocketMessages) {
+                this.pendingWebSocketMessages.shift();
+            }
+        }
+    };
+    clearTimers = () => {
+        if (this.pingInterval) {
+            clearInterval(this.pingInterval);
+            this.pingInterval = null;
+        }
+        if (this.pendingWebSocketMessageInterval) {
+            clearInterval(this.pendingWebSocketMessageInterval);
+            this.pendingWebSocketMessageInterval = null;
+        }
+        if (this.reconnectInterval) {
+            clearInterval(this.reconnectInterval);
+            this.reconnectInterval = null;
+        }
+    };
+    teardownSocket = () => {
+        this.clearTimers();
+        const oldSocket = this.webSocket;
+        this.webSocket = null;
+        if (oldSocket) {
+            oldSocket.onopen = null;
+            oldSocket.onclose = null;
+            oldSocket.onmessage = null;
+            oldSocket.removeAllListeners();
+            // Swallow errors from the discarded socket so they can't crash the process
+            oldSocket.on("error", () => { });
+            try {
+                oldSocket.terminate();
+            }
+            catch {
+                // socket already closed
+            }
         }
     };
     sendPingMessage = () => {
@@ -136,14 +181,10 @@ class EngineWebSocket extends stream_1.EventEmitter {
     };
     killWebSocket = () => {
         this.attemptReconnect = false;
-        if (this.reconnectInterval) {
-            clearInterval(this.reconnectInterval);
-        }
         this.registeredCallbacks = [];
         this.pendingWebSocketMessages = [];
-        if (this.webSocket) {
-            this.webSocket.close();
-        }
+        this.teardownSocket();
+        this.emit("disconnected");
         console.log(`(${this.hostname}) -> Killing Engine API Subscription WebSocket Client`);
     };
     disconnectFromWebSocket = () => {

package/dist/nodes/mobius-connection.html

@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
     <input class="input-append-left" type="text" id="node-config-input-host" placeholder="e.g. localhost" style="width: 70%;" >
   </div>
   <p style="text-align:center"> Ensure port number is included in host path if required</p>
-  <p style="text-align:center"> e.g. <b>myHostname:8443</b></p>
+  <p style="text-align:center"> e.g. <b>myHostname:8442</b></p>
   <hr>
   <div class="form-row">
     <label for="node-config-input-username"><i class="fa fa-user"></i> Username</label>
@@ -49,25 +49,25 @@ POSSIBILITY OF SUCH DAMAGE.
 </script>
 
 <script type="text/javascript">
-  hostLabel = 'test';
-  RED.nodes.registerType('mobius connection', {
-    category: 'config',
+  hostLabel = "test";
+  RED.nodes.registerType("mobius connection", {
+    category: "config",
     defaults: {
-      host: { required: true, value: 'mobius:8443' },
-      username: { required: true, value: '' },
-      password: { required: true, value: '' },
+      host: { required: true, value: "mobius:8442" },
+      username: { required: true, value: "" },
+      password: { required: true, value: "" },
       secure: { required: true, value: false },
     },
     label: function () {
       return `${this.host}`;
     },
     oneditprepare: function () {
-      $('#node-config-input-secure').change(function () {
-        let secure = $('#node-config-input-secure').is(':checked');
+      $("#node-config-input-secure").change(function () {
+        let secure = $("#node-config-input-secure").is(":checked");
         if (secure) {
-          document.getElementById('hostLabel').innerHTML = 'https://';
+          document.getElementById("hostLabel").innerHTML = "https://";
         } else {
-          document.getElementById('hostLabel').innerHTML = 'http://';
+          document.getElementById("hostLabel").innerHTML = "http://";
         }
       });
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-mobius-flow-base",
-  "version": "3.4.0-beta.2",
+  "version": "3.5.2",
   "description": "Node-RED base nodes for Mobius Flow",
   "main": "index.js",
   "types": "dist/index.d.ts",