patchright-bun-core 1.58.2 → 1.59.0

package/lib/utils/isomorphic/trace/traceModel.js

@@ -27,7 +27,7 @@ __export(traceModel_exports, {
   stats: () => stats
 });
 module.exports = __toCommonJS(traceModel_exports);
-var import_protocolFormatter = require("@isomorphic/protocolFormatter");
+var import_protocolFormatter = require("../protocolFormatter");
 const contextSymbol = Symbol("context");
 const nextInContextSymbol = Symbol("nextInContext");
 const prevByEndTimeSymbol = Symbol("prevByEndTime");
@@ -46,6 +46,7 @@ class TraceModel {
     this.playwrightVersion = contexts.find((c) => c.playwrightVersion)?.playwrightVersion;
     this.title = libraryContext?.title || "";
     this.options = libraryContext?.options || {};
+    this.testTimeout = contexts.find((c) => c.origin === "testRunner")?.testTimeout;
     this.actions = mergeActionsAndUpdateTiming(contexts);
     this.pages = [].concat(...contexts.map((c) => c.pages));
     this.wallTime = contexts.map((c) => c.wallTime).reduce((prev, cur) => Math.min(prev || Number.MAX_VALUE, cur), Number.MAX_VALUE);
@@ -56,7 +57,7 @@ class TraceModel {
     this.errors = [].concat(...contexts.map((c) => c.errors));
     this.hasSource = contexts.some((c) => c.hasSource);
     this.hasStepData = contexts.some((context2) => context2.origin === "testRunner");
-    this.resources = [...contexts.map((c) => c.resources)].flat();
+    this.resources = [...contexts.map((c) => c.resources)].flat().map((entry) => ({ ...entry, id: `${entry.pageref}-${entry.time}-${entry.request.url}` }));
     this.attachments = this.actions.flatMap((action) => action.attachments?.map((attachment) => ({ ...attachment, callId: action.callId, traceUri })) ?? []);
     this.visibleAttachments = this.attachments.filter((attachment) => !attachment.name.startsWith("_"));
     this.events.sort((a1, a2) => a1.time - a2.time);

package/lib/utils/isomorphic/trace/traceModernizer.js

@@ -83,6 +83,7 @@ class TraceModernizer {
         contextEntry.options = event.options;
         contextEntry.testIdAttributeName = event.testIdAttributeName;
         contextEntry.contextId = event.contextId ?? "";
+        contextEntry.testTimeout = event.testTimeout;
         break;
       }
       case "screencast-frame": {

package/lib/utils/isomorphic/urlMatch.js

@@ -19,8 +19,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var urlMatch_exports = {};
 __export(urlMatch_exports, {
   constructURLBasedOnBaseURL: () => constructURLBasedOnBaseURL,
+  deserializeURLMatch: () => deserializeURLMatch,
   globToRegexPattern: () => globToRegexPattern,
+  isURLPattern: () => isURLPattern,
   resolveGlobToRegexPattern: () => resolveGlobToRegexPattern,
+  serializeURLMatch: () => serializeURLMatch,
+  serializeURLPattern: () => serializeURLPattern,
   urlMatches: () => urlMatches,
   urlMatchesEqual: () => urlMatchesEqual
 });
@@ -86,6 +90,49 @@ function globToRegexPattern(glob) {
 function isRegExp(obj) {
   return obj instanceof RegExp || Object.prototype.toString.call(obj) === "[object RegExp]";
 }
+const isURLPattern = (v) => typeof globalThis.URLPattern === "function" && v instanceof globalThis.URLPattern;
+function serializeURLPattern(v) {
+  return {
+    hash: v.hash,
+    hostname: v.hostname,
+    password: v.password,
+    pathname: v.pathname,
+    port: v.port,
+    protocol: v.protocol,
+    search: v.search,
+    username: v.username
+  };
+}
+function serializeURLMatch(match) {
+  if ((0, import_stringUtils.isString)(match))
+    return { glob: match };
+  if (isRegExp(match))
+    return { regexSource: match.source, regexFlags: match.flags };
+  if (isURLPattern(match))
+    return { urlPattern: serializeURLPattern(match) };
+  return void 0;
+}
+function deserializeURLPattern(v) {
+  if (typeof globalThis.URLPattern !== "function")
+    return () => true;
+  return new globalThis.URLPattern({
+    hash: v.hash,
+    hostname: v.hostname,
+    password: v.password,
+    pathname: v.pathname,
+    port: v.port,
+    protocol: v.protocol,
+    search: v.search,
+    username: v.username
+  });
+}
+function deserializeURLMatch(match) {
+  if (match.regexSource)
+    return new RegExp(match.regexSource, match.regexFlags);
+  if (match.urlPattern)
+    return deserializeURLPattern(match.urlPattern);
+  return match.glob;
+}
 function urlMatchesEqual(match1, match2) {
   if (isRegExp(match1) && isRegExp(match2))
     return match1.source === match2.source && match1.flags === match2.flags;
@@ -103,8 +150,10 @@ function urlMatches(baseURL, urlString, match, webSocketUrl) {
   const url = parseURL(urlString);
   if (!url)
     return false;
+  if (isURLPattern(match))
+    return match.test(url.href);
   if (typeof match !== "function")
-    throw new Error("url parameter should be string, RegExp or function");
+    throw new Error("url parameter should be string, RegExp, URLPattern or function");
   return match(url);
 }
 function resolveGlobToRegexPattern(baseURL, glob, webSocketUrl) {
@@ -183,8 +232,12 @@ function resolveBaseURL(baseURL, givenURL) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   constructURLBasedOnBaseURL,
+  deserializeURLMatch,
   globToRegexPattern,
+  isURLPattern,
   resolveGlobToRegexPattern,
+  serializeURLMatch,
+  serializeURLPattern,
   urlMatches,
   urlMatchesEqual
 });

package/lib/utils/isomorphic/utilityScriptSerializers.js

@@ -57,6 +57,13 @@ function isTypedArray(obj, constructor) {
     return false;
   }
 }
+function isArrayBuffer(obj) {
+  try {
+    return obj instanceof ArrayBuffer || Object.prototype.toString.call(obj) === "[object ArrayBuffer]";
+  } catch (error) {
+    return false;
+  }
+}
 const typedArrayConstructors = {
   i8: Int8Array,
   ui8: Uint8Array,
@@ -141,6 +148,8 @@ function parseEvaluationResultValue(value, handles = [], refs = /* @__PURE__ */
       return handles[value.h];
     if ("ta" in value)
       return base64ToTypedArray(value.ta.b, typedArrayConstructors[value.ta.k]);
+    if ("ab" in value)
+      return base64ToTypedArray(value.ab.b, Uint8Array).buffer;
   }
   return value;
 }
@@ -206,6 +215,8 @@ ${value.stack}`;
     if (isTypedArray(value, ctor))
       return { ta: { b: typedArrayToBase64(value), k } };
   }
+  if (isArrayBuffer(value))
+    return { ab: { b: typedArrayToBase64(new Uint8Array(value)) } };
   const id = visitorInfo.visited.get(value);
   if (id)
     return { ref: id };

package/lib/utils.js

@@ -26,6 +26,8 @@ __reExport(utils_exports, require("./utils/isomorphic/ariaSnapshot"), module.exp
 __reExport(utils_exports, require("./utils/isomorphic/assert"), module.exports);
 __reExport(utils_exports, require("./utils/isomorphic/colors"), module.exports);
 __reExport(utils_exports, require("./utils/isomorphic/headers"), module.exports);
+__reExport(utils_exports, require("./utils/isomorphic/imageUtils"), module.exports);
+__reExport(utils_exports, require("./utils/isomorphic/jsonSchema"), module.exports);
 __reExport(utils_exports, require("./utils/isomorphic/locatorGenerators"), module.exports);
 __reExport(utils_exports, require("./utils/isomorphic/manualPromise"), module.exports);
 __reExport(utils_exports, require("./utils/isomorphic/mimeType"), module.exports);
@@ -36,6 +38,7 @@ __reExport(utils_exports, require("./utils/isomorphic/rtti"), module.exports);
 __reExport(utils_exports, require("./utils/isomorphic/semaphore"), module.exports);
 __reExport(utils_exports, require("./utils/isomorphic/stackTrace"), module.exports);
 __reExport(utils_exports, require("./utils/isomorphic/stringUtils"), module.exports);
+__reExport(utils_exports, require("./utils/isomorphic/formatUtils"), module.exports);
 __reExport(utils_exports, require("./utils/isomorphic/time"), module.exports);
 __reExport(utils_exports, require("./utils/isomorphic/timeoutRunner"), module.exports);
 __reExport(utils_exports, require("./utils/isomorphic/urlMatch"), module.exports);
@@ -51,7 +54,6 @@ __reExport(utils_exports, require("./server/utils/expectUtils"), module.exports)
 __reExport(utils_exports, require("./server/utils/fileUtils"), module.exports);
 __reExport(utils_exports, require("./server/utils/hostPlatform"), module.exports);
 __reExport(utils_exports, require("./server/utils/httpServer"), module.exports);
-__reExport(utils_exports, require("./server/utils/imageUtils"), module.exports);
 __reExport(utils_exports, require("./server/utils/network"), module.exports);
 __reExport(utils_exports, require("./server/utils/nodePlatform"), module.exports);
 __reExport(utils_exports, require("./server/utils/processLauncher"), module.exports);
@@ -71,6 +73,8 @@ var import_utilsBundle = require("./utilsBundle");
   ...require("./utils/isomorphic/assert"),
   ...require("./utils/isomorphic/colors"),
   ...require("./utils/isomorphic/headers"),
+  ...require("./utils/isomorphic/imageUtils"),
+  ...require("./utils/isomorphic/jsonSchema"),
   ...require("./utils/isomorphic/locatorGenerators"),
   ...require("./utils/isomorphic/manualPromise"),
   ...require("./utils/isomorphic/mimeType"),
@@ -81,6 +85,7 @@ var import_utilsBundle = require("./utilsBundle");
   ...require("./utils/isomorphic/semaphore"),
   ...require("./utils/isomorphic/stackTrace"),
   ...require("./utils/isomorphic/stringUtils"),
+  ...require("./utils/isomorphic/formatUtils"),
   ...require("./utils/isomorphic/time"),
   ...require("./utils/isomorphic/timeoutRunner"),
   ...require("./utils/isomorphic/urlMatch"),
@@ -96,7 +101,6 @@ var import_utilsBundle = require("./utilsBundle");
   ...require("./server/utils/fileUtils"),
   ...require("./server/utils/hostPlatform"),
   ...require("./server/utils/httpServer"),
-  ...require("./server/utils/imageUtils"),
   ...require("./server/utils/network"),
   ...require("./server/utils/nodePlatform"),
   ...require("./server/utils/processLauncher"),

package/lib/utilsBundle.js

@@ -27,11 +27,11 @@ __export(utilsBundle_exports, {
   diff: () => diff,
   dotenv: () => dotenv,
   getProxyForUrl: () => getProxyForUrl,
+  ini: () => ini,
   jpegjs: () => jpegjs,
   lockfile: () => lockfile,
   mime: () => mime,
   minimatch: () => minimatch,
-  ms: () => ms,
   open: () => open,
   program: () => program,
   progress: () => progress,
@@ -46,6 +46,7 @@ const colors = require("./utilsBundleImpl").colors;
 const debug = require("./utilsBundleImpl").debug;
 const diff = require("./utilsBundleImpl").diff;
 const dotenv = require("./utilsBundleImpl").dotenv;
+const ini = require("./utilsBundleImpl").ini;
 const getProxyForUrl = require("./utilsBundleImpl").getProxyForUrl;
 const HttpsProxyAgent = require("./utilsBundleImpl").HttpsProxyAgent;
 const jpegjs = require("./utilsBundleImpl").jpegjs;
@@ -63,25 +64,6 @@ const wsServer = require("./utilsBundleImpl").wsServer;
 const wsReceiver = require("./utilsBundleImpl").wsReceiver;
 const wsSender = require("./utilsBundleImpl").wsSender;
 const yaml = require("./utilsBundleImpl").yaml;
-function ms(ms2) {
-  if (!isFinite(ms2))
-    return "-";
-  if (ms2 === 0)
-    return "0ms";
-  if (ms2 < 1e3)
-    return ms2.toFixed(0) + "ms";
-  const seconds = ms2 / 1e3;
-  if (seconds < 60)
-    return seconds.toFixed(1) + "s";
-  const minutes = seconds / 60;
-  if (minutes < 60)
-    return minutes.toFixed(1) + "m";
-  const hours = minutes / 60;
-  if (hours < 24)
-    return hours.toFixed(1) + "h";
-  const days = hours / 24;
-  return days.toFixed(1) + "d";
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   HttpsProxyAgent,
@@ -93,11 +75,11 @@ function ms(ms2) {
   diff,
   dotenv,
   getProxyForUrl,
+  ini,
   jpegjs,
   lockfile,
   mime,
   minimatch,
-  ms,
   open,
   program,
   progress,