@codiac.io/codiac-cli 1.3.34 → 1.3.36

package/dist/relay/wsclient/relay-socket-listener.js

@@ -1,165 +1,165 @@
 "use strict";
-var RelaySocketListener_1;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RelaySocketListener = exports.RelaySocketListenerSettings = void 0;
-const tslib_1 = require("tslib");
-const inversify_1 = require("inversify");
-const _ = require("lodash");
-const guid_typescript_1 = require("guid-typescript");
-const stringify = require("json-stringify-safe");
-const codiac_common_1 = require("@codiac.io/codiac-common");
-const rx_websocket_subject_1 = require("./rx-websocket-subject");
-/** Configuration for the relay web socket client
- * (ie: duplex comms with the relay via Websocket)  */
-let RelaySocketListenerSettings = class RelaySocketListenerSettings {
-    constructor() { }
-};
-RelaySocketListenerSettings = tslib_1.__decorate([
-    (0, inversify_1.injectable)(),
-    tslib_1.__metadata("design:paramtypes", [])
-], RelaySocketListenerSettings);
-exports.RelaySocketListenerSettings = RelaySocketListenerSettings;
-/** Meta added to a message handler for facility in managing message subscribers. */
-class HandlerSubx {
-    constructor(id, handler) {
-        this.id = id;
-        this.handler = handler;
-    }
-}
-/**
- * **USAGE:**
- *
- * At bootstrap time...
- * ```
- * RelaySocketListenerService.bootstrap(ioc, { reconnectIntervalMs: 2000 });
- * ```
- * At ctor injection...
- * ```
- * export class MyClass {
- *  constructor(@inject(RelaySocketListener) private socket: RelaySocketListener) { ... }
- *
- *  public doSomething() {
- *    // wire up a msg handler...
- *    this.socket.listenFor("MyAction", msg => {
- *      console.log(`I just got a ${msg.action}, with cid: ${msg.correlationId}`);
- *    });
- *
- *    // Start listening (if its not already)
- *    this.socket.start();
- *  }
- * }
- * ```
- */
-let RelaySocketListener = RelaySocketListener_1 = class RelaySocketListener {
-    static bootstrap(ioc, settings) {
-        ioc.bind(RelaySocketListenerSettings).toConstantValue(settings !== null && settings !== void 0 ? settings : {});
-        ioc.bind(RelaySocketListener_1).toSelf().inSingletonScope(); // <-- There can be only one socket connection from the CLI.
-    }
-    constructor(settings, logger) {
-        this.logger = logger;
-        /** Fires any registered handlers. */
-        this.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 msg; // <--- Do we need to return this?
-        };
-        this.settings = _.assignIn({}, RelaySocketListener_1.DEFAULT_SETTINGS, settings);
-        this.subscribers = {};
-    }
-    /** Connects and initiates the listeners.
-     * Returns the SocketId.
-     * (IDEMPOTENT) Lazy-start: this method wont duplicate connections if it's already connected to the remote websocket server.
-     */
-    start() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                // if (this.rxWebsocketSubject?.connectionStatus !== connected) {
-                if (this.rxWebsocketSubject == undefined) {
-                    this.rxWebsocketSubject = new rx_websocket_subject_1.RxWebsocketSubject(this.settings.url, this.settings.reconnectIntervalMs, this.settings.reconnectAttempts, this.routeInboundMessage, this.logger);
-                }
-                this.rxWebsocketSubject.onSocketConnection((err, socketId) => {
-                    if (err) {
-                        reject(err);
-                    }
-                    else {
-                        resolve(socketId);
-                    }
-                });
-                this.rxWebsocketSubject.connect();
-                this.rxWebsocketSubject.subscribe();
-                // }
-                // How do we observe the connection status and return the socketId once connected?
-                // resolve("fakeSocketId-123-345");
-            }));
-        });
-    }
-    /** (IDEMPOTENT) Lazy-stop: this method can be called even if the (one-and-only) socket is already closed. */
-    stop() {
-        if (this.rxWebsocketSubject) {
-            if (this.rxWebsocketSubject.closed !== true /* .isStopped ? */) {
-                this.rxWebsocketSubject.complete(); // Is this right?
-            }
-        }
-    }
-    /** 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;
-        }
-    }
-};
-RelaySocketListener.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
-};
-RelaySocketListener = RelaySocketListener_1 = tslib_1.__decorate([
-    (0, inversify_1.injectable)(),
-    tslib_1.__param(0, (0, inversify_1.inject)(RelaySocketListenerSettings)),
-    tslib_1.__param(1, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
-    tslib_1.__metadata("design:paramtypes", [RelaySocketListenerSettings, Object])
-], RelaySocketListener);
-exports.RelaySocketListener = RelaySocketListener;
+// import { injectable, inject, interfaces } from "inversify"
+// import _ = require("lodash");
+// import { Observable } from 'rxjs';
+// import { concatMap, take, tap, } from 'rxjs/operators';
+// import { Guid } from "guid-typescript";
+// import * as stringify from "json-stringify-safe"
+// import { INTERFACES, IBetterLogger } from "@codiac.io/codiac-common";
+// import { RxWebsocketSubject } from './rx-websocket-subject'
+// import { IMessage, SocketAction, SocketActionHandler } from './socket-contracts';
+// /** Configuration for the relay web socket client
+//  * (ie: duplex comms with the relay via Websocket)  */
+// @injectable()
+// export class RelaySocketListenerSettings {
+//   constructor() { }
+//   /** Fully qualified url of the target web socket service. */
+//   public url?: string | undefined;
+//   /** The pause in mmilliseconds to wait after a connection failure before attempting to reconnect.  */
+//   public reconnectIntervalMs?: number | undefined;
+//   /** The number of retries on a failed connection before throwing exception. */
+//   public reconnectAttempts?: number | undefined;
+// }
+// /** Meta added to a message handler for facility in managing message subscribers. */
+// class HandlerSubx {
+//   constructor(public id: string, public handler: SocketActionHandler) {
+//   }
+// }
+// /**
+//  * **USAGE:**
+//  *
+//  * At bootstrap time...
+//  * ```
+//  * RelaySocketListenerService.bootstrap(ioc, { reconnectIntervalMs: 2000 });
+//  * ```
+//  * At ctor injection...
+//  * ```
+//  * export class MyClass {
+//  *  constructor(@inject(RelaySocketListener) private socket: RelaySocketListener) { ... }
+//  *
+//  *  public doSomething() {
+//  *    // wire up a msg handler...
+//  *    this.socket.listenFor("MyAction", msg => {
+//  *      console.log(`I just got a ${msg.action}, with cid: ${msg.correlationId}`);
+//  *    });
+//  *
+//  *    // Start listening (if its not already)
+//  *    this.socket.start();
+//  *  }
+//  * }
+//  * ```
+//  */
+// @injectable()
+// export class RelaySocketListener {
+//   public static bootstrap(ioc: interfaces.Container, settings?: RelaySocketListenerSettings | undefined): void {
+//     ioc.bind(RelaySocketListenerSettings).toConstantValue(settings ?? {});
+//     ioc.bind(RelaySocketListener).toSelf().inSingletonScope();  // <-- There can be only one socket connection from the CLI.
+//   }
+//   public static readonly DEFAULT_SETTINGS: Required<RelaySocketListenerSettings> = {
+//     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
+//   };
+//   constructor(
+//     @inject(RelaySocketListenerSettings) settings: RelaySocketListenerSettings,
+//     @inject(INTERFACES.IBetterLogger) private logger: IBetterLogger
+//   ) {
+//     this.settings = _.assignIn({}, RelaySocketListener.DEFAULT_SETTINGS, settings);
+//     this.subscribers = {};
+//   }
+//   private readonly settings: Required<RelaySocketListenerSettings>;
+//   private rxWebsocketSubject: RxWebsocketSubject<IMessage> | undefined
+//   /** Connects and initiates the listeners.
+//    * Returns the SocketId.
+//    * (IDEMPOTENT) Lazy-start: this method wont duplicate connections if it's already connected to the remote websocket server.
+//    */
+//   public async start(): Promise<string> {
+//     return new Promise<string>(async (resolve, reject) => {
+//       // if (this.rxWebsocketSubject?.connectionStatus !== connected) {
+//       if (this.rxWebsocketSubject == undefined) {
+//         this.rxWebsocketSubject = new RxWebsocketSubject(this.settings.url, this.settings.reconnectIntervalMs, this.settings.reconnectAttempts, this.routeInboundMessage, this.logger)
+//       }
+//       this.rxWebsocketSubject.onSocketConnection((err, socketId) => {
+//         if (err) {
+//           reject(err);
+//         } else {
+//           resolve(socketId);
+//         }
+//       })
+//       this.rxWebsocketSubject.connect();
+//       this.rxWebsocketSubject.subscribe();
+//       // }
+//       // How do we observe the connection status and return the socketId once connected?
+//       // resolve("fakeSocketId-123-345");
+//     })
+//   }
+//   /** (IDEMPOTENT) Lazy-stop: this method can be called even if the (one-and-only) socket is already closed. */
+//   public stop(): void {
+//     if (this.rxWebsocketSubject) {
+//       if (this.rxWebsocketSubject.closed !== true  /* .isStopped ? */) {
+//         this.rxWebsocketSubject.complete();  // Is this right?
+//       }
+//     }
+//   }
+//   // public go(correlationId?: string): void {
+//   //   if (correlationId) this.correlationId = correlationId;
+//   //   const socketRequest: SocketAction = { action: this.ACTION, correlationId: correlationId, payload: { authorization: this.authTokenQuery.JWT } } // new HttpHeaders({ authorization: this.authTokenQuery.JWT })
+//   //   this.rxWebsocketSubject.send(socketRequest);
+//   // }
+//   /** Late-bound subscribers to incoming messages, mapped by `SocketAction.action`.
+//    *
+//    * If multiple handlers are registered for a given action,
+//    * they get fired in order they subscribed (first-come first served).
+//    */
+//   private subscribers: { [action: string]: HandlerSubx[] };
+//   /** Returns the subscription id for the handler (reqd for unsubcribing).
+//    */
+//   public listenFor(action: string, handler: SocketActionHandler): string {
+//     if (this.subscribers[action] == undefined) {
+//       this.subscribers[action] = [];
+//     }
+//     let subx: HandlerSubx = {
+//       id: 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. */
+//   public unlisten(action: string, subscriptionId: string): boolean {
+//     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. */
+//   private routeInboundMessage = (msg: MessageEvent | SocketAction) => {
+//     if ((<any>msg).action) {
+//       let actionMsg = <SocketAction>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}]: ${err.name ?? ""} ${err.message ?? "(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 msg;  // <--- Do we need to return this?
+//   }
+// }
 //# sourceMappingURL=relay-socket-listener.js.map

