fix: handle app crashes the same as hmr sync failures in order to allow app recovery

Author: DimitarTachev

lib/common/constants.ts

@@ -54,6 +54,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 TARGET_FRAMEWORK_IDENTIFIERS = {
 	Cordova: "Cordova",

lib/definitions/hmr-status-service.d.ts

@@ -1,4 +1,5 @@
 interface IHmrStatusService {
+	watchHmrStatus(deviceId: string, operationHash: string): void;
 	getHmrStatus(deviceId: string, operationHash: string): Promise<number>;
 	attachToHmrStatusEvent(): void;
 }

lib/services/hmr-status-service.ts

@@ -1,5 +1,5 @@
 import { cache } from "../common/decorators";
-import { HmrConstants } from "../common/constants";
+import { HmrConstants, IOS_APP_CRASH_LOG_REG_EXP } from "../common/constants";
 
 export class HmrStatusService implements IHmrStatusService {
 	public static HMR_STATUS_LOG_REGEX = /([a-z A-Z]*) hmr hash ([a-z0-9]*)\./;
@@ -11,9 +11,10 @@ export class HmrStatusService implements IHmrStatusService {
 
 	constructor(private $logParserService: ILogParserService,
 		private $processService: IProcessService,
+		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $logger: ILogger) {
-			this.$processService.attachToProcessExitSignals(this, this.dispose);
-		}
+		this.$processService.attachToProcessExitSignals(this, this.dispose);
+	}
 
 	public getHmrStatus(deviceId: string, operationHash: string): Promise<number> {
 		return new Promise((resolve, reject) => {
@@ -33,13 +34,32 @@ export class HmrStatusService implements IHmrStatusService {
 		});
 	}
 
+	public watchHmrStatus(deviceId: string, operationHash: string): void {
+		this.setData(deviceId, operationHash);
+	}
+
 	@cache()
 	public attachToHmrStatusEvent(): void {
 		this.$logParserService.addParseRule({
 			regex: HmrStatusService.HMR_STATUS_LOG_REGEX,
 			handler: this.handleHmrStatusFound.bind(this),
 			name: "hmrStatus"
 		});
+		this.$logParserService.addParseRule({
+			regex: IOS_APP_CRASH_LOG_REG_EXP,
+			handler: this.handleAppCrash.bind(this),
+			name: "appCrashHmr",
+			platform: this.$devicePlatformsConstants.iOS.toLowerCase()
+		});
+	}
+
+	private handleAppCrash(matches: RegExpMatchArray, deviceId: string): void {
+		for (const operationId in this.hashOperationStatuses) {
+			const operation = this.hashOperationStatuses[operationId];
+			if (operationId.startsWith(deviceId) && !operation.status) {
+				operation.status = HmrConstants.HMR_ERROR_STATUS;
+			}
+		}
 	}
 
 	private handleHmrStatusFound(matches: RegExpMatchArray, deviceId: string): void {
@@ -65,7 +85,7 @@ export class HmrStatusService implements IHmrStatusService {
 		this.$logger.trace("Found hmr status.", { status, hash });
 
 		if (status) {
-			this.setData(status, hash, deviceId);
+			this.setData(deviceId, hash, status);
 		}
 	}
 
@@ -77,7 +97,7 @@ export class HmrStatusService implements IHmrStatusService {
 		return null;
 	}
 
-	private setData(status: Number, operationHash: string, deviceId: string): void {
+	private setData(deviceId: string, operationHash: string, status?: Number): void {
 		const key = `${deviceId}${operationHash}`;
 
 		if (!this.hashOperationStatuses[key]) {

lib/services/ios-debugger-port-service.ts

@@ -1,10 +1,9 @@
-import { DEBUGGER_PORT_FOUND_EVENT_NAME, ATTACH_REQUEST_EVENT_NAME } from "../common/constants";
+import { DEBUGGER_PORT_FOUND_EVENT_NAME, ATTACH_REQUEST_EVENT_NAME, IOS_APP_CRASH_LOG_REG_EXP } from "../common/constants";
 import { cache } from "../common/decorators";
 import { APPLICATION_RESPONSE_TIMEOUT_SECONDS } from "../constants";
 
 export class IOSDebuggerPortService implements IIOSDebuggerPortService {
 	public static DEBUG_PORT_LOG_REGEX = /NativeScript debugger has opened inspector socket on port (\d+?) for (.*)[.]/;
-	public static APP_CRASH_LOG_REGEX = /Fatal JavaScript exception \- application has been terminated/;
 	private mapDebuggerPortData: IDictionary<IIOSDebuggerPortStoredData> = {};
 	private currentAppId: string;
 
@@ -51,12 +50,13 @@ export class IOSDebuggerPortService implements IIOSDebuggerPortService {
 			platform: this.$devicePlatformsConstants.iOS.toLowerCase()
 		});
 		this.$logParserService.addParseRule({
-			regex: IOSDebuggerPortService.APP_CRASH_LOG_REGEX,
+			regex: IOS_APP_CRASH_LOG_REG_EXP,
 			handler: this.handleAppCrash.bind(this),
 			name: "appCrash",
 			platform: this.$devicePlatformsConstants.iOS.toLowerCase()
 		});
 	}
+
 	private handleAppCrash(matches: RegExpMatchArray, deviceId: string): void {
 		const data = {
 			port: 0,

lib/services/livesync/livesync-service.ts

@@ -664,12 +664,17 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 										const service = this.getLiveSyncService(device.deviceInfo.platform);
 
 										const watchAction = async (watchInfo: ILiveSyncWatchInfo): Promise<void> => {
+											const isInHMRMode = liveSyncData.useHotModuleReload && platformHmrData.hash;
+											if (isInHMRMode) {
+												this.$hmrStatusService.watchHmrStatus(device.deviceInfo.identifier, platformHmrData.hash);
+											}
+
 											let liveSyncResultInfo = await service.liveSyncWatchAction(device, watchInfo);
 
 											await this.refreshApplication(projectData, liveSyncResultInfo, deviceBuildInfoDescriptor.debugOptions, deviceBuildInfoDescriptor.outputPath);
 
-											// If didRecover is true, this means we were in ErrorActivity and fallback files were already transfered and app will be restarted.
-											if (!liveSyncResultInfo.didRecover && liveSyncData.useHotModuleReload && platformHmrData.hash) {
+											// If didRecover is true, this means we were in ErrorActivity and fallback files were already transferred and app will be restarted.
+											if (!liveSyncResultInfo.didRecover && isInHMRMode) {
 												const status = await this.$hmrStatusService.getHmrStatus(device.deviceInfo.identifier, platformHmrData.hash);
 												if (status === HmrConstants.HMR_ERROR_STATUS) {
 													watchInfo.filesToSync = platformHmrData.fallbackFiles;