New LiveSync

Author: rosen-vladimirov

lib/bootstrap.ts

@@ -105,7 +105,6 @@ $injector.requireCommand("platform|clean", "./commands/platform-clean");
 $injector.require("usbLiveSyncService", "./services/livesync/livesync-service"); // The name is used in https://github.com/NativeScript/nativescript-dev-typescript
 $injector.require("iosLiveSyncServiceLocator", "./services/livesync/ios-device-livesync-service");
 $injector.require("androidLiveSyncServiceLocator", "./services/livesync/android-device-livesync-service");
-$injector.require("platformLiveSyncService", "./services/livesync/platform-livesync-service");
 
 $injector.require("sysInfo", "./sys-info");
 

lib/commands/appstore-list.ts

@@ -12,8 +12,8 @@ export class ListiOSApps implements ICommand {
 		private $platformService: IPlatformService,
 		private $errors: IErrors,
 		private $prompter: IPrompter) {
-			this.$projectData.initializeProjectData();
-		 }
+		this.$projectData.initializeProjectData();
+	}
 
 	public async execute(args: string[]): Promise<void> {
 		if (!this.$platformService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {

lib/commands/debug.ts

@@ -56,7 +56,8 @@ export abstract class DebugPlatformCommand implements ICommand {
 			this.printDebugInformation(await this.debugService.debug<string[]>(debugData, debugOptions));
 		};
 
-		return this.$usbLiveSyncService.liveSync(this.$devicesService.platform, this.$projectData, applicationReloadAction);
+		// TODO: Fix this call
+		return this.$usbLiveSyncService.liveSync(this.$devicesService.platform, this.$projectData, applicationReloadAction, this.$options);
 	}
 
 	public async canExecute(args: string[]): Promise<boolean> {

lib/commands/run.ts

@@ -42,7 +42,8 @@ export class RunCommandBase {
 			return this.$platformService.trackProjectType(this.$projectData);
 		}
 
-		return this.$usbLiveSyncService.liveSync(args[0], this.$projectData);
+		// TODO: Fix this call
+		return this.$usbLiveSyncService.liveSync(args[0], this.$projectData, null, this.$options);
 	}
 }
 

lib/declarations.d.ts

@@ -257,8 +257,9 @@ interface IOpener {
 	open(target: string, appname: string): void;
 }
 
+// TODO: Fix
 interface ILiveSyncService {
-	liveSync(platform: string, projectData: IProjectData, applicationReloadAction?: (deviceAppData: Mobile.IDeviceAppData) => Promise<void>): Promise<void>;
+	liveSync(platform: string, projectData: IProjectData, applicationReloadAction?: (deviceAppData: Mobile.IDeviceAppData) => Promise<void>, options?: IOptions): Promise<void>;
 }
 
 interface INativeScriptDeviceLiveSyncService extends IDeviceLiveSyncServiceBase {
@@ -282,12 +283,6 @@ interface INativeScriptDeviceLiveSyncService extends IDeviceLiveSyncServiceBase
 	afterInstallApplicationAction?(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[], projectId: string): Promise<boolean>;
 }
 
-interface IPlatformLiveSyncService {
-	fullSync(projectData: IProjectData, postAction?: (deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]) => Promise<void>): Promise<void>;
-	partialSync(event: string, filePath: string, dispatcher: IFutureDispatcher, afterFileSyncAction: (deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]) => Promise<void>, projectData: IProjectData): Promise<void>;
-	refreshApplication(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[], isFullSync: boolean, projectData: IProjectData): Promise<void>;
-}
-
 interface IBundle {
 	bundle: boolean;
 }

lib/definitions/platform.d.ts

