feat: don't leak android debugging session and remove deprecated methods from logger

#4219

Author: Fatme

lib/common/definitions/logger.d.ts

@@ -25,36 +25,6 @@ declare global {
 		trace(formatStr?: any, ...args: any[]): void;
 		printMarkdown(...args: any[]): void;
 		prepare(item: any): string;
-
-		/**
-		 * DEPRECATED
-		 * Do not use it.
-		 */
-		out(formatStr?: any, ...args: any[]): void;
-
-		/**
-		 * DEPRECATED
-		 * Do not use it.
-		 */
-		write(...args: any[]): void;
-
-		/**
-		 * DEPRECATED
-		 * Do not use it.
-		 */
-		printInfoMessageOnSameLine(message: string): void;
-
-		/**
-		 * DEPRECATED
-		 * Do not use it.
-		 */
-		printMsgWithTimeout(message: string, timeout: number): Promise<void>;
-
-		/**
-		 * DEPRECATED
-		 * Do not use it.
-		 */
-		printOnStderr(formatStr?: any, ...args: any[]): void;
 	}
 
 	interface Log4JSAppenderConfiguration extends Configuration {

lib/common/logger/logger.ts

@@ -191,37 +191,6 @@ export class Logger implements ILogger {
 			return argument;
 		});
 	}
-
-	/*******************************************************************************************
-	 * Metods below are deprecated. Delete them in 6.0.0 release:                              *
-	 * Present only for backwards compatibility as some plugins (nativescript-plugin-firebase) *
-	 * use these methods in their hooks                                                          *
-	 *******************************************************************************************/
-
-	out(...args: any[]): void {
-		this.info(args);
-	}
-
-	write(...args: any[]): void {
-		this.info(args, { [LoggerConfigData.skipNewLine]: true });
-	}
-
-	printOnStderr(...args: string[]): void {
-		this.error(args);
-	}
-
-	printInfoMessageOnSameLine(message: string): void {
-		this.info(message, { [LoggerConfigData.skipNewLine]: true });
-	}
-
-	printMsgWithTimeout(message: string, timeout: number): Promise<void> {
-		return new Promise<void>((resolve, reject) => {
-			setTimeout(() => {
-				this.printInfoMessageOnSameLine(message);
-				resolve();
-			}, timeout);
-		});
-	}
 }
 
 $injector.register("logger", Logger);

lib/common/mobile/mobile-core/android-process-service.ts

@@ -8,8 +8,10 @@ export class AndroidProcessService implements Mobile.IAndroidProcessService {
 	private _forwardedLocalPorts: IDictionary<number>;
 
 	constructor(private $errors: IErrors,
+		private $cleanupService: ICleanupService,
 		private $injector: IInjector,
-		private $net: INet) {
+		private $net: INet,
+		private $staticConfig: IStaticConfig) {
 		this._devicesAdbs = {};
 		this._forwardedLocalPorts = {};
 	}
@@ -120,8 +122,7 @@ export class AndroidProcessService implements Mobile.IAndroidProcessService {
 		}
 
 		this._forwardedLocalPorts[portForwardInputData.deviceIdentifier] = localPort;
-		// TODO: Uncomment for 6.0.0 release
-		// await this.$cleanupService.addCleanupCommand({ command: await this.$staticConfig.getAdbFilePath(), args: ["-s", portForwardInputData.deviceIdentifier, "forward", "--remove", `tcp:${localPort}`] });
+		await this.$cleanupService.addCleanupCommand({ command: await this.$staticConfig.getAdbFilePath(), args: ["-s", portForwardInputData.deviceIdentifier, "forward", "--remove", `tcp:${localPort}`] });
 		return localPort && +localPort;
 	}
 

lib/common/services/commands-service.ts

