From ec19d725c4f9348a2dcf783b2a800e48fd4d6c7a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 13 Jun 2024 12:25:06 +0100 Subject: [PATCH] fix chant streaming --- .../Repositorys/chat/async/rooms/roomListChangeDetector.ts | 3 --- .../data-source/message/message-live-data-source.service.ts | 2 -- .../message/message-local-data-source.service.ts | 3 --- src/app/services/Repositorys/chat/infra/socket/socket.ts | 1 - .../chat/repository/message-respository.service.ts | 6 +++--- src/app/shared/popover/chat-popover/chat-popover.page.ts | 2 -- 6 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/app/services/Repositorys/chat/async/rooms/roomListChangeDetector.ts b/src/app/services/Repositorys/chat/async/rooms/roomListChangeDetector.ts index 563e6cd92..1786d3ebd 100644 --- a/src/app/services/Repositorys/chat/async/rooms/roomListChangeDetector.ts +++ b/src/app/services/Repositorys/chat/async/rooms/roomListChangeDetector.ts @@ -5,9 +5,6 @@ export function roomListDetermineChanges(serverRooms: RoomListItemOutPutDTO[], l const serverRoomMap = new Map(serverRooms.map(room => [room.id, room])); const localRoomMap = new Map(localRooms.map(room => [room.id, room])); - - console.log({serverRoomMap, localRoomMap}) - const roomsToInsert = serverRooms.filter(room => !localRoomMap.has(room.id)); const roomsToUpdate = serverRooms.filter(room => { const localRoom = localRoomMap.get(room.id); diff --git a/src/app/services/Repositorys/chat/data-source/message/message-live-data-source.service.ts b/src/app/services/Repositorys/chat/data-source/message/message-live-data-source.service.ts index 5810ec39d..1073ede2d 100644 --- a/src/app/services/Repositorys/chat/data-source/message/message-live-data-source.service.ts +++ b/src/app/services/Repositorys/chat/data-source/message/message-live-data-source.service.ts @@ -14,8 +14,6 @@ export class MessageLiveDataSourceService { const result = await this.socket.sendMessage(data).toPromise() - console.log({result}) - return ok(result) } catch (e) { return err(e) diff --git a/src/app/services/Repositorys/chat/data-source/message/message-local-data-source.service.ts b/src/app/services/Repositorys/chat/data-source/message/message-local-data-source.service.ts index 149c9b170..648369de6 100644 --- a/src/app/services/Repositorys/chat/data-source/message/message-local-data-source.service.ts +++ b/src/app/services/Repositorys/chat/data-source/message/message-local-data-source.service.ts @@ -49,7 +49,6 @@ export class MessageLocalDataSourceService { messageDataSource.message.hook('creating', (primKey, obj, trans) => { // const newMessage = await trans.table('message').get(primKey); - console.log(primKey, obj) this.messageSubject.next(obj); // return newMessage }) @@ -76,7 +75,6 @@ export class MessageLocalDataSourceService { const result = await messageDataSource.message.add(data) return ok(result as string) } catch (e) { - console.log('add error') return err(false) } @@ -114,7 +112,6 @@ export class MessageLocalDataSourceService { async findMessageById(messageId: string) { try { - console.log('messageId', messageId) const a = await messageDataSource.message.where('messageId').equals(messageId).first() if(a) { diff --git a/src/app/services/Repositorys/chat/infra/socket/socket.ts b/src/app/services/Repositorys/chat/infra/socket/socket.ts index c78926f03..2732847cf 100644 --- a/src/app/services/Repositorys/chat/infra/socket/socket.ts +++ b/src/app/services/Repositorys/chat/infra/socket/socket.ts @@ -42,7 +42,6 @@ export class WebSocketService { } - console.log({payload, requestId}) }) } diff --git a/src/app/services/Repositorys/chat/repository/message-respository.service.ts b/src/app/services/Repositorys/chat/repository/message-respository.service.ts index aef4eb8fa..f51562edd 100644 --- a/src/app/services/Repositorys/chat/repository/message-respository.service.ts +++ b/src/app/services/Repositorys/chat/repository/message-respository.service.ts @@ -30,11 +30,11 @@ export class MessageRepositoryService { try { if(clone.sender.wxUserId != SessionStore.user.UserId) { - console.log(this.messageLocalDataSourceService.createMessage(clone)) + this.messageLocalDataSourceService.createMessage(clone) } } catch (e) { - console.log('error', {payload}) + //console.log('error', {payload}) } } @@ -55,7 +55,7 @@ export class MessageRepositoryService { } const localActionResult = await this.messageLocalDataSourceService.sendMessage(data) - + this.messageLiveDataSourceService.sendMessage({ type: 'sendMessage', payload: data diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts index 3564e5379..afbd35a5e 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -39,8 +39,6 @@ export class ChatPopoverPage implements OnInit { this.members = this.navParams.get('members'); this.isAdmin = this.navParams.get('isAdmin'); - console.log(this.navParams.data) - } ngOnInit() {