Merge pull request #3722 from NativeScript/fatme/fix-console-log

Fatme · web-flow · commit 25522d1939f6 · 2018-07-04T11:32:39.000+03:00
chore: fix console.log regression after introducing ios-sim async api
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit bec6a251c78a62de917fbb1d731a451a99e07041
+Subproject commit 2bdc7a2b87e78dcc71e248802fc1b9d0869585de
diff --git a/lib/definitions/ios-debugger-port-service.d.ts b/lib/definitions/ios-debugger-port-service.d.ts
@@ -24,7 +24,7 @@ interface IIOSDebuggerPortService {
 	 * In case when STARTING_IOS_APPLICATION event is emitted, sets the port to null and add timeout for 5000 miliseconds which checks if port is null and prints a warning.
 	 * @param {Mobile.IDevice} device - Describes the device which logs should be parsed.
 	 * @param {IProjectDir} data - Object that has a projectDir property.
-	 * @returns {void}
+	 * @returns {Promise<void>}
 	 */
-	attachToDebuggerPortFoundEvent(device: Mobile.IDevice, data: IProjectDir): void;
+	attachToDebuggerPortFoundEvent(device: Mobile.IDevice, data: IProjectDir): Promise<void>;
 }
diff --git a/lib/definitions/ios-log-parser-service.d.ts b/lib/definitions/ios-log-parser-service.d.ts
@@ -3,5 +3,5 @@ interface IIOSLogParserService extends NodeJS.EventEmitter {
 	 * Starts looking for debugger port. Attaches on device logs and processes them. In case when port is found, DEBUGGER_PORT_FOUND event is emitted.
 	 * @param {Mobile.IDevice} device - Describes the device which logs will be processed.
 	 */
-	startParsingLog(device: Mobile.IDevice, data: IProjectName): void;
+	startParsingLog(device: Mobile.IDevice, data: IProjectName): Promise<void>;
 }
diff --git a/lib/definitions/livesync.d.ts b/lib/definitions/livesync.d.ts
@@ -337,7 +337,7 @@ interface IPlatformLiveSyncService {
 	fullSync(syncInfo: IFullSyncInfo): Promise<ILiveSyncResultInfo>;
 	liveSyncWatchAction(device: Mobile.IDevice, liveSyncInfo: ILiveSyncWatchInfo): Promise<ILiveSyncResultInfo>;
 	refreshApplication(projectData: IProjectData, liveSyncInfo: ILiveSyncResultInfo): Promise<void>;
-	prepareForLiveSync(device: Mobile.IDevice, data: IProjectDir, liveSyncInfo: ILiveSyncInfo): void;
+	prepareForLiveSync(device: Mobile.IDevice, data: IProjectDir, liveSyncInfo: ILiveSyncInfo): Promise<void>;
 }
 
 interface INativeScriptDeviceLiveSyncService extends IDeviceLiveSyncServiceBase {
diff --git a/lib/services/ios-debug-service.ts b/lib/services/ios-debug-service.ts
@@ -63,7 +63,7 @@ export class IOSDebugService extends DebugServiceBase implements IPlatformDebugS
 			await this.device.openDeviceLogStream();
 		}
 
-		this.$iOSDebuggerPortService.attachToDebuggerPortFoundEvent(this.device, debugData);
+		await this.$iOSDebuggerPortService.attachToDebuggerPortFoundEvent(this.device, debugData);
 
 		if (debugOptions.emulator) {
 			if (debugOptions.start) {
diff --git a/lib/services/ios-debugger-port-service.ts b/lib/services/ios-debugger-port-service.ts
@@ -36,7 +36,7 @@ export class IOSDebuggerPortService implements IIOSDebuggerPortService {
 		});
 	}
 
