@checkly/playwright-core 1.51.17-beta.2 → 1.54.2-beta.0

package/lib/browserServerImpl.js

@@ -1,73 +1,92 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var browserServerImpl_exports = {};
+__export(browserServerImpl_exports, {
+  BrowserServerLauncherImpl: () => BrowserServerLauncherImpl
 });
-exports.BrowserServerLauncherImpl = void 0;
-var _socksProxy = require("./server/utils/socksProxy");
-var _playwrightServer = require("./remote/playwrightServer");
-var _helper = require("./server/helper");
-var _instrumentation = require("./server/instrumentation");
-var _playwright = require("./server/playwright");
-var _crypto = require("./server/utils/crypto");
-var _stackTrace = require("./utils/isomorphic/stackTrace");
-var _utilsBundle = require("./utilsBundle");
-/**
- * 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.
- */
-
+module.exports = __toCommonJS(browserServerImpl_exports);
+var import_playwrightServer = require("./remote/playwrightServer");
+var import_helper = require("./server/helper");
+var import_instrumentation = require("./server/instrumentation");
+var import_playwright = require("./server/playwright");
+var import_crypto = require("./server/utils/crypto");
+var import_debug = require("./server/utils/debug");
+var import_stackTrace = require("./utils/isomorphic/stackTrace");
+var import_time = require("./utils/isomorphic/time");
+var import_utilsBundle = require("./utilsBundle");
+var validatorPrimitives = __toESM(require("./protocol/validatorPrimitives"));
+var import_progress = require("./server/progress");
 class BrowserServerLauncherImpl {
   constructor(browserName) {
-    this._browserName = void 0;
     this._browserName = browserName;
   }
   async launchServer(options = {}) {
-    const playwright = (0, _playwright.createPlaywright)({
-      sdkLanguage: 'javascript',
-      isServer: true
-    });
-    // TODO: enable socks proxy once ipv6 is supported.
-    const socksProxy = false ? new _socksProxy.SocksProxy() : undefined;
-    playwright.options.socksProxyPort = await (socksProxy === null || socksProxy === void 0 ? void 0 : socksProxy.listen(0));
-
-    // 1. Pre-launch the browser
-    const metadata = (0, _instrumentation.serverSideCallMetadata)();
-    const browser = await playwright[this._browserName].launch(metadata, {
+    const playwright = (0, import_playwright.createPlaywright)({ sdkLanguage: "javascript", isServer: true });
+    const metadata = (0, import_instrumentation.serverSideCallMetadata)();
+    const validatorContext = {
+      tChannelImpl: (names, arg, path2) => {
+        throw new validatorPrimitives.ValidationError(`${path2}: channels are not expected in launchServer`);
+      },
+      binary: "buffer",
+      isUnderTest: import_debug.isUnderTest
+    };
+    let launchOptions = {
       ...options,
-      ignoreDefaultArgs: Array.isArray(options.ignoreDefaultArgs) ? options.ignoreDefaultArgs : undefined,
+      ignoreDefaultArgs: Array.isArray(options.ignoreDefaultArgs) ? options.ignoreDefaultArgs : void 0,
       ignoreAllDefaultArgs: !!options.ignoreDefaultArgs && !Array.isArray(options.ignoreDefaultArgs),
-      env: options.env ? envObjectToArray(options.env) : undefined
-    }, toProtocolLogger(options.logger)).catch(e => {
-      const log = _helper.helper.formatBrowserLogs(metadata.log);
-      (0, _stackTrace.rewriteErrorMessage)(e, `${e.message} Failed to launch browser.${log}`);
+      env: options.env ? envObjectToArray(options.env) : void 0,
+      timeout: options.timeout ?? import_time.DEFAULT_PLAYWRIGHT_LAUNCH_TIMEOUT
+    };
+    let browser;
+    try {
+      const controller = new import_progress.ProgressController(metadata, playwright[this._browserName]);
+      browser = await controller.run(async (progress) => {
+        if (options._userDataDir !== void 0) {
+          const validator = validatorPrimitives.scheme["BrowserTypeLaunchPersistentContextParams"];
+          launchOptions = validator({ ...launchOptions, userDataDir: options._userDataDir }, "", validatorContext);
+          const context = await playwright[this._browserName].launchPersistentContext(progress, options._userDataDir, launchOptions);
+          return context._browser;
+        } else {
+          const validator = validatorPrimitives.scheme["BrowserTypeLaunchParams"];
+          launchOptions = validator(launchOptions, "", validatorContext);
+          return await playwright[this._browserName].launch(progress, launchOptions, toProtocolLogger(options.logger));
+        }
+      });
+    } catch (e) {
+      const log = import_helper.helper.formatBrowserLogs(metadata.log);
+      (0, import_stackTrace.rewriteErrorMessage)(e, `${e.message} Failed to launch browser.${log}`);
       throw e;
-    });
-    const path = options.wsPath ? options.wsPath.startsWith('/') ? options.wsPath : `/${options.wsPath}` : `/${(0, _crypto.createGuid)()}`;
-
-    // 2. Start the server
-    const server = new _playwrightServer.PlaywrightServer({
-      mode: 'launchServer',
-      path,
-      maxConnections: Infinity,
-      preLaunchedBrowser: browser,
-      preLaunchedSocksProxy: socksProxy
-    });
+    }
+    const path = options.wsPath ? options.wsPath.startsWith("/") ? options.wsPath : `/${options.wsPath}` : `/${(0, import_crypto.createGuid)()}`;
+    const server = new import_playwrightServer.PlaywrightServer({ mode: options._sharedBrowser ? "launchServerShared" : "launchServer", path, maxConnections: Infinity, preLaunchedBrowser: browser });
     const wsEndpoint = await server.listen(options.port, options.host);
-
-    // 3. Return the BrowserServer interface
-    const browserServer = new _utilsBundle.ws.EventEmitter();
+    const browserServer = new import_utilsBundle.ws.EventEmitter();
     browserServer.process = () => browser.options.browserProcess.process;
     browserServer.wsEndpoint = () => wsEndpoint;
     browserServer.close = () => browser.options.browserProcess.close();
@@ -76,26 +95,27 @@ class BrowserServerLauncherImpl {
     browserServer._disconnectForTest = () => server.close();
     browserServer._userDataDirForTest = browser._userDataDirForTest;
     browser.options.browserProcess.onclose = (exitCode, signal) => {
-      socksProxy === null || socksProxy === void 0 || socksProxy.close().catch(() => {});
       server.close();
-      browserServer.emit('close', exitCode, signal);
+      browserServer.emit("close", exitCode, signal);
     };
     return browserServer;
   }
 }
-exports.BrowserServerLauncherImpl = BrowserServerLauncherImpl;
 function toProtocolLogger(logger) {
   return logger ? (direction, message) => {
-    if (logger.isEnabled('protocol', 'verbose')) logger.log('protocol', 'verbose', (direction === 'send' ? 'SEND ► ' : '◀ RECV ') + JSON.stringify(message), [], {});
-  } : undefined;
+    if (logger.isEnabled("protocol", "verbose"))
+      logger.log("protocol", "verbose", (direction === "send" ? "SEND \u25BA " : "\u25C0 RECV ") + JSON.stringify(message), [], {});
+  } : void 0;
 }
 function envObjectToArray(env) {
   const result = [];
   for (const name in env) {
-    if (!Object.is(env[name], undefined)) result.push({
-      name,
-      value: String(env[name])
-    });
+    if (!Object.is(env[name], void 0))
+      result.push({ name, value: String(env[name]) });
   }
   return result;
-}
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BrowserServerLauncherImpl
+});

