@codiac.io/codiac-cli 1.3.35 → 1.3.36

package/dist/relay/wsclient/websocket-listener-settings.d.ts

@@ -0,0 +1,11 @@
+/** Configuration for the relay web socket client
+ * (ie: duplex comms with the relay via Websocket)  */
+export declare class WebsocketListenerSettings {
+    constructor();
+    /** Fully qualified url of the target web socket service. */
+    url?: string | undefined;
+    /** The pause in mmilliseconds to wait after a connection failure before attempting to reconnect.  */
+    reconnectIntervalMs?: number | undefined;
+    /** The number of retries on a failed connection before throwing exception. */
+    reconnectAttempts?: number | undefined;
+}

package/dist/relay/wsclient/websocket-listener-settings.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebsocketListenerSettings = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("inversify");
+/** Configuration for the relay web socket client
+ * (ie: duplex comms with the relay via Websocket)  */
+let WebsocketListenerSettings = class WebsocketListenerSettings {
+    constructor() { }
+};
+WebsocketListenerSettings = tslib_1.__decorate([
+    (0, inversify_1.injectable)(),
+    tslib_1.__metadata("design:paramtypes", [])
+], WebsocketListenerSettings);
+exports.WebsocketListenerSettings = WebsocketListenerSettings;
+//# sourceMappingURL=websocket-listener-settings.js.map

package/dist/relay/wsclient/websocket-listener-settings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-listener-settings.js","sourceRoot":"","sources":["../../../src/relay/wsclient/websocket-listener-settings.ts"],"names":[],"mappings":";;;;AAAA,yCAA0D;AAE1D;sDACsD;AAE/C,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IACpC,gBAAgB,CAAC;CAQlB,CAAA;AATY,yBAAyB;IADrC,IAAA,sBAAU,GAAE;;GACA,yBAAyB,CASrC;AATY,8DAAyB"}

package/dist/uilogic/cloud-resource-configurators/az-interactive-login-configurator.d.ts

@@ -4,20 +4,20 @@ import { UserNameTenantCode } from "@codiac.io/codiac-ops-common";
 import { RelayClient as GenRelayClient } from "../../apis/codiac-relay";
 import { ILoginConfigurator } from "../i-login-configurator";
 import { OperationMeta } from '../../ops';
-import { RelayWebsocketClient } from '../../relay/wsclient/relay-websocket-client';
 import { IOutputStyler, IUserInputProvider } from '../../ops';
