From d8eac85ad70f44d6b1b0b66487fa844abde85f5c Mon Sep 17 00:00:00 2001 From: Jason Cassidy Date: Wed, 15 Sep 2021 11:23:02 +0100 Subject: [PATCH 1/3] fix: running tests / http requests where no proxy configured --- lib/common/http-client.ts | 16 ++++++++++------ lib/services/test-execution-service.ts | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/common/http-client.ts b/lib/common/http-client.ts index 84efc0bdb5..74310a5c55 100644 --- a/lib/common/http-client.ts +++ b/lib/common/http-client.ts @@ -6,6 +6,7 @@ import { injector } from "./yok"; import axios from "axios"; import { HttpStatusCodes } from "./constants"; import * as tunnel from "tunnel"; +import { Agent } from "http"; export class HttpClient implements Server.IHttpClient { private static STUCK_REQUEST_ERROR_MESSAGE = @@ -98,12 +99,15 @@ export class HttpClient implements Server.IHttpClient { this.$logger.trace("httpRequest: %s", util.inspect(options)); - const agent = tunnel.httpsOverHttp({ - proxy: { - host: cliProxySettings.hostname, - port: parseInt(cliProxySettings.port), - }, - }); + const agent = cliProxySettings + ? tunnel.httpsOverHttp({ + proxy: { + host: cliProxySettings.hostname, + port: parseInt(cliProxySettings.port), + }, + }) + : new Agent({ keepAlive: true }); // If no proxy use default. + const result = await axios({ url: options.url, headers: options.headers, diff --git a/lib/services/test-execution-service.ts b/lib/services/test-execution-service.ts index 472bb06212..653201a1f2 100644 --- a/lib/services/test-execution-service.ts +++ b/lib/services/test-execution-service.ts @@ -81,7 +81,7 @@ export class TestExecutionService implements ITestExecutionService { liveSyncInfo.projectDir, TestExecutionService.SOCKETIO_JS_FILE_NAME ), - socketIoJs + JSON.parse(socketIoJs) ); } From c5837df1cd6aed9fe76961669001ab61724db456 Mon Sep 17 00:00:00 2001 From: Jason Cassidy <47318351+jcassidyav@users.noreply.github.com> Date: Wed, 15 Sep 2021 15:51:43 +0100 Subject: [PATCH 2/3] fix: allow axios defaults for agent Co-authored-by: Igor Randjelovic --- lib/common/http-client.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/common/http-client.ts b/lib/common/http-client.ts index 74310a5c55..b98e7a2b98 100644 --- a/lib/common/http-client.ts +++ b/lib/common/http-client.ts @@ -99,15 +99,15 @@ export class HttpClient implements Server.IHttpClient { this.$logger.trace("httpRequest: %s", util.inspect(options)); - const agent = cliProxySettings - ? tunnel.httpsOverHttp({ - proxy: { - host: cliProxySettings.hostname, - port: parseInt(cliProxySettings.port), - }, - }) - : new Agent({ keepAlive: true }); // If no proxy use default. - + let agent; + if (cliProxySettings) { + agent = tunnel.httpsOverHttp({ + proxy: { + host: cliProxySettings.hostname, + port: parseInt(cliProxySettings.port), + }, + }); + } const result = await axios({ url: options.url, headers: options.headers, From e596843875dfc6b5c53a0b2987d37d68dba63fa1 Mon Sep 17 00:00:00 2001 From: Jason Cassidy Date: Wed, 15 Sep 2021 15:53:56 +0100 Subject: [PATCH 3/3] cleanup: remove unneeded import --- lib/common/http-client.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/common/http-client.ts b/lib/common/http-client.ts index b98e7a2b98..a8bc49acb3 100644 --- a/lib/common/http-client.ts +++ b/lib/common/http-client.ts @@ -6,7 +6,6 @@ import { injector } from "./yok"; import axios from "axios"; import { HttpStatusCodes } from "./constants"; import * as tunnel from "tunnel"; -import { Agent } from "http"; export class HttpClient implements Server.IHttpClient { private static STUCK_REQUEST_ERROR_MESSAGE =