WIP

Author: TsvetanMilanov

lib/bootstrap.ts

@@ -24,6 +24,7 @@ $injector.require("platformsData", "./platforms-data");
 $injector.require("platformService", "./services/platform-service");
 
 $injector.require("debugDataService", "./services/debug-data-service");
+$injector.requirePublicClass("debugService", "./services/debug-service");
 $injector.require("iOSDebugService", "./services/ios-debug-service");
 $injector.require("androidDebugService", "./services/android-debug-service");
 
@@ -104,6 +105,7 @@ $injector.require("devicePathProvider", "./device-path-provider");
 $injector.requireCommand("platform|clean", "./commands/platform-clean");
 
 $injector.require("liveSyncService", "./services/livesync/livesync-service"); // The name is used in https://github.com/NativeScript/nativescript-dev-typescript
+$injector.require("debugLiveSyncService", "./services/livesync/debug-livesync-service");
 $injector.require("androidLiveSyncService", "./services/livesync/android-livesync-service");
 $injector.require("iOSLiveSyncService", "./services/livesync/ios-livesync-service");
 $injector.require("usbLiveSyncService", "./services/livesync/livesync-service"); // The name is used in https://github.com/NativeScript/nativescript-dev-typescript

lib/constants.ts

@@ -70,6 +70,7 @@ export const SYNC_DIR_NAME = "sync";
 export const REMOVEDSYNC_DIR_NAME = "removedsync";
 export const FULLSYNC_DIR_NAME = "fullsync";
 export const IOS_DEVICE_PROJECT_ROOT_PATH = "Library/Application Support/LiveSync/app";
+export const IOS_DEVICE_SYNC_ZIP_PATH = "Library/Application Support/LiveSync/sync.zip";
 export const ANGULAR_NAME = "angular";
 export const TYPESCRIPT_NAME = "typescript";
 export const BUILD_OUTPUT_EVENT_NAME = "buildOutput";

lib/definitions/debug.d.ts

