chore: allow passing cdp endpoint (#86)

Fixes https://github.com/microsoft/playwright-mcp/issues/84
This commit is contained in:
Pavel Feldman 2025-03-30 09:05:58 -07:00 committed by GitHub
parent 88fbf50841
commit a7392fc266
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 63 additions and 17 deletions

View File

@ -16,9 +16,15 @@
import * as playwright from 'playwright'; import * as playwright from 'playwright';
export type ContextOptions = {
userDataDir: string;
launchOptions?: playwright.LaunchOptions;
cdpEndpoint?: string;
remoteEndpoint?: string;
};
export class Context { export class Context {
private _userDataDir: string; private _options: ContextOptions;
private _launchOptions: playwright.LaunchOptions | undefined;
private _browser: playwright.Browser | undefined; private _browser: playwright.Browser | undefined;
private _page: playwright.Page | undefined; private _page: playwright.Page | undefined;
private _console: playwright.ConsoleMessage[] = []; private _console: playwright.ConsoleMessage[] = [];
@ -26,9 +32,8 @@ export class Context {
private _fileChooser: playwright.FileChooser | undefined; private _fileChooser: playwright.FileChooser | undefined;
private _lastSnapshotFrames: playwright.FrameLocator[] = []; private _lastSnapshotFrames: playwright.FrameLocator[] = [];
constructor(userDataDir: string, launchOptions?: playwright.LaunchOptions) { constructor(options: ContextOptions) {
this._userDataDir = userDataDir; this._options = options;
this._launchOptions = launchOptions;
} }
async createPage(): Promise<playwright.Page> { async createPage(): Promise<playwright.Page> {
@ -96,16 +101,25 @@ export class Context {
} }
private async _createPage(): Promise<{ browser?: playwright.Browser, page: playwright.Page }> { private async _createPage(): Promise<{ browser?: playwright.Browser, page: playwright.Page }> {
if (process.env.PLAYWRIGHT_WS_ENDPOINT) { if (this._options.remoteEndpoint) {
const url = new URL(process.env.PLAYWRIGHT_WS_ENDPOINT); const url = new URL(this._options.remoteEndpoint);
if (this._launchOptions) if (this._options.launchOptions)
url.searchParams.set('launch-options', JSON.stringify(this._launchOptions)); url.searchParams.set('launch-options', JSON.stringify(this._options.launchOptions));
const browser = await playwright.chromium.connect(String(url)); const browser = await playwright.chromium.connect(String(url));
const page = await browser.newPage(); const page = await browser.newPage();
return { browser, page }; return { browser, page };
} }
const context = await playwright.chromium.launchPersistentContext(this._userDataDir, this._launchOptions); if (this._options.cdpEndpoint) {
const browser = await playwright.chromium.connectOverCDP(this._options.cdpEndpoint);
const browserContext = browser.contexts()[0];
let [page] = browserContext.pages();
if (!page)
page = await browserContext.newPage();
return { browser, page };
}
const context = await playwright.chromium.launchPersistentContext(this._options.userDataDir, this._options.launchOptions);
const [page] = context.pages(); const [page] = context.pages();
return { page }; return { page };
} }

View File

@ -66,6 +66,7 @@ const resources: Resource[] = [
type Options = { type Options = {
userDataDir?: string; userDataDir?: string;
launchOptions?: LaunchOptions; launchOptions?: LaunchOptions;
cdpEndpoint?: string;
vision?: boolean; vision?: boolean;
}; };
@ -80,5 +81,6 @@ export function createServer(options?: Options): Server {
resources, resources,
userDataDir: options?.userDataDir ?? '', userDataDir: options?.userDataDir ?? '',
launchOptions: options?.launchOptions, launchOptions: options?.launchOptions,
cdpEndpoint: options?.cdpEndpoint,
}); });
} }

View File

@ -39,6 +39,7 @@ program
.option('--user-data-dir <path>', 'Path to the user data directory') .option('--user-data-dir <path>', 'Path to the user data directory')
.option('--vision', 'Run server that uses screenshots (Aria snapshots are used by default)') .option('--vision', 'Run server that uses screenshots (Aria snapshots are used by default)')
.option('--port <port>', 'Port to listen on for SSE transport.') .option('--port <port>', 'Port to listen on for SSE transport.')
.option('--cdp-endpoint <endpoint>', 'CDP endpoint to connect to.')
.action(async options => { .action(async options => {
const launchOptions: LaunchOptions = { const launchOptions: LaunchOptions = {
headless: !!options.headless, headless: !!options.headless,
@ -49,6 +50,7 @@ program
userDataDir, userDataDir,
launchOptions, launchOptions,
vision: !!options.vision, vision: !!options.vision,
cdpEndpoint: options.cdpEndpoint,
})); }));
setupExitWatchdog(serverList); setupExitWatchdog(serverList);

View File

@ -21,20 +21,18 @@ import { Context } from './context';
import type { Tool } from './tools/tool'; import type { Tool } from './tools/tool';
import type { Resource } from './resources/resource'; import type { Resource } from './resources/resource';
import type { LaunchOptions } from 'playwright'; import type { ContextOptions } from './context';
type Options = { type Options = ContextOptions & {
name: string; name: string;
version: string; version: string;
tools: Tool[]; tools: Tool[];
resources: Resource[], resources: Resource[],
userDataDir: string;
launchOptions?: LaunchOptions;
}; };
export function createServerWithTools(options: Options): Server { export function createServerWithTools(options: Options): Server {
const { name, version, tools, resources, userDataDir, launchOptions } = options; const { name, version, tools, resources } = options;
const context = new Context(userDataDir, launchOptions); const context = new Context(options);
const server = new Server({ name, version }, { const server = new Server({ name, version }, {
capabilities: { capabilities: {
tools: {}, tools: {},

View File

@ -313,3 +313,21 @@ test('sse transport', async () => {
cp.kill(); cp.kill();
} }
}); });
test('cdp server', async ({ cdpEndpoint, startClient }) => {
const client = await startClient({ args: [`--cdp-endpoint=${cdpEndpoint}`] });
expect(await client.callTool({
name: 'browser_navigate',
arguments: {
url: 'data:text/html,<html><title>Title</title><body>Hello, world!</body></html>',
},
})).toHaveTextContent(`
- Page URL: data:text/html,<html><title>Title</title><body>Hello, world!</body></html>
- Page Title: Title
- Page Snapshot
\`\`\`yaml
- document [ref=s1e2]: Hello, world!
\`\`\`
`
);
});

View File

@ -24,8 +24,9 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js';
type Fixtures = { type Fixtures = {
client: Client; client: Client;
visionClient: Client; visionClient: Client;
startClient: (options?: { env?: NodeJS.ProcessEnv, vision?: boolean }) => Promise<Client>; startClient: (options?: { args?: string[], vision?: boolean }) => Promise<Client>;
wsEndpoint: string; wsEndpoint: string;
cdpEndpoint: string;
}; };
export const test = baseTest.extend<Fixtures>({ export const test = baseTest.extend<Fixtures>({
@ -46,6 +47,8 @@ export const test = baseTest.extend<Fixtures>({
const args = ['--headless', '--user-data-dir', userDataDir]; const args = ['--headless', '--user-data-dir', userDataDir];
if (options?.vision) if (options?.vision)
args.push('--vision'); args.push('--vision');
if (options?.args)
args.push(...options.args);
const transport = new StdioClientTransport({ const transport = new StdioClientTransport({
command: 'node', command: 'node',
args: [path.join(__dirname, '../cli.js'), ...args], args: [path.join(__dirname, '../cli.js'), ...args],
@ -64,6 +67,15 @@ export const test = baseTest.extend<Fixtures>({
await use(browserServer.wsEndpoint()); await use(browserServer.wsEndpoint());
await browserServer.close(); await browserServer.close();
}, },
cdpEndpoint: async ({ }, use, testInfo) => {
const port = 3200 + (+process.env.TEST_PARALLEL_INDEX!);
const browser = await chromium.launchPersistentContext(testInfo.outputPath('user-data-dir'), {
args: [`--remote-debugging-port=${port}`],
});
await use(`http://localhost:${port}`);
await browser.close();
},
}); });
type Response = Awaited<ReturnType<Client['callTool']>>; type Response = Awaited<ReturnType<Client['callTool']>>;