refactor: Use single object as arg for some of application manager methods

In order to make future refactorings easier, introduce a single object as an argument to some of the methods in devices' ApplicationManagers.

Author: rosen-vladimirov

lib/definitions/platform.d.ts

@@ -125,7 +125,7 @@ interface IPlatformService extends IBuildPlatformAction, NodeJS.EventEmitter {
 	 * @param {IProjectData} projectData DTO with information about the project.
 	 * @returns {void}
 	 */
-	startApplication(platform: string, runOptions: IRunPlatformOptions, projectId: string, projectName: string): Promise<void>;
+	startApplication(platform: string, runOptions: IRunPlatformOptions, appData: Mobile.IApplicationData): Promise<void>;
 
 	cleanDestinationApp(platformInfo: IPreparePlatformInfo): Promise<void>;
 	validatePlatformInstalled(platform: string, projectData: IProjectData): void;

lib/helpers/livesync-command-helper.ts

@@ -151,7 +151,7 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 			};
 
 			await this.$platformService.deployPlatform(deployPlatformInfo);
-			await this.$platformService.startApplication(currentPlatform, runPlatformOptions, this.$projectData.projectId, this.$projectData.projectName);
+			await this.$platformService.startApplication(currentPlatform, runPlatformOptions, { appId: this.$projectData.projectId, projectName: this.$projectData.projectName });
 			this.$platformService.trackProjectType(this.$projectData);
 		}
 	}

lib/services/android-debug-service.ts

@@ -26,9 +26,14 @@ export class AndroidDebugService extends DebugServiceBase implements IPlatformDe
 	}
 
 	public async debugStart(debugData: IDebugData, debugOptions: IDebugOptions): Promise<void> {
-		const projectData = this.$projectDataService.getProjectData(debugData.projectDir);
 		await this.$devicesService.initialize({ platform: this.platform, deviceId: debugData.deviceIdentifier });
-		const action = (device: Mobile.IAndroidDevice): Promise<void> => this.debugStartCore(debugData.applicationIdentifier, debugOptions, projectData.projectName);
+		const projectData = this.$projectDataService.getProjectData(debugData.projectDir);
+		const appData: Mobile.IApplicationData = {
+			appId: debugData.applicationIdentifier,
+			projectName: projectData.projectName
+		};
+
+		const action = (device: Mobile.IAndroidDevice): Promise<void> => this.debugStartCore(appData, debugOptions);
 
 		await this.$devicesService.execute(action, this.getCanExecuteAction(debugData.deviceIdentifier));
 	}
@@ -93,24 +98,29 @@ export class AndroidDebugService extends DebugServiceBase implements IPlatformDe
 
 		await this.$devicesService.initialize({ platform: this.platform, deviceId: debugData.deviceIdentifier });
 
-		const packageName = this.$projectDataService.getProjectData(debugData.projectDir).projectName;
-		const action = (device: Mobile.IAndroidDevice): Promise<string> => this.debugCore(device, packageFile, debugData.applicationIdentifier, packageName, debugOptions);
+		const projectName = this.$projectDataService.getProjectData(debugData.projectDir).projectName;
+		const appData: Mobile.IApplicationData = {
+			appId: debugData.applicationIdentifier,
+			projectName
+		};
+
+		const action = (device: Mobile.IAndroidDevice): Promise<string> => this.debugCore(device, packageFile, appData, debugOptions);
 
 		const deviceActionResult = await this.$devicesService.execute(action, this.getCanExecuteAction(debugData.deviceIdentifier));
 		return deviceActionResult[0].result;
 	}
 
-	private async debugCore(device: Mobile.IAndroidDevice, packageFile: string, appId: string, packageName: string, debugOptions: IDebugOptions): Promise<string> {
-		await this.printDebugPort(device.deviceInfo.identifier, appId);
+	private async debugCore(device: Mobile.IAndroidDevice, packageFile: string, appData: Mobile.IApplicationData, debugOptions: IDebugOptions): Promise<string> {
+		await this.printDebugPort(device.deviceInfo.identifier, appData.appId);
 
 		if (debugOptions.start) {
-			return await this.attachDebugger(device.deviceInfo.identifier, appId, debugOptions);
+			return await this.attachDebugger(device.deviceInfo.identifier, appData.appId, debugOptions);
 		} else if (debugOptions.stop) {
 			await this.removePortForwarding();
 			return null;
 		} else {
-			await this.debugStartCore(appId, debugOptions, packageName);
-			return await this.attachDebugger(device.deviceInfo.identifier, appId, debugOptions);
+			await this.debugStartCore(appData, debugOptions);
+			return await this.attachDebugger(device.deviceInfo.identifier, appData.appId, debugOptions);
 		}
 	}
 
@@ -129,22 +139,21 @@ export class AndroidDebugService extends DebugServiceBase implements IPlatformDe
 		return this.getChromeDebugUrl(debugOptions, port);
 	}
 
