@bryce3310687963/android-toolkit 1.0.51 → 1.0.56

package/dist/index.js

@@ -883,9 +883,16 @@ async function adbExec(ctx, args, options = {}) {
   const startedAt = Date.now();
   try {
     const { stdout } = await execAdbWithRetry(adbPath, args, options);
-    Logger.useTemplate().adbExec({ duration: Logger.duration(startedAt), args: compactArgs(args) });
+    Logger.useTemplate().adbExec({ duration: Logger.duration(startedAt), args: options.sensitive ? "[REDACTED]" : compactArgs(args) });
     return stdout;
   } catch (error) {
+    if (options.sensitive) {
+      throw new CrawlerError({
+        message: "ADB command failed (sensitive content omitted)",
+        code: isAdbUnavailableError(error) ? Code.AdbUnavailable : Code.AutomationFailed,
+        context: { adbPath }
+      });
+    }
     if (isAdbUnavailableError(error)) {
       throw new CrawlerError({
         message: `adb_unavailable: ${error?.message || String(error)}`,
@@ -914,7 +921,8 @@ async function writeCacheFile(ctx, options = {}) {
   ].join(" && ");
   await Device.adbShell(ctx, [`su -c ${shellQuoteForRemote(command)}`], {
     timeoutMs: Number(options.timeoutMs || 1e4),
-    maxBuffer: Number(options.maxBuffer || 1024)
+    maxBuffer: Number(options.maxBuffer || 1024),
+    sensitive: true
   });
   return filePath;
 }
@@ -1238,8 +1246,8 @@ async function execAdbWithRetry(adbPath, args, options = {}) {
         label: options.label || "adb",
         attempt,
         attempts,
-        args: compactArgs(args),
-        message: error?.message || String(error)
+        args: options.sensitive ? "[REDACTED]" : compactArgs(args),
+        message: options.sensitive ? "sensitive ADB command failed" : error?.message || String(error)
       });
       await sleep(delayMs * attempt);
     }
@@ -1936,8 +1944,32 @@ import { promisify as promisify2 } from "node:util";
 var execFileAsync2 = promisify2(execFile2);
 var DeviceSQLite = {
   query,
-  health
+  health,
+  reset
 };
+async function reset(ctx, options = {}) {
+  const packageName = requireNonEmpty2(ctx?.packageName, "packageName");
+  const dbNamePrefix = requireNonEmpty2(options.dbNamePrefix, "dbNamePrefix");
+  if (!/^[A-Za-z_]\w*(?:\.[A-Za-z_]\w*)+$/.test(packageName) || !/^[A-Za-z_][A-Za-z0-9_.-]*$/.test(dbNamePrefix)) {
+    throw new CrawlerError({ message: "invalid_request: invalid database reset target", code: Code.InvalidRequest });
+  }
+  const command = [
+    "set -e",
+    `db_dir=${shellQuote(`/data/data/${packageName}/databases`)}`,
+    'if [ -L "$db_dir" ]; then echo "refusing symlink database directory" >&2; exit 1; fi',
+    'if [ ! -d "$db_dir" ]; then exit 0; fi',
+    `for db_file in "$db_dir"/${shellQuote(dbNamePrefix)}*; do`,
+    '  [ -e "$db_file" ] || [ -L "$db_file" ] || continue',
+    '  if [ -L "$db_file" ] || [ ! -f "$db_file" ]; then echo "refusing unexpected database entry: $db_file" >&2; exit 1; fi',
+    "done",
+    // 主库和 WAL/SHM/journal 一起删除，避免旧日志在重建时恢复聊天记录。
+    `rm -f -- "$db_dir"/${shellQuote(dbNamePrefix)}*`
+  ].join("\n");
+  await adbSuShell(ctx, command, { timeoutMs: 3e4, maxBuffer: 4096 }).catch((error) => {
+    throw CrawlerError.from(error, { code: Code.AutomationFailed, context: { packageName, dbNamePrefix } });
+  });
+  Logger.info("DeviceSQLite.reset", { packageName, dbNamePrefix });
+}
 async function query(ctx, options = {}) {
   if (!options.sql) {
     throw new CrawlerError({