patchright-core 1.50.1 → 1.51.1

package/lib/server/localUtils.js

@@ -0,0 +1,203 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.addStackToTracingNoReply = addStackToTracingNoReply;
+exports.harClose = harClose;
+exports.harLookup = harLookup;
+exports.harOpen = harOpen;
+exports.harUnzip = harUnzip;
+exports.traceDiscarded = traceDiscarded;
+exports.tracingStarted = tracingStarted;
+exports.zip = zip;
+var _fs = _interopRequireDefault(require("fs"));
+var _os = _interopRequireDefault(require("os"));
+var _path = _interopRequireDefault(require("path"));
+var _crypto = require("./utils/crypto");
+var _harBackend = require("./harBackend");
+var _manualPromise = require("../utils/isomorphic/manualPromise");
+var _zipFile = require("./utils/zipFile");
+var _zipBundle = require("../zipBundle");
+var _traceUtils = require("../utils/isomorphic/traceUtils");
+var _assert = require("../utils/isomorphic/assert");
+var _fileUtils = require("./utils/fileUtils");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the 'License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+async function zip(stackSessions, params) {
+  const promise = new _manualPromise.ManualPromise();
+  const zipFile = new _zipBundle.yazl.ZipFile();
+  zipFile.on('error', error => promise.reject(error));
+  const addFile = (file, name) => {
+    try {
+      if (_fs.default.statSync(file).isFile()) zipFile.addFile(file, name);
+    } catch (e) {}
+  };
+  for (const entry of params.entries) addFile(entry.value, entry.name);
+
+  // Add stacks and the sources.
+  const stackSession = params.stacksId ? stackSessions.get(params.stacksId) : undefined;
+  if (stackSession !== null && stackSession !== void 0 && stackSession.callStacks.length) {
+    await stackSession.writer;
+    if (process.env.PW_LIVE_TRACE_STACKS) {
+      zipFile.addFile(stackSession.file, 'trace.stacks');
+    } else {
+      const buffer = Buffer.from(JSON.stringify((0, _traceUtils.serializeClientSideCallMetadata)(stackSession.callStacks)));
+      zipFile.addBuffer(buffer, 'trace.stacks');
+    }
+  }
+
+  // Collect sources from stacks.
+  if (params.includeSources) {
+    const sourceFiles = new Set();
+    for (const {
+      stack
+    } of (stackSession === null || stackSession === void 0 ? void 0 : stackSession.callStacks) || []) {
+      if (!stack) continue;
+      for (const {
+        file
+      } of stack) sourceFiles.add(file);
+    }
+    for (const sourceFile of sourceFiles) addFile(sourceFile, 'resources/src@' + (await (0, _crypto.calculateSha1)(sourceFile)) + '.txt');
+  }
+  if (params.mode === 'write') {
+    // New file, just compress the entries.
+    await _fs.default.promises.mkdir(_path.default.dirname(params.zipFile), {
+      recursive: true
+    });
+    zipFile.end(undefined, () => {
+      zipFile.outputStream.pipe(_fs.default.createWriteStream(params.zipFile)).on('close', () => promise.resolve()).on('error', error => promise.reject(error));
+    });
+    await promise;
+    await deleteStackSession(stackSessions, params.stacksId);
+    return;
+  }
+
+  // File already exists. Repack and add new entries.
+  const tempFile = params.zipFile + '.tmp';
+  await _fs.default.promises.rename(params.zipFile, tempFile);
+  _zipBundle.yauzl.open(tempFile, (err, inZipFile) => {
+    if (err) {
+      promise.reject(err);
+      return;
+    }
+    (0, _assert.assert)(inZipFile);
+    let pendingEntries = inZipFile.entryCount;
+    inZipFile.on('entry', entry => {
+      inZipFile.openReadStream(entry, (err, readStream) => {
+        if (err) {
+          promise.reject(err);
+          return;
+        }
+        zipFile.addReadStream(readStream, entry.fileName);
+        if (--pendingEntries === 0) {
+          zipFile.end(undefined, () => {
+            zipFile.outputStream.pipe(_fs.default.createWriteStream(params.zipFile)).on('close', () => {
+              _fs.default.promises.unlink(tempFile).then(() => {
+                promise.resolve();
+              }).catch(error => promise.reject(error));
+            });
+          });
+        }
+      });
+    });
+  });
+  await promise;
+  await deleteStackSession(stackSessions, params.stacksId);
+}
+async function deleteStackSession(stackSessions, stacksId) {
+  const session = stacksId ? stackSessions.get(stacksId) : undefined;
+  if (!session) return;
+  await session.writer;
+  if (session.tmpDir) await (0, _fileUtils.removeFolders)([session.tmpDir]);
+  stackSessions.delete(stacksId);
+}
+async function harOpen(harBackends, params) {
+  let harBackend;
+  if (params.file.endsWith('.zip')) {
+    const zipFile = new _zipFile.ZipFile(params.file);
+    const entryNames = await zipFile.entries();
+    const harEntryName = entryNames.find(e => e.endsWith('.har'));
+    if (!harEntryName) return {
+      error: 'Specified archive does not have a .har file'
+    };
+    const har = await zipFile.read(harEntryName);
+    const harFile = JSON.parse(har.toString());
+    harBackend = new _harBackend.HarBackend(harFile, null, zipFile);
+  } else {
+    const harFile = JSON.parse(await _fs.default.promises.readFile(params.file, 'utf-8'));
+    harBackend = new _harBackend.HarBackend(harFile, _path.default.dirname(params.file), null);
+  }
+  harBackends.set(harBackend.id, harBackend);
+  return {
+    harId: harBackend.id
+  };
+}
+async function harLookup(harBackends, params) {
+  const harBackend = harBackends.get(params.harId);
+  if (!harBackend) return {
+    action: 'error',
+    message: `Internal error: har was not opened`
+  };
+  return await harBackend.lookup(params.url, params.method, params.headers, params.postData, params.isNavigationRequest);
+}
+async function harClose(harBackends, params) {
+  const harBackend = harBackends.get(params.harId);
+  if (harBackend) {
+    harBackends.delete(harBackend.id);
+    harBackend.dispose();
+  }
+}
+async function harUnzip(params) {
+  const dir = _path.default.dirname(params.zipFile);
+  const zipFile = new _zipFile.ZipFile(params.zipFile);
+  for (const entry of await zipFile.entries()) {
+    const buffer = await zipFile.read(entry);
+    if (entry === 'har.har') await _fs.default.promises.writeFile(params.harFile, buffer);else await _fs.default.promises.writeFile(_path.default.join(dir, entry), buffer);
+  }
+  zipFile.close();
+  await _fs.default.promises.unlink(params.zipFile);
+}
+async function tracingStarted(stackSessions, params) {
+  let tmpDir = undefined;
+  if (!params.tracesDir) tmpDir = await _fs.default.promises.mkdtemp(_path.default.join(_os.default.tmpdir(), 'playwright-tracing-'));
+  const traceStacksFile = _path.default.join(params.tracesDir || tmpDir, params.traceName + '.stacks');
+  stackSessions.set(traceStacksFile, {
+    callStacks: [],
+    file: traceStacksFile,
+    writer: Promise.resolve(),
+    tmpDir
+  });
+  return {
+    stacksId: traceStacksFile
+  };
+}
+async function traceDiscarded(stackSessions, params) {
+  await deleteStackSession(stackSessions, params.stacksId);
+}
+async function addStackToTracingNoReply(stackSessions, params) {
+  for (const session of stackSessions.values()) {
+    session.callStacks.push(params.callData);
+    if (process.env.PW_LIVE_TRACE_STACKS) {
+      session.writer = session.writer.then(() => {
+        const buffer = Buffer.from(JSON.stringify((0, _traceUtils.serializeClientSideCallMetadata)(session.callStacks)));
+        return _fs.default.promises.writeFile(session.file, buffer);
+      });
+    }
+  }
+}

