Merge pull request #1929 from NativeScript/raikov/livesync-debug

Added support for debug with livesync

Author: tzraikov

lib/commands/debug.ts

@@ -1,10 +1,15 @@
 export class DebugPlatformCommand implements ICommand {
 	constructor(private debugService: IDebugService,
 		private $devicesService: Mobile.IDevicesService,
+		private $usbLiveSyncService: ILiveSyncService,
 		private $logger: ILogger,
 		protected $options: IOptions) { }
 
 	execute(args: string[]): IFuture<void> {
+		if (!this.$options.rebuild) {
+			this.$options.debug = true;
+			return this.$usbLiveSyncService.liveSync(this.$devicesService.platform);
+		}
 		return this.debugService.debug();
 	}
 
@@ -33,19 +38,21 @@
 export class DebugIOSCommand extends DebugPlatformCommand {
 	constructor($iOSDebugService: IDebugService,
 		$devicesService: Mobile.IDevicesService,
+		$usbLiveSyncService: ILiveSyncService,
 		$logger: ILogger,
 		$options: IOptions) {
-		super($iOSDebugService, $devicesService, $logger, $options);
+		super($iOSDebugService, $devicesService, $usbLiveSyncService, $logger, $options);
 	}
 }
 $injector.registerCommand("debug|ios", DebugIOSCommand);
 
 export class DebugAndroidCommand extends DebugPlatformCommand {
 	constructor($androidDebugService: IDebugService,
 		$devicesService: Mobile.IDevicesService,
+		$usbLiveSyncService: ILiveSyncService,
 		$logger: ILogger,
 		$options: IOptions) {
-		super($androidDebugService, $devicesService, $logger, $options);
+		super($androidDebugService, $devicesService, $usbLiveSyncService, $logger, $options);
 	}
 }
 $injector.registerCommand("debug|android", DebugAndroidCommand);

lib/declarations.ts

@@ -91,6 +91,7 @@ interface IOptions extends ICommonOptions {
 	symlink: boolean;
 	tnsModulesVersion: string;
 	teamId: string;
+	rebuild: boolean;
 }
 
 interface IInitService {

lib/definitions/debug.d.ts

@@ -1,5 +1,5 @@
 interface IDebugService {
-	debug(): IFuture<void>;
+	debug(shouldBreak?: boolean): IFuture<void>;
 	debugStart(): IFuture<void>;
 	platform: string;
 }

lib/options.ts

@@ -36,7 +36,8 @@ export class Options extends commonOptionsLibPath.OptionsBase {
 			tsc: {type: OptionType.Boolean },
 			bundle: {type: OptionType.Boolean },
 			all: {type: OptionType.Boolean },
-			teamId: { type: OptionType.String }
+			teamId: { type: OptionType.String },
+			rebuild: { type: OptionType.Boolean, default: true }
 		},
 		path.join($hostInfo.isWindows ? process.env.AppData : path.join(osenv.home(), ".local/share"), ".nativescript-cli"),
 			$errors, $staticConfig);

lib/services/android-debug-service.ts

@@ -107,7 +107,9 @@ class AndroidDebugService implements IDebugService {
 			if (!this.$options.start && !this.$options.emulator && !this.$options.getPort) {
 				let cachedDeviceOption = this.$options.forDevice;
 				this.$options.forDevice = true;
-				this.$platformService.buildPlatform(this.platform).wait();
+				if (this.$options.rebuild) {
+					this.$platformService.buildPlatform(this.platform).wait();
+				}
 				this.$options.forDevice = !!cachedDeviceOption;
 
 				let platformData = this.$platformsData.getPlatformData(this.platform);

lib/services/ios-debug-service.ts

@@ -73,7 +73,9 @@ class IOSDebugService implements IDebugService {
 	private emulatorDebugBrk(shouldBreak?: boolean): IFuture<void> {
 		return (() => {
 			let platformData = this.$platformsData.getPlatformData(this.platform);
-			this.$platformService.buildPlatform(this.platform).wait();
+			if (this.$options.rebuild) {
+				this.$platformService.buildPlatform(this.platform).wait();
+			}
 			let emulatorPackage = this.$platformService.getLatestApplicationPackageForEmulator(platformData).wait();
 
 			let args = shouldBreak ? "--nativescript-debug-brk" : "--nativescript-debug-start";

lib/services/livesync/android-livesync-service.ts

@@ -15,11 +15,15 @@ class AndroidLiveSyncService extends PlatformLiveSyncServiceBase<Mobile.IAndroid
 		private $options: IOptions,
 		private $injector: IInjector,
 		private $projectData: IProjectData,
+		private $androidDebugService: IDebugService,
 		$liveSyncProvider: ILiveSyncProvider) {
 		super(_device, $liveSyncProvider);
 	}
 
 	public restartApplication(deviceAppData: Mobile.IDeviceAppData): IFuture<void> {
+		if (this.$options.debug) {
+			return this.$androidDebugService.debug();
+		}
 		return (() => {
 			this.device.adb.executeShellCommand(["chmod", "777", deviceAppData.deviceProjectRootPath, `/data/local/tmp/${deviceAppData.appIdentifier}`]).wait();
 

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

@@ -15,6 +15,7 @@ class IOSLiveSyncService extends PlatformLiveSyncServiceBase<Mobile.IiOSDevice>
 		private $injector: IInjector,
 		private $logger: ILogger,
 		private $options: IOptions,
+		private $iOSDebugService: IDebugService,
 		$liveSyncProvider: ILiveSyncProvider) {
 		super(_device, $liveSyncProvider);
 	}
@@ -32,8 +33,12 @@ class IOSLiveSyncService extends PlatformLiveSyncServiceBase<Mobile.IiOSDevice>
 	}
 
 	protected restartApplication(deviceAppData: Mobile.IDeviceAppData): IFuture<void> {
-		let projectData: IProjectData = this.$injector.resolve("projectData");
-		return this.device.applicationManager.restartApplication(deviceAppData.appIdentifier, projectData.projectName);
+		if (this.$options.debug) {
+			return this.$iOSDebugService.debug();
+		} else {
+			let projectData: IProjectData = this.$injector.resolve("projectData");
+			return this.device.applicationManager.restartApplication(deviceAppData.appIdentifier, projectData.projectName);
+		}
 	}
 
 	protected reloadPage(deviceAppData: Mobile.IDeviceAppData): IFuture<void> {