node-red-contrib-mobius-flow-base 3.3.0 → 3.4.0-beta.2

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

@@ -1,6 +1,6 @@
-import { AxiosInstance } from 'axios';
-import { EngineWebSocket } from './engine-websocket';
-import { EngineApiCalls } from './engine-api-calls';
+import { AxiosInstance } from "axios";
+import { EngineWebSocket } from "./engine-websocket";
+import { EngineApiCalls } from "./engine-api-calls";
 export declare class EngineApiClient extends EngineApiCalls {
     private reloginInterval;
     client: AxiosInstance | null;
@@ -14,7 +14,7 @@ export declare class EngineApiClient extends EngineApiCalls {
     EngineWebSocket: EngineWebSocket;
     private hostname;
     private protocol;
-    constructor(protocol: 'http' | 'https', host: string, username: string, password: string);
+    constructor(protocol: "http" | "https", host: string, username: string, password: string);
     private login;
     private refresh;
     close: () => void;

package/dist/engine-api-client.js

@@ -24,11 +24,11 @@ class EngineApiClient extends engine_api_calls_1.EngineApiCalls {
         this.password = password;
         this.hostname = host;
         this.protocol = protocol;
-        const baseURL = `${this.protocol}://${this.hostname}/api/v1`;
+        const baseURL = `${this.protocol}://${this.hostname}/api/engine/v1`;
         this.client = axios_1.default.create({
             baseURL: baseURL,
             headers: {
-                'Content-Type': 'application/json',
+                "Content-Type": "application/json",
             },
         });
         this.setApiClient(this.client);
@@ -41,15 +41,15 @@ class EngineApiClient extends engine_api_calls_1.EngineApiCalls {
             this.login();
         }
         else {
-            console.log('No username, password, host, or port provided. Not attempting to login to Mobius Engine API.');
+            console.log("No username, password, host, or port provided. Not attempting to login to Mobius Engine API.");
             this.reloginInterval && clearInterval(this.reloginInterval);
             this.reloginInterval = null;
         }
         // Add auth headers to all axios calls
         this.client.interceptors.request.use((config) => {
-            if (!config.url?.endsWith('/auth/login')) {
+            if (!config.url?.endsWith("/auth/login")) {
                 if (this.tokens && config.headers) {
-                    config.headers['Authorization'] = `Bearer ${this.tokens.token}`;
+                    config.headers["Authorization"] = `Bearer ${this.tokens.token}`;
                 }
             }
             return config;
@@ -62,7 +62,7 @@ class EngineApiClient extends engine_api_calls_1.EngineApiCalls {
             throw error;
         });
         this.EngineWebSocket = new engine_websocket_1.EngineWebSocket(this.hostname, this.protocol);
-        this.EngineWebSocket.on('disconnected', () => {
+        this.EngineWebSocket.on("disconnected", () => {
             this.loggedIn = false;
         });
     }
@@ -70,8 +70,8 @@ class EngineApiClient extends engine_api_calls_1.EngineApiCalls {
         console.log(`(${this.hostname}) -> Attempting Mobius Engine API Login`);
         try {
             const response = await this.client({
-                method: 'post',
-                url: '/auth/login',
+                method: "post",
+                url: "/auth/login",
                 data: {
                     username: this.username,
                     password: this.password,
@@ -97,8 +97,8 @@ class EngineApiClient extends engine_api_calls_1.EngineApiCalls {
         }
         try {
             const response = await this.client({
-                method: 'post',
-                url: '/auth/refresh',
+                method: "post",
+                url: "/auth/refresh",
                 data: {
                     refreshToken: this.tokens.refreshToken,
                 },

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/package.json

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