Merge pull request #1699 from NativeScript/milanov/fix-update-modules-in-platform-folder

Fix the updating of changed node modules in platform folder

Author: TsvetanMilanov

lib/declarations.ts

@@ -48,6 +48,7 @@ interface IApplicationPackage {
 interface ILockFile {
 	lock(): IFuture<void>;
 	unlock(): IFuture<void>;
+	check(): IFuture<boolean>;
 }
 
 interface IOpener {

lib/definitions/lockfile.d.ts

@@ -3,6 +3,7 @@ declare module "lockfile" {
 	export function lockSync(lockFilename: string, lockParams: ILockSyncParams): void;
 	export function unlock(lockFilename: string, callback: (err: Error) => void): void;
 	export function unlockSync(lockFilename: string): void;
+	export function check(lockFilename: string, lockParams: ILockParams, callback: (err: Error, isLocked: boolean) => void): boolean;
 
 	interface ILockSyncParams {
 		retries: number;

lib/lockfile.ts

@@ -42,5 +42,18 @@ export class LockFile implements ILockFile {
 		});
 		return future;
 	}
+
+	public check(): IFuture<boolean> {
+		let future = new Future<boolean>();
+		lockfile.check(this.lockFilePath, LockFile.LOCK_PARAMS, (err: Error, isLocked: boolean) => {
+			if(err) {
+				future.throw(err);
+			} else {
+				future.return(isLocked);
+			}
+		});
+		return future;
+	}
 }
+
 $injector.register("lockfile", LockFile);

lib/tools/broccoli/builder.ts

@@ -18,9 +18,8 @@ export class Builder implements IBroccoliBuilder {
 		private $projectData: IProjectData,
 		private $projectDataService: IProjectDataService,
 		private $injector: IInjector,
-		private $logger: ILogger
-	) {
-	}
+		private $logger: ILogger,
+		private $lockfile: ILockFile) { }
 
 	public getChangedNodeModules(absoluteOutputPath: string, platform: string, lastModifiedTime?: Date): IFuture<any> {
 		return (() => {
@@ -38,10 +37,13 @@ export class Builder implements IBroccoliBuilder {
 					stat: true
 				}, (er: Error, files: string[]) => {
 					fiberBootstrap.run(() => {
+						this.$lockfile.lock().wait();
 						if (er) {
 							if (!future.isResolved()) {
 								future.throw(er);
 							}
+
+							this.$lockfile.unlock().wait();
 							match.abort();
 							return;
 						}
@@ -59,6 +61,7 @@ export class Builder implements IBroccoliBuilder {
 							}
 							if (file === constants.NODE_MODULES_FOLDER_NAME) {
 								isNodeModulesModified = true;
+								this.$lockfile.unlock().wait();
 								match.abort();
 								if (!future.isResolved()) {
 									future.return();
@@ -69,29 +72,38 @@ export class Builder implements IBroccoliBuilder {
 							let rootModuleFullPath = path.join(nodeModulesPath, rootModuleName);
 							nodeModules[rootModuleFullPath] = rootModuleFullPath;
 						}
+
+						this.$lockfile.unlock().wait();
 					});
 				});
 				match.on("end", () => {
 					if (!future.isResolved()) {
-						future.return();
+						let intervalId = setInterval(() => {
+							fiberBootstrap.run(() => {
+								if (!this.$lockfile.check().wait()) {
+									future.return();
+									clearInterval(intervalId);
+								}
+							});
+						}, 100);
 					}
 				});
 
 				future.wait();
 			}
 
-			if(isNodeModulesModified && this.$fs.exists(absoluteOutputPath).wait()) {
+			if (isNodeModulesModified && this.$fs.exists(absoluteOutputPath).wait()) {
 				let currentPreparedTnsModules = this.$fs.readDirectory(absoluteOutputPath).wait();
 				let tnsModulesPath = path.join(projectDir, constants.APP_FOLDER_NAME, constants.TNS_MODULES_FOLDER_NAME);
-				if(!this.$fs.exists(tnsModulesPath).wait()) {
+				if (!this.$fs.exists(tnsModulesPath).wait()) {
 					tnsModulesPath = path.join(projectDir, constants.NODE_MODULES_FOLDER_NAME, constants.TNS_CORE_MODULES_NAME);
 				}
 				let tnsModulesInApp = this.$fs.readDirectory(tnsModulesPath).wait();
 				let modulesToDelete = _.difference(currentPreparedTnsModules, tnsModulesInApp);
 				_.each(modulesToDelete, moduleName => this.$fs.deleteDirectory(path.join(absoluteOutputPath, moduleName)).wait());
 			}
 
-			if(!lastModifiedTime || isNodeModulesModified) {
+			if (!lastModifiedTime || isNodeModulesModified) {
 				this.listModules(nodeModulesPath, nodeModules);
 			}
 

test/npm-support.ts

@@ -28,6 +28,7 @@ import {DeviceAppDataProvider} from "../lib/providers/device-app-data-provider";
 import {MobilePlatformsCapabilities} from "../lib/mobile-platforms-capabilities";
 import {DevicePlatformsConstants} from "../lib/common/mobile/device-platforms-constants";
 import { XmlValidator } from "../lib/xml-validator";
+import { LockFile } from "../lib/lockfile";
 import Future = require("fibers/future");
 
 import path = require("path");
@@ -48,7 +49,7 @@ function createTestInjector(): IInjector {
 	testInjector.register("platformService", PlatformServiceLib.PlatformService);
 	testInjector.register("logger", stubs.LoggerStub);
 	testInjector.register("npmInstallationManager", {});
-	testInjector.register("lockfile", {});
+	testInjector.register("lockfile", LockFile);
 	testInjector.register("prompter", {});
 	testInjector.register("androidProjectService", {});
 	testInjector.register("iOSProjectService", {});
@@ -235,6 +236,7 @@ describe("Npm support tests", () => {
 
 	it("Ensures that tns_modules absent when bundling", () => {
 		let fs = testInjector.resolve("fs");
+		let lockfile = testInjector.resolve("lockfile");
 		let options = testInjector.resolve("options");
 		let tnsModulesFolderPath = path.join(appDestinationFolderPath, "app", "tns_modules");