@fluojs/microservices 1.0.5 → 2.0.0

package/dist/transports/grpc-transport.js

@@ -16,8 +16,10 @@ const grpcKinds = {
  * and exposes matching unary/server-stream/client-stream/bidi-stream client calls through one transport surface.
  */
 export class GrpcMicroserviceTransport {
-  /** Indicates whether gRPC owns server shutdown in addition to cached client cleanup. */
-  ownsResources;
+  /** Indicates that gRPC closes the cached outbound clients it creates. */
+  ownsResources = true;
+  /** Reports server and cached outbound client ownership independently. */
+  resourceOwnership;
   bidiStreamHandler;
   clientStreamHandler;
   closePromise;
@@ -46,7 +48,10 @@ export class GrpcMicroserviceTransport {
     this.requestTimeoutMs = options.requestTimeoutMs ?? 3_000;
     this.server = options.server;
     this.ownsServer = !options.server;
-    this.ownsResources = this.ownsServer;
+    this.resourceOwnership = {
+      outboundClients: 'framework',
+      server: this.ownsServer ? 'framework' : 'caller'
+    };
   }
   setLogger(logger) {
     this.logger = logger;
@@ -553,6 +558,8 @@ export class GrpcMicroserviceTransport {
     let ended = false;
     let cleanupAbortListener;
     let settled = false;
+    let writerError;
+    let rejectResult;
     const cleanup = () => {
       cleanupAbortListener?.();
       cleanupAbortListener = undefined;
@@ -563,6 +570,7 @@ export class GrpcMicroserviceTransport {
         reject(new Error('gRPC client stream aborted before dispatch.'));
         return;
       }
+      rejectResult = reject;
       const settle = complete => {
         if (settled) {
           return;
@@ -572,6 +580,12 @@ export class GrpcMicroserviceTransport {
         complete();
       };
       callStream = method.call(runtime.client, metadata, (error, response) => {
+        // A local writer.error() failure is the authoritative cause: the transport-level
+        // status that follows an aborted call would otherwise mask it.
+        if (writerError) {
+          settle(() => reject(writerError));
+          return;
+        }
         if (error) {
           if (signal?.aborted) {
             settle(() => reject(new Error('gRPC client stream aborted.')));
@@ -615,10 +629,19 @@ export class GrpcMicroserviceTransport {
         }
       },
       error(err) {
-        void err;
-        if (!ended) {
-          ended = true;
-          callStream?.end();
+        if (ended) {
+          return;
+        }
+        ended = true;
+        writerError = err;
+        abortClientStreamCall(callStream, err);
+
+        // Runtimes without cancel()/destroy() cannot abort the call, so settle locally
+        // instead of leaving the caller with a silently successful stream.
+        if (!settled) {
+          settled = true;
+          cleanup();
+          rejectResult?.(err);
         }
       }
     };
@@ -637,6 +660,9 @@ export class GrpcMicroserviceTransport {
     const duplexStream = method.call(runtime.client, metadata);
     let writerEnded = false;
     let cleanupAbortListener;
+    const localFailure = {
+      error: undefined
+    };
     if (signal) {
       if (signal.aborted) {
         duplexStream.cancel?.();
@@ -656,6 +682,7 @@ export class GrpcMicroserviceTransport {
     }
     const reader = grpcReadableToAsyncIterable(duplexStream, {
       externalAbortCleanup: cleanupAbortListener,
+      localFailure,
       signal
     });
     const writer = {
@@ -671,11 +698,14 @@ export class GrpcMicroserviceTransport {
         }
       },
       error(err) {
-        void err;
-        if (!writerEnded) {
-          writerEnded = true;
-          duplexStream.end();
+        if (writerEnded) {
+          return;
         }
+        writerEnded = true;
+        // Recorded before cancelation so the reader reports the caller's cause rather than
+        // the CANCELLED status the aborted call raises.
+        localFailure.error = err;
+        abortDuplexStreamCall(duplexStream, err);
       }
     };
     return {
@@ -948,7 +978,7 @@ function grpcReadableToAsyncIterable(stream, options = {}) {
     }
   });
   stream.on('error', err => {
-    const streamError = signal?.aborted ? new Error(abortErrorMessage) : err;
+    const streamError = options.localFailure?.error ?? (signal?.aborted ? new Error(abortErrorMessage) : err);
     if (!finish()) {
       return;
     }
@@ -1009,6 +1039,41 @@ function grpcReadableToAsyncIterable(stream, options = {}) {
     }
   };
 }
+
+/**
+ * Aborts an outbound client-streaming call so the peer observes a failure instead of a clean EOF.
+ *
+ * `destroy(err)` is preferred because it carries the cause; `cancel()` is the grpc-js fallback.
+ */
+function abortClientStreamCall(stream, err) {
+  if (!stream) {
+    return;
+  }
+  if (stream.destroy) {
+    stream.destroy(err);
+    return;
+  }
+  if (stream.cancel) {
+    stream.cancel();
+    return;
+  }
+  stream.end();
+}
+
+/**
+ * Aborts an outbound bidirectional-streaming call so the peer observes a failure instead of a clean EOF.
+ */
+function abortDuplexStreamCall(stream, err) {
+  if (stream.destroy) {
+    stream.destroy(err);
+    return;
+  }
+  if (stream.cancel) {
+    stream.cancel();
+    return;
+  }
+  stream.end();
+}
 function parseGrpcPattern(pattern) {
   const segments = pattern.split('.');
   if (segments.length !== 2 || segments[0]?.length === 0 || segments[1]?.length === 0) {

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

@@ -1,4 +1,4 @@
-import type { MicroserviceTransport, TransportHandler } from '../types.js';
+import type { MicroserviceTransport, MicroserviceTransportLogger, TransportHandler } from '../types.js';
 interface KafkaConsumerLike {
     subscribe(topic: string, handler: (message: string) => Promise<void> | void): Promise<void>;
     unsubscribe(topic: string): Promise<void>;
@@ -28,11 +28,19 @@ export declare class KafkaMicroserviceTransport implements MicroserviceTransport
     private handler;
     private listening;
     private listenPromise;
+    private logger;
     private readonly eventTopic;
     private readonly messageTopic;
     private readonly pending;
     private readonly requestTimeoutMs;
     private readonly responseTopic;
+    private logEventHandlerFailure;
+    /**
+     * Registers the runtime logger that receives inbound event handler failures.
+     *
+     * @param logger Logger used to report event handler failures.
+     */
+    setLogger(logger: MicroserviceTransportLogger): void;
     /**
      * Creates a Kafka transport with explicit producer and consumer collaborators.
      *

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

@@ -1 +1 @@
-{"version":3,"file":"kafka-transport.d.ts","sourceRoot":"","sources":["../../src/transports/kafka-transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE3E,UAAU,iBAAiB;IACzB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5F,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3C;AAED,UAAU,iBAAiB;IACzB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxD;AAgBD,gEAAgE;AAChE,MAAM,WAAW,iCAAiC;IAChD,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;GAKG;AACH,qBAAa,0BAA2B,YAAW,qBAAqB;IAiB1D,OAAO,CAAC,QAAQ,CAAC,OAAO;IAhBpC,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,CAAqC;IAC7D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC;;;;OAIG;gBAC0B,OAAO,EAAE,iCAAiC;IAOvE;;;;;OAKG;IACG,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkDtD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAsFrF;;;;;;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;YA6Cd,kBAAkB;YAkBlB,oBAAoB;YA2CpB,qBAAqB;IAqBnC,OAAO,CAAC,YAAY;CAqCrB"}
+{"version":3,"file":"kafka-transport.d.ts","sourceRoot":"","sources":["../../src/transports/kafka-transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGxG,UAAU,iBAAiB;IACzB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5F,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3C;AAED,UAAU,iBAAiB;IACzB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxD;AAgBD,gEAAgE;AAChE,MAAM,WAAW,iCAAiC;IAChD,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;GAKG;AACH,qBAAa,0BAA2B,YAAW,qBAAqB;IAmC1D,OAAO,CAAC,QAAQ,CAAC,OAAO;IAlCpC,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,MAAM,CAA0C;IACxD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqC;IAC7D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC,OAAO,CAAC,sBAAsB;IAQ9B;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,2BAA2B,GAAG,IAAI;IAIpD;;;;OAIG;gBAC0B,OAAO,EAAE,iCAAiC;IAOvE;;;;;OAKG;IACG,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkDtD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAsFrF;;;;;;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;YA6Cd,kBAAkB;YAuBlB,oBAAoB;YA2CpB,qBAAqB;IAqBnC,OAAO,CAAC,YAAY;CAqCrB"}

package/dist/transports/kafka-transport.js

@@ -1,3 +1,5 @@
+import { logTransportEventHandlerFailure } from './event-handler-logger.js';
+
 /** Options for configuring the Kafka microservice transport. */
 
 /**
@@ -12,11 +14,28 @@ export class KafkaMicroserviceTransport {
   handler;
   listening = false;
   listenPromise;
+  logger;
   eventTopic;
   messageTopic;
   pending = new Map();
   requestTimeoutMs;
   responseTopic;
+  logEventHandlerFailure(error) {
+    try {
+      logTransportEventHandlerFailure(this.logger, 'KafkaMicroserviceTransport', error);
+    } catch {
+      // A failing logger must not mask the event failure the broker still has to observe.
+    }
+  }
+
+  /**
+   * Registers the runtime logger that receives inbound event handler failures.
+   *
+   * @param logger Logger used to report event handler failures.
+   */
+  setLogger(logger) {
+    this.logger = logger;
+  }
 
   /**
    * Creates a Kafka transport with explicit producer and consumer collaborators.
@@ -226,11 +245,16 @@ export class KafkaMicroserviceTransport {
     if (!message || message.kind !== 'event') {
       return;
     }
-    await this.handler({
-      kind: 'event',
-      pattern: message.pattern,
-      payload: message.payload
-    });
+    try {
+      await this.handler({
+        kind: 'event',
+        pattern: message.pattern,
+        payload: message.payload
+      });
+    } catch (error) {
+      this.logEventHandlerFailure(error);
+      throw error;
+    }
   }
   async handleInboundRequest(rawMessage) {
     if (!this.handler) {

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

@@ -47,6 +47,8 @@ export declare class NatsMicroserviceTransport implements MicroserviceTransport
     private subscriptions;
     private logEventHandlerFailure;
     private handleEventMessageSafely;
+    private handleRequestMessageSafely;
+    private logRequestCallbackFailure;
     /**
      * Creates a NATS transport using a client and codec supplied by the application.
      *

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;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"}
+{"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;IA+CzD,OAAO,CAAC,QAAQ,CAAC,OAAO;IA9CpC,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,OAAO,CAAC,0BAA0B;IAMlC,OAAO,CAAC,yBAAyB;IAcjC;;;;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;IA4CtD;;;;;;;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;YA+Cd,kBAAkB;YAsBlB,oBAAoB;IA8BlC,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,MAAM;CAGf"}

package/dist/transports/nats-transport.js

@@ -27,6 +27,22 @@ export class NatsMicroserviceTransport {
       this.logEventHandlerFailure(error);
     });
   }
+  handleRequestMessageSafely(message) {
+    void this.handleRequestMessage(message).catch(error => {
+      this.logRequestCallbackFailure(error);
+    });
+  }
+  logRequestCallbackFailure(error) {
+    const logger = this.logger;
+    if (!logger) {
+      return;
+    }
+    try {
+      logger.error('Request callback failed.', error, 'NatsMicroserviceTransport');
+    } catch (loggerError) {
+      void loggerError;
+    }
+  }
 
   /**
    * Creates a NATS transport using a client and codec supplied by the application.
@@ -54,6 +70,9 @@ export class NatsMicroserviceTransport {
       if (this.closePromise) {
         throw new Error('NATS microservice transport is closing. Wait for close() to complete before listen().');
       }
+      if (this.subscriptions.length > 0) {
+        throw new Error('NATS subscription cleanup is incomplete. Call close() again before listen().');
+      }
       this.closing = false;
     }
     this.handler = handler;
@@ -65,7 +84,7 @@ export class NatsMicroserviceTransport {
         this.handleEventMessageSafely(message);
       }));
       this.subscriptions.push(this.options.client.subscribe(this.messageSubject, message => {
-        void this.handleRequestMessage(message);
+        this.handleRequestMessageSafely(message);
       }));
     } catch (error) {
       for (const subscription of this.subscriptions.reverse()) {
@@ -198,23 +217,27 @@ export class NatsMicroserviceTransport {
     }
     this.closing = true;
     this.closePromise = (async () => {
-      let closeError;
-      try {
-        for (const subscription of this.subscriptions) {
+      const cleanupErrors = [];
+      const retainedSubscriptions = [];
+      for (const subscription of this.subscriptions) {
+        try {
           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) {
+          cleanupErrors.push(error);
+          retainedSubscriptions.push(subscription);
         }
       }
-      if (closeError) {
-        throw closeError;
+      this.subscriptions = retainedSubscriptions;
+      this.listening = false;
+      this.handler = undefined;
+      for (const pending of [...this.pending.values()]) {
+        pending.reject(new Error('NATS microservice transport closed before response.'));
+      }
+      if (cleanupErrors.length === 1) {
+        throw cleanupErrors[0];
+      }
+      if (cleanupErrors.length > 1) {
+        throw new AggregateError(cleanupErrors, 'NATS subscription cleanup failed for multiple subscriptions.');
       }
     })();
     try {
@@ -249,21 +272,21 @@ export class NatsMicroserviceTransport {
     if (packet.kind !== 'message') {
       return;
     }
+    let response;
     try {
-      const payload = await this.handler({
-        kind: 'message',
-        pattern: packet.pattern,
-        payload: packet.payload
-      });
-      message.respond(this.encode({
-        payload
-      }));
+      response = {
+        payload: await this.handler({
+          kind: 'message',
+          pattern: packet.pattern,
+          payload: packet.payload
+        })
+      };
     } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : 'Unhandled microservice error';
-      message.respond(this.encode({
-        error: errorMessage
-      }));
+      response = {
+        error: error instanceof Error ? error.message : 'Unhandled microservice error'
+      };
     }
+    message.respond(this.encode(response));
   }
   decode(data) {
     return JSON.parse(this.options.codec.decode(data));

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

@@ -1,4 +1,4 @@
-import type { MicroserviceTransport, TransportHandler } from '../types.js';
+import type { MicroserviceTransport, MicroserviceTransportLogger, TransportHandler } from '../types.js';
 interface RabbitMqConsumerLike {
     consume(queue: string, handler: (message: string) => Promise<void> | void): Promise<void>;
     cancel(queue: string): Promise<void>;
@@ -28,12 +28,20 @@ export declare class RabbitMqMicroserviceTransport implements MicroserviceTransp
     private handler;
     private listening;
     private listenPromise;
+    private logger;
     private readonly eventQueue;
     private readonly messageQueue;
     private readonly pending;
     private readonly requestTimeoutMs;
     private readonly responseQueue;
     private readonly subscribedQueues;
+    private logEventHandlerFailure;
+    /**
+     * Registers the runtime logger that receives inbound event handler failures.
+     *
+     * @param logger Logger used to report event handler failures.
+     */
+    setLogger(logger: MicroserviceTransportLogger): void;
     /**
      * Creates a RabbitMQ transport with explicit consumer and publisher collaborators.
      *

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;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"}
+{"version":3,"file":"rabbitmq-transport.d.ts","sourceRoot":"","sources":["../../src/transports/rabbitmq-transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGxG,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;IAwC7D,OAAO,CAAC,QAAQ,CAAC,OAAO;IAvCpC,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,MAAM,CAA0C;IACxD,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,OAAO,CAAC,sBAAsB;IAQ9B;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,2BAA2B,GAAG,IAAI;IAIpD;;;;OAIG;gBAC0B,OAAO,EAAE,oCAAoC;IAO1E;;;;;OAKG;IACG,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqDtD;;;;;;;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;YAkDd,oBAAoB;YAuCpB,aAAa;IAsC3B,OAAO,CAAC,cAAc;IAqBtB,OAAO,CAAC,qBAAqB;CAO9B"}

package/dist/transports/rabbitmq-transport.js

@@ -1,3 +1,5 @@
+import { logTransportEventHandlerFailure } from './event-handler-logger.js';
+
 /** Options for configuring the RabbitMQ microservice transport. */
 
 /**
@@ -12,12 +14,29 @@ export class RabbitMqMicroserviceTransport {
   handler;
   listening = false;
   listenPromise;
+  logger;
   eventQueue;
   messageQueue;
   pending = new Map();
   requestTimeoutMs;
   responseQueue;
   subscribedQueues = new Set();
+  logEventHandlerFailure(error) {
+    try {
+      logTransportEventHandlerFailure(this.logger, 'RabbitMqMicroserviceTransport', error);
+    } catch {
+      // A failing logger must not mask the event failure the broker still has to observe.
+    }
+  }
+
+  /**
+   * Registers the runtime logger that receives inbound event handler failures.
+   *
+   * @param logger Logger used to report event handler failures.
+   */
+  setLogger(logger) {
+    this.logger = logger;
+  }
 
   /**
    * Creates a RabbitMQ transport with explicit consumer and publisher collaborators.
@@ -43,6 +62,9 @@ export class RabbitMqMicroserviceTransport {
       if (this.closePromise) {
         throw new Error('RabbitMqMicroserviceTransport is closing. Wait for close() to complete before listen().');
       }
+      if (this.subscribedQueues.size > 0) {
+        throw new Error('RabbitMQ consumer cleanup is incomplete. Call close() again before listen().');
+      }
       this.closing = false;
     }
     this.handler = handler;
@@ -220,17 +242,15 @@ export class RabbitMqMicroserviceTransport {
         }
       }
       try {
-        if (this.listening) {
-          for (const queue of this.subscribedQueues) {
-            try {
-              await this.options.consumer.cancel(queue);
-            } catch (error) {
-              closeError ??= error;
-            }
+        for (const queue of [...this.subscribedQueues]) {
+          try {
+            await this.options.consumer.cancel(queue);
+            this.subscribedQueues.delete(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;
@@ -263,11 +283,16 @@ export class RabbitMqMicroserviceTransport {
       return;
     }
     if (message.kind === 'event') {
-      await this.handler({
-        kind: 'event',
-        pattern: message.pattern,
-        payload: message.payload
-      });
+      try {
+        await this.handler({
+          kind: 'event',
+          pattern: message.pattern,
+          payload: message.payload
+        });
+      } catch (error) {
+        this.logEventHandlerFailure(error);
+        throw error;
+      }
       return;
     }
     if (message.kind === 'message' && message.requestId) {

package/dist/transports/redis-streams-transport.d.ts

@@ -15,6 +15,12 @@ export interface RedisStreamClientLike {
         blockMs?: number;
         count?: number;
     }): Promise<readonly StreamReadGroupResult[] | null>;
+    xautoclaim?(stream: string, group: string, consumer: string, minIdleTimeMs: number, startId: string, options?: {
+        count?: number;
+    }): Promise<{
+        readonly entries: readonly StreamReadGroupResult[];
+        readonly nextStartId: string;
+    }>;
     xack(stream: string, group: string, id: string): Promise<void>;
     get?(key: string): Promise<string | null>;
     incr?(key: string): Promise<number>;
@@ -45,6 +51,14 @@ export interface RedisStreamsMicroserviceTransportOptions {
     responseRetentionMaxLen?: number;
     consumerGroup?: string;
     namespace?: string;
+    /**
+     * Minimum pending-entry idle time before `XAUTOCLAIM` recovery in the shared request group
+     * or this listener's instance-scoped event group.
+     *
+     * Defaults to `60_000`; set a non-positive value to disable recovery. The reader client must
+     * implement {@link RedisStreamClientLike.xautoclaim} for recovery to run.
+     */
+    pendingReclaimIdleMs?: number;
     requestTimeoutMs?: number;
     pollBlockMs?: number;
 }
@@ -66,9 +80,12 @@ export declare class RedisStreamsMicroserviceTransport implements MicroserviceTr
     private messageGroupLeaseRegistered;
     private ownsMessageGroup;
     private readonly pending;
+    private readonly pendingReclaimFailureGroups;
+    private readonly pendingReclaimStartIds;
     private pollPromises;
     private readonly namespace;
     private readonly consumerGroup;
+    private readonly pendingReclaimIdleMs;
     private readonly requestTimeoutMs;
     private readonly pollBlockMs;
     private readonly messageRetentionMaxLen;
@@ -115,6 +132,7 @@ export declare class RedisStreamsMicroserviceTransport implements MicroserviceTr
     private registerMessageGroupLease;
     private releaseMessageGroupLease;
     private pollStream;
+    private reclaimPendingEntries;
     private handleStreamEntry;
     private handleInboundRequest;
     private publishFrame;

package/dist/transports/redis-streams-transport.d.ts.map

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

package/dist/transports/redis-streams-transport.js

@@ -29,9 +29,12 @@ export class RedisStreamsMicroserviceTransport {
   messageGroupLeaseRegistered = false;
   ownsMessageGroup = false;
   pending = new Map();
+  pendingReclaimFailureGroups = new Set();
+  pendingReclaimStartIds = new Map();
   pollPromises = [];
   namespace;
   consumerGroup;
+  pendingReclaimIdleMs;
   requestTimeoutMs;
   pollBlockMs;
   messageRetentionMaxLen;
@@ -48,6 +51,7 @@ export class RedisStreamsMicroserviceTransport {
     this.consumerId = crypto.randomUUID();
     this.namespace = options.namespace ?? 'fluo:streams';
     this.consumerGroup = options.consumerGroup ?? 'fluo-handlers';
+    this.pendingReclaimIdleMs = options.pendingReclaimIdleMs ?? 60_000;
     this.requestTimeoutMs = options.requestTimeoutMs ?? 3_000;
     this.pollBlockMs = options.pollBlockMs ?? 500;
     this.messageRetentionMaxLen = options.messageRetentionMaxLen;
@@ -264,6 +268,8 @@ export class RedisStreamsMicroserviceTransport {
         this.handler = undefined;
         this.messageGroupLeaseRegistered = false;
         this.ownsMessageGroup = false;
+        this.pendingReclaimFailureGroups.clear();
+        this.pendingReclaimStartIds.clear();
         this.pollPromises = [];
         for (const pending of [...this.pending.values()]) {
           pending.reject(new Error('Redis Streams microservice transport closed before response.'));
@@ -342,7 +348,8 @@ export class RedisStreamsMicroserviceTransport {
   async pollStream(stream, group) {
     while (!this.closing) {
       try {
-        const entries = await this.options.readerClient.xreadgroup(group, this.consumerId, [stream], {
+        const reclaimedEntries = await this.reclaimPendingEntries(stream, group);
+        const entries = reclaimedEntries.length > 0 ? reclaimedEntries : await this.options.readerClient.xreadgroup(group, this.consumerId, [stream], {
           blockMs: this.pollBlockMs,
           count: 10
         });
@@ -369,6 +376,29 @@ export class RedisStreamsMicroserviceTransport {
       }
     }
   }
+  async reclaimPendingEntries(stream, group) {
+    const {
+      readerClient
+    } = this.options;
+    if (stream === this.responseStream || this.pendingReclaimIdleMs <= 0 || !readerClient.xautoclaim) {
+      return [];
+    }
+    const groupKey = `${stream}::${group}`;
+    try {
+      const result = await readerClient.xautoclaim(stream, group, this.consumerId, this.pendingReclaimIdleMs, this.pendingReclaimStartIds.get(groupKey) ?? '0-0', {
+        count: 10
+      });
+      this.pendingReclaimFailureGroups.delete(groupKey);
+      this.pendingReclaimStartIds.set(groupKey, result.nextStartId);
+      return result.entries;
+    } catch (error) {
+      if (!this.pendingReclaimFailureGroups.has(groupKey)) {
+        this.logger?.error('Redis Streams pending reclaim failed; continuing normal consumption.', error, 'RedisStreamsMicroserviceTransport');
+        this.pendingReclaimFailureGroups.add(groupKey);
+      }
+      return [];
+    }
+  }
   async handleStreamEntry(stream, message) {
     if (stream === this.messageStream) {
       await this.handleInboundRequest(message);