@yiarce/dsh-chat 0.1.1 → 0.1.2

package/context-menu.js

@@ -87,7 +87,7 @@ export function mountChatContextMenu(root, api) {
         } else if (relation === "blocked") {
           entries.push({ label: "解除屏蔽", run: () => api.toggleBlock(entry.message) });
         } else {
-          entries.push({ label: api.pendingFriend(id) ? "好友申请中" : "加为好友", disabled: !id || api.isSelf(id) || api.pendingFriend(id), run: () => api.addFriend(entry.message) });
+          entries.push({ label: "加为好友", disabled: !id || api.isSelf(id), run: () => api.addFriend(entry.message) });
           entries.push({ label: "屏蔽用户", danger: true, disabled: !id || api.isSelf(id), run: () => api.toggleBlock(entry.message) });
         }
         entries.push({ label: "复制 ID", disabled: !id, run: () => copy(id) });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yiarce/dsh-chat",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "独立聊天插件：共享聊天页面、图片上传、表情搜索；可选桌面独立窗口。",
   "type": "module",
   "main": "./host.js",

package/page.js

@@ -209,7 +209,7 @@ const timeStr = ms => ms ? new Date(Number(ms)).toLocaleTimeString('zh-CN', { ho
 function session(kind, id, name, avatar = '') {
   const key = kind + ':' + id;
   if (kind === 'room' && Number(id) === 1) name = '广场';
-  if (!state.sessions.has(key)) state.sessions.set(key, { key, kind, id, name: name || (kind === 'room' ? id + ' 号房' : id), avatar, entries: [], loaded: false, loading: null, loadVersion: 0, displayFloor: 0, clearedRevision: -1, detachedEntries: new Map(), messageCount: 0, localNew: true, unread: 0, draft: '', draftSticker: null, draftVersion: 0, preview: '', updated: 0, count: null, members: null });
+  if (!state.sessions.has(key)) state.sessions.set(key, { key, kind, id, name: name || (kind === 'room' ? id + ' 号房' : id), avatar, entries: [], loaded: false, loading: null, loadVersion: 0, displayFloor: 0, clearedRevision: -1, detachedEntries: new Map(), cards: new Map(), messageCount: 0, localNew: true, unread: 0, draft: '', draftSticker: null, draftVersion: 0, preview: '', updated: 0, count: null, members: null });
   const item = state.sessions.get(key);
   if (name) item.name = name;
   if (avatar) item.avatar = avatar;
@@ -238,11 +238,11 @@ function sendControl(peerId, type, fields = {}) {
   return sendClientFrame({ privateChat: { toUserId: String(peerId), clientMessageId: crypto.randomUUID(), content: controlMessage(type, { ...fields, toUserId: String(peerId) }) } });
 }
 function addRequestCard(request) {
+  if (!request?.requestId) return;
   const item = session('private', request.peerId, request.nickname, request.avatar);
-  const existing = item.entries.find(entry => entry.friendRequest?.requestId === request.requestId);
-  if (existing) existing.friendRequest = request;
-  else addEntry(item, { id: 'request:' + request.requestId, friendRequest: request, message: { fromUserId: request.peerId, fromNickname: request.nickname, fromAvatar: request.avatar, sentAtMs: request.created }, sendStatus: 'sent' });
-  if (current() === item) renderMessages(); renderSessions();
+  item.cards.set(request.requestId, { ...request });
+  if (current() === item) renderMessages();
+  renderSessions();
 }
 async function handleControlMessage(message, control) {
   const mine = String(message.fromUserId) === String(state.me?.id || lastUserID);
@@ -251,12 +251,17 @@ async function handleControlMessage(message, control) {
   const profile = { nickname: message.fromNickname || peerId, avatar: message.fromAvatar || '' };
   const base = { requestId: String(control.requestId || ''), peerId, nickname: profile.nickname, avatar: profile.avatar, created: Number(control.createdAt) || Date.now() };
   if (control.type === 'friend-request' && !mine) {
+    // The sender may retry freely; the receiver dedupes. Already a friend,
+    // an untouched pending request and an unreleased rejection all drop it.
     if (!base.requestId || isFriend(peerId)) return;
+    const existing = requestOf(peerId, 'incoming');
+    if (existing && (existing.status === 'pending' || existing.status === 'rejected')) return;
     const request = { ...base, direction: 'incoming', status: 'pending' }; await saveRequest(request); addRequestCard(request); return;
   }
-  if (control.type === 'friend-accept' && !mine) { const request = requestOf(peerId, 'outgoing'); if (request) { request.status = 'accepted'; await saveRequest(request); await saveContact(peerId, 'friend', profile); } return; }
-  if (control.type === 'friend-reject' && !mine) { const request = requestOf(peerId, 'outgoing'); if (request) { request.status = 'rejected'; await saveRequest(request); } return; }
-  if (control.type === 'friend-release' && !mine) { const request = requestOf(peerId, 'outgoing', 'rejected'); if (request) { request.status = 'released'; await saveRequest(request); } }
+  // Senders keep no local request record, so acceptance is applied directly.
+  if (control.type === 'friend-accept' && !mine) { await saveContact(peerId, 'friend', profile); return; }
+  if (control.type === 'friend-reject' && !mine) { log('对方拒绝了你的好友申请', 'err'); return; }
+  if (control.type === 'friend-release' && !mine) return;
 }
 async function handleRequestAction(request, action) {
   if (action === 'accept') { await saveRequest({ ...request, status: 'accepted' }); await saveContact(request.peerId, 'friend', request); sendControl(request.peerId, 'friend-accept', { requestId: request.requestId }); }
@@ -1011,18 +1016,27 @@ function scrollLatest() {
   const box = $('messageViewport'); box.scrollTop = box.scrollHeight; $('btnLatest').hidden = true;
 }
 function nearBottom() { const box = $('messageViewport'); return box.scrollHeight - box.scrollTop - box.clientHeight < 80; }
+function requestCardNode(request) {
+  const status = request.status;
+  const title = status === 'accepted' ? '已成为好友'
+    : status === 'rejected' ? '申请已拒绝'
+    : status === 'released' ? '已解除拒绝'
+    : request.direction === 'incoming' ? '好友申请' : '好友申请中';
+  const card = make('article', 'yc-friend-request-card');
+  card.append(make('strong', '', title));
+  card.append(make('p', '', request.nickname + (request.direction === 'incoming' ? ' 请求添加你为好友' : ' 的好友申请')));
+  const actions = make('div', 'yc-friend-request-actions');
+  const add = (label, action) => {
+    const button = make('button', '', label); button.type = 'button';
+    button.onclick = () => void handleRequestAction(request, action).catch(error => log(error.message || '操作失败', 'err'));
+    actions.append(button);
+  };
+  if (request.direction === 'incoming' && status === 'pending') { add('同意', 'accept'); add('拒绝', 'reject'); }
+  else if (request.direction === 'incoming' && status === 'rejected') add('解除拒绝', 'release');
+  if (actions.childNodes.length) card.append(actions);
+  return card;
+}
 function messageNode(entry) {
-  if (entry.friendRequest) {
-    const card = make('article', 'yc-friend-request-card');
-    card.append(make('strong', '', entry.friendRequest.direction === 'incoming' ? '好友申请' : entry.friendRequest.status === 'accepted' ? '已成为好友' : entry.friendRequest.status === 'rejected' ? '申请已拒绝' : '好友申请中'));
-    card.append(make('p', '', entry.friendRequest.nickname + ' 请求添加你为好友'));
-    if (entry.friendRequest.direction === 'incoming' && entry.friendRequest.status === 'pending') {
-      const actions = make('div', 'yc-friend-request-actions');
-      for (const [label, action] of [['同意','accept'],['拒绝','reject'],['稍后处理',null]]) { const button = make('button', '', label); button.type = 'button'; if (action) button.onclick = () => void handleRequestAction(entry.friendRequest, action).catch(error => log(error.message || '操作失败', 'err')); actions.append(button); }
-      card.append(actions);
-    }
-    return card;
-  }
   if (entry.system) return make('p', 'yc-system-message', entry.text);
   const m = entry.message;
   const attachment = m.sticker || (entry.localImage ? { url: entry.localImage.url } : null);
@@ -1067,7 +1081,9 @@ function renderMessages(force = false) {
   const entries = item?.entries || [];
   resetMessageImages();
   for (const row of $('messages').children) { const entry = contextEntries.get(row); if (entry) detachMessageRow(entry); }
-  $('messages').replaceChildren(...entries.map(messageNode));
+  const nodes = entries.map(messageNode);
+  for (const request of item?.cards?.values() || []) nodes.push(requestCardNode(request));
+  $('messages').replaceChildren(...nodes);
   if (bottom) scrollLatest(); else box.scrollTop = top;
 }
 function selectSession(key) {
@@ -1667,7 +1683,9 @@ function applyHistoryEvent(event) {
   if (!alive) return;
   if (event.type === 'snapshot') {
     contacts.clear(); for (const contact of event.contacts || []) contacts.set(String(contact.userId), contact);
-    friendRequests.clear(); for (const request of event.requests || []) { setRequestLocal(request); if (request.status === 'pending' || request.status === 'accepted' || request.status === 'rejected') addRequestCard(request); }
+    friendRequests.clear(); for (const request of event.requests || []) setRequestLocal(request);
+    for (const item of state.sessions.values()) item.cards?.clear();
+    for (const request of event.requests || []) if (request.status === 'pending' || request.status === 'accepted' || request.status === 'rejected') addRequestCard(request);
     const known = new Set(event.sessions.map(item => item.key));
     for (const item of [...state.sessions.values()]) if (!known.has(item.key) && !item.localNew) removeStoredSession(item);
     for (const meta of event.sessions) {
@@ -1678,7 +1696,9 @@ function applyHistoryEvent(event) {
     if (current() && !document.hidden && document.hasFocus()) void recordStore.read(current().key).catch(historyError);
   } else if (event.type === 'contact' || event.type === 'request') {
     contacts.clear(); for (const contact of event.contacts || []) contacts.set(String(contact.userId), contact);
-    friendRequests.clear(); for (const request of event.requests || []) { setRequestLocal(request); if (request.status === 'pending' || request.status === 'accepted' || request.status === 'rejected') addRequestCard(request); }
+    friendRequests.clear(); for (const request of event.requests || []) setRequestLocal(request);
+    for (const item of state.sessions.values()) item.cards?.clear();
+    for (const request of event.requests || []) if (request.status === 'pending' || request.status === 'accepted' || request.status === 'rejected') addRequestCard(request);
   } else if (event.type === 'remove') {
     const item = state.sessions.get(event.key);
     if (event.revision < (sessionRevisions.get(event.key) ?? -1)) { if (item) forgetSessionMessages(item, event.revision, event.pendingIds); }
@@ -1729,10 +1749,11 @@ function discardLocalEntry(item, entry) {
 }
 async function addFriend(message) {
   const id = String(message.fromUserId); if (!connected || isFriend(id) || isBlocked(id)) return;
-  if (requestOf(id, 'outgoing', 'pending')) { log('好友申请已发送，正在等待对方处理'); return; }
-  const request = { requestId: crypto.randomUUID(), peerId: id, direction: 'outgoing', status: 'pending', nickname: message.fromNickname || id, avatar: message.fromAvatar || '', created: Date.now() };
-  if (!sendControl(id, 'friend-request', { requestId: request.requestId, createdAt: request.created })) { log('好友申请发送失败', 'err'); return; }
-  await saveRequest(request); addRequestCard(request); log('好友申请已发送');
+  // No local pending record: a retry is always allowed so a lost request or a
+  // removed conversation can be recovered. The receiver dedupes.
+  const requestId = crypto.randomUUID(), createdAt = Date.now();
+  if (!sendControl(id, 'friend-request', { requestId, createdAt })) { log('好友申请发送失败，请重试', 'err'); return; }
+  log('好友申请已发送');
 }
 async function deleteFriend(message) { await saveContact(message.fromUserId, 'none', message); log('已删除好友'); }
 async function toggleBlock(message) {
@@ -1752,7 +1773,6 @@ const contextActions = mountChatContextMenu(root, {
   },
   isSelf: id => id === (state.me?.id || lastUserID),
   relation: id => contactOf(id),
-  pendingFriend: id => Boolean(requestOf(id, 'outgoing', 'pending')),
   addFriend,
   deleteFriend,
   toggleBlock,