@mablhq/mabl-cli 2.61.18 → 2.63.0

package/browserEngines/chromiumBrowserEngine.js

@@ -103,6 +103,11 @@ class ChromiumBrowserEngine {
         else if (proxyInfo.socksProxy) {
             commandLineArgs.push(`--proxy-server=socks=${proxyInfo.socksProxy}`);
         }
+        else if (proxyInfo.httpProxy) {
+            const proxyUrl = new URL(proxyInfo.httpProxy);
+            const proxyAddress = `${proxyUrl.hostname}:${proxyUrl.port}`;
+            commandLineArgs.push(`--proxy-server=http=${proxyAddress};https=${proxyAddress}`);
+        }
         else {
             throw new Error('no proxy provided for cloud run');
         }
@@ -178,8 +183,16 @@ class ChromiumBrowserEngine {
                 chrome.includes('beta'));
         })[0];
     }
-    getProxySpec(_proxyInfo) {
-        return;
+    getProxySpec(proxyInfo) {
+        const { httpProxy, socksProxy, excludeFromProxy } = proxyInfo;
+        const server = httpProxy ?? socksProxy;
+        if (!server) {
+            return;
+        }
+        const bypass = excludeFromProxy?.length
+            ? excludeFromProxy.join(',')
+            : undefined;
+        return { server, bypass };
     }
 }
 exports.ChromiumBrowserEngine = ChromiumBrowserEngine;

package/browserEngines/firefoxBrowserEngine.js

@@ -54,25 +54,40 @@ class FirefoxBrowserEngine {
             permissions: ['geolocation', 'notifications'],
         };
     }
-    getExecutionEngineBrowserLaunchOptions(options, _proxyInfo) {
+    getExecutionEngineBrowserLaunchOptions(options, proxyInfo) {
+        if (Object.keys(this.getProxyPreferences(proxyInfo)).length === 0) {
+            throw new Error('no proxy provided for cloud run');
+        }
         return {
             commandLineArgs: [],
             defaultDeviceDescriptor: (0, mobileEmulationUtil_1.getDeviceDescriptorForEmulation)(options.emulationConfig),
         };
     }
-    prepareBrowserPreferencesDirectory(_windowPlacement, proxyInfo) {
-        const customPreferences = {};
+    getProxyPreferences(proxyInfo) {
+        const proxyPreferences = {};
         if (proxyInfo?.pacProxy) {
-            customPreferences['network.proxy.autoconfig_url'] = proxyInfo.pacProxy;
-            customPreferences['network.proxy.type'] = 2;
+            proxyPreferences['network.proxy.autoconfig_url'] = proxyInfo.pacProxy;
+            proxyPreferences['network.proxy.type'] = 2;
         }
         else if (proxyInfo?.socksProxy) {
             const socksUrl = new URL(proxyInfo.socksProxy);
-            customPreferences['network.proxy.socks'] = socksUrl.hostname;
-            customPreferences['network.proxy.socks_port'] = Number.parseInt(socksUrl.port);
-            customPreferences['network.proxy.socks_version'] = 5;
-            customPreferences['network.proxy.type'] = 1;
+            proxyPreferences['network.proxy.socks'] = socksUrl.hostname;
+            proxyPreferences['network.proxy.socks_port'] = Number.parseInt(socksUrl.port);
+            proxyPreferences['network.proxy.socks_version'] = 5;
+            proxyPreferences['network.proxy.type'] = 1;
+        }
+        else if (proxyInfo?.httpProxy) {
+            const proxyUrl = new URL(proxyInfo.httpProxy);
+            proxyPreferences['network.proxy.http'] = proxyUrl.hostname;
+            proxyPreferences['network.proxy.http_port'] = Number.parseInt(proxyUrl.port);
+            proxyPreferences['network.proxy.https_port'] = Number.parseInt(proxyUrl.port);
+            proxyPreferences['network.proxy.share_proxy_settings'] = true;
+            proxyPreferences['network.proxy.type'] = 1;
         }
+        return proxyPreferences;
+    }
+    prepareBrowserPreferencesDirectory(_windowPlacement, proxyInfo) {
+        const customPreferences = this.getProxyPreferences(proxyInfo);
         return (0, async_retry_1.default)(() => {
             const preferenceFileName = 'user.js';
             const tempBrowserPreferencesDirectory = (0, browserEngine_1.getTempBrowserPrefDirectory)(this.name());
@@ -137,8 +152,16 @@ class FirefoxBrowserEngine {
             'network.proxy.socks_remote_dns': true,
         };
     }
-    getProxySpec(_proxyInfo) {
-        return;
+    getProxySpec(proxyInfo) {
+        const { httpProxy, socksProxy, excludeFromProxy } = proxyInfo;
+        const server = httpProxy ?? socksProxy;
+        if (!server) {
+            return;
+        }
+        const bypass = excludeFromProxy?.length
+            ? excludeFromProxy.join(',')
+            : undefined;
+        return { server, bypass };
     }
 }
 exports.FirefoxBrowserEngine = FirefoxBrowserEngine;