@skrillex1224/playwright-toolkit 2.1.223 → 2.1.225

package/README.md

@@ -76,12 +76,18 @@ await Actor.exit();
 
 ## 🛡️ 反检测功能
 
+### Desktop / Mobile Device
+
+`Constants.ActorInfo[actor].device` 是 visitor 的设备真源，只允许 `desktop` 和 `mobile`，未配置时默认 `desktop`。visitor 继续通过 `RuntimeEnv.parseInput(input, actor.key)` 和 `Launch.getPlaywrightCrawlerOptions({ runtimeState })` 传递状态；把某个 actor 的 `device` 改成 `mobile` 后，toolkit 会生成 Android Chrome 移动端指纹、移动端 viewport/touch context，并切到移动端 Humanize 行为。
+
+已有 `browser_profile.core` 会记录 `device`。当旧 core 的 `device` 与当前 ActorInfo 不一致时，Launch 会重建 core，避免配置看起来是移动端但实际仍复用桌面端指纹。
+
 ### 架构
 
 | 层次       | 问题                    | 解决方案                                |
 | ---------- | ----------------------- | --------------------------------------- |
 | **指纹层** | UA/屏幕/语言/时区一致性 | Crawlee `useFingerprints` + `AntiCheat` |
-| **行为层** | 机械输入/点击/滚动      | `ghost-cursor-playwright` + Humanize    |
+| **行为层** | 机械输入/点击/滚动      | 桌面端 `ghost-cursor-playwright`，移动端 touch Humanize |
 | **页面层** | 验证码/风控检测         | Captcha 监控器                          |
 
 ### API 一览
@@ -210,14 +216,12 @@ const cookies = Utils.parseCookies('key=value; key2=value2', '.example.com');
 await page.context().addCookies(cookies);
 
 // 全页面滚动截图 (自动检测所有滚动元素，强制展开后截图，默认会执行 watermarkify)
-// 默认会将返回的 base64 压缩到 8MiB 以内，避免 Apify/Crawlee dataset 单条 item 超限
+// 默认会将返回的 base64 压缩到 5MiB 以内，避免 Apify/Crawlee dataset 单条 item 超限
 const base64Image = await Share.captureScreen(page);
 
