Integrate the new live sync + debug logic in the current refactoring

KristinaKoeva · KristinaKoeva · commit 703e38670a33 · 2016-07-29T14:51:00.000+03:00
diff --git a/lib/commands/debug.ts b/lib/commands/debug.ts
@@ -6,32 +6,26 @@
 		private $childProcess: IChildProcess,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $config: IConfiguration,
+		private $usbLiveSyncService: ILiveSyncService,
 		protected $options: IOptions) { }
 
 	execute(args: string[]): IFuture<void> {
 		if (!this.$options.rebuild && !this.$options.start) {
 			this.$config.debugLivesync = true;
-			let usbLiveSyncService: ILiveSyncService = this.$injector.resolve("usbLiveSyncService");
-			let liveSyncServiceBase: any = this.$injector.resolve("liveSyncServiceBase");
-			let liveSyncProvider: ILiveSyncProvider = this.$injector.resolve("liveSyncProvider");
+			let applicationReloadAction = (deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]): IFuture<void> => {
+				return (() => {
+					let projectData: IProjectData = this.$injector.resolve("projectData");
 
-			liveSyncServiceBase.on("sync", (device: Mobile.IDevice, data: ILiveSyncData) => {
-				let platformLiveSyncService: IPlatformLiveSyncService = this.$injector.resolve(liveSyncProvider.platformSpecificLiveSyncServices[data.platform.toLowerCase()], { _device: device });
-				let projectData: IProjectData = this.$injector.resolve("projectData");
-				let appId = device.isEmulator ? projectData.projectName : data.appIdentifier;
-				if (data.platform === this.$devicePlatformsConstants.iOS) {
-					platformLiveSyncService.debugService.debugStop().wait();
-				}
-				device.applicationManager.stopApplication(appId).wait();
-				platformLiveSyncService.debugService.debug().wait();
-			});
+					this.debugService.debugStop().wait();
 
-			liveSyncServiceBase.on("syncAfterInstall", (device: Mobile.IDevice, data: ILiveSyncData) => {
-				let platformLiveSyncService: IPlatformLiveSyncService = this.$injector.resolve(liveSyncProvider.platformSpecificLiveSyncServices[data.platform.toLowerCase()], { _device: device });
-				platformLiveSyncService.debugService.debug().wait();
-			});
+					let applicationId = deviceAppData.device.isEmulator ? projectData.projectName : deviceAppData.appIdentifier;
+					deviceAppData.device.applicationManager.stopApplication(applicationId).wait();
 
-			return usbLiveSyncService.liveSync(this.$devicesService.platform);
+					this.debugService.debug().wait();
+				}).future<void>()();
+			};
+
+			return this.$usbLiveSyncService.liveSync(this.$devicesService.platform, applicationReloadAction);
 		}
 		return this.debugService.debug();
 	}
@@ -66,8 +60,9 @@ export class DebugIOSCommand extends DebugPlatformCommand {
 		$childProcess: IChildProcess,
 		$devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		$config: IConfiguration,
+		$usbLiveSyncService: ILiveSyncService,
 		$options: IOptions) {
-		super($iOSDebugService, $devicesService, $injector, $logger, $childProcess, $devicePlatformsConstants, $config, $options);
+		super($iOSDebugService, $devicesService, $injector, $logger, $childProcess, $devicePlatformsConstants, $config, $usbLiveSyncService, $options);
 	}
 }
 $injector.registerCommand("debug|ios", DebugIOSCommand);
