diff --git a/package.json b/package.json index 393b30be..f888bebb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vocechat-web", - "version": "0.3.9", + "version": "0.3.11", "private": true, "homepage": "https://voce.chat", "dependencies": { diff --git a/src/common/component/Notification/index.tsx b/src/common/component/Notification/index.tsx index 319598fd..d667431e 100644 --- a/src/common/component/Notification/index.tsx +++ b/src/common/component/Notification/index.tsx @@ -25,14 +25,16 @@ const Notification = () => { }, [token]); useEffect(() => { - const handleServiceworkerMessage = (event: MessageEvent) => { + const handleServiceWorkerMessage = (event: MessageEvent) => { const { newPath } = event.data; - navigateTo(newPath); + if (newPath) { + navigateTo(newPath); + } }; // https only - navigator.serviceWorker?.addEventListener("message", handleServiceworkerMessage); + navigator.serviceWorker?.addEventListener("message", handleServiceWorkerMessage); return () => { - navigator.serviceWorker?.removeEventListener("message", handleServiceworkerMessage); + navigator.serviceWorker?.removeEventListener("message", handleServiceWorkerMessage); }; }, []); diff --git a/src/common/hook/useStreaming/index.ts b/src/common/hook/useStreaming/index.ts index 2c680d1d..03575457 100644 --- a/src/common/hook/useStreaming/index.ts +++ b/src/common/hook/useStreaming/index.ts @@ -22,9 +22,9 @@ import chatMessageHandler from "./chat.handler"; import store, { useAppDispatch, useAppSelector } from "../../../app/store"; import { ServerEvent, UsersStateEvent } from "../../../types/sse"; -class RetriableError extends Error {} +class RetryError extends Error { } -class FatalError extends Error {} +class FatalError extends Error { } const getQueryString = (params: { [key: string]: string }) => { const sp = new URLSearchParams(); @@ -67,6 +67,11 @@ export default function useStreaming() { } = { "api-key": token }; + // token 非空 + if (!token) { + initializing = false; + return; + } // 如果afterMid是0,则不传该参数 if (afterMid !== 0) { params.after_mid = `${afterMid}`; @@ -92,7 +97,7 @@ export default function useStreaming() { } else { // server error console.info("sse debug: open retry"); - throw new RetriableError(); + throw new RetryError(); } }, onmessage(evt) { @@ -274,7 +279,7 @@ export default function useStreaming() { // if the server closes the connection unexpectedly, retry: console.info("sse debug: closed"); initializing = false; - throw new RetriableError(); + throw new RetryError(); }, onerror(err) { initializing = false;