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

package/dist/engine-api-calls.d.ts

@@ -16,3 +16,4 @@ export declare const updateObject: (apiClient: AxiosInstance, uri: string, confi
 export declare const filterObjectsByRIDValue: (apiClient: AxiosInstance, uri: string, pids: string[], rid: string, limit: number, func: (v: string | number | boolean) => boolean, callback: Function) => Promise<any>;
 export declare const getHubId: (apiClient: AxiosInstance, callback: Function) => Promise<void>;
 export declare const getNodeConfig: (apiClient: AxiosInstance, uri: string, callback: Function) => Promise<void>;
+export declare const changeAdminPassword: (apiClient: AxiosInstance, password: string, callback: Function) => Promise<void>;

package/dist/engine-api-calls.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNodeConfig = exports.getHubId = exports.filterObjectsByRIDValue = exports.updateObject = exports.getServiceConfig = exports.sendDirectCommand = exports.sendBroadcastCommand = exports.readObject = exports.readResource = exports.clearResource = exports.writeMultiResource = exports.writeResource = exports.discover = void 0;
+exports.changeAdminPassword = exports.getNodeConfig = exports.getHubId = exports.filterObjectsByRIDValue = exports.updateObject = exports.getServiceConfig = exports.sendDirectCommand = exports.sendBroadcastCommand = exports.readObject = exports.readResource = exports.clearResource = exports.writeMultiResource = exports.writeResource = exports.discover = void 0;
 const discover = async (apiClient, uri, callback) => {
     try {
         const response = await apiClient({
@@ -212,3 +212,24 @@ const getNodeConfig = async (apiClient, uri, callback) => {
     }
 };
 exports.getNodeConfig = getNodeConfig;
+const changeAdminPassword = async (apiClient, password, callback) => {
+    try {
+        const response = await apiClient({
+            method: 'get',
+            url: `/auth/user/admin`,
+        });
+        const adminUserId = response.data;
+        await apiClient({
+            method: 'patch',
+            url: `/auth/user/password/${adminUserId}`,
+            data: {
+                password,
+            },
+        });
+        callback(null, 'Ok');
+    }
+    catch (err) {
+        callback(err);
+    }
+};
+exports.changeAdminPassword = changeAdminPassword;

package/dist/engine-api-client.d.ts

@@ -3,5 +3,6 @@ export declare let tokens: null | {
     refreshToken: string;
 };
 export declare let loggedIn: boolean;
-export declare const getApiClient: (protocol: string, host: string, port: number, username: string, password: string) => import("axios").AxiosInstance;
+export declare const getApiClient: (protocol: 'http' | 'https', host: string, port: number, username: string, password: string) => import("axios").AxiosInstance;
 export declare const setLoggedIn: (value: boolean) => void;
+export declare const closeApiClient: () => void;

package/dist/engine-api-client.js

@@ -3,12 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setLoggedIn = exports.getApiClient = exports.loggedIn = exports.tokens = void 0;
+exports.closeApiClient = exports.setLoggedIn = exports.getApiClient = exports.loggedIn = exports.tokens = void 0;
 const axios_1 = __importDefault(require("axios"));
 const engine_websocket_1 = require("./engine-websocket");
 exports.tokens = null;
 exports.loggedIn = false;
+let reloginInterval = null;
 const getApiClient = (protocol, host, port, username, password) => {
+    (0, engine_websocket_1.setWebSocketConnectParams)(host, port, protocol);
     //const baseURL = `http://localhost:8443/api/v1`;
     const baseURL = `${protocol}://${host}:${port}/api/v1`;
     const client = axios_1.default.create({
@@ -17,6 +19,11 @@ const getApiClient = (protocol, host, port, username, password) => {
             'Content-Type': 'application/json',
         },
     });
+    reloginInterval = setInterval(() => {
+        if (!exports.loggedIn) {
+            login();
+        }
+    }, 30000);
     // Add auth headers to all axios calls
     client.interceptors.request.use((config) => {
         if (!config.url?.endsWith('/auth/login')) {
@@ -29,6 +36,7 @@ const getApiClient = (protocol, host, port, username, password) => {
         Promise.reject(error);
     });
     const login = async () => {
+        console.log('Attempting Mobius Engine API Login');
         try {
             const response = await client({
                 method: 'post',
@@ -40,7 +48,7 @@ const getApiClient = (protocol, host, port, username, password) => {
             });
             exports.tokens = response.data;
             exports.loggedIn = true;
-            console.log('Logged in');
+            console.log('Logged in to Mobius Engine API');
             (0, engine_websocket_1.connectToWebSocket)();
         }
         catch (e) {
@@ -75,7 +83,7 @@ const getApiClient = (protocol, host, port, username, password) => {
         if (!error.response) {
             // notify
         }
-        if (error.response.status === 401 && !error.config.url?.endsWith('/auth/login')) {
+        if (!error.config.url?.endsWith('/auth/login')) {
             console.log(`Logged Out: ${JSON.stringify(error.response)}`);
             exports.loggedIn = false;
             exports.tokens = null;
@@ -90,3 +98,9 @@ const setLoggedIn = (value) => {
     exports.loggedIn = value;
 };
 exports.setLoggedIn = setLoggedIn;
+const closeApiClient = () => {
+    if (reloginInterval) {
+        clearInterval(reloginInterval);
+    }
+};
+exports.closeApiClient = closeApiClient;

package/dist/engine-websocket.d.ts

@@ -1,15 +1,17 @@
 type WebSocketTopics = 'authorize' | 'subscribe' | 'unsubscribe' | 'connected' | 'authorized' | 'object-cov' | 'resource-cov' | 'service-status' | 'broadcast-command' | 'error' | 'ping' | 'pong';
 type Events = 'connected' | 'disconnected';
+export declare const setWebSocketConnectParams: (hostname: string, port: number, protocol: 'http' | 'https') => void;
 export declare const on: (eventName: Events, callback: Function) => void;
 export declare function registerCallback(topic: WebSocketTopics, callback: Function): void;
 export declare function clearAllCallbacks(): void;
+export declare const killWebSocket: () => void;
 /**
  * Connect to the Mobius WebSocket API
  * This method will connect to the Mobius WebSocket API and authenticate with the API token
  */
 export declare const connectToWebSocket: () => void;
 /**
- * Disconnect from the Mobius WebSocket API
+ * Disconnect from the Mobius WebSocket API - Using this will not stop socket from attempting to reconnect
  * This method will close the connection to the Mobius WebSocket API
  */
 export declare const disconnectFromWebSocket: () => void;

package/dist/engine-websocket.js

@@ -3,15 +3,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unsubscribeToBCMD = exports.subscribeToBCMD = exports.unsubscribeToResourceCOV = exports.subscribeToResourceCOV = exports.unsubscribeToObjectCOV = exports.subscribeToObjectCOV = exports.disconnectFromWebSocket = exports.connectToWebSocket = exports.clearAllCallbacks = exports.registerCallback = exports.on = void 0;
+exports.unsubscribeToBCMD = exports.subscribeToBCMD = exports.unsubscribeToResourceCOV = exports.subscribeToResourceCOV = exports.unsubscribeToObjectCOV = exports.subscribeToObjectCOV = exports.disconnectFromWebSocket = exports.connectToWebSocket = exports.killWebSocket = exports.clearAllCallbacks = exports.registerCallback = exports.on = exports.setWebSocketConnectParams = void 0;
 const ws_1 = __importDefault(require("ws"));
 const engine_api_client_1 = require("./engine-api-client");
 let webSocket = null;
-const pendingWebSocketMessages = [];
+let pendingWebSocketMessages = [];
 let pendingWebSocketMessageInterval = null;
 let pingInterval = null;
 let registeredCallbacks = [];
-const eventListeners = [];
+let eventListeners = [];
+let reconnectInterval = null;
+let attemptReconnect = false;
+let connectParams = null;
+const setWebSocketConnectParams = (hostname, port, protocol) => {
+    connectParams = { hostname, port, protocol };
+};
+exports.setWebSocketConnectParams = setWebSocketConnectParams;
 const on = (eventName, callback) => {
     eventListeners.push({ eventName, callback });
 };
@@ -49,7 +56,7 @@ function handleWebSocketMessage(message) {
         console.log(`Websocket Error: ${message.payload}`);
     }
     if (message.topic === 'authorized') {
-        console.log('Websocket Auth Success');
+        console.log('Engine API Subscription WebSocket Auth Success');
         triggerEvent('connected');
     }
     const callbacks = registeredCallbacks
@@ -58,30 +65,49 @@ function handleWebSocketMessage(message) {
     callbacks.forEach((cb) => cb(message.payload));
 }
 const reconnect = () => {
-    console.log('WebSocket Client reconnecting...');
+    console.log('Engine API Subscription WebSocket Client reconnecting...');
     (0, exports.connectToWebSocket)();
 };
-let reconnectInterval = null;
+// To be used only when connection node is deleted, hence removal of all callbacks etc.
+const killWebSocket = () => {
+    attemptReconnect = false;
+    if (reconnectInterval) {
+        clearInterval(reconnectInterval);
+    }
+    registeredCallbacks = [];
+    pendingWebSocketMessages = [];
+    eventListeners = [];
+    if (webSocket) {
+        webSocket.close();
+    }
+    console.log('Killing Engine API Subscription WebSocket Client');
+};
+exports.killWebSocket = killWebSocket;
 /**
  * Connect to the Mobius WebSocket API
  * This method will connect to the Mobius WebSocket API and authenticate with the API token
  */
 const connectToWebSocket = () => {
+    if (!connectParams) {
+        console.log('Unabled to connect to Engine API Subscription WebSocket as no connect params are set');
+        return;
+    }
     if (!engine_api_client_1.tokens) {
-        console.log('Unabled to connect to websocket as no tokens are available');
+        console.log('Unabled to connect to Engine API Subscription WebSocket as no tokens are available');
         return;
     }
     if (webSocket) {
         webSocket.close();
         webSocket = null;
     }
-    let webSocketProtocol = 'ws';
-    // if (window.location.protocol === 'http:') {
-    //   webSocketProtocol = 'ws';
-    // }
-    webSocket = new ws_1.default(`ws://localhost:8443/api/v1/mobius/subscribe/connect`);
+    let webSocketProtocol = 'wss';
+    if (connectParams.protocol === 'http') {
+        webSocketProtocol = 'ws';
+    }
+    webSocket = new ws_1.default(`${webSocketProtocol}://${connectParams.hostname}:${connectParams.port}/api/v1/mobius/subscribe/connect`);
     webSocket.onopen = () => {
-        console.log('WebSocket Client Connected');
+        attemptReconnect = true;
+        console.log('Engine API Subscription WebSocket Client Connected');
         pingInterval = setInterval(sendPingMessage, 30000);
         clearInterval(reconnectInterval);
         webSocket?.send(JSON.stringify({
@@ -96,15 +122,22 @@ const connectToWebSocket = () => {
         }, 1000);
     };
     webSocket.onclose = () => {
-        console.log('WebSocket Client Closed');
+        console.log('Engine API Subscription WebSocket Client Closed');
         if (pingInterval) {
             clearInterval(pingInterval);
         }
+        webSocket = null;
+        clearInterval(reconnectInterval);
         if (pendingWebSocketMessageInterval) {
             clearInterval(pendingWebSocketMessageInterval);
-            reconnectInterval = setInterval(reconnect, 5000);
         }
-        webSocket = null;
+        if (attemptReconnect) {
+            reconnectInterval = setInterval(() => {
+                if (engine_api_client_1.loggedIn) {
+                    reconnect();
+                }
+            }, 30000);
+        }
         triggerEvent('disconnected');
     };
     webSocket.onmessage = (message) => {
@@ -119,12 +152,17 @@ const connectToWebSocket = () => {
         }
     };
     webSocket.on('error', (e) => {
-        console.error(e);
+        if (e.code === 'ECONNREFUSED') {
+            (0, engine_api_client_1.setLoggedIn)(false);
+        }
+        else {
+            console.error('Engine API Subscription WebSocket Client Error: ', e);
+        }
     });
 };
 exports.connectToWebSocket = connectToWebSocket;
 /**
- * Disconnect from the Mobius WebSocket API
+ * Disconnect from the Mobius WebSocket API - Using this will not stop socket from attempting to reconnect
  * This method will close the connection to the Mobius WebSocket API
  */
 const disconnectFromWebSocket = () => {

package/dist/nodes/common/mobsearch.js

@@ -64,18 +64,28 @@ if (typeof selectionIndex === undefined) {
  * @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();
-  });
+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');
+  }
 }
 
 /**
@@ -116,6 +126,9 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
 
   //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>
@@ -143,12 +156,23 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
 
   // * INIT SETUP * //
 
+  let mobConnected = false;
+  $.getJSON(`mgetconnected?mobius=${mobiusSrvc}`, function (response) {
+    mobConnected = response;
+    if (!mobConnected) {
+      $('#node-lookup-instance').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');
-  $.getJSON(`mgethid?mobius=${mobiusSrvc}`, function (response) {
-    $('#instance-search-hid').val(response);
-  });
   let readyToAccept = false;
 
   let searchObject = {};
@@ -451,18 +475,20 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
   // * 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('');
+    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('');
+      }
+      $('#node-lookup-instance').addClass('disabled');
+      $('#node-search-return').removeClass('disabled');
+      $('#node-search-accept').removeClass('disabled');
+      $('#instance-row').hide();
+      $('#instance-search-row').show();
     }
-    $('#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 () {

package/dist/nodes/mobius-change-admin-password.d.ts

@@ -0,0 +1,26 @@
+/**
+ Copyright (C) 2016, IAConnects Technology Limited
+ All Rights Reserved
+
+ ALL INFORMATION CONTAINED HEREIN IS, AND REMAINS
+ THE PROPERTY OF IACONNECTS TECHNOLOGY LIMITED AND ITS SUPPLIERS,
+ IF ANY. THE INTELLECTUAL AND TECHNICAL CONCEPTS CONTAINED
+ HEREIN ARE PROPRIETARY TO IACONNECTS TECHNOLOGY LIMITED
+ AND ITS SUPPLIERS AND ARE PROTECTED BY TRADE SECRET OR COPYRIGHT LAW.
+ DISSEMINATION OF THIS INFORMATION OR REPRODUCTION OF THIS MATERIAL
+ IS STRICTLY FORBIDDEN UNLESS PRIOR WRITTEN PERMISSION IS OBTAINED
+ FROM IACONNECTS TECHNOLOGY LIMITED.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ **/
+export {};

package/dist/nodes/mobius-change-admin-password.html

@@ -0,0 +1,98 @@
+<!--
+Copyright (C) 2016, IAConnects Technology Limited
+All Rights Reserved
+
+ALL INFORMATION CONTAINED HEREIN IS, AND REMAINS
+THE PROPERTY OF IACONNECTS TECHNOLOGY LIMITED AND ITS SUPPLIERS,
+IF ANY. THE INTELLECTUAL AND TECHNICAL CONCEPTS CONTAINED
+HEREIN ARE PROPRIETARY TO IACONNECTS TECHNOLOGY LIMITED
+AND ITS SUPPLIERS AND ARE PROTECTED BY TRADE SECRET OR COPYRIGHT LAW.
+DISSEMINATION OF THIS INFORMATION OR REPRODUCTION OF THIS MATERIAL
+IS STRICTLY FORBIDDEN UNLESS PRIOR WRITTEN PERMISSION IS OBTAINED
+FROM IACONNECTS TECHNOLOGY LIMITED.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<script type="text/x-red" data-template-name="mobius change admin password">
+  <div class="form-row">
+    <label for="node-input-connection"><i class="fa fa-globe"></i> MOBiUS</label>
+    <input type="text" id="node-input-connection">
+  </div>
+  <hr>
+
+  <div class="form-row" id="input-row">
+    <label for="node-input-password"><i class="fa fa-key"></i> Password</label>
+    <input type="text" id="node-input-password" placeholder="Password (Min 8 Chars)">
+  </div>
+
+  <hr>
+
+  <div class="form-row">
+    <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+    <input type="text" id="node-input-name" placeholder="Name">
+  </div>
+</script>
+
+<script type="text/javascript">
+  RED.nodes.registerType('mobius change admin password',{
+    category: 'mobius',
+    defaults: {
+      name: {value:""},
+      password: {value:"", validate:function(v) {
+        if (v.length < 8) {
+          return false;
+        } else {
+          return true;
+        }
+      }},
+      connection: {type:"mobius connection", required:true}
+    },
+    color:"#6a8cc8",
+    inputs:1,
+    outputs:0,
+    icon: "mobius.png",
+    align: "right",
+    paletteLabel: 'change admin password',
+    label: 'Change Admin Password',
+    labelStyle: function() {
+      return this.name ? "node_label_italic":"";
+    },
+  });
+</script>
+
+<script type="text/x-red" data-help-name="mobius change admin password">
+  <p>Set MOBiUS admin password.</p>
+
+  <h3>Configuration Page</h3>
+  <dl class="message-properties">
+    <dt>MOBiUS <span class="property-type">node</span></dt>
+    <dd>Shared MOBiUS connection for communication with the MOBiUS Hub.</dd>
+    <dt>Password <span class="property-type">string</span></dt>
+    <dd>The new admin passsord (must be at least 8 characters).</dd>
+  </dl>
+
+  <h3>Inputs</h3>
+  <ol class="node-ports">
+    <li>Input message to trigger changes of password
+      <dl class="message-properties">
+        <dt class="optional">payload.passsword <span class="property-type">string</span></dt>
+        <dd>An optional property that overwrites the new password set in the node configuration page.
+          If the property is not valid (less than 8 characters) no action is taken.</dd>
+      </dl>
+    </li>
+  </ol>
+
+  <br>
+  <p align="center" style="color:#000080">mobiusflow © 2023</p>
+</script>

package/dist/nodes/mobius-change-admin-password.js

@@ -0,0 +1,87 @@
+"use strict";
+/**
+ Copyright (C) 2016, IAConnects Technology Limited
+ All Rights Reserved
+
+ ALL INFORMATION CONTAINED HEREIN IS, AND REMAINS
+ THE PROPERTY OF IACONNECTS TECHNOLOGY LIMITED AND ITS SUPPLIERS,
+ IF ANY. THE INTELLECTUAL AND TECHNICAL CONCEPTS CONTAINED
+ HEREIN ARE PROPRIETARY TO IACONNECTS TECHNOLOGY LIMITED
+ AND ITS SUPPLIERS AND ARE PROTECTED BY TRADE SECRET OR COPYRIGHT LAW.
+ DISSEMINATION OF THIS INFORMATION OR REPRODUCTION OF THIS MATERIAL
+ IS STRICTLY FORBIDDEN UNLESS PRIOR WRITTEN PERMISSION IS OBTAINED
+ FROM IACONNECTS TECHNOLOGY LIMITED.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ **/
+Object.defineProperty(exports, "__esModule", { value: true });
+module.exports = function (RED) {
+    RED.nodes.registerType('mobius change admin password', function (n) {
+        RED.nodes.createNode(this, n);
+        let node = (() => {
+            this['password'] = n.password;
+            this['serviceConn'] = RED.nodes.getNode(n.connection);
+            return this;
+        })();
+        if (node.serviceConn) {
+            node.status({
+                fill: 'red',
+                shape: 'ring',
+                text: 'Disconnected',
+            });
+            node.on('input', function (msg) {
+                let password = node.password;
+                if (msg.hasOwnProperty('payload')) {
+                    if (msg.payload.hasOwnProperty('password')) {
+                        password = msg.payload.password;
+                    }
+                }
+                if (password.length < 8) {
+                    node.error('Password provided must be at least 8 characters long');
+                    return;
+                }
+                if (password) {
+                    node.status({
+                        fill: 'green',
+                        shape: 'ring',
+                        text: 'Busy',
+                    });
+                    node.serviceConn.changeAdminPassword(password, (err, response) => {
+                        if (err) {
+                            node.status({
+                                fill: 'yellow',
+                                shape: 'dot',
+                                text: 'Error: ' + JSON.stringify(err.code),
+                            });
+                            node.error('Mobius error setting admin password ' + JSON.stringify(err));
+                        }
+                        else {
+                            node.status({
+                                fill: 'green',
+                                shape: 'dot',
+                                text: 'Admin password changed (use on next login)',
+                            });
+                        }
+                    });
+                }
+            });
+            node.serviceConn.register(node);
+            node.on('close', function (done) {
+                node.serviceConn.deregister(node, done);
+            });
+        }
+        else {
+            node.error(RED._('Mobius service not defined'));
+        }
+    });
+};

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

@@ -47,6 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
     <label>&nbsp;</label>
     <input type="checkbox" id="node-input-detailedOutput" style="display: inline-block; width: auto; vertical-align: top;">
     <label for="node-input-detailedOutput" style="width: 70%;"> Use detailed outputs</label>
+    <input type="hidden" id="node-input-outputs"/>
   </div>
 <hr>
   <div class="form-row">
@@ -74,11 +75,12 @@ POSSIBILITY OF SUCH DAMAGE.
         return false;
       }},
       priority: {value:15, type: 'Number', validate:function(v) { return (v > 0 && v < 16) }},
-      connection: {type:"mobius connection", required:true}
+      connection: {type:"mobius connection", required:true},
+      outputs: {value:2},
     },
     color:"#8abff5",
     inputs:1,
-    outputs:2,
+    outputs: 2,
     outputLabels: function (index) {
       if(index === 0) return ("Resource's PV");
       if(index === 1) return ("Resource's PV and name");
@@ -99,6 +101,10 @@ POSSIBILITY OF SUCH DAMAGE.
       return this.name ? "node_label_italic":"";
     },
     oneditprepare: function () {
+      $("#node-input-outputs").val(this.detailedOutput ? 4 : 2);
+      $("#node-input-detailedOutput").change(function() {
+        $("#node-input-outputs").val(this.checked ? 4 : 2);
+      });
       var node = this;
       let mobiusSrvc = $("#node-input-connection").val();
 
@@ -109,13 +115,13 @@ POSSIBILITY OF SUCH DAMAGE.
       };
       initMobsearch.toRid(mobiusSrvc, opts);
     },
-    oneditsave: function() {
-      if($("#node-input-detailedOutput").prop('checked')) {
-        this.outputs = 4;
-      } else {
-        this.outputs = 2;
-      }
-    }
+    // oneditsave: function() {
+    //   if($("#node-input-detailedOutput").prop('checked')) {
+    //     this.outputs = 4;
+    //   } else {
+    //     this.outputs = 2;
+    //   }
+    // }
   });
 </script>
 

package/dist/nodes/mobius-clear-resource.js

@@ -35,7 +35,6 @@ module.exports = function (RED) {
     this.priority = n.priority;
     this.serviceConn = RED.nodes.getNode(n.connection);
     var node = this;
-
     if (node.serviceConn) {
       node.status({
         fill: 'red',

package/dist/nodes/mobius-connection-interface.d.ts

@@ -0,0 +1,45 @@
+export interface NodeInterface {
+    on(type: 'input', callback: (msg: any, done?: any) => void): any;
+    on(type: 'close', callback: (done?: any) => void): any;
+    send(msg: any): any;
+    status(status: any): void;
+    log(msg: string): any;
+    warn(msg: string): any;
+    error(msg: string): any;
+}
+export interface MobiusConnectionInterface {
+    host: string;
+    port: number;
+    username: string;
+    password: string;
+    secure: boolean;
+    connected: boolean;
+    register(node: any): void;
+    deregister(node: any, done: () => void): void;
+    discover(uri: string, callback: (err: any, response: any) => void): void;
+    writeResourceValue(uri: string, value: string, callback: (err: any, response: any) => void): void;
+    writeMultiResourceValue(uri: string, updates: {
+        r: string;
+        p: number;
+        v: string | number | boolean;
+    }[], callback: (err: any, response: any) => void): void;
+    clearResourcePriority(uri: string, priority: number, callback: (err: any, response: any) => void): void;
+    readResource(uri: string, callback: (err: any, response: any) => void): void;
+    readObject(uri: string, callback: (err: any, response: any) => void): void;
+    filterObjectsByRidValue(uri: string, pids: string[], linit: number, func: Function, callback: (err: any, response: any) => void): void;
+    changeAdminPassword(password: string, callback: (err: any, response: string) => void): void;
+    subscribeToCov(uri: string, ref: string, callback: (err: any, response: any) => void): void;
+    unsubscribeToCov(uri: string, ref: string, callback: (err: any, response: any) => void): void;
+    subscribeToObjectCOV(uri: string, ref: string, callback: (err: any, response: any) => void): void;
+    unsubscribeToObjectCOV(uri: string, ref: string, callback: (err: any, response: any) => void): void;
+    subscribeToBCMD(uri: string, ref: string, callback: (err: any, response: any) => void): void;
+    unsubscribeToBCMD(uri: string, ref: string, callback: (err: any, response: any) => void): void;
+    sendBroadcastCommand(cid: string, commandData: any): void;
+    sendDirectCommand(uri: string, cid: string, timeout: number, callback: (err: any, response: any) => void): void;
+    getServiceConfig(hid: string, sid: string, callback: (err: any, response: any) => void): void;
+    updateObjectInServiceConfig(hid: string, sid: string, pid: string, ins: string, config: any, callback: (err: any, response: any) => void): void;
+    getNodeConfig(uri: string, callback: (err: any, response: any) => void): void;
+}
+export interface ServiceConn {
+    serviceConn: MobiusConnectionInterface;
+}

package/dist/nodes/mobius-connection-interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/nodes/mobius-connection.js

@@ -32,7 +32,7 @@ var uiFuncs = require('../node-red-ui-funcs');
 const webSocket = require('../engine-websocket');
 const apiCalls = require('../engine-api-calls');
 const webSocketCalls = require('../engine-websocket');
-const { getApiClient, setLoggedIn } = require('../engine-api-client');
+const { getApiClient, setLoggedIn, closeApiClient } = require('../engine-api-client');
 
 module.exports = function (RED) {
   /**
@@ -232,6 +232,11 @@ 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) {
+      node.users[mobiusNode.id].status({
+        fill: 'red',
+        shape: 'ring',
+        text: 'Disconnected',
+      });
       delete node.users[mobiusNode.id];
       try {
         node.resourceSubscriptions.forEach((subs, key) => {
@@ -277,6 +282,19 @@ module.exports = function (RED) {
      * Register the close connection handler
      */
     node.on('close', (done) => {
+      webSocket.killWebSocket();
+      closeApiClient();
+      setLoggedIn(false);
+      this.log(`Connection to MOBiUS closed.`);
+      for (var id in node.users) {
+        if (node.users.hasOwnProperty(id)) {
+          node.users[id].status({
+            fill: 'red',
+            shape: 'ring',
+            text: 'Disconnected',
+          });
+        }
+      }
       if (node.connected) {
         // Wait for all nodes to unsubscribe before terminating the connection
         node.unsubscribeTimeout = 0;
@@ -288,15 +306,11 @@ module.exports = function (RED) {
             node.unsubscribeTimeout > 50
           ) {
             clearInterval(waitForCleanup);
-            webSocket.disconnectFromWebSocket();
-            setLoggedIn(false);
             done();
           }
           node.unsubscribeTimeout++;
         }, 100);
       } else {
-        setLoggedIn(false);
-        webSocket.disconnectFromWebSocket();
         done();
       }
     });
@@ -378,6 +392,15 @@ module.exports = function (RED) {
       apiCalls.filterObjectsByRIDValue(this.apiClient, uri, pids, rid, limit, func, callback);
     };
 
+    /**
+     * Change the password of the admin user
+     * @param {*} password - The new password
+     * @param {*} callback - Callback when complete, function(err, [object]) {}
+     */
+    node.changeAdminPassword = function(password, callback) {
+      apiCalls.changeAdminPassword(this.apiClient, password, callback);
+    }
+
     /**
      * Subscribe to a resource COV
      * @param  {string} uri         - The full URI of the resource
@@ -674,8 +697,7 @@ module.exports = function (RED) {
     RED.httpAdmin.get('/mgetconnected', RED.auth.needsPermission('serial.read'), function (req, res) {
       let conn = RED.nodes.getNode(req.query.mobius);
       if (conn === null) {
-        RED.log.error('Get hid failed - could not to connect to MOBiUS hub.');
-        throw new Error('Get hid failed - could not to connect to MOBiUS hub.');
+        res.json(false);
       } else {
         res.json(conn.connected);
       }

package/dist/nodes/mobius-discover-object-list.html

@@ -187,7 +187,7 @@ POSSIBILITY OF SUCH DAMAGE.
               node.subscriptions[i] = {uri: '', type: 'include'}
             }
 
-            addMobsearchListButton(searchField, i, mobsearchOpts)
+            addMobsearchListButton(mobiusSrvc, searchField, i, mobsearchOpts)
             // *** END MOBSEARCH *** //
           },
         });

package/dist/nodes/mobius-filter-by-rid-value.html

@@ -67,7 +67,6 @@ POSSIBILITY OF SUCH DAMAGE.
     category: 'mobius',
     color: '#8abff5',
     defaults: {
-      outputs: { value: 1 },
       name: { value: '' },
       pids: { value: '[]' },
       func: { value: '' },
@@ -93,6 +92,7 @@ POSSIBILITY OF SUCH DAMAGE.
         },
       },
       connection: { type: 'mobius connection', required: true },
+      outputs: {value:1},
     },
     inputs: 1,
     outputs: 1,
@@ -114,6 +114,10 @@ POSSIBILITY OF SUCH DAMAGE.
       return this.name ? 'node_label_italic' : '';
     },
     oneditprepare: function () {
+      $("#node-input-outputs").val(this.detailedOutput ? 2 : 1);
+      $("#node-input-detailedOutput").change(function() {
+        $("#node-input-outputs").val(this.checked ? 2 : 1);
+      });
       $('#node-input-pids').typedInput({
         type: 'json',
         types: ['json'],
@@ -125,11 +129,11 @@ POSSIBILITY OF SUCH DAMAGE.
       });
     },
     oneditsave: function () {
-      if ($('#node-input-detailedOutput').prop('checked')) {
-        $('#node-input-outputs').val(2);
-      } else {
-        $('#node-input-outputs').val(1);
-      }
+      // if ($('#node-input-detailedOutput').prop('checked')) {
+      //   $('#node-input-outputs').val(2);
+      // } else {
+      //   $('#node-input-outputs').val(1);
+      // }
       this.func = this.editor.getValue();
       this.editor.destroy();
       delete this.editor;

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

@@ -107,7 +107,7 @@ POSSIBILITY OF SUCH DAMAGE.
             node.subscriptions[i] = {uri: '', type: 'include'}
           }
 
-          addMobsearchListButton(searchField, i, mobsearchOpts)
+          addMobsearchListButton(mobiusSrvc, searchField, i, mobsearchOpts)
           // *** END MOBSEARCH *** //
         }
       });

package/dist/nodes/mobius-get-multi-object.html

@@ -116,7 +116,7 @@ POSSIBILITY OF SUCH DAMAGE.
             node.mobjects[i] = {uri: '', comment: ''}
           }
 
-          addMobsearchListButton(searchField, i, mobsearchOpts)
+          addMobsearchListButton(mobiusSrvc, searchField, i, mobsearchOpts)
           // *** END MOBSEARCH *** //
 
         },

package/dist/nodes/mobius-get-multi-resource.html

@@ -108,6 +108,7 @@ POSSIBILITY OF SUCH DAMAGE.
           
           // *** MOBSEARCH *** //
           var searchField = $('<a class="searchbutton" style="margin-left: 5px; vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>').appendTo(row);
+          
           // *** END MOBSEARCH *** //
           
           row.append('&nbsp;&nbsp;-&nbsp;');
@@ -122,7 +123,7 @@ POSSIBILITY OF SUCH DAMAGE.
           if (!node.resources[i]) {
             node.resources[i] = {uri: '', comment: ''}
           }
-          addMobsearchListButton(searchField, i, mobsearchOpts)
+          addMobsearchListButton(mobiusSrvc, searchField, i, mobsearchOpts)
           // *** END MOBSEARCH *** //
 
         },

package/dist/nodes/mobius-get-object.html

@@ -53,6 +53,7 @@ POSSIBILITY OF SUCH DAMAGE.
     <label>&nbsp;</label>
     <input type="checkbox" id="node-input-detailedOutput" style="display: inline-block; width: auto; vertical-align: top;">
     <label for="node-input-detailedOutput" style="width: 70%;"> Use detailed outputs</label>
+    <input type="hidden" id="node-input-outputs"/>
   </div>
   <hr>
   <div class="form-row">
@@ -81,7 +82,8 @@ POSSIBILITY OF SUCH DAMAGE.
         if(parts.length < 4 && parts[parts.length - 1] === '#') { return true; }
         return false;
       }},
-      connection: {type: "mobius connection", required: true}
+      connection: {type: "mobius connection", required: true},
+      outputs: {value:1},
     },
     inputs:1,
     outputs:1,
@@ -104,6 +106,10 @@ POSSIBILITY OF SUCH DAMAGE.
       return this.name ? "node_label_italic":"";
     },
     oneditprepare: function () {
+      $("#node-input-outputs").val(this.detailedOutput ? 3 : 1);
+      $("#node-input-detailedOutput").change(function() {
+        $("#node-input-outputs").val(this.checked ? 3 : 1);
+      });
       var node = this;
       let mobiusSrvc = $("#node-input-connection").val();
 
@@ -114,13 +120,13 @@ POSSIBILITY OF SUCH DAMAGE.
       };
       initMobsearch.toIns(mobiusSrvc, opts);
     },
-    oneditsave: function() {
-      if($("#node-input-detailedOutput").prop('checked')) {
-        this.outputs = 3;
-      } else {
-        this.outputs = 1;
-      }
-    }
+    // oneditsave: function() {
+    //   if($("#node-input-detailedOutput").prop('checked')) {
+    //     this.outputs = 3;
+    //   } else {
+    //     this.outputs = 1;
+    //   }
+    // }
   });
 </script>
 

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

@@ -46,12 +46,14 @@ POSSIBILITY OF SUCH DAMAGE.
     <label>&nbsp;</label>
     <input type="checkbox" id="node-input-detailedOutput" style="display: inline-block; width: auto; vertical-align: top;">
     <label for="node-input-detailedOutput" style="width: 70%;"> Use detailed outputs</label>
+    <input type="hidden" id="node-input-outputs"/>
   </div>
   <hr>
   <div class="form-row">
     <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
     <input type="text" id="node-input-name" placeholder="Name">
   </div>
+
 </script>
 
 <script src="common/mobsearch.js"></script>
@@ -73,10 +75,11 @@ POSSIBILITY OF SUCH DAMAGE.
         if(parts.length < 5 && parts[parts.length - 1] === '#') { return true; }
         return false;
       }},
-      connection: {type:"mobius connection", required:true}
+      connection: {type:"mobius connection", required: true},
+      outputs: {value:2},
     },
     inputs:1,
-    outputs:2,
+    outputs: 2,
     outputLabels: function (index) {
       if(index === 0) return ("Resource's PV");
       if(index === 1) return ("Resource's PV and name");
@@ -97,9 +100,12 @@ POSSIBILITY OF SUCH DAMAGE.
       return this.name ? "node_label_italic":"";
     },
     oneditprepare: function () {
+      $("#node-input-outputs").val(this.detailedOutput ? 4 : 2);
+      $("#node-input-detailedOutput").change(function() {
+        $("#node-input-outputs").val(this.checked ? 4 : 2);
+      });
       var node = this;
       let mobiusSrvc = $("#node-input-connection").val();
-
       opts = {
         htmlElementId: 'mobsearch',
         uriFieldName: 'node-input-resource',
@@ -108,13 +114,13 @@ POSSIBILITY OF SUCH DAMAGE.
       initMobsearch.toRid(mobiusSrvc, opts);
 
     },
-    oneditsave: function() {
-      if($("#node-input-detailedOutput").prop('checked')) {
-        this.outputs = 4;
-      } else {
-        this.outputs = 2;
-      }
-    }
+    // oneditsave: function() {
+    //   if($("#node-input-detailedOutput").prop('checked')) {
+    //     this.outputs = 4;
+    //   } else {
+    //     this.outputs = 2;
+    //   }
+    // }
   });
 </script>
 

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

@@ -61,6 +61,7 @@ POSSIBILITY OF SUCH DAMAGE.
     <label>&nbsp;</label>
     <input type="checkbox" id="node-input-detailedOutput" style="display: inline-block; width: auto; vertical-align: top;">
     <label for="node-input-detailedOutput" style="width: 70%;"> Use detailed outputs</label>
+    <input type="hidden" id="node-input-outputs"/>
   </div>
   <hr>
   <div class="form-row">
@@ -89,7 +90,8 @@ POSSIBILITY OF SUCH DAMAGE.
         if(parts.length < 4 && parts[parts.length - 1] === '#') { return true; }
         return false;
       }},
-      connection: {type:"mobius connection", required:true}
+      connection: {type:"mobius connection", required:true},
+      outputs: {value:1},
     },
     color:"#8abff5",
     inputs:0,
@@ -113,7 +115,10 @@ POSSIBILITY OF SUCH DAMAGE.
       return this.name ? "node_label_italic":"";
     },
     oneditprepare: function () {
-
+      $("#node-input-outputs").val(this.detailedOutput ? 3 : 1);
+      $("#node-input-detailedOutput").change(function() {
+        $("#node-input-outputs").val(this.checked ? 3 : 1);
+      });
       var node = this;
       let mobiusSrvc = $("#node-input-connection").val();
 
@@ -124,13 +129,13 @@ POSSIBILITY OF SUCH DAMAGE.
       };
       initMobsearch.toIns(mobiusSrvc, opts);
     },
-    oneditsave: function() {
-      if($("#node-input-detailedOutput").prop('checked')) {
-        this.outputs = 3;
-      } else {
-        this.outputs = 1;
-      }
-    }
+    // oneditsave: function() {
+    //   if($("#node-input-detailedOutput").prop('checked')) {
+    //     this.outputs = 3;
+    //   } else {
+    //     this.outputs = 1;
+    //   }
+    // }
   });
 </script>
 

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

@@ -44,6 +44,7 @@ POSSIBILITY OF SUCH DAMAGE.
     <label>&nbsp;</label>
     <input type="checkbox" id="node-input-detailedOutput" style="display: inline-block; width: auto; vertical-align: top;">
     <label for="node-input-detailedOutput" style="width: 70%;"> Use detailed outputs</label>
+    <input type="hidden" id="node-input-outputs"/>
   </div>
   <hr>
   <div class="form-row">
@@ -69,7 +70,8 @@ POSSIBILITY OF SUCH DAMAGE.
         if(parts.length < 5 && parts[parts.length - 1] === '#') { return true; }
         return false;
       }},
-      connection: {type:"mobius connection", required:true}
+      connection: {type:"mobius connection", required:true},
+      outputs: {value:2},
     },
     color:"#8abff5",
     inputs:0,
@@ -94,6 +96,10 @@ POSSIBILITY OF SUCH DAMAGE.
       return this.name ? "node_label_italic":"";
     },
     oneditprepare: function () {
+      $("#node-input-outputs").val(this.detailedOutput ? 4 : 2);
+      $("#node-input-detailedOutput").change(function() {
+        $("#node-input-outputs").val(this.checked ? 4 : 2);
+      });
       var node = this;
       let mobiusSrvc = $("#node-input-connection").val();
 
@@ -104,13 +110,13 @@ POSSIBILITY OF SUCH DAMAGE.
       };
       initMobsearch.toRid(mobiusSrvc, opts);
     },
-    oneditsave: function() {
-      if($("#node-input-detailedOutput").prop('checked')) {
-        this.outputs = 4;
-      } else {
-        this.outputs = 2;
-      }
-    }
+    // oneditsave: function() {
+    //   if($("#node-input-detailedOutput").prop('checked')) {
+    //     this.outputs = 4;
+    //   } else {
+    //     this.outputs = 2;
+    //   }
+    // }
   });
 </script>
 

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

@@ -45,6 +45,7 @@ POSSIBILITY OF SUCH DAMAGE.
     <label>&nbsp;</label>
     <input type="checkbox" id="node-input-detailedOutput" style="display: inline-block; width: auto; vertical-align: top;">
     <label for="node-input-detailedOutput" style="width: 70%;"> Use detailed outputs</label>
+    <input type="hidden" id="node-input-outputs"/>
   </div>
   <hr>
   <div class="form-row">
@@ -70,11 +71,12 @@ POSSIBILITY OF SUCH DAMAGE.
         if(parts.length === 4) { return true; }
         return false;
       }},
-      connection: {type:"mobius connection", required:true}
+      connection: {type:"mobius connection", required:true},
+      outputs: {value:2},
     },
     color:"#8abff5",
     inputs:1,
-    outputs:1,
+    outputs:2,
     outputLabels: function (index) {
       if(index === 0) return ("MOBiUS object");
       if(index === 1) return ("Full MOBiUS response");
@@ -93,6 +95,10 @@ POSSIBILITY OF SUCH DAMAGE.
       return this.name ? "node_label_italic":"";
     },
     oneditprepare: function () {
+      $("#node-input-outputs").val(this.detailedOutput ? 4 : 2);
+      $("#node-input-detailedOutput").change(function() {
+        $("#node-input-outputs").val(this.checked ? 4 : 2);
+      });
       var node = this;
       let mobiusSrvc = $("#node-input-connection").val();
 
@@ -103,13 +109,13 @@ POSSIBILITY OF SUCH DAMAGE.
       };
       initMobsearch.toIns(mobiusSrvc, opts);
     },
-    oneditsave: function() {
-      if($("#node-input-detailedOutput").prop('checked')) {
-        this.outputs = 2;
-      } else {
-        this.outputs = 1;
-      }
-    }
+    // oneditsave: function() {
+    //   if($("#node-input-detailedOutput").prop('checked')) {
+    //     this.outputs = 2;
+    //   } else {
+    //     this.outputs = 1;
+    //   }
+    // }
   });
 </script>
 

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

@@ -49,6 +49,7 @@ POSSIBILITY OF SUCH DAMAGE.
     <label>&nbsp;</label>
     <input type="checkbox" id="node-input-detailedOutput" style="display: inline-block; width: auto; vertical-align: top;">
     <label for="node-input-detailedOutput" style="width: 70%;"> Use detailed outputs</label>
+    <input type="hidden" id="node-input-outputs"/>
   </div>
   <hr>
   <div class="form-row">
@@ -76,7 +77,8 @@ POSSIBILITY OF SUCH DAMAGE.
         return false;
       }},
       priority: {value:15, type: 'Number', validate:function(v) { return (v > 0 && v < 16) }},
-      connection: {type:"mobius connection", required:true}
+      connection: {type:"mobius connection", required:true},
+      outputs: {value:2},
     },
     color:"#8abff5",
     inputs:1,
@@ -101,6 +103,10 @@ POSSIBILITY OF SUCH DAMAGE.
       return this.name ? "node_label_italic":"";
     },
     oneditprepare: function () {
+      $("#node-input-outputs").val(this.detailedOutput ? 4 : 2);
+      $("#node-input-detailedOutput").change(function() {
+        $("#node-input-outputs").val(this.checked ? 4 : 2);
+      });
       var node = this;
       let mobiusSrvc = $("#node-input-connection").val();
 
@@ -111,13 +117,13 @@ POSSIBILITY OF SUCH DAMAGE.
       };
       initMobsearch.toRid(mobiusSrvc, opts);
     },
-    oneditsave: function() {
-      if($("#node-input-detailedOutput").prop('checked')) {
-        this.outputs = 4;
-      } else {
-        this.outputs = 2;
-      }
-    }
+    // oneditsave: function() {
+    //   if($("#node-input-detailedOutput").prop('checked')) {
+    //     this.outputs = 4;
+    //   } else {
+    //     this.outputs = 2;
+    //   }
+    // }
   });
 </script>
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "node-red-contrib-mobius-flow-base",
-  "version": "3.0.0-beta.12",
+  "version": "3.0.0-beta.13",
   "description": "Node-RED base nodes for Mobius Flow",
   "main": "index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "tsc && 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/mobsearch.js dist/nodes/common/ && cp src/node-red-ui-funcs.js dist/"
+    "build": "mkdir -p dist/nodes && tsc && cp src/nodes/*.js dist/nodes/ && cp src/nodes/*.html dist/nodes/ && cp -r src/nodes/icons dist/nodes/ && mkdir -p dist/nodes/common && cp src/mobsearch.js dist/nodes/common/ && cp src/node-red-ui-funcs.js dist/"
   },
   "repository": "bitbucket:interiorautomation/node-red-contrib-mobius-flow-base",
   "node-red": {
@@ -27,7 +27,8 @@
       "mobius resource cov": "dist/nodes/mobius-resource-cov.js",
       "mobius send bcmd": "dist/nodes/mobius-send-bcmd.js",
       "mobius sub bcmd": "dist/nodes/mobius-sub-bcmd.js",
-      "mobius send dcmd": "dist/nodes/mobius-send-dcmd.js"
+      "mobius send dcmd": "dist/nodes/mobius-send-dcmd.js",
+      "mobius change admin password": "dist/nodes/mobius-change-admin-password.js"
     }
   },
   "keywords": [