Merge master

Author: tdermendjiev

lib/bootstrap.ts

@@ -167,3 +167,5 @@ $injector.requireCommand("resources|generate|splashes", "./commands/generate-ass
 $injector.requirePublic("assetsGenerationService", "./services/assets-generation/assets-generation-service");
 
 $injector.require("filesHashService", "./services/files-hash-service");
+$injector.require("iOSLogParserService", "./services/ios-log-parser-service");
+$injector.require("iOSDebuggerPortService", "./services/ios-debugger-port-service");

lib/commands/debug.ts

@@ -143,13 +143,15 @@ export class DebugIOSCommand implements ICommand {
 		private $injector: IInjector,
 		private $projectData: IProjectData,
 		private $platformsData: IPlatformsData,
-		$iosDeviceOperations: IIOSDeviceOperations) {
+		$iosDeviceOperations: IIOSDeviceOperations,
+		$iOSSimulatorLogProvider: Mobile.IiOSSimulatorLogProvider) {
 		this.$projectData.initializeProjectData();
 		// Do not dispose ios-device-lib, so the process will remain alive and the debug application (NativeScript Inspector or Chrome DevTools) will be able to connect to the socket.
 		// In case we dispose ios-device-lib, the socket will be closed and the code will fail when the debug application tries to read/send data to device socket.
 		// That's why the `$ tns debug ios --justlaunch` command will not release the terminal.
 		// In case we do not set it to false, the dispose will be called once the command finishes its execution, which will prevent the debugging.
 		$iosDeviceOperations.setShouldDispose(false);
+		$iOSSimulatorLogProvider.setShouldDispose(false);
 	}
 
 	public execute(args: string[]): Promise<void> {

lib/constants.ts

@@ -137,6 +137,7 @@ export const enum DebugTools {
 export const enum TrackActionNames {
 	Build = "Build",
 	CreateProject = "Create project",
+	UsingTemplate = "Using Template",
 	Debug = "Debug",
 	Deploy = "Deploy",
 	LiveSync = "LiveSync",
@@ -145,6 +146,8 @@ export const enum TrackActionNames {
 	CheckEnvironmentRequirements = "Check Environment Requirements"
 }
 
+export const AnalyticsEventLabelDelimiter = "__";
+
 export const enum BuildStates {
 	Clean = "Clean",
 	Incremental = "Incremental"
@@ -189,3 +192,16 @@ export class SubscribeForNewsletterMessages {
 	public static ReviewPrivacyPolicyMsg = `You can review the Progress Software Privacy Policy at \`${PROGRESS_PRIVACY_POLICY_URL}\``;
 	public static PromptMsg = "Input your e-mail address to agree".green + " or " + "leave empty to decline".red.bold + ":";
 }
+
+export class TemplateVersions {
+	public static v1 = "v1";
+	public static v2 = "v2";
+}
+
+export class ProjectTemplateErrors {
+	public static InvalidTemplateVersionStringFormat = "The template '%s' has a NativeScript version '%s' that is not supported. Unable to create project from it.";
+}
+
+export class Hooks {
+	public static createProject = "createProject";
+}

lib/declarations.d.ts

@@ -643,9 +643,9 @@ interface ISocketProxyFactory extends NodeJS.EventEmitter {
 	createWebSocketProxy(factory: () => Promise<any>, deviceIdentifier: string): Promise<any>;
 }
 
-interface IiOSNotification {
+interface IiOSNotification extends NodeJS.EventEmitter {
 	getWaitForDebug(projectId: string): string;
-	getAttachRequest(projectId: string): string;
+	getAttachRequest(projectId: string, deviceId: string): string;
 	getAppLaunching(projectId: string): string;
 	getReadyForAttach(projectId: string): string;
 	getAttachAvailabilityQuery(projectId: string): string;
@@ -843,4 +843,4 @@ interface IAssetsGenerationService {
 	 * @returns {Promise<void>}
 	 */
 	generateSplashScreens(splashesGenerationData: ISplashesGenerationData): Promise<void>;
-}
+}

lib/definitions/debug.d.ts

@@ -87,6 +87,10 @@ interface IDebugOptions {
 	 * Defines if the iOS App Inspector should be used instead of providing URL to debug the application with Chrome DevTools
 	 */
 	inspector?: boolean;
+	/**
+	 * Defines if should print all availableDevices
+	 */
+	availableDevices?: boolean;
 }
 
 /**

lib/definitions/ios-debugger-port-service.d.ts

@@ -0,0 +1,28 @@
+interface IIOSDebuggerPortInputData {
+	deviceId: string;
+	appId: string;
+}
+
+interface IIOSDebuggerPortData extends IIOSDebuggerPortInputData {
+	port: number;
+}
+
+interface IIOSDebuggerPortStoredData {
+	port: number;
+	timer?: NodeJS.Timer;
+}
+
+interface IIOSDebuggerPortService {
+	/**
+	 * Gets iOS debugger port for specified deviceId and appId
+	 * @param {IIOSDebuggerPortInputData} data - Describes deviceId and appId
+	 */
+	getPort(data: IIOSDebuggerPortInputData): Promise<number>;
+	/**
+	 * Attaches on DEBUGGER_PORT_FOUND event and STARTING_IOS_APPLICATION events
+	 * In case when DEBUGGER_PORT_FOUND event is emitted, stores the port and clears the timeout if such.
+	 * In case when STARTING_IOS_APPLICATION event is emiited, sets the port to null and add timeout for 5000 miliseconds which checks if port is null and prints a warning.
+	 * @param {Mobile.IDevice} device - Describes the device which logs should be parsed. 
+	 */
+	attachToDebuggerPortFoundEvent(device: Mobile.IDevice): void;
+}

lib/definitions/ios-log-parser-service.d.ts

@@ -0,0 +1,7 @@
+interface IIOSLogParserService extends NodeJS.EventEmitter {
+	/**
+	 * Starts looking for debugger port. Attaches on device logs and processes them. In case when port is found, DEBUGGER_PORT_FOUND event is emitted.
+	 * @param {Mobile.IDevice} device - Describes the device which logs will be processed.
+	 */
+	startParsingLog(device: Mobile.IDevice): void;
+}

lib/definitions/platform.d.ts

@@ -381,5 +381,5 @@ interface IUpdateAppOptions extends IOptionalFilesToSync, IOptionalFilesToRemove
 }
 
 interface IPlatformEnvironmentRequirements {
-	checkEnvironmentRequirements(platform?: string): Promise<boolean>;
+	checkEnvironmentRequirements(platform?: string, projectDir?: string): Promise<boolean>;
 }

lib/definitions/project.d.ts

@@ -1,12 +1,19 @@
-/**
- * Describes available settings when creating new NativeScript application.
- */
-interface IProjectSettings {
+interface IProjectName {
+	projectName: string;
+}
+
+interface IProjectSettingsBase extends IProjectName {
 	/**
 	 * Name of the newly created application.
 	 */
 	projectName: string;
 
+	/**
+	 * Defines whether the `npm install` command should be executed with `--ignore-scripts` option.
+	 * When it is passed, all scripts (postinstall for example) will not be executed.
+	 */
+	ignoreScripts?: boolean;
+
 	/**
 	 * Selected template from which to create the project. If not specified, defaults to hello-world template.
 	 * Template can be any npm package, local dir, github url, .tgz file.
@@ -19,7 +26,19 @@ interface IProjectSettings {
 	 * Application identifier for the newly created application. If not specified, defaults to org.nativescript.<projectName>.
 	 */
 	appId?: string;
+}
+
+/**
+ * Describes information passed to project creation hook (createProject).
+ */
+interface IProjectCreationSettings extends IProjectSettingsBase, IProjectDir {
+
+}
 
+/**
+ * Describes available settings when creating new NativeScript application.
+ */
+interface IProjectSettings extends IProjectSettingsBase {
 	/**
 	 * Path where the project will be created. If not specified, defaults to current working dir.
 	 */
@@ -29,17 +48,8 @@ interface IProjectSettings {
 	 * Defines if invalid application name can be used for project creation.
 	 */
 	force?: boolean;
-
-	/**
-	 * Defines whether the `npm install` command should be executed with `--ignore-scripts` option.
-	 * When it is passed, all scripts (postinstall for example) will not be executed.
-	 */
-	ignoreScripts?: boolean;
 }
 
-interface IProjectName {
-	projectName: string;
-}
 
 interface ICreateProjectData extends IProjectDir, IProjectName {
 
@@ -201,6 +211,11 @@ interface IImageDefinitionsStructure {
 	android: IImageDefinitionGroup;
 }
 
+interface ITemplateData {
+	templatePath: string;
+	templateVersion: string;
+}
+
 /**
  * Describes working with templates.
  */
@@ -211,13 +226,22 @@ interface IProjectTemplatesService {
 	 * In case templateName is a special word, validated from us (for ex. typescript), resolve the real template name and add it to npm cache.
 	 * In any other cases try to `npm install` the specified templateName to temp directory.
 	 * @param {string} templateName The name of the template.
-	 * @return {string} Path to the directory where extracted template can be found.
+	 * @return {ITemplateData} Data describing the template - location where it is installed and its NativeScript version.
+	 */
+	prepareTemplate(templateName: string, projectDir: string): Promise<ITemplateData>;
+
+	/**
+	 * Gives information for the nativescript specific version of the template, for example v1, v2, etc.
+	 * Defaults to v1 in case there's no version specified.
+	 * @param {string} templatePath Full path to the template.
+	 * @returns {string} The version, for example v1 or v2.
 	 */
-	prepareTemplate(templateName: string, projectDir: string): Promise<string>;
+	getTemplateVersion(templatePath: string): string;
 }
 
 interface IPlatformProjectServiceBase {
 	getPluginPlatformsFolderPath(pluginData: IPluginData, platform: string): string;
+	getFrameworkVersion(projectData: IProjectData): string;
 }
 
 interface IBuildForDevice {
@@ -270,7 +294,7 @@ interface ILocalBuildService {
 
 interface ICleanNativeAppData extends IProjectDir, IPlatform { }
 
-interface IPlatformProjectService extends NodeJS.EventEmitter {
+interface IPlatformProjectService extends NodeJS.EventEmitter, IPlatformProjectServiceBase {
 	getPlatformData(projectData: IProjectData): IPlatformData;
 	validate(projectData: IProjectData): Promise<void>;
 	createProject(frameworkDir: string, frameworkVersion: string, projectData: IProjectData, config: ICreateProjectOptions): Promise<void>;

lib/device-sockets/ios/notification.ts

@@ -1,4 +1,7 @@
-export class IOSNotification implements IiOSNotification {
+import { EventEmitter } from "events";
+import { ATTACH_REQUEST_EVENT_NAME } from "../../common/constants";
+
+export class IOSNotification extends EventEmitter implements IiOSNotification {
 	private static WAIT_FOR_DEBUG_NOTIFICATION_NAME = "WaitForDebugger";
 	private static ATTACH_REQUEST_NOTIFICATION_NAME = "AttachRequest";
 	private static APP_LAUNCHING_NOTIFICATION_NAME = "AppLaunching";
@@ -11,8 +14,11 @@ export class IOSNotification implements IiOSNotification {
 		return this.formatNotification(IOSNotification.WAIT_FOR_DEBUG_NOTIFICATION_NAME, projectId);
 	}
 
-	public getAttachRequest(projectId: string): string {
-		return this.formatNotification(IOSNotification.ATTACH_REQUEST_NOTIFICATION_NAME, projectId);
+	public getAttachRequest(appId: string, deviceId: string): string {
+		// It could be too early to emit this event, but we rely that if you construct attach request,
+		// you will execute it immediately.
+		this.emit(ATTACH_REQUEST_EVENT_NAME, { deviceId, appId });
+		return this.formatNotification(IOSNotification.ATTACH_REQUEST_NOTIFICATION_NAME, appId);
 	}
 
 	public getAppLaunching(projectId: string): string {

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

@@ -95,7 +95,7 @@ export class SocketProxyFactory extends EventEmitter implements ISocketProxyFact
 					err.deviceIdentifier = deviceIdentifier;
 					this.$logger.trace(err);
 					this.emit(CONNECTION_ERROR_EVENT_NAME, err);
-					this.$errors.failWithoutHelp("Cannot connect to device socket.");
+					this.$errors.failWithoutHelp(`Cannot connect to device socket. The error message is ${err.message}`);
 				}
 
 				this.$logger.info("Backend socket created.");

lib/device-sockets/ios/socket-request-executor.ts

@@ -61,7 +61,7 @@ export class IOSSocketRequestExecutor implements IiOSSocketRequestExecutor {
 			const readyForAttachSocket = await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getReadyForAttach(projectId), constants.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE);
 			const readyForAttachPromise = this.$iOSNotificationService.awaitNotification(deviceIdentifier, +readyForAttachSocket, readyForAttachTimeout);
 
-			await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getAttachRequest(projectId));
+			await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getAttachRequest(projectId, deviceIdentifier));
 			await readyForAttachPromise;
 		} catch (e) {
 			this.$logger.trace("Launch request error:");
@@ -76,7 +76,7 @@ export class IOSSocketRequestExecutor implements IiOSSocketRequestExecutor {
 			// before we send the PostNotification.
 			const readyForAttachSocket = await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getReadyForAttach(projectId), constants.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE);
 			const readyForAttachPromise = this.$iOSNotificationService.awaitNotification(deviceIdentifier, +readyForAttachSocket, timeout);
-			await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getAttachRequest(projectId));
+			await this.$iOSNotificationService.postNotification(deviceIdentifier, this.$iOSNotification.getAttachRequest(projectId, deviceIdentifier));
 			await readyForAttachPromise;
 		} catch (e) {
 			this.$errors.failWithoutHelp(`The application ${projectId} timed out when performing the socket handshake.`);

lib/helpers/livesync-command-helper.ts

@@ -10,7 +10,8 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 		private $platformsData: IPlatformsData,
 		private $analyticsService: IAnalyticsService,
 		private $bundleValidatorHelper: IBundleValidatorHelper,
-		private $errors: IErrors) {
+		private $errors: IErrors,
+		private $iOSSimulatorLogProvider: Mobile.IiOSSimulatorLogProvider) {
 		this.$analyticsService.setShouldDispose(this.$options.justlaunch || !this.$options.watch);
 	}
 
@@ -53,6 +54,7 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 		const shouldKeepProcessAlive = this.$options.watch || !this.$options.justlaunch;
 		if (workingWithiOSDevices && shouldKeepProcessAlive) {
 			this.$iosDeviceOperations.setShouldDispose(false);
+			this.$iOSSimulatorLogProvider.setShouldDispose(false);
 		}
 
 		if (this.$options.release) {

lib/services/android-project-service.ts

@@ -133,7 +133,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		this.validatePackageName(projectData.projectId);
 		this.validateProjectName(projectData.projectName);
 
-		await this.$platformEnvironmentRequirements.checkEnvironmentRequirements(this.getPlatformData(projectData).normalizedPlatformName);
+		await this.$platformEnvironmentRequirements.checkEnvironmentRequirements(this.getPlatformData(projectData).normalizedPlatformName, projectData.projectDir);
 		this.$androidToolsInfo.validateTargetSdk({ showWarningsAsErrors: true });
 	}
 
@@ -605,7 +605,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 	}
 
 	public stopServices(projectRoot: string): Promise<ISpawnResult> {
-		return this.executeCommand(projectRoot, ["--stop", "--quiet"]);
+		return this.executeCommand(projectRoot, ["--stop", "--quiet"], {stdio: "pipe"});
 	}
 
 	public async cleanProject(projectRoot: string, projectData: IProjectData): Promise<void> {

lib/services/doctor-service.ts

@@ -17,10 +17,10 @@ class DoctorService implements IDoctorService {
 		private $terminalSpinnerService: ITerminalSpinnerService,
 		private $versionsService: IVersionsService) { }
 
-	public async printWarnings(configOptions?: { trackResult: boolean }): Promise<void> {
+	public async printWarnings(configOptions?: { trackResult: boolean , projectDir?: string }): Promise<void> {
 		const infos = await this.$terminalSpinnerService.execute<NativeScriptDoctor.IInfo[]>({
 			text: `Getting environment information ${EOL}`
-		}, () => doctor.getInfos());
+		}, () => doctor.getInfos({ projectDir: configOptions && configOptions.projectDir }));
 
 		const warnings = infos.filter(info => info.type === constants.WARNING_TYPE_NAME);
 		const hasWarnings = warnings.length > 0;
@@ -48,7 +48,7 @@ class DoctorService implements IDoctorService {
 			this.$logger.error("Cannot get the latest versions information from npm. Please try again later.");
 		}
 
-		await this.$injector.resolve("platformEnvironmentRequirements").checkEnvironmentRequirements(null);
+		await this.$injector.resolve("platformEnvironmentRequirements").checkEnvironmentRequirements(null, configOptions && configOptions.projectDir);
 	}
 
 	public async runSetupScript(): Promise<ISpawnResult> {
@@ -81,12 +81,12 @@ class DoctorService implements IDoctorService {
 		});
 	}
 
-	public async canExecuteLocalBuild(platform?: string): Promise<boolean> {
+	public async canExecuteLocalBuild(platform?: string, projectDir?: string): Promise<boolean> {
 		await this.$analyticsService.trackEventActionInGoogleAnalytics({
 			action: TrackActionNames.CheckLocalBuildSetup,
 			additionalData: "Starting",
 		});
-		const infos = await doctor.getInfos({ platform });
+		const infos = await doctor.getInfos({ platform, projectDir });
 
 		const warnings = this.filterInfosByType(infos, constants.WARNING_TYPE_NAME);
 		const hasWarnings = warnings.length > 0;