node-red-contrib-mobius-flow-base 2.5.86-beta.5 → 2.5.86-beta.53

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

@@ -29,10 +29,35 @@ 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">
+      <label for="node-input-resource"><i class="fa fa-tasks"></i> URI</label>
+      <input type="text" id="node-input-resource" style="width:61%;" placeholder="HID/SID/PID/INS/RID">
+      <a id="node-lookup-instance" class="searchbutton" style="vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
+    </div>
+  </div>
+  <div id="instance-search-row">
+    <div class="form-row">
+      <label for="instance-search-sid"><i class="fa fa-tasks"></i> URI</label>
+      <input type="text" id="instance-search-hid" style="width:13%;" placeholder="HID">
+      <input type="text" id="instance-search-sid" style="width:8%;" placeholder="SID">
+      <input type="text" id="instance-search-pid" style="width:10%;" placeholder="PID">
+      <input type="text" id="instance-search-ins" style="width:10%;" placeholder="INS">
+      <input type="text" id="instance-search-rid" style="width:8%;" placeholder="RID">
+      <a id="node-search-return" class="searchbutton" style="vertical-align: middle"><i id="node-search-return-icon" class="fa fa-arrow-left"></i></a>
+      <a id="node-search-accept" class="searchbutton" style="vertical-align: middle; color: #CCCCCC"><i id="node-search-accept-icon" class="fa fa-check"></i></a>
+    </div>
   </div>
+  <div id="wildcard-alert-row" class="form-row hidden" style="color:#555555" align="center">
+    <p>Please note: The selection of wildcard '+'
+      means a search for a specific instance or resource
+      cannot be performed. As such, enter the 
+      INS and/or RID manually.</p>
+  </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">
@@ -90,6 +115,266 @@ POSSIBILITY OF SUCH DAMAGE.
     labelStyle: function() {
       return this.name ? "node_label_italic":"";
     },
