Merge pull request #1002 from ubports/timeout

Timeout wait steps
ubports · Nov 6, 2019 · 6cad2b9 · 6cad2b9
2 parents 2f353aa + d416a31
commit 6cad2b9
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
     "jquery-i18next": "^1.2.0",
     "mkdirp": "^0.5.1",
     "popper.js": "^1.16.0",
-    "promise-android-tools": "^1.0.9",
+    "promise-android-tools": "^1.0.10",
     "ps-tree": "^1.2.0",
     "request": "^2.79.0",
     "system-image-node-module": "^1.0.10",

diff --git a/src/devices.js b/src/devices.js
@@ -239,7 +239,52 @@ function installStep(step) {
         global.mainEvent.emit(
           "user:action",
           global.installConfig.user_actions[step.action],
-          resolve
+          () => {
+            switch (step.action) {
+              case "recovery":
+              case "system":
+                global.mainEvent.emit("user:write:working", "particles");
+                global.mainEvent.emit(
+                  "user:write:status",
+                  "Waiting for device",
+                  true
+                );
+                global.mainEvent.emit(
+                  "user:write:under",
+                  "Adb is scanning for devices"
+                );
+                function adbWait() {
+                  return adb
+                    .waitForDevice()
+                    .catch(() =>
+                      mainEvent.emit("user:connection-lost", adbWait)
+                    );
+                }
+                return adbWait();
+              case "bootloader":
+                global.mainEvent.emit("user:write:working", "particles");
+                global.mainEvent.emit(
+                  "user:write:status",
+                  "Waiting for device",
+                  true
+                );
+                global.mainEvent.emit(
+                  "user:write:under",
+                  "Fastboot is scanning for devices"
+                );
+                function fastbootWait() {
+                  return fastboot
+                    .waitForDevice()
+                    .catch(() =>
+                      mainEvent.emit("user:connection-lost", fastbootWait)
+                    );
+                }
+                return fastbootWait();
+              default:
+                resolve();
+                break;
+            }
+          }
         );
       });
     default: