Fix tns debug ios --emulator

Fixes NativeScript/nativescript-cli#1253

Author: Fatme

lib/declarations.ts

@@ -55,6 +55,7 @@ interface ISimulator {
 interface IExecuteOptions {
 	canRunMainLoop: boolean;
 	appPath?: string;
+	applicationIdentifier?: string;
 }
 
 interface ISdk {

lib/iphone-interop-simulator-base.ts

@@ -26,11 +26,11 @@ export class IPhoneInteropSimulatorBase {
 
 	private static DEFAULT_TIMEOUT_IN_SECONDS = 90;
 
-	public run(appPath: string): IFuture<void> {
-		return this.execute(this.launch, { canRunMainLoop: true, appPath: appPath });
+	public run(appPath: string, applicationIdentifier: string): IFuture<void> {
+		return this.execute(this.launch, { canRunMainLoop: true, appPath: appPath, applicationIdentifier: applicationIdentifier });
 	}
-	
-	private setupSessionDelegate(appPath: string): any {
+
+	private setupSessionDelegate(appPath: string, applicationIdentifier: string): any {
 		let sessionDelegate = $.NSObject.extend("DTiPhoneSimulatorSessionDelegate");
 		sessionDelegate.addMethod("session:didEndWithError:", "v@:@@", function(self: any, sel: any, sess: any, error: any) {
 			IPhoneInteropSimulatorBase.logSessionInfo(error, "Session ended without errors.", "Session ended with error ");
@@ -39,16 +39,16 @@ export class IPhoneInteropSimulatorBase {
 		sessionDelegate.addMethod("session:didStart:withError:", "v@:@c@", function(self: any, sel: string, session: any, started: boolean, error:any) {
 			IPhoneInteropSimulatorBase.logSessionInfo(error, "Session started without errors.", "Session started with error ");
 
-			console.log(`${appPath}: ${session("simulatedApplicationPID")}`);
+			console.log(`${applicationIdentifier}: ${session("simulatedApplicationPID")}`);
 			if (options.exit) {
 				process.exit(0);
 			}
 		});
 		sessionDelegate.register();
-		
+
 		return sessionDelegate;
 	}
-	
+
 	private getTimeout(): number {
 		let timeoutParam = IPhoneInteropSimulatorBase.DEFAULT_TIMEOUT_IN_SECONDS;
 		if (options.timeout || options.timeout === 0) {
@@ -62,7 +62,7 @@ export class IPhoneInteropSimulatorBase {
 		}
 		return timeoutParam;
 	}
-	
+
 	private validateDevice() {
 		if (options.device) {
 			let devices = this.simulator.getDevices().wait();
@@ -73,8 +73,8 @@ export class IPhoneInteropSimulatorBase {
 		}
 	}
 
-	private launch(appPath: string): void {
-		let sessionDelegate = this.setupSessionDelegate(appPath);
+	private launch(appPath: string, applicationIdentifier: string): void {
+		let sessionDelegate = this.setupSessionDelegate(appPath, applicationIdentifier);
 
 		let appSpec = this.getClassByName("DTiPhoneSimulatorApplicationSpecifier")("specifierWithApplicationPath", $(appPath));
 		let config = this.getClassByName("DTiPhoneSimulatorSessionConfig")("alloc")("init")("autorelease");
@@ -125,7 +125,7 @@ export class IPhoneInteropSimulatorBase {
 		}
 	}
 
-	protected execute(action: (appPath?: string) => any, opts: IExecuteOptions): IFuture<any> {
+	protected execute(action: (appPath?: string, applicationIdentifier?: string) => any, opts: IExecuteOptions): IFuture<any> {
 		$.importFramework(IPhoneInteropSimulatorBase.FOUNDATION_FRAMEWORK_NAME);
 		$.importFramework(IPhoneInteropSimulatorBase.APPKIT_FRAMEWORK_NAME);
 
@@ -136,14 +136,14 @@ export class IPhoneInteropSimulatorBase {
 
 		this.loadFrameworks(developerDirectoryPath);
 
-		let result = action.apply(this, [opts.appPath]);
+		let result = action.apply(this, [opts.appPath, opts.applicationIdentifier]);
 		return this.runCFLoop(opts.canRunMainLoop, result);
 	}
-	
+
 	private runCFLoop(canRunMainLoop: boolean, result: any): IFuture<any> {
 		let pool = $.NSAutoreleasePool("alloc")("init");
 		let future = new Future<any>();
-		
+
 		if (canRunMainLoop) {
 			// Keeps the Node loop running
 			(function runLoop() {
@@ -157,7 +157,7 @@ export class IPhoneInteropSimulatorBase {
 		} else {
 			future.return(result);
 		}
-		
+
 		return future;
 	}
 

lib/simctl.ts

@@ -9,19 +9,28 @@ import options = require("./options");
 export class Simctl implements ISimctl {
 
 	public launch(deviceId: string, applicationIdentifier: string): IFuture<string> {
-		let args: string[] = [];
-		if (options.waitForDebugger) {
-			args.push("-w");
-		}
+		return (() => {
+			let args: string[] = [];
+			if (options.waitForDebugger) {
+				args.push("-w");
+			}
 
-		args = args.concat([deviceId, applicationIdentifier]);
+			args = args.concat([deviceId, applicationIdentifier]);
+
+			if(options.args) {
+				let applicationArgs = options.args.trim().split(/\s+/);
+				_.each(applicationArgs, (arg: string) => args.push(arg));
+			}
+
+			let result = this.simctlExec("launch", args).wait();
+
+			if (options.waitForDebugger) {
+				console.log(`${applicationIdentifier}: ${applicationIdentifier}`);
+			}
 
-		if(options.args) {
-			let applicationArgs = options.args.trim().split(/\s+/);
-			_.each(applicationArgs, (arg: string) => args.push(arg));
-		}
+			return result;
 
-		return this.simctlExec("launch", args);
+		}).future<string>()();
 	}
 
 	public install(deviceId: string, applicationPath: string): IFuture<void> {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ios-sim-portable",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "",
   "main": "./lib/ios-sim.js",
   "scripts": {