@skrillex1224/playwright-toolkit 2.0.22 → 2.0.24

package/dist/index.js

@@ -5,7 +5,7 @@ var __export = (target, all) => {
 };
 
 // src/apify-kit.js
-import { log } from "crawlee";
+import { log as originalLog } from "crawlee";
 
 // src/constants.js
 var constants_exports = {};
@@ -31,7 +31,65 @@ var StatusCode = {
 var FAILED_KEY_SEPARATOR = "::<@>::";
 var PresetOfLiveViewKey = "LIVE_VIEW_SCREENSHOT";
 
+// src/logger.js
+import { log } from "crawlee";
+var GLOBAL_PREFIX = "[Toolkit]";
+function createLogger(moduleName) {
+  const prefix = `${GLOBAL_PREFIX}[${moduleName}]`;
+  return {
+    /**
+     * 方法开始日志
+     * @param {string} methodName - 方法名称
+     * @param {string} [params] - 参数摘要 (可选)
+     */
+    start(methodName, params = "") {
+      const paramStr = params ? ` (${params})` : "";
+      log.info(`${prefix} \u{1F537} ${methodName} \u5F00\u59CB${paramStr}`);
+    },
+    /**
+     * 方法成功日志
+     * @param {string} methodName - 方法名称
+     * @param {string} [result] - 结果摘要 (可选)
+     */
+    success(methodName, result = "") {
+      const resultStr = result ? ` (${result})` : "";
+      log.info(`${prefix} \u2705 ${methodName} \u5B8C\u6210${resultStr}`);
+    },
+    /**
+     * 方法失败日志
+     * @param {string} methodName - 方法名称
+     * @param {Error|string} error - 错误对象或信息
+     */
+    fail(methodName, error) {
+      const message = error instanceof Error ? error.message : error;
+      log.error(`${prefix} \u274C ${methodName} \u5931\u8D25: ${message}`);
+    },
+    /**
+     * 调试日志
+     * @param {string} message - 详情
+     */
+    debug(message) {
+      log.debug(`${prefix} \u{1F539} ${message}`);
+    },
+    /**
+     * 警告日志
+     * @param {string} message - 警告信息
+     */
+    warn(message) {
+      log.warning(`${prefix} \u26A0\uFE0F ${message}`);
+    },
+    /**
+     * 普通信息日志
+     * @param {string} message - 信息
+     */
+    info(message) {
+      log.info(`${prefix} ${message}`);
+    }
+  };
+}
+
 // src/apify-kit.js
+var logger = createLogger("ApifyKit");
 async function createApifyKit() {
   let apify = null;
   try {
@@ -65,13 +123,13 @@ async function createApifyKit() {
     async runStep(pendingStepName, page, actionFn, options = {}) {
       const { failActor = true } = options;
       const [failedKey, stepName] = this.unwrapStepName(pendingStepName);
-      log.info(`\u{1F504} [\u6B63\u5728\u6267\u884C] ${stepName}...`);
+      logger.start(`[Step] ${stepName}`);
       try {
         const result = await actionFn();
-        log.info(`\u2705 [\u6267\u884C\u6210\u529F] ${stepName}`);
+        logger.success(`[Step] ${stepName}`);
         return result;
       } catch (error) {
-        log.error(`\u274C [\u6267\u884C\u5931\u8D25] ${stepName}: ${error.message}`);
+        logger.fail(`[Step] ${stepName}`, error);
         let screenshotBase64 = "\u622A\u56FE\u5931\u8D25";
         try {
           if (page) {
@@ -79,7 +137,7 @@ async function createApifyKit() {
             screenshotBase64 = `data:image/jpeg;base64,${buffer.toString("base64")}`;
           }
         } catch (snapErr) {
-          log.warning(`\u622A\u56FE\u751F\u6210\u5931\u8D25: ${snapErr.message}`);
+          logger.warn(`\u622A\u56FE\u751F\u6210\u5931\u8D25: ${snapErr.message}`);
         }
         await this.pushFailed(error, {
           failedStep: stepName,
@@ -112,6 +170,7 @@ async function createApifyKit() {
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
         ...data
       });
+      logger.success("pushSuccess", "Data pushed");
     },
     /**
      * 推送失败数据的通用方法（私有方法，仅供runStep内部使用）
@@ -128,6 +187,7 @@ async function createApifyKit() {
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
         ...meta
       });
+      logger.success("pushFailed", "Error data pushed");
     }
   };
 }
@@ -143,6 +203,7 @@ var ApifyKit = {
 };
 
 // src/utils.js
+var logger2 = createLogger("Utils");
 var Utils = {
   /**
   * 解析 SSE 流文本
@@ -161,12 +222,13 @@ var Utils = {
         }
       }
     }
+    logger2.success("parseSseStream", `parsed events: ${events.length}`);
     return events;
   }
 };
 
 // src/stealth.js
-import { log as log2 } from "crawlee";
+var logger3 = createLogger("Stealth");
 var Stealth = {
   /**
    * 关键修复：将 Page 视口调整为与浏览器指纹 (window.screen) 一致。
@@ -185,9 +247,9 @@ var Stealth = {
         width: screen.width,
         height: screen.height
       });
-      log2.info(`[Stealth] Viewport synced to fingerprint: ${screen.width}x${screen.height}`);
+      logger3.success("syncViewportWithScreen", `size=${screen.width}x${screen.height}`);
     } catch (e) {
-      log2.warning(`[Stealth] Failed to sync viewport: ${e.message}. Fallback to 1920x1080.`);
+      logger3.warn(`syncViewportWithScreen Failed: ${e.message}. Fallback to 1920x1080.`);
       await page.setViewportSize({ width: 1920, height: 1080 });
     }
   },
@@ -200,6 +262,7 @@ var Stealth = {
         get: () => false
       });
     });
+    logger3.success("hideWebdriver");
   },
   /**
    * 通用的 Playwright 资源拦截器，用于屏蔽不必要的资源以加速加载
@@ -215,6 +278,7 @@ var Stealth = {
       }
       return route.continue();
     });
+    logger3.success("setupBlockingResources", `types=[${resourceTypes.join(",")}]`);
   },
   /**
    * 获取推荐的 Stealth 启动参数
@@ -276,13 +340,13 @@ var Stealth = {
         return -480;
       };
     });
-    log2.info("[Stealth] \u65F6\u533A\u5DF2\u8BBE\u7F6E\u4E3A Asia/Shanghai (UTC+8)");
+    logger3.success("setChinaTimezone", "Asia/Shanghai (UTC+8)");
   }
 };
 
 // src/humanize.js
 import delay, { rangeDelay } from "delay";
-import { log as log3 } from "crawlee";
+var logger4 = createLogger("Humanize");
 var Humanize = {
   /**
    * 随机延迟一段毫秒数 (API Wrapper for 'delay' package)
@@ -290,8 +354,10 @@ var Humanize = {
    * @param {number} max - 最大毫秒
    */
   async randomSleep(min, max) {
+    logger4.start("randomSleep", `min=${min}, max=${max}`);
     const ms = typeof max === "number" ? rangeDelay(min, max) : delay(min);
     await ms;
+    logger4.success("randomSleep", `waited=${await ms}ms`);
   },
   /**
    * 模拟人类“注视”或“阅读”行为：鼠标在页面上随机微动。
@@ -299,6 +365,7 @@ var Humanize = {
    * @param {number} durationMs - 持续时间
    */
   async simulateGaze(cursor, durationMs = 2e3) {
+    logger4.start("simulateGaze", `duration=${durationMs}ms`);
     const startTime = Date.now();
     while (Date.now() - startTime < durationMs) {
       const x = Math.random() * 800;
@@ -306,6 +373,7 @@ var Humanize = {
       await cursor.actions.move({ x, y });
       await rangeDelay(200, 800);
     }
+    logger4.success("simulateGaze");
   },
   /**
    * 人类化输入 - 带节奏变化（快-慢-停顿-偶尔加速）
@@ -320,6 +388,7 @@ var Humanize = {
    * @param {number} [options.pauseMax=800] - 停顿最大时长 (ms)
    */
   async humanType(page, selector, text, options = {}) {
+    logger4.start("humanType", `selector=${selector}, textLen=${text.length}`);
     const {
       minDelay = 50,
       maxDelay = 200,
@@ -327,26 +396,32 @@ var Humanize = {
       pauseMin = 300,
       pauseMax = 800
     } = options;
-    const locator = page.locator(selector);
-    await locator.click();
-    await rangeDelay(100, 300);
-    for (let i = 0; i < text.length; i++) {
-      const char = text[i];
-      let charDelay;
-      if (char === " ") {
-        charDelay = minDelay + Math.random() * 50;
-      } else if (/[,.!?;:，。！？；：]/.test(char)) {
-        charDelay = maxDelay + Math.random() * 100;
-      } else {
-        charDelay = minDelay + Math.random() * (maxDelay - minDelay);
-      }
-      await page.keyboard.type(char);
-      await delay(charDelay);
-      if (Math.random() < pauseProbability && i < text.length - 1) {
-        const pauseTime = pauseMin + Math.random() * (pauseMax - pauseMin);
-        log3.debug(`[Humanize] \u505C\u987F ${Math.round(pauseTime)}ms...`);
-        await delay(pauseTime);
+    try {
+      const locator = page.locator(selector);
+      await locator.click();
+      await rangeDelay(100, 300);
+      for (let i = 0; i < text.length; i++) {
+        const char = text[i];
+        let charDelay;
+        if (char === " ") {
+          charDelay = minDelay + Math.random() * 50;
+        } else if (/[,.!?;:，。！？；：]/.test(char)) {
+          charDelay = maxDelay + Math.random() * 100;
+        } else {
+          charDelay = minDelay + Math.random() * (maxDelay - minDelay);
+        }
+        await page.keyboard.type(char);
+        await delay(charDelay);
+        if (Math.random() < pauseProbability && i < text.length - 1) {
+          const pauseTime = pauseMin + Math.random() * (pauseMax - pauseMin);
+          logger4.debug(`\u505C\u987F ${Math.round(pauseTime)}ms...`);
+          await delay(pauseTime);
+        }
       }
+      logger4.success("humanType");
+    } catch (error) {
+      logger4.fail("humanType", error);
+      throw error;
     }
   },
   /**
@@ -363,25 +438,30 @@ var Humanize = {
       durationMs = duration;
     }
     durationMs = Math.round(durationMs);
-    log3.info(`[Humanize] \u5F00\u59CB\u9875\u9762\u9884\u70ED\u6D4F\u89C8 (${durationMs}ms)...`);
+    logger4.start("warmUpBrowsing", `duration=${durationMs}ms`);
     const startTime = Date.now();
     const viewportSize = page.viewportSize() || { width: 1920, height: 1080 };
-    while (Date.now() - startTime < durationMs) {
-      const action = Math.random();
-      if (action < 0.4) {
-        const x = 100 + Math.random() * (viewportSize.width - 200);
-        const y = 100 + Math.random() * (viewportSize.height - 200);
-        await cursor.actions.move({ x, y });
-        await rangeDelay(200, 500);
-      } else if (action < 0.7) {
-        const scrollY = (Math.random() - 0.5) * 200;
-        await page.mouse.wheel(0, scrollY);
-        await rangeDelay(300, 700);
-      } else {
-        await rangeDelay(500, 1e3);
+    try {
+      while (Date.now() - startTime < durationMs) {
+        const action = Math.random();
+        if (action < 0.4) {
+          const x = 100 + Math.random() * (viewportSize.width - 200);
+          const y = 100 + Math.random() * (viewportSize.height - 200);
+          await cursor.actions.move({ x, y });
+          await rangeDelay(200, 500);
+        } else if (action < 0.7) {
+          const scrollY = (Math.random() - 0.5) * 200;
+          await page.mouse.wheel(0, scrollY);
+          await rangeDelay(300, 700);
+        } else {
+          await rangeDelay(500, 1e3);
+        }
       }
+      logger4.success("warmUpBrowsing");
+    } catch (error) {
+      logger4.fail("warmUpBrowsing", error);
+      throw error;
     }
-    log3.info("[Humanize] \u9875\u9762\u9884\u70ED\u5B8C\u6210");
   },
   /**
    * 自然滚动 - 带惯性和减速效果
@@ -391,14 +471,21 @@ var Humanize = {
    * @param {number} [steps=5] - 分几步完成
    */
   async naturalScroll(page, direction = "down", distance = 300, steps = 5) {
+    logger4.start("naturalScroll", `dir=${direction}, dist=${distance}, steps=${steps}`);
     const sign = direction === "down" ? 1 : -1;
     const stepDistance = distance / steps;
-    for (let i = 0; i < steps; i++) {
-      const factor = 1 - i / steps * 0.5;
-      const scrollAmount = stepDistance * factor * sign;
-      await page.mouse.wheel(0, scrollAmount);
-      const delayTime = 50 + i * 30;
-      await delay(delayTime);
+    try {
+      for (let i = 0; i < steps; i++) {
+        const factor = 1 - i / steps * 0.5;
+        const scrollAmount = stepDistance * factor * sign;
+        await page.mouse.wheel(0, scrollAmount);
+        const delayTime = 50 + i * 30;
+        await delay(delayTime);
+      }
+      logger4.success("naturalScroll");
+    } catch (error) {
+      logger4.fail("naturalScroll", error);
+      throw error;
     }
   },
   /**
@@ -415,39 +502,47 @@ var Humanize = {
    * @param {boolean} [options.throwOnMissing=true] - 元素不存在时是否抛出错误
    */
   async humanClick(page, cursor, selector, options = {}) {
+    logger4.start("humanClick", `selector=${selector}`);
     const {
       delayBefore = 300,
       delayAfter = 800,
       throwOnMissing = true
     } = options;
-    const element = await page.$(selector);
-    if (!element) {
-      if (throwOnMissing) {
-        throw new Error(`[Humanize] humanClick: \u627E\u4E0D\u5230\u5143\u7D20 ${selector}`);
+    try {
+      const element = await page.$(selector);
+      if (!element) {
+        if (throwOnMissing) {
+          throw new Error(`\u627E\u4E0D\u5230\u5143\u7D20 ${selector}`);
+        }
+        logger4.warn(`humanClick: \u5143\u7D20\u4E0D\u5B58\u5728\uFF0C\u8DF3\u8FC7\u70B9\u51FB ${selector}`);
+        return false;
       }
-      log3.warning(`[Humanize] humanClick: \u5143\u7D20\u4E0D\u5B58\u5728\uFF0C\u8DF3\u8FC7\u70B9\u51FB ${selector}`);
-      return false;
-    }
-    const box = await element.boundingBox();
-    if (!box) {
-      if (throwOnMissing) {
-        throw new Error(`[Humanize] humanClick: \u65E0\u6CD5\u83B7\u53D6\u5143\u7D20\u4F4D\u7F6E ${selector}`);
+      const box = await element.boundingBox();
+      if (!box) {
+        if (throwOnMissing) {
+          throw new Error(`\u65E0\u6CD5\u83B7\u53D6\u5143\u7D20\u4F4D\u7F6E ${selector}`);
+        }
+        logger4.warn(`humanClick: \u65E0\u6CD5\u83B7\u53D6\u4F4D\u7F6E\uFF0C\u8DF3\u8FC7\u70B9\u51FB ${selector}`);
+        return false;
       }
-      log3.warning(`[Humanize] humanClick: \u65E0\u6CD5\u83B7\u53D6\u4F4D\u7F6E\uFF0C\u8DF3\u8FC7\u70B9\u51FB ${selector}`);
-      return false;
+      const offsetX = (Math.random() - 0.5) * box.width * 0.3;
+      const offsetY = (Math.random() - 0.5) * box.height * 0.3;
+      const x = box.x + box.width / 2 + offsetX;
+      const y = box.y + box.height / 2 + offsetY;
+      await cursor.actions.move({ x, y });
+      await rangeDelay(delayBefore, delayAfter);
+      await cursor.actions.click();
+      logger4.success("humanClick");
+      return true;
+    } catch (error) {
+      logger4.fail("humanClick", error);
+      throw error;
     }
-    const offsetX = (Math.random() - 0.5) * box.width * 0.3;
-    const offsetY = (Math.random() - 0.5) * box.height * 0.3;
-    const x = box.x + box.width / 2 + offsetX;
-    const y = box.y + box.height / 2 + offsetY;
-    await cursor.actions.move({ x, y });
-    await rangeDelay(delayBefore, delayAfter);
-    await cursor.actions.click();
-    return true;
   }
 };
 
 // src/launch.js
+var logger5 = createLogger("Launch");
 var Launch = {
   getLaunchOptions(customArgs = []) {
     return {
@@ -502,6 +597,7 @@ var Launch = {
    */
   createStealthChromium(chromium, stealthPlugin) {
     chromium.use(stealthPlugin());
+    logger5.success("createStealthChromium", "Stealth plugin registered");
     return chromium;
   },
   /**
@@ -514,14 +610,16 @@ var Launch = {
    * @returns {Promise<import('ghost-cursor-playwright').Cursor>}
    */
   async createGhostCursor(page, createCursor) {
-    return await createCursor(page);
+    const cursor = await createCursor(page);
+    logger5.success("createGhostCursor", "initialized");
+    return cursor;
   }
 };
 
 // src/live-view.js
 import express from "express";
-import { log as log4 } from "crawlee";
 import { Actor } from "apify";
+var logger6 = createLogger("LiveView");
 async function startLiveViewServer(liveViewKey) {
   const app = express();
   app.get("/", async (req, res) => {
@@ -546,13 +644,13 @@ async function startLiveViewServer(liveViewKey) {
                 </html>
             `);
     } catch (error) {
-      log4.error(`Live View \u670D\u52A1\u5668\u9519\u8BEF: ${error.message}`);
+      logger6.fail("Live View Server", error);
       res.status(500).send(`\u65E0\u6CD5\u52A0\u8F7D\u5C4F\u5E55\u622A\u56FE: ${error.message}`);
     }
   });
   const port = process.env.APIFY_CONTAINER_PORT || 4321;
   app.listen(port, () => {
-    log4.info(`Live View \u670D\u52A1\u5668\u5DF2\u542F\u52A8\uFF0C\u76D1\u542C\u7AEF\u53E3 ${port}\u3002\u8BF7\u6253\u5F00 "Live View" \u9009\u9879\u5361\u67E5\u770B\u3002`);
+    logger6.success("startLiveViewServer", `\u76D1\u542C\u7AEF\u53E3 ${port}`);
   });
 }
 async function takeLiveScreenshot(liveViewKey, page, logMessage) {
@@ -560,10 +658,10 @@ async function takeLiveScreenshot(liveViewKey, page, logMessage) {
     const buffer = await page.screenshot({ type: "png" });
     await Actor.setValue(liveViewKey, buffer, { contentType: "image/png" });
     if (logMessage) {
-      log4.info(`(\u622A\u56FE): ${logMessage}`);
+      logger6.info(`(\u622A\u56FE): ${logMessage}`);
     }
   } catch (e) {
-    log4.warning(`\u65E0\u6CD5\u6355\u83B7 Live View \u5C4F\u5E55\u622A\u56FE: ${e.message}`);
+    logger6.warn(`\u65E0\u6CD5\u6355\u83B7 Live View \u5C4F\u5E55\u622A\u56FE: ${e.message}`);
   }
 }
 var useLiveView = (liveViewKey = PresetOfLiveViewKey) => {
@@ -581,7 +679,7 @@ var LiveView = {
 };
 
 // src/captcha-monitor.js
-import { log as log5 } from "crawlee";
+var logger7 = createLogger("Captcha");
 function useCaptchaMonitor(page, options) {
   const { domSelector, urlPattern, onDetected } = options;
   if (!domSelector && !urlPattern) {
@@ -596,7 +694,7 @@ function useCaptchaMonitor(page, options) {
   const triggerDetected = async () => {
     if (isHandled) return;
     isHandled = true;
-    log5.error("[CaptchaMonitor] \u{1F6D1} \u68C0\u6D4B\u5230\u9A8C\u8BC1\u7801\uFF01");
+    logger7.fail("Captcha Detected", "\u{1F6D1} \u68C0\u6D4B\u5230\u9A8C\u8BC1\u7801\uFF01");
     await onDetected();
   };
   if (domSelector) {
@@ -646,7 +744,7 @@ function useCaptchaMonitor(page, options) {
         }
       })();
     }, { selector: domSelector, callbackName: exposedFunctionName });
-    log5.info(`[CaptchaMonitor] DOM \u76D1\u63A7\u5DF2\u542F\u7528: ${domSelector}`);
+    logger7.success("useCaptchaMonitor", `DOM \u76D1\u63A7\u5DF2\u542F\u7528: ${domSelector}`);
   }
   if (urlPattern) {
     frameHandler = async (frame) => {
@@ -658,7 +756,7 @@ function useCaptchaMonitor(page, options) {
       }
     };
     page.on("framenavigated", frameHandler);
-    log5.info(`[CaptchaMonitor] URL \u76D1\u63A7\u5DF2\u542F\u7528: ${urlPattern}`);
+    logger7.success("useCaptchaMonitor", `URL \u76D1\u63A7\u5DF2\u542F\u7528: ${urlPattern}`);
   }
 }
 var Captcha = {