@agentunion/fastaun 0.5.34 → 0.5.35

package/dist/client/delivery.js

@@ -104,9 +104,73 @@ function deduplicatePlainForwardPageMessages(value, afterSeq) {
 }
 export class MessageDeliveryEngine {
     runtime;
+    forwardAckJobs = new Map();
+    forwardAckTasks = new Set();
+    scheduleForwardAck(ns, seq, send) {
+        const client = this.runtime.client;
+        if (client._closing || seq <= 0)
+            return;
+        const scope = () => [client._aid, client._deviceId, client._slotId, this.captureInlineAckGeneration(),
+            client._v2RuntimeGeneration, client._transport, client._transport?._connectionGeneration,
+            client._transport?._workerGeneration, this.captureSeqNamespaceGeneration(ns)];
+        const current = scope();
+        const previous = this.forwardAckJobs.get(ns);
+        if (previous && previous.scope.every((value, i) => value === current[i])) {
+            if (seq > previous.seq) {
+                previous.seq = seq;
+                previous.send = send;
+            }
+            return;
+        }
+        const job = { seq, scope: current, send };
+        this.forwardAckJobs.set(ns, job);
+        const isCurrent = () => this.forwardAckJobs.get(ns) === job && job.scope.every((value, i) => value === scope()[i]);
+        const task = (async () => {
+            let failures = 0;
+            while (isCurrent()) {
+                const pending = job.seq;
+                try {
+                    await job.send(pending);
+                    failures = 0;
+                    if (job.seq <= pending) {
+                        if (this.forwardAckJobs.get(ns) === job)
+                            this.forwardAckJobs.delete(ns);
+                        return;
+                    }
+                }
+                catch {
+                    if (!isCurrent() || client._closing || client.state !== ConnectionState.READY)
+                        return;
+                    if (job.seq <= pending)
+                        await new Promise(resolve => setTimeout(resolve, Math.min(100 * 2 ** Math.min(failures++, 5), 3000)));
+                }
+            }
+        })().finally(() => {
+            if (this.forwardAckJobs.get(ns) === job)
+                this.forwardAckJobs.delete(ns);
+            this.forwardAckTasks.delete(task);
+        });
+        this.forwardAckTasks.add(task);
+    }
+    drainForwardAcks() {
+        if (!this.forwardAckTasks.size)
+            return;
+        return this.waitForwardAcks();
+    }
+    async waitForwardAcks() {
+        let timer;
+        try {
+            await Promise.race([Promise.allSettled([...this.forwardAckTasks]), new Promise(resolve => { timer = setTimeout(resolve, 1000); })]);
+        }
+        finally {
+            if (timer)
+                clearTimeout(timer);
+        }
+    }
     realtimeTailHeads = null;
     realtimeSyncing = null;
     pendingGroupPullUpper = null;
+    pendingV2GroupPulls = new Set();
     onlineUnreadHintTargets = null;
     onlineUnreadHintTasks = null;
     backgroundPullNeeds = new Map();
@@ -1106,7 +1170,7 @@ export class MessageDeliveryEngine {
             this.onGroupV2AckSucceeded(groupId, actualAckSeq, generation);
         }
     }
