@mablhq/mabl-cli 1.45.8 → 1.47.12

package/browserLauncher/playwrightBrowserLauncher/chromium/chromiumPageDelegate.js

@@ -0,0 +1,117 @@
+"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.ChromiumPageDelegate = void 0;
+const playwright = __importStar(require("@playwright/test"));
+const chromiumElementHandleDelegate_1 = require("./chromiumElementHandleDelegate");
+const logUtils_1 = require("../../../util/logUtils");
+const chromiumFrameDelegate_1 = require("./chromiumFrameDelegate");
+class ChromiumPageDelegate {
+    constructor(page) {
+        this.page = page;
+        try {
+            this.pageImpl = playwright._toImpl(page);
+        }
+        catch (e) {
+            (0, logUtils_1.logInternal)(`Unable to get the page implementation. Error: ${e}`);
+        }
+    }
+    async setFocusEmulationEnabled(enabled) {
+        await this.makeCDPCall('Emulation.setFocusEmulationEnabled', {
+            enabled,
+        });
+    }
+    async waitForInitialization() {
+        this.fallbackCDPSession = await this.createCDPSession();
+    }
+    makeCDPCall(method, paramArgs) {
+        return this.getCDPSession().send(method, paramArgs);
+    }
+    async getWindowInfo() {
+        var _a, _b;
+        return this.makeCDPCall('Browser.getWindowForTarget', { targetId: (_a = this.getTargetId()) !== null && _a !== void 0 ? _a : (_b = this.pageImpl) === null || _b === void 0 ? void 0 : _b._guid });
+    }
+    async getBrowserBounds() {
+        const windowInfo = await this.getWindowInfo();
+        return windowInfo.bounds;
+    }
+    async setBrowserBounds(width, height) {
+        const session = this.getCDPSession();
+        if (session) {
+            const windowInfo = await session.send('Browser.getWindowForTarget');
+            const setWindowBoundsRequest = {
+                windowId: windowInfo.windowId,
+                bounds: {
+                    width,
+                    height,
+                },
+            };
+            await session.send('Browser.setWindowBounds', setWindowBoundsRequest);
+        }
+    }
+    getCDPSession() {
+        var _a, _b, _c, _d;
+        this.checkCDPSession();
+        return ((_d = (_c = (_b = (_a = this.pageImpl) === null || _a === void 0 ? void 0 : _a._delegate) === null || _b === void 0 ? void 0 : _b._mainFrameSession) === null || _c === void 0 ? void 0 : _c._client) !== null && _d !== void 0 ? _d : this.fallbackCDPSession);
+    }
+    checkCDPSession() {
+        var _a, _b, _c, _d, _e, _f;
+        if (((_c = (_b = (_a = this.pageImpl) === null || _a === void 0 ? void 0 : _a._delegate) === null || _b === void 0 ? void 0 : _b._mainFrameSession) === null || _c === void 0 ? void 0 : _c._client) === undefined) {
+            const undefinedField = ((_e = (_d = this.pageImpl) === null || _d === void 0 ? void 0 : _d._delegate) === null || _e === void 0 ? void 0 : _e._mainFrameSession) !== undefined
+                ? '_client'
+                : ((_f = this.pageImpl) === null || _f === void 0 ? void 0 : _f._delegate) !== undefined
+                    ? '_mainFrameSession'
+                    : 'pageImpl';
+            (0, logUtils_1.logInternal)(`Unable to get the CDP Session of the page (${undefinedField} is undefined).
+        Using a fallback session. Some functionality might not work as expected.`);
+            if (!this.fallbackCDPSession) {
+                (0, logUtils_1.logInternal)('No fallback CDP session found');
+            }
+        }
+    }
+    getTargetId() {
+        var _a, _b;
+        return (_b = (_a = this.pageImpl) === null || _a === void 0 ? void 0 : _a._delegate) === null || _b === void 0 ? void 0 : _b._targetId;
+    }
+    createCDPSession() {
+        return this.page.context().newCDPSession(this.page);
+    }
+    createElementHandleDelegate(element) {
+        return new chromiumElementHandleDelegate_1.ChromiumElementHandleDelegate(element);
+    }
+    createFrameDelegate(frame) {
+        return new chromiumFrameDelegate_1.ChromiumFrameDelegate(frame);
+    }
+    async enableScreencastMode() {
+        const cdp = await this.createCDPSession();
+        cdp.on('Page.screencastFrame', async (params) => {
+            await cdp
+                .send('Page.screencastFrameAck', { sessionId: params.sessionId })
+                .catch(() => { });
+        });
+        await cdp.send('Page.startScreencast', {});
+    }
+}
+exports.ChromiumPageDelegate = ChromiumPageDelegate;

