collabdocchat 2.0.8 → 2.1.0

package/src/services/auth.js

@@ -1,55 +1,54 @@
-const API_URL = 'http://localhost:3000/api';
-
-export class AuthService {
-  async login(username, password) {
-    const response = await fetch(`${API_URL}/auth/login`, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ username, password })
-    });
-
-    if (!response.ok) {
-      const error = await response.json();
-      throw new Error(error.message);
-    }
-
-    return await response.json();
-  }
-
-  async register(username, password) {
-    const response = await fetch(`${API_URL}/auth/register`, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ username, password })
-    });
-
-    if (!response.ok) {
-      const error = await response.json();
-      throw new Error(error.message);
-    }
-
-    return await response.json();
-  }
-
-  async getCurrentUser() {
-    const token = localStorage.getItem('token');
-    const response = await fetch(`${API_URL}/auth/me`, {
-      headers: { 'Authorization': `Bearer ${token}` }
-    });
-
-    if (!response.ok) {
-      throw new Error('获取用户信息失败');
-    }
-
-    const data = await response.json();
-    return data.user;
-  }
-
-  logout() {
-    localStorage.removeItem('token');
-    window.location.reload();
-  }
-}
-
-
+const API_URL = 'http://localhost:3000/api';
+
+export class AuthService {
+  async login(username, password) {
+    const response = await fetch(`${API_URL}/auth/login`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ username, password })
+    });
+
+    if (!response.ok) {
+      const error = await response.json();
+      throw new Error(error.message);
+    }
+
+    return await response.json();
+  }
+
+  async register(username, password) {
+    const response = await fetch(`${API_URL}/auth/register`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ username, password })
+    });
+
+    if (!response.ok) {
+      const error = await response.json();
+      throw new Error(error.message);
+    }
+
+    return await response.json();
+  }
+
+  async getCurrentUser() {
+    const token = localStorage.getItem('token');
+    const response = await fetch(`${API_URL}/auth/me`, {
+      headers: { 'Authorization': `Bearer ${token}` }
+    });
+
+    if (!response.ok) {
+      throw new Error('获取用户信息失败');
+    }
+
+    const data = await response.json();
+    return data.user;
+  }
+
+  logout() {
+    localStorage.removeItem('token');
+    window.location.reload();
+  }
+}
+
 

package/src/services/websocket.js

