Fast livesync for iOS simulator + some code review changes

Author: Fatme Havaluova

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

@@ -3,9 +3,10 @@
 
 import { PacketStream } from "./packet-stream";
 import * as net from "net";
-import semver = require("semver");
+import * as semver from "semver";
+import * as ws from "ws";
 import temp = require("temp");
-import ws = require("ws");
+import * as helpers from "../../common/helpers";
 
 export class SocketProxyFactory implements ISocketProxyFactory {
 	constructor(private $logger: ILogger,
@@ -14,7 +15,7 @@ export class SocketProxyFactory implements ISocketProxyFactory {
 
 	public createSocketProxy(factory: () => net.Socket): IFuture<any> {
 		return (() => {
-			let socketFactory = (callback: (_socket: net.Socket) => void) => this.connectEventually(factory, callback);
+			let socketFactory = (callback: (_socket: net.Socket) => void) => helpers.connectEventually(factory, callback);
 
 			this.$projectDataService.initialize(this.$projectData.projectDir);
 			let frameworkVersion = this.$projectDataService.getValue("tns-ios").wait().version;
@@ -30,21 +31,6 @@ export class SocketProxyFactory implements ISocketProxyFactory {
 		}).future<any>()();
 	}
 
-	private connectEventually(factory: () => net.Socket, handler: (_socket: net.Socket) => void) { // TODO: Add socketProxyBase
-		function tryConnect() {
-			let tryConnectAfterTimeout = setTimeout.bind(undefined, tryConnect, 1000);
-
-			let socket = factory();
-			socket.on("connect", () => {
-				socket.removeListener("error", tryConnectAfterTimeout);
-				handler(socket);
-			});
-			socket.on("error", tryConnectAfterTimeout);
-		}
-
-		tryConnect();
-	}
-
 	private createWebSocketProxy(socketFactory: (handler: (socket: net.Socket) => void) => void): ws.Server {
 		// NOTE: We will try to provide command line options to select ports, at least on the localhost.
 		let localPort = 8080;
@@ -58,7 +44,7 @@ export class SocketProxyFactory implements ISocketProxyFactory {
 
 		let server = ws.createServer(<any>{
 			port: localPort,
-			verifyClient: (info: any, callback: any) => {
+			verifyClient: (info: any, callback: Function) => {
 				this.$logger.info("Frontend client connected.");
 				socketFactory((_socket: any) => {
 					this.$logger.info("Backend socket created.");

lib/services/ios-debug-service.ts

@@ -5,7 +5,7 @@ import * as iOSDevice from "../common/mobile/ios/ios-device";
 
 import * as net from "net";
 import * as path from "path";
-import semver = require("semver");
+import * as semver from "semver";
 import byline = require("byline");
 
 let InspectorBackendPort = 18181;

lib/services/ios-notification-service.ts

@@ -4,9 +4,6 @@
 import Future = require("fibers/future");
 
 export class IOSNotificationService implements IiOSNotificationService {
-	constructor(private $errors: IErrors,
-		private $projectData: IProjectData) { }
-
 	public awaitNotification(npc: Mobile.INotificationProxyClient, notification: string, timeout: number): IFuture<string> {
 		let future = new Future<string>();
 

lib/services/test-execution-service.ts

@@ -67,20 +67,18 @@ class TestExecutionService implements ITestExecutionService {
 				}
 			};
 
-			let notInstalledAppOnDeviceAction = (device: Mobile.IDevice): IFuture<boolean> => {
+			let notInstalledAppOnDeviceAction = (device: Mobile.IDevice): IFuture<void> => {
 				return (() => {
 					this.$platformService.installOnDevice(platform).wait();
 					this.detourEntryPoint(projectFilesPath).wait();
-					return true;
-				}).future<boolean>()();
+				}).future<void>()();
 			};
 
-			let notRunningiOSSimulatorAction = (): IFuture<boolean> => {
+			let notRunningiOSSimulatorAction = (): IFuture<void> => {
 				return (() => {
 					this.$platformService.deployOnEmulator(this.$devicePlatformsConstants.iOS.toLowerCase()).wait();
 					this.detourEntryPoint(projectFilesPath).wait();
-					return true;
-				}).future<boolean>()();
+				}).future<void>()();
 			};
 
 			let beforeBatchLiveSyncAction = (filePath: string): IFuture<string> => {

lib/services/usb-livesync-service.ts

@@ -8,6 +8,7 @@ import * as path from "path";
 import * as semver from "semver";
 import * as net from "net";
 import Future = require("fibers/future");
+import * as helpers from "../common/helpers";
 
 export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncServiceBase implements IUsbLiveSyncService {
 
@@ -49,7 +50,7 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer
 				this.$projectDataService.initialize(this.$projectData.projectDir);
 				let frameworkVersion = this.$projectDataService.getValue(platformData.frameworkPackageName).wait().version;
 				if (semver.lt(frameworkVersion, "1.2.1")) {
-					let shouldUpdate = this.$prompter.confirm("You need Android Runtime 1.2.1 or later for LiveSync to work properly. Do you want to update your runtime now?").wait();
+					let shouldUpdate = this.$prompter.confirm(" You need Android Runtime 1.2.1 or later for LiveSync to work properly. Do you want to update your runtime now?").wait();
 					if(shouldUpdate) {
 						this.$platformService.updatePlatforms([this.$devicePlatformsConstants.Android.toLowerCase()]).wait();
 					} else {
@@ -62,19 +63,9 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer
 
 			let projectFilesPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME);
 
-			let notInstalledAppOnDeviceAction = (device: Mobile.IDevice): IFuture<boolean> => {
-				return (() => {
-					this.$platformService.deployOnDevice(platform).wait();
-					return false;
-				}).future<boolean>()();
-			};
+			let notInstalledAppOnDeviceAction = (device: Mobile.IDevice): IFuture<void> => this.$platformService.deployOnDevice(platform);
 
-			let notRunningiOSSimulatorAction = (): IFuture<boolean> => {
-				return (() => {
-					 this.$platformService.deployOnEmulator(this.$devicePlatformsConstants.iOS.toLowerCase()).wait();
-					return false;
-				}).future<boolean>()();
-			};
+			let notRunningiOSSimulatorAction = (): IFuture<void> => this.$platformService.deployOnEmulator(this.$devicePlatformsConstants.iOS.toLowerCase());
 
 			let beforeLiveSyncAction = (device: Mobile.IDevice, deviceAppData: Mobile.IDeviceAppData): IFuture<void> => {
 				let platformSpecificUsbLiveSyncService = this.resolveUsbLiveSyncService(platform || this.$devicesService.platform, device);
@@ -128,6 +119,8 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer
 					let mappedFilePath = beforeBatchLiveSyncAction(filePath).wait();
 
 					if (this.shouldSynciOSSimulator(platform).wait()) {
+						this.$iOSEmulatorServices.transferFiles(this.$projectData.projectId, [filePath], iOSSimulatorRelativeToProjectBasePathAction).wait();
+
 						let platformSpecificUsbLiveSyncService = <IiOSUsbLiveSyncService>this.resolvePlatformSpecificLiveSyncService(platform || this.$devicesService.platform, null, platformSpecificLiveSyncServices);
 						platformSpecificUsbLiveSyncService.sendPageReloadMessageToSimulator().wait();
 					} else {
@@ -192,7 +185,11 @@ export class IOSUsbLiveSyncService implements IiOSUsbLiveSyncService {
 	constructor(private _device: Mobile.IDevice,
 		private $iOSSocketRequestExecutor: IiOSSocketRequestExecutor,
 		private $iOSNotification: IiOSNotification,
-		private $iOSEmulatorServices: Mobile.IiOSSimulatorService) { }
+		private $iOSEmulatorServices: Mobile.IiOSSimulatorService,
+		private $injector: IInjector,
+		private $iOSNotificationService: IiOSNotificationService,
+		private $errors: IErrors,
+		private $projectData: IProjectData) { }
 
 	private get device(): Mobile.IiOSDevice {
 		return <Mobile.IiOSDevice>this._device;
@@ -212,11 +209,8 @@ export class IOSUsbLiveSyncService implements IiOSUsbLiveSyncService {
 	}
 
 	public sendPageReloadMessageToSimulator(): IFuture<void> {
-		return (() => {
-			this.$iOSEmulatorServices.postDarwinNotification(this.$iOSNotification.attachRequest).wait();
-			let socket = net.connect(IOSUsbLiveSyncService.BACKEND_PORT);
-			this.sendReloadMessageCore(socket);
-		}).future<void>()();
+		helpers.connectEventually(() => net.connect(IOSUsbLiveSyncService.BACKEND_PORT), (socket: net.Socket) => this.sendReloadMessageCore(socket));
+		return this.$iOSEmulatorServices.postDarwinNotification(this.$iOSNotification.attachRequest);
 	}
 
 	private sendReloadMessageCore(socket: net.Socket): void {
@@ -226,6 +220,7 @@ export class IOSUsbLiveSyncService implements IiOSUsbLiveSyncService {
 		payload.writeInt32BE(length, 0);
 		payload.write(message, 4, length, "utf16le");
 		socket.write(payload);
+		socket.destroy();
 	}
 }
 $injector.register("iosUsbLiveSyncServiceLocator", {factory: IOSUsbLiveSyncService});