fix: remove application start when refreshing application

Author: Fatme

lib/common/constants.ts

@@ -56,6 +56,7 @@ export class EmulatorDiscoveryNames {
 export const DEVICE_LOG_EVENT_NAME = "deviceLogData";
 export const IOS_LOG_PREDICATE = 'senderImagePath contains "NativeScript" || eventMessage contains[c] "NativeScript"';
 export const IOS_APP_CRASH_LOG_REG_EXP = /Fatal JavaScript exception \- application has been terminated/;
+export const FAIL_LIVESYNC_LOG_REGEX = /Failed to refresh the application with RefreshRequest./;
 
 export const TARGET_FRAMEWORK_IDENTIFIERS = {
 	Cordova: "Cordova",

lib/declarations.d.ts

@@ -756,11 +756,12 @@ interface IiOSNotification extends NodeJS.EventEmitter {
 	getAttachRequest(appId: string, deviceId: string): string;
 	getReadyForAttach(appId: string): string;
 	getRefreshRequest(appId: string): string;
+	getAppRefreshStarted(appId: string): string;
 }
 
 interface IiOSSocketRequestExecutor {
 	executeAttachRequest(device: Mobile.IiOSDevice, timeout: number, projectId: string): Promise<void>;
-	executeRefreshRequest(device: Mobile.IiOSDevice, appId: string): Promise<void>;
+	executeRefreshRequest(device: Mobile.IiOSDevice, appId: string): Promise<boolean>;
 }
 
 /**

lib/device-sockets/ios/notification.ts

@@ -3,6 +3,7 @@ import { ATTACH_REQUEST_EVENT_NAME } from "../../common/constants";
 
 export class IOSNotification extends EventEmitter implements IiOSNotification {
 	private static REFRESH_REQUEST_NOTIFICATION_NAME = "RefreshRequest";
+	private static APP_REFRESH_STARTED_NOTIFICATION_NAME = "AppRefreshStarted";
 	private static ATTACH_REQUEST_NOTIFICATION_NAME = "AttachRequest";
 	private static READY_FOR_ATTACH_NOTIFICATION_NAME = "ReadyForAttach";
 
@@ -21,6 +22,10 @@ export class IOSNotification extends EventEmitter implements IiOSNotification {
 		return this.formatNotification(IOSNotification.REFRESH_REQUEST_NOTIFICATION_NAME, appId);
 	}
 
+	public getAppRefreshStarted(appId: string): string {
+		return this.formatNotification(IOSNotification.APP_REFRESH_STARTED_NOTIFICATION_NAME, appId);
+	}
+
 	private formatNotification(notification: string, appId: string) {
 		return `${appId}:NativeScript.Debug.${notification}`;
 	}

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

@@ -6,22 +6,39 @@ export class IOSSocketRequestExecutor implements IiOSSocketRequestExecutor {
 		private $iOSNotificationService: IiOSNotificationService) { }
 
 	public async executeAttachRequest(device: Mobile.IiOSDevice, timeout: number, appId: string): Promise<void> {
-		const deviceIdentifier = device.deviceInfo.identifier;
+		const deviceId = device.deviceInfo.identifier;
+		const mainRequestName = this.$iOSNotification.getAttachRequest(appId, deviceId);
+		const readyRequestName = this.$iOSNotification.getReadyForAttach(appId);
+		await this.executeRequest(mainRequestName, readyRequestName, appId, deviceId, timeout);
+	}
+
+	public async executeRefreshRequest(device: Mobile.IiOSDevice, appId: string): Promise<boolean> {
+		const deviceId = device.deviceInfo.identifier;
+		const mainRequestName = this.$iOSNotification.getRefreshRequest(appId);
+		const readyRequestName = this.$iOSNotification.getAppRefreshStarted(appId);
+		const timeout = 5;
+
+		const result = await this.executeRequest(mainRequestName, readyRequestName, appId, deviceId, timeout);
+
+		return result;
+	}
+
+	private async executeRequest(mainRequestName: string, readyRequestName: string, appId: string, deviceId: string, timeout: number): Promise<boolean> {
+		let isSuccessful = false;
+
 		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(appId), constants.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE);
-			const readyForAttachPromise = this.$iOSNotificationService.awaitNotification(deviceIdentifier, +readyForAttachSocket, timeout);
-			await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getAttachRequest(appId, deviceIdentifier));
-			await readyForAttachPromise;
+			const socket = await this.$iOSNotificationService.postNotification(deviceId, readyRequestName, constants.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE);
+			const notificationPromise = this.$iOSNotificationService.awaitNotification(deviceId, +socket, timeout);
+			await this.$iOSNotificationService.postNotification(deviceId, mainRequestName);
+			await notificationPromise;
+			isSuccessful = true;
 		} catch (e) {
-			this.$errors.fail(`The application ${appId} does not appear to be running on ${deviceIdentifier} or is not built with debugging enabled. Try starting the application manually.`);
+			this.$errors.fail(`The application ${appId} does not appear to be running on ${deviceId} or is not built with debugging enabled. Try starting the application manually.`);
 		}
-	}
 
-	public async executeRefreshRequest(device: Mobile.IiOSDevice, appId: string): Promise<void> {
-		await this.$iOSNotificationService.postNotification(
-			device.deviceInfo.identifier, this.$iOSNotification.getRefreshRequest(appId));
+		return isSuccessful;
 	}
 }
 

lib/services/hmr-status-service.ts

@@ -1,5 +1,5 @@
 import { cache } from "../common/decorators";
-import { HmrConstants, IOS_APP_CRASH_LOG_REG_EXP } from "../common/constants";
+import { HmrConstants, IOS_APP_CRASH_LOG_REG_EXP, FAIL_LIVESYNC_LOG_REGEX } from "../common/constants";
 
 export class HmrStatusService implements IHmrStatusService {
 	public static HMR_STATUS_LOG_REGEX = /([a-z A-Z]*) hmr hash ([a-z0-9]*)\./;
@@ -49,6 +49,12 @@ export class HmrStatusService implements IHmrStatusService {
 			name: "appCrashHmr",
 			platform: this.$devicePlatformsConstants.iOS.toLowerCase()
 		});
+		this.$logParserService.addParseRule({
+			regex: FAIL_LIVESYNC_LOG_REGEX,
+			handler: this.handleAppCrash.bind(this),
+			name: "failedLiveSync",
+			platform: this.$devicePlatformsConstants.iOS.toLowerCase()
+		});
 	}
 
 	private handleAppCrash(matches: RegExpMatchArray, deviceId: string): void {

lib/services/livesync/ios-device-livesync-service.ts

@@ -1,7 +1,5 @@
 import * as constants from "../../constants";
 import * as minimatch from "minimatch";
-import { cache } from "../../common/decorators";
-import { IOS_APP_CRASH_LOG_REG_EXP } from "../../common/constants";
 import * as net from "net";
 import { DeviceLiveSyncServiceBase } from "./device-livesync-service-base";
 import { performanceLog } from "../../common/decorators";
@@ -10,10 +8,7 @@ import * as semver from "semver";
 let currentPageReloadId = 0;
 
 export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implements INativeScriptDeviceLiveSyncService {
-	public static SUCCESS_LIVESYNC_LOG_REGEX = /Successfully refreshed the application with RefreshRequest./;
-	public static FAIL_LIVESYNC_LOG_REGEX = /Failed to refresh the application with RefreshRequest./;
 	private static MIN_RUNTIME_VERSION_WITH_REFRESH_NOTIFICATION = "6.1.0";
-	private _isLiveSyncSuccessful: boolean = null;
 
 	private socket: net.Socket;
 
@@ -22,12 +17,10 @@ export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implemen
 		private $iOSSocketRequestExecutor: IiOSSocketRequestExecutor,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $lockService: ILockService,
-		private $logParserService: ILogParserService,
 		protected platformsDataService: IPlatformsDataService,
 		private $platformCommandHelper: IPlatformCommandHelper,
 		protected device: Mobile.IiOSDevice) {
 		super(platformsDataService, device);
-
 	}
 
 	private canRefreshWithNotification(projectData: IProjectData): boolean {
@@ -123,16 +116,7 @@ export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implemen
 	private async refreshWithNotification(projectData: IProjectData) {
 		let didRefresh = false;
 		await this.$lockService.executeActionWithLock(async () => {
-			this._isLiveSyncSuccessful = null;
-			this.attachToLiveSyncLogs();
-			// TODO: start the application only when needed when we know the app state
-			await this.device.applicationManager.startApplication({
-				appId: projectData.projectIdentifiers.ios,
-				projectName: projectData.projectName,
-				projectDir: projectData.projectDir
-			});
-			await this.$iOSSocketRequestExecutor.executeRefreshRequest(this.device, projectData.projectIdentifiers.ios);
-			didRefresh = await this.isLiveSyncSuccessful();
+			didRefresh = await this.$iOSSocketRequestExecutor.executeRefreshRequest(this.device, projectData.projectIdentifiers.ios);
 		}, `ios-device-livesync-${this.device.deviceInfo.identifier}-${projectData.projectIdentifiers.ios}.lock`);
 
 		return didRefresh;
@@ -147,55 +131,6 @@ export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implemen
 		});
 	}
 
-	@cache()
-	private attachToLiveSyncLogs(): void {
-		this.$logParserService.addParseRule({
-			regex: IOSDeviceLiveSyncService.SUCCESS_LIVESYNC_LOG_REGEX,
-			handler: this.onSuccessfulLiveSync.bind(this),
-			name: "successfulLiveSync",
-			platform: this.$devicePlatformsConstants.iOS.toLowerCase()
-		});
-		this.$logParserService.addParseRule({
-			regex: IOSDeviceLiveSyncService.FAIL_LIVESYNC_LOG_REGEX,
-			handler: this.onFailedLiveSync.bind(this),
-			name: "failedLiveSync",
-			platform: this.$devicePlatformsConstants.iOS.toLowerCase()
-		});
-		this.$logParserService.addParseRule({
-			regex: IOS_APP_CRASH_LOG_REG_EXP,
-			handler: this.onFailedLiveSync.bind(this),
-			name: "liveSyncCrash",
-			platform: this.$devicePlatformsConstants.iOS.toLowerCase()
-		});
-	}
-
-	private onSuccessfulLiveSync(): void {
-		this._isLiveSyncSuccessful = true;
-	}
-
-	private onFailedLiveSync(): void {
-		this._isLiveSyncSuccessful = false;
-	}
-
-	private async isLiveSyncSuccessful(): Promise<boolean> {
-		return new Promise<boolean>((resolve, reject) => {
-			const retryInterval = 500;
-			let retryCount = 60 * 1000 / retryInterval;
-
-			const interval = setInterval(() => {
-				if (this._isLiveSyncSuccessful !== null) {
-					clearInterval(interval);
-					resolve(this._isLiveSyncSuccessful);
-				} else if (retryCount === 0) {
-					clearInterval(interval);
-					resolve(false);
-				} else {
-					retryCount--;
-				}
-			}, retryInterval);
-		});
-	}
-
 	private async reloadPage(): Promise<void> {
 		const message = JSON.stringify({
 			method: "Page.reload",