Add receive message from ios device socket logic

Author: TsvetanMilanov

definitions/mobile.d.ts

@@ -720,6 +720,8 @@ interface IIOSDeviceOperations extends IDisposable {
 
 	sendMessageToSocket(sendMessageToSocketArray: IOSDeviceLib.ISendMessageToSocketData[], errorHandler?: DeviceOperationErrorHandler): Promise<IOSDeviceResponse>;
 
+	readMessageFromSocket(readMessageFromSocketArray: IOSDeviceLib.IReceiveMessagesFromSocketData[]): void;
+
 	connectToPort(connectToPortArray: IOSDeviceLib.IConnectToPortData[], errorHandler?: DeviceOperationErrorHandler): Promise<IOSDeviceResponse>;
 
 	setShouldDispose(shouldDispose: boolean): void;

helpers.ts

@@ -352,6 +352,22 @@ export function connectEventually(factory: () => net.Socket, handler: (_socket:
 	tryConnect();
 }
 
+export async function connectEventuallyAsync(factory: () => Promise<net.Socket>, handler: (_socket: net.Socket) => void): Promise<void> {
+	async function tryConnect() {
+		let tryConnectAfterTimeout = setTimeout.bind(undefined, tryConnect, 1000);
+
+		let socket = await factory();
+		socket.on("connect", () => {
+			socket.removeListener("error", tryConnectAfterTimeout);
+			handler(socket);
+		});
+		socket.on("error", tryConnectAfterTimeout);
+	}
+
+	await tryConnect();
+}
+
+
 export async function connectEventuallyUntilTimeout(factory: () => net.Socket, timeout: number): Promise<net.Socket> {
 	return new Promise<net.Socket>((resolve, reject) => {
 		let lastKnownError: Error;

mobile/ios/device/ios-device-operations.ts

@@ -169,6 +169,10 @@ export class IOSDeviceOperations implements IIOSDeviceOperations, IDisposable {
 		return this.getMultipleResults<IOSDeviceLib.IDeviceResponse>(() => this.deviceLib.sendMessageToSocket(sendMessageToSocketArray), errorHandler);
 	}
 
+	public readMessageFromSocket(readMessageFromSocketArray: IOSDeviceLib.IReceiveMessagesFromSocketData[]): void {
+		this.deviceLib.readMessagesFromSocket(readMessageFromSocketArray);
+	}
+
 	public async connectToPort(connectToPortArray: IOSDeviceLib.IConnectToPortData[], errorHandler?: DeviceOperationErrorHandler): Promise<IOSDeviceResponse> {
 		this.assertIsInitialized();
 

mobile/ios/device/ios-device-socket.ts

@@ -2,17 +2,25 @@ import { Socket } from "net";
 
 export class IOSDeviceSocket extends Socket {
 	private deviceIdentifier: string;
-	private fd: string;
+	private fd: number;
 	private iosDeviceOperations: IIOSDeviceOperations;
 
 	public initialize(fd: string, deviceIdentifier: string, iosDeviceOperatios: IIOSDeviceOperations): void {
-		this.fd = fd;
+		this.fd = +fd;
 		this.deviceIdentifier = deviceIdentifier;
 		this.iosDeviceOperations = iosDeviceOperatios;
+
+		const callback = (socketInfo: IOSDeviceLib.ISocketMessage) => {
+			if (+socketInfo.socket === this.fd) {
+				this.emit("message", socketInfo.message);
+				this.emit("data", socketInfo.message);
+			}
+		};
+		this.iosDeviceOperations.readMessageFromSocket([{ socket: this.fd, deviceId: this.deviceIdentifier, context: this, callback: callback }]);
 	}
 
 	public async write(message: string): Promise<number> {
-		const response = await this.iosDeviceOperations.sendMessageToSocket([{ socket: +this.fd, message: message, deviceId: this.deviceIdentifier }]);
+		const response = await this.iosDeviceOperations.sendMessageToSocket([{ socket: this.fd, message: message, deviceId: this.deviceIdentifier }]);
 
 		return +_.first(response[this.deviceIdentifier]).response;
 	}