@@ -27,17 +27,8 @@ export class CommandsService implements ICommandsService {
 		private $staticConfig: Config.IStaticConfig,
 		private $helpService: IHelpService,
 		private $extensibilityService: IExtensibilityService,
-		private $optionsTracker: IOptionsTracker,
-		private $projectDataService: IProjectDataService) {
-			let projectData = null;
-			try {
-				projectData = this.$projectDataService.getProjectData();
-			} catch (err) {
-				this.$logger.trace(`Error while trying to get project data. More info: ${err}`);
-			}
-
-			this.$options.setupOptions(projectData);
-			this.$options.printMessagesForDeprecatedOptions(this.$logger);
+		private $optionsTracker: IOptionsTracker) {
+			this.$options.setupOptions();
 	}
 
 	public allCommands(opts: { includeDevCommands: boolean }): string[] {

lib/declarations.d.ts

@@ -557,8 +557,7 @@ interface IOptions extends IRelease, IDeviceIdentifier, IJustLaunch, IAvd, IAvai
 	analyticsLogFile: string;
 	performance: Object;
 	cleanupLogFile: string;
-	setupOptions(projectData: IProjectData): void;
-	printMessagesForDeprecatedOptions(logger: ILogger): void;
+	setupOptions(): void;
 }
 
 interface IEnvOptions {

lib/definitions/project.d.ts

@@ -142,14 +142,6 @@ interface IProjectDataService {
 	 */
 	setNSValue(projectDir: string, key: string, value: any): void;
 
-	/**
-	 * Sets a value in the `useLegacyWorkflow` key in a project's nsconfig.json.
-	 * @param {string} projectDir The project directory - the place where the root package.json is located.
-	 * @param {any} value Value of the key to be set to `useLegacyWorkflow` key in project's nsconfig.json.
-	 * @returns {void}
-	 */
-	setUseLegacyWorkflow(projectDir: string, value: any): void;
-
 	/**
 	 * Removes a property from `nativescript` key in project's package.json.
 	 * @param {string} projectDir The project directory - the place where the root package.json is located.

lib/options.ts

@@ -21,32 +21,18 @@ export class Options {
 
 	public options: IDictionary<IDashedOption>;
 
-	public setupOptions(projectData: IProjectData): void {
+	public setupOptions(): void {
 		if (this.argv.release && this.argv.hmr) {
 			this.$errors.failWithoutHelp("The options --release and --hmr cannot be used simultaneously.");
 		}
 
-		// HACK: temporary solution for 5.3.0 release (until the webpack only feature)
-		const parsed = require("yargs-parser")(process.argv.slice(2), { 'boolean-negation': false });
-		const noBundle = parsed && (parsed.bundle === false || parsed.bundle === 'false');
-		if (noBundle && this.argv.hmr) {
-			this.$errors.failWithoutHelp("The options --no-bundle and --hmr cannot be used simultaneously.");
-		}
-
-		if (projectData && projectData.useLegacyWorkflow === false) {
-			this.argv.bundle = this.argv.bundle !== undefined ? this.argv.bundle : "webpack";
-			this.argv.hmr = !this.argv.release;
-		}
+		this.argv.bundle = "webpack";
 
+		const parsed = require("yargs-parser")(process.argv.slice(2), { 'boolean-negation': false });
 		// --no-hmr -> hmr: false or --hmr false -> hmr: 'false'
 		const noHmr = parsed && (parsed.hmr === false || parsed.hmr === 'false');
-		if (noHmr) {
-			this.argv.hmr = false;
-		}
-
-		if (noBundle) {
-			this.argv.bundle = undefined;
-			this.argv.hmr = false;
+		if (!noHmr) {
+			this.argv.hmr = !this.argv.release;
 		}
 
 		if (this.argv.debugBrk) {
@@ -207,16 +193,6 @@ export class Options {
 		});
 	}
 
-	public printMessagesForDeprecatedOptions($logger: ILogger) {
-		if (this.argv.platformTemplate) {
-			$logger.warn(`"--platformTemplate" option has been deprecated and will be removed in the upcoming NativeScript CLI v6.0.0. More info can be found in this issue https://github.com/NativeScript/nativescript-cli/issues/4518.`);
-		}
-
-		if (this.argv.syncAllFiles) {
-			$logger.warn(`"--syncAllFiles" option has been deprecated and will be removed in the upcoming NativeScript CLI v6.0.0. More info can be found in this issue https://github.com/NativeScript/nativescript-cli/issues/4518.`);
-		}
-	}
-
 	private getCorrectOptionName(optionName: string): string {
 		const secondaryOptionName = this.getNonDashedOptionName(optionName);
 		return _.includes(this.optionNames, secondaryOptionName) ? secondaryOptionName : optionName;

lib/services/android-device-debug-service.ts

@@ -13,9 +13,11 @@ export class AndroidDeviceDebugService extends DebugServiceBase implements IDevi
 
 	constructor(protected device: Mobile.IAndroidDevice,
 		protected $devicesService: Mobile.IDevicesService,
+		protected $cleanupService: ICleanupService,
 		private $errors: IErrors,
 		private $logger: ILogger,
 		private $androidProcessService: Mobile.IAndroidProcessService,
+		private $staticConfig: IStaticConfig,
 		private $net: INet,
 		private $deviceLogProvider: Mobile.IDeviceLogProvider) {
 
@@ -69,8 +71,7 @@ export class AndroidDeviceDebugService extends DebugServiceBase implements IDevi
 			await this.unixSocketForward(port, `${unixSocketName}`);
 		}
 
-		// TODO: Uncomment for 6.0.0 release
-		// await this.$cleanupService.addCleanupCommand({ command: await this.$staticConfig.getAdbFilePath(), args: ["-s", deviceId, "forward", "--remove", `tcp:${port}`] });
+		await this.$cleanupService.addCleanupCommand({ command: await this.$staticConfig.getAdbFilePath(), args: ["-s", deviceId, "forward", "--remove", `tcp:${port}`] });
 
 		return port;
 	}

lib/services/project-data-service.ts

@@ -1,5 +1,4 @@
 import * as path from "path";
-import * as constants from "../constants";
 import { ProjectData } from "../project-data";
 import { exported } from "../common/decorators";
 import {
@@ -139,13 +138,6 @@ export class ProjectDataService implements IProjectDataService {
 		};
 	}
 
-	public setUseLegacyWorkflow(projectDir: string, value: any): void {
-		this.$logger.trace(`useLegacyWorkflow will be set to ${value}`);
-		this.updateNsConfigValue(projectDir, { useLegacyWorkflow: value });
-		this.refreshProjectData(projectDir);
-		this.$logger.trace(`useLegacyWorkflow was set to ${value}`);
-	}
-
 	public getAppExecutableFiles(projectDir: string): string[] {
 		const projectData = this.getProjectData(projectDir);
 
@@ -179,33 +171,6 @@ export class ProjectDataService implements IProjectDataService {
 		return files;
 	}
 
-	private refreshProjectData(projectDir: string) {
-		if (this.projectDataCache[projectDir]) {
-			this.projectDataCache[projectDir].initializeProjectData(projectDir);
-		}
-	}
-
-	private updateNsConfigValue(projectDir: string, updateObject: INsConfig): void {
-		const nsConfigPath = path.join(projectDir, constants.CONFIG_NS_FILE_NAME);
-		const currentNsConfig = this.getNsConfig(nsConfigPath);
-		const newNsConfig = Object.assign(currentNsConfig, updateObject);
-
-		this.$fs.writeJson(nsConfigPath, newNsConfig);
-	}
-
-	private getNsConfig(nsConfigPath: string): INsConfig {
-		let result = this.getNsConfigDefaultObject();
-		if (this.$fs.exists(nsConfigPath)) {
-			try {
-				result = <INsConfig>this.$fs.readJson(nsConfigPath);
-			} catch (e) {
-				// default
-			}
-		}
-
-		return result;
-	}
-
 	private getImageDefinitions(): IImageDefinitionsStructure {
 		const pathToImageDefinitions = path.join(__dirname, "..", "..", CLI_RESOURCES_DIR_NAME, AssetConstants.assets, AssetConstants.imageDefinitionsFileName);
 		const imageDefinitions = this.$fs.readJson(pathToImageDefinitions);