@agentunion/fastaun-browser 0.5.2 → 0.5.3

package/dist/client/delivery.d.ts

@@ -29,13 +29,17 @@ export declare class MessageDeliveryEngine {
         event: string;
         payload: EventPayload;
     };
+    messageRecallDedupKey(payload: JsonObject): string;
+    publishMessageRecallTombstone(seq: unknown, message: EventPayload): Promise<boolean>;
     recallEventFromGroupMessage(message: EventPayload): JsonObject | null;
     groupRecallDedupKey(groupId: string, payload: JsonObject): string;
     publishGroupRecallTombstone(groupId: string, seq: unknown, message: EventPayload): Promise<boolean>;
     onRawGroupMessageRecalled(data: EventPayload): Promise<void>;
     publishAppEvent(event: string, payload: EventPayload): Promise<void>;
     messageTargetsCurrentInstance(message: EventPayload): boolean;
+    runPushProcessSerialized(ns: string, operation: () => Promise<void>): Promise<void>;
     onRawMessageReceived(data: EventPayload): void;
+    onRawMessageRecalled(data: EventPayload): Promise<void>;
     processAndPublishMessage(data: EventPayload): Promise<void>;
     onRawGroupMessageCreated(data: EventPayload): void;
     processAndPublishGroupMessage(data: EventPayload): Promise<void>;

package/dist/client/delivery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delivery.d.ts","sourceRoot":"","sources":["../../src/client/delivery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"delivery.d.ts","sourceRoot":"","sources":["../../src/client/delivery.ts"],"names":[],"mappings":"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"}

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 P2P_GAP_FILL_RETRY_LIMIT = 12;
@@ -14,6 +15,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',
@@ -134,6 +142,10 @@ export class MessageDeliveryEngine {
             await this.publishOrderedGroupChanged(payload);
             return;
         }
+        if (event === 'message.recalled') {
+            await this.publishMessageRecallTombstone(seq, payload);
+            return;
+        }
         await client._publishAppEvent(event, payload);
     }
     async publishOrderedGroupChanged(payload) {
@@ -351,6 +363,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)
@@ -392,6 +409,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);
+        client._clientLog.debug(`message.recalled published: seq=${String(seq)} ids=${JSON.stringify(eventPayload.message_ids)}`);
+        return true;
+    }
     recallEventFromGroupMessage(message) {
         if (!isJsonObject(message))
             return null;
@@ -408,6 +476,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)
@@ -438,23 +511,44 @@ 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 三条通道对同一次撤回
         // 可能携带不同来源的时间戳（push 在事务后重取），纳入 recalled_at 会使去重失效、回调多次。
+        const normalizedGroupId = normalizeGroupId(groupId) || String(groupId ?? '').trim();
         const ids = payload.message_ids;
         const idPart = Array.isArray(ids)
             ? ids.map((i) => String(i ?? '').trim()).filter(Boolean).sort().join(',')
-            : String(ids ?? '');
-        return `${groupId}|${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();
@@ -585,12 +679,75 @@ 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);
+        }
+    }
     onRawMessageReceived(data) {
         const client = this.runtime.client;
         client._clientLog.debug(`_onRawMessageReceived enter: from=${data?.from ?? '-'} mid=${data?.message_id ?? '-'} seq=${data?.seq ?? '-'}`);
-        client._safeAsync(this.processAndPublishMessage(data));
+        const ns = isJsonObject(data) && client._aid && data.seq !== undefined
+            ? `p2p:${client._aid}`
+            : '';
+        client._safeAsync(this.runPushProcessSerialized(ns, () => this.processAndPublishMessage(data)));
         client._clientLog.debug('_onRawMessageReceived exit: elapsed=0ms (dispatched async)');
     }
+    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}`;
+            if (seq > 0)
+                client._seqTracker.updateMaxSeen(ns, seq);
+            const contigBefore = client._seqTracker.getContiguousSeq(ns);
+            const seqNeedsPull = client._seqTracker.onMessageSeq(ns, seq);
+            const published = await this.publishOrderedMessage('message.recalled', ns, seq, msg);
+            const contigAfter = client._seqTracker.getContiguousSeq(ns);
+            if (seqNeedsPull && !published) {
+                client._safeAsync(this.fillP2pGap());
+            }
+            const contig = client._seqTracker.getContiguousSeq(ns);
+            if (contig > 0) {
+                const ackSeq = this.clampAckSeq('message.ack', 'seq', ns, contig);
+                client._transport.call('message.ack', {
+                    seq: ackSeq,
+                    device_id: client._deviceId,
+                    slot_id: client._slotId,
+                    _rpc_background: true,
+                }).catch((e) => { client._clientLog.warn(`P2P recall auto-ack failed:${String(e)}`); });
+            }
+            if (contigAfter !== contigBefore)
+                this.persistSeq(ns);
+            return;
+        }
+        await this.publishMessageRecallTombstone(seq, msg);
+    }
     async processAndPublishMessage(data) {
         const client = this.runtime.client;
         try {
@@ -661,7 +818,8 @@ export class MessageDeliveryEngine {
     onRawGroupMessageCreated(data) {
         const client = this.runtime.client;
         client._clientLog.debug(`_onRawGroupMessageCreated enter: group_id=${data?.group_id ?? '-'} from=${data?.from ?? '-'} seq=${data?.seq ?? '-'}`);
-        client._safeAsync(this.processAndPublishGroupMessage(data));
+        const groupId = isJsonObject(data) ? String(data.group_id ?? '').trim() : '';
+        client._safeAsync(this.runPushProcessSerialized(groupId ? `group:${groupId}` : '', () => this.processAndPublishGroupMessage(data)));
         client._clientLog.debug('_onRawGroupMessageCreated exit: elapsed=0ms (dispatched async)');
     }
     async processAndPublishGroupMessage(data) {
@@ -1690,6 +1848,9 @@ export class MessageDeliveryEngine {
         const client = this.runtime.client;
         const seqNum = Number(seq);
         if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0 || !ns) {
+            if (event === 'message.recalled') {
+                return this.publishMessageRecallTombstone(seq, payload);
+            }
             await client._publishAppEvent(event, payload);
             return true;
         }
@@ -1700,9 +1861,15 @@ export class MessageDeliveryEngine {
                 client._pendingOrderedMsgs.delete(ns);
             return false;
         }
+        await this.drainOrderedMessages(ns, seqNum);
         queue?.delete(seqNum);
         if (queue && queue.size === 0)
             client._pendingOrderedMsgs.delete(ns);
+        if (event === 'message.recalled') {
+            const published = await this.publishMessageRecallTombstone(seqNum, payload);
+            this.markPublishedSeq(ns, seqNum);
+            return published;
+        }
         await client._publishAppEvent(event, payload);
         this.markPublishedSeq(ns, seqNum);
         return true;