Cleanul livesync with sockets code.

Author: KristianDD

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

@@ -52,9 +52,9 @@ export class AndroidDeviceLiveSyncService extends DeviceLiveSyncServiceBase impl
 			getDirname: true
 		});
 
-		await this.device.adb.executeShellCommand(["rm", "-rf", await this.$mobileHelper.buildDevicePath(deviceRootPath, LiveSyncPaths.FULLSYNC_DIR_NAME),
+		await this.device.adb.executeShellCommand(["rm", "-rf", this.$mobileHelper.buildDevicePath(deviceRootPath, LiveSyncPaths.FULLSYNC_DIR_NAME),
 			this.$mobileHelper.buildDevicePath(deviceRootPath, LiveSyncPaths.SYNC_DIR_NAME),
-			await this.$mobileHelper.buildDevicePath(deviceRootPath, LiveSyncPaths.REMOVEDSYNC_DIR_NAME)]);
+			this.$mobileHelper.buildDevicePath(deviceRootPath, LiveSyncPaths.REMOVEDSYNC_DIR_NAME)]);
 	}
 
 	private async restartApplication(deviceAppData: Mobile.IDeviceAppData, projectName: string): Promise<void> {

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

@@ -23,7 +23,8 @@ export class AndroidLivesyncTool implements IAndroidLivesyncTool {
 	constructor(private $androidProcessService: Mobile.IAndroidProcessService,
 		private $errors: IErrors,
 		private $fs: IFileSystem,
-		private $logger: ILogger) {
+		private $logger: ILogger,
+		private $mobileHelper: Mobile.IMobileHelper) {
 			this.operationPromises = Object.create(null);
 			this.socketError = null;
 			this.socketConnection = null;
@@ -38,6 +39,10 @@ export class AndroidLivesyncTool implements IAndroidLivesyncTool {
 			this.$errors.fail(`You need to provide "baseDir" as a configuration property!`);
 		}
 
+		if (this.socketConnection) {
+			this.$errors.fail("Socket connection already exists.");
+		}
+
 		if (!configuration.localHostAddress) {
 			configuration.localHostAddress = DEFAULT_LOCAL_HOST_ADDRESS;
 		}
@@ -267,6 +272,8 @@ export class AndroidLivesyncTool implements IAndroidLivesyncTool {
 			const error = new Error(`Socket Error:\n${err}`);
 			if (this.configuration.errorHandler) {
 				this.configuration.errorHandler(error);
+			} else {
+				this.handleSocketError(socket.uid, error.message);
 			}
 		});
 	}
@@ -381,18 +388,9 @@ export class AndroidLivesyncTool implements IAndroidLivesyncTool {
 	}
 
 	private resolveRelativePath(filePath: string): string {
-		let relativeFilePath;
-
-		if (this.configuration.appPlatformsPath) {
-			relativeFilePath = path.relative(this.configuration.appPlatformsPath, filePath);
-		} else if (this.appPlatformsPath) {
-			relativeFilePath = path.relative(this.appPlatformsPath, filePath);
-		} else {
-			this.$errors.failWithoutHelp("You need to pass either \"baseDir\" " +
-				"when you initialize the tool or \"basePath\" as a second argument to this method!");
-		}
+		const relativeFilePath = path.relative(this.appPlatformsPath, filePath);
 
-		return relativeFilePath.split(path.sep).join(path.posix.sep);
+		return this.$mobileHelper.buildDevicePath(relativeFilePath);
 	}
 }
 $injector.register("androidLivesyncLibrary", AndroidLivesyncTool);

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

@@ -4,6 +4,7 @@ import { PlatformLiveSyncServiceBase } from "./platform-livesync-service-base";
 import * as semver from "semver";
 
 export class AndroidLiveSyncService extends PlatformLiveSyncServiceBase implements IPlatformLiveSyncService {
+	private static MIN_SOCKETS_LIVESYNC_RUNTIME_VERSION = "4.2.0";
 	constructor(protected $platformsData: IPlatformsData,
 		protected $projectFilesManager: IProjectFilesManager,
 		private $injector: IInjector,
@@ -15,7 +16,7 @@ export class AndroidLiveSyncService extends PlatformLiveSyncServiceBase implemen
 	}
 
 	protected _getDeviceLiveSyncService(device: Mobile.IDevice, data: IProjectDir, frameworkVersion: string): INativeScriptDeviceLiveSyncService {
-		if (semver.gte(frameworkVersion, "4.2.0")) {
+		if (semver.gte(frameworkVersion, AndroidLiveSyncService.MIN_SOCKETS_LIVESYNC_RUNTIME_VERSION)) {
 			return this.$injector.resolve<INativeScriptDeviceLiveSyncService>(AndroidDeviceSocketsLiveSyncService, { device, data });
 		}
 

lib/services/livesync/platform-livesync-service-base.ts

@@ -58,7 +58,7 @@ export abstract class PlatformLiveSyncServiceBase {
 
 	public async liveSyncWatchAction(device: Mobile.IDevice, liveSyncInfo: ILiveSyncWatchInfo): Promise<ILiveSyncResultInfo> {
 		const projectData = liveSyncInfo.projectData;
-		let deviceLiveSyncService = this.getDeviceLiveSyncService(device, projectData);
+		const deviceLiveSyncService = this.getDeviceLiveSyncService(device, projectData);
 		const syncInfo = _.merge<IFullSyncInfo>({ device, watch: true }, liveSyncInfo);
 		const deviceAppData = await this.getAppData(syncInfo);
 
@@ -101,7 +101,6 @@ export abstract class PlatformLiveSyncServiceBase {
 			const localToDevicePaths = await this.$projectFilesManager.createLocalToDevicePaths(deviceAppData, projectFilesPath, mappedFiles, []);
 			modifiedLocalToDevicePaths.push(...localToDevicePaths);
 
-			deviceLiveSyncService = this.getDeviceLiveSyncService(device, projectData);
 			await deviceLiveSyncService.removeFiles(deviceAppData, localToDevicePaths, projectFilesPath);
 		}