@@ -78,10 +73,11 @@ export class DebugAndroidCommand extends DebugPlatformCommand {
 		$injector: IInjector,
 		$logger: ILogger,
 		$childProcess: IChildProcess,
-	    $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
+		$devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		$config: IConfiguration,
+		$usbLiveSyncService: ILiveSyncService,
 		$options: IOptions) {
-		super($androidDebugService, $devicesService, $injector, $logger, $childProcess, $devicePlatformsConstants, $config, $options);
+		super($androidDebugService, $devicesService, $injector, $logger, $childProcess, $devicePlatformsConstants, $config, $usbLiveSyncService, $options);
 	}
 }
 $injector.registerCommand("debug|android", DebugAndroidCommand);
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit 030037b359919a37b84f534a110ad7e14bff8db2
+Subproject commit f649a80f62b5c822dfddb5dc220ffb9e7e46fed9
diff --git a/lib/declarations.ts b/lib/declarations.ts
@@ -57,13 +57,14 @@ interface IOpener {
 }
 
 interface ILiveSyncService {
-	liveSync(platform: string): IFuture<void>;
+	liveSync(platform: string, applicationReloadAction?: (deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]) => IFuture<void>): IFuture<void>;
 	forceExecuteFullSync: boolean;
 }
 
 interface IPlatformLiveSyncService {
-	fullSync(): IFuture<void>;
-	partialSync(event: string, filePath: string, dispatcher: IFutureDispatcher): void;
+	fullSync(postAction?: (deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]) => IFuture<void>): IFuture<void>;
+	partialSync(event: string, filePath: string, dispatcher: IFutureDispatcher, afterFileSyncAction: (deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]) => IFuture<void>): void;
+	refreshApplication(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]): IFuture<void>;
 }
 
 interface IOptions extends ICommonOptions {
diff --git a/lib/definitions/debug.d.ts b/lib/definitions/debug.d.ts
@@ -1,6 +1,6 @@
 interface IDebugService {
 	debug(shouldBreak?: boolean): IFuture<void>;
 	debugStart(): IFuture<void>;
-	debugStop?(): IFuture<void>
+	debugStop(): IFuture<void>
 	platform: string;
 }
diff --git a/lib/services/android-debug-service.ts b/lib/services/android-debug-service.ts
@@ -190,6 +190,10 @@ class AndroidDebugService implements IDebugService {
 		}).future<void>()();
 	}
 
