Merge pull request #1424 from NativeScript/fatme/shasums-on-android

Speed up livesync on android device

Author: rosen-vladimirov

lib/common

@@ -8,6 +8,7 @@ interface IPlatformService {
 	runPlatform(platform: string, buildConfig?: IBuildConfig): IFuture<void>;
 	preparePlatform(platform: string): IFuture<boolean>;
 	buildPlatform(platform: string, buildConfig?: IBuildConfig): IFuture<void>;
+	buildForDeploy(platform: string, buildConfig?: IBuildConfig): IFuture<void>;
 	installOnDevice(platform: string, buildConfig?: IBuildConfig): IFuture<void>;
 	deployOnDevice(platform: string, buildConfig?: IBuildConfig): IFuture<void>;
 	deployOnEmulator(platform: string, buildConfig?: IBuildConfig): IFuture<void>;

lib/definitions/platform.d.ts

@@ -3,6 +3,11 @@
 import * as deviceAppDataBaseLib from "../common/mobile/device-app-data/device-app-data-base";
 import Future = require("fibers/future");
 import * as path from "path";
+import {AndroidDeviceHashService} from "../common/mobile/android/android-device-hash-service";
+import {AndroidDebugBridge} from "../common/mobile/android/android-debug-bridge";
+
+const SYNC_DIR_NAME = "sync";
+const FULLSYNC_DIR_NAME = "fullsync";
 
 export class IOSAppIdentifier extends deviceAppDataBaseLib.DeviceAppDataBase implements Mobile.IDeviceAppData  {
 	private static DEVICE_PROJECT_ROOT_PATH = "Library/Application Support/LiveSync/app";
@@ -37,18 +42,34 @@ export class AndroidAppIdentifier extends deviceAppDataBaseLib.DeviceAppDataBase
 	constructor(_appIdentifier: string,
 		public device: Mobile.IDevice,
 		public platform: string,
-		private $options: IOptions) {
+		private $options: IOptions,
+		private $injector: IInjector) {
 		super(_appIdentifier);
 	}
 
+	private _deviceProjectRootPath: string;
+
 	public get deviceProjectRootPath(): string {
-		let syncFolderName = this.$options.watch ? "sync" : "fullsync";
-		return `/data/local/tmp/${this.appIdentifier}/${syncFolderName}`;
+		if(!this._deviceProjectRootPath) {
+			let syncFolderName = this.getSyncFolderName().wait();
+			this._deviceProjectRootPath = `/data/local/tmp/${this.appIdentifier}/${syncFolderName}`;
+		}
+
+		return this._deviceProjectRootPath;
 	}
 
 	public isLiveSyncSupported(): IFuture<boolean> {
 		return Future.fromResult(true);
 	}
+
+	private getSyncFolderName(): IFuture<string> {
+		return ((): string =>{
+			let adb =  this.$injector.resolve(AndroidDebugBridge, { identifier: this.device.deviceInfo.identifier });
+			let deviceHashService = this.$injector.resolve(AndroidDeviceHashService, {adb: adb, appIdentifier: this.appIdentifier});
+			let hashFile = this.$options.force ? null : deviceHashService.doesShasumFileExistsOnDevice().wait();
+			return this.$options.watch || hashFile ? SYNC_DIR_NAME : FULLSYNC_DIR_NAME;
+		}).future<string>()();
+	}
 }
 
 export class DeviceAppDataProvider implements Mobile.IDeviceAppDataProvider {

lib/providers/device-app-data-provider.ts

@@ -25,7 +25,7 @@ export class LiveSyncProvider implements ILiveSyncProvider {
 
 	public buildForDevice(device: Mobile.IDevice): IFuture<string> {
 		return (() => {
-			this.$platformService.buildPlatform(device.deviceInfo.platform, {buildForDevice: !device.isEmulator}).wait();
+			this.$platformService.buildForDeploy(device.deviceInfo.platform, {buildForDevice: !device.isEmulator}).wait();
 			let platformData = this.$platformsData.getPlatformData(device.deviceInfo.platform);
 			if (device.isEmulator) {
 				return this.$platformService.getLatestApplicationPackageForEmulator(platformData).wait().packageName;

lib/providers/livesync-provider.ts

@@ -7,6 +7,7 @@ import * as constants from "../constants";
 import * as semver from "semver";
 import * as projectServiceBaseLib from "./platform-project-service-base";
 import * as androidDebugBridgePath from "../common/mobile/android/android-debug-bridge";
+import {AndroidDeviceHashService} from "../common/mobile/android/android-device-hash-service";
 
 export class AndroidProjectService extends projectServiceBaseLib.PlatformProjectServiceBase implements IPlatformProjectService {
 	private static VALUES_DIRNAME = "values";
@@ -29,7 +30,8 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		private $sysInfo: ISysInfo,
 		private $mobileHelper: Mobile.IMobileHelper,
 		private $injector: IInjector,
-		private $pluginVariablesService: IPluginVariablesService) {
+		private $pluginVariablesService: IPluginVariablesService,
+		private $deviceAppDataFactory: Mobile.IDeviceAppDataFactory) {
 			super($fs, $projectData, $projectDataService);
 			this._androidProjectPropertiesManagers = Object.create(null);
 	}
@@ -330,6 +332,14 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 			adb.executeShellCommand(["rm", "-rf", this.$mobileHelper.buildDevicePath(deviceRootPath, "fullsync"),
 				this.$mobileHelper.buildDevicePath(deviceRootPath, "sync"),
 				this.$mobileHelper.buildDevicePath(deviceRootPath, "removedsync")]).wait();
+
+			let projectFilesManager = this.$injector.resolve("projectFilesManager"); // We need to resolve projectFilesManager here due to cyclic dependency
+			let devicesService: Mobile.IDevicesService = this.$injector.resolve("devicesService");
+			let device = _.find(devicesService.getDevicesForPlatform(this.platformData.normalizedPlatformName), d => d.deviceInfo.identifier === deviceIdentifier);
+			let deviceAppData = this.$deviceAppDataFactory.create(this.$projectData.projectId, this.platformData.normalizedPlatformName, device);
+			let localToDevicePaths = projectFilesManager.createLocalToDevicePaths(deviceAppData, path.join(this.platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME));
+			let deviceHashService = this.$injector.resolve(AndroidDeviceHashService, { adb: adb, appIdentifier: this.$projectData.projectId });
+			deviceHashService.uploadHashFileToDevice(localToDevicePaths).wait();
 		}).future<void>()();
 	}
 

lib/services/android-project-service.ts

@@ -1,6 +1,8 @@
 ///<reference path="../../.d.ts"/>
 "use strict";
 
+import {AndroidDebugBridge} from "../../common/mobile/android/android-debug-bridge";
+import {AndroidDeviceHashService} from "../../common/mobile/android/android-device-hash-service";
 import Future = require("fibers/future");
 import * as helpers from "../../common/helpers";
 import liveSyncServiceBaseLib = require("./livesync-service-base");
@@ -13,7 +15,9 @@ class AndroidLiveSyncService extends liveSyncServiceBaseLib.LiveSyncServiceBase<
 	constructor(_device: Mobile.IDevice,
 		private $fs: IFileSystem,
 		private $mobileHelper: Mobile.IMobileHelper,
-		private $options: IOptions) {
+		private $options: IOptions,
+		private $injector: IInjector,
+		private $projectData: IProjectData) {
 		super(_device);
 	}
 
@@ -53,9 +57,15 @@ class AndroidLiveSyncService extends liveSyncServiceBaseLib.LiveSyncServiceBase<
 				let deviceFilePath = this.$mobileHelper.buildDevicePath(deviceRootPath, "removedsync", relativeUnixPath);
 				this.device.adb.executeShellCommand(["mkdir", "-p", path.dirname(deviceFilePath), "&&", "touch", deviceFilePath]).wait();
 			});
+
+			this.deviceHashService.removeHashes(localToDevicePaths).wait();
 		}).future<void>()();
 	}
 
