@mablhq/mabl-cli 2.78.5 → 2.79.1

package/http/agentUtil.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getHttpAgent = getHttpAgent;
+const agent_base_1 = require("agent-base");
+const socks_proxy_agent_1 = require("socks-proxy-agent");
+const MablHttpAgent_1 = require("./MablHttpAgent");
+const RequestFilteringHttpAgent_1 = require("./RequestFilteringHttpAgent");
+function getHttpAgent(shouldFilterHttpRequests, linkServers, proxyConfig) {
+    const linkAgent = maybeGetSocksAgent(linkServers);
+    if (linkAgent) {
+        return MablHttpAgent_1.MablHttpAgent.createNewInstance({
+            httpAgent: linkAgent,
+            httpsAgent: linkAgent,
+        });
+    }
+    else if (shouldFilterHttpRequests) {
+        return RequestFilteringHttpAgent_1.RequestFilteringHttpAgent.createNewInstance();
+    }
+    return MablHttpAgent_1.MablHttpAgent.createNewInstance({ proxyConfig });
+}
+function maybeGetSocksAgent(linkServers) {
+    if (!linkServers?.length) {
+        return;
+    }
+    const agentOptions = linkServers.map((linkServer) => ({
+        host: linkServer.forwarding_host,
+        port: linkServer.forwarding_port,
+        userId: linkServer.workspace_id,
+        password: linkServer.label,
+        tls: {
+            rejectUnauthorized: false,
+        },
+    }));
+    if (agentOptions.length === 1) {
+        return new socks_proxy_agent_1.SocksProxyAgent(agentOptions[0]);
+    }
+    return new MultiSocksProxyAgent(agentOptions);
+}
+class MultiSocksProxyAgent extends agent_base_1.Agent {
+    constructor(options) {
+        super();
+        this.agents = options.map((proxy) => new socks_proxy_agent_1.SocksProxyAgent(proxy));
+    }
+    async callback(req, opts) {
+        return this.selectAgent().callback(req, opts);
+    }
+    selectAgent() {
+        return this.agents[Math.floor(Math.random() * this.agents.length)];
+    }
+    destroy() {
+        this.agents.forEach((agent) => agent.destroy());
+    }
+}

package/http/httpUtil.js

@@ -1,63 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GENERAL_API_STEP_EXECUTION_ERROR_CODE = exports.EXECUTION_ENGINE_SSL_VERIFY = exports.USER_AGENT_HEADER = exports.USER_AGENT = void 0;
-exports.getHttpAgent = getHttpAgent;
 exports.postProcessHeaders = postProcessHeaders;
-const agent_base_1 = require("agent-base");
-const socks_proxy_agent_1 = require("socks-proxy-agent");
 const pureUtil_1 = require("../util/pureUtil");
-const MablHttpAgent_1 = require("./MablHttpAgent");
-const RequestFilteringHttpAgent_1 = require("./RequestFilteringHttpAgent");
 exports.USER_AGENT = `${(0, pureUtil_1.getCliName)()}@${(0, pureUtil_1.getCliVersion)()}`;
 exports.USER_AGENT_HEADER = 'User-Agent';
 exports.EXECUTION_ENGINE_SSL_VERIFY = false;
 exports.GENERAL_API_STEP_EXECUTION_ERROR_CODE = '-1';
