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

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-object.js

@@ -117,7 +117,7 @@ module.exports = function (RED) {
         if (err) {
           reject(err);
         } else {
-          resolve(response.value);
+          resolve(response.data);
         }
       });
     });

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>