Handle protocol fault / connection reset error seen in ubports/ubport…

…s-installer#2528
ubports · Mar 23, 2022 · fcd920d · fcd920d
1 parent be88acd
commit fcd920d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/adb.js b/src/adb.js
@@ -59,7 +59,11 @@ export class Adb extends Tool {
       stderr?.includes("error: device still authorizing")
     ) {
       return "unauthorized";
-    } else if (stderr?.includes("error: device offline")) {
+    } else if (
+      stderr?.includes("error: device offline") ||
+      stderr?.includes("error: protocol fault") ||
+      stderr?.includes("connection reset")
+    ) {
       return "device offline";
     } else if (
       stderr?.includes("no devices/emulators found") ||

diff --git a/tests/test-data/known_errors.js b/tests/test-data/known_errors.js
@@ -56,6 +56,15 @@ export const adbErrors = [
     error: { killed: false, code: 1, signal: null, cmd: "command" },
     stdout: "",
     stderr: "error: error: device offline\n"
+  },
+  {
+    expectedReturn: "device offline",
+    error: {
+      message:
+        "Command failed: adb.exe -P 5037 shell getprop ro.product.device\nerror: protocol fault (couldn't read status): connection reset",
+      code: 1
+    },
+    stderr: "error: protocol fault (couldn't read status): connection reset"
   }
 ];