@skrillex1224/android-toolkit 1.0.5 → 1.0.7

package/dist/index.js

@@ -728,6 +728,9 @@ function sanitizeData(value, depth = 0, seen = /* @__PURE__ */ new WeakSet()) {
   return out;
 }
 
+// src/device-input.js
+import { createHash as createHash2 } from "node:crypto";
+
 // src/device-view.js
 import { createHash } from "node:crypto";
 import { XMLParser } from "fast-xml-parser";
@@ -1031,15 +1034,15 @@ 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");
   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 };
       }
     } else {
       stableRounds = 0;
@@ -1047,7 +1050,15 @@ 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 };
+}
+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);
 }
 function nearestClickable(node) {
   let current = node;
@@ -1323,8 +1334,24 @@ async function waitForStable(ctx, selectors, options = {}) {
   let stableSince = 0;
   let mutationCount = 0;
   let wasPaused = false;
+  let snapshotErrorCount = 0;
+  let lastSnapshotError = null;
   while (Date.now() < deadline) {
-    const snapshot2 = await captureSnapshot(ctx, selectorList, options);
+    const snapshot2 = await captureSnapshot(ctx, selectorList, options).catch((error) => {
+      snapshotErrorCount += 1;
+      lastSnapshotError = error;
+      if (snapshotErrorCount === 1 || snapshotErrorCount % 5 === 0) {
+        Logger.warn("Mutation.waitForStable snapshot skipped", {
+          snapshotErrorCount,
+          message: error?.message || String(error)
+        });
+      }
+      return null;
+    });
+    if (!snapshot2) {
+      await sleep(pollIntervalMs);
+      continue;
+    }
     if (!foundInitial) {
       if (snapshot2.found || Date.now() >= initialDeadline) {
         foundInitial = true;
@@ -1372,7 +1399,7 @@ async function waitForStable(ctx, selectors, options = {}) {
     }
     await sleep(pollIntervalMs);
   }
-  throw new Error(`Mutation.waitForStable \u8D85\u65F6 (${timeout}ms), \u5DF2\u68C0\u6D4B\u5230 ${mutationCount} \u6B21\u53D8\u5316`);
+  throw new Error(`Mutation.waitForStable \u8D85\u65F6 (${timeout}ms), \u5DF2\u68C0\u6D4B\u5230 ${mutationCount} \u6B21\u53D8\u5316, snapshotErrorCount=${snapshotErrorCount}, lastSnapshotError=${lastSnapshotError?.message || ""}`);
 }
 async function waitForStableAcrossRoots(ctx, selectors, options = {}) {
   return waitForStable(ctx, selectors, options);
@@ -1486,7 +1513,7 @@ function selectorLabel2(selector) {
 }
 
 // src/share.js
-import { createHash as createHash2 } from "node:crypto";
+import { createHash as createHash3 } from "node:crypto";
 import { Jimp as Jimp2, JimpMime as JimpMime2 } from "jimp";
 
 // src/internals/compression.js
@@ -1658,7 +1685,7 @@ async function captureScreen(ctx, options = {}) {
     });
     await sleep(DEFAULT_SETTLE_MS);
     const png = await Device.screenshotPng(ctx);
-    const hash = createHash2("sha256").update(png).digest("hex");
+    const hash = createHash3("sha256").update(png).digest("hex");
     if (seen.has(hash)) break;
     seen.add(hash);
     frameBuffers.push(png);