rebrowser-playwright-core 1.64.1 → 1.64.100

package/lib/coreBundle.js

@@ -20586,6 +20586,24 @@ var init_utilityScriptSource = __esm({
 });
 
 // packages/playwright-core/src/server/javascript.ts
+function utilityScriptSource() {
+  const source14 = source4;
+  if (process.env["REBROWSER_PATCHES_SOURCE_URL"] === "0")
+    return source14;
+  if (!rebrowserUtilityScriptName) {
+    const letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    const pick = () => letters[Math.floor(Math.random() * letters.length)];
+    for (let i = 0; i < 1e3 && !rebrowserUtilityScriptName; i++) {
+      const name2 = pick() + (Math.random() < 0.5 ? "" : pick());
+      if (["do", "if", "in"].includes(name2) || new RegExp(`(^|[^\\w$.])${name2}(?![\\w$])`).test(source14))
+        continue;
+      rebrowserUtilityScriptName = name2;
+    }
+  }
+  const name = rebrowserUtilityScriptName;
+  const renamed = source14.replace("var UtilityScript = class {", () => `var ${name} = class {`).replace("UtilityScript: () => UtilityScript", () => `UtilityScript: () => ${name}`);
+  return name && renamed.includes(`var ${name} = class {`) && renamed.includes(`UtilityScript: () => ${name}`) ? rebrowserUtilityScriptOffset + renamed : source14;
+}
 async function evaluate(context, returnByValue, pageFunction, ...args) {
   return evaluateExpression(context, String(pageFunction), { returnByValue, isFunction: typeof pageFunction === "function" }, ...args);
 }
@@ -20681,7 +20699,7 @@ function sparseArrayToString(entries) {
   }
   return "[" + tokens.join(", ") + "]";
 }
