node-red-contrib-mobius-flow-base 2.5.86-beta.6 → 2.5.86-beta.63

package/dist/nodes/node-red-ui-discover-devices.js

@@ -106,12 +106,12 @@ module.exports = {
     });
   },
 
-  async getServiceList(connection, hid) {
+  getServiceList(connection, hid) {
     // getNodeConfig -> id, spid, uri, name, enabled, runAtStart
     // For every: getServiceConfig -> mobiusSettings, customSettings
     // discover -> registered, last connected, status + any remaining if new service
     // For every: discover object -/0001/0001 -> status, statusText
-    return new Promise((resolve, reject) => {
+    return new Promise(async (resolve, reject) => {
       try {
         // Fetch information from node config
         const nodeConfig = await connection.getNodeConfig(hid);
@@ -119,41 +119,41 @@ module.exports = {
         let services = [];
         for (let i = 0; i < servicesFromConfig.length; i++) {
           services.push({
-            id: servicesFromConfig.id,
-            spid: servicesFromConfig.id.split('/')[0],
-            sid: servicesFromConfig.id.split('/')[1],
-            uri: `${nodeConfig.uri}/${servicesFromConfig.id.split('/')[1]}`,
-            name: servicesFromConfig.name,
-            enabled: servicesFromConfig.enabled,
-            runAtStart: servicesFromConfig.runAtStart,
+            id: servicesFromConfig[i].id,
+            spid: servicesFromConfig[i].id.split('/')[0],
+            sid: servicesFromConfig[i].id.split('/')[1],
+            uri: `${nodeConfig.uri}/${servicesFromConfig[i].id.split('/')[1]}`,
+            name: servicesFromConfig[i].name,
+            enabled: servicesFromConfig[i].enabled,
+            runAtStart: servicesFromConfig[i].runAtStart,
             registered: null,
             lastConnected: null,
             status: null,
             statusText: null,
             mobiusSettings: null,
             customSettings: null,
+            pids: [],
           });
         }
 
-        console.log('Following get node config');
-        console.log(services);
-
         // Fetch information from each service config
-        for (i = 0; i < services.length; i++) {
+        for (let i = 0; i < services.length; i++) {
           const fullServiceConfig = await connection.getServiceConfigProm(hid, services[i].sid);
-          services[i].mobiusSettings = fullServiceConfig.value.serviceConfig.settings;
-          services[i].customSettings = fullServiceConfig.value.serviceConfig.custom;
+          if (fullServiceConfig.value.serviceConfig !== undefined) {
+            services[i].mobiusSettings = fullServiceConfig.value.serviceConfig.settings;
+            services[i].customSettings = fullServiceConfig.value.serviceConfig.custom;
+          } else {
+            services[i].mobiusSettings = fullServiceConfig.value.settings;
+            services[i].customSettings = fullServiceConfig.value.custom;
+          }
         }
 
-        console.log('Following service node configs');
-        console.log(services);
-
         // Fetch information from discovered services
         const discoveryResponse = await this.discover(connection, hid);
         const servicesFromDiscovery = discoveryResponse.value;
-        for (i = 0; i < servicesFromDiscovery.length; i++) {
+        for (let i = 0; i < servicesFromDiscovery.length; i++) {
           let serviceFound = false;
-          for (j = 0; j < services.length; j++) {
+          for (let j = 0; j < services.length; j++) {
             if (servicesFromDiscovery[i].id === services[j].id) {
               serviceFound = true;
               services[j].registered = servicesFromDiscovery[i].registered;
@@ -176,30 +176,57 @@ module.exports = {
               statusText: null,
               mobiusSettings: null,
               customSettings: null,
+              pids: [],
             });
           }
         }
 
-        console.log('Following discover');
-        console.log(services);
-
-        // Fetch status object from all services
-        for (i = 0; i < services.length; i++) {
-          const statusObjectResponse = await this.discover(
-            connection,
-            `${hid}/${services[i].sid}/0001/0001`
-          );
-          const statusObject = statusObjectResponse.value;
-          services[i].status = statusObject.resources[1].pv;
-          services[i].statusText = `${statusObject.resources[2].pv}`;
+        // Fetch pids and status object from all services
+        for (let i = 0; i < services.length; i++) {
+          if (services[i].sid !== '009') {
+            const serviceResponse = await this.discover(connection, `${hid}/${services[i].sid}`);
+            services[i].pids = [...new Set(serviceResponse.value)];
+            const statusObjectResponse = await this.discover(
+              connection,
+              `${hid}/${services[i].sid}/0001/0001`
+            );
+            const statusObject = statusObjectResponse.value[0];
+            services[i].status = statusObject.resources[1].pv;
+            services[i].statusText = `${statusObject.resources[2].pv}`;
+          } else {
+            services[i].pids = [];
+            services[i].status = 'Unknown';
+            services[i].statusText = 'Unknown';
+          }
         }
 
-        console.log('Complete');
-        console.log(services);
-
         resolve(services);
       } catch (err) {
-        reject(err);
+        reject(JSON.stringify(err));
+      }
+    });
+  },
+
+  getObjectList(connection, hid, sid) {
+    return new Promise(async (resolve, reject) => {
+      try {
+        let objectList = [];
+        const serviceResponse = await this.discover(connection, `${hid}/${sid}`);
+        const pids = [...new Set(serviceResponse.value)];
+        for (let i = 0; i < pids.length; i++) {
+          const inssResponse = await this.discover(connection, `${hid}/${sid}/${pids[i]}`);
+          const inss = inssResponse.value;
+          for (let j = 0; j < inss.length; j++) {
+            const objResponse = await this.discover(
+              connection,
+              `${hid}/${sid}/${pids[i]}/${inss[j]}`
+            );
+            objectList.push(objResponse.value[0]);
+          }
+        }
+        resolve(objectList);
+      } catch (err) {
+        reject(JSON.stringify(err));
       }
     });
   },

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "node-red-contrib-mobius-flow-base",
-  "version": "2.5.86-beta.6",
+  "version": "2.5.86-beta.63",
   "description": "Node-RED base nodes for Mobius Flow",
   "main": "index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "mkdir -p dist/nodes && cp src/nodes/*.js dist/nodes/ && cp src/nodes/*.html dist/nodes/ && cp -r src/nodes/icons dist/nodes/"
+    "build": "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/nodes/common/*.js dist/nodes/common/"
   },
   "repository": "bitbucket:interiorautomation/node-red-contrib-mobius-flow-base",
   "node-red": {