@skrillex1224/playwright-toolkit 2.1.161 → 2.1.163

package/README.md

@@ -31,12 +31,16 @@ const ApifyKit = await KitHook.useApifyKit();
 // LiveView
 const { startLiveViewServer, takeLiveScreenshot } = LiveView.useLiveView();
 
+const crawlerOptions = Launch.getPlaywrightCrawlerOptions({
+    runInHeadfulMode: false,
+    isRunningOnApify: Actor.isAtHome(),
+    launcher: chromium,
+});
+
 const crawler = new PlaywrightCrawler({
-    launchContext: {
-        launcher: chromium,
-        launchOptions: Launch.getAdvancedLaunchOptions(),
-    },
+    ...crawlerOptions,
     preNavigationHooks: [
+        ...crawlerOptions.preNavigationHooks,
         async ({ page }) => {
             // 验证码监控
             Captcha.useCaptchaMonitor(page, {
@@ -84,9 +88,7 @@ await Actor.exit();
 
 | 模块        | 方法                                             | 说明                                                                                 |
 | ----------- | ------------------------------------------------ | ------------------------------------------------------------------------------------ |
-| `Launch`    | `getAdvancedLaunchOptions()`                     | 增强版启动参数                                                                       |
-| `Launch`    | `getLaunchOptions({ proxyConfiguration, log? })` | 基础启动参数（返回 `onPageCreated(page) => { waitUntil }`，默认 `domcontentloaded`） |
-| `Launch`    | `getFingerprintGeneratorOptions()`               | 指纹生成器选项                                                                       |
+| `Launch`    | `getPlaywrightCrawlerOptions(options)`           | 一次性返回 PlaywrightCrawler 所需公共配置（超时/指纹/代理/导航 hook）               |
 | `AntiCheat` | `applyPage(page, options?)`                      | 应用时区/语言/权限/视口                                                              |
 | `AntiCheat` | `applyContext(context, options?)`                | 仅应用 Context 设置                                                                  |
 | `AntiCheat` | `syncViewportWithScreen(page)`                   | 同步视口与屏幕                                                                       |

package/dist/index.cjs

@@ -631,7 +631,7 @@ async function createApifyKit() {
           logger2.success(`[RetryStep] before \u94A9\u5B50\u5B8C\u6210`);
         } else if (retryMode === "refresh") {
           logger2.start(`[RetryStep] \u5237\u65B0\u9875\u9762 (\u7B2C ${attemptNumber} \u6B21\u91CD\u8BD5)`);
-          await page.reload({ waitUntil: "domcontentloaded" });
+          await page.reload({ waitUntil: "commit" });
           logger2.success(`[RetryStep] \u9875\u9762\u5237\u65B0\u5B8C\u6210`);
         } else {
           logger2.start(`[RetryStep] \u7B49\u5F85 3 \u79D2 (\u7B2C ${attemptNumber} \u6B21\u91CD\u8BD5)`);
@@ -1619,6 +1619,12 @@ var createTrafficMeter = ({
 
 // src/launch.js
 var logger7 = createInternalLogger("Launch");
+var DEFAULT_CRAWLER_BASE_OPTIONS = Object.freeze({
+  maxConcurrency: 1,
+  maxRequestRetries: 0,
+  requestHandlerTimeoutSecs: 240,
+  navigationTimeoutSecs: 120
+});
 var resolveProxyLaunchOptions = (proxyConfiguration = {}) => {
   const config = proxyConfiguration && typeof proxyConfiguration === "object" && !Array.isArray(proxyConfiguration) ? proxyConfiguration : {};
   const proxyUrl = String(config.proxy_url || "").trim();
@@ -1644,12 +1650,17 @@ var resolveProxyLaunchOptions = (proxyConfiguration = {}) => {
   return { launchProxy, byPassDomains, enableProxy, proxyUrl };
 };
 var Launch = {
-  getLaunchOptions(options = {}) {
+  getPlaywrightCrawlerOptions(options = {}) {
     const normalizedOptions = Array.isArray(options) ? { customArgs: options } : options || {};
     const {
       customArgs = [],
       proxyConfiguration = {},
-      log: logOptions = null
+      log: logOptions = null,
+      runInHeadfulMode = false,
+      isRunningOnApify = false,
+      launcher = null,
+      preNavigationHooks = [],
+      postNavigationHooks = []
     } = normalizedOptions;
     const { launchProxy, byPassDomains, enableProxy, proxyUrl } = resolveProxyLaunchOptions(proxyConfiguration);
     const byPassRules = buildByPassDomainRules(byPassDomains);
@@ -1684,7 +1695,7 @@ var Launch = {
     }
     const onPageCreated = (page) => {
       const recommendedGotoOptions = {
-        waitUntil: "domcontentloaded"
+        waitUntil: "commit"
       };
       if (page && typeof page.on === "function") {
         trafficMeter2.attachPage(page);
@@ -1701,14 +1712,37 @@ var Launch = {
       page.on("request", requestHandler);
       return recommendedGotoOptions;
     };
-    return { launchOptions, onPageCreated };
-  },
-  /**
-   * 推荐的 Fingerprint Generator 选项
-   * 确保生成的是桌面端、较新的 Chrome，以匹配我们的脚本逻辑
-   */
-  getFingerprintGeneratorOptions() {
-    return AntiCheat.getFingerprintGeneratorOptions();
+    const launchContext = {
+      useIncognitoPages: true,
+      launchOptions
+    };
+    if (launcher) {
+      launchContext.launcher = launcher;
+    }
+    const crawlerBaseOptions = {
+      ...DEFAULT_CRAWLER_BASE_OPTIONS,
+      headless: !runInHeadfulMode || isRunningOnApify,
+      browserPoolOptions: {
+        useFingerprints: true,
+        fingerprintOptions: {
+          fingerprintGeneratorOptions: AntiCheat.getFingerprintGeneratorOptions()
+        }
+      },
+      launchContext
+    };
+    const normalizedPreNavigationHooks = Array.isArray(preNavigationHooks) ? preNavigationHooks : [];
+    const normalizedPostNavigationHooks = Array.isArray(postNavigationHooks) ? postNavigationHooks : [];
+    const internalPreNavigationHook = async ({ page }, gotoOptions = {}) => {
+      const recommendedGotoOptions = onPageCreated(page);
+      if (recommendedGotoOptions && typeof recommendedGotoOptions === "object") {
+        Object.assign(gotoOptions, recommendedGotoOptions);
+      }
+    };
+    return {
+      ...crawlerBaseOptions,
+      preNavigationHooks: [internalPreNavigationHook, ...normalizedPreNavigationHooks],
+      ...normalizedPostNavigationHooks.length > 0 ? { postNavigationHooks: normalizedPostNavigationHooks } : {}
+    };
   }
 };