@fluojs/microservices 1.0.3 → 1.0.5

package/dist/transports/kafka-transport.js

@@ -7,6 +7,7 @@
  * replies without leaking cross-request state through the shared producer/consumer pair.
  */
 export class KafkaMicroserviceTransport {
+  closePromise;
   closing = false;
   handler;
   listening = false;
@@ -37,7 +38,12 @@ export class KafkaMicroserviceTransport {
    * @returns A promise that resolves once all subscriptions are active.
    */
   async listen(handler) {
-    this.closing = false;
+    if (this.closing) {
+      if (this.closePromise) {
+        throw new Error('KafkaMicroserviceTransport is closing. Wait for close() to complete before listen().');
+      }
+      this.closing = false;
+    }
     this.handler = handler;
     if (this.listening) {
       return;
@@ -49,17 +55,11 @@ export class KafkaMicroserviceTransport {
     this.listenPromise = (async () => {
       const subscribed = [];
       try {
-        await this.options.consumer.subscribe(this.eventTopic, message => {
-          void this.handleInboundEvent(message).catch(() => undefined);
-        });
+        await this.options.consumer.subscribe(this.eventTopic, message => this.handleInboundEvent(message));
         subscribed.push(this.eventTopic);
-        await this.options.consumer.subscribe(this.messageTopic, message => {
-          void this.handleInboundRequest(message).catch(() => undefined);
-        });
+        await this.options.consumer.subscribe(this.messageTopic, message => this.handleInboundRequest(message));
         subscribed.push(this.messageTopic);
-        await this.options.consumer.subscribe(this.responseTopic, message => {
-          void this.handleInboundResponse(message).catch(() => undefined);
-        });
+        await this.options.consumer.subscribe(this.responseTopic, message => this.handleInboundResponse(message));
         subscribed.push(this.responseTopic);
       } catch (error) {
         for (const topic of subscribed) {
@@ -138,6 +138,13 @@ export class KafkaMicroserviceTransport {
         });
       }
       void Promise.resolve().then(async () => {
+        if (!this.pending.has(requestId)) {
+          return;
+        }
+        if (signal?.aborted) {
+          entry.reject(new Error('Kafka request aborted before publish.'));
+          return;
+        }
         if (this.closing) {
           entry.reject(new Error('Kafka microservice transport closed before request dispatch.'));
           return;
@@ -174,30 +181,41 @@ export class KafkaMicroserviceTransport {
    * @returns A promise that resolves once shutdown cleanup completes.
    */
   async close() {
-    this.closing = true;
-    let closeError;
-    if (this.listenPromise) {
-      await this.listenPromise;
+    if (this.closePromise) {
+      await this.closePromise;
+      return;
     }
-    try {
-      if (this.listening) {
-        for (const topic of new Set([this.eventTopic, this.messageTopic, this.responseTopic])) {
-          try {
-            await this.options.consumer.unsubscribe(topic);
-          } catch (error) {
-            closeError ??= error;
+    this.closing = true;
+    this.closePromise = (async () => {
+      let closeError;
+      if (this.listenPromise) {
+        await this.listenPromise;
+      }
+      try {
+        if (this.listening) {
+          for (const topic of new Set([this.eventTopic, this.messageTopic, this.responseTopic])) {
+            try {
+              await this.options.consumer.unsubscribe(topic);
+            } catch (error) {
+              closeError ??= error;
+            }
           }
         }
+      } finally {
+        this.handler = undefined;
+        this.listening = false;
+        for (const pending of [...this.pending.values()]) {
+          pending.reject(new Error('Kafka microservice transport closed before response.'));
+        }
       }
-    } finally {
-      this.handler = undefined;
-      this.listening = false;
-      for (const pending of [...this.pending.values()]) {
-        pending.reject(new Error('Kafka microservice transport closed before response.'));
+      if (closeError) {
+        throw closeError;
       }
-    }
-    if (closeError) {
-      throw closeError;
+    })();
+    try {
+      await this.closePromise;
+    } finally {
+      this.closePromise = undefined;
     }
   }
   async handleInboundEvent(rawMessage) {
@@ -223,19 +241,14 @@ export class KafkaMicroserviceTransport {
       return;
     }
     const replyTopic = message.replyTopic && message.replyTopic.length > 0 ? message.replyTopic : this.responseTopic;
+    let payload;
     try {
-      const payload = await this.handler({
+      payload = await this.handler({
         kind: 'message',
         pattern: message.pattern,
         payload: message.payload,
         requestId: message.requestId
       });
-      await this.options.producer.publish(replyTopic, JSON.stringify({
-        kind: 'response',
-        pattern: message.pattern,
-        payload,
-        requestId: message.requestId
-      }));
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : 'Unhandled microservice error';
       await this.options.producer.publish(replyTopic, JSON.stringify({
@@ -244,7 +257,14 @@ export class KafkaMicroserviceTransport {
         pattern: message.pattern,
         requestId: message.requestId
       }));
+      return;
     }
+    await this.options.producer.publish(replyTopic, JSON.stringify({
+      kind: 'response',
+      pattern: message.pattern,
+      payload,
+      requestId: message.requestId
+    }));
   }
   async handleInboundResponse(rawMessage) {
     const message = this.parseMessage(rawMessage);

package/dist/transports/mqtt-transport.d.ts

@@ -53,9 +53,12 @@ export interface MqttMicroserviceTransportOptions {
 export declare class MqttMicroserviceTransport implements MicroserviceTransport {
     private readonly options;
     private client;
+    private closePromise;
     private closing;
     private handler;
     private readonly internallyOwnedClient;
+    /** Indicates whether MQTT owns the client instance it resolves and closes. */
+    readonly ownsResources: boolean;
     private logger;
     private listening;
     private listenPromise;
@@ -118,6 +121,7 @@ export declare class MqttMicroserviceTransport implements MicroserviceTransport
     private subscribeTopic;
     private unsubscribeTopic;
     private endClient;
+    private disposeOwnedClientAfterListenFailure;
     private logEventHandlerFailure;
 }
 export {};

package/dist/transports/mqtt-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mqtt-transport.d.ts","sourceRoot":"","sources":["../../src/transports/mqtt-transport.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mqtt-transport.d.ts","sourceRoot":"","sources":["../../src/transports/mqtt-transport.ts"],"names":[],"mappings":"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"}

package/dist/transports/mqtt-transport.js

@@ -15,9 +15,12 @@ const mqttKinds = {
  */
 export class MqttMicroserviceTransport {
   client;
+  closePromise;
   closing = false;
   handler;
   internallyOwnedClient;
+  /** Indicates whether MQTT owns the client instance it resolves and closes. */
+  ownsResources;
   logger;
   listening = false;
   listenPromise;
@@ -56,6 +59,7 @@ export class MqttMicroserviceTransport {
     this.requestTimeoutMs = options.requestTimeoutMs ?? 3_000;
     this.client = options.client;
     this.internallyOwnedClient = !options.client;
+    this.ownsResources = this.internallyOwnedClient;
   }
   setLogger(logger) {
     this.logger = logger;
@@ -68,7 +72,12 @@ export class MqttMicroserviceTransport {
    * @returns A promise that resolves once all subscriptions are active.
    */
   async listen(handler) {
-    this.closing = false;
+    if (this.closing) {
+      if (this.closePromise) {
+        throw new Error('MqttMicroserviceTransport is closing. Wait for close() to complete before listen().');
+      }
+      this.closing = false;
+    }
     this.handler = handler;
     if (this.listening) {
       return;
@@ -93,6 +102,9 @@ export class MqttMicroserviceTransport {
           await this.unsubscribeTopic(client, topic).catch(() => undefined);
         }
         client.off?.('message', this.messageListener);
+        this.handler = undefined;
+        this.listening = false;
+        await this.disposeOwnedClientAfterListenFailure(client);
         throw error;
       }
       this.listening = true;
@@ -175,11 +187,29 @@ export class MqttMicroserviceTransport {
         });
       }
       void Promise.resolve().then(async () => {
+        if (!this.pending.has(requestId)) {
+          return;
+        }
+        if (signal?.aborted) {
+          entry.reject(new Error('MQTT request aborted before publish.'));
+          return;
+        }
         if (this.closing) {
           entry.reject(new Error('MQTT microservice transport closed before response.'));
           return;
         }
         const client = await this.resolveClient();
+        if (!this.pending.has(requestId)) {
+          return;
+        }
+        if (signal?.aborted) {
+          entry.reject(new Error('MQTT request aborted before publish.'));
+          return;
+        }
+        if (this.closing) {
+          entry.reject(new Error('MQTT microservice transport closed before response.'));
+          return;
+        }
         await this.publish(client, this.messageTopic, frame, {
           qos: this.messageQos,
           retain: this.messageRetain
@@ -219,44 +249,59 @@ export class MqttMicroserviceTransport {
    * @returns A promise that resolves once shutdown cleanup completes.
    */
   async close() {
-    this.closing = true;
-    let closeError;
-    if (this.listenPromise) {
-      await this.listenPromise;
+    if (this.closePromise) {
+      await this.closePromise;
+      return;
     }
-    try {
-      const client = this.client;
-      if (client && this.listening) {
-        for (const topic of [this.eventTopic, this.messageTopic, this.replyTopic]) {
-          try {
-            await this.unsubscribeTopic(client, topic);
-          } catch (error) {
-            closeError ??= error;
-          }
+    this.closing = true;
+    this.closePromise = (async () => {
+      let closeError;
+      if (this.listenPromise) {
+        try {
+          await this.listenPromise;
+        } catch (error) {
+          closeError = error;
         }
       }
-      if (client) {
-        client.off?.('message', this.messageListener);
-        if (this.internallyOwnedClient) {
-          try {
-            await this.endClient(client);
-          } catch (error) {
-            closeError ??= error;
+      try {
+        const client = this.client;
+        if (client && this.listening) {
+          for (const topic of [this.eventTopic, this.messageTopic, this.replyTopic]) {
+            try {
+              await this.unsubscribeTopic(client, topic);
+            } catch (error) {
+              closeError ??= error;
+            }
           }
         }
+        if (client) {
+          client.off?.('message', this.messageListener);
+          if (this.internallyOwnedClient) {
+            try {
+              await this.endClient(client);
+            } catch (error) {
+              closeError ??= error;
+            }
+          }
+        }
+      } finally {
+        this.handler = undefined;
+        this.listening = false;
+        if (this.internallyOwnedClient) {
+          this.client = undefined;
+        }
+        for (const pending of [...this.pending.values()]) {
+          pending.reject(new Error('MQTT microservice transport closed before response.'));
+        }
       }
-    } finally {
-      this.handler = undefined;
-      this.listening = false;
-      if (this.internallyOwnedClient) {
-        this.client = undefined;
-      }
-      for (const pending of [...this.pending.values()]) {
-        pending.reject(new Error('MQTT microservice transport closed before response.'));
+      if (closeError) {
+        throw closeError;
       }
-    }
-    if (closeError) {
-      throw closeError;
+    })();
+    try {
+      await this.closePromise;
+    } finally {
+      this.closePromise = undefined;
     }
   }
   async handleInbound(topic, rawMessage) {
@@ -419,6 +464,20 @@ export class MqttMicroserviceTransport {
       });
     });
   }
+  async disposeOwnedClientAfterListenFailure(client) {
+    if (!this.internallyOwnedClient) {
+      return;
+    }
+    try {
+      await this.endClient(client);
+    } catch {
+      // Preserve the original startup failure for callers; shutdown errors are best-effort here.
+    } finally {
+      if (this.client === client) {
+        this.client = undefined;
+      }
+    }
+  }
   logEventHandlerFailure(error) {
     logTransportEventHandlerFailure(this.logger, 'MqttMicroserviceTransport', error);
   }

package/dist/transports/nats-transport.d.ts

@@ -35,6 +35,7 @@ export interface NatsMicroserviceTransportOptions {
  */
 export declare class NatsMicroserviceTransport implements MicroserviceTransport {
     private readonly options;
+    private closePromise;
     private closing;
     private handler;
     private logger;

package/dist/transports/nats-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nats-transport.d.ts","sourceRoot":"","sources":["../../src/transports/nats-transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGxG,UAAU,eAAe;IACvB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,OAAO,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;CACjC;AAED,UAAU,aAAa;IACrB,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAAC;IACjC,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAAC;CACnC;AAED,UAAU,oBAAoB;IAC5B,WAAW,IAAI,IAAI,CAAC;CACrB;AAED,UAAU,QAAQ;IAChB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CAAC;IACpD,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,UAAU,CAAA;KAAE,CAAC,CAAC;IAC7G,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,GAAG,oBAAoB,CAAC;CAC/F;AAED,+DAA+D;AAC/D,MAAM,WAAW,gCAAgC;IAC/C,MAAM,EAAE,QAAQ,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAkBD;;;;;GAKG;AACH,qBAAa,yBAA0B,YAAW,qBAAqB;IA0BzD,OAAO,CAAC,QAAQ,CAAC,OAAO;IAzBpC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,OAAO,CAA+B;IAC9C,OAAO,CAAC,MAAM,CAA0C;IACxD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqC;IAC7D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,aAAa,CAA8B;IAEnD,OAAO,CAAC,sBAAsB;IAI9B,OAAO,CAAC,wBAAwB;IAMhC;;;;OAIG;gBAC0B,OAAO,EAAE,gCAAgC;IAMtE,SAAS,CAAC,MAAM,EAAE,2BAA2B,GAAG,IAAI;IAIpD;;;;;OAKG;IACG,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBtD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IA+FrF;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAc5D;;;;OAIG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YA0Bd,kBAAkB;YAsBlB,oBAAoB;IAwBlC,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,MAAM;CAGf"}
+{"version":3,"file":"nats-transport.d.ts","sourceRoot":"","sources":["../../src/transports/nats-transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGxG,UAAU,eAAe;IACvB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,OAAO,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;CACjC;AAED,UAAU,aAAa;IACrB,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAAC;IACjC,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAAC;CACnC;AAED,UAAU,oBAAoB;IAC5B,WAAW,IAAI,IAAI,CAAC;CACrB;AAED,UAAU,QAAQ;IAChB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CAAC;IACpD,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,UAAU,CAAA;KAAE,CAAC,CAAC;IAC7G,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,GAAG,oBAAoB,CAAC;CAC/F;AAED,+DAA+D;AAC/D,MAAM,WAAW,gCAAgC;IAC/C,MAAM,EAAE,QAAQ,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAkBD;;;;;GAKG;AACH,qBAAa,yBAA0B,YAAW,qBAAqB;IA2BzD,OAAO,CAAC,QAAQ,CAAC,OAAO;IA1BpC,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,OAAO,CAA+B;IAC9C,OAAO,CAAC,MAAM,CAA0C;IACxD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqC;IAC7D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,aAAa,CAA8B;IAEnD,OAAO,CAAC,sBAAsB;IAI9B,OAAO,CAAC,wBAAwB;IAMhC;;;;OAIG;gBAC0B,OAAO,EAAE,gCAAgC;IAMtE,SAAS,CAAC,MAAM,EAAE,2BAA2B,GAAG,IAAI;IAIpD;;;;;OAKG;IACG,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwCtD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IA+FrF;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAc5D;;;;OAIG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAuCd,kBAAkB;YAsBlB,oBAAoB;IAwBlC,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,MAAM;CAGf"}

package/dist/transports/nats-transport.js

@@ -9,6 +9,7 @@ import { logTransportEventHandlerFailure } from './event-handler-logger.js';
  * preserving JSON framing and NATS request timeout behavior.
  */
 export class NatsMicroserviceTransport {
+  closePromise;
   closing = false;
   handler;
   logger;
@@ -49,18 +50,36 @@ export class NatsMicroserviceTransport {
    * @returns A promise that resolves once subscriptions are active.
    */
   async listen(handler) {
-    this.closing = false;
+    if (this.closing) {
+      if (this.closePromise) {
+        throw new Error('NATS microservice transport is closing. Wait for close() to complete before listen().');
+      }
+      this.closing = false;
+    }
     this.handler = handler;
     if (this.listening) {
       return;
     }
-    const eventSubscription = this.options.client.subscribe(this.eventSubject, message => {
-      this.handleEventMessageSafely(message);
-    });
-    const messageSubscription = this.options.client.subscribe(this.messageSubject, message => {
-      void this.handleRequestMessage(message);
-    });
-    this.subscriptions = [eventSubscription, messageSubscription];
+    try {
+      this.subscriptions.push(this.options.client.subscribe(this.eventSubject, message => {
+        this.handleEventMessageSafely(message);
+      }));
+      this.subscriptions.push(this.options.client.subscribe(this.messageSubject, message => {
+        void this.handleRequestMessage(message);
+      }));
+    } catch (error) {
+      for (const subscription of this.subscriptions.reverse()) {
+        try {
+          subscription.unsubscribe();
+        } catch {
+          // Preserve the original subscription failure; partial setup cleanup is best-effort.
+        }
+      }
+      this.subscriptions = [];
+      this.handler = undefined;
+      this.listening = false;
+      throw error;
+    }
     this.listening = true;
   }
 
@@ -173,24 +192,35 @@ export class NatsMicroserviceTransport {
    * @returns A promise that resolves once shutdown cleanup completes.
    */
   async close() {
+    if (this.closePromise) {
+      await this.closePromise;
+      return;
+    }
     this.closing = true;
-    let closeError;
-    try {
-      for (const subscription of this.subscriptions) {
-        subscription.unsubscribe();
+    this.closePromise = (async () => {
+      let closeError;
+      try {
+        for (const subscription of this.subscriptions) {
+          subscription.unsubscribe();
+        }
+      } catch (error) {
+        closeError = error;
+      } finally {
+        this.subscriptions = [];
+        this.listening = false;
+        this.handler = undefined;
+        for (const pending of [...this.pending.values()]) {
+          pending.reject(new Error('NATS microservice transport closed before response.'));
+        }
       }
-    } catch (error) {
-      closeError = error;
-    } finally {
-      this.subscriptions = [];
-      this.listening = false;
-      this.handler = undefined;
-      for (const pending of [...this.pending.values()]) {
-        pending.reject(new Error('NATS microservice transport closed before response.'));
+      if (closeError) {
+        throw closeError;
       }
-    }
-    if (closeError) {
-      throw closeError;
+    })();
+    try {
+      await this.closePromise;
+    } finally {
+      this.closePromise = undefined;
     }
   }
   async handleEventMessage(message) {

package/dist/transports/rabbitmq-transport.d.ts

@@ -23,6 +23,7 @@ export interface RabbitMqMicroserviceTransportOptions {
  */
 export declare class RabbitMqMicroserviceTransport implements MicroserviceTransport {
     private readonly options;
+    private closePromise;
     private closing;
     private handler;
     private listening;

package/dist/transports/rabbitmq-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rabbitmq-transport.d.ts","sourceRoot":"","sources":["../../src/transports/rabbitmq-transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE3E,UAAU,oBAAoB;IAC5B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1F,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC;AAED,UAAU,qBAAqB;IAC7B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxD;AAWD,mEAAmE;AACnE,MAAM,WAAW,oCAAoC;IACnD,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,qBAAqB,CAAC;IACjC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;GAKG;AACH,qBAAa,6BAA8B,YAAW,qBAAqB;IAqB7D,OAAO,CAAC,QAAQ,CAAC,OAAO;IApBpC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,OAAO,CAA+B;IAC9C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,aAAa,CAA4B;IACjD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAInB;IACL,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqB;IAEtD;;;;OAIG;gBAC0B,OAAO,EAAE,oCAAoC;IAO1E;;;;;OAKG;IACG,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IA4CtD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IA6GrF;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAc5D;;;;OAIG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YA8Bd,oBAAoB;YAiCpB,aAAa;IAmC3B,OAAO,CAAC,cAAc;IAqBtB,OAAO,CAAC,qBAAqB;CAO9B"}
+{"version":3,"file":"rabbitmq-transport.d.ts","sourceRoot":"","sources":["../../src/transports/rabbitmq-transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE3E,UAAU,oBAAoB;IAC5B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1F,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC;AAED,UAAU,qBAAqB;IAC7B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxD;AAWD,mEAAmE;AACnE,MAAM,WAAW,oCAAoC;IACnD,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,qBAAqB,CAAC;IACjC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;GAKG;AACH,qBAAa,6BAA8B,YAAW,qBAAqB;IAsB7D,OAAO,CAAC,QAAQ,CAAC,OAAO;IArBpC,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,OAAO,CAA+B;IAC9C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,aAAa,CAA4B;IACjD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAInB;IACL,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqB;IAEtD;;;;OAIG;gBAC0B,OAAO,EAAE,oCAAoC;IAO1E;;;;;OAKG;IACG,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDtD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IA6GrF;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAc5D;;;;OAIG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAoDd,oBAAoB;YAiCpB,aAAa;IAsC3B,OAAO,CAAC,cAAc;IAqBtB,OAAO,CAAC,qBAAqB;CAO9B"}

package/dist/transports/rabbitmq-transport.js

@@ -7,6 +7,7 @@
  * a queue-oriented topology while still consuming the generic Fluo transport API.
  */
 export class RabbitMqMicroserviceTransport {
+  closePromise;
   closing = false;
   handler;
   listening = false;
@@ -38,7 +39,12 @@ export class RabbitMqMicroserviceTransport {
    * @returns A promise that resolves once queue consumers are registered.
    */
   async listen(handler) {
-    this.closing = false;
+    if (this.closing) {
+      if (this.closePromise) {
+        throw new Error('RabbitMqMicroserviceTransport is closing. Wait for close() to complete before listen().');
+      }
+      this.closing = false;
+    }
     this.handler = handler;
     if (this.listening) {
       return;
@@ -51,9 +57,7 @@ export class RabbitMqMicroserviceTransport {
       const queues = new Set([this.eventQueue, this.messageQueue, this.responseQueue]);
       try {
         for (const queue of queues) {
-          await this.options.consumer.consume(queue, message => {
-            void this.handleInboundMessage(message).catch(() => undefined);
-          });
+          await this.options.consumer.consume(queue, message => this.handleInboundMessage(message));
           this.subscribedQueues.add(queue);
         }
       } catch (error) {
@@ -200,29 +204,48 @@ export class RabbitMqMicroserviceTransport {
    * @returns A promise that resolves once shutdown cleanup completes.
    */
   async close() {
-    this.closing = true;
-    let closeError;
-    if (this.listenPromise) {
-      await this.listenPromise;
+    if (this.closePromise) {
+      await this.closePromise;
+      return;
     }
-    try {
-      if (this.listening) {
-        for (const queue of this.subscribedQueues) {
-          try {
-            await this.options.consumer.cancel(queue);
-          } catch (error) {
-            closeError ??= error;
+    this.closing = true;
+    this.closePromise = (async () => {
+      let closeError;
+      let listenError;
+      if (this.listenPromise) {
+        try {
+          await this.listenPromise;
+        } catch (error) {
+          listenError = error;
+        }
+      }
+      try {
+        if (this.listening) {
+          for (const queue of this.subscribedQueues) {
+            try {
+              await this.options.consumer.cancel(queue);
+            } catch (error) {
+              closeError ??= error;
+            }
           }
         }
+      } finally {
+        this.subscribedQueues.clear();
+        this.rejectPendingRequests(new Error('RabbitMQ microservice transport closed before response.'));
+        this.listening = false;
+        this.handler = undefined;
+      }
+      if (listenError) {
+        throw listenError;
       }
+      if (closeError) {
+        throw closeError;
+      }
+    })();
+    try {
+      await this.closePromise;
     } finally {
-      this.subscribedQueues.clear();
-      this.rejectPendingRequests(new Error('RabbitMQ microservice transport closed before response.'));
-      this.listening = false;
-      this.handler = undefined;
-    }
-    if (closeError) {
-      throw closeError;
+      this.closePromise = undefined;
     }
   }
   async handleInboundMessage(rawMessage) {
@@ -256,19 +279,14 @@ export class RabbitMqMicroserviceTransport {
       return;
     }
     const replyQueue = typeof message.replyTo === 'string' && message.replyTo.length > 0 ? message.replyTo : this.responseQueue;
+    let payload;
     try {
-      const payload = await this.handler({
+      payload = await this.handler({
         kind: 'message',
         pattern: message.pattern,
         payload: message.payload,
         requestId: message.requestId
       });
-      await this.options.publisher.publish(replyQueue, JSON.stringify({
-        kind: 'response',
-        pattern: message.pattern,
-        payload,
-        requestId: message.requestId
-      }));
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : 'Unhandled microservice error';
       await this.options.publisher.publish(replyQueue, JSON.stringify({
@@ -277,7 +295,14 @@ export class RabbitMqMicroserviceTransport {
         pattern: message.pattern,
         requestId: message.requestId
       }));
+      return;
     }
+    await this.options.publisher.publish(replyQueue, JSON.stringify({
+      kind: 'response',
+      pattern: message.pattern,
+      payload,
+      requestId: message.requestId
+    }));
   }
   handleResponse(message) {
     if (!message.requestId) {