@skrillex1224/android-toolkit 1.0.6 → 1.0.8

package/dist/index.cjs

@@ -757,6 +757,9 @@ function sanitizeData(value, depth = 0, seen = /* @__PURE__ */ new WeakSet()) {
   return out;
 }
 
+// src/device-input.js
+var import_node_crypto2 = require("node:crypto");
+
 // src/device-view.js
 var import_node_crypto = require("node:crypto");
 var import_fast_xml_parser = require("fast-xml-parser");
@@ -1034,7 +1037,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;
@@ -1060,15 +1066,18 @@ async function scrollToTop(ctx, selector, 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 node = await DeviceView.find(ctx, selector, options);
-    const currentHash = DeviceView.hashNode(node);
+    const currentHash = await scrollStateHash(ctx, selector, options, hashSource);
     if (currentHash === lastHash) {
       stableRounds += 1;
       if (stableRounds >= stableRoundsTarget) {
-        return { swipes: index, stableRounds, hash: currentHash };
+        return { swipes: index, stableRounds, hash: currentHash, hashSource, capped: false };
       }
     } else {
       stableRounds = 0;
@@ -1076,7 +1085,35 @@ async function scrollUntilStable(ctx, selector, direction, options = {}) {
     }
     await scroll(ctx, selector, direction, options);
   }
-  return { swipes: maxSwipes, stableRounds, hash: lastHash };
+  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") {
+    const png = await Device.screenshotPng(ctx);
+    return (0, import_node_crypto2.createHash)("sha256").update(png).digest("hex");
+  }
+  const node = await DeviceView.find(ctx, selector, options);
+  return DeviceView.hashNode(node);
 }
 function nearestClickable(node) {
   let current = node;
@@ -1531,7 +1568,7 @@ function selectorLabel2(selector) {
 }
 
 // src/share.js
-var import_node_crypto2 = require("node:crypto");
+var import_node_crypto3 = require("node:crypto");
 var import_jimp2 = require("jimp");
 
 // src/internals/compression.js
@@ -1703,7 +1740,7 @@ async function captureScreen(ctx, options = {}) {
     });
     await sleep(DEFAULT_SETTLE_MS);
     const png = await Device.screenshotPng(ctx);
-    const hash = (0, import_node_crypto2.createHash)("sha256").update(png).digest("hex");
+    const hash = (0, import_node_crypto3.createHash)("sha256").update(png).digest("hex");
     if (seen.has(hash)) break;
     seen.add(hash);
     frameBuffers.push(png);