@skrillex1224/playwright-toolkit 2.1.240 → 2.1.242

package/dist/index.js

@@ -140,8 +140,9 @@ var ActorInfo = {
   qbot: createActorInfo({
     key: "qbot",
     name: "QQ\u6D4F\u89C8\u5668AI\u641C",
-    domain: "sogou.com",
+    domain: "m.sogou.com",
     path: "/web",
+    device: Device.Mobile,
     share: {
       mode: "dom",
       prefix: "",
@@ -722,14 +723,16 @@ var expandScrollableContent = async (page, options = {}) => {
     expandDocumentElements: options.expandDocumentElements === true
   });
 };
-var pinBottomAffixedElements = async (page, options = {}) => {
+var adjustAffixedElementsForExpandedScreenshot = async (page, options = {}) => {
   return await page.evaluate(({ className, targetHeight }) => {
+    const viewportWidth = window.innerWidth || document.documentElement?.clientWidth || document.body?.clientWidth || 0;
     const viewportHeight = window.innerHeight || document.documentElement?.clientHeight || document.body?.clientHeight || 0;
+    const scrollY = window.scrollY || window.pageYOffset || 0;
     const safeTargetHeight = Math.ceil(Number(targetHeight) || 0);
-    const deltaY = safeTargetHeight - viewportHeight;
-    if (deltaY <= 1) {
+    if (safeTargetHeight <= viewportHeight + 1) {
       return 0;
     }
+    const hasOwn = (source, key) => Object.prototype.hasOwnProperty.call(source, key);
     const isVisible = (el, style, rect) => {
       if (!el || !style || !rect) return false;
       if (style.display === "none" || style.visibility === "hidden" || style.visibility === "collapse") {
@@ -738,7 +741,7 @@ var pinBottomAffixedElements = async (page, options = {}) => {
       if (Number(style.opacity) === 0) return false;
       return rect.width > 0 && rect.height > 0;
     };
-    const bottomThreshold = Math.max(24, Math.min(96, viewportHeight * 0.12));
+    const edgeThreshold = Math.max(24, Math.min(96, viewportHeight * 0.12));
     const maxAffixedHeight = Math.max(56, viewportHeight * 0.65);
     const candidates = [];
     document.querySelectorAll("*").forEach((el) => {
@@ -748,28 +751,49 @@ var pinBottomAffixedElements = async (page, options = {}) => {
       const rect = el.getBoundingClientRect();
       if (!isVisible(el, style, rect)) return;
       if (rect.height > maxAffixedHeight) return;
-      if (rect.bottom < viewportHeight - bottomThreshold) return;
+      if (rect.width < viewportWidth * 0.25 && rect.height < 80) return;
+      const top = Number.parseFloat(style.top);
       const bottom = Number.parseFloat(style.bottom);
+      const hasTopRule = Number.isFinite(top) && top <= Math.max(160, viewportHeight * 0.25);
       const hasBottomRule = Number.isFinite(bottom) && bottom <= Math.max(160, viewportHeight * 0.25);
-      const isNearViewportBottom = rect.bottom >= viewportHeight - bottomThreshold;
-      if (!hasBottomRule && !isNearViewportBottom) return;
-      candidates.push(el);
+      const isNearViewportTop = rect.top <= edgeThreshold;
+      const isNearViewportBottom = rect.bottom >= viewportHeight - edgeThreshold;
+      const edge = (hasBottomRule || isNearViewportBottom) && !(hasTopRule || isNearViewportTop) ? "bottom" : "top";
+      if (position === "fixed" && edge === "top" && !hasTopRule && !isNearViewportTop) return;
+      if (position === "fixed" && edge === "bottom" && !hasBottomRule && !isNearViewportBottom) return;
+      if (position === "sticky" && !hasTopRule && !hasBottomRule && !isNearViewportTop && !isNearViewportBottom) return;
+      candidates.push({ el, position, edge });
     });
-    const candidateSet = new Set(candidates);
-    const topLevelCandidates = candidates.filter((el) => {
+    const candidateSet = new Set(candidates.map(({ el }) => el));
+    const topLevelCandidates = candidates.filter(({ el }) => {
       for (let parent = el.parentElement; parent; parent = parent.parentElement) {
         if (candidateSet.has(parent)) return false;
       }
       return true;
     });
-    topLevelCandidates.forEach((el) => {
-      if (!Object.prototype.hasOwnProperty.call(el.dataset, "pkBottomPinned")) {
-        el.dataset.pkBottomPinned = "1";
+    topLevelCandidates.forEach(({ el, position, edge }) => {
+      if (!hasOwn(el.dataset, "pkAffixedAdjusted")) {
+        el.dataset.pkAffixedAdjusted = "1";
+        el.dataset.pkOrigPosition = el.style.getPropertyValue("position") || "";
+        el.dataset.pkOrigPositionPriority = el.style.getPropertyPriority("position") || "";
+        el.dataset.pkOrigTop = el.style.getPropertyValue("top") || "";
+        el.dataset.pkOrigTopPriority = el.style.getPropertyPriority("top") || "";
+        el.dataset.pkOrigBottom = el.style.getPropertyValue("bottom") || "";
+        el.dataset.pkOrigBottomPriority = el.style.getPropertyPriority("bottom") || "";
         el.dataset.pkOrigTranslate = el.style.getPropertyValue("translate") || "";
         el.dataset.pkOrigTranslatePriority = el.style.getPropertyPriority("translate") || "";
       }
       el.classList.add(className);
-      el.style.setProperty("translate", `0 ${Math.round(deltaY)}px`, "important");
+      if (position === "fixed") {
+        const deltaY = edge === "bottom" ? safeTargetHeight - viewportHeight - scrollY : -scrollY;
+        if (Math.abs(deltaY) > 1) {
+          el.style.setProperty("translate", `0 ${Math.round(deltaY)}px`, "important");
+        }
+        return;
+      }
+      el.style.setProperty("position", "relative", "important");
+      el.style.setProperty("top", "auto", "important");
+      el.style.setProperty("bottom", "auto", "important");
     });
     return topLevelCandidates.length;
   }, {
@@ -777,7 +801,7 @@ var pinBottomAffixedElements = async (page, options = {}) => {
     targetHeight: options.targetHeight
   });
 };
-var restoreBottomAffixedElements = async (page) => {
+var restoreAffixedElementsForExpandedScreenshot = async (page) => {
   await page.evaluate((className) => {
     const hasOwn = (source, key) => Object.prototype.hasOwnProperty.call(source, key);
     const expansionKeys = [
@@ -786,13 +810,28 @@ var restoreBottomAffixedElements = async (page) => {
       "pkOrigMinHeight",
       "pkOrigMaxHeight"
     ];
-    document.querySelectorAll('[data-pk-bottom-pinned="1"]').forEach((el) => {
+    document.querySelectorAll('[data-pk-affixed-adjusted="1"]').forEach((el) => {
+      if (hasOwn(el.dataset, "pkOrigPosition")) {
+        el.style.setProperty("position", el.dataset.pkOrigPosition || "", el.dataset.pkOrigPositionPriority || "");
+        delete el.dataset.pkOrigPosition;
+        delete el.dataset.pkOrigPositionPriority;
+      }
+      if (hasOwn(el.dataset, "pkOrigTop")) {
+        el.style.setProperty("top", el.dataset.pkOrigTop || "", el.dataset.pkOrigTopPriority || "");
+        delete el.dataset.pkOrigTop;
+        delete el.dataset.pkOrigTopPriority;
+      }
+      if (hasOwn(el.dataset, "pkOrigBottom")) {
+        el.style.setProperty("bottom", el.dataset.pkOrigBottom || "", el.dataset.pkOrigBottomPriority || "");
+        delete el.dataset.pkOrigBottom;
+        delete el.dataset.pkOrigBottomPriority;
+      }
       if (hasOwn(el.dataset, "pkOrigTranslate")) {
         el.style.setProperty("translate", el.dataset.pkOrigTranslate || "", el.dataset.pkOrigTranslatePriority || "");
         delete el.dataset.pkOrigTranslate;
         delete el.dataset.pkOrigTranslatePriority;
       }
-      delete el.dataset.pkBottomPinned;
+      delete el.dataset.pkAffixedAdjusted;
       const stillExpanded = expansionKeys.some((key) => hasOwn(el.dataset, key));
       if (!stillExpanded) {
         el.classList.remove(className);
@@ -821,8 +860,8 @@ var prepareExpandedFullPageScreenshot = async (page, options = {}) => {
     });
     viewportResized = true;
   } else {
-    await pinBottomAffixedElements(page, { targetHeight }).catch((error) => {
-      logger.warning(`\u79FB\u52A8\u7AEF\u5438\u5E95\u5143\u7D20\u91CD\u5B9A\u4F4D\u5931\u8D25: ${error?.message || error}`);
+    await adjustAffixedElementsForExpandedScreenshot(page, { targetHeight }).catch((error) => {
+      logger.warning(`\u79FB\u52A8\u7AEF\u5438\u9644\u5143\u7D20\u91CD\u5B9A\u4F4D\u5931\u8D25: ${error?.message || error}`);
     });
   }
   if (settleMs > 0) {
@@ -928,8 +967,8 @@ var captureExpandedFullPageScreenshot = async (page, options = {}) => {
       maxClipHeight: state.targetHeight
     });
   } finally {
-    await restoreBottomAffixedElements(page).catch((error) => {
-      logger.warning(`\u79FB\u52A8\u7AEF\u5438\u5E95\u5143\u7D20\u6062\u590D\u5931\u8D25: ${error?.message || error}`);
+    await restoreAffixedElementsForExpandedScreenshot(page).catch((error) => {
+      logger.warning(`\u79FB\u52A8\u7AEF\u5438\u9644\u5143\u7D20\u6062\u590D\u5931\u8D25: ${error?.message || error}`);
     });
     if (options.restore) {
       await restoreExpandedFullPageScreenshot(page, state);
@@ -3369,6 +3408,26 @@ var waitJitter = (base, jitterPercent = 0.3) => delay3(jitterMs(base, jitterPerc
 // src/internals/humanize/mobile.js
 var logger7 = createInternalLogger("Humanize.Mobile");
 var initializedPages = /* @__PURE__ */ new WeakSet();
+var DEFAULT_TAP_TIMEOUT_MS = 2500;
+var DEFAULT_MOUSE_TAP_FALLBACK_TIMEOUT_MS = 1200;
+var DEFAULT_ACTIVATE_FALLBACK_TIMEOUT_MS = 900;
+var INTERACTIVE_SELECTOR = [
+  "button",
+  '[role="button"]',
+  "a[href]",
+  "label",
+  "input",
+  "textarea",
+  "select",
+  "summary",
+  '[contenteditable="true"]',
+  '[tabindex]:not([tabindex="-1"])'
+].join(",");
+var EDITABLE_SELECTOR = [
+  "input",
+  "textarea",
+  '[contenteditable="true"]'
+].join(",");
 var clamp = (value, min, max) => Math.min(max, Math.max(min, value));
 var resolveViewport = (page) => page?.viewportSize?.() || { width: 390, height: 844 };
 var describeTarget = (target) => {
@@ -3391,8 +3450,24 @@ var clipBoxToViewport = (box, viewport) => {
   }
   return box;
 };
+var withTimeout = async (operation, timeoutMs, label) => {
+  const safeTimeoutMs = Math.max(50, Number(timeoutMs || 0));
+  let timeoutId = null;
+  try {
+    return await Promise.race([
+      Promise.resolve().then(operation),
+      new Promise((_, reject) => {
+        timeoutId = setTimeout(() => {
+          reject(new Error(`${label} timeout after ${safeTimeoutMs}ms`));
+        }, safeTimeoutMs);
+      })
+    ]);
+  } finally {
+    if (timeoutId) clearTimeout(timeoutId);
+  }
+};
 var checkElementVisibility = async (element) => {
-  return element.evaluate((el) => {
+  return element.evaluate((el, interactiveSelector) => {
     const targetStyle = window.getComputedStyle(el);
     if (!targetStyle || targetStyle.display === "none" || targetStyle.visibility === "hidden" || targetStyle.visibility === "collapse") {
       return { code: "NOT_INTERACTABLE", reason: "\u5143\u7D20\u4E0D\u53EF\u89C1", direction: "down" };
@@ -3409,10 +3484,12 @@ var checkElementVisibility = async (element) => {
     let clipTop = 0;
     let clipBottom = viewH;
     let isFixed = false;
+    let positioning = null;
     for (let node = el; node && node !== document.body; node = node.parentElement) {
       const style = window.getComputedStyle(node);
       if (style && (style.position === "fixed" || style.position === "sticky")) {
         isFixed = true;
+        positioning = style.position;
         break;
       }
     }
@@ -3448,21 +3525,10 @@ var checkElementVisibility = async (element) => {
         direction: centerY < clipTop ? "up" : "down",
         cy: centerY,
         viewH,
-        isFixed
+        isFixed,
+        positioning
       };
     }
-    const interactiveSelector = [
-      "button",
-      '[role="button"]',
-      "a[href]",
-      "label",
-      "input",
-      "textarea",
-      "select",
-      "summary",
-      '[contenteditable="true"]',
-      '[tabindex]:not([tabindex="-1"])'
-    ].join(",");
     const targetInteractive = typeof el.closest === "function" ? el.closest(interactiveSelector) : null;
     const sameInteractiveTarget = (pointElement) => {
       if (!pointElement) return false;
@@ -3484,6 +3550,7 @@ var checkElementVisibility = async (element) => {
         id: node.id || "",
         className,
         isFixed: Boolean(style && (style.position === "fixed" || style.position === "sticky")),
+        positioning: style?.position || "",
         top: rect2 ? rect2.top : null,
         bottom: rect2 ? rect2.bottom : null,
         left: rect2 ? rect2.left : null,
@@ -3501,7 +3568,7 @@ var checkElementVisibility = async (element) => {
     for (const point of samplePoints) {
       const pointElement = document.elementFromPoint(point.x, point.y);
       if (sameInteractiveTarget(pointElement)) {
-        return { code: "VISIBLE", isFixed };
+        return { code: "VISIBLE", isFixed, positioning };
       }
       obstruction = obstruction || describeElement(pointElement);
     }
@@ -3513,14 +3580,15 @@ var checkElementVisibility = async (element) => {
         obstruction,
         cy,
         viewH,
-        isFixed
+        isFixed,
+        positioning
       };
     }
-    return { code: "VISIBLE", isFixed };
-  });
+    return { code: "VISIBLE", isFixed, positioning };
+  }, INTERACTIVE_SELECTOR);
 };
 var resolveSafeTapPoint = async (element) => {
-  return element.evaluate((el) => {
+  return element.evaluate((el, interactiveSelector) => {
     const rect = el.getBoundingClientRect();
     if (!rect || rect.width <= 0 || rect.height <= 0) {
       return null;
@@ -3557,18 +3625,6 @@ var resolveSafeTapPoint = async (element) => {
     if (visibleWidth <= 1 || visibleHeight <= 1) {
       return null;
     }
-    const interactiveSelector = [
-      "button",
-      '[role="button"]',
-      "a[href]",
-      "label",
-      "input",
-      "textarea",
-      "select",
-      "summary",
-      '[contenteditable="true"]',
-      '[tabindex]:not([tabindex="-1"])'
-    ].join(",");
     const targetInteractive = typeof el.closest === "function" ? el.closest(interactiveSelector) : null;
     const sameInteractiveTarget = (pointElement) => {
       if (!pointElement) return false;
@@ -3606,6 +3662,46 @@ var resolveSafeTapPoint = async (element) => {
       x: chosen.x,
       y: chosen.y
     };
+  }, INTERACTIVE_SELECTOR);
+};
+var activateElementFallback = async (element, point = null, options = {}) => {
+  return element.evaluate((el, { innerPoint, innerOptions, interactiveSelector, editableSelector }) => {
+    const pointElement = innerPoint ? document.elementFromPoint(innerPoint.x, innerPoint.y) : null;
+    const nearestInteractive = (node) => {
+      if (!node || typeof node.closest !== "function") return null;
+      return node.closest(interactiveSelector);
+    };
+    const targetInteractive = nearestInteractive(el);
+    const pointInteractive = nearestInteractive(pointElement);
+    let target = null;
+    if (pointInteractive && (pointInteractive === targetInteractive || pointInteractive === el || pointInteractive.contains(el) || el.contains(pointInteractive))) {
+      target = pointInteractive;
+    }
+    target = target || targetInteractive || el;
+    const editable = typeof target.closest === "function" ? target.closest(editableSelector) : null;
+    if (editable && typeof editable.focus === "function") {
+      editable.focus({ preventScroll: true });
+      if (innerOptions.editableOnly) {
+        return { activated: true, method: "focus", tag: editable.tagName || "" };
+      }
+    }
+    if (typeof target.focus === "function") {
+      target.focus({ preventScroll: true });
+    }
+    if (!innerOptions.editableOnly && typeof target.click === "function") {
+      target.click();
+      return { activated: true, method: "dom-click", tag: target.tagName || "" };
+    }
+    return {
+      activated: Boolean(editable),
+      method: editable ? "focus" : "none",
+      tag: target?.tagName || ""
+    };
+  }, {
+    innerPoint: point,
+    innerOptions: options || {},
+    interactiveSelector: INTERACTIVE_SELECTOR,
+    editableSelector: EDITABLE_SELECTOR
   });
 };
 var getScrollableRect = async (element) => {
@@ -3810,12 +3906,31 @@ var dispatchTouchSwipe = async (page, deltaY, options = {}) => {
     }
   }
 };
-var tapPoint = async (page, point) => {
+var tapPoint = async (page, point, options = {}) => {
+  const {
+    timeoutMs = DEFAULT_TAP_TIMEOUT_MS,
+    mouseFallbackTimeoutMs = DEFAULT_MOUSE_TAP_FALLBACK_TIMEOUT_MS,
+    allowMouseFallback = true
+  } = options;
   if (page.touchscreen && typeof page.touchscreen.tap === "function") {
-    await page.touchscreen.tap(point.x, point.y);
-    return;
+    try {
+      await withTimeout(
+        () => page.touchscreen.tap(point.x, point.y),
+        timeoutMs,
+        "touchscreen.tap"
+      );
+      return { method: "touchscreen" };
+    } catch (error) {
+      logger7.warn(`tapPoint | touchscreen.tap \u5931\u8D25\u6216\u8D85\u65F6\uFF0C\u5C1D\u8BD5\u9F20\u6807\u515C\u5E95: ${error?.message || error}`);
+      if (!allowMouseFallback) throw error;
+    }
   }
-  await page.mouse.click(point.x, point.y);
+  await withTimeout(
+    () => page.mouse.click(point.x, point.y),
+    mouseFallbackTimeoutMs,
+    "mouse.click fallback"
+  );
+  return { method: "mouse" };
 };
 var MobileHumanize = {
   jitterMs,
@@ -3868,6 +3983,10 @@ var MobileHumanize = {
         return { element, didScroll, restore: null };
       }
       const scrollRect = await getScrollableRect(element);
+      if (!scrollRect && status.isFixed && status.code === "OUT_OF_VIEWPORT") {
+        logger7.warn(`humanScroll | fixed/sticky \u76EE\u6807\u4E0D\u5728\u89C6\u53E3\u5185\uFF0C\u9875\u9762\u6EDA\u52A8\u65E0\u6CD5\u6539\u53D8\u5176\u4F4D\u7F6E (direction=${status.direction || "unknown"})`);
+        return { element, didScroll, restore: null };
+      }
       if (!scrollRect && status.isFixed && status.code === "OBSTRUCTED") {
         logger7.warn(`humanScroll | fixed/sticky \u76EE\u6807\u88AB\u906E\u6321\uFF0C\u6EDA\u52A8\u65E0\u6CD5\u89E3\u9664 (${status.obstruction?.tag || "unknown"})`);
         return { element, didScroll, restore: null };
@@ -3988,7 +4107,12 @@ var MobileHumanize = {
     const {
       reactionDelay = 220,
       throwOnMissing = true,
-      scrollIfNeeded = true
+      scrollIfNeeded = true,
+      tapTimeoutMs = DEFAULT_TAP_TIMEOUT_MS,
+      mouseFallbackTimeoutMs = DEFAULT_MOUSE_TAP_FALLBACK_TIMEOUT_MS,
+      activateFallbackTimeoutMs = DEFAULT_ACTIVATE_FALLBACK_TIMEOUT_MS,
+      fallbackDomClick = true,
+      fallbackDomClickOnTapError = true
     } = options;
     const targetDesc = describeTarget(target);
     logger7.start("humanClick", `target=${targetDesc}`);
@@ -3999,6 +4123,9 @@ var MobileHumanize = {
         await tapPoint(page, {
           x: viewport.width * (0.45 + Math.random() * 0.1),
           y: viewport.height * (0.48 + Math.random() * 0.12)
+        }, {
+          timeoutMs: tapTimeoutMs,
+          mouseFallbackTimeoutMs
         });
         logger7.success("humanClick", "Tapped current position");
         return true;
@@ -4013,6 +4140,19 @@ var MobileHumanize = {
       }
       const status = await checkElementVisibility(element).catch(() => null);
       if (status && status.code !== "VISIBLE") {
+        if (fallbackDomClick && status.isFixed && status.code === "OUT_OF_VIEWPORT") {
+          const fallback = await withTimeout(
+            () => activateElementFallback(element, null, {
+              editableOnly: true
+            }),
+            activateFallbackTimeoutMs,
+            "focus fallback"
+          ).catch(() => null);
+          if (fallback?.activated) {
+            logger7.warn(`humanClick: fixed/sticky \u76EE\u6807\u4E0D\u5728\u89C6\u53E3\u5185\uFF0C\u5DF2\u7528 ${fallback.method} \u6FC0\u6D3B`);
+            return true;
+          }
+        }
         const message = `\u5143\u7D20\u4E0D\u53EF\u70B9\u51FB: ${status.reason || status.code}`;
         if (throwOnMissing) throw new Error(message);
         logger7.warn(`humanClick: ${message}\uFF0C\u8DF3\u8FC7\u70B9\u51FB`);
@@ -4027,7 +4167,23 @@ var MobileHumanize = {
       await waitJitter(reactionDelay, 0.45);
       const safePoint = await resolveSafeTapPoint(element).catch(() => null);
       const tapTarget = safePoint || randomPointInBox(clipBoxToViewport(box, resolveViewport(page)), 0.2);
-      await tapPoint(page, tapTarget);
+      try {
+        await tapPoint(page, tapTarget, {
+          timeoutMs: tapTimeoutMs,
+          mouseFallbackTimeoutMs
+        });
+      } catch (tapError) {
+        if (!fallbackDomClickOnTapError) throw tapError;
+        const fallback = await withTimeout(
+          () => activateElementFallback(element, tapTarget, {
+            editableOnly: false
+          }),
+          activateFallbackTimeoutMs,
+          "activation fallback"
+        ).catch(() => null);
+        if (!fallback?.activated) throw tapError;
+        logger7.warn(`humanClick: tap \u5931\u8D25\u540E\u5DF2\u7528 ${fallback.method} \u515C\u5E95: ${tapError?.message || tapError}`);
+      }
       await waitJitter(120, 0.35);
       logger7.success("humanClick");
       return true;
@@ -6845,7 +7001,7 @@ var getHostname = (url) => {
     return "\u672C\u5730\u9875\u9762";
   }
 };
-var withTimeout = async (promise, timeoutMs) => {
+var withTimeout2 = async (promise, timeoutMs) => {
   const safeTimeoutMs = Math.max(0, Number(timeoutMs) || 0);
   if (!safeTimeoutMs) {
     return promise;
@@ -6930,7 +7086,7 @@ var resolveWithCustomResolver = async (page, baseMeta, options = {}) => {
   const serverAddr = response && typeof response.serverAddr === "function" ? await response.serverAddr().catch(() => null) : null;
   const controller = typeof AbortController === "function" ? new AbortController() : null;
   try {
-    const resolved = await withTimeout(
+    const resolved = await withTimeout2(
       Promise.resolve(resolver({
         page,
         response,
@@ -7230,13 +7386,13 @@ var resolveWithIpLookup = async (page, options = {}) => {
     const contentType = normalizeText(await pickHeaderValue(response, ["content-type"]));
     let rawText = "";
     if (response && typeof response.text === "function") {
-      rawText = String(await withTimeout(
+      rawText = String(await withTimeout2(
         response.text().catch(() => ""),
         timeoutMs
       ) || "");
     }
     if (!rawText) {
-      rawText = String(await withTimeout(
+      rawText = String(await withTimeout2(
         probePage.evaluate(() => {
           return document.body?.innerText || document.documentElement?.innerText || "";
         }).catch(() => ""),