Merge pull request #3343 from NativeScript/vladimirov/merge-rel-master

chore: merge release in master

Author: rosen-vladimirov

PublicAPI.md

@@ -424,7 +424,7 @@ Provides methods for debugging applications on devices. The service is also even
 * Usage:
 ```JavaScript
 tns.debugService.on("connectionError", errorData => {
-	console.log(`Unable to start debug operation on device ${errorData.deviceId}. Error is: ${errorData.message}.`);
+	console.log(`Unable to start debug operation on device ${errorData.deviceIdentifier}. Error is: ${errorData.message}.`);
 });
 ```
 
@@ -522,7 +522,7 @@ interface IDebugOptions {
 * Usage:
 ```JavaScript
 tns.debugService.on("connectionError", errorData => {
-	console.log(`Unable to start debug operation on device ${errorData.deviceId}. Error is: ${errorData.message}.`);
+	console.log(`Unable to start debug operation on device ${errorData.deviceIdentifier}. Error is: ${errorData.message}.`);
 });
 
 const debugData = {
@@ -903,4 +903,4 @@ CLI is designed as command line tool and when it is used as a library, it does n
 For example the `$options` injected module contains information about all `--` options passed on the terminal. When the CLI is used as a library, the options are not populated. Before adding method to public API, make sure its implementation does not rely on `$options`.
 
 More information how to add a method to public API is available [here](https://github.com/telerik/mobile-cli-lib#how-to-make-a-method-public).
-After that add each method that you've exposed to the tests in `tests/nativescript-cli-lib.ts` file. There you'll find an object describing each publicly available module and the methods that you can call.
+After that add each method that you've exposed to the tests in `tests/nativescript-cli-lib.ts` file. There you'll find an object describing each publicly available module and the methods that you can call.

lib/android-tools-info.ts

@@ -6,7 +6,7 @@ import { appendZeroesToVersion } from './common/helpers';
 
 export class AndroidToolsInfo implements IAndroidToolsInfo {
 	private static ANDROID_TARGET_PREFIX = "android";
-	private static SUPPORTED_TARGETS = ["android-17", "android-18", "android-19", "android-21", "android-22", "android-23", "android-24", "android-25", "android-26"];
+	private static SUPPORTED_TARGETS = ["android-17", "android-18", "android-19", "android-21", "android-22", "android-23", "android-24", "android-25", "android-26", "android-27"];
 	private static MIN_REQUIRED_COMPILE_TARGET = 22;
 	private static REQUIRED_BUILD_TOOLS_RANGE_PREFIX = ">=23";
 	private static VERSION_REGEX = /((\d+\.){2}\d+)/;
@@ -306,6 +306,10 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 		if (this.androidHome && requiredAppCompatRange) {
 			const pathToAppCompat = path.join(this.androidHome, "extras", "android", "m2repository", "com", "android", "support", "appcompat-v7");
 			selectedAppCompatVersion = this.getMatchingDir(pathToAppCompat, requiredAppCompatRange);
+			if (!selectedAppCompatVersion) {
+				// get latest matching version, as there's no available appcompat versions for latest SDK versions.
+				selectedAppCompatVersion = this.getMatchingDir(pathToAppCompat, "*");
+			}
 		}
 
 		this.$logger.trace(`Selected AppCompat version is: ${selectedAppCompatVersion}`);

lib/common

@@ -544,7 +544,7 @@ interface IAndroidToolsInfoData {
 
 interface ISocketProxyFactory extends NodeJS.EventEmitter {
 	createTCPSocketProxy(factory: () => Promise<any>): Promise<any>;
-	createWebSocketProxy(factory: () => Promise<any>): Promise<any>;
+	createWebSocketProxy(factory: () => Promise<any>, deviceIdentifier: string): Promise<any>;
 }
 
 interface IiOSNotification {

lib/declarations.d.ts

@@ -60,7 +60,7 @@ interface ILiveSyncProcessInfo {
 	timer: NodeJS.Timer;
 	watcherInfo: {
 		watcher: IFSWatcher,
-		pattern: string | string[]
+		patterns: string[]
 	};
 	actionsChain: Promise<any>;
 	isStopped: boolean;

lib/definitions/livesync.d.ts

@@ -72,7 +72,7 @@ export class SocketProxyFactory extends EventEmitter implements ISocketProxyFact
 		return server;
 	}
 
-	public async createWebSocketProxy(factory: () => Promise<net.Socket>): Promise<ws.Server> {
+	public async createWebSocketProxy(factory: () => Promise<net.Socket>, deviceIdentifier: string): 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(41000);
 
@@ -92,6 +92,7 @@ export class SocketProxyFactory extends EventEmitter implements ISocketProxyFact
 				try {
 					_socket = await factory();
 				} catch (err) {
+					err.deviceIdentifier = deviceIdentifier;
 					this.$logger.trace(err);
 					this.emit(CONNECTION_ERROR_EVENT_NAME, err);
 					this.$errors.failWithoutHelp("Cannot connect to device socket.");

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

@@ -2,7 +2,6 @@ import { EOL } from "os";
 import * as semver from "semver";
 import * as path from "path";
 import * as helpers from "../common/helpers";
-const clui = require("clui");
 
 class DoctorService implements IDoctorService {
 	private static PROJECT_NAME_PLACEHOLDER = "__PROJECT_NAME__";
@@ -166,7 +165,7 @@ class DoctorService implements IDoctorService {
 		};
 		this.$fs.writeJson(path.join(projDir, "package.json"), packageJsonData);
 
-		const spinner = new clui.Spinner("Installing iOS runtime.");
+		const spinner = this.$progressIndicator.getSpinner("Installing iOS runtime.");
 		try {
 			spinner.start();
 			await this.$npm.install("tns-ios", projDir, {

lib/services/doctor-service.ts

@@ -23,7 +23,7 @@ export class IOSDebugService extends DebugServiceBase implements IPlatformDebugS
 	constructor(protected device: Mobile.IDevice,
 		protected $devicesService: Mobile.IDevicesService,
 		private $platformService: IPlatformService,
-		private $iOSEmulatorServices: Mobile.IEmulatorPlatformServices,
+		private $iOSEmulatorServices: Mobile.IiOSSimulatorService,
 		private $childProcess: IChildProcess,
 		private $hostInfo: IHostInfo,
 		private $logger: ILogger,
@@ -32,7 +32,8 @@ export class IOSDebugService extends DebugServiceBase implements IPlatformDebugS
 		private $iOSNotification: IiOSNotification,
 		private $iOSSocketRequestExecutor: IiOSSocketRequestExecutor,
 		private $processService: IProcessService,
-		private $socketProxyFactory: ISocketProxyFactory) {
+		private $socketProxyFactory: ISocketProxyFactory,
+		private $net: INet) {
 		super(device, $devicesService);
 		this.$processService.attachToProcessExitSignals(this, this.debugStop);
 		this.$socketProxyFactory.on(CONNECTION_ERROR_EVENT_NAME, (e: Error) => this.emit(CONNECTION_ERROR_EVENT_NAME, e));
@@ -145,6 +146,8 @@ export class IOSDebugService extends DebugServiceBase implements IPlatformDebugS
 			}
 		});
 
+		await this.waitForBackendPortToBeOpened(debugData.deviceIdentifier);
+
 		return this.wireDebuggerClient(debugData, debugOptions);
 	}
 
@@ -153,11 +156,21 @@ export class IOSDebugService extends DebugServiceBase implements IPlatformDebugS
 
 		const attachRequestMessage = this.$iOSNotification.getAttachRequest(debugData.applicationIdentifier);
 
-		const iOSEmulator = <Mobile.IiOSSimulatorService>this.$iOSEmulatorServices;
-		await iOSEmulator.postDarwinNotification(attachRequestMessage);
+		const iOSEmulatorService = <Mobile.IiOSSimulatorService>this.$iOSEmulatorServices;
+		await iOSEmulatorService.postDarwinNotification(attachRequestMessage);
+		await this.waitForBackendPortToBeOpened(debugData.deviceIdentifier);
 		return result;
 	}
 
+	private async waitForBackendPortToBeOpened(deviceIdentifier: string): Promise<void> {
+		const portListens = await this.$net.waitForPortToListen({ port: inspectorBackendPort, timeout: 10000, interval: 200 });
+		if (!portListens) {
+			const error = <Mobile.IDeviceError>new Error("Unable to connect to application. Ensure application is running on simulator.");
+			error.deviceIdentifier = deviceIdentifier;
+			throw error;
+		}
+	}
+
 	private async deviceDebugBrk(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string> {
 		await this.$devicesService.initialize({ platform: this.platform, deviceId: debugData.deviceIdentifier });
 		const action = async (device: iOSDevice.IOSDevice): Promise<string> => {
@@ -212,7 +225,8 @@ export class IOSDebugService extends DebugServiceBase implements IPlatformDebugS
 				this.$logger.info("'--chrome' is the default behavior. Use --inspector to debug iOS applications using the Safari Web Inspector.");
 			}
 
-			this._socketProxy = await this.$socketProxyFactory.createWebSocketProxy(this.getSocketFactory(device));
+			const deviceIdentifier = device ? device.deviceInfo.identifier : debugData.deviceIdentifier;
+			this._socketProxy = await this.$socketProxyFactory.createWebSocketProxy(this.getSocketFactory(device), deviceIdentifier);
 			return this.getChromeDebugUrl(debugOptions, this._socketProxy.options.port);
 		}
 	}

lib/services/ios-debug-service.ts

@@ -1,4 +1,3 @@
-import * as helpers from "../../common/helpers";
 import * as constants from "../../constants";
 import * as minimatch from "minimatch";
 import * as net from "net";
@@ -30,10 +29,8 @@ export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implemen
 
 		if (this.device.isEmulator) {
 			await this.$iOSEmulatorServices.postDarwinNotification(this.$iOSNotification.getAttachRequest(projectId));
-			try {
-				this.socket = await helpers.connectEventuallyUntilTimeout(() => net.connect(IOSDeviceLiveSyncService.BACKEND_PORT), 5000);
-			} catch (e) {
-				this.$logger.debug(e);
+			this.socket = await this.$iOSEmulatorServices.connectToPort({ port: IOSDeviceLiveSyncService.BACKEND_PORT });
+			if (!this.socket) {
 				return false;
 			}
 		} else {

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

@@ -513,21 +513,21 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 	}
 
 	private async startWatcher(projectData: IProjectData, liveSyncData: ILiveSyncInfo): Promise<void> {
-		const pattern = [APP_FOLDER_NAME];
+		const patterns = [APP_FOLDER_NAME];
 
 		if (liveSyncData.watchAllFiles) {
 			const productionDependencies = this.$nodeModulesDependenciesBuilder.getProductionDependencies(projectData.projectDir);
-			pattern.push(PACKAGE_JSON_FILE_NAME);
+			patterns.push(PACKAGE_JSON_FILE_NAME);
 
 			// watch only production node_module/packages same one prepare uses
 			for (const index in productionDependencies) {
-				pattern.push(productionDependencies[index].directory);
+				patterns.push(productionDependencies[index].directory);
 			}
 		}
 
 		const currentWatcherInfo = this.liveSyncProcessesInfo[liveSyncData.projectDir].watcherInfo;
-
-		if (!currentWatcherInfo || currentWatcherInfo.pattern !== pattern) {
+		const areWatcherPatternsDifferent = () => _.xor(currentWatcherInfo.patterns, patterns).length;
+		if (!currentWatcherInfo || areWatcherPatternsDifferent()) {
 			if (currentWatcherInfo) {
 				currentWatcherInfo.watcher.close();
 			}
@@ -630,7 +630,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 				ignored: ["**/.*", ".*"] // hidden files
 			};
 
-			const watcher = choki.watch(pattern, watcherOptions)
+			const watcher = choki.watch(patterns, watcherOptions)
 				.on("all", async (event: string, filePath: string) => {
 					clearTimeout(timeoutTimer);
 
@@ -650,7 +650,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 					}
 				});
 
-			this.liveSyncProcessesInfo[liveSyncData.projectDir].watcherInfo = { watcher, pattern };
+			this.liveSyncProcessesInfo[liveSyncData.projectDir].watcherInfo = { watcher, patterns };
 			this.liveSyncProcessesInfo[liveSyncData.projectDir].timer = timeoutTimer;
 
 			this.$processService.attachToProcessExitSignals(this, () => {

lib/services/livesync/livesync-service.ts

@@ -9,7 +9,6 @@ import { AppFilesUpdater } from "./app-files-updater";
 import { attachAwaitDetach } from "../common/helpers";
 import * as temp from "temp";
 temp.track();
-const clui = require("clui");
 
 const buildInfoFileName = ".nsbuildinfo";
 
@@ -25,6 +24,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 	constructor(private $devicesService: Mobile.IDevicesService,
 		private $preparePlatformNativeService: IPreparePlatformService,
 		private $preparePlatformJSService: IPreparePlatformService,
+		private $progressIndicator: IProgressIndicator,
 		private $errors: IErrors,
 		private $fs: IFileSystem,
 		private $logger: ILogger,
@@ -115,7 +115,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 			npmOptions["version"] = version;
 		}
 
-		const spinner = new clui.Spinner("Installing " + packageToInstall);
+		const spinner = this.$progressIndicator.getSpinner("Installing " + packageToInstall);
 		const projectDir = projectData.projectDir;
 		const platformPath = path.join(projectData.platformsDir, platform);
 
@@ -560,6 +560,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		return null;
 	}
 
+	@helpers.hook('cleanApp')
 	public async cleanDestinationApp(platformInfo: IPreparePlatformInfo): Promise<void> {
 		await this.ensurePlatformInstalled(platformInfo.platform, platformInfo.platformTemplate, platformInfo.projectData, platformInfo.config);