@checkly/playwright-core 1.41.2-beta.0 → 1.41.2-beta.1

package/lib/server/chromium/crNetworkManager.js

@@ -8,9 +8,8 @@ var _helper = require("../helper");
 var _eventsHelper = require("../../utils/eventsHelper");
 var network = _interopRequireWildcard(require("../network"));
 var _utils = require("../../utils");
-var _protocolError = require("../protocolError");
-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 _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -179,7 +178,7 @@ class CRNetworkManager {
     } else {
       var _existingRequest$_rou;
       const existingRequest = this._requestIdToRequest.get(requestId);
-      const alreadyContinuedParams = existingRequest === null || existingRequest === void 0 || (_existingRequest$_rou = existingRequest._route) === null || _existingRequest$_rou === void 0 ? void 0 : _existingRequest$_rou._alreadyContinuedParams;
+      const alreadyContinuedParams = existingRequest === null || existingRequest === void 0 ? void 0 : (_existingRequest$_rou = existingRequest._route) === null || _existingRequest$_rou === void 0 ? void 0 : _existingRequest$_rou._alreadyContinuedParams;
       if (alreadyContinuedParams && !event.redirectedRequestId) {
         // Sometimes Chromium network stack restarts the request internally.
         // For example, when no-cors request hits a "less public address space", it should be resent with cors.
@@ -267,9 +266,9 @@ class CRNetworkManager {
     if (requestPausedEvent) {
       // We do not support intercepting redirects.
       if (redirectedFrom || !this._userRequestInterceptionEnabled && this._protocolRequestInterceptionEnabled) {
-        var _redirectedFrom;
+        var _redirectedFrom, _redirectedFrom$_orig, _redirectedFrom$_orig2;
         let headers = undefined;
-        const previousHeaderOverrides = (_redirectedFrom = redirectedFrom) === null || _redirectedFrom === void 0 || (_redirectedFrom = _redirectedFrom._originalRequestRoute) === null || _redirectedFrom === void 0 || (_redirectedFrom = _redirectedFrom._alreadyContinuedParams) === null || _redirectedFrom === void 0 ? void 0 : _redirectedFrom.headers;
+        const previousHeaderOverrides = (_redirectedFrom = redirectedFrom) === null || _redirectedFrom === void 0 ? void 0 : (_redirectedFrom$_orig = _redirectedFrom._originalRequestRoute) === null || _redirectedFrom$_orig === void 0 ? void 0 : (_redirectedFrom$_orig2 = _redirectedFrom$_orig._alreadyContinuedParams) === null || _redirectedFrom$_orig2 === void 0 ? void 0 : _redirectedFrom$_orig2.headers;
         // Chromium does not preserve header overrides between redirects, so we have to do it ourselves.
         if (previousHeaderOverrides) headers = network.mergeHeaders([(0, _utils.headersObjectToArray)(requestPausedEvent.request.headers, '\n'), previousHeaderOverrides]);
         this._session._sendMayFail('Fetch.continueRequest', {
@@ -372,11 +371,11 @@ class CRNetworkManager {
       response._serverAddrFinished();
     }
     response._securityDetailsFinished({
-      protocol: responsePayload === null || responsePayload === void 0 || (_responsePayload$secu = responsePayload.securityDetails) === null || _responsePayload$secu === void 0 ? void 0 : _responsePayload$secu.protocol,
-      subjectName: responsePayload === null || responsePayload === void 0 || (_responsePayload$secu2 = responsePayload.securityDetails) === null || _responsePayload$secu2 === void 0 ? void 0 : _responsePayload$secu2.subjectName,
-      issuer: responsePayload === null || responsePayload === void 0 || (_responsePayload$secu3 = responsePayload.securityDetails) === null || _responsePayload$secu3 === void 0 ? void 0 : _responsePayload$secu3.issuer,
-      validFrom: responsePayload === null || responsePayload === void 0 || (_responsePayload$secu4 = responsePayload.securityDetails) === null || _responsePayload$secu4 === void 0 ? void 0 : _responsePayload$secu4.validFrom,
-      validTo: responsePayload === null || responsePayload === void 0 || (_responsePayload$secu5 = responsePayload.securityDetails) === null || _responsePayload$secu5 === void 0 ? void 0 : _responsePayload$secu5.validTo
+      protocol: responsePayload === null || responsePayload === void 0 ? void 0 : (_responsePayload$secu = responsePayload.securityDetails) === null || _responsePayload$secu === void 0 ? void 0 : _responsePayload$secu.protocol,
+      subjectName: responsePayload === null || responsePayload === void 0 ? void 0 : (_responsePayload$secu2 = responsePayload.securityDetails) === null || _responsePayload$secu2 === void 0 ? void 0 : _responsePayload$secu2.subjectName,
+      issuer: responsePayload === null || responsePayload === void 0 ? void 0 : (_responsePayload$secu3 = responsePayload.securityDetails) === null || _responsePayload$secu3 === void 0 ? void 0 : _responsePayload$secu3.issuer,
+      validFrom: responsePayload === null || responsePayload === void 0 ? void 0 : (_responsePayload$secu4 = responsePayload.securityDetails) === null || _responsePayload$secu4 === void 0 ? void 0 : _responsePayload$secu4.validFrom,
+      validTo: responsePayload === null || responsePayload === void 0 ? void 0 : (_responsePayload$secu5 = responsePayload.securityDetails) === null || _responsePayload$secu5 === void 0 ? void 0 : _responsePayload$secu5.validTo
     });
     this._responseExtraInfoTracker.processResponse(request._requestId, response, hasExtraInfo);
     return response;
@@ -544,44 +543,30 @@ class RouteImpl {
       method: overrides.method,
       postData: overrides.postData ? overrides.postData.toString('base64') : undefined
     };
-    await catchDisallowedErrors(async () => {
-      await this._session.send('Fetch.continueRequest', this._alreadyContinuedParams);
-    });
+    await this._session.send('Fetch.continueRequest', this._alreadyContinuedParams);
   }
   async fulfill(response) {
     const body = response.isBase64 ? response.body : Buffer.from(response.body).toString('base64');
     const responseHeaders = splitSetCookieHeader(response.headers);
-    await catchDisallowedErrors(async () => {
-      await this._session.send('Fetch.fulfillRequest', {
-        requestId: this._interceptionId,
-        responseCode: response.status,
-        responsePhrase: network.STATUS_TEXTS[String(response.status)],
-        responseHeaders,
-        body
-      });
+    await this._session.send('Fetch.fulfillRequest', {
+      requestId: this._interceptionId,
+      responseCode: response.status,
+      responsePhrase: network.STATUS_TEXTS[String(response.status)],
+      responseHeaders,
+      body
     });
   }
   async abort(errorCode = 'failed') {
     const errorReason = errorReasons[errorCode];
     (0, _utils.assert)(errorReason, 'Unknown error code: ' + errorCode);
-    await catchDisallowedErrors(async () => {
-      await this._session.send('Fetch.failRequest', {
-        requestId: this._interceptionId,
-        errorReason
-      });
+    // In certain cases, protocol will return error if the request was already canceled
+    // or the page was closed. We should tolerate these errors.
+    await this._session._sendMayFail('Fetch.failRequest', {
+      requestId: this._interceptionId,
+      errorReason
     });
   }
 }
-
-// In certain cases, protocol will return error if the request was already canceled
-// or the page was closed. We should tolerate these errors but propagate other.
-async function catchDisallowedErrors(callback) {
-  try {
-    return await callback();
-  } catch (e) {
-    if ((0, _protocolError.isProtocolError)(e) && e.message.includes('Invalid http status code or phrase')) throw e;
-  }
-}
 function splitSetCookieHeader(headers) {
   const index = headers.findIndex(({
     name
@@ -717,6 +702,7 @@ class ResponseExtraInfoTracker {
 
     // We are not done yet.
   }
+
   _stopTracking(requestId) {
     this._requests.delete(requestId);
   }

package/lib/server/chromium/crPage.js

@@ -29,8 +29,8 @@ var _videoRecorder = require("./videoRecorder");
 var _browserContext = require("../browserContext");
 var _errors = require("../errors");
 var _protocolError = require("../protocolError");
-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 _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Copyright 2017 Google Inc. All rights reserved.
@@ -836,7 +836,7 @@ class FrameSession {
     // Keep the video artifact in the map until encoding is fully finished, if the context
     // starts closing before the video is fully written to disk it will wait for it.
     const video = this._crPage._browserContext._browser._takeVideo(screencastId);
-    video === null || video === void 0 || video.reportFinished();
+    video === null || video === void 0 ? void 0 : video.reportFinished();
   }
   async _startScreencast(client, options = {}) {
     this._screencastClients.add(client);
@@ -852,6 +852,7 @@ class FrameSession {
       headers: (0, _utils.headersArrayToObject)(headers, false /* lowerCase */)
     });
   }
+
   async _updateGeolocation(initial) {
     const geolocation = this._crPage._browserContext._options.geolocation;
     if (!initial || geolocation) await this._client.send('Emulation.setGeolocationOverride', geolocation || {});
@@ -970,8 +971,7 @@ class FrameSession {
     const options = this._crPage._browserContext._options;
     await this._client.send('Emulation.setUserAgentOverride', {
       userAgent: options.userAgent || '',
-      acceptLanguage: options.locale,
-      userAgentMetadata: calculateUserAgentMetadata(options)
+      acceptLanguage: options.locale
     });
   }
   async _setDefaultFontFamilies(session) {
@@ -988,6 +988,7 @@ class FrameSession {
       enabled
     }).catch(() => {}); // target can be closed.
   }
+
   async _evaluateOnNewDocument(source, world) {
     const worldName = world === 'utility' ? UTILITY_WORLD_NAME : undefined;
     const {
@@ -1128,46 +1129,4 @@ async function emulateTimezone(session, timezoneId) {
     throw exception;
   }
 }
-const contextDelegateSymbol = Symbol('delegate');
-
-// Chromium reference: https://source.chromium.org/chromium/chromium/src/+/main:components/embedder_support/user_agent_utils.cc;l=434;drc=70a6711e08e9f9e0d8e4c48e9ba5cab62eb010c2
-function calculateUserAgentMetadata(options) {
-  const ua = options.userAgent;
-  if (!ua) return undefined;
-  const metadata = {
-    mobile: !!options.isMobile,
-    model: '',
-    architecture: 'x64',
-    platform: 'Windows',
-    platformVersion: ''
-  };
-  const androidMatch = ua.match(/Android (\d+(\.\d+)?(\.\d+)?)/);
-  const iPhoneMatch = ua.match(/iPhone OS (\d+(_\d+)?)/);
-  const iPadMatch = ua.match(/iPad; CPU OS (\d+(_\d+)?)/);
-  const macOSMatch = ua.match(/Mac OS X (\d+(_\d+)?(_\d+)?)/);
-  const windowsMatch = ua.match(/Windows\D+(\d+(\.\d+)?(\.\d+)?)/);
-  if (androidMatch) {
-    metadata.platform = 'Android';
-    metadata.platformVersion = androidMatch[1];
-    metadata.architecture = 'arm';
-  } else if (iPhoneMatch) {
-    metadata.platform = 'iOS';
-    metadata.platformVersion = iPhoneMatch[1];
-    metadata.architecture = 'arm';
-  } else if (iPadMatch) {
-    metadata.platform = 'iOS';
-    metadata.platformVersion = iPadMatch[1];
-    metadata.architecture = 'arm';
-  } else if (macOSMatch) {
-    metadata.platform = 'macOS';
-    metadata.platformVersion = macOSMatch[1];
-    if (!ua.includes('Intel')) metadata.architecture = 'arm';
-  } else if (windowsMatch) {
-    metadata.platform = 'Windows';
-    metadata.platformVersion = windowsMatch[1];
-  } else if (ua.toLowerCase().includes('linux')) {
-    metadata.platform = 'Linux';
-  }
-  if (ua.includes('ARM')) metadata.architecture = 'arm';
-  return metadata;
-}
+const contextDelegateSymbol = Symbol('delegate');

package/lib/server/chromium/crServiceWorker.js

@@ -10,8 +10,8 @@ var _crNetworkManager = require("./crNetworkManager");
 var network = _interopRequireWildcard(require("../network"));
 var _browserContext = require("../browserContext");
 var _utils = require("../../utils");
-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 _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -78,6 +78,7 @@ class CRServiceWorker extends _page.Worker {
       headers: (0, _utils.headersArrayToObject)(headers, false /* lowerCase */)
     });
   }
+
   updateRequestInterception() {
     if (!this._networkManager || !this._isNetworkInspectionEnabled()) return Promise.resolve();
     return this._networkManager.setRequestInterception(this.needsRequestInterception()).catch(e => {});

package/lib/server/debugController.js

@@ -160,6 +160,8 @@ class DebugController extends _instrumentation.SdkObject {
         pageCount += context.pages().length;
       }
     }
+    // TODO: browsers is deprecated, remove it.
+    this.emit(DebugController.Events.BrowsersChanged, browsers);
     this.emit(DebugController.Events.StateChanged, {
       pageCount
     });
@@ -187,6 +189,7 @@ class DebugController extends _instrumentation.SdkObject {
 }
 exports.DebugController = DebugController;
 DebugController.Events = {
+  BrowsersChanged: 'browsersChanged',
   StateChanged: 'stateChanged',
   InspectRequested: 'inspectRequested',
   SourceChanged: 'sourceChanged',