fix: execute only attach request in order to enable the ios debugging

We don't need the AttachAvailability response as now we don't need different actions based on the response. We just need to get the debug port which is printed by the AttachRequest and the Runtime is now accepting connections regardless of its state. This also allows us to remove the availability calls from the runtime.

Author: DimitarTachev

lib/declarations.d.ts

@@ -755,7 +755,7 @@ interface IiOSNotification extends NodeJS.EventEmitter {
 }
 
 interface IiOSSocketRequestExecutor {
-	executeLaunchRequest(deviceIdentifier: string, timeout: number, readyForAttachTimeout: number, projectId: string, debugOptions: IDebugOptions): Promise<void>;
+	executeLaunchRequest(device: Mobile.IiOSDevice, timeout: number, readyForAttachTimeout: number, projectId: string, debugOptions: IDebugOptions): Promise<void>;
 	executeAttachRequest(device: Mobile.IiOSDevice, timeout: number, projectId: string): Promise<void>;
 }
 

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

@@ -123,7 +123,7 @@ export class AppDebugSocketProxyFactory extends EventEmitter implements IAppDebu
 					this.$logger.trace(err);
 					this.emit(CONNECTION_ERROR_EVENT_NAME, err);
 					acceptHandshake = false;
-					this.$logger.warn(`Cannot connect to device socket. The error message is '${err.message}'. Try starting the application manually.`);
+					this.$logger.warn(`Cannot connect to device socket. The error message is '${err.message}'.`);
 				}
 
 				callback(acceptHandshake);

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

@@ -8,47 +8,21 @@ export class IOSSocketRequestExecutor implements IiOSSocketRequestExecutor {
 
 	public async executeAttachRequest(device: Mobile.IiOSDevice, timeout: number, projectId: string): Promise<void> {
 		const deviceIdentifier = device.deviceInfo.identifier;
-
-		const observeNotificationSockets = [
-			await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getAlreadyConnected(projectId), constants.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE),
-			await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getReadyForAttach(projectId), constants.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE),
-			await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getAttachAvailable(projectId), constants.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE)
-		];
-
-		const observeNotificationPromises = _(observeNotificationSockets)
-			.uniq()
-			.map(s => {
-				return this.$iOSNotificationService.awaitNotification(deviceIdentifier, s, timeout);
-			})
-			.value();
-
-		// Trigger the notifications update.
-		await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getAttachAvailabilityQuery(projectId));
-
-		let receivedNotification: string;
 		try {
-			receivedNotification = await Promise.race(observeNotificationPromises);
+			// We should create this promise here because we need to send the ObserveNotification on the device
+			// before we send the PostNotification.
+			const readyForAttachSocket = await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getReadyForAttach(projectId), constants.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE);
+			const readyForAttachPromise = this.$iOSNotificationService.awaitNotification(deviceIdentifier, +readyForAttachSocket, timeout);
+			await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getAttachRequest(projectId, deviceIdentifier));
+			await readyForAttachPromise;
 		} catch (e) {
-			this.$errors.failWithoutHelp(`The application ${projectId} does not appear to be running on ${device.deviceInfo.displayName} or is not built with debugging enabled.`);
-		}
-
-		switch (receivedNotification) {
-			case this.$iOSNotification.getAlreadyConnected(projectId):
-				this.$errors.failWithoutHelp("A client is already connected.");
-				break;
-			case this.$iOSNotification.getAttachAvailable(projectId):
-				await this.executeAttachAvailable(deviceIdentifier, projectId, timeout);
-				break;
-			case this.$iOSNotification.getReadyForAttach(projectId):
-				break;
-			default:
-				this.$logger.trace("Response from attach availability query:");
-				this.$logger.trace(receivedNotification);
-				this.$errors.failWithoutHelp("No notification received while executing attach request.");
+			this.$errors.failWithoutHelp(`The application ${projectId} does not appear to be running on ${deviceIdentifier} or is not built with debugging enabled. Try starting the application manually.`);
 		}
 	}
 
-	public async executeLaunchRequest(deviceIdentifier: string, timeout: number, readyForAttachTimeout: number, projectId: string, debugOptions: IDebugOptions): Promise<void> {
+	public async executeLaunchRequest(device: Mobile.IiOSDevice, timeout: number, readyForAttachTimeout: number, projectId: string, debugOptions: IDebugOptions): Promise<void> {
+		const deviceIdentifier = device.deviceInfo.identifier;
+
 		try {
 			if (!debugOptions.skipHandshake) {
 				await this.executeHandshake(deviceIdentifier, projectId, timeout);
@@ -58,27 +32,13 @@ export class IOSSocketRequestExecutor implements IiOSSocketRequestExecutor {
 				await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getWaitForDebug(projectId));
 			}
 
-			await this.executeAttachAvailable(deviceIdentifier, projectId, readyForAttachTimeout);
+			await this.executeAttachRequest(device, readyForAttachTimeout, projectId);
 		} catch (e) {
 			this.$logger.trace("Launch request error: ", e);
 			this.$errors.failWithoutHelp("Error while waiting for response from NativeScript runtime.");
 		}
 	}
 
-	private async executeAttachAvailable(deviceIdentifier: string, projectId: string, timeout: number): Promise<void> {
-		try {
-			// We should create this promise here because we need to send the ObserveNotification on the device
-			// before we send the PostNotification.
-			const readyForAttachSocket = await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getReadyForAttach(projectId), constants.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE);
-			const readyForAttachPromise = this.$iOSNotificationService.awaitNotification(deviceIdentifier, +readyForAttachSocket, timeout);
-			await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getAttachRequest(projectId, deviceIdentifier));
-			await readyForAttachPromise;
-		} catch (e) {
-			this.$logger.trace("Attach available error: ", e);
-			this.$errors.failWithoutHelp(`The application ${projectId} timed out when performing the socket handshake.`);
-		}
-	}
-
 	private async executeHandshake(deviceIdentifier: string, projectId: string, timeout: number): Promise<void> {
 		// This notification will be send only once by the runtime during application start.
 		// In case app is already running, we'll fail here as we'll not receive it.

lib/services/android-device-debug-service.ts

@@ -147,7 +147,7 @@ export class AndroidDeviceDebugService extends DebugServiceBase implements IDevi
 
 	private async validateRunningApp(deviceId: string, packageName: string): Promise<void> {
 		if (!(await this.isAppRunning(packageName, deviceId))) {
-			this.$errors.failWithoutHelp(`The application ${packageName} does not appear to be running on ${deviceId} or is not built with debugging enabled.`);
+			this.$errors.failWithoutHelp(`The application ${packageName} does not appear to be running on ${deviceId} or is not built with debugging enabled. Try starting the application manually.`);
 		}
 	}