Merge pull request #4465 from NativeScript/tachev/fix-debug-brk

 fix: debugging clients are now able to debug with debug-brk

Author: Dimitar Tachev

lib/commands/debug.ts

@@ -66,10 +66,6 @@ export class DebugPlatformCommand extends ValidatePlatformCommandBase implements
 			this.$errors.fail("--release flag is not applicable to this command");
 		}
 
-		if (this.$options.hmr && this.$options.debugBrk) {
-			this.$errors.fail("--debug-brk and --hmr flags cannot be combined");
-		}
-
 		const minSupportedWebpackVersion = this.$options.hmr ? LiveSyncCommandHelper.MIN_SUPPORTED_WEBPACK_VERSION_WITH_HMR : null;
 		this.$bundleValidatorHelper.validate(minSupportedWebpackVersion);
 

lib/common/definitions/mobile.d.ts

@@ -106,7 +106,7 @@ declare module Mobile {
 	}
 
 	interface IiOSDevice extends IDevice {
-		getDebugSocket(appId: string, projectName: string): Promise<any>;
+		getDebugSocket(appId: string, projectName: string, ensureAppStarted?: boolean): Promise<any>;
 		destroyDebugSocket(appId: string): Promise<void>;
 		openDeviceLogStream(options?: IiOSLogStreamOptions): Promise<void>;
 		destroyAllSockets(): Promise<void>;

lib/common/mobile/ios/ios-device-base.ts

@@ -15,15 +15,18 @@ export abstract class IOSDeviceBase implements Mobile.IiOSDevice {
 	abstract openDeviceLogStream(options?: Mobile.IiOSLogStreamOptions): Promise<void>;
 
 	@performanceLog()
-	public async getDebugSocket(appId: string, projectName: string): Promise<net.Socket> {
+	public async getDebugSocket(appId: string, projectName: string, ensureAppStarted: boolean = false): Promise<net.Socket> {
 		return this.$lockService.executeActionWithLock(
 			async () => {
 				if (this.cachedSockets[appId]) {
 					return this.cachedSockets[appId];
 				}
 
 				await this.attachToDebuggerFoundEvent(appId, projectName);
-				await this.applicationManager.startApplication({ appId, projectName });
+				if (ensureAppStarted) {
+					await this.applicationManager.startApplication({ appId, projectName });
+				}
+
 				this.cachedSockets[appId] = await this.getDebugSocketCore(appId);
 
 				if (this.cachedSockets[appId]) {

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

@@ -25,7 +25,9 @@ export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implemen
 
 		const appId = projectData.projectIdentifiers.ios;
 		try {
-			this.socket = await this.device.getDebugSocket(appId, projectData.projectName);
+			// TODO: temp workaround till we setup the sockets along with the app start
+			const ensureAppStarted = true;
+			this.socket = await this.device.getDebugSocket(appId, projectData.projectName, ensureAppStarted);
 		} catch (err) {
 			this.$logger.trace(`Error while connecting to the debug socket. Error is:`, err);
 		}