@skrillex1224/playwright-toolkit 2.1.233 → 2.1.235

package/dist/index.cjs

@@ -236,8 +236,9 @@ var ActorInfo = {
   erine: createActorInfo({
     key: "erine",
     name: "\u6587\u5FC3\u4E00\u8A00",
-    domain: "yiyan.baidu.com",
+    domain: "wenxin.baidu.com",
     path: "/",
+    device: Device.Mobile,
     share: {
       mode: "response",
       prefix: "https://yiyan.baidu.com/share/",
@@ -283,6 +284,7 @@ var ActorInfo = {
     name: "\u5143\u5B9D",
     domain: "yuanbao.tencent.com",
     path: "/chat/",
+    device: Device.Mobile,
     share: {
       mode: "response",
       prefix: "https://yb.tencent.com/s/",
@@ -312,6 +314,7 @@ var ActorInfo = {
     name: "\u901A\u4E49\u5343\u95EE",
     domain: "www.qianwen.com",
     path: "/chat",
+    device: Device.Mobile,
     share: {
       mode: "response",
       prefix: "https://www.qianwen.com/share/chat/",
@@ -469,6 +472,9 @@ function createInternalLogger(moduleName, explicitLogger) {
 // src/internals/screenshot.js
 var import_delay = __toESM(require("delay"), 1);
 
+// src/internals/constants.js
+var PageRuntimeStateKey = "__playwright_toolkit_runtime_state__";
+
 // src/internals/viewport.js
 var toPositiveInt = (value) => {
   const number = Math.round(Number(value) || 0);
@@ -505,6 +511,7 @@ var SUPPORTED_TYPES = /* @__PURE__ */ new Set(["png", "jpeg", "webp"]);
 var EXPANDED_SCROLLABLE_CLASS = "__pk_expanded__";
 var DEFAULT_MAX_HEIGHT = 8e3;
 var DEFAULT_SETTLE_MS = 1e3;
+var DEFAULT_MOBILE_SETTLE_MS = 50;
 var toPositiveNumber = (value, fallback = 0) => {
   const n = Number(value);
   if (!Number.isFinite(n) || n <= 0) return fallback;
@@ -527,6 +534,7 @@ var normalizeQuality = (value, type) => {
   if (rounded < 0 || rounded > 100) return void 0;
   return rounded;
 };
+var resolvePageDevice = (page) => normalizeDevice(page?.[PageRuntimeStateKey]?.device);
 var buildFullPageClip = (metrics, viewport, maxClipHeight) => {
   const contentSize = metrics && typeof metrics === "object" ? metrics.contentSize || null : null;
   const width = Math.max(1, Math.ceil(viewport.width || contentSize?.width || 1));
@@ -543,7 +551,7 @@ var buildFullPageClip = (metrics, viewport, maxClipHeight) => {
   };
 };
 var expandScrollableContent = async (page, options = {}) => {
-  return await page.evaluate(({ className, forceScrollableHeight, visibleOnly }) => {
+  return await page.evaluate(({ className, forceScrollableHeight, visibleOnly, expandDocumentElements }) => {
     const body = document.body;
     const root = document.documentElement;
     const scrollingElement = document.scrollingElement;
@@ -568,8 +576,8 @@ var expandScrollableContent = async (page, options = {}) => {
       if (Number(style.opacity) === 0) return false;
       return rect.width > 0 && rect.height > 0;
     };
-    const rememberOriginalBoxStyles = (el) => {
-      if (!el || isDocumentElement(el) || el.classList.contains(className)) {
+    const rememberOriginalBoxStyles = (el, { includeDocumentElement = false } = {}) => {
+      if (!el || !includeDocumentElement && isDocumentElement(el) || el.classList.contains(className)) {
         return;
       }
       el.dataset.pkOrigOverflow = el.style.overflow;
@@ -582,6 +590,19 @@ var expandScrollableContent = async (page, options = {}) => {
       el.dataset.pkOrigMaxHeightPriority = el.style.getPropertyPriority("max-height") || "";
       el.classList.add(className);
     };
+    const expandDocumentElementsToHeight = (height) => {
+      if (!expandDocumentElements) return;
+      const targetHeight = Math.ceil(Number(height) || 0);
+      if (targetHeight <= 0) return;
+      [root, body, scrollingElement].forEach((el) => {
+        if (!el) return;
+        rememberOriginalBoxStyles(el, { includeDocumentElement: true });
+        el.style.setProperty("overflow", "visible", "important");
+        el.style.setProperty("height", `${targetHeight}px`, "important");
+        el.style.setProperty("min-height", `${targetHeight}px`, "important");
+        el.style.setProperty("max-height", "none", "important");
+      });
+    };
     const isScrollableY = (el, style, rect) => {
       if (!el || el.scrollHeight <= el.clientHeight + 1) {
         return false;
@@ -717,38 +738,61 @@ var expandScrollableContent = async (page, options = {}) => {
       }
     });
     maxHeight = Math.max(maxHeight, measureDocumentScrollHeight(), measureExpandedRenderedBottom());
+    if (expandDocumentElements) {
+      for (let pass = 0; pass < 2; pass += 1) {
+        expandDocumentElementsToHeight(maxHeight);
+        maxHeight = Math.max(maxHeight, measureDocumentScrollHeight(), measureExpandedRenderedBottom());
+      }
+    }
     return Math.ceil(maxHeight);
   }, {
     className: EXPANDED_SCROLLABLE_CLASS,
     forceScrollableHeight: options.forceScrollableHeight !== false,
-    visibleOnly: options.visibleOnly !== false
+    visibleOnly: options.visibleOnly !== false,
+    expandDocumentElements: options.expandDocumentElements === true
   });
 };
 var prepareExpandedFullPageScreenshot = async (page, options = {}) => {
   const originalViewport = await resolveCurrentViewportSize(page);
   const maxHeight = toPositiveInteger(options.maxHeight, DEFAULT_MAX_HEIGHT);
-  const settleMs = Math.max(0, Number(options.settleMs ?? DEFAULT_SETTLE_MS) || 0);
+  const preserveViewport = options.preserveViewport ?? resolvePageDevice(page) === Device.Mobile;
+  const defaultSettleMs = preserveViewport ? DEFAULT_MOBILE_SETTLE_MS : DEFAULT_SETTLE_MS;
+  const requestedSettleMs = Math.max(0, Number(options.settleMs ?? defaultSettleMs) || 0);
+  const settleMs = preserveViewport ? Math.min(requestedSettleMs, DEFAULT_MOBILE_SETTLE_MS) : requestedSettleMs;
   const maxScrollHeight = await expandScrollableContent(page, {
     forceScrollableHeight: options.forceScrollableHeight,
-    visibleOnly: options.visibleOnly !== false
+    visibleOnly: options.visibleOnly !== false,
+    expandDocumentElements: preserveViewport
   });
   const targetHeight = Math.min(maxScrollHeight, maxHeight);
-  await page.setViewportSize({
-    width: originalViewport.width,
-    height: targetHeight
-  });
+  let viewportResized = false;
+  if (!preserveViewport) {
+    await page.setViewportSize({
+      width: originalViewport.width,
+      height: targetHeight
+    });
+    viewportResized = true;
+  }
   if (settleMs > 0) {
     await (0, import_delay.default)(settleMs);
   }
   return {
     originalViewport,
     maxScrollHeight,
-    targetHeight
+    targetHeight,
+    preserveViewport,
+    viewportResized
   };
 };
 var restoreExpandedFullPageScreenshot = async (page, state = {}) => {
   await page.evaluate((className) => {
-    document.querySelectorAll(`.${className}`).forEach((el) => {
+    const targets = new Set([
+      ...document.querySelectorAll(`.${className}`),
+      document.documentElement,
+      document.body,
+      document.scrollingElement
+    ].filter((el) => el?.classList?.contains(className)));
+    targets.forEach((el) => {
       el.style.setProperty("overflow", el.dataset.pkOrigOverflow || "", el.dataset.pkOrigOverflowPriority || "");
       el.style.setProperty("height", el.dataset.pkOrigHeight || "", el.dataset.pkOrigHeightPriority || "");
       el.style.setProperty("min-height", el.dataset.pkOrigMinHeight || "", el.dataset.pkOrigMinHeightPriority || "");
@@ -764,7 +808,7 @@ var restoreExpandedFullPageScreenshot = async (page, state = {}) => {
       el.classList.remove(className);
     });
   }, EXPANDED_SCROLLABLE_CLASS);
-  if (state?.originalViewport) {
+  if (state?.originalViewport && state?.viewportResized) {
     await page.setViewportSize(state.originalViewport);
   }
 };
@@ -1262,9 +1306,6 @@ var ProxyMeterRuntime = {
   getProxyMeterSnapshot
 };
 
-// src/internals/constants.js
-var PageRuntimeStateKey = "__playwright_toolkit_runtime_state__";
-
 // src/runtime-env.js
 var BROWSER_PROFILE_SCHEMA_VERSION = 1;
 var rememberedRuntimeState = null;
@@ -2814,14 +2855,14 @@ var Humanize = {
    * @param {import('playwright').Page} page
    * @param {string|import('playwright').ElementHandle} target - CSS 选择器或元素句柄
    * @param {Object} [options]
-   * @param {number} [options.maxSteps=14] - 最大滚动步数
+   * @param {number} [options.maxSteps=20] - 最大滚动步数
    * @param {number} [options.minStep=260] - 单次滚动最小步长
    * @param {number} [options.maxStep=800] - 单次滚动最大步长
    * @param {number} [options.maxDurationMs] - 最长耗时上限 (默认随 maxSteps 估算)
    */
   async humanScroll(page, target, options = {}) {
     const {
-      maxSteps = 14,
+      maxSteps = 20,
       minStep = 260,
       maxStep = 800,
       maxDurationMs = maxSteps * 220 + 800
@@ -3742,7 +3783,7 @@ var MobileHumanize = {
   },
   async humanScroll(page, target, options = {}) {
     const {
-      maxSteps = 12,
+      maxSteps = 20,
       minStep = 180,
       maxStep = 520,
       maxDurationMs = maxSteps * 280 + 1200,
@@ -7379,11 +7420,11 @@ var resolveScreenshotWatermarkifyMeta = async (page, options = {}) => {
     watermark: options.watermark,
     strip: options.strip,
     stripLogoSrc,
-    device: resolvePageDevice(page)
+    device: resolvePageDevice2(page)
   };
 };
 var buildFontFamily = () => 'MiSans, "SF Pro Display", "PingFang SC", "Helvetica Neue", Arial, sans-serif';
-var resolvePageDevice = (page) => normalizeDevice(page?.[PageRuntimeStateKey]?.device);
+var resolvePageDevice2 = (page) => normalizeDevice(page?.[PageRuntimeStateKey]?.device);
 var findStripSegment = (segments, kind) => {
   const found = Array.isArray(segments) ? segments.find((segment) => segment?.kind === kind) : null;
   return found && typeof found === "object" ? found : {};