@codiac.io/codiac-cli 1.2.169 → 1.2.170

package/lib/relay/wsclient/relay-websocket-client.js

@@ -1,179 +1,179 @@
-"use strict";
-var RelayWebsocketClient_1;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RelayWebsocketClient = void 0;
-const tslib_1 = require("tslib");
-const codiac_common_1 = require("@codiac.io/codiac-common");
-const inversify_1 = require("inversify");
-const _ = require("lodash");
-const WebSocket = require("ws");
-const guid_typescript_1 = require("guid-typescript");
-const stringify = require("json-stringify-safe");
-const relay_socket_listener_1 = require("./relay-socket-listener");
-const api_user_creds_1 = require("../../apis/codiac-api/common/api-user-creds");
-/** Meta added to a message handler for facility in managing message subscribers. */
-class HandlerSubx {
-    constructor(id, handler) {
-        this.id = id;
-        this.handler = handler;
-    }
-}
-let RelayWebsocketClient = RelayWebsocketClient_1 = class RelayWebsocketClient {
-    static bootstrap(ioc, settings) {
-        ioc.bind(relay_socket_listener_1.RelaySocketListenerSettings).toConstantValue(settings !== null && settings !== void 0 ? settings : {});
-        ioc.bind(RelayWebsocketClient_1).toSelf().inSingletonScope(); // <-- There can be only one socket connection from the CLI.
-    }
-    constructor(credentials, settings, logger) {
-        this.credentials = credentials;
-        this.logger = logger;
-        this.settings = _.assignIn({}, RelayWebsocketClient_1.DEFAULT_SETTINGS, settings);
-        this.subscribers = {};
-    }
-    open() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                try {
-                    this.socket = new WebSocket(this.settings.url, undefined, {
-                        headers: {
-                            "Authorization": this.credentials.apiToken
-                        }
-                    });
-                    this.socket.onopen = (eventMsg) => {
-                        this.logger.debug(`Connection opened successfully at [${eventMsg.target.url}]. Waiting on socket details message. `);
-                    };
-                    this.socket.onerror = (eventMsg) => {
-                        var _a;
-                        this.logger.error(`WebSocket ${eventMsg.type}: ${(_a = eventMsg.message) !== null && _a !== void 0 ? _a : "(no details available)"}`);
-                        if (eventMsg.error) {
-                            reject(eventMsg.error);
-                        }
-                        else {
-                            reject(new Error(`WebSocket ${eventMsg.type} error: ${eventMsg.message}`));
-                        }
-                    };
-                    this.listenFor("connection", (msg) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                        var _a, _b;
-                        this.logger.trace(`COnnection msg received: `, msg);
-                        resolve((_b = (_a = msg.payload) === null || _a === void 0 ? void 0 : _a.socketId) !== null && _b !== void 0 ? _b : "undefined-socket-id");
-                    }));
-                    this.socket.onmessage = (msg) => {
-                        var _a, _b;
-                        try {
-                            if (msg.type === "message" && msg.target && msg.data) {
-                                // MessageEvent entity
-                                let contentsObj = JSON.parse(msg.data);
-                                this.routeInboundMessage(contentsObj);
-                            }
-                            else {
-                                this.routeInboundMessage(msg);
-                            }
-                        }
-                        catch (err) {
-                            this.logger.error(`Error routing message: ${(_a = err.name) !== null && _a !== void 0 ? _a : ""} ${(_b = err.message) !== null && _b !== void 0 ? _b : "(no dettails available)"}`);
-                        }
-                    };
-                }
-                catch (err) {
-                    reject(err);
-                }
-            }));
-        });
-    }
-    close() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                var _a;
-                try {
-                    if (this.socket) {
-                        if (![this.socket.CLOSED, this.socket.CLOSING].includes(this.socket.readyState)) {
-                            this.socket.close();
-                            this.logger.debug(`Closed web socket.`);
-                        }
-                        else {
-                            this.logger.debug(`Attempted close when socket was already closed or closing.`);
-                        }
-                    }
-                    else {
-                        this.logger.debug(`Attempted close when socket was undefined.`);
-                    }
-                    resolve();
-                }
-                catch (err) {
-                    this.logger.error(`Error closing socket connection: ${(_a = err.message) !== null && _a !== void 0 ? _a : "(no details available)"}`);
-                    reject(err);
-                }
-            }));
-        });
-    }
-    /** Returns the subscription id for the handler (reqd for unsubcribing).
-     */
-    listenFor(action, handler) {
-        if (this.subscribers[action] == undefined) {
-            this.subscribers[action] = [];
-        }
-        let subx = {
-            id: guid_typescript_1.Guid.create().toString(),
-            handler: handler
-        };
-        this.subscribers[action].push(subx);
-        return subx.id;
-    }
-    /** Removes the given listener.  (IDEMPOTENT) Returns whether a handler was indeed removed (false if it didn't exist).
-     *
-     * Throws any exceptions. */
-    unlisten(action, subscriptionId) {
-        let existings = this.subscribers[action];
-        if (existings && existings.length > 0) {
-            let removed = _.remove(existings, x => x.id === subscriptionId);
-            return Boolean(removed.length > 0);
-        }
-        else {
-            return false;
-        }
-    }
-    /** Fires any registered handlers.
-     * (and doesnt wait for them).
-    */
-    routeInboundMessage(msg) {
-        var _a, _b;
-        if (msg.action) {
-            let actionMsg = msg;
-            let subxs = this.subscribers[actionMsg.action];
-            if (subxs && subxs.length > 0) {
-                for (let subx of subxs) {
-                    try {
-                        this.logger.debug(`Handling inbound [${actionMsg.action}] SocketAction [handler id: ${subx.id}]...`);
-                        /* TODO: await? */ subx.handler(actionMsg);
-                    }
-                    catch (err) {
-                        this.logger.error(`Unhandled error in [${actionMsg.action}] SocketAction handler [id: ${subx.id}]: ${(_a = err.name) !== null && _a !== void 0 ? _a : ""} ${(_b = err.message) !== null && _b !== void 0 ? _b : "(No details available)"}`);
-                    }
-                }
-            }
-            else {
-                this.logger.warn(`Received unhandled [${actionMsg.action}] message from [${this.settings.url}];`);
-            }
-        }
-        else {
-            this.logger.warn(`Received unrecognized WebSocket message.`, stringify(msg));
-        }
-        return;
-    }
-};
-RelayWebsocketClient.DEFAULT_SETTINGS = {
-    url: "ws://localhost:5798",
-    reconnectIntervalMs: 2000,
-    /** Deliberately kept short because the retry is limited to a single cli command execution,
-     * not an ongoing user session (thus it needs to fail fast).  */
-    reconnectAttempts: 5
-};
-RelayWebsocketClient = RelayWebsocketClient_1 = tslib_1.__decorate([
-    (0, inversify_1.injectable)(),
-    tslib_1.__param(0, (0, inversify_1.inject)(api_user_creds_1.ApiUserCreds)),
-    tslib_1.__param(1, (0, inversify_1.inject)(relay_socket_listener_1.RelaySocketListenerSettings)),
-    tslib_1.__param(2, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
-    tslib_1.__metadata("design:paramtypes", [api_user_creds_1.ApiUserCreds,
-        relay_socket_listener_1.RelaySocketListenerSettings, Object])
-], RelayWebsocketClient);
-exports.RelayWebsocketClient = RelayWebsocketClient;
+"use strict";
+var RelayWebsocketClient_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RelayWebsocketClient = void 0;
+const tslib_1 = require("tslib");
+const codiac_common_1 = require("@codiac.io/codiac-common");
+const inversify_1 = require("inversify");
+const _ = require("lodash");
+const WebSocket = require("ws");
+const guid_typescript_1 = require("guid-typescript");
+const stringify = require("json-stringify-safe");
+const relay_socket_listener_1 = require("./relay-socket-listener");
+const api_user_creds_1 = require("../../apis/codiac-api/common/api-user-creds");
+/** Meta added to a message handler for facility in managing message subscribers. */
+class HandlerSubx {
+    constructor(id, handler) {
+        this.id = id;
+        this.handler = handler;
+    }
+}
+let RelayWebsocketClient = RelayWebsocketClient_1 = class RelayWebsocketClient {
+    static bootstrap(ioc, settings) {
+        ioc.bind(relay_socket_listener_1.RelaySocketListenerSettings).toConstantValue(settings !== null && settings !== void 0 ? settings : {});
+        ioc.bind(RelayWebsocketClient_1).toSelf().inSingletonScope(); // <-- There can be only one socket connection from the CLI.
+    }
+    constructor(credentials, settings, logger) {
+        this.credentials = credentials;
+        this.logger = logger;
+        this.settings = _.assignIn({}, RelayWebsocketClient_1.DEFAULT_SETTINGS, settings);
+        this.subscribers = {};
+    }
+    open() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                try {
+                    this.socket = new WebSocket(this.settings.url, undefined, {
+                        headers: {
+                            "Authorization": this.credentials.apiToken
+                        }
+                    });
+                    this.socket.onopen = (eventMsg) => {
+                        this.logger.debug(`Connection opened successfully at [${eventMsg.target.url}]. Waiting on socket details message. `);
+                    };
+                    this.socket.onerror = (eventMsg) => {
+                        var _a;
+                        this.logger.error(`WebSocket ${eventMsg.type}: ${(_a = eventMsg.message) !== null && _a !== void 0 ? _a : "(no details available)"}`);
+                        if (eventMsg.error) {
+                            reject(eventMsg.error);
+                        }
+                        else {
+                            reject(new Error(`WebSocket ${eventMsg.type} error: ${eventMsg.message}`));
+                        }
+                    };
+                    this.listenFor("connection", (msg) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        var _a, _b;
+                        this.logger.trace(`COnnection msg received: `, msg);
+                        resolve((_b = (_a = msg.payload) === null || _a === void 0 ? void 0 : _a.socketId) !== null && _b !== void 0 ? _b : "undefined-socket-id");
+                    }));
+                    this.socket.onmessage = (msg) => {
+                        var _a, _b;
+                        try {
+                            if (msg.type === "message" && msg.target && msg.data) {
+                                // MessageEvent entity
+                                let contentsObj = JSON.parse(msg.data);
+                                this.routeInboundMessage(contentsObj);
+                            }
+                            else {
+                                this.routeInboundMessage(msg);
+                            }
+                        }
+                        catch (err) {
+                            this.logger.error(`Error routing message: ${(_a = err.name) !== null && _a !== void 0 ? _a : ""} ${(_b = err.message) !== null && _b !== void 0 ? _b : "(no dettails available)"}`);
+                        }
+                    };
+                }
+                catch (err) {
+                    reject(err);
+                }
+            }));
+        });
+    }
+    close() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                var _a;
+                try {
+                    if (this.socket) {
+                        if (![this.socket.CLOSED, this.socket.CLOSING].includes(this.socket.readyState)) {
+                            this.socket.close();
+                            this.logger.debug(`Closed web socket.`);
+                        }
+                        else {
+                            this.logger.debug(`Attempted close when socket was already closed or closing.`);
+                        }
+                    }
+                    else {
+                        this.logger.debug(`Attempted close when socket was undefined.`);
+                    }
+                    resolve();
+                }
+                catch (err) {
+                    this.logger.error(`Error closing socket connection: ${(_a = err.message) !== null && _a !== void 0 ? _a : "(no details available)"}`);
+                    reject(err);
+                }
+            }));
+        });
+    }
+    /** Returns the subscription id for the handler (reqd for unsubcribing).
+     */
+    listenFor(action, handler) {
+        if (this.subscribers[action] == undefined) {
+            this.subscribers[action] = [];
+        }
+        let subx = {
+            id: guid_typescript_1.Guid.create().toString(),
+            handler: handler
+        };
+        this.subscribers[action].push(subx);
+        return subx.id;
+    }
+    /** Removes the given listener.  (IDEMPOTENT) Returns whether a handler was indeed removed (false if it didn't exist).
+     *
+     * Throws any exceptions. */
+    unlisten(action, subscriptionId) {
+        let existings = this.subscribers[action];
+        if (existings && existings.length > 0) {
+            let removed = _.remove(existings, x => x.id === subscriptionId);
+            return Boolean(removed.length > 0);
+        }
+        else {
+            return false;
+        }
+    }
+    /** Fires any registered handlers.
+     * (and doesnt wait for them).
+    */
+    routeInboundMessage(msg) {
+        var _a, _b;
+        if (msg.action) {
+            let actionMsg = msg;
+            let subxs = this.subscribers[actionMsg.action];
+            if (subxs && subxs.length > 0) {
+                for (let subx of subxs) {
+                    try {
+                        this.logger.debug(`Handling inbound [${actionMsg.action}] SocketAction [handler id: ${subx.id}]...`);
+                        /* TODO: await? */ subx.handler(actionMsg);
+                    }
+                    catch (err) {
+                        this.logger.error(`Unhandled error in [${actionMsg.action}] SocketAction handler [id: ${subx.id}]: ${(_a = err.name) !== null && _a !== void 0 ? _a : ""} ${(_b = err.message) !== null && _b !== void 0 ? _b : "(No details available)"}`);
+                    }
+                }
+            }
+            else {
+                this.logger.warn(`Received unhandled [${actionMsg.action}] message from [${this.settings.url}];`);
+            }
+        }
+        else {
+            this.logger.warn(`Received unrecognized WebSocket message.`, stringify(msg));
+        }
+        return;
+    }
+};
+RelayWebsocketClient.DEFAULT_SETTINGS = {
+    url: "ws://localhost:5798",
+    reconnectIntervalMs: 2000,
+    /** Deliberately kept short because the retry is limited to a single cli command execution,
+     * not an ongoing user session (thus it needs to fail fast).  */
+    reconnectAttempts: 5
+};
+RelayWebsocketClient = RelayWebsocketClient_1 = tslib_1.__decorate([
+    (0, inversify_1.injectable)(),
+    tslib_1.__param(0, (0, inversify_1.inject)(api_user_creds_1.ApiUserCreds)),
+    tslib_1.__param(1, (0, inversify_1.inject)(relay_socket_listener_1.RelaySocketListenerSettings)),
+    tslib_1.__param(2, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
+    tslib_1.__metadata("design:paramtypes", [api_user_creds_1.ApiUserCreds,
+        relay_socket_listener_1.RelaySocketListenerSettings, Object])
+], RelayWebsocketClient);
+exports.RelayWebsocketClient = RelayWebsocketClient;
 //# sourceMappingURL=relay-websocket-client.js.map

package/lib/relay/wsclient/rx-websocket-subject.d.ts

@@ -1,25 +1,25 @@
-import { Subject, Observable } from 'rxjs';
-import { IBetterLogger } from "@codiac.io/codiac-common";
-import { SocketAction } from './socket-contracts';
-export declare class RxWebsocketSubject<T> extends Subject<T> {
-    private url;
-    private reconnectInterval;
-    private reconnectAttempts;
-    private resultSelector;
-    private logger;
-    private serializer?;
-    private data;
-    private reconnectionObservable;
-    private wsSubjectConfig;
-    private socket;
-    private connectionObserver;
-    connectionStatus: Observable<boolean>;
-    defaultResultSelector: (e: MessageEvent | SocketAction) => any;
-    defaultSerializer: (data: any) => string;
-    constructor(url: string, reconnectInterval: number, reconnectAttempts: number, resultSelector: (e: MessageEvent | SocketAction) => any, logger: IBetterLogger, serializer?: ((data: any) => string) | undefined);
-    connect(): void;
-    private cnxnHandler;
-    onSocketConnection(handler: (err: Error | undefined, data?: any) => void): void;
-    reconnect(): void;
-    send(data: any): void;
-}
+import { Subject, Observable } from 'rxjs';
+import { IBetterLogger } from "@codiac.io/codiac-common";
+import { SocketAction } from './socket-contracts';
+export declare class RxWebsocketSubject<T> extends Subject<T> {
+    private url;
+    private reconnectInterval;
+    private reconnectAttempts;
+    private resultSelector;
+    private logger;
+    private serializer?;
+    private data;
+    private reconnectionObservable;
+    private wsSubjectConfig;
+    private socket;
+    private connectionObserver;
+    connectionStatus: Observable<boolean>;
+    defaultResultSelector: (e: MessageEvent | SocketAction) => any;
+    defaultSerializer: (data: any) => string;
+    constructor(url: string, reconnectInterval: number, reconnectAttempts: number, resultSelector: (e: MessageEvent | SocketAction) => any, logger: IBetterLogger, serializer?: ((data: any) => string) | undefined);
+    connect(): void;
+    private cnxnHandler;
+    onSocketConnection(handler: (err: Error | undefined, data?: any) => void): void;
+    reconnect(): void;
+    send(data: any): void;
+}