fix(fetch): add support for aborting requests using AbortSignal (#2809)

Michael Solomon · web-flow · commit a14391168328 · 2024-11-21T13:59:51.000-08:00
diff --git a/lib/create_response.js b/lib/create_response.js
@@ -16,8 +16,9 @@ const responseStatusCodesWithoutBody = [204, 205, 304]
 
 /**
  * @param {import('http').IncomingMessage} message
+ * @param {AbortSignal} signal
  */
-function createResponse(message) {
+function createResponse(message, signal) {
   const responseBodyOrNull = responseStatusCodesWithoutBody.includes(
     message.statusCode || 200,
   )
@@ -27,6 +28,7 @@ function createResponse(message) {
           message.on('data', chunk => controller.enqueue(chunk))
           message.on('end', () => controller.close())
           message.on('error', error => controller.error(error))
+          signal.addEventListener('abort', () => message.destroy(signal.reason))
         },
         cancel() {
           message.destroy()
diff --git a/lib/intercept.js b/lib/intercept.js
@@ -399,7 +399,7 @@ function activate() {
           globalEmitter.emit('no match', nockRequest)
         } else {
           nockRequest.on('response', nockResponse => {
-            const response = createResponse(nockResponse)
+            const response = createResponse(nockResponse, mswRequest.signal)
             controller.respondWith(response)
           })
 
diff --git a/tests/test_fetch.js b/tests/test_fetch.js
@@ -119,6 +119,19 @@ describe('Native Fetch', () => {
     scope.done()
   })
 
+  it('should abort a request with a timeout signal', async () => {
+    const scope = nock('http://test.com').get('/').delayBody(100).reply(200)
+
+    const response = await fetch('http://test.com', {
+      signal: AbortSignal.timeout(50),
+    })
+    await assertRejects(
+      response.text(),
+      'TimeoutError: The operation was aborted due to timeout',
+    )
+    scope.done()
+  })
+
   // https://github.com/nock/nock/issues/2768
   it('should not mess the Headers object', async () => {
     nock('https://api.test.com', {
