feat: enable keepAlive for webdriver communication

keepAlive allows Intern to re-use TCP connections, which can greatly speed up functional tests. references theintern#1057
jason0x43 · Jul 6, 2020 · e9c10af · e9c10af
1 parent a79d71a
commit e9c10af
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 37 deletions.
diff --git a/packages/common/src/lib/request.ts b/packages/common/src/lib/request.ts
@@ -8,7 +8,9 @@ import axios, {
   AxiosProxyConfig,
   AxiosResponse
 } from 'axios';
-import * as qs from 'qs';
+import { Agent as HttpAgent } from 'http';
+import { Agent as HttpsAgent } from 'https';
+import qs from 'qs';
 import Task, { CancellablePromise } from './Task';
 import Evented from './Evented';
 
@@ -38,6 +40,8 @@ export interface RequestOptions {
   user?: string;
   username?: string;
   onDownloadProgress?: (progressEvent: any) => void;
+  httpAgent?: HttpAgent;
+  httpsAgent?: HttpsAgent;
 }
 
 export interface ProgressEvent {
@@ -238,7 +242,7 @@ class ResponseClass<T = any> extends Evented<ProgressEvent>
       }
     }
 
-    return Task.resolve(this.stringValue!);
+    return Task.resolve(this.stringValue);
   }
 }
 
