node-red-contrib-mobius-flow-base 2.5.91 → 3.0.0-beta.13

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

@@ -29,10 +29,18 @@ POSSIBILITY OF SUCH DAMAGE.
     <label for="node-input-connection"><i class="fa fa-globe"></i> MOBiUS</label>
     <input type="text" id="node-input-connection">
   </div>
-  <div class="form-row">
-    <label for="node-input-resource"><i class="fa fa-tasks"></i> URI</label>
-    <input type="text" id="node-input-resource" placeholder="Resource URI (hid/sid/pid/ins/rid)">
+
+  <hr>
+
+  <div id="instance-row">
+    <div class="form-row" id="input-row">
+      <label for="node-input-resource"><i class="fa fa-tasks"></i> URI</label>
+      <input type="text" id="node-input-resource" style="width:61%;" placeholder="Resource URI (hid/sid/pid/ins/rid)">
+    </div>
   </div>
+
+  <div id="mobsearch"></div>
+
   <div class="form-row">
     <label for="node-input-priority"><i class="fa fa-exclamation-triangle"></i> Priority</label>
     <input type="text" id="node-input-priority" placeholder="Priotity to write or clear">
@@ -41,6 +49,7 @@ POSSIBILITY OF SUCH DAMAGE.
     <label>&nbsp;</label>
     <input type="checkbox" id="node-input-detailedOutput" style="display: inline-block; width: auto; vertical-align: top;">
     <label for="node-input-detailedOutput" style="width: 70%;"> Use detailed outputs</label>
+    <input type="hidden" id="node-input-outputs"/>
   </div>
   <hr>
   <div class="form-row">
@@ -49,6 +58,8 @@ POSSIBILITY OF SUCH DAMAGE.
   </div>
 </script>
 
+<script src="common/mobsearch.js"></script>
+
 <script type="text/javascript">
   RED.nodes.registerType('mobius set resource',{
     category: 'mobius',
@@ -66,7 +77,8 @@ POSSIBILITY OF SUCH DAMAGE.
         return false;
       }},
       priority: {value:15, type: 'Number', validate:function(v) { return (v > 0 && v < 16) }},
-      connection: {type:"mobius connection", required:true}
+      connection: {type:"mobius connection", required:true},
+      outputs: {value:2},
     },
     color:"#8abff5",
     inputs:1,
@@ -90,13 +102,28 @@ POSSIBILITY OF SUCH DAMAGE.
     labelStyle: function() {
       return this.name ? "node_label_italic":"";
     },
-    oneditsave: function() {
-      if($("#node-input-detailedOutput").prop('checked')) {
-        this.outputs = 4;
-      } else {
-        this.outputs = 2;
-      }
-    }
+    oneditprepare: function () {
+      $("#node-input-outputs").val(this.detailedOutput ? 4 : 2);
+      $("#node-input-detailedOutput").change(function() {
+        $("#node-input-outputs").val(this.checked ? 4 : 2);
+      });
+      var node = this;
+      let mobiusSrvc = $("#node-input-connection").val();
+
+      opts = {
+        htmlElementId: 'mobsearch',
+        uriFieldName: 'node-input-resource',
+        inputRowId: 'input-row',
+      };
+      initMobsearch.toRid(mobiusSrvc, opts);
+    },
+    // oneditsave: function() {
+    //   if($("#node-input-detailedOutput").prop('checked')) {
+    //     this.outputs = 4;
+    //   } else {
+    //     this.outputs = 2;
+    //   }
+    // }
   });
 </script>
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "node-red-contrib-mobius-flow-base",
-  "version": "2.5.91",
+  "version": "3.0.0-beta.13",
   "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 && tsc && 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/mobsearch.js dist/nodes/common/ && cp src/node-red-ui-funcs.js dist/"
   },
   "repository": "bitbucket:interiorautomation/node-red-contrib-mobius-flow-base",
   "node-red": {
@@ -27,7 +27,8 @@
       "mobius resource cov": "dist/nodes/mobius-resource-cov.js",
       "mobius send bcmd": "dist/nodes/mobius-send-bcmd.js",
       "mobius sub bcmd": "dist/nodes/mobius-sub-bcmd.js",
-      "mobius send dcmd": "dist/nodes/mobius-send-dcmd.js"
+      "mobius send dcmd": "dist/nodes/mobius-send-dcmd.js",
+      "mobius change admin password": "dist/nodes/mobius-change-admin-password.js"
     }
   },
   "keywords": [
@@ -39,12 +40,18 @@
   "license": "Commercial",
   "homepage": "https://bitbucket.org/interiorautomation/node-red-contrib-mobius-flow-base#readme",
   "dependencies": {
-    "@ia/mobius-tcpip-service-api": "^2.0.0",
-    "lodash": "^4.17.11"
+    "axios": "^1.4.0",
+    "https": "^1.0.0",
+    "lodash": "^4.17.11",
+    "ws": "^8.13.0"
   },
   "devDependencies": {
-    "@ia/eslint-config-ia": "^1.0.2",
-    "@types/node": "^11.12.2",
-    "typescript": "^3.4.1"
+    "@types/node": "^18.11.18",
+    "@typescript-eslint/eslint-plugin": "^5.56.0",
+    "@typescript-eslint/parser": "^5.56.0",
+    "eslint-config-prettier": "^8.8.0",
+    "prettier": "^2.8.7",
+    "prettier-eslint": "^15.0.1",
+    "typescript": "^4.9.4"
   }
 }

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