+	public debugStop(): IFuture<void> {
+		return Future.fromResult();
+	}
+
 	private debugStartCore(): IFuture<void> {
 		return (() => {
 			let packageName = this.$projectData.projectId;
diff --git a/lib/services/livesync/android-platform-livesync-service.ts b/lib/services/livesync/android-platform-livesync-service.ts
@@ -15,7 +15,7 @@ class AndroidPlatformLiveSyncService extends PlatformLiveSyncServiceBase {
 		super(_liveSyncData, $devicesService, $mobileHelper, $logger, $options, $deviceAppDataFactory, $fs, $injector, $projectFilesManager, $projectFilesProvider, $liveSyncProvider);
 	}
 
-	public fullSync(): IFuture<void> {
+	public fullSync(postAction?: (deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]) => IFuture<void>): IFuture<void> {
 		return (() => {
 			let appIdentifier = this.liveSyncData.appIdentifier;
 			let platform = this.liveSyncData.platform;
@@ -30,15 +30,21 @@ class AndroidPlatformLiveSyncService extends PlatformLiveSyncServiceBase {
 
 					let installed = this.tryInstallApplication(device, deviceAppData).wait();
 					let localToDevicePaths = this.$projectFilesManager.createLocalToDevicePaths(deviceAppData, projectFilesPath, null, this.liveSyncData.excludedProjectDirsAndFiles);
+					let afterSyncAction: () => IFuture<void>;
 
 					if (installed) {
 						deviceLiveSyncService.afterInstallApplicationAction(deviceAppData, localToDevicePaths).wait();
-
-						device.applicationManager.tryStartApplication(deviceAppData.appIdentifier).wait();
+						afterSyncAction = () => device.applicationManager.tryStartApplication(deviceAppData.appIdentifier);
 					} else {
 						this.transferFiles(deviceAppData, localToDevicePaths, this.liveSyncData.projectFilesPath, true).wait();
-						this.refreshApplication(deviceAppData, localToDevicePaths, this.liveSyncData.forceExecuteFullSync).wait();
+						afterSyncAction = () => this.refreshApplication(deviceAppData, localToDevicePaths);
+					}
+
+					if (postAction) {
+						return postAction(deviceAppData, localToDevicePaths);
 					}
+
+					return afterSyncAction();
 				}).future<void>()();
 			};
 			this.$devicesService.execute(action, canExecute).wait();
diff --git a/lib/services/livesync/ios-platform-livesync-service.ts b/lib/services/livesync/ios-platform-livesync-service.ts
@@ -15,7 +15,7 @@ class IOSPlatformLiveSyncService extends PlatformLiveSyncServiceBase {
 		super(_liveSyncData, $devicesService, $mobileHelper, $logger, $options, $deviceAppDataFactory, $fs, $injector, $projectFilesManager, $projectFilesProvider, $liveSyncProvider);
 	}
 
-	public fullSync(): IFuture<void> {
+	public fullSync(postAction?: (deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]) => IFuture<void>): IFuture<void> {
 		return (() => {
 			let appIdentifier = this.liveSyncData.appIdentifier;
 			let platform = this.liveSyncData.platform;
@@ -26,14 +26,21 @@ class IOSPlatformLiveSyncService extends PlatformLiveSyncServiceBase {
 				return (() => {
 					let deviceAppData = this.$deviceAppDataFactory.create(appIdentifier, this.$mobileHelper.normalizePlatformName(platform), device);
 					let installed = this.tryInstallApplication(device, deviceAppData).wait();
+					let localToDevicePaths = this.$projectFilesManager.createLocalToDevicePaths(deviceAppData, projectFilesPath, null, this.liveSyncData.excludedProjectDirsAndFiles);
+					let afterSyncAction: () => IFuture<void>;
 
 					if(installed) {
-						device.applicationManager.tryStartApplication(deviceAppData.appIdentifier).wait();
+						afterSyncAction = () => device.applicationManager.tryStartApplication(deviceAppData.appIdentifier);
 					} else {
-						let localToDevicePaths = this.$projectFilesManager.createLocalToDevicePaths(deviceAppData, projectFilesPath, null, this.liveSyncData.excludedProjectDirsAndFiles);
 						this.transferFiles(deviceAppData, localToDevicePaths, this.liveSyncData.projectFilesPath, true).wait();
-						this.refreshApplication(deviceAppData, localToDevicePaths, this.liveSyncData.forceExecuteFullSync).wait();
+						afterSyncAction = () => this.refreshApplication(deviceAppData, localToDevicePaths);
 					}
+
+					if (postAction) {
+						return postAction(deviceAppData, localToDevicePaths);
+					}
+
+					return afterSyncAction();
 				}).future<void>()();
 			};
 			this.$devicesService.execute(action, canExecute).wait();
diff --git a/lib/services/livesync/livesync-service-base.ts b/lib/services/livesync/livesync-service-base.ts
diff --git a/lib/services/livesync/livesync-service.ts b/lib/services/livesync/livesync-service.ts
diff --git a/lib/services/livesync/platform-livesync-service-base.ts b/lib/services/livesync/platform-livesync-service-base.ts

Original file line number	Diff line number	Diff line change
`@@ -57,13 +57,14 @@ interface IOpener {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`interface ILiveSyncService {`
`60`		`- liveSync(platform: string): IFuture<void>;`
	`60`	`+ liveSync(platform: string, applicationReloadAction?: (deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]) => IFuture<void>): IFuture<void>;`
`61`	`61`	`forceExecuteFullSync: boolean;`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`interface IPlatformLiveSyncService {`
`65`		`- fullSync(): IFuture<void>;`
`66`		`- partialSync(event: string, filePath: string, dispatcher: IFutureDispatcher): void;`
	`65`	`+ fullSync(postAction?: (deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]) => IFuture<void>): IFuture<void>;`
	`66`	`+ partialSync(event: string, filePath: string, dispatcher: IFutureDispatcher, afterFileSyncAction: (deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]) => IFuture<void>): void;`
	`67`	`+ refreshApplication(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]): IFuture<void>;`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`interface IOptions extends ICommonOptions {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`interface IDebugService {`
`2`	`2`	`debug(shouldBreak?: boolean): IFuture<void>;`
`3`	`3`	`debugStart(): IFuture<void>;`
`4`		`- debugStop?(): IFuture<void>`
	`4`	`+ debugStop(): IFuture<void>`
`5`	`5`	`platform: string;`
`6`	`6`	`}`