@skrillex1224/playwright-toolkit 2.1.160 → 2.1.162

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

@@ -423,6 +423,8 @@ function createInternalLogger(moduleName, explicitLogger) {
 // src/internals/screenshot.js
 var logger = createInternalLogger("Screenshot");
 var DEFAULT_TIMEOUT_MS = 5e3;
+var FORCED_FULLPAGE_TYPE = "jpeg";
+var FORCED_FULLPAGE_QUALITY = 50;
 var SUPPORTED_TYPES = /* @__PURE__ */ new Set(["png", "jpeg", "webp"]);
 var toPositiveNumber = (value, fallback = 0) => {
   const n = Number(value);
@@ -458,9 +460,9 @@ var buildFullPageClip = (metrics, viewport, maxClipHeight) => {
   };
 };
 var capturePageScreenshot = async (page, options = {}) => {
-  const type = normalizeType(options.type);
-  const quality = normalizeQuality(options.quality, type);
   const fullPage = Boolean(options.fullPage);
+  const type = fullPage ? FORCED_FULLPAGE_TYPE : normalizeType(options.type);
+  const quality = fullPage ? FORCED_FULLPAGE_QUALITY : normalizeQuality(options.quality, type);
   const timeout = toPositiveNumber(options.timeout, DEFAULT_TIMEOUT_MS);
   const maxClipHeight = Math.round(toPositiveNumber(options.maxClipHeight, 0));
   const fallbackOptions = {
@@ -1617,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();
@@ -1642,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);
@@ -1699,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 } : {}
+    };
   }
 };