fixup

lib/core/request.js

@@ -229,9 +229,9 @@ class Request {
       abort.paused = false
       abort.aborted = false
       abort.internal = null
-      abort.abort = function (...args) {
+      abort.abort = function (err) {
         abort.aborted = true
-        abort(...args)
+        abort(err)
       }
       abort.pause = function () {
         abort.paused = true

lib/dispatcher/client-h2.js

@@ -458,7 +458,7 @@ function writeH2 (client, request) {
       stream.pause()
     }
 
-    if (request.onHeaders(Number(statusCode), realHeaders, resume, '') === false) {
+    if (request.onHeaders(Number(statusCode), parseH2Headers(realHeaders), resume, '') === false) {
       stream.pause()
     }
 

lib/mock/mock-utils.js

@@ -293,6 +293,7 @@ function mockDispatch (opts, handler) {
         super()
         this.resume = this.resume.bind(this)
         this.pause = this.pause.bind(this)
+        this.abort = this.abort.bind(this)
       }
 
       resume () {

test/node-test/client-dispatch.js

@@ -875,15 +875,15 @@ test('dispatches in expected order', async (t) => {
       method: 'POST',
       body: 'body'
     }, {
-      onConnect () {
+      onConnect (controller) {
+        assert(typeof controller.resume === 'function')
+        assert(typeof controller.pause === 'function')
         dispatches.push('onConnect')
       },
       onBodySent () {
         dispatches.push('onBodySent')
       },
-      onStart (controller) {
-        assert(typeof controller.resume === 'function')
-        assert(typeof controller.pause === 'function')
+      onStart () {
         dispatches.push('onStart')
       },
       onResponseStarted () {
@@ -937,15 +937,15 @@ test('dispatches in expected order for http2', async (t) => {
       method: 'POST',
       body: 'body'
     }, {
-      onConnect () {
+      onConnect (controller) {
+        assert(typeof controller.resume === 'function')
+        assert(typeof controller.pause === 'function')
         dispatches.push('onConnect')
       },
       onBodySent () {
         dispatches.push('onBodySent')
       },
-      onStart (controller) {
-        assert(typeof controller.resume === 'function')
-        assert(typeof controller.pause === 'function')
+      onStart () {
         dispatches.push('onStart')
       },
       onResponseStarted () {

types/dispatcher.d.ts

@@ -219,14 +219,16 @@ declare namespace Dispatcher {
   export interface Controller {
     pause (): void;
     resume (): void;
+    abort (err?): void;
     readonly paused: boolean;
+    readonly aborted: boolean;
   }
 
   export interface DispatchHandlers {
     /** 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. */
-    onConnect?(abort: () => void): void;
+    onConnect?(controller: Controller): void;
     /** */
-    onStart?(controller: Controller): void;
+    onStart?(): void;
     /** Invoked when an error has occurred. */
     onError?(err: Error): void;
     /** Invoked when request is upgraded either due to a `Upgrade` header or `CONNECT` method. */