@skrillex1224/playwright-toolkit 2.1.211 → 2.1.212

package/dist/index.js

@@ -323,18 +323,18 @@ var fallbackLog = {
   error: (...args) => console.error(...args),
   debug: (...args) => console.debug ? console.debug(...args) : console.log(...args)
 };
-var resolveLogMethod = (logger12, name) => {
-  if (logger12 && typeof logger12[name] === "function") {
-    return logger12[name].bind(logger12);
+var resolveLogMethod = (logger13, name) => {
+  if (logger13 && typeof logger13[name] === "function") {
+    return logger13[name].bind(logger13);
   }
-  if (name === "warning" && logger12 && typeof logger12.warn === "function") {
-    return logger12.warn.bind(logger12);
+  if (name === "warning" && logger13 && typeof logger13.warn === "function") {
+    return logger13.warn.bind(logger13);
   }
   return fallbackLog[name];
 };
 var defaultLogger = null;
-var setDefaultLogger = (logger12) => {
-  defaultLogger = logger12;
+var setDefaultLogger = (logger13) => {
+  defaultLogger = logger13;
 };
 var resolveLogger = (explicitLogger) => {
   if (explicitLogger && typeof explicitLogger.info === "function") {
@@ -361,8 +361,8 @@ var colorize = (text, color) => {
 var createBaseLogger = (prefix = "", explicitLogger) => {
   const name = prefix ? String(prefix) : "";
   const dispatch = (methodName, icon, message, color) => {
-    const logger12 = resolveLogger(explicitLogger);
-    const logFn = resolveLogMethod(logger12, methodName);
+    const logger13 = resolveLogger(explicitLogger);
+    const logFn = resolveLogMethod(logger13, methodName);
     const timestamp = colorize(`[${formatTimestamp()}]`, ANSI.gray);
     const line = formatLine(name, icon, message);
     const coloredLine = colorize(line, color);
@@ -4541,7 +4541,7 @@ var createTemplateLogger = (baseLogger = createBaseLogger()) => {
 };
 var getDefaultBaseLogger = () => createBaseLogger("");
 var Logger = {
-  setLogger: (logger12) => setDefaultLogger(logger12),
+  setLogger: (logger13) => setDefaultLogger(logger13),
   info: (message) => getDefaultBaseLogger().info(message),
   success: (message) => getDefaultBaseLogger().success(message),
   warning: (message) => getDefaultBaseLogger().warning(message),
@@ -4549,8 +4549,8 @@ var Logger = {
   error: (message) => getDefaultBaseLogger().error(message),
   debug: (message) => getDefaultBaseLogger().debug(message),
   start: (message) => getDefaultBaseLogger().start(message),
-  useTemplate: (logger12) => {
-    if (logger12) return createTemplateLogger(createBaseLogger("", logger12));
+  useTemplate: (logger13) => {
+    if (logger13) return createTemplateLogger(createBaseLogger("", logger13));
     return createTemplateLogger();
   }
 };
@@ -4568,7 +4568,7 @@ var DEFAULT_WATERMARK_ROTATE_DEG = -16;
 var DEFAULT_WATERMARK_CELL_WIDTH = 860;
 var DEFAULT_WATERMARK_CELL_HEIGHT = 330;
 var DEFAULT_STRIP_LOGO_URL = "https://static.heartbitai.com/geo/icon/favicon.png";
-var DEFAULT_IP_LOOKUP_URL = "http://myip.ipip.net";
+var DEFAULT_IP_LOOKUP_URL = "https://myip.ipip.net/json";
 var DEFAULT_LOGO_FETCH_TIMEOUT_MS = 2500;
 var DEFAULT_STRIP_ONE_LINE_HEIGHT = 78;
 var DEFAULT_STRIP_WRAPPED_MIN_HEIGHT = 108;
@@ -4615,6 +4615,7 @@ var LOCATION_NETWORK_SUFFIX_PATTERNS = [
 ];
 var cachedStripLogoSrcPromise = null;
 var cachedEnrichmentByContext = /* @__PURE__ */ new WeakMap();
+var logger11 = createInternalLogger("Watermarkify");
 var normalizeText = (value) => String(value || "").trim();
 var toInline = (value, maxLen = 200) => {
   const text = normalizeText(value);
@@ -4682,18 +4683,26 @@ var pickHeaderValue = async (response, names = []) => {
   }
   return "";
 };
-var parseIpIpResponse = (rawText) => {
+var parseIpIpJsonResponse = (rawText) => {
   const text = normalizeWhitespace(rawText);
-  if (!text) return null;
-  const ipMatch = text.match(/当前\s*IP[:：]\s*([^\s]+)/i) || text.match(/\b((?:\d{1,3}\.){3}\d{1,3}|(?:[0-9a-f]{0,4}:){2,}[0-9a-f]{0,4})\b/i);
-  const locationMatch = text.match(/来自于[:：]?\s*(.+)$/i);
-  const ip = toInline(ipMatch?.[1], 80);
-  const rawLocation = toInline(locationMatch?.[1], 120);
-  const location = toInline(stripLocationNetworkSuffix(rawLocation), 80) || rawLocation;
-  if (!ip && !location) {
+  if (!text || !text.startsWith("{") && !text.startsWith("[")) {
+    return null;
+  }
+  try {
+    const payload = JSON.parse(text);
+    const ip = toInline(payload?.data?.ip || payload?.ip, 80);
+    const locationParts = Array.isArray(payload?.data?.location) ? payload.data.location.map((item) => normalizeWhitespace(item)).filter(Boolean) : [];
+    const location = toInline(
+      stripLocationNetworkSuffix(locationParts.join(" ")),
+      80
+    );
+    if (!ip && !location) {
+      return null;
+    }
+    return { ip, location };
+  } catch {
     return null;
   }
-  return { ip, location };
 };
 var fillEnrichment = (target, source) => {
   if (!target || !source || typeof source !== "object") {
@@ -4843,10 +4852,16 @@ var resolveWithCustomResolver = async (page, baseMeta, options = {}) => {
     if (!resolved || typeof resolved !== "object") {
       return null;
     }
-    return {
+    const enrichment = {
       ip: toInline(resolved.ip, 80),
       location: toInline(resolved.location, 80)
     };
+    if (enrichment.ip || enrichment.location) {
+      logger11.info(`\u81EA\u5B9A\u4E49 resolver \u547D\u4E2D: ip=${enrichment.ip || "-"}, loc=${enrichment.location || "-"}`);
+    } else {
+      logger11.warning("\u81EA\u5B9A\u4E49 resolver \u5DF2\u6267\u884C\uFF0C\u4F46\u672A\u8FD4\u56DE IP/Loc");
+    }
+    return enrichment;
   } finally {
     controller?.abort();
   }
@@ -4903,6 +4918,7 @@ var resolveWithIpLookup = async (page, options = {}) => {
   }
   const probeScope = await openProbePage(page);
   if (!probeScope?.page) {
+    logger11.warning("ipLookup \u8DF3\u8FC7: \u65E0\u6CD5\u521B\u5EFA probe page");
     return null;
   }
   const timeoutMs = Math.max(
@@ -4911,10 +4927,16 @@ var resolveWithIpLookup = async (page, options = {}) => {
   );
   try {
     const probePage = probeScope.page;
+    logger11.info(`ipLookup \u5C1D\u8BD5: url=${DEFAULT_IP_LOOKUP_URL}, timeoutMs=${timeoutMs}`);
     const response = await probePage.goto(DEFAULT_IP_LOOKUP_URL, {
       waitUntil: "commit",
       timeout: timeoutMs
-    }).catch(() => null);
+    }).catch((error) => {
+      logger11.warning(`ipLookup \u8BF7\u6C42\u5931\u8D25: url=${DEFAULT_IP_LOOKUP_URL}, error=${error instanceof Error ? error.message : String(error)}`);
+      return null;
+    });
+    const status = response && typeof response.status === "function" ? response.status() : 0;
+    const contentType = normalizeText(await pickHeaderValue(response, ["content-type"]));
     let rawText = "";
     if (response && typeof response.text === "function") {
       rawText = String(await withTimeout(
@@ -4930,8 +4952,15 @@ var resolveWithIpLookup = async (page, options = {}) => {
         Math.min(timeoutMs, 500)
       ) || "");
     }
-    return parseIpIpResponse(rawText);
-  } catch {
+    const parsed = parseIpIpJsonResponse(rawText);
+    if (parsed?.ip || parsed?.location) {
+      logger11.info(`ipLookup \u6210\u529F: url=${DEFAULT_IP_LOOKUP_URL}, status=${status || "-"}, contentType=${contentType || "-"}, ip=${parsed.ip || "-"}, loc=${parsed.location || "-"}`);
+      return parsed;
+    }
+    logger11.warning(`ipLookup \u672A\u89E3\u6790\u51FA IP/Loc: url=${DEFAULT_IP_LOOKUP_URL}, status=${status || "-"}, contentType=${contentType || "-"}, preview=${shortenTail(rawText, 120) || "[empty]"}`);
+    return null;
+  } catch (error) {
+    logger11.warning(`ipLookup \u6267\u884C\u5F02\u5E38\uFF0C\u672A\u83B7\u5F97 IP/Loc: ${error instanceof Error ? error.message : String(error)}`);
     return null;
   } finally {
     await probeScope.close().catch(() => {
@@ -4945,7 +4974,11 @@ var resolveEnrichment = async (page, baseMeta, options) => {
     ip: toInline(options.ip, 80),
     location: toInline(options.location, 80)
   };
+  logger11.info(`enrichment \u5F00\u59CB: host=${baseMeta.hostname || "-"}, hasPresetIp=${Boolean(merged.ip)}, hasPresetLoc=${Boolean(merged.location)}, ipLookup=${options.ipLookup !== false}`);
   if (!merged.ip || !merged.location) {
+    if (cached?.ip || cached?.location) {
+      logger11.info(`enrichment \u547D\u4E2D\u4E0A\u4E0B\u6587\u7F13\u5B58: ip=${cached.ip || "-"}, loc=${cached.location || "-"}`);
+    }
     fillEnrichment(merged, cached);
   }
   if (!merged.ip || !merged.location) {
@@ -4968,10 +5001,16 @@ var resolveEnrichment = async (page, baseMeta, options) => {
       "x-geo-country"
     ]), 80);
     if (!merged.location || isWeakLocationValue(merged.location) && headerLocation) {
+      logger11.info(`enrichment \u4F7F\u7528\u54CD\u5E94\u5934\u8865\u5145 Loc: ${headerLocation || "-"}`);
       merged.location = headerLocation || merged.location;
     }
   }
   writeCachedEnrichment(page, merged);
+  if (merged.ip || merged.location) {
+    logger11.info(`enrichment \u5B8C\u6210: ip=${merged.ip || "-"}, loc=${merged.location || "-"}`);
+  } else {
+    logger11.warning("enrichment \u5B8C\u6210: \u672A\u83B7\u5F97 IP/Loc");
+  }
   return merged;
 };
 var buildWatermarkStamp = ({ prompt, captureTime, ip, location }) => {
@@ -5650,7 +5689,7 @@ var watermarkifyScreenshotBuffer = async (buffer, meta) => {
 };
 
 // src/share.js
-var logger11 = createInternalLogger("Share");
+var logger12 = createInternalLogger("Share");
 var DEFAULT_TIMEOUT_MS2 = 50 * 1e3;
 var DEFAULT_PAYLOAD_SNAPSHOT_MAX_LEN = 500;
 var DEFAULT_POLL_INTERVAL_MS = 120;
@@ -5787,7 +5826,7 @@ var createDomShareMonitor = async (page, options = {}) => {
   const onMatch = typeof options.onMatch === "function" ? options.onMatch : null;
   const onTelemetry = typeof options.onTelemetry === "function" ? options.onTelemetry : null;
   let matched = false;
-  logger11.info(`DOM \u76D1\u542C\u51C6\u5907\u6302\u8F7D: selectors=${toJsonInline(selectors, 120)}, mode=${mode}`);
+  logger12.info(`DOM \u76D1\u542C\u51C6\u5907\u6302\u8F7D: selectors=${toJsonInline(selectors, 120)}, mode=${mode}`);
   const monitor = await Mutation.useMonitor(page, selectors, {
     mode,
     onMutation: (context = {}) => {
@@ -5805,12 +5844,12 @@ ${text}`;
         });
       }
       if (mutationCount <= 5 || mutationCount % 50 === 0) {
-        logger11.info(`DOM \u53D8\u5316\u5DF2\u6355\u83B7: mutationCount=${mutationCount}, mutationNodes=${mutationNodes.length}`);
+        logger12.info(`DOM \u53D8\u5316\u5DF2\u6355\u83B7: mutationCount=${mutationCount}, mutationNodes=${mutationNodes.length}`);
       }
       const [candidate] = Utils.parseLinks(rawDom, { prefix }) || [];
       if (!candidate) return;
       matched = true;
-      logger11.success("captureLink.domHit", `DOM \u547D\u4E2D\u5206\u4EAB\u94FE\u63A5: mutationCount=${mutationCount}, link=${candidate}`);
+      logger12.success("captureLink.domHit", `DOM \u547D\u4E2D\u5206\u4EAB\u94FE\u63A5: mutationCount=${mutationCount}, link=${candidate}`);
       if (onMatch) {
         onMatch({
           link: candidate,
@@ -5826,7 +5865,7 @@ ${text}`;
   return {
     stop: async () => {
       const result = await monitor.stop();
-      logger11.info(`DOM \u76D1\u542C\u5DF2\u505C\u6B62: totalMutations=${result?.totalMutations || 0}`);
+      logger12.info(`DOM \u76D1\u542C\u5DF2\u505C\u6B62: totalMutations=${result?.totalMutations || 0}`);
       return result;
     }
   };
@@ -5866,8 +5905,8 @@ var Share = {
     if (share.mode === "response" && apiMatchers.length === 0) {
       throw new Error("Share.captureLink requires share.xurl[0] api matcher when mode=response");
     }
-    logger11.start("captureLink", `mode=${share.mode}, timeoutMs=${timeoutMs}, prefix=${share.prefix}`);
-    logger11.info(`captureLink \u914D\u7F6E: xurl=${toJsonInline(share.xurl)}, domMode=${domMode}, domSelectors=${toJsonInline(domSelectors, 120)}`);
+    logger12.start("captureLink", `mode=${share.mode}, timeoutMs=${timeoutMs}, prefix=${share.prefix}`);
+    logger12.info(`captureLink \u914D\u7F6E: xurl=${toJsonInline(share.xurl)}, domMode=${domMode}, domSelectors=${toJsonInline(domSelectors, 120)}`);
     const stats = {
       actionTimedOut: false,
       domMutationCount: 0,
@@ -5892,7 +5931,7 @@ var Share = {
         link: validated,
         payloadText: String(payloadText || "")
       };
-      logger11.info(`\u5019\u9009\u94FE\u63A5\u5DF2\u786E\u8BA4: source=${source}, link=${validated}`);
+      logger12.info(`\u5019\u9009\u94FE\u63A5\u5DF2\u786E\u8BA4: source=${source}, link=${validated}`);
       return true;
     };
     const resolveResponseCandidate = (responseText) => {
@@ -5927,7 +5966,7 @@ var Share = {
       try {
         await monitor.stop();
       } catch (error) {
-        logger11.warning(`\u505C\u6B62 DOM \u76D1\u542C\u5931\u8D25: ${error instanceof Error ? error.message : String(error)}`);
+        logger12.warning(`\u505C\u6B62 DOM \u76D1\u542C\u5931\u8D25: ${error instanceof Error ? error.message : String(error)}`);
       }
     };
     const onResponse = async (response) => {
@@ -5940,29 +5979,29 @@ var Share = {
           stats.responseSampleUrls.push(url);
         }
         if (stats.responseObserved <= 5) {
-          logger11.info(`\u63A5\u53E3\u54CD\u5E94\u91C7\u6837(${stats.responseObserved}): ${url}`);
+          logger12.info(`\u63A5\u53E3\u54CD\u5E94\u91C7\u6837(${stats.responseObserved}): ${url}`);
         }
         if (!apiMatchers.some((matcher) => url.includes(matcher))) return;
         stats.responseMatched += 1;
         stats.lastMatchedUrl = url;
-        logger11.info(`\u63A5\u53E3\u547D\u4E2D\u5339\u914D(${stats.responseMatched}): ${url}`);
+        logger12.info(`\u63A5\u53E3\u547D\u4E2D\u5339\u914D(${stats.responseMatched}): ${url}`);
         const text = await response.text();
         const hit = resolveResponseCandidate(text);
         if (!hit?.link) {
           if (stats.responseMatched <= 3) {
-            logger11.info(`\u63A5\u53E3\u89E3\u6790\u5B8C\u6210\u4F46\u672A\u63D0\u53D6\u5230\u5206\u4EAB\u94FE\u63A5: payloadSize=${text.length}`);
+            logger12.info(`\u63A5\u53E3\u89E3\u6790\u5B8C\u6210\u4F46\u672A\u63D0\u53D6\u5230\u5206\u4EAB\u94FE\u63A5: payloadSize=${text.length}`);
           }
           return;
         }
         stats.responseResolved += 1;
-        logger11.success("captureLink.responseHit", `\u63A5\u53E3\u547D\u4E2D\u5206\u4EAB\u94FE\u63A5: url=${url}, link=${hit.link}`);
+        logger12.success("captureLink.responseHit", `\u63A5\u53E3\u547D\u4E2D\u5206\u4EAB\u94FE\u63A5: url=${url}, link=${hit.link}`);
         setCandidate("response", hit.link, hit.payloadText);
       } catch (error) {
-        logger11.warning(`\u63A5\u53E3\u54CD\u5E94\u5904\u7406\u5F02\u5E38: ${error instanceof Error ? error.message : String(error)}`);
+        logger12.warning(`\u63A5\u53E3\u54CD\u5E94\u5904\u7406\u5F02\u5E38: ${error instanceof Error ? error.message : String(error)}`);
       }
     };
     if (share.mode === "dom") {
-      logger11.info("\u5F53\u524D\u4E3A DOM \u6A21\u5F0F\uFF0C\u4EC5\u542F\u7528 DOM \u76D1\u542C");
+      logger12.info("\u5F53\u524D\u4E3A DOM \u6A21\u5F0F\uFF0C\u4EC5\u542F\u7528 DOM \u76D1\u542C");
       domMonitor = await createDomShareMonitor(page, {
         prefix: share.prefix,
         selectors: domSelectors,
@@ -5977,14 +6016,14 @@ var Share = {
       });
     }
     if (share.mode === "response") {
-      logger11.info(`\u5F53\u524D\u4E3A\u63A5\u53E3\u6A21\u5F0F\uFF0C\u6302\u8F7D response \u76D1\u542C: apiMatchers=${toJsonInline(apiMatchers, 160)}`);
+      logger12.info(`\u5F53\u524D\u4E3A\u63A5\u53E3\u6A21\u5F0F\uFF0C\u6302\u8F7D response \u76D1\u542C: apiMatchers=${toJsonInline(apiMatchers, 160)}`);
       page.on("response", onResponse);
     }
     const deadline = Date.now() + timeoutMs;
     const getRemainingMs = () => Math.max(0, deadline - Date.now());
     try {
       const actionTimeout = getRemainingMs();
-      logger11.start("captureLink.performActions", `\u6267\u884C\u52A8\u4F5C\u9884\u7B97=${actionTimeout}ms`);
+      logger12.start("captureLink.performActions", `\u6267\u884C\u52A8\u4F5C\u9884\u7B97=${actionTimeout}ms`);
       if (actionTimeout > 0) {
         let timer = null;
         let actionError = null;
@@ -5998,21 +6037,21 @@ var Share = {
         const actionResult = await Promise.race([actionPromise, timeoutPromise]);
         if (timer) clearTimeout(timer);
         if (actionResult === "__ACTION_ERROR__") {
-          logger11.fail("captureLink.performActions", actionError);
+          logger12.fail("captureLink.performActions", actionError);
           throw actionError;
         }
         if (actionResult === "__ACTION_TIMEOUT__") {
           stats.actionTimedOut = true;
-          logger11.warning(`performActions \u5DF2\u8D85\u65F6 (${actionTimeout}ms)\uFF0C\u52A8\u4F5C\u53EF\u80FD\u4ECD\u5728\u5F02\u6B65\u6267\u884C`);
+          logger12.warning(`performActions \u5DF2\u8D85\u65F6 (${actionTimeout}ms)\uFF0C\u52A8\u4F5C\u53EF\u80FD\u4ECD\u5728\u5F02\u6B65\u6267\u884C`);
         } else {
-          logger11.success("captureLink.performActions", "\u6267\u884C\u52A8\u4F5C\u5B8C\u6210");
+          logger12.success("captureLink.performActions", "\u6267\u884C\u52A8\u4F5C\u5B8C\u6210");
         }
       }
       let nextProgressLogTs = Date.now() + 3e3;
       while (true) {
         const selected = share.mode === "dom" ? candidates.dom : candidates.response;
         if (selected?.link) {
-          logger11.success("captureLink", `\u6355\u83B7\u6210\u529F: source=${share.mode}, link=${selected.link}`);
+          logger12.success("captureLink", `\u6355\u83B7\u6210\u529F: source=${share.mode}, link=${selected.link}`);
           return {
             link: selected.link,
             payloadText: selected.payloadText,
@@ -6024,7 +6063,7 @@ var Share = {
         if (remaining <= 0) break;
         const now = Date.now();
         if (now >= nextProgressLogTs) {
-          logger11.info(
+          logger12.info(
             `captureLink \u7B49\u5F85\u4E2D: remaining=${remaining}ms, domMutationCount=${stats.domMutationCount}, responseMatched=${stats.responseMatched}`
           );
           nextProgressLogTs = now + 5e3;
@@ -6032,11 +6071,11 @@ var Share = {
         await delay2(Math.max(0, Math.min(DEFAULT_POLL_INTERVAL_MS, remaining)));
       }
       if (share.mode === "response" && stats.responseMatched === 0) {
-        logger11.warning(
+        logger12.warning(
           `\u63A5\u53E3\u76D1\u542C\u672A\u547D\u4E2D: apiMatchers=${toJsonInline(apiMatchers, 220)}, \u54CD\u5E94\u6837\u672CURLs=${toJsonInline(stats.responseSampleUrls, 420)}`
         );
       }
-      logger11.warning(
+      logger12.warning(
         `captureLink \u8D85\u65F6\u672A\u62FF\u5230\u94FE\u63A5: mode=${share.mode}, actionTimedOut=${stats.actionTimedOut}, domMutationCount=${stats.domMutationCount}, responseObserved=${stats.responseObserved}, responseMatched=${stats.responseMatched}, lastMatchedUrl=${stats.lastMatchedUrl || "none"}`
       );
       return {
@@ -6048,7 +6087,7 @@ var Share = {
     } finally {
       if (share.mode === "response") {
         page.off("response", onResponse);
-        logger11.info("response \u76D1\u542C\u5DF2\u5378\u8F7D");
+        logger12.info("response \u76D1\u542C\u5DF2\u5378\u8F7D");
       }
       await stopDomMonitor();
     }