修复接单端过期会话重复请求
This commit is contained in:
@@ -8,12 +8,21 @@ import {
|
||||
import { App, Button, Layout, Menu, Typography } from 'antd'
|
||||
import { useQueryClient } from '@tanstack/react-query'
|
||||
import type { MenuProps } from 'antd'
|
||||
import { useEffect } from 'react'
|
||||
import { Outlet, useLocation, useNavigate } from 'react-router'
|
||||
|
||||
import { logoutWorker } from '@/services/worker'
|
||||
import { useIsMobile } from '@/utils/use-is-mobile'
|
||||
import { clearWorkerSession, getWorkerStatus, getWorkerUsername } from '@/utils/worker-auth'
|
||||
import { getWorkerToken } from '@/utils/worker-auth'
|
||||
import {
|
||||
clearWorkerSession,
|
||||
expireWorkerSession,
|
||||
getWorkerSessionExpiryDelay,
|
||||
getWorkerStatus,
|
||||
getWorkerToken,
|
||||
getWorkerTokenExpiresAt,
|
||||
getWorkerUsername,
|
||||
isWorkerSessionStorageKey,
|
||||
} from '@/utils/worker-auth'
|
||||
import { useRealtimeEvents, type RealtimeEvent } from '@/hooks/useRealtimeEvents'
|
||||
import WorkerAnnouncementBanner from '@/components/worker/WorkerAnnouncementBanner'
|
||||
import WorkerNewOrderSpeech from '@/components/worker/WorkerNewOrderSpeech'
|
||||
@@ -41,14 +50,45 @@ export default function WorkerLayout() {
|
||||
const status = getWorkerStatus()
|
||||
const currentKey = resolveSelectedKey(location.pathname)
|
||||
|
||||
useEffect(() => {
|
||||
const navigateToLogin = () => {
|
||||
if (window.location.pathname !== '/') {
|
||||
void navigate('/', { replace: true })
|
||||
}
|
||||
}
|
||||
const handleSessionExpired = () => navigateToLogin()
|
||||
const handleStorage = (event: StorageEvent) => {
|
||||
if (isWorkerSessionStorageKey(event.key) && event.newValue === null) {
|
||||
expireWorkerSession()
|
||||
navigateToLogin()
|
||||
}
|
||||
}
|
||||
|
||||
window.addEventListener('worker-session-expired', handleSessionExpired)
|
||||
window.addEventListener('storage', handleStorage)
|
||||
return () => {
|
||||
window.removeEventListener('worker-session-expired', handleSessionExpired)
|
||||
window.removeEventListener('storage', handleStorage)
|
||||
}
|
||||
}, [navigate])
|
||||
|
||||
useEffect(() => {
|
||||
const delay = getWorkerSessionExpiryDelay(getWorkerTokenExpiresAt())
|
||||
if (delay === null) return
|
||||
|
||||
const timer = window.setTimeout(() => {
|
||||
expireWorkerSession()
|
||||
}, delay)
|
||||
return () => window.clearTimeout(timer)
|
||||
}, [])
|
||||
|
||||
useRealtimeEvents({
|
||||
url: '/api/v1/worker/realtime',
|
||||
token: getWorkerToken(),
|
||||
onEvent: (event) => applyWorkerRealtimeEvent(event, queryClient),
|
||||
// 会话过期时清登录态回登录页,避免 SSE 带着失效 token 无限重连刷 401。
|
||||
onAuthExpired: () => {
|
||||
clearWorkerSession()
|
||||
void navigate('/', { replace: true })
|
||||
expireWorkerSession()
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user