Make stop to wait until close

lib/device-connections-factory.js

@@ -67,45 +67,49 @@ class iProxy {
     }
     this.localServer.on('error', (e) => this.log.warn(e.message));
 
-    this.onBeforeProcessExit = () => {
-      if (this.localServer?.listening) {
-        this.localServer.close((e) => {
-          if (e) {
-            this.log.debug(e);
-          } else {
-            this.log.info(`The connection to ${this.udid} has been closed`);
-          }
-          this.localServer = null;
-        });
+    this.onBeforeProcessExit = async () => {
+      try {
+        await this._closeLocalServer();
+      } catch (e) {
+        this.log.debug(e);
       }
     };
     // Make sure we free up the socket on process exit
     process.on('beforeExit', this.onBeforeProcessExit);
   }
 
-  // eslint-disable-next-line require-await
-  async quit () {
+  async _closeLocalServer () {
+    if (!this.localServer) {
+      return;
+    }
+
+    const server = this.localServer;
+    this.localServer = null;
+    if (server.listening) {
+      await new B((resolve, reject) => {
+        server.close((e) => {
+          if (e) {
+            reject(e);
+          } else {
+            this.log.info(`The connection to ${this.udid} has been successfully closed`);
+            resolve();
+          }
+        });
+      });
+    }
+  }
+
+  async stop () {
     if (this.onBeforeProcessExit) {
       process.off('beforeExit', this.onBeforeProcessExit);
       this.onBeforeProcessExit = null;
     }
-    if (!this.localServer) {
-      return;
-    }
 
-    // TODO: Wait until the connection is actually closed
-    // after the corresponding fixes are done in appium-ios-device
-    // module. Without the fixes the close event might be delayed for up to
-    // 30 seconds (see https://github.com/appium/appium-xcuitest-driver/pull/1094#issuecomment-546578765)
-    this.localServer.once('close', (e) => {
-      if (e) {
-        this.log.debug(e);
-      } else {
-        this.log.info(`The connection to ${this.udid} has been closed`);
-      }
-      this.localServer = null;
-    });
-    this.localServer.close();
+    try {
+      await this._closeLocalServer();
+    } catch (e) {
+      this.log.debug(e);
+    }
   }
 }
 
@@ -216,7 +220,7 @@ class DeviceConnectionsFactory {
         this._connectionsMapping[currentKey] = {iproxy};
       } catch (e) {
         try {
-          await iproxy.quit();
+          await iproxy.stop();
         } catch (ign) {}
         throw e;
       }