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

chore: merge release in master

Author: rosen-vladimirov

CHANGELOG.md

@@ -16,6 +16,7 @@ NativeScript CLI Changelog
 ### Fixed
 
 * [Fixed #5187](https://github.com/NativeScript/nativescript-cli/issues/5187): Inaccessible native source code without modulemap
+* [Fixed #5239](https://github.com/NativeScript/nativescript-cli/issues/5239): Temporary files created by CLI are not deleted in some cases
 
 
 6.3.3 (2020, January 13)

lib/bootstrap.ts

@@ -236,3 +236,4 @@ $injector.require("ipService", "./services/ip-service");
 $injector.require("jsonFileSettingsService", "./common/services/json-file-settings-service");
 $injector.require("markingModeService", "./services/marking-mode-service");
 $injector.require("metadataFilteringService", "./services/metadata-filtering-service");
+$injector.require("tempService", "./services/temp-service");

lib/commands/plugin/build-plugin.ts

@@ -1,7 +1,7 @@
 import { EOL } from "os";
 import * as path from "path";
 import * as constants from "../../constants";
-import * as temp from "temp";
+
 export class BuildPluginCommand implements ICommand {
 	public allowedParameters: ICommandParameter[] = [];
 	public pluginProjectPath: string;
@@ -10,7 +10,8 @@ export class BuildPluginCommand implements ICommand {
 		private $errors: IErrors,
 		private $logger: ILogger,
 		private $fs: IFileSystem,
-		private $options: IOptions) {
+		private $options: IOptions,
+		private $tempService: ITempService) {
 
 		this.pluginProjectPath = path.resolve(this.$options.path || ".");
 	}
@@ -29,8 +30,7 @@ export class BuildPluginCommand implements ICommand {
 			}
 		}
 
-		temp.track();
-		const tempAndroidProject = temp.mkdirSync("android-project");
+		const tempAndroidProject = await this.$tempService.mkdirSync("android-project");
 
 		const options: IPluginBuildOptions = {
 			aarOutputDir: platformsAndroidPath,

lib/common/mobile/android/android-device-file-system.ts

@@ -1,6 +1,5 @@
 import * as path from "path";
 import * as semver from "semver";
-import * as temp from "temp";
 import { AndroidDeviceHashService } from "./android-device-hash-service";
 import { executeActionByChunks } from "../../helpers";
 import { DEFAULT_CHUNK_SIZE } from '../../constants';
@@ -12,6 +11,7 @@ export class AndroidDeviceFileSystem implements Mobile.IDeviceFileSystem {
 		private $fs: IFileSystem,
 		private $logger: ILogger,
 		private $mobileHelper: Mobile.IMobileHelper,
+		private $tempService: ITempService,
 		private $injector: IInjector) { }
 
 	public async listFiles(devicePath: string, appIdentifier?: string): Promise<any> {
@@ -27,8 +27,7 @@ export class AndroidDeviceFileSystem implements Mobile.IDeviceFileSystem {
 		const stdout = !outputPath;
 
 		if (stdout) {
-			temp.track();
-			outputPath = temp.path({ prefix: "sync", suffix: ".tmp" });
+			outputPath = await this.$tempService.path({ prefix: "sync", suffix: ".tmp" });
 		}
 
 		await this.adb.executeCommand(["pull", deviceFilePath, outputPath]);
@@ -134,7 +133,7 @@ export class AndroidDeviceFileSystem implements Mobile.IDeviceFileSystem {
 	}
 
 	public async createFileOnDevice(deviceFilePath: string, fileContent: string): Promise<void> {
-		const hostTmpDir = this.getTempDir();
+		const hostTmpDir = await this.$tempService.mkdirSync("application-");
 		const commandsFileHostPath = path.join(hostTmpDir, "temp.commands.file");
 		this.$fs.writeFile(commandsFileHostPath, fileContent);
 
@@ -159,9 +158,4 @@ export class AndroidDeviceFileSystem implements Mobile.IDeviceFileSystem {
 
 		return this._deviceHashServices[appIdentifier];
 	}
-
-	private getTempDir(): string {
-		temp.track();
-		return temp.mkdirSync("application-");
-	}
 }

lib/common/mobile/android/android-device-hash-service.ts

@@ -1,5 +1,4 @@
 import * as path from "path";
-import * as temp from "temp";
 import { cache } from "../../decorators";
 import { executeActionByChunks } from "../../helpers";
 import { DEFAULT_CHUNK_SIZE, LiveSyncPaths } from "../../constants";
@@ -10,7 +9,8 @@ export class AndroidDeviceHashService implements Mobile.IAndroidDeviceHashServic
 	constructor(private adb: Mobile.IDeviceAndroidDebugBridge,
 		private appIdentifier: string,
 		private $fs: IFileSystem,
-		private $mobileHelper: Mobile.IMobileHelper) {
+		private $mobileHelper: Mobile.IMobileHelper,
+		private $tempService: ITempService) {
 	}
 
 	@cache()
@@ -34,8 +34,9 @@ export class AndroidDeviceHashService implements Mobile.IAndroidDeviceHashServic
 	}
 
 	public async uploadHashFileToDevice(data: IStringDictionary): Promise<void> {
-		this.$fs.writeJson(this.hashFileLocalPath, data);
-		await this.adb.pushFile(this.hashFileLocalPath, this.hashFileDevicePath);
+		const hashFileLocalPath = await this.getHashFileLocalPath();
+		this.$fs.writeJson(hashFileLocalPath, data);
+		await this.adb.pushFile(hashFileLocalPath, this.hashFileDevicePath);
 	}
 
 	public async updateHashes(localToDevicePaths: Mobile.ILocalToDevicePathData[]): Promise<void> {
@@ -86,20 +87,20 @@ export class AndroidDeviceHashService implements Mobile.IAndroidDeviceHashServic
 	}
 
 	@cache()
-	private get hashFileLocalPath(): string {
-		return path.join(this.tempDir, AndroidDeviceHashService.HASH_FILE_NAME);
+	private async getHashFileLocalPath(): Promise<string> {
+		return path.join(await this.getTempDir(), AndroidDeviceHashService.HASH_FILE_NAME);
 	}
 
 	@cache()
-	private get tempDir(): string {
-		temp.track();
-		return temp.mkdirSync(`android-device-hash-service-${this.appIdentifier}`);
+	private getTempDir(): Promise<string> {
+		return this.$tempService.mkdirSync(`android-device-hash-service-${this.appIdentifier}`);
 	}
 
 	private async downloadHashFileFromDevice(): Promise<string> {
-		if (!this.$fs.exists(this.hashFileLocalPath)) {
-			await this.adb.executeCommand(["pull", this.hashFileDevicePath, this.tempDir]);
+		const hashFileLocalPath = await this.getHashFileLocalPath();
+		if (!this.$fs.exists(hashFileLocalPath)) {
+			await this.adb.executeCommand(["pull", this.hashFileDevicePath, await this.getTempDir()]);
 		}
-		return this.hashFileLocalPath;
+		return hashFileLocalPath;
 	}
 }

lib/common/mobile/ios/simulator/ios-simulator-application-manager.ts

@@ -4,7 +4,6 @@ import { hook, getPidFromiOSSimulatorLogs } from "../../../helpers";
 import { cache } from "../../../decorators";
 import { IOS_LOG_PREDICATE } from "../../../constants";
 import * as path from "path";
-import * as temp from "temp";
 import * as log4js from "log4js";
 
 export class IOSSimulatorApplicationManager extends ApplicationManagerBase {
@@ -16,6 +15,7 @@ export class IOSSimulatorApplicationManager extends ApplicationManagerBase {
 		private $options: IOptions,
 		private $fs: IFileSystem,
 		protected $deviceLogProvider: Mobile.IDeviceLogProvider,
+		private $tempService: ITempService,
 		$logger: ILogger,
 		$hooksService: IHooksService) {
 		super($logger, $hooksService, $deviceLogProvider);
@@ -28,8 +28,7 @@ export class IOSSimulatorApplicationManager extends ApplicationManagerBase {
 	@hook('install')
 	public async installApplication(packageFilePath: string): Promise<void> {
 		if (this.$fs.exists(packageFilePath) && path.extname(packageFilePath) === ".zip") {
-			temp.track();
-			const dir = temp.mkdirSync("simulatorPackage");
+			const dir = await this.$tempService.mkdirSync("simulatorPackage");
 			await this.$fs.unzip(packageFilePath, dir);
 			const app = _.find(this.$fs.readDirectory(dir), directory => path.extname(directory) === ".app");
 			if (app) {

lib/common/mobile/mobile-helper.ts

@@ -1,13 +1,13 @@
 import * as helpers from "../helpers";
 import * as shell from "shelljs";
-import * as temp from "temp";
 
 export class MobileHelper implements Mobile.IMobileHelper {
 	private static DEVICE_PATH_SEPARATOR = "/";
 
 	constructor(private $errors: IErrors,
 		private $fs: IFileSystem,
-		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants) { }
+		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
+		private $tempService: ITempService) { }
 
 	public get platformNames(): string[] {
 		return [this.$devicePlatformsConstants.iOS, this.$devicePlatformsConstants.Android];
@@ -58,8 +58,7 @@ export class MobileHelper implements Mobile.IMobileHelper {
 	}
 
 	public async getDeviceFileContent(device: Mobile.IDevice, deviceFilePath: string, projectData: IProjectData): Promise<string> {
-		temp.track();
-		const uniqueFilePath = temp.path({ suffix: ".tmp" });
+		const uniqueFilePath = await this.$tempService.path({ suffix: ".tmp" });
 		const platform = device.deviceInfo.platform.toLowerCase();
 		try {
 			await device.fileSystem.getFile(deviceFilePath, projectData.projectIdentifiers[platform], uniqueFilePath);

lib/common/test/unit-tests/mobile/android-device-file-system.ts

@@ -8,6 +8,7 @@ import { DevicePlatformsConstants } from "../../../mobile/device-platforms-const
 import * as path from "path";
 import { assert } from "chai";
 import { LiveSyncPaths } from "../../../constants";
+import { TempServiceStub } from "../../../../../test/stubs";
 
 const myTestAppIdentifier = "org.nativescript.myApp";
 let isAdbPushExecuted = false;
@@ -64,7 +65,7 @@ function createTestInjector(): IInjector {
 	injector.register("errors", Errors);
 	injector.register("devicePlatformsConstants", DevicePlatformsConstants);
 	injector.register("projectFilesManager", {});
-
+	injector.register("tempService", TempServiceStub);
 	return injector;
 }
 

lib/common/test/unit-tests/mobile/ios-simulator-discovery.ts

@@ -5,7 +5,7 @@ import { assert } from "chai";
 import { DeviceDiscoveryEventNames, CONNECTED_STATUS } from "../../../constants";
 import { DevicePlatformsConstants } from "../../../mobile/device-platforms-constants";
 import { ErrorsStub, CommonLoggerStub, HooksServiceStub, LockServiceStub } from "../stubs";
-import { FileSystemStub, ChildProcessStub } from "../../../../../test/stubs";
+import { FileSystemStub, ChildProcessStub, TempServiceStub } from "../../../../../test/stubs";
 import { DeviceConnectionType } from "../../../../constants";
 
 let currentlyRunningSimulators: Mobile.IiSimDevice[];
@@ -45,7 +45,7 @@ function createTestInjector(): IInjector {
 	injector.register("options", {});
 	injector.register("hooksService", HooksServiceStub);
 	injector.register("logger", CommonLoggerStub);
-
+	injector.register("tempService", TempServiceStub);
 	return injector;
 }
 

lib/common/test/unit-tests/mobile/project-files-manager.ts

@@ -14,6 +14,7 @@ import { ProjectFilesProviderBase } from "../../../services/project-files-provid
 
 import temp = require("temp");
 import { LiveSyncPaths } from "../../../constants";
+import { TempServiceStub } from "../../../../../test/stubs";
 temp.track();
 
 const testedApplicationIdentifier = "com.telerik.myApp";
@@ -49,6 +50,7 @@ function createTestInjector(): IInjector {
 	});
 	testInjector.register("logger", Logger);
 	testInjector.register("config", {});
+	testInjector.register("tempService", TempServiceStub);
 	return testInjector;
 }
 

lib/definitions/ios.d.ts

@@ -30,8 +30,8 @@ declare global {
 	}
 
 	interface IExportOptionsPlistService {
-		createDevelopmentExportOptionsPlist(archivePath: string, projectData: IProjectData, buildConfig: IBuildConfig): IExportOptionsPlistOutput;
-		createDistributionExportOptionsPlist(projectRoot: string, projectData: IProjectData, buildConfig: IBuildConfig): IExportOptionsPlistOutput;
+		createDevelopmentExportOptionsPlist(archivePath: string, projectData: IProjectData, buildConfig: IBuildConfig): Promise<IExportOptionsPlistOutput>;
+		createDistributionExportOptionsPlist(projectRoot: string, projectData: IProjectData, buildConfig: IBuildConfig): Promise<IExportOptionsPlistOutput>;
 	}
 
 	interface IExportOptionsPlistOutput {

lib/definitions/plugins.d.ts

@@ -4,7 +4,7 @@ interface IPluginsService {
 	addToPackageJson(plugin: string, version: string, isDev: boolean, projectDir: string): void;
 	removeFromPackageJson(plugin: string, projectDir: string): void;
 	getAllInstalledPlugins(projectData: IProjectData): Promise<IPluginData[]>;
-	getAllProductionPlugins(projectData: IProjectData, dependencies?: IDependencyData[]): IPluginData[];
+	getAllProductionPlugins(projectData: IProjectData, platform: string, dependencies?: IDependencyData[]): IPluginData[];
 	ensureAllDependenciesAreInstalled(projectData: IProjectData): Promise<void>;
 
 	/**

lib/definitions/temp-service.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Declares wrapped functions of temp module
+ */
+interface ITempService {
+	mkdirSync(affixes: string): Promise<string>;
+	path(options: ITempPathOptions): Promise<string>;
+}

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

@@ -2,7 +2,6 @@ import { EventEmitter } from "events";
 import { CONNECTION_ERROR_EVENT_NAME } from "../../constants";
 import * as net from "net";
 import * as ws from "ws";
-import temp = require("temp");
 import { MessageUnpackStream } from "ios-device-lib";
 
 export class AppDebugSocketProxyFactory extends EventEmitter implements IAppDebugSocketProxyFactory {
@@ -13,6 +12,7 @@ export class AppDebugSocketProxyFactory extends EventEmitter implements IAppDebu
 		private $errors: IErrors,
 		private $lockService: ILockService,
 		private $options: IOptions,
+		private $tempService: ITempService,
 		private $net: INet) {
 		super();
 	}
@@ -72,7 +72,7 @@ export class AppDebugSocketProxyFactory extends EventEmitter implements IAppDebu
 			frontendSocket.resume();
 		});
 
-		const socketFileLocation = temp.path({ suffix: ".sock" });
+		const socketFileLocation = await this.$tempService.path({ suffix: ".sock" });
 		server.listen(socketFileLocation);
 		if (!this.$options.client) {
 			this.$logger.info("socket-file-location: " + socketFileLocation);

lib/helpers/platform-command-helper.ts

@@ -1,6 +1,5 @@
 import * as path from "path";
 import * as semver from "semver";
-import * as temp from "temp";
 import * as constants from "../constants";
 import { PlatformController } from "../controllers/platform-controller";
 import { PlatformValidationService } from "../services/platform/platform-validation-service";
@@ -17,7 +16,8 @@ export class PlatformCommandHelper implements IPlatformCommandHelper {
 		private $platformsDataService: IPlatformsDataService,
 		private $platformValidationService: PlatformValidationService,
 		private $projectChangesService: IProjectChangesService,
-		private $projectDataService: IProjectDataService
+		private $projectDataService: IProjectDataService,
+		private $tempService: ITempService
 	) { }
 
 	public async addPlatforms(platforms: string[], projectData: IProjectData, frameworkPath: string): Promise<void> {
@@ -147,7 +147,7 @@ export class PlatformCommandHelper implements IPlatformCommandHelper {
 		const data = this.$projectDataService.getNSValue(projectData.projectDir, platformData.frameworkPackageName);
 		const currentVersion = data && data.version ? data.version : "0.2.0";
 
-		const installedModuleDir = temp.mkdirSync("runtime-to-update");
+		const installedModuleDir = await this.$tempService.mkdirSync("runtime-to-update");
 		let newVersion = version === constants.PackageVersion.NEXT ?
 			await this.$packageInstallationManager.getNextVersion(platformData.frameworkPackageName) :
 			version || await this.$packageInstallationManager.getLatestCompatibleVersion(platformData.frameworkPackageName);

lib/services/ios-project-service.ts

@@ -7,7 +7,6 @@ import { attachAwaitDetach } from "../common/helpers";
 import * as projectServiceBaseLib from "./platform-project-service-base";
 import { PlistSession, Reporter } from "plist-merge-patch";
 import { EOL } from "os";
-import * as temp from "temp";
 import * as plist from "plist";
 import { IOSProvisionService } from "./ios-provision-service";
 import { IOSEntitlementsService } from "./ios-entitlements-service";
@@ -55,7 +54,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		private $iOSExtensionsService: IIOSExtensionsService,
 		private $iOSWatchAppService: IIOSWatchAppService,
 		private $iOSNativeTargetService: IIOSNativeTargetService,
-		private $sysInfo: ISysInfo) {
+		private $sysInfo: ISysInfo,
+		private $tempService: ITempService) {
 		super($fs, $projectDataService);
 	}
 
@@ -471,7 +471,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 	}
 
 	private getAllProductionPlugins(projectData: IProjectData): IPluginData[] {
-		return (<IPluginsService>this.$injector.resolve("pluginsService")).getAllProductionPlugins(projectData);
+		return (<IPluginsService>this.$injector.resolve("pluginsService")).getAllProductionPlugins(projectData, this.getPlatformData(projectData).platformNameLowerCase);
 	}
 
 	private replace(name: string): string {
@@ -814,8 +814,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			// Set Entitlements Property to point to default file if not set explicitly by the user.
 			const entitlementsPropertyValue = this.$xcconfigService.readPropertyValue(pluginsXcconfigFilePath, constants.CODE_SIGN_ENTITLEMENTS);
 			if (entitlementsPropertyValue === null && this.$fs.exists(this.$iOSEntitlementsService.getPlatformsEntitlementsPath(projectData))) {
-				temp.track();
-				const tempEntitlementsDir = temp.mkdirSync("entitlements");
+				const tempEntitlementsDir = await this.$tempService.mkdirSync("entitlements");
 				const tempEntitlementsFilePath = path.join(tempEntitlementsDir, "set-entitlements.xcconfig");
 				const entitlementsRelativePath = this.$iOSEntitlementsService.getPlatformsEntitlementsRelativePath(projectData);
 				this.$fs.writeFile(tempEntitlementsFilePath, `CODE_SIGN_ENTITLEMENTS = ${entitlementsRelativePath}${EOL}`);