@mablhq/mabl-cli 1.25.15 → 1.26.5

package/util/asyncUtil.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.filterAsync = exports.mapAsync = exports.TimeoutError = exports.promiseWithTimeout = void 0;
 const loggingProvider_1 = require("../providers/logging/loggingProvider");
-async function promiseWithTimeout(promise, timeoutMillis, description) {
+async function promiseWithTimeout(promise, timeoutMillis, description, timeoutType = 'mabl promise timeout') {
     const startTimeMillis = new Date().getTime();
-    const { timer, cancelTimer } = startTimer(timeoutMillis, description);
+    const { timer, cancelTimer } = startTimer(timeoutMillis, description, timeoutType);
     try {
         const result = await Promise.race([timer, promise]);
         if (loggingProvider_1.logger.isDebugEnabled()) {
@@ -24,18 +24,19 @@ async function promiseWithTimeout(promise, timeoutMillis, description) {
 }
 exports.promiseWithTimeout = promiseWithTimeout;
 class TimeoutError extends Error {
-    constructor(timeoutMillis, description) {
-        super(`[mabl promise timeout] "${description}" timed out after ${timeoutMillis}ms`);
+    constructor(timeoutMillis, description, timeoutType) {
+        super(`[${timeoutType}] "${description}" timed out after ${timeoutMillis}ms`);
         this.timeoutMillis = timeoutMillis;
         this.description = description;
+        this.timeoutType = timeoutType;
         Object.setPrototypeOf(this, TimeoutError.prototype);
     }
 }
 exports.TimeoutError = TimeoutError;
-const startTimer = (timeoutMillis, description) => {
+const startTimer = (timeoutMillis, description, timeoutType) => {
     let timeout;
     const promise = new Promise((_resolve, reject) => {
-        timeout = global.setTimeout(() => reject(new TimeoutError(timeoutMillis, description)), timeoutMillis);
+        timeout = global.setTimeout(() => reject(new TimeoutError(timeoutMillis, description, timeoutType)), timeoutMillis);
         timeout.unref();
     });
     return {

package/util/httpUtil.js

@@ -28,6 +28,7 @@ const cliConfigProvider_1 = require("../providers/cliConfigProvider");
 const https = __importStar(require("https"));
 const pureUtil_1 = require("./pureUtil");
 const https_proxy_agent_1 = require("https-proxy-agent");
+const hpagent_1 = require("hpagent");
 exports.USER_AGENT = `${(0, pureUtil_1.getCliName)()}@${(0, pureUtil_1.getCliVersion)()}`;
 exports.USER_AGENT_HEADER = 'User-Agent';
 exports.EXECUTION_ENGINE_SSL_VERIFY = false;
@@ -51,7 +52,7 @@ function axiosProxyConfig(httpConfig) {
     if ((_a = httpConfig.proxyHost) === null || _a === void 0 ? void 0 : _a.href) {
         config.proxy = proxyUrlToPortConfig(httpConfig.proxyHost);
     }
-    return maybeGetModifiedAxiosConfigForHttpProxy(config, httpConfig.sslVerify);
+    return maybeGetModifiedAxiosConfigForHttpProxy(config, httpConfig.sslVerify, httpConfig.proxyType);
 }
 exports.axiosProxyConfig = axiosProxyConfig;
 function escapeRegexDots(input) {
@@ -80,7 +81,7 @@ function proxyUrlToPortConfig(proxyUrl) {
     return config;
 }
 exports.proxyUrlToPortConfig = proxyUrlToPortConfig;
-function maybeGetModifiedAxiosConfigForHttpProxy(config, sslVerify) {
+function maybeGetModifiedAxiosConfigForHttpProxy(config, sslVerify, proxyType) {
     var _a, _b;
     if (config.proxy &&
         (((_a = config.proxy) === null || _a === void 0 ? void 0 : _a.protocol) === 'http:' || ((_b = config.proxy) === null || _b === void 0 ? void 0 : _b.protocol) === 'http')) {
@@ -89,16 +90,35 @@ function maybeGetModifiedAxiosConfigForHttpProxy(config, sslVerify) {
         };
         newConfig.proxy = false;
         const authConfig = config.proxy.auth;
-        const configOptions = {
-            host: config.proxy.host,
-            port: config.proxy.port,
-            auth: authConfig
-                ? `${authConfig.username}:${authConfig.password}`
-                : undefined,
-            rejectUnauthorized: sslVerify !== false,
-        };
-        newConfig.httpsAgent = new https_proxy_agent_1.HttpsProxyAgent(configOptions);
-        newConfig.httpAgent = new https_proxy_agent_1.HttpsProxyAgent(configOptions);
+        if (proxyType === 'current') {
+            let proxyString = 'http://';
+            if (authConfig !== undefined) {
+                proxyString += `${authConfig.username}:${authConfig.password}@`;
+            }
+            proxyString += `${config.proxy.host}:${config.proxy.port}`;
+            const agentConfig = {
+                keepAlive: true,
+                keepAliveMsecs: 1000,
+                maxSockets: 256,
+                maxFreeSockets: 256,
+                proxy: proxyString,
+                rejectUnauthorized: sslVerify !== false,
+            };
+            newConfig.httpsAgent = new hpagent_1.HttpsProxyAgent(agentConfig);
+            newConfig.httpAgent = new hpagent_1.HttpsProxyAgent(agentConfig);
+        }
+        else {
+            const configOptions = {
+                host: config.proxy.host,
+                port: config.proxy.port,
+                auth: authConfig
+                    ? `${authConfig.username}:${authConfig.password}`
+                    : undefined,
+                rejectUnauthorized: sslVerify !== false,
+            };
+            newConfig.httpsAgent = new https_proxy_agent_1.HttpsProxyAgent(configOptions);
+            newConfig.httpAgent = new https_proxy_agent_1.HttpsProxyAgent(configOptions);
+        }
         return newConfig;
     }
     return config;

package/browserLauncher/runnerType.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RunnerType = void 0;
-var RunnerType;
-(function (RunnerType) {
-    RunnerType["Playwright"] = "playwright";
-})(RunnerType = exports.RunnerType || (exports.RunnerType = {}));

package/domUtil/index.js.LICENSE.txt

@@ -1,14 +0,0 @@
-/**
- * @license Complex.js v2.1.1 12/05/2020
- *
- * Copyright (c) 2020, Robert Eisele (robert@xarg.org)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- **/
-
-/**
- * @license Fraction.js v4.2.0 05/03/2022
- * https://www.xarg.org/2014/03/rational-numbers-in-javascript/
- *
- * Copyright (c) 2021, Robert Eisele (robert@xarg.org)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- **/

package/mablscript/AttributesConstants.js

@@ -1,115 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ALLOWED_ASSERTABLE_EMAIL_ATTRS_PROPS = exports.isAllowedAssertableUrlAttrProps = exports.ALLOWED_ASSERTABLE_URL_ATTRS_PROPS = exports.ALLOWED_ASSERTABLE_COOKIES_ATTRS_PROPS = exports.ALLOWED_ASSERTABLE_ATTRS_PROPS = void 0;
-exports.ALLOWED_ASSERTABLE_ATTRS_PROPS = [
-    'accessKey',
-    'accessKeyLabel',
-    'align',
-    'alt',
-    'aria-checked',
-    'aria-label',
-    'aria-labelledby',
-    'aria-disabled',
-    'autofocus',
-    'border',
-    'checked',
-    'class',
-    'className',
-    'clientHeight',
-    'clientLeft',
-    'clientTop',
-    'clientWidth',
-    'complete',
-    'computedName',
-    'computedRole',
-    'contentEditable',
-    'contextMenu',
-    'crossOrigin',
-    'currentSrc',
-    'dataset',
-    'defaultChecked',
-    'defaultValue',
-    'dir',
-    'disabled',
-    'draggable',
-    'formEncType',
-    'formMethod',
-    'formNoValidate',
-    'formTarget',
-    'height',
-    'hidden',
-    'href',
-    'hspace',
-    'id',
-    'indeterminate',
-    'inert',
-    'innerText',
-    'isContentEditable',
-    'isMap',
-    'itemId',
-    'itemScope',
-    'lang',
-    'length',
-    'localName',
-    'longDesc',
-    'lowSrc',
-    'maxLength',
-    'multiple',
-    'name',
-    'namespaceURI',
-    'naturalHeight',
-    'naturalWidth',
-    'noModule',
-    'offsetHeight',
-    'offsetLeft',
-    'offsetTop',
-    'offsetWidth',
-    'prefix',
-    'referrerPolicy',
-    'required',
-    'selectedIndex',
-    'size',
-    'sizes',
-    'slot',
-    'src',
-    'srcset',
-    'tabIndex',
-    'tagName',
-    'title',
-    'translate',
-    'type',
-    'validationMessage',
-    'validity',
-    'value',
-    'vspace',
-    'width',
-    'willValidate',
-];
-exports.ALLOWED_ASSERTABLE_COOKIES_ATTRS_PROPS = [
-    'domain',
-    'http_only',
-    'name',
-    'path',
-    'expires',
-    'secure',
-    'value',
-];
-exports.ALLOWED_ASSERTABLE_URL_ATTRS_PROPS = [
-    'hash',
-    'host',
-    'hostname',
-    'href',
-    'password',
-    'pathname',
-    'port',
-    'protocol',
-    'search',
-    'username',
-];
-const ALLOWED_ASSERTABLE_URL_ATTRS_PROPS_SET = new Set(exports.ALLOWED_ASSERTABLE_URL_ATTRS_PROPS);
-const isAllowedAssertableUrlAttrProps = (x) => ALLOWED_ASSERTABLE_URL_ATTRS_PROPS_SET.has(x);
-exports.isAllowedAssertableUrlAttrProps = isAllowedAssertableUrlAttrProps;
-exports.ALLOWED_ASSERTABLE_EMAIL_ATTRS_PROPS = [
-    'from',
-    'subject',
-];