@@ -58,7 +58,7 @@ interface IPlatformService extends NodeJS.EventEmitter {
 	 * @param {IBuildConfig} buildConfig Indicates whether the build is for device or emulator.
 	 * @returns {boolean} true indicates that the platform should be build.
 	 */
-	shouldBuild(platform: string, projectData: IProjectData, buildConfig?: IBuildConfig): Promise<boolean>;
+	shouldBuild(platform: string, projectData: IProjectData, buildConfig?: IBuildConfig, outputPath?: string): Promise<boolean>;
 
 	/**
 	 * Builds the native project for the specified platform for device or emulator.
@@ -79,7 +79,7 @@ interface IPlatformService extends NodeJS.EventEmitter {
 	 * @param {IProjectData} projectData DTO with information about the project.
 	 * @returns {Promise<boolean>} true indicates that the application should be installed.
 	 */
-	shouldInstall(device: Mobile.IDevice, projectData: IProjectData): Promise<boolean>;
+	shouldInstall(device: Mobile.IDevice, projectData: IProjectData, outputPath?: string): Promise<boolean>;
 
 	/**
 	 * Installs the application on specified device.
@@ -90,7 +90,7 @@ interface IPlatformService extends NodeJS.EventEmitter {
 	 * @param {IProjectData} projectData DTO with information about the project.
 	 * @returns {void}
 	 */
-	installApplication(device: Mobile.IDevice, options: IRelease, projectData: IProjectData): Promise<void>;
+	installApplication(device: Mobile.IDevice, options: IRelease, projectData: IProjectData, pathToBuiltApp?: string, outputPath?: string): Promise<void>;
 
 	/**
 	 * Gets first chance to validate the options provided as command line arguments.

lib/definitions/project.d.ts

@@ -105,6 +105,8 @@ interface IProjectDataService {
 	 * @returns {void}
 	 */
 	removeDependency(projectDir: string, dependencyName: string): void;
+
+	getProjectData(projectDir: string): IProjectData;
 }
 
 /**

lib/services/android-project-service.ts

@@ -65,7 +65,8 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 
 					return [
 						`${packageName}-${buildMode}.apk`,
-						`${projectData.projectName}-${buildMode}.apk`
+						`${projectData.projectName}-${buildMode}.apk`,
+						`${projectData.projectName}.apk`
 					];
 				},
 				frameworkFilesExtensions: [".jar", ".dat", ".so"],

lib/services/ios-project-service.ts

@@ -503,7 +503,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		let project = this.createPbxProj(projectData);
 		let frameworkName = path.basename(frameworkPath, path.extname(frameworkPath));
 		let frameworkBinaryPath = path.join(frameworkPath, frameworkName);
-		let isDynamic = _.includes((await this.$childProcess.spawnFromEvent(path.join(__dirname, "..", "..", "vendor", "file", "file.exe"), [frameworkBinaryPath], "close")).stdout, "dynamically linked");
+		const pathToFileCommand = this.$hostInfo.isWindows ? path.join(__dirname, "..", "..", "vendor", "file", "file.exe") : "file";
+		let isDynamic = _.includes((await this.$childProcess.spawnFromEvent(pathToFileCommand, [frameworkBinaryPath], "close")).stdout, "dynamically linked");
 
 		let frameworkAddOptions: IXcode.Options = { customFramework: true };
 

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

@@ -3,31 +3,54 @@ import { AndroidDeviceHashService } from "../../common/mobile/android/android-de
 import * as helpers from "../../common/helpers";
 import * as path from "path";
 import * as net from "net";
+import { EOL } from "os";
 
-class AndroidLiveSyncService implements INativeScriptDeviceLiveSyncService {
+export class AndroidLiveSyncService implements INativeScriptDeviceLiveSyncService {
 	private static BACKEND_PORT = 18182;
 	private device: Mobile.IAndroidDevice;
 
 	constructor(_device: Mobile.IDevice,
 		private $mobileHelper: Mobile.IMobileHelper,
 		private $injector: IInjector,
-		private $androidDebugService: IDebugService,
+		private $logger: ILogger,
+		private $androidDebugService: IPlatformDebugService,
 		private $liveSyncProvider: ILiveSyncProvider) {
 		this.device = <Mobile.IAndroidDevice>(_device);
 	}
 
-	public get debugService(): IDebugService {
+	public get debugService(): IPlatformDebugService {
 		return this.$androidDebugService;
 	}
 
-	public async refreshApplication(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[], forceExecuteFullSync: boolean, projectData: IProjectData): Promise<void> {
+	public async refreshApplication(deviceAppData: Mobile.IDeviceAppData,
+		localToDevicePaths: Mobile.ILocalToDevicePathData[],
+		forceExecuteFullSync: boolean,
+		projectData: IProjectData,
+		outputFilePath?: string,
+		debugData?: IDebugData,
+		debugOptions?: IOptions): Promise<void> {
+
+		if (debugData) {
+			// TODO: Move this outside of here
+			await this.debugService.debugStop();
+
+			let applicationId = deviceAppData.appIdentifier;
+			await deviceAppData.device.applicationManager.stopApplication(applicationId, projectData.projectName);
+
+			debugData.pathToAppPackage = outputFilePath;
+			const debugInfo = await this.debugService.debug<string[]>(debugData, debugOptions);
+			this.printDebugInformation(debugInfo);
+
+			return;
+		}
+
 		await this.device.adb.executeShellCommand(
 			["chmod",
-			"777",
-			await deviceAppData.getDeviceProjectRootPath(),
-			`/data/local/tmp/${deviceAppData.appIdentifier}`,
-			`/data/local/tmp/${deviceAppData.appIdentifier}/sync`]
-			);
+				"777",
+				await deviceAppData.getDeviceProjectRootPath(),
+				`/data/local/tmp/${deviceAppData.appIdentifier}`,
+				`/data/local/tmp/${deviceAppData.appIdentifier}/sync`]
+		);
 
 		let canExecuteFastSync = !forceExecuteFullSync && !_.some(localToDevicePaths, (localToDevicePath: any) => !this.$liveSyncProvider.canExecuteFastSync(localToDevicePath.getLocalPath(), projectData, deviceAppData.platform));
 
@@ -38,6 +61,12 @@ class AndroidLiveSyncService implements INativeScriptDeviceLiveSyncService {
 		return this.restartApplication(deviceAppData);
 	}
 
+	protected printDebugInformation(information: string[]): void {
+		_.each(information, i => {
+			this.$logger.info(`To start debugging, open the following URL in Chrome:${EOL}${i}${EOL}`.cyan);
+		});
+	}
+
 	private async restartApplication(deviceAppData: Mobile.IDeviceAppData): Promise<void> {
 		let devicePathRoot = `/data/data/${deviceAppData.appIdentifier}/files`;
 		let devicePath = this.$mobileHelper.buildDevicePath(devicePathRoot, "code_cache", "secondary_dexes", "proxyThumb");