+import { IMessagingClient } from '../i-messaging-client';
 /** Implements AuthorizationCode Flow with a popup-browser interactive login
  * for user to authenticate and provide consent.
  */
 export declare class AzureInteractiveLoginConfigurator implements ILoginConfigurator {
     private opMeta;
     private genRelayClient;
-    private relayWebSocket;
+    private msgClient;
     private codiacUser;
     private _ui;
     private _styler;
     private logger;
-    constructor(opMeta: OperationMeta, genRelayClient: GenRelayClient, relayWebSocket: RelayWebsocketClient, codiacUser: UserNameTenantCode, _ui: IUserInputProvider, _styler: IOutputStyler, logger: IBetterLogger);
+    constructor(opMeta: OperationMeta, genRelayClient: GenRelayClient, msgClient: IMessagingClient, codiacUser: UserNameTenantCode, _ui: IUserInputProvider, _styler: IOutputStyler, logger: IBetterLogger);
     get cloudProvider(): CloudProviderEnum;
     /** Performs an EXPLICIT login sequence in ALL CASES.
      * It does NOT attempt or defer to a silent authentication.

package/dist/uilogic/cloud-resource-configurators/az-interactive-login-configurator.js

@@ -10,18 +10,15 @@ const codiac_domain_1 = require("@codiac.io/codiac-domain");
 const codiac_ops_common_1 = require("@codiac.io/codiac-ops-common");
 const codiac_relay_1 = require("../../apis/codiac-relay");
 const ops_1 = require("../../ops");
-const relay_websocket_client_1 = require("../../relay/wsclient/relay-websocket-client");
 const ops_2 = require("../../ops");
 /** Implements AuthorizationCode Flow with a popup-browser interactive login
  * for user to authenticate and provide consent.
  */
 let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator {
-    constructor(opMeta, genRelayClient, 
-    // @inject(RelaySocketListener) private relayWebSocket: RelaySocketListener,
-    relayWebSocket, codiacUser, _ui, _styler, logger) {
+    constructor(opMeta, genRelayClient, msgClient, codiacUser, _ui, _styler, logger) {
         this.opMeta = opMeta;
         this.genRelayClient = genRelayClient;
-        this.relayWebSocket = relayWebSocket;
+        this.msgClient = msgClient;
         this.codiacUser = codiacUser;
         this._ui = _ui;
         this._styler = _styler;
@@ -48,7 +45,7 @@ let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator
                 //   };
                 // }
                 commChannel = {
-                    socketId: yield this.relayWebSocket.open() // .start()
+                    socketId: yield this.msgClient.connect() // .start()
                 };
                 // 2. Get the login url
                 let authResult = yield this.genRelayClient.Call.csp_login_interactive({ providerCode: this.cloudProvider, commChannel: commChannel, correlationId: this.opMeta.correlationId }, {});
@@ -59,7 +56,6 @@ let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator
                     throw new Error(`No interactive login url found.`);
                 // 3. Trigger the external auth sequence in a browser window.
                 let result = yield this.invokeBrowserSequence(loginUrl);
-                yield this.relayWebSocket.close();
                 return result;
             }
             catch (err) {
@@ -68,6 +64,11 @@ let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator
                 }
                 throw new Error(`Error logging into ${this.cloudProvider}: ${(_b = err.name) !== null && _b !== void 0 ? _b : ""} ${(_c = err.message) !== null && _c !== void 0 ? _c : "(not details available)"}`);
             }
+            finally {
+                if (this.msgClient.isConnected()) {
+                    yield this.msgClient.disconnect();
+                }
+            }
         });
     }
     /** Opens the the external login url in a browser window.
@@ -81,17 +82,17 @@ let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator
                     let isCompleted = false;
                     let isAuthed = false; // Read this from the websocket message / fail / timeout.
                     let cspUserName; // Read this from the websocket message
-                    let handlerId = this.relayWebSocket.listenFor("loginComplete", msg => {
-                        var _a, _b, _c, _d;
+                    let handlerId = this.msgClient.subscribe("loginComplete", (err, msg, meta, raw) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        var _a, _b;
                         isCompleted = true;
                         // TODO: get these from the completion message
-                        isAuthed = Boolean((_b = (_a = msg.payload) === null || _a === void 0 ? void 0 : _a.success) !== null && _b !== void 0 ? _b : "false") === true;
-                        cspUserName = (_d = (_c = msg.payload) === null || _c === void 0 ? void 0 : _c.cspUserName) !== null && _d !== void 0 ? _d : "anonymous@domain.com";
+                        isAuthed = Boolean((_a = msg === null || msg === void 0 ? void 0 : msg.success) !== null && _a !== void 0 ? _a : "false") === true;
+                        cspUserName = (_b = msg === null || msg === void 0 ? void 0 : msg.cspUserName) !== null && _b !== void 0 ? _b : "anonymous@domain.com";
                         this.logger.debug(`Interactive ${this.cloudProvider} login sequence completed [${cspUserName}]`, msg);
-                        this.relayWebSocket.unlisten("loginComplete", handlerId);
+                        this.msgClient.unsubscribe("loginComplete", { subscriptionId: handlerId });
                         // resolve([isAuthed, cspUserName]);
                         // return;
-                    });
+                    }));
                     // 3. Sprout the login interaction in a browser popup
                     let childProcess = yield open(loginUrl, {});
                     // 4. Wait for the completion message via websocket
@@ -125,18 +126,24 @@ let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator
     promptToLogout() {
         var _a, _b, _c, _d;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            // try {
+            //     // if (webSocketId) {
+            //     //   commChannel = { socketId: webSocketId };
+            //     // } else {
+            //     //   commChannel = {
+            //     //     socketId: await this.openWebSocket()
+            //     //   };
+            //     // }
+            //   } catch (err) {
+            //     const errMsg = "Error establishing messaging connection: ".concat(err.message ?? "no details available");
+            //     this.logger.error(errMsg, err.stack);
+            //     throw new Error(errMsg);
+            //   }
             try {
                 // 1. Establish 2-way messaging channel w the relay
                 let commChannel;
-                // if (webSocketId) {
-                //   commChannel = { socketId: webSocketId };
-                // } else {
-                //   commChannel = {
-                //     socketId: await this.openWebSocket()
-                //   };
-                // }
                 commChannel = {
-                    socketId: yield this.relayWebSocket.open() // .start()
+                    socketId: yield this.msgClient.connect() // .start()
                 };
                 // 2. Get the logout url
                 let authResult = yield this.genRelayClient.Call.csp_logout_interactive({ providerCode: this.cloudProvider, commChannel: commChannel, correlationId: this.opMeta.correlationId }, {});
@@ -147,7 +154,6 @@ let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator
                     throw new Error(`No interactive login url found.`);
                 // 3. Trigger the external auth sequence in a browser window.
                 let result = yield this.invokeLogoutBrowserSequence(logoutUrl, (_b = authResult.output) === null || _b === void 0 ? void 0 : _b.cspUserName);
-                yield this.relayWebSocket.close();
                 return result;
             }
             catch (err) {
@@ -156,6 +162,11 @@ let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator
                 }
                 throw new Error(`Error logging out from ${this.cloudProvider}: ${(_c = err.name) !== null && _c !== void 0 ? _c : ""} ${(_d = err.message) !== null && _d !== void 0 ? _d : "(no details available)"}`);
             }
+            finally {
+                if (this.msgClient.isConnected()) {
+                    yield this.msgClient.disconnect();
+                }
+            }
         });
     }
     /** Opens the the external login url in a browser window.
@@ -185,17 +196,25 @@ let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator
                      *
                      * Do we need to fire the logout at all in that scenario?  Perhaps. We may want to run this command anyway to make sure our systems are in sync. */
                     let waitForResult = !_.isEmpty(currentCspUserName);
