Merge pull request #117 from telerik/tachev/fix-stop-application

fix: stop the application using the local pid instead of `simctl terminate` (the terminate commands hangs when the application is on a breakpoint)

Author: Dimitar Tachev

lib/declarations.ts

@@ -52,7 +52,7 @@ interface ISimulator extends INameGetter {
 	installApplication(deviceId: string, applicationPath: string): Promise<void>;
 	uninstallApplication(deviceId: string, appIdentifier: string): Promise<void>;
 	startApplication(deviceId: string, appIdentifier: string, options: IOptions): Promise<string>;
-	stopApplication(deviceId: string, appIdentifier: string, bundleExecutable: string): Promise<string>;
+	stopApplication(deviceId: string, appIdentifier: string, bundleExecutable: string): Promise<void>;
 	getDeviceLogProcess(deviceId: string): Promise<any>;
 	startSimulator(options: IOptions, device?: IDevice): Promise<void>;
 }

lib/iphone-simulator-xcode-simctl.ts

@@ -93,34 +93,24 @@ export class XCodeSimctlSimulator extends IPhoneSimulatorNameGetter implements I
 		return launchResult;
 	}
 
-	public async stopApplication(deviceId: string, appIdentifier: string, bundleExecutable: string): Promise<string> {
+	public async stopApplication(deviceId: string, appIdentifier: string, bundleExecutable: string): Promise<void> {
 		try {
-			let xcodeMajorVersion: number = null;
-			try {
-				const xcodeVersion = xcode.getXcodeVersionData();
-				xcodeMajorVersion = +xcodeVersion.major;
-			} catch (err) {
-				// Ignore the error.
-			}
-
-			let resultOfTermination: string;
-			if (xcodeMajorVersion && xcodeMajorVersion < 8) {
-				// Xcode 7.x does not have support for `xcrun simctl terminate` command
-				resultOfTermination = childProcess.execSync(`killall ${bundleExecutable}`, { skipError: true });
-			} else {
-				resultOfTermination = await this.simctl.terminate(deviceId, appIdentifier);
+			let pid = this.getPid(deviceId, bundleExecutable);
+			while (pid) {
+				childProcess.execSync(`kill -9 ${pid}`, { skipError: true });
+				pid = this.getPid(deviceId, bundleExecutable);
+				if (pid) {
+					utils.sleep(0.1);
+				}
 			}
-
-			// killall command does not terminate the processes immediately and we have to wait a little bit,
-			// just to ensure all related processes and services are dead.
-			// Same is valid for simctl terminate when Simulator's OS version is below 10.
-			utils.sleep(0.5);
-
-			return resultOfTermination;
 		} catch (e) {
 		}
 	}
 
+	private getPid(deviceId: string, bundleExecutable: string): string {
+		return childProcess.execSync(`ps -ef | grep ${bundleExecutable} | grep ${deviceId} | grep -v grep | awk '{print $2}'`, { skipError: true }).toString().trim();
+	}
+
 	public async getDeviceLogProcess(deviceId: string, predicate?: string): Promise<child_process.ChildProcess> {
 		const device = await this.getDeviceFromIdentifier(deviceId);
 		return new Promise<child_process.ChildProcess>((resolve, reject) => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ios-sim-portable",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "description": "",
   "main": "./lib/ios-sim.js",
   "scripts": {
@@ -44,4 +44,4 @@
   "engines": {
     "node": ">=4.2.1 <5.0.0 || >=5.1.0 <11.0.0"
   }
-}
+}