Fix sendCommandAndReceiveEvent (#23)

osstotalsoft · Nov 27, 2023 · 3107104 · 3107104
1 parent 547244c
commit 3107104
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/.changeset/hot-pens-raise.md b/.changeset/hot-pens-raise.md
@@ -0,0 +1,5 @@
+---
+'@totalsoft/message-bus': patch
+---
+
+Fixed sendCommandAndWaitForEvent unhandled rejection
diff --git a/packages/message-bus/src/messageBus.ts b/packages/message-bus/src/messageBus.ts
@@ -88,12 +88,14 @@ function _messageBus(transport: Transport, serDes: SerDes): MessageBus {
       events.map(eventTopic =>
         subscribe(
           eventTopic,
-          ev => {
-            if (!publishedMsg) return Promise.reject('Message missing')
-            if (!resolveEventReceived) return Promise.reject('Resolver not set')
-            if (envelope.getCorrelationId(ev) != envelope.getCorrelationId(publishedMsg)) return Promise.reject()
-            resolveEventReceived([eventTopic, ev])
-            return Promise.resolve()
+          async ev => {
+            if (
+              publishedMsg &&
+              resolveEventReceived &&
+              envelope.getCorrelationId(ev) == envelope.getCorrelationId(publishedMsg)
+            ) {
+              resolveEventReceived([eventTopic, ev])
+            }
           },
           SubscriptionOptions.RPC
         )