@thalesrc/hermes 7.2.0 → 7.4.7

package/README.md

@@ -231,9 +231,9 @@ mainService.sendDataToWorker([1, 2, 3, 4, 5]).subscribe(result => {
 });
 ```
 
-##### Async Worker Initialization
+##### Flexible Worker Initialization
 
-The worker parameter supports flexible initialization patterns:
+The worker parameter supports multiple initialization patterns for different use cases:
 
 ```typescript
 // Direct Worker instance
@@ -253,6 +253,41 @@ const service4 = new MainThread(async () => {
 });
 ```
 
+##### Dynamic Worker Management with `initialize()`
+
+The `initialize()` method allows you to switch workers at runtime or re-establish connections:
+
+```typescript
+class MainThread extends WorkerMessageService {
+  // ... decorators and methods
+}
+
+// Start without a worker
+const service = new MainThread();
+
+// Later, connect to a worker dynamically
+service.initialize(new Worker('./worker.js'));
+
+// Switch to a different worker
+service.initialize(new Worker('./different-worker.js'));
+
+// Re-establish connection after worker error
+const worker = new Worker('./worker.js');
+worker.onerror = (error) => {
+  console.error('Worker error, reinitializing...', error);
+  service.initialize(new Worker('./worker.js'));
+};
+service.initialize(worker);
+
+// Conditional worker initialization
+function getWorker() {
+  return navigator.hardwareConcurrency > 2 
+    ? new Worker('./heavy-worker.js')
+    : new Worker('./light-worker.js');
+}
+service.initialize(getWorker);
+```
+
 #### Worker Thread
 
 ```typescript

package/broadcast/message-host.cjs

@@ -4,6 +4,7 @@ exports.BroadcastMessageHost = void 0;
 const rxjs_1 = require("rxjs");
 const message_host_1 = require("../message-host");
 const default_channel_name_1 = require("./default-channel-name");
