@mablhq/mabl-cli 1.61.7 → 1.62.1

package/http/MablHttpAgent.js

@@ -55,11 +55,14 @@ class MablHttpAgent extends agent_base_1.Agent {
             httpsAgent: (_b = httpsAgent !== null && httpsAgent !== void 0 ? httpsAgent : proxyConfig.httpsAgent) !== null && _b !== void 0 ? _b : https.globalAgent,
         };
     }
-    callback(req, opts) {
+    createSocket(req, options, cb) {
         var _a;
         if ((_a = this.maybeGetFirstStringHeader(req, httpUtil_1.USER_AGENT_HEADER)) === null || _a === void 0 ? void 0 : _a.startsWith('PostmanRuntime/')) {
             req.setHeader(httpUtil_1.USER_AGENT_HEADER, httpUtil_1.USER_AGENT);
         }
+        super.createSocket(req, options, cb);
+    }
+    connect(_req, opts) {
         return Promise.resolve(opts.secureEndpoint ? this.httpsAgent : this.httpAgent);
     }
     maybeGetFirstStringHeader(req, name) {

package/http/RequestFilteringHttpAgent.js

@@ -45,17 +45,17 @@ class RequestFilteringHttpAgent extends MablHttpAgent_1.MablHttpAgent {
         const constructorParameters = await MablHttpAgent_1.MablHttpAgent.getConstructorParameters();
         return new RequestFilteringHttpAgent(constructorParameters.httpAgent, constructorParameters.httpsAgent);
     }
-    callback(req, opts) {
+    connect(req, opts) {
         if (isForbiddenHost(opts.host)) {
             return Promise.reject(new RequestSecurityError_1.RequestSecurityError('Request contains forbidden host'));
         }
-        else if (containsForbiddenHeader(opts.headers)) {
+        else if (containsForbiddenHeader(req.getHeaders())) {
             return Promise.reject(new RequestSecurityError_1.RequestSecurityError('Request contains forbidden header'));
         }
         else if (isPrivateAddress(opts.host)) {
             return Promise.reject(new RequestSecurityError_1.RequestSecurityError('Request contains private address'));
         }
-        return super.callback(req, opts);
+        return super.connect(req, opts);
     }
 }
 exports.RequestFilteringHttpAgent = RequestFilteringHttpAgent;

package/http/axiosProxyConfig.js

@@ -23,12 +23,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.maybeGetModifiedAxiosConfigForHttpProxy = exports.proxyUrlToPortConfig = exports.axiosProxyConfig = exports.currentProxyConfig = void 0;
+exports.proxyUrlToPortConfig = exports.axiosProxyConfig = exports.currentProxyConfig = exports.setTestExecutionProxyUrl = void 0;
 const cliConfigProvider_1 = require("../providers/cliConfigProvider");
 const https = __importStar(require("https"));
 const https_proxy_agent_1 = require("https-proxy-agent");
 const hpagent_1 = require("hpagent");
 const httpUtil_1 = require("./httpUtil");
+let testExecutionProxyUrl;
+function setTestExecutionProxyUrl(url) {
+    testExecutionProxyUrl = url;
+}
+exports.setTestExecutionProxyUrl = setTestExecutionProxyUrl;
 async function currentProxyConfig(mode = 'mabl') {
     const httpConfig = (await cliConfigProvider_1.CliConfigProvider.getCliConfig()).http;
     return axiosProxyConfig(mode === 'test' ? httpConfig === null || httpConfig === void 0 ? void 0 : httpConfig.test : httpConfig === null || httpConfig === void 0 ? void 0 : httpConfig.mabl);
@@ -41,15 +46,21 @@ function axiosProxyConfig(httpConfig) {
             [httpUtil_1.USER_AGENT_HEADER]: httpUtil_1.USER_AGENT,
         },
     };
-    if (!httpConfig.sslVerify) {
+    let { proxyType, sslVerify } = httpConfig;
+    if (testExecutionProxyUrl) {
+        sslVerify = false;
+        proxyType = 'current';
+    }
+    if (!sslVerify) {
         config.httpsAgent = new https.Agent({
             rejectUnauthorized: false,
         });
     }
-    if ((_a = httpConfig.proxyHost) === null || _a === void 0 ? void 0 : _a.href) {
-        config.proxy = proxyUrlToPortConfig(httpConfig.proxyHost);
+    if (testExecutionProxyUrl || ((_a = httpConfig.proxyHost) === null || _a === void 0 ? void 0 : _a.href)) {
+        config.proxy = proxyUrlToPortConfig((testExecutionProxyUrl !== null && testExecutionProxyUrl !== void 0 ? testExecutionProxyUrl : httpConfig.proxyHost));
     }
-    return maybeGetModifiedAxiosConfigForHttpProxy(config, httpConfig.sslVerify, httpConfig.proxyType);
+    const result = maybeGetModifiedAxiosConfigForHttpProxy(config, sslVerify, proxyType);
+    return result;
 }
 exports.axiosProxyConfig = axiosProxyConfig;
 function escapeRegexDots(input) {
@@ -87,12 +98,16 @@ function maybeGetModifiedAxiosConfigForHttpProxy(config, sslVerify, proxyType) {
         };
         newConfig.proxy = false;
         const authConfig = config.proxy.auth;
+        let proxyString = 'http://';
+        if (authConfig) {
+            proxyString += `${authConfig.username}:${authConfig.password}@`;
+        }
+        proxyString += `${config.proxy.host}:${config.proxy.port}`;
+        const proxyUrl = new URL(proxyString);
+        const configOptions = {
+            rejectUnauthorized: sslVerify !== false,
+        };
         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,
@@ -102,22 +117,12 @@ function maybeGetModifiedAxiosConfigForHttpProxy(config, sslVerify, proxyType) {
                 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);
+            newConfig.httpsAgent = new https_proxy_agent_1.HttpsProxyAgent(proxyUrl, configOptions);
         }
+        newConfig.httpAgent = new https_proxy_agent_1.HttpsProxyAgent(proxyUrl, configOptions);
         return newConfig;
     }
     return config;
 }
-exports.maybeGetModifiedAxiosConfigForHttpProxy = maybeGetModifiedAxiosConfigForHttpProxy;

package/http/httpUtil.js

@@ -27,16 +27,12 @@ function maybeGetSocksAgent(linkServer) {
     if (!linkServer) {
         return;
     }
-    const agentOptions = {
-        host: linkServer.forwarding_host,
-        port: linkServer.forwarding_port,
-        userId: linkServer.workspace_id,
-        password: linkServer.label,
-        tls: {
-            rejectUnauthorized: false,
-        },
-    };
-    return new socks_proxy_agent_1.SocksProxyAgent(agentOptions);
+    const user = linkServer.workspace_id;
+    const password = linkServer.label;
+    const host = linkServer.forwarding_host;
+    const port = linkServer.forwarding_port;
+    const url = new URL(`socks5h://${user}:${password}@${host}:${port}`);
+    return new socks_proxy_agent_1.SocksProxyAgent(url);
 }
 function postProcessHeaders(response) {
     var _a, _b, _c;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mablhq/mabl-cli",
-  "version": "1.61.7",
+  "version": "1.62.1",
   "license": "SEE LICENSE IN LICENSE.txt",
   "description": "The official mabl command line interface tool",
   "main": "index.js",
@@ -27,7 +27,7 @@
     "@types/serve-handler": "6.1.0",
     "@types/tmp": "0.2.0",
     "@types/tough-cookie": "4.0.2",
-    "agent-base": "6.0.2",
+    "agent-base": "7.1.0",
     "analytics-node": "3.5.0",
     "async-mutex": "0.3.1",
     "async-retry": "1.3.3",
@@ -54,7 +54,8 @@
     "git-repo-info": "2.1.1",
     "glob": "7.1.6",
     "hpagent": "1.0.0",
-    "https-proxy-agent": "5.0.0",
+    "http-mitm-proxy": "1.0.0",
+    "https-proxy-agent": "7.0.1",
     "humanize-duration": "3.23.0",
     "inquirer": "7.1.0",
     "js-yaml": "4.1.0",
@@ -83,9 +84,10 @@
     "serve-handler": "6.1.5",
     "set-cookie-parser": "2.5.1",
     "simple-update-notifier": "1.1.0",
-    "socks-proxy-agent": "6.1.1",
+    "socks-proxy-agent": "8.0.1",
     "stoppable": "1.1.0",
     "strip-ansi": "6.0.0",
+    "tldts": "6.0.12",
     "tmp-promise": "3.0.2",
     "tough-cookie": "4.0.0",
     "triple-beam": "1.3.0",

package/resources/pdf-viewer/embeddedPdfDetection.js

@@ -125,7 +125,7 @@ mablEmbeddedPdfDetector = () => {
       );
 
       // Signal embedded PDF detection and pending download
-      // Wait for the event to be acknowledged before starting the download
+      // Wait for PDF to be downloaded by PageFrameContextTracker before continuing
       await window.dispatchMablEvent({
         type: MESSAGE_TYPE_EMBEDDED_PDF_DETECTED,
         baseUri,
@@ -133,9 +133,6 @@ mablEmbeddedPdfDetector = () => {
         pdfFileName,
       });
 
-      // Trigger a download for the PDF
-      mablDownloadEmbeddedPdf(pdfFileName, pdfUrl);
-
       // Trigger replacement of the embedded PDF with an interactable version served by PDF server
       window.dispatchMablEvent({
         type: MESSAGE_TYPE_EMBEDDED_PDF_MARKED,
@@ -203,16 +200,6 @@ function mablGetPdfFilenameFromUrl(pdfUrl) {
   return pdfUrl.startsWith('blob:') ? 'blob_pdf' : pdfFileName;
 }
 
-function mablDownloadEmbeddedPdf(fileName, pdfUrl) {
-  const aTag = document.createElement('a');
-  aTag.style.display = 'none';
-  document.body.appendChild(aTag);
-  aTag.href = pdfUrl;
-  aTag.setAttribute('download', fileName);
-  aTag.click();
-  document.body.removeChild(aTag);
-}
-
 if (!documentHasDocType()) {
   // If this is executed too quickly, the DOCTYPE has not been loaded yet
   // so wait a bit before checking again.