@thalesrc/hermes 5.3.3 → 6.0.1

package/broadcast/message-client.d.ts

@@ -3,18 +3,10 @@ import { MessageClient } from "../message-client";
 import { MessageResponse } from "../message-response.type";
 import { Message } from "../message.interface";
 import { GET_NEW_ID, RESPONSES$, SEND } from "../selectors";
-interface MessageEvent<T> {
-    data: T;
-}
-declare const CHANNEL: unique symbol;
-declare const HANDLER: unique symbol;
 export declare class BroadcastMessageClient extends MessageClient {
-    private channelName;
-    [RESPONSES$]: Subject<MessageResponse<any>>;
-    private [CHANNEL];
+    #private;
+    protected [RESPONSES$]: Subject<MessageResponse>;
     constructor(channelName?: string);
-    [SEND]<T>(message: Message<T>): void;
-    protected [HANDLER]: (event: MessageEvent<MessageResponse>) => void;
+    protected [SEND]<T>(message: Message<T>): void;
     protected [GET_NEW_ID](): string;
 }
-export {};

package/broadcast/message-client.js

@@ -1,29 +1,22 @@
-var _a, _b, _c;
 import { Subject } from "rxjs";
 import { MessageClient } from "../message-client";
 import { GET_NEW_ID, RESPONSES$, SEND } from "../selectors";
 import { DEFAULT_CHANNEL_NAME } from "./default-channel-name";
