node-red-contrib-mobius-flow-base 3.4.0-beta.1 → 3.5.0

package/dist/engine-websocket.d.ts

@@ -1,5 +1,5 @@
-import { EventEmitter } from 'stream';
-type WebSocketTopics = 'authorize' | 'subscribe' | 'unsubscribe' | 'connected' | 'authorized' | 'object-cov' | 'resource-cov' | 'service-status' | 'broadcast-command' | 'error' | 'ping' | 'pong';
+import { EventEmitter } from "stream";
+type WebSocketTopics = "authorize" | "subscribe" | "unsubscribe" | "connected" | "authorized" | "object-cov" | "resource-cov" | "service-status" | "broadcast-command" | "error" | "ping" | "pong";
 interface EngineWebSocketInterface {
     registerCallback: (topic: WebSocketTopics, callback: Function) => void;
     clearAllCallbacks: () => void;
@@ -24,7 +24,7 @@ export declare class EngineWebSocket extends EventEmitter implements EngineWebSo
     private authToken;
     private hostname;
     private protocol;
-    constructor(hostname: string, protocol: 'http' | 'https');
+    constructor(hostname: string, protocol: "http" | "https");
     connectToWebSocket: (token: string) => void;
     private sendWebSocketMessage;
     private sendPingMessage;

package/dist/engine-websocket.js

@@ -24,18 +24,18 @@ class EngineWebSocket extends stream_1.EventEmitter {
     }
     connectToWebSocket = (token) => {
         this.authToken = token;
-        let webSocketProtocol = 'wss';
-        if (this.protocol === 'http') {
-            webSocketProtocol = 'ws';
+        let webSocketProtocol = "wss";
+        if (this.protocol === "http") {
+            webSocketProtocol = "ws";
         }
-        this.webSocket = new ws_1.default(`${webSocketProtocol}://${this.hostname}/api/v1/mobius/subscribe/connect`);
+        this.webSocket = new ws_1.default(`${webSocketProtocol}://${this.hostname}/api/engine/v1/mobius/subscribe/connect`);
         this.webSocket.onopen = () => {
             this.attemptReconnect = true;
             console.log(`(${this.hostname}) -> Engine API Subscription WebSocket Client Connected`);
             this.pingInterval = setInterval(this.sendPingMessage, 30000);
             clearInterval(this.reconnectInterval);
             this.sendWebSocketMessage({
-                topic: 'authorize',
+                topic: "authorize",
                 payload: `Bearer ${this.authToken}`,
             });
             this.pendingWebSocketMessageInterval = setInterval(() => {
@@ -60,7 +60,7 @@ class EngineWebSocket extends stream_1.EventEmitter {
                     this.reconnect();
                 }, 30000);
             }
-            this.emit('disconnected');
+            this.emit("disconnected");
         };
         this.webSocket.onmessage = (message) => {
             try {
@@ -70,15 +70,15 @@ class EngineWebSocket extends stream_1.EventEmitter {
                 }
             }
             catch (e) {
-                console.log(`(${this.hostname}) -> Error parsing message: ${e.code}, ${e.message ? e.message : ''}`);
+                console.log(`(${this.hostname}) -> Error parsing message: ${e.code}, ${e.message ? e.message : ""}`);
             }
         };
-        this.webSocket.on('error', (e) => {
-            if (e.code === 'ECONNREFUSED') {
-                this.emit('disconnected');
+        this.webSocket.on("error", (e) => {
+            if (e.code === "ECONNREFUSED") {
+                this.emit("disconnected");
             }
             else {
-                console.error(`(${this.hostname}) -> Engine API Subscription WebSocket Client Error: ${e.code}, ${e.message ? e.message : ''}`);
+                console.error(`(${this.hostname}) -> Engine API Subscription WebSocket Client Error: ${e.code}, ${e.message ? e.message : ""}`);
             }
         });
     };
@@ -97,7 +97,7 @@ class EngineWebSocket extends stream_1.EventEmitter {
     };
     sendPingMessage = () => {
         this.sendWebSocketMessage({
-            topic: 'ping',
+            topic: "ping",
             payload: {},
         });
     };
@@ -108,12 +108,12 @@ class EngineWebSocket extends stream_1.EventEmitter {
         this.registeredCallbacks = [];
     };
     handleWebSocketMessage = (message) => {
-        if (message.topic === 'error') {
+        if (message.topic === "error") {
             console.log(`(${this.hostname}) -> Websocket Error: ${message.payload}`);
         }
-        if (message.topic === 'authorized') {
+        if (message.topic === "authorized") {
             console.log(`(${this.hostname}) -> Engine API Subscription WebSocket Auth Success`);
-            this.emit('connected');
+            this.emit("connected");
         }
         const callbacks = this.registeredCallbacks
             .filter((cb) => cb.topic === message.topic)
@@ -153,38 +153,38 @@ class EngineWebSocket extends stream_1.EventEmitter {
     };
     subscribeToObjectCOV = (uri) => {
         this.sendWebSocketMessage({
-            topic: 'subscribe',
-            payload: { type: 'object-cov', uri },
+            topic: "subscribe",
+            payload: { type: "object-cov", uri },
         });
     };
     unsubscribeToObjectCOV = (uri) => {
         this.sendWebSocketMessage({
-            topic: 'unsubscribe',
-            payload: { type: 'object-cov', uri },
+            topic: "unsubscribe",
+            payload: { type: "object-cov", uri },
         });
     };
     subscribeToResourceCOV = (uri) => {
         this.sendWebSocketMessage({
-            topic: 'subscribe',
-            payload: { type: 'resource-cov', uri },
+            topic: "subscribe",
+            payload: { type: "resource-cov", uri },
         });
     };
     unsubscribeToResourceCOV = (uri) => {
         this.sendWebSocketMessage({
-            topic: 'unsubscribe',
-            payload: { type: 'resource-cov', uri },
+            topic: "unsubscribe",
+            payload: { type: "resource-cov", uri },
         });
     };
     subscribeToBCMD = (uri) => {
         this.sendWebSocketMessage({
-            topic: 'subscribe',
-            payload: { type: 'broadcast-command', uri },
+            topic: "subscribe",
+            payload: { type: "broadcast-command", uri },
         });
     };
     unsubscribeToBCMD = (uri) => {
         this.sendWebSocketMessage({
-            topic: 'unsubscribe',
-            payload: { type: 'broadcast-command', uri },
+            topic: "unsubscribe",
+            payload: { type: "broadcast-command", uri },
         });
     };
 }

package/dist/nodes/mobius-connection.html

@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
     <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 if required</p>
-  <p style="text-align:center"> e.g. <b>myHostname:8443</b></p>
+  <p style="text-align:center"> e.g. <b>myHostname:8442</b></p>
   <hr>
   <div class="form-row">
     <label for="node-config-input-username"><i class="fa fa-user"></i> Username</label>
@@ -49,25 +49,25 @@ POSSIBILITY OF SUCH DAMAGE.
 </script>
 
 <script type="text/javascript">
-  hostLabel = 'test';
-  RED.nodes.registerType('mobius connection', {
-    category: 'config',
+  hostLabel = "test";
+  RED.nodes.registerType("mobius connection", {
+    category: "config",
     defaults: {
-      host: { required: true, value: 'mobius:8443' },
-      username: { required: true, value: '' },
-      password: { required: true, value: '' },
+      host: { required: true, value: "mobius:8442" },
+      username: { required: true, value: "" },
+      password: { required: true, value: "" },
       secure: { required: true, value: false },
     },
     label: function () {
       return `${this.host}`;
     },
     oneditprepare: function () {
-      $('#node-config-input-secure').change(function () {
-        let secure = $('#node-config-input-secure').is(':checked');
+      $("#node-config-input-secure").change(function () {
+        let secure = $("#node-config-input-secure").is(":checked");
         if (secure) {
-          document.getElementById('hostLabel').innerHTML = 'https://';
+          document.getElementById("hostLabel").innerHTML = "https://";
         } else {
-          document.getElementById('hostLabel').innerHTML = 'http://';
+          document.getElementById("hostLabel").innerHTML = "http://";
         }
       });
     },

package/package.json

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