@@ -89,7 +89,7 @@ interface IDebugDataService {
 /**
  * Describes methods for debug operation.
  */
-interface IDebugService extends NodeJS.EventEmitter {
+interface IDebugServiceBase extends NodeJS.EventEmitter {
 	/**
 	 * Starts debug operation based on the specified debug data.
 	 * @param {IDebugData} debugData Describes information for device and application that will be debugged.
@@ -99,10 +99,14 @@ interface IDebugService extends NodeJS.EventEmitter {
 	debug<T>(debugData: IDebugData, debugOptions: IDebugOptions): Promise<T>;
 }
 
+interface IDebugService {
+	getDebugService(device: Mobile.IDevice): IPlatformDebugService;
+}
+
 /**
  * Describes actions required for debugging on specific platform (Android or iOS).
  */
-interface IPlatformDebugService extends IDebugService {
+interface IPlatformDebugService extends IDebugServiceBase {
 	/**
 	 * Starts debug operation.
 	 * @param {IDebugData} debugData Describes information for device and application that will be debugged.

lib/definitions/livesync.d.ts

@@ -214,4 +214,5 @@ interface IDeviceProjectRootOptions {
 interface IDevicePathProvider {
 	getDeviceBuildInfoDirname(device: Mobile.IDevice, appIdentifier: string): Promise<string>;
 	getDeviceProjectRootPath(device: Mobile.IDevice, options: IDeviceProjectRootOptions): Promise<string>;
+	getDeviceSyncZipPath(device: Mobile.IDevice): string;
 }

lib/device-path-provider.ts

@@ -1,5 +1,5 @@
 import { fromWindowsRelativePathToUnix } from "./common/helpers";
-import { IOS_DEVICE_PROJECT_ROOT_PATH, SYNC_DIR_NAME, FULLSYNC_DIR_NAME } from "./constants";
+import { IOS_DEVICE_SYNC_ZIP_PATH, IOS_DEVICE_PROJECT_ROOT_PATH, SYNC_DIR_NAME, FULLSYNC_DIR_NAME } from "./constants";
 import { AndroidDeviceLiveSyncService } from "./services/livesync/android-device-livesync-service";
 import * as path from "path";
 
@@ -12,7 +12,7 @@ export class DevicePathProvider implements IDevicePathProvider {
 	public async getDeviceBuildInfoDirname(device: Mobile.IDevice, appIdentifier: string): Promise<string> {
 		let result = "";
 		if (this.$mobileHelper.isiOSPlatform(device.deviceInfo.platform)) {
-			result = path.basename(await this.getDeviceProjectRootPath(device, { appIdentifier }));
+			result = path.dirname(await this.getDeviceProjectRootPath(device, { appIdentifier }));
 		} else if (this.$mobileHelper.isAndroidPlatform(device.deviceInfo.platform)) {
 			result = `/data/local/tmp/${appIdentifier}`;
 		}
@@ -39,6 +39,10 @@ export class DevicePathProvider implements IDevicePathProvider {
 
 		return fromWindowsRelativePathToUnix(projectRoot);
 	}
+
+	public getDeviceSyncZipPath(device: Mobile.IDevice): string {
+		return this.$mobileHelper.isiOSPlatform(device.deviceInfo.platform) && !device.isEmulator ? IOS_DEVICE_SYNC_ZIP_PATH : undefined;
+	}
 }
 
 $injector.register("devicePathProvider", DevicePathProvider);

lib/device-sockets/ios/socket-proxy-factory.ts

@@ -75,7 +75,7 @@ export class SocketProxyFactory extends EventEmitter implements ISocketProxyFact
 
 	public async createWebSocketProxy(factory: () => Promise<net.Socket>): Promise<ws.Server> {
 		// NOTE: We will try to provide command line options to select ports, at least on the localhost.
-		const localPort = await this.$net.getAvailablePortInRange(8080);
+		const localPort = await this.$net.getFreePort();
 
 		this.$logger.info("\nSetting up debugger proxy...\nPress Ctrl + C to terminate, or disconnect.\n");
 

lib/nativescript-cli-lib-bootstrap.ts

@@ -9,7 +9,6 @@ $injector.requirePublic("companionAppsService", "./common/appbuilder/services/li
 $injector.requirePublicClass("deviceEmitter", "./common/appbuilder/device-emitter");
 $injector.requirePublicClass("deviceLogProvider", "./common/appbuilder/device-log-provider");
 $injector.requirePublicClass("localBuildService", "./services/local-build-service");
-$injector.requirePublicClass("debugService", "./services/debug-service");
 
 // We need this because some services check if (!$options.justlaunch) to start the device log after some operation.
 // We don't want this behaviour when the CLI is required as library.

lib/services/debug-service.ts

@@ -67,7 +67,7 @@ export class DebugService extends EventEmitter implements IDebugService {
 		return _.first(result);
 	}
 
-	private getDebugService(device: Mobile.IDevice): IPlatformDebugService {
+	public getDebugService(device: Mobile.IDevice): IPlatformDebugService {
 		if (this.$mobileHelper.isiOSPlatform(device.deviceInfo.platform)) {
 			return this.$iOSDebugService;
 		} else if (this.$mobileHelper.isAndroidPlatform(device.deviceInfo.platform)) {

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

@@ -15,7 +15,7 @@ export class DebugLiveSyncService extends LiveSyncService {
 		private $options: IOptions,
 		private $debugDataService: IDebugDataService,
 		private $projectData: IProjectData,
-		private debugService: IPlatformDebugService,
+		private $debugService: IDebugService,
 		private $config: IConfiguration) {
 
 		super($platformService,
@@ -43,25 +43,26 @@ export class DebugLiveSyncService extends LiveSyncService {
 		};
 
 		let debugData = this.$debugDataService.createDebugData(this.$projectData, this.$options);
+		const debugService = this.$debugService.getDebugService(liveSyncResultInfo.deviceAppData.device);
 
 		await this.$platformService.trackProjectType(this.$projectData);
 
 		if (this.$options.start) {
-			return this.printDebugInformation(await this.debugService.debug<string[]>(debugData, debugOptions));
+			return this.printDebugInformation(await debugService.debug<string[]>(debugData, debugOptions));
 		}
 
 		const deviceAppData = liveSyncResultInfo.deviceAppData;
 		this.$config.debugLivesync = true;
 
-		await this.debugService.debugStop();
+		await debugService.debugStop();
 
 		let applicationId = deviceAppData.appIdentifier;
 		await deviceAppData.device.applicationManager.stopApplication(applicationId, projectData.projectName);
 
 		const buildConfig: IBuildConfig = _.merge({ buildForDevice: !deviceAppData.device.isEmulator }, deployOptions);
-		debugData.pathToAppPackage = this.$platformService.lastOutputPath(this.debugService.platform, buildConfig, projectData);
+		debugData.pathToAppPackage = this.$platformService.lastOutputPath(debugService.platform, buildConfig, projectData);
 
-		this.printDebugInformation(await this.debugService.debug<string[]>(debugData, debugOptions));
+		this.printDebugInformation(await debugService.debug<string[]>(debugData, debugOptions));
 	}
 
 	protected printDebugInformation(information: string[]): void {

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

@@ -104,6 +104,7 @@ export abstract class PlatformLiveSyncServiceBase {
 			device: syncInfo.device,
 			platform: syncInfo.device.deviceInfo.platform,
 			getDeviceProjectRootPath: () => this.$devicePathProvider.getDeviceProjectRootPath(syncInfo.device, deviceProjectRootOptions),
+			deviceSyncZipPath: this.$devicePathProvider.getDeviceSyncZipPath(syncInfo.device),
 			isLiveSyncSupported: async () => true
 		};
 	}