package/lib/checkly/escapeRegExp.js

@@ -1,33 +1,29 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var escapeRegExp_exports = {};
+__export(escapeRegExp_exports, {
+  default: () => escapeRegExp_default
 });
-exports.default = void 0;
-/**
- * Copyright (c) 2009-2020 Lodash.
- * Taken from: https://github.com/lodash/lodash/blob/main/src/escapeRegExp.ts
- * Used to match `RegExp`
- * [syntax characters](http://ecma-international.org/ecma-262/7.0/#sec-patterns).
- */
+module.exports = __toCommonJS(escapeRegExp_exports);
 const reRegExpChar = /[\\^$.*+?()[\]{}|]/g;
 const reHasRegExpChar = RegExp(reRegExpChar.source);
-
-/**
- * Escapes the `RegExp` special characters "^", "$", "\", ".", "*", "+",
- * "?", "(", ")", "[", "]", "{", "}", and "|" in `string`.
- *
- * @since 3.0.0
- * @category String
- * @param {string} [string=''] The string to escape.
- * @returns {string} Returns the escaped string.
- * @see escape, escapeRegExp, unescape
- * @example
- *
- * escapeRegExp('[lodash](https://lodash.com/)')
- * // => '\[lodash\]\(https://lodash\.com/\)'
- */
 function escapeRegExp(string) {
-  return string && reHasRegExpChar.test(string) ? string.replace(reRegExpChar, '\\$&') : string || '';
+  return string && reHasRegExpChar.test(string) ? string.replace(reRegExpChar, "\\$&") : string || "";
 }
-var _default = exports.default = escapeRegExp;
+var escapeRegExp_default = escapeRegExp;

package/lib/checkly/fetch.js