+    oneditprepare: function () {
+      var node = this;
+      let mobiusSrvc = $("#node-input-connection").val();
+
+      // *** MOBSEARCH *** //
+
+      //Inital setup
+      $("#instance-search-row").hide();
+      $("#wildcard-alert-row").hide();
+      $("#node-search-return").addClass('disabled');
+      $.getJSON(`mgethid?mobius=${mobiusSrvc}`, function (response) {
+        $("#instance-search-hid").val(response);
+      })
+      let readyToAccept = false;
+      let searchObject = {
+        hid: $("#instance-search-hid").val(),
+        sid: $("#instance-search-sid").val(),
+        pid: $("#instance-search-pid").val(),
+        ins: $("#instance-search-ins").val(),
+        rid: $("#instance-search-rid").val(),
+        objects: []
+      }
+
+      //Function to search for RIDs
+      function ridSearch (objects, ins) {
+        $.getJSON(`mdiscover?mobius=${mobiusSrvc}&uri=${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}`, (response) => {
+          resList = response.value[0].resources
+          ress = ['#'];
+          for (let j = 0; j < resList.length; j++) {
+            ress.push(`${resList[j].rid} - ${resList[j].name}`)
+          }
+          $("#instance-search-rid").autocomplete({
+            source: ress,
+            minLength: 0,
+            close: function (event, ui) {
+              acceptCheck();
+              $("#instance-search-rid").autocomplete('destroy');
+              $("#instance-search-rid").val($("#instance-search-rid").val().substring(0, 2));
+              searchObject.rid = $("#instance-search-rid").val();
+            }
+          }).autocomplete('search', '');
+        })
+      }
+
+      //Function to search for INSs
+      function insSearch (objects, pid) {
+        let inss = ['#', '+'];
+        for (let i = 0; i < objects.length; i++) {
+          if (objects[i].pid === pid) {
+            const name = objects[i].resources[1].pv;
+            if (name === '') {
+              inss.push(objects[i].ins);
+            } else {
+              inss.push(`${objects[i].ins} - ${name}`);
+            }
+          }
+        }
+        $("#instance-search-ins").autocomplete({
+          source: inss,
+          minLength: 0,
+          close: function (event, ui) {
+            acceptCheck();
+            $("#instance-search-ins").autocomplete('destroy');
+            if ($("#instance-search-ins").val().length > 4) {
+              $("#instance-search-ins").val($("#instance-search-ins").val().substring(0, 4))
+            }
+            searchObject.ins = $("#instance-search-ins").val();
+          }
+        }).autocomplete('search', '');
+      }
+
+      //Function to search for PIDs
+      function pidsSearch(objects) {
+        searchObject.objects = objects;
+        let pids = ['#', '+'];
+        for (let i = 0; i < objects.length; i++) {
+          pids.push(`${objects[i].pid} - ${objects[i].profileName}`);
+        }
+        pids = [...new Set(pids)];
+        $("#instance-search-pid").autocomplete({
+          source: pids,
+          minLength: 0,
+          close: function (event, ui) {
+            acceptCheck();
+            $("#instance-search-pid").autocomplete('destroy');
+            if ($("#instance-search-pid").val().length > 4) {
+              $("#instance-search-pid").val($("#instance-search-pid").val().substring(0, 4))
+            }
+            searchObject.pid = $("#instance-search-pid").val();
+          }
+        }).autocomplete('search', '');
+      }
+
+      //Function to search for SIDs, and then fetch child objects based on selection
+      function serviceSearch(response) {
+        let services = ['#', '+'];
+        for (let i = 0; i < response.length; i++) {
+          if (response[i].sid !== '009') {
+            services.push(`${response[i].sid} - ${response[i].name}`);
+          }
+        }
+        $("#instance-search-sid").autocomplete({
+          source: services,
+          minLength: 0,
+          close: function (event, ui) {
+            acceptCheck();
+            $("#instance-search-sid").autocomplete('destroy');
+            if ($("#instance-search-sid").val().length > 3) {
+              $("#instance-search-sid").val($("#instance-search-sid").val().substring(0, 3))
+            }
+            searchObject.sid = $("#instance-search-sid").val();
+            if (searchObject.sid === '+') {
+              for (let i = 2; i < services.length; i++) {
+                $.getJSON(`mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${services[i].substring(0, 3)}`, (objects) => {
+                  searchObject.objects = searchObject.objects.concat(objects);
+                })
+              }
+            } else {
+              $.getJSON(`mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${searchObject.sid}`, (objects) => {
+                searchObject.objects = objects;
+              })
+            }
+          }
+        }).autocomplete('search', '');
+      }
+
+      //Start a new search
+      function startSearch() {
+        $("#wildcard-alert-row").hide();
+        $("#instance-search-sid").val('');
+        $("#instance-search-pid").val('');
+        $("#instance-search-ins").val('');
+        searchObject.hid = $("#instance-search-hid").val()
+        searchObject.sid = '';
+        searchObject.pid = '';
+        searchObject.ins = '';
+        if (/((^([0-9A-F]){6}$)|^$)/.test(searchObject.hid)) {
+          $.getJSON(`mgetservices?mobius=${mobiusSrvc}&hid=${searchObject.hid}`, serviceSearch)
+            .fail((err) => {
+              console.log('Some kind of html failure message on service discovery');
+            });
+        }
+      }
+
+      //Finish a search
+      function finishSearch() {
+        $("#wildcard-alert-row").hide();
+        let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}/${searchObject.rid}`
+        if (uri.includes('#')) {
+          uri = uri.substring(0,uri.indexOf('#') + 1)
+        }
+        $("#node-input-resource").val(uri);
+        $("#node-search-accept").css('color', '#CCCCCC');
+        readyToAccept = false;
+        $("#node-search-return").addClass('disabled');
+        $("#node-search-accept").addClass('disabled');
+        $("#node-lookup-instance").removeClass('disabled');
+        $("#instance-search-row").hide();
+        $("#instance-row").show();
+      }
+
+      //Function to update if accept button is grade out and functions based on conditions of fields
+      function acceptCheck() {
+        if (($("#instance-search-hid").val() !== '' && $("#instance-search-sid").val() !== '' && $("#instance-search-pid").val() !== '' && $("#instance-search-ins").val() !== '' && $("#instance-search-rid").val() !== '') ||
+        $("#instance-search-sid").val() === '#' || $("#instance-search-pid").val() === '#' || $("#instance-search-ins").val() === '#' || $("#instance-search-rid").val() === '#') {
+          $("#node-search-accept").css('color', '#555555');
+          readyToAccept = true;
+        } else {
+          $("#node-search-accept").css('color', '#CCCCCC');
+          readyToAccept = false;
+        }
+        if ($("#instance-search-sid").val() !== '+' && $("#instance-search-pid").val() !== '+' && $("#instance-search-ins").val() !== '+') {
+          $("#wildcard-alert-row").hide();
+        } else {
+          $("#wildcard-alert-row").show();
+        }
+      }
+
+      // Respond to clicks
+      $("#node-lookup-instance").click(function () {  //When search button is clicked
+        $("#instance-search-sid").val('');
+        $("#instance-search-pid").val('');
+        $("#instance-search-ins").val('');
+        $("#instance-search-rid").val('');
+        $("#node-lookup-instance").addClass('disabled');
+        $("#node-search-return").removeClass('disabled');
+        $("#node-search-accept").removeClass('disabled');
+        $("#instance-row").hide();
+        $("#instance-search-row").show();
+      });
+      $("#instance-search-sid").click(function () {     //SID field clicked
+        $("#instance-search-pid").val('')
+        $("#instance-search-ins").val('')
+        searchObject.pid = '';
+        searchObject.ins = '';
+        searchObject.rid = '';
+        searchObject.objects = [];
+        startSearch();
+      })
+      $("#instance-search-pid").click(function () {    //PID field clicked
+        $("#instance-search-ins").val('')
+        $("#instance-search-rid").val('')
+        searchObject.ins = '';
+        searchObject.rid = '';
+        if (searchObject.sid !== '') {
+          pidsSearch(searchObject.objects);
+        }
+      })
+      $("#instance-search-ins").click(function () {   //INS field clicked
+        $("#instance-search-rid").val('')
+        searchObject.rid = '';
+        if (searchObject.pid !== '' && searchObject.pid !== '+' && searchObject.sid !== '+') {
+          insSearch(searchObject.objects, searchObject.pid);
+        }
+      })
+      $("#instance-search-rid").click(function () {   //RID clicked
+        if (searchObject.ins !== '' && searchObject.ins !== '+' && searchObject.pid !== '+' && searchObject.sid !== '+') {
+          ridSearch(searchObject.objects, searchObject.ins);
+        }
+      });
+      $("#node-search-return").click(function () {    //Return/Back button clicked
+        $("#node-search-return").addClass('disabled');
+        $("#node-search-accept").addClass('disabled');
+        $("#node-lookup-instance").removeClass('disabled');
+        $("#instance-search-row").hide();
+        $("#instance-row").show();
+      });
+      $("#node-search-accept").click(function () {    //Accept button clicked
+        if (readyToAccept) {
+          finishSearch();
+        }
+      });
+
+      // Respond to search field changes
+      $("#instance-search-hid").change(function () {
+        acceptCheck();
+        $("#instance-search-sid").val('');
+        $("#instance-search-pid").val('');
+        $("#instance-search-ins").val('');
+        $("#instance-search-rid").val('');
+      });
+      $("#instance-search-sid").change(function () {
+        searchObject.sid = $("#instance-search-sid").val()
+        acceptCheck();
+      });
+      $("#instance-search-pid").change(function () {
+        searchObject.pid = $("#instance-search-pid").val()
+        acceptCheck();
+      });
+      $("#instance-search-ins").change(function () {
+        searchObject.ins = $("#instance-search-ins").val()
+        acceptCheck();
+      });
+      $("#instance-search-rid").change(function () {
+        searchObject.rid = $("#instance-search-rid").val()
+        acceptCheck();
+      });
+
+      // *** MOBSEARCH *** //
+    },
     oneditsave: function() {
       if($("#node-input-detailedOutput").prop('checked')) {
         this.outputs = 4;

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++) {
-          const fullServiceConfig = await connection.getServicesConfig(hid, services[i].sid);
-          services[i].mobiusSettings = fullServiceConfig.value.serviceConfig.settings;
-          services[i].customSettings = fullServiceConfig.value.serviceConfig.custom;
+        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;
+          }
         }
 
-        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.5",
+  "version": "2.5.86-beta.53",
   "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": {