@agentunion/fastaun 0.5.2 → 0.5.4

package/dist/client/delivery.js

@@ -3,6 +3,7 @@ import { normalizeGroupId } from '../group-id.js';
 import { ConnectionState, isJsonObject } from '../types.js';
 const PUSHED_SEQS_LIMIT = 50_000;
 const PENDING_ORDERED_LIMIT = 50_000;
+const MESSAGE_RECALL_SEEN_LIMIT = 10_000;
 const GROUP_RECALL_SEEN_LIMIT = 10_000;
 const SEQ_TRACKER_PERSIST_FLUSH_DELAY_MS = 200;
 const APP_MESSAGE_ENVELOPE_KEYS = [
@@ -11,6 +12,13 @@ const APP_MESSAGE_ENVELOPE_KEYS = [
     'timestamp', 'created_at', 'encrypted',
     'context', 'protected_headers', 'headers', 'payload_type',
 ];
+const RECALL_PAYLOAD_KEYS = [
+    'message_ids', 'target_message_seqs',
+    'recalled_message_id', 'target_message_id', 'original_message_id',
+    'target_seq', 'original_seq',
+    'notice_message_id', 'notice_seq', 'event_seq',
+    'sender_aid', 'recalled_by', 'recalled_at', 'reason',
+];
 const APP_SEND_ENVELOPE_METHODS = new Set([
     'message.send',
     'group.send',
@@ -79,6 +87,10 @@ export class MessageDeliveryEngine {
             await this.publishOrderedGroupChanged(payload, source);
             return;
         }
+        if (event === 'message.recalled') {
+            await this.publishMessageRecallTombstone(seq, payload);
+            return;
+        }
         if (pullResponse) {
             const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source));
             if (isPromiseLike(published))
@@ -308,6 +320,11 @@ export class MessageDeliveryEngine {
                 event[key] = msg[key];
             }
         }
+        for (const key of RECALL_PAYLOAD_KEYS) {
+            if (Object.prototype.hasOwnProperty.call(msg, key) && !(key in event)) {
+                event[key] = msg[key];
+            }
+        }
         const rawIds = event.message_ids;
         let messageIds = Array.isArray(rawIds)
             ? rawIds.map((item) => String(item ?? '').trim()).filter(Boolean)
@@ -349,6 +366,57 @@ export class MessageDeliveryEngine {
             return { event: 'message.recalled', payload: recall };
         return { event: 'message.received', payload: message };
     }
+    messageRecallDedupKey(payload) {
+        const ids = payload.message_ids;
+        const idPart = Array.isArray(ids)
+            ? ids.map((i) => String(i ?? '').trim()).filter(Boolean).sort().join(',')
+            : String(ids ?? '').trim();
+        if (idPart)
+            return `p2p|id:${idPart}`;
+        for (const key of ['recalled_message_id', 'target_message_id', 'original_message_id']) {
+            const value = String(payload[key] ?? '').trim();
+            if (value)
+                return `p2p|id:${value}`;
+        }
+        const rawSeqs = payload.target_message_seqs;
+        const seqPart = Array.isArray(rawSeqs)
+            ? rawSeqs.map((seq) => String(seq ?? '').trim()).filter(Boolean).sort().join(',')
+            : String(rawSeqs ?? payload.target_seq ?? payload.original_seq ?? '').trim();
+        if (seqPart) {
+            const fromAid = String(payload.from ?? payload.from_aid ?? payload.sender_aid ?? '').trim();
+            const toAid = String(payload.to ?? payload.to_aid ?? '').trim();
+            return `p2p|from:${fromAid}|to:${toAid}|seq:${seqPart}`;
+        }
+        const tombstoneId = String(payload.tombstone_message_id ?? payload.message_id ?? '').trim();
+        if (tombstoneId)
+            return `p2p|tombstone:${tombstoneId}`;
+        return `p2p|unknown:${Date.now()}:${Math.random()}`;
+    }
+    async publishMessageRecallTombstone(seq, message) {
+        const client = this.runtime.client;
+        const eventPayload = this.recallEventFromMessage(message);
+        if (!eventPayload)
+            return false;
+        const dedupKey = this.messageRecallDedupKey(eventPayload);
+        let seen = client._messageRecallSeen;
+        if (!seen) {
+            seen = new Map();
+            client._messageRecallSeen = seen;
+        }
+        if (seen.has(dedupKey)) {
+            client._clientLog.debug(`message.recalled dedup suppressed: seq=${String(seq)} key=${dedupKey}`);
+            return false;
+        }
+        seen.set(dedupKey, Date.now());
+        if (seen.size > MESSAGE_RECALL_SEEN_LIMIT) {
+            const drop = [...seen.entries()].sort((a, b) => a[1] - b[1]).slice(0, seen.size - MESSAGE_RECALL_SEEN_LIMIT);
+            for (const [oldKey] of drop)
+                seen.delete(oldKey);
+        }
+        await client._publishAppEvent('message.recalled', eventPayload, 'message-recall');
+        client._clientLog.debug(`message.recalled published: seq=${String(seq)} ids=${JSON.stringify(eventPayload.message_ids)}`);
+        return true;
+    }
     recallEventFromGroupMessage(message) {
         if (!isJsonObject(message))
             return null;
@@ -365,6 +433,11 @@ export class MessageDeliveryEngine {
                 event[key] = msg[key];
             }
         }
+        for (const key of RECALL_PAYLOAD_KEYS) {
+            if (Object.prototype.hasOwnProperty.call(msg, key) && !(key in event)) {
+                event[key] = msg[key];
+            }
+        }
         const rawIds = event.message_ids;
         let messageIds = Array.isArray(rawIds)
             ? rawIds.map((item) => String(item ?? '').trim()).filter(Boolean)
@@ -395,9 +468,9 @@ export class MessageDeliveryEngine {
         return event;
     }
     groupRecallDedupKey(groupId, payload) {
-        // 群撤回去重键：group_id + 排序后的 message_ids。
+        // 群撤回去重键：group_id + 原始消息标识。
         // 一条消息只能被撤回一次（服务端 group_message_recalls uk_recall_msg_id 唯一约束），
-        // (group_id, sorted message_ids) 已能唯一标识一次撤回。
+        // (group_id, sorted message_ids) 已能唯一标识一次撤回；缺 message_ids 时按原消息 id/seq 兜底。
         // 去重键不含 recalled_at：占位/通知 tombstone（pull，事务内时间）与在线 push（事务后重取时间）
         // 三条通道对同一次撤回可能携带不同来源的时间戳，纳入 recalled_at 会使去重失效、回调多次。
         // group_id 归一化一次，使去重键与来源无关（pull 用 normalizeGroupId，push 可能是原始值）。
@@ -405,15 +478,35 @@ export class MessageDeliveryEngine {
         const ids = payload.message_ids;
         const idPart = Array.isArray(ids)
             ? ids.map((i) => String(i ?? '').trim()).filter(Boolean).sort().join(',')
-            : String(ids ?? '');
-        return `${normalizedGroupId}|${idPart}`;
+            : String(ids ?? '').trim();
+        if (idPart)
+            return `${normalizedGroupId}|id:${idPart}`;
+        for (const key of ['recalled_message_id', 'target_message_id', 'original_message_id']) {
+            const value = String(payload[key] ?? '').trim();
+            if (value)
+                return `${normalizedGroupId}|id:${value}`;
+        }
+        const rawSeqs = payload.target_message_seqs;
+        const seqPart = Array.isArray(rawSeqs)
+            ? rawSeqs.map((seq) => String(seq ?? '').trim()).filter(Boolean).sort().join(',')
+            : String(rawSeqs ?? payload.original_seq ?? '').trim();
+        if (seqPart)
+            return `${normalizedGroupId}|seq:${seqPart}`;
+        const tombstoneId = String(payload.tombstone_message_id ?? payload.message_id ?? '').trim();
+        if (tombstoneId)
+            return `${normalizedGroupId}|tombstone:${tombstoneId}`;
+        return `${normalizedGroupId}|unknown:${Date.now()}:${Math.random()}`;
     }
     async publishGroupRecallTombstone(groupId, seq, message) {
         const client = this.runtime.client;
         const eventPayload = this.recallEventFromGroupMessage(message);
         if (!eventPayload)
             return false;
-        const dedupKey = this.groupRecallDedupKey(groupId, eventPayload);
+        const rawGroupId = String(eventPayload.group_id ?? groupId ?? '').trim();
+        const dedupGroupId = normalizeGroupId(rawGroupId) || rawGroupId;
+        if (dedupGroupId)
+            eventPayload.group_id = dedupGroupId;
+        const dedupKey = this.groupRecallDedupKey(dedupGroupId, eventPayload);
         let seen = client._groupRecallSeen;
         if (!seen) {
             seen = new Map();
@@ -605,6 +698,29 @@ export class MessageDeliveryEngine {
         }
         return true;
     }
+    async runPushProcessSerialized(ns, operation) {
+        const client = this.runtime.client;
+        if (!ns) {
+            await operation();
+            return;
+        }
+        let queues = client._pushProcessQueues;
+        if (!queues) {
+            queues = new Map();
+            client._pushProcessQueues = queues;
+        }
+        const previous = queues.get(ns) ?? Promise.resolve();
+        const current = previous.catch(() => undefined).then(operation);
+        const stored = current.then(() => undefined, () => undefined);
+        queues.set(ns, stored);
+        try {
+            await current;
+        }
+        finally {
+            if (queues.get(ns) === stored)
+                queues.delete(ns);
+        }
+    }
     async onRawMessageReceived(data) {
         const client = this.runtime.client;
         const tStart = Date.now();
@@ -615,7 +731,10 @@ export class MessageDeliveryEngine {
         else {
             client._clientLog.debug('_onRawMessageReceived enter: non-object payload');
         }
-        this.processAndPublishMessage(data).catch((exc) => {
+        const ns = isJsonObject(data) && client._aid && data.seq !== undefined
+            ? `p2p:${client._aid}`
+            : '';
+        this.runPushProcessSerialized(ns, () => this.processAndPublishMessage(data)).catch((exc) => {
             client._clientLog.warn(`P2P message decrypt failed: ${formatDeliveryError(exc)}`);
             if (isJsonObject(data)) {
                 const src = data;
@@ -633,6 +752,39 @@ export class MessageDeliveryEngine {
         });
         client._clientLog.debug(`_onRawMessageReceived exit: elapsed=${Date.now() - tStart}ms (handler dispatched)`);
     }
+    async onRawMessageRecalled(data) {
+        const client = this.runtime.client;
+        if (!isJsonObject(data))
+            return;
+        const msg = { ...data };
+        if (!('type' in msg))
+            msg.type = 'message.recalled';
+        if (!this.messageTargetsCurrentInstance(msg))
+            return;
+        const seq = msg.seq;
+        if (seq !== undefined && seq !== null && client._aid) {
+            const ns = `p2p:${client._aid}`;
+            const seqNum = Number(seq);
+            if (Number.isFinite(seqNum) && seqNum > 0)
+                client._seqTracker.updateMaxSeen(ns, seqNum);
+            const contigBefore = client._seqTracker.getContiguousSeq(ns);
+            const published = await this.publishOrderedMessage('message.recalled', ns, seq, msg);
+            const contigAfter = client._seqTracker.getContiguousSeq(ns);
+            if (Number(seq) > contigAfter && !published) {
+                this.fillP2pGap().catch((exc) => client._clientLog.warn(`background recall gap fill failed: ${formatDeliveryError(exc)}`));
+            }
+            const contig = client._seqTracker.getContiguousSeq(ns);
+            if (contig > 0) {
+                const ackSeq = this.clampAckSeq('message.ack', 'seq', ns, contig);
+                client._withBackgroundRpc(() => client._ackV2(ackSeq))
+                    .catch((e) => { client._clientLog.debug(`P2P recall auto-ack failed: ${formatDeliveryError(e)}`); });
+            }
+            if (contigAfter !== contigBefore)
+                this.persistSeq(ns);
+            return;
+        }
+        await this.publishMessageRecallTombstone(seq, msg);
+    }
     async processAndPublishMessage(data) {
         const client = this.runtime.client;
         if (!isJsonObject(data)) {
@@ -692,7 +844,10 @@ export class MessageDeliveryEngine {
         else {
             client._clientLog.debug('_onRawGroupMessageCreated enter: non-object payload');
         }
-        this.processAndPublishGroupMessage(data).catch((exc) => {
+        const groupNs = isJsonObject(data)
+            ? String(data.group_id ?? '').trim()
+            : '';
+        this.runPushProcessSerialized(groupNs ? `group:${groupNs}` : '', () => this.processAndPublishGroupMessage(data)).catch((exc) => {
             client._clientLog.warn(`group message decrypt failed: ${formatDeliveryError(exc)}`);
             if (isJsonObject(data)) {
                 const src = data;
@@ -1720,6 +1875,9 @@ export class MessageDeliveryEngine {
         const seqNum = Number(seq);
         if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0 || !ns) {
             client._clientLog.debug(`publish pulled direct(no-seq): event=${event}, ns=${ns || '<none>'}, seq=${String(seq)}`);
+            if (event === 'message.recalled') {
+                return this.publishMessageRecallTombstone(seq, payload);
+            }
             const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, 'pull'));
             if (isPromiseLike(published))
                 await published;
@@ -1733,16 +1891,25 @@ export class MessageDeliveryEngine {
                 client._pendingOrderedMsgs.delete(ns);
             return false;
         }
+        await this.drainOrderedMessages(ns, seqNum, true);
         queue?.delete(seqNum);
         if (queue && queue.size === 0)
             client._pendingOrderedMsgs.delete(ns);
+        if (event === 'message.recalled') {
+            const recallPublished = await this.publishMessageRecallTombstone(seqNum, payload);
+            this.markPublishedSeq(ns, seqNum);
+            client._markPulledSeqDelivered(ns, seqNum);
+            client._clientLog.debug(`publish pulled delivered: event=${event}, ns=${ns}, seq=${seqNum}`);
+            await this.drainOrderedMessages(ns, undefined, true);
+            return recallPublished;
+        }
         const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, 'pull'));
         if (isPromiseLike(published))
             await published;
         this.markPublishedSeq(ns, seqNum);
         client._markPulledSeqDelivered(ns, seqNum);
-        await this.drainOrderedMessages(ns, undefined, true);
         client._clientLog.debug(`publish pulled delivered: event=${event}, ns=${ns}, seq=${seqNum}`);
+        await this.drainOrderedMessages(ns, undefined, true);
         return true;
     }
 }