-var ExecutionContext, JSHandle, JavaScriptErrorInEvaluate, snapshottedFunctionBuiltins, snapshottedObjectBuiltins, snapshottedTimerBuiltins, saveGlobalsSnapshotSource, mainWorldGlobalsSnapshotSource;
+var rebrowserUtilityScriptName, rebrowserUtilityScriptOffset, ExecutionContext, JSHandle, JavaScriptErrorInEvaluate, snapshottedFunctionBuiltins, snapshottedObjectBuiltins, snapshottedTimerBuiltins, saveGlobalsSnapshotSource, mainWorldGlobalsSnapshotSource;
 var init_javascript = __esm({
   "packages/playwright-core/src/server/javascript.ts"() {
     "use strict";
@@ -20690,6 +20708,7 @@ var init_javascript = __esm({
     init_debug();
     init_instrumentation();
     init_utilityScriptSource();
+    rebrowserUtilityScriptOffset = "\n".repeat(Math.floor(Math.random() * 100));
     ExecutionContext = class extends SdkObject {
       constructor(parent, delegate, worldNameForTest, options) {
         super(parent, "execution-context");
@@ -20730,7 +20749,7 @@ var init_javascript = __esm({
       (() => {
         ${globalsSnapshot}
         const module = {};
-        ${source4}
+        ${utilityScriptSource()}
         return new (module.exports.UtilityScript())(globalThis, ${isUnderTest()});
       })();`;
           this._utilityScriptPromise = this.raceAgainstContextDestroyed(this.delegate.rawEvaluateHandle(this, source14)).then((handle) => {
@@ -23407,6 +23426,27 @@ var init_screencast = __esm({
 });
 
 // packages/playwright-core/src/server/page.ts
+function bindingsControllerSource() {
+  const source14 = source6;
+  if (process.env["REBROWSER_PATCHES_RUNTIME_FIX_MODE"] === "0")
+    return source14;
+  const call = "    this._global[this._globalBindingName](JSON.stringify(payload));\n";
+  const retry2 = [
+    "    const json = JSON.stringify(payload);",
+    "    const send = (tries) => {",
+    "      const binding = this._global[this._globalBindingName];",
+    '      if (typeof binding === "function")',
+    "        binding(json);",
+    "      else if (tries < 500)",
+    "        setTimeout(() => send(tries + 1), 10);",
+    "      else",
+    '        data.callbacks.get(seq)?.reject(new Error(`binding "${bindingName}" is not available`));',
+    "    };",
+    "    send(0);",
+    ""
+  ].join("\n");
+  return source14.split(call).length === 2 ? source14.replace(call, () => retry2) : source14;
+}
 async function ariaSnapshotJSONForFrame(progress2, frame, selector, options = {}) {
   const snapshot3 = await frame.retryWithProgressAndTimeouts(progress2, [1e3, 2e3, 4e3, 8e3], async (progress3, continuePolling) => {
     try {
@@ -24244,7 +24284,7 @@ var init_page = __esm({
         return new InitScript(browserContext, `
       (() => {
         const module = {};
-        ${source6}
+        ${bindingsControllerSource()}
         const property = '${kBindingsControllerProperty}';
         if (!globalThis[property])
           globalThis[property] = new (module.exports.BindingsController())(globalThis, '${_PageBinding.kBindingName}');
@@ -24551,8 +24591,12 @@ var init_frames = __esm({
         } else {
           frame._currentDocument = { documentId, request: void 0 };
         }
-        if (process.env["REBROWSER_PATCHES_RUNTIME_FIX_MODE"] !== "0" && frame._rebrowserSession())
+        if (process.env["REBROWSER_PATCHES_RUNTIME_FIX_MODE"] !== "0" && frame._rebrowserSession()) {
           frame._rebrowserDropContexts();
+          if (this._page.browserContext.needsPlaywrightBinding())
+            frame._rebrowserSession().send("Runtime.addBinding", { name: PageBinding.kBindingName }).catch(() => {
+            });
+        }
         frame._onClearLifecycle();
         const navigationEvent = { url: url3, name, newDocument: frame._currentDocument, isPublic: true };
         this._fireInternalFrameNavigation(frame, navigationEvent);
@@ -36336,7 +36380,7 @@ var init_chromiumSwitches = __esm({
 });
 
 // packages/playwright-core/src/server/chromium/crConnection.ts
-var ConnectionEvents, kBrowserCloseMessageId, CRConnection, CRSession, CDPSession;
+var ConnectionEvents, kBrowserCloseMessageId, CRConnection, rebrowserLookupWorldName, rebrowserFallbackWarned, CRSession, CDPSession;
 var init_crConnection = __esm({
   "packages/playwright-core/src/server/chromium/crConnection.ts"() {
     "use strict";
@@ -36399,6 +36443,8 @@ var init_crConnection = __esm({
         return new CDPSession(this.rootSession, sessionId);
       }
     };
+    rebrowserLookupWorldName = [...Array(Math.floor(Math.random() * (10 + 1)) + 10)].map(() => Math.random().toString(36)[2]).join("");
+    rebrowserFallbackWarned = false;
     CRSession = class _CRSession extends SdkObject {
       constructor(connection, parentSession, sessionId, eventListener) {
         super(connection, "cr-session");
@@ -36507,7 +36553,45 @@ var init_crConnection = __esm({
         });
       }
       async __re__getMainWorld({ client, frameId, isWorker = false }) {
+        try {
+          const contextId4 = await this.__re__getMainWorldIdByObject({ client, frameId, isWorker });
+          if (contextId4)
+            return contextId4;
+        } catch (error) {
+          process.env["REBROWSER_PATCHES_DEBUG"] && console.log("[rebrowser-patches][getMainWorld] object lookup failed, using a binding:", error);
+        }
+        if (!rebrowserFallbackWarned) {
+          rebrowserFallbackWarned = true;
+          console.warn("[rebrowser-patches] could not look up the page's context id without touching the page; falling back to a binding handshake that page scripts can notice. Please report this with your Chrome version. REBROWSER_PATCHES_RUNTIME_FIX_MODE=alwaysIsolated avoids it.");
+        }
+        return this.__re__getMainWorldByBinding({ client, frameId, isWorker });
+      }
+      // A worker evaluates `this` in its only context. A frame reads `document` in an isolated world and resolves that
+      // node again without a context, which lands in the frame's main world. Either way the remote object id is
+      // "<isolate>.<contextId>.<id>".
+      async __re__getMainWorldIdByObject({ client, frameId, isWorker }) {
+        const objectGroup = "g" + Math.random().toString(36).slice(2);
+        let objectId;
+        try {
+          if (isWorker) {
+            objectId = (await client.send("Runtime.evaluate", { expression: "this", objectGroup })).result.objectId;
+          } else {
+            const { executionContextId } = await client.send("Page.createIsolatedWorld", { frameId, worldName: rebrowserLookupWorldName, grantUniveralAccess: true });
+            const { result: result2 } = await client.send("Runtime.evaluate", { expression: "document", contextId: executionContextId, objectGroup });
+            const { node } = await client.send("DOM.describeNode", { objectId: result2.objectId });
+            objectId = (await client.send("DOM.resolveNode", { backendNodeId: node.backendNodeId, objectGroup })).object.objectId;
+          }
+        } finally {
+          client.send("Runtime.releaseObjectGroup", { objectGroup }).catch(() => {
+          });
+        }
+        const match = /^-?\d+\.(\d+)\.\d+$/.exec(objectId || "");
+        process.env["REBROWSER_PATCHES_DEBUG"] && console.log(`[rebrowser-patches][getMainWorldIdByObject] frameId = ${frameId}, objectId = ${objectId}`);
+        return match ? Number(match[1]) : void 0;
+      }
+      async __re__getMainWorldByBinding({ client, frameId, isWorker = false }) {
         let contextId4;
+        let identifier;
         const randomName = [...Array(Math.floor(Math.random() * (10 + 1)) + 10)].map(() => Math.random().toString(36)[2]).join("");
         process.env["REBROWSER_PATCHES_DEBUG"] && console.log(`[rebrowser-patches][getMainWorld] binding name = ${randomName}`);
         await client.send("Runtime.addBinding", {
@@ -36537,10 +36621,11 @@ var init_crConnection = __esm({
             expression: `this['${randomName}']('${frameId}')`
           });
         } else {
-          await client.send("Page.addScriptToEvaluateOnNewDocument", {
-            source: `document.addEventListener('${randomName}', (e) => self['${randomName}'](e.detail.frameId))`,
+          ({ identifier } = await client.send("Page.addScriptToEvaluateOnNewDocument", {
+            // use `window`, not `self`: pages can reassign `self` (or make it throw, e.g. LavaMoat scuttling), `window` is unforgeable
+            source: `document.addEventListener('${randomName}', (e) => window['${randomName}'](e.detail.frameId))`,
             runImmediately: true
-          });
+          }));
           const createIsolatedWorldResult = await client.send("Page.createIsolatedWorld", {
             frameId,
             // use randomName for worldName to distinguish from normal utility world
@@ -36553,6 +36638,14 @@ var init_crConnection = __esm({
           });
         }
         process.env["REBROWSER_PATCHES_DEBUG"] && console.log(`[rebrowser-patches][getMainWorld] result:`, { contextId: contextId4 });
+        client.send("Runtime.removeBinding", { name: randomName }).catch(() => {
+        });
+        if (contextId4)
+          client.send("Runtime.evaluate", { expression: `delete this['${randomName}']`, contextId: contextId4 }).catch(() => {
+          });
+        if (identifier)
+          client.send("Page.removeScriptToEvaluateOnNewDocument", { identifier }).catch(() => {
+          });
         return contextId4;
       }
       async __re__getIsolatedWorld({ client, frameId, worldName }) {
@@ -39450,7 +39543,18 @@ var init_crPage = __esm({
       async _onBindingCalled(event) {
         const pageOrError = await this._crPage._page.waitForInitializedOrError();
         if (!(pageOrError instanceof Error)) {
-          const context = this._contextIdToContext.get(event.executionContextId);
+          let context = this._contextIdToContext.get(event.executionContextId);
+          if (!context && process.env["REBROWSER_PATCHES_RUNTIME_FIX_MODE"] !== "0" && event.payload.startsWith("{")) {
+            for (const frame of this._page.frameManager.frames()) {
+              if (frame._rebrowserSession() !== this._client)
+                continue;
+              await frame.context("main").catch(() => {
+              });
+              context = this._contextIdToContext.get(event.executionContextId);
+              if (context)
+                break;
+            }
+          }
           if (context)
             await this._page.onBindingCalled(event.payload, context);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rebrowser-playwright-core",
-  "version": "1.64.1",
+  "version": "1.64.100",
   "description": "A drop-in replacement for playwright-core patched with rebrowser-patches. It allows to pass modern automation detection tests.",
   "keywords": [
     "rebrowser",