-    async commitPlainForwardPage(ns, afterSeq, method, result, groupId = '') {
+    async commitPlainForwardPage(ns, afterSeq, method, result, groupId = '', background = false) {
         if (!isJsonObject(result)) {
             throw new Error(`${method} response must be an object`);
         }
@@ -1250,7 +1314,10 @@ export class MessageDeliveryEngine {
                 throw new Error(`${ackMethod} cannot confirm pending Forward watermark ${pendingAckSeq}`);
             }
             this.ensurePullOperationCurrent(ns);
-            await this.confirmPlainForwardAck(ns, ackMethod, pendingAckSeq, groupId);
+            if (background)
+                this.scheduleForwardAck(ns, pendingAckSeq, seq => this.confirmPlainForwardAck(ns, ackMethod, seq, groupId));
+            else
+                await this.confirmPlainForwardAck(ns, ackMethod, pendingAckSeq, groupId);
         }
         this.syncProgress(ns, {
             rawCount: messages.length,
@@ -1458,6 +1525,7 @@ export class MessageDeliveryEngine {
         this.pendingGroupInlineAckNamespaces = null;
         this.realtimeSyncing = null;
         this.pendingGroupPullUpper = null;
+        this.pendingV2GroupPulls.clear();
         this.onlineUnreadHintTargets = null;
         this.onlineUnreadHintTasks = null;
         this.realtimeTailHeads = null;
@@ -1937,6 +2005,11 @@ export class MessageDeliveryEngine {
                     this.backgroundPullNeeds.delete(ns);
                     continue;
                 }
+                if (this.pendingV2GroupPulls.has(ns)) {
+                    if (!client._v2Session)
+                        continue;
+                    this.pendingV2GroupPulls.delete(ns);
+                }
                 if (ns.startsWith('p2p:') && !this.hasP2pApplicationSubscription())
                     continue;
                 if (need.messageClassRequest && need.messageClassRequest.message_class !== 'sdk_control') {
@@ -2362,6 +2435,8 @@ export class MessageDeliveryEngine {
             return applicationResult({ ...result, message_class: 'sdk_control' });
         if (!APP_SEND_ENVELOPE_METHODS.has(method) || !isJsonObject(result))
             return result;
+        if (result.status === 'echo_return')
+            return result;
         let out = { ...result };
         const serverEnvelope = method === 'group.send' && isJsonObject(out.envelope)
             ? { ...out.envelope }
@@ -2686,8 +2761,10 @@ export class MessageDeliveryEngine {
                 return this.runApplicationPage(namespace, source, async () => { await this.publishAppEvent(event, payload, source, deliveryContext); });
             }
         }
-        if ((event === 'message.received' || event === 'group.message_created') && isJsonObject(payload)) {
-            client._maybeAppendEchoTraceReceive(payload);
+        if (source !== 'echo_return' && (event === 'message.received' || event === 'group.message_created') && isJsonObject(payload)) {
+            if (client._maybeAppendEchoTraceReceive(payload)) {
+                return client._returnReceivedEcho(payload);
+            }
         }
         this.logAppMessagePublish(event, payload, source);
         if (isJsonObject(payload)) {
@@ -2929,7 +3006,14 @@ export class MessageDeliveryEngine {
     }
     async onRawMessageReceived(data) {
         const client = this.runtime.client;
-        if (client._p2pPeerPullEnabled) {
+        if (isJsonObject(data) && !client._echoStarts.has(data))
+            client._echoStarts.set(data, performance.now());
+        const message = isJsonObject(data) ? data : undefined;
+        const payload = message?.payload;
+        const plainEcho = message && !message.encrypted && !message.encrypt && isJsonObject(payload)
+            && !String(payload.type ?? '').trim().toLowerCase().startsWith('e2ee') && !payload.ciphertext
+            && !client._isEncryptedPushMessage(message) && client._isEchoPayload(payload);
+        if (client._p2pPeerPullEnabled && !plainEcho) {
             await this.onPeerPush(data);
             return;
         }
@@ -2998,6 +3082,7 @@ export class MessageDeliveryEngine {
             return;
         }
         const msg = { ...data };
+        client._echoStarts.set(msg, client._echoStarts.get(data) ?? performance.now());
         if (!this.messageTargetsCurrentInstance(msg)) {
             client._clientLog.debug(`P2P push filtered by instance: message_id=${String(msg.message_id ?? '')}, seq=${String(msg.seq ?? '')}, target_device=${String(msg.device_id ?? '')}, target_slot=${String(msg.slot_id ?? '')}, local_device=${client._deviceId}, local_slot=${client._slotId}`);
             return;
@@ -3054,6 +3139,8 @@ export class MessageDeliveryEngine {
     }
     async onRawGroupMessageCreated(data) {
         const client = this.runtime.client;
+        if (isJsonObject(data) && !client._echoStarts.has(data))
+            client._echoStarts.set(data, performance.now());
         const tStart = Date.now();
         if (isJsonObject(data)) {
             client._logMessageDebug('server-push', '_raw.group.message_created', 'group.message_created', data);
@@ -3094,6 +3181,7 @@ export class MessageDeliveryEngine {
         }
         const msg = { ...data };
         const groupId = String(msg.group_id ?? '');
+        client._echoStarts.set(msg, client._echoStarts.get(data) ?? performance.now());
         const seq = msg.seq;
         const payload = msg.payload;
         if (groupId) {
@@ -3210,7 +3298,7 @@ export class MessageDeliveryEngine {
         try {
             // Gap Fill 本身就是 Forward Pull，必须沿用协调器的完整事务：
             // 原始页提交成功后由协调器负责 Piggyback/终端 ACK。
-            const operation = () => client._pullV2(afterSeq, _INTERNAL_MESSAGE_FLOW_LIMITS.pullPageSize, { gateLocked: true });
+            const operation = () => client._pullV2(afterSeq, _INTERNAL_MESSAGE_FLOW_LIMITS.pullPageSize, { gateLocked: true, background: true });
             const messages = await this.runAutomaticPull(ns, operation, (attempt) => client._rpcPipeline
                 ? client._rpcPipeline.runPullSerialized(client._rpcPipeline.pullGateKeyForCall('message.pull', { after_seq: afterSeq, limit: _INTERNAL_MESSAGE_FLOW_LIMITS.pullPageSize }), attempt, true)
                 : client._withBackgroundRpc(attempt));
@@ -3859,7 +3947,7 @@ export class MessageDeliveryEngine {
                     tailHead = this.syncState(ns).head;
                     return tailResult;
                 }
-                const opts = { gateLocked: true };
+                const opts = { gateLocked: true, background };
                 if (request.max_pages !== undefined)
                     opts.maxPages = request.max_pages;
                 const messages = await client._pullV2(after, pageLimit, opts);
@@ -3985,7 +4073,7 @@ export class MessageDeliveryEngine {
         const client = this.runtime.client;
         const request = { after_seq: this.syncState(ns).ack, limit: pageLimit, max_pages: 1 };
         const invoke = async () => {
-            const messages = await client._pullV2(Number(request.after_seq), pageLimit, { gateLocked: true, maxPages: 1 });
+            const messages = await client._pullV2(Number(request.after_seq), pageLimit, { gateLocked: true, maxPages: 1, background });
             return { messages, raw_count: messages.length };
         };
         if (!client._rpcPipeline)
@@ -4843,7 +4931,7 @@ export class MessageDeliveryEngine {
             const coordinator = client._v2E2EE;
             const pendingAckSeq = Number(coordinator.pendingForwardAck?.(ns, committedAck) ?? 0);
             if (pendingAckSeq > 0) {
-                client._safeAsync(coordinator.confirmForwardGroupAck(groupId, pendingAckSeq, String(data.group_aid ?? '').trim() || undefined, true));
+                this.scheduleForwardAck(ns, pendingAckSeq, seq => coordinator.confirmForwardGroupAck(groupId, seq, String(data.group_aid ?? '').trim() || undefined, true));
             }
             else {
                 const pendingNs = this.resolvePendingGroupInlineAckNamespace(ns);
@@ -4904,8 +4992,6 @@ export class MessageDeliveryEngine {
         const groupId = typeof d.group_id === 'string' ? d.group_id.trim() : '';
         const rawSeq = d.seq;
         const inlinePresent = hasNonEmptyInlineMessage(d.inline_message);
-        if (!client._v2Session && !(expectedVersion === 'v1' && inlinePresent))
-            return;
         const seq = this.realtimeHeadSeq(rawSeq, inlinePresent);
         if (!groupId) {
             client._clientLog.debug(`_onRawGroupV2MessageCreated skipped: group=${groupId || '<empty>'}, seq=${String(d.seq ?? '')}`);
@@ -4918,6 +5004,15 @@ export class MessageDeliveryEngine {
             return;
         }
         const eventKind = String(d.kind ?? '').trim();
+        if (!client._v2Session && !(expectedVersion === 'v1' && inlinePresent)) {
+            if (client._sessionOptions?.background_sync !== false) {
+                const ns = `group:${groupId}`;
+                this.recordBackgroundPullNeed(ns, seq, eventKind === 'group.online_unread_hint', true);
+                if (this.backgroundPullNeeds.has(ns))
+                    this.pendingV2GroupPulls.add(ns);
+            }
+            return;
+        }
         if (eventKind === 'group.online_unread_hint') {
             if (client._sessionOptions.background_sync === false)
                 return;
@@ -5052,18 +5147,44 @@ export class MessageDeliveryEngine {
             this.refreshPendingPeers();
             return;
         }
-        if (!client._aid || !client._v2Session)
+        if (!client._aid || !client._v2Session || client._sessionOptions?.background_sync === false)
             return;
         const ns = `p2p:${client._aid}`;
         const generation = this.captureInlineAckGeneration();
-        const afterSeq = this.syncState(ns).ack;
-        this.recordBackgroundPullNeed(ns, positiveSafeSequenceHint(data.seq), true, true);
+        const state = this.syncState(ns);
+        const afterSeq = state.ack;
+        const hintSeq = positiveSafeSequenceHint(data.seq);
+        if (hintSeq > 0 && afterSeq >= Math.max(hintSeq, state.head, Number(client._seqTracker.getMaxSeenSeq?.(ns) ?? 0), Number(client._pendingP2pPullUpper?.get?.(ns) ?? 0))
+            && afterSeq >= state.tail - 1 && !client._pendingOrderedMsgs.get(ns)?.size) {
+            const coordinator = client._v2E2EE;
+            const pendingAckSeq = Number(coordinator.pendingForwardAck?.(ns, afterSeq) ?? 0);
+            if (pendingAckSeq > 0) {
+                this.scheduleForwardAck(ns, pendingAckSeq, seq => coordinator.confirmForwardP2PAck(seq));
+            }
+            else {
+                const pending = this.pendingP2PInlineAcks?.get(ns);
+                if (pending)
+                    this.retryPendingP2PInlineAck(ns, pending.seq, 'covered online hint', afterSeq);
+            }
+            return;
+        }
+        this.recordBackgroundPullNeed(ns, hintSeq, true, true);
         const pullTrigger = this.backgroundPullNeeds.get(ns)?.trigger;
+        const tasks = this.onlineUnreadHintTasks ?? new Map();
+        this.onlineUnreadHintTasks = tasks;
+        if (tasks.has(ns))
+            return;
         let failed = false;
-        client._safeAsync(this.runP2PForwardRecovery(ns, _INTERNAL_MESSAGE_FLOW_LIMITS.pullPageSize, true).catch((exc) => {
+        const task = this.runP2PForwardRecovery(ns, _INTERNAL_MESSAGE_FLOW_LIMITS.pullPageSize, true).then(() => undefined).catch((exc) => {
             failed = true;
             client._clientLog.debug(`P2P online unread hint background Forward failed: ns=${ns} err=${formatDeliveryError(exc)}`);
-        }).finally(() => this.finishBackgroundPull(ns, generation, afterSeq, failed, pullTrigger)));
+        }).finally(() => {
+            if (tasks.get(ns) === task)
+                tasks.delete(ns);
+            this.finishBackgroundPull(ns, generation, afterSeq, failed, pullTrigger);
+        });
+        tasks.set(ns, task);
+        client._safeAsync(task);
     }
     async saveSeqTrackerState() {
         const client = this.runtime.client;