@codiac.io/codiac-cli 1.3.34 → 1.3.36

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

@@ -9,7 +9,7 @@ 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 websocket_listener_settings_1 = require("./websocket-listener-settings");
 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 {
@@ -20,7 +20,7 @@ class HandlerSubx {
 }
 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(websocket_listener_settings_1.WebsocketListenerSettings).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) {
@@ -29,7 +29,7 @@ let RelayWebsocketClient = RelayWebsocketClient_1 = class RelayWebsocketClient {
         this.settings = _.assignIn({}, RelayWebsocketClient_1.DEFAULT_SETTINGS, settings);
         this.subscribers = {};
     }
-    open() {
+    connect(connectionId) {
         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 {
@@ -51,10 +51,10 @@ let RelayWebsocketClient = RelayWebsocketClient_1 = class RelayWebsocketClient {
                             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.subscribe("connection", (err, msg, meta, raw) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        var _a;
+                        this.logger.trace(`Connection msg received: `, msg);
+                        resolve((_a = msg === null || msg === void 0 ? void 0 : msg.socketId) !== null && _a !== void 0 ? _a : RelayWebsocketClient_1.SOCKET_ID_UNDEFINED);
                     }));
                     this.socket.onmessage = (msg) => {
                         var _a, _b;
@@ -79,7 +79,20 @@ let RelayWebsocketClient = RelayWebsocketClient_1 = class RelayWebsocketClient {
             }));
         });
     }
-    close() {
+    isConnected() {
+        var _a;
+        let isConnected = false;
+        try {
+            isConnected = Boolean(this.socket != undefined);
+        }
+        catch (err) {
+            this.logger.error("Error checking connection: ".concat((_a = err.message) !== null && _a !== void 0 ? _a : ""), err.stack);
+        }
+        finally {
+            return isConnected;
+        }
+    }
+    disconnect() {
         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;
@@ -87,7 +100,7 @@ let RelayWebsocketClient = RelayWebsocketClient_1 = class RelayWebsocketClient {
                     if (this.socket) {
                         let closingStates = [this.socket.CLOSED, this.socket.CLOSING];
                         if (!closingStates.includes(this.socket.readyState)) {
-                            this.socket.close();
+                            this.socket.close(1000); // for codes see: https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent/code
                             this.logger.debug(`Closed web socket.`);
                         }
                         else {
@@ -106,48 +119,84 @@ let RelayWebsocketClient = RelayWebsocketClient_1 = class RelayWebsocketClient {
             }));
         });
     }
+    // ---------------------------------------------------------------------------------------
+    // PUB-SUB  (...well, sub, really)
+    // ---------------------------------------------------------------------------------------
+    publish(msg, meta) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            // TODO: Lift this from the ServerSideWebSocketClient
+            throw new Error("publish is not yet implemented");
+        });
+    }
+    /** Invoke and wait for a direct response (Request-response pattern). */
+    request(msg, meta, timeoutInSecs) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            // TODO: Lift this from the ServerSideWebSocketClient
+            throw new Error("request is not yet implemented");
+        });
+    }
     /** Returns the subscription id for the handler (reqd for unsubcribing).
      */
