refactor: use project dir to get project data for source map

Author: KristianDD

lib/common/commands/device/run-application.ts

@@ -15,7 +15,7 @@ export class RunApplicationOnDeviceCommand implements ICommand {
 			this.$errors.failWithoutHelp("More than one device found. Specify device explicitly with --device option. To discover device ID, use $%s device command.", this.$staticConfig.CLIENT_NAME.toLowerCase());
 		}
 
-		await this.$devicesService.execute(async (device: Mobile.IDevice) => await device.applicationManager.startApplication({ appId: args[0], projectName: args[1] }));
+		await this.$devicesService.execute(async (device: Mobile.IDevice) => await device.applicationManager.startApplication({ appId: args[0], projectName: args[1], projectDir: null }));
 	}
 }
 

lib/common/commands/device/stop-application.ts

@@ -9,7 +9,7 @@ export class StopApplicationOnDeviceCommand implements ICommand {
 	public async execute(args: string[]): Promise<void> {
 		await this.$devicesService.initialize({ deviceId: this.$options.device, skipInferPlatform: true, platform: args[1] });
 
-		const action = (device: Mobile.IDevice) => device.applicationManager.stopApplication({ appId: args[0], projectName: args[2] });
+		const action = (device: Mobile.IDevice) => device.applicationManager.stopApplication({ appId: args[0], projectName: args[2], projectDir: null });
 		await this.$devicesService.execute(action);
 	}
 }

lib/common/definitions/mobile.d.ts