-	public attachToDebuggerPortFoundEvent(device: Mobile.IDevice, data: IProjectDir): void {
+	public async attachToDebuggerPortFoundEvent(device: Mobile.IDevice, data: IProjectDir): Promise<void> {
 		const projectData = this.$projectDataService.getProjectData(data && data.projectDir);
 		if (!this.canStartLookingForDebuggerPort(projectData)) {
 			return;
@@ -45,7 +45,7 @@ export class IOSDebuggerPortService implements IIOSDebuggerPortService {
 		this.attachToDebuggerPortFoundEventCore();
 		this.attachToAttachRequestEvent(device);
 
-		this.$iOSLogParserService.startParsingLog(device, projectData);
+		await this.$iOSLogParserService.startParsingLog(device, projectData);
 	}
 
 	private canStartLookingForDebuggerPort(data: IProjectDir): boolean {
diff --git a/lib/services/ios-log-parser-service.ts b/lib/services/ios-log-parser-service.ts
@@ -13,12 +13,12 @@ export class IOSLogParserService extends EventEmitter implements IIOSLogParserSe
 		super();
 	}
 
-	public startParsingLog(device: Mobile.IDevice, data: IProjectName): void {
+	public async startParsingLog(device: Mobile.IDevice, data: IProjectName): Promise<void> {
 		this.$deviceLogProvider.setProjectNameForDevice(device.deviceInfo.identifier, data.projectName);
 
 		if (!this.startedDeviceLogInstances[device.deviceInfo.identifier]) {
 			this.startParsingLogCore(device);
-			this.startLogProcess(device);
+			await this.startLogProcess(device);
 			this.startedDeviceLogInstances[device.deviceInfo.identifier] = true;
 		}
 	}
@@ -41,7 +41,7 @@ export class IOSLogParserService extends EventEmitter implements IIOSLogParserSe
 		}
 	}
 
-	private startLogProcess(device: Mobile.IDevice): void {
+	private async startLogProcess(device: Mobile.IDevice): Promise<void> {
 		if (device.isEmulator) {
 			return this.$iOSSimulatorLogProvider.startNewMutedLogProcess(device.deviceInfo.identifier);
 		}
diff --git a/lib/services/livesync/android-livesync-service.ts b/lib/services/livesync/android-livesync-service.ts
@@ -17,6 +17,6 @@ export class AndroidLiveSyncService extends PlatformLiveSyncServiceBase implemen
 		return service;
 	}
 
-	public prepareForLiveSync(device: Mobile.IDevice, data: IProjectDir): void { /* */ }
+	public async prepareForLiveSync(device: Mobile.IDevice, data: IProjectDir): Promise<void> { /* */ }
 }
 $injector.register("androidLiveSyncService", AndroidLiveSyncService);
diff --git a/lib/services/livesync/ios-livesync-service.ts b/lib/services/livesync/ios-livesync-service.ts
@@ -66,9 +66,9 @@ export class IOSLiveSyncService extends PlatformLiveSyncServiceBase implements I
 		}
 	}
 