-const CHANNEL = Symbol('Broadcast Channel');
-const HANDLER = Symbol('Handler');
 export class BroadcastMessageClient extends MessageClient {
+    [RESPONSES$] = new Subject();
+    #channel;
     constructor(channelName = DEFAULT_CHANNEL_NAME) {
         super();
-        this.channelName = channelName;
-        this[_a] = new Subject();
-        this[_b] = new BroadcastChannel(this.channelName);
-        this[_c] = (event) => {
-            this[RESPONSES$].next(event.data);
-        };
-        this[CHANNEL].addEventListener('message', this[HANDLER]);
+        this.#channel = new BroadcastChannel(channelName);
+        this.#channel.addEventListener('message', this.#handler);
     }
-    [(_a = RESPONSES$, _b = CHANNEL, SEND)](message) {
-        this[CHANNEL].postMessage(message);
+    [SEND](message) {
+        this.#channel.postMessage(message);
     }
-    [(_c = HANDLER, GET_NEW_ID)]() {
-        const key = 'Hermes/Broadcast/' + this.channelName;
-        const lastId = +(localStorage.getItem(key) || '0');
-        const newId = (lastId + 1) + '';
-        localStorage.setItem(key, newId);
-        return newId;
+    #handler = (event) => {
+        this[RESPONSES$].next(event.data);
+    };
+    [GET_NEW_ID]() {
+        return crypto.randomUUID();
     }
 }

package/broadcast/message-host.d.ts

@@ -1,15 +1,8 @@
 import { MessageHost } from "../message-host";
 import { MessageResponse } from "../message-response.type";
-declare const REQUESTS$: unique symbol;
-declare const HANDLER: unique symbol;
-declare const CHANNEL: unique symbol;
 export declare class BroadcastMessageHost extends MessageHost {
-    private channelName;
-    private [REQUESTS$];
-    private [CHANNEL];
+    #private;
     constructor(channelName?: string);
     protected response(message: MessageResponse): void;
     terminate(): void;
-    private [HANDLER];
 }
-export {};

package/broadcast/message-host.js

@@ -1,28 +1,23 @@
-var _a, _b, _c;
 import { Subject } from "rxjs";
 import { MessageHost } from "../message-host";
 import { DEFAULT_CHANNEL_NAME } from "./default-channel-name";
-const REQUESTS$ = Symbol('Requests');
-const HANDLER = Symbol('Handler');
-const CHANNEL = Symbol('Broadcast Channel');
 export class BroadcastMessageHost extends MessageHost {
+    #requests$ = new Subject();
+    #channel;
     constructor(channelName = DEFAULT_CHANNEL_NAME) {
         super();
-        this.channelName = channelName;
-        this[_a] = new Subject();
-        this[_b] = new BroadcastChannel(this.channelName);
-        this[_c] = (event) => {
-            this[REQUESTS$].next(event.data);
-        };
-        this[CHANNEL].addEventListener('message', this[HANDLER]);
-        this.listen(this[REQUESTS$]);
+        this.#channel = new BroadcastChannel(channelName);
+        this.#channel.addEventListener('message', this.#handler);
+        this.listen(this.#requests$);
     }
     response(message) {
-        this[CHANNEL].postMessage(message);
+        this.#channel.postMessage(message);
     }
     terminate() {
-        this[CHANNEL].removeEventListener('message', this[HANDLER]);
-        this[CHANNEL].close();
+        this.#channel.removeEventListener('message', this.#handler);
+        this.#channel.close();
     }
+    #handler = (event) => {
+        this.#requests$.next(event.data);
+    };
 }
-_a = REQUESTS$, _b = CHANNEL, _c = HANDLER;

package/broadcast/message-service.d.ts

@@ -1,5 +1,5 @@
 import { BroadcastMessageClient } from "./message-client";
-declare const BroadcastMessageService_base: new (args_0: [string?], args_1: [string?]) => {
+declare const BroadcastMessageService_base: new (args_0: [channelName?: string], args_1: [channelName?: string]) => {
     terminate: () => void;
 } & BroadcastMessageClient;
 export declare class BroadcastMessageService extends BroadcastMessageService_base {

package/chrome/message-client.js

@@ -7,6 +7,9 @@ const RANDOM_ID_CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz012
 const RANDOM_ID_CHARS_LENGTH = RANDOM_ID_CHARS.length;
 const PORT = Symbol('Port');
 export class ChromeMessageClient extends MessageClient {
+    static connections = {};
+    [RESPONSES$];
+    [PORT];
     constructor(name = DEFAULT_CONNECTION_NAME) {
         super();
         if (!(name in ChromeMessageClient.connections)) {
@@ -32,4 +35,3 @@ export class ChromeMessageClient extends MessageClient {
         return result;
     }
 }
-ChromeMessageClient.connections = {};

package/chrome/message-host.js

@@ -1,14 +1,14 @@
-var _a, _b;
 import { Subject } from 'rxjs';
 import { MessageHost } from '../message-host';
 import { DEFAULT_CONNECTION_NAME } from './default-connection-name';
 const PORTS = Symbol('Ports');
 const REQUESTS$ = Symbol('Requests');
 export class ChromeMessageHost extends MessageHost {
+    static PORT_IDENTIFIER = 'portIdentifier';
+    [PORTS] = {};
+    [REQUESTS$] = new Subject();
     constructor(name = DEFAULT_CONNECTION_NAME) {
         super();
-        this[_a] = {};
-        this[_b] = new Subject();
         chrome.runtime.onConnect.addListener((port) => {
             if (port.name !== name) {
                 return;
@@ -38,5 +38,3 @@ export class ChromeMessageHost extends MessageHost {
         }
     }
 }
-_a = PORTS, _b = REQUESTS$;
-ChromeMessageHost.PORT_IDENTIFIER = 'portIdentifier';

package/iframe/iframe.type.d.ts

@@ -1 +1 @@
-export declare type IFrame = HTMLIFrameElement | (() => HTMLIFrameElement);
+export type IFrame = HTMLIFrameElement | (() => HTMLIFrameElement);

package/iframe/iframe.type.js

@@ -0,0 +1 @@
+export {};

package/iframe/message-client.d.ts

@@ -8,7 +8,7 @@ declare const TARGET_FRAME: unique symbol;
 declare const _TARGET_FRAME: unique symbol;
 export declare class IframeMessageClient extends MessageClient {
     private channelName;
-    [RESPONSES$]: Subject<MessageResponse<any>>;
+    [RESPONSES$]: Subject<MessageResponse>;
     private [_TARGET_FRAME];
     protected get [TARGET_FRAME](): null | HTMLIFrameElement;
     constructor(channelName?: string, targetFrame?: IFrame);

package/iframe/message-client.js

@@ -1,4 +1,3 @@
-var _a;
 import { uniqueId } from '@thalesrc/js-utils';
 import { Subject } from 'rxjs';
 import { MessageClient } from '../message-client';
@@ -8,10 +7,17 @@ import { DEFAULT_CHANNEL_NAME } from './default-channel-name';
 const TARGET_FRAME = Symbol('Target Frame');
 const _TARGET_FRAME = Symbol('_ Target Frame');
 export class IframeMessageClient extends MessageClient {
+    channelName;
+    [RESPONSES$] = new Subject();
+    [_TARGET_FRAME];
+    get [TARGET_FRAME]() {
+        return typeof this[_TARGET_FRAME] === 'function'
+            ? this[_TARGET_FRAME]() || null
+            : this[_TARGET_FRAME] || null;
+    }
     constructor(channelName = DEFAULT_CHANNEL_NAME, targetFrame) {
         super();
         this.channelName = channelName;
-        this[_a] = new Subject();
         this[_TARGET_FRAME] = targetFrame;
         window.addEventListener('message', ({ data, source }) => {
             const target = this[TARGET_FRAME];
@@ -26,11 +32,6 @@ export class IframeMessageClient extends MessageClient {
             this[RESPONSES$].next(data);
         });
     }
-    get [(_a = RESPONSES$, TARGET_FRAME)]() {
-        return typeof this[_TARGET_FRAME] === 'function'
-            ? this[_TARGET_FRAME]() || null
-            : this[_TARGET_FRAME] || null;
-    }
     [SEND](message) {
         message = { ...message, path: `${this.channelName}${CHANNEL_PATH_SPLITTER}${message.path}` };
         const target = this[TARGET_FRAME];

package/iframe/message-host.js

@@ -1,4 +1,3 @@
-var _a, _b, _c;
 import { uniqueId } from '@thalesrc/js-utils';
 import { Subject } from 'rxjs';
 import { MessageHost } from '../message-host';
@@ -11,42 +10,22 @@ const HANDLER = Symbol('Handler');
 const TARGET_FRAME = Symbol('Target Frame');
 const _TARGET_FRAME = Symbol('_ Target Frame');
 export class IframeMessageHost extends MessageHost {
+    channelName;
+    [REQUESTS$] = new Subject();
+    [SOURCES] = [];
+    [_TARGET_FRAME];
+    get [TARGET_FRAME]() {
+        return typeof this[_TARGET_FRAME] === 'function'
+            ? this[_TARGET_FRAME]() || null
+            : this[_TARGET_FRAME] || null;
+    }
     constructor(channelName = DEFAULT_CHANNEL_NAME, targetFrame) {
         super();
         this.channelName = channelName;
-        this[_a] = new Subject();
-        this[_b] = [];
-        this[_c] = ({ data, source }) => {
-            if (!data || typeof data !== 'object' || !data.path || typeof data.id === 'undefined') {
-                return;
-            }
-            const targetFrame = this[TARGET_FRAME];
-            if (targetFrame && targetFrame.contentWindow !== source) {
-                return;
-            }
-            const [channel, path] = data.path.split(CHANNEL_PATH_SPLITTER);
-            if (channel !== this.channelName) {
-                return;
-            }
-            if (!this[SOURCES].some(([, s]) => s === source)) {
-                this[SOURCES].push([uniqueId('hermes-iframe-source'), source]);
-            }
-            const [sourceId] = this[SOURCES].find(([, s]) => s === source);
-            this[REQUESTS$].next({
-                body: targetFrame ? data.body : { data: data.body, sender: source },
-                id: `${sourceId}${SOURCE_ID_SPLITTER}${data.id}`,
-                path,
-            });
-        };
         this[_TARGET_FRAME] = targetFrame;
         window.addEventListener('message', this[HANDLER]);
         this.listen(this[REQUESTS$]);
     }
-    get [(_a = REQUESTS$, _b = SOURCES, TARGET_FRAME)]() {
-        return typeof this[_TARGET_FRAME] === 'function'
-            ? this[_TARGET_FRAME]() || null
-            : this[_TARGET_FRAME] || null;
-    }
     terminate() {
         window.removeEventListener('message', this[HANDLER]);
     }
@@ -59,5 +38,26 @@ export class IframeMessageHost extends MessageHost {
         };
         source.postMessage(message);
     }
+    [HANDLER] = ({ data, source }) => {
+        if (!data || typeof data !== 'object' || !data.path || typeof data.id === 'undefined') {
+            return;
+        }
+        const targetFrame = this[TARGET_FRAME];
+        if (targetFrame && targetFrame.contentWindow !== source) {
+            return;
+        }
+        const [channel, path] = data.path.split(CHANNEL_PATH_SPLITTER);
+        if (channel !== this.channelName) {
+            return;
+        }
+        if (!this[SOURCES].some(([, s]) => s === source)) {
+            this[SOURCES].push([uniqueId('hermes-iframe-source'), source]);
+        }
+        const [sourceId] = this[SOURCES].find(([, s]) => s === source);
+        this[REQUESTS$].next({
+            body: targetFrame ? data.body : { data: data.body, sender: source },
+            id: `${sourceId}${SOURCE_ID_SPLITTER}${data.id}`,
+            path,
+        });
+    };
 }
-_c = HANDLER;

package/iframe/message-service.d.ts

@@ -1,6 +1,6 @@
 import { IframeMessageClient } from "./message-client";
 import { IFrame } from "./iframe.type";
-declare const IframeMessageService_base: new (args_0: [string?, IFrame?], args_1: [string?, IFrame?]) => {
+declare const IframeMessageService_base: new (args_0: [channelName?: string, targetFrame?: IFrame], args_1: [channelName?: string, targetFrame?: IFrame]) => {
     terminate: () => void;
 } & IframeMessageClient;
 export declare class IframeMessageService extends IframeMessageService_base {

package/iframe/upcoming-message.js

@@ -0,0 +1 @@
+export {};

package/jest.config.js

@@ -6,13 +6,17 @@ module.exports = {
   coverageReporters: ["html", "json"],
   collectCoverageFrom: [
     "src/**/*.ts",
-    "!**/*/index.ts"
+    "!**/*/index.ts",
+    "!src/broadcast/*", // Remove these lines later
+    "!src/chrome/*",
+    "!src/iframe/*",
+    "!src/worker/*",
   ],
   testMatch: [
     "**/__tests__/**/*.+(ts|tsx|js)",
     "**/?(*.)+(spec|test).+(ts|tsx|js)"
   ],
   transform: {
-    "^.+\\.(ts|tsx)$": "ts-jest"
-  },
+    "^.+\\.(ts|tsx)$": ["ts-jest", {tsconfig: './tsconfig.spec.json'}]
+  }
 }

package/listener-storage.type.d.ts

@@ -1,2 +1,2 @@
 import { Observable } from 'rxjs';
-export declare type ListenerStorage<T = any> = Map<string, ((message: any) => Observable<T>)[]>;
+export type ListenerStorage<T = any> = Map<string, ((message: any) => Observable<T>)[]>;

package/listener-storage.type.js

@@ -0,0 +1 @@
+export {};

package/message-host.js

@@ -10,32 +10,30 @@ export const GET_LISTENERS = Symbol('Message Host Listeners');
  * Message Host
  */
 export class MessageHost {
-    constructor() {
-        /**
-         * Message Terminator Subject
-         *
-         * Use `next(messageId)` method to terminate a message connection
-         */
-        this.terminateMessage$ = new Subject();
-        /**
-         * Run this method to start listening the requests
-         */
-        this.listen = (messages$) => {
-            for (const [path, listeners] of this[GET_LISTENERS]()) {
-                messages$
-                    .pipe(filter(({ path: messagePath }) => path === messagePath))
-                    .subscribe(({ body, id }) => {
-                    for (const listener of listeners) {
-                        listener.call(this, body).pipe(takeUntil(this.terminateMessage$.pipe(filter(terminatedMessageId => terminatedMessageId === id)))).subscribe(result => {
-                            this.response({ completed: false, id, body: result });
-                        }, noop, () => {
-                            this.response({ completed: true, id });
-                        });
-                    }
-                });
-            }
-        };
-    }
+    /**
+     * Message Terminator Subject
+     *
+     * Use `next(messageId)` method to terminate a message connection
+     */
+    terminateMessage$ = new Subject();
+    /**
+     * Run this method to start listening the requests
+     */
+    listen = (messages$) => {
+        for (const [path, listeners] of this[GET_LISTENERS]()) {
+            messages$
+                .pipe(filter(({ path: messagePath }) => path === messagePath))
+                .subscribe(({ body, id }) => {
+                for (const listener of listeners) {
+                    listener.call(this, body).pipe(takeUntil(this.terminateMessage$.pipe(filter(terminatedMessageId => terminatedMessageId === id)))).subscribe(result => {
+                        this.response({ completed: false, id, body: result });
+                    }, noop, () => {
+                        this.response({ completed: true, id });
+                    });
+                }
+            });
+        }
+    };
     /**
      * All inherited listeners
      */

package/message-response.type.d.ts

@@ -1,10 +1,10 @@
 import { Message } from './message.interface';
-declare type Omit<ObjectType, KeysType extends keyof ObjectType> = Pick<ObjectType, Exclude<keyof ObjectType, KeysType>>;
-declare type UncompletedMessageResponse<T = any> = Omit<Message<T>, 'path'> & {
+type Omit<ObjectType, KeysType extends keyof ObjectType> = Pick<ObjectType, Exclude<keyof ObjectType, KeysType>>;
+type UncompletedMessageResponse<T = any> = Omit<Message<T>, 'path'> & {
     completed: false;
 };
-declare type CompletedMessageResponse = Omit<Message, 'body' | 'path'> & {
+type CompletedMessageResponse = Omit<Message, 'body' | 'path'> & {
     completed: true;
 };
-export declare type MessageResponse<T = any> = UncompletedMessageResponse<T> | CompletedMessageResponse;
+export type MessageResponse<T = any> = UncompletedMessageResponse<T> | CompletedMessageResponse;
 export {};

package/message-response.type.js

@@ -0,0 +1 @@
+export {};

package/message.interface.js

@@ -0,0 +1 @@
+export {};

package/mixin.d.ts

@@ -1,11 +1,11 @@
-declare type Merge<T, U> = {
+type Merge<T, U> = {
     [P in keyof T]: P extends keyof U ? U[P] : T[P];
 } & U;
-declare type Constructor<T extends {}, U extends any[] = any[]> = new (...args: U) => T;
-declare type ConstructorProps<T> = T extends {
+type Constructor<T extends {}, U extends any[] = any[]> = new (...args: U) => T;
+type ConstructorProps<T> = T extends {
     new (...args: infer U): any;
 } ? U : never;
-declare type Instance<T> = T extends {
+type Instance<T> = T extends {
     new (...args: any[]): infer U;
 } ? U : never;
 export declare function Mixin<T extends Constructor<any>, U extends Constructor<any>>(First: T, Second: U): Constructor<Merge<Instance<T>, Instance<U>>, [ConstructorProps<T>, ConstructorProps<U>]>;

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@thalesrc/hermes",
-  "version": "5.3.3",
+  "version": "6.0.1",
   "description": "Javascript messaging library",
   "main": "index.js",
   "typings": "index.d.ts",
   "scripts": {
+    "build": "tsc -p ./tsconfig.lib.json",
     "test": "jest",
     "test:coverage": "jest --collectCoverage",
     "lint": "tslint -p tsconfig.json && tslint -p tsconfig.spec.json",
@@ -34,19 +35,19 @@
   },
   "homepage": "https://github.com/thalesrc/hermes#readme",
   "dependencies": {
-    "@thalesrc/js-utils": "^1.3.0",
-    "rxjs": "^6.3.3"
+    "@thalesrc/js-utils": "^2.12.0",
+    "rxjs": "^7.8.1"
   },
   "devDependencies": {
-    "@types/chrome": "^0.0.126",
-    "@types/jest": "^24.0.23",
-    "cpy-cli": "^2.0.0",
-    "jest": "^24.9.0",
-    "replace": "^1.0.1",
-    "rxjs-marbles": "^5.0.3",
-    "ts-jest": "^24.2.0",
+    "@types/chrome": "^0.0.253",
+    "@types/jest": "^29.5.10",
+    "cpy-cli": "^5.0.0",
+    "jest": "^29.7.0",
+    "replace": "^1.2.2",
+    "rxjs-marbles": "^7.0.1",
+    "ts-jest": "^29.1.1",
     "tslint": "^5.20.1",
-    "typescript": "^3.2.4"
+    "typescript": "^5.3.2"
   },
   "publishConfig": {
     "access": "public"

package/tsconfig.spec.json

@@ -2,7 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "types": [
-      "@types/jest"
+      "jest"
     ]
   },
   "include": [

package/worker/message-client.d.ts

@@ -10,7 +10,7 @@ declare const WORKER: unique symbol;
 declare const HANDLER: unique symbol;
 declare const INSTANCE_ID: unique symbol;
 export declare class WorkerMessageClient extends MessageClient {
-    [RESPONSES$]: Subject<MessageResponse<any>>;
+    [RESPONSES$]: Subject<MessageResponse>;
     protected [WORKER]: Worker;
     private [INSTANCE_ID];
     constructor(worker?: Worker);

package/worker/message-client.js

@@ -1,4 +1,3 @@
-var _a, _b, _c;
 import { uniqueId } from "@thalesrc/js-utils";
 import { Subject } from "rxjs";
 import { MessageClient } from "../message-client";
@@ -7,13 +6,11 @@ const WORKER = Symbol('Worker');
 const HANDLER = Symbol('Handler');
 const INSTANCE_ID = Symbol('Instance Id');
 export class WorkerMessageClient extends MessageClient {
+    [RESPONSES$] = new Subject();
+    [WORKER];
+    [INSTANCE_ID] = Date.now();
     constructor(worker) {
         super();
-        this[_a] = new Subject();
-        this[_b] = Date.now();
-        this[_c] = (event) => {
-            this[RESPONSES$].next(event.data);
-        };
         this[WORKER] = worker;
         if (worker) {
             worker.addEventListener('message', this[HANDLER]);
@@ -22,7 +19,7 @@ export class WorkerMessageClient extends MessageClient {
             addEventListener('message', this[HANDLER]);
         }
     }
-    [(_a = RESPONSES$, _b = INSTANCE_ID, SEND)](message) {
+    [SEND](message) {
         if (this[WORKER]) {
             this[WORKER].postMessage(message);
         }
@@ -30,7 +27,10 @@ export class WorkerMessageClient extends MessageClient {
             postMessage(message);
         }
     }
-    [(_c = HANDLER, GET_NEW_ID)]() {
+    [HANDLER] = (event) => {
+        this[RESPONSES$].next(event.data);
+    };
+    [GET_NEW_ID]() {
         return uniqueId('hermes-worker-message-' + this[INSTANCE_ID]);
     }
 }

package/worker/message-host.js

@@ -1,16 +1,13 @@
-var _a, _b;
 import { Subject } from "rxjs";
 import { MessageHost } from "../message-host";
 const REQUESTS$ = Symbol('Requests');
 const HANDLER = Symbol('Handler');
 const WORKER = Symbol('Worker');
 export class WorkerMessageHost extends MessageHost {
+    [REQUESTS$] = new Subject();
+    [WORKER];
     constructor(worker) {
         super();
-        this[_a] = new Subject();
-        this[_b] = (event) => {
-            this[REQUESTS$].next(event.data);
-        };
         if (worker) {
             this[WORKER] = worker;
             worker.addEventListener('message', this[HANDLER]);
@@ -36,5 +33,7 @@ export class WorkerMessageHost extends MessageHost {
             removeEventListener('message', this[HANDLER]);
         }
     }
+    [HANDLER] = (event) => {
+        this[REQUESTS$].next(event.data);
+    };
 }
-_a = REQUESTS$, _b = HANDLER;

package/worker/message-service.d.ts

@@ -1,5 +1,5 @@
 import { WorkerMessageClient } from "./message-client";
-declare const WorkerMessageService_base: new (args_0: [Worker?], args_1: [Worker?]) => {
+declare const WorkerMessageService_base: new (args_0: [worker?: Worker], args_1: [worker?: Worker]) => {
     terminate: () => void;
 } & WorkerMessageClient;
 export declare class WorkerMessageService extends WorkerMessageService_base {