Proxy request.signal through in vite dev (#9976)

remix-run · Sep 13, 2024 · a49b4c6 · a49b4c6
1 parent d9a6076
commit a49b4c6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/.changeset/hungry-experts-suffer.md b/.changeset/hungry-experts-suffer.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/dev": patch
+---
+
+Properly abort `request.signal` during `vite dev` when the node response is closed
diff --git a/packages/remix-dev/vite/cloudflare-proxy-plugin.ts b/packages/remix-dev/vite/cloudflare-proxy-plugin.ts
@@ -70,7 +70,7 @@ export const cloudflareDevProxyVitePlugin = <Env, Cf extends CfProperties>({
               )) as ServerBuild;
 
               let handler = createRequestHandler(build, "development");
-              let req = fromNodeRequest(nodeReq);
+              let req = fromNodeRequest(nodeReq, nodeRes);
               let loadContext = getLoadContext
                 ? await getLoadContext({ request: req, context })
                 : context;

diff --git a/packages/remix-dev/vite/node-adapter.ts b/packages/remix-dev/vite/node-adapter.ts
@@ -32,7 +32,8 @@ function fromNodeHeaders(nodeHeaders: IncomingHttpHeaders): Headers {
 
 // Based on `createRemixRequest` in packages/remix-express/server.ts
 export function fromNodeRequest(
-  nodeReq: Vite.Connect.IncomingMessage
+  nodeReq: Vite.Connect.IncomingMessage,
+  nodeRes: ServerResponse<Vite.Connect.IncomingMessage>
 ): Request {
   let origin =
     nodeReq.headers.origin && "null" !== nodeReq.headers.origin
@@ -44,9 +45,15 @@ export function fromNodeRequest(
     "Expected `nodeReq.originalUrl` to be defined"
   );
   let url = new URL(nodeReq.originalUrl, origin);
+
+  // Abort action/loaders once we can no longer write a response
+  let controller = new AbortController();
+  nodeRes.on("close", () => controller.abort());
+
   let init: RequestInit = {
     method: nodeReq.method,
     headers: fromNodeHeaders(nodeReq.headers),
+    signal: controller.signal,
   };
 
   if (nodeReq.method !== "GET" && nodeReq.method !== "HEAD") {

diff --git a/packages/remix-dev/vite/plugin.ts b/packages/remix-dev/vite/plugin.ts
@@ -1382,7 +1382,7 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
                   nodeReq,
                   nodeRes
                 ) => {
-                  let req = fromNodeRequest(nodeReq);
+                  let req = fromNodeRequest(nodeReq, nodeRes);
                   let res = await handler(req, await remixDevLoadContext(req));
                   await toNodeRequest(res, nodeRes);
                 };