@checkly/playwright-core 1.48.22 → 1.51.11-beta.1

package/lib/server/har/harRecorder.js

@@ -8,10 +8,10 @@ var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 var _artifact = require("../artifact");
 var _harTracer = require("./harTracer");
+var _crypto = require("../utils/crypto");
+var _manualPromise = require("../../utils/isomorphic/manualPromise");
 var _zipBundle = require("../../zipBundle");
-var _manualPromise = require("../../utils/manualPromise");
-var _utils = require("../../utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -36,7 +36,7 @@ class HarRecorder {
     this._entries = [];
     this._zipFile = null;
     this._writtenZipEntries = new Set();
-    this._artifact = new _artifact.Artifact(context, _path.default.join(context._browser.options.artifactsDir, `${(0, _utils.createGuid)()}.har`));
+    this._artifact = new _artifact.Artifact(context, _path.default.join(context._browser.options.artifactsDir, `${(0, _crypto.createGuid)()}.har`));
     const urlFilterRe = options.urlRegexSource !== undefined && options.urlRegexFlags !== undefined ? new RegExp(options.urlRegexSource, options.urlRegexFlags) : undefined;
     const expectsZip = options.path.endsWith('.zip');
     const content = options.content || (expectsZip ? 'attach' : 'embed');

package/lib/server/har/harTracer.js

@@ -4,17 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.HarTracer = void 0;
+var _utils = require("../../utils");
+var _eventsHelper = require("../utils/eventsHelper");
+var _manualPromise = require("../../utils/isomorphic/manualPromise");
+var _utilsBundle = require("../../utilsBundle");
 var _browserContext = require("../browserContext");
 var _fetch = require("../fetch");
+var _frames = require("../frames");
 var _helper = require("../helper");
 var network = _interopRequireWildcard(require("../network"));
-var _utils = require("../../utils");
-var _eventsHelper = require("../../utils/eventsHelper");
-var _utilsBundle = require("../../utilsBundle");
-var _manualPromise = require("../../utils/manualPromise");
-var _frames = require("../frames");
 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.
  *
@@ -196,7 +196,7 @@ class HarTracer {
     if (!this._shouldIncludeEntryWithUrl(request.url())) return;
     const page = (_request$frame = request.frame()) === null || _request$frame === void 0 ? void 0 : _request$frame._page;
     if (this._page && page !== this._page) return;
-    const url = network.parsedURL(request.url());
+    const url = network.parseURL(request.url());
     if (!url) return;
     const pageEntry = this._createPageEntryIfNeeded(page);
     const harEntry = createHarEntry(request.method(), url, (_request$frame2 = request.frame()) === null || _request$frame2 === void 0 ? void 0 : _request$frame2.guid, this._options);
@@ -440,9 +440,8 @@ class HarTracer {
     return this._postDataForBuffer(postData, contentType, content);
   }
   _postDataForBuffer(postData, contentType, content) {
-    var _contentType;
     if (!postData) return;
-    (_contentType = contentType) !== null && _contentType !== void 0 ? _contentType : contentType = 'application/octet-stream';
+    contentType !== null && contentType !== void 0 ? contentType : contentType = 'application/octet-stream';
     const result = {
       mimeType: contentType,
       text: '',

package/lib/server/harBackend.js

@@ -0,0 +1,157 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.HarBackend = void 0;
+var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
+var _crypto = require("./utils/crypto");
+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.
+ */
+
+const redirectStatus = [301, 302, 303, 307, 308];
+class HarBackend {
+  constructor(harFile, baseDir, zipFile) {
+    this.id = void 0;
+    this._harFile = void 0;
+    this._zipFile = void 0;
+    this._baseDir = void 0;
+    this.id = (0, _crypto.createGuid)();
+    this._harFile = harFile;
+    this._baseDir = baseDir;
+    this._zipFile = zipFile;
+  }
+  async lookup(url, method, headers, postData, isNavigationRequest) {
+    let entry;
+    try {
+      entry = await this._harFindResponse(url, method, headers, postData);
+    } catch (e) {
+      return {
+        action: 'error',
+        message: 'HAR error: ' + e.message
+      };
+    }
+    if (!entry) return {
+      action: 'noentry'
+    };
+
+    // If navigation is being redirected, restart it with the final url to ensure the document's url changes.
+    if (entry.request.url !== url && isNavigationRequest) return {
+      action: 'redirect',
+      redirectURL: entry.request.url
+    };
+    const response = entry.response;
+    try {
+      const buffer = await this._loadContent(response.content);
+      return {
+        action: 'fulfill',
+        status: response.status,
+        headers: response.headers,
+        body: buffer
+      };
+    } catch (e) {
+      return {
+        action: 'error',
+        message: e.message
+      };
+    }
+  }
+  async _loadContent(content) {
+    const file = content._file;
+    let buffer;
+    if (file) {
+      if (this._zipFile) buffer = await this._zipFile.read(file);else buffer = await _fs.default.promises.readFile(_path.default.resolve(this._baseDir, file));
+    } else {
+      buffer = Buffer.from(content.text || '', content.encoding === 'base64' ? 'base64' : 'utf-8');
+    }
+    return buffer;
+  }
+  async _harFindResponse(url, method, headers, postData) {
+    const harLog = this._harFile.log;
+    const visited = new Set();
+    while (true) {
+      const entries = [];
+      for (const candidate of harLog.entries) {
+        if (candidate.request.url !== url || candidate.request.method !== method) continue;
+        if (method === 'POST' && postData && candidate.request.postData) {
+          const buffer = await this._loadContent(candidate.request.postData);
+          if (!buffer.equals(postData)) {
+            const boundary = multipartBoundary(headers);
+            if (!boundary) continue;
+            const candidataBoundary = multipartBoundary(candidate.request.headers);
+            if (!candidataBoundary) continue;
+            // Try to match multipart/form-data ignroing boundary as it changes between requests.
+            if (postData.toString().replaceAll(boundary, '') !== buffer.toString().replaceAll(candidataBoundary, '')) continue;
+          }
+        }
+        entries.push(candidate);
+      }
+      if (!entries.length) return;
+      let entry = entries[0];
+
+      // Disambiguate using headers - then one with most matching headers wins.
+      if (entries.length > 1) {
+        const list = [];
+        for (const candidate of entries) {
+          const matchingHeaders = countMatchingHeaders(candidate.request.headers, headers);
+          list.push({
+            candidate,
+            matchingHeaders
+          });
+        }
+        list.sort((a, b) => b.matchingHeaders - a.matchingHeaders);
+        entry = list[0].candidate;
+      }
+      if (visited.has(entry)) throw new Error(`Found redirect cycle for ${url}`);
+      visited.add(entry);
+
+      // Follow redirects.
+      const locationHeader = entry.response.headers.find(h => h.name.toLowerCase() === 'location');
+      if (redirectStatus.includes(entry.response.status) && locationHeader) {
+        const locationURL = new URL(locationHeader.value, url);
+        url = locationURL.toString();
+        if ((entry.response.status === 301 || entry.response.status === 302) && method === 'POST' || entry.response.status === 303 && !['GET', 'HEAD'].includes(method)) {
+          // HTTP-redirect fetch step 13 (https://fetch.spec.whatwg.org/#http-redirect-fetch)
+          method = 'GET';
+        }
+        continue;
+      }
+      return entry;
+    }
+  }
+  dispose() {
+    var _this$_zipFile;
+    (_this$_zipFile = this._zipFile) === null || _this$_zipFile === void 0 || _this$_zipFile.close();
+  }
+}
+exports.HarBackend = HarBackend;
+function countMatchingHeaders(harHeaders, headers) {
+  const set = new Set(headers.map(h => h.name.toLowerCase() + ':' + h.value));
+  let matches = 0;
+  for (const h of harHeaders) {
+    if (set.has(h.name.toLowerCase() + ':' + h.value)) ++matches;
+  }
+  return matches;
+}
+function multipartBoundary(headers) {
+  const contentType = headers.find(h => h.name.toLowerCase() === 'content-type');
+  if (!(contentType !== null && contentType !== void 0 && contentType.value.includes('multipart/form-data'))) return undefined;
+  const boundary = contentType.value.match(/boundary=(\S+)/);
+  if (boundary) return boundary[1];
+  return undefined;
+}

package/lib/server/helper.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.helper = void 0;
-var _debugLogger = require("../utils/debugLogger");
-var _eventsHelper = require("../utils/eventsHelper");
+var _debugLogger = require("./utils/debugLogger");
+var _eventsHelper = require("./utils/eventsHelper");
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.

package/lib/server/index.js

@@ -27,12 +27,6 @@ Object.defineProperty(exports, "RootDispatcher", {
     return _dispatcher.RootDispatcher;
   }
 });
-Object.defineProperty(exports, "SocksProxy", {
-  enumerable: true,
-  get: function () {
-    return _socksProxy.SocksProxy;
-  }
-});
 Object.defineProperty(exports, "createPlaywright", {
   enumerable: true,
   get: function () {
@@ -45,12 +39,6 @@ Object.defineProperty(exports, "installBrowsersForNpmInstall", {
     return _registry.installBrowsersForNpmInstall;
   }
 });
-Object.defineProperty(exports, "installDefaultBrowsersForNpmInstall", {
-  enumerable: true,
-  get: function () {
-    return _registry.installDefaultBrowsersForNpmInstall;
-  }
-});
 Object.defineProperty(exports, "installRootRedirect", {
   enumerable: true,
   get: function () {
@@ -110,5 +98,4 @@ var _dispatcher = require("./dispatchers/dispatcher");
 var _playwrightDispatcher = require("./dispatchers/playwrightDispatcher");
 var _playwright = require("./playwright");
 var _traceViewer = require("./trace/viewer/traceViewer");
-var _instrumentation = require("./instrumentation");
-var _socksProxy = require("../common/socksProxy");
+var _instrumentation = require("./instrumentation");

package/lib/server/input.js

@@ -9,7 +9,7 @@ exports.resolveSmartModifierString = resolveSmartModifierString;
 var _utils = require("../utils");
 var keyboardLayout = _interopRequireWildcard(require("./usKeyboardLayout"));
 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.
  *
@@ -40,8 +40,7 @@ class Keyboard {
     const autoRepeat = this._pressedKeys.has(description.code);
     this._pressedKeys.add(description.code);
     if (kModifiers.includes(description.key)) this._pressedModifiers.add(description.key);
-    const text = description.text;
-    await this._raw.keydown(this._pressedModifiers, description.code, description.keyCode, description.keyCodeWithoutLocation, description.key, description.location, autoRepeat, text);
+    await this._raw.keydown(this._pressedModifiers, key, description, autoRepeat);
   }
   _keyDescriptionForString(str) {
     const keyString = resolveSmartModifierString(str);
@@ -61,7 +60,7 @@ class Keyboard {
     const description = this._keyDescriptionForString(key);
     if (kModifiers.includes(description.key)) this._pressedModifiers.delete(description.key);
     this._pressedKeys.delete(description.code);
-    await this._raw.keyup(this._pressedModifiers, description.code, description.keyCode, description.keyCodeWithoutLocation, description.key, description.location);
+    await this._raw.keyup(this._pressedModifiers, key, description);
   }
   async insertText(text) {
     await this._raw.sendText(text);

package/lib/server/instrumentation.js

@@ -7,7 +7,7 @@ exports.SdkObject = void 0;
 exports.createInstrumentation = createInstrumentation;
 exports.serverSideCallMetadata = serverSideCallMetadata;
 var _events = require("events");
-var _utils = require("../utils");
+var _crypto = require("./utils/crypto");
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.
  *
@@ -30,7 +30,7 @@ class SdkObject extends _events.EventEmitter {
     this.guid = void 0;
     this.attribution = void 0;
     this.instrumentation = void 0;
-    this.guid = guid || `${guidPrefix || ''}@${(0, _utils.createGuid)()}`;
+    this.guid = guid || `${guidPrefix || ''}@${(0, _crypto.createGuid)()}`;
     this.setMaxListeners(0);
     this.attribution = {
       ...parent.attribution

package/lib/server/isomorphic/utilityScriptSerializers.js

@@ -101,8 +101,11 @@ function source() {
   }
   function serialize(value, handleSerializer, visitorInfo) {
     if (value && typeof value === 'object') {
+      // eslint-disable-next-line no-restricted-globals
       if (typeof globalThis.Window === 'function' && value instanceof globalThis.Window) return 'ref: <Window>';
+      // eslint-disable-next-line no-restricted-globals
       if (typeof globalThis.Document === 'function' && value instanceof globalThis.Document) return 'ref: <Document>';
+      // eslint-disable-next-line no-restricted-globals
       if (typeof globalThis.Node === 'function' && value instanceof globalThis.Node) return 'ref: <Node>';
     }
     return innerSerialize(value, handleSerializer, visitorInfo);

package/lib/server/javascript.js

@@ -10,13 +10,13 @@ exports.isJavaScriptErrorInEvaluate = isJavaScriptErrorInEvaluate;
 exports.normalizeEvaluationExpression = normalizeEvaluationExpression;
 exports.parseUnserializableValue = parseUnserializableValue;
 exports.sparseArrayToString = sparseArrayToString;
-var utilityScriptSource = _interopRequireWildcard(require("../generated/utilityScriptSource"));
-var _utilityScriptSerializers = require("./isomorphic/utilityScriptSerializers");
 var _instrumentation = require("./instrumentation");
-var _manualPromise = require("../utils/manualPromise");
+var utilityScriptSource = _interopRequireWildcard(require("../generated/utilityScriptSource"));
 var _utils = require("../utils");
+var _utilityScriptSerializers = require("./isomorphic/utilityScriptSerializers");
+var _manualPromise = require("../utils/isomorphic/manualPromise");
 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.
  *
@@ -36,12 +36,12 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 class ExecutionContext extends _instrumentation.SdkObject {
   constructor(parent, delegate, worldNameForTest) {
     super(parent, 'execution-context');
-    this._delegate = void 0;
+    this.delegate = void 0;
     this._utilityScriptPromise = void 0;
     this._contextDestroyedScope = new _manualPromise.LongStandingScope();
     this.worldNameForTest = void 0;
     this.worldNameForTest = worldNameForTest;
-    this._delegate = delegate;
+    this.delegate = delegate;
   }
   contextDestroyed(reason) {
     this._contextDestroyedScope.close(new Error(reason));
@@ -50,30 +50,25 @@ class ExecutionContext extends _instrumentation.SdkObject {
     return this._contextDestroyedScope.race(promise);
   }
   rawEvaluateJSON(expression) {
-    return this._raceAgainstContextDestroyed(this._delegate.rawEvaluateJSON(expression));
+    return this._raceAgainstContextDestroyed(this.delegate.rawEvaluateJSON(expression));
   }
   rawEvaluateHandle(expression) {
-    return this._raceAgainstContextDestroyed(this._delegate.rawEvaluateHandle(expression));
+    return this._raceAgainstContextDestroyed(this.delegate.rawEvaluateHandle(this, expression));
   }
-  rawCallFunctionNoReply(func, ...args) {
-    this._delegate.rawCallFunctionNoReply(func, ...args);
+  async evaluateWithArguments(expression, returnByValue, values, handles) {
+    const utilityScript = await this._utilityScript();
+    return this._raceAgainstContextDestroyed(this.delegate.evaluateWithArguments(expression, returnByValue, utilityScript, values, handles));
   }
-  evaluateWithArguments(expression, returnByValue, utilityScript, values, objectIds) {
-    return this._raceAgainstContextDestroyed(this._delegate.evaluateWithArguments(expression, returnByValue, utilityScript, values, objectIds));
+  getProperties(object) {
+    return this._raceAgainstContextDestroyed(this.delegate.getProperties(object));
   }
-  getProperties(context, objectId) {
-    return this._raceAgainstContextDestroyed(this._delegate.getProperties(context, objectId));
-  }
-  createHandle(remoteObject) {
-    return this._delegate.createHandle(this, remoteObject);
-  }
-  releaseHandle(objectId) {
-    return this._delegate.releaseHandle(objectId);
+  releaseHandle(handle) {
+    return this.delegate.releaseHandle(handle);
   }
   adoptIfNeeded(handle) {
     return null;
   }
-  utilityScript() {
+  _utilityScript() {
     if (!this._utilityScriptPromise) {
       const source = `
       (() => {
@@ -81,7 +76,10 @@ class ExecutionContext extends _instrumentation.SdkObject {
         ${utilityScriptSource.source}
         return new (module.exports.UtilityScript())(${(0, _utils.isUnderTest)()});
       })();`;
-      this._utilityScriptPromise = this._raceAgainstContextDestroyed(this._delegate.rawEvaluateHandle(source).then(objectId => new JSHandle(this, 'object', 'UtilityScript', objectId)));
+      this._utilityScriptPromise = this._raceAgainstContextDestroyed(this.delegate.rawEvaluateHandle(this, source)).then(handle => {
+        handle._setPreview('UtilityScript');
+        return handle;
+      });
     }
     return this._utilityScriptPromise;
   }
@@ -108,9 +106,6 @@ class JSHandle extends _instrumentation.SdkObject {
     this._preview = this._objectId ? preview || `JSHandle@${this._objectType}` : String(value);
     if (this._objectId && globalThis.leakedJSHandles) globalThis.leakedJSHandles.set(this, new Error('Leaked JSHandle'));
   }
-  callFunctionNoReply(func, arg) {
-    this._context.rawCallFunctionNoReply(func, this, arg);
-  }
   async evaluate(pageFunction, arg) {
     return evaluate(this._context, true /* returnByValue */, pageFunction, this, arg);
   }
@@ -148,16 +143,15 @@ class JSHandle extends _instrumentation.SdkObject {
   }
   async getProperties() {
     if (!this._objectId) return new Map();
-    return this._context.getProperties(this._context, this._objectId);
+    return this._context.getProperties(this);
   }
   rawValue() {
     return this._value;
   }
   async jsonValue() {
     if (!this._objectId) return this._value;
-    const utilityScript = await this._context.utilityScript();
     const script = `(utilityScript, ...args) => utilityScript.jsonValue(...args)`;
-    return this._context.evaluateWithArguments(script, true, utilityScript, [true], [this._objectId]);
+    return this._context.evaluateWithArguments(script, true, [true], [this]);
   }
   asElement() {
     return null;
@@ -166,7 +160,7 @@ class JSHandle extends _instrumentation.SdkObject {
     if (this._disposed) return;
     this._disposed = true;
     if (this._objectId) {
-      this._context.releaseHandle(this._objectId).catch(e => {});
+      this._context.releaseHandle(this).catch(e => {});
       if (globalThis.leakedJSHandles) globalThis.leakedJSHandles.delete(this);
     }
   }
@@ -195,7 +189,6 @@ async function evaluate(context, returnByValue, pageFunction, ...args) {
   }, ...args);
 }
 async function evaluateExpression(context, expression, options, ...args) {
-  const utilityScript = await context.utilityScript();
   expression = normalizeEvaluationExpression(expression, options.isFunction);
   const handles = [];
   const toDispose = [];
@@ -222,17 +215,17 @@ async function evaluateExpression(context, expression, options, ...args) {
       fallThrough: handle
     };
   }));
-  const utilityScriptObjectIds = [];
+  const utilityScriptObjects = [];
   for (const handle of await Promise.all(handles)) {
     if (handle._context !== context) throw new JavaScriptErrorInEvaluate('JSHandles can be evaluated only in the context they were created!');
-    utilityScriptObjectIds.push(handle._objectId);
+    utilityScriptObjects.push(handle);
   }
 
   // See UtilityScript for arguments.
   const utilityScriptValues = [options.isFunction, options.returnByValue, expression, args.length, ...args];
   const script = `(utilityScript, ...args) => utilityScript.evaluate(...args)`;
   try {
-    return await context.evaluateWithArguments(script, options.returnByValue || false, utilityScript, utilityScriptValues, utilityScriptObjectIds);
+    return await context.evaluateWithArguments(script, options.returnByValue || false, utilityScriptValues, utilityScriptObjects);
   } finally {
     toDispose.map(handlePromise => handlePromise.then(handle => handle.dispose()));
   }

package/lib/server/launchApp.js

@@ -7,10 +7,10 @@ exports.launchApp = launchApp;
 exports.syncLocalStorageWithSettings = syncLocalStorageWithSettings;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
-var _registry = require("./registry");
 var _utils = require("../utils");
 var _instrumentation = require("./instrumentation");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _registry = require("./registry");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -28,18 +28,18 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 
 async function launchApp(browserType, options) {
-  var _options$persistentCo, _options$persistentCo2, _options$persistentCo3;
+  var _options$persistentCo, _options$persistentCo2, _options$persistentCo3, _options$persistentCo4, _options$persistentCo5, _options$persistentCo6, _options$persistentCo7, _options$persistentCo8, _options$persistentCo9, _options$persistentCo10, _options$persistentCo11;
   const args = [...((_options$persistentCo = (_options$persistentCo2 = options.persistentContextOptions) === null || _options$persistentCo2 === void 0 ? void 0 : _options$persistentCo2.args) !== null && _options$persistentCo !== void 0 ? _options$persistentCo : [])];
   if (browserType.name() === 'chromium') {
     args.push('--app=data:text/html,', `--window-size=${options.windowSize.width},${options.windowSize.height}`, ...(options.windowPosition ? [`--window-position=${options.windowPosition.x},${options.windowPosition.y}`] : []), '--test-type=');
   }
   const context = await browserType.launchPersistentContext((0, _instrumentation.serverSideCallMetadata)(), '', {
-    channel: !((_options$persistentCo3 = options.persistentContextOptions) !== null && _options$persistentCo3 !== void 0 && _options$persistentCo3.executablePath) ? (0, _registry.findChromiumChannel)(options.sdkLanguage) : undefined,
-    noDefaultViewport: true,
     ignoreDefaultArgs: ['--enable-automation'],
-    colorScheme: 'no-override',
-    acceptDownloads: (0, _utils.isUnderTest)() ? 'accept' : 'internal-browser-default',
     ...(options === null || options === void 0 ? void 0 : options.persistentContextOptions),
+    channel: (_options$persistentCo3 = (_options$persistentCo4 = options.persistentContextOptions) === null || _options$persistentCo4 === void 0 ? void 0 : _options$persistentCo4.channel) !== null && _options$persistentCo3 !== void 0 ? _options$persistentCo3 : !((_options$persistentCo5 = options.persistentContextOptions) !== null && _options$persistentCo5 !== void 0 && _options$persistentCo5.executablePath) ? (0, _registry.findChromiumChannel)(options.sdkLanguage) : undefined,
+    noDefaultViewport: (_options$persistentCo6 = (_options$persistentCo7 = options.persistentContextOptions) === null || _options$persistentCo7 === void 0 ? void 0 : _options$persistentCo7.noDefaultViewport) !== null && _options$persistentCo6 !== void 0 ? _options$persistentCo6 : true,
+    acceptDownloads: (_options$persistentCo8 = options === null || options === void 0 || (_options$persistentCo9 = options.persistentContextOptions) === null || _options$persistentCo9 === void 0 ? void 0 : _options$persistentCo9.acceptDownloads) !== null && _options$persistentCo8 !== void 0 ? _options$persistentCo8 : (0, _utils.isUnderTest)() ? 'accept' : 'internal-browser-default',
+    colorScheme: (_options$persistentCo10 = options === null || options === void 0 || (_options$persistentCo11 = options.persistentContextOptions) === null || _options$persistentCo11 === void 0 ? void 0 : _options$persistentCo11.colorScheme) !== null && _options$persistentCo10 !== void 0 ? _options$persistentCo10 : 'no-override',
     args
   });
   const [page] = context.pages();