fix(use/http,use/http2,use/express,use/fastify): Handle cases where r…

…esponse's `close` event is late (#75) Closes #69
enisdenjo · Aug 22, 2023 · 4457cba · 4457cba
1 parent b7c980f
commit 4457cba
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 12 deletions.
diff --git a/src/use/express.ts b/src/use/express.ts
@@ -95,9 +95,17 @@ export function createHandler<Context extends OperationContext = undefined>(
 
     res.once('close', body.return);
     for await (const value of body) {
-      await new Promise<void>((resolve, reject) =>
-        res.write(value, (err) => (err ? reject(err) : resolve())),
-      );
+      const closed = await new Promise((resolve, reject) => {
+        if (res.closed) {
+          // response's close event might be late
+          resolve(true);
+        } else {
+          res.write(value, (err) => (err ? reject(err) : resolve(false)));
+        }
+      });
+      if (closed) {
+        break;
+      }
     }
     res.off('close', body.return);
     return new Promise((resolve) => res.end(resolve));

diff --git a/src/use/fastify.ts b/src/use/fastify.ts
@@ -97,9 +97,17 @@ export function createHandler<Context extends OperationContext = undefined>(
 
     reply.raw.once('close', body.return);
     for await (const value of body) {
-      await new Promise<void>((resolve, reject) =>
-        reply.raw.write(value, (err) => (err ? reject(err) : resolve())),
-      );
+      const closed = await new Promise((resolve, reject) => {
+        if (reply.raw.closed) {
+          // response's close event might be late
+          resolve(true);
+        } else {
+          reply.raw.write(value, (err) => (err ? reject(err) : resolve(false)));
+        }
+      });
+      if (closed) {
+        break;
+      }
     }
     reply.raw.off('close', body.return);
     return new Promise((resolve) => reply.raw.end(resolve));

diff --git a/src/use/http.ts b/src/use/http.ts
@@ -90,9 +90,17 @@ export function createHandler<Context extends OperationContext = undefined>(
 
     res.once('close', body.return);
     for await (const value of body) {
-      await new Promise<void>((resolve, reject) =>
-        res.write(value, (err) => (err ? reject(err) : resolve())),
-      );
+      const closed = await new Promise((resolve, reject) => {
+        if (res.closed) {
+          // response's close event might be late
+          resolve(true);
+        } else {
+          res.write(value, (err) => (err ? reject(err) : resolve(false)));
+        }
+      });
+      if (closed) {
+        break;
+      }
     }
     res.off('close', body.return);
     return new Promise((resolve) => res.end(resolve));

diff --git a/src/use/http2.ts b/src/use/http2.ts
@@ -92,9 +92,17 @@ export function createHandler<Context extends OperationContext = undefined>(
 
     res.once('close', body.return);
     for await (const value of body) {
-      await new Promise<void>((resolve, reject) =>
-        res.write(value, (err) => (err ? reject(err) : resolve())),
-      );
+      const closed = await new Promise((resolve, reject) => {
+        if (res.closed) {
+          // response's close event might be late
+          resolve(true);
+        } else {
+          res.write(value, (err) => (err ? reject(err) : resolve(false)));
+        }
+      });
+      if (closed) {
+        break;
+      }
     }
     res.off('close', body.return);
     return new Promise((resolve) => res.end(resolve));