node-red-contrib-mobius-flow-base 2.5.86-beta.8 → 2.5.86-beta.83

package/dist/nodes/common/mobsearch.js

@@ -0,0 +1,575 @@
+/**
+ *
+ * @param mobiusSrvc - Connection to Mobius
+ * @param {object} opts - Options object, field explained below
+
+  OPTS OBJECT (opts.)
+  ALL CASES
+    htmlElementId - The id of the HTML element that mobsearch will inject into
+  NON-LISTED ONLY
+    uriFieldName - The id of the URI HTML field, mobsearch will set the value of this field to be the result
+    inputRowId - The id of the main input, mobsearch will add the search button to this row
+  LISTED ONLY (Uses editable list)
+    list - Array containing current list items in object form
+    containerRowName - The id of the row containing the HTML container
+    containerName - The id of the HTML container
+    containerSecondFieldName - The id of the secondary field (Not URI field) within HTML container
+
+  EXAMPLE OPTS OBJECT - context of getMultiResource (node using editable list)
+  opts = {
+    htmlElementId: 'mobsearch',
+    list: node.resources,
+    containerRowName: 'node-input-resources-container-row',
+    containerName: 'node-input-resources-container',
+    containerSecondFieldName: 'node-input-resources-comment',
+  };
+  EXAMPLE OPTS OBJECT - context of getResource (standard node, not using editable list)
+  opts = {
+    htmlElementId: 'mobsearch',
+    uriFieldName: 'node-input-resource',
+    inputRowId: 'input-row',
+  };
+ * 
+ * 
+ * 
+ */
+initMobsearch = {
+  // Standard mobsearch to rid level
+  toRid: (mobiusSrvc, opts) => {
+    getMobsearch(mobiusSrvc, true, false, opts);
+  },
+  // Standard mobsearch to ins level
+  toIns: (mobiusSrvc, opts) => {
+    getMobsearch(mobiusSrvc, false, false, opts);
+  },
+  // Mobsearch to rid level, for nodes using editable list
+  toRid_listed: (mobiusSrvc, opts) => {
+    getMobsearch(mobiusSrvc, true, true, opts);
+  },
+  // Mobsearch to ins level, for nodes using editable list
+  toIns_listed: (mobiusSrvc, opts) => {
+    getMobsearch(mobiusSrvc, false, true, opts);
+  },
+};
+
+// Make / Reset global selectionIndex vairable (variable to allow setting of correct list field)
+if (typeof selectionIndex === undefined) {
+  let selectionIndex = 0;
+}
+
+/**
+ * function to add search button functionality to list rows
+ * @param {object} field - The search field within a given list row
+ * @param {number} rowIndex - The list row index
+ * @param {object} opts - Mobsearch options object
+ */
+function addMobsearchListButton(field, rowIndex, opts) {
+  field.click(function () {
+    selectionIndex = rowIndex;
+    $(`#${opts.containerRowName}`).hide();
+    $('#instance-search-sid').val('');
+    $('#instance-search-pid').val('');
+    $('#instance-search-ins').val('');
+    $('#instance-search-rid').val('');
+    $('#node-search-return').removeClass('disabled');
+    $('#node-search-accept').removeClass('disabled');
+    $('#instance-search-row').show();
+  });
+}
+
+/**
+ *
+ * @param mobiusSrvc - Connection to Mobius
+ * @param {boolean} useRid - Flag for Mobsearch to include rid field
+ * @param {boolean} listed - Flag for Mobsearch work with nodes using editableLists
+ * @param {object} opts - Mobsearhc options object
+ */
+function getMobsearch(mobiusSrvc, useRid, listed, opts) {
+  selectionIndex = 0;
+  // Get current state of input field
+  let uriFieldValue = '';
+  if (!listed) {
+    uriFieldValue = $(`#${opts.uriFieldName}`).val();
+  }
+
+  // * HTML INJECTION * //
+
+  const resourceHtml = `
+  <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">
+  `;
+
+  const instanceHtml = `
+  <input type="text" id="instance-search-hid" style="width:15%;" placeholder="HID">
+  <input type="text" id="instance-search-sid" style="width:10%;" 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">
+  `;
+
+  //set level dependent html
+  let rows = useRid === true ? resourceHtml : instanceHtml;
+  let alertMsg = useRid === true ? `and/or RID ` : ``;
+
+  //Inject new html
+  document.getElementById(opts.htmlElementId).innerHTML += `
+  <div id="instance-search-row">
+    <div class="form-row">
+      <label for="instance-search-sid"><i class="fa fa-tasks"></i> URI</label>
+      ${rows}
+      <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 ${alertMsg}manually.</p>
+  </div>
+  `;
+
+  if (!listed) {
+    //Add search button
+    document.getElementById(opts.inputRowId).innerHTML += `
+    <a id="node-lookup-instance" class="searchbutton" style="vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
+    `;
+  }
+
+  // * END HTML INJECTION * //
+
+  // * INIT 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 = {};
+  if (listed) {
+    searchObject = {
+      hid: '',
+      sid: '',
+      pid: '',
+      ins: '',
+      rid: '',
+      objects: [],
+    };
+  } else {
+    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: [],
+    };
+  }
+
+  // * END INIT SETUP * //
+
+  /**
+   * Search for INSs present on selected PID
+   * @param {object} objects - Response from call to Mobiu, list of mobius objects
+   * @param {string} pid - The chosen PID
+   */
+  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', '');
+      }
+    );
+  }
+
+  /**
+   * Search for INSs present on selected PID
+   * @param {object} objects - Response from call to Mobius, list of mobius objects
+   * @param {string} pid - The chosen PID
+   */
+  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', '');
+  }
+
+  /**
+   * Search for PIDs present on selected service
+   * @param {object} objects - Response from call to Mobius, list of mobius objects
+   */
+  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', '');
+  }
+
+  /**
+   * Search for SIDs, and then fetch child objects based on selection
+   * @param {object} response - Response from call to Mobius
+   */
+  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 mobsearch
+   */
+  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('Mobsearch failed to contact Mobius');
+        }
+      );
+    }
+  }
+
+  /**
+   * Finish mobsearch, compile full URI and set value in host node
+   */
+  function finishSearch() {
+    $('#wildcard-alert-row').hide();
+    let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}`;
+    if (useRid) {
+      uri = uri + `/${searchObject.rid}`;
+    }
+    if (uri.includes('#')) {
+      uri = uri.substring(0, uri.indexOf('#') + 1);
+    }
+    if (listed) {
+      opts.list[selectionIndex].uri = uri;
+      updateList();
+    } else {
+      $(`#${opts.uriFieldName}`).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();
+  }
+
+  /**
+   * Update if accept button is grade out and functional, based on conditions of fields
+   */
+  function acceptCheck() {
+    if (useRid) {
+      checkFieldsToRid();
+    } else {
+      checkFieldsToIns();
+    }
+    checkWildcards();
+  }
+
+  /**
+   * Check state of all field to rid level, change state of accept button accordingly
+   */
+  function checkFieldsToRid() {
+    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;
+    }
+  }
+
+  /**
+   * Check state of all field to ins level, change state of accept button accordingly
+   */
+  function checkFieldsToIns() {
+    if (
+      ($('#instance-search-hid').val() !== '' &&
+        $('#instance-search-sid').val() !== '' &&
+        $('#instance-search-pid').val() !== '' &&
+        $('#instance-search-ins').val() !== '') ||
+      $('#instance-search-sid').val() === '#' ||
+      $('#instance-search-pid').val() === '#' ||
+      $('#instance-search-ins').val() === '#'
+    ) {
+      $('#node-search-accept').css('color', '#555555');
+      readyToAccept = true;
+    } else {
+      $('#node-search-accept').css('color', '#CCCCCC');
+      readyToAccept = false;
+    }
+  }
+
+  /**
+   * Checks if + wildcard values are present, shows / hides alert message accordingly
+   */
+  function checkWildcards() {
+    if (
+      $('#instance-search-sid').val() !== '+' &&
+      $('#instance-search-pid').val() !== '+' &&
+      $('#instance-search-ins').val() !== '+'
+    ) {
+      $('#wildcard-alert-row').hide();
+    } else {
+      $('#wildcard-alert-row').show();
+    }
+  }
+
+  /**
+   * Update editable list with results from mobsearch
+   */
+  function updateList() {
+    $(`#${opts.containerName}`)
+      .editableList('items')
+      .each(function (i) {
+        let item = $(this);
+        let secondField = item.find(`.${opts.containerSecondFieldName}`).val();
+        opts.list[i][Object.keys(opts.list[i])[1]] = secondField;
+      });
+    $(`#${opts.containerName}`).editableList('empty');
+    for (let i = 0; i < opts.list.length; i++) {
+      let item = opts.list[i];
+      $(`#${opts.containerName}`).editableList('addItem', item);
+    }
+    $(`#${opts.containerRowName}`).show();
+  }
+
+  // * CLICK RESPONSE * //
+
+  $('#node-lookup-instance').click(function () {
+    //When search button is clicked
+    $('#instance-search-sid').val('');
+    $('#instance-search-pid').val('');
+    $('#instance-search-ins').val('');
+    if (useRid) {
+      $('#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 = '';
+    if (useRid) {
+      searchObject.rid = '';
+    }
+    searchObject.objects = [];
+    startSearch();
+  });
+  $('#instance-search-pid').click(function () {
+    //PID field clicked
+    $('#instance-search-ins').val('');
+
+    searchObject.ins = '';
+
+    if (useRid) {
+      $('#instance-search-rid').val('');
+      searchObject.rid = '';
+    }
+    if (searchObject.sid !== '') {
+      pidsSearch(searchObject.objects);
+    }
+  });
+  $('#instance-search-ins').click(function () {
+    //INS field clicked
+    if (useRid) {
+      $('#instance-search-rid').val('');
+      searchObject.rid = '';
+    }
+    if (searchObject.pid !== '' && searchObject.pid !== '+' && searchObject.sid !== '+') {
+      insSearch(searchObject.objects, searchObject.pid);
+    }
+  });
+
+  if (useRid) {
+    $('#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();
+    }
+  });
+
+  // * END CLICK RESPONSE * //
+
+  // * CHANGE RESPONSE * //
+
+  $('#instance-search-hid').change(function () {
+    acceptCheck();
+    $('#instance-search-sid').val('');
+    $('#instance-search-pid').val('');
+    $('#instance-search-ins').val('');
+    if (useRid) {
+      $('#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();
+  });
+
+  if (useRid) {
+    $('#instance-search-rid').change(function () {
+      searchObject.rid = $('#instance-search-rid').val();
+      acceptCheck();
+    });
+  }
+
+  // * END CHANGE RESPONSE * //
+
+  // reset input filed after init
+  if (!listed) {
+    $(`#${opts.uriFieldName}`).val(uriFieldValue);
+  }
+}

package/dist/nodes/mobius-connection.js

@@ -193,6 +193,42 @@ module.exports = function (RED) {
       });
     };
 
