fix types and some flaws

Author: aster-void

common/types.ts

@@ -40,6 +40,7 @@ export type {
 export type SSEChatEvents = {
   "Chat:Append": {
     message: Message;
+    sender: string; // user name
   };
   "Chat:Update": {
     id: number;
@@ -50,3 +51,8 @@ export type SSEChatEvents = {
   };
   "Chat:Ping": "";
 };
+export type SSEChatEventEnum = "Chat:Append" | "Chat:Update" | "Chat:Delete";
+export type SSEChatEvent<T extends SSEChatEventEnum> = {
+  event: T;
+  data: SSEChatEvents[T];
+};

server/src/functions/chat.ts

@@ -8,6 +8,7 @@ import type {
   SendMessage,
   ShareRoomID,
 } from "common/types";
+import { HTTPException } from "hono/http-exception";
 import * as db from "../database/chat";
 import { areAllMatched, getRelation } from "../database/matches";
 import { getUserByID } from "../database/users";
@@ -37,12 +38,13 @@ export async function sendDM(
   from: UserID,
   to: UserID,
   send: SendMessage,
-): Promise<http.Response<Message>> {
+): Promise<Message> {
   const rel = await getRelation(from, to);
   if (rel.status === "REJECTED")
-    return http.forbidden(
-      "You cannot send a message because the friendship request was rejected.",
-    );
+    throw new HTTPException(403, {
+      message:
+        "You cannot send a message because the friendship request was rejected.",
+    });
 
   // they are now MATCHED
   const msg: Omit<Omit<Message, "id">, "isPicture"> = {
@@ -53,8 +55,9 @@ export async function sendDM(
   };
 
   const result = await db.sendDM(rel.id, msg);
-  if (!result) return http.internalError("Failed to send DM");
-  return http.created(result);
+  if (!result)
+    throw new HTTPException(500, { message: "Failed to send message" });
+  return result;
 }
 
 export async function getDM(

server/src/router/chat.ts

@@ -7,8 +7,10 @@ import {
   SharedRoomSchema,
 } from "common/zod/schemas";
 import { Hono } from "hono";
+import { HTTPException } from "hono/http-exception";
 import { z } from "zod";
 import * as db from "../database/chat";
+import { prisma } from "../database/client";
 import { getUserId } from "../firebase/auth/db";
 import * as core from "../functions/chat";
 import { json, param } from "../lib/validator";
@@ -28,14 +30,23 @@ const router = new Hono()
     const friend = c.req.valid("param").userid;
     const send = c.req.valid("json");
     const result = await core.sendDM(user, friend, send);
-    if (result.ok) {
-      sse.send(friend, {
-        event: "Chat:Append",
-        data: { message: result.body },
-      });
-    }
-    c.status(result.code);
-    return c.json(result.body);
+    const senderName = await prisma.user.findUnique({
+      where: {
+        id: user,
+      },
+      select: {
+        name: true,
+      },
+    });
+    if (!senderName)
+      throw new HTTPException(500, { message: "sender not found???" });
+
+    sse.send(friend, {
+      event: "Chat:Append",
+      data: { message: result, sender: senderName?.name },
+    });
+    c.status(201);
+    return c.json(result);
   })
 
   // GET a DM Room with userId, CREATE one if not found.

server/src/router/sse.ts

@@ -1,15 +1,10 @@
-import type { SSEChatEvents, UserID } from "common/types";
+import type { SSEChatEvent, SSEChatEventEnum, UserID } from "common/types";
 import { Hono } from "hono";
 import { HTTPException } from "hono/http-exception";
 import { streamSSE } from "hono/streaming";
 import { getUserIdFromToken } from "../firebase/auth/db";
 
 export const sseChatPath = (id: UserID) => `sse:chat:${id}`;
-type SSEChatEventEnum = "Chat:Append" | "Chat:Update" | "Chat:Delete";
-type SSEChatEvent<T extends SSEChatEventEnum> = {
-  event: T;
-  data: SSEChatEvents[T];
-};
 export function send<T extends SSEChatEventEnum>(
   to: UserID,
   event: SSEChatEvent<T>,

web/components/data/socket.tsx

@@ -24,15 +24,13 @@ async function main({ signal }: { signal: AbortSignal }) {
 
   sse.addEventListener(
     "Chat:Append",
-    async (ev) => {
+    (ev) => {
       console.log(ev);
       const data = JSON.parse(ev.data) as SSEChatEvents["Chat:Append"];
       const msg = data.message;
       // if it exists and caught the create sig
       if (handlers.onCreate?.(msg)) return;
-      const creator = await user.get(msg.creator);
-      if (!creator) return;
-      enqueueSnackbar(`${creator.name}さんからのメッセージ : ${msg.content}`, {
+      enqueueSnackbar(`${data.sender}さんからのメッセージ : ${msg.content}`, {
         variant: "info",
       });
     },