@skrillex1224/android-toolkit 1.0.7 → 1.0.9

package/dist/browser.js

@@ -25,7 +25,7 @@ var Code = Object.freeze({
   ContentUnavailable: 30010003,
   SourceExtractionFailed: 30010004,
   AutomationFailed: 30010005,
-  DataAccessUnavailable: 30010008,
+  AppRuntimeUnavailable: 30010008,
   AppNotInstalled: 30010009
 });
 var Status = Object.freeze({

package/dist/browser.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/constants.js", "../src/errors.js", "../entrys/browser.js"],
-  "sourcesContent": ["export const Code = Object.freeze({\n    Success: 0,\n    UnknownError: -1,\n    NotLogin: 30000001,\n    Timeout: 30000003,\n    InitialTimeout: 30000004,\n    OverallTimeout: 30000005,\n    InvalidRequest: 30010001,\n    AdbUnavailable: 30010002,\n    ContentUnavailable: 30010003,\n    SourceExtractionFailed: 30010004,\n    AutomationFailed: 30010005,\n    DataAccessUnavailable: 30010008,\n    AppNotInstalled: 30010009,\n});\n\nexport const Status = Object.freeze({\n    Success: 'SUCCESS',\n    Failed: 'FAILED',\n});\n\nexport const UnicodeIme = Object.freeze({\n    packageName: 'io.appium.settings',\n    component: 'io.appium.settings/.UnicodeIME',\n    inputAction: 'ADB_INPUT_TEXT',\n});\n\nexport const AppiumSettings = Object.freeze({\n    packageName: 'io.appium.settings',\n    clipboardReceiver: 'io.appium.settings/.receivers.ClipboardReceiver',\n    clipboardGetAction: 'io.appium.settings.clipboard.get',\n});\n\nconst normalizeShare = (share) => {\n    const source = share && typeof share === 'object' ? share : {};\n    return {\n        mode: 'clipboard',\n        prefix: String(source.prefix || '').trim(),\n        xurl: Array.isArray(source.xurl) ? source.xurl : [],\n    };\n};\n\nconst createActorInfo = (info) => {\n    const key = String(info.key || '').trim();\n    return Object.freeze({\n        key,\n        name: String(info.name || key),\n        icon: String(info.icon || `https://static.heartbitai.com/general/actors/${key}.png`),\n        share: Object.freeze(normalizeShare(info.share)),\n    });\n};\n\nexport const ActorInfo = Object.freeze({\n    'doubao.android': createActorInfo({\n        key: 'doubao.android',\n        name: '\u8C46\u5305 Android',\n        share: {\n            prefix: 'https://www.doubao.com/thread/',\n            xurl: [],\n        },\n    }),\n});\n", "import { Code } from './constants.js';\n\nexport class CrawlerError extends Error {\n    constructor(input = {}, options = {}) {\n        const payload = typeof input === 'string' ? { message: input } : input;\n        super(payload.message || 'Android crawler error', options);\n        this.name = 'CrawlerError';\n        this.code = payload.code || Code.UnknownError;\n        this.context = payload.context || {};\n    }\n\n    static isCrawlerError(error) {\n        return error instanceof CrawlerError || error?.name === 'CrawlerError';\n    }\n\n    static from(error, fallback = {}) {\n        if (CrawlerError.isCrawlerError(error)) return error;\n        return new CrawlerError({\n            message: error?.message || String(error),\n            code: fallback.code || Code.UnknownError,\n            context: fallback.context || {},\n        });\n    }\n}\n\nexport function serializeError(error) {\n    if (!error) return { message: '' };\n    return {\n        name: error.name || 'Error',\n        message: error.message || String(error),\n        stack: error.stack || '',\n        code: error.code || '',\n        context: error.context || undefined,\n    };\n}\n", "import * as Constants from '../src/constants.js';\nimport * as Errors from '../src/errors.js';\n\nconst ToolkitMode = Object.freeze({\n    default: 'default',\n});\n\nexport const useAndroidToolKit = () => {\n    return {\n        Constants,\n        Errors,\n    };\n};\n\nuseAndroidToolKit.Mode = ToolkitMode;\n"],
+  "sourcesContent": ["export const Code = Object.freeze({\n    Success: 0,\n    UnknownError: -1,\n    NotLogin: 30000001,\n    Timeout: 30000003,\n    InitialTimeout: 30000004,\n    OverallTimeout: 30000005,\n    InvalidRequest: 30010001,\n    AdbUnavailable: 30010002,\n    ContentUnavailable: 30010003,\n    SourceExtractionFailed: 30010004,\n    AutomationFailed: 30010005,\n    AppRuntimeUnavailable: 30010008,\n    AppNotInstalled: 30010009,\n});\n\nexport const Status = Object.freeze({\n    Success: 'SUCCESS',\n    Failed: 'FAILED',\n});\n\nexport const UnicodeIme = Object.freeze({\n    packageName: 'io.appium.settings',\n    component: 'io.appium.settings/.UnicodeIME',\n    inputAction: 'ADB_INPUT_TEXT',\n});\n\nexport const AppiumSettings = Object.freeze({\n    packageName: 'io.appium.settings',\n    clipboardReceiver: 'io.appium.settings/.receivers.ClipboardReceiver',\n    clipboardGetAction: 'io.appium.settings.clipboard.get',\n});\n\nconst normalizeShare = (share) => {\n    const source = share && typeof share === 'object' ? share : {};\n    return {\n        mode: 'clipboard',\n        prefix: String(source.prefix || '').trim(),\n        xurl: Array.isArray(source.xurl) ? source.xurl : [],\n    };\n};\n\nconst createActorInfo = (info) => {\n    const key = String(info.key || '').trim();\n    return Object.freeze({\n        key,\n        name: String(info.name || key),\n        icon: String(info.icon || `https://static.heartbitai.com/general/actors/${key}.png`),\n        share: Object.freeze(normalizeShare(info.share)),\n    });\n};\n\nexport const ActorInfo = Object.freeze({\n    'doubao.android': createActorInfo({\n        key: 'doubao.android',\n        name: '\u8C46\u5305 Android',\n        share: {\n            prefix: 'https://www.doubao.com/thread/',\n            xurl: [],\n        },\n    }),\n});\n", "import { Code } from './constants.js';\n\nexport class CrawlerError extends Error {\n    constructor(input = {}, options = {}) {\n        const payload = typeof input === 'string' ? { message: input } : input;\n        super(payload.message || 'Android crawler error', options);\n        this.name = 'CrawlerError';\n        this.code = payload.code || Code.UnknownError;\n        this.context = payload.context || {};\n    }\n\n    static isCrawlerError(error) {\n        return error instanceof CrawlerError || error?.name === 'CrawlerError';\n    }\n\n    static from(error, fallback = {}) {\n        if (CrawlerError.isCrawlerError(error)) return error;\n        return new CrawlerError({\n            message: error?.message || String(error),\n            code: fallback.code || Code.UnknownError,\n            context: fallback.context || {},\n        });\n    }\n}\n\nexport function serializeError(error) {\n    if (!error) return { message: '' };\n    return {\n        name: error.name || 'Error',\n        message: error.message || String(error),\n        stack: error.stack || '',\n        code: error.code || '',\n        context: error.context || undefined,\n    };\n}\n", "import * as Constants from '../src/constants.js';\nimport * as Errors from '../src/errors.js';\n\nconst ToolkitMode = Object.freeze({\n    default: 'default',\n});\n\nexport const useAndroidToolKit = () => {\n    return {\n        Constants,\n        Errors,\n    };\n};\n\nuseAndroidToolKit.Mode = ToolkitMode;\n"],
   "mappings": "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",
   "names": []
 }

package/dist/index.cjs

@@ -57,7 +57,7 @@ var Code = Object.freeze({
   ContentUnavailable: 30010003,
   SourceExtractionFailed: 30010004,
   AutomationFailed: 30010005,
-  DataAccessUnavailable: 30010008,
+  AppRuntimeUnavailable: 30010008,
   AppNotInstalled: 30010009
 });
 var Status = Object.freeze({
@@ -1037,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;
@@ -1064,6 +1067,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) {
@@ -1071,7 +1077,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;
@@ -1079,7 +1085,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") {
@@ -1164,8 +1190,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 }
       });
     }
@@ -1214,8 +1240,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 }
     });
   });
@@ -1240,8 +1266,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 }
       });
     });
@@ -1700,17 +1726,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);