-    listenFor(action, handler) {
-        if (this.subscribers[action] == undefined) {
-            this.subscribers[action] = [];
+    subscribe(topics, handler) {
+        if (this.subscribers[topics] == undefined) {
+            this.subscribers[topics] = [];
         }
         let subx = {
             id: guid_typescript_1.Guid.create().toString(),
             handler: handler
         };
-        this.subscribers[action].push(subx);
+        this.subscribers[topics].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;
-        }
+    // public async unsubscribe(action: string, subscriptionId: string): Promise<boolean> {
+    unsubscribe(topics, options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let existings = this.subscribers[topics];
+            if (existings && existings.length > 0) {
+                let removed;
+                if (options === null || options === void 0 ? void 0 : options.subscriptionId) {
+                    removed = _.remove(existings, x => x.id === options.subscriptionId);
+                }
+                else {
+                    removed = this.subscribers[topics];
+                    delete this.subscribers[topics];
+                }
+                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) {
+        if ((msg === null || msg === void 0 ? void 0 : msg.action) != undefined /* && msg.payload != undefined */) {
             let actionMsg = msg;
-            let subxs = this.subscribers[actionMsg.action];
+            let meta = this.extractInboundMeta(msg);
+            let subxs = this.subscribers[meta.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);
+                        // -----------------------------------------------------
+                        //  !!!!  ATTENTION !!!!
+                        // We're firing off all these handlers simulataneously!  
+                        // TODO: consider await instead of async catch 
+                        // (for sequential executions)  
+                        subx.handler(null, msg.payload /* <-- HACK to allow for existing msgs wo payloads */, meta, msg)
+                            .catch(reason => {
+                            this.logger.error(`Unhandled error in [${actionMsg.action}] SocketAction handler [id: ${subx.id}]: ${reason !== null && reason !== void 0 ? reason : "(No details available)"}`);
+                        });
+                        // -----------------------------------------------------
                     }
                     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)"}`);
+                        this.logger.error(`Error triggering [${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)"}`);
                     }
                 }
             }
@@ -160,6 +209,22 @@ let RelayWebsocketClient = RelayWebsocketClient_1 = class RelayWebsocketClient {
         }
         return;
     }
+    extractInboundMeta(msg) {
+        var _a, _b, _c;
+        try {
+            let meta = {
+                sid: (_b = (_a = msg.payload) === null || _a === void 0 ? void 0 : _a.socketId) !== null && _b !== void 0 ? _b : RelayWebsocketClient_1.SOCKET_ID_UNDEFINED,
+                action: msg.action,
+                subject: RelayWebsocketClient_1.NOT_USED_PLACEHOLDER,
+                correlationId: msg.correlationId,
+            };
+            return meta;
+        }
+        catch (err) {
+            this.logger.error("Error extracting meta from SocketAction: ".concat((_c = err.message) !== null && _c !== void 0 ? _c : "no details available"), err.stack);
+            throw err;
+        }
+    }
 };
 RelayWebsocketClient.DEFAULT_SETTINGS = {
     url: "ws://localhost:5798",
@@ -168,13 +233,15 @@ RelayWebsocketClient.DEFAULT_SETTINGS = {
      * not an ongoing user session (thus it needs to fail fast).  */
     reconnectAttempts: 5
 };
+RelayWebsocketClient.SOCKET_ID_UNDEFINED = "undefined-socket-id";
+RelayWebsocketClient.NOT_USED_PLACEHOLDER = "not-used";
 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(1, (0, inversify_1.inject)(websocket_listener_settings_1.WebsocketListenerSettings)),
     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])
+        websocket_listener_settings_1.WebsocketListenerSettings, Object])
 ], RelayWebsocketClient);
 exports.RelayWebsocketClient = RelayWebsocketClient;
 //# sourceMappingURL=relay-websocket-client.js.map

package/dist/relay/wsclient/relay-websocket-client.js.map

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

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

@@ -1,25 +0,0 @@
-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;
-}

package/dist/relay/wsclient/rx-websocket-subject.js

