@skrillex1224/playwright-toolkit 3.0.16 → 3.0.17

package/dist/index.cjs

@@ -1478,6 +1478,7 @@ var ProxyMeterRuntime = {
 
 // src/runtime-env.js
 var BROWSER_PROFILE_SCHEMA_VERSION = 1;
+var SUPPORTED_CLOAK_FINGERPRINT_PLATFORMS = /* @__PURE__ */ new Set(["linux", "macos", "windows"]);
 var rememberedRuntimeState = null;
 var isPlainObject = (value) => value && typeof value === "object" && !Array.isArray(value);
 var normalizeKnownDevice = (value) => {
@@ -1486,6 +1487,22 @@ var normalizeKnownDevice = (value) => {
   if (raw === Device.Desktop) return Device.Desktop;
   return "";
 };
+var normalizeCloakSeed = (value) => {
+  const numericSeed = Number(value);
+  if (Number.isSafeInteger(numericSeed) && numericSeed > 0) {
+    return numericSeed;
+  }
+  const raw = String(value || "").trim();
+  if (!/^\d+$/.test(raw)) {
+    return 0;
+  }
+  const parsedSeed = Number(raw);
+  return Number.isSafeInteger(parsedSeed) && parsedSeed > 0 ? parsedSeed : 0;
+};
+var normalizeCloakFingerprintPlatform = (value) => {
+  const raw = String(value || "").trim().toLowerCase();
+  return SUPPORTED_CLOAK_FINGERPRINT_PLATFORMS.has(raw) ? raw : "";
+};
 var deepClone = (value) => {
   if (value == null) return value;
   try {
@@ -1856,6 +1873,14 @@ var normalizeBrowserProfileCore = (value) => {
   if (Number.isFinite(browserMajorVersion) && browserMajorVersion > 0) {
     profile.browser_major_version = browserMajorVersion;
   }
+  const cloakSeed = normalizeCloakSeed(source.cloak_seed);
+  if (cloakSeed > 0) {
+    profile.cloak_seed = cloakSeed;
+  }
+  const cloakFingerprintPlatform = normalizeCloakFingerprintPlatform(source.cloak_fingerprint_platform);
+  if (cloakFingerprintPlatform) {
+    profile.cloak_fingerprint_platform = cloakFingerprintPlatform;
+  }
   const schemaVersion = Number(source.schema_version || 0);
   if (Number.isFinite(schemaVersion) && schemaVersion > 0) {
     profile.schema_version = schemaVersion;
@@ -5109,6 +5134,7 @@ var buildReplayableBrowserProfile = (runtimeState, launcher) => {
     const fingerprint = generated.fingerprint;
     const fingerprintBrowserMajorVersion = parseChromeMajorVersion(fingerprint?.fingerprint?.navigator?.userAgent || "");
     browserProfileCore = {
+      ...browserProfileCore,
       fingerprint,
       device,
       timezone_id: timezoneId,
@@ -5302,6 +5328,7 @@ var DefaultLaunch = {
 
 // src/internals/launch/cloak.js
 var import_node_child_process2 = require("node:child_process");
+var import_node_crypto = require("node:crypto");
 var import_node_util = require("node:util");
 var logger9 = createInternalLogger("Launch");
 var execFileAsync = (0, import_node_util.promisify)(import_node_child_process2.execFile);
@@ -5317,9 +5344,15 @@ var DEFAULT_CLOAK_HUMANIZE_OPTIONS = Object.freeze({
 var DEFAULT_CLOAK_GOTO_OPTIONS = Object.freeze({
   waitUntil: "commit"
 });
+var DEFAULT_CLOAK_SEED_MIN = 1e4;
+var DEFAULT_CLOAK_SEED_MAX = 99999;
 var DEFAULT_CLOAK_FINGERPRINT_PLATFORM = "linux";
+var CLOAK_FINGERPRINT_ARG_PREFIX = "--fingerprint=";
 var CLOAK_FINGERPRINT_PLATFORM_ARG_PREFIX = "--fingerprint-platform=";
-var SUPPORTED_CLOAK_FINGERPRINT_PLATFORMS = /* @__PURE__ */ new Set(["linux", "macos", "windows"]);
+var CLOAK_FINGERPRINT_TIMEZONE_ARG_PREFIX = "--fingerprint-timezone=";
+var CLOAK_FINGERPRINT_LOCALE_ARG_PREFIX = "--fingerprint-locale=";
+var CLOAK_LANG_ARG_PREFIX = "--lang=";
+var SUPPORTED_CLOAK_FINGERPRINT_PLATFORMS2 = /* @__PURE__ */ new Set(["linux", "macos", "windows"]);
 var cachedCloakModulePromise = null;
 var hasOwn = (target, key) => Object.prototype.hasOwnProperty.call(target, key);
 var loadCloakModule = async () => {
@@ -5349,16 +5382,36 @@ var normalizeStringArray = (value) => {
   }
   return value.map((item) => String(item || "").trim()).filter(Boolean);
 };
+var normalizeText = (value) => String(value || "").trim();
+var normalizePositiveInteger = (value) => {
+  const numericValue = Number(value);
+  if (Number.isSafeInteger(numericValue) && numericValue > 0) {
+    return numericValue;
+  }
+  const raw = normalizeText(value);
+  if (!/^\d+$/.test(raw)) {
+    return 0;
+  }
+  const parsedValue = Number(raw);
+  return Number.isSafeInteger(parsedValue) && parsedValue > 0 ? parsedValue : 0;
+};
+var normalizeCloakFingerprintPlatform2 = (value) => {
+  const normalizedFingerprintPlatform = String(value || "").trim().toLowerCase();
+  return SUPPORTED_CLOAK_FINGERPRINT_PLATFORMS2.has(normalizedFingerprintPlatform) ? normalizedFingerprintPlatform : "";
+};
+var buildCloakFingerprintPlatformArg = (fingerprintPlatform = DEFAULT_CLOAK_FINGERPRINT_PLATFORM) => `${CLOAK_FINGERPRINT_PLATFORM_ARG_PREFIX}${fingerprintPlatform}`;
 var resolveCloakFingerprintPlatformArg = (fingerprintPlatform = "", args = []) => {
-  const normalizedFingerprintPlatform = String(fingerprintPlatform || "").trim().toLowerCase();
-  if (SUPPORTED_CLOAK_FINGERPRINT_PLATFORMS.has(normalizedFingerprintPlatform)) {
-    return `${CLOAK_FINGERPRINT_PLATFORM_ARG_PREFIX}${normalizedFingerprintPlatform}`;
+  const normalizedFingerprintPlatform = normalizeCloakFingerprintPlatform2(fingerprintPlatform);
+  if (normalizedFingerprintPlatform) {
+    return buildCloakFingerprintPlatformArg(normalizedFingerprintPlatform);
   }
-  const existingArg = normalizeStringArray(args).find((value) => value.startsWith(CLOAK_FINGERPRINT_PLATFORM_ARG_PREFIX));
-  if (existingArg) {
-    return existingArg;
+  const existingFingerprintPlatform = normalizeCloakFingerprintPlatform2(
+    extractArgValue(args, CLOAK_FINGERPRINT_PLATFORM_ARG_PREFIX)
+  );
+  if (existingFingerprintPlatform) {
+    return buildCloakFingerprintPlatformArg(existingFingerprintPlatform);
   }
-  return `${CLOAK_FINGERPRINT_PLATFORM_ARG_PREFIX}${DEFAULT_CLOAK_FINGERPRINT_PLATFORM}`;
+  return buildCloakFingerprintPlatformArg(DEFAULT_CLOAK_FINGERPRINT_PLATFORM);
 };
 var resolveCloakProxy = (proxyConfiguration = {}) => {
   const config = normalizeObject2(proxyConfiguration);
@@ -5381,7 +5434,124 @@ var resolveCloakProxy = (proxyConfiguration = {}) => {
 };
 var extractFingerprintArg = (launchOptions = {}) => {
   const args = Array.isArray(launchOptions?.args) ? launchOptions.args : [];
-  return args.find((value) => String(value || "").startsWith("--fingerprint=")) || "";
+  return args.find((value) => String(value || "").startsWith(CLOAK_FINGERPRINT_ARG_PREFIX)) || "";
+};
+var buildFingerprintArg = (seed) => `${CLOAK_FINGERPRINT_ARG_PREFIX}${seed}`;
+var extractArgValue = (args = [], prefix = "") => {
+  const matchedArg = normalizeStringArray(args).find((value) => value.startsWith(prefix));
+  if (!matchedArg) {
+    return "";
+  }
+  return normalizeText(matchedArg.slice(prefix.length));
+};
+var extractFingerprintSeedFromArgs = (args = []) => normalizePositiveInteger(
+  extractArgValue(args, CLOAK_FINGERPRINT_ARG_PREFIX)
+);
+var extractLocaleFromArgs = (args = []) => extractArgValue(args, CLOAK_LANG_ARG_PREFIX) || extractArgValue(args, CLOAK_FINGERPRINT_LOCALE_ARG_PREFIX);
+var extractTimezoneFromArgs = (args = []) => extractArgValue(args, CLOAK_FINGERPRINT_TIMEZONE_ARG_PREFIX);
+var hashStringToSeed = (value = "") => {
+  let hash = 2166136261;
+  const text = normalizeText(value);
+  for (let index = 0; index < text.length; index += 1) {
+    hash ^= text.charCodeAt(index);
+    hash = Math.imul(hash, 16777619);
+  }
+  const numericHash = hash >>> 0;
+  const seedRange = DEFAULT_CLOAK_SEED_MAX - DEFAULT_CLOAK_SEED_MIN + 1;
+  return DEFAULT_CLOAK_SEED_MIN + numericHash % seedRange;
+};
+var buildCloakSeedIdentity = (runtimeState = {}) => {
+  const normalizedRuntimeState = normalizeObject2(runtimeState);
+  const normalizedEnvId = normalizeText(normalizedRuntimeState.envId);
+  if (normalizedEnvId) {
+    return `env:${normalizedEnvId}`;
+  }
+  const runtimePayload = normalizeObject2(normalizedRuntimeState.runtime);
+  if (Object.keys(runtimePayload).length === 0) {
+    return "";
+  }
+  return JSON.stringify({
+    actor: normalizeText(normalizedRuntimeState.actor),
+    device: normalizeText(normalizedRuntimeState.device),
+    runtime: runtimePayload
+  });
+};
+var generateCloakSeed = (runtimeState = {}) => {
+  const identity = buildCloakSeedIdentity(runtimeState);
+  if (identity) {
+    return hashStringToSeed(`cloak:${identity}`);
+  }
+  return (0, import_node_crypto.randomInt)(DEFAULT_CLOAK_SEED_MIN, DEFAULT_CLOAK_SEED_MAX + 1);
+};
+var resolveReplayableCloakProfile = (runtimeState, { fingerprintPlatform = "", cloakOptions = {} } = {}) => {
+  const normalizedCloakOptions = normalizeObject2(cloakOptions);
+  const normalizedArgs = normalizeStringArray(normalizedCloakOptions.args);
+  const explicitFingerprintSeed = extractFingerprintSeedFromArgs(normalizedArgs);
+  const explicitFingerprintPlatform = normalizeCloakFingerprintPlatform2(fingerprintPlatform) || normalizeCloakFingerprintPlatform2(
+    extractArgValue(normalizedArgs, CLOAK_FINGERPRINT_PLATFORM_ARG_PREFIX)
+  );
+  const explicitTimezone = normalizeText(
+    normalizedCloakOptions.timezone || normalizedCloakOptions.timezoneId || extractTimezoneFromArgs(normalizedArgs)
+  );
+  const explicitLocale = normalizeText(
+    normalizedCloakOptions.locale || extractLocaleFromArgs(normalizedArgs)
+  );
+  if (!runtimeState || !RuntimeEnv.hasLoginState(runtimeState)) {
+    return {
+      runtimeState,
+      browserProfileCore: null,
+      fingerprintSeed: explicitFingerprintSeed,
+      fingerprintPlatform: explicitFingerprintPlatform,
+      locale: explicitLocale,
+      timezone: explicitTimezone,
+      hasExplicitFingerprintSeed: explicitFingerprintSeed > 0,
+      hasExplicitLocale: Boolean(explicitLocale),
+      hasExplicitTimezone: Boolean(explicitTimezone)
+    };
+  }
+  let nextState = RuntimeEnv.rememberState(runtimeState);
+  const currentBrowserProfileCore = RuntimeEnv.getBrowserProfileCore(nextState);
+  const storedFingerprintSeed = normalizePositiveInteger(currentBrowserProfileCore?.cloak_seed);
+  const storedFingerprintPlatform = normalizeCloakFingerprintPlatform2(
+    currentBrowserProfileCore?.cloak_fingerprint_platform
+  );
+  const storedLocale = normalizeText(currentBrowserProfileCore?.locale);
+  const storedTimezone = normalizeText(currentBrowserProfileCore?.timezone_id);
+  const fingerprintSeed = explicitFingerprintSeed || storedFingerprintSeed || generateCloakSeed(nextState);
+  const resolvedFingerprintPlatform = explicitFingerprintPlatform || storedFingerprintPlatform || DEFAULT_CLOAK_FINGERPRINT_PLATFORM;
+  const locale = explicitLocale || storedLocale;
+  const timezone = explicitTimezone || storedTimezone;
+  const nextBrowserProfileCore = {
+    ...currentBrowserProfileCore,
+    cloak_seed: fingerprintSeed,
+    cloak_fingerprint_platform: resolvedFingerprintPlatform
+  };
+  if (locale) {
+    nextBrowserProfileCore.locale = locale;
+  }
+  if (timezone) {
+    nextBrowserProfileCore.timezone_id = timezone;
+  }
+  const currentCoreRaw = JSON.stringify(currentBrowserProfileCore || {});
+  const nextCoreRaw = JSON.stringify(nextBrowserProfileCore);
+  if (currentCoreRaw !== nextCoreRaw) {
+    nextState = RuntimeEnv.setBrowserProfileCore(nextState, nextBrowserProfileCore);
+    logger9.info(
+      `\u5DF2\u540C\u6B65 Cloak \u6307\u7EB9\u771F\u6E90 | env=${String(nextState.envId || "-")} | seed=${fingerprintSeed} | platform=${resolvedFingerprintPlatform} | timezone=${timezone || "-"} | locale=${locale || "-"}`
+    );
+  }
+  const rememberedBrowserProfileCore = RuntimeEnv.getBrowserProfileCore(nextState);
+  return {
+    runtimeState: nextState,
+    browserProfileCore: rememberedBrowserProfileCore,
+    fingerprintSeed,
+    fingerprintPlatform: resolvedFingerprintPlatform,
+    locale,
+    timezone,
+    hasExplicitFingerprintSeed: explicitFingerprintSeed > 0,
+    hasExplicitLocale: Boolean(explicitLocale),
+    hasExplicitTimezone: Boolean(explicitTimezone)
+  };
 };
 var createStableGotoHook = (recommendedGotoOptions = DEFAULT_CLOAK_GOTO_OPTIONS) => {
   const normalizedRecommendedGotoOptions = normalizeObject2(recommendedGotoOptions);
@@ -5495,6 +5665,7 @@ var CloakLaunch = {
       runInHeadfulMode = false,
       isRunningOnApify = false,
       launcher = null,
+      runtimeState = null,
       fingerprintPlatform = "",
       cloakOptions = {},
       humanizeOptions = DEFAULT_CLOAK_HUMANIZE_OPTIONS,
@@ -5509,8 +5680,16 @@ var CloakLaunch = {
     const activeBrowsers = /* @__PURE__ */ new Set();
     const patchedBrowsers = /* @__PURE__ */ new WeakSet();
     const defaultArgs = isRunningOnApify ? ["--no-sandbox", "--disable-setuid-sandbox"] : [];
-    const fingerprintPlatformArg = resolveCloakFingerprintPlatformArg(fingerprintPlatform, normalizedCloakOptions.args);
+    const replayContext = resolveReplayableCloakProfile(runtimeState, {
+      fingerprintPlatform,
+      cloakOptions: normalizedCloakOptions
+    });
+    const fingerprintPlatformArg = resolveCloakFingerprintPlatformArg(
+      replayContext.fingerprintPlatform,
+      normalizedCloakOptions.args
+    );
     const extraArgs = normalizeStringArray(normalizedCloakOptions.args).filter((value) => !value.startsWith(CLOAK_FINGERPRINT_PLATFORM_ARG_PREFIX));
+    const replayFingerprintArg = !replayContext.hasExplicitFingerprintSeed && replayContext.fingerprintSeed > 0 ? buildFingerprintArg(replayContext.fingerprintSeed) : "";
     const hasExplicitProxy = hasOwn(normalizedCloakOptions, "proxy");
     const proxyLaunchState = hasExplicitProxy ? resolveLaunchTraffic({ proxyConfiguration, debugMode, useMeter: false }) : resolveLaunchTraffic({ proxyConfiguration, debugMode });
     const proxy = hasExplicitProxy ? normalizedCloakOptions.proxy : proxyLaunchState.launchProxy;
@@ -5520,7 +5699,15 @@ var CloakLaunch = {
       ...normalizedCloakOptions,
       headless,
       proxy,
-      args: [...defaultArgs, ...extraArgs, fingerprintPlatformArg]
+      ...normalizedCloakOptions.timezoneId && !hasOwn(normalizedCloakOptions, "timezone") ? { timezone: normalizedCloakOptions.timezoneId } : {},
+      ...replayContext.timezone && !replayContext.hasExplicitTimezone ? { timezone: replayContext.timezone } : {},
+      ...replayContext.locale && !replayContext.hasExplicitLocale ? { locale: replayContext.locale } : {},
+      args: [
+        ...defaultArgs,
+        ...replayFingerprintArg ? [replayFingerprintArg] : [],
+        ...extraArgs,
+        fingerprintPlatformArg
+      ]
     };
     const launchOptions = await buildCloakLaunchOptions(mergedCloakOptions);
     const fingerprintArg = extractFingerprintArg(launchOptions);
@@ -6341,10 +6528,6 @@ var sleep = (ms) => new Promise((resolve) => {
 });
 var getErrorMessage = (error) => String(error?.message || error || "");
 var isTimeoutError = (error) => error?.name === "TimeoutError" || getErrorMessage(error).includes("Timeout");
-var isPageLifecycleError = (error) => {
-  const message = getErrorMessage(error);
-  return message.includes("Execution context was destroyed") || message.includes("Frame was detached") || message.includes("Target page, context or browser has been closed") || message.includes("Target closed") || message.includes("Most likely the page has been closed");
-};
 function useCaptchaMonitor(page, options) {
   const { domSelector, urlPattern, onDetected } = options;
   if (!domSelector && !urlPattern) {
@@ -6386,8 +6569,8 @@ function useCaptchaMonitor(page, options) {
           });
         } catch (error) {
           if (isStopped) break;
-          if (page?.isClosed?.() && isPageLifecycleError(error)) break;
-          if (isTimeoutError(error) || isPageLifecycleError(error)) {
+          if (page?.isClosed?.()) break;
+          if (isTimeoutError(error)) {
             await sleep(DOM_MONITOR_RECOVERY_WAIT_MS);
             continue;
           }
@@ -6477,7 +6660,7 @@ var Captcha = {
 };
 
 // src/mutation.js
-var import_node_crypto = require("node:crypto");
+var import_node_crypto2 = require("node:crypto");
 var import_uuid = require("uuid");
 var logger13 = createInternalLogger("Mutation");
 var MUTATION_MONITOR_MODE = Object.freeze({
@@ -6684,9 +6867,9 @@ var Mutation = {
       if (text.length <= max) return text;
       return `${text.slice(0, max)}...`;
     };
-    const normalizeText2 = (value) => String(value || "").replace(/\s+/g, " ").trim();
+    const normalizeText3 = (value) => String(value || "").replace(/\s+/g, " ").trim();
     const normalizeHtml = (value) => String(value || "").trim();
-    const hashSnapshot = (value) => (0, import_node_crypto.createHash)("sha256").update(String(value || "")).digest("hex");
+    const hashSnapshot = (value) => (0, import_node_crypto2.createHash)("sha256").update(String(value || "")).digest("hex");
     const buildState = async () => {
       const items = [];
       const describeElement = async (elementHandle) => {
@@ -6749,7 +6932,7 @@ var Mutation = {
               if (frame) {
                 try {
                   const frameSnapshot = await readFrameSnapshot(frame);
-                  text = normalizeText2(frameSnapshot?.text || "");
+                  text = normalizeText3(frameSnapshot?.text || "");
                   html = normalizeHtml(frameSnapshot?.html || "");
                   frameUrl = String(frameSnapshot?.url || "").trim();
                   readyState = String(frameSnapshot?.readyState || "").trim();
@@ -6763,7 +6946,7 @@ var Mutation = {
             } else {
               try {
                 const elementSnapshot = await readElementSnapshot(handle);
-                text = normalizeText2(elementSnapshot?.text || "");
+                text = normalizeText3(elementSnapshot?.text || "");
                 html = normalizeHtml(elementSnapshot?.html || "");
               } catch (error) {
                 source = "main-unreadable";
@@ -8025,9 +8208,9 @@ var LOCATION_NETWORK_SUFFIX_PATTERNS = [
 var cachedStripLogoSrcPromise = null;
 var cachedEnrichmentByContext = /* @__PURE__ */ new WeakMap();
 var logger14 = createInternalLogger("Watermarkify");
-var normalizeText = (value) => String(value || "").trim();
+var normalizeText2 = (value) => String(value || "").trim();
 var toInline = (value, maxLen = 200) => {
-  const text = normalizeText(value);
+  const text = normalizeText2(value);
   if (!text) return "";
   return text.replace(/\s+/g, " ").trim().slice(0, maxLen);
 };
@@ -8087,7 +8270,7 @@ var pickHeaderValue = async (response, names = []) => {
   if (!response || typeof response.headerValue !== "function") return "";
   for (const name of names) {
     const value = await response.headerValue(name).catch(() => null);
-    const text = normalizeText(value);
+    const text = normalizeText2(value);
     if (text) return text;
   }
   return "";
@@ -8191,7 +8374,7 @@ var fetchAsDataUrl = async (url, timeoutMs = DEFAULT_LOGO_FETCH_TIMEOUT_MS) => {
     if (!response?.ok) {
       return "";
     }
-    const contentType = normalizeText(response.headers?.get?.("content-type")) || "image/png";
+    const contentType = normalizeText2(response.headers?.get?.("content-type")) || "image/png";
     if (!/^image\//i.test(contentType)) {
       return "";
     }
@@ -8214,7 +8397,7 @@ var resolveStripLogoSrc = async () => {
     })();
   }
   const resolved = await cachedStripLogoSrcPromise.catch(() => DEFAULT_STRIP_LOGO_URL);
-  return normalizeText(resolved) || DEFAULT_STRIP_LOGO_URL;
+  return normalizeText2(resolved) || DEFAULT_STRIP_LOGO_URL;
 };
 var normalizeLayer = (value, defaults) => {
   if (value === false) {
@@ -8564,7 +8747,7 @@ var resolveWithIpLookup = async (page, options = {}) => {
       return null;
     });
     const status = response && typeof response.status === "function" ? response.status() : 0;
-    const contentType = normalizeText(await pickHeaderValue(response, ["content-type"]));
+    const contentType = normalizeText2(await pickHeaderValue(response, ["content-type"]));
     let rawText = "";
     if (response && typeof response.text === "function") {
       rawText = String(await withTimeout2(
@@ -8703,8 +8886,8 @@ var estimateTextWidth = (value, fontSize = 16) => {
   return Math.ceil(width);
 };
 var resolvePromptFields = (options = {}, fallbackTitle = "") => {
-  const query = normalizeText(options.query);
-  const prompt = query || normalizeText(options.prompt) || normalizeText(fallbackTitle) || "\u672A\u63D0\u4F9B Prompt";
+  const query = normalizeText2(options.query);
+  const prompt = query || normalizeText2(options.prompt) || normalizeText2(fallbackTitle) || "\u672A\u63D0\u4F9B Prompt";
   return {
     prompt,
     query: query || prompt
@@ -8758,8 +8941,8 @@ var normalizeScreenshotWatermarkify = (value) => {
     enabled: source.enabled !== false,
     timezoneOffsetHours: Number.isFinite(timezoneOffsetHoursRaw) ? timezoneOffsetHoursRaw : DEFAULT_TIMEZONE_OFFSET,
     response: source.response ?? null,
-    ip: normalizeText(source.ip),
-    location: normalizeText(source.location),
+    ip: normalizeText2(source.ip),
+    location: normalizeText2(source.location),
     prompt: normalizeWhitespace(source.prompt),
     query: normalizeWhitespace(source.query),
     ipLookup: source.ipLookup !== false,
@@ -8777,8 +8960,8 @@ var normalizeScreenshotWatermarkify = (value) => {
 };
 var resolveScreenshotWatermarkifyMeta = async (page, options = {}) => {
   const timezoneOffsetHours = options.timezoneOffsetHours ?? DEFAULT_TIMEZONE_OFFSET;
-  const url = normalizeText(page?.url?.()) || "about:blank";
-  const title = normalizeText(await page.title().catch(() => "")) || "\u672A\u547D\u540D\u9875\u9762";
+  const url = normalizeText2(page?.url?.()) || "about:blank";
+  const title = normalizeText2(await page.title().catch(() => "")) || "\u672A\u547D\u540D\u9875\u9762";
   const hostname = getHostname(url);
   const { prompt, query } = resolvePromptFields(options, title);
   const capturedAt = options.capturedAt instanceof Date ? options.capturedAt : new Date(options.capturedAt || Date.now());
@@ -9265,7 +9448,7 @@ var renderMobileStrip = ({ meta, width, baseHeight, fontFamily }) => {
     `;
 };
 var buildWatermarkifySvg = (meta, imageWidth, imageHeight) => {
-  const hasWatermark = meta?.watermark?.enabled !== false && normalizeText(meta?.watermarkText);
+  const hasWatermark = meta?.watermark?.enabled !== false && normalizeText2(meta?.watermarkText);
   const hasStrip = meta?.strip?.enabled !== false && Array.isArray(meta?.stripSegments) && meta.stripSegments.length > 0;
   if (!hasWatermark && !hasStrip) {
     return "";
@@ -9276,7 +9459,7 @@ var buildWatermarkifySvg = (meta, imageWidth, imageHeight) => {
   const fontFamily = escapeXml(buildFontFamily());
   const parts = [];
   if (hasWatermark) {
-    const stampText = escapeXml(normalizeText(meta.watermarkText));
+    const stampText = escapeXml(normalizeText2(meta.watermarkText));
     const cellWidth = Math.max(680, Number(meta.watermark?.cellWidth) || DEFAULT_WATERMARK_CELL_WIDTH);
     const cellHeight = Math.max(260, Number(meta.watermark?.cellHeight) || DEFAULT_WATERMARK_CELL_HEIGHT);
     const rotateDeg = Number(meta.watermark?.rotateDeg) || DEFAULT_WATERMARK_ROTATE_DEG;
@@ -9443,7 +9626,7 @@ var buildWatermarkifySvg = (meta, imageWidth, imageHeight) => {
     `;
 };
 var watermarkifyScreenshotBuffer = async (buffer, meta, page = null, options = {}) => {
-  const hasWatermark = meta?.watermark?.enabled !== false && normalizeText(meta?.watermarkText);
+  const hasWatermark = meta?.watermark?.enabled !== false && normalizeText2(meta?.watermarkText);
   const hasStrip = meta?.strip?.enabled !== false && Array.isArray(meta?.stripSegments) && meta.stripSegments.length > 0;
   if (!Buffer.isBuffer(buffer) || !meta || !hasWatermark && !hasStrip) {
     return buffer;