@agentunion/fastaun 0.5.8 → 0.5.9

package/dist/client/delivery.js

@@ -67,6 +67,8 @@ export class MessageDeliveryEngine {
     realtimeTailHeads = null;
     realtimeSyncing = null;
     pendingGroupPullUpper = null;
+    onlineUnreadHintTargets = null;
+    onlineUnreadHintTasks = null;
     pendingP2PInlineAcks = null;
     pendingGroupInlineAcks = null;
     pendingGroupInlineAckNamespaces = null;
@@ -76,6 +78,20 @@ export class MessageDeliveryEngine {
     constructor(runtime) {
         this.runtime = runtime;
     }
+    isPullOperationCurrent() {
+        const client = this.runtime.client;
+        const generation = client._pullOperationGeneration;
+        if (generation === undefined)
+            return true;
+        const pipeline = client._rpcPipeline;
+        return typeof pipeline?.isPullGenerationCurrent === 'function'
+            ? pipeline.isPullGenerationCurrent(generation)
+            : true;
+    }
+    ensurePullOperationCurrent() {
+        if (!this.isPullOperationCurrent())
+            throw new Error('pull invalidated');
+    }
     forwardCoordinator() {
         const coordinator = this.runtime.client._v2E2EE;
         if (!coordinator
@@ -91,6 +107,7 @@ export class MessageDeliveryEngine {
     }
     async confirmPlainForwardAck(ns, method, ackSeq, groupId = '') {
         const client = this.runtime.client;
+        this.ensurePullOperationCurrent();
         const coordinator = this.forwardCoordinator();
         const generation = this.captureInlineAckGeneration();
         coordinator.recordForwardAck(ns, ackSeq);
@@ -109,6 +126,7 @@ export class MessageDeliveryEngine {
                 _rpc_background: true,
             };
         const result = await client._rpcPipeline.rawCall(method, params, { background: true });
+        this.ensurePullOperationCurrent();
         const actualAckSeq = this.resolveForwardAckSeq(result, ackSeq);
         if (actualAckSeq < ackSeq) {
             throw new Error(`${method} server ACK watermark ${actualAckSeq} is below requested ${ackSeq}`);
@@ -126,6 +144,7 @@ export class MessageDeliveryEngine {
             throw new Error(`${method} response must be an object`);
         }
         const client = this.runtime.client;
+        this.ensurePullOperationCurrent();
         const response = result;
         const messages = deduplicatePlainForwardPageMessages(response.messages, afterSeq);
         const coordinator = this.forwardCoordinator();
@@ -156,25 +175,30 @@ export class MessageDeliveryEngine {
         let committed = false;
         try {
             for (const rawMessage of messages) {
+                this.ensurePullOperationCurrent();
                 const seq = positiveSafeSequenceHint(rawMessage.seq);
                 if (method === 'message.pull') {
                     const appEvent = this.p2pAppEventForMessage(rawMessage);
                     if (await this.publishPulledMessage(appEvent.event, ns, seq, appEvent.payload, false)) {
                         publishedCount += 1;
                     }
+                    this.ensurePullOperationCurrent();
                     continue;
                 }
                 const message = normalizeGroupMentionMode(rawMessage);
                 if (this.recallEventFromGroupMessage(message)) {
                     if (await this.publishGroupRecallTombstone(groupId, seq, message)) {
+                        this.ensurePullOperationCurrent();
                         this.markPublishedSeq(ns, seq);
                         publishedCount += 1;
                     }
                 }
                 else if (await this.publishPulledMessage('group.message_created', ns, seq, message, false)) {
+                    this.ensurePullOperationCurrent();
                     publishedCount += 1;
                 }
             }
+            this.ensurePullOperationCurrent();
             if (messages.length > 0)
                 client._seqTracker.onPullResult(ns, messages, afterSeq);
             const commitTarget = Math.max(client._seqTracker.getContiguousSeq(ns), retentionFloor, visibilityFloor, deferredServerCursor);
@@ -182,18 +206,21 @@ export class MessageDeliveryEngine {
                 client._seqTracker.forceContiguousSeq(ns, commitTarget);
             }
             if (client._seqTracker.getContiguousSeq(ns) !== pageContigBefore) {
+                this.ensurePullOperationCurrent();
                 await this.drainOrderedMessages(ns, undefined, false, false);
+                this.ensurePullOperationCurrent();
                 await client._commitSeqTrackerState(ns);
             }
             committed = true;
         }
         catch (exc) {
-            if (!committed && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
+            if (this.isPullOperationCurrent() && !committed && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
                 client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
                 this.dropSeqTrackerPending(ns);
             }
             throw exc;
         }
+        this.ensurePullOperationCurrent();
         const committedAck = client._seqTracker.getContiguousSeq(ns);
         if (deferredServerCursor > 0 && committedAck >= deferredServerCursor) {
             coordinator.clearForwardCursor(ns, committedAck);
@@ -224,17 +251,21 @@ export class MessageDeliveryEngine {
             if (clampedAckSeq < pendingAckSeq) {
                 throw new Error(`${ackMethod} cannot confirm pending Forward watermark ${pendingAckSeq}`);
             }
+            this.ensurePullOperationCurrent();
             await this.confirmPlainForwardAck(ns, ackMethod, pendingAckSeq, groupId);
         }
         return { rawCount: messages.length, publishedCount };
     }
     resetInlineAckState() {
         this.inlineAckGeneration += 1;
+        void this.runtime.client._rpcPipeline?.invalidatePulls?.();
         this.pendingP2PInlineAcks = null;
         this.pendingGroupInlineAcks = null;
         this.pendingGroupInlineAckNamespaces = null;
         this.realtimeSyncing = null;
         this.pendingGroupPullUpper = null;
+        this.onlineUnreadHintTargets = null;
+        this.onlineUnreadHintTasks = null;
         this.realtimeTailHeads = null;
     }
     inlineGenerationIsCurrent(generation) {
@@ -366,12 +397,15 @@ export class MessageDeliveryEngine {
     }
     async publishOrderedQueueItem(ns, event, seq, payload, source, pullResponse = false) {
         const client = this.runtime.client;
+        this.ensurePullOperationCurrent();
         if (event === 'group.changed' && this.isGroupEventNamespace(ns)) {
             await this.publishOrderedGroupChanged(payload, source);
+            this.ensurePullOperationCurrent();
             return;
         }
         if (event === 'message.recalled') {
             await this.publishMessageRecallTombstone(seq, payload);
+            this.ensurePullOperationCurrent();
             return;
         }
         if (pullResponse) {
@@ -384,6 +418,7 @@ export class MessageDeliveryEngine {
             if (isPromiseLike(published))
                 await published;
         }
+        this.ensurePullOperationCurrent();
     }
     async publishOrderedGroupChanged(payload, source = 'ordered') {
         const client = this.runtime.client;
@@ -1938,6 +1973,18 @@ export class MessageDeliveryEngine {
             raw = response.effective_ack_seq;
         else if (Object.prototype.hasOwnProperty.call(response, 'ack_seq'))
             raw = response.ack_seq;
+        else if (Object.prototype.hasOwnProperty.call(response, 'cursor')) {
+            const cursor = response.cursor;
+            const cursorObject = isJsonObject(cursor) ? cursor : null;
+            if (cursorObject) {
+                if (!Object.prototype.hasOwnProperty.call(cursorObject, 'current_seq'))
+                    return 0;
+                raw = cursorObject.current_seq;
+            }
+            else {
+                raw = cursor;
+            }
+        }
         else
             return requestedSeq;
         return typeof raw === 'number' && Number.isSafeInteger(raw) && raw >= 0 ? raw : 0;
@@ -2020,19 +2067,20 @@ export class MessageDeliveryEngine {
         const state = this.syncState(ns);
         const needsForward = state.ack < state.tail - 1;
         const backgroundEnabled = client._sessionOptions?.background_sync !== false;
-        // Tail 期间到达的新 Push 可能只更新 maxSeen 而没有扩展 Tail 窗口；
-        // 仍须在本次 Tail 周期内补一页 Forward，不能交给外层重复恢复。
-        const tailMissedDuringPull = tailHead !== null
-            && Number(client._seqTracker.getMaxSeenSeq?.(ns) ?? 0) > state.head;
+        // Tail 期间到达的新 Push 可能只更新 maxSeen 而没有扩展 Tail 窗口。
+        const maxSeen = Number(client._seqTracker.getMaxSeenSeq?.(ns) ?? 0);
+        const tailMissedDuringPull = tailHead !== null && maxSeen > state.head;
         const tailForward = tailHead !== null && (needsForward || tailMissedDuringPull);
         const backgroundWindowForward = (order.length === 1 && order[0] === 'forward' && !headForward)
             || (order.length === 1 && order[0] === 'tail' && tailHead === null && needsForward);
         const foregroundForward = headForward || tailForward;
         if (foregroundForward || backgroundEnabled && backgroundWindowForward) {
+            const forwardTarget = Math.max(headForward ? pushSeq : 0, tailForward || backgroundWindowForward ? state.tail - 1 : 0, tailMissedDuringPull ? maxSeen : 0);
+            const requiredPages = Math.max(1, Math.ceil(Math.max(0, forwardTarget - state.ack) / pageLimit));
             result = await run({
                 after_seq: state.ack,
                 limit: pageLimit,
-                ...(headForward ? { max_pages: 2 } : order[0] === 'tail' ? { max_pages: 1 } : {}),
+                ...(headForward ? { max_pages: Math.max(2, requiredPages) } : order[0] === 'tail' ? { max_pages: requiredPages } : {}),
             }, !foregroundForward, headForward || tailMissedDuringPull);
         }
         if (tailHead !== null && this.syncState(ns).ack < this.syncState(ns).tail - 1) {
@@ -2094,18 +2142,19 @@ export class MessageDeliveryEngine {
         const state = this.syncState(ns);
         const needsForward = state.ack < state.tail - 1;
         const backgroundEnabled = client._sessionOptions?.background_sync !== false;
-        // 与 P2P 对称：Tail 期间出现的新 Push 在本次周期内补一页 Forward。
-        const tailMissedDuringPull = tailHead !== null
-            && Number(client._seqTracker.getMaxSeenSeq?.(ns) ?? 0) > state.head;
+        const maxSeen = Number(client._seqTracker.getMaxSeenSeq?.(ns) ?? 0);
+        const tailMissedDuringPull = tailHead !== null && maxSeen > state.head;
         const tailForward = tailHead !== null && (needsForward || tailMissedDuringPull);
         const backgroundWindowForward = (order.length === 1 && order[0] === 'forward' && !headForward)
             || (order.length === 1 && order[0] === 'tail' && tailHead === null && needsForward);
         const foregroundForward = headForward || tailForward;
         if (foregroundForward || backgroundEnabled && backgroundWindowForward) {
+            const forwardTarget = Math.max(headForward ? pushSeq : 0, tailForward || backgroundWindowForward ? state.tail - 1 : 0, tailMissedDuringPull ? maxSeen : 0);
+            const requiredPages = Math.max(1, Math.ceil(Math.max(0, forwardTarget - state.ack) / pageLimit));
             result = await run({
                 after_seq: state.ack,
                 limit: pageLimit,
-                ...(headForward ? { max_pages: 2 } : order[0] === 'tail' ? { max_pages: 1 } : {}),
+                ...(headForward ? { max_pages: Math.max(2, requiredPages) } : order[0] === 'tail' ? { max_pages: requiredPages } : {}),
             }, !foregroundForward, headForward || tailMissedDuringPull);
         }
         if (tailHead !== null && this.syncState(ns).ack < this.syncState(ns).tail - 1) {
@@ -2129,12 +2178,14 @@ export class MessageDeliveryEngine {
         const key = client._rpcPipeline.pullGateKeyForCall('message.pull', request);
         return await client._rpcPipeline.runPullSerialized(key, invoke, background);
     }
-    async runGroupForwardRecovery(groupId, ns, pageLimit, background = false) {
+    async runGroupForwardRecovery(groupId, ns, pageLimit, background = false, throughSeq = 0) {
         const client = this.runtime.client;
-        const request = { group_id: groupId, after_seq: this.syncState(ns).ack, limit: pageLimit, max_pages: 1 };
+        const ack = this.syncState(ns).ack;
+        const maxPages = Math.max(1, Math.ceil(Math.max(0, throughSeq - ack) / pageLimit));
+        const request = { group_id: groupId, after_seq: ack, limit: pageLimit, max_pages: maxPages };
         const invoke = async () => {
             const after = this.syncState(ns).ack;
-            const messages = await client._pullGroupV2(groupId, after, pageLimit, { gateLocked: true, maxPages: 1 });
+            const messages = await client._pullGroupV2(groupId, after, pageLimit, { gateLocked: true, maxPages });
             return { messages, raw_count: messages.length };
         };
         if (!client._rpcPipeline)
@@ -2770,9 +2821,34 @@ export class MessageDeliveryEngine {
         if (!groupId)
             return;
         const ns = `group:${groupId}`;
-        client._safeAsync(this.runGroupForwardRecovery(groupId, ns, 50, true).catch((exc) => {
-            client._clientLog.debug(`online unread hint background Forward failed: ns=${ns} err=${formatDeliveryError(exc)}`);
-        }));
+        const targets = this.onlineUnreadHintTargets ?? new Map();
+        const tasks = this.onlineUnreadHintTasks ?? new Map();
+        this.onlineUnreadHintTargets = targets;
+        this.onlineUnreadHintTasks = tasks;
+        targets.set(ns, Math.max(targets.get(ns) ?? 0, positiveSafeSequenceHint(data.seq)));
+        if (tasks.has(ns))
+            return;
+        const task = Promise.resolve().then(async () => {
+            try {
+                while (true) {
+                    const ackBefore = this.syncState(ns).ack;
+                    await this.runGroupForwardRecovery(groupId, ns, 50, true, targets.get(ns) ?? 0);
+                    const ackAfter = this.syncState(ns).ack;
+                    if (ackAfter >= (targets.get(ns) ?? 0) || ackAfter <= ackBefore)
+                        return;
+                }
+            }
+            catch (exc) {
+                client._clientLog.debug(`online unread hint background Forward failed: ns=${ns} err=${formatDeliveryError(exc)}`);
+            }
+            finally {
+                targets.delete(ns);
+                if (tasks.get(ns) === task)
+                    tasks.delete(ns);
+            }
+        });
+        tasks.set(ns, task);
+        client._safeAsync(task);
     }
     async onRawGroupV2MessageCreated(data, expectedVersion, inlineGeneration) {
         const client = this.runtime.client;
@@ -3250,11 +3326,13 @@ export class MessageDeliveryEngine {
     }
     async drainOrderedMessages(ns, beforeSeq, pullResponse = false, persist = true) {
         const client = this.runtime.client;
+        this.ensurePullOperationCurrent();
         const queue = client._pendingOrderedMsgs.get(ns);
         if (!queue || queue.size === 0)
             return;
         let delivered = false;
         while (true) {
+            this.ensurePullOperationCurrent();
             const contig = client._seqTracker.getContiguousSeq(ns);
             const ready = [...queue.keys()]
                 .filter((seq) => seq <= contig && (beforeSeq === undefined || seq < beforeSeq))
@@ -3280,6 +3358,7 @@ export class MessageDeliveryEngine {
                 continue;
             }
             await this.publishOrderedQueueItem(ns, item.event, seq, item.payload, 'ordered-drain', pullResponse);
+            this.ensurePullOperationCurrent();
             this.markPublishedSeq(ns, seq);
             client._markOrderedSeqDelivered(ns, seq);
             delivered = true;
@@ -3287,16 +3366,20 @@ export class MessageDeliveryEngine {
         }
         if (queue.size === 0) {
             client._pendingOrderedMsgs.delete(ns);
-            if (delivered && persist)
+            if (delivered && persist) {
+                this.ensurePullOperationCurrent();
                 await this.saveSeqTrackerState();
+            }
         }
     }
     async publishOrderedMessage(event, ns, seq, payload) {
         const client = this.runtime.client;
+        this.ensurePullOperationCurrent();
         const seqNum = Number(seq);
         if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0) {
             client._clientLog.debug(`publish ordered direct(no-seq): event=${event}, ns=${ns || '<none>'}, seq=${String(seq)}`);
             await this.publishOrderedQueueItem(ns, event, seqNum, payload, 'ordered');
+            this.ensurePullOperationCurrent();
             return true;
         }
         if (client._pushedSeqs.get(ns)?.has(seqNum)) {
@@ -3314,6 +3397,7 @@ export class MessageDeliveryEngine {
             return false;
         }
         await this.drainOrderedMessages(ns, seqNum);
+        this.ensurePullOperationCurrent();
         if (client._pushedSeqs.get(ns)?.has(seqNum)) {
             client._clientLog.debug(`publish ordered skipped after-drain duplicate: event=${event}, ns=${ns}, seq=${seqNum}`);
             return false;
@@ -3323,19 +3407,24 @@ export class MessageDeliveryEngine {
         if (queue && queue.size === 0)
             client._pendingOrderedMsgs.delete(ns);
         await this.publishOrderedQueueItem(ns, event, seqNum, payload, 'ordered');
+        this.ensurePullOperationCurrent();
         this.markPublishedSeq(ns, seqNum);
         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))
+        if (!client._pendingOrderedMsgs.get(ns)) {
+            this.ensurePullOperationCurrent();
             await this.saveSeqTrackerState();
+        }
         return true;
     }
     async publishOrderedGroupRecall(ns, seq, message) {
         const client = this.runtime.client;
+        this.ensurePullOperationCurrent();
         const seqNum = Number(seq);
         if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0) {
             await this.publishGroupRecallTombstone(ns.replace(/^group:/, ''), seq, message);
+            this.ensurePullOperationCurrent();
             return true;
         }
         // 撤回 tombstone 也占 seq：推进 contiguous 并标记已发布，确保 ack 正常推进、不留空洞。
@@ -3345,24 +3434,31 @@ export class MessageDeliveryEngine {
         }
         client._seqTracker.onMessageSeq(ns, seqNum);
         await this.publishGroupRecallTombstone(ns.replace(/^group:/, ''), seq, message);
+        this.ensurePullOperationCurrent();
         this.markPublishedSeq(ns, seqNum);
         client._markOrderedSeqDelivered?.(ns, seqNum);
         await this.drainOrderedMessages(ns);
-        if (!client._pendingOrderedMsgs.get(ns))
+        if (!client._pendingOrderedMsgs.get(ns)) {
+            this.ensurePullOperationCurrent();
             await this.saveSeqTrackerState();
+        }
         return true;
     }
     async publishPulledMessage(event, ns, seq, payload, persist = true) {
         const client = this.runtime.client;
+        this.ensurePullOperationCurrent();
         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 = await this.publishMessageRecallTombstone(seq, payload);
+                this.ensurePullOperationCurrent();
+                return published;
             }
             const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, 'pull'));
             if (isPromiseLike(published))
                 await published;
+            this.ensurePullOperationCurrent();
             return true;
         }
         const queue = client._pendingOrderedMsgs.get(ns);
@@ -3374,22 +3470,27 @@ export class MessageDeliveryEngine {
             return false;
         }
         await this.drainOrderedMessages(ns, seqNum, true, persist);
+        this.ensurePullOperationCurrent();
         queue?.delete(seqNum);
         if (queue && queue.size === 0)
             client._pendingOrderedMsgs.delete(ns);
         if (event === 'message.recalled') {
             const recallPublished = await this.publishMessageRecallTombstone(seqNum, payload);
+            this.ensurePullOperationCurrent();
             this.markPublishedSeq(ns, seqNum);
             client._clientLog.debug(`publish pulled delivered: event=${event}, ns=${ns}, seq=${seqNum}`);
             await this.drainOrderedMessages(ns, undefined, true, persist);
+            this.ensurePullOperationCurrent();
             return recallPublished;
         }
         const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, 'pull'));
         if (isPromiseLike(published))
             await published;
+        this.ensurePullOperationCurrent();
         this.markPublishedSeq(ns, seqNum);
         client._clientLog.debug(`publish pulled delivered: event=${event}, ns=${ns}, seq=${seqNum}`);
         await this.drainOrderedMessages(ns, undefined, true, persist);
+        this.ensurePullOperationCurrent();
         return true;
     }
 }