fix: Device logs are not properly shown with debug command

The console.log from application should be shown in the terminal when `tns debug <platform>` command is executed.
When `tns debug android --start` is used, the console.log messages are not visible as noone has started reading them. Add logic to read and filter them based on the PID of the application.
When `tns debug ios [--start]` is used with older runtime (4.0.1 for example) with iOS Simulator, the device logs are not shown as the filtering is based on the projectName, but noone has set this projectName to the filter. So we filter everything. Fix this by setting the projectName to the filter instance.

Author: rosen-vladimirov

lib/services/android-debug-service.ts

@@ -14,15 +14,27 @@ export class AndroidDebugService extends DebugServiceBase implements IPlatformDe
 		private $androidDeviceDiscovery: Mobile.IDeviceDiscovery,
 		private $androidProcessService: Mobile.IAndroidProcessService,
 		private $net: INet,
-		private $projectDataService: IProjectDataService) {
+		private $projectDataService: IProjectDataService,
+		private $deviceLogProvider: Mobile.IDeviceLogProvider) {
 		super(device, $devicesService);
 	}
 
 	public async debug(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string> {
 		this._packageName = debugData.applicationIdentifier;
-		return debugOptions.emulator
-			? this.debugOnEmulator(debugData, debugOptions)
-			: this.debugOnDevice(debugData, debugOptions);
+		const result = debugOptions.emulator
+			? await this.debugOnEmulator(debugData, debugOptions)
+			: await this.debugOnDevice(debugData, debugOptions);
+
+		if (!debugOptions.justlaunch) {
+			const pid = await this.$androidProcessService.getAppProcessId(debugData.deviceIdentifier, debugData.applicationIdentifier);
+			if (pid) {
+				this.$deviceLogProvider.setApplicationPidForDevice(debugData.deviceIdentifier, pid);
+				const device = await this.$devicesService.getDevice(debugData.deviceIdentifier);
+				await device.openDeviceLogStream();
+			}
+		}
+
+		return result;
 	}
 
 	public async debugStart(debugData: IDebugData, debugOptions: IDebugOptions): Promise<void> {

lib/services/ios-debug-service.ts

@@ -29,7 +29,8 @@ export class IOSDebugService extends DebugServiceBase implements IPlatformDebugS
 		private $iOSSocketRequestExecutor: IiOSSocketRequestExecutor,
 		private $processService: IProcessService,
 		private $socketProxyFactory: ISocketProxyFactory,
-		private $projectDataService: IProjectDataService) {
+		private $projectDataService: IProjectDataService,
+		private $deviceLogProvider: Mobile.IDeviceLogProvider) {
 		super(device, $devicesService);
 		this.$processService.attachToProcessExitSignals(this, this.debugStop);
 		this.$socketProxyFactory.on(CONNECTION_ERROR_EVENT_NAME, (e: Error) => this.emit(CONNECTION_ERROR_EVENT_NAME, e));
@@ -50,19 +51,36 @@ export class IOSDebugService extends DebugServiceBase implements IPlatformDebugS
 			debugOptions.emulator = true;
 		}
 
+		let action: (debugData: IDebugData, debugOptions: IDebugOptions) => Promise<string> = null;
 		if (debugOptions.emulator) {
 			if (debugOptions.start) {
-				return this.emulatorStart(debugData, debugOptions);
+				action = this.emulatorStart;
 			} else {
-				return this.emulatorDebugBrk(debugData, debugOptions);
+				action = this.emulatorDebugBrk;
 			}
 		} else {
 			if (debugOptions.start) {
-				return this.deviceStart(debugData, debugOptions);
+				action = this.deviceStart;
 			} else {
-				return this.deviceDebugBrk(debugData, debugOptions);
+				action = this.deviceDebugBrk;
 			}
 		}
+
+		const result = await action.bind(this)(debugData, debugOptions);
+
+		if (!debugOptions.justlaunch) {
+			let projectName = debugData.projectName;
+			if (!projectName && debugData.projectDir) {
+				const projectData = this.$projectDataService.getProjectData(debugData.projectDir);
+				projectName = projectData.projectName;
+			}
+
+			if (projectName) {
+				this.$deviceLogProvider.setProjectNameForDevice(debugData.deviceIdentifier, projectName);
+			}
+		}
+
+		return result;
 	}
 
 	public async debugStart(debugData: IDebugData, debugOptions: IDebugOptions): Promise<void> {
@@ -108,7 +126,7 @@ export class IOSDebugService extends DebugServiceBase implements IPlatformDebugS
 
 	private async emulatorDebugBrk(debugData: IDebugData, debugOptions: IDebugOptions): Promise<string> {
 		const args = debugOptions.debugBrk ? "--nativescript-debug-brk" : "--nativescript-debug-start";
-			const launchResult = await this.$iOSEmulatorServices.runApplicationOnEmulator(debugData.pathToAppPackage, {
+		const launchResult = await this.$iOSEmulatorServices.runApplicationOnEmulator(debugData.pathToAppPackage, {
 			waitForDebugger: true,
 			captureStdin: true,
 			args: args,

test/services/android-debug-service.ts

@@ -12,8 +12,9 @@ class AndroidDebugServiceInheritor extends AndroidDebugService {
 		$androidDeviceDiscovery: Mobile.IDeviceDiscovery,
 		$androidProcessService: Mobile.IAndroidProcessService,
 		$net: INet,
-		$projectDataService: IProjectDataService) {
-		super(<any>{}, $devicesService, $errors, $logger, $androidDeviceDiscovery, $androidProcessService, $net, $projectDataService);
+		$projectDataService: IProjectDataService,
+		$deviceLogProvider: Mobile.IDeviceLogProvider) {
+		super(<any>{}, $devicesService, $errors, $logger, $androidDeviceDiscovery, $androidProcessService, $net, $projectDataService, $deviceLogProvider);
 	}
 
 	public getChromeDebugUrl(debugOptions: IDebugOptions, port: number): string {
@@ -30,6 +31,7 @@ const createTestInjector = (): IInjector => {
 	testInjector.register("androidProcessService", {});
 	testInjector.register("net", {});
 	testInjector.register("projectDataService", {});
+	testInjector.register("deviceLogProvider", {});
 
 	return testInjector;
 };

test/services/ios-debug-service.ts

@@ -20,9 +20,11 @@ class IOSDebugServiceInheritor extends IOSDebugService {
 		$processService: IProcessService,
 		$socketProxyFactory: ISocketProxyFactory,
 		$net: INet,
-		$projectDataService: IProjectDataService) {
+		$projectDataService: IProjectDataService,
+		$deviceLogProvider: Mobile.IDeviceLogProvider) {
 		super(<any>{}, $devicesService, $platformService, $iOSEmulatorServices, $childProcess, $hostInfo, $logger, $errors,
-			$npmInstallationManager, $iOSDebuggerPortService, $iOSNotification, $iOSSocketRequestExecutor, $processService, $socketProxyFactory, $projectDataService);
+			$npmInstallationManager, $iOSDebuggerPortService, $iOSNotification, $iOSSocketRequestExecutor, $processService,
+			$socketProxyFactory, $projectDataService, $deviceLogProvider);
 	}
 
 	public getChromeDebugUrl(debugOptions: IDebugOptions, port: number): string {
@@ -58,6 +60,7 @@ const createTestInjector = (): IInjector => {
 
 	testInjector.register("projectDataService", {});
 	testInjector.register("iOSDebuggerPortService", {});
+	testInjector.register("deviceLogProvider", {});
 
 	return testInjector;
 };