Merge pull request #865 from telerik/all/remove-fibers

Remove fibers and use async/await

Author: rosen-vladimirov

Gruntfile.js

@@ -5,7 +5,7 @@ var now = new Date().toISOString();
 
 function shallowCopy(obj) {
 	var result = {};
-	Object.keys(obj).forEach(function(key) {
+	Object.keys(obj).forEach(function (key) {
 		result[key] = obj[key];
 	});
 	return result;
@@ -20,7 +20,7 @@ function getBuildVersion(version) {
 	return buildVersion;
 }
 
-module.exports = function(grunt) {
+module.exports = function (grunt) {
 
 	// Windows cmd does not accept paths with / and unix shell does not accept paths with \\ and we need to execute from a sub-dir.
 	// To circumvent the issue, hack our environment's PATH and let the OS deal with it, which in practice works
@@ -60,14 +60,14 @@ module.exports = function(grunt) {
 
 		tslint: {
 			build: {
-                files: {
-                    src: ["**/*.ts", "!node_modules/**/*.ts", "!messages/**/*.ts", "!**/*.d.ts"]
-                },
-                options: {
-                    configuration: grunt.file.readJSON("./tslint.json")
-                }
-            }
-        },
+				files: {
+					src: ["**/*.ts", "!node_modules/**/*.ts", "!messages/**/*.ts", "!**/*.d.ts"]
+				},
+				options: {
+					configuration: grunt.file.readJSON("./tslint.json")
+				}
+			}
+		},
 
 		watch: {
 			devall: {
@@ -90,7 +90,7 @@ module.exports = function(grunt) {
 				command: "npm test",
 				options: {
 					execOptions: {
-						env: (function() {
+						env: (function () {
 							var env = shallowCopy(process.env);
 							env["XUNIT_FILE"] = "test-reports.xml";
 							env["LOG_XUNIT"] = "true";
@@ -104,7 +104,7 @@ module.exports = function(grunt) {
 				command: "npm pack",
 				options: {
 					execOptions: {
-						env: (function() {
+						env: (function () {
 							var env = shallowCopy(process.env);
 							env["COMMON_LIB_SKIP_POSTINSTALL_TASKS"] = "1";
 							return env;
@@ -134,7 +134,7 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks("grunt-ts");
 	grunt.loadNpmTasks("grunt-tslint");
 
-	grunt.registerTask("set_package_version", function(version) {
+	grunt.registerTask("set_package_version", function (version) {
 		var buildVersion = getBuildVersion(version);
 		var packageJson = grunt.file.readJSON("package.json");
 		packageJson.buildVersion = buildVersion;
@@ -147,7 +147,7 @@ module.exports = function(grunt) {
 		var buildVersion = getBuildVersion(version);
 		var packageJson = grunt.file.readJSON("package.json");
 		var oldFileName = packageJson.name + "-" + packageJson.version + fileExtension;
-		if(buildVersion) {
+		if (buildVersion) {
 			var newFileName = oldFileName + "-" + buildVersion + fileExtension;
 			fs.renameSync(oldFileName, newFileName);
 			console.log("Renamed " + oldFileName + " to " + newFileName);
@@ -156,11 +156,11 @@ module.exports = function(grunt) {
 		}
 	});
 
-	grunt.registerTask("delete_coverage_dir", function() {
+	grunt.registerTask("delete_coverage_dir", function () {
 		var done = this.async();
 		var rimraf = require("rimraf");
-		rimraf("coverage", function(err) {
-			if(err) {
+		rimraf("coverage", function (err) {
+			if (err) {
 				console.log("Error while deleting coverage directory from the package.");
 				done(false);
 			}

appbuilder/declarations.d.ts

@@ -5,7 +5,7 @@ interface ILiveSyncDeviceAppData extends Mobile.IDeviceAppData {
 }
 
 interface IDeployHelper {
-	deploy(platform?: string): IFuture<void>;
+	deploy(platform?: string): Promise<void>;
 }
 
 declare module Project {
@@ -110,14 +110,9 @@ declare module Project {
 		/**
 		 * Gets the app identifier which is going to be used to build the application.
 		 * @parameter Optional parameter the platform for which the app identifier will be returned.
-		 * @return {IFuture<string>} the app identifier which will be used to build the application.
+		 * @return {string} the app identifier which will be used to build the application.
 		 */
-		getAppIdentifierForPlatform(platform?: string): IFuture<string>;
-
-		/**
-		 * Checks if the app identifier is valid and if it is not - this method will throw an exception.
-		 */
-		validateAppIdentifier(platform?: string): IFuture<void>;
+		getAppIdentifierForPlatform(platform?: string): string;
 	}
 
 	/**
@@ -164,7 +159,7 @@ interface IProtonLiveSyncService {
 	 * @param {string[]} filePaths Passed only in cases when only some of the files must be synced.
 	 * @return {IDeviceLiveSyncResult[]} Information about each LiveSync operation.
 	 */
-	livesync(deviceDescriptors: IDeviceLiveSyncInfo[], projectDir: string, filePaths?: string[]): IFuture<IDeviceLiveSyncResult>[];
+	livesync(deviceDescriptors: IDeviceLiveSyncInfo[], projectDir: string, filePaths?: string[]): Promise<IDeviceLiveSyncResult>[];
 }
 
 /**
@@ -322,37 +317,37 @@ interface INpmService {
 	 * The method will remove them from package.json and from node_modules dir.
 	 * @param {string} projectDir Directory of the project, where package.json is located.
 	 * @param {string} dependency The name of the dependency that has to be removed.
-	 * @return {IFuture<void>}
+	 * @return {Promise<void>}
 	 */
-	uninstall(projectDir: string, dependency: string): IFuture<void>;
+	uninstall(projectDir: string, dependency: string): Promise<void>;
 
 	/**
 	 * Installs everything from package.json or specified dependency.
 	 * In case there's information which dependency to install, the method will check it and install only this dependency and possibly its @types.
 	 * @param {string} projectDir Directory of the project, where package.json is located.
 	 * @param @optional {INpmDependency} dependency Description of the dependency that has to be installed.
-	 * @return {IFuture<INpmInstallResult>} Returns object that will have error in case something fails.
+	 * @return {Promise<INpmInstallResult>} Returns object that will have error in case something fails.
 	 * In case there's no specific dependency that has to be installed and everything is installed successfully, the result will be empty object.
 	 * In case there's dependency that has to be installed, the result object will contain information for the successfull installation of the dependency and the @types reference.
 	 */
-	install(projectDir: string, dependencyToInstall?: INpmDependency): IFuture<INpmInstallResult>;
+	install(projectDir: string, dependencyToInstall?: INpmDependency): Promise<INpmInstallResult>;
 
 	/**
 	 * Searches for plugins in npm.
 	 * @param {string} projectDir The project directory.
 	 * @param {string[]} keywords The keywords for the search.
 	 * @param @optional {string[]} args Additional flags for the npm search command.
-	 * @return {IFuture<IBasicPluginInformation[]>} Array of basic plugin information for the search results.
+	 * @return {Promise<IBasicPluginInformation[]>} Array of basic plugin information for the search results.
 	 */
-	search(projectDir: string, keywords: string[], args?: string[]): IFuture<IBasicPluginInformation[]>;
+	search(projectDir: string, keywords: string[], args?: string[]): Promise<IBasicPluginInformation[]>;
 
 	/**
 	 * Gets package.json of a specific dependency from registry.npmjs.org.
 	 * @param {string} packageName The name of the dependency.
 	 * @param {string} version The version that has to be taken from registry. "latest" will be used in case there's no version passed.
 	 * @return {any} package.json of a dependency or null in case such dependency or version does not exist.
 	 */
-	getPackageJsonFromNpmRegistry(packageName: string, version?: string): IFuture<any>;
+	getPackageJsonFromNpmRegistry(packageName: string, version?: string): Promise<any>;
 
 	/**
 	 * Checks if dependency is scoped.
@@ -379,16 +374,16 @@ interface INpmPluginsService {
 	 * @param {string} projectDir The directory of the project.
 	 * @param {string[]} keywords The keywords for the search.
 	 * @param @optional {(keywords: string[]) => string[]} modifySearchQuery Function which will be used to modify the search query when using the npm binary.
-	 * @return {IFuture<IPluginsSource>} The plugins source which can be used to get the result.
+	 * @return {Promise<IPluginsSource>} The plugins source which can be used to get the result.
 	 */
-	search(projectDir: string, keywords: string[], modifySearchQuery?: (keywords: string[]) => string[]): IFuture<IPluginsSource>;
+	search(projectDir: string, keywords: string[], modifySearchQuery?: (keywords: string[]) => string[]): Promise<IPluginsSource>;
 
 	/**
 	 * Searches for plugin in http://registry.npmjs.org plugins and if plugin is not found will continue the search in http://npmjs.org and the npm binary.
 	 * @param {string} projectDir The directory of the project.
 	 * @param {string[]} keywords The keywords for the search.
 	 * @param @optional {(keywords: string[]) => string[]} modifySearchQuery Function which will be used to modify the search query when using the npm binary.
-	 * @return {IFuture<IPluginsSource>} The plugins source which can be used to get the result.
+	 * @return {Promise<IPluginsSource>} The plugins source which can be used to get the result.
 	 */
-	optimizedSearch(projectDir: string, keywords: string[], modifySearchQuery?: (keywords: string[]) => string[]): IFuture<IPluginsSource>;
+	optimizedSearch(projectDir: string, keywords: string[], modifySearchQuery?: (keywords: string[]) => string[]): Promise<IPluginsSource>;
 }

appbuilder/device-emitter.ts

@@ -7,7 +7,6 @@ export class DeviceEmitter extends EventEmitter {
 		private $devicesService: Mobile.IDevicesService,
 		private $deviceLogProvider: EventEmitter,
 		private $companionAppsService: ICompanionAppsService,
-		private $projectConstants: Project.IConstants,
 		private $logger: ILogger) {
 		super();
 	}
@@ -21,50 +20,49 @@ export class DeviceEmitter extends EventEmitter {
 		return this._companionAppIdentifiers;
 	}
 
-	public initialize(): IFuture<void> {
-		return (() => {
-			try {
-				this.$androidDeviceDiscovery.ensureAdbServerStarted().wait();
-			} catch(err) {
-				this.$logger.warn(`Unable to start adb server. Error message is: ${err.message}`);
-			}
+	public async initialize(): Promise<void> {
+		try {
+			await this.$androidDeviceDiscovery.ensureAdbServerStarted();
+		} catch (err) {
+			this.$logger.warn(`Unable to start adb server. Error message is: ${err.message}`);
+		}
+
+		this.$androidDeviceDiscovery.on("deviceFound", (device: Mobile.IDevice) => {
+			this.emit("deviceFound", device.deviceInfo);
+			this.attachApplicationChangedHandlers(device);
+			// await: Do not await as this will require to mark the lambda with async keyword, but there's no way to await the lambda itself.
+			device.openDeviceLogStream();
+		});
+
+		this.$androidDeviceDiscovery.on("deviceLost", (device: Mobile.IDevice) => {
+			this.emit("deviceLost", device.deviceInfo);
+		});
+
+		this.$iOSDeviceDiscovery.on("deviceFound", (device: Mobile.IDevice) => {
+			this.emit("deviceFound", device.deviceInfo);
+			this.attachApplicationChangedHandlers(device);
+			device.openDeviceLogStream();
+		});
 
-			this.$androidDeviceDiscovery.on("deviceFound", (device: Mobile.IDevice) => {
-				this.emit("deviceFound", device.deviceInfo);
-				this.attachApplicationChangedHandlers(device);
-				device.openDeviceLogStream();
-			});
-
-			this.$androidDeviceDiscovery.on("deviceLost", (device: Mobile.IDevice) => {
-				this.emit("deviceLost", device.deviceInfo);
-			});
-
-			this.$iOSDeviceDiscovery.on("deviceFound", (device: Mobile.IDevice) => {
-				this.emit("deviceFound", device.deviceInfo);
-				this.attachApplicationChangedHandlers(device);
-				device.openDeviceLogStream();
-			});
-
-			this.$iOSDeviceDiscovery.on("deviceLost", (device: Mobile.IDevice) => {
-				this.emit("deviceLost", device.deviceInfo);
-			});
-
-			this.$iOSSimulatorDiscovery.on("deviceFound", (device: Mobile.IDevice) => {
-				this.emit("deviceFound", device.deviceInfo);
-				device.openDeviceLogStream();
-				this.attachApplicationChangedHandlers(device);
-			});
-
-			this.$iOSSimulatorDiscovery.on("deviceLost", (device: Mobile.IDevice) => {
-				this.emit("deviceLost", device.deviceInfo);
-			});
-
-			this.$devicesService.initialize({ skipInferPlatform: true }).wait();
-
-			this.$deviceLogProvider.on("data", (identifier: string, data: any) => {
-				this.emit('deviceLogData', identifier, data.toString());
-			});
-		}).future<void>()();
+		this.$iOSDeviceDiscovery.on("deviceLost", (device: Mobile.IDevice) => {
+			this.emit("deviceLost", device.deviceInfo);
+		});
+
+		this.$iOSSimulatorDiscovery.on("deviceFound", (device: Mobile.IDevice) => {
+			this.emit("deviceFound", device.deviceInfo);
+			device.openDeviceLogStream();
+			this.attachApplicationChangedHandlers(device);
+		});
+
+		this.$iOSSimulatorDiscovery.on("deviceLost", (device: Mobile.IDevice) => {
+			this.emit("deviceLost", device.deviceInfo);
+		});
+
+		await this.$devicesService.initialize({ skipInferPlatform: true });
+
+		this.$deviceLogProvider.on("data", (identifier: string, data: any) => {
+			this.emit('deviceLogData', identifier, data.toString());
+		});
 	}
 
 	private attachApplicationChangedHandlers(device: Mobile.IDevice): void {

appbuilder/device-log-provider.ts

@@ -24,7 +24,7 @@ export class DeviceLogProvider extends DeviceLogProviderBase {
 			this.$logFilter.loggingLevel = logLevel.toUpperCase();
 
 			_.keys(this.devicesLogOptions).forEach(deviceId => {
-				this.devicesLogOptions[deviceId] = this.devicesLogOptions[deviceId] || <Mobile.IDeviceLogOptions> { };
+				this.devicesLogOptions[deviceId] = this.devicesLogOptions[deviceId] || <Mobile.IDeviceLogOptions>{};
 				this.devicesLogOptions[deviceId].logLevel = this.$logFilter.loggingLevel;
 			});
 		}

appbuilder/mobile-platforms-capabilities.ts

@@ -1,9 +1,7 @@
 export class MobilePlatformsCapabilities implements Mobile.IPlatformsCapabilities {
 	private platformCapabilities: IDictionary<Mobile.IPlatformCapabilities>;
 
-	constructor(private $errors: IErrors) { }
-
-	public getPlatformNames(): string[]{
+	public getPlatformNames(): string[] {
 		return _.keys(this.getAllCapabilities());
 	}
 

appbuilder/mobile/appbuilder-companion-device-app-data-base.ts

@@ -1,7 +1,7 @@
-import {AppBuilderDeviceAppDataBase} from "./appbuilder-device-app-data-base";
+import { AppBuilderDeviceAppDataBase } from "./appbuilder-device-app-data-base";
 
 export abstract class AppBuilderCompanionDeviceAppDataBase extends AppBuilderDeviceAppDataBase {
-	public isLiveSyncSupported(): IFuture<boolean> {
+	public isLiveSyncSupported(): Promise<boolean> {
 		return this.device.applicationManager.isApplicationInstalled(this.appIdentifier);
 	}
 

appbuilder/mobile/appbuilder-device-app-data-base.ts

@@ -1,17 +1,18 @@
 import * as querystring from "querystring";
-import {DeviceAppDataBase} from "./../../mobile/device-app-data/device-app-data-base";
+import { DeviceAppDataBase } from "./../../mobile/device-app-data/device-app-data-base";
 
 export class AppBuilderDeviceAppDataBase extends DeviceAppDataBase implements ILiveSyncDeviceAppData {
-	public deviceProjectRootPath: string;
-
 	constructor(_appIdentifier: string,
 		public device: Mobile.IDevice,
 		public platform: string,
-		private $deployHelper: IDeployHelper,
-		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants) {
+		private $deployHelper: IDeployHelper) {
 		super(_appIdentifier);
 	}
 
+	public getDeviceProjectRootPath(): Promise<string> {
+		return Promise.resolve("");
+	}
+
 	public get liveSyncFormat(): string {
 		return null;
 	}
@@ -24,17 +25,15 @@ export class AppBuilderDeviceAppDataBase extends DeviceAppDataBase implements IL
 		return `You can't LiveSync on device with id ${this.device.deviceInfo.identifier}! Deploy the app with LiveSync enabled and wait for the initial start up before LiveSyncing.`;
 	}
 
-	public isLiveSyncSupported(): IFuture<boolean> {
-		return (() => {
-			let isApplicationInstalled = this.device.applicationManager.isApplicationInstalled(this.appIdentifier).wait();
+	public async isLiveSyncSupported(): Promise<boolean> {
+		let isApplicationInstalled = await this.device.applicationManager.isApplicationInstalled(this.appIdentifier);
 
-			if (!isApplicationInstalled) {
-				this.$deployHelper.deploy(this.platform.toString()).wait();
-				// Update cache of installed apps
-				this.device.applicationManager.checkForApplicationUpdates().wait();
-			}
+		if (!isApplicationInstalled) {
+			await this.$deployHelper.deploy(this.platform.toString());
+			// Update cache of installed apps
+			await this.device.applicationManager.checkForApplicationUpdates();
+		}
 
-			return this.device.applicationManager.isLiveSyncSupported(this.appIdentifier).wait();
-		}).future<boolean>()();
+		return await this.device.applicationManager.isLiveSyncSupported(this.appIdentifier);
 	}
 }