remove anti-pattern dispatcher hooks (#2723)

docs/api/DiagnosticsChannel.md

@@ -27,17 +27,6 @@ diagnosticsChannel.channel('undici:request:create').subscribe(({ request }) => {
 
 Note: a request is only loosely completed to a given socket.
 
-
-## `undici:request:bodySent`
-
-```js
-import diagnosticsChannel from 'diagnostics_channel'
-
-diagnosticsChannel.channel('undici:request:bodySent').subscribe(({ request }) => {
-  // request is the same object undici:request:create
-})
-```
-
 ## `undici:request:headers`
 
 This message is published after the response headers have been received, i.e. the response has been completed.

docs/api/Dispatcher.md

@@ -209,11 +209,9 @@ Returns: `Boolean` - `false` if dispatcher is busy and further dispatch calls wo
 * **onConnect** `(abort: () => void, context: object) => void` - Invoked before request is dispatched on socket. May be invoked multiple times when a request is retried when the request at the head of the pipeline fails.
 * **onError** `(error: Error) => void` - Invoked when an error has occurred. May not throw.
 * **onUpgrade** `(statusCode: number, headers: Buffer[], socket: Duplex) => void` (optional) - Invoked when request is upgraded. Required if `DispatchOptions.upgrade` is defined or `DispatchOptions.method === 'CONNECT'`.
-* **onResponseStarted** `() => void` (optional) - Invoked when response is received, before headers have been read.
 * **onHeaders** `(statusCode: number, headers: Buffer[], resume: () => void, statusText: string) => boolean` - Invoked when statusCode and headers have been received. May be invoked multiple times due to 1xx informational headers. Not required for `upgrade` requests.
 * **onData** `(chunk: Buffer) => boolean` - Invoked when response payload data is received. Not required for `upgrade` requests.
 * **onComplete** `(trailers: Buffer[]) => void` - Invoked when response payload and trailers have been received and the request has completed. Not required for `upgrade` requests.
-* **onBodySent** `(chunk: string | Buffer | Uint8Array) => void` - Invoked when a body chunk is sent to the server. Not required. For a stream or iterable body this will be invoked for every chunk. For other body types, it will be invoked once after the body is sent.
 
 #### Example 1 - Dispatch GET request
 

docs/api/RedirectHandler.md

@@ -86,11 +86,3 @@ Called when the request is complete.
 Parameters:
 
 - **trailers** `object` - The trailers received.
-
-#### `onBodySent(chunk)`
-
-Called when the request body is sent.
-
-Parameters:
-
-- **chunk** `Buffer` - The chunk of the request body sent.

docs/api/RetryHandler.md

@@ -73,7 +73,6 @@ const handler = new RetryHandler(
     },
     handler: {
       onConnect() {},
-      onBodySent() {},
       onHeaders(status, _rawHeaders, resume, _statusMessage) {
         // do something with headers
       },
@@ -98,7 +97,6 @@ const handler = new RetryHandler(dispatchOptions, {
   dispatch: client.dispatch.bind(client),
   handler: {
     onConnect() {},
-    onBodySent() {},
     onHeaders(status, _rawHeaders, resume, _statusMessage) {},
     onData(chunk) {},
     onComplete() {},

lib/client.js

@@ -728,7 +728,6 @@ class Parser {
     if (!request) {
       return -1
     }
-    request.onResponseStarted()
   }
 
   onHeaderField (buf) {
@@ -1626,16 +1625,13 @@ function write (client, request) {
       assert(contentLength === null, 'no body must not have content length')
       socket.write(`${header}\r\n`, 'latin1')
     }
-    request.onRequestSent()
   } else if (util.isBuffer(body)) {
     assert(contentLength === body.byteLength, 'buffer body must have content length')
 
     socket.cork()
     socket.write(`${header}content-length: ${contentLength}\r\n\r\n`, 'latin1')
     socket.write(body)
     socket.uncork()
-    request.onBodySent(body)
-    request.onRequestSent()
     if (!expectsPayload) {
       socket[kReset] = true
     }
@@ -1809,7 +1805,6 @@ function writeH2 (client, session, request) {
 
   stream.once('response', headers => {
     const { [HTTP2_HEADER_STATUS]: statusCode, ...realHeaders } = headers
-    request.onResponseStarted()
 
     if (request.onHeaders(Number(statusCode), realHeaders, stream.resume.bind(stream), '') === false) {
       stream.pause()
@@ -1890,15 +1885,13 @@ function writeH2 (client, session, request) {
   function writeBodyH2 () {
     /* istanbul ignore else: assertion */
     if (!body) {
-      request.onRequestSent()
+      // Do nothing...
     } else if (util.isBuffer(body)) {
       assert(contentLength === body.byteLength, 'buffer body must have content length')
       stream.cork()
       stream.write(body)
       stream.uncork()
       stream.end()
-      request.onBodySent(body)
-      request.onRequestSent()
     } else if (util.isBlobLike(body)) {
       if (typeof body.stream === 'function') {
         writeIterable({
@@ -1963,22 +1956,14 @@ function writeStream ({ h2stream, body, client, request, socket, contentLength,
         if (err) {
           util.destroy(body, err)
           util.destroy(h2stream, err)
-        } else {
-          request.onRequestSent()
         }
       }
     )
 
-    pipe.on('data', onPipeData)
     pipe.once('end', () => {
-      pipe.removeListener('data', onPipeData)
       util.destroy(pipe)
     })
 
-    function onPipeData (chunk) {
-      request.onBodySent(chunk)
-    }
-
     return
   }
 
@@ -2104,9 +2089,6 @@ async function writeBlob ({ h2stream, body, client, request, socket, contentLeng
       socket.uncork()
     }
 
-    request.onBodySent(buffer)
-    request.onRequestSent()
-
     if (!expectsPayload) {
       socket[kReset] = true
     }
@@ -2152,15 +2134,13 @@ async function writeIterable ({ h2stream, body, client, request, socket, content
         }
 
         const res = h2stream.write(chunk)
-        request.onBodySent(chunk)
         if (!res) {
           await waitForDrain()
         }
       }
     } catch (err) {
       h2stream.destroy(err)
     } finally {
-      request.onRequestSent()
       h2stream.end()
       h2stream
         .off('close', onDrain)
@@ -2211,7 +2191,7 @@ class AsyncWriter {
   }
 
   write (chunk) {
-    const { socket, request, contentLength, client, bytesWritten, expectsPayload, header } = this
+    const { socket, contentLength, client, bytesWritten, expectsPayload, header } = this
 
     if (socket[kError]) {
       throw socket[kError]
@@ -2259,8 +2239,6 @@ class AsyncWriter {
 
     socket.uncork()
 
-    request.onBodySent(chunk)
-
     if (!ret) {
       if (socket[kParser].timeout && socket[kParser].timeoutType === TIMEOUT_HEADERS) {
         // istanbul ignore else: only for jest
@@ -2274,8 +2252,7 @@ class AsyncWriter {
   }
 
   end () {
-    const { socket, contentLength, client, bytesWritten, expectsPayload, header, request } = this
-    request.onRequestSent()
+    const { socket, contentLength, client, bytesWritten, expectsPayload, header } = this
 
     socket[kWriting] = false
 

lib/core/diagnostics.js

@@ -14,7 +14,6 @@ const channels = {
   sendHeaders: diagnosticsChannel.channel('undici:client:sendHeaders'),
   // Request
   create: diagnosticsChannel.channel('undici:request:create'),
-  bodySent: diagnosticsChannel.channel('undici:request:bodySent'),
   headers: diagnosticsChannel.channel('undici:request:headers'),
   trailers: diagnosticsChannel.channel('undici:request:trailers'),
   error: diagnosticsChannel.channel('undici:request:error'),

lib/core/request.js

@@ -191,30 +191,6 @@ class Request {
     }
   }
 
-  onBodySent (chunk) {
-    if (this[kHandler].onBodySent) {
-      try {
-        return this[kHandler].onBodySent(chunk)
-      } catch (err) {
-        this.abort(err)
-      }
-    }
-  }
-
-  onRequestSent () {
-    if (channels.bodySent.hasSubscribers) {
-      channels.bodySent.publish({ request: this })
-    }
-
-    if (this[kHandler].onRequestSent) {
-      try {
-        return this[kHandler].onRequestSent()
-      } catch (err) {
-        this.abort(err)
-      }
-    }
-  }
-
   onConnect (abort) {
     assert(!this.aborted)
     assert(!this.completed)
@@ -227,10 +203,6 @@ class Request {
     }
   }
 
-  onResponseStarted () {
-    return this[kHandler].onResponseStarted?.()
-  }
-
   onHeaders (statusCode, headers, resume, statusText) {
     assert(!this.aborted)
     assert(!this.completed)

lib/core/util.js

@@ -323,10 +323,6 @@ function validateHandler (handler, method, upgrade) {
     throw new InvalidArgumentError('invalid onError method')
   }
 
-  if (typeof handler.onBodySent !== 'function' && handler.onBodySent !== undefined) {
-    throw new InvalidArgumentError('invalid onBodySent method')
-  }
-
   if (upgrade || method === 'CONNECT') {
     if (typeof handler.onUpgrade !== 'function') {
       throw new InvalidArgumentError('invalid onUpgrade method')

lib/fetch/index.js

@@ -2114,15 +2114,13 @@ async function httpNetworkFetch (
           timingInfo.finalNetworkRequestStartTime = coarsenedSharedCurrentTime(fetchParams.crossOriginIsolatedCapability)
         },
 
-        onResponseStarted () {
+        onHeaders (status, rawHeaders, resume, statusText) {
           // Set timingInfo’s final network-response start time to the coarsened shared current
           // time given fetchParams’s cross-origin isolated capability, immediately after the
           // user agent’s HTTP parser receives the first byte of the response (e.g., frame header
           // bytes for HTTP/2 or response status line for HTTP/1.x).
           timingInfo.finalNetworkResponseStartTime = coarsenedSharedCurrentTime(fetchParams.crossOriginIsolatedCapability)
-        },
 
-        onHeaders (status, rawHeaders, resume, statusText) {
           if (status < 200) {
             return
           }

lib/handler/DecoratorHandler.js

@@ -28,8 +28,4 @@ module.exports = class DecoratorHandler {
   onComplete (...args) {
     return this.handler.onComplete(...args)
   }
-
-  onBodySent (...args) {
-    return this.handler.onBodySent(...args)
-  }
 }

lib/handler/RedirectHandler.js

@@ -173,12 +173,6 @@ class RedirectHandler {
       this.handler.onComplete(trailers)
     }
   }
-
-  onBodySent (chunk) {
-    if (this.handler.onBodySent) {
-      this.handler.onBodySent(chunk)
-    }
-  }
 }
 
 function parseLocation (statusCode, headers) {

lib/handler/RetryHandler.js

@@ -74,12 +74,6 @@ class RetryHandler {
     })
   }
 
-  onRequestSent () {
-    if (this.handler.onRequestSent) {
-      this.handler.onRequestSent()
-    }
-  }
-
   onUpgrade (statusCode, headers, socket) {
     if (this.handler.onUpgrade) {
       this.handler.onUpgrade(statusCode, headers, socket)
@@ -94,10 +88,6 @@ class RetryHandler {
     }
   }
 
-  onBodySent (chunk) {
-    if (this.handler.onBodySent) return this.handler.onBodySent(chunk)
-  }
-
   static [kRetryHandlerDefaultRetry] (err, { state, opts }, cb) {
     const { statusCode, code, headers } = err
     const { method, retryOptions } = opts

test/http2.js

@@ -819,7 +819,7 @@ test('Should handle h2 request with body (string or buffer) - dispatch', async t
     stream.end('hello h2!')
   })
 
-  t = tspl(t, { plan: 7 })
+  t = tspl(t, { plan: 6 })
 
   server.listen(0, () => {
     const client = new Client(`https://localhost:${server.address().port}`, {
@@ -857,9 +857,6 @@ test('Should handle h2 request with body (string or buffer) - dispatch', async t
         onData (chunk) {
           response.push(chunk)
         },
-        onBodySent (body) {
-          t.strictEqual(body.toString('utf-8'), expectedBody)
-        },
         onComplete () {
           t.strictEqual(Buffer.concat(response).toString('utf-8'), 'hello h2!')
           t.strictEqual(

test/jest/interceptor.test.js

@@ -143,14 +143,6 @@ describe('interceptors with NtlmRequestHandler', () => {
         return this.handler.onComplete(...args)
       }
     }
-
-    onBodySent (...args) {
-      if (this.requestCount < 2) {
-        // Do nothing
-      } else {
-        return this.handler.onBodySent(...args)
-      }
-    }
   }
   let server