@skrillex1224/android-toolkit 1.0.1 → 1.0.3

package/dist/index.js

@@ -215,9 +215,6 @@ var Logger = {
     return `${((Date.now() - startedAt) / 1e3).toFixed(2)}s`;
   }
 };
-function stripAnsi(value) {
-  return String(value || "").replace(/\u001b\[[0-9;]*m/g, "");
-}
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -432,13 +429,25 @@ async function screenshotBase64(ctx) {
   return `data:image/png;base64,${(await screenshotPng(ctx)).toString("base64")}`;
 }
 async function dumpUiXml(ctx) {
-  const raw = await adbShell(ctx, ["uiautomator", "dump", "/dev/tty"], {
+  const dumpPath = `/data/local/tmp/android-toolkit-window-${Date.now()}-${Math.random().toString(16).slice(2)}.xml`;
+  await adbShell(ctx, ["rm", "-f", dumpPath], { timeoutMs: 1e4 }).catch(() => {
+  });
+  await adbShell(ctx, ["uiautomator", "dump", dumpPath], {
     timeoutMs: 3e4,
-    maxBuffer: 16 * 1024 * 1024
+    maxBuffer: 4 * 1024 * 1024
   });
-  const start = String(raw || "").indexOf("<?xml");
-  if (start < 0) throw new CrawlerError({ message: `automation_failed: uiautomator dump missing xml: ${raw}`, code: Code.AutomationFailed });
-  return String(raw || "").slice(start).trim();
+  try {
+    const raw = await adbShell(ctx, ["cat", dumpPath], {
+      timeoutMs: 3e4,
+      maxBuffer: 16 * 1024 * 1024
+    });
+    const start = String(raw || "").indexOf("<?xml");
+    if (start < 0) throw new CrawlerError({ message: `automation_failed: uiautomator dump missing xml: ${raw}`, code: Code.AutomationFailed });
+    return String(raw || "").slice(start).trim();
+  } finally {
+    await adbShell(ctx, ["rm", "-f", dumpPath], { timeoutMs: 1e4 }).catch(() => {
+    });
+  }
 }
 async function wakeAndUnlock(ctx) {
   await pressKey(ctx, "KEYCODE_WAKEUP").catch(() => {
@@ -1868,11 +1877,7 @@ var useAndroidToolKit = () => ({
   Constants: constants_exports,
   Errors: errors_exports,
   Logger,
-  Context,
-  $Internals: {
-    LOG_TEMPLATES,
-    stripAnsi
-  }
+  Context
 });
 export {
   useAndroidToolKit