feat: stop webpack and native watchers on stopRunOnDevices()

Author: Fatme

lib/controllers/main-controller.ts

@@ -10,6 +10,7 @@ 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";
+import { PlatformWatcherService } from "../services/platform/platform-watcher-service";
 
 export class MainController extends EventEmitter {
 	constructor(
@@ -20,7 +21,7 @@ export class MainController extends EventEmitter {
 		private $errors: IErrors,
 		private $hooksService: IHooksService,
 		private $logger: ILogger,
-		private $platformWatcherService: IPlatformWatcherService,
+		private $platformWatcherService: PlatformWatcherService,
 		private $pluginsService: IPluginsService,
 		private $preparePlatformService: PreparePlatformService,
 		private $projectDataService: IProjectDataService,
@@ -90,7 +91,7 @@ export class MainController extends EventEmitter {
 
 			for (const platform of platforms) {
 				const { nativePlatformData, preparePlatformData } = this.$workflowDataService.createWorkflowData(platform, projectDir, liveSyncInfo);
-				await this.$platformWatcherService.startWatcher(nativePlatformData, projectData, preparePlatformData);
+				await this.$platformWatcherService.startWatchers(nativePlatformData, projectData, preparePlatformData);
 			}
 		}
 
@@ -117,11 +118,11 @@ export class MainController extends EventEmitter {
 					clearTimeout(liveSyncProcessInfo.timer);
 				}
 
-				if (liveSyncProcessInfo.watcherInfo && liveSyncProcessInfo.watcherInfo.watcher) {
-					liveSyncProcessInfo.watcherInfo.watcher.close();
-				}
+				_.each(liveSyncProcessInfo.deviceDescriptors, deviceDescriptor => {
+					const device = this.$devicesService.getDeviceByIdentifier(deviceDescriptor.identifier);
+					this.$platformWatcherService.stopWatchers(projectDir, device.deviceInfo.platform);
+				});
 
-				liveSyncProcessInfo.watcherInfo = null;
 				liveSyncProcessInfo.isStopped = true;
 
 				if (liveSyncProcessInfo.actionsChain && shouldAwaitPendingOperation) {

lib/services/platform/platform-watcher-service.ts

@@ -5,24 +5,25 @@ import * as path from "path";
 import { INITIAL_SYNC_EVENT_NAME, FILES_CHANGE_EVENT_NAME } from "../../constants";
 import { PreparePlatformData } from "../workflow/workflow-data-service";
 import { PreparePlatformService } from "./prepare-platform-service";
+import { WebpackCompilerService } from "../webpack/webpack-compiler-service";
 
 interface IPlatformWatcherData {
 	webpackCompilerProcess: child_process.ChildProcess;
 	nativeFilesWatcher: choki.FSWatcher;
 }
 
-export class PlatformWatcherService extends EventEmitter implements IPlatformWatcherService {
+export class PlatformWatcherService extends EventEmitter {
 	private watchersData: IDictionary<IDictionary<IPlatformWatcherData>> = {};
 	private isInitialSyncEventEmitted = false;
 	private persistedFilesChangeEventData: IFilesChangeEventData[] = [];
 
 	constructor(
 		private $logger: ILogger,
 		private $preparePlatformService: PreparePlatformService,
-		private $webpackCompilerService: IWebpackCompilerService
+		private $webpackCompilerService: WebpackCompilerService
 	) { super(); }
 
-	public async startWatcher(platformData: IPlatformData, projectData: IProjectData, preparePlatformData: PreparePlatformData): Promise<void> {
+	public async startWatchers(platformData: IPlatformData, projectData: IProjectData, preparePlatformData: PreparePlatformData): Promise<void> {
 		this.$logger.out("Starting watchers...");
 
 		if (!this.watchersData[projectData.projectDir]) {
@@ -42,6 +43,20 @@ export class PlatformWatcherService extends EventEmitter implements IPlatformWat
 		this.emitInitialSyncEvent({ platform: platformData.platformNameLowerCase, hasNativeChanges });
 	}
 
+	public async stopWatchers(projectDir: string, platform: string) {
+		const platformLowerCase = platform.toLowerCase();
+
+		if (this.watchersData && this.watchersData[projectDir] && this.watchersData[projectDir][platformLowerCase] && this.watchersData[projectDir][platformLowerCase].nativeFilesWatcher) {
+			this.watchersData[projectDir][platformLowerCase].nativeFilesWatcher.close();
+			this.watchersData[projectDir][platformLowerCase].nativeFilesWatcher = null;
+		}
+
+		if (this.watchersData && this.watchersData[projectDir] && this.watchersData[projectDir][platformLowerCase] && this.watchersData[projectDir][platformLowerCase].webpackCompilerProcess) {
+			this.$webpackCompilerService.stopWebpackCompile(platform);
+			this.watchersData[projectDir][platformLowerCase].webpackCompilerProcess = null;
+		}
+	}
+
 	private async startJSWatcherWithPrepare(platformData: IPlatformData, projectData: IProjectData, config: IWebpackCompilerConfig): Promise<void> {
 		if (!this.watchersData[projectData.projectDir][platformData.platformNameLowerCase].webpackCompilerProcess) {
 			this.$webpackCompilerService.on("webpackEmittedFiles", data => {

lib/services/webpack/webpack-compiler-service.ts

@@ -7,6 +7,7 @@ export class WebpackCompilerService extends EventEmitter implements IWebpackComp
 
 	constructor(
 		private $childProcess: IChildProcess,
+		private $logger: ILogger,
 		private $projectData: IProjectData
 	) { super(); }
 
@@ -86,6 +87,14 @@ export class WebpackCompilerService extends EventEmitter implements IWebpackComp
 		});
 	}
 
+	public stopWebpackCompile(platform: string) {
+		if (platform) {
+			this.stopWebpackForPlatform(platform);
+		} else {
+			Object.keys(this.webpackProcesses).forEach(pl => this.stopWebpackForPlatform(pl));
+		}
+	}
+
 	private startWebpackProcess(platformData: IPlatformData, projectData: IProjectData, config: IWebpackCompilerConfig): child_process.ChildProcess {
 		const envData = this.buildEnvData(platformData.platformNameLowerCase, config.env);
 		const envParams = this.buildEnvCommandLineParams(envData);
@@ -183,5 +192,14 @@ export class WebpackCompilerService extends EventEmitter implements IWebpackComp
 			hash: matches[2] || "",
 		};
 	}
+
+	private stopWebpackForPlatform(platform: string) {
+		this.$logger.trace(`Stopping webpack watch for platform ${platform}.`);
+		const webpackProcess = this.webpackProcesses[platform];
+		if (webpackProcess) {
+			webpackProcess.kill("SIGINT");
+			delete this.webpackProcesses[platform];
+		}
+	}
 }
 $injector.register("webpackCompilerService", WebpackCompilerService);