@applitools/spec-driver-webdriver 1.1.26 → 1.2.1

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## [1.2.1](https://github.com/Applitools-Dev/sdk/compare/js/spec-driver-webdriver@1.2.0...js/spec-driver-webdriver@1.2.1) (2025-03-30)
+
+
+### Dependencies
+
+* @applitools/utils bumped to 1.8.0
+  #### Features
+
+  * allow sending callback functions to waitBeforeCapture ([#2780](https://github.com/Applitools-Dev/sdk/issues/2780)) ([4caa2e8](https://github.com/Applitools-Dev/sdk/commit/4caa2e8ae055d3dd48164eeceaa4c691eeadcdd4))
+* @applitools/logger bumped to 2.1.2
+
+* @applitools/driver bumped to 1.21.0
+  #### Features
+
+  * allow sending callback functions to waitBeforeCapture ([#2780](https://github.com/Applitools-Dev/sdk/issues/2780)) ([4caa2e8](https://github.com/Applitools-Dev/sdk/commit/4caa2e8ae055d3dd48164eeceaa4c691eeadcdd4))
+
+
+
+
+## [1.2.0](https://github.com/Applitools-Dev/sdk/compare/js/spec-driver-webdriver@1.1.26...js/spec-driver-webdriver@1.2.0) (2025-03-13)
+
+
+### Features
+
+* support HTTPS_PROXY and HTTP_PROXY environment variables ([#2795](https://github.com/Applitools-Dev/sdk/issues/2795)) ([226ae08](https://github.com/Applitools-Dev/sdk/commit/226ae08627381a1212df8b938c6576e82c777914))
+
 ## [1.1.26](https://github.com/Applitools-Dev/sdk/compare/js/spec-driver-webdriver@1.1.25...js/spec-driver-webdriver@1.1.26) (2025-02-26)
 
 

package/dist/spec-driver.js

@@ -94,6 +94,16 @@ function getFrameworkMajorVersion() {
 function getWebDriver() {
     return getFrameworkMajorVersion() < 8 ? require('webdriver').default : require('webdriver');
 }
+function getAgents(httpUrl, httpsUrl) {
+    const httpProxyOptions = { ...(0, url_1.parse)(httpUrl.href), rejectUnauthorized: false };
+    const httpAgent = (0, http_proxy_agent_1.default)(httpProxyOptions);
+    const httpsProxyOptions = { ...(0, url_1.parse)(httpsUrl.href), rejectUnauthorized: false };
+    const httpsAgent = (0, https_proxy_agent_1.default)(httpsProxyOptions);
+    httpsAgent.callback = utils.general.wrap(httpsAgent.callback.bind(httpsAgent), (fn, request, options, ...rest) => {
+        return fn(request, { ...options, rejectUnauthorized: false }, ...rest);
+    });
+    return { httpAgent, httpsAgent };
+}
 function isDriver(driver) {
     if (!driver)
         return false;
@@ -146,7 +156,7 @@ function isStaleElementError(error) {
 }
 exports.isStaleElementError = isStaleElementError;
 function toDriver(driver) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     let transformedDriver;
     if (utils.types.has(driver, ['sessionId', 'serverUrl'])) {
         const url = new URL(driver.serverUrl);
@@ -171,12 +181,14 @@ function toDriver(driver) {
             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);
-            });
+            const { httpAgent, httpsAgent } = getAgents(proxyUrl, proxyUrl);
+            options.agent = { http: httpAgent, https: httpsAgent };
+        }
+        else if (process.env.HTTP_PROXY || process.env.HTTPS_PROXY) {
+            // these could be different but if not set as same
+            const httpUrl = new URL(((_d = process.env.HTTP_PROXY) !== null && _d !== void 0 ? _d : process.env.HTTPS_PROXY));
+            const httpsUrl = new URL(((_e = process.env.HTTPS_PROXY) !== null && _e !== void 0 ? _e : process.env.HTTP_PROXY));
+            const { httpAgent, httpsAgent } = getAgents(httpUrl, httpsUrl);
             options.agent = { http: httpAgent, https: httpsAgent };
         }
         else {
@@ -483,6 +495,7 @@ const browserOptionsNames = {
  * installed in the SDK, then this function will error.
  */
 async function build(env) {
+    var _a, _b;
     const WebDriver = getWebDriver();
     const parseEnv = require('@applitools/test-utils/src/parse-env');
     const { browser = '', capabilities, url, proxy, configurable = true, args = [], headless, logLevel = 'silent', } = parseEnv(env);
@@ -518,7 +531,15 @@ async function build(env) {
             noProxy: proxy.bypass.join(','),
         };
     }
-    options.agent = { https: require('https').Agent({ rejectUnauthorized: false }) };
+    if (process.env.HTTP_PROXY || process.env.HTTPS_PROXY) {
+        const httpUrl = new URL(((_a = process.env.HTTP_PROXY) !== null && _a !== void 0 ? _a : process.env.HTTPS_PROXY));
+        const httpsUrl = new URL(((_b = process.env.HTTPS_PROXY) !== null && _b !== void 0 ? _b : process.env.HTTP_PROXY));
+        const { httpAgent, httpsAgent } = getAgents(httpUrl, httpsUrl);
+        options.agent = { http: httpAgent, https: httpsAgent };
+    }
+    else {
+        options.agent = { https: require('https').Agent({ rejectUnauthorized: false }) };
+    }
     const driver = await WebDriver.newSession(options);
     return [driver, () => driver.deleteSession()];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/spec-driver-webdriver",
-  "version": "1.1.26",
+  "version": "1.2.1",
   "keywords": [
     "webdriver",
     "chrome devtools protocol",
@@ -49,8 +49,8 @@
     "up:framework": "echo \"$(jq '.devDependencies.webdriver = $ENV.APPLITOOLS_FRAMEWORK_VERSION' ./package.json)\" > ./package.json"
   },
   "dependencies": {
-    "@applitools/driver": "1.20.5",
-    "@applitools/utils": "1.7.8",
+    "@applitools/driver": "1.21.0",
+    "@applitools/utils": "1.8.0",
     "http-proxy-agent": "5.0.0",
     "https-proxy-agent": "5.0.1"
   },

package/types/index.d.ts

@@ -73,6 +73,7 @@ export type SecondarySpecType = {
     element: StaticElement;
     selector: never;
     secondary: never;
+    userFunction: unknown;
 };
 export type Driver<TOriginalDriver = unknown> = import('webdriver').Client & { original: TOriginalDriver; } & { __applitoolsBrand?: undefined; };
 export type Element = ({ 'element-6066-11e4-a52e-4f735466cecf': string; } | { ELEMENT: string; }) & { __applitoolsBrand?: undefined; };
@@ -91,5 +92,6 @@ export type PrimarySpecType = {
     element: Element;
     selector: Selector;
     secondary: SecondarySpecType;
+    userFunction: unknown;
 };
 export type SpecDriver = import('@applitools/driver').SpecDriver<PrimarySpecType>;