@thalesrc/hermes 5.3.0 → 5.3.2

package/chrome/message-client.d.ts

@@ -4,9 +4,10 @@ import { MessageResponse } from '../message-response.type';
 import { Message } from '../message.interface';
 import { GET_NEW_ID, RESPONSES$, SEND } from '../selectors';
 declare const PORT: unique symbol;
+declare const ID_HELPER: unique symbol;
 export declare class ChromeMessageClient extends MessageClient {
-    private static readonly idHelper;
     private static readonly connections;
+    private readonly [ID_HELPER];
     [RESPONSES$]: Observable<MessageResponse>;
     private [PORT];
     constructor(name?: string);

package/chrome/message-client.js

@@ -1,3 +1,4 @@
+var _a;
 import { Observable } from 'rxjs';
 import { share } from 'rxjs/operators';
 import { MessageClient } from '../message-client';
@@ -5,9 +6,11 @@ import { GET_NEW_ID, RESPONSES$, SEND } from '../selectors';
 import { DEFAULT_CONNECTION_NAME } from './default-connection-name';
 import { UniqueMessageIdHelper } from './unique-message-id.helper';
 const PORT = Symbol('Port');
+const ID_HELPER = Symbol('Id Helper');
 export class ChromeMessageClient extends MessageClient {
     constructor(name = DEFAULT_CONNECTION_NAME) {
         super();
+        this[_a] = new UniqueMessageIdHelper();
         if (!(name in ChromeMessageClient.connections)) {
             const port = chrome.runtime.connect({ name });
             const responses = new Observable(subscriber => {
@@ -20,12 +23,11 @@ export class ChromeMessageClient extends MessageClient {
         this[PORT] = ChromeMessageClient.connections[name].port;
         this[RESPONSES$] = ChromeMessageClient.connections[name].responses;
     }
-    [SEND](message) {
+    [(_a = ID_HELPER, SEND)](message) {
         this[PORT].postMessage(message);
     }
     [GET_NEW_ID]() {
-        return ChromeMessageClient.idHelper.getId();
+        return this[ID_HELPER].getId();
     }
 }
-ChromeMessageClient.idHelper = new UniqueMessageIdHelper();
 ChromeMessageClient.connections = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thalesrc/hermes",
-  "version": "5.3.0",
+  "version": "5.3.2",
   "description": "Javascript messaging library",
   "main": "index.js",
   "typings": "index.d.ts",

package/worker/message-client.d.ts

@@ -8,9 +8,11 @@ interface MessageEvent<T> {
 }
 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>>;
     protected [WORKER]: Worker;
+    private [INSTANCE_ID];
     constructor(worker?: Worker);
     [SEND]<T>(message: Message<T>): void;
     protected [HANDLER]: (event: MessageEvent<MessageResponse>) => void;

package/worker/message-client.js

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