+	public afterInstallApplicationAction(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]): IFuture<void> {
+		return this.deviceHashService.uploadHashFileToDevice(localToDevicePaths);
+	}
+
 	private getDeviceRootPath(appIdentifier: string): string {
 		return `/data/local/tmp/${appIdentifier}`;
 	}
@@ -77,5 +87,15 @@ class AndroidLiveSyncService extends liveSyncServiceBaseLib.LiveSyncServiceBase<
 
 		return future;
 	}
+
+	private _deviceHashService: Mobile.IAndroidDeviceHashService;
+	private get deviceHashService(): Mobile.IAndroidDeviceHashService {
+		if (!this._deviceHashService) {
+			let adb = this.$injector.resolve(AndroidDebugBridge, { identifier: this.device.deviceInfo.identifier });
+			this._deviceHashService = this.$injector.resolve(AndroidDeviceHashService, { adb: adb, appIdentifier: this.$projectData.projectId });
+		}
+
+		return this._deviceHashService;
+	}
 }
 $injector.register("androidLiveSyncServiceLocator", {factory: AndroidLiveSyncService});

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

@@ -311,7 +311,7 @@ export class PlatformService implements IPlatformService {
 		}).future<void>()();
 	}
 
-	public buildForDeploy(platform: string, buildConfig?: IBuildConfig): IFuture<string> {
+	public buildForDeploy(platform: string, buildConfig?: IBuildConfig): IFuture<void> {
 		return (() => {
 			platform = platform.toLowerCase();
 			if (!this.preparePlatform(platform).wait()) {
@@ -321,7 +321,7 @@ export class PlatformService implements IPlatformService {
 			let platformData = this.$platformsData.getPlatformData(platform);
 			platformData.platformProjectService.buildForDeploy(platformData.projectRoot, buildConfig).wait();
 			this.$logger.out("Project successfully built");
-		}).future<string>()();
+		}).future<void>()();
 	}
 
 	public copyLastOutput(platform: string, targetPath: string, settings: {isForDevice: boolean}): IFuture<void> {