package/lib/server/network.js

@@ -13,10 +13,10 @@ exports.singleHeader = singleHeader;
 exports.statusText = statusText;
 exports.stripFragmentFromUrl = stripFragmentFromUrl;
 var _utils = require("../utils");
-var _manualPromise = require("../utils/manualPromise");
-var _instrumentation = require("./instrumentation");
-var _fetch = require("./fetch");
 var _browserContext = require("./browserContext");
+var _fetch = require("./fetch");
+var _instrumentation = require("./instrumentation");
+var _manualPromise = require("../utils/isomorphic/manualPromise");
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/server/page.js

@@ -4,27 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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"));
-var _screenshotter = require("./screenshotter");
-var _timeoutSettings = require("../common/timeoutSettings");
+var accessibility = _interopRequireWildcard(require("./accessibility"));
 var _browserContext = require("./browserContext");
 var _console = require("./console");
-var accessibility = _interopRequireWildcard(require("./accessibility"));
+var _errors = require("./errors");
 var _fileChooser = require("./fileChooser");
+var frames = _interopRequireWildcard(require("./frames"));
+var _helper = require("./helper");
+var input = _interopRequireWildcard(require("./input"));
+var _instrumentation = require("./instrumentation");
+var _utilityScriptSerializers = require("./isomorphic/utilityScriptSerializers");
+var js = _interopRequireWildcard(require("./javascript"));
 var _progress = require("./progress");
