@agentunion/fastaun 0.4.13 → 0.5.1

package/dist/client/delivery.js

@@ -1,9 +1,10 @@
 import { slotIsolationKey } from '../config.js';
 import { normalizeGroupId } from '../group-id.js';
-import { isJsonObject } from '../types.js';
+import { ConnectionState, isJsonObject } from '../types.js';
 const PUSHED_SEQS_LIMIT = 50_000;
 const PENDING_ORDERED_LIMIT = 50_000;
 const GROUP_RECALL_SEEN_LIMIT = 10_000;
+const SEQ_TRACKER_PERSIST_FLUSH_DELAY_MS = 200;
 const APP_MESSAGE_ENVELOPE_KEYS = [
     'module_id', 'message_type', 'type', 'kind', 'version',
     'from', 'from_aid', 'sender_aid', 'to', 'to_aid', 'group_id',
@@ -95,7 +96,8 @@ export class MessageDeliveryEngine {
             const eventPayload = payload;
             client._groupState?.handleGroupChangedV2Membership?.(eventPayload);
             if (eventPayload.action === 'dissolved') {
-                const groupId = normalizeGroupId(String(eventPayload.group_id ?? '')) || String(eventPayload.group_id ?? '').trim();
+                const rawGroupId = eventPayload.group_aid ?? eventPayload.group_id ?? '';
+                const groupId = normalizeGroupId(String(rawGroupId)) || String(rawGroupId).trim();
                 if (groupId)
                     client._cleanupDissolvedGroup?.(groupId);
             }
@@ -495,7 +497,7 @@ export class MessageDeliveryEngine {
                 .catch((e) => { client._clientLog.debug(`group recall auto-ack failed: group=${groupId} ${formatDeliveryError(e)}`); });
         }
         if (contig !== contigBefore)
-            this.saveSeqTrackerState();
+            this.persistSeq(ns);
     }
     publishAppEvent(event, payload, source = 'direct') {
         const client = this.runtime.client;
@@ -565,6 +567,8 @@ export class MessageDeliveryEngine {
     }
     logMessageDebug(stage, source, event, message, opts = {}) {
         const client = this.runtime.client;
+        if (client._isMessageDebugEnabled?.() === false)
+            return;
         const record = {
             stage,
             source,
@@ -666,7 +670,7 @@ export class MessageDeliveryEngine {
                     .catch((e) => { client._clientLog.debug(`P2P auto-ack failed: ${formatDeliveryError(e)}`); });
             }
             if (contigAfter !== contigBefore)
-                this.saveSeqTrackerState();
+                this.persistSeq(ns);
             if (encryptedPush)
                 return;
         }
@@ -743,7 +747,7 @@ export class MessageDeliveryEngine {
                         .catch((e) => { client._clientLog.debug(`group recall auto-ack failed: group=${groupId} ${formatDeliveryError(e)}`); });
                 }
                 if (contigAfter !== contigBefore)
-                    this.saveSeqTrackerState();
+                    this.persistSeq(ns);
                 void published;
                 return;
             }
@@ -766,7 +770,7 @@ export class MessageDeliveryEngine {
                     .catch((e) => { client._clientLog.debug(`group message auto-ack failed: group=${groupId} ${formatDeliveryError(e)}`); });
             }
             if (contigAfter !== contigBefore)
-                this.saveSeqTrackerState();
+                this.persistSeq(ns);
             if (encryptedPush)
                 return;
         }
@@ -822,7 +826,7 @@ export class MessageDeliveryEngine {
             this.prunePushedSeqs(ns);
             if (client._seqTracker.getContiguousSeq(ns) !== afterSeq) {
                 await this.drainOrderedMessages(ns, undefined, true);
-                this.saveSeqTrackerState();
+                this.persistSeq(ns);
             }
             const contig = client._seqTracker.getContiguousSeq(ns);
             if (contig > 0 && contig !== afterSeq) {
@@ -836,9 +840,6 @@ export class MessageDeliveryEngine {
         finally {
             client._gapFillDone.delete(dedupKey);
             client._releasePullGate(ns, token);
-            if (filled > 0 && client._seqTracker.getContiguousSeq(ns) > afterSeq) {
-                void this.fillP2pGap();
-            }
         }
     }
     async fillGroupGap(groupId) {
@@ -865,7 +866,7 @@ export class MessageDeliveryEngine {
             this.prunePushedSeqs(ns);
             if (client._seqTracker.getContiguousSeq(ns) !== afterSeq) {
                 await this.drainOrderedMessages(ns, undefined, true);
-                this.saveSeqTrackerState();
+                this.persistSeq(ns);
             }
             client._clientLog.debug(`group message gap fill done: group=${groupId}, after_seq=${afterSeq}, filled=${filled}`);
         }
@@ -910,6 +911,7 @@ export class MessageDeliveryEngine {
                     device_id: client._deviceId,
                     limit: 50,
                     _pull_gate_locked: true,
+                    _rpc_background: true,
                 });
                 if (!isJsonObject(result))
                     return;
@@ -962,7 +964,7 @@ export class MessageDeliveryEngine {
                 const ackContig = client._seqTracker.getContiguousSeq(ns);
                 await this.drainOrderedMessages(ns);
                 if (ackContig !== pageContigBefore && !hasDissolvedEvent) {
-                    this.saveSeqTrackerState();
+                    this.persistSeq(ns);
                 }
                 if (eventObjects.length > 0 && ackContig > 0 && ackContig !== pageContigBefore) {
                     const ackSeq = this.clampAckSeq('group.ack_events', 'event_seq', ns, ackContig);
@@ -998,6 +1000,7 @@ export class MessageDeliveryEngine {
     }
     async handleGroupChangedEventSeq(data, groupId) {
         const client = this.runtime.client;
+        groupId = normalizeGroupId(groupId) || String(groupId ?? '').trim();
         let needPull = false;
         const rawEventSeq = data.event_seq;
         const eventSeq = Number(rawEventSeq);
@@ -1017,6 +1020,7 @@ export class MessageDeliveryEngine {
         const contigBefore = client._seqTracker.getContiguousSeq(ns);
         if (eventSeq <= contigBefore || client._pushedSeqs.get(ns)?.has(eventSeq)) {
             client._clientLog.debug(`group.changed skipped duplicate/stale: group=${groupId}, event_seq=${eventSeq}, contiguous=${contigBefore}`);
+            this.fireGroupEventAck(groupId, Math.min(eventSeq, contigBefore > 0 ? contigBefore : eventSeq), 'covered push');
             return;
         }
         this.enqueueOrderedMessage(ns, 'group.changed', eventSeq, data);
@@ -1025,7 +1029,7 @@ export class MessageDeliveryEngine {
         await this.drainOrderedMessages(ns);
         if (ackContig > 0 && ackContig !== contigBefore) {
             if (data.action !== 'dissolved')
-                this.saveSeqTrackerState();
+                this.persistSeq(ns);
             const ackSeq = this.clampAckSeq('group.ack_events', 'event_seq', ns, ackContig);
             client._transport.call('group.ack_events', {
                 group_id: groupId,
@@ -1042,6 +1046,53 @@ export class MessageDeliveryEngine {
             });
         }
     }
+    fireGroupEventAck(groupId, eventSeq, reason) {
+        const client = this.runtime.client;
+        const gid = normalizeGroupId(groupId) || String(groupId ?? '').trim();
+        if (!gid)
+            return;
+        const ns = `group_event:${gid}`;
+        const ackSeq = this.clampAckSeq('group.ack_events', 'event_seq', ns, Number(eventSeq) || 0);
+        if (ackSeq <= 0)
+            return;
+        const params = {
+            group_id: gid,
+            event_seq: ackSeq,
+            device_id: client._deviceId,
+            slot_id: client._slotId,
+            _rpc_background: true,
+        };
+        try {
+            Promise.resolve(client.call('group.ack_events', params)).catch((e) => {
+                client._clientLog.debug(`group event ${reason} ack failed: group=${gid} ${formatDeliveryError(e)}`);
+            });
+        }
+        catch (e) {
+            client._clientLog.debug(`group event ${reason} ack failed: group=${gid} ${formatDeliveryError(e)}`);
+        }
+    }
+    fireGroupV2Ack(groupId, upToSeq, reason) {
+        const client = this.runtime.client;
+        const gid = normalizeGroupId(groupId) || String(groupId ?? '').trim();
+        if (!gid)
+            return;
+        const ns = `group:${gid}`;
+        const ackSeq = this.clampAckSeq('group.v2.ack', 'up_to_seq', ns, Number(upToSeq) || 0);
+        if (ackSeq <= 0)
+            return;
+        try {
+            Promise.resolve(client.call('group.v2.ack', {
+                group_id: gid,
+                up_to_seq: ackSeq,
+                _rpc_background: true,
+            })).catch((e) => {
+                client._clientLog.debug(`group.v2 ${reason} ack failed: group=${gid} ${formatDeliveryError(e)}`);
+            });
+        }
+        catch (e) {
+            client._clientLog.debug(`group.v2 ${reason} ack failed: group=${gid} ${formatDeliveryError(e)}`);
+        }
+    }
     isSelfJoinGroupChanged(data) {
         const action = String(data.action ?? '').trim();
         if (!['member_added', 'joined', 'join_approved', 'invite_code_used'].includes(action))
@@ -1083,7 +1134,7 @@ export class MessageDeliveryEngine {
                     const newContig = client._seqTracker.getContiguousSeq(ns);
                     const needPull = pushSeq > newContig && !published;
                     if (newContig !== contigBefore) {
-                        client._saveSeqTrackerState();
+                        this.persistSeq(ns);
                     }
                     if (newContig > 0 && newContig !== contigBefore) {
                         const ackSeq = this.clampAckSeq('message.v2.ack', 'up_to_seq', ns, newContig);
@@ -1155,7 +1206,7 @@ export class MessageDeliveryEngine {
         this.runtime.delivery.setOnlineUnreadHintDrainActive(true);
         try {
             while (client._onlineUnreadHintQueue.size > 0) {
-                if (client.state !== 'ready')
+                if (client.state !== ConnectionState.READY)
                     return;
                 if (client._sessionOptions?.background_sync === false)
                     return;
@@ -1208,8 +1259,9 @@ export class MessageDeliveryEngine {
         client._seqTracker.updateMaxSeen(ns, seq);
         const contigBefore = client._seqTracker.getContiguousSeq(ns);
         client._clientLog.debug(`_onRawGroupV2MessageCreated enter: group=${groupId}, seq=${seq}, contiguous=${contigBefore}, max_seen=${client._seqTracker.getMaxSeenSeq(ns)}`);
-        if (contigBefore === seq) {
+        if (contigBefore === seq || (eventKind === 'group.online_unread_hint' && contigBefore > seq)) {
             client._clientLog.debug(`_onRawGroupV2MessageCreated duplicate push already covered: group=${groupId} seq=${seq}`);
+            this.fireGroupV2Ack(groupId, seq, 'covered push');
             return;
         }
         const afterSeq = client._repairPushContiguousBound(ns, seq, false, '_raw.group.v2.message_created');
@@ -1327,23 +1379,132 @@ export class MessageDeliveryEngine {
     }
     saveSeqTrackerState() {
         const client = this.runtime.client;
-        if (!client._aid)
+        const context = this.currentSeqTrackerContext();
+        if (!context) {
+            this.flushSeqTrackerPending();
             return;
+        }
         const state = client._seqTracker.exportState();
-        if (Object.keys(state).length === 0)
+        const pending = this.seqTrackerPending();
+        if (pending.size > 0 && client._seqTrackerPendingPersistContext === context) {
+            const liveNamespaces = new Set(Object.keys(state));
+            for (const ns of [...pending.keys()]) {
+                if (!liveNamespaces.has(ns))
+                    pending.delete(ns);
+            }
+            if (pending.size === 0)
+                client._seqTrackerPendingPersistContext = null;
+        }
+        if (Object.keys(state).length > 0)
+            this.mergeSeqTrackerPending(context, state);
+        this.flushSeqTrackerPending();
+    }
+    persistSeq(ns, forceSeq) {
+        const client = this.runtime.client;
+        const context = this.currentSeqTrackerContext();
+        if (!context) {
+            this.flushSeqTrackerPending();
+            return;
+        }
+        const seq = forceSeq ?? client._seqTracker.getContiguousSeq(ns);
+        if (!ns || !Number.isFinite(seq) || seq <= 0)
+            return;
+        if (forceSeq !== undefined) {
+            client._seqTracker.forceContiguousSeq(ns, seq);
+        }
+        this.mergeSeqTrackerPending(context, { [ns]: seq });
+        this.scheduleSeqTrackerFlush();
+    }
+    flushSeqTrackerPending() {
+        const client = this.runtime.client;
+        this.cancelSeqTrackerFlushTimer();
+        const context = client._seqTrackerPendingPersistContext;
+        const pending = this.seqTrackerPending();
+        if (!context || pending.size === 0) {
+            client._seqTrackerPendingPersistContext = null;
+            return;
+        }
+        const [aid, deviceId, slotId] = JSON.parse(context);
+        const state = Object.fromEntries(pending.entries());
+        pending.clear();
+        client._seqTrackerPendingPersistContext = null;
+        this.writeSeqTrackerState(aid, deviceId, slotId, state);
+    }
+    dropSeqTrackerPending(ns) {
+        const client = this.runtime.client;
+        const pending = this.seqTrackerPending();
+        pending.delete(ns);
+        if (pending.size === 0) {
+            client._seqTrackerPendingPersistContext = null;
+            this.cancelSeqTrackerFlushTimer();
+        }
+    }
+    currentSeqTrackerContext() {
+        const client = this.runtime.client;
+        if (!client._aid)
+            return null;
+        return JSON.stringify([client._aid, client._deviceId, client._slotId]);
+    }
+    seqTrackerPending() {
+        const client = this.runtime.client;
+        if (!(client._seqTrackerPendingPersist instanceof Map)) {
+            client._seqTrackerPendingPersist = new Map();
+        }
+        return client._seqTrackerPendingPersist;
+    }
+    mergeSeqTrackerPending(context, state) {
+        const client = this.runtime.client;
+        const pending = this.seqTrackerPending();
+        const pendingContext = client._seqTrackerPendingPersistContext;
+        if (pendingContext && pendingContext !== context && pending.size > 0) {
+            this.flushSeqTrackerPending();
+        }
+        client._seqTrackerPendingPersistContext = context;
+        for (const [ns, seq] of Object.entries(state)) {
+            const seqNum = Number(seq);
+            if (ns && Number.isFinite(seqNum) && seqNum > 0) {
+                pending.set(ns, seqNum);
+            }
+        }
+    }
+    scheduleSeqTrackerFlush() {
+        const client = this.runtime.client;
+        const pending = this.seqTrackerPending();
+        if (pending.size === 0)
+            return;
+        if (client._seqTrackerFlushTimer)
+            return;
+        client._seqTrackerFlushTimer = setTimeout(() => {
+            client._seqTrackerFlushTimer = null;
+            this.flushSeqTrackerPending();
+        }, SEQ_TRACKER_PERSIST_FLUSH_DELAY_MS);
+    }
+    cancelSeqTrackerFlushTimer() {
+        const client = this.runtime.client;
+        if (client._seqTrackerFlushTimer) {
+            clearTimeout(client._seqTrackerFlushTimer);
+            client._seqTrackerFlushTimer = null;
+        }
+    }
+    writeSeqTrackerState(aid, deviceId, slotId, state) {
+        const client = this.runtime.client;
+        if (!aid || Object.keys(state).length === 0)
             return;
         try {
             const saveFn = client._tokenStore.saveSeq;
             if (typeof saveFn === 'function') {
                 for (const [ns, seq] of Object.entries(state)) {
-                    saveFn.call(client._tokenStore, client._aid, client._deviceId, client._slotId, ns, seq);
+                    saveFn.call(client._tokenStore, aid, deviceId, slotId, ns, seq);
                 }
                 return;
             }
             const updater = client._tokenStore.updateInstanceState;
             if (typeof updater === 'function') {
-                updater.call(client._tokenStore, client._aid, client._deviceId, client._slotId, (metadata) => {
-                    metadata.seq_tracker_state = state;
+                updater.call(client._tokenStore, aid, deviceId, slotId, (metadata) => {
+                    const existing = isJsonObject(metadata.seq_tracker_state)
+                        ? { ...metadata.seq_tracker_state }
+                        : {};
+                    metadata.seq_tracker_state = { ...existing, ...state };
                     return metadata;
                 });
             }
@@ -1353,9 +1514,9 @@ export class MessageDeliveryEngine {
             client._clientLog.warn(`save SeqTracker state failed: ${error}`);
             client._dispatcher.publish('seq_tracker.persist_error', {
                 phase: 'save',
-                aid: client._aid,
-                device_id: client._deviceId,
-                slot_id: client._slotId,
+                aid,
+                device_id: deviceId,
+                slot_id: slotId,
                 error: String(error),
             }).catch(() => { });
         }
@@ -1365,6 +1526,7 @@ export class MessageDeliveryEngine {
         if (!client._aid || !ns)
             return;
         const seq = client._seqTracker.getContiguousSeq(ns);
+        this.dropSeqTrackerPending(ns);
         try {
             if (seq > 0 && typeof client._tokenStore.saveSeq === 'function') {
                 client._tokenStore.saveSeq(client._aid, client._deviceId, client._slotId, ns, seq);
@@ -1375,6 +1537,18 @@ export class MessageDeliveryEngine {
                 deleteSeq.call(client._tokenStore, client._aid, client._deviceId, client._slotId, ns);
                 return;
             }
+            const updater = client._tokenStore.updateInstanceState;
+            if (seq <= 0 && typeof updater === 'function') {
+                updater.call(client._tokenStore, client._aid, client._deviceId, client._slotId, (metadata) => {
+                    if (isJsonObject(metadata.seq_tracker_state)) {
+                        const next = { ...metadata.seq_tracker_state };
+                        delete next[ns];
+                        metadata.seq_tracker_state = next;
+                    }
+                    return metadata;
+                });
+                return;
+            }
             if (seq > 0) {
                 this.saveSeqTrackerState();
             }
@@ -1434,6 +1608,7 @@ export class MessageDeliveryEngine {
         const queue = client._pendingOrderedMsgs.get(ns);
         if (!queue || queue.size === 0)
             return;
+        let delivered = false;
         while (true) {
             const contig = client._seqTracker.getContiguousSeq(ns);
             const ready = [...queue.keys()]
@@ -1462,10 +1637,14 @@ export class MessageDeliveryEngine {
             await this.publishOrderedQueueItem(ns, item.event, seq, item.payload, 'ordered-drain', pullResponse);
             this.markPublishedSeq(ns, seq);
             client._markOrderedSeqDelivered(ns, seq);
+            delivered = true;
             client._clientLog.debug(`publish ordered drain delivered: ns=${ns}, seq=${seq}, event=${item.event}`);
         }
-        if (queue.size === 0)
+        if (queue.size === 0) {
             client._pendingOrderedMsgs.delete(ns);
+            if (delivered)
+                this.saveSeqTrackerState();
+        }
     }
     async publishOrderedMessage(event, ns, seq, payload) {
         const client = this.runtime.client;
@@ -1511,6 +1690,8 @@ export class MessageDeliveryEngine {
         client._markOrderedSeqDelivered(ns, seqNum);
         client._clientLog.debug(`publish ordered delivered: event=${event}, ns=${ns}, seq=${seqNum}`);
         await this.drainOrderedMessages(ns);
+        if (!client._pendingOrderedMsgs.get(ns))
+            this.saveSeqTrackerState();
         return true;
     }
     async publishOrderedGroupRecall(ns, seq, message) {
@@ -1530,6 +1711,8 @@ export class MessageDeliveryEngine {
         this.markPublishedSeq(ns, seqNum);
         client._markOrderedSeqDelivered?.(ns, seqNum);
         await this.drainOrderedMessages(ns);
+        if (!client._pendingOrderedMsgs.get(ns))
+            this.saveSeqTrackerState();
         return true;
     }
     async publishPulledMessage(event, ns, seq, payload) {