@skrillex1224/android-toolkit 1.0.7 → 1.0.9

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({
@@ -1008,7 +1008,10 @@ async function pressEnter2(ctx) {
 }
 async function scroll(ctx, selector, direction, options = {}) {
   const node = await DeviceView.find(ctx, selector, options);
-  const box = node.bounds;
+  await scrollBounds(ctx, node.bounds, 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 x = box.centerX;
@@ -1035,6 +1038,9 @@ 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) {
@@ -1042,7 +1048,7 @@ async function scrollUntilStable(ctx, selector, direction, options = {}) {
     if (currentHash === lastHash) {
       stableRounds += 1;
       if (stableRounds >= stableRoundsTarget) {
-        return { swipes: index, stableRounds, hash: currentHash, hashSource };
+        return { swipes: index, stableRounds, hash: currentHash, hashSource, capped: false };
       }
     } else {
       stableRounds = 0;
@@ -1050,7 +1056,27 @@ async function scrollUntilStable(ctx, selector, direction, options = {}) {
     }
     await scroll(ctx, selector, direction, options);
   }
-  return { swipes: maxSwipes, stableRounds, hash: lastHash, hashSource };
+  return { swipes: maxSwipes, stableRounds, hash: lastHash, hashSource, capped: true };
+}
+async function scrollUntilScreenshotStable(ctx, selector, direction, options, maxSwipes, stableRoundsTarget, hashSource) {
+  const node = await DeviceView.find(ctx, selector, options);
+  const bounds2 = node.bounds;
+  let lastHash = await scrollStateHash(ctx, selector, options, hashSource);
+  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);
+    if (currentHash === lastHash) {
+      stableRounds += 1;
+      if (stableRounds >= stableRoundsTarget) {
+        return { swipes: index + 1, stableRounds, hash: currentHash, hashSource, capped: false };
+      }
+    } else {
+      stableRounds = 0;
+      lastHash = currentHash;
+    }
+  }
+  return { swipes: maxSwipes, stableRounds, hash: lastHash, hashSource, capped: true };
 }
 async function scrollStateHash(ctx, selector, options, hashSource) {
   if (hashSource === "screenshot") {
@@ -1135,8 +1161,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 }
       });
     }
@@ -1185,8 +1211,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 }
     });
   });
@@ -1211,8 +1237,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 }
       });
     });
@@ -1671,17 +1697,28 @@ 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(() => {
+  const shouldHideKeyboard = options.hideKeyboard !== false;
+  if (shouldHideKeyboard) 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) => {
+  try {
+    const topResult = await DeviceInput.scrollToTop(ctx, targetSelector, {
+      maxSwipes: Number(options.scrollToTopMaxSwipes || 12),
+      stableRounds: Number(options.scrollToTopStableRounds || 2),
+      settleMs: 400,
+      stability: options.scrollStability || options.stability || "view"
+    });
+    Logger.info("captureScreen scrollToTop", {
+      swipes: topResult?.swipes,
+      stableRounds: topResult?.stableRounds,
+      hashSource: topResult?.hashSource,
+      capped: topResult?.capped === true
+    });
+  } catch (error) {
+    if (options.strictScrollToTop === true) throw 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(() => {
+    if (shouldHideKeyboard) await Device.hideKeyboard(ctx, { attempts: 1, settleMs: 250 }).catch(() => {
     });
     await sleep(DEFAULT_SETTLE_MS);
     const png = await Device.screenshotPng(ctx);