@@ -106,7 +106,7 @@ declare module Mobile {
 	}
 
 	interface IiOSDevice extends IDevice {
-		getDebugSocket(appId: string, projectName: string, ensureAppStarted?: boolean): Promise<any>;
+		getDebugSocket(appId: string, projectName: string, projectDir: string, ensureAppStarted?: boolean): Promise<any>;
 		destroyDebugSocket(appId: string): Promise<void>;
 		openDeviceLogStream(options?: IiOSLogStreamOptions): Promise<void>;
 		destroyAllSockets(): Promise<void>;
@@ -145,6 +145,7 @@ declare module Mobile {
 		device: Mobile.IDevice;
 		getDeviceProjectRootPath(): Promise<string>;
 		deviceSyncZipPath?: string;
+		projectDir: string
 	}
 
 	interface ILogcatStartOptions {
@@ -192,12 +193,19 @@ declare module Mobile {
 		 * @param {string} projectName The project name of the currently running application for which we need the logs.
 		 */
 		setProjectNameForDevice(deviceIdentifier: string, projectName: string): void;
+
+		/**
+		 * Sets the project name of the application on the specified device.
+		 * @param {string} deviceIdentifier The unique identifier of the device.
+		 * @param {string} projectDir The project dir of the currently running application for which we need the logs.
+		 */
+		setProjectDirForDevice(deviceIdentifier: string, projectDir: string): void;
 	}
 
 	/**
 	 * Describes different options for filtering device logs.
 	 */
-	interface IDeviceLogOptions extends IDictionary<string | boolean> {
+	interface IDeviceLogOptions extends IDictionary<string | boolean>, Partial<IProjectDir> {
 		/**
 		 * Process id of the application on the device.
 		 */
@@ -212,7 +220,6 @@ declare module Mobile {
 		 * The project name.
 		 */
 		projectName?: string;
-
 	}
 
 	/**
@@ -251,7 +258,7 @@ declare module Mobile {
 	 * Replaces file paths in device log with their original location
 	 */
 	interface ILogSourceMapService {
-		replaceWithOriginalFileLocations(platform: string, messageData: string): string
+		replaceWithOriginalFileLocations(platform: string, messageData: string, loggingOptions: Mobile.IDeviceLogOptions): string
 	}
 
 	/**
@@ -273,7 +280,7 @@ declare module Mobile {
 		full: string;
 	}
 
-	interface IApplicationData {
+	interface IApplicationData extends IProjectDir {
 		appId: string;
 		projectName: string;
 		justLaunch?: boolean;
@@ -469,9 +476,9 @@ declare module Mobile {
 		isiOSDevice(device: Mobile.IDevice): boolean;
 		isiOSSimulator(device: Mobile.IDevice): boolean;
 		isOnlyiOSSimultorRunning(): boolean;
-		isAppInstalledOnDevices(deviceIdentifiers: string[], appIdentifier: string, framework: string): Promise<IAppInstalledInfo>[];
+		isAppInstalledOnDevices(deviceIdentifiers: string[], appIdentifier: string, framework: string, projectDir: string): Promise<IAppInstalledInfo>[];
 		setLogLevel(logLevel: string, deviceIdentifier?: string): void;
-		deployOnDevices(deviceIdentifiers: string[], packageFile: string, packageName: string, framework: string): Promise<void>[];
+		deployOnDevices(deviceIdentifiers: string[], packageFile: string, packageName: string, framework: string, projectDir: string): Promise<void>[];
 		getDeviceByIdentifier(identifier: string): Mobile.IDevice;
 		mapAbstractToTcpPort(deviceIdentifier: string, appIdentifier: string, framework: string): Promise<string>;
 		getDebuggableApps(deviceIdentifiers: string[]): Promise<Mobile.IDeviceApplicationInformation[]>[];

lib/common/mobile/android/android-application-manager.ts

@@ -87,6 +87,7 @@ export class AndroidApplicationManager extends ApplicationManagerBase {
 			const processIdentifier = await this.getAppProcessId(deviceIdentifier, appIdentifier);
 			if (processIdentifier) {
 				this.$deviceLogProvider.setApplicationPidForDevice(deviceIdentifier, processIdentifier);
+				this.$deviceLogProvider.setProjectDirForDevice(deviceIdentifier, appData.projectDir);
 				await this.$logcatHelper.start({
 					deviceIdentifier: this.identifier,
 					pid: processIdentifier
@@ -118,6 +119,7 @@ export class AndroidApplicationManager extends ApplicationManagerBase {
 	public stopApplication(appData: Mobile.IApplicationData): Promise<void> {
 		this.$logcatHelper.stop(this.identifier);
 		this.$deviceLogProvider.setApplicationPidForDevice(this.identifier, null);
+		this.$deviceLogProvider.setProjectDirForDevice(this.identifier, null);
 		return this.adb.executeShellCommand(["am", "force-stop", `${appData.appId}`]);
 	}
 

lib/common/mobile/android/android-log-filter.ts

@@ -44,7 +44,6 @@ export class AndroidLogFilter implements Mobile.IPlatformLogFilter {
 
 		if (match && acceptedTags.indexOf(match[1].trim()) !== -1) {
 			consoleLogMessage = { tag: match[1].trim(), message: match[2] };
-			consoleLogMessage.message = lineText;
 		}
 
 		return consoleLogMessage;

lib/common/mobile/device-log-emitter.ts

@@ -12,9 +12,9 @@ export class DeviceLogEmitter extends DeviceLogProviderBase {
 	public logData(line: string, platform: string, deviceIdentifier: string): void {
 		this.setDefaultLogLevelForDevice(deviceIdentifier);
 
-		const loggingOptions = this.getDeviceLogOptionsForDevice(deviceIdentifier) || { logLevel: this.$loggingLevels.info };
+		const loggingOptions = this.getDeviceLogOptionsForDevice(deviceIdentifier) || { logLevel: this.$loggingLevels.info, projectDir: null };
 		let data = this.$logFilter.filterData(platform, line, loggingOptions);
-		data = this.$logSourceMapService.replaceWithOriginalFileLocations(platform, data);
+		data = this.$logSourceMapService.replaceWithOriginalFileLocations(platform, data, loggingOptions);
 
 		if (data) {
 			this.emit('data', deviceIdentifier, data);

lib/common/mobile/device-log-provider-base.ts

@@ -21,6 +21,10 @@ export abstract class DeviceLogProviderBase extends EventEmitter implements Mobi
 		this.setDeviceLogOptionsProperty(deviceIdentifier, (deviceLogOptions: Mobile.IDeviceLogOptions) => deviceLogOptions.projectName, projectName);
 	}
 
+	public setProjectDirForDevice(deviceIdentifier: string, projectDir: string): void {
+		this.setDeviceLogOptionsProperty(deviceIdentifier, (deviceLogOptions: Mobile.IDeviceLogOptions) => deviceLogOptions.projectDir, projectDir);
+	}
+
 	protected setDefaultLogLevelForDevice(deviceIdentifier: string): void {
 		const logLevel = (this.devicesLogOptions[deviceIdentifier] && this.devicesLogOptions[deviceIdentifier].logLevel) || this.$logFilter.loggingLevel;
 		this.setLogLevel(logLevel, deviceIdentifier);

lib/common/mobile/device-log-provider.ts

@@ -12,7 +12,7 @@ export class DeviceLogProvider extends DeviceLogProviderBase {
 	public logData(lineText: string, platform: string, deviceIdentifier: string): void {
 		const loggingOptions = this.getDeviceLogOptionsForDevice(deviceIdentifier);
 		let data = this.$logFilter.filterData(platform, lineText, loggingOptions);
-		data = this.$logSourceMapService.replaceWithOriginalFileLocations(platform, data);
+		data = this.$logSourceMapService.replaceWithOriginalFileLocations(platform, data, loggingOptions);
 		if (data) {
 			this.logDataCore(data);
 			this.emit(DEVICE_LOG_EVENT_NAME, lineText, deviceIdentifier, platform);

lib/common/mobile/ios/device/ios-application-manager.ts

@@ -95,6 +95,7 @@ export class IOSApplicationManager extends ApplicationManagerBase {
 
 	private async setDeviceLogData(appData: Mobile.IApplicationData): Promise<void> {
 		this.$deviceLogProvider.setProjectNameForDevice(this.device.deviceInfo.identifier, appData.projectName);
+		this.$deviceLogProvider.setProjectDirForDevice(this.device.deviceInfo.identifier, appData.projectDir);
 		if (!this.$options.justlaunch) {
 			await this.startDeviceLog();
 		}

lib/common/mobile/ios/ios-device-base.ts

@@ -14,16 +14,16 @@ export abstract class IOSDeviceBase implements Mobile.IiOSDevice {
 	abstract openDeviceLogStream(options?: Mobile.IiOSLogStreamOptions): Promise<void>;
 
 	@performanceLog()
-	public async getDebugSocket(appId: string, projectName: string, ensureAppStarted: boolean = false): Promise<net.Socket> {
+	public async getDebugSocket(appId: string, projectName: string, projectDir: string, ensureAppStarted: boolean = false): Promise<net.Socket> {
 		return this.$lockService.executeActionWithLock(
 			async () => {
 				if (this.cachedSockets[appId]) {
 					return this.cachedSockets[appId];
 				}
 
-				await this.attachToDebuggerFoundEvent(appId, projectName);
+				await this.attachToDebuggerFoundEvent(appId, projectName, projectDir);
 				if (ensureAppStarted) {
-					await this.applicationManager.startApplication({ appId, projectName });
+					await this.applicationManager.startApplication({ appId, projectName, projectDir });
 				}
 
 				this.cachedSockets[appId] = await this.getDebugSocketCore(appId);
@@ -42,8 +42,8 @@ export abstract class IOSDeviceBase implements Mobile.IiOSDevice {
 
 	protected abstract async getDebugSocketCore(appId: string): Promise<net.Socket>;
 
-	protected async attachToDebuggerFoundEvent(appId: string, projectName: string): Promise<void> {
-		await this.startDeviceLogProcess(projectName);
+	protected async attachToDebuggerFoundEvent(appId: string, projectName: string, projectDir: string): Promise<void> {
+		await this.startDeviceLogProcess(projectName, projectDir);
 		await this.$iOSDebuggerPortService.attachToDebuggerPortFoundEvent(appId);
 	}
 
@@ -78,9 +78,10 @@ export abstract class IOSDeviceBase implements Mobile.IiOSDevice {
 		}
 	}
 
-	private async startDeviceLogProcess(projectName: string): Promise<void> {
+	private async startDeviceLogProcess(projectName: string, projectDir: string): Promise<void> {
 		if (projectName) {
 			this.$deviceLogProvider.setProjectNameForDevice(this.deviceInfo.identifier, projectName);
+			this.$deviceLogProvider.setProjectDirForDevice(this.deviceInfo.identifier, projectDir);
 		}
 
 		await this.openDeviceLogStream();