Fix tns debug ios issues

Since we use the ios-device-lib to connect to the device backend port for debugging, the socket returned from the device can be used only in the ios-device lib.
That's why we need to change the logic for creating the Node.js socket in the CLI. The ios-device-lib will expose the device socket on a specific port in the localhost.
After we connect to the exposed socket we can continue to work like we used to.

Author: TsvetanMilanov

definitions/mobile.d.ts

@@ -718,11 +718,7 @@ interface IIOSDeviceOperations extends IDisposable {
 
 	awaitNotificationResponse(awaitNotificationResponseArray: IOSDeviceLib.IAwaitNotificatioNResponseData[], errorHandler?: DeviceOperationErrorHandler): Promise<IOSDeviceResponse>;
 
-	sendMessageToSocket(sendMessageToSocketArray: IOSDeviceLib.ISendMessageToSocketData[], errorHandler?: DeviceOperationErrorHandler): Promise<IOSDeviceResponse>;
-
-	readMessageFromSocket(readMessageFromSocketArray: IOSDeviceLib.IReceiveMessagesFromSocketData[]): void;
-
-	connectToPort(connectToPortArray: IOSDeviceLib.IConnectToPortData[], errorHandler?: DeviceOperationErrorHandler): Promise<IOSDeviceResponse>;
+	connectToPort(connectToPortArray: IOSDeviceLib.IConnectToPortData[], errorHandler?: DeviceOperationErrorHandler): Promise<IDictionary<IOSDeviceLib.IConnectToPortResponse[]>>;
 
 	setShouldDispose(shouldDispose: boolean): void;
 }

helpers.ts

@@ -352,22 +352,6 @@ 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

@@ -159,28 +159,14 @@ export class IOSDeviceOperations implements IIOSDeviceOperations, IDisposable {
 		return this.getMultipleResults<IOSDeviceLib.IDeviceResponse>(() => this.deviceLib.awaitNotificationResponse(awaitNotificationResponseArray), errorHandler);
 	}
 
-	public async sendMessageToSocket(sendMessageToSocketArray: IOSDeviceLib.ISendMessageToSocketData[], errorHandler?: DeviceOperationErrorHandler): Promise<IOSDeviceResponse> {
-		this.assertIsInitialized();
-
-		_.each(sendMessageToSocketArray, s => {
-			this.$logger.trace(`Sending message: ${s.message} to socket: ${s.socket}`);
-		});
-
-		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> {
+	public async connectToPort(connectToPortArray: IOSDeviceLib.IConnectToPortData[], errorHandler?: DeviceOperationErrorHandler): Promise<IDictionary<IOSDeviceLib.IConnectToPortResponse[]>> {
 		this.assertIsInitialized();
 
 		_.each(connectToPortArray, c => {
 			this.$logger.trace(`Connecting to port ${c.port} on device with identifier: ${c.deviceId}`);
 		});
 
-		return this.getMultipleResults<IOSDeviceLib.IDeviceResponse>(() => this.deviceLib.connectToPort(connectToPortArray), errorHandler);
+		return this.getMultipleResults<IOSDeviceLib.IConnectToPortResponse>(() => this.deviceLib.connectToPort(connectToPortArray), errorHandler);
 	}
 
 	public setShouldDispose(shouldDispose: boolean): void {

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

@@ -2,7 +2,6 @@ import * as applicationManagerPath from "./ios-application-manager";
 import * as fileSystemPath from "./ios-device-file-system";
 import * as constants from "../../../constants";
 import * as net from "net";
-import { IOSDeviceSocket } from "./ios-device-socket";
 
 export class IOSDevice implements Mobile.IiOSDevice {
 	public applicationManager: Mobile.IDeviceApplicationManager;
@@ -24,12 +23,13 @@ export class IOSDevice implements Mobile.IiOSDevice {
 
 		const productType = deviceActionInfo.productType;
 		const isTablet = productType && productType.toLowerCase().indexOf("ipad") !== -1;
+		const deviceStatus = deviceActionInfo.status || constants.UNREACHABLE_STATUS;
 		this.deviceInfo = {
 			identifier: deviceActionInfo.deviceId,
 			vendor: "Apple",
 			platform: this.$devicePlatformsConstants.iOS,
-			status: constants.CONNECTED_STATUS,
-			errorHelp: null,
+			status: deviceStatus,
+			errorHelp: deviceStatus === constants.UNREACHABLE_STATUS ? `Device ${deviceActionInfo.deviceId} is ${constants.UNREACHABLE_STATUS}` : null,
 			type: "Device",
 			isTablet: isTablet,
 			displayName: this.$iOSDeviceProductNameMapper.resolveProductName(deviceActionInfo.deviceName) || deviceActionInfo.deviceName,
@@ -59,13 +59,11 @@ export class IOSDevice implements Mobile.IiOSDevice {
 	// This function works only on OSX
 	public async connectToPort(port: number): Promise<net.Socket> {
 		const deviceId = this.deviceInfo.identifier;
-		const deviceResponse = (await this.$iosDeviceOperations.connectToPort([{ deviceId: deviceId, port: port }]))[deviceId];
+		const deviceResponse = _.first((await this.$iosDeviceOperations.connectToPort([{ deviceId: deviceId, port: port }]))[deviceId]);
 
-		// HACK to override the write method of net.Socket
-		const fd = deviceResponse[0].response;
-		const socket = new IOSDeviceSocket({ fd: fd });
-		socket.initialize(fd, deviceId, this.$iosDeviceOperations);
-		this._socket = <any>socket;
+		const socket = new net.Socket();
+		socket.connect(deviceResponse.port, deviceResponse.host);
+		this._socket = socket;
 
 		this.$processService.attachToProcessExitSignals(this, this.destroySocket);
 		return this._socket;