use vanilla axios

appium · Sep 20, 2023 · c8f1e8f · c8f1e8f
1 parent 00613e6
commit c8f1e8f
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/uiautomator2.js b/lib/uiautomator2.js
@@ -305,6 +305,8 @@ class UiAutomator2Server {
   async cleanupAutomationLeftovers (strictCleanup = false) {
     this.log.debug(`Performing ${strictCleanup ? 'strict' : 'shallow'} cleanup of automation leftovers`);
 
+    const axiosTimeout = 500;
+
     const waitStop = async () => {
       // Wait for the process stop by sending a status request to the port.
       // We observed the process stop could be delayed, then it caused the process stop
@@ -314,9 +316,13 @@ class UiAutomator2Server {
       try {
         await waitForCondition(async () => {
           try {
-            await this.adb.processExists(SERVER_TEST_PACKAGE_ID);
+            await axios({
+              url: `http://${this.host}:${this.systemPort}/status`,
+              timeout: axiosTimeout,
+            });
+          } catch (err) {
             return true;
-          } catch (ignore) {}
+          }
         }, {
           waitMs: timeout,
           intervalMs: 100,
@@ -329,7 +335,7 @@ class UiAutomator2Server {
     try {
       const {value} = (await axios({
         url: `http://${this.host}:${this.systemPort}/sessions`,
-        timeout: 500,
+        timeout: axiosTimeout,
       })).data;
       const activeSessionIds = value.map(({id}) => id).filter(Boolean);
       if (activeSessionIds.length) {