+    /**
+     * Update a given node's node status based on last active time
+     * @param  {Object} mobiusNode - The node whos status is to be updated
+     */
+    node.updateNodeStatus = function (mobiusNode) {
+      node.users[mobiusNode.id] = mobiusNode;
+      const timeSinceLastActive = Date.now() - node.users[mobiusNode.id].lastActiveTime;
+      let statusText = '';
+      let statusColour = 'green';
+      if (timeSinceLastActive < 15 * 60000) {
+        statusText = 'Active less than 15 minutes ago';
+      }
+      if (timeSinceLastActive >= 15 * 60000 && timeSinceLastActive < 3 * 60 * 60000) {
+        statusText = 'Active less than 3 hours ago';
+      }
+      if (timeSinceLastActive >= 3 * 60 * 60000 && timeSinceLastActive < 12 * 60 * 60000) {
+        statusText = 'Active less than 12 hours ago';
+      }
+      if (timeSinceLastActive >= 12 * 60 * 60000 && timeSinceLastActive < 24 * 60 * 60000) {
+        statusText = 'Active less than 24 hours ago';
+      }
+      if (timeSinceLastActive > 24 * 60 * 60000 && node.users[mobiusNode.id].lastActiveTime > 0) {
+        statusColour = 'grey';
+        statusText = 'Active more than 24 hours ago';
+      }
+      if (node.users[mobiusNode.id].lastActiveTime === 0) {
+        statusColour = 'grey';
+        statusText = 'Never Active';
+      }
+      node.users[mobiusNode.id].status({
+        fill: statusColour,
+        shape: 'dot',
+        text: statusText,
+      });
+    };
+
     /**
      * Register a new Mobius node with this config node
      * @param  {Object} mobiusNode - The new node to register
@@ -206,6 +242,17 @@ module.exports = function (RED) {
           text: 'Connected',
         });
       }
+      node.users[mobiusNode.id].lastActiveTime = 0;
+      node.users[mobiusNode.id].on('send', () => {
+        console.log('lalala');
+        console.log(Date.now());
+        node.users[mobiusNode.id].lastActiveTime = Date.now();
+        node.updateNodeStatus(mobiusNode);
+        console.log(node.users[mobiusNode.id].lastActiveTime);
+      });
+      node.users[mobiusNode.id].statusCheckLoop = setInterval(() => {
+        node.updateNodeStatus(mobiusNode);
+      }, 60000);
     };
 
     /**
@@ -214,6 +261,7 @@ module.exports = function (RED) {
      * @param  {Function} done       - A callback to be run by the node after it has been deregistered
      */
     node.deregister = function (mobiusNode, done) {
+      clearInterval(node.users[mobiusNode.id].statusCheckLoop);
       delete node.users[mobiusNode.id];
       if (node.service) {
         try {
@@ -520,30 +568,6 @@ module.exports = function (RED) {
     node.updateObjectInServiceConfig = function (hid, sid, pid, ins, config, callback) {
       node.service.srvcAPI.updateObjectInServiceConfig(hid, sid, pid, ins, config, callback);
     };
-
-    node.getNodeConfig = function (hid) {
-      return new Promise((resolve, reject) => {
-        node.service.srvcAPI.getNodeConfig(hid, (err, response) => {
-          if (!err) {
-            resolve(response);
-          } else {
-            reject(err);
-          }
-        });
-      });
-    };
-
-    node.getServiceConfigProm = function (hid, sid) {
-      return new Promise((resolve, reject) => {
-        node.service.srvcAPI.getServiceConfig(hid, sid, (err, response) => {
-          if (!err) {
-            resolve(response);
-          } else {
-            reject(err);
-          }
-        });
-      });
-    };
   }
 
   RED.nodes.registerType('mobius connection', MobiusConnectionNode);
@@ -604,42 +628,4 @@ module.exports = function (RED) {
       }
     }
   );
-
-  // Register the endpoint for node-red mobius discovery in node-red node config pages
-  RED.httpAdmin.get('/mdiscover', RED.auth.needsPermission('serial.read'), function (req, res) {
-    let conn = RED.nodes.getNode(req.query.mobius);
-    let uri = req.query.uri;
-    if (conn === null || !conn.service.connected) {
-      RED.log.error('Discover services failed - could not to connect to MOBiUS hub.');
-      throw new Error('Discover services failed - could not to connect to MOBiUS hub.');
-    } else {
-      uiDeviceDiscovery
-        .discover(conn, uri)
-        .then((response) => {
-          res.json(response);
-        })
-        .catch((err) => {
-          throw err;
-        });
-    }
-  });
-
-  // Register the endpoint for node-red mobius discovery in node-red node config pages
-  RED.httpAdmin.get('/mgetservices', RED.auth.needsPermission('serial.read'), function (req, res) {
-    let conn = RED.nodes.getNode(req.query.mobius);
-    let hid = req.query.hid;
-    if (conn === null || !conn.service.connected) {
-      RED.log.error('Get services failed - could not to connect to MOBiUS hub.');
-      throw new Error('Get services failed - could not to connect to MOBiUS hub.');
-    } else {
-      uiDeviceDiscovery
-        .getServiceList(conn, hid)
-        .then((response) => {
-          res.json(response);
-        })
-        .catch((err) => {
-          RED.log.warn(`Get services failed - ${err}`);
-        });
-    }
-  });
 };

