Merge pull request #1913 from ubports/fix-windows-macos

Fix "Internet connection lost" errors
ubports · Apr 21, 2021 · 5d31f45 · 5d31f45
2 parents 31f330b + 63dab24
commit 5d31f45
Show file tree

Hide file tree

Showing 15 changed files with 406 additions and 179 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,8 +33,8 @@ jobs:
           ${{ runner.os }}-build-
           ${{ runner.os }}-
 
-    - name: npm install
-      run: npm install
+    - name: npm ci
+      run: npm ci
     - name: npm audit
       run: npm audit --production
     - name: npm run lint
@@ -73,7 +73,7 @@ jobs:
 
     - name: test
       run: |
-        npm install
+        npm ci
         npm run test
 
     - name: codecov.io
@@ -112,7 +112,7 @@ jobs:
 
     - name: prepare build
       run: |
-        npm install
+        npm ci
         npm run prerender
 
     - name: build linux

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -64,7 +64,7 @@
     "open-cuts-reporter": "^1.0.1",
     "popper.js": "^1.16.0",
     "progressive-downloader": "^1.0.6",
-    "promise-android-tools": "^4.0.5",
+    "promise-android-tools": "^4.0.6",
     "ps-tree": "^1.2.0",
     "sudo-prompt": "^9.2.1",
     "systeminformation": "^5.5.0",

diff --git a/src/core/core.js b/src/core/core.js
@@ -66,40 +66,42 @@ class Core {
    * @returns {Promise}
    */
   prepare(file) {
-    return Promise.all([this.readConfigFile(file), this.plugins.init()]).then(
-      () => {
-        if (this.props.config) {
-          this.selectOs();
-        } else {
-          const wait = this.plugins
-            .wait()
-            .then(device => api.resolveAlias(device))
-            .catch(
-              e =>
-                new Promise(() => {
-                  log.debug(`failed to resolve device name: ${e}`);
-                  mainEvent.emit("user:no-network");
-                })
-            )
-            .then(device => {
-              if (device) {
-                log.info(`device detected: ${device}`);
-                this.setDevice(device);
-              }
-            });
-          ipcMain.once("device:selected", () => (wait ? wait.cancel() : null));
-          api
-            .getDeviceSelects()
-            .then(out => {
-              window.send("device:wait:device-selects-ready", out);
-            })
-            .catch(e => {
-              log.error("getDeviceSelects error: " + e);
-              window.send("user:no-network");
-            });
-        }
+    return Promise.all([
+      this.readConfigFile(file),
+      this.plugins.init().catch(e => errors.toUser(e, "initializing plugins"))
+    ]).then(() => {
+      if (this.props.config) {
+        this.selectOs();
+      } else {
+        const wait = this.plugins
+          .wait()
+          .catch(e => errors.toUser(e, "plugin wait()"))
+          .then(device => api.resolveAlias(device))
+          .catch(
+            e =>
+              new Promise(() => {
+                log.debug(`failed to resolve device name: ${e}`);
+                mainEvent.emit("user:no-network");
+              })
+          )
+          .then(device => {
+            if (device) {
+              log.info(`device detected: ${device}`);
+              this.setDevice(device);
+            }
+          });
+        ipcMain.once("device:selected", () => (wait ? wait.cancel() : null));
+        api
+          .getDeviceSelects()
+          .then(out => {
+            window.send("device:wait:device-selects-ready", out);
+          })
+          .catch(e => {
+            log.error("getDeviceSelects error: " + e);
+            window.send("user:no-network");
+          });
       }
-    );
+    });
   }
 
   /**

diff --git a/src/core/core.spec.js b/src/core/core.spec.js
@@ -127,21 +127,23 @@ describe("Core module", () => {
       jest.spyOn(core, "readConfigFile").mockResolvedValueOnce();
       jest.spyOn(core.plugins, "init").mockResolvedValueOnce();
       jest.spyOn(core.plugins, "wait").mockReturnValueOnce({
-        then: () => ({
-          catch: () => ({
-            then: () => ({
-              cancel: () => {
-                expect(core.readConfigFile).toHaveBeenCalledWith("a");
-                expect(core.readConfigFile).toHaveBeenCalledTimes(1);
-                core.readConfigFile.mockRestore();
-                expect(core.plugins.init).toHaveBeenCalledTimes(1);
-                core.plugins.init.mockRestore();
-                expect(core.plugins.wait).toHaveBeenCalledTimes(1);
-                core.plugins.wait.mockRestore();
-                core.setDevice.mockRestore();
-                core.props.config = { user_actions, handlers };
-                done();
-              }
+        catch: () => ({
+          then: () => ({
+            catch: () => ({
+              then: () => ({
+                cancel: () => {
+                  expect(core.readConfigFile).toHaveBeenCalledWith("a");
+                  expect(core.readConfigFile).toHaveBeenCalledTimes(1);
+                  core.readConfigFile.mockRestore();
+                  expect(core.plugins.init).toHaveBeenCalledTimes(1);
+                  core.plugins.init.mockRestore();
+                  expect(core.plugins.wait).toHaveBeenCalledTimes(1);
+                  core.plugins.wait.mockRestore();
+                  core.setDevice.mockRestore();
+                  core.props.config = { user_actions, handlers };
+                  done();
+                }
+              })
             })
           })
         })
@@ -157,9 +159,11 @@ describe("Core module", () => {
       jest.spyOn(core, "readConfigFile").mockResolvedValueOnce();
       jest.spyOn(core.plugins, "init").mockResolvedValueOnce();
       jest.spyOn(core.plugins, "wait").mockReturnValueOnce({
-        then: () => ({
-          catch: () => ({
-            then: () => null
+        catch: () => ({
+          then: () => ({
+            catch: () => ({
+              then: () => null
+            })
           })
         })
       });

diff --git a/src/core/plugins/adb/plugin.js b/src/core/plugins/adb/plugin.js
@@ -42,10 +42,10 @@ class AdbPlugin extends Plugin {
 
   /**
    * initialize adb server
-   * @returns {Promise}
+   * @returns {Promise<Boolean>}
    */
   init() {
-    return this.adb.startServer();
+    return this.adb.startServer().then(() => true);
   }
 
   /**