Merge pull request #2064 from NativeScript/raikov/ctrl-c

A proper fix for all Ctrl+C issues

Author: tzraikov

lib/common

@@ -228,6 +228,7 @@ interface IAndroidToolsInfoData {
 
 interface ISocketProxyFactory {
 	createSocketProxy(factory: () => any): IFuture<any>;
+	stopServer(): void;
 }
 
 interface IiOSNotification {

lib/declarations.ts

@@ -10,8 +10,12 @@ export class SocketProxyFactory implements ISocketProxyFactory {
 		private $config: IConfiguration,
 		private $projectData: IProjectData,
 		private $projectDataService: IProjectDataService,
+		private $processService: IProcessService,
 		private $options: IOptions) { }
 
+	private _server: any;
+	private _sockets: net.Socket[] = [];
+
 	public createSocketProxy(factory: () => net.Socket): IFuture<any> {
 		return (() => {
 			let socketFactory = (callback: (_socket: net.Socket) => void) => helpers.connectEventually(factory, callback);
@@ -83,6 +87,9 @@ export class SocketProxyFactory implements ISocketProxyFactory {
 
 		});
 
+		this._server = server;
+		this.$processService.attachToProcessExitSignals(this, this.stopServer);
+
 		this.$logger.info("Opened localhost " + localPort);
 		return server;
 	}
@@ -97,6 +104,8 @@ export class SocketProxyFactory implements ISocketProxyFactory {
 		server.on("connection", (frontendSocket: net.Socket) => {
 			this.$logger.info("Frontend client connected.");
 
+			this._sockets.push(frontendSocket);
+
 			frontendSocket.on("end", () => {
 				this.$logger.info('Frontend socket closed!');
 				if (!(this.$config.debugLivesync && this.$options.watch)) {
@@ -126,7 +135,21 @@ export class SocketProxyFactory implements ISocketProxyFactory {
 			this.$logger.info("socket-file-location: " + socketFileLocation);
 		}
 
+		this._server = server;
+		this.$processService.attachToProcessExitSignals(this, this.stopServer);
+
 		return socketFileLocation;
 	}
+
+	public stopServer() {
+		if (this._server) {
+			this._server.close();
+			for (let socket of this._sockets) {
+				socket.destroy();
+			}
+			this._sockets = [];
+			this._server = null;
+		}
+	}
 }
 $injector.register("socketProxyFactory", SocketProxyFactory);

lib/device-sockets/ios/socket-proxy-factory.ts

@@ -20,9 +20,6 @@ fiber(() => {
 	let messages: IMessagesService = $injector.resolve("$messagesService");
 	messages.pathsToMessageJsonFiles = [/* Place client-specific json message file paths here */];
 
-	let processService: IProcessService = $injector.resolve("$processService");
-	processService.attachToProcessExitSignals(this, process.exit);
-
 	if (process.argv[2] === "completion") {
 		commandDispatcher.completeCommand().wait();
 	} else {

lib/nativescript-cli.ts

@@ -31,9 +31,13 @@ class IOSDebugService implements IDebugService {
 		private $utils: IUtils,
 		private $iOSNotification: IiOSNotification,
 		private $iOSSocketRequestExecutor: IiOSSocketRequestExecutor,
-		private $socketProxyFactory: ISocketProxyFactory) { }
+		private $processService: IProcessService,
+		private $socketProxyFactory: ISocketProxyFactory) {
+			this.$processService.attachToProcessExitSignals(this, this.debugStop);
+		}
 
 	private _lldbProcess: ChildProcess;
+	private _sockets: net.Socket[] = [];
 
 	public get platform(): string {
 		return "ios";
@@ -76,6 +80,11 @@ class IOSDebugService implements IDebugService {
 
 	public debugStop(): IFuture<void> {
 		return (() => {
+			this.$socketProxyFactory.stopServer();
+			for (let socket of this._sockets) {
+				socket.destroy();
+			}
+			this._sockets = [];
 			if (this._lldbProcess) {
 				this._lldbProcess.stdin.write("process detach\n");
 				this._lldbProcess.kill();
@@ -105,19 +114,19 @@ class IOSDebugService implements IDebugService {
 				if (lineText && _.startsWith(lineText, this.$projectData.projectId)) {
 					let pid = _.trimStart(lineText, this.$projectData.projectId + ": ");
 					this._lldbProcess = this.$childProcess.spawn("lldb", [ "-p", pid]);
-					this._lldbProcess.stdin.write("process continue\n");
+				 	this._lldbProcess.stdin.write("process continue\n");
 				} else {
 					process.stdout.write(line + "\n");
 				}
 			});
 
-			this.wireDebuggerClient(() => net.connect(inspectorBackendPort)).wait();
+			this.wireDebuggerClient().wait();
 		}).future<void>()();
 	}
 
 	private emulatorStart(): IFuture<void> {
 		return (() => {
-			this.wireDebuggerClient(() => net.connect(inspectorBackendPort)).wait();
+			this.wireDebuggerClient().wait();
 
 			let attachRequestMessage = this.$iOSNotification.attachRequest;
 
@@ -152,7 +161,7 @@ class IOSDebugService implements IDebugService {
 			let readyForAttachTimeout = this.getReadyForAttachTimeout(timeout);
 
 			this.$iOSSocketRequestExecutor.executeLaunchRequest(device, timeout, readyForAttachTimeout, shouldBreak).wait();
-			this.wireDebuggerClient(() => device.connectToPort(inspectorBackendPort)).wait();
+			this.wireDebuggerClient(device).wait();
 		}).future<void>()();
 	}
 
@@ -167,13 +176,17 @@ class IOSDebugService implements IDebugService {
 		return (() => {
 			let timeout = this.getReadyForAttachTimeout();
 			this.$iOSSocketRequestExecutor.executeAttachRequest(device, timeout).wait();
-			this.wireDebuggerClient(() => device.connectToPort(inspectorBackendPort)).wait();
+			this.wireDebuggerClient(device).wait();
 		}).future<void>()();
 	}
 
-	private wireDebuggerClient(factory: () => net.Socket): IFuture<void> {
+	private wireDebuggerClient(device?: Mobile.IiOSDevice): IFuture<void> {
 		return (() => {
-			let socketProxy = this.$socketProxyFactory.createSocketProxy(factory).wait();
+			let socketProxy = this.$socketProxyFactory.createSocketProxy(() => {
+				let socket = device ? device.connectToPort(inspectorBackendPort) : net.connect(inspectorBackendPort);
+				this._sockets.push(socket);
+				return socket;
+			}).wait();
 			this.executeOpenDebuggerClient(socketProxy).wait();
 		}).future<void>()();
 	}