@thalesrc/hermes 6.0.1 → 6.1.1

package/chrome/message-host.d.ts

@@ -1,5 +1,5 @@
 import { MessageHost } from '../message-host';
-import { MessageResponse } from '../message-response.type';
+import { SuccessfulMessageResponse } from '../message-response.type';
 declare const PORTS: unique symbol;
 declare const REQUESTS$: unique symbol;
 export declare class ChromeMessageHost extends MessageHost {
@@ -7,6 +7,6 @@ export declare class ChromeMessageHost extends MessageHost {
     private [PORTS];
     private [REQUESTS$];
     constructor(name?: string);
-    protected response(message: MessageResponse): void;
+    protected response(message: SuccessfulMessageResponse): void;
 }
 export {};

package/iframe/message-host.d.ts

@@ -1,5 +1,5 @@
 import { MessageHost } from '../message-host';
-import { MessageResponse } from '../message-response.type';
+import { SuccessfulMessageResponse } from '../message-response.type';
 import { IFrame } from './iframe.type';
 declare const REQUESTS$: unique symbol;
 declare const SOURCES: unique symbol;
@@ -14,7 +14,7 @@ export declare class IframeMessageHost extends MessageHost {
     protected get [TARGET_FRAME](): null | HTMLIFrameElement;
     constructor(channelName?: string, targetFrame?: IFrame);
     terminate(): void;
-    protected response(message: MessageResponse): void;
+    protected response(message: SuccessfulMessageResponse): void;
     private [HANDLER];
 }
 export {};

package/index.d.ts

@@ -4,3 +4,4 @@ export { Message } from './message.interface';
 export { MessageResponse } from './message-response.type';
 export { MessageClient } from './message-client';
 export { MessageHost } from './message-host';
+export * from './selectors';

package/index.js

@@ -2,3 +2,4 @@ export { Request } from './request.decorator';
 export { Listen } from './listen.decorator';
 export { MessageClient } from './message-client';
 export { MessageHost } from './message-host';
+export * from './selectors';

package/message-host.d.ts

@@ -1,14 +1,11 @@
 import { Observable, Subject } from 'rxjs';
-import { MessageResponse } from './message-response.type';
+import { SuccessfulMessageResponse } from './message-response.type';
 import { Message } from './message.interface';
-/**
- * Listeners property symbol
- */
-export declare const GET_LISTENERS: unique symbol;
 /**
  * Message Host
  */
 export declare abstract class MessageHost {
+    #private;
     /**
      * Message Terminator Subject
      *
@@ -24,9 +21,5 @@ export declare abstract class MessageHost {
      *
      * @param message Incoming response message
      */
-    protected abstract response(message: MessageResponse): void;
-    /**
-     * All inherited listeners
-     */
-    private [GET_LISTENERS];
+    protected abstract response<T = any>(message: SuccessfulMessageResponse<T>): void;
 }

package/message-host.js

@@ -2,10 +2,6 @@ import { noop } from '@thalesrc/js-utils';
 import { Subject } from 'rxjs';
 import { filter, takeUntil } from 'rxjs/operators';
 import { MESSAGE_LISTENERS } from './selectors';
-/**
- * Listeners property symbol
- */
-export const GET_LISTENERS = Symbol('Message Host Listeners');
 /**
  * Message Host
  */
@@ -20,7 +16,7 @@ export class MessageHost {
      * Run this method to start listening the requests
      */
     listen = (messages$) => {
-        for (const [path, listeners] of this[GET_LISTENERS]()) {
+        for (const [path, listeners] of this.#getListeners()) {
             messages$
                 .pipe(filter(({ path: messagePath }) => path === messagePath))
                 .subscribe(({ body, id }) => {
@@ -37,7 +33,7 @@ export class MessageHost {
     /**
      * All inherited listeners
      */
-    [GET_LISTENERS]() {
+    #getListeners() {
         const map = new Map();
         let currentProto = this['__proto__' + ''];
         while (currentProto.constructor !== Object) {

package/message-response.type.d.ts

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

package/package.json

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

package/request.decorator.js

@@ -1,11 +1,16 @@
-import { filter, pluck, takeWhile } from 'rxjs/operators';
+import { filter, map, takeWhile } from 'rxjs/operators';
 import { GET_NEW_ID, RESPONSES$, SEND } from './selectors';
 export function Request(path) {
     return function (target, key, descriptor) {
         descriptor.value = function (message) {
             const messageId = this[GET_NEW_ID]();
             this[SEND]({ body: message, id: messageId, path });
-            return this[RESPONSES$].pipe(filter(({ id }) => id === messageId), takeWhile(({ completed }) => !completed), pluck('body'));
+            return this[RESPONSES$].pipe(map((data) => {
+                const { error } = data;
+                if (error)
+                    throw error;
+                return data;
+            }), filter(({ id }) => id === messageId), takeWhile(({ completed }) => !completed), map(({ body }) => body));
         };
         return descriptor;
     };

package/tsconfig.lib.json

@@ -1,5 +1,10 @@
 {
   "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "types": [
+      "@types/chrome"
+    ]
+  },
   "exclude": [
     "node_modules",
     "**/*.spec.ts"