package/dist/nodes/mobius-object-cov.js

@@ -29,7 +29,7 @@
 var _ = require('lodash');
 
 module.exports = function (RED) {
-  function MobiusObjectCovNode (n) {
+  function MobiusObjectCovNode(n) {
     RED.nodes.createNode(this, n);
     this.detailedOutput = n.detailedOutput;
     this.object = n.object;
@@ -42,16 +42,19 @@ module.exports = function (RED) {
       node.status({
         fill: 'red',
         shape: 'ring',
-        text: 'Disconnected'
+        text: 'Disconnected',
       });
 
       node.serviceConn.subscribeToObjectCOV(node.object, this.id, (response) => {
         node.status({
           fill: 'green',
           shape: 'dot',
-          text: JSON.stringify(response.uri)
+          text: JSON.stringify(response.uri),
         });
-        let allResources = _.keyBy(response.value.resources, node.format === 'name' ? 'name' : 'rid');
+        let allResources = _.keyBy(
+          response.value.resources,
+          node.format === 'name' ? 'name' : 'rid'
+        );
         if (node.include === 'changed') {
           allResources = _.pickBy(allResources, (res) => {
             return response.changed.includes(res.rid);
@@ -61,7 +64,7 @@ module.exports = function (RED) {
           node.send([
             { topic: response.uri, payload: allResources },
             { topic: response.uri, payload: response.value },
-            { topic: response.uri, payload: { response: response } }
+            { topic: response.uri, payload: { response: response } },
           ]);
         } else {
           node.send({ topic: response.uri, payload: allResources });
@@ -69,6 +72,9 @@ module.exports = function (RED) {
       });
 
       node.serviceConn.register(node);
+      node.on('send', () => {
+        console.log('Send Detect');
+      });
 
       node.on('close', function (done) {
         node.serviceConn.deregister(node, done);

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,104 +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);
-        console.log(nodeConfig);
-        const servicesFromConfig = nodeConfig.value.services;
-        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,
-            registered: null,
-            lastConnected: null,
-            status: null,
-            statusText: null,
-            mobiusSettings: null,
-            customSettings: null,
-          });
-        }
-
-        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.getServiceConfigProm(hid, services[i].sid);
-          services[i].mobiusSettings = fullServiceConfig.value.serviceConfig.settings;
-          services[i].customSettings = fullServiceConfig.value.serviceConfig.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++) {
-          let serviceFound = false;
-          for (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,
-            });
-          }
-        }
-
-        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}`;
-        }
-
-        console.log('Complete');
-        console.log(services);
-
-        resolve(services);
-      } catch (err) {
-        reject(err);
-      }
-    });
-  },
+  }
 };

package/package.json

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