豆豆友情提示：这是一个非官方 GitHub 代理镜像，主要用于网络测试或访问加速。请勿在此进行登录、注册或处理任何敏感信息。进行这些操作请务必访问官方网站 github.com。 Raw 内容也通过此代理提供。
Skip to content

fix: respect custom timeouts in navigate tools #865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OrKoN merged 1 commit into from
Jan 30, 2026
Merged

fix: respect custom timeouts in navigate tools #865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/McpContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,10 @@ export class McpContext implements Context {
return new WaitForHelper(page, cpuMultiplier, networkMultiplier);
}

waitForEventsAfterAction(action: () => Promise<unknown>): Promise<void> {
waitForEventsAfterAction(
action: () => Promise<unknown>,
options?: {timeout?: number},
): Promise<void> {
const page = this.getSelectedPage();
const cpuMultiplier = this.getCpuThrottlingRate();
const networkMultiplier = getNetworkMultiplierFromString(
Expand All @@ -738,7 +741,7 @@ export class McpContext implements Context {
cpuMultiplier,
networkMultiplier,
);
return waitForHelper.waitForEventsAfterAction(action);
return waitForHelper.waitForEventsAfterAction(action, options);
}

getNetworkRequestStableId(request: HTTPRequest): number {
Expand Down
3 changes: 2 additions & 1 deletion src/WaitForHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,13 @@ export class WaitForHelper {

async waitForEventsAfterAction(
action: () => Promise<unknown>,
options?: {timeout?: number},
): Promise<void> {
const navigationFinished = this.waitForNavigationStarted()
.then(navigationStated => {
if (navigationStated) {
return this.#page.waitForNavigation({
timeout: this.#navigationTimeout,
timeout: options?.timeout ?? this.#navigationTimeout,
signal: this.#abortController.signal,
});
}
Expand Down
5 changes: 4 additions & 1 deletion src/tools/ToolDefinition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,10 @@ export type Context = Readonly<{
data: Uint8Array<ArrayBufferLike>,
filename: string,
): Promise<{filename: string}>;
waitForEventsAfterAction(action: () => Promise<unknown>): Promise<void>;
waitForEventsAfterAction(
action: () => Promise<unknown>,
options?: {timeout?: number},
): Promise<void>;
waitForTextOnPage(text: string, timeout?: number): Promise<Element>;
getDevToolsData(): Promise<DevToolsData>;
/**
Expand Down
130 changes: 69 additions & 61 deletions src/tools/pages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,14 @@ export const newPage = defineTool({
handler: async (request, response, context) => {
const page = await context.newPage(request.params.background);

await context.waitForEventsAfterAction(async () => {
await page.goto(request.params.url, {
timeout: request.params.timeout,
});
});
await context.waitForEventsAfterAction(
async () => {
await page.goto(request.params.url, {
timeout: request.params.timeout,
});
},
{timeout: request.params.timeout},
);

response.setIncludePages(true);
},
Expand Down Expand Up @@ -181,62 +184,67 @@ export const navigatePage = defineTool({
page.on('dialog', dialogHandler);

try {
await context.waitForEventsAfterAction(async () => {
switch (request.params.type) {
case 'url':
if (!request.params.url) {
throw new Error('A URL is required for navigation of type=url.');
}
try {
await page.goto(request.params.url, options);
response.appendResponseLine(
`Successfully navigated to ${request.params.url}.`,
);
} catch (error) {
response.appendResponseLine(
`Unable to navigate in the selected page: ${error.message}.`,
);
}
break;
case 'back':
try {
await page.goBack(options);
response.appendResponseLine(
`Successfully navigated back to ${page.url()}.`,
);
} catch (error) {
response.appendResponseLine(
`Unable to navigate back in the selected page: ${error.message}.`,
);
}
break;
case 'forward':
try {
await page.goForward(options);
response.appendResponseLine(
`Successfully navigated forward to ${page.url()}.`,
);
} catch (error) {
response.appendResponseLine(
`Unable to navigate forward in the selected page: ${error.message}.`,
);
}
break;
case 'reload':
try {
await page.reload({
...options,
ignoreCache: request.params.ignoreCache,
});
response.appendResponseLine(`Successfully reloaded the page.`);
} catch (error) {
response.appendResponseLine(
`Unable to reload the selected page: ${error.message}.`,
);
}
break;
}
});
await context.waitForEventsAfterAction(
async () => {
switch (request.params.type) {
case 'url':
if (!request.params.url) {
throw new Error(
'A URL is required for navigation of type=url.',
);
}
try {
await page.goto(request.params.url, options);
response.appendResponseLine(
`Successfully navigated to ${request.params.url}.`,
);
} catch (error) {
response.appendResponseLine(
`Unable to navigate in the selected page: ${error.message}.`,
);
}
break;
case 'back':
try {
await page.goBack(options);
response.appendResponseLine(
`Successfully navigated back to ${page.url()}.`,
);
} catch (error) {
response.appendResponseLine(
`Unable to navigate back in the selected page: ${error.message}.`,
);
}
break;
case 'forward':
try {
await page.goForward(options);
response.appendResponseLine(
`Successfully navigated forward to ${page.url()}.`,
);
} catch (error) {
response.appendResponseLine(
`Unable to navigate forward in the selected page: ${error.message}.`,
);
}
break;
case 'reload':
try {
await page.reload({
...options,
ignoreCache: request.params.ignoreCache,
});
response.appendResponseLine(`Successfully reloaded the page.`);
} catch (error) {
response.appendResponseLine(
`Unable to reload the selected page: ${error.message}.`,
);
}
break;
}
},
{timeout: request.params.timeout},
);
} finally {
page.off('dialog', dialogHandler);
if (initScriptId) {
Expand Down
29 changes: 29 additions & 0 deletions tests/tools/pages.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import assert from 'node:assert';
import {describe, it} from 'node:test';

import type {Dialog} from 'puppeteer-core';
import sinon from 'sinon';

import {
listPages,
Expand Down Expand Up @@ -160,6 +161,34 @@ describe('pages', () => {
}
});
});

it('respects the timeout parameter', async () => {
await withMcpContext(async (response, context) => {
const page = context.getSelectedPage();
const stub = sinon.stub(page, 'waitForNavigation').resolves(null);

try {
await navigatePage.handler(
{
params: {
url: 'about:blank',
timeout: 12345,
},
},
response,
context,
);
} finally {
stub.restore();
}

assert.strictEqual(
stub.firstCall.args[0]?.timeout,
12345,
'The timeout parameter should be passed to waitForNavigation',
);
});
});
it('go back', async () => {
await withMcpContext(async (response, context) => {
const page = context.getSelectedPage();
Expand Down