Tune unpipe

lib/device-connections-factory.js

@@ -18,31 +18,49 @@ class iProxy {
     if (this.localServer) {
       return;
     }
+
     this.localServer = net.createServer(async (localSocket) => {
+      let remoteSocket;
       try {
-        const remoteSocket = await utilities.connectPort(this.udid, this.deviceport);
-        remoteSocket.on('close', () => localSocket.end());
-        remoteSocket.on('error', (e) => {
-          // not all remote socket errors are critical for the user
-          this.log.info(e.message);
-          this.log.debug(e);
-        });
-        localSocket.on('close', () => remoteSocket.end());
-        localSocket.on('error', (e) => this.log.warn(e.message));
-        localSocket.pipe(remoteSocket);
-        remoteSocket.pipe(localSocket);
+        remoteSocket = await utilities.connectPort(this.udid, this.deviceport);
       } catch (e) {
         this.log.error(e);
-        localSocket.end();
+        localSocket.destroy();
+        return;
       }
+      const destroyCommChannel = () => {
+        remoteSocket.unpipe(localSocket);
+        localSocket.unpipe(remoteSocket);
+      };
+      remoteSocket.on('close', () => {
+        destroyCommChannel();
+        localSocket.destroy();
+      });
+      remoteSocket.on('error', (e) => {
+        // not all remote socket errors are critical for the user
+        this.log.debug(e);
+      });
+      localSocket.on('end', () => {
+        destroyCommChannel();
+        remoteSocket.end();
+      });
+      localSocket.on('close', () => {
+        destroyCommChannel();
+        remoteSocket.destroy();
+      });
+      localSocket.on('error', (e) => {
+        this.log.warn(e.message);
+      });
+      localSocket.pipe(remoteSocket);
+      remoteSocket.pipe(localSocket);
     });
-    const status = new B((resolve, reject) => {
+    const listeningPromise = new B((resolve, reject) => {
       this.localServer.once('listening', resolve);
       this.localServer.once('error', reject);
     });
     this.localServer.listen(this.localport);
     try {
-      await status;
+      await listeningPromise;
     } catch (e) {
       this.localServer = null;
       throw e;