@mablhq/mabl-cli 1.47.12 → 1.47.20

package/browserEngines/chromiumBrowserEngine.js

@@ -56,14 +56,14 @@ class ChromiumBrowserEngine {
     name() {
         return 'chromium';
     }
-    getBrowserLaunchOptions(containerTesting, options, browserWidth, browserHeight, ignoreCertificateErrors, emulationConfig, enableExtensions, disableIsolation, resourcesDirectoryOverride) {
+    getBrowserLaunchOptions(options) {
         const commandLineArgs = [];
         const ignoreCommandLineDefaultArgs = [];
         const disableFeaturesFlags = [];
-        if (containerTesting) {
+        if (options.containerTesting) {
             commandLineArgs.push('--no-sandbox');
         }
-        if (disableIsolation) {
+        if (options.disableIsolation) {
             disableFeaturesFlags.push('IsolateOrigins');
         }
         disableFeaturesFlags.push('site-per-process');
@@ -71,35 +71,34 @@ class ChromiumBrowserEngine {
         if (options.autoOpenDevtoolsForTabs) {
             commandLineArgs.push('--auto-open-devtools-for-tabs');
         }
-        const fakeMicrophoneMedia = (0, resourceUtil_1.findResource)('media/mabl_test_audio.wav', resourcesDirectoryOverride);
-        const fakeWebcamMedia = (0, resourceUtil_1.findResource)('media/mabl_test_pattern.y4m', resourcesDirectoryOverride);
-        const defaultDeviceDescriptor = (0, mobileEmulationUtil_1.getDeviceDescriptorForEmulation)(emulationConfig);
-        this.addBasicLaunchArgs(commandLineArgs, browserWidth, browserHeight, fakeMicrophoneMedia, fakeWebcamMedia, ignoreCertificateErrors, defaultDeviceDescriptor);
-        if (enableExtensions) {
+        const fakeMicrophoneMedia = (0, resourceUtil_1.findResource)('media/mabl_test_audio.wav', options.resourcesDirectoryOverride);
+        const fakeWebcamMedia = (0, resourceUtil_1.findResource)('media/mabl_test_pattern.y4m', options.resourcesDirectoryOverride);
+        const defaultDeviceDescriptor = (0, mobileEmulationUtil_1.getDeviceDescriptorForEmulation)(options.emulationConfig);
+        this.addBasicLaunchArgs(commandLineArgs, options.browserWidth, options.browserHeight, fakeMicrophoneMedia, fakeWebcamMedia, options.ignoreCertificateErrors, defaultDeviceDescriptor);
+        if (options.enableExtensions) {
             ignoreCommandLineDefaultArgs.push('--disable-extensions');
         }
         return {
             commandLineArgs,
-            engineSpecificOptions: undefined,
             ignoreCommandLineDefaultArgs,
             defaultDeviceDescriptor,
         };
     }
-    getExecutionEngineBrowserLaunchOptions(browserWidth, browserHeight, proxyInfo, emulationConfig) {
-        const launchArgs = [...baseExecutionEngineLaunchArgs];
+    getExecutionEngineBrowserLaunchOptions(options, proxyInfo) {
+        const commandLineArgs = [...baseExecutionEngineLaunchArgs];
         if (proxyInfo.pacProxy) {
-            launchArgs.push(`--proxy-pac-url=${proxyInfo.pacProxy}`);
+            commandLineArgs.push(`--proxy-pac-url=${proxyInfo.pacProxy}`);
         }
         else if (proxyInfo.socksProxy) {
-            launchArgs.push(`--proxy-server=socks=${proxyInfo.socksProxy}`);
+            commandLineArgs.push(`--proxy-server=socks=${proxyInfo.socksProxy}`);
         }
         else {
             throw new Error('no proxy provided for cloud run');
         }
-        const defaultDeviceDescriptor = (0, mobileEmulationUtil_1.getDeviceDescriptorForEmulation)(emulationConfig);
-        this.addBasicLaunchArgs(launchArgs, browserWidth, browserHeight, ExecutionEngineFakeAudioFilePath, ExecutionEngineFakeVideoFilePath, true, defaultDeviceDescriptor);
-        loggingProvider_1.logger.debug(`launchArgs: ${JSON.stringify(launchArgs)}`);
-        return { defaultDeviceDescriptor, launchArgs };
+        const defaultDeviceDescriptor = (0, mobileEmulationUtil_1.getDeviceDescriptorForEmulation)(options.emulationConfig);
+        this.addBasicLaunchArgs(commandLineArgs, options.browserWidth, options.browserHeight, ExecutionEngineFakeAudioFilePath, ExecutionEngineFakeVideoFilePath, true, defaultDeviceDescriptor);
+        loggingProvider_1.logger.debug(`launchArgs: ${JSON.stringify(commandLineArgs)}`);
+        return { commandLineArgs, defaultDeviceDescriptor };
     }
     addBasicLaunchArgs(launchArgs, browserWidth, browserHeight, fakeMicrophoneMediaPath, fakeWebcamMediaPath, ignoreCertificateErrors, deviceDescriptor) {
         var _a, _b;

package/browserEngines/firefoxBrowserEngine.js

@@ -1,42 +1,75 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FirefoxBrowserEngine = void 0;
 const mobileEmulationUtil_1 = require("../commands/tests/mobileEmulationUtil");
+const path_1 = __importDefault(require("path"));
+const fs = __importStar(require("fs-extra"));
 const browserEngine_1 = require("./browserEngine");
 const async_retry_1 = __importDefault(require("async-retry"));
-const browserTypes_1 = require("../commands/browserTypes");
 class FirefoxBrowserEngine {
     name() {
         return 'firefox';
     }
-    getBrowserLaunchOptions(_containerTesting, _options, _browserWidth, _browserHeight, _ignoreCertificateErrors, emulationConfig, _enableExtensions, _disableIsolation, _resourcesDirectoryOverride) {
+    getBrowserLaunchOptions(options) {
         return {
             commandLineArgs: [],
-            engineSpecificOptions: {
-                browserType: browserTypes_1.BrowserType.Firefox,
-                firefoxUserPrefs: this.getFirefoxUserPrefs(),
-            },
             ignoreCommandLineDefaultArgs: [],
-            defaultDeviceDescriptor: (0, mobileEmulationUtil_1.getDeviceDescriptorForEmulation)(emulationConfig),
+            defaultDeviceDescriptor: (0, mobileEmulationUtil_1.getDeviceDescriptorForEmulation)(options.emulationConfig),
         };
     }
-    getExecutionEngineBrowserLaunchOptions(_browserWidth, _browserHeight, _proxyInfo, emulationConfig) {
+    getExecutionEngineBrowserLaunchOptions(options, _proxyInfo) {
         return {
-            defaultDeviceDescriptor: (0, mobileEmulationUtil_1.getDeviceDescriptorForEmulation)(emulationConfig),
-            launchArgs: [],
+            commandLineArgs: [],
+            defaultDeviceDescriptor: (0, mobileEmulationUtil_1.getDeviceDescriptorForEmulation)(options.emulationConfig),
         };
     }
     prepareBrowserPreferencesDirectory(_windowPlacement) {
-        return (0, async_retry_1.default)(() => (0, browserEngine_1.getTempBrowserPrefDirectory)(this.name()), {
+        return (0, async_retry_1.default)(() => {
+            const preferenceFileName = 'user.js';
+            const tempBrowserPreferencesDirectory = (0, browserEngine_1.getTempBrowserPrefDirectory)(this.name());
+            const prefFilePath = path_1.default.normalize(`${tempBrowserPreferencesDirectory}/${preferenceFileName}`);
+            fs.writeFileSync(prefFilePath, this.generatePreferencesInfo());
+            return tempBrowserPreferencesDirectory;
+        }, {
             retries: 5,
         });
     }
     findBrowserExecutable() {
         return Promise.resolve('');
     }
+    generatePreferencesInfo() {
+        const lines = [];
+        for (const [name, value] of Object.entries(this.getFirefoxUserPrefs())) {
+            lines.push(`user_pref(${JSON.stringify(name)}, ${JSON.stringify(value)});`);
+        }
+        return lines.join('\n');
+    }
     getFirefoxUserPrefs() {
         return {
             'xpinstall.signatures.required': false,

package/browserEngines/unsupportedBrowserEngine.js

@@ -6,15 +6,14 @@ class UnsupportedBrowserEngine {
     name() {
         throw new Error('Unsupported browser engine');
     }
-    getBrowserLaunchOptions(_containerTesting, _options, _browserWidth, _browserHeight, _ignoreCertificateErrors, emulationConfig, _enableExtensions, _disableIsolation, _resourcesDirectoryOverride) {
+    getBrowserLaunchOptions(options) {
         return {
             commandLineArgs: [],
-            engineSpecificOptions: undefined,
             ignoreCommandLineDefaultArgs: [],
-            defaultDeviceDescriptor: (0, mobileEmulationUtil_1.getDeviceDescriptorForEmulation)(emulationConfig),
+            defaultDeviceDescriptor: (0, mobileEmulationUtil_1.getDeviceDescriptorForEmulation)(options.emulationConfig),
         };
     }
-    getExecutionEngineBrowserLaunchOptions(_browserWidth, _browserHeight, _proxyInfo, _emulationConfig) {
+    getExecutionEngineBrowserLaunchOptions(_options, _proxyInfo) {
         throw new Error('Unsupported browser engine');
     }
     prepareBrowserPreferencesDirectory(_windowPlacement) {

package/browserLauncher/playwrightBrowserLauncher/chromium/chromiumBrowserDelegate.js

@@ -51,5 +51,8 @@ class ChromiumBrowserDelegate {
     downloadsUsingGuids() {
         return false;
     }
+    supportsTracing() {
+        return true;
+    }
 }
 exports.ChromiumBrowserDelegate = ChromiumBrowserDelegate;

package/browserLauncher/playwrightBrowserLauncher/chromium/chromiumElementHandleDelegate.js

@@ -44,7 +44,7 @@ class ChromiumElementHandleDelegate {
         if (this.elementImpl === undefined) {
             (0, logUtils_1.logInternal)(`Unable to get the Element's internal implementation. Some functionality, such as getting the clickable point or element highlighting might not work.`);
         }
-        else if (this.getCDPSession() === undefined) {
+        else if (this.getInternalCDPSession() === undefined) {
             const undefinedField = ((_b = (_a = this.elementImpl) === null || _a === void 0 ? void 0 : _a._context) === null || _b === void 0 ? void 0 : _b._delegate) !== undefined
                 ? '_client'
                 : ((_c = this.elementImpl) === null || _c === void 0 ? void 0 : _c._context) !== undefined
@@ -54,8 +54,11 @@ class ChromiumElementHandleDelegate {
         }
     }
     getCDPSession() {
-        var _a, _b, _c;
         this.checkCDPSession();
+        return this.getInternalCDPSession();
+    }
+    getInternalCDPSession() {
+        var _a, _b, _c;
         return (_c = (_b = (_a = this.elementImpl) === null || _a === void 0 ? void 0 : _a._context) === null || _b === void 0 ? void 0 : _b._delegate) === null || _c === void 0 ? void 0 : _c._client;
     }
 }

package/browserLauncher/playwrightBrowserLauncher/firefox/firefoxBrowserDelegate.js

@@ -47,5 +47,8 @@ class FirefoxBrowserDelegate {
     downloadsUsingGuids() {
         return true;
     }
+    supportsTracing() {
+        return false;
+    }
 }
 exports.FirefoxBrowserDelegate = FirefoxBrowserDelegate;

package/browserLauncher/playwrightBrowserLauncher/playwrightBrowser.js

@@ -157,6 +157,9 @@ class PlaywrightBrowser extends events_1.default {
     exposeFunction(name, callback) {
         return this.defaultContext.exposeFunction(name, callback);
     }
+    supportsTracing() {
+        return this.browserDelegate.supportsTracing();
+    }
 }
 exports.PlaywrightBrowser = PlaywrightBrowser;
 function getBrowserDelegate(browserType, browserContext) {

package/browserLauncher/playwrightBrowserLauncher/playwrightBrowserLauncher.js

@@ -35,7 +35,7 @@ class PlaywrightBrowserLauncher {
         const playwrightBrowserType = getPlaywrightBrowserType(options.browserType);
         const defaultContext = await playwrightBrowserType.launchPersistentContext(options.userDataDir, {
             acceptDownloads: true,
-            args: options.args,
+            args: options.commandLineArgs,
             bypassCSP: options.bypassContentSecurityPolicy,
             channel: browserTypes_1.SupportedBrowserTypeProperties[options.browserType]
                 .browserReleaseChannel,
@@ -46,7 +46,7 @@ class PlaywrightBrowserLauncher {
             hasTouch: (_b = options.defaultDeviceDescriptor) === null || _b === void 0 ? void 0 : _b.hasTouch,
             headless: options.headless,
             httpCredentials: options.credentials,
-            ignoreDefaultArgs: options.ignoreDefaultArgs,
+            ignoreDefaultArgs: options.ignoreCommandLineDefaultArgs,
             ignoreHTTPSErrors: true,
             isMobile: (_c = options.defaultDeviceDescriptor) === null || _c === void 0 ? void 0 : _c.isMobile,
             logger: playwrightLogger,

package/browserLauncher/playwrightBrowserLauncher/playwrightDom.js

@@ -77,7 +77,7 @@ class PlaywrightElementHandle extends PlaywrightJsHandle {
             this.cdpSession = delegate.getCDPSession();
         }
         catch (e) {
-            (0, logUtils_1.logInternal)(`Unable to get the element handle's implementation. Error: ${e}`);
+            (0, logUtils_1.logInternal)(`Unable to get a CDP session for the element handle. Error: ${e}`);
         }
     }
     uploadFile(filePath) {

package/browserLauncher/playwrightBrowserLauncher/playwrightHttpRequest.js

@@ -1,12 +1,44 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlaywrightHttpRequest = void 0;
+const playwright = __importStar(require("@playwright/test"));
+const logUtils_1 = require("../../util/logUtils");
 class PlaywrightHttpRequest {
     constructor(page, request, route) {
+        var _a;
         this.page = page;
         this.request = request;
         this.route = route;
-        this.documentId = this.request._guid;
+        try {
+            this.documentId = playwright._toImpl(this.request)._documentId;
+        }
+        catch (e) {
+            (0, logUtils_1.logInternal)(`Unable to get documentId from request: ${e.message}`);
+        }
+        (_a = this.documentId) !== null && _a !== void 0 ? _a : (this.documentId = this.request._guid);
     }
     abort() {
         var _a;

package/commands/tests/testsUtil.js

@@ -51,8 +51,8 @@ function getFinalUrl(test, parsedUrl) {
     return finalUrl;
 }
 exports.getFinalUrl = getFinalUrl;
-async function launchBrowserInstance(engine, launchArgs, headless, credentials, options) {
-    const userDataDir = await engine.prepareBrowserPreferencesDirectory(options.windowPlacement);
+async function launchBrowserInstance(options) {
+    var _a;
     const optionsProxy = await maybeGetProxyOptions(options);
     if (optionsProxy) {
         options = {
@@ -62,13 +62,13 @@ async function launchBrowserInstance(engine, launchArgs, headless, credentials,
     }
     let browser;
     try {
-        browser = await maybeLaunchBrowser(launchArgs, userDataDir, headless, credentials, options);
+        browser = await maybeLaunchBrowser(options);
     }
     catch (error) {
         if (error.message.includes('Running as root without --no-sandbox is not supported')) {
-            launchArgs.push('--no-sandbox');
+            (_a = options.commandLineArgs) === null || _a === void 0 ? void 0 : _a.push('--no-sandbox');
             messaging_1.mablEventEmitter.log('Unable to initialize browser with standard settings, attempting to run with --no-sandbox setting', Date.now(), logLineMessaging_1.LogLineColor.yellow);
-            return maybeLaunchBrowser(launchArgs, userDataDir, headless, credentials, options).catch((error) => {
+            return maybeLaunchBrowser(options).catch((error) => {
                 messaging_1.mablEventEmitter.log('Browser launch failed', Date.now(), logLineMessaging_1.LogLineColor.red);
                 messaging_1.mablEventEmitter.log(error.message);
             });
@@ -98,15 +98,8 @@ async function maybeGetProxyOptions(options) {
     }
     return optionsProxy;
 }
-function maybeLaunchBrowser(launchArgs, userDataDir, headless, credentials, options) {
-    return browserLauncher_1.BrowserLauncherFactory.createRunner(options === null || options === void 0 ? void 0 : options.runnerType, options === null || options === void 0 ? void 0 : options.loggerFunc).launch({
-        ...options,
-        headless,
-        args: launchArgs,
-        userDataDir,
-        downloadPath: createDownloadDirectory(),
-        credentials,
-    });
+function maybeLaunchBrowser(options) {
+    return browserLauncher_1.BrowserLauncherFactory.createRunner(options === null || options === void 0 ? void 0 : options.runnerType, options === null || options === void 0 ? void 0 : options.loggerFunc).launch(options);
 }
 function removeTempBrowserPreferencesDirectory(tempDirPath) {
     try {
@@ -115,18 +108,14 @@ function removeTempBrowserPreferencesDirectory(tempDirPath) {
     catch (error) {
     }
 }
-async function createBrowser(engine, browserWidth, browserHeight, headless, containerTesting, options) {
-    var _a;
-    const { credentials, disableIsolation, ignoreCertificateErrors, emulationConfig, enableExtensions, resourcesDirectoryOverride, } = options || {};
-    const { commandLineArgs: launchArgs, ignoreCommandLineDefaultArgs: ignoreDefaultArgs, defaultDeviceDescriptor, engineSpecificOptions, } = engine.getBrowserLaunchOptions(containerTesting, options, browserWidth, browserHeight, ignoreCertificateErrors, emulationConfig, enableExtensions, disableIsolation, resourcesDirectoryOverride);
-    const maybeBrowser = await launchBrowserInstance(engine, launchArgs, headless, credentials, {
+async function createBrowser(engine, options) {
+    const userDataDir = await engine.prepareBrowserPreferencesDirectory(options.windowPlacement);
+    const browserEngineLaunchOptions = engine.getBrowserLaunchOptions(options);
+    const maybeBrowser = await launchBrowserInstance({
         ...options,
-        ...engineSpecificOptions,
-        defaultDeviceDescriptor,
-        ignoreDefaultArgs,
-        userAgent: (_a = options === null || options === void 0 ? void 0 : options.userAgent) !== null && _a !== void 0 ? _a : emulationConfig === null || emulationConfig === void 0 ? void 0 : emulationConfig.device_config.user_agent,
-        defaultUserAgent: options === null || options === void 0 ? void 0 : options.defaultUserAgent,
-        windowPlacement: options.windowPlacement,
+        ...browserEngineLaunchOptions,
+        downloadPath: createDownloadDirectory(),
+        userDataDir,
     });
     if (!maybeBrowser) {
         throw new Error('Unable to start browser session');
@@ -135,20 +124,15 @@ async function createBrowser(engine, browserWidth, browserHeight, headless, cont
     return maybeBrowser;
 }
 exports.createBrowser = createBrowser;
-async function createBrowserForExecutionEngine(engine, browserWidth, browserHeight, headless, proxyInfo, options) {
-    const tempBrowserPreferencesDirectory = await engine.prepareBrowserPreferencesDirectory();
-    const { credentials, deviceEmulationConfig, userAgent } = options;
-    if (deviceEmulationConfig && !userAgent) {
-        options = {
-            ...options,
-            userAgent: deviceEmulationConfig.device_config.user_agent,
-        };
-    }
-    const { launchArgs, defaultDeviceDescriptor } = engine.getExecutionEngineBrowserLaunchOptions(browserWidth, browserHeight, proxyInfo, deviceEmulationConfig);
-    if (defaultDeviceDescriptor) {
-        options = { ...options, defaultDeviceDescriptor };
-    }
-    const maybeBrowser = await maybeLaunchBrowser(launchArgs, tempBrowserPreferencesDirectory, headless, credentials, options);
+async function createBrowserForExecutionEngine(engine, proxyInfo, options) {
+    const userDataDir = await engine.prepareBrowserPreferencesDirectory();
+    const launchOptions = engine.getExecutionEngineBrowserLaunchOptions(options, proxyInfo);
+    const maybeBrowser = await maybeLaunchBrowser({
+        ...options,
+        ...launchOptions,
+        downloadPath: createDownloadDirectory(),
+        userDataDir,
+    });
     if (!maybeBrowser) {
         throw new Error('Unable to start browser session');
     }