-function getHttpAgent(shouldFilterHttpRequests, linkServers, proxyConfig) {
-    const linkAgent = maybeGetSocksAgent(linkServers);
-    if (linkAgent) {
-        return MablHttpAgent_1.MablHttpAgent.createNewInstance({
-            httpAgent: linkAgent,
-            httpsAgent: linkAgent,
-        });
-    }
-    else if (shouldFilterHttpRequests) {
-        return RequestFilteringHttpAgent_1.RequestFilteringHttpAgent.createNewInstance();
-    }
-    return MablHttpAgent_1.MablHttpAgent.createNewInstance({ proxyConfig });
-}
-function maybeGetSocksAgent(linkServers) {
-    if (!linkServers?.length) {
-        return;
-    }
-    const agentOptions = linkServers.map((linkServer) => ({
-        host: linkServer.forwarding_host,
-        port: linkServer.forwarding_port,
-        userId: linkServer.workspace_id,
-        password: linkServer.label,
-        tls: {
-            rejectUnauthorized: false,
-        },
-    }));
-    if (agentOptions.length === 1) {
-        return new socks_proxy_agent_1.SocksProxyAgent(agentOptions[0]);
-    }
-    return new MultiSocksProxyAgent(agentOptions);
-}
-class MultiSocksProxyAgent extends agent_base_1.Agent {
-    constructor(options) {
-        super();
-        this.agents = options.map((proxy) => new socks_proxy_agent_1.SocksProxyAgent(proxy));
-    }
-    async callback(req, opts) {
-        return this.selectAgent().callback(req, opts);
-    }
-    selectAgent() {
-        return this.agents[Math.floor(Math.random() * this.agents.length)];
-    }
-    destroy() {
-        this.agents.forEach((agent) => agent.destroy());
-    }
-}
 function postProcessHeaders(response) {
     const parsed = {};
     const rawHeaders = response.request?.res?.rawHeaders;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mablhq/mabl-cli",
-  "version": "2.78.5",
+  "version": "2.79.1",
   "license": "SEE LICENSE IN LICENSE.txt",
   "description": "The official mabl command line interface tool",
   "main": "index.js",
@@ -31,7 +31,6 @@
     "@types/adm-zip": "0.5.5",
     "@types/estree": "1.0.5",
     "@types/finalhandler": "1.2.4",
-    "@types/send": "0.17.4",
     "@xmldom/xmldom": "0.8.10",
     "adm-zip": "0.5.10",
     "agent-base": "6.0.2",

package/util/clickUtil.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CLICK_TYPE_TO_HUMAN_TEXT = exports.ClickType = void 0;
 exports.clickOnElement = clickOnElement;
 const messaging_1 = require("../core/messaging/messaging");
-const ExecutorUtils_1 = require("../execution/actions/ExecutorUtils");
+const errorUtil_1 = require("./errorUtil");
 const loggingProvider_1 = require("../providers/logging/loggingProvider");
 const actionabilityUtil_1 = require("./actionabilityUtil");
 const logUtils_1 = require("./logUtils");
@@ -40,7 +40,7 @@ async function clickOnElement(elementHandle, executionContext, clickType = Click
     if (!noOverlappingElement || !elementHasSurfaceArea) {
         const isAttached = await elementHandle.evaluate((el) => el.isConnected);
         if (!isAttached) {
-            throw new Error(ExecutorUtils_1.ELEMENT_NOT_ATTACHED_ERROR);
+            throw new Error(errorUtil_1.ELEMENT_NOT_ATTACHED_ERROR);
         }
         const jsClickReasons = [
             !noOverlappingElement && "there is a popup we couldn't dismiss",

package/util/errorUtil.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.STRINGS_TO_RETRY_ON = exports.ELEMENT_NOT_ATTACHED_ERROR = exports.ELEMENT_NOT_READY_ERROR = void 0;
+exports.isRetriableError = isRetriableError;
+exports.ELEMENT_NOT_READY_ERROR = 'ELEMENT_NOT_READY_ERROR';
+exports.ELEMENT_NOT_ATTACHED_ERROR = 'Element is not attached to the DOM';
+const GET_CONTENT_FRAME_ERROR_TEXT = 'Could not get content frame from current frame';
+const MABL_FIND_LOGIC_TIMEOUT_ERROR_TYPE = 'Mabl find logic timeout';
+exports.STRINGS_TO_RETRY_ON = [
+    exports.ELEMENT_NOT_READY_ERROR,
+    'Node is either not visible or',
+    'Node is detached',
+    exports.ELEMENT_NOT_ATTACHED_ERROR,
+    'Execution context was destroyed',
+    'Element is not attached',
+    'TimeoutError',
+    MABL_FIND_LOGIC_TIMEOUT_ERROR_TYPE,
+    'Protocol error (DOM.describeNode)',
+    GET_CONTENT_FRAME_ERROR_TEXT,
+    'frame.evaluate: Target closed',
+    'frame.evaluateHandle: Frame was detached',
+    'JSHandles can be evaluated only in the context they were created',
+    'Unable to adopt element handle from a different document',
+    'Cannot find context with specified id',
+    'Cannot find object with id',
+    'Node not found',
+    'stale element reference',
+    'referenced element is no longer attached',
+    'is not present in the current view anymore',
+    'addBinding',
+];
+function isRetriableError(error) {
+    return exports.STRINGS_TO_RETRY_ON.some((errorMessage) => error.message.toLowerCase().includes(errorMessage.toLowerCase()));
+}