@skrillex1224/android-toolkit 1.0.8 → 1.0.10

package/dist/index.js

@@ -28,7 +28,7 @@ var Code = Object.freeze({
   ContentUnavailable: 30010003,
   SourceExtractionFailed: 30010004,
   AutomationFailed: 30010005,
-  DataAccessUnavailable: 30010008,
+  AppRuntimeUnavailable: 30010008,
   AppNotInstalled: 30010009
 });
 var Status = Object.freeze({
@@ -253,7 +253,7 @@ function safeJson(value) {
 
 // src/device.js
 var execFileAsync = promisify(execFile);
-var Device = {
+var Device2 = {
   adbExec,
   adbShell,
   forceStopApp,
@@ -634,7 +634,7 @@ function createApifyKit(options = {}) {
       if (failActor) {
         let base64 = "";
         try {
-          base64 = await Device.screenshotBase64(ctx);
+          base64 = await Device2.screenshotBase64(ctx);
         } catch (error) {
           base64 = `\u622A\u56FE\u5931\u8D25: ${error?.message || String(error)}`;
         }
@@ -752,7 +752,7 @@ var DeviceView = {
   normalizeSelector
 };
 async function snapshot(ctx, options = {}) {
-  const xml = options.xml || await Device.dumpUiXml(ctx);
+  const xml = options.xml || await Device2.dumpUiXml(ctx);
   const parsed = parser.parse(xml);
   const roots = toArray(parsed?.hierarchy?.node).map((node) => normalizeNode(node, null, 0));
   const flat = [];
@@ -936,6 +936,12 @@ function selectorLabel(selector) {
 }
 
 // src/device-input.js
+var SCROLL_MAX_SWIPES = 24;
+var SCROLL_STABLE_ROUNDS = 1;
+var SCROLL_SWIPE_RATIO = 0.72;
+var SCROLL_DURATION_MS = 360;
+var SCROLL_SETTLE_MS = 500;
+var SCROLL_HASH_SOURCE = "screenshot";
 var DeviceInput = {
   click,
   tap: click,
@@ -949,12 +955,12 @@ var DeviceInput = {
 };
 async function click(ctx, selectorOrPoint, options = {}) {
   if (isPoint(selectorOrPoint)) {
-    await Device.tapAbsolute(ctx, selectorOrPoint.x, selectorOrPoint.y);
+    await Device2.tapAbsolute(ctx, selectorOrPoint.x, selectorOrPoint.y);
     return { point: selectorOrPoint };
   }
   if (isBounds(selectorOrPoint)) {
     const point2 = centerOf(selectorOrPoint);
-    await Device.tapAbsolute(ctx, point2.x, point2.y);
+    await Device2.tapAbsolute(ctx, point2.x, point2.y);
     return { point: point2 };
   }
   const target = await DeviceView.find(ctx, selectorOrPoint, options);
@@ -973,7 +979,7 @@ async function click(ctx, selectorOrPoint, options = {}) {
     actual: simplifyNode(actual),
     point
   });
-  await Device.tapAbsolute(ctx, point.x, point.y);
+  await Device2.tapAbsolute(ctx, point.x, point.y);
   await sleep(Number(options.settleMs || 250));
   return { target, actual, point };
 }
@@ -984,7 +990,7 @@ async function fill(ctx, selector, text2, options = {}) {
     settleMs: Number(options.focusSettleMs || 350)
   });
   try {
-    await Device.typeText(ctx, value);
+    await Device2.typeText(ctx, value);
   } catch (error) {
     throw new CrawlerError({
       message: `automation_failed: View \u5199\u5165\u6587\u672C\u5931\u8D25 ${JSON.stringify(selector)}`,
@@ -1001,10 +1007,10 @@ async function fill(ctx, selector, text2, options = {}) {
   return { target: clicked.actual || clicked.target, chars: value.length };
 }
 async function press(ctx, key) {
-  await Device.pressKey(ctx, key);
+  await Device2.pressKey(ctx, key);
 }
 async function pressEnter2(ctx) {
-  await Device.pressEnter(ctx);
+  await Device2.pressEnter(ctx);
 }
 async function scroll(ctx, selector, direction, options = {}) {
   const node = await DeviceView.find(ctx, selector, options);
@@ -1012,8 +1018,8 @@ async function scroll(ctx, selector, direction, options = {}) {
 }
 async function scrollBounds(ctx, bounds2, direction, options = {}) {
   const box = bounds2;
-  const ratio = Number(options.swipeRatio || 0.72);
-  const durationMs = Number(options.durationMs || 360);
+  const ratio = Number(options.swipeRatio || SCROLL_SWIPE_RATIO);
+  const durationMs = Number(options.durationMs || SCROLL_DURATION_MS);
   const x = box.centerX;
   const distance = Math.max(40, box.height * ratio);
   const down = String(direction || "").toLowerCase() === "down";
@@ -1025,8 +1031,8 @@ async function scrollBounds(ctx, bounds2, direction, options = {}) {
     x,
     y: down ? Math.min(box.bottom - 10, from.y + distance) : Math.max(box.top + 10, from.y - distance)
   };
-  await Device.swipe(ctx, from, to, durationMs);
-  await sleep(Number(options.settleMs || 500));
+  await Device2.swipe(ctx, from, to, durationMs);
+  await sleep(Number(options.settleMs || SCROLL_SETTLE_MS));
 }
 async function scrollToEnd(ctx, selector, options = {}) {
   return scrollUntilStable(ctx, selector, "up", options);
@@ -1035,56 +1041,30 @@ async function scrollToTop(ctx, selector, options = {}) {
   return scrollUntilStable(ctx, selector, "down", options);
 }
 async function scrollUntilStable(ctx, selector, direction, options = {}) {
-  const maxSwipes = Math.max(1, Number(options.maxSwipes || 20));
-  const stableRoundsTarget = Math.max(1, Number(options.stableRounds || 2));
-  const hashSource = String(options.stability || options.hashSource || "view");
-  if (hashSource === "screenshot") {
-    return scrollUntilScreenshotStable(ctx, selector, direction, options, maxSwipes, stableRoundsTarget, hashSource);
-  }
-  let lastHash = "";
-  let stableRounds = 0;
-  for (let index = 0; index < maxSwipes; index += 1) {
-    const currentHash = await scrollStateHash(ctx, selector, options, hashSource);
-    if (currentHash === lastHash) {
-      stableRounds += 1;
-      if (stableRounds >= stableRoundsTarget) {
-        return { swipes: index, stableRounds, hash: currentHash, hashSource, capped: false };
-      }
-    } else {
-      stableRounds = 0;
-      lastHash = currentHash;
-    }
-    await scroll(ctx, selector, direction, options);
-  }
-  return { swipes: maxSwipes, stableRounds, hash: lastHash, hashSource, capped: true };
-}
-async function scrollUntilScreenshotStable(ctx, selector, direction, options, maxSwipes, stableRoundsTarget, hashSource) {
+  const maxSwipes = Math.max(1, Number(options.maxSwipes || SCROLL_MAX_SWIPES));
+  const stableRoundsTarget = Math.max(1, Number(options.stableRounds || SCROLL_STABLE_ROUNDS));
   const node = await DeviceView.find(ctx, selector, options);
   const bounds2 = node.bounds;
-  let lastHash = await scrollStateHash(ctx, selector, options, hashSource);
+  let lastHash = await scrollStateHash(ctx);
   let stableRounds = 0;
   for (let index = 0; index < maxSwipes; index += 1) {
     await scrollBounds(ctx, bounds2, direction, options);
-    const currentHash = await scrollStateHash(ctx, selector, options, hashSource);
+    const currentHash = await scrollStateHash(ctx);
     if (currentHash === lastHash) {
       stableRounds += 1;
       if (stableRounds >= stableRoundsTarget) {
-        return { swipes: index + 1, stableRounds, hash: currentHash, hashSource, capped: false };
+        return { swipes: index + 1, stableRounds, hash: currentHash, hashSource: SCROLL_HASH_SOURCE, capped: false };
       }
     } else {
       stableRounds = 0;
       lastHash = currentHash;
     }
   }
-  return { swipes: maxSwipes, stableRounds, hash: lastHash, hashSource, capped: true };
+  return { swipes: maxSwipes, stableRounds, hash: lastHash, hashSource: SCROLL_HASH_SOURCE, capped: true };
 }
-async function scrollStateHash(ctx, selector, options, hashSource) {
-  if (hashSource === "screenshot") {
-    const png = await Device.screenshotPng(ctx);
-    return createHash2("sha256").update(png).digest("hex");
-  }
-  const node = await DeviceView.find(ctx, selector, options);
-  return DeviceView.hashNode(node);
+async function scrollStateHash(ctx) {
+  const png = await Device2.screenshotPng(ctx);
+  return createHash2("sha256").update(png).digest("hex");
 }
 function nearestClickable(node) {
   let current = node;
@@ -1161,8 +1141,8 @@ async function query(ctx, options = {}) {
     const dbPaths = await resolveDeviceDbPaths(ctx, config);
     if (dbPaths.length === 0) {
       throw new CrawlerError({
-        message: "data_access_unavailable: sqlite database not found",
-        code: Code.DataAccessUnavailable,
+        message: "app_runtime_unavailable: sqlite database not found",
+        code: Code.AppRuntimeUnavailable,
         context: { dbDir: config.dbDir, dbPath: config.dbPath, dbNamePrefix: config.dbNamePrefix }
       });
     }
@@ -1211,8 +1191,8 @@ async function resolveDeviceDbPaths(ctx, config) {
     maxBuffer: 2 * 1024 * 1024
   }).catch((error) => {
     throw new CrawlerError({
-      message: `data_access_unavailable: sqlite dbDir unavailable ${error?.message || String(error)}`,
-      code: Code.DataAccessUnavailable,
+      message: `app_runtime_unavailable: sqlite dbDir unavailable ${error?.message || String(error)}`,
+      code: Code.AppRuntimeUnavailable,
       context: { dbDir: config.dbDir }
     });
   });
@@ -1237,8 +1217,8 @@ async function pullDatabaseSnapshot(ctx, dbPath, localDir) {
     await adbSuShell(ctx, copyCommand, { timeoutMs: 3e4, maxBuffer: 4 * 1024 * 1024 });
     await adbPull(adbPath, serial, remoteDb, localDb).catch((error) => {
       throw new CrawlerError({
-        message: `data_access_unavailable: sqlite snapshot pull failed ${error?.message || String(error)}`,
-        code: Code.DataAccessUnavailable,
+        message: `app_runtime_unavailable: sqlite snapshot pull failed ${error?.message || String(error)}`,
+        code: Code.AppRuntimeUnavailable,
         context: { dbPath }
       });
     });
@@ -1251,7 +1231,7 @@ async function pullDatabaseSnapshot(ctx, dbPath, localDir) {
   }
 }
 async function adbSuShell(ctx, command, options = {}) {
-  return Device.adbShell(ctx, [`su -c ${shellQuote(command)}`], options);
+  return Device2.adbShell(ctx, [`su -c ${shellQuote(command)}`], options);
 }
 async function queryLocalSQLite(dbPath, config) {
   const payloadPath = `${dbPath}.query.json`;
@@ -1688,6 +1668,11 @@ var DEFAULT_COLUMNS = 3;
 var DEFAULT_SETTLE_MS = 550;
 var DEFAULT_TIMEOUT_MS = 5e4;
 var DEFAULT_POLL_INTERVAL_MS = 800;
+var RESET_TO_TOP_MAX_SWIPES = 16;
+var RESET_TO_TOP_STABLE_ROUNDS = 1;
+var CAPTURE_SCROLL_STEP_RATIO = 0.56;
+var CAPTURE_SCROLL_DURATION_MS = 360;
+var SPRITE_GAP = 16;
 var Share = {
   captureScreen,
   captureLink
@@ -1697,18 +1682,34 @@ async function captureScreen(ctx, options = {}) {
   const frameBuffers = [];
   const seen = /* @__PURE__ */ new Set();
   const targetSelector = options.selector || { id: "message_list" };
-  await Device.hideKeyboard(ctx, { attempts: 2, settleMs: 350 }).catch(() => {
-  });
-  await DeviceInput.scrollToTop(ctx, targetSelector, {
-    maxSwipes: Number(options.scrollToTopMaxSwipes || 12),
-    stableRounds: 2,
-    settleMs: 400
-  }).catch((error) => {
-    Logger.warn("captureScreen scrollToTop skipped", { message: error?.message || String(error) });
-  });
-  for (let index = 0; index < DEFAULT_CAPTURE_COUNT; index += 1) {
-    await Device.hideKeyboard(ctx, { attempts: 1, settleMs: 250 }).catch(() => {
+  const resetToTop = options.resetToTop !== false;
+  let topResult = null;
+  if (resetToTop) {
+    topResult = await DeviceInput.scrollToTop(ctx, targetSelector, {
+      maxSwipes: RESET_TO_TOP_MAX_SWIPES,
+      stableRounds: RESET_TO_TOP_STABLE_ROUNDS,
+      settleMs: 400
+    });
+    Logger.info("captureScreen scrollToTop", {
+      swipes: topResult?.swipes,
+      stableRounds: topResult?.stableRounds,
+      hashSource: topResult?.hashSource,
+      capped: topResult?.capped === true
     });
+    if (topResult?.capped === true) {
+      throw new CrawlerError({
+        message: `source_extraction_failed: \u622A\u56FE\u524D\u672A\u80FD\u786E\u8BA4\u56DE\u5230\u9876\u90E8 swipes=${topResult.swipes} stableRounds=${topResult.stableRounds}`,
+        code: Code.SourceExtractionFailed,
+        context: {
+          selector: targetSelector,
+          swipes: topResult.swipes,
+          stableRounds: topResult.stableRounds,
+          hashSource: topResult.hashSource
+        }
+      });
+    }
+  }
+  for (let index = 0; index < DEFAULT_CAPTURE_COUNT; index += 1) {
     await sleep(DEFAULT_SETTLE_MS);
     const png = await Device.screenshotPng(ctx);
     const hash = createHash3("sha256").update(png).digest("hex");
@@ -1717,18 +1718,21 @@ async function captureScreen(ctx, options = {}) {
     frameBuffers.push(png);
     if (index >= DEFAULT_CAPTURE_COUNT - 1) break;
     await DeviceInput.scroll(ctx, targetSelector, "up", {
-      swipeRatio: 0.72,
-      durationMs: 360,
+      swipeRatio: CAPTURE_SCROLL_STEP_RATIO,
+      durationMs: CAPTURE_SCROLL_DURATION_MS,
       settleMs: DEFAULT_SETTLE_MS
     }).catch(() => {
     });
   }
-  const sprite = await composeSprite(frameBuffers, { columns: DEFAULT_COLUMNS, gap: 16 });
+  const sprite = await composeSprite(frameBuffers, { columns: DEFAULT_COLUMNS, gap: SPRITE_GAP });
   const compression = resolveImageCompression(options);
   const base64 = await compressImageBufferToBase64(sprite, compression);
   Logger.success("Share.captureScreen", {
     duration: Logger.duration(startedAt),
     frameCount: frameBuffers.length,
+    scrollStepRatio: CAPTURE_SCROLL_STEP_RATIO,
+    resetToTop,
+    topCapped: topResult?.capped === true,
     base64Bytes: Math.ceil(base64.length)
   });
   return `data:image/jpeg;base64,${base64}`;
@@ -1743,7 +1747,6 @@ async function captureLink(ctx, options = {}) {
     });
   }
   const timeoutMs = Number(options.timeoutMs || DEFAULT_TIMEOUT_MS);
-  const pollIntervalMs = Number(options.pollIntervalMs || DEFAULT_POLL_INTERVAL_MS);
   const deadline = Date.now() + timeoutMs;
   const prefix = String(share.prefix || "").trim();
   Logger.start("Share.captureLink", { actor: actorInfo.key, prefix, timeoutMs });
@@ -1765,7 +1768,7 @@ async function captureLink(ctx, options = {}) {
     if (link && link === beforeLink) {
       lastEvent = { ...event, rejected: "same_as_baseline", beforeLink };
     }
-    await sleep(pollIntervalMs);
+    await sleep(DEFAULT_POLL_INTERVAL_MS);
   }
   throw new CrawlerError({
     message: "source_extraction_failed: \u672A\u6355\u83B7\u5206\u4EAB\u94FE\u63A5",
@@ -1861,7 +1864,7 @@ async function run(handler, options = {}) {
   const kit = {
     Launch,
     ApifyKit: apifyKit,
-    Device,
+    Device: Device2,
     DeviceInput,
     DeviceView,
     DeviceSQLite,
@@ -1912,7 +1915,7 @@ var useAndroidToolKit = () => {
     DeviceInput,
     DeviceView,
     DeviceSQLite,
-    Device,
+    Device: Device2,
     Mutation,
     Share,
     Constants: constants_exports,