+                    let subxId;
                     if (waitForResult) {
-                        let handlerId = this.relayWebSocket.listenFor("logoutComplete", msg => {
-                            isCompleted = true;
-                            // TODO: get these from the completion message
-                            isAuthed = true;
-                            cspUserName = currentCspUserName;
-                            this.logger.debug(`Interactive logout sequence completed`, msg);
-                            this.relayWebSocket.unlisten("logoutComplete", handlerId);
-                            // resolve([isAuthed, cspUserName]);
-                            // return;
-                        });
+                        subxId = this.msgClient.subscribe("logoutComplete", (err, msg, meta, raw) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                            var _a;
+                            try {
+                                isCompleted = true;
+                                // TODO: get these from the completion message
+                                isAuthed = true;
+                                cspUserName = currentCspUserName;
+                                this.logger.debug(`Interactive logout sequence completed`, msg);
+                                this.msgClient.unsubscribe("logoutComplete", { subscriptionId: subxId });
+                            }
+                            catch (err) {
+                                this.logger.error(`Error handling logoutComplete on [subxId: ${subxId}]: ${(_a = err.message) !== null && _a !== void 0 ? _a : "no details available"}`, err.stack);
+                            }
+                            finally {
+                                return;
+                            }
+                        }));
                     }
                     // 3. Sprout the login interaction in a browser popup
                     let childProcess = yield open(logoutUrl, {});