package/browserLauncher/playwrightBrowserLauncher/elementHandleDelegate.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/browserLauncher/playwrightBrowserLauncher/firefox/firefoxBrowserDelegate.js

@@ -0,0 +1,51 @@
+"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.FirefoxBrowserDelegate = void 0;
+const playwright = __importStar(require("@playwright/test"));
+const firefoxPageDelegate_1 = require("./firefoxPageDelegate");
+class FirefoxBrowserDelegate {
+    constructor(context) {
+        this.context = context;
+        const contextImpl = playwright._toImpl(context);
+        this._browser = contextImpl._browser;
+    }
+    setDownloadBehavior(_downloadDirectory) {
+        return Promise.resolve();
+    }
+    getCDPSession() {
+        return this._browser._connection;
+    }
+    getBrowser() {
+        return this._browser;
+    }
+    createPageDelegate(page) {
+        return new firefoxPageDelegate_1.FirefoxPageDelegate(page);
+    }
+    downloadsUsingGuids() {
+        return true;
+    }
+}
+exports.FirefoxBrowserDelegate = FirefoxBrowserDelegate;

package/browserLauncher/playwrightBrowserLauncher/firefox/firefoxElementHandleDelegate.js

@@ -0,0 +1,61 @@
+"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.FirefoxElementHandleDelegate = void 0;
+const playwright = __importStar(require("@playwright/test"));
+const logUtils_1 = require("../../../util/logUtils");
+class FirefoxElementHandleDelegate {
+    constructor(elementHandle) {
+        this.elementHandle = elementHandle;
+        try {
+            this.elementImpl = playwright._toImpl(elementHandle);
+        }
+        catch {
+        }
+    }
+    getElementImpl() {
+        return this.elementImpl;
+    }
+    checkCDPSession() {
+        var _a, _b, _c;
+        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) {
+            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
+                    ? '_delegate'
+                    : '_context';
+            (0, logUtils_1.logInternal)(`Unable to get the CDP Session of the element handle. ${undefinedField} is undefined. Some functionality, such as element highlighting will not work.`);
+        }
+    }
+    getCDPSession() {
+        var _a, _b, _c;
+        this.checkCDPSession();
+        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._session;
+    }
+}
+exports.FirefoxElementHandleDelegate = FirefoxElementHandleDelegate;

package/browserLauncher/playwrightBrowserLauncher/firefox/firefoxFrameDelegate.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FirefoxFrameDelegate = void 0;
+const playwrightFrame_1 = require("../playwrightFrame");
+class FirefoxFrameDelegate {
+    constructor(parentPageDelegate, frame) {
+        this.parentPageDelegate = parentPageDelegate;
+        this.frame = frame;
+    }
+    async addBindingToSecondaryWorld(binding) {
+        var _a;
+        const pageImpl = this.parentPageDelegate.pageImpl;
+        if (pageImpl) {
+            await ((_a = pageImpl._delegate) === null || _a === void 0 ? void 0 : _a._session.send('Page.addBinding', {
+                worldName: playwrightFrame_1.UTILITY_CONTEXT_NAME,
+                name: binding.name,
+                script: binding.source,
+            }));
+        }
+        return;
+    }
+}
+exports.FirefoxFrameDelegate = FirefoxFrameDelegate;

package/browserLauncher/playwrightBrowserLauncher/firefox/firefoxPageDelegate.js