-// 移动端宽度截图（moblie 拼写保持兼容）
-const mobileImage = await Share.captureScreen(page, { moblie: true });
-
-// 仅恢复宽度（restore 支持 true / false / 'width-only' / 'height-only'）
-const image2 = await Share.captureScreen(page, { restore: 'width-only' });
+// 截图只使用当前页面运行时 viewport；移动端请通过 ActorInfo.device 切换，不再通过截图参数覆盖
+// 仅在完成后恢复页面高度和展开过的滚动容器
+const image2 = await Share.captureScreen(page, { restore: true });
 
 // 显式配置 watermarkify：全页淡水印 + 底部一行细条
 const image3 = await Share.captureScreen(page, {

package/dist/browser.js

@@ -2511,8 +2511,10 @@ var constants_exports = {};
 __export(constants_exports, {
   ActorInfo: () => ActorInfo,
   Code: () => Code,
+  Device: () => Device,
   PresetOfLiveViewKey: () => PresetOfLiveViewKey,
-  Status: () => Status
+  Status: () => Status,
+  normalizeDevice: () => normalizeDevice
 });
 var Code = {
   Success: 0,
@@ -2528,6 +2530,17 @@ var Status = {
   Failed: "FAILED"
 };
 var PresetOfLiveViewKey = "LIVE_VIEW_SCREENSHOT";
+var Device = Object.freeze({
+  Desktop: "desktop",
+  Mobile: "mobile"
+});
+var normalizeDevice = (value, fallback = Device.Desktop) => {
+  const normalizedFallback = String(fallback || "").trim().toLowerCase() === Device.Mobile ? Device.Mobile : Device.Desktop;
+  const raw = String(value || "").trim().toLowerCase();
+  if (raw === Device.Mobile) return Device.Mobile;
+  if (raw === Device.Desktop) return Device.Desktop;
+  return normalizedFallback;
+};
 var createActorInfo = (info) => {
   const normalizeDomain = (value) => {
     if (!value) return "";
@@ -2605,12 +2618,14 @@ var createActorInfo = (info) => {
   const domain = normalizeDomain(info.domain);
   const path = normalizePath(info.path);
   const share = normalizeShare(info.share);
+  const device = normalizeDevice(info.device);
   return {
     ...info,
     protocol,
     domain,
     path,
     share,
+    device,
     get icon() {
       if (info.icon) return info.icon;
       return buildIcon(this);
@@ -2662,6 +2677,7 @@ var ActorInfo = {
     name: "\u8C46\u5305",
     domain: "www.doubao.com",
     path: "/",
+    device: Device.Mobile,
     share: {
       mode: "response",
       prefix: "https://www.doubao.com/thread/",
@@ -2677,6 +2693,7 @@ var ActorInfo = {
     name: "DeepSeek",
     domain: "chat.deepseek.com",
     path: "/",
+    device: Device.Mobile,
     share: {
       mode: "response",
       prefix: "https://chat.deepseek.com/share/",
@@ -2892,6 +2909,12 @@ var PageRuntimeStateKey = "__playwright_toolkit_runtime_state__";
 var BROWSER_PROFILE_SCHEMA_VERSION = 1;
 var rememberedRuntimeState = null;
 var isPlainObject = (value) => value && typeof value === "object" && !Array.isArray(value);
+var normalizeKnownDevice = (value) => {
+  const raw = String(value || "").trim().toLowerCase();
+  if (raw === Device.Mobile) return Device.Mobile;
+  if (raw === Device.Desktop) return Device.Desktop;
+  return "";
+};
 var deepClone = (value) => {
   if (value == null) return value;
   try {
@@ -3246,6 +3269,10 @@ var normalizeObservedBrowserProfile = (value) => {
 var normalizeBrowserProfileCore = (value) => {
   const source = isPlainObject(value) ? value : {};
   const profile = {};
+  const device = normalizeKnownDevice(source.device);
+  if (device) {
+    profile.device = device;
+  }
   if (isPlainObject(source.fingerprint) && Object.keys(source.fingerprint).length > 0) {
     profile.fingerprint = deepClone(source.fingerprint);
   }
@@ -3303,9 +3330,11 @@ var mergeBrowserProfilePayload = (target = {}, source = {}) => {
   if (Object.keys(mergedCore).length === 0 && Object.keys(incomingCore).length > 0) {
     mergedCore = incomingCore;
   } else if (Object.keys(incomingCore).length > 0) {
+    const currentDevice = normalizeKnownDevice(currentCore.device);
+    const incomingDevice = normalizeKnownDevice(incomingCore.device);
     const currentVersion = Number(currentCore.browser_major_version || 0);
     const incomingVersion = Number(incomingCore.browser_major_version || 0);
-    if (currentVersion > 0 && incomingVersion > 0 && currentVersion !== incomingVersion) {
+    if (incomingDevice && currentDevice !== incomingDevice || currentVersion > 0 && incomingVersion > 0 && currentVersion !== incomingVersion) {
       mergedCore = incomingCore;
     }
   }
@@ -3356,8 +3385,14 @@ var normalizeRuntimeState = (source = {}, actor = "") => {
   }
   return RuntimeEnv.parseInput(source, actor);
 };
+var resolveInputDevice = (input = {}, runtime = {}, actor = "") => {
+  var _a, _b, _c;
+  const actorDevice = (_b = (_a = ActorInfo) == null ? void 0 : _a[actor]) == null ? void 0 : _b.device;
+  return normalizeDevice((_c = actorDevice != null ? actorDevice : input == null ? void 0 : input.device) != null ? _c : runtime == null ? void 0 : runtime.device);
+};
 var RuntimeEnv = {
   tryParseJSON,
+  normalizeDevice,
   normalizeCookies,
   normalizeLocalStorage,
   normalizeSessionStorage,
@@ -3383,6 +3418,7 @@ var RuntimeEnv = {
   parseInput(input = {}, actor = "") {
     const runtime = tryParseJSON(input == null ? void 0 : input.runtime) || {};
     const resolvedActor = String(actor || (input == null ? void 0 : input.actor) || "").trim();
+    const device = resolveInputDevice(input, runtime, resolvedActor);
     const query = String((input == null ? void 0 : input.query) || "").trim();
     const cookies = normalizeCookies(runtime == null ? void 0 : runtime.cookies);
     const cookieMap = buildCookieMap(cookies);
@@ -3402,6 +3438,7 @@ var RuntimeEnv = {
     }
     const state = {
       actor: resolvedActor,
+      device,
       runtime: normalizedRuntime,
       envId,
       query,
@@ -3447,7 +3484,10 @@ var RuntimeEnv = {
   },
   setBrowserProfileCore(source = {}, core = {}, actor = "") {
     const state = normalizeRuntimeState(source, actor);
-    const normalizedCore = normalizeBrowserProfileCore(core);
+    const normalizedCore = normalizeBrowserProfileCore({
+      ...core,
+      device: normalizeKnownDevice(core == null ? void 0 : core.device) || state.device
+    });
     state.browserProfileCore = normalizedCore;
     state.browserProfile = buildBrowserProfilePayload(normalizedCore, state.browserProfileObserved);
     if (Object.keys(state.browserProfile).length > 0) {