Merge pull request #3737 from NativeScript/vladimirov/fix-invalid-fm-path

fix: Platform add hangs when invalid frameworkPath is passed

Author: rosen-vladimirov

lib/constants.ts

@@ -208,3 +208,7 @@ export class Hooks {
 }
 
 export const PACKAGE_PLACEHOLDER_NAME = "__PACKAGE__";
+
+export class AddPlaformErrors {
+	public static InvalidFrameworkPathStringFormat = "Invalid frameworkPath: %s. Please ensure the specified frameworkPath exists.";
+}

lib/services/platform-service.ts

@@ -4,6 +4,7 @@ import * as constants from "../constants";
 import { Configurations } from "../common/constants";
 import * as helpers from "../common/helpers";
 import * as semver from "semver";
+import { format } from "util";
 import { EventEmitter } from "events";
 import { AppFilesUpdater } from "./app-files-updater";
 import { attachAwaitDetach } from "../common/helpers";
@@ -104,6 +105,10 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		let packageToInstall = "";
 		if (frameworkPath) {
 			packageToInstall = path.resolve(frameworkPath);
+			if (!this.$fs.exists(packageToInstall)) {
+				const errorMessage = format(constants.AddPlaformErrors.InvalidFrameworkPathStringFormat, frameworkPath);
+				this.$errors.fail(errorMessage);
+			}
 		} else {
 			if (!version) {
 				version = this.getCurrentPlatformVersion(platform, projectData) ||

test/platform-service.ts

@@ -2,12 +2,13 @@ import * as yok from "../lib/common/yok";
 import * as stubs from "./stubs";
 import * as PlatformServiceLib from "../lib/services/platform-service";
 import * as StaticConfigLib from "../lib/config";
-import { VERSION_STRING, PACKAGE_JSON_FILE_NAME } from "../lib/constants";
+import { VERSION_STRING, PACKAGE_JSON_FILE_NAME, AddPlaformErrors } from "../lib/constants";
 import * as fsLib from "../lib/common/file-system";
 import * as optionsLib from "../lib/options";
 import * as hostInfoLib from "../lib/common/host-info";
 import * as ProjectFilesManagerLib from "../lib/common/services/project-files-manager";
 import * as path from "path";
+import { format } from "util";
 import { assert } from "chai";
 import { DeviceAppDataFactory } from "../lib/common/mobile/device-app-data/device-app-data-factory";
 import { LocalToDevicePathDataFactory } from "../lib/common/mobile/local-to-device-path-data-factory";
@@ -232,6 +233,16 @@ describe('Platform Service Tests', () => {
 				await assert.isRejected(platformService.addPlatforms(["android"], "", projectData, config), errorMessage);
 			});
 
+			it("fails when path passed to frameworkPath does not exist", async () => {
+				const fs = testInjector.resolve("fs");
+				fs.exists = () => false;
+
+				const projectData: IProjectData = testInjector.resolve("projectData");
+				const frameworkPath = "invalidPath";
+				const errorMessage = format(AddPlaformErrors.InvalidFrameworkPathStringFormat, frameworkPath);
+				await assert.isRejected(platformService.addPlatforms(["android"], "", projectData, config, frameworkPath), errorMessage);
+			});
+
 			const assertCorrectDataIsPassedToPacoteService = async (versionString: string): Promise<void> => {
 				const fs = testInjector.resolve("fs");
 				fs.exists = () => false;