@@ -0,0 +1,83 @@
+"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.FirefoxPageDelegate = void 0;
+const playwright = __importStar(require("@playwright/test"));
+const firefoxElementHandleDelegate_1 = require("./firefoxElementHandleDelegate");
+const logUtils_1 = require("../../../util/logUtils");
+const firefoxFrameDelegate_1 = require("./firefoxFrameDelegate");
+class FirefoxPageDelegate {
+    constructor(page) {
+        this.page = page;
+        this.pageImpl = playwright._toImpl(page);
+    }
+    setFocusEmulationEnabled(_enabled) {
+        return Promise.resolve();
+    }
+    waitForInitialization() {
+        return Promise.resolve();
+    }
+    getBrowserBounds() {
+        return undefined;
+    }
+    setBrowserBounds(_width, _height) {
+        return Promise.resolve();
+    }
+    getTargetId() {
+        return this.page.mainFrame()._id;
+    }
+    createCDPSession() {
+        var _a;
+        return Promise.resolve((_a = this.pageImpl._delegate) === null || _a === void 0 ? void 0 : _a._session);
+    }
+    makeCDPCall(method, paramArgs) {
+        return this.getCDPSession().send(method, paramArgs);
+    }
+    createElementHandleDelegate(element) {
+        return new firefoxElementHandleDelegate_1.FirefoxElementHandleDelegate(element);
+    }
+    getCDPSession() {
+        var _a, _b;
+        this.checkCDPSession();
+        return (_b = (_a = this.pageImpl) === null || _a === void 0 ? void 0 : _a._delegate) === null || _b === void 0 ? void 0 : _b._session;
+    }
+    checkCDPSession() {
+        var _a, _b, _c, _d;
+        if (((_b = (_a = this.pageImpl) === null || _a === void 0 ? void 0 : _a._delegate) === null || _b === void 0 ? void 0 : _b._session) === undefined) {
+            const undefinedField = ((_d = (_c = this.pageImpl) === null || _c === void 0 ? void 0 : _c._delegate) === null || _d === void 0 ? void 0 : _d._session) !== undefined
+                ? '_session'
+                : '_delegate';
+            (0, logUtils_1.logInternal)(`Unable to get the CDP Session of the page (${undefinedField} is undefined).
+        Creating a fallback session. Some functionality might not work as expected.`);
+        }
+    }
+    createFrameDelegate(frame) {
+        return new firefoxFrameDelegate_1.FirefoxFrameDelegate(this, frame);
+    }
+    enableScreencastMode() {
+        return Promise.resolve();
+    }
+}
+exports.FirefoxPageDelegate = FirefoxPageDelegate;

package/browserLauncher/playwrightBrowserLauncher/frameDelegate.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/browserLauncher/playwrightBrowserLauncher/pageDelegate.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/browserLauncher/playwrightBrowserLauncher/playwrightBrowser.js

