@vitest/browser 3.1.2 → 3.2.0-beta.1

package/dist/{webdriver-BzjiKqT8.js → webdriver-D7k26Na7.js}

@@ -1,5 +1,8 @@
 import { createManualModuleSource } from '@vitest/mocker/node';
+import c from 'tinyrainbow';
+import { createDebugger } from 'vitest/node';
 
+const debug$1 = createDebugger("vitest:browser:playwright");
 const playwrightBrowsers = [
 	"firefox",
 	"webkit",
@@ -16,25 +19,41 @@ class PlaywrightBrowserProvider {
 	pages = new Map();
 	browserPromise = null;
 	mocker;
+	closing = false;
 	getSupportedBrowsers() {
 		return playwrightBrowsers;
 	}
 	initialize(project, { browser, options }) {
+		this.closing = false;
 		this.project = project;
 		this.browserName = browser;
 		this.options = options;
 		this.mocker = this.createMocker();
 	}
 	async openBrowser() {
+		await this._throwIfClosing();
 		if (this.browserPromise) {
+			debug$1?.("[%s] the browser is resolving, reusing the promise", this.browserName);
 			return this.browserPromise;
 		}
 		if (this.browser) {
+			debug$1?.("[%s] the browser is resolved, reusing it", this.browserName);
 			return this.browser;
 		}
 		this.browserPromise = (async () => {
 			const options = this.project.config.browser;
 			const playwright = await import('playwright');
+			if (this.options?.connect) {
+				if (this.options.launch) {
+					this.project.vitest.logger.warn(c.yellow(`Found both ${c.bold(c.italic(c.yellow("connect")))} and ${c.bold(c.italic(c.yellow("launch")))} options in browser instance configuration.
+          Ignoring ${c.bold(c.italic(c.yellow("launch")))} options and using ${c.bold(c.italic(c.yellow("connect")))} mode.
+          You probably want to remove one of the two options and keep only the one you want to use.`));
+				}
+				const browser = await playwright[this.browserName].connect(this.options.connect.wsEndpoint, this.options.connect.options);
+				this.browser = browser;
+				this.browserPromise = null;
+				return this.browser;
+			}
 			const launchOptions = {
 				...this.options?.launch,
 				headless: options.headless
@@ -55,8 +74,8 @@ class PlaywrightBrowserProvider {
 					launchOptions.args.push("--start-maximized");
 				}
 			}
-			const browser = await playwright[this.browserName].launch(launchOptions);
-			this.browser = browser;
+			debug$1?.("[%s] initializing the browser with launch options: %O", this.browserName, launchOptions);
+			this.browser = await playwright[this.browserName].launch(launchOptions);
 			this.browserPromise = null;
 			return this.browser;
 		})();
@@ -166,10 +185,13 @@ class PlaywrightBrowserProvider {
 		};
 	}
 	async createContext(sessionId) {
+		await this._throwIfClosing();
 		if (this.contexts.has(sessionId)) {
+			debug$1?.("[%s][%s] the context already exists, reusing it", sessionId, this.browserName);
 			return this.contexts.get(sessionId);
 		}
 		const browser = await this.openBrowser();
+		await this._throwIfClosing(browser);
 		const { actionTimeout,...contextOptions } = this.options?.context ?? {};
 		const options = {
 			...contextOptions,
@@ -179,9 +201,11 @@ class PlaywrightBrowserProvider {
 			options.viewport = null;
 		}
 		const context = await browser.newContext(options);
+		await this._throwIfClosing(context);
 		if (actionTimeout) {
 			context.setDefaultTimeout(actionTimeout);
 		}
+		debug$1?.("[%s][%s] the context is ready", sessionId, this.browserName);
 		this.contexts.set(sessionId, context);
 		return context;
 	}
@@ -219,13 +243,17 @@ class PlaywrightBrowserProvider {
 		};
 	}
 	async openBrowserPage(sessionId) {
+		await this._throwIfClosing();
 		if (this.pages.has(sessionId)) {
+			debug$1?.("[%s][%s] the page already exists, closing the old one", sessionId, this.browserName);
 			const page = this.pages.get(sessionId);
 			await page.close();
 			this.pages.delete(sessionId);
 		}
 		const context = await this.createContext(sessionId);
 		const page = await context.newPage();
+		debug$1?.("[%s][%s] the page is ready", sessionId, this.browserName);
+		await this._throwIfClosing(page);
 		this.pages.set(sessionId, page);
 		if (process.env.VITEST_PW_DEBUG) {
 			page.on("requestfailed", (request) => {
@@ -235,9 +263,23 @@ class PlaywrightBrowserProvider {
 		return page;
 	}
 	async openPage(sessionId, url, beforeNavigate) {
+		debug$1?.("[%s][%s] creating the browser page for %s", sessionId, this.browserName, url);
 		const browserPage = await this.openBrowserPage(sessionId);
 		await beforeNavigate?.();
+		debug$1?.("[%s][%s] browser page is created, opening %s", sessionId, this.browserName, url);
 		await browserPage.goto(url, { timeout: 0 });
+		await this._throwIfClosing(browserPage);
+	}
+	async _throwIfClosing(disposable) {
+		if (this.closing) {
+			debug$1?.("[%s] provider was closed, cannot perform the action on %s", this.browserName, String(disposable));
+			await disposable?.close();
+			this.pages.clear();
+			this.contexts.clear();
+			this.browser = null;
+			this.browserPromise = null;
+			throw new Error(`[vitest] The provider was closed.`);
+		}
 	}
 	async getCDPSession(sessionid) {
 		const page = this.getPage(sessionid);
@@ -259,13 +301,20 @@ class PlaywrightBrowserProvider {
 		};
 	}
 	async close() {
+		debug$1?.("[%s] closing provider", this.browserName);
+		this.closing = true;
 		const browser = this.browser;
 		this.browser = null;
+		if (this.browserPromise) {
+			await this.browserPromise;
+			this.browserPromise = null;
+		}
 		await Promise.all([...this.pages.values()].map((p) => p.close()));
 		this.pages.clear();
 		await Promise.all([...this.contexts.values()].map((c) => c.close()));
 		this.contexts.clear();
 		await browser?.close();
+		debug$1?.("[%s] provider is closed", this.browserName);
 	}
 }
 function getHeaders(config) {
@@ -295,6 +344,7 @@ function isDirectCSSRequest(request) {
 	return CSS_LANGS_RE.test(request) && directRequestRE.test(request);
 }
 
+const debug = createDebugger("vitest:browser:wdio");
 const webdriverBrowsers = [
 	"firefox",
 	"chrome",
@@ -308,10 +358,12 @@ class WebdriverBrowserProvider {
 	browserName;
 	project;
 	options;
+	closing = false;
 	getSupportedBrowsers() {
 		return webdriverBrowsers;
 	}
 	async initialize(ctx, { browser, options }) {
+		this.closing = false;
 		this.project = ctx;
 		this.browserName = browser;
 		this.options = options;
@@ -337,7 +389,9 @@ class WebdriverBrowserProvider {
 		return { browser: this.browser };
 	}
 	async openBrowser() {
+		await this._throwIfClosing("opening the browser");
 		if (this.browser) {
+			debug?.("[%s] the browser is already opened, reusing it", this.browserName);
 			return this.browser;
 		}
 		const options = this.project.config.browser;
@@ -347,11 +401,14 @@ class WebdriverBrowserProvider {
 			}
 		}
 		const { remote } = await import('webdriverio');
-		this.browser = await remote({
+		const remoteOptions = {
 			...this.options,
 			logLevel: "error",
 			capabilities: this.buildCapabilities()
-		});
+		};
+		debug?.("[%s] opening the browser with options: %O", this.browserName, remoteOptions);
+		this.browser = await remote(remoteOptions);
+		await this._throwIfClosing();
 		return this.browser;
 	}
 	buildCapabilities() {
@@ -386,11 +443,24 @@ class WebdriverBrowserProvider {
 		}
 		return capabilities;
 	}
-	async openPage(_sessionId, url) {
+	async openPage(sessionId, url) {
+		await this._throwIfClosing("creating the browser");
+		debug?.("[%s][%s] creating the browser page for %s", sessionId, this.browserName, url);
 		const browserInstance = await this.openBrowser();
+		debug?.("[%s][%s] browser page is created, opening %s", sessionId, this.browserName, url);
 		await browserInstance.url(url);
+		await this._throwIfClosing("opening the url");
+	}
+	async _throwIfClosing(action) {
+		if (this.closing) {
+			debug?.(`[%s] provider was closed, cannot perform the action${action ? ` ${action}` : ""}`, this.browserName);
+			await (this.browser?.sessionId ? this.browser?.deleteSession?.() : null);
+			throw new Error(`[vitest] The provider was closed.`);
+		}
 	}
 	async close() {
+		debug?.("[%s] closing provider", this.browserName);
+		this.closing = true;
 		await Promise.all([this.browser?.sessionId ? this.browser?.deleteSession?.() : null]);
 		process.exit();
 	}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "3.1.2",
+  "version": "3.2.0-beta.1",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -66,7 +66,7 @@
   "peerDependencies": {
     "playwright": "*",
     "webdriverio": "^7.0.0 || ^8.0.0 || ^9.0.0",
-    "vitest": "3.1.2"
+    "vitest": "3.2.0-beta.1"
   },
   "peerDependenciesMeta": {
     "playwright": {
@@ -86,27 +86,27 @@
     "sirv": "^3.0.1",
     "tinyrainbow": "^2.0.0",
     "ws": "^8.18.1",
-    "@vitest/utils": "3.1.2",
-    "@vitest/mocker": "3.1.2"
+    "@vitest/mocker": "3.2.0-beta.1",
+    "@vitest/utils": "3.2.0-beta.1"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",
     "@wdio/protocols": "^9.12.5",
-    "@wdio/types": "^9.12.3",
+    "@wdio/types": "^9.12.6",
     "birpc": "2.3.0",
     "flatted": "^3.3.3",
     "ivya": "^1.6.0",
     "mime": "^4.0.7",
     "pathe": "^2.0.3",
     "periscopic": "^4.0.2",
-    "playwright": "^1.51.1",
-    "playwright-core": "^1.51.1",
+    "playwright": "^1.52.0",
+    "playwright-core": "^1.52.0",
     "safaridriver": "^1.0.0",
-    "webdriverio": "^9.12.5",
-    "@vitest/runner": "3.1.2",
-    "@vitest/ui": "3.1.2",
-    "@vitest/ws-client": "3.1.2",
-    "vitest": "3.1.2"
+    "webdriverio": "^9.12.7",
+    "@vitest/runner": "3.2.0-beta.1",
+    "@vitest/ui": "3.2.0-beta.1",
+    "vitest": "3.2.0-beta.1",
+    "@vitest/ws-client": "3.2.0-beta.1"
   },
   "scripts": {
     "build": "rimraf dist && pnpm build:node && pnpm build:client",

package/providers/playwright.d.ts

@@ -5,7 +5,8 @@ import type {
   FrameLocator,
   LaunchOptions,
   Page,
-  CDPSession
+  CDPSession,
+  ConnectOptions
 } from 'playwright'
 import { Protocol } from 'playwright-core/types/protocol'
 import '../matchers.js'
@@ -14,6 +15,10 @@ import type {} from "vitest/node"
 declare module 'vitest/node' {
   export interface BrowserProviderOptions {
     launch?: LaunchOptions
+    connect?: {
+      wsEndpoint: string
+      options?: ConnectOptions
+    }
     context?: Omit<
       BrowserContextOptions,
       'ignoreHTTPSErrors' | 'serviceWorkers'