chore: restart browser if page closed manually (#19)

Fixes https://github.com/microsoft/playwright-mcp/issues/18
This commit is contained in:
Pavel Feldman
2025-03-25 13:05:28 -07:00
committed by GitHub
parent f98d5d2e31
commit a392ba2f41
4 changed files with 143 additions and 47 deletions

View File

@@ -18,6 +18,7 @@ import * as playwright from 'playwright';
export class Context {
private _launchOptions: playwright.LaunchOptions;
private _browser: playwright.Browser | undefined;
private _page: playwright.Page | undefined;
private _console: playwright.ConsoleMessage[] = [];
private _initializePromise: Promise<void> | undefined;
@@ -39,30 +40,39 @@ export class Context {
async close() {
const page = await this.ensurePage();
await page.close();
this._initializePromise = undefined;
}
private async _initialize() {
if (this._initializePromise)
return this._initializePromise;
this._initializePromise = (async () => {
const browser = await this._createBrowser();
this._page = await browser.newPage();
this._browser = await createBrowser(this._launchOptions);
this._page = await this._browser.newPage();
this._page.on('console', event => this._console.push(event));
this._page.on('framenavigated', frame => {
if (!frame.parentFrame())
this._console.length = 0;
});
this._page.on('close', () => this._reset());
})();
return this._initializePromise;
}
private async _createBrowser(): Promise<playwright.Browser> {
if (process.env.PLAYWRIGHT_WS_ENDPOINT) {
const url = new URL(process.env.PLAYWRIGHT_WS_ENDPOINT);
url.searchParams.set('launch-options', JSON.stringify(this._launchOptions));
return await playwright.chromium.connect(String(url));
}
return await playwright.chromium.launch({ channel: 'chrome', ...this._launchOptions });
private _reset() {
const browser = this._browser;
this._initializePromise = undefined;
this._browser = undefined;
this._page = undefined;
this._console.length = 0;
void browser?.close();
}
}
async function createBrowser(launchOptions: playwright.LaunchOptions): Promise<playwright.Browser> {
if (process.env.PLAYWRIGHT_WS_ENDPOINT) {
const url = new URL(process.env.PLAYWRIGHT_WS_ENDPOINT);
url.searchParams.set('launch-options', JSON.stringify(launchOptions));
return await playwright.chromium.connect(String(url));
}
return await playwright.chromium.launch({ channel: 'chrome', ...launchOptions });
}

View File

@@ -17,7 +17,6 @@
import { Server as MCPServer } from '@modelcontextprotocol/sdk/server/index.js';
import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
import { CallToolRequestSchema, ListResourcesRequestSchema, ListToolsRequestSchema, ReadResourceRequestSchema } from '@modelcontextprotocol/sdk/types.js';
import * as playwright from 'playwright';
import { Context } from './context';
@@ -31,7 +30,6 @@ export type LaunchOptions = {
export class Server {
private _server: MCPServer;
private _tools: Tool[];
private _page: playwright.Page | undefined;
private _context: Context;
constructor(options: { name: string, version: string, tools: Tool[], resources: Resource[] }, launchOptions: LaunchOptions) {
@@ -90,6 +88,6 @@ export class Server {
async stop() {
await this._server.close();
await this._page?.context()?.browser()?.close();
await this._context.close();
}
}