@@ -1,134 +1,135 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RxWebsocketSubject = void 0;
-const tslib_1 = require("tslib");
-const inversify_1 = require("inversify");
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const webSocket_1 = require("rxjs/webSocket");
-global.WebSocket = require('ws');
-let RxWebsocketSubject = class RxWebsocketSubject extends rxjs_1.Subject {
-    constructor(url, reconnectInterval = 5000, reconnectAttempts = 10, resultSelector, logger, serializer) {
-        super();
-        this.url = url;
-        this.reconnectInterval = reconnectInterval;
-        this.reconnectAttempts = reconnectAttempts;
-        this.resultSelector = resultSelector;
-        this.logger = logger;
-        this.serializer = serializer;
-        this.defaultResultSelector = (e) => {
-            if (e.data)
-                return JSON.parse(e.data);
-        };
-        this.defaultSerializer = (data) => {
-            this.logger.debug("deserializing...");
-            return JSON.stringify(data);
-        };
-        this.connectionStatus = new rxjs_1.Observable((observer) => {
-            this.connectionObserver = observer;
-        }).pipe((0, operators_1.share)(), (0, operators_1.distinctUntilChanged)());
-        if (!resultSelector) {
-            this.resultSelector = this.defaultResultSelector;
-        }
-        if (!this.serializer) {
-            this.serializer = this.defaultSerializer;
-        }
-        this.wsSubjectConfig = {
-            url: url,
-            closeObserver: {
-                next: (e) => {
-                    this.logger.detail(`connection CLOSE [code: ${e.code}]`);
-                    this.socket = undefined;
-                    if (this.connectionObserver) {
-                        this.connectionObserver.next(false);
-                    }
-                    else {
-                        return undefined; // false?
-                    }
-                }
-            },
-            openObserver: {
-                next: (e) => {
-                    this.logger.detail(`connection OPEN`);
-                    if (this.connectionObserver) {
-                        this.connectionObserver.next(true);
-                    }
-                    else {
-                        return undefined; // false?
-                    }
-                }
-            }
-        };
-        this.connect();
-        this.connectionStatus.subscribe((isConnected) => {
-            this.logger.debug(`Connection status: ${isConnected ? "connected" : "not connected"}`);
-            if (!this.reconnectionObservable && typeof (isConnected) == "boolean" && !isConnected) {
-                this.reconnect();
-            }
-        });
-    }
-    connect() {
-        this.socket = new webSocket_1.WebSocketSubject(this.wsSubjectConfig);
-        this.socket
-            .pipe((0, operators_1.tap)(msg => {
-            var _a;
-            if (msg) {
-                if (msg.action === "connection" && this.cnxnHandler) {
-                    try {
-                        this.cnxnHandler(msg.error, msg.payload);
-                    }
-                    catch (err) {
-                        this.logger.warn(`Unhandled exception in connection handler: ${(_a = err.message) !== null && _a !== void 0 ? _a : "(no details available)"}`);
-                    }
-                    // } else {
-                    //   this.logger.debug(msg);
-                }
-            }
-        }))
-            .subscribe((m) => {
-            this.next(m);
-            this.resultSelector(m);
-        }, (error) => {
-            var _a;
-            this.logger.error(`Connection error: ${(_a = error.message) !== null && _a !== void 0 ? _a : ""}`);
-            if (!this.socket) {
-                this.reconnect();
-            }
-        });
-    }
-    onSocketConnection(handler) {
-        this.cnxnHandler = handler;
-    }
-    reconnect() {
-        this.reconnectionObservable = (0, rxjs_1.interval)(this.reconnectInterval)
-            .pipe((0, operators_1.takeWhile)((v, index) => {
-            return index < this.reconnectAttempts && !this.socket;
-        }));
-        this.reconnectionObservable.subscribe(() => {
-            this.connect();
-            // this.send(this.data);
-        }, null, () => {
-            this.reconnectionObservable = undefined;
-            if (!this.socket) {
-                this.complete();
-                if (this.connectionObserver) {
-                    this.connectionObserver.complete();
-                }
-                else {
-                    return undefined;
-                }
-            }
-        });
-    }
-    send(data) {
-        this.data = data;
-        if (this.data && this.socket)
-            this.socket.next(this.data);
-    }
-};
-RxWebsocketSubject = tslib_1.__decorate([
-    (0, inversify_1.injectable)(),
-    tslib_1.__metadata("design:paramtypes", [String, Number, Number, Function, Object, Function])
-], RxWebsocketSubject);
-exports.RxWebsocketSubject = RxWebsocketSubject;
+// COMMENTED OUT BC: Was only used by RelaySocketListener, which is obsolete.
+// import { injectable } from 'inversify';
+// import { Subject, Observer, Observable, interval, fromEvent, timer } from 'rxjs';
+// import { tap, delayWhen, distinctUntilChanged, retryWhen, share, takeWhile } from 'rxjs/operators';
+// import { WebSocketSubject, WebSocketSubjectConfig } from 'rxjs/webSocket';
+// import { IBetterLogger } from "@codiac.io/codiac-common";
+// import { SocketAction } from './socket-contracts';
+// (global as any).WebSocket = require('ws');
+// @injectable()
+// export class RxWebsocketSubject<T> extends Subject<T> {
+//   private data: any;
+//   private reconnectionObservable: Observable<number> | undefined;
+//   private wsSubjectConfig: WebSocketSubjectConfig<T>;
+//   private socket: WebSocketSubject<any> | undefined;
+//   private connectionObserver: Observer<boolean> | undefined;
+//   public connectionStatus: Observable<boolean>;
+//   defaultResultSelector = (e: MessageEvent | SocketAction) => {
+//     if ((<any>e).data) return JSON.parse((<any>e).data);
+//   }
+//   defaultSerializer = (data: any): string => {
+//     this.logger.debug("deserializing...")
+//     return JSON.stringify(data);
+//   }
+//   constructor(
+//     private url: string,
+//     private reconnectInterval: number = 5000,
+//     private reconnectAttempts: number = 10,
+//     private resultSelector: (e: MessageEvent | SocketAction) => any,
+//     private logger: IBetterLogger,
+//     private serializer?: (data: any) => string,
+//   ) {
+//     super();
+//     this.connectionStatus = new Observable<boolean>((observer) => {
+//       this.connectionObserver = observer;
+//     }).pipe(share(), distinctUntilChanged());
+//     if (!resultSelector) {
+//       this.resultSelector = this.defaultResultSelector;
+//     }
+//     if (!this.serializer) {
+//       this.serializer = this.defaultSerializer;
+//     }
+//     this.wsSubjectConfig = {
+//       url: url,
+//       closeObserver: {
+//         next: (e: CloseEvent) => {
+//           this.logger.detail(`connection CLOSE [code: ${e.code}]`);
+//           this.socket = undefined;
+//           if (this.connectionObserver) {
+//             this.connectionObserver.next(false);
+//           } else {
+//             return undefined;  // false?
+//           }
+//         }
+//       },
+//       openObserver: {
+//         next: (e: Event) => {
+//           this.logger.detail(`connection OPEN`);
+//           if (this.connectionObserver) {
+//             this.connectionObserver.next(true);
+//           } else {
+//             return undefined; // false?
+//           }
+//         }
+//       }
+//     };
+//     this.connect();
+//     this.connectionStatus.subscribe((isConnected) => {
+//       this.logger.debug(`Connection status: ${isConnected ? "connected" : "not connected"}`);
+//       if (!this.reconnectionObservable && typeof (isConnected) == "boolean" && !isConnected) {
+//         this.reconnect();
+//       }
+//     });
+//   }
+//   connect(): void {
+//     this.socket = new WebSocketSubject(this.wsSubjectConfig);
+//     this.socket
+//       .pipe(tap(msg => {
+//         if (msg) {
+//           if (msg.action === "connection" && this.cnxnHandler) {
+//             try {
+//               this.cnxnHandler(msg.error, msg.payload)
+//             } catch (err) {
+//               this.logger.warn(`Unhandled exception in connection handler: ${err.message ?? "(no details available)"}`)
+//             }
+//             // } else {
+//             //   this.logger.debug(msg);
+//           }
+//         }
+//       }))
+//       .subscribe(
+//         (m) => {
+//           this.next(m);
+//           this.resultSelector(m);
+//         },
+//         (error: Event) => {
+//           this.logger.error(`Connection error: ${(<Error><any>error).message ?? ""}`);
+//           if (!this.socket) {
+//             this.reconnect();
+//           }
+//         });
+//   }
+//   private cnxnHandler: ((err: Error | undefined, data?: any) => void) | undefined;
+//   public onSocketConnection(handler: (err: Error | undefined, data?: any) => void): void {
+//     this.cnxnHandler = handler;
+//   }
+//   reconnect(): void {
+//     this.reconnectionObservable = interval(this.reconnectInterval)
+//       .pipe(takeWhile((v, index) => {
+//         return index < this.reconnectAttempts && !this.socket
+//       }));
+//     this.reconnectionObservable.subscribe(
+//       () => {
+//         this.connect();
+//         // this.send(this.data);
+//       },
+//       null,
+//       () => {
+//         this.reconnectionObservable = undefined;
+//         if (!this.socket) {
+//           this.complete();
+//           if (this.connectionObserver) {
+//             this.connectionObserver.complete();
+//           } else {
+//             return undefined;
+//           }
+//         }
+//       });
+//   }
+//   send(data: any): void {
+//     this.data = data;
+//     if (this.data && this.socket) this.socket.next(this.data);
+//   }
+// }
 //# sourceMappingURL=rx-websocket-subject.js.map

