@mablhq/mabl-cli 1.26.0 → 1.29.1

package/util/asyncUtil.js

@@ -2,18 +2,20 @@
 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, timeoutType = 'mabl promise timeout') {
+async function promiseWithTimeout(promise, timeoutMillis, description, timeoutType = 'mabl promise timeout', printToConsole = true) {
     const startTimeMillis = new Date().getTime();
-    const { timer, cancelTimer } = startTimer(timeoutMillis, description, timeoutType);
+    const { timer, cancelTimer, errorMessage } = startTimer(timeoutMillis, description, timeoutType);
     try {
         const result = await Promise.race([timer, promise]);
-        if (loggingProvider_1.logger.isDebugEnabled()) {
+        if (loggingProvider_1.logger.isDebugEnabled() && printToConsole) {
             loggingProvider_1.logger.debug(`"${description}" completed in ${new Date().getTime() - startTimeMillis}ms`);
         }
         return result;
     }
     catch (error) {
-        if (error instanceof TimeoutError) {
+        if (error instanceof TimeoutError &&
+            printToConsole &&
+            error.message === errorMessage) {
             loggingProvider_1.logger.warn(error.message);
         }
         throw error;
@@ -35,13 +37,15 @@ class TimeoutError extends Error {
 exports.TimeoutError = TimeoutError;
 const startTimer = (timeoutMillis, description, timeoutType) => {
     let timeout;
+    const timeoutError = new TimeoutError(timeoutMillis, description, timeoutType);
     const promise = new Promise((_resolve, reject) => {
-        timeout = global.setTimeout(() => reject(new TimeoutError(timeoutMillis, description, timeoutType)), timeoutMillis);
+        timeout = global.setTimeout(() => reject(timeoutError), timeoutMillis);
         timeout.unref();
     });
     return {
         timer: promise,
         cancelTimer: () => global.clearTimeout(timeout),
+        errorMessage: timeoutError.message,
     };
 };
 function mapAsync(array, callback) {

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;