@@ -1,190 +1,80 @@
-export class WebSocketService {
-  constructor() {
-    this.ws = null;
-    this.listeners = new Map();
-    this.token = null;
-    this.reconnectAttempts = 0;
-    this.maxReconnectAttempts = 10;
-    this.reconnectDelay = 1000;
-    this.heartbeatInterval = null;
-    this.isConnecting = false;
-    this.isAuthenticated = false;
-  }
-
-  connect(token) {
-    if (this.isConnecting) {
-      console.log('�?正在连接中，请稍�?..');
-      return;
-    }
-
-    this.token = token;
-    this.isConnecting = true;
-
-    try {
-      this.ws = new WebSocket('ws://localhost:3000');
-
-      this.ws.onopen = () => {
-        console.log('�?WebSocket 连接成功');
-        this.isConnecting = false;
-        this.reconnectAttempts = 0;
-        this.reconnectDelay = 1000;
-        this.send({ type: 'auth', token });
-        this.startHeartbeat();
-      };
-
-      this.ws.onmessage = (event) => {
-        try {
-          const data = JSON.parse(event.data);
-          
-          if (data.type === 'auth_success') {
-            this.isAuthenticated = true;
-            console.log('�?WebSocket 认证成功');
-          } else if (data.type === 'pong') {
-            // 心跳响应
-            console.log('💓 心跳正常');
-          }
-          
-          this.notifyListeners(data.type, data);
-        } catch (error) {
-          console.error('�?解析消息失败:', error);
-        }
-      };
-
-      this.ws.onerror = (error) => {
-        console.error('�?WebSocket 错误:', error);
-        this.isConnecting = false;
-      };
-
-      this.ws.onclose = (event) => {
-        console.log(`🔌 WebSocket 连接关闭 (代码: ${event.code}, 原因: ${event.reason || '未知'})`);
-        this.isConnecting = false;
-        this.isAuthenticated = false;
-        this.stopHeartbeat();
-        
-        // 只有在非正常关闭时才重连
-        if (event.code !== 1000 && this.reconnectAttempts < this.maxReconnectAttempts) {
-          this.handleReconnect();
-        }
-      };
-    } catch (error) {
-      console.error('�?WebSocket 连接失败:', error);
-      this.isConnecting = false;
-      this.handleReconnect();
-    }
-  }
-
-  handleReconnect() {
-    if (this.reconnectAttempts >= this.maxReconnectAttempts) {
-      console.error('�?达到最大重连次数，停止重连');
-      this.notifyListeners('max_reconnect_reached', {
-        message: '无法连接到服务器，请刷新页面重试'
-      });
-      return;
-    }
-
-    this.reconnectAttempts++;
-    const delay = Math.min(this.reconnectDelay * Math.pow(2, this.reconnectAttempts - 1), 30000);
-    
-    console.log(`🔄 ${delay / 1000}秒后尝试�?${this.reconnectAttempts} 次重�?..`);
-    
-    setTimeout(() => {
-      if (this.token) {
-        this.connect(this.token);
-      }
-    }, delay);
-  }
-
-  startHeartbeat() {
-    this.stopHeartbeat();
-    
-    this.heartbeatInterval = setInterval(() => {
-      if (this.ws && this.ws.readyState === WebSocket.OPEN) {
-        this.send({ type: 'ping', timestamp: Date.now() });
-      }
-    }, 30000); // �?0秒发送一次心�?  }
-
-  stopHeartbeat() {
-    if (this.heartbeatInterval) {
-      clearInterval(this.heartbeatInterval);
-      this.heartbeatInterval = null;
-    }
-  }
-
-  disconnect() {
-    this.stopHeartbeat();
-    this.reconnectAttempts = this.maxReconnectAttempts; // 阻止自动重连
-    
-    if (this.ws) {
-      this.ws.close(1000, '用户主动断开');
-      this.ws = null;
-    }
-    
-    this.isAuthenticated = false;
-    console.log('👋 WebSocket 已断开');
-  }
-
-  send(data) {
-    if (this.ws && this.ws.readyState === WebSocket.OPEN) {
-      this.ws.send(JSON.stringify(data));
-    }
-  }
-
-  on(event, callback) {
-    if (!this.listeners.has(event)) {
-      this.listeners.set(event, []);
-    }
-    this.listeners.get(event).push(callback);
-  }
-
-  off(event, callback) {
-    if (this.listeners.has(event)) {
-      const callbacks = this.listeners.get(event);
-      const index = callbacks.indexOf(callback);
-      if (index > -1) {
-        callbacks.splice(index, 1);
-      }
-    }
-  }
-
-  notifyListeners(event, data) {
-    if (this.listeners.has(event)) {
-      this.listeners.get(event).forEach(callback => callback(data));
-    }
-  }
-
-  joinGroup(groupId) {
-    this.send({ type: 'join_group', groupId });
-  }
-
-  sendChatMessage(groupId, username, content) {
-    this.send({ type: 'chat_message', groupId, username, content });
-  }
-
-  syncDocument(documentId, content, cursorPosition) {
-    this.send({ type: 'document_sync', documentId, content, cursorPosition });
-  }
-
-  respondToCall(groupId, username) {
-    this.send({ type: 'call_response', groupId, username });
-  }
-
-  sendTyping(documentId, username, isTyping) {
-    this.send({ type: 'typing', documentId, username, isTyping });
-  }
-
-  // 撤回消息
-  recallMessage(messageId) {
-    this.send({ type: 'recall_message', messageId });
-  }
-
-  // 标记消息为已�?  markMessageAsRead(messageId) {
-    this.send({ type: 'message_read', messageId });
-  }
-
-  // 发送用户在线状�?  sendUserOnline(username) {
-    this.send({ type: 'user_online', username });
-  }
-}
-
-
+export class WebSocketService {
+  constructor() {
+    this.ws = null;
+    this.listeners = new Map();
+  }
+
+  connect(token) {
+    this.ws = new WebSocket('ws://localhost:3000');
+
+    this.ws.onopen = () => {
+      console.log('✅ WebSocket 连接成功');
+      this.send({ type: 'auth', token });
+    };
+
+    this.ws.onmessage = (event) => {
+      const data = JSON.parse(event.data);
+      this.notifyListeners(data.type, data);
+    };
+
+    this.ws.onerror = (error) => {
+      console.error('❌ WebSocket 错误:', error);
+    };
+
+    this.ws.onclose = () => {
+      console.log('🔌 WebSocket 连接关闭');
+      setTimeout(() => this.connect(token), 3000);
+    };
+  }
+
+  send(data) {
+    if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+      this.ws.send(JSON.stringify(data));
+    }
+  }
+
+  on(event, callback) {
+    if (!this.listeners.has(event)) {
+      this.listeners.set(event, []);
+    }
+    this.listeners.get(event).push(callback);
+  }
+
+  off(event, callback) {
+    if (this.listeners.has(event)) {
+      const callbacks = this.listeners.get(event);
+      const index = callbacks.indexOf(callback);
+      if (index > -1) {
+        callbacks.splice(index, 1);
+      }
+    }
+  }
+
+  notifyListeners(event, data) {
+    if (this.listeners.has(event)) {
+      this.listeners.get(event).forEach(callback => callback(data));
+    }
+  }
+
+  joinGroup(groupId) {
+    this.send({ type: 'join_group', groupId });
+  }
+
+  sendChatMessage(groupId, username, content) {
+    this.send({ type: 'chat_message', groupId, username, content });
+  }
+
+  syncDocument(documentId, content, cursorPosition) {
+    this.send({ type: 'document_sync', documentId, content, cursorPosition });
+  }
+
+  respondToCall(groupId, username) {
+    this.send({ type: 'call_response', groupId, username });
+  }
+
+  sendTyping(documentId, username, isTyping) {
+    this.send({ type: 'typing', documentId, username, isTyping });
+  }
+}
+