fix: 🐛 Abnormal built-in terminal adb command

viarotel-org · Mar 10, 2024 · 368551a · 368551a
1 parent bf2d2b4
commit 368551a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/...s/TerminalDialog/composables/adb-spawn.js → ...s/TerminalDialog/composables/adb-async.js b/...s/TerminalDialog/composables/adb-spawn.js → ...s/TerminalDialog/composables/adb-async.js
diff --git a/src/components/Device/components/TerminalAction/components/TerminalDialog/composables/adb.js b/src/components/Device/components/TerminalAction/components/TerminalDialog/composables/adb.js
@@ -7,7 +7,18 @@ export function useAdb({ loading }) {
     loading.value = true
     const command = args.slice(1).join(' ')
 
-    const { stderr, stdout } = await $adb.shell(command || 'help')
+    let stderr
+    let stdout
+
+    try {
+      const res = await $adb.shell(command || 'help')
+
+      stdout = res?.stdout
+      stderr = res?.stderr
+    }
+    catch (error) {
+      stderr = error?.message || JSON.stringify(error) || 'Command failed'
+    }
 
     if (stderr) {
       return createStderr(stderr)

diff --git a/src/components/Device/components/TerminalAction/components/TerminalDialog/index.vue b/src/components/Device/components/TerminalAction/components/TerminalDialog/index.vue
@@ -45,7 +45,7 @@ import VueCommand, {
   listFormatter,
 } from 'vue-command'
 import 'vue-command/dist/vue-command.css'
-import { useAdb } from './composables/adb.js'
+import { useAdb } from './composables/adb-async.js'
 import { useScrcpy } from './composables/scrcpy.js'
 import { useGnirehtet } from './composables/gnirehtet.js'