From 5053c9f0b83488ed531cf4184e88a07d72695bba Mon Sep 17 00:00:00 2001
From: Alan Agius <17563226+alan-agius4@users.noreply.github.com>
Date: Wed, 19 Aug 2026 09:25:46 +0000
Subject: [PATCH 1/2] fix(@angular/ssr): abort web request signal when node
 request is aborted

---
 packages/angular/ssr/node/src/request.ts      |  9 +++++++++
 .../ssr/node/test/request_http1_spec.ts       | 20 +++++++++++++++++++
 .../ssr/node/test/request_http2_spec.ts       | 20 +++++++++++++++++++
 3 files changed, 49 insertions(+)

diff --git a/packages/angular/ssr/node/src/request.ts b/packages/angular/ssr/node/src/request.ts
index 4bd754b268cc..4f604b6a9d0e 100644
--- a/packages/angular/ssr/node/src/request.ts
+++ b/packages/angular/ssr/node/src/request.ts
@@ -55,9 +55,18 @@ export function createWebRequestFromNodeRequest(
   const { headers, method = 'GET' } = nodeRequest;
   const withBody = method !== 'GET' && method !== 'HEAD';
   const referrer = headers.referer && URL.canParse(headers.referer) ? headers.referer : undefined;
+  const controller = new AbortController();
+  if (nodeRequest.aborted) {
+    controller.abort();
+  } else {
+    const onAbort = () => controller.abort();
+    nodeRequest.once('aborted', onAbort);
+    nodeRequest.once('close', () => nodeRequest.off('aborted', onAbort));
+  }
 
   return new Request(createRequestUrl(nodeRequest, trustProxyHeadersNormalized), {
     method,
+    signal: controller.signal,
     headers: createRequestHeaders(headers),
     body: withBody ? nodeRequest : undefined,
     duplex: withBody ? 'half' : undefined,
diff --git a/packages/angular/ssr/node/test/request_http1_spec.ts b/packages/angular/ssr/node/test/request_http1_spec.ts
index 87f25f918ef7..7e534eae3d41 100644
--- a/packages/angular/ssr/node/test/request_http1_spec.ts
+++ b/packages/angular/ssr/node/test/request_http1_spec.ts
@@ -189,4 +189,24 @@ describe('createWebRequestFromNodeRequest (HTTP/1.1)', () => {
       expect(await webRequest.text()).toBe('');
     });
   });
+
+  describe('abort handling', () => {
+    it('should abort the web request signal when the node request is aborted', async () => {
+      const nodeRequest = await extractNodeRequest(() => {
+        request({
+          hostname: 'localhost',
+          port,
+          path: '/abort',
+          method: 'GET',
+        }).end();
+      });
+
+      const webRequest = createWebRequestFromNodeRequest(nodeRequest);
+      expect(webRequest.signal.aborted).toBeFalse();
+
+      nodeRequest.emit('aborted');
+
+      expect(webRequest.signal.aborted).toBeTrue();
+    });
+  });
 });
diff --git a/packages/angular/ssr/node/test/request_http2_spec.ts b/packages/angular/ssr/node/test/request_http2_spec.ts
index 7079a385daaf..79e6bcd1bbd0 100644
--- a/packages/angular/ssr/node/test/request_http2_spec.ts
+++ b/packages/angular/ssr/node/test/request_http2_spec.ts
@@ -188,4 +188,24 @@ describe('createWebRequestFromNodeRequest (HTTP/2)', () => {
       expect(await webRequest.text()).toBe('');
     });
   });
+
+  describe('abort handling', () => {
+    it('should abort the web request signal when the node request is aborted', async () => {
+      const nodeRequest = await extractNodeRequest(() => {
+        client
+          .request({
+            ':path': '/abort',
+            ':method': 'GET',
+          })
+          .end();
+      });
+
+      const webRequest = createWebRequestFromNodeRequest(nodeRequest);
+      expect(webRequest.signal.aborted).toBeFalse();
+
+      nodeRequest.emit('aborted');
+
+      expect(webRequest.signal.aborted).toBeTrue();
+    });
+  });
 });

From 4d9c7cf8ff092e2bfa68d1dc4744967048098095 Mon Sep 17 00:00:00 2001
From: Alan Agius <17563226+alan-agius4@users.noreply.github.com>
Date: Thu, 20 Aug 2026 07:18:45 +0000
Subject: [PATCH 2/2] fixup! fix(@angular/ssr): abort web request signal when
 node request is aborted

---
 .../ssr/node/test/request_http1_spec.ts        | 18 ++++++++++++++++++
 .../ssr/node/test/request_http2_spec.ts        | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/packages/angular/ssr/node/test/request_http1_spec.ts b/packages/angular/ssr/node/test/request_http1_spec.ts
index 7e534eae3d41..9f11fe390ed4 100644
--- a/packages/angular/ssr/node/test/request_http1_spec.ts
+++ b/packages/angular/ssr/node/test/request_http1_spec.ts
@@ -208,5 +208,23 @@ describe('createWebRequestFromNodeRequest (HTTP/1.1)', () => {
 
       expect(webRequest.signal.aborted).toBeTrue();
     });
+
+    it('should create an aborted web request signal when the node request is already aborted', async () => {
+      const nodeRequest = await extractNodeRequest(() => {
+        request({
+          hostname: 'localhost',
+          port,
+          path: '/already-aborted',
+          method: 'GET',
+        }).end();
+      });
+
+      Object.defineProperty(nodeRequest, 'aborted', { get: () => true, configurable: true });
+
+      const webRequest = createWebRequestFromNodeRequest(nodeRequest);
+      expect(webRequest.signal.aborted).toBeTrue();
+
+      delete (nodeRequest as { aborted?: boolean }).aborted;
+    });
   });
 });
diff --git a/packages/angular/ssr/node/test/request_http2_spec.ts b/packages/angular/ssr/node/test/request_http2_spec.ts
index 79e6bcd1bbd0..e652c59f6461 100644
--- a/packages/angular/ssr/node/test/request_http2_spec.ts
+++ b/packages/angular/ssr/node/test/request_http2_spec.ts
@@ -207,5 +207,23 @@ describe('createWebRequestFromNodeRequest (HTTP/2)', () => {
 
       expect(webRequest.signal.aborted).toBeTrue();
     });
+
+    it('should create an aborted web request signal when the node request is already aborted', async () => {
+      const nodeRequest = await extractNodeRequest(() => {
+        client
+          .request({
+            ':path': '/already-aborted',
+            ':method': 'GET',
+          })
+          .end();
+      });
+
+      Object.defineProperty(nodeRequest, 'aborted', { get: () => true, configurable: true });
+
+      const webRequest = createWebRequestFromNodeRequest(nodeRequest);
+      expect(webRequest.signal.aborted).toBeTrue();
+
+      delete (nodeRequest as { aborted?: boolean }).aborted;
+    });
   });
 });