@@ -34,44 +34,50 @@ const playwrightPage_1 = require("./playwrightPage");
 const types_1 = require("../types");
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const loggingProvider_1 = require("../../providers/logging/loggingProvider");
+const firefoxBrowserDelegate_1 = require("./firefox/firefoxBrowserDelegate");
+const chromiumBrowserDelegate_1 = require("./chromium/chromiumBrowserDelegate");
 class PlaywrightBrowser extends events_1.default {
-    constructor(defaultContext, downloadDirectory, browserWSEndpoint, enableScreencastMode, disableFocusEmulation) {
+    constructor(defaultContext, downloadDirectory, browserWSEndpoint, browserDelegate, preferenceDirectory, disableFocusEmulation) {
         super();
         this.defaultContext = defaultContext;
         this.downloadDirectory = downloadDirectory;
         this.browserWSEndpoint = browserWSEndpoint;
+        this.browserDelegate = browserDelegate;
+        this.preferenceDirectory = preferenceDirectory;
         this.disableFocusEmulation = disableFocusEmulation;
         this.playwrightPages = new Map();
-        const contextImpl = playwright._toImpl(defaultContext);
-        this.browser = contextImpl._browser;
-        this.cdpSession = this.browser._connection.rootSession;
+        this.cdpSession = browserDelegate.getCDPSession();
         this.defaultContext.on('page', async (page) => {
             this.emit(browserLauncher_1.BrowserEvent.PageCreated, await this.getOrCreatePage(page));
         });
-        this.browser.on('disconnected', () => {
+        this.browserDelegate.getBrowser().on('disconnected', () => {
             this.emit(browserLauncher_1.BrowserEvent.Disconnected);
         });
         if (!fs_extra_1.default.existsSync(path_1.default.join(this.downloadDirectory))) {
             fs_extra_1.default.mkdirSync(path_1.default.join(this.downloadDirectory));
         }
-        loggingProvider_1.logger.debug(`Screencast mode is ${enableScreencastMode ? 'enabled' : 'disabled'}`);
-        if (enableScreencastMode) {
-            this.defaultContext.on('page', async (page) => this.enableScreencastMode(page));
-            this.defaultContext.pages().forEach(async (page) => {
-                await this.enableScreencastMode(page);
-            });
-        }
+        this.defaultContext.on('page', async (playwrightPage) => {
+            const page = await this.getOrCreatePage(playwrightPage);
+            await page.delegate.enableScreencastMode();
+        });
+        this.defaultContext.pages().forEach(async (playwrightPage) => {
+            const page = await this.getOrCreatePage(playwrightPage);
+            await page.delegate.enableScreencastMode();
+        });
     }
-    static async create(defaultContext, downloadDirectory, browserWSEndpoint, enableScreencastMode, disableFocusEmulation) {
-        const browser = new PlaywrightBrowser(defaultContext, downloadDirectory, browserWSEndpoint, enableScreencastMode, disableFocusEmulation);
-        await browser.setDownloadBehavior();
+    static async create(browserType, defaultContext, downloadDirectory, browserWSEndpoint, preferenceDirectory, disableFocusEmulation) {
+        const delegate = getBrowserDelegate(browserType, defaultContext);
+        const browser = new PlaywrightBrowser(defaultContext, downloadDirectory, browserWSEndpoint, delegate, preferenceDirectory, disableFocusEmulation);
+        await delegate.setDownloadBehavior(downloadDirectory);
         return browser;
     }
+    getBrowserPreferencesDirectory() {
+        return this.preferenceDirectory;
+    }
     getRunnerType() {
         return types_1.RunnerType.Playwright;
     }
-    makeCdpCall(method, paramArgs) {
+    makeCDPCall(method, paramArgs) {
         return this.cdpSession.send(method, paramArgs);
     }
     close() {
@@ -87,7 +93,7 @@ class PlaywrightBrowser extends events_1.default {
         return this.getOrCreatePage(await this.defaultContext.newPage());
     }
     isConnected() {
-        return this.browser.isConnected();
+        return this.browserDelegate.getBrowser().isConnected();
     }
     wsEndpoint() {
         return this.browserWSEndpoint;
@@ -100,6 +106,12 @@ class PlaywrightBrowser extends events_1.default {
             .pages()
             .map((page) => this.getOrCreatePage(page)));
     }
+    addCookies(cookies) {
+        return this.getDefaultContext().addCookies(cookies);
+    }
+    getCookies(url) {
+        return this.getDefaultContext().cookies(url);
+    }
     async getExtensionBackgroundPage(extensionId) {
         const backgroundExtensionPage = this.defaultContext
             .backgroundPages()
@@ -128,22 +140,6 @@ class PlaywrightBrowser extends events_1.default {
     getDefaultContext() {
         return this.defaultContext;
     }
-    async setDownloadBehavior() {
-        await this.cdpSession.send('Browser.setDownloadBehavior', {
-            behavior: 'allow',
-            downloadPath: this.downloadDirectory,
-            eventsEnabled: true,
-        });
-    }
-    async enableScreencastMode(page) {
-        const cdp = await this.defaultContext.newCDPSession(page);
-        cdp.on('Page.screencastFrame', async (params) => {
-            await cdp
-                .send('Page.screencastFrameAck', { sessionId: params.sessionId })
-                .catch(() => { });
-        });
-        await cdp.send('Page.startScreencast', {});
-    }
     onPageClose(page) {
         this.playwrightPages.delete(page.getPageId());
         this.emit(browserLauncher_1.BrowserEvent.PageDestroyed, page);
@@ -151,7 +147,7 @@ class PlaywrightBrowser extends events_1.default {
     async getOrCreatePage(page) {
         const pageId = page._guid;
         if (!this.playwrightPages.has(pageId)) {
-            const newPage = new playwrightPage_1.PlaywrightPage(page, this);
+            const newPage = new playwrightPage_1.PlaywrightPage(page, this, this.browserDelegate.createPageDelegate(page));
             this.playwrightPages.set(pageId, newPage);
         }
         const playwrightPage = this.playwrightPages.get(pageId);
@@ -163,3 +159,13 @@ class PlaywrightBrowser extends events_1.default {
     }
 }
 exports.PlaywrightBrowser = PlaywrightBrowser;
+function getBrowserDelegate(browserType, browserContext) {
+    switch (browserType) {
+        case playwright.chromium:
+            return new chromiumBrowserDelegate_1.ChromiumBrowserDelegate(browserContext);
+        case playwright.firefox:
+            return new firefoxBrowserDelegate_1.FirefoxBrowserDelegate(browserContext);
+        default:
+            throw new Error(`Unsupported browser type: ${browserType}`);
+    }
+}

package/browserLauncher/playwrightBrowserLauncher/playwrightBrowserLauncher.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlaywrightBrowserLauncher = void 0;
 const test_1 = require("@playwright/test");
+const path_1 = __importDefault(require("path"));
 const browserTypes_1 = require("../../commands/browserTypes");
 const loggingProvider_1 = require("../../providers/logging/loggingProvider");
 const playwrightBrowser_1 = require("./playwrightBrowser");
@@ -28,14 +32,15 @@ class PlaywrightBrowserLauncher {
             loggingProvider_1.logger.error('Download path is required to launch a persistent chromium context and was not provided with LaunchOptions [{}]', options);
             throw new Error('Download path is required to launch a persistent chromium context and was not provided with LaunchOptions');
         }
-        const defaultContext = await test_1.chromium.launchPersistentContext(options.userDataDir, {
+        const playwrightBrowserType = getPlaywrightBrowserType(options.browserType);
+        const defaultContext = await playwrightBrowserType.launchPersistentContext(options.userDataDir, {
             acceptDownloads: true,
             args: options.args,
             bypassCSP: options.bypassContentSecurityPolicy,
             channel: browserTypes_1.SupportedBrowserTypeProperties[options.browserType]
                 .browserReleaseChannel,
             deviceScaleFactor: (_a = options.defaultDeviceDescriptor) === null || _a === void 0 ? void 0 : _a.deviceScaleFactor,
-            downloadsPath: options.downloadPath,
+            downloadsPath: getFinalDownloadDestination(options.browserType, options.downloadPath),
             executablePath: options.browserPath,
             extraHTTPHeaders: options.extraHttpHeaders,
             hasTouch: (_b = options.defaultDeviceDescriptor) === null || _b === void 0 ? void 0 : _b.hasTouch,
@@ -50,7 +55,27 @@ class PlaywrightBrowserLauncher {
             userAgent: (_d = options.userAgent) !== null && _d !== void 0 ? _d : options.defaultUserAgent,
             viewport,
         });
-        return playwrightBrowser_1.PlaywrightBrowser.create(defaultContext, options.downloadPath, '', options.enableScreencastModeForScreenshotTimeouts, options.disableFocusEmulation);
+        return playwrightBrowser_1.PlaywrightBrowser.create(playwrightBrowserType, defaultContext, options.downloadPath, '', options.userDataDir, options.disableFocusEmulation);
     }
 }
 exports.PlaywrightBrowserLauncher = PlaywrightBrowserLauncher;
+function getPlaywrightBrowserType(browserType) {
+    switch (browserType) {
+        case browserTypes_1.BrowserType.Chrome:
+        case browserTypes_1.BrowserType.Edge:
+            return test_1.chromium;
+        case browserTypes_1.BrowserType.Firefox:
+            return test_1.firefox;
+        default:
+            throw new Error(`Unsupported browser type: ${browserType}`);
+    }
+}
+function getFinalDownloadDestination(browserType, downloadPath) {
+    switch (browserType) {
+        case browserTypes_1.BrowserType.Chrome:
+        case browserTypes_1.BrowserType.Edge:
+            return downloadPath;
+        default:
+            return path_1.default.join(downloadPath, 'tmp');
+    }
+}