@mastra/fastify 1.3.19-alpha.3 → 1.3.19-alpha.4

package/dist/index.js

@@ -304,9 +304,12 @@ function toWebRequest2(request) {
     headers
   });
 }
+function isRequestAborted(rawRequest) {
+  return rawRequest.aborted || rawRequest.readableAborted || !rawRequest.complete;
+}
 var MastraServer = class extends MastraServer$1 {
   createContextMiddleware() {
-    return async (request, _reply) => {
+    return async (request, reply) => {
       let bodyRequestContext;
       let paramsRequestContext;
       if (request.method === "POST" || request.method === "PUT") {
@@ -346,14 +349,19 @@ var MastraServer = class extends MastraServer$1 {
       request.customRouteAuthConfig = this.customRouteAuthConfig;
       const controller = new AbortController();
       request.raw.on("close", () => {
-        if (!request.raw.complete) {
+        if (isRequestAborted(request.raw)) {
+          controller.abort();
+        }
+      });
+      reply.raw.on("close", () => {
+        if (!reply.raw.writableEnded) {
           controller.abort();
         }
       });
       request.abortSignal = controller.signal;
     };
   }
-  async stream(route, reply, result) {
+  async stream(route, reply, result, request) {
     const rawHeaders = reply.getHeaders();
     const existingHeaders = {};
     for (const [key, value] of Object.entries(rawHeaders)) {
@@ -379,9 +387,20 @@ var MastraServer = class extends MastraServer$1 {
     });
     const readableStream = result instanceof ReadableStream ? result : result.fullStream;
     const reader = readableStream.getReader();
-    reply.raw.on("close", () => {
-      void reader.cancel("request aborted");
-    });
+    let readerCanceled = false;
+    const cancelReader = (reason) => {
+      if (readerCanceled) return;
+      readerCanceled = true;
+      void reader.cancel(reason);
+    };
+    const cancelReaderOnResponseClose = () => cancelReader("request aborted");
+    const cancelReaderOnRequestClose = () => {
+      if (request && isRequestAborted(request.raw)) {
+        cancelReader("request aborted");
+      }
+    };
+    reply.raw.on("close", cancelReaderOnResponseClose);
+    request?.raw.on("close", cancelReaderOnRequestClose);
     try {
       while (true) {
         const { done, value } = await reader.read();
@@ -403,7 +422,11 @@ var MastraServer = class extends MastraServer$1 {
         error: error instanceof Error ? { message: error.message, stack: error.stack } : error
       });
     } finally {
-      reply.raw.end();
+      reply.raw.off("close", cancelReaderOnResponseClose);
+      request?.raw.off("close", cancelReaderOnRequestClose);
+      if (!reply.raw.writableEnded && !reply.raw.destroyed) {
+        reply.raw.end();
+      }
     }
   }
   async getParams(route, request) {
@@ -498,20 +521,34 @@ var MastraServer = class extends MastraServer$1 {
     if (route.responseType === "json") {
       await reply.send(result);
     } else if (route.responseType === "stream") {
-      await this.stream(route, reply, result);
+      await this.stream(route, reply, result, request);
     } else if (route.responseType === "datastream-response") {
       const fetchResponse = result;
       fetchResponse.headers.forEach((value, key) => reply.header(key, value));
       reply.status(fetchResponse.status);
       if (fetchResponse.body) {
         const reader = fetchResponse.body.getReader();
+        let readerCanceled = false;
+        const cancelReader = (reason) => {
+          if (readerCanceled) return;
+          readerCanceled = true;
+          void reader.cancel(reason);
+        };
+        const cancelReaderOnResponseClose = () => cancelReader("request aborted");
+        const cancelReaderOnRequestClose = () => {
+          if (request && isRequestAborted(request.raw)) {
+            cancelReader("request aborted");
+          }
+        };
         const onResError = (err) => {
           this.mastra.getLogger()?.error("Error writing datastream response", {
             error: err instanceof Error ? { message: err.message, stack: err.stack } : err
           });
-          void reader.cancel("response write error");
+          cancelReader("response write error");
         };
         reply.raw.once("error", onResError);
+        reply.raw.on("close", cancelReaderOnResponseClose);
+        request?.raw.on("close", cancelReaderOnRequestClose);
         try {
           while (true) {
             const { done, value } = await reader.read();
@@ -524,7 +561,11 @@ var MastraServer = class extends MastraServer$1 {
           });
         } finally {
           reply.raw.off("error", onResError);
-          reply.raw.end();
+          reply.raw.off("close", cancelReaderOnResponseClose);
+          request?.raw.off("close", cancelReaderOnRequestClose);
+          if (!reply.raw.writableEnded && !reply.raw.destroyed) {
+            reply.raw.end();
+          }
         }
       } else {
         reply.raw.end();