node-red-contrib-mobius-flow-base 2.5.86-beta.74 → 2.5.86-beta.78

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

@@ -29,7 +29,7 @@
 const _ = require('lodash');
 
 module.exports = {
-  async discover(connection, uri) {
+  async discover (connection, uri) {
     return new Promise((resolve, reject) => {
       connection.discover(uri, (err, response) => {
         if (err) {
@@ -41,7 +41,7 @@ module.exports = {
     });
   },
 
-  async discoverDevicesByPID(RED, connection, hid, spids, pid) {
+  async discoverDevicesByPID (RED, connection, hid, spids, pid) {
     let devices = [];
     if (!hid || hid === '') {
       hid = connection.service.srvcAPI.status.hubId;
@@ -54,17 +54,12 @@ module.exports = {
       throw new Error(`Discover devices failed (${hid}) - ${err.message}`);
     }
     for (let srvcLoop = 0; srvcLoop < services.value.length; srvcLoop++) {
-      if (
-        services.value[srvcLoop].status === 'online' &&
-        (spids.length === 0 || spids.includes(services.value[srvcLoop].spid))
-      ) {
+      if (services.value[srvcLoop].status === 'online' && (spids.length === 0 || spids.includes(services.value[srvcLoop].spid))) {
         let insURI = `${hid}/${services.value[srvcLoop].id.split('/')[1]}/${pid}`;
         try {
           let instances = await this.discover(connection, insURI);
           for (let insLoop = 0; insLoop < instances.value.length; insLoop++) {
-            let deviceURI = `${hid}/${services.value[srvcLoop].id.split('/')[1]}/${pid}/${
-              instances.value[insLoop]
-            }`;
+            let deviceURI = `${hid}/${services.value[srvcLoop].id.split('/')[1]}/${pid}/${instances.value[insLoop]}`;
             let device = await this.discover(connection, deviceURI);
             let resourcesByName = _.keyBy(device.value[0].resources, 'name');
             let deviceName = resourcesByName['name'].pv;
@@ -84,7 +79,7 @@ module.exports = {
     });
   },
 
-  async discoverServicesBySPID(RED, connection, hid, spid) {
+  async discoverServicesBySPID (RED, connection, hid, spid) {
     if (!hid || hid === '') {
       hid = connection.service.srvcAPI.status.hubId;
     }
@@ -104,130 +99,5 @@ module.exports = {
     return new Promise((resolve) => {
       resolve(srvcs);
     });
-  },
-
-  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(async (resolve, reject) => {
-      try {
-        // Fetch information from node config
-        const nodeConfig = await connection.getNodeConfig(hid);
-        const servicesFromConfig = nodeConfig.value.services;
-        let services = [];
-        for (let i = 0; i < servicesFromConfig.length; i++) {
-          services.push({
-            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: [],
-          });
-        }
-
-        // Fetch information from each service config
-        for (let i = 0; i < services.length; i++) {
-          const fullServiceConfig = await connection.getServiceConfigProm(hid, services[i].sid);
-          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;
-          }
-        }
-
-        // Fetch information from discovered services
-        const discoveryResponse = await this.discover(connection, hid);
-        const servicesFromDiscovery = discoveryResponse.value;
-        for (let i = 0; i < servicesFromDiscovery.length; i++) {
-          let serviceFound = false;
-          for (let j = 0; j < services.length; j++) {
-            if (servicesFromDiscovery[i].id === services[j].id) {
-              serviceFound = true;
-              services[j].registered = servicesFromDiscovery[i].registered;
-              services[j].lastConnected = servicesFromDiscovery[i].lastconnected;
-              j = services.length;
-            }
-          }
-          if (!serviceFound) {
-            services.push({
-              id: servicesFromDiscovery[i].id,
-              spid: servicesFromDiscovery[i].id.split('/')[0],
-              sid: servicesFromDiscovery[i].id.split('/')[1],
-              uri: `${nodeConfig.uri}/${servicesFromDiscovery[i].id.split('/')[1]}`,
-              name: null,
-              enabled: null,
-              runAtStart: null,
-              registered: servicesFromDiscovery[i].registered,
-              lastConnected: servicesFromDiscovery[i].lastconnected,
-              status: null,
-              statusText: null,
-              mobiusSettings: null,
-              customSettings: null,
-              pids: [],
-            });
-          }
-        }
-
-        // 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';
-          }
-        }
-
-        resolve(services);
-      } catch (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.74",
+  "version": "2.5.86-beta.78",
   "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/ && mkdir -p dist/nodes/common && cp src/nodes/common/*.js dist/nodes/common/"
+    "build": "mkdir -p dist/nodes && cp src/nodes/*.js dist/nodes/ && cp src/nodes/*.html dist/nodes/ && cp -r src/nodes/icons dist/nodes/"
   },
   "repository": "bitbucket:interiorautomation/node-red-contrib-mobius-flow-base",
   "node-red": {