remove anti-pattern dispatcher hooks (nodejs#2723)

Author: ronag

docs/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.

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

@@ -192,30 +192,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)
@@ -228,10 +204,6 @@ class Request {
     }
   }
 
-  onResponseStarted () {
-    return this[kHandler].onResponseStarted?.()
-  }
-
   onHeaders (statusCode, headers, resume, statusText) {
     assert(!this.aborted)
     assert(!this.completed)

lib/core/util.js

@@ -413,10 +413,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')

test/http2.js

@@ -819,7 +819,11 @@ test('Should handle h2 request with body (string or buffer) - dispatch', async t
     stream.end('hello h2!')
   })
 
+<<<<<<< HEAD
   t = tspl(t, { plan: 9 })
+=======
+  t = tspl(t, { plan: 6 })
+>>>>>>> ddabe919... remove anti-pattern dispatcher hooks (#2723)
 
   server.listen(0, () => {
     const client = new Client(`https://localhost:${server.address().port}`, {
@@ -859,9 +863,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
 

test/mock-agent.js

@@ -144,7 +144,7 @@ describe('MockAgent - dispatch', () => {
   })
 
   test('should throw if handler is not valid on redirect', (t) => {
-    t = tspl(t, { plan: 7 })
+    t = tspl(t, { plan: 6 })
 
     const baseUrl = 'http://localhost:9999'
 
@@ -168,24 +168,13 @@ describe('MockAgent - dispatch', () => {
       onConnect: 'INVALID'
     }), new InvalidArgumentError('invalid onConnect method'))
 
-    t.throws(() => mockAgent.dispatch({
-      origin: baseUrl,
-      path: '/foo',
-      method: 'GET'
-    }, {
-      onError: (err) => { throw err },
-      onConnect: () => {},
-      onBodySent: 'INVALID'
-    }), new InvalidArgumentError('invalid onBodySent method'))
-
     t.throws(() => mockAgent.dispatch({
       origin: baseUrl,
       path: '/foo',
       method: 'CONNECT'
     }, {
       onError: (err) => { throw err },
       onConnect: () => {},
-      onBodySent: () => {},
       onUpgrade: 'INVALID'
     }), new InvalidArgumentError('invalid onUpgrade method'))
 
@@ -196,7 +185,6 @@ describe('MockAgent - dispatch', () => {
     }, {
       onError: (err) => { throw err },
       onConnect: () => {},
-      onBodySent: () => {},
       onHeaders: 'INVALID'
     }), new InvalidArgumentError('invalid onHeaders method'))
 
@@ -207,7 +195,6 @@ describe('MockAgent - dispatch', () => {
     }, {
       onError: (err) => { throw err },
       onConnect: () => {},
-      onBodySent: () => {},
       onHeaders: () => {},
       onData: 'INVALID'
     }), new InvalidArgumentError('invalid onData method'))
@@ -219,7 +206,6 @@ describe('MockAgent - dispatch', () => {
     }, {
       onError: (err) => { throw err },
       onConnect: () => {},
-      onBodySent: () => {},
       onHeaders: () => {},
       onData: () => {},
       onComplete: 'INVALID'
@@ -789,8 +775,13 @@ test('MockAgent - handle delays to simulate work', async (t) => {
 
   const response = await getResponse(body)
   t.strictEqual(response, 'hello')
+<<<<<<< HEAD
   const elapsedInMs = Math.ceil(process.hrtime(start)[1] / 1e6)
   t.ok(elapsedInMs >= 50, `Elapsed time is not greater than 50ms: ${elapsedInMs}`)
+=======
+  const elapsedInMs = process.hrtime(start)[1] / 1e6
+  t.ok(elapsedInMs >= 49, `Elapsed time is not greater than 50ms: ${elapsedInMs}`)
+>>>>>>> ddabe919... remove anti-pattern dispatcher hooks (#2723)
 })
 
 test('MockAgent - should persist requests', async (t) => {