-	public prepareForLiveSync(device: Mobile.IDevice, data: IProjectDir, liveSyncInfo: ILiveSyncInfo): void {
+	public async prepareForLiveSync(device: Mobile.IDevice, data: IProjectDir, liveSyncInfo: ILiveSyncInfo): Promise<void> {
 		if (!liveSyncInfo.skipWatcher) {
-			this.$iOSDebuggerPortService.attachToDebuggerPortFoundEvent(device, data);
+			return this.$iOSDebuggerPortService.attachToDebuggerPortFoundEvent(device, data);
 		}
 	}
 
diff --git a/lib/services/livesync/livesync-service.ts b/lib/services/livesync/livesync-service.ts
@@ -459,7 +459,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 				const platformLiveSyncService = this.getLiveSyncService(platform);
 				const deviceBuildInfoDescriptor = _.find(deviceDescriptors, dd => dd.identifier === device.deviceInfo.identifier);
 
-				platformLiveSyncService.prepareForLiveSync(device, projectData, liveSyncData);
+				await platformLiveSyncService.prepareForLiveSync(device, projectData, liveSyncData);
 
 				await this.ensureLatestAppPackageIsInstalledOnDevice({
 					device,
diff --git a/test/services/ios-debugger-port-service.ts b/test/services/ios-debugger-port-service.ts
@@ -148,7 +148,7 @@ describe("iOSDebuggerPortService", () => {
 
 		_.each(testCases, testCase => {
 			it(testCase.name, async () => {
-				iOSDebuggerPortService.attachToDebuggerPortFoundEvent(device, mockProjectDirObj);
+				await iOSDebuggerPortService.attachToDebuggerPortFoundEvent(device, mockProjectDirObj);
 				if (testCase.emitStartingIOSApplicationEvent) {
 					emitStartingIOSApplicationEvent();
 				}
@@ -162,7 +162,7 @@ describe("iOSDebuggerPortService", () => {
 				assert.deepEqual(port, testCase.emittedPort);
 			});
 			it(`${testCase.name} for multiline debugger port message.`, async () => {
-				iOSDebuggerPortService.attachToDebuggerPortFoundEvent(device, mockProjectDirObj);
+				await iOSDebuggerPortService.attachToDebuggerPortFoundEvent(device, mockProjectDirObj);
 				if (testCase.emitStartingIOSApplicationEvent) {
 					emitStartingIOSApplicationEvent();
 				}

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@ interface IIOSLogParserService extends NodeJS.EventEmitter {`
`3`	`3`	`* Starts looking for debugger port. Attaches on device logs and processes them. In case when port is found, DEBUGGER_PORT_FOUND event is emitted.`
`4`	`4`	`* @param {Mobile.IDevice} device - Describes the device which logs will be processed.`
`5`	`5`	`*/`
`6`		`- startParsingLog(device: Mobile.IDevice, data: IProjectName): void;`
	`6`	`+ startParsingLog(device: Mobile.IDevice, data: IProjectName): Promise<void>;`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ interface IPlatformLiveSyncService {`
`337`	`337`	`fullSync(syncInfo: IFullSyncInfo): Promise<ILiveSyncResultInfo>;`
`338`	`338`	`liveSyncWatchAction(device: Mobile.IDevice, liveSyncInfo: ILiveSyncWatchInfo): Promise<ILiveSyncResultInfo>;`
`339`	`339`	`refreshApplication(projectData: IProjectData, liveSyncInfo: ILiveSyncResultInfo): Promise<void>;`
`340`		`- prepareForLiveSync(device: Mobile.IDevice, data: IProjectDir, liveSyncInfo: ILiveSyncInfo): void;`
	`340`	`+ prepareForLiveSync(device: Mobile.IDevice, data: IProjectDir, liveSyncInfo: ILiveSyncInfo): Promise<void>;`
`341`	`341`	`}`
`342`	`342`
`343`	`343`	`interface INativeScriptDeviceLiveSyncService extends IDeviceLiveSyncServiceBase {`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ export class IOSDebugService extends DebugServiceBase implements IPlatformDebugS`
`63`	`63`	`await this.device.openDeviceLogStream();`
`64`	`64`	`}`
`65`	`65`
`66`		`- this.$iOSDebuggerPortService.attachToDebuggerPortFoundEvent(this.device, debugData);`
	`66`	`+ await this.$iOSDebuggerPortService.attachToDebuggerPortFoundEvent(this.device, debugData);`
`67`	`67`
`68`	`68`	`if (debugOptions.emulator) {`
`69`	`69`	`if (debugOptions.start) {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ export class IOSDebuggerPortService implements IIOSDebuggerPortService {`
`36`	`36`	`});`
`37`	`37`	`}`
`38`	`38`
`39`		`- public attachToDebuggerPortFoundEvent(device: Mobile.IDevice, data: IProjectDir): void {`
	`39`	`+ public async attachToDebuggerPortFoundEvent(device: Mobile.IDevice, data: IProjectDir): Promise<void> {`
`40`	`40`	`const projectData = this.$projectDataService.getProjectData(data && data.projectDir);`
`41`	`41`	`if (!this.canStartLookingForDebuggerPort(projectData)) {`
`42`	`42`	`return;`
`@@ -45,7 +45,7 @@ export class IOSDebuggerPortService implements IIOSDebuggerPortService {`
`45`	`45`	`this.attachToDebuggerPortFoundEventCore();`
`46`	`46`	`this.attachToAttachRequestEvent(device);`
`47`	`47`
`48`		`- this.$iOSLogParserService.startParsingLog(device, projectData);`
	`48`	`+ await this.$iOSLogParserService.startParsingLog(device, projectData);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`private canStartLookingForDebuggerPort(data: IProjectDir): boolean {`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@ export class IOSLogParserService extends EventEmitter implements IIOSLogParserSe`
`13`	`13`	`super();`
`14`	`14`	`}`
`15`	`15`
`16`		`- public startParsingLog(device: Mobile.IDevice, data: IProjectName): void {`
	`16`	`+ public async startParsingLog(device: Mobile.IDevice, data: IProjectName): Promise<void> {`
`17`	`17`	`this.$deviceLogProvider.setProjectNameForDevice(device.deviceInfo.identifier, data.projectName);`
`18`	`18`
`19`	`19`	`if (!this.startedDeviceLogInstances[device.deviceInfo.identifier]) {`
`20`	`20`	`this.startParsingLogCore(device);`
`21`		`- this.startLogProcess(device);`
	`21`	`+ await this.startLogProcess(device);`
`22`	`22`	`this.startedDeviceLogInstances[device.deviceInfo.identifier] = true;`
`23`	`23`	`}`
`24`	`24`	`}`
`@@ -41,7 +41,7 @@ export class IOSLogParserService extends EventEmitter implements IIOSLogParserSe`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- private startLogProcess(device: Mobile.IDevice): void {`
	`44`	`+ private async startLogProcess(device: Mobile.IDevice): Promise<void> {`
`45`	`45`	`if (device.isEmulator) {`
`46`	`46`	`return this.$iOSSimulatorLogProvider.startNewMutedLogProcess(device.deviceInfo.identifier);`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@ export class AndroidLiveSyncService extends PlatformLiveSyncServiceBase implemen`
`17`	`17`	`return service;`
`18`	`18`	`}`
`19`	`19`
`20`		`- public prepareForLiveSync(device: Mobile.IDevice, data: IProjectDir): void { /* */ }`
	`20`	`+ public async prepareForLiveSync(device: Mobile.IDevice, data: IProjectDir): Promise<void> { /* */ }`
`21`	`21`	`}`
`22`	`22`	`$injector.register("androidLiveSyncService", AndroidLiveSyncService);`
Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,9 @@ export class IOSLiveSyncService extends PlatformLiveSyncServiceBase implements I`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`		`- public prepareForLiveSync(device: Mobile.IDevice, data: IProjectDir, liveSyncInfo: ILiveSyncInfo): void {`
	`69`	`+ public async prepareForLiveSync(device: Mobile.IDevice, data: IProjectDir, liveSyncInfo: ILiveSyncInfo): Promise<void> {`
`70`	`70`	`if (!liveSyncInfo.skipWatcher) {`
`71`		`- this.$iOSDebuggerPortService.attachToDebuggerPortFoundEvent(device, data);`
	`71`	`+ return this.$iOSDebuggerPortService.attachToDebuggerPortFoundEvent(device, data);`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`