chore: updates

src/app/services/message.ts

@@ -1,5 +1,4 @@
 import { createApi } from "@reduxjs/toolkit/query/react";
-import { unescape } from "lodash";
 
 import { ChatContext } from "@/types/common";
 import { ChatMessage, ContentTypeKey, UploadFileResponse } from "@/types/message";

src/components/ChannelModal/index.tsx

@@ -52,7 +52,7 @@ const ChannelModal: FC<Props> = ({ personal = false, closeModal }) => {
       return;
     }
     if (data.is_public) {
-      // 公共频道 不必有members
+      // 公共频道 不必有 members
       delete data.members;
     }
     createChannel(data);
@@ -90,7 +90,9 @@ const ChannelModal: FC<Props> = ({ personal = false, closeModal }) => {
     const members = data.members ?? [];
     const { uid } = currentTarget.dataset;
     const uidNum = Number(uid);
-    let tmp = members.includes(uidNum) ? members.filter((m) => m != uidNum) : [...members, uidNum];
+    const tmp = members.includes(uidNum)
+      ? members.filter((m) => m != uidNum)
+      : [...members, uidNum];
     setData((prev) => ({ ...prev, members: tmp }));
   };
 

src/components/MessageInput/index.tsx

@@ -75,7 +75,7 @@ export default function MessageInput({
   }, [id]);
   const items: MentionData[] = members.map((uid) => ({
     key: `${uid}`,
-    text: userData[uid].name,
+    text: userData[uid]?.name || "",
     data: {
       uid
     }

src/components/RequireNoAuth.tsx

@@ -1,10 +1,9 @@
-import { FC, ReactElement, useEffect } from "react";
+import { FC, ReactElement } from "react";
 import { Navigate } from "react-router-dom";
 
 import { useGetInitializedQuery } from "@/app/services/auth";
 import { useAppSelector } from "@/app/store";
 import { shallowEqual } from "react-redux";
-import useStreaming from "@/hooks/useStreaming";
 
 interface Props {
   children: ReactElement;
@@ -12,17 +11,8 @@ interface Props {
 }
 
 const RequireNoAuth: FC<Props> = ({ children, redirectTo = "/" }) => {
-  // const {pathname} =useLocation()
-  const { stopStreaming } = useStreaming();
   const { isLoading } = useGetInitializedQuery();
   const { token, initialized, guest } = useAppSelector((store) => store.authData, shallowEqual);
-  // 停掉 sse
-  useEffect(() => {
-    console.log("start stop from require no auth");
-    // if()
-    stopStreaming();
-  }, []);
-
   if (isLoading) return null;
   //  未初始化 则先走 setup 流程
   if (!initialized) return <Navigate to={`/onboarding`} replace />;

src/hooks/useStreaming/index.ts

@@ -86,12 +86,12 @@ export default function useStreaming() {
     console.info("debug SSE: start new timeout", aliveInter);
   };
   const startStreaming = useCallback(async () => {
-    // stop first
-    stopStreaming();
-    // if (SSE && (SSE.readyState === EventSource.OPEN || SSE.readyState === EventSource.CONNECTING)) {
-    //   console.info("debug SSE: SSE not disconnect");
-    //   return;
-    // }
+    console.info("debug SSE: clear timeout at startStreaming", aliveInter);
+    clearTimeout(aliveInter);
+    if (SSE && (SSE.readyState === EventSource.OPEN || SSE.readyState === EventSource.CONNECTING)) {
+      console.info("debug SSE: SSE not disconnect");
+      return;
+    }
     const { token, refreshToken, expireTime } = getLocalAuthData();
     //  token 非空
     if (!token) {
@@ -105,10 +105,10 @@ export default function useStreaming() {
       if ("error" in resp) {
         console.error("renew error from sse", resp.error);
         // 还有网，而且在当前页，则停止循环
-        // const tabHidden = isTabHidden();
-        // if (navigator.onLine || !tabHidden) {
-        //   stopStreaming();
-        // }
+        const tabHidden = isTabHidden();
+        if (navigator.onLine || !tabHidden) {
+          stopStreaming();
+        }
         // 返回，开始下次 polling（如果有）
         return;
       } else {
@@ -183,7 +183,7 @@ export default function useStreaming() {
           dispatch(setReady(true));
           setTimeout(() => {
             toast.dismiss();
-          }, 1000);
+          }, 2000);
           break;
         case "server_config_changed": {
           const { type, ...rest } = data;
@@ -432,6 +432,7 @@ export default function useStreaming() {
   };
   useEffect(() => {
     const handleNetworkChange = () => {
+      if (!user || guest) return;
       console.info("debug SSE: network changed", navigator.onLine);
       if (navigator.onLine) {
         startStreaming();
@@ -440,6 +441,7 @@ export default function useStreaming() {
       }
     };
     const handleWindowVisibilityChange = () => {
+      if (!user || guest) return;
       // bug in electron webview: https://github.com/electron/electron/issues/28677
       console.info("debug SSE: visibility changed", isTabHidden());
       const tabHidden = isTabHidden();
@@ -449,18 +451,15 @@ export default function useStreaming() {
       } else {
         const elapsedTime = (new Date().getTime() - hiddenTime) / 1000;
         // 大于 1 天
-        // const timeSpan = 60;
         const timeSpan = 24 * 60 * 60;
         // const timeSpan = 5;
-        const canReconnect = !guest && (elapsedTime > timeSpan || !SSE);
-        // const canReconnect = (elapsedTime > timeSpan || !SSE) && pathname !== "/login";
+        const canReconnect = elapsedTime > timeSpan || !SSE;
         console.info(
           "debug SSE: visibility changed elapsedTime",
           elapsedTime,
           hiddenTime,
           canReconnect,
-          !SSE,
-          guest
+          !SSE
         );
         // 超过 1 天或者已断线，强制重连
         if (canReconnect) {
@@ -476,7 +475,6 @@ export default function useStreaming() {
             }, 1500);
           } else {
             // 直接重连
-            console.info("debug SSE: stop directly and reconnect");
             startStreaming();
           }
         }
@@ -490,7 +488,7 @@ export default function useStreaming() {
       window.removeEventListener("offline", handleNetworkChange);
       document.removeEventListener("visibilitychange", handleWindowVisibilityChange);
     };
-  }, []);
+  }, [user, guest]);
 
   return {
     startStreaming,

src/routes/invitePrivate/index.tsx

@@ -32,6 +32,7 @@ const InvitePrivate = () => {
     if (data && isSuccess) {
       //  joinChannel(data)
       navigateTo(`/chat/channel/${data.gid}`);
+      location.reload();
     }
   }, [isSuccess, data]);
   const handleJoin = async () => {