bf1942/bili-sync-ai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: 升级 rust 到 1.93.1，移除 ws 中的一些无用变量 (#650)

Browse Source
This commit is contained in:
ᴀᴍᴛᴏᴀᴇʀ
2026-02-15 16:31:31 +08:00
committed by GitHub
parent e130f14c13
commit 5350d3491b
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rust-toolchain.toml
View File

@@ -1,3 +1,3 @@
[toolchain] [toolchain]
channel = "1.93.0" channel = "1.93.1"
components = ["clippy"] components = ["clippy"]

9
web/src/lib/ws.ts
View File

@@ -26,13 +26,11 @@ interface ClientEvent {
type LogsCallback = (data: string) => void; type LogsCallback = (data: string) => void;
type TasksCallback = (data: TaskStatus) => void; type TasksCallback = (data: TaskStatus) => void;
type SysInfoCallback = (data: SysInfo) => void; type SysInfoCallback = (data: SysInfo) => void;
type ErrorCallback = (error: Event) => void;
export class WebSocketManager { export class WebSocketManager {
private static instance: WebSocketManager; private static instance: WebSocketManager;
private socket: WebSocket | null = null; private socket: WebSocket | null = null;
private connected = false; private connected = false;
private connecting = false;
private reconnectTimer: ReturnType<typeof setTimeout> | null = null; private reconnectTimer: ReturnType<typeof setTimeout> | null = null;
private reconnectAttempts = 0; private reconnectAttempts = 0;
private maxReconnectAttempts = 5; private maxReconnectAttempts = 5;
@@ -41,7 +39,6 @@ export class WebSocketManager {
private logsSubscribers: Set<LogsCallback> = new Set(); private logsSubscribers: Set<LogsCallback> = new Set();
private tasksSubscribers: Set<TasksCallback> = new Set(); private tasksSubscribers: Set<TasksCallback> = new Set();
private sysInfoSubscribers: Set<SysInfoCallback> = new Set(); private sysInfoSubscribers: Set<SysInfoCallback> = new Set();
private errorSubscribers: Set<ErrorCallback> = new Set();
private subscribedEvents: Set<EventType> = new Set(); private subscribedEvents: Set<EventType> = new Set();
private connectionPromise: Promise<void> | null = null; private connectionPromise: Promise<void> | null = null;
@@ -61,7 +58,6 @@ export class WebSocketManager {
if (this.connectionPromise) return this.connectionPromise; if (this.connectionPromise) return this.connectionPromise;
this.connectionPromise = new Promise((resolve, reject) => { this.connectionPromise = new Promise((resolve, reject) => {
this.connecting = true;
const token = api.getAuthToken() || ''; const token = api.getAuthToken() || '';
try { try {
@@ -73,7 +69,6 @@ export class WebSocketManager {
); );
this.socket.onopen = () => { this.socket.onopen = () => {
this.connected = true; this.connected = true;
this.connecting = false;
this.reconnectAttempts = 0; this.reconnectAttempts = 0;
this.connectionPromise = null; this.connectionPromise = null;
this.resubscribeEvents(); this.resubscribeEvents();
@@ -84,20 +79,17 @@ export class WebSocketManager {
this.socket.onclose = () => { this.socket.onclose = () => {
this.connected = false; this.connected = false;
this.connecting = false;
this.connectionPromise = null; this.connectionPromise = null;
this.scheduleReconnect(); this.scheduleReconnect();
}; };
this.socket.onerror = (error) => { this.socket.onerror = (error) => {
console.error('WebSocket error:', error); console.error('WebSocket error:', error);
this.connecting = false;
this.connectionPromise = null; this.connectionPromise = null;
reject(error); reject(error);
toast.error('WebSocket 连接发生错误，请检查网络或稍后重试'); toast.error('WebSocket 连接发生错误，请检查网络或稍后重试');
}; };
} catch (error) { } catch (error) {
this.connecting = false;
this.connectionPromise = null; this.connectionPromise = null;
reject(error); reject(error);
console.error('Failed to create WebSocket:', error); console.error('Failed to create WebSocket:', error);
@@ -273,7 +265,6 @@ export class WebSocketManager {
} }
this.connected = false; this.connected = false;
this.connecting = false;
this.connectionPromise = null; this.connectionPromise = null;
this.subscribedEvents.clear(); this.subscribedEvents.clear();
} }