@@ -1,103 +0,0 @@
-/**
- Copyright (C) 2016, IAConnects Technology Limited
- All Rights Reserved
-
- ALL INFORMATION CONTAINED HEREIN IS, AND REMAINS
- THE PROPERTY OF IACONNECTS TECHNOLOGY LIMITED AND ITS SUPPLIERS,
- IF ANY. THE INTELLECTUAL AND TECHNICAL CONCEPTS CONTAINED
- HEREIN ARE PROPRIETARY TO IACONNECTS TECHNOLOGY LIMITED
- AND ITS SUPPLIERS AND ARE PROTECTED BY TRADE SECRET OR COPYRIGHT LAW.
- DISSEMINATION OF THIS INFORMATION OR REPRODUCTION OF THIS MATERIAL
- IS STRICTLY FORBIDDEN UNLESS PRIOR WRITTEN PERMISSION IS OBTAINED
- FROM IACONNECTS TECHNOLOGY LIMITED.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
- **/
-
-'use strict';
-
-const _ = require('lodash');
-
-module.exports = {
-  async discover (connection, uri) {
-    return new Promise((resolve, reject) => {
-      connection.discover(uri, (err, response) => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve(response);
-        }
-      });
-    });
-  },
-
-  async discoverDevicesByPID (RED, connection, hid, spids, pid) {
-    let devices = [];
-    if (!hid || hid === '') {
-      hid = connection.service.srvcAPI.status.hubId;
-    }
-    let services = null;
-    try {
-      services = await this.discover(connection, hid);
-    } catch (err) {
-      RED.log.error(`Discover devices failed (${hid}) - ${err.message}`);
-      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))) {
-        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 device = await this.discover(connection, deviceURI);
-            let resourcesByName = _.keyBy(device.value[0].resources, 'name');
-            let deviceName = resourcesByName['name'].pv;
-            if (deviceName !== '') {
-              devices.push(device.uri + ' ' + deviceName);
-            } else {
-              devices.push(device.uri);
-            }
-          }
-        } catch (err) {
-          RED.log.warn(`Discover devices failed (${insURI}) - ${err.message}`);
-        }
-      }
-    }
-    return new Promise((resolve) => {
-      resolve(devices);
-    });
-  },
-
-  async discoverServicesBySPID (RED, connection, hid, spid) {
-    if (!hid || hid === '') {
-      hid = connection.service.srvcAPI.status.hubId;
-    }
-    let services = null;
-    try {
-      services = await this.discover(connection, hid);
-    } catch (err) {
-      RED.log.error(`Discover services failed (${hid}) - ${err.message}`);
-      throw new Error(`Discover services failed (${hid}) - ${err.message}`);
-    }
-    let srvcs = [];
-    for (let srvcLoop = 0; srvcLoop < services.value.length; srvcLoop++) {
-      if (services.value[srvcLoop].status === 'online' && services.value[srvcLoop].spid === spid) {
-        srvcs.push(`${hid}/${services.value[srvcLoop].id.split('/')[1]}`);
-      }
-    }
-    return new Promise((resolve) => {
-      resolve(srvcs);
-    });
-  }
-};