package/dist/relay/wsclient/relay-socket-listener.js.map

@@ -1 +1 @@
-{"version":3,"file":"relay-socket-listener.js","sourceRoot":"","sources":["../../../src/relay/wsclient/relay-socket-listener.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"relay-socket-listener.js","sourceRoot":"","sources":["../../../src/relay/wsclient/relay-socket-listener.ts"],"names":[],"mappings":";AAAA,6DAA6D;AAC7D,gCAAgC;AAChC,qCAAqC;AACrC,0DAA0D;AAC1D,0CAA0C;AAC1C,mDAAmD;AAEnD,wEAAwE;AAExE,8DAA8D;AAC9D,oFAAoF;AAGpF,oDAAoD;AACpD,yDAAyD;AACzD,gBAAgB;AAChB,6CAA6C;AAC7C,sBAAsB;AAEtB,iEAAiE;AACjE,qCAAqC;AACrC,0GAA0G;AAC1G,qDAAqD;AACrD,mFAAmF;AACnF,mDAAmD;AACnD,IAAI;AAEJ,uFAAuF;AACvF,sBAAsB;AACtB,0EAA0E;AAC1E,MAAM;AACN,IAAI;AAEJ,MAAM;AACN,gBAAgB;AAChB,KAAK;AACL,0BAA0B;AAC1B,SAAS;AACT,+EAA+E;AAC/E,SAAS;AACT,0BAA0B;AAC1B,SAAS;AACT,4BAA4B;AAC5B,4FAA4F;AAC5F,KAAK;AACL,6BAA6B;AAC7B,oCAAoC;AACpC,mDAAmD;AACnD,qFAAqF;AACrF,YAAY;AACZ,KAAK;AACL,gDAAgD;AAChD,6BAA6B;AAC7B,QAAQ;AACR,OAAO;AACP,SAAS;AACT,MAAM;AACN,gBAAgB;AAChB,qCAAqC;AAErC,mHAAmH;AACnH,6EAA6E;AAC7E,+HAA+H;AAC/H,MAAM;AAGN,uFAAuF;AACvF,kCAAkC;AAClC,iCAAiC;AACjC,kGAAkG;AAClG,uEAAuE;AACvE,2BAA2B;AAC3B,OAAO;AAGP,iBAAiB;AACjB,kFAAkF;AAClF,sEAAsE;AACtE,QAAQ;AACR,sFAAsF;AACtF,6BAA6B;AAC7B,MAAM;AAEN,sEAAsE;AACtE,yEAAyE;AAIzE,8CAA8C;AAC9C,6BAA6B;AAC7B,iIAAiI;AACjI,QAAQ;AACR,4CAA4C;AAC5C,8DAA8D;AAC9D,0EAA0E;AAC1E,oDAAoD;AACpD,yLAAyL;AACzL,UAAU;AAEV,wEAAwE;AACxE,qBAAqB;AACrB,yBAAyB;AACzB,mBAAmB;AACnB,+BAA+B;AAC/B,YAAY;AACZ,WAAW;AAEX,2CAA2C;AAC3C,6CAA6C;AAC7C,aAAa;AAEb,2FAA2F;AAC3F,4CAA4C;AAC5C,SAAS;AACT,MAAM;AAGN,kHAAkH;AAClH,0BAA0B;AAC1B,qCAAqC;AACrC,2EAA2E;AAC3E,iEAAiE;AACjE,UAAU;AACV,QAAQ;AACR,MAAM;AAEN,iDAAiD;AACjD,gEAAgE;AAChE,uNAAuN;AACvN,sDAAsD;AACtD,SAAS;AAGT,sFAAsF;AACtF,OAAO;AACP,+DAA+D;AAC/D,0EAA0E;AAC1E,QAAQ;AACR,8DAA8D;AAG9D,6EAA6E;AAC7E,QAAQ;AACR,6EAA6E;AAC7E,mDAAmD;AACnD,uCAAuC;AACvC,QAAQ;AACR,gCAAgC;AAChC,sCAAsC;AACtC,yBAAyB;AACzB,SAAS;AACT,2CAA2C;AAC3C,sBAAsB;AACtB,MAAM;AAGN,2HAA2H;AAC3H,OAAO;AACP,iCAAiC;AACjC,uEAAuE;AACvE,gDAAgD;AAChD,+CAA+C;AAC/C,yEAAyE;AACzE,4CAA4C;AAC5C,eAAe;AACf,sBAAsB;AACtB,QAAQ;AACR,MAAM;AAIN,0CAA0C;AAC1C,0EAA0E;AAE1E,+BAA+B;AAC/B,2CAA2C;AAC3C,wDAAwD;AACxD,yCAAyC;AACzC,oCAAoC;AACpC,kBAAkB;AAClB,oHAAoH;AACpH,yDAAyD;AACzD,4BAA4B;AAC5B,iLAAiL;AACjL,cAAc;AACd,YAAY;AACZ,iBAAiB;AACjB,6GAA6G;AAC7G,UAAU;AACV,eAAe;AACf,sFAAsF;AACtF,QAAQ;AAER,sDAAsD;AACtD,MAAM;AACN,IAAI"}

package/dist/relay/wsclient/relay-websocket-client.d.ts

@@ -1,18 +1,25 @@
 import { IBetterLogger } from "@codiac.io/codiac-common";
+import { Result } from "@codiac.io/codiac-common/contracts";
 import { interfaces } from "inversify";
-import { RelaySocketListenerSettings } from "./relay-socket-listener";
-import { SocketActionHandler } from './socket-contracts';
+import { WebsocketListenerSettings } from "./websocket-listener-settings";
 import { ApiUserCreds } from "../../apis/codiac-api/common/api-user-creds";
-export declare class RelayWebsocketClient {
+import { IMessageSendMeta, IMessagingClient, MessageHandlerOf, MessagePayload } from "../../uilogic/i-messaging-client";
+export declare class RelayWebsocketClient implements IMessagingClient {
     private credentials;
     private logger;
-    static bootstrap(ioc: interfaces.Container, settings?: RelaySocketListenerSettings | undefined): void;
-    static readonly DEFAULT_SETTINGS: Required<RelaySocketListenerSettings>;
-    constructor(credentials: ApiUserCreds, settings: RelaySocketListenerSettings, logger: IBetterLogger);
+    static bootstrap(ioc: interfaces.Container, settings?: WebsocketListenerSettings | undefined): void;
+    static readonly DEFAULT_SETTINGS: Required<WebsocketListenerSettings>;
+    private static readonly SOCKET_ID_UNDEFINED;
+    private static readonly NOT_USED_PLACEHOLDER;
+    constructor(credentials: ApiUserCreds, settings: WebsocketListenerSettings, logger: IBetterLogger);
     private readonly settings;
     private socket;
-    open(): Promise<string>;
-    close(): Promise<void>;
+    connect(connectionId?: string): Promise<string>;
+    isConnected(): boolean;
+    disconnect(): Promise<void>;
+    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>;
     /** Late-bound subscribers to incoming messages, mapped by `SocketAction.action`.
    *
    * If multiple handlers are registered for a given action,
@@ -21,13 +28,17 @@ export declare class RelayWebsocketClient {
     private subscribers;
     /** Returns the subscription id for the handler (reqd for unsubcribing).
      */
-    listenFor(action: string, handler: SocketActionHandler): string;
+    subscribe<TMsg extends MessagePayload>(topics: string, handler: MessageHandlerOf<TMsg>): string;
     /** Removes the given listener.  (IDEMPOTENT) Returns whether a handler was indeed removed (false if it didn't exist).
      *
      * Throws any exceptions. */
-    unlisten(action: string, subscriptionId: string): boolean;
+    unsubscribe(topics: string, options?: {
+        force?: boolean;
+        subscriptionId?: string;
+    }): Promise<boolean>;
     /** Fires any registered handlers.
      * (and doesnt wait for them).
     */
     private routeInboundMessage;
+    private extractInboundMeta;
 }