@applitools/spec-driver-webdriver 1.0.31 → 1.0.32

package/dist/spec-driver.js

@@ -30,7 +30,8 @@ exports.build = exports.switchWorld = exports.getWorlds = exports.getCurrentWorl
 const url_1 = require("url");
 const utils = __importStar(require("@applitools/utils"));
 const webdriver_1 = __importStar(require("webdriver"));
-const proxy_agent_1 = __importDefault(require("proxy-agent"));
+const http_proxy_agent_1 = __importDefault(require("http-proxy-agent"));
+const https_proxy_agent_1 = __importDefault(require("https-proxy-agent"));
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
 // #region HELPERS
@@ -103,7 +104,7 @@ function isSelector(selector) {
 }
 exports.isSelector = isSelector;
 function transformDriver(driver) {
-    var _a;
+    var _a, _b, _c;
     if (!utils.types.has(driver, ['sessionId', 'serverUrl']))
         return driver;
     const url = new URL(driver.serverUrl);
@@ -119,17 +120,21 @@ function transformDriver(driver) {
         ...environment,
     };
     if ((_a = driver.proxy) === null || _a === void 0 ? void 0 : _a.url) {
-        const agent = new proxy_agent_1.default({ ...(0, url_1.parse)(driver.proxy.url), rejectUnauthorized: false });
-        agent.callback = utils.general.wrap(agent.callback.bind(agent), (fn, request, options, ...rest) => {
+        const proxyUrl = new URL(driver.proxy.url);
+        proxyUrl.username = (_b = driver.proxy.username) !== null && _b !== void 0 ? _b : proxyUrl.username;
+        proxyUrl.password = (_c = driver.proxy.password) !== null && _c !== void 0 ? _c : proxyUrl.password;
+        const proxyOptions = { ...(0, url_1.parse)(proxyUrl.href), rejectUnauthorized: false };
+        const httpAgent = (0, http_proxy_agent_1.default)(proxyOptions);
+        const httpsAgent = (0, https_proxy_agent_1.default)(proxyOptions);
+        httpsAgent.callback = utils.general.wrap(httpsAgent.callback.bind(httpsAgent), (fn, request, options, ...rest) => {
             return fn(request, { ...options, rejectUnauthorized: false }, ...rest);
         });
-        options.agent = { http: agent, https: agent };
+        options.agent = { http: httpAgent, https: httpsAgent };
     }
     else {
-        const httpsAgent = new https_1.default.Agent({
-            rejectUnauthorized: false,
-        });
-        options.agent = { http: http_1.default.globalAgent, https: httpsAgent };
+        const httpAgent = http_1.default.globalAgent;
+        const httpsAgent = new https_1.default.Agent({ rejectUnauthorized: false });
+        options.agent = { http: httpAgent, https: httpsAgent };
     }
     if (!options.port) {
         if (options.protocol === 'http')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/spec-driver-webdriver",
-  "version": "1.0.31",
+  "version": "1.0.32",
   "keywords": [
     "webdriver",
     "chrome devtools protocol",
@@ -61,15 +61,16 @@
     "postversion": "bongo postversion"
   },
   "dependencies": {
-    "@applitools/driver": "1.11.51",
-    "@applitools/utils": "1.3.36",
-    "proxy-agent": "5.0.0"
+    "@applitools/driver": "1.12.0",
+    "@applitools/utils": "1.3.37",
+    "http-proxy-agent": "5.0.0",
+    "https-proxy-agent": "5.0.1"
   },
   "devDependencies": {
     "@applitools/api-extractor": "1.2.21",
-    "@applitools/bongo": "^3.0.3",
-    "@applitools/test-server": "^1.2.0",
-    "@applitools/test-utils": "1.5.16",
+    "@applitools/bongo": "^3.0.4",
+    "@applitools/test-server": "^1.2.1",
+    "@applitools/test-utils": "1.5.17",
     "@types/node": "^12.20.55",
     "nock": "^13.2.9",
     "webdriver": "^7.27.0"

package/types/index.d.ts

@@ -69,5 +69,5 @@ export type Selector = {
     __applitoolsBrand?: undefined;
 };
 export type SpecType = { driver: Driver; context: Driver; element: Element; selector: Selector; };
-export type StaticDriver = { sessionId: string; serverUrl: string; capabilities: Record<string, any>; proxy?: undefined | { url: string; }; };
+export type StaticDriver = { sessionId: string; serverUrl: string; capabilities: Record<string, any>; proxy?: undefined | { url: string; username?: undefined | string; password?: undefined | string; }; };
 export type StaticElement = { elementId: string; };