feat(Core): added error handling to message client

thalesrc · Nov 29, 2023 · e20eff6 · e20eff6
1 parent dc05cfe
commit e20eff6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/index.ts b/src/index.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';
diff --git a/src/message-response.type.ts b/src/message-response.type.ts
@@ -2,7 +2,10 @@ 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'> & { completed: false; };
+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;
diff --git a/src/request.decorator.ts b/src/request.decorator.ts
@@ -1,7 +1,8 @@
-import { filter, pluck, takeWhile } from 'rxjs/operators';
+import { filter, map, takeWhile } from 'rxjs/operators';
 
 import { MessageClient } from './message-client';
 import { GET_NEW_ID, RESPONSES$, SEND } from './selectors';
+import { ErrorMessageResponse, SuccessfulMessageResponse, UncompletedMessageResponse } from './message-response.type';
 
 export function Request(path: string): MethodDecorator {
   return function(target: object, key: string, descriptor: TypedPropertyDescriptor<any>): TypedPropertyDescriptor<any> {
@@ -11,9 +12,16 @@ export function Request(path: string): MethodDecorator {
       this[SEND]({body: message, id: messageId, path});
 
       return this[RESPONSES$].pipe(
+        map((data) => {
+          const {error} = data as ErrorMessageResponse;
+
+          if (error) throw error;
+
+          return data as SuccessfulMessageResponse;
+        }),
         filter(({id}) => id === messageId),
         takeWhile(({completed}) => !completed),
-        pluck('body'),
+        map(({body}: UncompletedMessageResponse) => body),
       );
     };