node-red-contrib-mobius-flow-base 3.0.0-rc.8 → 3.0.0

package/dist/engine-websocket.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { EventEmitter } from 'stream';
 type WebSocketTopics = 'authorize' | 'subscribe' | 'unsubscribe' | 'connected' | 'authorized' | 'object-cov' | 'resource-cov' | 'service-status' | 'broadcast-command' | 'error' | 'ping' | 'pong';
 interface EngineWebSocketInterface {

package/dist/nodes/common/mobsearch.js

@@ -22,610 +22,621 @@
     containerRowName: 'node-input-resources-container-row',
     containerName: 'node-input-resources-container',
     containerSecondFieldName: 'node-input-resources-comment',
+    filterPids: ['0050', '005A'],
   };
   EXAMPLE OPTS OBJECT - context of getResource (standard node, not using editable list)
   opts = {
     htmlElementId: 'mobsearch',
     uriFieldName: 'node-input-resource',
-    inputRowId: 'input-row',
+    searchButtonId: 'node-lookup-instance',
+    removeWildcards: true,
+    filterPids: ['0050', '005A'],
   };
  * 
  * 
  * 
  */
 
-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(mobiusSrvc, field, rowIndex, opts) {
-  if (mobiusSrvc !== '_ADD_') {
-    $.getJSON(`mgetconnected?mobius=${mobiusSrvc}`, function (response) {
-      if (!response) {
-        field.css('color', '#CCCCCC');
-      } else {
-        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();
-        });
-      }
-    });
-  } else {
-    field.css('color', '#CCCCCC');
-  }
-}
-
-/**
- *
- * @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="bad-connection-alert" style="color:#FF0000" align="center">
-    <p>Setup and deploy MOBiUS connection to allow search.</p>
-  </div>
-  <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>
-  `;
-
-  // * END HTML INJECTION * //
-
-  // * INIT SETUP * //
-
-  let mobConnected = false;
-  $.getJSON(`mgetconnected?mobius=${mobiusSrvc}`, function (response) {
-    mobConnected = response;
-    if (!mobConnected) {
-      $(`#${opts.searchButtonId}`).css('color', '#CCCCCC');
-      $('#bad-connection-alert').show();
-    } else {
-      $('#bad-connection-alert').hide();
-      $.getJSON(`mgethid?mobius=${mobiusSrvc}`, function (response) {
-        $('#instance-search-hid').val(response);
-      });
-    }
-  });
-
-  $('#instance-search-row').hide();
-  $('#wildcard-alert-row').hide();
-  $('#node-search-return').addClass('disabled');
-  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 RIDs options for a given PID
-   * @param {object} objects - Response from call to Mobiu, list of mobius objects
-   * @param {string} pid - The chosen PID
-   */
-  function ridSearch(objects, ins) {
-    $.getJSON(
-      `mgetresourceoptions?mobius=${mobiusSrvc}&hid=${searchObject.hid}&pid=${searchObject.pid}`,
-      (response) => {
-        resList = response;
-        ress = opts.removeWildcards ? [] : ['#'];
-        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', '');
-      }
-    );
+  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;
   }
