账号、私信与消息提醒配套更新

chat_store.py

@@ -2,6 +2,7 @@
 import copy
 import logging
 import math
+import re
 import time
 import uuid
 
@@ -76,7 +77,10 @@ def _project(message):
     return result
 
 
-def send_message(sender, receiver, content):
+def send_message(sender, receiver, content, client_request_id=None):
+    if client_request_id is not None and (not isinstance(client_request_id, str)
+            or re.fullmatch(r"[0-9a-f]{32}", client_request_id) is None):
+        raise HTTPException(status_code=400, detail="发送请求标识不正确")
     if not isinstance(receiver, str) or not receiver or not isinstance(content, str) or not content.strip() or len(content) > MAX_MESSAGE_LENGTH:
         raise HTTPException(status_code=400, detail="私信内容或接收者不正确")
     users = _read("users.json")
@@ -89,7 +93,19 @@ def send_message(sender, receiver, content):
     message = {"id": f"chat_{int(time.time())}_{uuid.uuid4().hex}", "sender": sender,
                "receiver": receiver, "content": content, "created_at": int(time.time()), "is_read": False}
     key = f"{min(sender, receiver)}_{max(sender, receiver)}"
-    _mutate(lambda data: data.setdefault(key, []).append(message))
+    def append(data):
+        if client_request_id is not None:
+            for messages in data.values():
+                for existing in messages:
+                    if existing["sender"] == sender and existing.get("client_request_id") == client_request_id:
+                        if existing["receiver"] != receiver or existing["content"] != content:
+                            raise HTTPException(status_code=409, detail="发送请求标识已用于其它消息")
+                        return {"id": existing["id"], "client_request_id": client_request_id}
+            message["client_request_id"] = client_request_id
+        data.setdefault(key, []).append(message)
+        if client_request_id is not None:
+            return {"id": message["id"], "client_request_id": client_request_id}
+    return _mutate(append)
 
 
 def chat_list(account):

models.py

@@ -131,6 +131,10 @@ class PrivateMessage(BaseModel):
     receiver: str
     content: str
 
+class IdempotentPrivateMessage(PrivateMessage):
+    client_request_id: str = Field(..., strict=True, min_length=32, max_length=32, pattern=r"^[0-9a-f]{32}$")
+
+
 class PrivacySettings(BaseModel):
     follows: bool
     likes: bool

router_messages.py

@@ -12,7 +12,7 @@ import os
 import 数据库连接 as db
 import chat_store
 import notification_store
-from models import PrivateMessage
+from models import PrivateMessage, IdempotentPrivateMessage
 from 安全认证 import require_auth, is_admin
 
 # 🔒 频次限制（与 router_users_auth.py / router_wallet.py / router_prompts.py 同一写法）
