chore: emit runOnDeviceStopperEvent

Author: Fatme

lib/bootstrap.ts

@@ -43,14 +43,13 @@ $injector.require("platformWatcherService", "./services/platform/platform-watche
 
 $injector.require("buildArtefactsService", "./services/build-artefacts-service");
 
-$injector.require("runOnDevicesDataService", "./services/run-on-devices-data-service");
-$injector.require("runOnDevicesEmitter", "./run-on-devices-emitter");
-
+$injector.require("deviceDebugAppService", "./services/device/device-debug-app-service");
 $injector.require("deviceInstallAppService", "./services/device/device-install-app-service");
 $injector.require("deviceRefreshAppService", "./services/device/device-refresh-app-service");
-$injector.require("deviceDebugAppService", "./services/device/device-debug-app-service");
 
 $injector.require("workflowDataService", "./services/workflow/workflow-data-service");
+$injector.require("runOnDevicesDataService", "./services/run-on-devices-data-service");
+$injector.require("runOnDevicesEmitter", "./run-on-devices-emitter");
 
 $injector.require("mainController", "./controllers/main-controller");
 $injector.require("runOnDevicesController", "./controllers/run-on-devices-controller");

lib/controllers/main-controller.ts

@@ -9,6 +9,7 @@ import { RunOnDevicesController } from "./run-on-devices-controller";
 import { RunOnDevicesDataService } from "../services/run-on-devices-data-service";
 import { cache } from "../common/decorators";
 import { DeviceDiscoveryEventNames } from "../common/constants";
+import { RunOnDevicesEmitter } from "../run-on-devices-emitter";
 
 export class MainController extends EventEmitter {
 	constructor(
@@ -25,6 +26,7 @@ export class MainController extends EventEmitter {
 		private $projectDataService: IProjectDataService,
 		private $runOnDevicesController: RunOnDevicesController,
 		private $runOnDevicesDataService: RunOnDevicesDataService,
+		private $runOnDevicesEmitter: RunOnDevicesEmitter,
 		private $workflowDataService: WorkflowDataService
 	) { super(); }
 
@@ -146,7 +148,7 @@ export class MainController extends EventEmitter {
 
 			// Emit RunOnDevice stopped when we've really stopped.
 			_.each(removedDeviceIdentifiers, deviceIdentifier => {
-				this.emit(RunOnDeviceEvents.runOnDeviceStopped, { projectDir, deviceIdentifier });
+				this.$runOnDevicesEmitter.emitRunOnDeviceStoppedEvent(projectDir, deviceIdentifier);
 			});
 		}
 	}
@@ -157,13 +159,8 @@ export class MainController extends EventEmitter {
 
 	private handleRunOnDeviceEvents(projectDir: string): void {
 		this.$runOnDevicesController.on(RunOnDeviceEvents.runOnDeviceError, async data => {
-			this.emit(RunOnDeviceEvents.runOnDeviceError, data);
 			await this.stopRunOnDevices(projectDir, [data.deviceIdentifier], { shouldAwaitAllActions: false });
 		});
-
-		this.$runOnDevicesController.on(RunOnDeviceEvents.runOnDeviceStarted, data => {
-			this.emit(RunOnDeviceEvents.runOnDeviceStarted, data);
-		});
 	}
 
 	// TODO: expose previewOnDevice() method { }
@@ -190,15 +187,16 @@ export class MainController extends EventEmitter {
 		this.$devicesService.on(DeviceDiscoveryEventNames.DEVICE_LOST, async (device: Mobile.IDevice) => {
 			this.$logger.trace(`Received ${DeviceDiscoveryEventNames.DEVICE_LOST} event in LiveSync service for ${device.deviceInfo.identifier}. Will stop LiveSync operation for this device.`);
 
-			// for (const projectDir in this.liveSyncProcessesInfo) {
-			// 	try {
-			// 		if (_.find(this.liveSyncProcessesInfo[projectDir].deviceDescriptors, d => d.identifier === device.deviceInfo.identifier)) {
-			// 			await this.stopLiveSync(projectDir, [device.deviceInfo.identifier]);
-			// 		}
-			// 	} catch (err) {
-			// 		this.$logger.warn(`Unable to stop LiveSync operation for ${device.deviceInfo.identifier}.`, err);
-			// 	}
-			// }
+			for (const projectDir in this.$runOnDevicesDataService.getAllData()) {
+				try {
+					const deviceDescriptors = this.$runOnDevicesDataService.getDeviceDescriptors(projectDir);
+					if (_.find(deviceDescriptors, d => d.identifier === device.deviceInfo.identifier)) {
+						await this.stopRunOnDevices(projectDir, [device.deviceInfo.identifier]);
+					}
+				} catch (err) {
+					this.$logger.warn(`Unable to stop LiveSync operation for ${device.deviceInfo.identifier}.`, err);
+				}
+			}
 		});
 	}
 }

lib/run-on-devices-emitter.ts

@@ -42,6 +42,13 @@ export class RunOnDevicesEmitter extends EventEmitter {
 		});
 	}
 
+	public emitRunOnDeviceStoppedEvent(projectDir: string, deviceIdentifier: string) {
+		this.emitCore(RunOnDeviceEvents.runOnDeviceStopped, {
+			projectDir,
+			deviceIdentifier
+		});
+	}
+
 	public emitDebuggerAttachedEvent(debugInformation: IDebugInformation) {
 		this.emit(DEBUGGER_ATTACHED_EVENT_NAME, debugInformation);
 	}

lib/services/run-on-devices-data-service.ts

@@ -5,6 +5,10 @@ export class RunOnDevicesDataService {
 		return this.liveSyncProcessesInfo[projectDir];
 	}
 
+	public getAllData(): IDictionary<ILiveSyncProcessInfo> {
+		return this.liveSyncProcessesInfo;
+	}
+
 	public getDeviceDescriptors(projectDir: string): ILiveSyncDeviceInfo[] {
 		const liveSyncProcessesInfo = this.liveSyncProcessesInfo[projectDir] || <ILiveSyncProcessInfo>{};
 		const currentDescriptors = liveSyncProcessesInfo.deviceDescriptors;