-
+  
   /**
-   * 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 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 insSearch(objects, pid) {
-    $('#instance-search-rid').removeAttr("disabled");
-    let inss = opts.removeWildcards ? [] : ['#', '+'];
-    for (let i = 0; i < objects.length; i++) {
-      if (objects[i].pid === pid) {
-        const name = objects[i].name ? objects[i].name : '';
-        if (name === '') {
-          inss.push(objects[i].ins);
+  function addMobsearchListButton(mobiusSrvc, field, rowIndex, opts) {
+    if (mobiusSrvc !== '_ADD_') {
+      $.getJSON(`mgetconnected?mobius=${mobiusSrvc}`, function (response) {
+        if (!response) {
+          field.css('color', '#CCCCCC');
         } else {
-          inss.push(`${objects[i].ins} - ${name}`);
+          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();
+          });
         }
-      }
+      });
+    } else {
+      field.css('color', '#CCCCCC');
     }
-    $('#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();
-          if (searchObject.ins === '#') {
-            $('#instance-search-rid').attr("disabled", "disabled");
-          }
-        },
-      })
-      .autocomplete('search', '');
   }
-
+  
   /**
-   * Search for PIDs present on selected service
-   * @param {object} objects - Response from call to Mobius, list of mobius objects
+   *
+   * @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 pidsSearch(objects) {
-    $('#instance-search-ins').removeAttr("disabled");
-    $('#instance-search-rid').removeAttr("disabled");
-    searchObject.objects = objects;
-    let pids = opts.removeWildcards ? [] : ['#', '+'];
-    for (let i = 0; i < objects.length; i++) {
-      pids.push(`${objects[i].pid} - ${objects[i].profileName}`);
+  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="bad-connection-alert" style="color:#FF0000" align="center">
+      <p>Setup and deploy MOBiUS connection to allow search.</p>
+    </div>
+    <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>
+    `;
+  
+    // * END HTML INJECTION * //
+  
+    // * INIT SETUP * //
+  
+    let mobConnected = false;
+    $.getJSON(`mgetconnected?mobius=${mobiusSrvc}`, function (response) {
+      mobConnected = response;
+      if (!mobConnected) {
+        $(`#${opts.searchButtonId}`).css('color', '#CCCCCC');
+        $('#bad-connection-alert').show();
+      } else {
+        $('#bad-connection-alert').hide();
+        $.getJSON(`mgethid?mobius=${mobiusSrvc}`, function (response) {
+          $('#instance-search-hid').val(response);
+        });
+      }
+    });
+  
+    $('#instance-search-row').hide();
+    $('#wildcard-alert-row').hide();
+    $('#node-search-return').addClass('disabled');
+    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: [],
+      };
     }
-    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));
+  
+    // * END INIT SETUP * //
+  
+    /**
+     * Search for RIDs options for a given PID
+     * @param {object} objects - Response from call to Mobiu, list of mobius objects
+     * @param {string} pid - The chosen PID
+     */
+    function ridSearch(objects, ins) {
+      $.getJSON(
+        `mgetresourceoptions?mobius=${mobiusSrvc}&hid=${searchObject.hid}&pid=${searchObject.pid}`,
+        (response) => {
+          resList = response;
+          ress = opts.removeWildcards ? [] : ['#'];
+          for (let j = 0; j < resList.length; j++) {
+            ress.push(`${resList[j].rid} - ${resList[j].name}`);
           }
-          searchObject.pid = $('#instance-search-pid').val();
-          if (searchObject.pid === '#') {
-            $('#instance-search-ins').attr("disabled", "disabled");
-            $('#instance-search-rid').attr("disabled", "disabled");
+          $('#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) {
+      $('#instance-search-rid').removeAttr("disabled");
+      let inss = opts.removeWildcards ? [] : ['#', '+'];
+      for (let i = 0; i < objects.length; i++) {
+        if (objects[i].pid === pid) {
+          const name = objects[i].name ? objects[i].name : '';
+          if (name === '') {
+            inss.push(objects[i].ins);
+          } else {
+            inss.push(`${objects[i].ins} - ${name}`);
           }
-        },
-      })
-      .autocomplete('search', '');
-  }
-
-  /**
-   * Search for SIDs, and then fetch child objects based on selection
-   * @param {object} response - Response from call to Mobius
-   */
-  function serviceSearch(response) {
-    $('#instance-search-pid').removeAttr("disabled");
-    $('#instance-search-ins').removeAttr("disabled");
-    $('#instance-search-rid').removeAttr("disabled");
-    let services = opts.removeWildcards ? [] : ['#', '+'];
-    for (let i = 0; i < response.length; i++) {
-      if (response[i].sid !== '009') {
-        services.push(`${response[i].sid} - ${response[i].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();
+            if (searchObject.ins === '#') {
+              $('#instance-search-rid').attr("disabled", "disabled");
+            }
+          },
+        })
+        .autocomplete('search', '');
     }
-    $('#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));
+  
+    /**
+     * Search for PIDs present on selected service
+     * @param {object} objects - Response from call to Mobius, list of mobius objects
+     */
+    function pidsSearch(objects) {
+      $('#instance-search-ins').removeAttr("disabled");
+      $('#instance-search-rid').removeAttr("disabled");
+      searchObject.objects = objects;
+      let pids = opts.removeWildcards ? [] : ['#', '+'];
+      for (let i = 0; i < objects.length; i++) {
+        if (opts.filterPids) {
+          console.log(opts.filterPids);
+          if (opts.filterPids.includes(objects[i].pid)) {
+            pids.push(`${objects[i].pid} - ${objects[i].profileName}`);
           }
-          searchObject.sid = $('#instance-search-sid').val();
-          if (searchObject.sid === '#') {
-            $('#instance-search-pid').attr("disabled", "disabled");
-            $('#instance-search-ins').attr("disabled", "disabled");
-            $('#instance-search-rid').attr("disabled", "disabled");
-            return;
-          };
-          if (searchObject.sid === '+') {
-            for (let i = 2; i < services.length; i++) {
-              if (services[i].substring(0, 3).length !== 3) {
+        } else {
+          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();
+            if (searchObject.pid === '#') {
+              $('#instance-search-ins').attr("disabled", "disabled");
+              $('#instance-search-rid').attr("disabled", "disabled");
+            }
+          },
+        })
+        .autocomplete('search', '');
+    }
+  
+    /**
+     * Search for SIDs, and then fetch child objects based on selection
+     * @param {object} response - Response from call to Mobius
+     */
+    function serviceSearch(response) {
+      $('#instance-search-pid').removeAttr("disabled");
+      $('#instance-search-ins').removeAttr("disabled");
+      $('#instance-search-rid').removeAttr("disabled");
+      let services = opts.removeWildcards ? [] : ['#', '+'];
+      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 === '#') {
+              $('#instance-search-pid').attr("disabled", "disabled");
+              $('#instance-search-ins').attr("disabled", "disabled");
+              $('#instance-search-rid').attr("disabled", "disabled");
+              return;
+            };
+            if (searchObject.sid === '+') {
+              for (let i = 2; i < services.length; i++) {
+                if (services[i].substring(0, 3).length !== 3) {
+                  return;
+                }
+                $.getJSON(
+                  `mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${services[
+                    i
+                  ].substring(0, 3)}`,
+                  (objects) => {
+                    searchObject.objects = searchObject.objects.concat(objects);
+                  }
+                );
+              }
+            } else {
+              if (searchObject.sid.length !== 3) {
                 return;
               }
               $.getJSON(
-                `mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${services[
-                  i
-                ].substring(0, 3)}`,
+                `mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${searchObject.sid}`,
                 (objects) => {
-                  searchObject.objects = searchObject.objects.concat(objects);
+                  searchObject.objects = objects;
                 }
               );
             }
-          } else {
-            if (searchObject.sid.length !== 3) {
-              return;
-            }
-            $.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');
-        }
-      );
+          },
+        })
+        .autocomplete('search', '');
     }
-  }
-
-  // Used to temporarily store updated list items
-  let tempList = [];
-
-  /**
-   * 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);
+  
+    /**
+     * 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');
+          }
+        );
+      }
     }
-    if (listed) {
-      tempList = JSON.parse(JSON.stringify(opts.list)); // Pre List
-      if (tempList.length === selectionIndex) {
-        tempList.push({uri, type: 'unknown'})
+  
+    // Used to temporarily store updated list items
+    let tempList = [];
+  
+    /**
+     * 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) {
+        tempList = JSON.parse(JSON.stringify(opts.list)); // Pre List
+        if (tempList.length === selectionIndex) {
+          tempList.push({uri, type: 'unknown'})
+        } else {
+          tempList[selectionIndex].uri = uri;
+        }
+        updateList();
+        opts.list = JSON.parse(JSON.stringify(tempList)); // Set log
       } else {
-        tempList[selectionIndex].uri = uri;
+        $(`#${opts.uriFieldName}`).val(uri);
+        document.getElementById(opts.uriFieldName).dispatchEvent(new Event('change'));
+        $(`#${opts.searchButtonId}`).removeClass('disabled');
       }
-      updateList();
-      opts.list = JSON.parse(JSON.stringify(tempList)); // Set log
-    } else {
-      $(`#${opts.uriFieldName}`).val(uri);
-      document.getElementById(opts.uriFieldName).dispatchEvent(new Event('change'));
-      $(`#${opts.searchButtonId}`).removeClass('disabled');
-    }
-    $('#node-search-accept').css('color', '#CCCCCC');
-    readyToAccept = false;
-    $('#node-search-return').addClass('disabled');
-    $('#node-search-accept').addClass('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() {
-    const wildcardPass = !opts.removeWildcards && ($('#instance-search-sid').val() === '#' ||
-    $('#instance-search-pid').val() === '#' ||
-    $('#instance-search-ins').val() === '#' ||
-    $('#instance-search-rid').val() === '#')
-    if (
-      ($('#instance-search-hid').val() !== '' &&
-        $('#instance-search-sid').val() !== '' &&
-        $('#instance-search-pid').val() !== '' &&
-        $('#instance-search-ins').val() !== '' &&
-        $('#instance-search-rid').val() !== '') || wildcardPass
-    ) {
-      $('#node-search-accept').css('color', '#555555');
-      readyToAccept = true;
-    } else {
       $('#node-search-accept').css('color', '#CCCCCC');
       readyToAccept = false;
+      $('#node-search-return').addClass('disabled');
+      $('#node-search-accept').addClass('disabled');
+      $('#instance-search-row').hide();
+      $('#instance-row').show();
     }
-  }
-
-  /**
-   * Check state of all field to ins level, change state of accept button accordingly
-   */
-  function checkFieldsToIns() {
-    const wildcardPass = !opts.removeWildcards && ($('#instance-search-sid').val() === '#' ||
-    $('#instance-search-pid').val() === '#' ||
-    $('#instance-search-ins').val() === '#')
-    if (
-      ($('#instance-search-hid').val() !== '' &&
-        $('#instance-search-sid').val() !== '' &&
-        $('#instance-search-pid').val() !== '' &&
-        $('#instance-search-ins').val() !== '') || wildcardPass
-    ) {
-      $('#node-search-accept').css('color', '#555555');
-      readyToAccept = true;
-    } else {
-      $('#node-search-accept').css('color', '#CCCCCC');
-      readyToAccept = false;
+  
+    /**
+     * Update if accept button is grade out and functional, based on conditions of fields
+     */
+    function acceptCheck() {
+      if (useRid) {
+        checkFieldsToRid();
+      } else {
+        checkFieldsToIns();
+      }
+      checkWildcards();
     }
-  }
-
-  /**
-   * 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();
+  
+    /**
+     * Check state of all field to rid level, change state of accept button accordingly
+     */
+    function checkFieldsToRid() {
+      const wildcardPass = !opts.removeWildcards && ($('#instance-search-sid').val() === '#' ||
+      $('#instance-search-pid').val() === '#' ||
+      $('#instance-search-ins').val() === '#' ||
+      $('#instance-search-rid').val() === '#')
+      if (
+        ($('#instance-search-hid').val() !== '' &&
+          $('#instance-search-sid').val() !== '' &&
+          $('#instance-search-pid').val() !== '' &&
+          $('#instance-search-ins').val() !== '' &&
+          $('#instance-search-rid').val() !== '') || wildcardPass
+      ) {
+        $('#node-search-accept').css('color', '#555555');
+        readyToAccept = true;
+      } else {
+        $('#node-search-accept').css('color', '#CCCCCC');
+        readyToAccept = false;
+      }
     }
-  }
-
-  /**
-   * 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();
-        tempList[i][Object.keys(tempList[i])[1]] = JSON.parse(JSON.stringify(secondField));
-      });
-    $(`#${opts.containerName}`).editableList('empty');
-    for (let i = 0; i < tempList.length; i++) {
-      let item = tempList[i];
-      $(`#${opts.containerName}`).editableList('addItem', item);
+  
+    /**
+     * Check state of all field to ins level, change state of accept button accordingly
+     */
+    function checkFieldsToIns() {
+      const wildcardPass = !opts.removeWildcards && ($('#instance-search-sid').val() === '#' ||
+      $('#instance-search-pid').val() === '#' ||
+      $('#instance-search-ins').val() === '#')
+      if (
+        ($('#instance-search-hid').val() !== '' &&
+          $('#instance-search-sid').val() !== '' &&
+          $('#instance-search-pid').val() !== '' &&
+          $('#instance-search-ins').val() !== '') || wildcardPass
+      ) {
+        $('#node-search-accept').css('color', '#555555');
+        readyToAccept = true;
+      } else {
+        $('#node-search-accept').css('color', '#CCCCCC');
+        readyToAccept = false;
+      }
     }
-    $(`#${opts.containerRowName}`).show();
-  }
-
-  // * CLICK RESPONSE * //
-
-  $(`#${opts.searchButtonId}`).click(function () {
-    if (mobConnected) {
-      //When search button is clicked
-      $('#instance-search-sid').val('');
+  
+    /**
+     * 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();
+          tempList[i][Object.keys(tempList[i])[1]] = JSON.parse(JSON.stringify(secondField));
+        });
+      $(`#${opts.containerName}`).editableList('empty');
+      for (let i = 0; i < tempList.length; i++) {
+        let item = tempList[i];
+        $(`#${opts.containerName}`).editableList('addItem', item);
+      }
+      $(`#${opts.containerRowName}`).show();
+    }
+  
+    // * CLICK RESPONSE * //
+  
+    $(`#${opts.searchButtonId}`).click(function () {
+      if (mobConnected) {
+        //When search button is clicked
+        $('#instance-search-sid').val('');
+        $('#instance-search-pid').val('');
+        $('#instance-search-ins').val('');
+        if (useRid) {
+          $('#instance-search-rid').val('');
+        }
+        $(`#${opts.searchButtonId}`).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 = '';
       }
-      $(`#${opts.searchButtonId}`).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);
+      if (searchObject.sid !== '') {
+        pidsSearch(searchObject.objects);
       }
     });
-  }
-
-  $('#node-search-return').click(function () {
-    //Return/Back button clicked
-    $('#node-search-return').addClass('disabled');
-    $('#node-search-accept').addClass('disabled');
-    $(`#${opts.searchButtonId}`).removeClass('disabled');
-    $('#instance-search-row').hide();
-    $('#instance-row').show();
-    $(`#${opts.containerRowName}`).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('');
+    $('#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').val('');
+      $('#instance-search-rid').click(function () {
+        //RID clicked
+        if (
+          searchObject.ins !== '' &&
+          searchObject.ins !== '+' &&
+          searchObject.pid !== '+' &&
+          searchObject.sid !== '+'
+        ) {
+          ridSearch(searchObject.objects, searchObject.ins);
+        }
+      });
     }
-  });
-
-  $('#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();
+  
+    $('#node-search-return').click(function () {
+      //Return/Back button clicked
+      $('#node-search-return').addClass('disabled');
+      $('#node-search-accept').addClass('disabled');
+      $(`#${opts.searchButtonId}`).removeClass('disabled');
+      $('#instance-search-row').hide();
+      $('#instance-row').show();
+      $(`#${opts.containerRowName}`).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);
+    }
   }
-
-  // * END CHANGE RESPONSE * //
-
-  // reset input filed after init
-  if (!listed) {
-    $(`#${opts.uriFieldName}`).val(uriFieldValue);
-  }
-}
+  

package/dist/nodes/mobius-connection.html

@@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
     <div style="white-space: nowrap; display: inline-block;"><label for="node-config-input-host" style="width: 100px;" ><i class="fa fa-globe"></i> Host <span id="hostLabel" style="color: grey;">?</span></label></div>
     <input class="input-append-left" type="text" id="node-config-input-host" placeholder="e.g. localhost" style="width: 70%;" >
   </div>
-  <p style="text-align:center"> Ensure port number is included in host path in required</p>
+  <p style="text-align:center"> Ensure port number is included in host path if required</p>
   <p style="text-align:center"> e.g. <b>myHostname:8443</b></p>
   <hr>
   <div class="form-row">

package/dist/nodes/mobius-flow-inject.html

@@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
     <input type="text" id="node-input-connection">
   </div>
   <div id="node-input-subs-container-row" class="form-row node-input-subs-container-row">
-    <label for="node-input-subs-container"><i class="fa fa-bars"></i> Subscriptions</label>
+    <label for="node-input-subs-container" style="width: 100%"><i class="fa fa-bars"></i> Subscriptions</label>
       <ol id="node-input-subs-container"></ol>
   </div>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-mobius-flow-base",
-  "version": "3.0.0-rc.8",
+  "version": "3.0.0",
   "description": "Node-RED base nodes for Mobius Flow",
   "main": "index.js",
   "types": "dist/index.d.ts",
@@ -8,7 +8,10 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "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",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/mobiusflow/node-red-contrib-mobius-flow-base.git"
+  },
   "node-red": {
     "nodes": {
       "mobius connection": "dist/nodes/mobius-connection.js",