Fix hanging commands

rosen-vladimirov · rosen-vladimirov · commit 9bd85d810603 · 2017-09-05T13:20:39.000+03:00
In case the command is not related to LiveSync, once it finishes its work, CLI process should end. However, this works only on Windows, as the broker child process there is really detached from the parent. On macOS and Linux, the 'ipc' channel between the broker process and CLI, keeps both alive. So use the 'dispose' method, which is called at the end of command execution and disconnect the broker process. In case we are in LiveSync case, set shouldDispose to false and this way the broker will be kept alive. Once Ctrl + C is used to end the CLI process, send the finish message to broker and it will disconnect itself from CLI.
diff --git a/lib/commands/run.ts b/lib/commands/run.ts
@@ -5,7 +5,6 @@ export class RunCommandBase implements ICommand {
 
 	public platform: string;
 	constructor(protected $platformService: IPlatformService,
-		protected $liveSyncService: ILiveSyncService,
 		protected $projectData: IProjectData,
 		protected $options: IOptions,
 		protected $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit 7072607b66f0394699b6bb36a5c66f366f3965fa
+Subproject commit 694631dcc76e69c17d4eec2e69860b4dd823d34d
diff --git a/lib/services/analytics/analytics-broker-process.ts b/lib/services/analytics/analytics-broker-process.ts
@@ -25,15 +25,19 @@ const finishTracking = async (data?: ITrackingInformation) => {
 		sentFinishMsg = true;
 
 		data = data || { type: TrackingTypes.Finish };
+		const action = async () => {
+			await sendDataForTracking(data);
+			process.disconnect();
+		};
 
 		if (receivedFinishMsg) {
-			await sendDataForTracking(data);
+			await action();
 		} else {
 			// In case we've got here without receiving "finish" message from parent (receivedFinishMsg is false)
 			// there might be various reasons, but most probably the parent is dead.
 			// However, there's no guarantee that we've received all messages. So wait some time before sending finish message to children.
 			setTimeout(async () => {
-				await sendDataForTracking(data);
+				await action();
 			}, 1000);
 		}
 	}
diff --git a/lib/services/analytics/analytics-service.ts b/lib/services/analytics/analytics-service.ts
@@ -5,8 +5,9 @@ import { cache } from "../../common/decorators";
 import { isInteractive } from '../../common/helpers';
 import { DeviceTypes, AnalyticsClients } from "../../common/constants";
 
-export class AnalyticsService extends AnalyticsServiceBase implements IAnalyticsService {
+export class AnalyticsService extends AnalyticsServiceBase {
 	private static ANALYTICS_BROKER_START_TIMEOUT = 30 * 1000;
+	private brokerProcess: ChildProcess;
 
 	constructor(protected $logger: ILogger,
 		protected $options: IOptions,
@@ -102,6 +103,12 @@ export class AnalyticsService extends AnalyticsServiceBase implements IAnalytics
 		await this.trackInGoogleAnalytics(googleAnalyticsEventData);
 	}
 
+	public dispose(): void {
+		if (this.brokerProcess && this.shouldDisposeInstance) {
+			this.brokerProcess.disconnect();
+		}
+	}
+
 	private addDataToLabel(label: string, newData: string): string {
 		if (newData && label) {
 			return `${label}_${newData}`;
@@ -156,6 +163,8 @@ export class AnalyticsService extends AnalyticsServiceBase implements IAnalytics
 							});
 						});
 
+						this.brokerProcess = broker;
+
 						resolve(broker);
 					}
 				}
diff --git a/lib/services/analytics/eqatec-analytics-provider.ts b/lib/services/analytics/eqatec-analytics-provider.ts
@@ -51,6 +51,10 @@ export class EqatecAnalyticsProvider extends AnalyticsServiceBase implements IAn
 		this.tryStopEqatecMonitors();
 	}
 
+	public dispose(): void {
+		// Intentionally left blank.
+	}
+
 }
 
 $injector.register("eqatecAnalyticsProvider", EqatecAnalyticsProvider);
diff --git a/lib/services/livesync/livesync-command-helper.ts b/lib/services/livesync/livesync-command-helper.ts
@@ -7,7 +7,9 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 		private $iosDeviceOperations: IIOSDeviceOperations,
 		private $mobileHelper: Mobile.IMobileHelper,
 		private $platformsData: IPlatformsData,
+		private $analyticsService: IAnalyticsService,
 		private $errors: IErrors) {
+			this.$analyticsService.setShouldDispose(this.$options.justlaunch || !this.$options.watch);
 	}
 
 	public getPlatformsForOperation(platform: string): string[] {
diff --git a/lib/services/test-execution-service.ts b/lib/services/test-execution-service.ts
@@ -26,7 +26,9 @@ class TestExecutionService implements ITestExecutionService {
 		private $errors: IErrors,
 		private $debugService: IDebugService,
 		private $devicesService: Mobile.IDevicesService,
+		private $analyticsService: IAnalyticsService,
 		private $childProcess: IChildProcess) {
+			this.$analyticsService.setShouldDispose(this.$options.justlaunch || !this.$options.watch);
 	}
 
 	public platform: string;
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,10 @@ export class EqatecAnalyticsProvider extends AnalyticsServiceBase implements IAn`
`51`	`51`	`this.tryStopEqatecMonitors();`
`52`	`52`	`}`
`53`	`53`
	`54`	`+ public dispose(): void {`
	`55`	`+ // Intentionally left blank.`
	`56`	`+ }`
	`57`	`+`
`54`	`58`	`}`
`55`	`59`
`56`	`60`	`$injector.register("eqatecAnalyticsProvider", EqatecAnalyticsProvider);`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,9 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {`
`7`	`7`	`private $iosDeviceOperations: IIOSDeviceOperations,`
`8`	`8`	`private $mobileHelper: Mobile.IMobileHelper,`
`9`	`9`	`private $platformsData: IPlatformsData,`
	`10`	`+ private $analyticsService: IAnalyticsService,`
`10`	`11`	`private $errors: IErrors) {`
	`12`	`+ this.$analyticsService.setShouldDispose(this.$options.justlaunch \|\| !this.$options.watch);`
`11`	`13`	`}`
`12`	`14`
`13`	`15`	`public getPlatformsForOperation(platform: string): string[] {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,9 @@ class TestExecutionService implements ITestExecutionService {`
`26`	`26`	`private $errors: IErrors,`
`27`	`27`	`private $debugService: IDebugService,`
`28`	`28`	`private $devicesService: Mobile.IDevicesService,`
	`29`	`+ private $analyticsService: IAnalyticsService,`
`29`	`30`	`private $childProcess: IChildProcess) {`
	`31`	`+ this.$analyticsService.setShouldDispose(this.$options.justlaunch \|\| !this.$options.watch);`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`public platform: string;`