@skrillex1224/playwright-toolkit 2.1.257 → 2.1.259

package/dist/index.js

@@ -2275,7 +2275,7 @@ async function createApifyKit() {
             options
           }
         );
-        await Actor2.fail(`Run Step ${step} \u5931\u8D25 (\u5DF2\u91CD\u8BD5 ${retryTimes} \u6B21): ${finalError.message}`);
+        await Actor2.fail(`Run Step ${step} \u5931\u8D25 (\u5DF2\u91CD\u8BD5 ${retryTimes} \u6B21): ${finalError.message} | url: ${page.url()}`);
       } else {
         throw finalError;
       }
@@ -2473,7 +2473,8 @@ function buildFingerprintOptions({ locale = BASE_CONFIG.locale, browserMajorVers
     browsers: browserDescriptor,
     devices: [resolvedDevice],
     operatingSystems: resolvedDevice === Device.Mobile ? ["android"] : ["windows", "macos", "linux"],
-    locales: [locale]
+    locales: [locale],
+    strict: true
   };
   if (resolvedDevice === Device.Mobile) {
     options.screen = {
@@ -4527,7 +4528,7 @@ var resolveProxyLaunchOptions = (proxyConfiguration = {}) => {
   return { byPassDomains, enableProxy, proxyUrl };
 };
 var parseChromeMajorVersion = (rawValue = "") => {
-  const match = String(rawValue || "").match(/Chrome\/(\d+)/i);
+  const match = String(rawValue || "").match(/(?:Chrome|Chromium)(?:\/|\s+(?:for Testing\s+)?)(\d+)/i);
   return match ? Number(match[1] || 0) : 0;
 };
 var resolveLauncherExecutablePath = (launcher) => {
@@ -4576,6 +4577,36 @@ var buildFingerprintGenerator = ({ locale, browserMajorVersion, device }) => {
     })
   );
 };
+var generateFingerprintForCore = ({ locale, browserMajorVersion, device }) => {
+  const requestedBrowserMajorVersion = Number(browserMajorVersion || 0);
+  const generator = buildFingerprintGenerator({
+    locale,
+    browserMajorVersion: requestedBrowserMajorVersion,
+    device
+  });
+  try {
+    return {
+      fingerprint: generator.getFingerprint(),
+      exactBrowserMajorVersion: requestedBrowserMajorVersion > 0
+    };
+  } catch (error) {
+    if (requestedBrowserMajorVersion <= 0) {
+      throw error;
+    }
+    logger8.warn(
+      `\u5F53\u524D\u6D4F\u89C8\u5668\u5927\u7248\u672C ${requestedBrowserMajorVersion} \u65E0\u53EF\u7528 strict \u6307\u7EB9\u6837\u672C\uFF0C\u9000\u56DE\u4E0D\u7ED1\u5B9A\u5927\u7248\u672C\u751F\u6210: ${error?.message || error}`
+    );
+  }
+  const fallbackGenerator = buildFingerprintGenerator({
+    locale,
+    browserMajorVersion: 0,
+    device
+  });
+  return {
+    fingerprint: fallbackGenerator.getFingerprint(),
+    exactBrowserMajorVersion: false
+  };
+};
 var buildReplayableBrowserProfile = (runtimeState, launcher) => {
   const device = resolveRuntimeDevice(runtimeState);
   if (!runtimeState || !RuntimeEnv.hasLoginState(runtimeState)) {
@@ -4591,12 +4622,12 @@ var buildReplayableBrowserProfile = (runtimeState, launcher) => {
   const needsDeviceRebuild = storedDevice ? storedDevice !== device : device === Device.Mobile;
   const needsRebuild = !browserProfileCore?.fingerprint || Object.keys(browserProfileCore.fingerprint || {}).length === 0 || needsDeviceRebuild || currentBrowserMajorVersion > 0 && storedBrowserMajorVersion > 0 && storedBrowserMajorVersion !== currentBrowserMajorVersion;
   if (needsRebuild) {
-    const generator = buildFingerprintGenerator({
+    const generated = generateFingerprintForCore({
       locale,
       browserMajorVersion: currentBrowserMajorVersion,
       device
     });
-    const fingerprint = generator.getFingerprint();
+    const fingerprint = generated.fingerprint;
     const fingerprintBrowserMajorVersion = parseChromeMajorVersion(fingerprint?.fingerprint?.navigator?.userAgent || "");
     browserProfileCore = {
       fingerprint,
@@ -4608,7 +4639,7 @@ var buildReplayableBrowserProfile = (runtimeState, launcher) => {
     };
     nextState = RuntimeEnv.setBrowserProfileCore(nextState, browserProfileCore);
     logger8.info(
-      `\u5DF2\u751F\u6210\u6D4F\u89C8\u5668\u6307\u7EB9\u771F\u6E90 | env=${String(nextState.envId || "-")} | device=${device} | version=${browserProfileCore.browser_major_version || "-"} | timezone=${timezoneId}`
+      `\u5DF2\u751F\u6210\u6D4F\u89C8\u5668\u6307\u7EB9\u771F\u6E90 | env=${String(nextState.envId || "-")} | device=${device} | version=${browserProfileCore.browser_major_version || "-"} | fingerprintVersion=${fingerprintBrowserMajorVersion || "-"} | exactVersion=${generated.exactBrowserMajorVersion ? "true" : "false"} | timezone=${timezoneId}`
     );
     return { runtimeState: nextState, browserProfileCore };
   }
@@ -4630,33 +4661,36 @@ var buildReplayableBrowserProfile = (runtimeState, launcher) => {
     browserProfileCore: normalizedBrowserProfileCore
   };
 };
-var applyDevicePageOptions = (pageOptions = {}, { device = Device.Desktop, fingerprint = null } = {}) => {
+var applyFingerprintPageOptions = (pageOptions = {}, { fingerprintWithHeaders = null, locale = "", timezoneId = "" } = {}) => {
   if (!pageOptions || typeof pageOptions !== "object") return;
-  const resolvedDevice = normalizeDevice(device);
+  const fingerprint = fingerprintWithHeaders?.fingerprint || fingerprintWithHeaders;
+  if (!fingerprint || typeof fingerprint !== "object") return;
   const screen = fingerprint?.screen || {};
+  const navigatorFingerprint = fingerprint?.navigator || {};
+  const headers = fingerprintWithHeaders?.headers || {};
+  const userAgent = String(navigatorFingerprint.userAgent || headers["user-agent"] || "").trim();
+  const width = Number(screen.width || 0);
+  const height = Number(screen.height || 0);
   const dpr = Number(screen.devicePixelRatio || 0);
-  if (resolvedDevice === Device.Mobile) {
-    pageOptions.isMobile = true;
-    pageOptions.hasTouch = true;
-    pageOptions.deviceScaleFactor = dpr > 0 ? dpr : 2;
-    if (!pageOptions.viewport) {
-      pageOptions.viewport = {
-        width: Number(screen.width || 390),
-        height: Number(screen.height || 844)
-      };
-    }
-    if (!pageOptions.screen) {
-      pageOptions.screen = {
-        width: Number(screen.width || pageOptions.viewport.width || 390),
-        height: Number(screen.height || pageOptions.viewport.height || 844)
-      };
-    }
-    return;
+  const maxTouchPoints = Number(navigatorFingerprint.maxTouchPoints || 0);
+  const isMobile = navigatorFingerprint.userAgentData?.mobile === true || headers["sec-ch-ua-mobile"] === "?1" || /Mobile|Android/i.test(userAgent);
+  if (userAgent) {
+    pageOptions.userAgent = userAgent;
+  }
+  if (width > 0 && height > 0) {
+    pageOptions.viewport = { width, height };
+    pageOptions.screen = { width, height };
   }
-  pageOptions.isMobile = false;
-  pageOptions.hasTouch = false;
-  if (!pageOptions.deviceScaleFactor) {
-    pageOptions.deviceScaleFactor = dpr > 0 ? dpr : 1;
+  pageOptions.isMobile = isMobile;
+  pageOptions.hasTouch = maxTouchPoints > 0;
+  if (dpr > 0) {
+    pageOptions.deviceScaleFactor = dpr;
+  }
+  if (locale) {
+    pageOptions.locale = locale;
+  }
+  if (timezoneId) {
+    pageOptions.timezoneId = timezoneId;
   }
 };
 var buildReplayBrowserPoolOptions = (browserProfileCore) => {
@@ -4670,30 +4704,10 @@ var buildReplayBrowserPoolOptions = (browserProfileCore) => {
     prePageCreateHooks: [
       (_pageId, _browserController, pageOptions = {}) => {
         if (!pageOptions || typeof pageOptions !== "object") return;
-        const screen = fingerprint.screen || {};
-        const userAgent = String(fingerprint.navigator?.userAgent || "").trim();
-        if (userAgent) {
-          pageOptions.userAgent = userAgent;
-        }
-        if (Number(screen.width || 0) > 0 && Number(screen.height || 0) > 0) {
-          pageOptions.viewport = {
-            width: Number(screen.width),
-            height: Number(screen.height)
-          };
-          pageOptions.screen = {
-            width: Number(screen.width),
-            height: Number(screen.height)
-          };
-        }
-        if (browserProfileCore.locale) {
-          pageOptions.locale = browserProfileCore.locale;
-        }
-        if (browserProfileCore.timezone_id) {
-          pageOptions.timezoneId = browserProfileCore.timezone_id;
-        }
-        applyDevicePageOptions(pageOptions, {
-          device: browserProfileCore.device,
-          fingerprint
+        applyFingerprintPageOptions(pageOptions, {
+          fingerprintWithHeaders,
+          locale: browserProfileCore.locale,
+          timezoneId: browserProfileCore.timezone_id
         });
       }
     ],
@@ -4811,15 +4825,14 @@ var Launch = {
           })
         },
         prePageCreateHooks: [
-          (_pageId, _browserController, pageOptions = {}) => {
-            applyDevicePageOptions(pageOptions, { device });
-            if (launchLocale) {
-              pageOptions.locale = launchLocale;
-            }
+          (_pageId, browserController, pageOptions = {}) => {
+            const fingerprintWithHeaders = browserController?.launchContext?.fingerprint;
             const timezoneId = AntiCheat.getBaseConfig().timezoneId;
-            if (timezoneId) {
-              pageOptions.timezoneId = timezoneId;
-            }
+            applyFingerprintPageOptions(pageOptions, {
+              fingerprintWithHeaders,
+              locale: launchLocale,
+              timezoneId
+            });
           }
         ]
       },