豆豆友情提示:这是一个非官方 GitHub 代理镜像,主要用于网络测试或访问加速。请勿在此进行登录、注册或处理任何敏感信息。进行这些操作请务必访问官方网站 github.com。 Raw 内容也通过此代理提供。
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions src/McpContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
SerializedAXNode,
PredefinedNetworkConditions,
} from 'puppeteer-core';
import {Context} from './tools/ToolDefinition.js';
import {CLOSE_PAGE_ERROR, Context} from './tools/ToolDefinition.js';
import {Debugger} from 'debug';
import {NetworkCollector, PageCollector} from './PageCollector.js';
import fs from 'node:fs/promises';
Expand Down Expand Up @@ -133,9 +133,7 @@ export class McpContext implements Context {
}
async closePage(pageIdx: number): Promise<void> {
if (this.#pages.length === 1) {
throw new Error(
'Unable to close the last page in the browser. It is fine to keep the last page open.',
);
throw new Error(CLOSE_PAGE_ERROR);
}
const page = this.getPageByIdx(pageIdx);
this.setSelectedPageIdx(0);
Expand Down
3 changes: 3 additions & 0 deletions src/tools/ToolDefinition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,6 @@ export function defineTool<Schema extends Zod.ZodRawShape>(
) {
return definition;
}

export const CLOSE_PAGE_ERROR =
'The last open page cannot be closed. It is fine to keep it open.';
12 changes: 10 additions & 2 deletions src/tools/pages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import z from 'zod';
import {defineTool} from './ToolDefinition.js';
import {CLOSE_PAGE_ERROR, defineTool} from './ToolDefinition.js';
import {ToolCategories} from './categories.js';

export const listPages = defineTool({
Expand Down Expand Up @@ -58,7 +58,15 @@ export const closePage = defineTool({
),
},
handler: async (request, response, context) => {
await context.closePage(request.params.pageIdx);
try {
await context.closePage(request.params.pageIdx);
} catch (err) {
if (err.message === CLOSE_PAGE_ERROR) {
response.appendResponseLine(err.message);
} else {
throw err;
}
}
response.setIncludePages(true);
},
});
Expand Down
15 changes: 6 additions & 9 deletions tests/tools/pages.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,12 @@ describe('pages', () => {
it('cannot close the last page', async () => {
await withBrowser(async (response, context) => {
const page = context.getSelectedPage();
try {
await closePage.handler({params: {pageIdx: 0}}, response, context);
assert.fail('not reached');
} catch (err) {
assert.strictEqual(
err.message,
'Unable to close the last page in the browser. It is fine to keep the last page open.',
);
}
await closePage.handler({params: {pageIdx: 0}}, response, context);
assert.deepStrictEqual(
response.responseLines[0],
`The last open page cannot be closed. It is fine to keep it open.`,
);
assert.ok(response.includePages);
assert.ok(!page.isClosed());
});
});
Expand Down
Loading