fix: remove prepareReadyHandler on run command and don't provide deviceDescriptors as param to sync method

Author: Fatme

lib/controllers/run-controller.ts

@@ -4,6 +4,8 @@ import { cache, performanceLog } from "../common/decorators";
 import { EventEmitter } from "events";
 
 export class RunController extends EventEmitter implements IRunController {
+	private prepareReadyEventHandler: any = null;
+
 	constructor(
 		protected $analyticsService: IAnalyticsService,
 		private $buildController: IBuildController,
@@ -45,9 +47,10 @@ export class RunController extends EventEmitter implements IRunController {
 			this.$hmrStatusService.attachToHmrStatusEvent();
 		}
 
-		this.$prepareController.on(PREPARE_READY_EVENT_NAME, async data => {
-			await this.syncChangedDataOnDevices(data, projectData, liveSyncInfo, deviceDescriptors);
-		});
+		if (!this.prepareReadyEventHandler) {
+			this.prepareReadyEventHandler = async (data: any) => await this.syncChangedDataOnDevices(data, projectData, liveSyncInfo);
+			this.$prepareController.on(PREPARE_READY_EVENT_NAME, this.prepareReadyEventHandler.bind(this));
+		}
 
 		await this.syncInitialDataOnDevices(projectData, liveSyncInfo, deviceDescriptorsForInitialSync);
 
@@ -58,6 +61,11 @@ export class RunController extends EventEmitter implements IRunController {
 		const { projectDir, deviceIdentifiers, stopOptions } = data;
 		const liveSyncProcessInfo = this.$liveSyncProcessDataService.getPersistedData(projectDir);
 		if (liveSyncProcessInfo && !liveSyncProcessInfo.isStopped) {
+			if (this.prepareReadyEventHandler) {
+				this.removeListener(PREPARE_READY_EVENT_NAME, this.prepareReadyEventHandler);
+				this.prepareReadyEventHandler = null;
+			}
+
 			// In case we are coming from error during livesync, the current action is the one that erred (but we are still executing it),
 			// so we cannot await it as this will cause infinite loop.
 			const shouldAwaitPendingOperation = !stopOptions || stopOptions.shouldAwaitAllActions;
@@ -313,10 +321,11 @@ export class RunController extends EventEmitter implements IRunController {
 		await this.addActionToChain(projectData.projectDir, () => this.$devicesService.execute(deviceAction, (device: Mobile.IDevice) => _.some(deviceDescriptors, deviceDescriptor => deviceDescriptor.identifier === device.deviceInfo.identifier)));
 	}
 
-	private async syncChangedDataOnDevices(data: IFilesChangeEventData, projectData: IProjectData, liveSyncInfo: ILiveSyncInfo, deviceDescriptors: ILiveSyncDeviceDescriptor[]): Promise<void> {
+	private async syncChangedDataOnDevices(data: IFilesChangeEventData, projectData: IProjectData, liveSyncInfo: ILiveSyncInfo): Promise<void> {
 		const rebuiltInformation: IDictionary<{ packageFilePath: string, platform: string, isEmulator: boolean }> = { };
 
 		const deviceAction = async (device: Mobile.IDevice) => {
+			const deviceDescriptors = this.$liveSyncProcessDataService.getDeviceDescriptors(projectData.projectDir);
 			const deviceDescriptor = _.find(deviceDescriptors, dd => dd.identifier === device.deviceInfo.identifier);
 			const platformData = this.$platformsDataService.getPlatformData(data.platform, projectData);
 			const prepareData = this.$prepareDataService.getPrepareData(liveSyncInfo.projectDir, device.deviceInfo.platform,