Generate hashes and init connection on beforeLiveSyncAction

Author: KristianDD

lib/common

@@ -1,7 +1,9 @@
 import { DeviceAndroidDebugBridge } from "../../common/mobile/android/device-android-debug-bridge";
 import { AndroidDeviceHashService } from "../../common/mobile/android/android-device-hash-service";
 import { DeviceLiveSyncServiceBase } from "./device-livesync-service-base";
-import { cache } from "../../common/decorators";
+import { APP_FOLDER_NAME } from "../../constants";
+import * as path from "path";
+
 const LivesyncTool = require("nativescript-android-livesync-lib");
 
 export class AndroidDeviceSocketsLiveSyncService extends DeviceLiveSyncServiceBase implements IAndroidNativeScriptDeviceLiveSyncService, INativeScriptDeviceLiveSyncService {
@@ -13,32 +15,61 @@ export class AndroidDeviceSocketsLiveSyncService extends DeviceLiveSyncServiceBa
 		private $injector: IInjector,
 		protected $platformsData: IPlatformsData,
 		protected $staticConfig: Config.IStaticConfig,
-		protected device: Mobile.IAndroidDevice) {
+		protected device: Mobile.IAndroidDevice,
+		private $options: ICommonOptions) {
 		super($platformsData, device);
 		this.livesyncTool = new LivesyncTool();
 	}
 
 	public async beforeLiveSyncAction(deviceAppData: Mobile.IDeviceAppData): Promise<void> {
+		const platformData = this.$platformsData.getPlatformData(deviceAppData.platform, this.data);
+		const projectFilesPath = path.join(platformData.appDestinationDirectoryPath, APP_FOLDER_NAME);
+		await this.connectLivesyncTool(projectFilesPath, this.data.projectId);
 		await this.device.applicationManager.startApplication({ appId: deviceAppData.appIdentifier, projectName: this.data.projectName });
 	}
 
 	public async refreshApplication(projectData: IProjectData, liveSyncInfo: ILiveSyncResultInfo): Promise<void> {
-		//await this.connectLivesyncTool("", projectData.projectId);
 		await this.livesyncTool.sendDoSyncOperation()
 	}
 
 	public async removeFiles(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[], projectFilesPath: string): Promise<void> {
-		await this.connectLivesyncTool(projectFilesPath, deviceAppData.appIdentifier);
 		await this.livesyncTool.removeFilesArray(_.map(localToDevicePaths, (element: any) => { return element.filePath }));
 	}
 
 	public async transferFiles(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[], projectFilesPath: string, isFullSync: boolean): Promise<Mobile.ILocalToDevicePathData[]> {
-		await this.connectLivesyncTool(projectFilesPath, deviceAppData.appIdentifier);
+		let transferredFiles;
+
+		if (isFullSync) {
+			transferredFiles = await this._transferDirectory(deviceAppData, localToDevicePaths, projectFilesPath);
+		} else {
+			transferredFiles = this._transferFiles(deviceAppData, localToDevicePaths, projectFilesPath);
+		}
+
+		return transferredFiles;
+	}
+
+	private async _transferFiles(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[], projectFilesPath: string): Promise<Mobile.ILocalToDevicePathData[]> {
 		await this.livesyncTool.sendFilesArray(localToDevicePaths.map(localToDevicePathData => localToDevicePathData.getLocalPath()));
 
 		return localToDevicePaths;
 	}
 
+	private async _transferDirectory(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[], projectFilesPath: string): Promise<Mobile.ILocalToDevicePathData[]> {
+		const deviceHashService = this.getDeviceHashService(deviceAppData.appIdentifier);
+		const currentShasums: IStringDictionary = await deviceHashService.generateHashesFromLocalToDevicePaths(localToDevicePaths);
+		const oldShasums = await deviceHashService.getShasumsFromDevice();
+
+		if(this.$options.force || !oldShasums) {
+			this.livesyncTool.sendDirectory(projectFilesPath);
+
+			return localToDevicePaths;
+		} else {
+			const changedShasums = deviceHashService.getChnagedShasums(oldShasums, currentShasums);
+			await this.livesyncTool.sendFilesArray(_.map(changedShasums, (hash: string, pathToFile: string) => pathToFile));
+			await deviceHashService.uploadHashFileToDevice(currentShasums);
+		}
+	}
+
 	private async connectLivesyncTool(projectFilesPath: string, appIdentifier: string) {
 		const adbPath = await this.$staticConfig.getAdbFilePath();
 		await this.livesyncTool.connect({
@@ -50,8 +81,6 @@ export class AndroidDeviceSocketsLiveSyncService extends DeviceLiveSyncServiceBa
 		});
 	}
 
-
-	@cache()
 	public getDeviceHashService(appIdentifier: string): Mobile.IAndroidDeviceHashService {
 		const adb = this.$injector.resolve(DeviceAndroidDebugBridge, { identifier: this.device.deviceInfo.identifier });
 		return this.$injector.resolve(AndroidDeviceHashService, { adb, appIdentifier });

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

@@ -1,6 +1,7 @@
 import * as path from "path";
 import * as util from "util";
 import { APP_FOLDER_NAME } from "../../constants";
+import { getHash } from "../common/helpers";
 
 export abstract class PlatformLiveSyncServiceBase {
 	private _deviceLiveSyncServicesCache: IDictionary<INativeScriptDeviceLiveSyncService> = {};
@@ -13,8 +14,9 @@ export abstract class PlatformLiveSyncServiceBase {
 		private $projectFilesProvider: IProjectFilesProvider) { }
 
 	public getDeviceLiveSyncService(device: Mobile.IDevice, projectData: IProjectData): INativeScriptDeviceLiveSyncService {
-		const key = device.deviceInfo.identifier + projectData.projectId;
-		const frameworkVersion = this.$platformsData.getPlatformData(device.deviceInfo.platform, projectData).platformProjectService.getFrameworkVersion(projectData);
+		const platformData = this.$platformsData.getPlatformData(device.deviceInfo.platform, projectData);
+		const frameworkVersion = platformData.platformProjectService.getFrameworkVersion(projectData);
+		const key = getHash(`${device.deviceInfo.identifier}${projectData.projectId}${projectData.projectDir}${frameworkVersion}`);
 		if (!this._deviceLiveSyncServicesCache[key]) {
 			this._deviceLiveSyncServicesCache[key] = this._getDeviceLiveSyncService(device, projectData, frameworkVersion);
 		}