Fixed bug with messages not saving

seed-ecosystem · Nov 30, 2024 · cb92b90 · cb92b90
1 parent 2aafd38
commit cb92b90
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 14 deletions.
diff --git a/src/components/chat/ChatDependencies.ts b/src/components/chat/ChatDependencies.ts
@@ -22,6 +22,8 @@ import {handleSocketEventsUsecase} from "@/usecase/chat/socket-event-usecase/han
 import {createSendMessageUsecase} from "@/usecase/chat/send-message/send-message-usecase.ts";
 import {messagesHistoryUsecase} from "@/usecase/chat/messages-history-usecase/messages-history-usecase.ts";
 import {OptionPredicator} from "typia/lib/programmers/helpers/OptionPredicator";
+import {useCallback} from "react";
+import {saveMessageUsecase} from "@/usecase/chat/save-message-usecase/save-messaga-usecase.ts";
 
 export interface ChatDependencies {
   chat: Chat;
@@ -83,10 +85,17 @@ export function createChatDependencies(
   });
   socketEventUsecase();
 
-  const messageHistoryUsecase = messagesHistoryUsecase({
+  const messagesHistory = messagesHistoryUsecase({
     chat, events, getNickname, messagesStorage: persistence.message
   });
-  messageHistoryUsecase();
+  messagesHistory();
+
+  const saveMessage = saveMessageUsecase({
+    events: events,
+    getMessageKey: getMessageKey,
+    messageStorage: persistence.message
+  });
+  saveMessage();
 
   return {
     events, sendMessage: sendTextMessage,

diff --git a/src/persistence/message/create-message-storage.ts b/src/persistence/message/create-message-storage.ts
@@ -15,7 +15,7 @@ export function createMessageStorage(db: IDBPDatabase): MessageStorage {
       const cursor = await db.transaction("message")
         .objectStore("message")
         .index("chatId")
-        .openCursor(IDBKeyRange.only(chat.chatId), "prev");
+        .openCursor(IDBKeyRange.only(chat.chatId));
 
       if (!cursor) return;
 

diff --git a/src/usecase/chat/event-bus/event-bus.ts b/src/usecase/chat/event-bus/event-bus.ts
@@ -1,8 +1,13 @@
 
 import {Flow} from "@/coroutines/flow.ts";
 import {Message} from "@/usecase/chat/message/message.ts";
+import {Chat} from "@/persistence/chat/chat.ts";
 
 export type ChatEvent = {
+  type: "save";
+  chat: Chat;
+  message: Message & { nonce: { server: number } };
+} | {
   type: "history";
   message: Message;
 } | {

diff --git a/src/usecase/chat/save-message-usecase/save-messaga-usecase.ts b/src/usecase/chat/save-message-usecase/save-messaga-usecase.ts
@@ -0,0 +1,34 @@
+import {EventBus} from "@/usecase/chat/event-bus/event-bus.ts";
+import {MessageStorage} from "@/persistence/message/message-storage.ts";
+import {GetMessageKeyUsecase} from "@/usecase/chat/get-message-key-usecase/get-message-key-usecase.ts";
+import {launch} from "@/coroutines/launch.ts";
+
+export interface SaveMessageUsecase {
+  (): void;
+}
+
+export function saveMessageUsecase(
+  {events, messageStorage, getMessageKey}: {
+    events: EventBus,
+    messageStorage: MessageStorage,
+    getMessageKey: GetMessageKeyUsecase
+  }
+): SaveMessageUsecase {
+  return () => {
+    events.flow.collect((event) => launch(async () => {
+      if (event.type != "save") return;
+
+      const key = await getMessageKey(event.message.nonce.server);
+      if (!key) return;
+
+      const message = event.message;
+
+      await messageStorage.add({
+        ...message,
+        chatId: event.chat.chatId,
+        nonce: event.message.nonce.server,
+        key: key
+      });
+    }));
+  }
+}
diff --git a/src/usecase/chat/send-message/send-message-usecase.ts b/src/usecase/chat/send-message/send-message-usecase.ts
@@ -99,15 +99,18 @@ export function createSendMessageUsecase(
       const response: SendMessageResponse = await socket.execute(request);
 
       if (response.status) {
+        const event: Message & { nonce: { server: number } } = {
+          ...message,
+          isSending: false,
+          nonce: { server: nonce },
+        };
+
         events.emit({
           type: "edit",
           nonce: message.nonce,
-          message: {
-            ...message,
-            isSending: false,
-            nonce: { server: nonce },
-          }
+          message: event
         });
+
         return;
       }
 

diff --git a/src/usecase/chat/socket-event-usecase/handle-socket-events-usecase.ts b/src/usecase/chat/socket-event-usecase/handle-socket-events-usecase.ts
@@ -23,18 +23,21 @@ export function handleSocketEventsUsecase(
       if (event.type == "new") {
         const message = await decodeMessage(event.message);
 
+        events.emit({
+          type: "save",
+          chat: event.message,
+          message: {
+            ...message,
+            nonce: { server: event.message.nonce }
+          }
+        });
+
         // skip doubling of self-messages
         for (const current of messagesSnapshot()) {
           if ("server" in current.nonce && current.nonce.server == message.nonce.server) {
             return;
           }
         }
-        await messagesStorage.add({
-          ...message,
-          chatId: event.message.chatId,
-          nonce: event.message.nonce,
-          key: message.key
-        });
 
         events.emit({
           type: "new",