Add receive message from ios device socket logic

Author: TsvetanMilanov

lib/common

@@ -306,7 +306,6 @@ interface IiOSNotification {
 interface IiOSNotificationService {
 	awaitNotification(deviceIdentifier: string, socket: number, timeout: number): Promise<string>;
 	postNotification(deviceIdentifier: string, notification: string, commandType?: string): Promise<string>;
-	subscribeForNotification(deviceIdentifier: string, notification: string, timeout: number): Promise<Promise<string>>;
 }
 
 interface IiOSSocketRequestExecutor {

lib/declarations.ts

@@ -66,8 +66,8 @@ export class SocketProxyFactory implements ISocketProxyFactory {
 		return server;
 	}
 
-	public createWebSocketProxy(factory: () => net.Socket): ws.Server {
-		let socketFactory = (callback: (_socket: net.Socket) => void) => helpers.connectEventually(factory, callback);
+	public createWebSocketProxy(factory: () => Promise<net.Socket>): ws.Server {
+		let socketFactory = async (callback: (_socket: net.Socket) => void) => callback(await factory());
 		// NOTE: We will try to provide command line options to select ports, at least on the localhost.
 		let localPort = 8080;
 
@@ -102,10 +102,9 @@ export class SocketProxyFactory implements ISocketProxyFactory {
 
 			webSocket.on("message", (message, flags) => {
 				let length = Buffer.byteLength(message, encoding);
-				let payload = new Buffer(length + 4);
-				payload.writeInt32BE(length, 0);
-				payload.write(message, 4, length, encoding);
-				deviceSocket.write(payload);
+				let payload = new Buffer(length);
+				payload.write(message, 0, length, encoding);
+				deviceSocket.write(payload.toString());
 			});
 
 			deviceSocket.on("end", () => {

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

@@ -4,19 +4,27 @@ export class IOSSocketRequestExecutor implements IiOSSocketRequestExecutor {
 	constructor(private $errors: IErrors,
 		private $iOSNotification: IiOSNotification,
 		private $iOSNotificationService: IiOSNotificationService,
-		private $logger: ILogger) { }
+		private $logger: ILogger,
+		private $projectData: IProjectData,
+		private $iosDeviceOperations: IIOSDeviceOperations) { 
+			this.$iosDeviceOperations.setShouldDispose(false);
+		}
 
 	public async executeAttachRequest(device: Mobile.IiOSDevice, timeout: number, projectId: string): Promise<void> {
 		const deviceIdentifier = device.deviceInfo.identifier;
 
-		const observeNotificationPromises = [
-			await this.$iOSNotificationService.subscribeForNotification(deviceIdentifier, this.$iOSNotification.getAlreadyConnected(projectId), timeout),
-			await this.$iOSNotificationService.subscribeForNotification(deviceIdentifier, this.$iOSNotification.getReadyForAttach(projectId), timeout),
-			await this.$iOSNotificationService.subscribeForNotification(deviceIdentifier, this.$iOSNotification.getAttachAvailable(projectId), timeout)
+		const observeNotificationSockets = [
+			await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.alreadyConnected, constants.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE),
+			await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.readyForAttach, constants.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE),
+			await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.attachAvailable, constants.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE)
 		];
 
+		const observeNotificationPromises = _.map(observeNotificationSockets, s => {
+			return this.$iOSNotificationService.awaitNotification(deviceIdentifier, +s, timeout);
+		});
+
 		// Trigger the notifications update.
-		await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getAttachAvailabilityQuery(projectId), constants.IOS_POST_NOTIFICATION_COMMAND_TYPE);
+		await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.attachAvailabilityQuery);
 
 		let receivedNotification: string;
 		try {
@@ -43,16 +51,18 @@ export class IOSSocketRequestExecutor implements IiOSSocketRequestExecutor {
 
 	public async executeLaunchRequest(deviceIdentifier: string, timeout: number, readyForAttachTimeout: number, projectId: string, shouldBreak?: boolean): Promise<void> {
 		try {
-			const appLaunchingPromise = await this.$iOSNotificationService.subscribeForNotification(deviceIdentifier, this.$iOSNotification.getAppLaunching(projectId), timeout);
-			await appLaunchingPromise;
+			const appLaunchingSocket = await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.appLaunching, constants.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE);
+			await this.$iOSNotificationService.awaitNotification(deviceIdentifier, +appLaunchingSocket, timeout);
+
 				if (shouldBreak) {
 				await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getWaitForDebug(projectId), constants.IOS_POST_NOTIFICATION_COMMAND_TYPE);
 			}
 
 			// We need to send the ObserveNotification ReadyForAttach before we post the AttachRequest.
-			const readyForAttachPromise = await this.$iOSNotificationService.subscribeForNotification(deviceIdentifier, this.$iOSNotification.getReadyForAttach(projectId), readyForAttachTimeout);
+			const readyForAttachSocket = await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.readyForAttach, constants.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE);
+			const readyForAttachPromise = this.$iOSNotificationService.awaitNotification(deviceIdentifier, +readyForAttachSocket, readyForAttachTimeout);
 
-			await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getAttachRequest(projectId), constants.IOS_POST_NOTIFICATION_COMMAND_TYPE);
+			await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.attachRequest);
 			await readyForAttachPromise;
 		} catch (e) {
 			this.$logger.trace("Launch request error:");
@@ -65,8 +75,9 @@ export class IOSSocketRequestExecutor implements IiOSSocketRequestExecutor {
 		try {
 			// We should create this promise here because we need to send the ObserveNotification on the device
 			// before we send the PostNotification.
-			const readyForAttachPromise = await this.$iOSNotificationService.subscribeForNotification(deviceIdentifier, this.$iOSNotification.getReadyForAttach(projectId), timeout);
-			await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getAttachRequest(projectId));
+			const readyForAttachSocket = await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.readyForAttach, constants.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE);
+			const readyForAttachPromise = this.$iOSNotificationService.awaitNotification(deviceIdentifier, +readyForAttachSocket, timeout);
+			await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.attachRequest);
 			await readyForAttachPromise;
 		} catch (e) {
 			this.$errors.failWithoutHelp(`The application ${projectId} timed out when performing the socket handshake.`);

lib/device-sockets/ios/socket-request-executor.ts

@@ -15,15 +15,6 @@ export class IOSNotificationService implements IiOSNotificationService {
 		return _.first(notificationResponse[deviceIdentifier]).response;
 	}
 
-	public subscribeForNotification(deviceIdentifier: string, notification: string, timeout: number): Promise<Promise<string>> {
-		return new Promise((resolve, reject) => {
-			this.postNotification(deviceIdentifier, notification, constants.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE)
-				.then((socket) => {
-					resolve(this.awaitNotification(deviceIdentifier, +socket, timeout));
-				});
-		});
-	}
-
 	public async postNotification(deviceIdentifier: string, notification: string, commandType?: string): Promise<string> {
 		commandType = commandType || constants.IOS_POST_NOTIFICATION_COMMAND_TYPE;
 		const response = await this.$iosDeviceOperations.postNotification([{ deviceId: deviceIdentifier, commandType: commandType, notificationName: notification }]);