From 69fecc3bc59f8f4a968368e48f1f06174255e62c Mon Sep 17 00:00:00 2001 From: viarotel Date: Thu, 2 Jan 2025 19:23:26 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=F0=9F=90=9B=20Improve=20wireless=20con?= =?UTF-8?q?nection=20verification=20method?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electron/exposes/adb/index.js | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/electron/exposes/adb/index.js b/electron/exposes/adb/index.js index b7b8e614..cb8906ab 100644 --- a/electron/exposes/adb/index.js +++ b/electron/exposes/adb/index.js @@ -287,15 +287,39 @@ async function battery(id) { } async function pair(host, port, code) { - return shell(`pair ${ipv6Wrapper(host)}:${port} ${code}`) + const { stderr, stdout } = await shell(`pair ${ipv6Wrapper(host)}:${port} ${code}`) + + if (stderr) { + throw stderr + } + + return stdout } async function connect(host, port = 5555) { - return shell(`connect ${ipv6Wrapper(host)}:${port}`) + const { stderr, stdout } = await shell(`connect ${ipv6Wrapper(host)}:${port}`) + + if (stderr) { + throw stderr + } + + const errorKeys = ['cannot', 'failed'] + + if (errorKeys.some(item => stdout.includes(item))) { + throw stdout + } + + return stdout } async function disconnect(host, port = 5555) { - return shell(`disconnect ${ipv6Wrapper(host)}:${port}`) + const { stderr, stdout } = await shell(`disconnect ${ipv6Wrapper(host)}:${port}`) + + if (stderr) { + throw stderr + } + + return stdout } function init() {