Merge pull request #286 from zhangxichang/branch-1

zhangxichang · web-flow · commit f93d7af3c818 · 2026-03-26T06:10:59.000+08:00
refactor: 简化 Toaster API 并实现好友请求处理
diff --git a/schema.prisma b/schema.prisma
@@ -18,16 +18,16 @@ model user {
 }
 
 model friend {
-  id      String @id
-  user_id String
-  name    String
-  avatar  Bytes?
-  bio     String
+  id       String @id
+  owner_id String
+  name     String
+  avatar   Bytes?
+  bio      String
 }
 
-model message {
-  id        Int      @id @default(autoincrement())
-  sender_id String
-  timestamp DateTime @default(now())
+model chat_message {
+  timestamp    DateTime @id @default(now())
+  owner_id     String
+  chat_user_id String
   content      String
 }
diff --git a/src/app.tsx b/src/app.tsx
@@ -20,7 +20,7 @@ if (import.meta.env.TAURI_ENV_PLATFORM !== undefined) {
     log_error(error);
     void createTauRPCProxy().log.error(error.message);
   };
-  window.onunhandledrejection = (e) => {
+  onunhandledrejection = (e) => {
     e.preventDefault();
     console.error(e.reason);
   };
diff --git a/src/components/modal/add_friend.tsx b/src/components/modal/add_friend.tsx
@@ -76,20 +76,14 @@ export default function AddFriend() {
                         home_store.endpoint.request_friend(v().id),
                       )();
                       if (err) {
-                        shell_store.toaster.popup("error", err.message);
+                        shell_store.toaster.popup(err.message);
                       } else {
                         // TODO 处理好友添加
                         if (agree) {
-                          shell_store.toaster.popup(
-                            "success",
-                            "对方同意好友请求",
-                          );
+                          shell_store.toaster.popup("对方同意好友请求");
                           console.info(v());
                         } else {
-                          shell_store.toaster.popup(
-                            "error",
-                            "对方拒绝好友请求",
-                          );
+                          shell_store.toaster.popup("对方拒绝好友请求");
                         }
                       }
                       set_send_friend_request_button_disabled(false);
diff --git a/src/components/modal/setting.tsx b/src/components/modal/setting.tsx
@@ -8,7 +8,10 @@ export default function Setting() {
       <button
         class="btn"
         onClick={() => {
-          shell_store.toaster.popup("success", "你好，世界");
+          const close = shell_store.toaster.popup("你好，世界");
+          setTimeout(() => {
+            close();
+          }, 3000);
         }}
       >
         测试按钮
diff --git a/src/components/ui/chat_bar.tsx b/src/components/ui/chat_bar.tsx
@@ -12,15 +12,17 @@ export default function ChatBar(props: { chat_user: User }) {
   const shell_store = use_context(ShellContext);
   const main_store = use_context(MainContext);
   const [user] = shell_store.user;
-  const messages = createAsync(
-    async () =>
-      await main_store.sqlite.query<Message>(
-        QueryBuilder.selectFrom("message")
-          .select(["sender_id", "timestamp", "content"])
-          .where("sender_id", "=", props.chat_user.id)
-          .compile(),
-      ),
-  );
+  const messages = createAsync(async () => {
+    const u = user();
+    if (!u) throw new Error("用户不存在");
+    return await main_store.sqlite.query<Message>(
+      QueryBuilder.selectFrom("chat_message")
+        .select(["chat_user_id", "timestamp", "content"])
+        .where("owner_id", "=", u.id)
+        .where("chat_user_id", "=", props.chat_user.id)
+        .compile(),
+    );
+  });
   let message_list_ref: HTMLDivElement | undefined;
   const message_list_virtualizer = createVirtualizer({
     getScrollElement: () => message_list_ref ?? null,
diff --git a/src/components/ui/friend_list.tsx b/src/components/ui/friend_list.tsx
@@ -22,7 +22,7 @@ export default function FriendList(props: {
       await main_store.sqlite.query<User>(
         QueryBuilder.selectFrom("friend")
           .select(["id", "name", "avatar", "bio"])
-          .where("user_id", "=", params.user_id)
+          .where("owner_id", "=", params.user_id)
           .compile(),
       ),
   );
diff --git a/src/lib/endpoint/native.ts b/src/lib/endpoint/native.ts
@@ -25,7 +25,7 @@ export class EndpointModuleImpl implements EndpointModule {
 }
 
 export class EndpointImpl implements Endpoint {
-  private handle: bigint;
+  private handle;
 
   private constructor(handle: bigint) {
     this.handle = handle;
diff --git a/src/lib/endpoint/web.ts b/src/lib/endpoint/web.ts
@@ -28,7 +28,7 @@ export class EndpointModuleImpl implements EndpointModule {
 }
 
 export class EndpointImpl implements Endpoint {
-  private endpoint: WasmEndpoint;
+  private endpoint;
 
   private constructor(endpoint: WasmEndpoint) {
     this.endpoint = endpoint;
diff --git a/src/lib/sqlite/native.ts b/src/lib/sqlite/native.ts
@@ -12,8 +12,8 @@ export class SQLiteModuleImpl implements SQLiteModule {
 }
 
 export class SQLiteImpl implements SQLite {
-  private handle: bigint;
-  private on_updates: ((event: SQLiteUpdateEvent) => void)[];
+  private handle;
+  private on_updates;
 
   private constructor(
     handle: bigint,
diff --git a/src/lib/sqlite/web.ts b/src/lib/sqlite/web.ts
@@ -30,9 +30,9 @@ export class SQLiteModuleImpl implements SQLiteModule {
 }
 
 export class SQLiteImpl implements SQLite {
-  private api: Remote<SQLiteWorker>;
-  private id: number;
-  private on_updates: ((event: SQLiteUpdateEvent) => void)[];
+  private api;
+  private id;
+  private on_updates;
 
   private constructor(
     api: Remote<SQLiteWorker>,
diff --git a/src/lib/toaster.ts b/src/lib/toaster.ts
@@ -1,55 +1,25 @@
-import { createStore, produce } from "solid-js/store";
+import { createSignal } from "solid-js";
 import { uid } from "radash";
 import type { JSX } from "solid-js";
 
-const DEFAULT_DURATION = {
-  info: 3000,
-  success: 2000,
-  warning: 4000,
-  error: 5000,
-};
-
-export type ToastLevel = "info" | "success" | "warning" | "error";
-export type Toast = {
-  id: string;
-  level: ToastLevel;
-  content: JSX.Element;
-};
-
 export class Toaster {
-  items;
-  private set_items;
-  private timeouts = new Map<string, number>();
+  toasts;
+  private set_toasts;
 
   constructor() {
-    [this.items, this.set_items] = createStore<Toast[]>([]);
+    [this.toasts, this.set_toasts] = createSignal<Map<string, JSX.Element>>(
+      new Map(),
+    );
   }
-  popup(
-    level: ToastLevel,
-    content: JSX.Element,
-    duration = DEFAULT_DURATION[level],
-  ) {
+  popup(content: JSX.Element) {
     const id = uid(8);
-    this.set_items(produce((draft) => draft.push({ id, level, content })));
-    if (duration > 0) {
-      this.timeouts.set(
-        id,
-        window.setTimeout(() => this.remove(id), duration),
-      );
-    }
-    return () => this.remove(id);
-  }
-  private remove(id: string) {
-    const timeout = this.timeouts.get(id);
-    if (timeout !== undefined) {
-      window.clearTimeout(timeout);
-      this.timeouts.delete(id);
-    }
-    this.set_items(
-      produce((draft) => {
-        const idx = draft.findIndex((t) => t.id === id);
-        if (idx !== -1) draft.splice(idx, 1);
-      }),
-    );
+    this.set_toasts((v) => new Map(v).set(id, content));
+    return () => {
+      this.set_toasts((v) => {
+        const a = new Map(v);
+        a.delete(id);
+        return a;
+      });
+    };
   }
 }
diff --git a/src/shell.tsx b/src/shell.tsx
@@ -5,7 +5,6 @@ import { ShellContext } from "./components/context";
 import MenuBar from "./components/ui/menu_bar";
 import Loading from "./components/widgets/loading";
 import Error from "./components/widgets/error";
-import { twMerge } from "tailwind-merge";
 
 export function Shell(props: RouteSectionProps) {
   const store = ShellStore.new();
@@ -23,20 +22,8 @@ export function Shell(props: RouteSectionProps) {
           </ErrorBoundary>
         </div>
         <div class="toast">
-          <For each={store.toaster.items}>
-            {(v) => {
-              const level_style = {
-                info: "alert-info",
-                success: "alert-success",
-                warning: "alert-warning",
-                error: "alert-error",
-              }[v.level];
-              return (
-                <div class={`${twMerge("alert", level_style)}`}>
-                  {v.content}
-                </div>
-              );
-            }}
+          <For each={store.toaster.toasts().values().toArray()}>
+            {(v) => <div class="alert">{v}</div>}
           </For>
         </div>
       </div>
diff --git a/src/stores/home.ts b/src/stores/home.ts
@@ -6,8 +6,8 @@ import type { ShellStore } from "./shell";
 import type { Setter } from "solid-js";
 
 export class HomeStore {
-  endpoint: Endpoint;
-  set_user: Setter<User | undefined>;
+  endpoint;
+  set_user;
 
   private constructor(endpoint: Endpoint, set_user: Setter<User | undefined>) {
     this.endpoint = endpoint;
@@ -38,7 +38,34 @@ export class HomeStore {
       person,
       [],
     );
-    // TODO 处理好友请求
+    void (async () => {
+      const event_type = await endpoint.person_protocol_next_event();
+      if (event_type === "FriendRequest") {
+        const remote_id =
+          await endpoint.person_protocol_event<string>("remote_id");
+        const result = await main_store.sqlite.query(
+          QueryBuilder.selectFrom("friend")
+            .select((eb) => eb.val(1).as("exists"))
+            .where("owner_id", "=", user_id)
+            .where("id", "=", remote_id)
+            .limit(1)
+            .compile(),
+        );
+        if (result.length !== 0) {
+          await endpoint.person_protocol_event("reject");
+        } else {
+          // TODO 好友请求通知
+          const person = await endpoint.request_person(remote_id);
+          shell_store.toaster.popup("添加好友");
+          await endpoint.person_protocol_event("accept");
+          await main_store.sqlite.execute(
+            QueryBuilder.insertInto("friend")
+              .values({ id: remote_id, owner_id: user_id, ...person })
+              .compile(),
+          );
+        }
+      }
+    })();
     const [, set_user] = shell_store.user;
     set_user({ id: user_id, ...person });
     return new HomeStore(endpoint, set_user);
diff --git a/src/stores/main.ts b/src/stores/main.ts
@@ -4,9 +4,9 @@ import { SQLiteModuleAdapter } from "~/lib/sqlite";
 import type { SQLite, SQLiteModule } from "~/lib/sqlite/interface";
 
 export class MainStore {
-  sqlite_module: SQLiteModule;
-  endpoint_module: EndpointModule;
-  sqlite: SQLite;
+  sqlite_module;
+  endpoint_module;
+  sqlite;
 
   private constructor(
     sqlite_module: SQLiteModule,
diff --git a/src/stores/shell.ts b/src/stores/shell.ts
@@ -1,14 +1,14 @@
-import { createSignal, type Signal } from "solid-js";
+import { createSignal } from "solid-js";
 import type { User } from "~/lib/endpoint/types";
 import { Toaster } from "~/lib/toaster";
 
 export class ShellStore {
-  toaster: Toaster;
-  user: Signal<User | undefined>;
+  toaster;
+  user;
 
   private constructor() {
     this.toaster = new Toaster();
-    this.user = createSignal();
+    this.user = createSignal<User>();
   }
   static new() {
     return new ShellStore();

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ export class EndpointModuleImpl implements EndpointModule {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`export class EndpointImpl implements Endpoint {`
`28`		`- private handle: bigint;`
	`28`	`+ private handle;`
`29`	`29`
`30`	`30`	`private constructor(handle: bigint) {`
`31`	`31`	`this.handle = handle;`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ export class EndpointModuleImpl implements EndpointModule {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`export class EndpointImpl implements Endpoint {`
`31`		`- private endpoint: WasmEndpoint;`
	`31`	`+ private endpoint;`
`32`	`32`
`33`	`33`	`private constructor(endpoint: WasmEndpoint) {`
`34`	`34`	`this.endpoint = endpoint;`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ export class SQLiteModuleImpl implements SQLiteModule {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`export class SQLiteImpl implements SQLite {`
`15`		`- private handle: bigint;`
`16`		`- private on_updates: ((event: SQLiteUpdateEvent) => void)[];`
	`15`	`+ private handle;`
	`16`	`+ private on_updates;`
`17`	`17`
`18`	`18`	`private constructor(`
`19`	`19`	`handle: bigint,`