fixup

Author: ronag

lib/client.js

@@ -73,7 +73,6 @@ const {
   kMaxResponseSize,
   kHTTPConnVersion,
   // HTTP2
-  kHost,
   kHTTP2SessionState,
   kHTTP2BuildRequest,
   kHTTP2CopyHeaders,
@@ -285,7 +284,6 @@ class Client extends DispatcherBase {
           openStreams: 0, // Keep track of them to decide whether or not unref the session
           maxConcurrentStreams: maxConcurrentStreams != null ? maxConcurrentStreams : 100 // Max peerConcurrentStreams for a Node h2 server
         }
-    this[kHost] = `${this[kUrl].hostname}${this[kUrl].port ? `:${this[kUrl].port}` : ''}`
 
     // kQueue is built up of 3 sections separated by
     // the kRunningIdx and kPendingIdx indices.
@@ -395,8 +393,6 @@ class Client extends DispatcherBase {
         resolve()
       }
 
-      this[kHTTP2SessionState] = null
-
       if (this[kSocket]) {
         util.destroy(this[kSocket].on('close', callback), err)
       } else {
@@ -408,63 +404,6 @@ class Client extends DispatcherBase {
   }
 }
 
-function onHttp2SessionError (err) {
-  assert(err.code !== 'ERR_TLS_CERT_ALTNAME_INVALID')
-
-  this[kSocket][kError] = err
-
-  onError(this[kClient], err)
-}
-
-function onHttp2FrameError (type, code, id) {
-  const err = new InformationalError(`HTTP/2: "frameError" received - type ${type}, code ${code}`)
-
-  if (id === 0) {
-    this[kSocket][kError] = err
-    onError(this[kClient], err)
-  }
-}
-
-function onHttp2SessionEnd () {
-  util.destroy(this, new SocketError('other side closed'))
-  util.destroy(this[kSocket], new SocketError('other side closed'))
-}
-
-function onHTTP2GoAway (code) {
-  const client = this[kClient]
-  const err = new InformationalError(`HTTP/2: "GOAWAY" frame received with code ${code}`)
-  client[kSocket] = null
-
-  if (client.destroyed) {
-    assert(this[kPending] === 0)
-
-    // Fail entire queue.
-    const requests = client[kQueue].splice(client[kRunningIdx])
-    for (let i = 0; i < requests.length; i++) {
-      const request = requests[i]
-      errorRequest(this, request, err)
-    }
-  } else if (client[kRunning] > 0) {
-    // Fail head of pipeline.
-    const request = client[kQueue][client[kRunningIdx]]
-    client[kQueue][client[kRunningIdx]++] = null
-
-    errorRequest(client, request, err)
-  }
-
-  client[kPendingIdx] = client[kRunningIdx]
-
-  assert(client[kRunning] === 0)
-
-  client.emit('disconnect',
-    client[kUrl],
-    [client],
-    err
-  )
-
-  resume(client)
-}
-
 const constants = require('./llhttp/constants')
 const createRedirectInterceptor = require('./interceptor/redirectInterceptor')
 const EMPTY_BUF = Buffer.alloc(0)
@@ -1222,10 +1161,59 @@ async function connect (client) {
       })
 
       client[kHTTPConnVersion] = 'h2'
-      session.on('error', onHttp2SessionError)
-      session.on('frameError', onHttp2FrameError)
-      session.on('end', onHttp2SessionEnd)
-      session.on('goaway', onHTTP2GoAway)
+      session.on('error', err => {
+        assert(err.code !== 'ERR_TLS_CERT_ALTNAME_INVALID')
+
+        this[kSocket][kError] = err
+
+        onError(this[kClient], err)
+      })
+      session.on('frameError', (type, code, id) => {
+        const err = new InformationalError(`HTTP/2: "frameError" received - type ${type}, code ${code}`)
+
+        if (id === 0) {
+          this[kSocket][kError] = err
+          onError(this[kClient], err)
+        }
+      })
+      session.on('end', () => {
+        util.destroy(session, new SocketError('other side closed'))
+        util.destroy(socket, new SocketError('other side closed'))
+      })
+      session.on('goaway', (code) => {
+        const client = this[kClient]
+        const err = new InformationalError(`HTTP/2: "GOAWAY" frame received with code ${code}`)
+        client[kSocket] = null
+
+        if (client.destroyed) {
+          assert(this[kPending] === 0)
+
+          // Fail entire queue.
+          const requests = client[kQueue].splice(client[kRunningIdx])
+          for (let i = 0; i < requests.length; i++) {
+            const request = requests[i]
+            errorRequest(this, request, err)
+          }
+        } else if (client[kRunning] > 0) {
+          // Fail head of pipeline.
+          const request = client[kQueue][client[kRunningIdx]]
+          client[kQueue][client[kRunningIdx]++] = null
+
+          errorRequest(client, request, err)
+        }
+
+        client[kPendingIdx] = client[kRunningIdx]
+
+        assert(client[kRunning] === 0)
+
+        client.emit('disconnect',
+          client[kUrl],
+          [client],
+          err
+        )
+
+        resume(client)
+      })
       session.on('close', onSocketClose)
       session.unref()
 
@@ -1665,7 +1653,9 @@ function writeH2 (client, session, request) {
   let stream
   const h2State = client[kHTTP2SessionState]
 
-  headers[HTTP2_HEADER_AUTHORITY] = host || client[kHost]
+  const { hostname, port } = client[kUrl]
+
+  headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port ? `:${port}` : ''}`
   headers[HTTP2_HEADER_METHOD] = method
 
   try {