feat: add abort signal to body.dump()

lib/api/readable.js

@@ -4,7 +4,7 @@
 
 const assert = require('assert')
 const { Readable } = require('stream')
-const { RequestAbortedError, NotSupportedError } = require('../core/errors')
+const { RequestAbortedError, NotSupportedError, InvalidArgumentError } = require('../core/errors')
 const util = require('../core/util')
 const { ReadableStreamFrom, toUSVString } = require('../core/util')
 
@@ -146,15 +146,30 @@ module.exports = class BodyReadable extends Readable {
 
   async dump (opts) {
     let limit = opts && Number.isFinite(opts.limit) ? opts.limit : 262144
+    const signal = opts && opts.signal
+    if (signal) {
+      signal.throwIfAborted()
+      if (typeof signal !== 'object' || !('aborted' in signal)) {
+        throw new InvalidArgumentError('signal must be an AbortSignal');
+      }
+      signal.throwIfAborted()
+      signal.addEventListener('abort', () => {
+        this.destroy()
+      })
+    }
     try {
       for await (const chunk of this) {
+        signal.throwIfAborted()
         limit -= Buffer.byteLength(chunk)
         if (limit < 0) {
           return
         }
       }
-    } catch {
-      // Do nothing...
+    } catch (err) {
+      signal.throwIfAborted()
+      if (err.name === 'AbortError') {
+        throw err
+      }
     }
   }
 }

test/client-request.js

@@ -1,3 +1,5 @@
+/* globals AbortController */
+
 'use strict'
 
 const { test } = require('tap')
@@ -41,6 +43,32 @@ test('request dump', (t) => {
   })
 })
 
+test('request dump with abort signal', (t) => {
+  t.plan(2)
+  const server = createServer((req, res) => {
+    res.write('hello')
+  })
+  t.teardown(server.close.bind(server))
+
+  server.listen(0, () => {
+    const client = new Client(`http://localhost:${server.address().port}`)
+    t.teardown(client.destroy.bind(client))
+
+    client.request({
+      path: '/',
+      method: 'GET'
+    }, (err, { body }) => {
+      t.error(err)
+      const ac = new AbortController()
+      body.dump({ signal: ac.signal }).catch((err) => {
+        t.equal(err.name, 'AbortError')
+        server.close()
+      })
+      ac.abort()
+    })
+  })
+})
+
 test('request abort before headers', (t) => {
   t.plan(6)