[dev]notificationcenter update

This commit is contained in:
susie-laptop 2025-04-17 10:02:43 -04:00
parent 7db0c6fc26
commit e03c2cbe89
2 changed files with 24 additions and 5 deletions

View File

@ -39,16 +39,14 @@ export default function NotificationCenter({ show, onClose }) {
// WebSocket // WebSocket
useEffect(() => { useEffect(() => {
// WebSocket // WebSocketWebSocket
if (isAuthenticated && !isConnected) { if (isAuthenticated && !isConnected) {
initWebSocket() initWebSocket()
.then(() => { .then(() => {
dispatch(setWebSocketConnected(true));
console.log('Successfully connected to notification WebSocket'); console.log('Successfully connected to notification WebSocket');
}) })
.catch((error) => { .catch((error) => {
console.error('Failed to connect to notification WebSocket:', error); console.error('Failed to connect to notification WebSocket:', error);
dispatch(setWebSocketConnected(false));
// //
dispatch( dispatch(
showNotification({ showNotification({
@ -63,7 +61,6 @@ export default function NotificationCenter({ show, onClose }) {
return () => { return () => {
if (isConnected) { if (isConnected) {
closeWebSocket(); closeWebSocket();
dispatch(setWebSocketConnected(false));
} }
}; };
}, [isAuthenticated, isConnected, dispatch]); }, [isAuthenticated, isConnected, dispatch]);

View File

@ -1,4 +1,8 @@
import { addNotification, markNotificationAsRead } from '../store/notificationCenter/notificationCenter.slice'; import {
addNotification,
markNotificationAsRead,
setWebSocketConnected,
} from '../store/notificationCenter/notificationCenter.slice';
import store from '../store/store'; // 修改为默认导出 import store from '../store/store'; // 修改为默认导出
import CryptoJS from 'crypto-js'; import CryptoJS from 'crypto-js';
@ -38,6 +42,7 @@ export const initWebSocket = () => {
let token = ''; let token = '';
if (!encryptedToken) { if (!encryptedToken) {
console.error('No token found, cannot connect to notification service'); console.error('No token found, cannot connect to notification service');
store.dispatch(setWebSocketConnected(false));
reject(new Error('No token found')); reject(new Error('No token found'));
return; return;
} }
@ -53,6 +58,9 @@ export const initWebSocket = () => {
console.log('WebSocket connection established'); console.log('WebSocket connection established');
reconnectAttempts = 0; // 连接成功后重置重连计数器 reconnectAttempts = 0; // 连接成功后重置重连计数器
// 更新Redux中的连接状态
store.dispatch(setWebSocketConnected(true));
// 订阅通知频道 // 订阅通知频道
subscribeToNotifications(); subscribeToNotifications();
@ -79,6 +87,8 @@ export const initWebSocket = () => {
// 错误处理 // 错误处理
socket.onerror = (error) => { socket.onerror = (error) => {
console.error('WebSocket error:', error); console.error('WebSocket error:', error);
// 更新Redux中的连接状态
store.dispatch(setWebSocketConnected(false));
reject(error); reject(error);
}; };
@ -86,6 +96,9 @@ export const initWebSocket = () => {
socket.onclose = (event) => { socket.onclose = (event) => {
console.log(`WebSocket connection closed: ${event.code} ${event.reason}`); console.log(`WebSocket connection closed: ${event.code} ${event.reason}`);
// 更新Redux中的连接状态
store.dispatch(setWebSocketConnected(false));
// 清除ping定时器 // 清除ping定时器
if (pingInterval) clearInterval(pingInterval); if (pingInterval) clearInterval(pingInterval);
@ -99,15 +112,21 @@ export const initWebSocket = () => {
console.log('Attempting to reconnect WebSocket...'); console.log('Attempting to reconnect WebSocket...');
initWebSocket().catch((err) => { initWebSocket().catch((err) => {
console.error('Failed to reconnect WebSocket:', err); console.error('Failed to reconnect WebSocket:', err);
// 重连失败时更新Redux中的连接状态
store.dispatch(setWebSocketConnected(false));
}); });
}, RECONNECT_DELAY); }, RECONNECT_DELAY);
} else { } else {
console.log('Maximum reconnection attempts reached. Giving up.'); console.log('Maximum reconnection attempts reached. Giving up.');
// 达到最大重连次数时更新Redux中的连接状态
store.dispatch(setWebSocketConnected(false));
} }
} }
}; };
} catch (error) { } catch (error) {
console.error('Error initializing WebSocket:', error); console.error('Error initializing WebSocket:', error);
// 更新Redux中的连接状态
store.dispatch(setWebSocketConnected(false));
reject(error); reject(error);
} }
}); });
@ -173,6 +192,9 @@ export const closeWebSocket = () => {
clearInterval(pingInterval); clearInterval(pingInterval);
pingInterval = null; pingInterval = null;
} }
// 更新Redux中的连接状态
store.dispatch(setWebSocketConnected(false));
}; };
/** /**