fix: logout sometimes

src/common/hook/useStreaming/index.ts

@@ -1,10 +1,8 @@
 import { useEffect, useState } from "react";
 import { fetchEventSource, EventStreamContentType } from "@microsoft/fetch-event-source";
 import toast from "react-hot-toast";
-import dayjs from "dayjs";
 import BASE_URL from "../../../app/config";
 import { setReady } from "../../../app/slices/ui";
-import { useRenewMutation } from "../../../app/services/auth";
 import {
   fillChannels,
   addChannel,
@@ -46,7 +44,6 @@ export default function useStreaming() {
     ui: { ready, online },
     footprint: { afterMid, usersVersion, readUsers, readChannels }
   } = useAppSelector((store) => store);
-  const [renewToken] = useRenewMutation();
   const dispatch = useAppDispatch();
   const loginUid = authData.user?.uid || 0;
   let initialized = false;
@@ -58,26 +55,14 @@ export default function useStreaming() {
     if (initialized || initializing) return;
     // 如果token快要过期，先renew
     const {
-      authData: { token = "", expireTime = +new Date(), refreshToken }
+      authData: { token = "" }
     } = store.getState();
-    let api_token = token;
-    const tokenAlmostExpire = dayjs().isAfter(new Date(expireTime - 20 * 1000));
-    if (tokenAlmostExpire && refreshToken && token) {
-      const resp = await renewToken({
-        token,
-        refresh_token: refreshToken
-      });
-      if ("error" in resp) return;
-      if ("data" in resp) {
-        api_token = resp.data.token;
-      }
-    }
 
     // 开始初始化
     initializing = true;
     await fetchEventSource(
       `${BASE_URL}/user/events?${getQueryString({
-        "api-key": api_token,
+        "api-key": token,
         users_version: `${usersVersion}`,
         after_mid: `${afterMid}`
       })}`,

src/routes/home/usePreload.ts

@@ -1,4 +1,5 @@
 import { useEffect } from "react";
+import dayjs from "dayjs";
 import initCache, { useRehydrate } from "../../app/cache";
 import { useLazyGetFavoritesQuery } from "../../app/services/message";
 import { useLazyGetUsersQuery } from "../../app/services/user";
@@ -7,8 +8,16 @@ import useStreaming from "../../common/hook/useStreaming";
 import { useAppSelector } from "../../app/store";
 export default function usePreload() {
   const { rehydrate, rehydrated } = useRehydrate();
-  const { loginUid, token } = useAppSelector((store) => {
-    return { loginUid: store.authData.user?.uid, token: store.authData.token };
+  const {
+    loginUid,
+    token,
+    expireTime = +new Date()
+  } = useAppSelector((store) => {
+    return {
+      loginUid: store.authData.user?.uid,
+      token: store.authData.token,
+      expireTime: store.authData.expireTime
+    };
   });
   const { setStreamingReady } = useStreaming();
   const [
@@ -35,13 +44,19 @@ export default function usePreload() {
       setStreamingReady(false);
     };
   }, []);
-  const canStreaming = !!loginUid && rehydrated && !!token;
+
+  useEffect(() => {
+    if (rehydrated) {
+      getUsers();
+      getServer();
+      getFavorites();
+    }
+  }, [rehydrated]);
+  const tokenAlmostExpire = dayjs().isAfter(new Date(expireTime - 20 * 1000));
+  const canStreaming = !!loginUid && rehydrated && !!token && !tokenAlmostExpire;
   console.log("ttt", loginUid, rehydrated, token);
 
   useEffect(() => {
-    getServer();
-    getUsers();
-    getFavorites();
     setStreamingReady(canStreaming);
   }, [canStreaming]);