@@ -1,17 +1,36 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var fetch_exports = {};
+__export(fetch_exports, {
+  addRequestListeners: () => addRequestListeners,
+  getBody: () => getBody,
+  getClientCertificates: () => getClientCertificates,
+  getRequestBody: () => getRequestBody,
+  getRequestHeaders: () => getRequestHeaders,
+  getTimings: () => getTimings,
+  initializeTimings: () => initializeTimings,
+  parseQueryParameters: () => parseQueryParameters,
+  setSWatcherCurrentStepData: () => setSWatcherCurrentStepData
 });
-exports.setSWatcherCurrentStepData = exports.parseQueryParameters = exports.initializeTimings = exports.getTimings = exports.getRequestHeaders = exports.getRequestBody = exports.getClientCertificates = exports.getBody = exports.addRequestListeners = void 0;
-var _utils = require("../utils");
-/**
- * Get client custom certificates.
- *
- * @param {Object} options
- * @returns Object
- */
-const getClientCertificates = options => {
+module.exports = __toCommonJS(fetch_exports);
+var import_utils = require("../utils");
+const getClientCertificates = (options) => {
   if (!options.certs) return {};
   return {
     cert: options.cert,
@@ -20,68 +39,56 @@ const getClientCertificates = options => {
     ca: options.ca
   };
 };
-exports.getClientCertificates = getClientCertificates;
 const setSWatcherCurrentStepData = (sWatcher, result) => {
   if (!sWatcher) return;
   sWatcher.appendCurrentStepData({
     ...result.response,
-    checklyStepCategory: 'api-call'
+    checklyStepCategory: "api-call"
   });
 };
-exports.setSWatcherCurrentStepData = setSWatcherCurrentStepData;
-const getRequestHeaders = headers => {
+const getRequestHeaders = (headers) => {
   return Object.entries(headers).map(([key, value]) => {
     return {
       name: key,
-      value: value
+      value
     };
   });
 };
-exports.getRequestHeaders = getRequestHeaders;
 const getRequestBody = (postData, multipartData, options) => {
   const requestBody = {};
   if (postData) {
     requestBody.data = getBody(postData);
   } else if (multipartData && multipartData.length > 0) {
-    requestBody.multipart = multipartData.map(field => {
-      var _field$file, _field$file2, _field$file3;
-      const multiPartBuffer = getBody(((_field$file = field.file) === null || _field$file === void 0 ? void 0 : _field$file.buffer) || Buffer.from(''));
+    requestBody.multipart = multipartData.map((field) => {
+      const multiPartBuffer = getBody(field.file?.buffer || Buffer.from(""));
       return {
         name: field.name,
         value: field.value,
         file: {
-          name: (_field$file2 = field.file) === null || _field$file2 === void 0 ? void 0 : _field$file2.name,
-          mimeType: (_field$file3 = field.file) === null || _field$file3 === void 0 ? void 0 : _field$file3.mimeType,
+          name: field.file?.name,
+          mimeType: field.file?.mimeType,
           buffer: multiPartBuffer
         }
       };
     });
   }
   for (const [key, value] of Object.entries(options)) {
-    if (key !== 'headers' && key !== 'method') {
+    if (key !== "headers" && key !== "method") {
       requestBody[key] = value;
     }
   }
   return requestBody;
 };
-exports.getRequestBody = getRequestBody;
-const parseQueryParameters = url => {
+const parseQueryParameters = (url) => {
   const searchParams = new URL(url).searchParams;
   const parameters = [];
   for (const [name, value] of searchParams.entries()) {
-    parameters.push({
-      name,
-      value
-    });
+    parameters.push({ name, value });
   }
   return parameters;
 };
-exports.parseQueryParameters = parseQueryParameters;
-const getTimings = eventTimes => {
-  const {
-    agent,
-    values
-  } = eventTimes;
+const getTimings = (eventTimes) => {
+  const { agent, values } = eventTimes;
   const end = performance.now() - values.startTimeNow;
   const socket = values.socket || 0;
   const lookup = values.lookup || socket;
@@ -96,18 +103,15 @@ const getTimings = eventTimes => {
     total: end
   };
 };
-exports.getTimings = getTimings;
-const getBody = body => {
-  const responseBodySizeLimit = 100000;
-  //@ts-ignore
-  const bodyAsText = Buffer.byteLength(body, 'utf-8') > responseBodySizeLimit ? body.slice(0, responseBodySizeLimit).toString('utf8') + '...' : body.toString('utf8');
+const getBody = (body) => {
+  const responseBodySizeLimit = 1e5;
+  const bodyAsText = Buffer.byteLength(body, "utf-8") > responseBodySizeLimit ? body.slice(0, responseBodySizeLimit).toString("utf8") + "..." : body.toString("utf8");
   try {
     return JSON.parse(bodyAsText);
   } catch {
     return bodyAsText;
   }
 };
-exports.getBody = getBody;
 const initializeTimings = () => {
   return {
     values: {
@@ -116,11 +120,25 @@ const initializeTimings = () => {
     agent: false
   };
 };
-exports.initializeTimings = initializeTimings;
 const addRequestListeners = (request, timings, listeners) => {
-  request.on('socket', socket => {
+  request.on("socket", (socket) => {
     timings.values.socket = performance.now() - timings.values.startTimeNow;
-    listeners.push(_utils.eventsHelper.addEventListener(socket, 'connect', () => timings.values.connect = performance.now() - timings.values.startTimeNow), _utils.eventsHelper.addEventListener(socket, 'lookup', () => timings.values.lookup = performance.now() - timings.values.startTimeNow), _utils.eventsHelper.addEventListener(socket, 'secureConnect', () => timings.values.tlsHandshake = performance.now() - timings.values.startTimeNow));
+    listeners.push(
+      import_utils.eventsHelper.addEventListener(socket, "connect", () => timings.values.connect = performance.now() - timings.values.startTimeNow),
+      import_utils.eventsHelper.addEventListener(socket, "lookup", () => timings.values.lookup = performance.now() - timings.values.startTimeNow),
+      import_utils.eventsHelper.addEventListener(socket, "secureConnect", () => timings.values.tlsHandshake = performance.now() - timings.values.startTimeNow)
+    );
   });
 };
-exports.addRequestListeners = addRequestListeners;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  addRequestListeners,
+  getBody,
+  getClientCertificates,
+  getRequestBody,
+  getRequestHeaders,
+  getTimings,
+  initializeTimings,
+  parseQueryParameters,
+  setSWatcherCurrentStepData
+});

package/lib/checkly/secretsFilter.js

@@ -1,50 +1,64 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var secretsFilter_exports = {};
+__export(secretsFilter_exports, {
+  secretsFilter: () => secretsFilter
 });
-exports.secretsFilter = void 0;
-var _escapeRegExp = _interopRequireDefault(require("./escapeRegExp"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/* Copyright Checkly
-*/
-
-const IdentityFunction = s => s;
-const disabled = process.env['CHECKLY_INTERNAL_ENABLE_PATCHED_TRACING'] !== 'true';
-// GitLeaks
-const gitLeaksKeys = process.env['CHECKLY_GITLEAKS_RULES'] || '[]';
-const gitLeaksKeyList = JSON.parse(gitLeaksKeys).map(rule => new RegExp(rule, 'gi'));
-const secretPlaceholder = '*********';
+module.exports = __toCommonJS(secretsFilter_exports);
+var import_escapeRegExp = __toESM(require("./escapeRegExp"));
+const IdentityFunction = (s) => s;
 const secretsFilter = () => {
-  if (disabled) return IdentityFunction;
-
-  // Cache for regex to avoid recompiling on every call
+  const disabled = process.env["CHECKLY_INTERNAL_ENABLE_PATCHED_TRACING"] !== "true";
+  if (disabled)
+    return IdentityFunction;
   let cachedRegex = null;
-  let cachedKeys = '';
-
-  // Regex to filter out console markers
+  let cachedKeys = "";
   const consoleMarkerRegex = /\[CHECKLY_RUNTIME_SECRET\].*?\[\/CHECKLY_RUNTIME_SECRET\]/g;
-  return s => {
-    const keys = process.env['CHECKLY_INTERNAL_REPLACE_TRACE_KEYS'] || '[]';
-
-    // Only recompile regex if keys have changed (handles runtime CHECKLY_SECRET_ variables)
+  return (s) => {
+    const keys = process.env["CHECKLY_INTERNAL_REPLACE_TRACE_KEYS"] || "[]";
     if (keys !== cachedKeys) {
       const keylist = JSON.parse(keys);
       if (keylist.length === 0) {
         cachedRegex = null;
       } else {
-        const escapedList = keylist.map(_escapeRegExp.default);
-        cachedRegex = new RegExp(escapedList.join('|'), 'g');
+        const escapedList = keylist.map(import_escapeRegExp.default);
+        cachedRegex = new RegExp(escapedList.join("|"), "g");
       }
       cachedKeys = keys;
     }
-
-    // First filter out console markers entirely
-    const filtered = s.replace(consoleMarkerRegex, '');
-    const gitLeaksFiltered = gitLeaksKeyList.reduce((memo, gitLeaksRule) => {
-      return memo.replaceAll(gitLeaksRule, secretPlaceholder);
-    }, filtered);
-    return cachedRegex ? gitLeaksFiltered.replaceAll(cachedRegex, secretPlaceholder) : gitLeaksFiltered;
+    let filtered = s.replace(consoleMarkerRegex, "");
+    if (cachedRegex)
+      filtered = filtered.replaceAll(cachedRegex, "*********");
+    return filtered;
   };
 };
-exports.secretsFilter = secretsFilter;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  secretsFilter
+});