PR comments and some improvements

Author: Fatme Havaluova

mobile/ios/ios-core.ts

@@ -1199,25 +1199,13 @@ export class GDBServer implements Mobile.IGDBServer {
 		let retryCount = 3;
 		let isDataReceived = false;
 
-		let dataCallback = (data: any) => {
-			let dataAsString = data.toString();
-			if (dataAsString.indexOf("thread") > -1) {
-				isDataReceived = true;
-				this.socket.removeListener("data", dataCallback);
-				future.return(data.toString());
-			}
-		};
-
-		this.socket.on("data", dataCallback);
-		this.sendCore("\x03");
-
 		let timer = setInterval(() => {
 			this.sendCore("\x03");
 			retryCount--;
 
-			let secondTimer = setInterval(() => {
+			let secondTimer = setTimeout(() => {
 				if (isDataReceived || !retryCount) {
-					clearInterval(secondTimer);
+					clearTimeout(secondTimer);
 					clearInterval(timer);
 				}
 
@@ -1227,6 +1215,19 @@ export class GDBServer implements Mobile.IGDBServer {
 			}, 1000);
 		}, 1000);
 
+		let dataCallback = (data: any) => {
+			let dataAsString = data.toString();
+			if (dataAsString.indexOf("thread") > -1) {
+				isDataReceived = true;
+				this.socket.removeListener("data", dataCallback);
+				clearInterval(timer);
+				future.return(data.toString());
+			}
+		};
+
+		this.socket.on("data", dataCallback);
+		this.sendCore("\x03");
+
 		return future;
 	}
 

mobile/ios/ios-emulator-services.ts

@@ -5,6 +5,11 @@ import Future = require("fibers/future");
 import * as path from "path";
 import * as shell from "shelljs";
 
+interface IiOSSim {
+	getRunningSimulator(appIdentifier: string): { id: string };
+	getApplicationPath(runningSimulatorId: string, appIdentifier: string): string;
+}
+
 class IosEmulatorServices implements Mobile.IiOSSimulatorService {
 	constructor(private $logger: ILogger,
 		private $emulatorSettingsService: Mobile.IEmulatorSettingsService,
@@ -89,6 +94,15 @@ class IosEmulatorServices implements Mobile.IiOSSimulatorService {
 		}).future<boolean>()();
 	}
 
+	private _iosSim: IiOSSim = null;
+	private get iosSim(): IiOSSim {
+		if (!this._iosSim) {
+			this._iosSim = require("ios-sim-portable");
+		}
+
+		return this._iosSim;
+	}
+
 	private startEmulatorCore(app: string, emulatorOptions?: Mobile.IEmulatorOptions): any {
 		this.$logger.info("Starting iOS Simulator");
 		let iosSimPath = require.resolve("ios-sim-portable");
@@ -174,18 +188,14 @@ class IosEmulatorServices implements Mobile.IiOSSimulatorService {
 	}
 
 	private getApplicationPath(appIdentifier: string): string {
-		let iosSim = require("ios-sim-portable");
 		let runningSimulatorId = this.getRunningSimulatorId(appIdentifier);
-		let applicationPath = iosSim.getApplicationPath(runningSimulatorId, appIdentifier);
+		let applicationPath = this.iosSim.getApplicationPath(runningSimulatorId, appIdentifier);
 		return applicationPath;
 	}
 
 	private getRunningSimulatorId(appIdentifier: string): string {
-		let iosSim = require("ios-sim-portable");
-
-		let runningSimulator = iosSim.getRunningSimulator(appIdentifier);
+		let runningSimulator = this.iosSim.getRunningSimulator(appIdentifier);
 		let runningSimulatorId = runningSimulator.id;
-
 		return runningSimulatorId;
 	}
 }

services/usb-livesync-service-base.ts

@@ -39,7 +39,7 @@ class SyncBatch {
 					});
 				}
 				this.timer = null;
-			}, 250);
+			}, 250); // https://github.com/Microsoft/TypeScript/blob/master/src/compiler/tsc.ts#L487-L489
 		}
 
 		public get syncPending() {
@@ -86,11 +86,11 @@ export class UsbLiveSyncServiceBase implements IUsbLiveSyncServiceBase {
 				this.$iOSEmulatorServices.sync(data.appIdentifier, data.projectFilesPath, data.notRunningiOSSimulatorAction).wait();
 			}
 
-			if(!this._initialized && (!this.$options.emulator || data.platform.toLowerCase() === "android")) {
-				this.initialize(data.platform).wait();
-			}
+			if (!this.$options.emulator || data.platform.toLowerCase() === "android") {
+				if (!this._initialized) {
+					this.initialize(data.platform).wait();
+				}
 
-			if(!this.$options.emulator || data.platform.toLowerCase() === "android") {
 				let projectFiles = this.$fs.enumerateFilesInDirectorySync(data.projectFilesPath,
 					(filePath, stat) => !this.isFileExcluded(path.relative(data.projectFilesPath, filePath), data.excludedProjectDirsAndFiles, data.projectFilesPath),
 					{ enumerateDirectories: true }
@@ -106,15 +106,15 @@ export class UsbLiveSyncServiceBase implements IUsbLiveSyncServiceBase {
 
 				gaze("**/*", { cwd: data.watchGlob }, function(err: any, watcher: any) {
 					this.on('all', (event: string, filePath: string) => {
-						if(event === "added" || event === "changed") {
-							if(!that.isFileExcluded(filePath, data.excludedProjectDirsAndFiles, data.projectFilesPath)) {
+						if (event === "added" || event === "changed") {
+							if (!that.isFileExcluded(filePath, data.excludedProjectDirsAndFiles, data.projectFilesPath)) {
 								let canExecuteFastLiveSync = data.canExecuteFastLiveSync && data.canExecuteFastLiveSync(filePath);
 
-								if(synciOSSimulator && !canExecuteFastLiveSync) {
+								if (synciOSSimulator && !canExecuteFastLiveSync) {
 									that.batchSimulatorLiveSync(data, filePath);
 								}
 
-								if( (!that.$options.emulator || data.platform.toLowerCase() === "android") && !canExecuteFastLiveSync) {
+								if ((!that.$options.emulator || data.platform.toLowerCase() === "android") && !canExecuteFastLiveSync) {
 									that.batchLiveSync(data, filePath);
 								}