@@ -235,15 +254,13 @@ AzureInteractiveLoginConfigurator = tslib_1.__decorate([
     (0, inversify_1.injectable)(),
     tslib_1.__param(0, (0, inversify_1.inject)(ops_1.OperationMeta)),
     tslib_1.__param(1, (0, inversify_1.inject)(codiac_relay_1.RelayClient)),
-    tslib_1.__param(2, (0, inversify_1.inject)(relay_websocket_client_1.RelayWebsocketClient)),
+    tslib_1.__param(2, (0, inversify_1.inject)(ops_2.INTERFACES_CLI.IMessagingClient)),
     tslib_1.__param(3, (0, inversify_1.inject)(codiac_ops_common_1.UserNameTenantCode)),
     tslib_1.__param(4, (0, inversify_1.inject)(ops_2.INTERFACES_CLI.IUserInputProvider)),
     tslib_1.__param(5, (0, inversify_1.inject)(ops_2.INTERFACES_CLI.IOutputStyler)),
     tslib_1.__param(6, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
     tslib_1.__metadata("design:paramtypes", [ops_1.OperationMeta,
-        codiac_relay_1.RelayClient,
-        relay_websocket_client_1.RelayWebsocketClient,
-        codiac_ops_common_1.UserNameTenantCode, Object, Object, Object])
+        codiac_relay_1.RelayClient, Object, codiac_ops_common_1.UserNameTenantCode, Object, Object, Object])
 ], AzureInteractiveLoginConfigurator);
 exports.AzureInteractiveLoginConfigurator = AzureInteractiveLoginConfigurator;
 //# sourceMappingURL=az-interactive-login-configurator.js.map

package/dist/uilogic/cloud-resource-configurators/az-interactive-login-configurator.js.map

