From e1a436b35d3e58e8ae0bea94b78b7fbf9f5a013c Mon Sep 17 00:00:00 2001 From: fatme Date: Tue, 3 Jul 2018 15:20:12 +0300 Subject: [PATCH] Fix console.log regression after introducing ios-sim async api --- lib/common | 2 +- lib/definitions/ios-debugger-port-service.d.ts | 4 ++-- lib/definitions/ios-log-parser-service.d.ts | 2 +- lib/definitions/livesync.d.ts | 2 +- lib/services/ios-debug-service.ts | 2 +- lib/services/ios-debugger-port-service.ts | 4 ++-- lib/services/ios-log-parser-service.ts | 6 +++--- lib/services/livesync/android-livesync-service.ts | 2 +- lib/services/livesync/ios-livesync-service.ts | 4 ++-- lib/services/livesync/livesync-service.ts | 2 +- test/services/ios-debugger-port-service.ts | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/common b/lib/common index bec6a251c7..2bdc7a2b87 160000 --- 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 index a81391e8fd..f4fecdfcea 100644 --- 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} */ - attachToDebuggerPortFoundEvent(device: Mobile.IDevice, data: IProjectDir): void; + attachToDebuggerPortFoundEvent(device: Mobile.IDevice, data: IProjectDir): Promise; } \ No newline at end of file diff --git a/lib/definitions/ios-log-parser-service.d.ts b/lib/definitions/ios-log-parser-service.d.ts index 72b86615be..dcc3391e8e 100644 --- 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; } diff --git a/lib/definitions/livesync.d.ts b/lib/definitions/livesync.d.ts index c91e0a9c93..c4a21e6106 100644 --- a/lib/definitions/livesync.d.ts +++ b/lib/definitions/livesync.d.ts @@ -337,7 +337,7 @@ interface IPlatformLiveSyncService { fullSync(syncInfo: IFullSyncInfo): Promise; liveSyncWatchAction(device: Mobile.IDevice, liveSyncInfo: ILiveSyncWatchInfo): Promise; refreshApplication(projectData: IProjectData, liveSyncInfo: ILiveSyncResultInfo): Promise; - prepareForLiveSync(device: Mobile.IDevice, data: IProjectDir, liveSyncInfo: ILiveSyncInfo): void; + prepareForLiveSync(device: Mobile.IDevice, data: IProjectDir, liveSyncInfo: ILiveSyncInfo): Promise; } interface INativeScriptDeviceLiveSyncService extends IDeviceLiveSyncServiceBase { diff --git a/lib/services/ios-debug-service.ts b/lib/services/ios-debug-service.ts index eb701d3145..401e2f6507 100644 --- 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 index 09cd825142..ed6c574be6 100644 --- 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 { 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 index dad99d6904..c1e95287ee 100644 --- 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 { 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 { 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 index b069088f91..ec33162b2c 100644 --- 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 { /* */ } } $injector.register("androidLiveSyncService", AndroidLiveSyncService); diff --git a/lib/services/livesync/ios-livesync-service.ts b/lib/services/livesync/ios-livesync-service.ts index d253bb1d3e..3e902407d8 100644 --- 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 { 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 index 6cae05e247..9228fbe621 100644 --- 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 index 72b0e502b4..3dd8fd2a3f 100644 --- 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(); }