Merge pull request #63 from ubports/connection-reset

Handle connection reset

CHANGELOG.md

@@ -11,6 +11,9 @@ promise-android-tools versioning started at 1.0.0, but this changelog was not ad
 ### New
 
 - Adb: add getprop() and getSystemImageCapability() ([#61](https://github.com/ubports/promise-android-tools/pull/61))
+
+### Changed
+
 - Update dependencies ([6d47250c40bdf9dc1a24d748e72b13f8d50ae36d](https://github.com/ubports/promise-android-tools/commit/6d47250c40bdf9dc1a24d748e72b13f8d50ae36d))
 
 ## [4.0.8] - 2022-03-10

package.json

@@ -1,6 +1,6 @@
 {
   "name": "promise-android-tools",
-  "version": "4.0.9",
+  "version": "4.0.10",
   "description": "A wrapper for adb, fastboot, and heimdall that returns convenient promises.",
   "main": "./lib/module.cjs",
   "type": "module",

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") ||

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"
   }
 ];