+const selectors_1 = require("../selectors");
 class BroadcastMessageHost extends message_host_1.MessageHost {
     #requests$ = new rxjs_1.Subject();
     #channel;
@@ -11,9 +12,9 @@ class BroadcastMessageHost extends message_host_1.MessageHost {
         super();
         this.#channel = new BroadcastChannel(channelName);
         this.#channel.addEventListener('message', this.#handler);
-        this.listen(this.#requests$);
+        this[selectors_1.LISTEN](this.#requests$);
     }
-    response(message) {
+    [selectors_1.RESPONSE](message) {
         this.#channel.postMessage(message);
     }
     terminate() {

package/broadcast/message-host.d.ts

@@ -1,8 +1,9 @@
 import { MessageHost } from "../message-host";
 import { MessageResponse } from "../message-response.type";
+import { RESPONSE } from "../selectors";
 export declare class BroadcastMessageHost extends MessageHost {
     #private;
     constructor(channelName?: string);
-    protected response(message: MessageResponse): void;
+    protected [RESPONSE](message: MessageResponse): void;
     terminate(): void;
 }

package/broadcast/message-host.js

@@ -1,6 +1,7 @@
 import { Subject } from "rxjs";
 import { MessageHost } from "../message-host";
 import { DEFAULT_CHANNEL_NAME } from "./default-channel-name";
+import { LISTEN, RESPONSE } from "../selectors";
 export class BroadcastMessageHost extends MessageHost {
     #requests$ = new Subject();
     #channel;
@@ -8,9 +9,9 @@ export class BroadcastMessageHost extends MessageHost {
         super();
         this.#channel = new BroadcastChannel(channelName);
         this.#channel.addEventListener('message', this.#handler);
-        this.listen(this.#requests$);
+        this[LISTEN](this.#requests$);
     }
-    response(message) {
+    [RESPONSE](message) {
         this.#channel.postMessage(message);
     }
     terminate() {

package/broadcast/message-host.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../libs/hermes/src/broadcast/message-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAM9D,MAAM,OAAO,oBAAqB,SAAQ,WAAW;IACnD,UAAU,GAAG,IAAI,OAAO,EAAW,CAAC;IACpC,QAAQ,CAAmB;IAE3B,YAAY,WAAW,GAAG,oBAAoB;QAC5C,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,QAAQ,GAAG,IAAI,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAElD,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;IAES,QAAQ,CAAC,OAAwB;QACzC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,SAAS;QACP,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC5D,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,QAAQ,GAAG,CAAC,KAA4B,EAAE,EAAE;QAC1C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC,CAAA;CACF","file":"message-host.js","sourcesContent":["import { Subject } from \"rxjs\";\nimport { MessageHost } from \"../message-host\";\nimport { MessageResponse } from \"../message-response.type\";\nimport { Message } from \"../message.interface\";\nimport { DEFAULT_CHANNEL_NAME } from \"./default-channel-name\";\n\ninterface MessageEvent<T> {\n  data: T;\n}\n\nexport class BroadcastMessageHost extends MessageHost {\n  #requests$ = new Subject<Message>();\n  #channel: BroadcastChannel;\n\n  constructor(channelName = DEFAULT_CHANNEL_NAME) {\n    super();\n\n    this.#channel = new BroadcastChannel(channelName);\n\n    this.#channel.addEventListener('message', this.#handler);\n    this.listen(this.#requests$);\n  }\n\n  protected response(message: MessageResponse) {\n    this.#channel.postMessage(message);\n  }\n\n  terminate() {\n    this.#channel.removeEventListener('message', this.#handler);\n    this.#channel.close();\n  }\n\n  #handler = (event: MessageEvent<Message>) => {\n    this.#requests$.next(event.data);\n  }\n}"]}
+{"version":3,"sources":["../../../../../libs/hermes/src/broadcast/message-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAMhD,MAAM,OAAO,oBAAqB,SAAQ,WAAW;IACnD,UAAU,GAAG,IAAI,OAAO,EAAW,CAAC;IACpC,QAAQ,CAAmB;IAE3B,YAAY,WAAW,GAAG,oBAAoB;QAC5C,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,QAAQ,GAAG,IAAI,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAElD,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;IAES,CAAC,QAAQ,CAAC,CAAC,OAAwB;QAC3C,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,SAAS;QACP,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC5D,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,QAAQ,GAAG,CAAC,KAA4B,EAAE,EAAE;QAC1C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC,CAAA;CACF","file":"message-host.js","sourcesContent":["import { Subject } from \"rxjs\";\nimport { MessageHost } from \"../message-host\";\nimport { MessageResponse } from \"../message-response.type\";\nimport { Message } from \"../message.interface\";\nimport { DEFAULT_CHANNEL_NAME } from \"./default-channel-name\";\nimport { LISTEN, RESPONSE } from \"../selectors\";\n\ninterface MessageEvent<T> {\n  data: T;\n}\n\nexport class BroadcastMessageHost extends MessageHost {\n  #requests$ = new Subject<Message>();\n  #channel: BroadcastChannel;\n\n  constructor(channelName = DEFAULT_CHANNEL_NAME) {\n    super();\n\n    this.#channel = new BroadcastChannel(channelName);\n\n    this.#channel.addEventListener('message', this.#handler);\n    this[LISTEN](this.#requests$);\n  }\n\n  protected [RESPONSE](message: MessageResponse) {\n    this.#channel.postMessage(message);\n  }\n\n  terminate() {\n    this.#channel.removeEventListener('message', this.#handler);\n    this.#channel.close();\n  }\n\n  #handler = (event: MessageEvent<Message>) => {\n    this.#requests$.next(event.data);\n  }\n}\n"]}

package/chrome/message-host.cjs

@@ -4,6 +4,7 @@ exports.ChromeMessageHost = void 0;
 const rxjs_1 = require("rxjs");
 const message_host_1 = require("../message-host");
 const default_connection_name_1 = require("./default-connection-name");
+const selectors_1 = require("../selectors");
 class ChromeMessageHost extends message_host_1.MessageHost {
     static PORT_IDENTIFIER = 'portIdentifier';
     #ports = {};
@@ -19,7 +20,7 @@ class ChromeMessageHost extends message_host_1.MessageHost {
                     this.#ports[incomingMessagePort.sender.tab.id] = incomingMessagePort;
                     incomingMessagePort.onDisconnect.addListener(disconnectedPort => {
                         delete this.#ports[disconnectedPort.sender.tab.id];
-                        this.terminateMessage$.next(message.id);
+                        this[selectors_1.TERMINATE_MESSAGE$].next(message.id);
                     });
                 }
                 const newMessage = {
@@ -29,9 +30,9 @@ class ChromeMessageHost extends message_host_1.MessageHost {
                 this.#requests.next(newMessage);
             });
         });
-        this.listen(this.#requests);
+        this[selectors_1.LISTEN](this.#requests);
     }
-    response(message) {
+    [selectors_1.RESPONSE](message) {
         const [messageId, portId] = message.id.split(`&${ChromeMessageHost.PORT_IDENTIFIER}=`);
         message.id = messageId;
         if (this.#ports[portId]) {

package/chrome/message-host.d.ts

@@ -1,8 +1,9 @@
 import { MessageHost } from '../message-host';
 import { SuccessfulMessageResponse } from '../message-response.type';
+import { RESPONSE } from '../selectors';
 export declare class ChromeMessageHost extends MessageHost {
     #private;
     private static readonly PORT_IDENTIFIER;
     constructor(name?: string);
-    protected response(message: SuccessfulMessageResponse): void;
+    protected [RESPONSE](message: SuccessfulMessageResponse): void;
 }

package/chrome/message-host.js

@@ -1,6 +1,7 @@
 import { Subject } from 'rxjs';
 import { MessageHost } from '../message-host';
 import { DEFAULT_CONNECTION_NAME } from './default-connection-name';
+import { LISTEN, RESPONSE, TERMINATE_MESSAGE$ } from '../selectors';
 export class ChromeMessageHost extends MessageHost {
     static PORT_IDENTIFIER = 'portIdentifier';
     #ports = {};
@@ -16,7 +17,7 @@ export class ChromeMessageHost extends MessageHost {
                     this.#ports[incomingMessagePort.sender.tab.id] = incomingMessagePort;
                     incomingMessagePort.onDisconnect.addListener(disconnectedPort => {
                         delete this.#ports[disconnectedPort.sender.tab.id];
-                        this.terminateMessage$.next(message.id);
+                        this[TERMINATE_MESSAGE$].next(message.id);
                     });
                 }
                 const newMessage = {
@@ -26,9 +27,9 @@ export class ChromeMessageHost extends MessageHost {
                 this.#requests.next(newMessage);
             });
         });
-        this.listen(this.#requests);
+        this[LISTEN](this.#requests);
     }
-    response(message) {
+    [RESPONSE](message) {
         const [messageId, portId] = message.id.split(`&${ChromeMessageHost.PORT_IDENTIFIER}=`);
         message.id = messageId;
         if (this.#ports[portId]) {

package/chrome/message-host.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../libs/hermes/src/chrome/message-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IACxC,MAAM,CAAU,eAAe,GAAG,gBAAgB,CAAC;IAE3D,MAAM,GAAyC,EAAE,CAAC;IAClD,SAAS,GAAG,IAAI,OAAO,EAAW,CAAC;IAEnC,YAAY,IAAI,GAAG,uBAAuB;QACxC,KAAK,EAAE,CAAC;QAER,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,EAAE;YAC5C,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;gBACvB,OAAO;YACT,CAAC;YAED,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,OAAgB,EAAE,mBAAwC,EAAE,EAAE;gBACxF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAO,CAAC,GAAI,CAAC,EAAG,CAAC,EAAE,CAAC;oBACvD,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAO,CAAC,GAAI,CAAC,EAAG,CAAC,GAAG,mBAAmB,CAAC;oBAExE,mBAAmB,CAAC,YAAY,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE;wBAC9D,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAO,CAAC,GAAI,CAAC,EAAG,CAAC,CAAC;wBACtD,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;oBAC1C,CAAC,CAAC,CAAC;gBACL,CAAC;gBAED,MAAM,UAAU,GAAG;oBACjB,GAAG,OAAO;oBACV,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,IAAI,iBAAiB,CAAC,eAAe,IAAI,mBAAmB,CAAC,MAAO,CAAC,GAAI,CAAC,EAAG,EAAE;iBACjG,CAAC;gBAEF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAClC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAES,QAAQ,CAAC,OAAkC;QACnD,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,iBAAiB,CAAC,eAAe,GAAG,CAAC,CAAC;QAEvF,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;QAEvB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC","file":"message-host.js","sourcesContent":["import { Subject } from 'rxjs';\n\nimport { MessageHost } from '../message-host';\nimport { SuccessfulMessageResponse } from '../message-response.type';\nimport { Message } from '../message.interface';\nimport { DEFAULT_CONNECTION_NAME } from './default-connection-name';\n\nexport class ChromeMessageHost extends MessageHost {\n  private static readonly PORT_IDENTIFIER = 'portIdentifier';\n\n  #ports: {[key: string]: chrome.runtime.Port} = {};\n  #requests = new Subject<Message>();\n\n  constructor(name = DEFAULT_CONNECTION_NAME) {\n    super();\n\n    chrome.runtime.onConnect.addListener((port) => {\n      if (port.name !== name) {\n        return;\n      }\n\n      port.onMessage.addListener((message: Message, incomingMessagePort: chrome.runtime.Port) => {\n        if (!this.#ports[incomingMessagePort.sender!.tab!.id!]) {\n          this.#ports[incomingMessagePort.sender!.tab!.id!] = incomingMessagePort;\n\n          incomingMessagePort.onDisconnect.addListener(disconnectedPort => {\n            delete this.#ports[disconnectedPort.sender!.tab!.id!];\n            this.terminateMessage$.next(message.id);\n          });\n        }\n\n        const newMessage = {\n          ...message,\n          id: `${message.id}&${ChromeMessageHost.PORT_IDENTIFIER}=${incomingMessagePort.sender!.tab!.id!}`,\n        };\n\n        this.#requests.next(newMessage);\n      });\n    });\n\n    this.listen(this.#requests);\n  }\n\n  protected response(message: SuccessfulMessageResponse): void {\n    const [messageId, portId] = message.id.split(`&${ChromeMessageHost.PORT_IDENTIFIER}=`);\n\n    message.id = messageId;\n\n    if (this.#ports[portId]) {\n      this.#ports[portId].postMessage(message);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../../../../../libs/hermes/src/chrome/message-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEpE,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IACxC,MAAM,CAAU,eAAe,GAAG,gBAAgB,CAAC;IAE3D,MAAM,GAAyC,EAAE,CAAC;IAClD,SAAS,GAAG,IAAI,OAAO,EAAW,CAAC;IAEnC,YAAY,IAAI,GAAG,uBAAuB;QACxC,KAAK,EAAE,CAAC;QAER,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,EAAE;YAC5C,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;gBACvB,OAAO;YACT,CAAC;YAED,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,OAAgB,EAAE,mBAAwC,EAAE,EAAE;gBACxF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAO,CAAC,GAAI,CAAC,EAAG,CAAC,EAAE,CAAC;oBACvD,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAO,CAAC,GAAI,CAAC,EAAG,CAAC,GAAG,mBAAmB,CAAC;oBAExE,mBAAmB,CAAC,YAAY,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE;wBAC9D,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAO,CAAC,GAAI,CAAC,EAAG,CAAC,CAAC;wBACtD,IAAI,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;oBAC5C,CAAC,CAAC,CAAC;gBACL,CAAC;gBAED,MAAM,UAAU,GAAG;oBACjB,GAAG,OAAO;oBACV,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,IAAI,iBAAiB,CAAC,eAAe,IAAI,mBAAmB,CAAC,MAAO,CAAC,GAAI,CAAC,EAAG,EAAE;iBACjG,CAAC;gBAEF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAClC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC/B,CAAC;IAES,CAAC,QAAQ,CAAC,CAAC,OAAkC;QACrD,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,iBAAiB,CAAC,eAAe,GAAG,CAAC,CAAC;QAEvF,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;QAEvB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC","file":"message-host.js","sourcesContent":["import { Subject } from 'rxjs';\n\nimport { MessageHost } from '../message-host';\nimport { SuccessfulMessageResponse } from '../message-response.type';\nimport { Message } from '../message.interface';\nimport { DEFAULT_CONNECTION_NAME } from './default-connection-name';\nimport { LISTEN, RESPONSE, TERMINATE_MESSAGE$ } from '../selectors';\n\nexport class ChromeMessageHost extends MessageHost {\n  private static readonly PORT_IDENTIFIER = 'portIdentifier';\n\n  #ports: {[key: string]: chrome.runtime.Port} = {};\n  #requests = new Subject<Message>();\n\n  constructor(name = DEFAULT_CONNECTION_NAME) {\n    super();\n\n    chrome.runtime.onConnect.addListener((port) => {\n      if (port.name !== name) {\n        return;\n      }\n\n      port.onMessage.addListener((message: Message, incomingMessagePort: chrome.runtime.Port) => {\n        if (!this.#ports[incomingMessagePort.sender!.tab!.id!]) {\n          this.#ports[incomingMessagePort.sender!.tab!.id!] = incomingMessagePort;\n\n          incomingMessagePort.onDisconnect.addListener(disconnectedPort => {\n            delete this.#ports[disconnectedPort.sender!.tab!.id!];\n            this[TERMINATE_MESSAGE$].next(message.id);\n          });\n        }\n\n        const newMessage = {\n          ...message,\n          id: `${message.id}&${ChromeMessageHost.PORT_IDENTIFIER}=${incomingMessagePort.sender!.tab!.id!}`,\n        };\n\n        this.#requests.next(newMessage);\n      });\n    });\n\n    this[LISTEN](this.#requests);\n  }\n\n  protected [RESPONSE](message: SuccessfulMessageResponse): void {\n    const [messageId, portId] = message.id.split(`&${ChromeMessageHost.PORT_IDENTIFIER}=`);\n\n    message.id = messageId;\n\n    if (this.#ports[portId]) {\n      this.#ports[portId].postMessage(message);\n    }\n  }\n}\n"]}

package/iframe/message-host.cjs

@@ -7,6 +7,7 @@ const message_host_1 = require("../message-host");
 const channel_path_splitter_1 = require("./channel-path-splitter");
 const default_channel_name_1 = require("./default-channel-name");
 const source_id_splitter_1 = require("./source-id-splitter");
+const selectors_1 = require("../selectors");
 class IframeMessageHost extends message_host_1.MessageHost {
     channelName;
     #requests = new rxjs_1.Subject();
@@ -22,12 +23,12 @@ class IframeMessageHost extends message_host_1.MessageHost {
         this.channelName = channelName;
         this.#_targetFrame = targetFrame;
         window.addEventListener('message', this.#handler);
-        this.listen(this.#requests);
+        this[selectors_1.LISTEN](this.#requests);
     }
     terminate() {
         window.removeEventListener('message', this.#handler);
     }
-    response(message) {
+    [selectors_1.RESPONSE](message) {
         const [sourceId, messageId] = message.id.split(source_id_splitter_1.SOURCE_ID_SPLITTER);
         const [, source] = this.#sources.find(([sId]) => sId === sourceId);
         message = {

package/iframe/message-host.d.ts

@@ -1,10 +1,11 @@
 import { MessageHost } from '../message-host';
 import { SuccessfulMessageResponse } from '../message-response.type';
 import { IFrame } from './iframe.type';
+import { RESPONSE } from '../selectors';
 export declare class IframeMessageHost extends MessageHost {
     #private;
     private channelName;
     constructor(channelName?: string, targetFrame?: IFrame);
     terminate(): void;
-    protected response(message: SuccessfulMessageResponse): void;
+    protected [RESPONSE](message: SuccessfulMessageResponse): void;
 }

package/iframe/message-host.js

@@ -4,6 +4,7 @@ import { MessageHost } from '../message-host';
 import { CHANNEL_PATH_SPLITTER } from './channel-path-splitter';
 import { DEFAULT_CHANNEL_NAME } from './default-channel-name';
 import { SOURCE_ID_SPLITTER } from './source-id-splitter';
+import { LISTEN, RESPONSE } from '../selectors';
 export class IframeMessageHost extends MessageHost {
     channelName;
     #requests = new Subject();
@@ -19,12 +20,12 @@ export class IframeMessageHost extends MessageHost {
         this.channelName = channelName;
         this.#_targetFrame = targetFrame;
         window.addEventListener('message', this.#handler);
-        this.listen(this.#requests);
+        this[LISTEN](this.#requests);
     }
     terminate() {
         window.removeEventListener('message', this.#handler);
     }
-    response(message) {
+    [RESPONSE](message) {
         const [sourceId, messageId] = message.id.split(SOURCE_ID_SPLITTER);
         const [, source] = this.#sources.find(([sId]) => sId === sourceId);
         message = {

package/iframe/message-host.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../libs/hermes/src/iframe/message-host.ts"],"names":[],"mappings":"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","file":"message-host.js","sourcesContent":["import { uniqueId } from '@thalesrc/js-utils';\nimport { Subject } from 'rxjs';\nimport { MessageHost } from '../message-host';\nimport { SuccessfulMessageResponse } from '../message-response.type';\nimport { Message } from '../message.interface';\nimport { CHANNEL_PATH_SPLITTER } from './channel-path-splitter';\nimport { DEFAULT_CHANNEL_NAME } from './default-channel-name';\nimport { SOURCE_ID_SPLITTER } from './source-id-splitter';\nimport { IFrame } from './iframe.type';\n\nexport class IframeMessageHost extends MessageHost {\n  #requests = new Subject<Message>();\n  #sources: Array<[string, MessageEventSource]> = [];\n  #_targetFrame: IFrame | undefined;\n\n  get #targetFrame(): null | HTMLIFrameElement {\n    return typeof this.#_targetFrame === 'function'\n      ? (this.#_targetFrame as () => HTMLIFrameElement)() || null\n      : this.#_targetFrame as HTMLIFrameElement || null;\n  }\n\n  constructor(\n    private channelName = DEFAULT_CHANNEL_NAME,\n    targetFrame?: IFrame\n  ) {\n    super();\n\n    this.#_targetFrame = targetFrame;\n\n    window.addEventListener('message', this.#handler);\n\n    this.listen(this.#requests);\n  }\n\n  public terminate(): void {\n    window.removeEventListener('message', this.#handler);\n  }\n\n  protected response(message: SuccessfulMessageResponse): void {\n    const [sourceId, messageId] = message.id.split(SOURCE_ID_SPLITTER);\n    const [, source] = this.#sources.find(([sId]) => sId === sourceId)!;\n\n    message = {\n      ...message,\n      id: messageId,\n    };\n\n    (source as any).postMessage(message);\n  }\n\n  #handler = ({data, source}: MessageEvent<Message>) => {\n    if (!data || typeof data !== 'object' || !data.path || typeof data.id === 'undefined') {\n      return;\n    }\n\n    const targetFrame = this.#targetFrame;\n\n    if (targetFrame && targetFrame.contentWindow !== source) {\n      return;\n    }\n\n    const [channel, path] = data.path.split(CHANNEL_PATH_SPLITTER);\n\n    if (channel !== this.channelName) {\n      return;\n    }\n\n    if (!this.#sources.some(([, s]) => s === source)) {\n      this.#sources.push([uniqueId('hermes-iframe-source') as string, source!]);\n    }\n\n    const [sourceId] = this.#sources.find(([, s]) => s === source)!;\n    this.#requests.next({\n      body: targetFrame ? data.body : {data: data.body, sender: source},\n      id: `${sourceId}${SOURCE_ID_SPLITTER}${data.id}`,\n      path,\n    });\n  }\n}\n"]}
+{"version":3,"sources":["../../../../../libs/hermes/src/iframe/message-host.ts"],"names":[],"mappings":"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","file":"message-host.js","sourcesContent":["import { uniqueId } from '@thalesrc/js-utils';\nimport { Subject } from 'rxjs';\nimport { MessageHost } from '../message-host';\nimport { SuccessfulMessageResponse } from '../message-response.type';\nimport { Message } from '../message.interface';\nimport { CHANNEL_PATH_SPLITTER } from './channel-path-splitter';\nimport { DEFAULT_CHANNEL_NAME } from './default-channel-name';\nimport { SOURCE_ID_SPLITTER } from './source-id-splitter';\nimport { IFrame } from './iframe.type';\nimport { LISTEN, RESPONSE } from '../selectors';\n\nexport class IframeMessageHost extends MessageHost {\n  #requests = new Subject<Message>();\n  #sources: Array<[string, MessageEventSource]> = [];\n  #_targetFrame: IFrame | undefined;\n\n  get #targetFrame(): null | HTMLIFrameElement {\n    return typeof this.#_targetFrame === 'function'\n      ? (this.#_targetFrame as () => HTMLIFrameElement)() || null\n      : this.#_targetFrame as HTMLIFrameElement || null;\n  }\n\n  constructor(\n    private channelName = DEFAULT_CHANNEL_NAME,\n    targetFrame?: IFrame\n  ) {\n    super();\n\n    this.#_targetFrame = targetFrame;\n\n    window.addEventListener('message', this.#handler);\n\n    this[LISTEN](this.#requests);\n  }\n\n  public terminate(): void {\n    window.removeEventListener('message', this.#handler);\n  }\n\n  protected [RESPONSE](message: SuccessfulMessageResponse): void {\n    const [sourceId, messageId] = message.id.split(SOURCE_ID_SPLITTER);\n    const [, source] = this.#sources.find(([sId]) => sId === sourceId)!;\n\n    message = {\n      ...message,\n      id: messageId,\n    };\n\n    (source as any).postMessage(message);\n  }\n\n  #handler = ({data, source}: MessageEvent<Message>) => {\n    if (!data || typeof data !== 'object' || !data.path || typeof data.id === 'undefined') {\n      return;\n    }\n\n    const targetFrame = this.#targetFrame;\n\n    if (targetFrame && targetFrame.contentWindow !== source) {\n      return;\n    }\n\n    const [channel, path] = data.path.split(CHANNEL_PATH_SPLITTER);\n\n    if (channel !== this.channelName) {\n      return;\n    }\n\n    if (!this.#sources.some(([, s]) => s === source)) {\n      this.#sources.push([uniqueId('hermes-iframe-source') as string, source!]);\n    }\n\n    const [sourceId] = this.#sources.find(([, s]) => s === source)!;\n    this.#requests.next({\n      body: targetFrame ? data.body : {data: data.body, sender: source},\n      id: `${sourceId}${SOURCE_ID_SPLITTER}${data.id}`,\n      path,\n    });\n  }\n}\n"]}

package/message-host.cjs

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageHost = void 0;
-const js_utils_1 = require("@thalesrc/js-utils");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const selectors_1 = require("./selectors");
@@ -14,20 +13,26 @@ class MessageHost {
      *
      * Use `next(messageId)` method to terminate a message connection
      */
-    terminateMessage$ = new rxjs_1.Subject();
+    [selectors_1.TERMINATE_MESSAGE$] = new rxjs_1.Subject();
     /**
      * Run this method to start listening the requests
      */
-    listen = (messages$) => {
+    [selectors_1.LISTEN] = (messages$) => {
         for (const [path, listeners] of this.#getListeners()) {
             messages$
                 .pipe((0, operators_1.filter)(({ path: messagePath }) => path === messagePath))
                 .subscribe(({ body, id }) => {
                 for (const listener of listeners) {
-                    listener.call(this, body).pipe((0, operators_1.takeUntil)(this.terminateMessage$.pipe((0, operators_1.filter)(terminatedMessageId => terminatedMessageId === id)))).subscribe(result => {
-                        this.response({ completed: false, id, body: result });
-                    }, js_utils_1.noop, () => {
-                        this.response({ completed: true, id });
+                    listener.call(this, body).pipe((0, operators_1.takeUntil)(this[selectors_1.TERMINATE_MESSAGE$].pipe((0, operators_1.filter)(terminatedMessageId => terminatedMessageId === id)))).subscribe({
+                        next: result => {
+                            this[selectors_1.RESPONSE]({ completed: false, id, body: result });
+                        },
+                        error: error => {
+                            this[selectors_1.RESPONSE]({ completed: true, id, error });
+                        },
+                        complete: () => {
+                            this[selectors_1.RESPONSE]({ completed: true, id });
+                        }
                     });
                 }
             });

package/message-host.d.ts

@@ -1,6 +1,7 @@
 import { Observable, Subject } from 'rxjs';
 import { SuccessfulMessageResponse } from './message-response.type';
 import { Message } from './message.interface';
+import { LISTEN, RESPONSE, TERMINATE_MESSAGE$ } from './selectors';
 /**
  * Message Host
  */
@@ -11,15 +12,15 @@ export declare abstract class MessageHost {
      *
      * Use `next(messageId)` method to terminate a message connection
      */
-    protected readonly terminateMessage$: Subject<string>;
+    protected readonly [TERMINATE_MESSAGE$]: Subject<string>;
     /**
      * Run this method to start listening the requests
      */
-    protected readonly listen: (messages$: Observable<Message>) => void;
+    protected readonly [LISTEN]: (messages$: Observable<Message>) => void;
     /**
      * Build a reponse method to send the responses to the requests by using the communication methods of the platform
      *
      * @param message Incoming response message
      */
-    protected abstract response<T = any>(message: SuccessfulMessageResponse<T>): void;
+    protected abstract [RESPONSE]<T = any>(message: SuccessfulMessageResponse<T>): void;
 }

package/message-host.js

@@ -1,7 +1,6 @@
-import { noop } from '@thalesrc/js-utils';
 import { Subject } from 'rxjs';
 import { filter, takeUntil } from 'rxjs/operators';
-import { MESSAGE_LISTENERS } from './selectors';
+import { LISTEN, MESSAGE_LISTENERS, RESPONSE, TERMINATE_MESSAGE$ } from './selectors';
 /**
  * Message Host
  */
@@ -11,20 +10,26 @@ export class MessageHost {
      *
      * Use `next(messageId)` method to terminate a message connection
      */
-    terminateMessage$ = new Subject();
+    [TERMINATE_MESSAGE$] = new Subject();
     /**
      * Run this method to start listening the requests
      */
-    listen = (messages$) => {
+    [LISTEN] = (messages$) => {
         for (const [path, listeners] of this.#getListeners()) {
             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 });
+                    listener.call(this, body).pipe(takeUntil(this[TERMINATE_MESSAGE$].pipe(filter(terminatedMessageId => terminatedMessageId === id)))).subscribe({
+                        next: result => {
+                            this[RESPONSE]({ completed: false, id, body: result });
+                        },
+                        error: error => {
+                            this[RESPONSE]({ completed: true, id, error });
+                        },
+                        complete: () => {
+                            this[RESPONSE]({ completed: true, id });
+                        }
                     });
                 }
             });

package/message-host.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../libs/hermes/src/message-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAc,OAAO,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAKnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGhD;;GAEG;AACH,MAAM,OAAgB,WAAW;IAC/B;;;;OAIG;IACgB,iBAAiB,GAAG,IAAI,OAAO,EAAU,CAAC;IAE7D;;OAEG;IACgB,MAAM,GAAG,CAAC,SAA8B,EAAQ,EAAE;QACnE,KAAK,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;YACrD,SAAS;iBACN,IAAI,CAAC,MAAM,CAAC,CAAC,EAAC,IAAI,EAAE,WAAW,EAAC,EAAE,EAAE,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;iBAC3D,SAAS,CAAC,CAAC,EAAC,IAAI,EAAE,EAAE,EAAC,EAAE,EAAE;gBACxB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;oBAChC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAqB,CAAC,IAAI,CACjD,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,CAClG,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;wBACnB,IAAI,CAAC,QAAQ,CAAC,EAAC,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAC,CAAC,CAAC;oBACtD,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE;wBACZ,IAAI,CAAC,QAAQ,CAAC,EAAC,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;oBACxC,CAAC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CAAC;QACP,CAAC;IACH,CAAC,CAAA;IASD;;OAEG;IACH,aAAa;QACX,MAAM,GAAG,GAAoB,IAAI,GAAG,EAAE,CAAC;QAEvC,IAAI,YAAY,GAAI,IAAY,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;QAEnD,OAAO,YAAY,CAAC,WAAW,KAAK,MAAM,EAAE,CAAC;YAC3C,IAAI,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAC1E,KAAK,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,YAAY,CAAC,WAAW,CAAC,iBAAiB,CAAoB,EAAE,CAAC;oBAC7F,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC;gBACvD,CAAC;YACH,CAAC;YAED,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC;QACxC,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;CACF","file":"message-host.js","sourcesContent":["import { noop } from '@thalesrc/js-utils';\nimport { Observable, Subject } from 'rxjs';\nimport { filter, takeUntil } from 'rxjs/operators';\n\nimport { ListenerStorage } from './listener-storage.type';\nimport { SuccessfulMessageResponse } from './message-response.type';\nimport { Message } from './message.interface';\nimport { MESSAGE_LISTENERS } from './selectors';\n\n\n/**\n * Message Host\n */\nexport abstract class MessageHost {\n  /**\n   * Message Terminator Subject\n   *\n   * Use `next(messageId)` method to terminate a message connection\n   */\n  protected readonly terminateMessage$ = new Subject<string>();\n\n  /**\n   * Run this method to start listening the requests\n   */\n  protected readonly listen = (messages$: Observable<Message>): void => {\n    for (const [path, listeners] of this.#getListeners()) {\n      messages$\n        .pipe(filter(({path: messagePath}) => path === messagePath))\n        .subscribe(({body, id}) => {\n          for (const listener of listeners) {\n            (listener.call(this, body) as Observable<any>).pipe(\n              takeUntil(this.terminateMessage$.pipe(filter(terminatedMessageId => terminatedMessageId === id))),\n            ).subscribe(result => {\n              this.response({completed: false, id, body: result});\n            }, noop, () => {\n              this.response({completed: true, id });\n            });\n          }\n        });\n    }\n  }\n\n  /**\n   * Build a reponse method to send the responses to the requests by using the communication methods of the platform\n   *\n   * @param message Incoming response message\n   */\n  protected abstract response<T = any>(message: SuccessfulMessageResponse<T>): void;\n\n  /**\n   * All inherited listeners\n   */\n  #getListeners(): ListenerStorage {\n    const map: ListenerStorage = new Map();\n\n    let currentProto = (this as any)['__proto__' + ''];\n\n    while (currentProto.constructor !== Object) {\n      if (Reflect.ownKeys(currentProto.constructor).includes(MESSAGE_LISTENERS)) {\n        for (const [key, handlers] of currentProto.constructor[MESSAGE_LISTENERS] as ListenerStorage) {\n          map.set(key, [...(map.get(key) || []), ...handlers]);\n        }\n      }\n\n      currentProto = currentProto.__proto__;\n    }\n\n    return map;\n  }\n}\n"]}
+{"version":3,"sources":["../../../../../libs/hermes/src/message-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,OAAO,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAKnD,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEtF;;GAEG;AACH,MAAM,OAAgB,WAAW;IAC/B;;;;OAIG;IACgB,CAAC,kBAAkB,CAAC,GAAG,IAAI,OAAO,EAAU,CAAC;IAEhE;;OAEG;IACgB,CAAC,MAAM,CAAC,GAAG,CAAC,SAA8B,EAAQ,EAAE;QACrE,KAAK,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;YACrD,SAAS;iBACN,IAAI,CAAC,MAAM,CAAC,CAAC,EAAC,IAAI,EAAE,WAAW,EAAC,EAAE,EAAE,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;iBAC3D,SAAS,CAAC,CAAC,EAAC,IAAI,EAAE,EAAE,EAAC,EAAE,EAAE;gBACxB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;oBAChC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAqB,CAAC,IAAI,CACjD,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,CACpG,CAAC,SAAS,CAAC;wBACV,IAAI,EAAE,MAAM,CAAC,EAAE;4BACb,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAC,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAC,CAAC,CAAC;wBACvD,CAAC;wBACD,KAAK,EAAE,KAAK,CAAC,EAAE;4BACb,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAC,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAC,CAAC,CAAC;wBAC/C,CAAC;wBACD,QAAQ,EAAE,GAAG,EAAE;4BACb,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAC,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;wBACzC,CAAC;qBACF,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CAAC;QACP,CAAC;IACH,CAAC,CAAA;IASD;;OAEG;IACH,aAAa;QACX,MAAM,GAAG,GAAoB,IAAI,GAAG,EAAE,CAAC;QAEvC,IAAI,YAAY,GAAI,IAAY,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;QAEnD,OAAO,YAAY,CAAC,WAAW,KAAK,MAAM,EAAE,CAAC;YAC3C,IAAI,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAC1E,KAAK,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,YAAY,CAAC,WAAW,CAAC,iBAAiB,CAAoB,EAAE,CAAC;oBAC7F,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC;gBACvD,CAAC;YACH,CAAC;YAED,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC;QACxC,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;CACF","file":"message-host.js","sourcesContent":["import { Observable, Subject } from 'rxjs';\nimport { filter, takeUntil } from 'rxjs/operators';\n\nimport { ListenerStorage } from './listener-storage.type';\nimport { SuccessfulMessageResponse } from './message-response.type';\nimport { Message } from './message.interface';\nimport { LISTEN, MESSAGE_LISTENERS, RESPONSE, TERMINATE_MESSAGE$ } from './selectors';\n\n/**\n * Message Host\n */\nexport abstract class MessageHost {\n  /**\n   * Message Terminator Subject\n   *\n   * Use `next(messageId)` method to terminate a message connection\n   */\n  protected readonly [TERMINATE_MESSAGE$] = new Subject<string>();\n\n  /**\n   * Run this method to start listening the requests\n   */\n  protected readonly [LISTEN] = (messages$: Observable<Message>): void => {\n    for (const [path, listeners] of this.#getListeners()) {\n      messages$\n        .pipe(filter(({path: messagePath}) => path === messagePath))\n        .subscribe(({body, id}) => {\n          for (const listener of listeners) {\n            (listener.call(this, body) as Observable<any>).pipe(\n              takeUntil(this[TERMINATE_MESSAGE$].pipe(filter(terminatedMessageId => terminatedMessageId === id))),\n            ).subscribe({\n              next: result => {\n                this[RESPONSE]({completed: false, id, body: result});\n              },\n              error: error => {\n                this[RESPONSE]({completed: true, id, error});\n              },\n              complete: () => {\n                this[RESPONSE]({completed: true, id });\n              }\n            });\n          }\n        });\n    }\n  }\n\n  /**\n   * Build a reponse method to send the responses to the requests by using the communication methods of the platform\n   *\n   * @param message Incoming response message\n   */\n  protected abstract [RESPONSE]<T = any>(message: SuccessfulMessageResponse<T>): void;\n\n  /**\n   * All inherited listeners\n   */\n  #getListeners(): ListenerStorage {\n    const map: ListenerStorage = new Map();\n\n    let currentProto = (this as any)['__proto__' + ''];\n\n    while (currentProto.constructor !== Object) {\n      if (Reflect.ownKeys(currentProto.constructor).includes(MESSAGE_LISTENERS)) {\n        for (const [key, handlers] of currentProto.constructor[MESSAGE_LISTENERS] as ListenerStorage) {\n          map.set(key, [...(map.get(key) || []), ...handlers]);\n        }\n      }\n\n      currentProto = currentProto.__proto__;\n    }\n\n    return map;\n  }\n}\n"]}

package/message.interface.d.ts

@@ -2,4 +2,5 @@ export interface Message<T = any> {
     path: string;
     body: T;
     id: string;
+    error?: any;
 }

package/message.interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../libs/hermes/src/message.interface.ts"],"names":[],"mappings":"","file":"message.interface.js","sourcesContent":["export interface Message<T = any> {\n  path: string;\n  body: T;\n  id: string;\n}\n"]}
+{"version":3,"sources":["../../../../../libs/hermes/src/message.interface.ts"],"names":[],"mappings":"","file":"message.interface.js","sourcesContent":["export interface Message<T = any> {\n  path: string;\n  body: T;\n  id: string;\n  error?: any;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thalesrc/hermes",
-  "version": "7.2.0",
+  "version": "7.4.7",
   "description": "Javascript messaging library",
   "keywords": [
     "javascript",

package/selectors.cjs

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GET_NEW_ID = exports.SEND = exports.RESPONSES$ = exports.SENDING_SERVICE = exports.MESSAGE_LISTENERS = void 0;
+exports.RESPONSE = exports.TERMINATE_MESSAGE$ = exports.LISTEN = exports.GET_NEW_ID = exports.SEND = exports.RESPONSES$ = exports.MESSAGE_LISTENERS = void 0;
 exports.MESSAGE_LISTENERS = Symbol('Message Listeners');
-exports.SENDING_SERVICE = Symbol('Sending Service');
 exports.RESPONSES$ = Symbol('Responses');
 exports.SEND = Symbol('Send');
 exports.GET_NEW_ID = Symbol('Get New Id');
+exports.LISTEN = Symbol('Listen');
+exports.TERMINATE_MESSAGE$ = Symbol('Terminate Message');
+exports.RESPONSE = Symbol('Response');

package/selectors.d.ts

@@ -1,5 +1,7 @@
 export declare const MESSAGE_LISTENERS: unique symbol;
-export declare const SENDING_SERVICE: unique symbol;
 export declare const RESPONSES$: unique symbol;
 export declare const SEND: unique symbol;
 export declare const GET_NEW_ID: unique symbol;
+export declare const LISTEN: unique symbol;
+export declare const TERMINATE_MESSAGE$: unique symbol;
+export declare const RESPONSE: unique symbol;

package/selectors.js

@@ -1,7 +1,9 @@
 export const MESSAGE_LISTENERS = Symbol('Message Listeners');
-export const SENDING_SERVICE = Symbol('Sending Service');
 export const RESPONSES$ = Symbol('Responses');
 export const SEND = Symbol('Send');
 export const GET_NEW_ID = Symbol('Get New Id');
+export const LISTEN = Symbol('Listen');
+export const TERMINATE_MESSAGE$ = Symbol('Terminate Message');
+export const RESPONSE = Symbol('Response');
 
 //# sourceMappingURL=selectors.js.map

package/selectors.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../libs/hermes/src/selectors.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAC7D,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AACzD,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAC9C,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;AACnC,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC","file":"selectors.js","sourcesContent":["export const MESSAGE_LISTENERS = Symbol('Message Listeners');\nexport const SENDING_SERVICE = Symbol('Sending Service');\nexport const RESPONSES$ = Symbol('Responses');\nexport const SEND = Symbol('Send');\nexport const GET_NEW_ID = Symbol('Get New Id');\n"]}
+{"version":3,"sources":["../../../../../libs/hermes/src/selectors.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAC7D,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAC9C,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;AACnC,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAC/C,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AACvC,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAC9D,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC","file":"selectors.js","sourcesContent":["export const MESSAGE_LISTENERS = Symbol('Message Listeners');\nexport const RESPONSES$ = Symbol('Responses');\nexport const SEND = Symbol('Send');\nexport const GET_NEW_ID = Symbol('Get New Id');\nexport const LISTEN = Symbol('Listen');\nexport const TERMINATE_MESSAGE$ = Symbol('Terminate Message');\nexport const RESPONSE = Symbol('Response');\n"]}

package/worker/message-client.cjs

@@ -23,6 +23,9 @@ const selectors_1 = require("../selectors");
  * - Function that returns a Worker (for lazy initialization)
  * - Function that returns a Promise<Worker> (for async lazy initialization)
  *
+ * The `initialize()` method allows dynamic worker management, enabling you to switch
+ * workers at runtime or re-establish connections after errors.
+ *
  * @example
  * // In main thread - communicate with a specific worker
  * const worker = new Worker('./worker.js');
@@ -42,13 +45,19 @@ const selectors_1 = require("../selectors");
  * const client = new WorkerMessageClient(() =>
  *   document.querySelector('[data-worker]') ? new Worker('./worker.js') : undefined
  * );
+ *
+ * @example
+ * // Re-initialize with a different worker
+ * const client = new WorkerMessageClient();
+ * // Later, switch to a different worker
+ * client.initialize(new Worker('./different-worker.js'));
  */
 class WorkerMessageClient extends message_client_1.MessageClient {
     /**
      * Promise resolving to the Worker instance or undefined if running in worker context
      * @private
      */
-    #worker = null;
+    #worker = Promise.resolve(undefined);
     /**
      * Unique identifier for this client instance to prevent ID collisions
      * @private
@@ -70,6 +79,46 @@ class WorkerMessageClient extends message_client_1.MessageClient {
      */
     constructor(worker) {
         super();
+        this.initialize(worker);
+    }
+    /**
+     * Initializes or re-initializes the worker connection.
+     *
+     * This method sets up message listeners for the provided worker. If a worker
+     * was previously initialized, it cleans up the old connection before establishing
+     * the new one. This allows for dynamic worker management, such as:
+     * - Switching between different workers at runtime
+     * - Re-establishing connections after worker errors
+     * - Lazy initialization when the worker is conditionally needed
+     *
+     * @param worker - Optional worker configuration:
+     *   - Worker: Direct worker instance (main thread)
+     *   - Promise<Worker>: Promise resolving to worker (async initialization)
+     *   - () => Worker: Function returning worker (lazy initialization)
+     *   - () => Promise<Worker>: Function returning promise (async lazy initialization)
+     *   - undefined: Omit for worker thread context (uses self)
+     *
+     * @example
+     * // Switch to a different worker dynamically
+     * const client = new WorkerMessageClient(oldWorker);
+     * client.initialize(newWorker); // Cleans up old listener, sets up new one
+     *
+     * @example
+     * // Re-initialize after worker error
+     * worker.onerror = () => {
+     *   client.initialize(new Worker('./worker.js'));
+     * };
+     */
+    initialize(worker) {
+        // Deinitialize previous worker if any
+        this.#worker.then(prevWorker => {
+            if (prevWorker) {
+                prevWorker.removeEventListener('message', this.#handler);
+            }
+            else {
+                removeEventListener('message', this.#handler);
+            }
+        }).catch(noop_1.noop);
         // Resolve worker parameter: execute function if provided, otherwise use value directly
         const _worker = typeof worker === 'function' ? worker() : worker;
         // Ensure worker is wrapped in a promise for consistent async handling

package/worker/message-client.d.ts

@@ -3,6 +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";
+type ClientWorkerType = Worker | undefined;
+type ClientWorkerPromise = Promise<ClientWorkerType>;
+type ClientWorkerFactory = () => ClientWorkerType | ClientWorkerPromise;
+type ClientWorkerArg = ClientWorkerType | ClientWorkerPromise | ClientWorkerFactory;
 /**
  * WorkerMessageClient
  *
@@ -19,6 +23,9 @@ import { GET_NEW_ID, RESPONSES$, SEND } from "../selectors";
  * - Function that returns a Worker (for lazy initialization)
  * - Function that returns a Promise<Worker> (for async lazy initialization)
  *
+ * The `initialize()` method allows dynamic worker management, enabling you to switch
+ * workers at runtime or re-establish connections after errors.
+ *
  * @example
  * // In main thread - communicate with a specific worker
  * const worker = new Worker('./worker.js');
@@ -38,6 +45,12 @@ import { GET_NEW_ID, RESPONSES$, SEND } from "../selectors";
  * const client = new WorkerMessageClient(() =>
  *   document.querySelector('[data-worker]') ? new Worker('./worker.js') : undefined
  * );
+ *
+ * @example
+ * // Re-initialize with a different worker
+ * const client = new WorkerMessageClient();
+ * // Later, switch to a different worker
+ * client.initialize(new Worker('./different-worker.js'));
  */
 export declare class WorkerMessageClient extends MessageClient {
     #private;
@@ -55,7 +68,36 @@ export declare class WorkerMessageClient extends MessageClient {
      *   - () => Promise<Worker>: Function returning promise (async lazy initialization)
      *   - undefined: Omit for worker thread context (uses self)
      */
-    constructor(worker?: Worker | Promise<Worker | undefined> | (() => Worker | undefined) | (() => Promise<Worker | undefined>));
+    constructor(worker?: ClientWorkerArg);
+    /**
+     * Initializes or re-initializes the worker connection.
+     *
+     * This method sets up message listeners for the provided worker. If a worker
+     * was previously initialized, it cleans up the old connection before establishing
+     * the new one. This allows for dynamic worker management, such as:
+     * - Switching between different workers at runtime
+     * - Re-establishing connections after worker errors
+     * - Lazy initialization when the worker is conditionally needed
+     *
+     * @param worker - Optional worker configuration:
+     *   - Worker: Direct worker instance (main thread)
+     *   - Promise<Worker>: Promise resolving to worker (async initialization)
+     *   - () => Worker: Function returning worker (lazy initialization)
+     *   - () => Promise<Worker>: Function returning promise (async lazy initialization)
+     *   - undefined: Omit for worker thread context (uses self)
+     *
+     * @example
+     * // Switch to a different worker dynamically
+     * const client = new WorkerMessageClient(oldWorker);
+     * client.initialize(newWorker); // Cleans up old listener, sets up new one
+     *
+     * @example
+     * // Re-initialize after worker error
+     * worker.onerror = () => {
+     *   client.initialize(new Worker('./worker.js'));
+     * };
+     */
+    initialize(worker?: ClientWorkerArg): void;
     /**
      * Sends a message to the worker or main thread
      *
@@ -72,3 +114,4 @@ export declare class WorkerMessageClient extends MessageClient {
      */
     protected [GET_NEW_ID](): string;
 }
+export {};

package/worker/message-client.js

@@ -20,6 +20,9 @@ import { GET_NEW_ID, RESPONSES$, SEND } from "../selectors";
  * - Function that returns a Worker (for lazy initialization)
  * - Function that returns a Promise<Worker> (for async lazy initialization)
  *
+ * The `initialize()` method allows dynamic worker management, enabling you to switch
+ * workers at runtime or re-establish connections after errors.
+ *
  * @example
  * // In main thread - communicate with a specific worker
  * const worker = new Worker('./worker.js');
@@ -39,13 +42,19 @@ import { GET_NEW_ID, RESPONSES$, SEND } from "../selectors";
  * const client = new WorkerMessageClient(() =>
  *   document.querySelector('[data-worker]') ? new Worker('./worker.js') : undefined
  * );
+ *
+ * @example
+ * // Re-initialize with a different worker
+ * const client = new WorkerMessageClient();
+ * // Later, switch to a different worker
+ * client.initialize(new Worker('./different-worker.js'));
  */
 export class WorkerMessageClient extends MessageClient {
     /**
      * Promise resolving to the Worker instance or undefined if running in worker context
      * @private
      */
-    #worker = null;
+    #worker = Promise.resolve(undefined);
     /**
      * Unique identifier for this client instance to prevent ID collisions
      * @private
@@ -67,6 +76,46 @@ export class WorkerMessageClient extends MessageClient {
      */
     constructor(worker) {
         super();
+        this.initialize(worker);
+    }
+    /**
+     * Initializes or re-initializes the worker connection.
+     *
+     * This method sets up message listeners for the provided worker. If a worker
+     * was previously initialized, it cleans up the old connection before establishing
+     * the new one. This allows for dynamic worker management, such as:
+     * - Switching between different workers at runtime
+     * - Re-establishing connections after worker errors
+     * - Lazy initialization when the worker is conditionally needed
+     *
+     * @param worker - Optional worker configuration:
+     *   - Worker: Direct worker instance (main thread)
+     *   - Promise<Worker>: Promise resolving to worker (async initialization)
+     *   - () => Worker: Function returning worker (lazy initialization)
+     *   - () => Promise<Worker>: Function returning promise (async lazy initialization)
+     *   - undefined: Omit for worker thread context (uses self)
+     *
+     * @example
+     * // Switch to a different worker dynamically
+     * const client = new WorkerMessageClient(oldWorker);
+     * client.initialize(newWorker); // Cleans up old listener, sets up new one
+     *
+     * @example
+     * // Re-initialize after worker error
+     * worker.onerror = () => {
+     *   client.initialize(new Worker('./worker.js'));
+     * };
+     */
+    initialize(worker) {
+        // Deinitialize previous worker if any
+        this.#worker.then(prevWorker => {
+            if (prevWorker) {
+                prevWorker.removeEventListener('message', this.#handler);
+            }
+            else {
+                removeEventListener('message', this.#handler);
+            }
+        }).catch(noop);
         // Resolve worker parameter: execute function if provided, otherwise use value directly
         const _worker = typeof worker === 'function' ? worker() : worker;
         // Ensure worker is wrapped in a promise for consistent async handling

package/worker/message-client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../libs/hermes/src/worker/message-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGlD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAE5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,MAAM,OAAO,mBAAoB,SAAQ,aAAa;IACpD;;;OAGG;IACH,OAAO,GAAgC,IAAK,CAAC;IAE7C;;;OAGG;IACH,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEzB;;OAEG;IACI,CAAC,UAAU,CAAC,GAAG,IAAI,OAAO,EAAmB,CAAC;IAErD;;;;;;;;;OASG;IACH,YAAY,MAAgH;QAC1H,KAAK,EAAE,CAAC;QAER,uFAAuF;QACvF,MAAM,OAAO,GAAqD,OAAO,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;QAEnH,sEAAsE;QACtE,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;QAElC,kDAAkD;QAClD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACzB,IAAI,MAAM,EAAE,CAAC;gBACX,iDAAiD;gBACjD,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACpD,CAAC;iBAAM,CAAC;gBACN,6DAA6D;gBAC7D,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;IAED;;;;;;OAMG;IACI,CAAC,IAAI,CAAC,CAAI,OAAmB;QAClC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACzB,IAAI,MAAM,EAAE,CAAC;gBACX,8BAA8B;gBAC9B,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC9B,CAAC;iBAAM,CAAC;gBACN,qCAAqC;gBACpC,WAAmB,CAAC,OAAO,CAAC,CAAC;YAChC,CAAC;QACH,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;IAED;;;OAGG;IACH,QAAQ,GAAG,CAAC,KAAoC,EAAE,EAAE;QAClD,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC,CAAA;IAED;;;;;OAKG;IACO,CAAC,UAAU,CAAC;QACpB,OAAO,QAAQ,CAAC,wBAAwB,GAAG,IAAI,CAAC,WAAW,CAAW,CAAC;IACzE,CAAC;CACF","file":"message-client.js","sourcesContent":["import { uniqueId } from \"@thalesrc/js-utils/unique-id\";\nimport { noop } from \"@thalesrc/js-utils/function/noop\";\nimport { promisify } from '@thalesrc/js-utils/promise/promisify';\nimport { Subject } from \"rxjs\";\nimport { MessageClient } from \"../message-client\";\nimport { MessageResponse } from \"../message-response.type\";\nimport { Message } from \"../message.interface\";\nimport { GET_NEW_ID, RESPONSES$, SEND } from \"../selectors\";\n\n/**\n * WorkerMessageClient\n *\n * Client implementation for Web Worker communication. Sends messages to and receives\n * responses from Web Workers using the Worker postMessage API.\n *\n * This class can be used in two contexts:\n * - **Main thread**: Provide a Worker instance to communicate with that specific worker\n * - **Worker thread**: Omit the worker parameter to communicate with the main thread via self\n *\n * The worker parameter supports multiple types for flexibility:\n * - Direct Worker instance\n * - Promise that resolves to a Worker (for async worker initialization)\n * - Function that returns a Worker (for lazy initialization)\n * - Function that returns a Promise<Worker> (for async lazy initialization)\n *\n * @example\n * // In main thread - communicate with a specific worker\n * const worker = new Worker('./worker.js');\n * const client = new WorkerMessageClient(worker);\n *\n * @example\n * // In worker thread - communicate with main thread\n * const client = new WorkerMessageClient();\n *\n * @example\n * // With async worker initialization\n * const workerPromise = import('./worker.js').then(m => new m.MyWorker());\n * const client = new WorkerMessageClient(workerPromise);\n *\n * @example\n * // With lazy initialization\n * const client = new WorkerMessageClient(() =>\n *   document.querySelector('[data-worker]') ? new Worker('./worker.js') : undefined\n * );\n */\nexport class WorkerMessageClient extends MessageClient {\n  /**\n   * Promise resolving to the Worker instance or undefined if running in worker context\n   * @private\n   */\n  #worker: Promise<Worker | undefined> = null!;\n\n  /**\n   * Unique identifier for this client instance to prevent ID collisions\n   * @private\n   */\n  #instanceId = Date.now();\n\n  /**\n   * Observable stream of message responses from the worker or main thread\n   */\n  public [RESPONSES$] = new Subject<MessageResponse>();\n\n  /**\n   * Creates a new WorkerMessageClient instance\n   *\n   * @param worker - Optional worker configuration:\n   *   - Worker: Direct worker instance (main thread)\n   *   - Promise<Worker>: Promise resolving to worker (async initialization)\n   *   - () => Worker: Function returning worker (lazy initialization)\n   *   - () => Promise<Worker>: Function returning promise (async lazy initialization)\n   *   - undefined: Omit for worker thread context (uses self)\n   */\n  constructor(worker?: Worker | Promise<Worker | undefined> | (() => Worker | undefined) | (() => Promise<Worker | undefined>)) {\n    super();\n\n    // Resolve worker parameter: execute function if provided, otherwise use value directly\n    const _worker: Worker | Promise<Worker | undefined> | undefined = typeof worker === 'function' ? worker() : worker;\n\n    // Ensure worker is wrapped in a promise for consistent async handling\n    this.#worker = promisify(_worker);\n\n    // Set up message listener once worker is resolved\n    this.#worker.then(worker => {\n      if (worker) {\n        // Main thread context: listen to specific worker\n        worker.addEventListener('message', this.#handler);\n      } else {\n        // Worker thread context: listen to messages from main thread\n        addEventListener('message', this.#handler);\n      }\n    }).catch(noop);\n  }\n\n  /**\n   * Sends a message to the worker or main thread\n   *\n   * @param message - The message to send\n   * @template T - Type of the message body\n   * @internal Used by @Request decorator\n   */\n  public [SEND]<T>(message: Message<T>) {\n    this.#worker.then(worker => {\n      if (worker) {\n        // Main thread: send to worker\n        worker.postMessage(message);\n      } else {\n        // Worker thread: send to main thread\n        (postMessage as any)(message);\n      }\n    }).catch(noop);\n  }\n\n  /**\n   * Handles incoming messages and forwards them to the responses stream\n   * @private\n   */\n  #handler = (event: MessageEvent<MessageResponse>) => {\n    this[RESPONSES$].next(event.data);\n  }\n\n  /**\n   * Generates a unique message ID for tracking request-response pairs\n   *\n   * @returns Unique message identifier\n   * @internal Used by @Request decorator\n   */\n  protected [GET_NEW_ID](): string {\n    return uniqueId('hermes-worker-message-' + this.#instanceId) as string;\n  }\n}\n"]}
+{"version":3,"sources":["../../../../../libs/hermes/src/worker/message-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGlD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAO5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,MAAM,OAAO,mBAAoB,SAAQ,aAAa;IACpD;;;OAGG;IACH,OAAO,GAAwB,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAE1D;;;OAGG;IACH,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEzB;;OAEG;IACI,CAAC,UAAU,CAAC,GAAG,IAAI,OAAO,EAAmB,CAAC;IAErD;;;;;;;;;OASG;IACH,YAAY,MAAwB;QAClC,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACH,UAAU,CAAC,MAAwB;QACjC,sCAAsC;QACtC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YAC7B,IAAI,UAAU,EAAE,CAAC;gBACf,UAAU,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC3D,CAAC;iBAAM,CAAC;gBACN,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAChD,CAAC;QACH,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEf,uFAAuF;QACvF,MAAM,OAAO,GAAuD,OAAO,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;QACrH,sEAAsE;QACtE,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;QAElC,kDAAkD;QAClD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACzB,IAAI,MAAM,EAAE,CAAC;gBACX,iDAAiD;gBACjD,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACpD,CAAC;iBAAM,CAAC;gBACN,6DAA6D;gBAC7D,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;IAED;;;;;;OAMG;IACI,CAAC,IAAI,CAAC,CAAI,OAAmB;QAClC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACzB,IAAI,MAAM,EAAE,CAAC;gBACX,8BAA8B;gBAC9B,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC9B,CAAC;iBAAM,CAAC;gBACN,qCAAqC;gBACpC,WAAmB,CAAC,OAAO,CAAC,CAAC;YAChC,CAAC;QACH,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;IAED;;;OAGG;IACH,QAAQ,GAAG,CAAC,KAAoC,EAAE,EAAE;QAClD,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC,CAAA;IAED;;;;;OAKG;IACO,CAAC,UAAU,CAAC;QACpB,OAAO,QAAQ,CAAC,wBAAwB,GAAG,IAAI,CAAC,WAAW,CAAW,CAAC;IACzE,CAAC;CACF","file":"message-client.js","sourcesContent":["import { uniqueId } from \"@thalesrc/js-utils/unique-id\";\nimport { noop } from \"@thalesrc/js-utils/function/noop\";\nimport { promisify } from '@thalesrc/js-utils/promise/promisify';\nimport { Subject } from \"rxjs\";\nimport { MessageClient } from \"../message-client\";\nimport { MessageResponse } from \"../message-response.type\";\nimport { Message } from \"../message.interface\";\nimport { GET_NEW_ID, RESPONSES$, SEND } from \"../selectors\";\n\ntype ClientWorkerType = Worker | undefined;\ntype ClientWorkerPromise = Promise<ClientWorkerType>;\ntype ClientWorkerFactory = () => ClientWorkerType | ClientWorkerPromise;\ntype ClientWorkerArg = ClientWorkerType | ClientWorkerPromise | ClientWorkerFactory;\n\n/**\n * WorkerMessageClient\n *\n * Client implementation for Web Worker communication. Sends messages to and receives\n * responses from Web Workers using the Worker postMessage API.\n *\n * This class can be used in two contexts:\n * - **Main thread**: Provide a Worker instance to communicate with that specific worker\n * - **Worker thread**: Omit the worker parameter to communicate with the main thread via self\n *\n * The worker parameter supports multiple types for flexibility:\n * - Direct Worker instance\n * - Promise that resolves to a Worker (for async worker initialization)\n * - Function that returns a Worker (for lazy initialization)\n * - Function that returns a Promise<Worker> (for async lazy initialization)\n *\n * The `initialize()` method allows dynamic worker management, enabling you to switch\n * workers at runtime or re-establish connections after errors.\n *\n * @example\n * // In main thread - communicate with a specific worker\n * const worker = new Worker('./worker.js');\n * const client = new WorkerMessageClient(worker);\n *\n * @example\n * // In worker thread - communicate with main thread\n * const client = new WorkerMessageClient();\n *\n * @example\n * // With async worker initialization\n * const workerPromise = import('./worker.js').then(m => new m.MyWorker());\n * const client = new WorkerMessageClient(workerPromise);\n *\n * @example\n * // With lazy initialization\n * const client = new WorkerMessageClient(() =>\n *   document.querySelector('[data-worker]') ? new Worker('./worker.js') : undefined\n * );\n *\n * @example\n * // Re-initialize with a different worker\n * const client = new WorkerMessageClient();\n * // Later, switch to a different worker\n * client.initialize(new Worker('./different-worker.js'));\n */\nexport class WorkerMessageClient extends MessageClient {\n  /**\n   * Promise resolving to the Worker instance or undefined if running in worker context\n   * @private\n   */\n  #worker: ClientWorkerPromise = Promise.resolve(undefined);\n\n  /**\n   * Unique identifier for this client instance to prevent ID collisions\n   * @private\n   */\n  #instanceId = Date.now();\n\n  /**\n   * Observable stream of message responses from the worker or main thread\n   */\n  public [RESPONSES$] = new Subject<MessageResponse>();\n\n  /**\n   * Creates a new WorkerMessageClient instance\n   *\n   * @param worker - Optional worker configuration:\n   *   - Worker: Direct worker instance (main thread)\n   *   - Promise<Worker>: Promise resolving to worker (async initialization)\n   *   - () => Worker: Function returning worker (lazy initialization)\n   *   - () => Promise<Worker>: Function returning promise (async lazy initialization)\n   *   - undefined: Omit for worker thread context (uses self)\n   */\n  constructor(worker?: ClientWorkerArg) {\n    super();\n\n    this.initialize(worker);\n  }\n\n  /**\n   * Initializes or re-initializes the worker connection.\n   *\n   * This method sets up message listeners for the provided worker. If a worker\n   * was previously initialized, it cleans up the old connection before establishing\n   * the new one. This allows for dynamic worker management, such as:\n   * - Switching between different workers at runtime\n   * - Re-establishing connections after worker errors\n   * - Lazy initialization when the worker is conditionally needed\n   *\n   * @param worker - Optional worker configuration:\n   *   - Worker: Direct worker instance (main thread)\n   *   - Promise<Worker>: Promise resolving to worker (async initialization)\n   *   - () => Worker: Function returning worker (lazy initialization)\n   *   - () => Promise<Worker>: Function returning promise (async lazy initialization)\n   *   - undefined: Omit for worker thread context (uses self)\n   *\n   * @example\n   * // Switch to a different worker dynamically\n   * const client = new WorkerMessageClient(oldWorker);\n   * client.initialize(newWorker); // Cleans up old listener, sets up new one\n   *\n   * @example\n   * // Re-initialize after worker error\n   * worker.onerror = () => {\n   *   client.initialize(new Worker('./worker.js'));\n   * };\n   */\n  initialize(worker?: ClientWorkerArg) {\n    // Deinitialize previous worker if any\n    this.#worker.then(prevWorker => {\n      if (prevWorker) {\n        prevWorker.removeEventListener('message', this.#handler);\n      } else {\n        removeEventListener('message', this.#handler);\n      }\n    }).catch(noop);\n\n    // Resolve worker parameter: execute function if provided, otherwise use value directly\n    const _worker: ClientWorkerType | ClientWorkerPromise | undefined = typeof worker === 'function' ? worker() : worker;\n    // Ensure worker is wrapped in a promise for consistent async handling\n    this.#worker = promisify(_worker);\n\n    // Set up message listener once worker is resolved\n    this.#worker.then(worker => {\n      if (worker) {\n        // Main thread context: listen to specific worker\n        worker.addEventListener('message', this.#handler);\n      } else {\n        // Worker thread context: listen to messages from main thread\n        addEventListener('message', this.#handler);\n      }\n    }).catch(noop);\n  }\n\n  /**\n   * Sends a message to the worker or main thread\n   *\n   * @param message - The message to send\n   * @template T - Type of the message body\n   * @internal Used by @Request decorator\n   */\n  public [SEND]<T>(message: Message<T>) {\n    this.#worker.then(worker => {\n      if (worker) {\n        // Main thread: send to worker\n        worker.postMessage(message);\n      } else {\n        // Worker thread: send to main thread\n        (postMessage as any)(message);\n      }\n    }).catch(noop);\n  }\n\n  /**\n   * Handles incoming messages and forwards them to the responses stream\n   * @private\n   */\n  #handler = (event: MessageEvent<MessageResponse>) => {\n    this[RESPONSES$].next(event.data);\n  }\n\n  /**\n   * Generates a unique message ID for tracking request-response pairs\n   *\n   * @returns Unique message identifier\n   * @internal Used by @Request decorator\n   */\n  protected [GET_NEW_ID](): string {\n    return uniqueId('hermes-worker-message-' + this.#instanceId) as string;\n  }\n}\n"]}

package/worker/message-host.cjs

@@ -3,41 +3,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkerMessageHost = void 0;
 const rxjs_1 = require("rxjs");
 const message_host_1 = require("../message-host");
-const REQUESTS$ = Symbol('Requests');
-const HANDLER = Symbol('Handler');
-const WORKER = Symbol('Worker');
+const selectors_1 = require("../selectors");
 class WorkerMessageHost extends message_host_1.MessageHost {
-    [REQUESTS$] = new rxjs_1.Subject();
-    [WORKER];
+    #requests$ = new rxjs_1.Subject();
+    #worker;
     constructor(worker) {
         super();
         if (worker) {
-            this[WORKER] = worker;
-            worker.addEventListener('message', this[HANDLER]);
+            this.#worker = worker;
+            worker.addEventListener('message', this.#handler);
         }
         else {
-            addEventListener('message', this[HANDLER]);
+            addEventListener('message', this.#handler);
         }
-        this.listen(this[REQUESTS$]);
+        this[selectors_1.LISTEN](this.#requests$);
     }
-    response(message) {
-        if (this[WORKER]) {
-            this[WORKER].postMessage(message);
+    [selectors_1.RESPONSE](message) {
+        if (this.#worker) {
+            this.#worker.postMessage(message);
         }
         else {
             postMessage(message);
         }
     }
     terminate() {
-        if (this[WORKER]) {
-            this[WORKER].removeEventListener('message', this[HANDLER]);
+        if (this.#worker) {
+            this.#worker.removeEventListener('message', this.#handler);
         }
         else {
-            removeEventListener('message', this[HANDLER]);
+            removeEventListener('message', this.#handler);
         }
     }
-    [HANDLER] = (event) => {
-        this[REQUESTS$].next(event.data);
+    #handler = (event) => {
+        this.#requests$.next(event.data);
     };
 }
 exports.WorkerMessageHost = WorkerMessageHost;

package/worker/message-host.d.ts

@@ -1,14 +1,9 @@
 import { MessageHost } from "../message-host";
 import { MessageResponse } from "../message-response.type";
-declare const REQUESTS$: unique symbol;
-declare const HANDLER: unique symbol;
-declare const WORKER: unique symbol;
+import { RESPONSE } from "../selectors";
 export declare class WorkerMessageHost extends MessageHost {
-    private [REQUESTS$];
-    private [WORKER];
+    #private;
     constructor(worker?: Worker);
-    protected response(message: MessageResponse): void;
+    protected [RESPONSE](message: MessageResponse): void;
     terminate(): void;
-    private [HANDLER];
 }
-export {};

package/worker/message-host.js

@@ -1,40 +1,38 @@
 import { Subject } from "rxjs";
 import { MessageHost } from "../message-host";
-const REQUESTS$ = Symbol('Requests');
-const HANDLER = Symbol('Handler');
-const WORKER = Symbol('Worker');
+import { LISTEN, RESPONSE } from "../selectors";
 export class WorkerMessageHost extends MessageHost {
-    [REQUESTS$] = new Subject();
-    [WORKER];
+    #requests$ = new Subject();
+    #worker;
     constructor(worker) {
         super();
         if (worker) {
-            this[WORKER] = worker;
-            worker.addEventListener('message', this[HANDLER]);
+            this.#worker = worker;
+            worker.addEventListener('message', this.#handler);
         }
         else {
-            addEventListener('message', this[HANDLER]);
+            addEventListener('message', this.#handler);
         }
-        this.listen(this[REQUESTS$]);
+        this[LISTEN](this.#requests$);
     }
-    response(message) {
-        if (this[WORKER]) {
-            this[WORKER].postMessage(message);
+    [RESPONSE](message) {
+        if (this.#worker) {
+            this.#worker.postMessage(message);
         }
         else {
             postMessage(message);
         }
     }
     terminate() {
-        if (this[WORKER]) {
-            this[WORKER].removeEventListener('message', this[HANDLER]);
+        if (this.#worker) {
+            this.#worker.removeEventListener('message', this.#handler);
         }
         else {
-            removeEventListener('message', this[HANDLER]);
+            removeEventListener('message', this.#handler);
         }
     }
-    [HANDLER] = (event) => {
-        this[REQUESTS$].next(event.data);
+    #handler = (event) => {
+        this.#requests$.next(event.data);
     };
 }
 

package/worker/message-host.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../libs/hermes/src/worker/message-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAQ9C,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AACrC,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;AAClC,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAEhC,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IACxC,CAAC,SAAS,CAAC,GAAG,IAAI,OAAO,EAAW,CAAC;IACrC,CAAC,MAAM,CAAC,CAAqB;IAErC,YAAY,MAAe;QACzB,KAAK,EAAE,CAAC;QAER,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;YACtB,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7C,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAC/B,CAAC;IAES,QAAQ,CAAC,OAAwB;QACzC,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACjB,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;aAAM,CAAC;YACL,WAAmB,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAEM,SAAS;QACd,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACjB,IAAI,CAAC,MAAM,CAAC,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7D,CAAC;aAAM,CAAC;YACN,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAEO,CAAC,OAAO,CAAC,GAAG,CAAC,KAA4B,EAAE,EAAE;QACnD,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC,CAAA;CACF","file":"message-host.js","sourcesContent":["import { Subject } from \"rxjs\";\nimport { MessageHost } from \"../message-host\";\nimport { MessageResponse } from \"../message-response.type\";\nimport { Message } from \"../message.interface\";\n\ninterface MessageEvent<T> {\n  data: T;\n}\n\nconst REQUESTS$ = Symbol('Requests');\nconst HANDLER = Symbol('Handler');\nconst WORKER = Symbol('Worker');\n\nexport class WorkerMessageHost extends MessageHost {\n  private [REQUESTS$] = new Subject<Message>();\n  private [WORKER]: Worker | undefined;\n\n  constructor(worker?: Worker) {\n    super();\n\n    if (worker) {\n      this[WORKER] = worker;\n      worker.addEventListener('message', this[HANDLER]);\n    } else {\n      addEventListener('message', this[HANDLER]);\n    }\n\n    this.listen(this[REQUESTS$]);\n  }\n\n  protected response(message: MessageResponse) {\n    if (this[WORKER]) {\n      this[WORKER].postMessage(message);\n    } else {\n      (postMessage as any)(message);\n    }\n  }\n\n  public terminate() {\n    if (this[WORKER]) {\n      this[WORKER].removeEventListener('message', this[HANDLER]);\n    } else {\n      removeEventListener('message', this[HANDLER]);\n    }\n  }\n\n  private [HANDLER] = (event: MessageEvent<Message>) => {\n    this[REQUESTS$].next(event.data);\n  }\n}\n"]}
+{"version":3,"sources":["../../../../../libs/hermes/src/worker/message-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9C,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAMhD,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IAChD,UAAU,GAAG,IAAI,OAAO,EAAW,CAAC;IACpC,OAAO,CAAqB;IAE5B,YAAY,MAAe;QACzB,KAAK,EAAE,CAAC;QAER,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;YACtB,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7C,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;IAES,CAAC,QAAQ,CAAC,CAAC,OAAwB;QAC3C,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;aAAM,CAAC;YACL,WAAmB,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAEM,SAAS;QACd,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7D,CAAC;aAAM,CAAC;YACN,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,QAAQ,GAAG,CAAC,KAA4B,EAAE,EAAE;QAC1C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC,CAAA;CACF","file":"message-host.js","sourcesContent":["import { Subject } from \"rxjs\";\nimport { MessageHost } from \"../message-host\";\nimport { MessageResponse } from \"../message-response.type\";\nimport { Message } from \"../message.interface\";\nimport { LISTEN, RESPONSE } from \"../selectors\";\n\ninterface MessageEvent<T> {\n  data: T;\n}\n\nexport class WorkerMessageHost extends MessageHost {\n  #requests$ = new Subject<Message>();\n  #worker: Worker | undefined;\n\n  constructor(worker?: Worker) {\n    super();\n\n    if (worker) {\n      this.#worker = worker;\n      worker.addEventListener('message', this.#handler);\n    } else {\n      addEventListener('message', this.#handler);\n    }\n\n    this[LISTEN](this.#requests$);\n  }\n\n  protected [RESPONSE](message: MessageResponse) {\n    if (this.#worker) {\n      this.#worker.postMessage(message);\n    } else {\n      (postMessage as any)(message);\n    }\n  }\n\n  public terminate() {\n    if (this.#worker) {\n      this.#worker.removeEventListener('message', this.#handler);\n    } else {\n      removeEventListener('message', this.#handler);\n    }\n  }\n\n  #handler = (event: MessageEvent<Message>) => {\n    this.#requests$.next(event.data);\n  }\n}\n"]}

package/worker/message-service.d.ts

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