@@ -1 +1 @@
-{"version":3,"file":"az-interactive-login-configurator.js","sourceRoot":"","sources":["../../../src/uilogic/cloud-resource-configurators/az-interactive-login-configurator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"az-interactive-login-configurator.js","sourceRoot":"","sources":["../../../src/uilogic/cloud-resource-configurators/az-interactive-login-configurator.ts"],"names":[],"mappings":"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"}

package/dist/uilogic/i-messaging-client.d.ts

@@ -0,0 +1,55 @@
+import { Result } from "@codiac.io/codiac-common/contracts";
+export declare class MessagingDefaults {
+    /** Default message action to specify when not provided by sender. */
+    static readonly ACTION = "none";
+    /** Default subject (aka: topic/queue) to specify when not provided by sender. */
+    static readonly SUBJECT = "default";
+}
+/** Information about a message being sent. */
+export interface IMessageSendMeta {
+    /** The purpose of the message being sent (aka: the operation type).
+     * (akin to a type of message, but not dependent on the details of the class implementation of the message). */
+    action: string;
+    /** (format: guid) Unique identifier for the composite of one or more transactions in a hierarchical sequence. */
+    correlationId: string;
+    /** The string of tokens ("." separated) constituting the concrete topic/queue
+     * to which the message is being sent
+     * (ie: no wildcards "*" or wire taps ">" included).  */
+    subject: string;
+    /** (Optional) The concrete topic/queue (dot-separated tokens) on which the recipient of a message can send back a direct response to the sender. */
+    replyOn?: string;
+}
+/** Generic information related to the message and channel on which it was sent. */
+export interface IMessageReceivedMeta extends IMessageSendMeta {
+    /** The subscription ID to which the message was dispatched. */
+    sid: number;
+}
+/** Declares an Enumerable Object (requiring serialization)
+ * to differentiate the entity from a string that is already serialized. */
+export type MessagePayload = {
+    [name: string]: string | string[] | any;
+};
+export interface ITransportMessage {
+    payload: MessagePayload;
+    meta: IMessageSendMeta;
+}
+export type MessageHandlerOf<TMsg extends MessagePayload> = (err: Error | null, msg: TMsg, meta: IMessageReceivedMeta, raw?: any) => Promise<void>;
+export type MessageHandler = MessageHandlerOf<MessagePayload>;
+/** Abstraction enforcing selected patterns for basic communications functionality. */
+export interface IMessagingClient {
+    /** Returns the unique identifier for the connection. */
+    connect(connectionId?: string): Promise<string>;
+    isConnected(): boolean;
+    disconnect(): Promise<void>;
+    /** Throws on errors subscribing.
+     * Returns the unique id for the subscription. */
+    subscribe<TMsg extends MessagePayload>(topics: string, handler: MessageHandlerOf<TMsg>): string;
+    /** Throws on errors unsubscribing. */
+    unsubscribe(topics: string, options?: {
+        force?: boolean;
+        subscriptionId?: string;
+    }): Promise<boolean>;
+    publish(msg: MessagePayload, meta?: Partial<IMessageSendMeta>): Promise<void>;
+    /** Invoke and wait for a direct response (Request-response pattern). */
+    request<TMsg extends MessagePayload, TRes extends Result>(msg: TMsg, meta?: Partial<IMessageSendMeta>, timeoutInSecs?: number): Promise<TRes>;
+}

package/dist/uilogic/i-messaging-client.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MessagingDefaults = void 0;
+class MessagingDefaults {
+}
+exports.MessagingDefaults = MessagingDefaults;
+/** Default message action to specify when not provided by sender. */
+MessagingDefaults.ACTION = "none";
+/** Default subject (aka: topic/queue) to specify when not provided by sender. */
+MessagingDefaults.SUBJECT = "default";
+//# sourceMappingURL=i-messaging-client.js.map

package/dist/uilogic/i-messaging-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"i-messaging-client.js","sourceRoot":"","sources":["../../src/uilogic/i-messaging-client.ts"],"names":[],"mappings":";;;AAEA,MAAa,iBAAiB;;AAA9B,8CAKC;AAJC,qEAAqE;AAC9C,wBAAM,GAAG,MAAM,CAAC;AACvC,iFAAiF;AAC1D,yBAAO,GAAG,SAAS,CAAC"}

package/dist/uilogic/lrp-watcher-predef.d.ts

@@ -1,7 +1,7 @@
 import { IBetterLogger } from "@codiac.io/codiac-common";
 import { Result } from '@codiac.io/codiac-common/contracts';
-import { RelayWebsocketClient } from "../relay/wsclient/relay-websocket-client";
 import { AsyncTrigger } from "./lrp-watcher-utils";
+import { IMessagingClient } from "./i-messaging-client";
 /** Triggers and renders real time status for a Long Running Process using a predefined call tree.
  *
  * That is, it fires an async request to trigger the process,
@@ -9,9 +9,9 @@ import { AsyncTrigger } from "./lrp-watcher-utils";
  * and renders them in sequential order.
  */
 export declare class LrpWatcherPredef {
-    private relayWebSocket;
+    private msgClient;
     private logger;
-    constructor(relayWebSocket: RelayWebsocketClient, logger: IBetterLogger);
+    constructor(msgClient: IMessagingClient, logger: IBetterLogger);
     private readonly qmgr;
     private statusHandlerId;
     private removeStatusListeners;

package/dist/uilogic/lrp-watcher-predef.js

@@ -7,10 +7,10 @@ const listr2_1 = require("listr2");
 const codiac_common_1 = require("@codiac.io/codiac-common");
 const contracts_1 = require("@codiac.io/codiac-common/contracts");
 const contracts_2 = require("../apis/codiac-relay/contracts");
-const relay_websocket_client_1 = require("../relay/wsclient/relay-websocket-client");
 const relay_queue_manager_1 = require("../relay/wsclient/relay-queue-manager");
 const _ = require("lodash");
 const lrp_watcher_utils_1 = require("./lrp-watcher-utils");
+const ops_1 = require("../ops");
 /** Triggers and renders real time status for a Long Running Process using a predefined call tree.
  *
  * That is, it fires an async request to trigger the process,
@@ -18,15 +18,15 @@ const lrp_watcher_utils_1 = require("./lrp-watcher-utils");
  * and renders them in sequential order.
  */
 let LrpWatcherPredef = class LrpWatcherPredef {
-    constructor(relayWebSocket, logger) {
-        this.relayWebSocket = relayWebSocket;
+    constructor(msgClient, logger) {
+        this.msgClient = msgClient;
         this.logger = logger;
         this.qmgr = new relay_queue_manager_1.QueueManager();
     }
     removeStatusListeners() {
         let closed = false;
-        if (this.relayWebSocket) {
-            closed = closed && this.relayWebSocket.unlisten(lrp_watcher_utils_1.LrpWatcherUtils.STATUS_MSG_TYPE, this.statusHandlerId);
+        if (this.msgClient) {
+            closed = closed && this.msgClient.unsubscribe(lrp_watcher_utils_1.LrpWatcherUtils.STATUS_MSG_TYPE, { subscriptionId: this.statusHandlerId });
         }
         return closed;
     }
@@ -35,14 +35,20 @@ let LrpWatcherPredef = class LrpWatcherPredef {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let result = new contracts_1.Result(false);
             try {
-                let socketId = yield this.relayWebSocket.open();
-                this.statusHandlerId = this.relayWebSocket.listenFor(lrp_watcher_utils_1.LrpWatcherUtils.STATUS_MSG_TYPE, (msg) => {
+                let socketId = yield this.msgClient.connect();
+                this.statusHandlerId = this.msgClient.subscribe(lrp_watcher_utils_1.LrpWatcherUtils.STATUS_MSG_TYPE, (err, msg, meta, raw) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                     // gotta queue these to prevent msg loss due to 
                     // client-server latency in triggering each task watcher 
                     // (server may send messages before the local client task starts listening).
-                    let status = msg.payload;
-                    this.qmgr.push(msg, status.opCode); // todo: consider prefixing with "<CorrelationId>."
-                });
+                    // TODO: Convert MemoryQueue to take an ITransportMessage instead...
+                    const msgForQ = {
+                        action: meta.action,
+                        correlationId: meta.correlationId,
+                        payload: msg
+                    };
+                    this.qmgr.push(msgForQ, msg.opCode); // todo: consider prefixing with "<CorrelationId>."
+                    return;
+                }));
                 // TODO: Make this the first task in the taskMap
                 let ack = yield this.invokeOperation(socketId, trigger);
                 let statusView = yield this.buildStatusView(ack.taskMap);
@@ -55,7 +61,7 @@ let LrpWatcherPredef = class LrpWatcherPredef {
                 result.message = (_b = err.message) !== null && _b !== void 0 ? _b : "Error executing operation: See logs for details";
             }
             finally {
-                yield this.relayWebSocket.close();
+                yield this.msgClient.disconnect();
                 return result;
             }
         });
@@ -149,9 +155,9 @@ let LrpWatcherPredef = class LrpWatcherPredef {
 };
 LrpWatcherPredef = tslib_1.__decorate([
     (0, inversify_1.injectable)(),
-    tslib_1.__param(0, (0, inversify_1.inject)(relay_websocket_client_1.RelayWebsocketClient)),
+    tslib_1.__param(0, (0, inversify_1.inject)(ops_1.INTERFACES_CLI.IMessagingClient)),
     tslib_1.__param(1, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
-    tslib_1.__metadata("design:paramtypes", [relay_websocket_client_1.RelayWebsocketClient, Object])
+    tslib_1.__metadata("design:paramtypes", [Object, Object])
 ], LrpWatcherPredef);
 exports.LrpWatcherPredef = LrpWatcherPredef;
 //# sourceMappingURL=lrp-watcher-predef.js.map

package/dist/uilogic/lrp-watcher-predef.js.map

@@ -1 +1 @@
-{"version":3,"file":"lrp-watcher-predef.js","sourceRoot":"","sources":["../../src/uilogic/lrp-watcher-predef.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lrp-watcher-predef.js","sourceRoot":"","sources":["../../src/uilogic/lrp-watcher-predef.ts"],"names":[],"mappings":"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"}

package/dist/uilogic/lrp-watcher.d.ts

@@ -1,7 +1,7 @@
 import { IBetterLogger } from "@codiac.io/codiac-common";
 import { SingleResult, Result } from '@codiac.io/codiac-common/contracts';
 import { AsyncAck } from '../apis/codiac-relay/contracts';
-import { RelayWebsocketClient } from "../relay/wsclient/relay-websocket-client";
+import { IMessagingClient } from "./i-messaging-client";
 /** Triggers and renders real time status for Long Running Processes.
  *
  * That is, it fires an async request to trigger the process,
@@ -9,9 +9,9 @@ import { RelayWebsocketClient } from "../relay/wsclient/relay-websocket-client";
  * and renders them in sequential order.
  */
 export declare class LrpWatcher {
-    private relayWebSocket;
+    private msgClient;
     private logger;
-    constructor(relayWebSocket: RelayWebsocketClient, logger: IBetterLogger);
+    constructor(msgClient: IMessagingClient, logger: IBetterLogger);
     private statusHandlerId;
     private removeStatusListeners;
     /** Opens and closes its own web socket.

package/dist/uilogic/lrp-watcher.js

@@ -6,7 +6,6 @@ const inversify_1 = require("inversify");
 const listr2_1 = require("listr2");
 const codiac_common_1 = require("@codiac.io/codiac-common");
 const contracts_1 = require("../apis/codiac-relay/contracts");
-const relay_websocket_client_1 = require("../relay/wsclient/relay-websocket-client");
 const lrp_watcher_utils_1 = require("./lrp-watcher-utils");
 /** Triggers and renders real time status for Long Running Processes.
  *
@@ -15,8 +14,8 @@ const lrp_watcher_utils_1 = require("./lrp-watcher-utils");
  * and renders them in sequential order.
  */
 let LrpWatcher = class LrpWatcher {
-    constructor(relayWebSocket, logger) {
-        this.relayWebSocket = relayWebSocket;
+    constructor(msgClient, logger) {
+        this.msgClient = msgClient;
         this.logger = logger;
     }
     // private setStatusHandlers(): void {
@@ -40,8 +39,8 @@ let LrpWatcher = class LrpWatcher {
     // }
     removeStatusListeners() {
         let closed = false;
-        if (this.relayWebSocket) {
-            closed = closed && this.relayWebSocket.unlisten(lrp_watcher_utils_1.LrpWatcherUtils.STATUS_MSG_TYPE, this.statusHandlerId);
+        if (this.msgClient) {
+            closed = closed && this.msgClient.unsubscribe(lrp_watcher_utils_1.LrpWatcherUtils.STATUS_MSG_TYPE, { subscriptionId: this.statusHandlerId });
             // closed = closed && this.relayWebSocket.unlisten("clusterCreateCompleted", this.completionHandlerId!);
         }
         return closed;
@@ -61,17 +60,17 @@ let LrpWatcher = class LrpWatcher {
                         // 1. open real time status stream
                         let commChannel;
                         commChannel = {
-                            socketId: yield this.relayWebSocket.open() // .start()
+                            socketId: yield this.msgClient.connect() // .start()
                         };
                         // this.setStatusHandlers();
-                        this.statusHandlerId = this.relayWebSocket.listenFor(lrp_watcher_utils_1.LrpWatcherUtils.STATUS_MSG_TYPE, msg => {
-                            var _a, _b, _c, _d, _e, _f;
-                            if (msg.payload) {
-                                let statusMsg = msg.payload;
+                        this.statusHandlerId = this.msgClient.subscribe(lrp_watcher_utils_1.LrpWatcherUtils.STATUS_MSG_TYPE, (err, msg, meta, raw) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                            var _l, _m, _o, _p, _q, _r;
+                            if (msg) {
+                                let statusMsg = msg;
                                 // COMPLETION STATUS
                                 if (statusMsg.opCode == mainOpCode && statusMsg.state == contracts_1.OperationStateEnum.Completed) {
-                                    task.output = "".concat((_b = (_a = statusMsg.completionCode) !== null && _a !== void 0 ? _a : statusMsg.message) !== null && _b !== void 0 ? _b : statusMsg.state, "!");
-                                    task.title = task.title.concat("...", (_c = statusMsg.completionCode) !== null && _c !== void 0 ? _c : statusMsg.state);
+                                    task.output = "".concat((_m = (_l = statusMsg.completionCode) !== null && _l !== void 0 ? _l : statusMsg.message) !== null && _m !== void 0 ? _m : statusMsg.state, "!");
+                                    task.title = task.title.concat("...", (_o = statusMsg.completionCode) !== null && _o !== void 0 ? _o : statusMsg.state);
                                     task.task.complete();
                                     ctx.res = lrp_watcher_utils_1.LrpWatcherUtils.resultFromStatusMessage(statusMsg);
                                     // Poor man's DRAIN
@@ -88,18 +87,18 @@ let LrpWatcher = class LrpWatcher {
                                 }
                                 else {
                                     if (statusMsg.state == contracts_1.OperationStateEnum.Completed) {
-                                        task.output = statusMsg.opIngTitle.concat("...", (_d = statusMsg.completionCode) !== null && _d !== void 0 ? _d : statusMsg.state, " ", (_e = statusMsg.message) !== null && _e !== void 0 ? _e : "").trimEnd();
+                                        task.output = statusMsg.opIngTitle.concat("...", (_p = statusMsg.completionCode) !== null && _p !== void 0 ? _p : statusMsg.state, " ", (_q = statusMsg.message) !== null && _q !== void 0 ? _q : "").trimEnd();
                                     }
                                     else {
-                                        task.output = statusMsg.opIngTitle.concat("...", (_f = statusMsg.message) !== null && _f !== void 0 ? _f : "").trimEnd();
+                                        task.output = statusMsg.opIngTitle.concat("...", (_r = statusMsg.message) !== null && _r !== void 0 ? _r : "").trimEnd();
                                     }
                                 }
                             }
                             else {
                                 // No payload - ignore as a ping/heartbeat
-                                task.output = JSON.stringify(msg);
+                                task.output = JSON.stringify(raw);
                             }
-                        });
+                        }));
                         // 2. Fire off the async cluster create
                         // this._ui.userMessage(`(CLI says, Starting cluster create...`);
                         task.output = "Invoking operation...";
@@ -128,7 +127,7 @@ let LrpWatcher = class LrpWatcher {
             });
             let taskResult = yield (spinners === null || spinners === void 0 ? void 0 : spinners.run()); // we're not going to await because we cant block execution (we havent fired the actual task yet)
             // this._ui.userMessage("CLI says, spinner task ended. ".concat(JSON.stringify(taskResult)));
-            yield this.relayWebSocket.close();
+            yield this.msgClient.disconnect();
             // return <TResult>{ success: true, message: "Process execution completed" };  // TODO: Capture the result from the completion status message
             return taskResult.res;
         });
@@ -137,7 +136,7 @@ let LrpWatcher = class LrpWatcher {
 LrpWatcher = tslib_1.__decorate([
     (0, inversify_1.injectable)(),
     tslib_1.__param(1, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
-    tslib_1.__metadata("design:paramtypes", [relay_websocket_client_1.RelayWebsocketClient, Object])
+    tslib_1.__metadata("design:paramtypes", [Object, Object])
 ], LrpWatcher);
 exports.LrpWatcher = LrpWatcher;
 //# sourceMappingURL=lrp-watcher.js.map

package/dist/uilogic/lrp-watcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"lrp-watcher.js","sourceRoot":"","sources":["../../src/uilogic/lrp-watcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lrp-watcher.js","sourceRoot":"","sources":["../../src/uilogic/lrp-watcher.ts"],"names":[],"mappings":"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"}