fix request.signal

As per remix-run/remix#3626
penx · Jan 25, 2023 · e1d896f · e1d896f
1 parent 1158276
commit e1d896f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/__tests__/server-test.ts b/__tests__/server-test.ts
@@ -1,5 +1,5 @@
 import supertest from "supertest";
-import { createRequest } from "node-mocks-http";
+import { createRequest, createResponse } from "node-mocks-http";
 import {
   createRequestHandler as createRemixRequestHandler,
   Response as NodeResponse,
@@ -237,7 +237,10 @@ describe("google-cloud-functions createRemixRequest", () => {
       },
     });
 
-    expect(createRemixRequest(expressRequest)).toMatchInlineSnapshot(`
+    let expressResponse = createResponse();
+
+    expect(createRemixRequest(expressRequest, expressResponse))
+      .toMatchInlineSnapshot(`
       NodeRequest {
         "agent": undefined,
         "compress": true,

diff --git a/server.ts b/server.ts
@@ -48,7 +48,7 @@ export function createRequestHandler({
 
   return async (req: GcfRequest, res: GcfResponse) => {
     try {
-      let request = createRemixRequest(req);
+      let request = createRemixRequest(req, res);
       let loadContext =
         typeof getLoadContext === "function"
           ? getLoadContext(req, res)
@@ -90,15 +90,16 @@ export function createRemixHeaders(
   return headers;
 }
 
-export function createRemixRequest(req: GcfRequest): NodeRequest {
+export function createRemixRequest(
+  req: GcfRequest,
+  res: GcfResponse
+): NodeRequest {
   let origin = `${req.protocol}://${req.get("host")}`;
   let url = new URL(req.url, origin);
 
   let controller = new AbortController();
 
-  req.on("close", () => {
-    controller.abort();
-  });
+  res.on("close", () => controller.abort());
 
   let init: NodeRequestInit = {
     method: req.method,