@agentunion/fastaun 0.5.11 → 0.5.12

package/dist/client/v2-e2ee.js

@@ -60,11 +60,16 @@ function deduplicateForwardPageMessages(value, afterSeq) {
     }
     return [...bySeq.entries()].sort(([a], [b]) => a - b).map(([, row]) => row);
 }
-function shouldContinueForwardPage({ rawCount, nextAfterSeq, nextAfter, limit, hasMoreField, hasMore, serverHead, pendingAckSeq, }) {
+function contiguousPullSeq(afterSeq, seqs, proof) {
+    const pulledMax = seqs.length > 0 ? Math.max(...seqs) : 0;
+    const serverProof = safeNonNegativeSeq(proof);
+    return Math.max(afterSeq, pulledMax, serverProof ?? 0);
+}
+function shouldContinueForwardPage({ rawCount, nextAfterSeq, nextAfter, limit, hasMoreField, hasMore, serverHead, observedUpper, pendingAckSeq, }) {
     // 无新 seq 或游标未前进时必须停止，避免错误元数据造成循环。
     if (rawCount <= 0 || nextAfter <= nextAfterSeq)
         return false;
-    if (hasMore || serverHead > nextAfter || pendingAckSeq > 0)
+    if (hasMore || serverHead > nextAfter || observedUpper > nextAfter || pendingAckSeq > 0)
         return true;
     // 仅旧服务缺失 has_more 时，以满页保留兼容续拉。
     return !hasMoreField && limit > 0 && rawCount >= limit;
@@ -767,6 +772,8 @@ export class V2E2EECoordinator {
                 pending.delete(key);
                 const seq = Number(entry.msg.seq ?? 0);
                 if (entry.groupId) {
+                    if (client._delivery.isSelfSentGroupMessage?.(entry.msg))
+                        continue;
                     plaintext = normalizeGroupMentionMode(plaintext, entry.msg, entry.msg.envelope_json);
                     plaintext.group_id = entry.groupId;
                     await client._publishPulledMessage('group.message_created', `group:${entry.groupId}`, seq, plaintext, false, 'pending_retry');
@@ -1051,12 +1058,7 @@ export class V2E2EECoordinator {
         }
         if (publish) {
             const event = client._delivery.p2pAppEventForMessage(plaintext);
-            if (orderedPublish) {
-                await client._delivery.publishOrderedMessage(event.event, client._aid ? `p2p:${client._aid}` : '', seq, event.payload, source);
-            }
-            else {
-                await client._publishAppEvent(event.event, event.payload, source);
-            }
+            await client._publishAppEvent(event.event, event.payload, source);
         }
         return plaintext;
     }
@@ -1077,12 +1079,7 @@ export class V2E2EECoordinator {
                     seq,
                 };
                 if (publish) {
-                    if (orderedPublish) {
-                        await client._delivery.publishOrderedMessage('group.message_recalled', `group:${groupId}`, seq, recallPayload, source);
-                    }
-                    else {
-                        await client._publishAppEvent('group.message_recalled', recallPayload, source);
-                    }
+                    await client._publishAppEvent('group.message_recalled', recallPayload, source);
                 }
                 return recallPayload;
             }
@@ -1129,24 +1126,14 @@ export class V2E2EECoordinator {
             client._clientLog.warn(`Group Tail 单条消息解密失败，连续性证明仍保留: group=${groupId}, seq=${seq}`);
             return null;
         }
+        if (publish && !history && client._delivery.isSelfSentGroupMessage?.(msg)) {
+            return plaintext;
+        }
         if (publish) {
-            if (orderedPublish) {
-                await client._delivery.publishOrderedMessage('group.message_created', `group:${groupId}`, seq, plaintext, source);
-            }
-            else {
-                await client._publishAppEvent('group.message_created', plaintext, source);
-            }
+            await client._publishAppEvent('group.message_created', plaintext, source);
         }
         return plaintext;
     }
-    async applyTailFloor(ns, floor) {
-        const client = this.client;
-        if (!ns || floor <= 0 || client._seqTracker.getContiguousSeq(ns) >= floor)
-            return;
-        client._seqTracker.forceContiguousSeq(ns, floor);
-        client._persistSeq(ns);
-        await client._saveSeqTrackerState?.();
-    }
     async pullV2TailInternal(params, deferPublish = false) {
         const client = this.client;
         if (params.window_mode !== 'tail')
@@ -1159,9 +1146,6 @@ export class V2E2EECoordinator {
         if (ns)
             client._delivery.syncStarted(ns);
         const result = await client._callRawV2Rpc('message.v2.pull', { window_mode: 'tail', after_seq: afterSeq, limit, _rpc_foreground: true });
-        const floor = Number(result.retention_floor_seq ?? 0);
-        const previous = ns ? client._seqTracker.getSyncState(ns) : null;
-        await this.applyTailFloor(ns, Number.isSafeInteger(floor) ? floor : 0);
         const page = validateTailPage(result, afterSeq, limit);
         if (ns) {
             client._seqTracker.commitTailWindow(ns, {
@@ -1180,8 +1164,6 @@ export class V2E2EECoordinator {
                 decoded.push(plaintext);
         }
         const ack = ns ? client._seqTracker.getContiguousSeq(ns) : 0;
-        if (previous && ack > previous.ack)
-            await this.ackV2(ack);
         if (ns)
             client._delivery.syncProgress(ns, {
                 rawCount: page.messages.length,
@@ -1291,6 +1273,7 @@ export class V2E2EECoordinator {
             if (seqs.length > 0) {
                 pageMaxSeq = Math.max(...seqs);
             }
+            const pageContiguousSeq = contiguousPullSeq(pageContigBefore, seqs, result.contiguous_seq);
             const deferredKeyFetches = new Map();
             let blockedSeq = 0;
             const pageDecryptedBefore = decrypted.length;
@@ -1391,7 +1374,7 @@ export class V2E2EECoordinator {
             const serverAckSeq = parsedServerAckSeq ?? 0;
             const retentionFloor = Math.max(0, Number(result.retention_floor_seq ?? 0));
             if (ns) {
-                const commitTarget = Math.max(pageContigBefore, Number.isFinite(retentionFloor) ? retentionFloor : 0, pageCount === 1 ? deferredServerCursor : 0, blockedSeq > 0 ? blockedSeq - 1 : (seqs.length > 0 ? pageMaxSeq : pageContigBefore));
+                const commitTarget = Math.max(pageContigBefore, Number.isFinite(retentionFloor) ? retentionFloor : 0, pageCount === 1 ? deferredServerCursor : 0, serverAckSeq, blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq);
                 let ackSeq = pageContigBefore;
                 let contigAdvanced = false;
                 try {
@@ -1441,7 +1424,7 @@ export class V2E2EECoordinator {
                         || (contigAdvanced && ackSeq > knownServerAckSeq));
                 if (ackNeeded) {
                     this.recordForwardAck(ns, ackSeq);
-                    const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
+                    const nextAfter = Math.max(pageContiguousSeq, nextAfterSeq);
                     const canContinuePage = blockedSeq <= 0 && messages.length > 0 && nextAfter > nextAfterSeq;
                     if (canContinuePage) {
                         pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
@@ -1469,7 +1452,7 @@ export class V2E2EECoordinator {
                     currentSeq: client._seqTracker.getContiguousSeq(ns),
                     targetSeq: serverHead,
                 });
-            const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
+            const nextAfter = Math.max(pageContiguousSeq, nextAfterSeq);
             const rawCount = messages.length;
             if (blockedSeq > 0)
                 break;
@@ -1481,6 +1464,7 @@ export class V2E2EECoordinator {
                 hasMoreField,
                 hasMore,
                 serverHead,
+                observedUpper: Math.max(client._seqTracker.getMaxSeenSeq(ns), Number(client._pendingP2pPullUpper?.get?.(ns) ?? 0)),
                 pendingAckSeq,
             });
             if (!shouldContinue)
@@ -1621,22 +1605,8 @@ export class V2E2EECoordinator {
             client._clientLog.debug(`group.v2.send ok: group=${gid}, use_cache=${useCache}, seq=${String((isJsonObject(result) ? result.seq : '') ?? '')}`);
             return result;
         };
-        const markSentSeq = async (result) => {
-            if (!isJsonObject(result))
-                return;
-            const obj = result;
-            const seq = Number(obj.seq ?? 0);
-            if (!Number.isFinite(seq) || seq <= 0)
-                return;
-            const ns = `group:${gid}`;
-            client._seqTracker.onMessageSeq(ns, seq);
-            client._markPublishedSeq(ns, seq);
-            await client._saveSeqTrackerState();
-            client._clientLog.debug(`group.v2.send marked own seq: group=${gid}, ns=${ns}, seq=${seq}`);
-        };
         try {
             const result = await attempt(true);
-            await markSentSeq(result);
             return client._delivery.attachSendResultEnvelope('group.send', withExplicitGroupAid({
                 group_id: gid,
                 payload,
@@ -1652,7 +1622,6 @@ export class V2E2EECoordinator {
                 client._clientLog.debug(`V2 group speculative send rejected (code=${String(excCode)}), refreshing bootstrap`);
                 this.deleteBootstrapCacheEntry(`group:${gid}`);
                 const result = await attempt(false);
-                await markSentSeq(result);
                 return client._delivery.attachSendResultEnvelope('group.send', withExplicitGroupAid({
                     group_id: gid,
                     payload,
@@ -1842,9 +1811,6 @@ export class V2E2EECoordinator {
         const resultAid = String(result.group_aid ?? result.groupAid ?? '').trim();
         if (resultAid)
             groupAid = resultAid;
-        const floor = Number(result.retention_floor_message_seq ?? result.retention_floor_seq ?? 0);
-        const previous = client._seqTracker.getSyncState(ns);
-        await this.applyTailFloor(ns, Number.isSafeInteger(floor) ? floor : 0);
         const page = validateTailPage(result, afterSeq, limit);
         client._seqTracker.commitTailWindow(ns, {
             windowStartSeq: page.windowStart,
@@ -1862,8 +1828,6 @@ export class V2E2EECoordinator {
                 decoded.push(plaintext);
         }
         const ack = client._seqTracker.getContiguousSeq(ns);
-        if (ack > previous.ack)
-            await this.ackGroupV2(groupId, ack, groupAid);
         if (ownsCursor)
             client._delivery.syncProgress(ns, {
                 rawCount: page.messages.length,
@@ -2019,6 +1983,7 @@ export class V2E2EECoordinator {
             if (seqs.length > 0) {
                 pageMaxSeq = Math.max(...seqs);
             }
+            const pageContiguousSeq = contiguousPullSeq(pageContigBefore, seqs, result.contiguous_seq);
             const deferredKeyFetches = new Map();
             let blockedSeq = 0;
             const pageDecryptedBefore = decrypted.length;
@@ -2059,7 +2024,12 @@ export class V2E2EECoordinator {
                             };
                             v1Msg = normalizeGroupMentionMode(v1Msg, msg, msg.envelope_json);
                             attachGatewayProximity(v1Msg, msg);
-                            await client._publishPulledMessage('group.message_created', ns, seq, v1Msg, false);
+                            if (!client._delivery.isSelfSentGroupMessage?.(msg)) {
+                                await client._publishPulledMessage('group.message_created', ns, seq, v1Msg, false);
+                            }
+                            else {
+                                client._markPublishedSeq(ns, seq);
+                            }
                             decrypted.push(v1Msg);
                             client._clientLog.debug(`group.v2.pull plaintext V1 delivered: group=${gid}, seq=${seq}`);
                             continue;
@@ -2097,7 +2067,12 @@ export class V2E2EECoordinator {
                         if (plaintext) {
                             plaintext.group_id = gid;
                             plaintext.group_aid = eventGroupAid;
-                            await client._publishPulledMessage('group.message_created', ns, seq, plaintext, false);
+                            if (!client._delivery.isSelfSentGroupMessage?.(msg)) {
+                                await client._publishPulledMessage('group.message_created', ns, seq, plaintext, false);
+                            }
+                            else {
+                                client._markPublishedSeq(ns, seq);
+                            }
                             decrypted.push(plaintext);
                         }
                     }
@@ -2130,7 +2105,12 @@ export class V2E2EECoordinator {
                 plaintext = normalizeGroupMentionMode(plaintext, msg, msg.envelope_json);
                 plaintext.group_id = gid;
                 plaintext.group_aid = eventGroupAid;
-                await client._publishPulledMessage('group.message_created', ns, seq, plaintext, false);
+                if (!client._delivery.isSelfSentGroupMessage?.(msg)) {
+                    await client._publishPulledMessage('group.message_created', ns, seq, plaintext, false);
+                }
+                else {
+                    client._markPublishedSeq(ns, seq);
+                }
                 decrypted.push(plaintext);
                 client._logMessageDebug('decrypt-ok', 'group.v2.pull', 'group.message_created', plaintext);
             }
@@ -2140,7 +2120,7 @@ export class V2E2EECoordinator {
             const retentionFloor = Math.max(client._pullRetentionFloor(result, 'retention_floor_message_seq', 'retention_floor_message_seq'));
             const visibilityFloor = Math.max(0, Math.max(0, Number(result.earliest_available_message_seq ?? 1) - 1), Number(cursor?.join_seq ?? 0));
             const effectiveFloor = Math.max(retentionFloor, visibilityFloor);
-            const commitTarget = Math.max(pageContigBefore, effectiveFloor, ownsCursor && pageCount === 1 ? deferredServerCursor : 0, blockedSeq > 0 ? blockedSeq - 1 : (seqs.length > 0 ? pageMaxSeq : pageContigBefore));
+            const commitTarget = Math.max(pageContigBefore, effectiveFloor, ownsCursor && pageCount === 1 ? deferredServerCursor : 0, ownsCursor ? cursorCurrentSeq : 0, blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq);
             let ackSeq = pageContigBefore;
             let contigAdvanced = false;
             if (ownsCursor) {
@@ -2193,7 +2173,7 @@ export class V2E2EECoordinator {
                     || (contigAdvanced && ackSeq > knownServerCursorSeq));
             if (ackNeeded) {
                 this.recordForwardAck(ns, ackSeq);
-                const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
+                const nextAfter = Math.max(pageContiguousSeq, nextAfterSeq);
                 const canContinuePage = blockedSeq <= 0 && messages.length > 0 && nextAfter > nextAfterSeq && ownsCursor;
                 if (canContinuePage) {
                     pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
@@ -2214,7 +2194,7 @@ export class V2E2EECoordinator {
                 currentSeq: client._seqTracker.getContiguousSeq(ns),
                 targetSeq: serverHead,
             });
-            const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
+            const nextAfter = Math.max(pageContiguousSeq, nextAfterSeq);
             if (!ownsCursor)
                 break;
             const rawCount = messages.length;
@@ -2228,6 +2208,7 @@ export class V2E2EECoordinator {
                 hasMoreField,
                 hasMore,
                 serverHead,
+                observedUpper: Math.max(client._seqTracker.getMaxSeenSeq(ns), Number(client._delivery.pendingPullUpper?.(ns) ?? 0)),
                 pendingAckSeq,
             });
             if (!shouldContinue)