node-red-contrib-mobius-flow-base 3.1.0 → 3.1.2

package/dist/engine-api-calls.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EngineApiCalls = void 0;
 class EngineApiCalls {
     apiClient = null;
-    constructor() {
-    }
+    constructor() { }
     setApiClient = (apiClient) => {
         this.apiClient = apiClient;
     };
@@ -111,7 +110,7 @@ class EngineApiCalls {
             });
         }
         catch (err) {
-            throw `Failed to send broadcast command: ${JSON.stringify(err)}`;
+            throw `Failed to send broadcast command: ${err.code}, ${err.message ? err.message : ''}`;
         }
     };
     sendDirectCommand = async (uri, cid, commandData, timeout, callback) => {
@@ -194,10 +193,18 @@ class EngineApiCalls {
                     objects.push(object.data.data);
                 }
                 if (objects.length >= limit) {
-                    return callback(null, { uri, ts: new Date().toISOString(), value: objects });
+                    return callback(null, {
+                        uri,
+                        ts: new Date().toISOString(),
+                        value: objects,
+                    });
                 }
             }
-            return callback(null, { uri, ts: new Date().toISOString(), value: objects });
+            return callback(null, {
+                uri,
+                ts: new Date().toISOString(),
+                value: objects,
+            });
         }
         catch (err) {
             callback(err);

package/dist/engine-websocket.js

@@ -70,7 +70,7 @@ class EngineWebSocket extends stream_1.EventEmitter {
                 }
             }
             catch (e) {
-                console.log(`(${this.hostname}) -> Error parsing message `, e);
+                console.log(`(${this.hostname}) -> Error parsing message: ${e.code}, ${e.message ? e.message : ''}`);
             }
         };
         this.webSocket.on('error', (e) => {
@@ -78,7 +78,7 @@ class EngineWebSocket extends stream_1.EventEmitter {
                 this.emit('disconnected');
             }
             else {
-                console.error(`(${this.hostname}) -> Engine API Subscription WebSocket Client Error: `, e);
+                console.error(`(${this.hostname}) -> Engine API Subscription WebSocket Client Error: ${e.code}, ${e.message ? e.message : ''}`);
             }
         });
     };
@@ -114,7 +114,9 @@ class EngineWebSocket extends stream_1.EventEmitter {
             .filter((cb) => cb.topic === message.topic)
             .map((cb) => cb.callback);
         if (!message.payload.timestamp) {
-            message.payload.timestamp = message.timestamp ? message.timestamp : new Date().toISOString();
+            message.payload.timestamp = message.timestamp
+                ? message.timestamp
+                : new Date().toISOString();
         }
         callbacks.forEach((cb) => cb(message.payload));
     };

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

