From eaad37f877a72caf8a5df4e3a3b22702eb45d2c4 Mon Sep 17 00:00:00 2001 From: Louis Date: Thu, 18 Jul 2024 20:30:13 +0700 Subject: [PATCH] fix: download model wrong event mits --- .../controllers/events.controller.ts | 15 +++------------ .../download-manager/download-manager.service.ts | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/cortex-js/src/infrastructure/controllers/events.controller.ts b/cortex-js/src/infrastructure/controllers/events.controller.ts index cf166ec8b..0cd3ec4ee 100644 --- a/cortex-js/src/infrastructure/controllers/events.controller.ts +++ b/cortex-js/src/infrastructure/controllers/events.controller.ts @@ -16,6 +16,7 @@ import { EventEmitter2 } from '@nestjs/event-emitter'; import { ApiOperation, ApiTags } from '@nestjs/swagger'; import { Observable, + asyncScheduler, catchError, combineLatest, from, @@ -50,25 +51,15 @@ export class EventsController { const latestDownloadState$: Observable = of({ data: this.downloadManagerService.getDownloadStates(), }); - - const downloadAbortEvent$ = fromEvent( - this.eventEmitter, - 'download.event.aborted', - ).pipe(map((downloadState) => ({ data: downloadState }))); - const downloadEvent$ = fromEvent( this.eventEmitter, 'download.event', ).pipe( map((downloadState) => ({ data: downloadState })), - throttleTime(1000, undefined, { leading: true, trailing: true }), + throttleTime(1000, asyncScheduler, { trailing: true }), ); - return merge( - latestDownloadState$, - downloadEvent$, - downloadAbortEvent$, - ).pipe(); + return merge(latestDownloadState$, downloadEvent$).pipe(); } @ApiOperation({ diff --git a/cortex-js/src/infrastructure/services/download-manager/download-manager.service.ts b/cortex-js/src/infrastructure/services/download-manager/download-manager.service.ts index 3c018ab77..7bec962c3 100644 --- a/cortex-js/src/infrastructure/services/download-manager/download-manager.service.ts +++ b/cortex-js/src/infrastructure/services/download-manager/download-manager.service.ts @@ -34,7 +34,7 @@ export class DownloadManagerService { this.allDownloadStates = this.allDownloadStates.filter( (downloadState) => downloadState.id !== downloadId, ); - this.eventEmitter.emit('download.event.aborted', this.allDownloadStates); + this.eventEmitter.emit('download.event', this.allDownloadStates); } async submitDownloadRequest(