@fluojs/microservices 1.0.3 → 1.0.5

package/dist/transports/grpc-transport.js

@@ -16,8 +16,11 @@ 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;
   bidiStreamHandler;
   clientStreamHandler;
+  closePromise;
   closing = false;
   clients = new Map();
   grpc;
@@ -29,6 +32,7 @@ export class GrpcMicroserviceTransport {
   packageRoot;
   requestTimeoutMs;
   server;
+  ownsServer;
   resolvedServer;
   serverStreamHandler;
 
@@ -41,6 +45,8 @@ export class GrpcMicroserviceTransport {
     this.options = options;
     this.requestTimeoutMs = options.requestTimeoutMs ?? 3_000;
     this.server = options.server;
+    this.ownsServer = !options.server;
+    this.ownsResources = this.ownsServer;
   }
   setLogger(logger) {
     this.logger = logger;
@@ -53,7 +59,12 @@ export class GrpcMicroserviceTransport {
    * @returns A promise that resolves once the gRPC server is bound and ready.
    */
   async listen(handler) {
-    this.closing = false;
+    if (this.closing) {
+      if (this.closePromise) {
+        throw new Error('GrpcMicroserviceTransport is closing. Wait for close() to complete before listen().');
+      }
+      this.closing = false;
+    }
     this.handler = handler;
     if (this.listening) {
       return;
@@ -85,7 +96,9 @@ export class GrpcMicroserviceTransport {
         }
         await this.bindServer(server, grpc);
       } catch (error) {
-        await this.shutdownServer(server);
+        if (this.ownsServer) {
+          await this.shutdownServer(server);
+        }
         throw error;
       }
       this.grpc = grpc;
@@ -225,39 +238,50 @@ export class GrpcMicroserviceTransport {
    * @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.resolvedServer) {
-        await this.shutdownServer(this.resolvedServer);
+    this.closing = true;
+    this.closePromise = (async () => {
+      let closeError;
+      if (this.listenPromise) {
+        await this.listenPromise;
       }
-      for (const service of this.clients.values()) {
-        try {
-          service.client.close?.();
-        } catch (error) {
-          closeError ??= error;
+      try {
+        if (this.resolvedServer && this.ownsServer) {
+          await this.shutdownServer(this.resolvedServer);
+        }
+        for (const service of this.clients.values()) {
+          try {
+            service.client.close?.();
+          } catch (error) {
+            closeError ??= error;
+          }
+        }
+      } catch (error) {
+        closeError ??= error;
+      } finally {
+        this.handler = undefined;
+        this.serverStreamHandler = undefined;
+        this.clientStreamHandler = undefined;
+        this.bidiStreamHandler = undefined;
+        this.listening = false;
+        this.resolvedServer = undefined;
+        this.clients.clear();
+        this.packageRoot = undefined;
+        for (const pending of [...this.pending.values()]) {
+          pending.reject(new Error('gRPC microservice transport closed before response.'));
         }
       }
-    } catch (error) {
-      closeError ??= error;
-    } finally {
-      this.handler = undefined;
-      this.serverStreamHandler = undefined;
-      this.clientStreamHandler = undefined;
-      this.bidiStreamHandler = undefined;
-      this.listening = false;
-      this.resolvedServer = undefined;
-      this.clients.clear();
-      this.packageRoot = undefined;
-      for (const pending of [...this.pending.values()]) {
-        pending.reject(new Error('gRPC microservice transport closed before response.'));
+      if (closeError) {
+        throw closeError;
       }
-    }
-    if (closeError) {
-      throw closeError;
+    })();
+    try {
+      await this.closePromise;
+    } finally {
+      this.closePromise = undefined;
     }
   }
   buildServiceImplementation(serviceName, serviceConstructor) {
@@ -471,6 +495,13 @@ export class GrpcMicroserviceTransport {
         });
       }
       void Promise.resolve().then(() => {
+        if (!this.pending.has(requestId)) {
+          return;
+        }
+        if (signal?.aborted) {
+          entry.reject(new Error('gRPC request aborted before dispatch.'));
+          return;
+        }
         if (this.closing) {
           entry.reject(new Error('gRPC microservice transport closed before response.'));
           return;
@@ -505,124 +536,11 @@ export class GrpcMicroserviceTransport {
       throw new Error(`GrpcMicroserviceTransport could not resolve server-streaming method "${parsedPattern.serviceName}.${parsedPattern.methodName}".`);
     }
     const metadata = this.createMetadata(grpcKinds.message);
-    const transport = this;
-    return {
-      [Symbol.asyncIterator]() {
-        const buffer = [];
-        let done = false;
-        let error;
-        let waiting;
-        let stream;
-        let removeAbortListener;
-        const cleanupAbortListener = () => {
-          removeAbortListener?.();
-          removeAbortListener = undefined;
-        };
-        const finish = () => {
-          done = true;
-          cleanupAbortListener();
-        };
-        const startStream = () => {
-          if (stream) {
-            return;
-          }
-          stream = method.call(runtime.client, payload, metadata);
-          stream.on('data', data => {
-            if (waiting) {
-              const w = waiting;
-              waiting = undefined;
-              w.resolve({
-                value: data,
-                done: false
-              });
-            } else {
-              buffer.push(data);
-            }
-          });
-          stream.on('end', () => {
-            finish();
-            if (waiting) {
-              const w = waiting;
-              waiting = undefined;
-              w.resolve({
-                value: undefined,
-                done: true
-              });
-            }
-          });
-          stream.on('error', err => {
-            finish();
-            if (signal?.aborted) {
-              error = new Error('gRPC server stream aborted.');
-            } else {
-              error = err instanceof Error ? err : new Error('gRPC server stream error.');
-            }
-            if (waiting) {
-              const w = waiting;
-              waiting = undefined;
-              w.reject(error);
-            }
-          });
-          if (signal) {
-            if (signal.aborted) {
-              finish();
-              error = new Error('gRPC server stream aborted.');
-              stream.cancel?.();
-              return;
-            }
-            const onAbort = () => {
-              finish();
-              error = new Error('gRPC server stream aborted.');
-              stream?.cancel?.();
-              if (waiting) {
-                const w = waiting;
-                waiting = undefined;
-                w.reject(error);
-              }
-            };
-            signal.addEventListener('abort', onAbort, {
-              once: true
-            });
-            removeAbortListener = () => signal.removeEventListener('abort', onAbort);
-          }
-        };
-        void transport;
-        return {
-          next() {
-            startStream();
-            if (buffer.length > 0) {
-              return Promise.resolve({
-                value: buffer.shift(),
-                done: false
-              });
-            }
-            if (error) {
-              return Promise.reject(error);
-            }
-            if (done) {
-              return Promise.resolve({
-                value: undefined,
-                done: true
-              });
-            }
-            return new Promise((resolve, reject) => {
-              waiting = {
-                resolve,
-                reject
-              };
-            });
-          },
-          return() {
-            finish();
-            stream?.cancel?.();
-            return Promise.resolve({
-              value: undefined,
-              done: true
-            });
-          }
-        };
-      }
-    };
+    const stream = method.call(runtime.client, payload, metadata);
+    return grpcReadableToAsyncIterable(stream, {
+      abortErrorMessage: 'gRPC server stream aborted.',
+      signal
+    });
   }
   callClientStream(parsedPattern, signal) {
     const runtime = this.getServiceRuntime(parsedPattern.serviceName);
@@ -634,40 +552,54 @@ export class GrpcMicroserviceTransport {
     let callStream;
     let ended = false;
     let cleanupAbortListener;
+    let settled = false;
     const cleanup = () => {
       cleanupAbortListener?.();
       cleanupAbortListener = undefined;
     };
     const result = new Promise((resolve, reject) => {
       if (signal?.aborted) {
+        settled = true;
         reject(new Error('gRPC client stream aborted before dispatch.'));
         return;
       }
-      callStream = method.call(runtime.client, metadata, (error, response) => {
+      const settle = complete => {
+        if (settled) {
+          return;
+        }
+        settled = true;
         cleanup();
+        complete();
+      };
+      callStream = method.call(runtime.client, metadata, (error, response) => {
         if (error) {
           if (signal?.aborted) {
-            reject(new Error('gRPC client stream aborted.'));
+            settle(() => reject(new Error('gRPC client stream aborted.')));
             return;
           }
           const message = typeof error.message === 'string' && error.message.length > 0 ? error.message : 'Unhandled gRPC client stream error';
-          reject(new Error(message));
+          settle(() => reject(new Error(message)));
           return;
         }
-        resolve(response);
+        settle(() => resolve(response));
       });
-      if (signal) {
+      if (signal && !settled) {
         const onAbort = () => {
-          if (!ended) {
-            ended = true;
-            callStream?.end();
-          }
-          reject(new Error('gRPC client stream aborted.'));
+          settle(() => {
+            if (!ended) {
+              ended = true;
+              callStream?.end();
+            }
+            reject(new Error('gRPC client stream aborted.'));
+          });
         };
         signal.addEventListener('abort', onAbort, {
           once: true
         });
         cleanupAbortListener = () => signal.removeEventListener('abort', onAbort);
+        if (signal.aborted) {
+          onAbort();
+        }
       }
     });
     const writer = {
@@ -722,7 +654,10 @@ export class GrpcMicroserviceTransport {
         cleanupAbortListener = () => signal.removeEventListener('abort', onAbort);
       }
     }
-    const reader = grpcReadableToAsyncIterable(duplexStream, signal, cleanupAbortListener);
+    const reader = grpcReadableToAsyncIterable(duplexStream, {
+      externalAbortCleanup: cleanupAbortListener,
+      signal
+    });
     const writer = {
       write(data) {
         if (!writerEnded) {
@@ -932,114 +867,145 @@ export class GrpcMicroserviceTransport {
     logTransportEventHandlerFailure(this.logger, 'GrpcMicroserviceTransport', error);
   }
 }
-function grpcReadableToAsyncIterable(stream, signal, externalAbortCleanup) {
-  return {
-    [Symbol.asyncIterator]() {
-      const buffer = [];
-      let done = false;
-      let error;
-      let waiting;
-      let removeAbortListener;
-      const cleanupAbortListeners = () => {
-        removeAbortListener?.();
-        removeAbortListener = undefined;
-        externalAbortCleanup?.();
-      };
-      const finish = () => {
-        done = true;
-        cleanupAbortListeners();
-      };
-      stream.on('data', data => {
-        if (waiting) {
-          const w = waiting;
-          waiting = undefined;
-          w.resolve({
-            value: data,
-            done: false
-          });
-        } else {
-          buffer.push(data);
+function grpcReadableToAsyncIterable(stream, options = {}) {
+  const {
+    signal
+  } = options;
+  const abortErrorMessage = options.abortErrorMessage ?? 'gRPC stream aborted.';
+  const buffer = [];
+  let cleanupExternalAbortListener = options.externalAbortCleanup;
+  let done = false;
+  let error;
+  let waiting;
+  let removeAbortListener;
+  const cleanupAbortListeners = () => {
+    const cleanupLocal = removeAbortListener;
+    const cleanupExternal = cleanupExternalAbortListener;
+    removeAbortListener = undefined;
+    cleanupExternalAbortListener = undefined;
+    cleanupLocal?.();
+    cleanupExternal?.();
+  };
+  const finish = () => {
+    if (done) {
+      return false;
+    }
+    done = true;
+    cleanupAbortListeners();
+    return true;
+  };
+  if (signal) {
+    if (signal.aborted) {
+      error = new Error(abortErrorMessage);
+      finish();
+      stream.cancel?.();
+    } else {
+      const onAbort = () => {
+        const abortError = new Error(abortErrorMessage);
+        if (!finish()) {
+          return;
         }
-      });
-      stream.on('end', () => {
-        finish();
+        error = abortError;
+        stream.cancel?.();
         if (waiting) {
-          const w = waiting;
+          const current = waiting;
           waiting = undefined;
-          w.resolve({
-            value: undefined,
-            done: true
-          });
+          current.reject(abortError);
         }
+      };
+      signal.addEventListener('abort', onAbort, {
+        once: true
       });
-      stream.on('error', err => {
-        finish();
-        if (signal?.aborted) {
-          error = new Error('gRPC stream aborted.');
-        } else {
-          error = err instanceof Error ? err : new Error('gRPC stream error.');
-        }
-        if (waiting) {
-          const w = waiting;
-          waiting = undefined;
-          w.reject(error);
-        }
+      removeAbortListener = () => signal.removeEventListener('abort', onAbort);
+    }
+  }
+  stream.on('data', data => {
+    if (done) {
+      return;
+    }
+    if (waiting) {
+      const current = waiting;
+      waiting = undefined;
+      current.resolve({
+        value: data,
+        done: false
       });
-      if (signal) {
-        if (signal.aborted) {
-          finish();
-          error = new Error('gRPC stream aborted.');
-          stream.cancel?.();
-        } else {
-          const onAbort = () => {
-            finish();
-            error = new Error('gRPC stream aborted.');
-            stream.cancel?.();
-            if (waiting) {
-              const w = waiting;
-              waiting = undefined;
-              w.reject(error);
-            }
-          };
-          signal.addEventListener('abort', onAbort, {
-            once: true
-          });
-          removeAbortListener = () => signal.removeEventListener('abort', onAbort);
-        }
+    } else {
+      buffer.push(data);
+    }
+  });
+  stream.on('end', () => {
+    if (!finish()) {
+      return;
+    }
+    if (waiting) {
+      const current = waiting;
+      waiting = undefined;
+      current.resolve({
+        value: undefined,
+        done: true
+      });
+    }
+  });
+  stream.on('error', err => {
+    const streamError = signal?.aborted ? new Error(abortErrorMessage) : err;
+    if (!finish()) {
+      return;
+    }
+    error = streamError;
+    if (waiting) {
+      const current = waiting;
+      waiting = undefined;
+      current.reject(streamError);
+    }
+  });
+  const iterator = {
+    next() {
+      if (buffer.length > 0) {
+        return Promise.resolve({
+          value: buffer.shift(),
+          done: false
+        });
       }
-      return {
-        next() {
-          if (buffer.length > 0) {
-            return Promise.resolve({
-              value: buffer.shift(),
-              done: false
-            });
-          }
-          if (error) {
-            return Promise.reject(error);
-          }
-          if (done) {
-            return Promise.resolve({
-              value: undefined,
-              done: true
-            });
-          }
-          return new Promise((resolve, reject) => {
-            waiting = {
-              resolve,
-              reject
-            };
-          });
-        },
-        return() {
-          finish();
-          stream.cancel?.();
-          return Promise.resolve({
-            value: undefined,
-            done: true
-          });
-        }
-      };
+      if (error) {
+        return Promise.reject(error);
+      }
+      if (done) {
+        return Promise.resolve({
+          value: undefined,
+          done: true
+        });
+      }
+      return new Promise((resolve, reject) => {
+        waiting = {
+          resolve,
+          reject
+        };
+      });
+    },
+    return() {
+      const shouldCancel = finish();
+      buffer.length = 0;
+      if (waiting) {
+        const current = waiting;
+        waiting = undefined;
+        current.resolve({
+          value: undefined,
+          done: true
+        });
+      }
+      if (shouldCancel) {
+        stream.cancel?.();
+      }
+      return Promise.resolve({
+        value: undefined,
+        done: true
+      });
+    }
+  };
+  return {
+    [Symbol.asyncIterator]() {
+      return iterator;
     }
   };
 }

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

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

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;IAgB1D,OAAO,CAAC,QAAQ,CAAC,OAAO;IAfpC,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;IAiDtD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IA6ErF;;;;;;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;YAgCd,kBAAkB;YAkBlB,oBAAoB;YAwCpB,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,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"}