package/dist/relay/wsclient/rx-websocket-subject.js.map

@@ -1 +1 @@
-{"version":3,"file":"rx-websocket-subject.js","sourceRoot":"","sources":["../../../src/relay/wsclient/rx-websocket-subject.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rx-websocket-subject.js","sourceRoot":"","sources":["../../../src/relay/wsclient/rx-websocket-subject.ts"],"names":[],"mappings":";AAAA,6EAA6E;AAE7E,0CAA0C;AAC1C,oFAAoF;AACpF,sGAAsG;AACtG,6EAA6E;AAC7E,4DAA4D;AAC5D,qDAAqD;AACrD,6CAA6C;AAE7C,gBAAgB;AAChB,0DAA0D;AAC1D,uBAAuB;AACvB,oEAAoE;AACpE,wDAAwD;AACxD,uDAAuD;AACvD,+DAA+D;AAC/D,kDAAkD;AAElD,kEAAkE;AAClE,2DAA2D;AAC3D,MAAM;AAEN,iDAAiD;AACjD,4CAA4C;AAC5C,mCAAmC;AACnC,MAAM;AAEN,iBAAiB;AACjB,2BAA2B;AAC3B,gDAAgD;AAChD,8CAA8C;AAC9C,uEAAuE;AACvE,qCAAqC;AACrC,kDAAkD;AAClD,QAAQ;AACR,eAAe;AAEf,sEAAsE;AACtE,4CAA4C;AAC5C,gDAAgD;AAEhD,6BAA6B;AAC7B,0DAA0D;AAC1D,QAAQ;AACR,8BAA8B;AAC9B,kDAAkD;AAClD,QAAQ;AAER,+BAA+B;AAC/B,kBAAkB;AAClB,yBAAyB;AACzB,qCAAqC;AACrC,sEAAsE;AACtE,qCAAqC;AACrC,2CAA2C;AAC3C,mDAAmD;AACnD,qBAAqB;AACrB,2CAA2C;AAC3C,cAAc;AACd,YAAY;AACZ,WAAW;AACX,wBAAwB;AACxB,gCAAgC;AAChC,mDAAmD;AACnD,2CAA2C;AAC3C,kDAAkD;AAClD,qBAAqB;AACrB,0CAA0C;AAC1C,cAAc;AACd,YAAY;AACZ,UAAU;AACV,SAAS;AACT,sBAAsB;AACtB,yDAAyD;AACzD,gGAAgG;AAChG,iGAAiG;AACjG,4BAA4B;AAC5B,UAAU;AACV,UAAU;AACV,MAAM;AAEN,sBAAsB;AACtB,gEAAgE;AAChE,kBAAkB;AAClB,2BAA2B;AAC3B,qBAAqB;AACrB,mEAAmE;AACnE,oBAAoB;AACpB,yDAAyD;AACzD,8BAA8B;AAC9B,0HAA0H;AAC1H,gBAAgB;AAChB,0BAA0B;AAC1B,2CAA2C;AAC3C,cAAc;AACd,YAAY;AACZ,YAAY;AACZ,oBAAoB;AACpB,mBAAmB;AACnB,0BAA0B;AAC1B,oCAAoC;AACpC,aAAa;AACb,8BAA8B;AAC9B,yFAAyF;AACzF,gCAAgC;AAChC,gCAAgC;AAChC,cAAc;AACd,cAAc;AACd,MAAM;AAGN,qFAAqF;AAErF,6FAA6F;AAC7F,kCAAkC;AAClC,MAAM;AAEN,wBAAwB;AACxB,qEAAqE;AACrE,wCAAwC;AACxC,gEAAgE;AAChE,aAAa;AACb,6CAA6C;AAC7C,gBAAgB;AAChB,0BAA0B;AAC1B,mCAAmC;AACnC,WAAW;AACX,cAAc;AACd,gBAAgB;AAChB,mDAAmD;AACnD,8BAA8B;AAC9B,6BAA6B;AAC7B,2CAA2C;AAC3C,kDAAkD;AAClD,qBAAqB;AACrB,gCAAgC;AAChC,cAAc;AACd,YAAY;AACZ,YAAY;AACZ,MAAM;AAEN,4BAA4B;AAC5B,wBAAwB;AACxB,iEAAiE;AACjE,MAAM;AACN,IAAI"}

package/dist/relay/wsclient/socket-contracts.d.ts

@@ -1,22 +1,8 @@
-export type SocketPayload = {
-    [name: string]: string | string[] | any;
-};
+import { MessagePayload } from "../../uilogic/i-messaging-client";
 export type SocketAction = {
     action: string;
     correlationId: string;
-    payload?: SocketPayload;
+    payload?: MessagePayload;
 };
 export type SocketActionHandler = (response: SocketAction) => void;
 export type SocketActionHandlerAsync = (response: SocketAction) => Promise<void>;
-export interface IMessage {
-    messageId: string;
-    entity: any;
-    entityId: string;
-    entityType: string;
-    operation: string;
-    messageType: string;
-    sentBy: string;
-    sentOn: Date;
-    description: string;
-    correlationId?: string | undefined;
-}

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

@@ -1,3 +1,19 @@
 "use strict";
+// export type SocketPayload = {
+//   [name: string]: string | string[] | any;
+// };
 Object.defineProperty(exports, "__esModule", { value: true });
+// Commented out bc: Not in use.
+// export interface IMessage {
+//   messageId: string,
+//   entity: any,
+//   entityId: string,
+//   entityType: string,
+//   operation: string,
+//   messageType: string,
+//   sentBy: string,
+//   sentOn: Date,
+//   description: string,
+//   correlationId?: string | undefined
+// }
 //# sourceMappingURL=socket-contracts.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"socket-contracts.js","sourceRoot":"","sources":["../../../src/relay/wsclient/socket-contracts.ts"],"names":[],"mappings":""}
+{"version":3,"file":"socket-contracts.js","sourceRoot":"","sources":["../../../src/relay/wsclient/socket-contracts.ts"],"names":[],"mappings":";AACA,gCAAgC;AAChC,6CAA6C;AAC7C,KAAK;;AAaL,gCAAgC;AAChC,8BAA8B;AAC9B,uBAAuB;AACvB,iBAAiB;AACjB,sBAAsB;AACtB,wBAAwB;AACxB,uBAAuB;AACvB,yBAAyB;AACzB,oBAAoB;AACpB,kBAAkB;AAClB,yBAAyB;AACzB,uCAAuC;AACvC,IAAI"}