Support for multiple simulators

Author: Fatme

lib/ios-sim.ts

@@ -31,6 +31,29 @@ Object.defineProperty(publicApi, "getRunningSimulator", {
 	}
 });
 
+Object.defineProperty(publicApi, "getRunningSimulators", {
+	get: () => {
+		return (...args: any[]) => {
+			let isResolved = false;
+
+			return new Promise<any>((resolve, reject) => {
+				const libraryPath = require("./iphone-simulator-xcode-simctl");
+				const simulator = new libraryPath.XCodeSimctlSimulator();
+				let repeatCount = 30;
+				const timer = setInterval(() => {
+					const result = simulator.getBootedDevices.apply(simulator, args);
+					if ((result || !repeatCount) && !isResolved) {
+						isResolved = true;
+						clearInterval(timer);
+						resolve(result);
+					}
+					repeatCount--;
+				}, 500);
+			});
+		}
+	}
+});
+
 Object.defineProperty(publicApi, "getApplicationPath", {
 	get: () => {
 		return (...args: any[]) => {

lib/iphone-simulator-xcode-simctl.ts

@@ -220,6 +220,11 @@ export class XCodeSimctlSimulator extends IPhoneSimulatorNameGetter implements I
 		return _.find(devices, device => this.isDeviceBooted(device));
 	}
 
+	private getBootedDevices(): IDevice[] {
+		const devices = this.simctl.getDevices();
+		return _.filter(devices, device => this.isDeviceBooted(device));
+	}
+
 	public startSimulator(device?: IDevice): void {
 		device = device || this.getDeviceToRun();
 
@@ -229,15 +234,17 @@ export class XCodeSimctlSimulator extends IPhoneSimulatorNameGetter implements I
 		}
 
 		if (!this.isDeviceBooted(device)) {
-			let bootedDevice = this.getBootedDevice();
-			if (bootedDevice && bootedDevice.id !== device.id) {
-				this.killSimulator();
-			}
-
-			// In case user closes simulator window but simulator app is still alive
-			if (!bootedDevice && this.isSimulatorAppRunning()) {
-				const defaultDevice = _.find(this.simctl.getDevices(), device => device.name === this.defaultDeviceIdentifier);
-				this.simctl.boot(defaultDevice.id);
+			const isSimulatorAppRunning = this.isSimulatorAppRunning();
+			const haveBootedDevices = this.haveBootedDevices();
+				
+			if (isSimulatorAppRunning) {
+				// In case user closes simulator window but simulator app is still alive
+				if (!haveBootedDevices) {
+					device = this.getDeviceToRun();
+				}
+				this.simctl.boot(device.id);
+			} else {
+				common.startSimulator(device.id);
 			}
 
 			common.startSimulator(device.id);
@@ -248,6 +255,11 @@ export class XCodeSimctlSimulator extends IPhoneSimulatorNameGetter implements I
 		}
 	}
 
+	private haveBootedDevices(): boolean {
+		const bootedDevices = this.getBootedDevices();
+		return bootedDevices && bootedDevices.length > 0;
+	}
+
 	private isSimulatorAppRunning(): boolean {
 		const simulatorAppName = "Simulator";