Added timeout tests

Author: parthverma1

lib/http2/http2Agent.ts

@@ -61,12 +61,10 @@ export class Http2Agent extends EventEmitter {
 
       connection.once('connect', () => {
         // start the timeout only when the connection is in ready state, otherwise the connection closes early
-        connection.setTimeout(options?.timeout ?? 30000, () => {
+        connection.setTimeout(options?.timeout ?? 5000, () => {
           // @ts-expect-error
           if (connection.refCount === 0) {
-            connection.close(() => {
-              connection.destroy()
-            })
+            connection.close()
             delete this.connections[name]
           }
         })
@@ -157,5 +155,4 @@ export class Http2Agent extends EventEmitter {
   }
 }
 
-// export const
 export const globalAgent = new Http2Agent({})

lib/http2/request.ts

@@ -3,7 +3,8 @@ import * as http from 'http'
 import * as http2 from 'http2'
 import { EventEmitter } from 'events'
 import type * as https from 'https'
-import { type Http2Agent, HTTP2ClientRequestOptions, globalAgent } from './http2Agent'
+import { HTTP2ClientRequestOptions, globalAgent } from './http2Agent'
+import * as tls from "tls";
 
 export interface RequestOptions extends Omit<https.RequestOptions, 'agent' | 'createConnection' | 'protocol'> {
   agent?: {
@@ -22,6 +23,8 @@ export class Http2Request extends EventEmitter {
   stream: http2.ClientHttp2Stream
   private readonly _client: http2.ClientHttp2Session
   requestHeaders: http2.OutgoingHttpHeaders = {};
+  connectionHeaders = ['connection', 'host']
+  socket: tls.TLSSocket
 
   constructor (options: RequestOptions) {
     super()
@@ -51,12 +54,16 @@ export class Http2Request extends EventEmitter {
       [http2.constants.HTTP2_HEADER_AUTHORITY]: newoptions.host,
       ...headers
     }
+    this.socket = this._client.socket as tls.TLSSocket;
 
-    this.requestHeaders = Object.fromEntries(Object.entries(this.requestHeaders).filter(([key]) => !(options.blacklistHeaders ?? []).includes(key.toLowerCase())))
-    
-    // Remove blacklisted http/1 headers
-    delete this.requestHeaders.Connection
-    delete this.requestHeaders.Host
+    this.requestHeaders = Object.fromEntries(
+        Object.entries(this.requestHeaders)
+            .map(([key, value])=>([key.toLowerCase(), value]))
+            // @ts-ignore
+            .filter(([key]) => !(options.blacklistHeaders ?? []).includes(key))
+            // @ts-ignore
+            .filter(([key])=> !this.connectionHeaders.includes(key))
+    )
 
     this.stream = this._client.request(this.requestHeaders)
     this.registerListeners()
@@ -80,20 +87,14 @@ export class Http2Request extends EventEmitter {
     this.stream.on('close', (...args) => {
       this.emit('close', ...args)
     })
-    this.stream.on('socket', () => this.emit('socket', this._client.socket))
+
     this._client.once('error', this.onError)
     this.stream.on('response', (response) => {
       this.emit('response', new ResponseProxy(response, this))
-
-      // HTTP response events returns a readable stream which has data event that consumers listen on to get the response body
-      // With HTTP2 the response object is a header object and the body is streamed via the data event.
-      // To maintain compatibilty with the HTTP API, we need to emit the data after the response event is emitted
-      // And wait for the data listeners to be attached
     })
-    //
+
     this.stream.on('end', () => {
       this._client.off('error', this.onError)
-      this.emit('end')
     })
   }
 
@@ -120,7 +121,7 @@ export class Http2Request extends EventEmitter {
 
   on (eventName: string | symbol, listener: (...args: any[]) => void): this {
     if (eventName === 'socket') {
-      listener(this._client.socket)
+      listener(this.socket)
       return this
     }
 
@@ -164,7 +165,6 @@ class ResponseProxy extends EventEmitter {
   }
 
   registerRequestListeners () {
-    this.req.stream.on('end', () => this.emit('end'))
     this.req.stream.on('error', (e) => this.emit('error', e))
     this.req.stream.on('close', () => {
       this.emit('close')
@@ -183,6 +183,10 @@ class ResponseProxy extends EventEmitter {
         this.emit('data', chunk)
       })
     }
+
+    if(eventName === 'end'){
+      this.req.stream.on('end', listener)
+    }
     return this
   }
 
@@ -209,6 +213,7 @@ class ResponseProxy extends EventEmitter {
   }
 
   pause () {
+    console.log(performance.now(), 'pausing')
     this.req.stream.pause()
   }
 
@@ -223,4 +228,8 @@ class ResponseProxy extends EventEmitter {
   setEncoding (encoding: BufferEncoding) {
     this.req.stream.setEncoding(encoding)
   }
+
+  destroy(){
+    this.req.stream.destroy();
+  }
 }

lib/redirect.js

@@ -212,7 +212,10 @@ Redirect.prototype.onResponse = function (response) {
 
   options.protocolVersion = this.request.protocolVersion
 
-  request.init(options)
+  // Wait for request to end before firing redirect request
+  request.once('finish', () => {
+    request.init(options);
+  })
 
   return true
 }

request.js

@@ -922,7 +922,7 @@ Request.prototype.start = function () {
     // at the _exact_ same time, they should be close enough to be able to calculate
     // high-resolution, monotonically non-decreasing timestamps relative to startTime.
     var startTime = new Date().getTime()
-    var startTimeNow = now()
+    var startTimeNow = performance.now()
   }
 
   if (self._aborted) {
@@ -1212,13 +1212,13 @@ Request.prototype.onRequestResponse = function (response) {
   var self = this
 
   if (self.timing) {
-    self.timings.response = now() - self.startTimeNow
+    self.timings.response = performance.now() - self.startTimeNow
   }
 
   debug('onRequestResponse', self.uri.href, response.statusCode, response.headers)
   response.on('end', function () {
     if (self.timing) {
-      self.timings.end = now() - self.startTimeNow
+      self.timings.end = performance.now() - self.startTimeNow
       response.timingStart = self.startTime
       response.timingStartTimer = self.startTimeNow
 
@@ -1269,6 +1269,10 @@ Request.prototype.onRequestResponse = function (response) {
     }
 
     debug('response end', self.uri.href, response.statusCode, response.headers)
+
+    // Only consumed by redirects for now, in order to wait for current request to finish processing and then move onto
+    // the next one
+    self.emit('finish')
   })
 
   if (self._aborted) {