-	private async debugStartCore(appId: string, debugOptions: IDebugOptions, projectName: string): Promise<void> {
+	private async debugStartCore(appData: Mobile.IApplicationData, debugOptions: IDebugOptions): Promise<void> {
 		// Arguments passed to executeShellCommand must be in array ([]), but it turned out adb shell "arg with intervals" still works correctly.
 		// As we need to redirect output of a command on the device, keep using only one argument.
 		// We could rewrite this with two calls - touch and rm -f , but -f flag is not available on old Android, so rm call will fail when file does not exist.
-
-		await this.device.applicationManager.stopApplication(appId);
+		await this.device.applicationManager.stopApplication(appData);
 
 		if (debugOptions.debugBrk) {
-			await this.device.adb.executeShellCommand([`cat /dev/null > /data/local/tmp/${appId}-debugbreak`]);
+			await this.device.adb.executeShellCommand([`cat /dev/null > /data/local/tmp/${appData.appId}-debugbreak`]);
 		}
 
-		await this.device.adb.executeShellCommand([`cat /dev/null > /data/local/tmp/${appId}-debugger-started`]);
+		await this.device.adb.executeShellCommand([`cat /dev/null > /data/local/tmp/${appData.appId}-debugger-started`]);
 
-		await this.device.applicationManager.startApplication(appId, projectName);
+		await this.device.applicationManager.startApplication(appData);
 
-		await this.waitForDebugger(appId);
+		await this.waitForDebugger(appData.appId);
 	}
 
 	private async waitForDebugger(packageName: String): Promise<void> {

lib/services/ios-debug-service.ts

@@ -187,7 +187,7 @@ export class IOSDebugService extends DebugServiceBase implements IPlatformDebugS
 			};
 
 			const promisesResults = await Promise.all<any>([
-				this.$platformService.startApplication(this.platform, runOptions, debugData.applicationIdentifier, projectData.projectName),
+				this.$platformService.startApplication(this.platform, runOptions, { appId: debugData.applicationIdentifier, projectName: projectData.projectName }),
 				this.debugBrkCore(device, debugData, debugOptions)
 			]);
 

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

@@ -62,7 +62,7 @@ export class AndroidDeviceLiveSyncService extends DeviceLiveSyncServiceBase impl
 		const devicePath = this.$mobileHelper.buildDevicePath(devicePathRoot, "code_cache", "secondary_dexes", "proxyThumb");
 		await this.device.adb.executeShellCommand(["rm", "-rf", devicePath]);
 
-		await this.device.applicationManager.restartApplication(deviceAppData.appIdentifier, projectName);
+		await this.device.applicationManager.restartApplication({ appId: deviceAppData.appIdentifier, projectName });
 	}
 
 	public async beforeLiveSyncAction(deviceAppData: Mobile.IDeviceAppData): Promise<void> {

lib/services/livesync/ios-device-livesync-service.ts

@@ -75,8 +75,8 @@ export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implemen
 		}
 	}
 
-	private async restartApplication(deviceAppData: Mobile.IDeviceAppData, appName: string): Promise<void> {
-		return this.device.applicationManager.restartApplication(deviceAppData.appIdentifier, appName);
+	private async restartApplication(deviceAppData: Mobile.IDeviceAppData, projectName: string): Promise<void> {
+		return this.device.applicationManager.restartApplication({ appId: deviceAppData.appIdentifier, projectName });
 	}
 
 	private async reloadPage(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]): Promise<void> {

lib/services/livesync/livesync-service.ts

@@ -165,7 +165,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 		};
 
 		try {
-			await deviceAppData.device.applicationManager.stopApplication(applicationId, projectData.projectName);
+			await deviceAppData.device.applicationManager.stopApplication({ appId: applicationId, projectName: projectData.projectName });
 			// Now that we've stopped the application we know it isn't started, so set debugOptions.start to false
 			// so that it doesn't default to true in attachDebugger method
 			debugOptions = debugOptions || {};

lib/services/platform-service.ts

@@ -543,11 +543,11 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		await this.$devicesService.execute(action, this.getCanExecuteAction(deployInfo.platform, deployInfo.deployOptions));
 	}
 
-	public async startApplication(platform: string, runOptions: IRunPlatformOptions, projectId: string, projectName: string): Promise<void> {
+	public async startApplication(platform: string, runOptions: IRunPlatformOptions, appData: Mobile.IApplicationData): Promise<void> {
 		this.$logger.out("Starting...");
 
 		const action = async (device: Mobile.IDevice) => {
-			await device.applicationManager.startApplication(projectId, projectName);
+			await device.applicationManager.startApplication(appData);
 			this.$logger.out(`Successfully started on device with identifier '${device.deviceInfo.identifier}'.`);
 		};