node-red-contrib-mobius-flow-base 3.1.6 → 3.1.7

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,7 @@ export declare class EngineApiClient extends EngineApiCalls {
     EngineWebSocket: EngineWebSocket;
     private hostname;
     private protocol;
-    constructor(protocol: "http" | "https", host: string, username: string, password: string);
+    constructor(protocol: 'http' | 'https', host: string, username: string, password: string);
     private login;
     private refresh;
     close: () => void;

package/dist/engine-api-client.js

@@ -29,7 +29,7 @@ class EngineApiClient extends engine_api_calls_1.EngineApiCalls {
         this.client = axios_1.default.create({
             baseURL: baseURL,
             headers: {
-                "Content-Type": "application/json",
+                'Content-Type': 'application/json',
             },
         });
         this.setApiClient(this.client);
@@ -42,15 +42,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.');
             this.reloginInterval && 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 +63,7 @@ class EngineApiClient extends engine_api_calls_1.EngineApiCalls {
             throw error;
         });
         this.EngineWebSocket = new engine_websocket_1.EngineWebSocket(this.hostname, this.protocol);
-        this.EngineWebSocket.on("disconnected", () => {
+        this.EngineWebSocket.on('disconnected', () => {
             this.loggedIn = false;
         });
     }
@@ -71,8 +71,8 @@ class EngineApiClient extends engine_api_calls_1.EngineApiCalls {
         console.log(`(${this.hostname}) -> Attempting Mobius Engine API Login`);
         try {
             const response = await this.client({
-                method: "post",
-                url: "/auth/login",
+                method: 'post',
+                url: '/auth/login',
                 data: {
                     username: this.username,
                     password: this.password,
@@ -98,8 +98,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/nodes/mobius-discover-object-list.js

@@ -108,6 +108,7 @@ module.exports = function (RED) {
               shape: 'dot',
               text: 'Failed discovery',
             });
+            node.error(`Failed to discover objects`);
           });
         if (done) {
           done();
@@ -122,113 +123,101 @@ module.exports = function (RED) {
     }
 
     node.discoverAllObjectURIs = async function (msg) {
-      return new Promise(async (resolve, reject) => {
-        let objectList = [];
+      let objectList = [];
+      const hid = node.hid === '' ? node.serviceConn.hubId : node.hid;
+      const profiles = await discoverProfiles(
+        node.serviceConn,
+        hid,
+        node.subscriptions
+      );
+
+      for await (let entry of profiles.entries()) {
+        let discoverParams = {};
+        const serviceURI = entry[0];
+        const pids = entry[1];
+        if (node.useRIDValueFiltering) {
+          discoverParams = {
+            uri: serviceURI,
+            pids: pids,
+            rid: node.rid,
+            func: node.func,
+            limit: node.limit,
+          };
+        } else {
+          discoverParams = {
+            uri: serviceURI,
+            pids: pids,
+            rid: '00',
+            func: '(v) => { return true; }',
+            limit: 512,
+          };
+        }
         try {
-          const hid = node.hid === '' ? node.serviceConn.hubId : node.hid;
-          const profiles = await discoverProfiles(
+          let objects = await filterObjectsByRIDValue(
             node.serviceConn,
-            hid,
-            node.subscriptions
+            discoverParams
           );
-
-          for await (let entry of profiles.entries()) {
-            let discoverParams = {};
-            const serviceURI = entry[0];
-            const pids = entry[1];
-            if (node.useRIDValueFiltering) {
-              discoverParams = {
-                uri: serviceURI,
-                pids: pids,
-                rid: node.rid,
-                func: node.func,
-                limit: node.limit,
-              };
-            } else {
-              discoverParams = {
-                uri: serviceURI,
-                pids: pids,
-                rid: '00',
-                func: '(v) => { return true; }',
-                limit: 512,
-              };
-            }
-            try {
-              let objects = await filterObjectsByRIDValue(
-                node.serviceConn,
-                discoverParams
-              );
-              for (let lp = 0; lp < objects.value.length; lp++) {
-                objects.value[lp][
-                  'uri'
-                ] = `${serviceURI}/${objects.value[lp].pid}/${objects.value[lp].ins}`;
-                if (
-                  isIncluded(
-                    `${objects.value[lp]['uri']}`,
-                    node.subscriptions
-                  ) &&
-                  !isExcluded(`${objects.value[lp]['uri']}`, node.subscriptions)
-                ) {
-                  objectList.push(objects.value[lp]);
-                }
-              }
-            } catch (err) {
-              node.warn(
-                `Discover object failed for service (${serviceURI}) - ${err.message}`
-              );
+          for (let lp = 0; lp < objects.value.length; lp++) {
+            objects.value[lp][
+              'uri'
+            ] = `${serviceURI}/${objects.value[lp].pid}/${objects.value[lp].ins}`;
+            if (
+              isIncluded(`${objects.value[lp]['uri']}`, node.subscriptions) &&
+              !isExcluded(`${objects.value[lp]['uri']}`, node.subscriptions)
+            ) {
+              objectList.push(objects.value[lp]);
             }
           }
-
-          if (objectList.length === 0) {
-            throw new Error('No discovery data found');
-          }
         } catch (err) {
-          node.warn(`Failed discover all objects: ${err.message}`);
-          reject(err.message);
+          node.warn(
+            `Discover object failed for service (${serviceURI}) - ${err.message}`
+          );
         }
-        resolve(objectList);
-      });
+      }
+
+      if (objectList.length === 0) {
+        throw new Error('No discovery data found');
+      }
+      return objectList;
     };
   }
 
   async function discoverProfiles(serviceConn, hid, subscriptions) {
-    return new Promise(async (resolve) => {
-      let discoveredProfiles = new Map();
-      let services = await discover(serviceConn, hid);
-      for (const service of services.data) {
-        if (service.status === 'online') {
-          let sid = service.id.split('/')[1];
-          if (isIncluded(`${hid}/${sid}/#`, subscriptions)) {
-            let profiles = await discover(serviceConn, `${hid}/${sid}`);
-            let pids = [];
-            for (const pid of profiles.data) {
-              if (isIncluded(`${hid}/${sid}/${pid}/#`, subscriptions)) {
-                pids.push(pid);
-              }
-            }
-            if (pids.length > 0) {
-              discoveredProfiles.set(`${hid}/${sid}`, pids);
+    let discoveredProfiles = new Map();
+    let services = await discover(serviceConn, hid);
+    for (const service of services.data) {
+      if (service.status === 'online') {
+        let sid = service.id.split('/')[1];
+        if (isIncluded(`${hid}/${sid}/#`, subscriptions)) {
+          let profiles = await discover(serviceConn, `${hid}/${sid}`);
+          let pids = [];
+          for (const pid of profiles.data) {
+            if (isIncluded(`${hid}/${sid}/${pid}/#`, subscriptions)) {
+              pids.push(pid);
             }
           }
-        } else {
-          RED.log.warn(
-            `Failed to discover objects for service ${
-              service.id.split('/')[1]
-            } as it is offline.`
-          );
+          if (pids.length > 0) {
+            discoveredProfiles.set(`${hid}/${sid}`, pids);
+          }
         }
+      } else {
+        RED.log.warn(
+          `Failed to discover objects for service ${
+            service.id.split('/')[1]
+          } as it is offline.`
+        );
       }
-      resolve(discoveredProfiles);
-    });
+    }
+    return discoveredProfiles;
   }
 
   async function discover(serviceConn, params) {
     return new Promise((resolve, reject) => {
       serviceConn.discover(params, (err, response) => {
         if (err) {
-          reject(err);
+          return reject(err);
         } else {
-          resolve(response);
+          return resolve(response);
         }
       });
     });
@@ -244,9 +233,9 @@ module.exports = function (RED) {
         eval('(' + params.func + ')'),
         (err, response) => {
           if (err) {
-            reject(err);
+            return reject(err);
           } else {
-            resolve(response);
+            return resolve(response);
           }
         }
       );

package/package.json

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