@@ -142,6 +142,13 @@ async def send_private_message(request: Request, msg: PrivateMessage, current_us
     await asyncio.to_thread(chat_store.send_message, current_user, msg.receiver, msg.content)
     return {"status": "success"}
 
+@router.post("/api/messages/private/idempotent")
+@shared_limit(30)
+async def send_idempotent_private_message(request: Request, msg: IdempotentPrivateMessage, current_user: str = Depends(require_auth)):
+    receipt = await asyncio.to_thread(chat_store.send_message, current_user, msg.receiver, msg.content, msg.client_request_id)
+    return {"status": "success", "data": receipt}
+
+
 @router.get("/api/chats/{account}")
 async def get_chat_list(account: str, current_user: str = Depends(require_auth)):
     if account != current_user:

前端页面/components/用户体验_国际化.js

@@ -629,6 +629,10 @@ const translations = {
         'chat.date_day': '日',
         'chat.load_more': '加载更早的消息',
         'chat.msg_too_long': '消息不能超1000字',
+        'chat.send_unconfirmed': '发送结果暂时无法确认，请先查看会话。保持原文重试可复用本次发送标识。',
+        'chat.send_service_unavailable': '私信发送服务暂不可用，请确认接收账号及云端版本。',
+        'chat.send_request_conflict': '发送请求与原消息不一致，请先核对会话中的消息。',
+        'chat.send_rejected': '发送请求未获接受，请检查输入或稍后重试。',
         'chat.send_failed': '发送失败: {msg}',
         'chat.load_list_failed': '加载对话列表失败',
         'chat.load_history_failed': '加载消息记录失败',
@@ -2340,6 +2344,10 @@ const translations = {
         'chat.date_day': '',
         'chat.load_more': 'Load earlier messages',
         'chat.msg_too_long': 'Message cannot exceed 1000 characters',
+        'chat.send_unconfirmed': 'Sending could not be confirmed. Check the conversation first. Retrying unchanged text reuses this send identifier.',
+        'chat.send_service_unavailable': 'Messaging is unavailable. Check the recipient and cloud version.',
+        'chat.send_request_conflict': 'This request differs from the original message. Check the conversation first.',
+        'chat.send_rejected': 'The send request was not accepted. Check your input or try again later.',
         'chat.send_failed': 'Send failed: {msg}',
         'chat.load_list_failed': 'Failed to load conversations',
         'chat.load_history_failed': 'Failed to load messages',

前端页面/core/网络请求_业务API.js

@@ -105,7 +105,12 @@ const api = {
     // 🔥 新增：轻量级获取未读消息数量（不标记已读，用于轮询红点）
     async getUnreadCount(account) { return request(`/api/messages/${account}?count_only=true`); },
     async markMessagesRead(account) { return request(`/api/messages/${account}/read`, { method: "POST" }); },
-    async sendPrivateMessage(sender, receiver, content) { return request("/api/messages/private", { method: "POST", body: { sender, receiver, content } }); },
+    async sendPrivateMessage(sender, receiver, content, clientRequestId) {
+        const path = clientRequestId === undefined ? "/api/messages/private" : "/api/messages/private/idempotent";
+        const body = { sender, receiver, content };
+        if (clientRequestId !== undefined) body.client_request_id = clientRequestId;
+        return request(path, { method: "POST", body, retries: 0 });
+    },
     async getChatList(account, options = {}) { return request(`/api/chats/${account}`, options); },
     async getChatHistory(account, targetAccount, options = {}) { return request(`/api/chats/${account}/${targetAccount}`, options); },
     async getWallet(account, options = {}) { return request(`/api/wallet/${account}`, options); },

前端页面/social/私信聊天组件.js

@@ -140,7 +140,7 @@ export function openChatModal(currentUser, targetAccount = null) {
 
     let constructing = true, observer, listGeneration = 0, historyGeneration = 0, conversationGeneration = 0;
     let sending = false;
-    const drafts = new Map(), clearTimes = new Map();
+    const drafts = new Map(), clearTimes = new Map(), pendingMessages = new Map();
     const componentId = `chat-${++chatSequence}`;
     const sessionMatches = captureRequestSession();
     const scope = createTaskViewScope({
@@ -153,7 +153,7 @@ export function openChatModal(currentUser, targetAccount = null) {
     });
     scope.addCleanup(() => {
         clearTimeout(pollTimer); pollTimer = null; observer?.disconnect();
-        drafts.clear(); clearTimes.clear(); allMessages = []; currentTargetInfo = null; currentChatTarget = null;
+        drafts.clear(); clearTimes.clear(); pendingMessages.clear(); allMessages = []; currentTargetInfo = null; currentChatTarget = null;
         inputField.value = ''; messagesArea.replaceChildren(); chatListContainer.replaceChildren(); chatHeader.replaceChildren();
         window.dispatchEvent(new CustomEvent('comfy-chat-unread-changed'));
     });
@@ -416,12 +416,28 @@ export function openChatModal(currentUser, targetAccount = null) {
         const current = () => scope.isCurrent() && currentChatTarget === target && generation === conversationGeneration;
         sending = true; sendBtn.disabled = true; sendBtn.setAttribute('aria-busy', 'true');
         try {
-            const result = await api.sendPrivateMessage(currentUser.account, target, txt);
+            let pending = pendingMessages.get(target);
+            if (!pending || pending.content !== txt) {
+                const bytes = new Uint8Array(16);
+                crypto.getRandomValues(bytes);
+                pending = { id: Array.from(bytes, byte => byte.toString(16).padStart(2, '0')).join(''), content: txt };
+                pendingMessages.set(target, pending);
+            }
+            const result = await api.sendPrivateMessage(currentUser.account, target, txt, pending.id);
             if (!current()) return;
-            if (result?.status !== 'success') throw new Error('Unconfirmed message');
+            if (result?.status !== 'success' || typeof result.data?.id !== 'string' || !result.data.id
+                || result.data.client_request_id !== pending.id) throw new Error('Unconfirmed message');
+            if (pendingMessages.get(target) === pending) pendingMessages.delete(target);
             if (inputField.value === originalInput) { inputField.value = ''; drafts.delete(target); adjustHeight(); }
             await Promise.allSettled([loadChatHistory(target, currentTargetInfo?.name, currentTargetInfo?.avatar), loadChatList()]);
-        } catch (_) { if (current()) showToast(t('common.error'), 'error'); }
+        } catch (error) {
+            if (current()) {
+                const message = error?.status === 404 ? t('chat.send_service_unavailable')
+                    : error?.status === 409 ? t('chat.send_request_conflict')
+                    : error?.status >= 400 && error?.status < 500 ? t('chat.send_rejected') : t('chat.send_unconfirmed');
+                showToast(message, 'error');
+            }
+        }
         finally {
             sending = false;
             if (scope.isCurrent()) { sendBtn.disabled = false; sendBtn.setAttribute('aria-busy', 'false'); }