node-red-contrib-mobius-flow-base 3.1.2 → 3.1.4-beta.1

package/dist/engine-api-calls.js

@@ -110,7 +110,7 @@ class EngineApiCalls {
             });
         }
         catch (err) {
-            throw `Failed to send broadcast command: ${err.code}, ${err.message ? err.message : ''}`;
+            throw `Failed to send broadcast command: ${err.code ? err.code : 'Unknown'}, ${err.message ? err.message : ''}`;
         }
     };
     sendDirectCommand = async (uri, cid, commandData, timeout, callback) => {

package/dist/engine-api-client.d.ts

@@ -1,6 +1,6 @@
-import { AxiosInstance } from 'axios';
-import { EngineWebSocket } from './engine-websocket';
-import { EngineApiCalls } from './engine-api-calls';
+import { AxiosInstance } from "axios";
+import { EngineWebSocket } from "./engine-websocket";
+import { EngineApiCalls } from "./engine-api-calls";
 export declare class EngineApiClient extends EngineApiCalls {
     private reloginInterval;
     client: AxiosInstance | null;
@@ -15,7 +15,8 @@ export declare class EngineApiClient extends EngineApiCalls {
     EngineWebSocket: EngineWebSocket;
     private hostname;
     private protocol;
-    constructor(protocol: 'http' | 'https', host: string, username: string, password: string);
+    private clientID;
+    constructor(protocol: "http" | "https", host: string, username: string, password: string);
     private login;
     private refresh;
     close: () => void;

package/dist/engine-api-client.js

@@ -7,6 +7,7 @@ exports.EngineApiClient = void 0;
 const axios_1 = __importDefault(require("axios"));
 const engine_websocket_1 = require("./engine-websocket");
 const engine_api_calls_1 = require("./engine-api-calls");
+const crypto_1 = __importDefault(require("crypto"));
 // new class
 class EngineApiClient extends engine_api_calls_1.EngineApiCalls {
     reloginInterval = null;
@@ -19,17 +20,19 @@ class EngineApiClient extends engine_api_calls_1.EngineApiCalls {
     EngineWebSocket;
     hostname;
     protocol;
+    clientID;
     constructor(protocol, host, username, password) {
         super();
         this.username = username;
         this.password = password;
         this.hostname = host;
         this.protocol = protocol;
+        this.clientID = crypto_1.default.randomBytes(16).toString("hex");
         const baseURL = `${this.protocol}://${this.hostname}/api/v1`;
         this.client = axios_1.default.create({
             baseURL: baseURL,
             headers: {
-                'Content-Type': 'application/json',
+                "Content-Type": "application/json",
             },
         });
         this.setApiClient(this.client);
@@ -42,15 +45,15 @@ class EngineApiClient extends engine_api_calls_1.EngineApiCalls {
             this.login();
         }
         else {
-            console.log('No username, password, host, or port provided. Not attempting to login to Mobius Engine API.');
+            console.log("No username, password, host, or port provided. Not attempting to login to Mobius Engine API.");
             clearInterval(this.reloginInterval);
             this.reloginInterval = null;
         }
         // Add auth headers to all axios calls
         this.client.interceptors.request.use((config) => {
-            if (!config.url?.endsWith('/auth/login')) {
+            if (!config.url?.endsWith("/auth/login")) {
                 if (this.tokens && config.headers) {
-                    config.headers['Authorization'] = `Bearer ${this.tokens.token}`;
+                    config.headers["Authorization"] = `Bearer ${this.tokens.token}`;
                 }
             }
             return config;
@@ -63,7 +66,7 @@ class EngineApiClient extends engine_api_calls_1.EngineApiCalls {
             if (!error.response) {
                 // notify
             }
-            if (!error.config.url?.endsWith('/auth/login')) {
+            if (!error.config.url?.endsWith("/auth/login")) {
                 console.log(`(${this.hostname}) -> Logged Out: ${error.response}`);
                 clearInterval(this.refreshLoop);
                 this.loggedIn = false;
@@ -76,11 +79,11 @@ class EngineApiClient extends engine_api_calls_1.EngineApiCalls {
         this.EngineWebSocket = new engine_websocket_1.EngineWebSocket(this.hostname, this.protocol);
     }
     login = async () => {
-        console.log(`(${this.hostname}) -> Attempting Mobius Engine API Login`);
+        console.log(`(${this.hostname}) -> Attempting Mobius Engine API Login => ${this.clientID}`);
         try {
             const response = await this.client({
-                method: 'post',
-                url: '/auth/login',
+                method: "post",
+                url: "/auth/login",
                 data: {
                     username: this.username,
                     password: this.password,
@@ -106,8 +109,8 @@ class EngineApiClient extends engine_api_calls_1.EngineApiCalls {
         }
         try {
             const response = await this.client({
-                method: 'post',
-                url: '/auth/refresh',
+                method: "post",
+                url: "/auth/refresh",
                 data: {
                     refreshToken: this.tokens.refreshToken,
                 },

package/dist/engine-websocket.js

@@ -34,10 +34,10 @@ class EngineWebSocket extends stream_1.EventEmitter {
             console.log(`(${this.hostname}) -> Engine API Subscription WebSocket Client Connected`);
             this.pingInterval = setInterval(this.sendPingMessage, 30000);
             clearInterval(this.reconnectInterval);
-            this.webSocket?.send(JSON.stringify({
+            this.sendWebSocketMessage({
                 topic: 'authorize',
                 payload: `Bearer ${this.authToken}`,
-            }));
+            });
             this.pendingWebSocketMessageInterval = setInterval(() => {
                 for (let i = 0; i < this.pendingWebSocketMessages.length; i++) {
                     const pendingMessage = this.pendingWebSocketMessages.shift();
@@ -84,7 +84,12 @@ class EngineWebSocket extends stream_1.EventEmitter {
     };
     sendWebSocketMessage = (message) => {
         if (this.webSocket?.readyState === ws_1.default.OPEN) {
-            this.webSocket.send(JSON.stringify(message));
+            try {
+                this.webSocket.send(JSON.stringify(message));
+            }
+            catch {
+                console.log(`(${this.hostname}) -> Error sending WS message`);
+            }
         }
         else {
             this.pendingWebSocketMessages.push(message);

package/dist/node-red-ui-funcs.js

@@ -199,9 +199,9 @@ module.exports = {
       }
       return services;
     } catch (err) {
-      throw `Error getting service list for Flows UI: ${err.code}, ${
-        err.message ? err.message : ''
-      }`;
+      throw `Error getting service list for Flows UI: ${
+        err.code ? err.code : 'Unknown'
+      }, ${err.message ? err.message : ''}`;
     }
   },
 
@@ -227,9 +227,9 @@ module.exports = {
       }
       return objectList;
     } catch (err) {
-      throw `Error getting object list for Flows UI: ${err.code}, ${
-        err.message ? err.message : ''
-      }`;
+      throw `Error getting object list for Flows UI: ${
+        err.code ? err.code : 'Unknown'
+      }, ${err.message ? err.message : ''}`;
     }
   },
 
@@ -287,9 +287,9 @@ module.exports = {
       }
       return formattedObjectList;
     } catch (err) {
-      throw `Error getting config objects list for Flows UI: ${err.code}, ${
-        err.message ? err.message : ''
-      }`;
+      throw `Error getting config objects list for Flows UI: ${
+        err.code ? err.code : 'Unknown'
+      }, ${err.message ? err.message : ''}`;
     }
   },
 

package/dist/nodes/mobius-change-admin-password.js

@@ -61,9 +61,9 @@ module.exports = function (RED) {
                             node.status({
                                 fill: 'yellow',
                                 shape: 'dot',
-                                text: 'Error: ' + JSON.stringify(err.code),
+                                text: `Error: ${err.code ? err.code : 'Unknown'}`,
                             });
-                            node.error(`Mobius error setting admin password: ${err.code}, ${err.message ? err.message : ''}`);
+                            node.error(`Mobius error setting admin password: ${err.code ? err.code : 'Unknown'}, ${err.message ? err.message : ''}`);
                         }
                         else {
                             node.status({

package/dist/nodes/mobius-clear-resource.js

@@ -67,12 +67,12 @@ module.exports = function (RED) {
               node.status({
                 fill: 'yellow',
                 shape: 'dot',
-                text: 'Error: ' + JSON.stringify(err.code),
+                text: `Error: ${err.code ? err.code : 'Unknown'}`,
               });
               node.error(
-                `Mobius error clearing resource priority: ${err.code}, ${
-                  err.message ? err.message : ''
-                }`
+                `Mobius error clearing resource priority: ${
+                  err.code ? err.code : 'Unknown'
+                }, ${err.message ? err.message : ''}`
               );
               if (node.detailedOutput === true) {
                 node.send([

package/dist/nodes/mobius-connection.js

@@ -108,7 +108,7 @@ module.exports = function (RED) {
       this.apiClient.getHubId((err, hubId) => {
         if (err) {
           node.error(
-            `Mobius error getting hub ID: ${err.code}, ${
+            `Mobius error getting hub ID: ${err.code ? err.code : 'Unknown'}, ${
               err.message ? err.message : ''
             }`
           );
@@ -117,9 +117,9 @@ module.exports = function (RED) {
           this.apiClient.discover(node.hubId, (err, response) => {
             if (err) {
               node.error(
-                `Mobius error discovering service list: ${err.code}, ${
-                  err.message ? err.message : ''
-                }`
+                `Mobius error discovering service list: ${
+                  err.code ? err.code : 'Unknown'
+                }, ${err.message ? err.message : ''}`
               );
             } else {
               node.serviceList = response.data;
@@ -807,9 +807,9 @@ module.exports = function (RED) {
           })
           .catch((err) => {
             RED.log.warn(
-              `Get objects failed on service ${req.query.sid}: ${err.code}, ${
-                err.message ? err.message : ''
-              }`
+              `Get objects failed on service ${req.query.sid}: ${
+                err.code ? err.code : 'Unknown'
+              }, ${err.message ? err.message : ''}`
             );
           });
       }

package/dist/nodes/mobius-discover.js

@@ -60,7 +60,10 @@ module.exports = function (RED) {
           });
 
           let parameters = {};
-          if (msg.payload.hasOwnProperty('rid') && msg.payload.hasOwnProperty('func')) {
+          if (
+            msg.payload.hasOwnProperty('rid') &&
+            msg.payload.hasOwnProperty('func')
+          ) {
             parameters = msg.payload;
             parameters['uri'] = path;
           } else {
@@ -71,16 +74,24 @@ module.exports = function (RED) {
               node.status({
                 fill: 'yellow',
                 shape: 'dot',
-                text: 'Error: ' + JSON.stringify(err.code),
+                text: `Error: ${err.code ? err.code : 'Unknown'}`,
+              });
+              node.send({
+                ...msg,
+                topic: path,
+                payload: { error: true, response: err },
               });
-              node.send({ ...msg, topic: path, payload: { error: true, response: err } });
             } else {
               node.status({
                 fill: 'green',
                 shape: 'dot',
                 text: JSON.stringify(response.uri),
               });
-              node.send({ ...msg, topic: path, payload: { error: false, response: response } });
+              node.send({
+                ...msg,
+                topic: path,
+                payload: { error: false, response: response },
+              });
             }
           });
         }

package/dist/nodes/mobius-filter-by-rid-value.js

@@ -54,7 +54,10 @@ module.exports = function (RED) {
         let rid = node.rid;
         let limit = node.limit;
         let func = node.func;
-        if (msg.hasOwnProperty('topic') && require('./validateURI')(msg.topic, 2)) {
+        if (
+          msg.hasOwnProperty('topic') &&
+          require('./validateURI')(msg.topic, 2)
+        ) {
           uri = msg.topic;
         }
         if (msg.hasOwnProperty('payload')) {
@@ -88,10 +91,17 @@ module.exports = function (RED) {
               node.status({
                 fill: 'yellow',
                 shape: 'dot',
-                text: 'Error: ' + JSON.stringify(err.code),
+                text: `Error: ${err.code ? err.code : 'Unknown'}`,
               });
               if (node.detailedOutput === true) {
-                node.send([null, { ...msg, topic: uri, payload: { error: true, response: err } }]);
+                node.send([
+                  null,
+                  {
+                    ...msg,
+                    topic: uri,
+                    payload: { error: true, response: err },
+                  },
+                ]);
               }
             } else {
               node.status({
@@ -101,12 +111,18 @@ module.exports = function (RED) {
               });
               let uriList = [];
               for (let lp = 0; lp < response.value.length; lp++) {
-                uriList.push(`${response.uri}/${response.value[lp].pid}/${response.value[lp].ins}`);
+                uriList.push(
+                  `${response.uri}/${response.value[lp].pid}/${response.value[lp].ins}`
+                );
               }
               if (node.detailedOutput === true) {
                 node.send([
                   { ...msg, topic: uri, payload: uriList },
-                  { ...msg, topic: uri, payload: { error: false, response: response } },
+                  {
+                    ...msg,
+                    topic: uri,
+                    payload: { error: false, response: response },
+                  },
                 ]);
               } else {
                 node.send({ ...msg, topic: uri, payload: uriList });

package/dist/nodes/mobius-get-multi-object.js

@@ -79,12 +79,12 @@ module.exports = function (RED) {
             node.status({
               fill: 'yellow',
               shape: 'dot',
-              text: 'Error: ' + JSON.stringify(err.code),
+              text: `Error: ${err.code ? err.code : 'Unknown'}`,
             });
             node.error(
-              `Mobius error reading object: ${err.code}, ${
-                err.message ? err.message : ''
-              }`
+              `Mobius error reading object: ${
+                err.code ? err.code : 'Unknown'
+              }, ${err.message ? err.message : ''}`
             );
           })
           .finally(() => {

package/dist/nodes/mobius-get-multi-resource.js

@@ -88,12 +88,12 @@ module.exports = function (RED) {
             node.status({
               fill: 'yellow',
               shape: 'dot',
-              text: 'Error: ' + JSON.stringify(err.code),
+              text: `Error: ${err.code ? err.code : 'Unknown'}`,
             });
             node.error(
-              `Mobius error reading resource: ${err.code}, ${
-                err.message ? err.message : ''
-              }`
+              `Mobius error reading resource: ${
+                err.code ? err.code : 'Unknown'
+              }, ${err.message ? err.message : ''}`
             );
           })
           .finally(() => {

package/dist/nodes/mobius-get-object.js

@@ -64,12 +64,12 @@ module.exports = function (RED) {
             node.status({
               fill: 'yellow',
               shape: 'dot',
-              text: 'Error: ' + JSON.stringify(err.code),
+              text: `Error: ${err.code ? err.code : 'Unknown'}`,
             });
             node.error(
-              `Mobius error reading object: ${err.code}, ${
-                err.message ? err.message : ''
-              }`
+              `Mobius error reading object: ${
+                err.code ? err.code : 'Unknown'
+              }, ${err.message ? err.message : ''}`
             );
             if (node.detailedOutput === true) {
               node.send([

package/dist/nodes/mobius-get-resource.js

@@ -61,12 +61,12 @@ module.exports = function (RED) {
             node.status({
               fill: 'yellow',
               shape: 'dot',
-              text: 'Error: ' + JSON.stringify(err.code),
+              text: `Error: ${err.code ? err.code : 'Unknown'}`,
             });
             node.error(
-              `Mobius error reading resource : ${err.code}, ${
-                err.message ? err.message : ''
-              }`
+              `Mobius error reading resource : ${
+                err.code ? err.code : 'Unknown'
+              }, ${err.message ? err.message : ''}`
             );
             if (node.detailedOutput === true) {
               node.send([

package/dist/nodes/mobius-send-dcmd.js

@@ -55,12 +55,12 @@ module.exports = function (RED) {
                 node.status({
                   fill: 'yellow',
                   shape: 'dot',
-                  text: 'Error: ' + JSON.stringify(err.code),
+                  text: `Error: ${err.code ? err.code : 'Unknown'}`,
                 });
                 node.error(
-                  `Mobius error sending DCMD command: ${err.code}, ${
-                    err.message ? err.message : ''
-                  }`
+                  `Mobius error sending DCMD command: ${
+                    err.code ? err.code : 'Unknown'
+                  }, ${err.message ? err.message : ''}`
                 );
                 node.send([
                   null,

package/dist/nodes/mobius-set-multi-resource.js

@@ -69,12 +69,12 @@ module.exports = function (RED) {
                 node.status({
                   fill: 'yellow',
                   shape: 'dot',
-                  text: 'Error: ' + JSON.stringify(err.code),
+                  text: `Error: ${err.code ? err.code : 'Unknown'}`,
                 });
                 node.error(
-                  `Mobius error writing multiple resources: ${err.code}, ${
-                    err.message ? err.message : ''
-                  }`
+                  `Mobius error writing multiple resources: ${
+                    err.code ? err.code : 'Unknown'
+                  }, ${err.message ? err.message : ''}`
                 );
                 if (node.detailedOutput === true) {
                   node.send([

package/dist/nodes/mobius-set-resource.js

@@ -75,12 +75,12 @@ module.exports = function (RED) {
                   node.status({
                     fill: 'yellow',
                     shape: 'dot',
-                    text: 'Error: ' + JSON.stringify(err.code),
+                    text: `Error: ${err.code ? err.code : 'Unknown'}`,
                   });
                   node.error(
-                    `Mobius error clearing resource priority: ${err.code}, ${
-                      err.message ? err.message : ''
-                    }`
+                    `Mobius error clearing resource priority: ${
+                      err.code ? err.code : 'Unknown'
+                    }, ${err.message ? err.message : ''}`
                   );
                   if (node.detailedOutput === true) {
                     node.send([
@@ -144,12 +144,12 @@ module.exports = function (RED) {
                   node.status({
                     fill: 'yellow',
                     shape: 'dot',
-                    text: 'Error: ' + JSON.stringify(err.code),
+                    text: `Error: ${err.code ? err.code : 'Unknown'}`,
                   });
                   node.error(
-                    `Mobius error writing resource: ${err.code}, ${
-                      err.message ? err.message : ''
-                    }`
+                    `Mobius error writing resource: ${
+                      err.code ? err.code : 'Unknown'
+                    }, ${err.message ? err.message : ''}`
                   );
                   node.send([
                     null,

package/package.json

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