Merge pull request #1722 from NativeScript/vladimirov/fix-ios-socket-issues

Fix iOS socket issues

Author: rosen-vladimirov

lib/services/livesync/ios-livesync-service.ts

@@ -39,9 +39,7 @@ class IOSLiveSyncService extends liveSyncServiceBaseLib.LiveSyncServiceBase<Mobi
 				if (!this.socket) {
 					helpers.connectEventually(() => net.connect(IOSLiveSyncService.BACKEND_PORT), (socket: net.Socket) => {
 						this.socket = socket;
-						if(this.$options.watch) {
-							this.attachProcessExitHandlers();
-						}
+						this.attachEventHandlersIfNecessary();
 						this.sendPageReloadMessage();
 					});
 				} else {
@@ -52,12 +50,27 @@ class IOSLiveSyncService extends liveSyncServiceBaseLib.LiveSyncServiceBase<Mobi
 				if(!this.socket) {
 					this.$iOSSocketRequestExecutor.executeAttachRequest(this.device, timeout).wait();
 					this.socket = this.device.connectToPort(IOSLiveSyncService.BACKEND_PORT);
+					this.attachEventHandlersIfNecessary();
 				}
 				this.sendPageReloadMessage();
 			}
 		}).future<void>()();
 	}
 
+	private attachEventHandlersIfNecessary(): void {
+		if(this.$options.watch) {
+			this.attachProcessExitHandlers();
+			this.attachSocketCloseEvent();
+		}
+	}
+
+	private attachSocketCloseEvent(): void {
+		this.socket.on("close", (hadError: boolean) => {
+			this.$logger.trace(`Socket closed, hadError is ${hadError}.`);
+			this.socket = null;
+		});
+	}
+
 	private sendPageReloadMessage(): void {
 		try {
 			this.sendPageReloadMessageCore();
@@ -101,8 +114,10 @@ class IOSLiveSyncService extends liveSyncServiceBaseLib.LiveSyncServiceBase<Mobi
 	}
 
 	private destroySocket(): void {
-		this.socket.destroy();
-		this.socket = null;
+		if(this.socket) {
+			this.socket.destroy();
+			this.socket = null;
+		}
 	}
 }
 $injector.register("iosLiveSyncServiceLocator", {factory: IOSLiveSyncService});