opensource/plus-ui
2
0
Fork 0
mirror of https://gitee.com/JavaLionLi/plus-ui.git synced 2026-09-13 15:53:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix 修复 push 模块 sse/ws 浏览器多标签页互挤掉线问题

Browse Source
This commit is contained in:
疯狂的狮子Li 2026-06-25 17:23:45 +08:00
parent 5f8d919f03
commit b7d8b4e426
1 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/utils/push.ts
View File

@ -9,6 +9,9 @@ import { parsePushMessage, resolveNoticeGroup, resolveNoticeTitle, shouldAppendN
let closePushConnection: (() => void) | undefined; let closePushConnection: (() => void) | undefined;
let stopPushWatchers: Array<() => void> = []; let stopPushWatchers: Array<() => void> = [];
const KICKED_MESSAGE = 'kicked';
let pushKicked = false;
let resumePushTimer: ReturnType<typeof setTimeout> | undefined;
const formatNoticeTime = (timestamp?: number | string) => { const formatNoticeTime = (timestamp?: number | string) => {
const time = timestamp ? new Date(timestamp) : new Date(); const time = timestamp ? new Date(timestamp) : new Date();
@ -44,6 +47,15 @@ const appendNotice = (raw: string) => {
}); });
}; };
const handlePushMessage = (raw: string) => {
if (raw === KICKED_MESSAGE) {
pushKicked = true;
closePush();
return;
}
appendNotice(raw);
};
const toNoticeItem = (item: MessageVO) => { const toNoticeItem = (item: MessageVO) => {
const userId = useUserStore().userId; const userId = useUserStore().userId;
const timestamp = item.createTime ? new Date(item.createTime).getTime() : Date.now(); const timestamp = item.createTime ? new Date(item.createTime).getTime() : Date.now();
@ -91,7 +103,7 @@ const initSsePush = (url: string) => {
const stopDataWatch = watch(data, () => { const stopDataWatch = watch(data, () => {
if (!data.value) return; if (!data.value) return;
appendNotice(data.value); handlePushMessage(data.value);
data.value = null; data.value = null;
}); });
stopPushWatchers.push(stopErrorWatch, stopDataWatch); stopPushWatchers.push(stopErrorWatch, stopDataWatch);
@ -115,7 +127,7 @@ const initWsPush = (url: string) => {
if (String(e.data) === 'pong') { if (String(e.data) === 'pong') {
return; return;
} }
appendNotice(String(e.data)); handlePushMessage(String(e.data));
} }
}); });
closePushConnection = close; closePushConnection = close;
@ -126,6 +138,7 @@ export const initPush = () => {
if (import.meta.env.VITE_APP_MESSAGE_ENABLED === 'false') { if (import.meta.env.VITE_APP_MESSAGE_ENABLED === 'false') {
return; return;
} }
pushKicked = false;
const path = import.meta.env.VITE_APP_MESSAGE_PATH || '/resource/message'; const path = import.meta.env.VITE_APP_MESSAGE_PATH || '/resource/message';
const transport = import.meta.env.VITE_APP_MESSAGE_TRANSPORT || 'sse'; const transport = import.meta.env.VITE_APP_MESSAGE_TRANSPORT || 'sse';
if (transport.toLowerCase() === 'websocket') { if (transport.toLowerCase() === 'websocket') {
@ -153,3 +166,27 @@ export const closePush = () => {
stopPushWatchers.forEach(stop => stop()); stopPushWatchers.forEach(stop => stop());
stopPushWatchers = []; stopPushWatchers = [];
}; };
const resumePushIfNeeded = () => {
if (!pushKicked || !getToken() || document.visibilityState !== 'visible') {
return;
}
if (resumePushTimer) {
clearTimeout(resumePushTimer);
}
resumePushTimer = setTimeout(async () => {
resumePushTimer = undefined;
if (!pushKicked || !getToken() || document.visibilityState !== 'visible') {
return;
}
try {
await initMessageBox();
} finally {
initPush();
}
}, 300);
};
window.addEventListener('focus', resumePushIfNeeded);
document.addEventListener('visibilitychange', resumePushIfNeeded);
window.addEventListener('online', resumePushIfNeeded);