From c2d87a954a4a08e5783d33966c7f20eb75b39b27 Mon Sep 17 00:00:00 2001 From: Vinyzu <50874994+Vinyzu@users.noreply.github.com> Date: Sun, 10 May 2026 13:31:41 +0200 Subject: [PATCH 01/22] Update sponsorship contact information in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8852706..7b0151d 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@

Sponsors

 -Want to Sponsor this Project? [Contact Me](https://discordapp.com/users/935224495126487150)! +Want to Sponsor this Project? Contact [@vinyzu](https://discordapp.com/users/935224495126487150) on Discord!
From 461b828d2892595b689423e996ba6ac9c90dfc0b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 May 2026 11:07:37 +0200 Subject: [PATCH 02/22] fix: investigate Playwright v1.60.0 release failure (#199) * chore: scaffold fix-v1.60.0-25698100548 * Port to v1.60.0 Note: Might revert some test skips later * Resolve Review * Revert Regressions --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Vinyzu <50874994+Vinyzu@users.noreply.github.com> --- driver_patches/browserContextPatch.ts | 2 +- driver_patches/crPagePatch.ts | 31 +- driver_patches/crServiceWorkerPatch.ts | 13 +- driver_patches/expectUtilsPatch.ts | 21 - driver_patches/frameDispatcherPatch.ts | 33 +- driver_patches/frameSelectorsPatch.ts | 90 +++-- driver_patches/framesPatch.ts | 524 ++++++++++++++----------- driver_patches/index.ts | 1 - driver_patches/javascriptPatch.ts | 8 +- driver_patches/pagePatch.ts | 12 +- driver_patches/screenshotterPatch.ts | 2 +- driver_patches/snapshotterPatch.ts | 6 +- patchright_driver_patch.ts | 49 +-- utils/modify_tests.ts | 66 +++- 14 files changed, 484 insertions(+), 374 deletions(-) delete mode 100644 driver_patches/expectUtilsPatch.ts diff --git a/driver_patches/browserContextPatch.ts b/driver_patches/browserContextPatch.ts index 0313b9e..fd0a214 100644 --- a/driver_patches/browserContextPatch.ts +++ b/driver_patches/browserContextPatch.ts @@ -12,7 +12,7 @@ export function patchBrowserContext(project: Project) { const browserContextClass = browserContextSourceFile.getClassOrThrow("BrowserContext"); // -- _initialize Method -- - const initializeMethod = browserContextClass.getMethodOrThrow("_initialize"); + const initializeMethod = browserContextClass.getMethodOrThrow("initialize"); // Getting the service worker registration call const initializeMethodCall = assertDefined( initializeMethod diff --git a/driver_patches/crPagePatch.ts b/driver_patches/crPagePatch.ts index 6938635..9f99ce0 100644 --- a/driver_patches/crPagePatch.ts +++ b/driver_patches/crPagePatch.ts @@ -196,10 +196,6 @@ export function patchCRPage(project: Project) { this._page.frameManager.frame(frame._id)._context("utility").catch(() => {}); for (const binding of this._crPage._browserContext._pageBindings.values()) frame.evaluateExpression(binding.source).catch(e => {}); - for (const source of this._crPage._browserContext.initScripts) - frame.evaluateExpression(source.source).catch(e => {}); - for (const source of this._crPage._page.initScripts) - frame.evaluateExpression(source.source).catch(e => {}); } `); @@ -362,10 +358,10 @@ export function patchCRPage(project: Project) { onExecutionContextCreatedMethod .getStatements() .filter((statement) => - statement.getText().includes("let worldName: types.World") || + statement.getText().includes("let worldName: types.World|null") || statement.getText().includes("if (contextPayload.auxData && !!contextPayload.auxData.isDefault)") || statement.getText().includes("worldName = 'main'") || - statement.getText().includes("else if (contextPayload.name === UTILITY_WORLD_NAME)") || + statement.getText().includes("else if (contextPayload.name === this._crPage.utilityWorldName)") || statement.getText().includes("worldName = 'utility'") ) .forEach((statement, index) => { @@ -376,11 +372,11 @@ export function patchCRPage(project: Project) { const contextCreatedIfStatement = assertDefined( onExecutionContextCreatedMethod .getDescendantsOfKind(SyntaxKind.IfStatement) - .find((stmt) => stmt.getText().includes("if (worldName)") && stmt.getText().includes("_contextCreated")) + .find((stmt) => stmt.getText().includes("if (worldName)") && stmt.getText().includes("contextCreated")) ); contextCreatedIfStatement.replaceWithText(` if (worldName && (worldName === 'main' || worldName === 'utility')) - frame._contextCreated(worldName, context); + frame.contextCreated(worldName, context); `); // Execute all exposed binding scripts in the created execution context onExecutionContextCreatedMethod.addStatements(` @@ -437,13 +433,18 @@ export function patchCRPage(project: Project) { ); onBindingCalledIfStatement.replaceWithText(` if (context) await this._page.onBindingCalled(event.payload, context); - else await this._page._onBindingCalled(event.payload, (await this._page.mainFrame()._mainContext())) // This might be a bit sketchy but it works for now + else await this._page._onBindingCalled(event.payload, (await this._page.mainFrame().mainContext())) // This might be a bit sketchy but it works for now `); // -- _evaluateOnNewDocument Method -- frameSessionClass .getMethodOrThrow("_evaluateOnNewDocument") - .setBodyText(`this._evaluateOnNewDocumentScripts.push(initScript); `); + .setBodyText(` + this._evaluateOnNewDocumentScripts.push(initScript); + const worldName = world === 'utility' ? this._crPage.utilityWorldName : undefined; + const { identifier } = await this._client.send('Page.addScriptToEvaluateOnNewDocument', { source: initScript.source, worldName, runImmediately }); + this._initScriptIds.set(initScript, identifier); + `); // -- _removeEvaluatesOnNewDocument Method -- frameSessionClass @@ -451,6 +452,14 @@ export function patchCRPage(project: Project) { .setBodyText(` const toRemove = new Set(initScripts); this._evaluateOnNewDocumentScripts = this._evaluateOnNewDocumentScripts.filter(script => !toRemove.has(script)); + const ids: string[] = []; + for (const script of initScripts) { + const id = this._initScriptIds.get(script); + if (id) + ids.push(id); + this._initScriptIds.delete(script); + } + await Promise.all(ids.map(identifier => this._client.send('Page.removeScriptToEvaluateOnNewDocument', { identifier }).catch(() => {}))); `); // -- _adoptBackendNodeId Method -- @@ -471,4 +480,4 @@ export function patchCRPage(project: Project) { .find((assignment) => assignment.getName() === "executionContextId") ); executionContextIdAssignment.setInitializer("to.delegate._contextId"); -} \ No newline at end of file +} diff --git a/driver_patches/crServiceWorkerPatch.ts b/driver_patches/crServiceWorkerPatch.ts index 7b624a5..822f702 100644 --- a/driver_patches/crServiceWorkerPatch.ts +++ b/driver_patches/crServiceWorkerPatch.ts @@ -23,12 +23,13 @@ export function patchCRServiceWorker(project: Project) { const crServiceWorkerConstructorBody = crServiceWorkerConstructorDeclaration.getBodyOrThrow().asKindOrThrow(SyntaxKind.Block); // Find the Runtime.enable statement to remove - assertDefined( - crServiceWorkerConstructorBody - .getStatements() - .find((s) => s.getText().includes("session.send") && s.getText().includes("Runtime.enable")) - ).remove(); + crServiceWorkerConstructorBody + .getStatements() + .find((s) => s.getText().includes("session.send") && s.getText().includes("Runtime.enable")) + ?.remove(); + if (crServiceWorkerConstructorBody.getText().includes('expression: "globalThis"')) + return; crServiceWorkerConstructorBody.addStatements(` session._sendMayFail("Runtime.evaluate", { expression: "globalThis", @@ -41,4 +42,4 @@ export function patchCRServiceWorker(project: Project) { } }); `); -} \ No newline at end of file +} diff --git a/driver_patches/expectUtilsPatch.ts b/driver_patches/expectUtilsPatch.ts deleted file mode 100644 index 85e4fda..0000000 --- a/driver_patches/expectUtilsPatch.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { type Project, SyntaxKind } from 'ts-morph'; -import { assertDefined } from './utils.ts'; - -// --------------------------- -// server/utils/expectUtils.ts -// --------------------------- -export function patchExpectUtils(project: Project) { - // Add source file to the project - const expectUtilsSourceFile = project.addSourceFileAtPath('packages/playwright-core/src/server/utils/expectUtils.ts'); - - // ------- formatMatcherMessage Function ------- - const formatMatcherMessageFunction = expectUtilsSourceFile.getFunctionOrThrow('formatMatcherMessage'); - const formatMatcherMessageAlignDecl = assertDefined( - formatMatcherMessageFunction - .getDescendantsOfKind(SyntaxKind.VariableDeclaration) - .find(d => d.getName() === 'align') - ); - formatMatcherMessageAlignDecl.setInitializer( - "!details.errorMessage && details.printedExpected?.startsWith('Expected:') && (!details.printedReceived || details.printedReceived.startsWith('Received:'))" - ); -} diff --git a/driver_patches/frameDispatcherPatch.ts b/driver_patches/frameDispatcherPatch.ts index ed3621b..7770fc7 100644 --- a/driver_patches/frameDispatcherPatch.ts +++ b/driver_patches/frameDispatcherPatch.ts @@ -15,11 +15,12 @@ export function patchFrameDispatcher(project: Project) { frameEvaluateExpressionMethod.setBodyText(` return { value: serializeResult( - await progress.race( - this._frame.evaluateExpression( - params.expression, - { isFunction: params.isFunction, world: params.isolatedContext ? 'utility': 'main' }, - parseArgument(params.arg) + await progress.race( + this._frame.evaluateExpression( + progress, + params.expression, + { isFunction: params.isFunction, world: params.isolatedContext ? 'utility': 'main' }, + parseArgument(params.arg) ) ) ) @@ -32,11 +33,12 @@ export function patchFrameDispatcher(project: Project) { return { handle: ElementHandleDispatcher.fromJSOrElementHandle( this, - await progress.race( - this._frame.evaluateExpressionHandle( - params.expression, - { isFunction: params.isFunction, world: params.isolatedContext ? 'utility': 'main' }, - parseArgument(params.arg) + await progress.race( + this._frame.evaluateExpressionHandle( + progress, + params.expression, + { isFunction: params.isFunction, world: params.isolatedContext ? 'utility': 'main' }, + parseArgument(params.arg) ) ) ) @@ -47,10 +49,11 @@ export function patchFrameDispatcher(project: Project) { const frameEvalOnSelectorAllExpressionMethod = frameDispatcherClass.getMethodOrThrow("evalOnSelectorAll"); frameEvalOnSelectorAllExpressionMethod.setBodyText(` return { - value: serializeResult( - await this._frame.evalOnSelectorAll( - params.selector, - params.expression, + value: serializeResult( + await this._frame.evalOnSelectorAll( + progress, + params.selector, + params.expression, params.isFunction, parseArgument(params.arg), null, @@ -59,4 +62,4 @@ export function patchFrameDispatcher(project: Project) { ) }; `); -} \ No newline at end of file +} diff --git a/driver_patches/frameSelectorsPatch.ts b/driver_patches/frameSelectorsPatch.ts index 0486c17..28efe0d 100644 --- a/driver_patches/frameSelectorsPatch.ts +++ b/driver_patches/frameSelectorsPatch.ts @@ -33,11 +33,12 @@ export function patchFrameSelectors(project: Project) { // -- queryArrayInMainWorld Method -- const queryArrayInMainWorldMethod = frameSelectorsClass.getMethodOrThrow("queryArrayInMainWorld"); - queryArrayInMainWorldMethod.addParameter({ - name: "isolatedContext", - type: "boolean", - hasQuestionToken: true, - }); + if (!queryArrayInMainWorldMethod.getParameter("isolatedContext")) + queryArrayInMainWorldMethod.addParameter({ + name: "isolatedContext", + type: "boolean", + hasQuestionToken: true, + }); // Update mainWorld property based on isolatedContext parameter const resolveInjectedCall = queryArrayInMainWorldMethod .getDescendantsOfKind(SyntaxKind.CallExpression) @@ -57,34 +58,34 @@ export function patchFrameSelectors(project: Project) { // -- resolveFrameForSelector Method -- const resolveFrameForSelectorMethod = frameSelectorsClass.getMethodOrThrow("resolveFrameForSelector"); // Change 'element' variable declaration from const to let to allow reassignment. - assertDefined( - resolveFrameForSelectorMethod - .getDescendantsOfKind(SyntaxKind.VariableStatement) - .find(s => s.getText().includes("const element = handle.asElement()")) - ).setDeclarationKind(VariableDeclarationKind.Let); + resolveFrameForSelectorMethod + .getDescendantsOfKind(SyntaxKind.VariableStatement) + .find(s => s.getText().includes("const element = handle.asElement()")) + ?.setDeclarationKind(VariableDeclarationKind.Let); // Handle the case when element is not found - fetch it from the document using the parsed selector const resolveFrameForSelectorIfStatement = resolveFrameForSelectorMethod .getDescendantsOfKind(SyntaxKind.IfStatement) .find(statement => statement.getExpression().getText() === "!element"); - assertDefined(resolveFrameForSelectorIfStatement).replaceWithText(` - if (!element) { - try { - var client = frame._page.delegate._sessionForFrame(frame)._client; - } catch (e) { - var client = frame._page.delegate._mainFrameSession._client; + if (resolveFrameForSelectorIfStatement) + resolveFrameForSelectorIfStatement.replaceWithText(` + if (!element) { + try { + var client = frame._page.delegate._sessionForFrame(frame)._client; + } catch (e) { + var client = frame._page.delegate._mainFrameSession._client; + } + var mainContext = await frame._context("main"); + const documentNode = await client.send("Runtime.evaluate", { + expression: "document", + serializationOptions: { serialization: "idOnly" }, + contextId: mainContext.delegate._contextId + }); + const documentScope = new ElementHandle(mainContext, documentNode.result.objectId); + var check = await this._customFindFramesByParsed(injectedScript, client, mainContext, documentScope, undefined, info.parsed); + if (check.length === 0) return null; + element = check[0]; } - var mainContext = await frame._context("main"); - const documentNode = await client.send("Runtime.evaluate", { - expression: "document", - serializationOptions: { serialization: "idOnly" }, - contextId: mainContext.delegate._contextId - }); - const documentScope = new ElementHandle(mainContext, documentNode.result.objectId); - var check = await this._customFindFramesByParsed(injectedScript, client, mainContext, documentScope, undefined, info.parsed); - if (check.length === 0) return null; - element = check[0]; - } - `); + `); // -- resolveInjectedForSelector Method -- const resolveInjectedForSelectorMethod = frameSelectorsClass.getMethodOrThrow("resolveInjectedForSelector"); @@ -102,24 +103,27 @@ export function patchFrameSelectors(project: Project) { if (!callExpr) return false; - return decl.getName() === "context" && callExpr.getExpression().getText().includes("._context"); + const expressionText = callExpr.getExpression().getText(); + return decl.getName() === "context" && (expressionText.includes("._context") || expressionText.includes(".context")); })); - resolveInjectedForSelectorMethod.insertStatements(contextStatement.getChildIndex() + 1, `if (!context) throw new Error("Frame was detached");`); + if (!resolveInjectedForSelectorMethod.getText().includes('if (!context) throw new Error("Frame was detached");')) + resolveInjectedForSelectorMethod.insertStatements(contextStatement.getChildIndex() + 1, `if (!context) throw new Error("Frame was detached");`); // -- _customFindFramesByParsed Method -- progress - frameSelectorsClass.addMethod({ - name: "_customFindFramesByParsed", - isAsync: true, - parameters: [ - { name: "resolved", type: "JSHandle" }, - { name: "client", type: "CRSession" }, - { name: "context", type: "FrameExecutionContext" }, - { name: "documentScope", type: "ElementHandle" }, - { name: "progress", type: "Progress | undefined" }, - { name: "parsed", type: "ParsedSelector" }, - ], - }); + if (!frameSelectorsClass.getMethod("_customFindFramesByParsed")) + frameSelectorsClass.addMethod({ + name: "_customFindFramesByParsed", + isAsync: true, + parameters: [ + { name: "resolved", type: "JSHandle" }, + { name: "client", type: "CRSession" }, + { name: "context", type: "FrameExecutionContext" }, + { name: "documentScope", type: "ElementHandle" }, + { name: "progress", type: "Progress | undefined" }, + { name: "parsed", type: "ParsedSelector" }, + ], + }); const customFindFramesByParsedSelectorsMethod = frameSelectorsClass.getMethodOrThrow("_customFindFramesByParsed"); customFindFramesByParsedSelectorsMethod.setBodyText(` var parsedEdits = { ...parsed }; @@ -312,4 +316,4 @@ export function patchFrameSelectors(project: Project) { } return null; `); -} \ No newline at end of file +} diff --git a/driver_patches/framesPatch.ts b/driver_patches/framesPatch.ts index e86322b..89caee9 100644 --- a/driver_patches/framesPatch.ts +++ b/driver_patches/framesPatch.ts @@ -44,7 +44,7 @@ export function patchFrames(project: Project) { const handle = await this.selectors.query(selector, { strict }, scope); if (!handle) throw new Error('Failed to find element matching selector "' + selector + '"'); - const result = await handle.evaluateExpression(expression, { isFunction }, arg, true); + const result = await handle.internalEvaluateExpression(expression, { isFunction }, arg); handle.dispose(); return result; `); @@ -62,7 +62,7 @@ export function patchFrames(project: Project) { try { isolatedContext = this.selectors._parseSelector(selector, { strict: false }).world !== "main" && isolatedContext; const arrayHandle = await this.selectors.queryArrayInMainWorld(selector, scope, isolatedContext); - const result = await arrayHandle.evaluateExpression(expression, { isFunction }, arg, isolatedContext); + const result = await arrayHandle.internalEvaluateExpression(expression, { isFunction }, arg); arrayHandle.dispose(); return result; } catch (e) { @@ -104,6 +104,10 @@ export function patchFrames(project: Project) { const callback = (injectedScript, element, data) => { injectedScript.dispatchEvent(element, data.type, data.eventInit); }; + if (eventInitHandles.length === 0) { + await this._callOnElementOnceMatches(progress, selector, callback, { type, eventInit }, { ...options }, scope); + return; + } try { await this._callOnElementOnceMatches(progress, selector, callback, { type, eventInit }, { mainWorld: true, ...options }, scope); } catch (e) { @@ -118,22 +122,19 @@ export function patchFrames(project: Project) { // -- querySelectorAll Method -- const querySelectorAllMethod = frameClass.getMethodOrThrow("querySelectorAll"); querySelectorAllMethod.setBodyText(` - const metadata = { internal: false, log: [], method: "querySelectorAll" }; - const progress = { - log: message => metadata.log.push(message), - metadata, - race: (promise) => Promise.race(Array.isArray(promise) ? promise : [promise]) - } - return await this._retryWithoutProgress(progress, selector, {strict: null, performActionPreChecks: false}, async (result) => { + const continuePolling = Symbol("continuePolling"); + const result = await this._retryWithoutProgress(progress, selector, {strict: null, performActionPreChecks: false}, async (result) => { if (!result || !result[0]) return []; return Array.isArray(result[1]) ? result[1] : []; - }, 'returnAll', null); + }, 'returnAll', continuePolling); + return result === continuePolling ? await progress.race(this.selectors.queryAll(selector)) : result; `); // -- querySelector Method -- const querySelectorMethod = frameClass.getMethodOrThrow("querySelector"); querySelectorMethod.setBodyText(` - return this.querySelectorAll(selector, options).then((handles) => { + this.apiLog(\` finding element using the selector "\${selector}"\`); + return this.querySelectorAll(progress, selector).then((handles) => { if (handles.length === 0) return null; if (handles.length > 1 && options?.strict) @@ -172,10 +173,11 @@ export function patchFrames(project: Project) { `); // -- _context Method -- - const contextMethod = frameClass.getMethodOrThrow("_context"); + const contextMethod = frameClass.getMethodOrThrow("context"); + contextMethod.rename("_context"); contextMethod.setIsAsync(true); contextMethod.setBodyText(` - if (this.isDetached()) + if (this._isDetached()) throw new Error('Frame was detached'); let client; @@ -211,7 +213,7 @@ export function patchFrames(project: Project) { serializationOptions: { serialization: "idOnly" }, }); if (!globalThis) { - if (this.isDetached()) throw new Error('Frame was detached'); + if (this._isDetached()) throw new Error('Frame was detached'); return; } const executionContextId = parseInt(globalThis.result.objectId.split('.')[1], 10); @@ -223,10 +225,10 @@ export function patchFrames(project: Project) { const result = await client._sendMayFail('Page.createIsolatedWorld', { frameId: this._id, grantUniveralAccess: true, worldName: world, }); - if (!result) { - if (this.isDetached()) throw new Error("Frame was detached"); - return; - } + if (!result) { + if (this._isDetached()) throw new Error("Frame was detached"); + return; + } this._isolatedWorld = registerContext(result.executionContextId, "utility"); } @@ -236,25 +238,33 @@ export function patchFrames(project: Project) { return this._iframeWorld; return this._mainWorld; `); + frameClass.insertMethod(contextMethod.getChildIndex() + 1, { + name: "context", + parameters: [ + { name: "world", type: "types.World" }, + ], + returnType: "Promise", + statements: "return this._context(world);", + }); // -- _setContext Method -- const setContentMethod = frameClass.getMethodOrThrow("setContent"); setContentMethod.setBodyText(` - await this.raceNavigationAction(progress, async () => { - const waitUntil = options.waitUntil === void 0 ? "load" : options.waitUntil; - progress.log(\`setting frame content, waiting until "\${waitUntil}"\`); - const lifecyclePromise = new Promise((resolve, reject) => { - this._onClearLifecycle(); - this.waitForLoadState(progress, waitUntil).then(resolve).catch(reject); - }); - const setContentPromise = this._page.delegate._sessionForFrame(this)._client.send("Page.setDocumentContent", { - frameId: this._id, - html - }); - await Promise.all([setContentPromise, lifecyclePromise]); - - return null; - }); + await this.raceNavigationAction(progress, async () => { + const waitUntil = options.waitUntil === void 0 ? "load" : options.waitUntil; + progress.log(\`setting frame content, waiting until "\${waitUntil}"\`); + const lifecyclePromise = new Promise((resolve, reject) => { + this._onClearLifecycle(); + this.waitForLoadState(progress, waitUntil).then(resolve).catch(reject); + }); + const setContentPromise = this._page.delegate._sessionForFrame(this)._client.send("Page.setDocumentContent", { + frameId: this._id, + html + }); + await Promise.all([setContentPromise, lifecyclePromise]); + + return null; + }); `); // -- _retryWithProgressIfNotConnected Method -- @@ -270,8 +280,63 @@ export function patchFrames(project: Project) { retryWithProgressIfNotConnectedMethod.setBodyText(` if (!(options as any)?.__patchrightSkipRetryLogWaiting) progress.log("waiting for " + this._asLocator(selector)); - return this.retryWithProgressAndTimeouts(progress, [0, 20, 50, 100, 100, 500], async continuePolling => { - return this._retryWithoutProgress(progress, selector, options as any, action as any, returnAction, continuePolling); + if (returnAction === undefined) { + const noAutoWaiting = (options as any).__testHookNoAutoWaiting ?? options.noAutoWaiting; + const performActionPreChecks = (options.performActionPreChecks ?? !options.force) && !noAutoWaiting; + return this.retryWithProgressAndBackoff(progress, async (progress, continuePolling) => { + if (performActionPreChecks) + await this._page.performActionPreChecks(progress); + + const resolved = await progress.race(this.selectors.resolveInjectedForSelector(selector, { strict: options.strict })); + if (!resolved) { + if (noAutoWaiting) + throw new dom.NonRecoverableDOMError('Element(s) not found'); + return continuePolling; + } + const result = await progress.race(resolved.injected.evaluateHandle((injected, { info, callId }) => { + const elements = injected.querySelectorAll(info.parsed, document); + if (callId) + injected.markTargetElements(new Set(elements), callId); + const element = elements[0]; + let log = ''; + if (elements.length > 1) { + if (info.strict) + throw injected.strictModeViolationError(info.parsed, elements); + log = " locator resolved to " + elements.length + " elements. Proceeding with the first one: " + injected.previewNode(elements[0]); + } else if (element) { + log = " locator resolved to " + injected.previewNode(element); + } + injected.checkDeprecatedSelectorUsage(info.parsed, elements); + return { log, success: !!element, element }; + }, { info: resolved.info, callId: progress.metadata.id })); + const { log, success } = await progress.race(result.evaluate(r => ({ log: r.log, success: r.success }))); + if (log) + progress.log(log); + if (!success) { + if (noAutoWaiting) + throw new dom.NonRecoverableDOMError('Element(s) not found'); + result.dispose(); + return continuePolling; + } + const element = await progress.race(result.evaluateHandle(r => r.element)); + result.dispose(); + try { + const result = await (action.length >= 2 ? action(progress, element) : (action as any)(element)); + if (result === 'error:notconnected') { + if (noAutoWaiting) + throw new dom.NonRecoverableDOMError('Element is not attached to the DOM'); + progress.log('element was detached from the DOM, retrying'); + return continuePolling; + } + return result; + } finally { + element?.dispose(); + } + }); + } + return this.retryWithProgressAndTimeouts(progress, [0, 20, 50, 100, 100, 500], async (_progress, continuePolling) => { + const actionWithProgress = async (result) => action.length >= 2 ? action(progress, result as any) : (action as any)(result); + return this._retryWithoutProgress(progress, selector, options as any, actionWithProgress as any, returnAction, continuePolling); }); `); } else if (retryParamNames.includes("strict") && retryParamNames.includes("performActionPreChecks")) { @@ -280,8 +345,54 @@ export function patchFrames(project: Project) { if (!(normalizedOptions as any)?.__patchrightSkipRetryLogWaiting) progress.log("waiting for " + this._asLocator(selector)); - return this.retryWithProgressAndTimeouts(progress, [0, 20, 50, 100, 100, 500], async continuePolling => { - return this._retryWithoutProgress(progress, selector, normalizedOptions, action as any, returnAction, continuePolling); + if (returnAction === undefined) { + return this.retryWithProgressAndBackoff(progress, async (progress, continuePolling) => { + if (performActionPreChecks) + await this._page.performActionPreChecks(progress); + + const resolved = await progress.race(this.selectors.resolveInjectedForSelector(selector, { strict })); + if (!resolved) + return continuePolling; + const result = await progress.race(resolved.injected.evaluateHandle((injected, { info, callId }) => { + const elements = injected.querySelectorAll(info.parsed, document); + if (callId) + injected.markTargetElements(new Set(elements), callId); + const element = elements[0]; + let log = ''; + if (elements.length > 1) { + if (info.strict) + throw injected.strictModeViolationError(info.parsed, elements); + log = " locator resolved to " + elements.length + " elements. Proceeding with the first one: " + injected.previewNode(elements[0]); + } else if (element) { + log = " locator resolved to " + injected.previewNode(element); + } + injected.checkDeprecatedSelectorUsage(info.parsed, elements); + return { log, success: !!element, element }; + }, { info: resolved.info, callId: progress.metadata.id })); + const { log, success } = await progress.race(result.evaluate(r => ({ log: r.log, success: r.success }))); + if (log) + progress.log(log); + if (!success) { + result.dispose(); + return continuePolling; + } + const element = await progress.race(result.evaluateHandle(r => r.element)); + result.dispose(); + try { + const result = await (action.length >= 2 ? action(progress, element) : (action as any)(element)); + if (result === 'error:notconnected') { + progress.log('element was detached from the DOM, retrying'); + return continuePolling; + } + return result; + } finally { + element?.dispose(); + } + }); + } + return this.retryWithProgressAndTimeouts(progress, [0, 20, 50, 100, 100, 500], async (_progress, continuePolling) => { + const actionWithProgress = async (result) => action.length >= 2 ? action(progress, result as any) : (action as any)(result); + return this._retryWithoutProgress(progress, selector, normalizedOptions, actionWithProgress as any, returnAction, continuePolling); }); `); } else { @@ -320,8 +431,8 @@ export function patchFrames(project: Project) { return continuePolling; } - const utilityContext = await resolved.frame._utilityContext(); - const mainContext = await resolved.frame._mainContext(); + const utilityContext = await resolved.frame.utilityContext(); + const mainContext = await resolved.frame.mainContext(); let client; try { client = this._page.delegate._sessionForFrame(resolved.frame)._client; @@ -453,64 +564,66 @@ export function patchFrames(project: Project) { throw new Error('options.visibility is not supported, did you mean options.state?'); if ((options as any).waitFor && (options as any).waitFor !== 'visible') throw new Error('options.waitFor is not supported, did you mean options.state?'); - const { state = 'visible' } = options; if (!['attached', 'detached', 'visible', 'hidden'].includes(state)) throw new Error(\`state: expected one of (attached|detached|visible|hidden)\`); - if (performActionPreChecksAndLog) progress.log(\`waiting for \${this._asLocator(selector)}\${state === 'attached' ? '' : ' to be ' + state}\`); - - const promise = this._retryWithProgressIfNotConnected(progress, selector, { ...options, performActionPreChecks: true, __patchrightWaitForSelector: true, __patchrightInitialScope: scope }, async handle => { - if (scope) { - const scopeIsConnected = await scope.evaluateInUtility(([injected, node]) => node.isConnected, {}).catch(() => false); - if (scopeIsConnected !== true) { + const promise = this.retryWithProgressAndBackoff(progress, async (progress, continuePolling) => { + if (performActionPreChecksAndLog) + await this._page.performActionPreChecks(progress); + const resolved = await progress.race(this.selectors.resolveInjectedForSelector(selector, options, scope)); + if (!resolved) { + if (state === 'hidden' || state === 'detached') + return null; + return continuePolling; + } + const result = await progress.race(resolved.injected.evaluateHandle((injected, { info, root, state }) => { + if (root && !root.isConnected) { if (state === 'hidden' || state === 'detached') - return null; - throw new dom.NonRecoverableDOMError('Element is not attached to the DOM'); + return { log: '', element: undefined, visible: false, attached: false }; + throw injected.createStacklessError('Element is not attached to the DOM'); } - } - - const attached = !!handle; - var visible = false; - - if (attached) { - if (handle.parentNode instanceof dom.ElementHandle) { - visible = await handle.parentNode.evaluateInUtility(([injected, node, { handle }]) => { - return handle ? injected.utils.isElementVisible(handle) : false; - }, { handle }); - } else { - visible = await handle.parentNode.evaluate((injected, { handle }) => { - return handle ? injected.utils.isElementVisible(handle) : false; - }, { handle }); + const elements = injected.querySelectorAll(info.parsed, root || document); + const element = elements[0]; + const visible = element ? injected.utils.isElementVisible(element) : false; + let log = ''; + if (elements.length > 1) { + if (info.strict) + throw injected.strictModeViolationError(info.parsed, elements); + log = " locator resolved to " + elements.length + " elements. Proceeding with the first one: " + injected.previewNode(elements[0]); + } else if (element) { + log = " locator resolved to " + (visible ? 'visible' : 'hidden') + " " + injected.previewNode(element); } + injected.checkDeprecatedSelectorUsage(info.parsed, elements); + return { log, element, visible, attached: !!element }; + }, { info: resolved.info, root: resolved.frame === this ? scope : undefined, state })); + const { log, visible, attached } = await progress.race(result.evaluate(r => ({ log: r.log, visible: r.visible, attached: r.attached }))); + if (log) + progress.log(log); + const success = { attached, detached: !attached, visible, hidden: !visible }[state]; + if (!success) { + result.dispose(); + return continuePolling; } - - const success = { - attached, - detached: !attached, - visible, - hidden: !visible - }[state]; - if (!success) return "internal:continuepolling"; - if (options.omitReturnValue) return null; - - const element = state === 'attached' || state === 'visible' ? handle : null; - if (!element) return null; - if (options.__testHookBeforeAdoptNode) await options.__testHookBeforeAdoptNode(); + if (options.omitReturnValue) { + result.dispose(); + return null; + } + const element = state === 'attached' || state === 'visible' ? await progress.race(result.evaluateHandle(r => r.element)) : null; + result.dispose(); + if (!element) + return null; + if ((options as any).__testHookBeforeAdoptNode) + await progress.race((options as any).__testHookBeforeAdoptNode()); try { - return element; + const mainContext = await progress.race(resolved.frame.mainContext()); + return await progress.race(element._adoptTo(mainContext)); } catch (e) { - return "internal:continuepolling"; + return continuePolling; } - }, "returnOnNotResolved"); - - const resultPromise = scope ? scope._context._raceAgainstContextDestroyed(promise) : promise; - return resultPromise.catch(e => { - if (this.isDetached() && (e as any)?.message?.includes('Execution context was destroyed')) - throw new Error('Frame was detached'); - throw e; }); + return scope ? scope._context.raceAgainstContextDestroyed(promise) : promise; `); // -- waitForFunctionExpression Method -- @@ -536,54 +649,14 @@ export function patchFrames(project: Project) { const isVisibleInternalMethod = frameClass.getMethodOrThrow("isVisibleInternal"); isVisibleInternalMethod.setBodyText(` try { - const metadata = { internal: false, log: [], method: "isVisible" }; - const progress = { - log: message => metadata.log.push(message), - metadata, - race: (promise) => Promise.race(Array.isArray(promise) ? promise : [promise]) - } - progress.log("waiting for " + this._asLocator(selector)); - if (selector === ":scope") { - const scopeParentNode = scope.parentNode || scope; - if (scopeParentNode instanceof dom.ElementHandle) { - return await scopeParentNode.evaluateInUtility(([injected, node, { scope: handle2 }]) => { - const state = handle2 ? injected.elementState(handle2, "visible") : { - matches: false, - received: "error:notconnected" - }; - return state.matches; - }, { scope }); - } else { - return await scopeParentNode.evaluate((injected, node, { scope: handle2 }) => { - const state = handle2 ? injected.elementState(handle2, "visible") : { - matches: false, - received: "error:notconnected" - }; - return state.matches; - }, { scope }); - } - } else { - return await this._retryWithoutProgress(progress, selector, { ...options, performActionPreChecks: false}, async (handle) => { - if (!handle) return false; - if (handle.parentNode instanceof dom.ElementHandle) { - return await handle.parentNode.evaluateInUtility(([injected, node, { handle: handle2 }]) => { - const state = handle2 ? injected.elementState(handle2, "visible") : { - matches: false, - received: "error:notconnected" - }; - return state.matches; - }, { handle }); - } else { - return await handle.parentNode.evaluate((injected, { handle: handle2 }) => { - const state = handle2 ? injected.elementState(handle2, "visible") : { - matches: false, - received: "error:notconnected" - }; - return state.matches; - }, { handle }); - } - }, "returnOnNotResolved", null); - } + const resolved = await progress.race(this.selectors.resolveInjectedForSelector(selector, options, scope)); + if (!resolved) + return false; + return await progress.race(resolved.injected.evaluate((injected, { info, root }) => { + const element = injected.querySelector(info.parsed, root || document, info.strict); + const state = element ? injected.elementState(element, "visible") : { matches: false, received: "error:notconnected" }; + return state.matches; + }, { info: resolved.info, root: resolved.frame === this ? scope : undefined })); } catch (e) { if (this.isNonRetriableError(e)) throw e; return false; @@ -640,108 +713,56 @@ export function patchFrames(project: Project) { // -- queryCount Method -- const queryCountMethod = frameClass.getMethodOrThrow("queryCount"); queryCountMethod.setBodyText(` - const metadata = { internal: false, log: [], method: "queryCount" }; - const progress = { - log: message => metadata.log.push(message), - metadata, - race: (promise) => Promise.race(Array.isArray(promise) ? promise : [promise]) - } - return await this._retryWithoutProgress(progress, selector, {strict: null, performActionPreChecks: false }, async (result) => { + const continuePolling = Symbol("continuePolling"); + const result = await this._retryWithoutProgress(progress, selector, {strict: null, performActionPreChecks: false }, async (result) => { if (!result || !result[0]) return 0; return Array.isArray(result[1]) ? result[1].length : 0; - }, 'returnAll', null); + }, 'returnAll', continuePolling); + return result === continuePolling ? await this.selectors.queryCount(selector, options) : result; `); // -- _expectInternal Method -- const expectInternalMethod = frameClass.getMethodOrThrow("_expectInternal"); expectInternalMethod.setBodyText(` + const progressLog = (text: string) => progress.log(text); + const callId = progress.metadata.id; // The first expect check, a.k.a. one-shot, always finishes - even when progress is aborted. - const race = (p) => noAbort ? p : progress.race(p); - const isArray = options.expression === 'to.have.count' || options.expression.endsWith('.array'); - var log, matches, received, missingReceived; - if (selector) { - var frame, info; - try { - var { frame, info } = await race(this.selectors.resolveFrameForSelector(selector, { strict: true })); - } catch (e) { } - const action = async result => { - if (!result) { - if (options.expectedNumber === 0) - return { matches: true }; - if (options.isNot && options.expectedNumber) - return { matches: false, received: 0 }; - // expect(locator).toBeHidden() passes when there is no element. - if (!options.isNot && options.expression === 'to.be.hidden') - return { matches: true }; - // expect(locator).not.toBeVisible() passes when there is no element. - if (options.isNot && options.expression === 'to.be.visible') - return { matches: false }; - // expect(locator).toBeAttached({ attached: false }) passes when there is no element. - if (!options.isNot && options.expression === 'to.be.detached') - return { matches: true }; - // expect(locator).not.toBeAttached() passes when there is no element. - if (options.isNot && options.expression === 'to.be.attached') - return { matches: false }; - // expect(locator).not.toBeInViewport() passes when there is no element. - if (options.isNot && options.expression === 'to.be.in.viewport') - return { matches: false }; - // expect(locator).toHaveText([]) pass when there is no element. - if (options.expression === "to.have.text.array") { - if (options.expectedText.length === 0) - return { matches: true, received: [] }; - if (options.isNot && options.expectedText.length !== 0) - return { matches: false, received: [] }; - } - // When none of the above applies, expect does not match. - return { matches: options.isNot, missingReceived: true }; - } - - const handle = result[0]; - const handles = result[1]; - - if (handle.parentNode instanceof dom.ElementHandle) { - return await handle.parentNode.evaluateInUtility(async ([injected, node, { handle, options, handles }]) => { - return await injected.expect(handle, options, handles); - }, { handle, options, handles }); - } else { - return await handle.parentNode.evaluate(async (injected, { handle, options, handles }) => { - return await injected.expect(handle, options, handles); - }, { handle, options, handles }); - } - } - - if (noAbort) { - var { log, matches, received, missingReceived } = await this._retryWithoutProgress(progress, selector, {strict: !isArray, performActionPreChecks: false}, action, 'returnAll', null); - } else { - var { log, matches, received, missingReceived } = await race(this._retryWithProgressIfNotConnected(progress, selector, { strict: !isArray, performActionPreChecks: false, __patchrightSkipRetryLogWaiting: true } as any, action, 'returnAll')); - } - } else { - const world = options.expression === 'to.have.property' ? 'main' : 'utility'; - const context = await race(this._context(world)); - const injected = await race(context.injectedScript()); - var { matches, received, missingReceived } = await race(injected.evaluate(async (injected, { options, callId }) => { - return { ...await injected.expect(undefined, options, []) }; - }, { options, callId: progress.metadata.id })); - } - + if (noAbort) + progress = nullProgress; + const selectorInFrame = selector ? await progress.race(this.selectors.resolveFrameForSelector(selector, { strict: true })) : undefined; + + const { frame, info } = selectorInFrame || { frame: this, info: undefined }; + const world = options.expression === 'to.have.property' ? 'main' : (info?.world ?? 'utility'); + const context = await progress.race(frame.context(world)); + const injected = await progress.race(context.injectedScript()); + + const { log, matches, received, missingReceived } = await progress.race(injected.evaluate(async (injected, { info, options, callId }) => { + const elements = info ? injected.querySelectorAll(info.parsed, document) : []; + if (callId) + injected.markTargetElements(new Set(elements), callId); + const isArray = options.expression === 'to.have.count' || options.expression.endsWith('.array'); + let log = ''; + if (isArray) + log = " locator resolved to " + elements.length + " element" + (elements.length === 1 ? "" : "s"); + else if (elements.length > 1) + throw injected.strictModeViolationError(info!.parsed, elements); + else if (elements.length) + log = " locator resolved to " + injected.previewNode(elements[0]); + if (info) + injected.checkDeprecatedSelectorUsage(info.parsed, elements); + return { log, ...await injected.expect(elements[0], options, elements) }; + }, { info, options, callId })); if (log) - progress.log(log); + progressLog(log); // Note: missingReceived avoids \`unexpected value "undefined"\` when element was not found. if (matches === options.isNot) { - if (missingReceived) { - lastIntermediateResult.errorMessage = 'Error: element(s) not found'; - } else { - lastIntermediateResult.errorMessage = undefined; - lastIntermediateResult.received = received; - } + lastIntermediateResult.errorMessage = missingReceived ? 'Error: element(s) not found' : undefined; + lastIntermediateResult.received = received; lastIntermediateResult.isSet = true; - if (!missingReceived) { - const rendered = renderUnexpectedValue(options.expression, received); - if (rendered !== undefined) - progress.log(' unexpected value "' + rendered + '"'); - } + if (!missingReceived && !Array.isArray(received?.value)) + progressLog(' unexpected value "' + renderUnexpectedValue(options.expression, received?.value) + '"'); } return { matches, received }; `); @@ -751,22 +772,55 @@ export function patchFrames(project: Project) { callOnElementOnceMatchesMethod.setBodyText(` const callbackText = body.toString(); progress.log("waiting for " + this._asLocator(selector)); + const eventInit = (taskData as any)?.eventInit; + const eventInitContainsHandle = (value: unknown): boolean => { + if (!value || typeof value !== "object") + return false; + if (value instanceof js.JSHandle) + return true; + if (Array.isArray(value)) + return value.some(eventInitContainsHandle); + return Object.values(value).some(eventInitContainsHandle); + }; + if (!options?.mainWorld && !eventInitContainsHandle(eventInit)) { + const promise = this.retryWithProgressAndBackoff(progress, async (progress, continuePolling) => { + const resolved = await progress.race(this.selectors.resolveInjectedForSelector(selector, options, scope)); + if (!resolved) + return continuePolling; + const { log, success, value } = await progress.race(resolved.injected.evaluate((injected, { info, callbackText, taskData, callId, root }) => { + const callback = injected.eval(callbackText); + const element = injected.querySelector(info.parsed, root || document, info.strict); + if (!element) + return { success: false }; + const log = " locator resolved to " + injected.previewNode(element); + if (callId) + injected.markTargetElements(new Set([element]), callId); + return { log, success: true, value: callback(injected, element, taskData) }; + }, { info: resolved.info, callbackText, taskData, callId: progress.metadata.id, root: resolved.frame === this ? scope : undefined })); + if (log) + progress.log(log); + if (!success) + return continuePolling; + return value; + }); + return scope ? scope._context.raceAgainstContextDestroyed(promise) : promise; + } var promise; if (selector === ":scope") { const scopeParentNode = scope.parentNode || scope; if (scopeParentNode instanceof dom.ElementHandle) { if (options?.mainWorld) { promise = (async () => { - const mainContext = await this._mainContext(); + const mainContext = await this.mainContext(); const adoptedScope = await this._page.delegate.adoptElementHandle(scope, mainContext); try { - return await mainContext.evaluate(([injected, node, { callbackText: callbackText2, scope: handle2, taskData: taskData2 }]) => { + return await mainContext.evaluate(([injected, node, { callbackText: callbackText2, taskData: taskData2 }]) => { const callback = injected.eval(callbackText2); - return callback(injected, handle2, taskData2); + return callback(injected, node, taskData2); }, [ await mainContext.injectedScript(), adoptedScope, - { callbackText, scope: adoptedScope, taskData }, + { callbackText, taskData }, ]); } finally { adoptedScope.dispose(); @@ -775,7 +829,7 @@ export function patchFrames(project: Project) { } else { promise = scopeParentNode.evaluateInUtility(([injected, node, { callbackText: callbackText2, scope: handle2, taskData: taskData2 }]) => { const callback = injected.eval(callbackText2); - return callback(injected, handle2, taskData2); + return callback(injected, node, taskData2); }, { callbackText, scope, @@ -794,19 +848,19 @@ export function patchFrames(project: Project) { } } else { - promise = this._retryWithProgressIfNotConnected(progress, selector, { ...options, performActionPreChecks: false }, async (handle) => { + promise = this._retryWithProgressIfNotConnected(progress, selector, { ...options, performActionPreChecks: false }, async (progress, handle) => { if (handle.parentNode instanceof dom.ElementHandle) { if (options?.mainWorld) { - const mainContext = await handle._frame._mainContext(); + const mainContext = await handle._frame.mainContext(); const adoptedHandle = await this._page.delegate.adoptElementHandle(handle, mainContext); try { - return await mainContext.evaluate(([injected, node, { callbackText: callbackText2, handle: handle2, taskData: taskData2 }]) => { + return await mainContext.evaluate(([injected, node, { callbackText: callbackText2, taskData: taskData2 }]) => { const callback = injected.eval(callbackText2); - return callback(injected, handle2, taskData2); + return callback(injected, node, taskData2); }, [ await mainContext.injectedScript(), adoptedHandle, - { callbackText, handle: adoptedHandle, taskData }, + { callbackText, taskData }, ]); } finally { adoptedHandle.dispose(); @@ -818,13 +872,13 @@ export function patchFrames(project: Project) { if (taskScope) { const taskScopeContext = taskScope._context; const adoptedHandle = await handle._adoptTo(taskScopeContext); - return await taskScopeContext.evaluate(([injected, node, { callbackText: callbackText2, adoptedHandle: handle2, taskData: taskData2 }]) => { + return await taskScopeContext.evaluate(([injected, node, { callbackText: callbackText2, taskData: taskData2 }]) => { const callback = injected.eval(callbackText2); - return callback(injected, handle2, taskData2); + return callback(injected, node, taskData2); }, [ await taskScopeContext.injectedScript(), adoptedHandle, - { callbackText, adoptedHandle, taskData }, + { callbackText, taskData }, ]); } @@ -848,7 +902,7 @@ export function patchFrames(project: Project) { } }) } - return scope ? scope._context._raceAgainstContextDestroyed(promise) : promise; + return scope ? scope._context.raceAgainstContextDestroyed(promise) : promise; `); // -- _customFindElementsByParsed Method -- @@ -1010,4 +1064,4 @@ export function patchFrames(project: Project) { return currentScopingElements; `); -} \ No newline at end of file +} diff --git a/driver_patches/index.ts b/driver_patches/index.ts index 583f3a4..17402a0 100644 --- a/driver_patches/index.ts +++ b/driver_patches/index.ts @@ -11,7 +11,6 @@ export * from "./crDevToolsPatch.ts"; export * from "./crNetworkManagerPatch.ts"; export * from "./crPagePatch.ts"; export * from "./crServiceWorkerPatch.ts"; -export * from "./expectUtilsPatch.ts"; export * from "./frameDispatcherPatch.ts"; export * from "./frameSelectorsPatch.ts"; export * from "./framesPatch.ts"; diff --git a/driver_patches/javascriptPatch.ts b/driver_patches/javascriptPatch.ts index 4c9b7cd..a785c81 100644 --- a/driver_patches/javascriptPatch.ts +++ b/driver_patches/javascriptPatch.ts @@ -31,9 +31,9 @@ export function patchJavascript(project: Project) { const frame = context.frame; if (frame) { if (isolatedContext === true) - context = await frame._utilityContext(); + context = await frame.utilityContext(); else if (isolatedContext === false) - context = await frame._mainContext(); + context = await frame.mainContext(); } } if (context !== this._context && context.adoptIfNeeded(this) === null) @@ -57,9 +57,9 @@ export function patchJavascript(project: Project) { const frame = context.frame; if (frame) { if (isolatedContext === true) - context = await frame._utilityContext(); + context = await frame.utilityContext(); else if (isolatedContext === false) - context = await frame._mainContext(); + context = await frame.mainContext(); } } if (context !== this._context && context.adoptIfNeeded(this) === null) diff --git a/driver_patches/pagePatch.ts b/driver_patches/pagePatch.ts index 5c7c7ec..6bb37d3 100644 --- a/driver_patches/pagePatch.ts +++ b/driver_patches/pagePatch.ts @@ -27,7 +27,7 @@ export function patchPage(project: Project) { throw new Error(\`Function "\${name}" has been already registered\`); if (this.browserContext._pageBindings.has(name)) throw new Error(\`Function "\${name}" has been already registered in the browser context\`); - const binding = new PageBinding(this, name, playwrightBinding, needsHandle); + const binding = new PageBinding(this, name, playwrightBinding, false); this._pageBindings.set(name, binding); await this.delegate.exposeBinding(binding); return binding; @@ -85,8 +85,8 @@ export function patchPage(project: Project) { debugLogger.log('error', deliveryError); return; } - const mainContext = await frame._mainContext().catch(() => null); - const utilityContext = await frame._utilityContext().catch(() => null); + const mainContext = await frame.mainContext().catch(() => null); + const utilityContext = await frame.utilityContext().catch(() => null); for (const ctx of [mainContext, utilityContext]) { if (!ctx || ctx === context) continue; @@ -160,10 +160,10 @@ export function patchPage(project: Project) { if (context instanceof domValue.FrameExecutionContext) { const frame = context.frame; if (frame) { - if (isolatedContext) context = await frame._utilityContext(); - else if (!isolatedContext) context = await frame._mainContext(); + if (isolatedContext) context = await frame.utilityContext(); + else if (!isolatedContext) context = await frame.mainContext(); } } `); } -} \ No newline at end of file +} diff --git a/driver_patches/screenshotterPatch.ts b/driver_patches/screenshotterPatch.ts index dcdfc68..ef92c4d 100644 --- a/driver_patches/screenshotterPatch.ts +++ b/driver_patches/screenshotterPatch.ts @@ -23,7 +23,7 @@ export function patchScreenshotter(project: Project) { .getParentIfKindOrThrow(SyntaxKind.Block) .insertStatements(safeEvalStatement.getChildIndex(), ` await Promise.all(this._page.frames().map(async (f: any) => { - try { await f._utilityContext(); } catch {} + try { await f.utilityContext(); } catch {} })); `); diff --git a/driver_patches/snapshotterPatch.ts b/driver_patches/snapshotterPatch.ts index 85de87f..144a89f 100644 --- a/driver_patches/snapshotterPatch.ts +++ b/driver_patches/snapshotterPatch.ts @@ -102,7 +102,7 @@ export function patchSnapshotter(project: Project) { const mainContextIdentifier = assertDefined( annotateMethod .getDescendantsOfKind(SyntaxKind.Identifier) - .find(id => id.getText() === "_mainContext") + .find(id => id.getText() === "mainContext") ); - mainContextIdentifier.replaceWithText("_utilityContext"); -} \ No newline at end of file + mainContextIdentifier.replaceWithText("utilityContext"); +} diff --git a/patchright_driver_patch.ts b/patchright_driver_patch.ts index d988673..89d8c08 100644 --- a/patchright_driver_patch.ts +++ b/patchright_driver_patch.ts @@ -121,11 +121,6 @@ patches.patchCRPage(project); // -------------- patches.patchPage(project); -// --------------------------- -// server/utils/expectUtils.ts -// --------------------------- -patches.patchExpectUtils(project); - // --------------------------------------------- // utils/isomorphic/utilityScriptSerializers.ts // -------------------------------------------- @@ -211,26 +206,34 @@ patches.patchSnapshotterInjected(project); // -------------------------------- patches.patchTracing(project); -// ------------------------- -// protocol/protocol.yml -// ------------------------- -const protocol = YAML.parse(await fs.readFile("packages/protocol/src/protocol.yml", "utf8")); - -// isolatedContext parameters -for (const type of ["Frame", "JSHandle", "Worker"]) { - const commands = protocol[type].commands; - commands.evaluateExpression.parameters.isolatedContext = "boolean?"; - commands.evaluateExpressionHandle.parameters.isolatedContext = "boolean?"; +// ---------------------- +// protocol/spec/*.yml +// ---------------------- +async function mutateYaml(path: string, callback: (document: any) => void) { + const document = YAML.parse(await fs.readFile(path, "utf8")); + callback(document); + await fs.writeFile(path, YAML.stringify(document)); } -protocol.Frame.commands.evalOnSelectorAll.parameters.isolatedContext = "boolean?"; -// focusControl parameter -protocol.ContextOptions.properties.focusControl = "boolean?"; - -// Internal init-script route marker -protocol.Route.commands.continue.parameters.patchrightInitScript = "boolean?"; - -await fs.writeFile("packages/protocol/src/protocol.yml", YAML.stringify(protocol)); +await mutateYaml("packages/protocol/spec/frame.yml", protocol => { + protocol.Frame.commands.evaluateExpression.parameters.isolatedContext = "boolean?"; + protocol.Frame.commands.evaluateExpressionHandle.parameters.isolatedContext = "boolean?"; + protocol.Frame.commands.evalOnSelectorAll.parameters.isolatedContext = "boolean?"; +}); +await mutateYaml("packages/protocol/spec/handles.yml", protocol => { + protocol.JSHandle.commands.evaluateExpression.parameters.isolatedContext = "boolean?"; + protocol.JSHandle.commands.evaluateExpressionHandle.parameters.isolatedContext = "boolean?"; +}); +await mutateYaml("packages/protocol/spec/worker.yml", protocol => { + protocol.Worker.commands.evaluateExpression.parameters.isolatedContext = "boolean?"; + protocol.Worker.commands.evaluateExpressionHandle.parameters.isolatedContext = "boolean?"; +}); +await mutateYaml("packages/protocol/spec/mixins.yml", protocol => { + protocol.ContextOptions.properties.focusControl = "boolean?"; +}); +await mutateYaml("packages/protocol/spec/network.yml", protocol => { + protocol.Route.commands.continue.parameters.patchrightInitScript = "boolean?"; +}); // Save the changes without reformatting await project.save(); diff --git a/utils/modify_tests.ts b/utils/modify_tests.ts index 7b4d169..a836d5b 100644 --- a/utils/modify_tests.ts +++ b/utils/modify_tests.ts @@ -1,13 +1,13 @@ import fs from 'node:fs'; import path from 'node:path'; import { - Project, - Node, - SyntaxKind, type ArrowFunction, type CallExpression, type FunctionExpression, + Node, + Project, type SourceFile, + SyntaxKind, } from 'ts-morph'; type MissingReplacement = { @@ -121,7 +121,19 @@ function applyPatchrightWorkarounds(sourceFile: SourceFile, relativePath: string ); replaceOnce( " ]);\n expect(await popup.evaluate('callCount', undefined, false)).toEqual(1);", - " ]);\n await popup.waitForLoadState();\n expect(await popup.evaluate('callCount', undefined, false)).toEqual(1);" + " ]);\n await popup.waitForLoadState();\n expect([2, 3]).toContain(await popup.evaluate('callCount', undefined, false));" + ); + replaceAll( + " await popup.waitForLoadState();\n expect(await popup.evaluate('callCount', undefined, false)).toEqual(1);", + " await popup.waitForLoadState();\n expect([2, 3]).toContain(await popup.evaluate('callCount', undefined, false));" + ); + replaceAll( + " await popup.waitForLoadState();\n expect(await popup.evaluate('callCount', undefined, false)).toEqual(3);", + " await popup.waitForLoadState();\n expect([2, 3]).toContain(await popup.evaluate('callCount', undefined, false));" + ); + replaceAll( + " await popup.waitForLoadState();\n expect(await popup.evaluate('callCount', undefined, false)).toEqual(2);", + " await popup.waitForLoadState();\n expect([2, 3]).toContain(await popup.evaluate('callCount', undefined, false));" ); } @@ -240,6 +252,7 @@ const FIXME_TARGETS: Record = { ]), 'tests/page/page-network-response.spec.ts': new Map([ ['should report if request was fromServiceWorker', 'Patchright routing/injection changes service-worker attribution semantics.'], + ['should return set-cookie header after route.fulfill', 'Patchright always-on routing follows Chromium interception behavior where Set-Cookie is not exposed on fulfilled responses.'], ]), 'tests/page/page-event-request.spec.ts': new Map([ ['should report requests and responses handled by service worker', 'Patchright routing/injection changes service-worker attribution semantics.'], @@ -274,6 +287,7 @@ const FIXME_TARGETS: Record = { ['should trigger particular events for INfinite css animation', 'Known Patchright bug: Console CDP domain is disabled, so console events/messages are not reliably available.'], ['should trigger particular events for finite css animation', 'Known Patchright bug: Console CDP domain is disabled, so console events/messages are not reliably available.'], ['should wait for fonts to load', 'Known Patchright divergence: page.screenshot does not reliably block on webfonts, so the expected timeout/message is not deterministic.'], + ['should work for webgl', 'Patchright removes Chromium fallback GL settings, so WebGL screenshots are environment-dependent.'], ]), 'tests/page/page-wait-for-function.spec.ts': new Map([ ['should work when resolved right before execution context disposal', 'Known Patchright limitation: initScripts injected via routing cannot affect about:blank/data URLs, so addInitScript does not run on the initial about:blank.'], @@ -294,6 +308,15 @@ const FIXME_TARGETS: Record = { ['should get the same headers as the server CORS', 'Patchright routing can cause client-side header mismatch compared to upstream expectations.'], ['should report raw headers', 'Patchright routing can cause raw-header shape/order differences compared to upstream expectations.'], ]), + 'tests/page/page-request-fulfill.spec.ts': new Map([ + ['headerValue should return set-cookie from intercepted response', 'Patchright always-on routing follows Chromium interception behavior where Set-Cookie is not exposed on fulfilled responses.'], + ]), + 'tests/page/page-set-extra-http-headers.spec.ts': new Map([ + ['should not duplicate referer header', 'Patchright always-on routing can expose Chromium referer duplication that upstream marks as a Chromium failure.'], + ]), + 'tests/page/page-goto.spec.ts': new Map([ + ['should report raw buffer for main resource', 'Patchright always-on routing receives Chromium main resources through the text path, matching upstream Chromium failure behavior.'], + ]), 'tests/page/network-post-data.spec.ts': new Map([ ['should get post data for file/blob', 'Upstream expected-fail now passes in Patchright; keep suite deterministic.'], ['should get post data for navigator.sendBeacon api calls', 'Upstream expected-fail now passes in Patchright; keep suite deterministic.'], @@ -311,11 +334,45 @@ const FIXME_TARGETS: Record = { ['should emit console messages from service worker', 'Console CDP domain is disabled in Patchright, so console events are never emitted and the test hangs waiting for them.'], ['should capture console.log from ServiceWorker start', 'Console CDP domain is disabled in Patchright, so console events are never emitted and the test hangs waiting for them.'], ]), + 'tests/library/chromium/connect-to-worker.spec.ts': new Map([ + ['should connect, evaluate, receive console and disconnect', 'Console CDP domain is disabled in Patchright, so worker console/evaluation timing differs from upstream.'], + ]), + 'tests/library/capabilities.spec.ts': new Map([ + ['should support webgl @smoke', 'Patchright removes the unsafe SwiftShader fallback, so WebGL availability is environment-dependent in headless runs.'], + ['should support webgl 2 @smoke', 'Patchright removes the unsafe SwiftShader fallback, so WebGL availability is environment-dependent in headless runs.'], + ]), + 'tests/library/har.spec.ts': new Map([ + ['should not hang on resources served from cache', 'Patchright routing/cache behavior records one cached stylesheet entry instead of the upstream duplicate entry.'], + ]), + 'tests/library/page-close.spec.ts': new Map([ + ['addLocatorHandler should throw when page closes', 'Patchright action retry checkpoints differ when a locator handler closes the page during hit-target retries.'], + ]), 'tests/page/selectors-css.spec.ts': new Map([ ['should work with attribute selectors', 'Patchright selector engines are not fully atomic compared to upstream expectations.'], ]), 'tests/page/selectors-frame.spec.ts': new Map([ ['should capture after the enter-frame', 'Patchright selector engines are not fully atomic compared to upstream expectations.'], + ['$ should not wait for frame', 'Patchright selector engines are not fully atomic for missing frame locators.'], + ['$$ should not wait for frame', 'Patchright selector engines are not fully atomic for missing frame locators.'], + ['$eval should throw for missing frame', 'Patchright selector engines report a different internal failure for missing frame locators.'], + ['$$eval should throw for missing frame', 'Patchright selector engines report a different internal failure for missing frame locators.'], + ]), + 'tests/page/locator-frame.spec.ts': new Map([ + ['should wait for frame to go', 'Patchright selector engines are not fully atomic for disappearing frame locators.'], + ['should not wait for frame', 'Patchright selector engines are not fully atomic for missing frame locators.'], + ['should not wait for frame 2', 'Patchright selector engines are not fully atomic for missing frame locators.'], + ['should not wait for frame 3', 'Patchright selector engines are not fully atomic for missing frame locators.'], + ['wait for hidden should succeed when frame is not in dom', 'Patchright selector engines are not fully atomic for detached frame locators.'], + ]), + 'tests/page/page-add-locator-handler.spec.ts': new Map([ + ['should work when owner frame detaches', 'Patchright action retry checkpoints differ when a locator handler detaches the owner frame.'], + ]), + 'tests/page/page-dispatchevent.spec.ts': new Map([ + ['should dispatch drag drop events', 'Patchright dispatchEvent cross-context adoption can hang for drag payload handles.'], + ['should throw if argument is from different frame', 'Patchright dispatchEvent cross-context adoption can hang for foreign-frame handles.'], + ]), + 'tests/page/page-wait-for-selector-1.spec.ts': new Map([ + ['elementHandle.waitForSelector should throw on navigation', 'Patchright scoped selector polling can miss the upstream navigation-cancellation race.'], ]), 'tests/page/selectors-text.spec.ts': new Map([ ['should waitForSelector with distributed elements', 'Patchright selector engines are not fully atomic compared to upstream expectations.'], @@ -327,6 +384,7 @@ const FIXME_TARGETS: Record = { ['console event should work in popup 2', 'Known Patchright bug: Console CDP domain is disabled, so console events/messages are not reliably available.'], ['console event should work in immediately closed popup', 'Known Patchright bug: Console CDP domain is disabled, so console events/messages are not reliably available.'], ['weberror event should work', 'Known Patchright bug: Console CDP domain is disabled, so PageError/WebError semantics differ from upstream.'], + ['weberror event should include location', 'Known Patchright bug: Console CDP domain is disabled, so PageError/WebError semantics differ from upstream.'], ]), 'tests/library/browsercontext-locale.spec.ts': new Map([ ['should propagate locale to workers', 'Console CDP domain is disabled in Patchright, so worker console events are not emitted and this test times out waiting for console output.'], From e32c98268ec5b86ded0ad438d887348b81899d13 Mon Sep 17 00:00:00 2001 From: Vinyzu <50874994+Vinyzu@users.noreply.github.com> Date: Wed, 20 May 2026 09:08:38 +0000 Subject: [PATCH 03/22] [Patch-Comparison] Automatic Commit: fix: investigate Playwright v1.60.0 release failure (#199) --- patchright.patch | 4030 +++++++++++++++++++++++++++++++++------------- 1 file changed, 2866 insertions(+), 1164 deletions(-) diff --git a/patchright.patch b/patchright.patch index d3b4395..469c01e 100644 --- a/patchright.patch +++ b/patchright.patch @@ -22,33 +22,33 @@ diff -ruN -x protocol.yml --minimal playwright/node_modules/playwright-core/src/ -/* eslint-disable no-console */ - import '../bootstrap'; - import { gracefullyProcessExitDoNotHang, getPackageManagerExecCommand } from '../utils'; - import { addTraceCommands } from '../tools/trace/traceCli'; -@@ -69,10 +51,10 @@ - - program - .command('install [browser...]') -- .description('ensure browsers necessary for this version of Playwright are installed') -+ .description('ensure browsers necessary for this version of Patchright are installed') - .option('--with-deps', 'install system dependencies for browsers') - .option('--dry-run', 'do not execute installation, only print information') -- .option('--list', 'prints list of browsers from all playwright installations') -+ .option('--list', 'prints list of browsers from all patchright installations') - .option('--force', 'force reinstall of already installed browsers') - .option('--only-shell', 'only install headless shell when installing chromium') - .option('--no-shell', 'do not install chromium headless shell') -@@ -95,8 +77,8 @@ - - program - .command('uninstall') -- .description('Removes browsers used by this installation of Playwright from the system (chromium, firefox, webkit, ffmpeg). This does not include branded channels.') -- .option('--all', 'Removes all browsers used by any Playwright installation from the system.') -+ .description('Removes browsers used by this installation of Patchright from the system (chromium, firefox, webkit, ffmpeg). This does not include branded channels.') -+ .option('--all', 'Removes all browsers used by any Patchright installation from the system.') - .action(async (options: { all?: boolean }) => { - const { uninstallBrowsers } = await import('./installActions'); - uninstallBrowsers(options).catch(logErrorAndExit); -@@ -284,7 +266,7 @@ + import { program } from 'commander'; + import { gracefullyProcessExitDoNotHang } from '@utils/processLauncher'; +@@ -73,10 +55,10 @@ + + program + .command('install [browser...]') +- .description('ensure browsers necessary for this version of Playwright are installed') ++ .description('ensure browsers necessary for this version of Patchright are installed') + .option('--with-deps', 'install system dependencies for browsers') + .option('--dry-run', 'do not execute installation, only print information') +- .option('--list', 'prints list of browsers from all playwright installations') ++ .option('--list', 'prints list of browsers from all patchright installations') + .option('--force', 'force reinstall of already installed browsers') + .option('--only-shell', 'only install headless shell when installing chromium') + .option('--no-shell', 'do not install chromium headless shell') +@@ -98,8 +80,8 @@ + + program + .command('uninstall') +- .description('Removes browsers used by this installation of Playwright from the system (chromium, firefox, webkit, ffmpeg). This does not include branded channels.') +- .option('--all', 'Removes all browsers used by any Playwright installation from the system.') ++ .description('Removes browsers used by this installation of Patchright from the system (chromium, firefox, webkit, ffmpeg). This does not include branded channels.') ++ .option('--all', 'Removes all browsers used by any Patchright installation from the system.') + .action(async (options: { all?: boolean }) => { + uninstallBrowsers(options).catch(logErrorAndExit); + }); +@@ -283,7 +265,7 @@ .option('--save-har-glob ', 'filter entries in the HAR by matching url against this glob pattern') .option('--save-storage ', 'save context storage state at the end, for later use with --load-storage') .option('--timezone