Chrome DevTools for coding agents
fix(emulate): keep previous viewport when setViewport fails (#3150)
MankhongGarden19d883c4d2ba
diff --git a/src/McpPage.ts b/src/McpPage.tsindex 086de9b0..53da2fa5 100644--- a/src/McpPage.ts+++ b/src/McpPage.ts@@ -1272,13 +1272,26 @@ export class McpPage implements ContextPage {}}+ const previousViewport = this.emulationSettings.viewport;this.emulationSettings = Object.keys(newSettings).length ? newSettings : {};this.updateTimeouts();// This should happen after updating the page timeouts.// Setting the viewport can trigger a reload which we don't want to timeout.- await page.setViewport(newSettings.viewport ?? null);+ try {+ await page.setViewport(newSettings.viewport ?? null);+ } catch (error) {+ if (previousViewport) {+ newSettings.viewport = previousViewport;+ } else {+ delete newSettings.viewport;+ }+ this.emulationSettings = Object.keys(newSettings).length+ ? newSettings+ : {};+ throw error;+ }}updateTimeouts(): void {diff --git a/tests/McpPage.test.ts b/tests/McpPage.test.tsindex 0f23d436..0df230f6 100644--- a/tests/McpPage.test.ts+++ b/tests/McpPage.test.ts@@ -728,6 +728,43 @@ describe('McpPage', () => {sinon.assert.calledWithExactly(pptrPage.setViewport.secondCall, null);});+ it('does not store a viewport that setViewport rejects', async () => {+ const {mcpPage, pptrPage} = await createMcpPage();+ pptrPage.setViewport.rejects(new Error('Invalid parameters'));++ await assert.rejects(+ () => mcpPage.emulate({viewport: {width: 800.5, height: 600}}),+ /Invalid parameters/,+ );++ assert.strictEqual(mcpPage.viewport, null);+ });++ it('keeps the previous viewport when setViewport rejects a new one', async () => {+ const {mcpPage, pptrPage} = await createMcpPage();+ await mcpPage.emulate({viewport: {width: 400, height: 400}});+ pptrPage.setViewport.rejects(new Error('Invalid parameters'));++ await assert.rejects(+ () =>+ mcpPage.emulate({+ viewport: {width: 20000000, height: 600},+ cpuThrottlingRate: 4,+ }),+ /Invalid parameters/,+ );++ assert.deepStrictEqual(mcpPage.viewport, {+ width: 400,+ height: 400,+ deviceScaleFactor: 1,+ isMobile: false,+ hasTouch: false,+ isLandscape: false,+ });+ assert.strictEqual(mcpPage.cpuThrottlingRate, 4);+ });+it('calls setExtraHTTPHeaders with the given headers', async () => {const {mcpPage, pptrPage} = await createMcpPage();await mcpPage.emulate({