playwright-core 1.45.0 → 1.45.1

package/lib/server/browserContext.js

@@ -314,9 +314,10 @@ class BrowserContext extends _instrumentation.SdkObject {
       password: password || ''
     };
   }
-  async addInitScript(script) {
-    this.initScripts.push(script);
-    await this.doAddInitScript(script);
+  async addInitScript(source) {
+    const initScript = new _page6.InitScript(source);
+    this.initScripts.push(initScript);
+    await this.doAddInitScript(initScript);
   }
   async _removeInitScripts() {
     this.initScripts.splice(0, this.initScripts.length);

package/lib/server/chromium/crBrowser.js

@@ -415,8 +415,8 @@ class CRBrowserContext extends _browserContext.BrowserContext {
     for (const page of this.pages()) await page._delegate.updateHttpCredentials();
     for (const sw of this.serviceWorkers()) await sw.updateHttpCredentials();
   }
-  async doAddInitScript(source) {
-    for (const page of this.pages()) await page._delegate.addInitScript(source);
+  async doAddInitScript(initScript) {
+    for (const page of this.pages()) await page._delegate.addInitScript(initScript);
   }
   async doRemoveInitScripts() {
     for (const page of this.pages()) await page._delegate.removeInitScripts();

package/lib/server/chromium/crPage.js

@@ -221,8 +221,8 @@ class CRPage {
   goForward() {
     return this._go(+1);
   }
-  async addInitScript(source, world = 'main') {
-    await this._forAllFrameSessions(frame => frame._evaluateOnNewDocument(source, world));
+  async addInitScript(initScript, world = 'main') {
+    await this._forAllFrameSessions(frame => frame._evaluateOnNewDocument(initScript, world));
   }
   async removeInitScripts() {
     await this._forAllFrameSessions(frame => frame._removeEvaluatesOnNewDocument());
@@ -429,6 +429,17 @@ class FrameSession {
         this._handleFrameTree(frameTree);
         this._addRendererListeners();
       }
+      const localFrames = this._isMainFrame() ? this._page.frames() : [this._page._frameManager.frame(this._targetId)];
+      for (const frame of localFrames) {
+        // Note: frames might be removed before we send these.
+        this._client._sendMayFail('Page.createIsolatedWorld', {
+          frameId: frame._id,
+          grantUniveralAccess: true,
+          worldName: UTILITY_WORLD_NAME
+        });
+        for (const binding of this._crPage._browserContext._pageBindings.values()) frame.evaluateExpression(binding.source).catch(e => {});
+        for (const initScript of this._crPage._browserContext.initScripts) frame.evaluateExpression(initScript.source).catch(e => {});
+      }
       const isInitialEmptyPage = this._isMainFrame() && this._page.mainFrame().url() === ':';
       if (isInitialEmptyPage) {
         // Ignore lifecycle events, worlds and bindings for the initial empty page. It is never the final page
@@ -438,17 +449,6 @@ class FrameSession {
           this._eventListeners.push(_eventsHelper.eventsHelper.addEventListener(this._client, 'Page.lifecycleEvent', event => this._onLifecycleEvent(event)));
         });
       } else {
-        const localFrames = this._isMainFrame() ? this._page.frames() : [this._page._frameManager.frame(this._targetId)];
-        for (const frame of localFrames) {
-          // Note: frames might be removed before we send these.
-          this._client._sendMayFail('Page.createIsolatedWorld', {
-            frameId: frame._id,
-            grantUniveralAccess: true,
-            worldName: UTILITY_WORLD_NAME
-          });
-          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).catch(e => {});
-        }
         this._firstNonInitialNavigationCommittedFulfill();
         this._eventListeners.push(_eventsHelper.eventsHelper.addEventListener(this._client, 'Page.lifecycleEvent', event => this._onLifecycleEvent(event)));
       }
@@ -488,8 +488,8 @@ class FrameSession {
       promises.push(this._updateEmulateMedia());
       promises.push(this._updateFileChooserInterception(true));
       for (const binding of this._crPage._page.allBindings()) promises.push(this._initBinding(binding));
-      for (const source of this._crPage._browserContext.initScripts) promises.push(this._evaluateOnNewDocument(source, 'main'));
-      for (const source of this._crPage._page.initScripts) promises.push(this._evaluateOnNewDocument(source, 'main'));
+      for (const initScript of this._crPage._browserContext.initScripts) promises.push(this._evaluateOnNewDocument(initScript, 'main'));
+      for (const initScript of this._crPage._page.initScripts) promises.push(this._evaluateOnNewDocument(initScript, 'main'));
       if (screencastOptions) promises.push(this._startVideoRecording(screencastOptions));
     }
     promises.push(this._client.send('Runtime.runIfWaitingForDebugger'));
@@ -970,12 +970,12 @@ class FrameSession {
       enabled
     }).catch(() => {}); // target can be closed.
   }
-  async _evaluateOnNewDocument(source, world) {
+  async _evaluateOnNewDocument(initScript, world) {
     const worldName = world === 'utility' ? UTILITY_WORLD_NAME : undefined;
     const {
       identifier
     } = await this._client.send('Page.addScriptToEvaluateOnNewDocument', {
-      source,
+      source: initScript.source,
       worldName
     });
     this._evaluateOnNewDocumentIdentifiers.push(identifier);

package/lib/server/firefox/ffBrowser.js

@@ -374,11 +374,11 @@ class FFBrowserContext extends _browserContext.BrowserContext {
       credentials
     });
   }
-  async doAddInitScript(source) {
+  async doAddInitScript(initScript) {
     await this._browser.session.send('Browser.setInitScripts', {
       browserContextId: this._browserContextId,
       scripts: this.initScripts.map(script => ({
-        script
+        script: script.source
       }))
     });
   }

package/lib/server/firefox/ffPage.js

@@ -81,7 +81,7 @@ class FFPage {
     });
     // Ideally, we somehow ensure that utility world is created before Page.ready arrives, but currently it is racy.
     // Therefore, we can end up with an initialized page without utility world, although very unlikely.
-    this.addInitScript('', UTILITY_WORLD_NAME).catch(e => this._markAsError(e));
+    this.addInitScript(new _page.InitScript(''), UTILITY_WORLD_NAME).catch(e => this._markAsError(e));
   }
   potentiallyUninitializedPage() {
     return this._page;
@@ -369,13 +369,16 @@ class FFPage {
     });
     return success;
   }
-  async addInitScript(script, worldName) {
+  async addInitScript(initScript, worldName) {
     this._initScripts.push({
-      script,
+      initScript,
       worldName
     });
     await this._session.send('Page.setInitScripts', {
-      scripts: this._initScripts
+      scripts: this._initScripts.map(s => ({
+        script: s.initScript.source,
+        worldName: s.worldName
+      }))
     });
   }
   async removeInitScripts() {

package/lib/server/page.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Worker = exports.PageBinding = exports.Page = void 0;
+exports.Worker = exports.PageBinding = exports.Page = exports.InitScript = void 0;
 var frames = _interopRequireWildcard(require("./frames"));
 var input = _interopRequireWildcard(require("./input"));
 var js = _interopRequireWildcard(require("./javascript"));
@@ -383,8 +383,9 @@ class Page extends _instrumentation.SdkObject {
     await this._delegate.bringToFront();
   }
   async addInitScript(source) {
-    this.initScripts.push(source);
-    await this._delegate.addInitScript(source);
+    const initScript = new InitScript(source);
+    this.initScripts.push(initScript);
+    await this._delegate.addInitScript(initScript);
   }
   async _removeInitScripts() {
     this.initScripts.splice(0, this.initScripts.length);
@@ -750,6 +751,21 @@ function addPageBinding(bindingName, needsHandle, utilityScriptSerializers) {
   };
   globalThis[bindingName].__installed = true;
 }
+class InitScript {
+  constructor(source) {
+    this.source = void 0;
+    const guid = (0, _utils.createGuid)();
+    this.source = `(() => {
+      globalThis.__pwInitScripts = globalThis.__pwInitScripts || {};
+      const hasInitScript = globalThis.__pwInitScripts[${JSON.stringify(guid)}];
+      if (hasInitScript)
+        return;
+      globalThis.__pwInitScripts[${JSON.stringify(guid)}] = true;
+      ${source}
+    })();`;
+  }
+}
+exports.InitScript = InitScript;
 class FrameThrottler {
   constructor(nonThrottledFrames, defaultInterval, throttlingInterval) {
     this._acks = [];

package/lib/server/webkit/wkBrowser.js

@@ -279,7 +279,7 @@ class WKBrowserContext extends _browserContext.BrowserContext {
     this._options.httpCredentials = httpCredentials;
     for (const page of this.pages()) await page._delegate.updateHttpCredentials();
   }
-  async doAddInitScript(source) {
+  async doAddInitScript(initScript) {
     for (const page of this.pages()) await page._delegate._updateBootstrapScript();
   }
   async doRemoveInitScripts() {

package/lib/server/webkit/wkPage.js

@@ -756,7 +756,7 @@ class WKPage {
   async removeExposedBindings() {
     await this._updateBootstrapScript();
   }
-  async addInitScript(script) {
+  async addInitScript(initScript) {
     await this._updateBootstrapScript();
   }
   async removeInitScripts() {
@@ -772,8 +772,8 @@ class WKPage {
     scripts.push('if (!window.safari) window.safari = { pushNotification: { toString() { return "[object SafariRemoteNotification]"; } } };');
     scripts.push('if (!window.GestureEvent) window.GestureEvent = function GestureEvent() {};');
     for (const binding of this._page.allBindings()) scripts.push(binding.source);
-    scripts.push(...this._browserContext.initScripts);
-    scripts.push(...this._page.initScripts);
+    scripts.push(...this._browserContext.initScripts.map(s => s.source));
+    scripts.push(...this._page.initScripts.map(s => s.source));
     return scripts.join(';\n');
   }
   async _updateBootstrapScript() {