@@ -250,10 +254,10 @@ function getFileReaderPromise<T extends string | ArrayBuffer>(
   reader: FileReader
 ): Promise<T> {
   return new Promise((resolve, reject) => {
-    reader.onload = function() {
+    reader.onload = function () {
       resolve(<T>reader.result);
     };
-    reader.onerror = function() {
+    reader.onerror = function () {
       reject(reader.error);
     };
   });

diff --git a/packages/leadfoot/docs/api.json b/packages/leadfoot/docs/api.json
@@ -19249,7 +19249,7 @@
 							"sources": [
 								{
 									"fileName": "packages/leadfoot/src/Server.ts",
-									"line": 415,
+									"line": 419,
 									"character": 15
 								}
 							]
@@ -19343,7 +19343,7 @@
 							"sources": [
 								{
 									"fileName": "packages/leadfoot/src/Server.ts",
-									"line": 386,
+									"line": 390,
 									"character": 8
 								}
 							]
@@ -19398,7 +19398,7 @@
 							"sources": [
 								{
 									"fileName": "packages/leadfoot/src/Server.ts",
-									"line": 2035,
+									"line": 2039,
 									"character": 15
 								}
 							]
@@ -19492,7 +19492,7 @@
 							"sources": [
 								{
 									"fileName": "packages/leadfoot/src/Server.ts",
-									"line": 370,
+									"line": 374,
 									"character": 5
 								}
 							]
@@ -19548,7 +19548,7 @@
 							"sources": [
 								{
 									"fileName": "packages/leadfoot/src/Server.ts",
-									"line": 2028,
+									"line": 2032,
 									"character": 24
 								}
 							]
@@ -19592,7 +19592,7 @@
 							"sources": [
 								{
 									"fileName": "packages/leadfoot/src/Server.ts",
-									"line": 2002,
+									"line": 2006,
 									"character": 13
 								}
 							]
@@ -19633,7 +19633,7 @@
 							"sources": [
 								{
 									"fileName": "packages/leadfoot/src/Server.ts",
-									"line": 400,
+									"line": 404,
 									"character": 11
 								}
 							]
@@ -19727,7 +19727,7 @@
 							"sources": [
 								{
 									"fileName": "packages/leadfoot/src/Server.ts",
-									"line": 378,
+									"line": 382,
 									"character": 6
 								}
 							]
@@ -19790,7 +19790,7 @@
 							"sources": [
 								{
 									"fileName": "packages/leadfoot/src/Server.ts",
-									"line": 2200,
+									"line": 2204,
 									"character": 6
 								}
 							],
@@ -19808,7 +19808,7 @@
 							"sources": [
 								{
 									"fileName": "packages/leadfoot/src/Server.ts",
-									"line": 2199,
+									"line": 2203,
 									"character": 10
 								}
 							],
@@ -19831,7 +19831,7 @@
 					"sources": [
 						{
 							"fileName": "packages/leadfoot/src/Server.ts",
-							"line": 2198,
+							"line": 2202,
 							"character": 22
 						}
 					]
@@ -19874,7 +19874,7 @@
 													"sources": [
 														{
 															"fileName": "packages/leadfoot/src/Server.ts",
-															"line": 2040,
+															"line": 2044,
 															"character": 51
 														}
 													],
@@ -19896,7 +19896,7 @@
 																	"sources": [
 																		{
 																			"fileName": "packages/leadfoot/src/Server.ts",
-																			"line": 2040,
+																			"line": 2044,
 																			"character": 60
 																		}
 																	],
@@ -19918,7 +19918,7 @@
 															"sources": [
 																{
 																	"fileName": "packages/leadfoot/src/Server.ts",
-																	"line": 2040,
+																	"line": 2044,
 																	"character": 52
 																}
 															]
@@ -19934,7 +19934,7 @@
 													"sources": [
 														{
 															"fileName": "packages/leadfoot/src/Server.ts",
-															"line": 2040,
+															"line": 2044,
 															"character": 35
 														}
 													],
@@ -19957,7 +19957,7 @@
 											"sources": [
 												{
 													"fileName": "packages/leadfoot/src/Server.ts",
-													"line": 2040,
+													"line": 2044,
 													"character": 28
 												}
 											]
@@ -19974,7 +19974,7 @@
 					"sources": [
 						{
 							"fileName": "packages/leadfoot/src/Server.ts",
-							"line": 2040,
+							"line": 2044,
 							"character": 21
 						}
 					]
@@ -20015,7 +20015,7 @@
 					"sources": [
 						{
 							"fileName": "packages/leadfoot/src/Server.ts",
-							"line": 2068,
+							"line": 2072,
 							"character": 18
 						}
 					]
@@ -20056,7 +20056,7 @@
 					"sources": [
 						{
 							"fileName": "packages/leadfoot/src/Server.ts",
-							"line": 2073,
+							"line": 2077,
 							"character": 26
 						}
 					]
@@ -20141,7 +20141,7 @@
 					"sources": [
 						{
 							"fileName": "packages/leadfoot/src/Server.ts",
-							"line": 2078,
+							"line": 2082,
 							"character": 17
 						}
 					]
@@ -20234,7 +20234,7 @@
 					"sources": [
 						{
 							"fileName": "packages/leadfoot/src/Server.ts",
-							"line": 2143,
+							"line": 2147,
 							"character": 25
 						}
 					]
@@ -20327,7 +20327,7 @@
 					"sources": [
 						{
 							"fileName": "packages/leadfoot/src/Server.ts",
-							"line": 2117,
+							"line": 2121,
 							"character": 34
 						}
 					]
@@ -20368,7 +20368,7 @@
 					"sources": [
 						{
 							"fileName": "packages/leadfoot/src/Server.ts",
-							"line": 2090,
+							"line": 2094,
 							"character": 14
 						}
 					]
@@ -20409,7 +20409,7 @@
 					"sources": [
 						{
 							"fileName": "packages/leadfoot/src/Server.ts",
-							"line": 2095,
+							"line": 2099,
 							"character": 14
 						}
 					]
@@ -20502,7 +20502,7 @@
 					"sources": [
 						{
 							"fileName": "packages/leadfoot/src/Server.ts",
-							"line": 2104,
+							"line": 2108,
 							"character": 24
 						}
 					]
@@ -20595,7 +20595,7 @@
 					"sources": [
 						{
 							"fileName": "packages/leadfoot/src/Server.ts",
-							"line": 2130,
+							"line": 2134,
 							"character": 24
 						}
 					]
@@ -20683,7 +20683,7 @@
 					"sources": [
 						{
 							"fileName": "packages/leadfoot/src/Server.ts",
-							"line": 2161,
+							"line": 2165,
 							"character": 23
 						}
 					]
@@ -20710,7 +20710,7 @@
 					"sources": [
 						{
 							"fileName": "packages/leadfoot/src/Server.ts",
-							"line": 2186,
+							"line": 2190,
 							"character": 13
 						}
 					]
@@ -20757,7 +20757,7 @@
 					"sources": [
 						{
 							"fileName": "packages/leadfoot/src/Server.ts",
-							"line": 2194,
+							"line": 2198,
 							"character": 20
 						}
 					]

diff --git a/packages/leadfoot/src/Server.ts b/packages/leadfoot/src/Server.ts
@@ -112,15 +112,17 @@ export default class Server {
     };
 
     const headers = { ...defaultRequestHeaders };
+    const httpAgent = this._httpAgent;
+    const httpsAgent = this._httpsAgent;
 
     const kwArgs = {
       ...this.requestOptions,
       followRedirects: false,
       handleAs: 'text',
-      httpAgent: this._httpAgent,
-      httpsAgent: this._httpsAgent,
       headers,
-      method
+      method,
+      httpAgent,
+      httpsAgent
     } as RequestOptions;
 
     if (requestData) {
@@ -175,7 +177,9 @@ export default class Server {
           }
 
           return request(redirectUrl, {
-            headers: defaultRequestHeaders
+            headers: defaultRequestHeaders,
+            httpAgent,
+            httpsAgent
           }).then(handleResponse);
         }