+var _screenshotter = require("./screenshotter");
+var _timeoutSettings = require("./timeoutSettings");
 var _utils = require("../utils");
-var _manualPromise = require("../utils/manualPromise");
-var _debugLogger = require("../utils/debugLogger");
-var _comparators = require("../utils/comparators");
-var _instrumentation = require("./instrumentation");
+var _crypto = require("./utils/crypto");
+var _comparators = require("./utils/comparators");
+var _debugLogger = require("./utils/debugLogger");
 var _selectorParser = require("../utils/isomorphic/selectorParser");
-var _utilityScriptSerializers = require("./isomorphic/utilityScriptSerializers");
-var _errors = require("./errors");
-var _helper = require("./helper");
+var _manualPromise = require("../utils/isomorphic/manualPromise");
+var _callLog = require("./callLog");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -378,16 +380,18 @@ class Page extends _instrumentation.SdkObject {
     if (options.colorScheme !== undefined) this._emulatedMedia.colorScheme = options.colorScheme;
     if (options.reducedMotion !== undefined) this._emulatedMedia.reducedMotion = options.reducedMotion;
     if (options.forcedColors !== undefined) this._emulatedMedia.forcedColors = options.forcedColors;
+    if (options.contrast !== undefined) this._emulatedMedia.contrast = options.contrast;
     await this._delegate.updateEmulateMedia();
   }
   emulatedMedia() {
-    var _contextOptions$color, _contextOptions$reduc, _contextOptions$force;
+    var _contextOptions$color, _contextOptions$reduc, _contextOptions$force, _contextOptions$contr;
     const contextOptions = this._browserContext._options;
     return {
       media: this._emulatedMedia.media || 'no-override',
       colorScheme: this._emulatedMedia.colorScheme !== undefined ? this._emulatedMedia.colorScheme : (_contextOptions$color = contextOptions.colorScheme) !== null && _contextOptions$color !== void 0 ? _contextOptions$color : 'light',
       reducedMotion: this._emulatedMedia.reducedMotion !== undefined ? this._emulatedMedia.reducedMotion : (_contextOptions$reduc = contextOptions.reducedMotion) !== null && _contextOptions$reduc !== void 0 ? _contextOptions$reduc : 'no-preference',
-      forcedColors: this._emulatedMedia.forcedColors !== undefined ? this._emulatedMedia.forcedColors : (_contextOptions$force = contextOptions.forcedColors) !== null && _contextOptions$force !== void 0 ? _contextOptions$force : 'none'
+      forcedColors: this._emulatedMedia.forcedColors !== undefined ? this._emulatedMedia.forcedColors : (_contextOptions$force = contextOptions.forcedColors) !== null && _contextOptions$force !== void 0 ? _contextOptions$force : 'none',
+      contrast: this._emulatedMedia.contrast !== undefined ? this._emulatedMedia.contrast : (_contextOptions$contr = contextOptions.contrast) !== null && _contextOptions$contr !== void 0 ? _contextOptions$contr : 'no-preference'
     };
   }
   async setViewportSize(viewportSize) {
@@ -517,7 +521,7 @@ class Page extends _instrumentation.SdkObject {
       let errorMessage = e.message;
       if (e instanceof _errors.TimeoutError && (_intermediateResult = intermediateResult) !== null && _intermediateResult !== void 0 && _intermediateResult.previous) errorMessage = `Failed to take two consecutive stable screenshots.`;
       return {
-        log: (0, _utils.compressCallLog)(e.message ? [...metadata.log, e.message] : metadata.log),
+        log: (0, _callLog.compressCallLog)(e.message ? [...metadata.log, e.message] : metadata.log),
         ...intermediateResult,
         errorMessage,
         timedOut: e instanceof _errors.TimeoutError
@@ -641,6 +645,7 @@ class Worker extends _instrumentation.SdkObject {
   _createExecutionContext(delegate) {
     this._existingExecutionContext = new js.ExecutionContext(this, delegate, 'worker');
     this._executionContextCallback(this._existingExecutionContext);
+    return this._existingExecutionContext;
   }
   url() {
     return this._url;
@@ -650,14 +655,28 @@ class Worker extends _instrumentation.SdkObject {
     this.emit(Worker.Events.Close, this);
     this.openScope.close(new Error('Worker closed'));
   }
-  async evaluateExpression(expression, isFunction, arg) {
-    return js.evaluateExpression(await this._executionContextPromise, expression, {
+  async evaluateExpression(expression, isFunction, arg, isolatedContext) {
+    let context = await this._executionContextPromise;
+    if (context.constructor.name === "FrameExecutionContext") {
+      const frame = context.frame;
+      if (frame) {
+        if (isolatedContext) context = await frame._utilityContext();else if (!isolatedContext) context = await frame._mainContext();
+      }
+    }
+    return js.evaluateExpression(context, expression, {
       returnByValue: true,
       isFunction
     }, arg);
   }
-  async evaluateExpressionHandle(expression, isFunction, arg) {
-    return js.evaluateExpression(await this._executionContextPromise, expression, {
+  async evaluateExpressionHandle(expression, isFunction, arg, isolatedContext) {
+    let context = await this._executionContextPromise;
+    if (this._context.constructor.name === "FrameExecutionContext") {
+      const frame = this._context.frame;
+      if (frame) {
+        if (isolatedContext) context = await frame._utilityContext();else if (!isolatedContext) context = await frame._mainContext();
+      }
+    }
+    return js.evaluateExpression(context, expression, {
       returnByValue: false,
       isFunction
     }, arg);
@@ -787,7 +806,7 @@ class InitScript {
     this.source = void 0;
     this.internal = void 0;
     this.name = void 0;
-    const guid = (0, _utils.createGuid)();
+    const guid = (0, _crypto.createGuid)();
     this.source = `(() => { ${source} })();`;
     this.internal = !!internal;
     this.name = name;

package/lib/server/pipeTransport.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.PipeTransport = void 0;
 var _utils = require("../utils");
-var _debugLogger = require("../utils/debugLogger");
+var _debugLogger = require("./utils/debugLogger");
 /**
  * Copyright 2018 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.

package/lib/server/playwright.js

@@ -5,18 +5,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Playwright = void 0;
 exports.createPlaywright = createPlaywright;
+var _utils = require("../utils");
 var _android = require("./android/android");
 var _backendAdb = require("./android/backendAdb");
+var _bidiChromium = require("./bidi/bidiChromium");
+var _bidiFirefox = require("./bidi/bidiFirefox");
 var _chromium = require("./chromium/chromium");
+var _debugController = require("./debugController");
 var _electron = require("./electron/electron");
 var _firefox = require("./firefox/firefox");
+var _instrumentation = require("./instrumentation");
 var _selectors = require("./selectors");
 var _webkit = require("./webkit/webkit");
-var _instrumentation = require("./instrumentation");
-var _utils = require("../utils");
-var _debugController = require("./debugController");
-var _bidiChromium = require("./bidi/bidiChromium");
-var _bidiFirefox = require("./bidi/bidiFirefox");
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/server/progress.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.ProgressController = void 0;
 var _errors = require("./errors");
 var _utils = require("../utils");
-var _manualPromise = require("../utils/manualPromise");
+var _manualPromise = require("../utils/isomorphic/manualPromise");
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/server/protocolError.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.ProtocolError = void 0;
 exports.isProtocolError = isProtocolError;
 exports.isSessionClosedError = isSessionClosedError;
-var _stackTrace = require("../utils/stackTrace");
+var _stackTrace = require("../utils/isomorphic/stackTrace");
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/server/recorder/contextRecorder.js

@@ -6,18 +6,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.ContextRecorder = void 0;
 exports.generateFrameSelector = generateFrameSelector;
 var _events = require("events");
+var _recorderCollection = require("./recorderCollection");
 var recorderSource = _interopRequireWildcard(require("../../generated/pollingRecorderSource"));
 var _utils = require("../../utils");
-var _timeoutRunner = require("../../utils/timeoutRunner");
+var _timeoutRunner = require("../../utils/isomorphic/timeoutRunner");
 var _browserContext = require("../browserContext");
 var _languages = require("../codegen/languages");
 var _frames = require("../frames");
 var _page = require("../page");
 var _throttledFile = require("./throttledFile");
-var _recorderCollection = require("./recorderCollection");
 var _language = require("../codegen/language");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/server/recorder/recorderApp.js

@@ -4,15 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RecorderApp = exports.EmptyRecorderApp = void 0;
+var _events = require("events");
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
-var _progress = require("../progress");
-var _events = require("events");
-var _instrumentation = require("../instrumentation");
-var _utils = require("../../utils");
+var _debug = require("../utils/debug");
 var _utilsBundle = require("../../utilsBundle");
+var _instrumentation = require("../instrumentation");
 var _launchApp = require("../launchApp");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _progress = require("../progress");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -40,7 +40,7 @@ class EmptyRecorderApp extends _events.EventEmitter {
   async setRunningFile(file) {}
   async elementPicked(elementInfo, userGesture) {}
   async updateCallLogs(callLogs) {}
-  async setSources(sources) {}
+  async setSources(sources, primaryPageURL) {}
   async setActions(actions, sources) {}
 }
 exports.EmptyRecorderApp = EmptyRecorderApp;
@@ -117,8 +117,8 @@ class RecorderApp extends _events.EventEmitter {
       },
       persistentContextOptions: {
         noDefaultViewport: true,
-        headless: !!process.env.PWTEST_CLI_HEADLESS || (0, _utils.isUnderTest)() && !headed,
-        useWebSocket: (0, _utils.isUnderTest)(),
+        headless: !!process.env.PWTEST_CLI_HEADLESS || (0, _debug.isUnderTest)() && !headed,
+        useWebSocket: (0, _debug.isUnderTest)(),
         handleSIGINT: recorder.handleSIGINT,
         executablePath: inspectedContext._browser.options.isChromium ? inspectedContext._browser.options.customExecutablePath : undefined
       }
@@ -152,12 +152,18 @@ class RecorderApp extends _events.EventEmitter {
       isFunction: true
     }, paused).catch(() => {});
   }
-  async setSources(sources) {
-    await this._page.mainFrame().evaluateExpression((sources => {
-      window.playwrightSetSources(sources);
+  async setSources(sources, primaryPageURL) {
+    await this._page.mainFrame().evaluateExpression((({
+      sources,
+      primaryPageURL
+    }) => {
+      window.playwrightSetSources(sources, primaryPageURL);
     }).toString(), {
       isFunction: true
-    }, sources).catch(() => {});
+    }, {
+      sources,
+      primaryPageURL
+    }).catch(() => {});
 
     // Testing harness for runCLI mode.
     if (process.env.PWTEST_CLI_IS_UNDER_TEST && sources.length) {

package/lib/server/recorder/recorderCollection.js

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.RecorderCollection = void 0;
 var _events = require("events");
-var _time = require("../../utils/time");
-var _recorderUtils = require("./recorderUtils");
 var _recorderRunner = require("./recorderRunner");
-var _debug = require("../../utils/debug");
+var _recorderUtils = require("./recorderUtils");
+var _debug = require("../utils/debug");
+var _time = require("../../utils/isomorphic/time");
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/server/recorder/throttledFile.js

@@ -4,9 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ThrottledFile = void 0;
-var fs = _interopRequireWildcard(require("fs"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var _fs = _interopRequireDefault(require("fs"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -39,7 +38,7 @@ class ThrottledFile {
       clearTimeout(this._timer);
       this._timer = undefined;
     }
-    if (this._text) fs.writeFileSync(this._file, this._text);
+    if (this._text) _fs.default.writeFileSync(this._file, this._text);
     this._text = undefined;
   }
 }

package/lib/server/recorder.js

@@ -4,17 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Recorder = void 0;
-var fs = _interopRequireWildcard(require("fs"));
+var _fs = _interopRequireDefault(require("fs"));
 var consoleApiSource = _interopRequireWildcard(require("../generated/consoleApiSource"));
 var _utils = require("../utils");
-var _locatorParser = require("../utils/isomorphic/locatorParser");
 var _browserContext = require("./browserContext");
 var _debugger = require("./debugger");
 var _contextRecorder = require("./recorder/contextRecorder");
 var _recorderUtils = require("./recorder/recorderUtils");
+var _locatorParser = require("../utils/isomorphic/locatorParser");
 var _selectorParser = require("../utils/isomorphic/selectorParser");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -325,7 +326,8 @@ class Recorder {
   }
   _pushAllSources() {
     var _this$_recorderApp6;
-    (_this$_recorderApp6 = this._recorderApp) === null || _this$_recorderApp6 === void 0 || _this$_recorderApp6.setSources([...this._recorderSources, ...this._userSources.values()]);
+    const primaryPage = this._context.pages()[0];
+    (_this$_recorderApp6 = this._recorderApp) === null || _this$_recorderApp6 === void 0 || _this$_recorderApp6.setSources([...this._recorderSources, ...this._userSources.values()], primaryPage === null || primaryPage === void 0 ? void 0 : primaryPage.mainFrame().url());
   }
   async onBeforeInputAction(sdkObject, metadata) {}
   async onCallLog(sdkObject, metadata, logName, message) {
@@ -349,7 +351,7 @@ class Recorder {
   }
   _readSource(fileName) {
     try {
-      return fs.readFileSync(fileName, 'utf-8');
+      return _fs.default.readFileSync(fileName, 'utf-8');
     } catch (e) {
       return '// No source available';
     }

package/lib/server/registry/browserFetcher.js

@@ -5,17 +5,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.downloadBrowserWithProgressBar = downloadBrowserWithProgressBar;
 exports.logPolitely = logPolitely;
+var childProcess = _interopRequireWildcard(require("child_process"));
 var _fs = _interopRequireDefault(require("fs"));
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
-var _child_process = _interopRequireDefault(require("child_process"));
-var _fileUtils = require("../../utils/fileUtils");
-var _debugLogger = require("../../utils/debugLogger");
-var _manualPromise = require("../../utils/manualPromise");
+var _debugLogger = require("../utils/debugLogger");
+var _manualPromise = require("../../utils/isomorphic/manualPromise");
+var _userAgent = require("../utils/userAgent");
 var _utilsBundle = require("../../utilsBundle");
+var _fileUtils = require("../utils/fileUtils");
 var _ = require(".");
-var _userAgent = require("../../utils/userAgent");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -78,7 +80,7 @@ async function downloadBrowserWithProgressBar(title, browserDirectory, executabl
  * https://github.com/microsoft/playwright/issues/17394
  */
 function downloadBrowserWithProgressBarOutOfProcess(title, browserDirectory, url, zipPath, executablePath, connectionTimeout) {
-  const cp = _child_process.default.fork(_path.default.join(__dirname, 'oopDownloadBrowserMain.js'));
+  const cp = childProcess.fork(_path.default.join(__dirname, 'oopDownloadBrowserMain.js'));
   const promise = new _manualPromise.ManualPromise();
   const progress = getDownloadProgress();
   cp.on('message', message => {