perf: ♻️ Improve ADB connection stability

viarotel-org · Sep 9, 2024 · 7655ba6 · 7655ba6
1 parent 55ba798
commit 7655ba6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/electron/exposes/adbkit/index.js b/electron/exposes/adbkit/index.js
@@ -117,7 +117,6 @@ const getDeviceIP = async (id) => {
   }
   catch (error) {
     console.warn('adbkit.getDeviceIP.error', error.message)
-    return false
   }
 }
 
@@ -279,6 +278,7 @@ export default () => {
 
   client = Adb.createClient({
     bin: binPath,
+    timeout: 5 * 1000,
   })
 
   return {

diff --git a/src/components/Device/index.vue b/src/components/Device/index.vue
@@ -258,16 +258,21 @@ export default {
         this.deviceList = data
       }
       catch (error) {
-        console.warn(error)
-        if (error?.message || error?.cause?.message) {
-          this.$message.warning(error?.message || error?.cause?.message)
+        const message = error?.message || error?.cause?.message
+
+        console.warn(message)
+
+        if (message && !message.includes('daemon not running')) {
+          this.$message.warning(message)
         }
+
         this.deviceList = []
 
         if (resetResolve) {
           this.handleReset()
         }
       }
+
       this.loading = false
     },
   },