@@ -30,9 +30,8 @@ const _ = require('lodash');
 const excludedSpids = ['0004', '0012'];
 
 module.exports = {
-
   // Promisified version of discover
-  discover (connection, uri) {
+  discover(connection, uri) {
     return new Promise((resolve, reject) => {
       connection.discover(uri, (err, response) => {
         if (err) {
@@ -45,7 +44,7 @@ module.exports = {
   },
 
   // Promisified version of getServiceConfig
-  getNodeConfig (connection, hid) {
+  getNodeConfig(connection, hid) {
     return new Promise((resolve, reject) => {
       connection.getNodeConfig(hid, (err, response) => {
         if (!err) {
@@ -58,7 +57,7 @@ module.exports = {
   },
 
   // Promisified version of getServiceConfig
-  getServiceConfig (connection, hid, sid) {
+  getServiceConfig(connection, hid, sid) {
     return new Promise((resolve, reject) => {
       connection.getServiceConfig(hid, sid, (err, response) => {
         if (!err) {
@@ -71,7 +70,7 @@ module.exports = {
   },
 
   // Promisified version of getNodeConfigTree
-  getNodeConfigTree (connection, hid) {
+  getNodeConfigTree(connection, hid) {
     return new Promise((resolve, reject) => {
       connection.getNodeConfigTree(hid, (err, response) => {
         if (!err) {
@@ -84,7 +83,7 @@ module.exports = {
   },
 
   // Promisified version of getProfileByPid
-  getProfileByPid (connection, hid, pid) {
+  getProfileByPid(connection, hid, pid) {
     return new Promise((resolve, reject) => {
       connection.getProfileByPid(hid, pid, (err, response) => {
         if (!err) {
@@ -97,7 +96,7 @@ module.exports = {
   },
 
   // Promisified version of getAllObjectProfiles
-  getAllObjectProfiles (connection, hid) {
+  getAllObjectProfiles(connection, hid) {
     return new Promise((resolve, reject) => {
       connection.getAllObjectProfiles(hid, (err, response) => {
         if (!err) {
@@ -110,7 +109,7 @@ module.exports = {
   },
 
   // Discover object by By PID
-  async discoverDevicesByPID (RED, connection, hid, spids, pid) {
+  async discoverDevicesByPID(RED, connection, hid, spids, pid) {
     let devices = [];
     if (!hid || hid === '') {
       hid = connection.service.hubId;
@@ -123,12 +122,19 @@ module.exports = {
       throw new Error(`Discover devices failed (${hid}) - ${err.message}`);
     }
     for (let srvcLoop = 0; srvcLoop < services.data.length; srvcLoop++) {
-      if (services.data[srvcLoop].status === 'online' && (spids.length === 0 || spids.includes(services.data[srvcLoop].spid))) {
-        let insURI = `${hid}/${services.data[srvcLoop].id.split('/')[1]}/${pid}`;
+      if (
+        services.data[srvcLoop].status === 'online' &&
+        (spids.length === 0 || spids.includes(services.data[srvcLoop].spid))
+      ) {
+        let insURI = `${hid}/${
+          services.data[srvcLoop].id.split('/')[1]
+        }/${pid}`;
         try {
           let instances = await this.discover(connection, insURI);
           for (let insLoop = 0; insLoop < instances.data.length; insLoop++) {
-            let deviceURI = `${hid}/${services.data[srvcLoop].id.split('/')[1]}/${pid}/${instances.data[insLoop]}`;
+            let deviceURI = `${hid}/${
+              services.data[srvcLoop].id.split('/')[1]
+            }/${pid}/${instances.data[insLoop]}`;
             let device = await this.discover(connection, deviceURI);
             let resourcesByName = _.keyBy(device.data[0].resources, 'name');
             let deviceName = resourcesByName['name'].pv;
@@ -147,7 +153,7 @@ module.exports = {
   },
 
   // Discover services by SPID
-  async discoverServicesBySPID (RED, connection, hid, spid) {
+  async discoverServicesBySPID(RED, connection, hid, spid) {
     if (!hid || hid === '') {
       hid = connection.service.hubId;
     }
@@ -160,7 +166,10 @@ module.exports = {
     }
     let srvcs = [];
     for (let srvcLoop = 0; srvcLoop < services.data.length; srvcLoop++) {
-      if (services.data[srvcLoop].status === 'online' && services.data[srvcLoop].spid === spid) {
+      if (
+        services.data[srvcLoop].status === 'online' &&
+        services.data[srvcLoop].spid === spid
+      ) {
         srvcs.push(`${hid}/${services.data[srvcLoop].id.split('/')[1]}`);
       }
     }
@@ -190,7 +199,9 @@ module.exports = {
       }
       return services;
     } catch (err) {
-      throw JSON.stringify(err);
+      throw `Error getting service list for Flows UI: ${err.code}, ${
+        err.message ? err.message : ''
+      }`;
     }
   },
 
@@ -201,7 +212,10 @@ module.exports = {
       const serviceResponse = await this.discover(connection, `${hid}/${sid}`);
       const pids = [...new Set(serviceResponse.data)];
       for (let i = 0; i < pids.length; i++) {
-        const inssResponse = await this.discover(connection, `${hid}/${sid}/${pids[i]}`);
+        const inssResponse = await this.discover(
+          connection,
+          `${hid}/${sid}/${pids[i]}`
+        );
         const inss = inssResponse.data;
         for (let j = 0; j < inss.length; j++) {
           const objResponse = await this.discover(
@@ -213,7 +227,9 @@ module.exports = {
       }
       return objectList;
     } catch (err) {
-      throw JSON.stringify(err);
+      throw `Error getting object list for Flows UI: ${err.code}, ${
+        err.message ? err.message : ''
+      }`;
     }
   },
 
@@ -221,15 +237,24 @@ module.exports = {
     try {
       let objectList = [];
       const configTreeResponse = await this.getNodeConfigTree(connection, hid);
-      const service = configTreeResponse.data.find((service) => service.sid === sid);
+      const service = configTreeResponse.data.find(
+        (service) => service.sid === sid
+      );
       for (let i = 0; i < service.objects.length; i++) {
         objectList = objectList.concat(service.objects[i].objects);
       }
       let formattedObjectList = [];
-      const getProfilesResponse = await this.getAllObjectProfiles(connection, hid);
+      const getProfilesResponse = await this.getAllObjectProfiles(
+        connection,
+        hid
+      );
       const objectProfiles = getProfilesResponse.data;
       for (let i = 0; i < objectList.length; i++) {
-        const profile = Object.values(objectProfiles).find((profile) => profile.header.pid === parseInt(objectList[i].pid, 16) || profile.header.pid === `${parseInt(objectList[i].pid, 16)}`);
+        const profile = Object.values(objectProfiles).find(
+          (profile) =>
+            profile.header.pid === parseInt(objectList[i].pid, 16) ||
+            profile.header.pid === `${parseInt(objectList[i].pid, 16)}`
+        );
         const profileName = profile ? profile.header.uiname : '';
         // const rids = objectList[i].rids;
         // let resources = [];
@@ -248,8 +273,11 @@ module.exports = {
         //     pv: rids[j].pv,
         //   })
         // }
-        const foundObjectName = objectList[i].rids.filter((rid) => rid.rid === '01');
-        const objName = foundObjectName.length > 0 ? foundObjectName[0].settings.pv : '';
+        const foundObjectName = objectList[i].rids.filter(
+          (rid) => rid.rid === '01'
+        );
+        const objName =
+          foundObjectName.length > 0 ? foundObjectName[0].settings.pv : '';
         formattedObjectList.push({
           pid: objectList[i].pid,
           ins: objectList[i].ins,
@@ -259,7 +287,9 @@ module.exports = {
       }
       return formattedObjectList;
     } catch (err) {
-      throw JSON.stringify(err);
+      throw `Error getting config objects list for Flows UI: ${err.code}, ${
+        err.message ? err.message : ''
+      }`;
     }
   },
 
@@ -277,7 +307,5 @@ module.exports = {
       });
     }
     return result;
-  }
-
+  },
 };
-

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

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

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

@@ -45,7 +45,10 @@ module.exports = function (RED) {
       node.on('input', function (msg) {
         let uri = node.resource;
         let pri = parseInt(node.priority);
-        if (msg.hasOwnProperty('topic') && require('./validateURI')(msg.topic, 5)) {
+        if (
+          msg.hasOwnProperty('topic') &&
+          require('./validateURI')(msg.topic, 5)
+        ) {
           uri = msg.topic;
         }
         if (msg.hasOwnProperty('priority')) {
@@ -66,13 +69,21 @@ module.exports = function (RED) {
                 shape: 'dot',
                 text: 'Error: ' + JSON.stringify(err.code),
               });
-              node.error('Mobius error clearing resource priority ' + JSON.stringify(err));
+              node.error(
+                `Mobius error clearing resource priority: ${err.code}, ${
+                  err.message ? err.message : ''
+                }`
+              );
               if (node.detailedOutput === true) {
                 node.send([
                   null,
                   null,
                   null,
-                  { ...msg, topic: uri, payload: { error: true, response: err } },
+                  {
+                    ...msg,
+                    topic: uri,
+                    payload: { error: true, response: err },
+                  },
                 ]);
               }
             } else {
@@ -84,14 +95,26 @@ module.exports = function (RED) {
               if (node.detailedOutput === true) {
                 node.send([
                   { ...msg, topic: uri, payload: response.data.pv },
-                  { ...msg, topic: uri, payload: { pv: response.data.pv, name: response.data.name } },
+                  {
+                    ...msg,
+                    topic: uri,
+                    payload: { pv: response.data.pv, name: response.data.name },
+                  },
                   { ...msg, topic: uri, payload: response.data },
-                  { ...msg, topic: uri, payload: { error: false, response: response } },
+                  {
+                    ...msg,
+                    topic: uri,
+                    payload: { error: false, response: response },
+                  },
                 ]);
               } else {
                 node.send([
                   { ...msg, topic: uri, payload: response.data.pv },
-                  { ...msg, topic: uri, payload: { pv: response.data.pv, name: response.data.name } },
+                  {
+                    ...msg,
+                    topic: uri,
+                    payload: { pv: response.data.pv, name: response.data.name },
+                  },
                 ]);
               }
             }