@agentunion/fastaun-browser 0.5.18 → 0.5.19

package/dist/client/v2-e2ee.js

@@ -1000,11 +1000,12 @@ export class V2E2EECoordinator {
                     client._clientLog.debug(`V2 sender IK pending retry delivered: key=${key}`);
                     continue;
                 }
-                client._v2SenderIKPending.delete(key);
                 const seq = Number(entry.msg.seq ?? 0);
                 if (entry.groupId) {
-                    if (client._delivery.isSelfSentGroupMessage?.(entry.msg))
+                    if (client._delivery.isSelfSentGroupMessage?.(entry.msg)) {
+                        client._v2SenderIKPending.delete(key);
                         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');
@@ -1012,6 +1013,7 @@ export class V2E2EECoordinator {
                 else {
                     await client._publishPulledMessage('message.received', `p2p:${client._aid ?? ''}`, seq, plaintext, false, 'pending_retry');
                 }
+                client._v2SenderIKPending.delete(key);
                 client._clientLog.debug(`V2 sender IK pending retry delivered: key=${key}`);
             }
         }
@@ -1110,6 +1112,12 @@ export class V2E2EECoordinator {
             history_error: { code: 'decrypt_failed', message: reason },
         };
     }
+    ensureDeliveryCurrent(ns, generation, inlineGeneration) {
+        if (Number(this.client._v2RuntimeGeneration ?? 0) !== generation
+            || (inlineGeneration !== undefined && !this.client._delivery.isInlineGenerationCurrent(inlineGeneration))
+            || this.client._rpcPipeline?.isPullNamespaceCurrent?.(ns) === false)
+            throw new StateError('pull invalidated');
+    }
     async decodeP2PWindowMessage(msg, publish, history, source, orderedPublish = false) {
         const client = this.client;
         const seq = strictWindowSeq(msg.seq, 'messages[].seq', true);
@@ -1257,6 +1265,8 @@ export class V2E2EECoordinator {
     }
     async pullV2TailInternal(params, deferPublish = false) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
+        const inlineGeneration = client._delivery.captureInlineGeneration?.();
         if (params.window_mode !== 'tail')
             throw new ValidationError('window_mode must equal tail');
         if ('ack_up_to_seq' in params || params.force === true)
@@ -1271,19 +1281,27 @@ export class V2E2EECoordinator {
         }, `${ns}|tail|after=${afterSeq}|limit=${limit}`);
         const result = await client._callRawV2Rpc('message.v2.pull', { window_mode: 'tail', after_seq: afterSeq, limit, _rpc_foreground: true }, pullGateKey);
         const page = validateTailPage(result, afterSeq, limit);
-        if (ns) {
-            client._seqTracker.commitTailWindow(ns, {
-                windowStartSeq: page.windowStart, headSeq: page.head, coveredThroughSeq: page.head, pageLimit: limit,
-            });
-            client._persistSeq(ns);
-            await client._saveSeqTrackerState?.();
-        }
         const decoded = [];
         for (const msg of page.messages) {
+            this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
             const plaintext = await this.decodeP2PWindowMessage(msg, true, false, 'tail', deferPublish);
             if (plaintext)
                 decoded.push(plaintext);
         }
+        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+        if (ns) {
+            const proof = {
+                windowStartSeq: page.windowStart, headSeq: page.head, coveredThroughSeq: page.head, pageLimit: limit,
+            };
+            if (deferPublish)
+                client._delivery.deferTailWindow(ns, proof);
+            else {
+                client._seqTracker.commitTailWindow(ns, proof);
+                client._persistSeq(ns);
+                await client._saveSeqTrackerState?.();
+                this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+            }
+        }
         const ack = ns ? client._seqTracker.getContiguousSeq(ns) : 0;
         if (ns)
             client._delivery.onPullPage?.(ns, decoded.length, result.has_more === true, page.head, typeof result.remaining === 'number' && Number.isSafeInteger(result.remaining) && result.remaining >= 0 ? result.remaining : null, page.messages.length, ack, page.head);
@@ -1320,6 +1338,8 @@ export class V2E2EECoordinator {
     }
     async pullV2Impl(afterSeq = 0, limit = 50, opts) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
+        const inlineGeneration = client._delivery.captureInlineGeneration?.();
         await client._ensureV2SessionReady('message.pull');
         const ns = client._aid ? `p2p:${client._aid}` : '';
         let volatileCursor = String(opts?.afterVolatileCursor ?? client._delivery.volatilePullCursor() ?? '').trim();
@@ -1365,6 +1385,7 @@ export class V2E2EECoordinator {
         const pipelineQueue = new V2PullPageQueue(V2_PULL_PIPELINE_QUEUE_CAPACITY);
         let pipelineProducer = null;
         let pipelineStopped = false;
+        let pipelineResume = null;
         const startPipeline = (startAfterSeq, startVolatileCursor) => {
             if (pipelineRunning || pageCount >= maxPages || limit < V2_PULL_MAX_PAGE_LIMIT)
                 return;
@@ -1385,6 +1406,7 @@ export class V2E2EECoordinator {
                     if (pipelineStopped)
                         break;
                     const rawPageMessages = (Array.isArray(result?.messages) ? result.messages : []);
+                    const completed = new Promise((resolve) => { pipelineResume = resolve; });
                     const enqueued = await pipelineQueue.put({
                         result,
                         afterSeq: producerAfterSeq,
@@ -1395,6 +1417,9 @@ export class V2E2EECoordinator {
                     }, rawPageMessages.length);
                     if (!enqueued || pipelineStopped)
                         break;
+                    await completed;
+                    if (pipelineStopped)
+                        break;
                     const volatileMessages = client._delivery.volatileMessages(rawPageMessages);
                     if (volatileMessages.length > 0)
                         break;
@@ -1429,6 +1454,8 @@ export class V2E2EECoordinator {
         };
         const stopPipeline = async () => {
             pipelineStopped = true;
+            pipelineResume?.();
+            pipelineResume = null;
             pipelineQueue.close();
             if (pipelineProducer) {
                 const producer = pipelineProducer;
@@ -1514,9 +1541,7 @@ export class V2E2EECoordinator {
                     .map((msg) => Number(msg.seq ?? 0))
                     .filter((seq) => Number.isFinite(seq) && seq > 0);
                 const pageContigBefore = ns ? client._seqTracker.getContiguousSeq(ns) : 0;
-                const pageTrackerSnapshot = ns && typeof client._seqTracker.snapshotNamespace === 'function'
-                    ? client._seqTracker.snapshotNamespace(ns)
-                    : null;
+                let pageTrackerSnapshot;
                 const pageMaxSeq = seqs.length > 0 ? Math.max(...seqs) : nextAfterSeq;
                 const pageContiguousSeq = contiguousPullSeq(pageContigBefore, seqs, result.contiguous_seq);
                 const deferredKeyFetches = new Map();
@@ -1622,10 +1647,18 @@ 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, serverAckSeq, blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq);
+                    let commitTarget = Math.max(pageContigBefore, Number.isFinite(retentionFloor) ? retentionFloor : 0, pageCount === 1 ? deferredServerCursor : 0, serverAckSeq, blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq);
+                    commitTarget = client._delivery.pendingTailDeliveryThrough?.(ns, commitTarget) ?? commitTarget;
                     let ackSeq = pageContigBefore;
                     let contigAdvanced = false;
                     try {
+                        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                        const state = client._seqTracker.getSyncState?.(ns);
+                        const deliveryThrough = client._delivery.pendingTailDeliveryThrough?.(ns, state && commitTarget >= state.tail - 1 ? Math.max(commitTarget, state.head) : commitTarget) ?? (state && commitTarget >= state.tail - 1 ? Math.max(commitTarget, state.head) : commitTarget);
+                        await client._drainOrderedMessages(ns, undefined, false, false, deliveryThrough);
+                        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                        pageTrackerSnapshot = client._seqTracker.snapshotNamespace?.(ns);
+                        client._delivery.commitPendingTailWindow?.(ns, commitTarget);
                         if (commitTarget > pageContigBefore) {
                             client._seqTracker.forceContiguousSeq(ns, commitTarget);
                             if (retentionFloor > pageContigBefore) {
@@ -1642,19 +1675,23 @@ export class V2E2EECoordinator {
                         contigAdvanced = ackSeq !== pageContigBefore;
                         if (contigAdvanced) {
                             await client._commitSeqTrackerState(ns);
+                            this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
                             if (pageCount === 1 && deferredServerCursor > 0)
                                 this.clearForwardCursor(ns, ackSeq);
                         }
+                        client._delivery.completePendingTailWindow?.(ns);
                     }
                     catch (exc) {
-                        if (typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
-                            client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
+                        if (Number(client._v2RuntimeGeneration ?? 0) === generation
+                            && (inlineGeneration === undefined || client._delivery.isInlineGenerationCurrent(inlineGeneration))
+                            && client._rpcPipeline?.isPullNamespaceCurrent?.(ns) !== false
+                            && pageTrackerSnapshot !== undefined
+                            && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
+                            client._seqTracker._restoreNamespaceSnapshotPreservingPush(ns, pageTrackerSnapshot);
                         }
                         client._clientLog.error?.(`message.v2.pull Forward commit rolled back: ns=${ns} target=${commitTarget} error=${formatE2EEError(exc)}`);
                         throw exc;
                     }
-                    if (contigAdvanced)
-                        await client._drainOrderedMessages(ns, undefined, false, false);
                     for (const fetch of deferredKeyFetches.values()) {
                         this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
                     }
@@ -1721,6 +1758,10 @@ export class V2E2EECoordinator {
                 });
                 if (!shouldContinue)
                     break;
+                if (pipelinePage) {
+                    pipelineResume?.();
+                    pipelineResume = null;
+                }
                 if (shouldContinueForPipeline && !volatileAdvanced && !pipelineRunning && limit >= V2_PULL_MAX_PAGE_LIMIT) {
                     if (pendingAckSeq > 0) {
                         await this.confirmForwardP2PAck(pendingAckSeq);
@@ -1965,6 +2006,8 @@ export class V2E2EECoordinator {
     }
     async pullGroupV2TailInternal(params, deferPublish = false) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
+        const inlineGeneration = client._delivery.captureInlineGeneration?.();
         if (params.window_mode !== 'tail')
             throw new ValidationError('window_mode must equal tail');
         if ('ack_up_to_seq' in params || params.force === true)
@@ -2000,18 +2043,26 @@ export class V2E2EECoordinator {
         if (resultAid)
             groupAid = resultAid;
         const page = validateTailPage(result, afterSeq, limit);
-        client._seqTracker.commitTailWindow(ns, {
-            windowStartSeq: page.windowStart, headSeq: page.head, coveredThroughSeq: page.head, pageLimit: limit,
-        });
-        client._persistSeq(ns);
-        await client._saveSeqTrackerState?.();
         const decoded = [];
         for (const msg of page.messages) {
+            this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
             client._logMessageDebug?.('tail-raw', 'group.v2.pull', 'group.message_created', msg);
             const plaintext = await this.decodeGroupWindowMessage(msg, groupId, groupAid, true, false, 'tail', deferPublish);
             if (plaintext)
                 decoded.push(plaintext);
         }
+        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+        const proof = {
+            windowStartSeq: page.windowStart, headSeq: page.head, coveredThroughSeq: page.head, pageLimit: limit,
+        };
+        if (deferPublish)
+            client._delivery.deferTailWindow(ns, proof);
+        else {
+            client._seqTracker.commitTailWindow(ns, proof);
+            client._persistSeq(ns);
+            await client._saveSeqTrackerState?.();
+            this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+        }
         const ack = client._seqTracker.getContiguousSeq(ns);
         if (ownsCursor)
             client._delivery.onPullPage?.(ns, decoded.length, result.has_more === true, page.head, typeof result.remaining === 'number' && Number.isSafeInteger(result.remaining) && result.remaining >= 0 ? result.remaining : null, page.messages.length, ack, page.head);
@@ -2056,6 +2107,8 @@ export class V2E2EECoordinator {
     }
     async pullGroupV2Impl(groupId, afterSeq = 0, limit = 50, opts) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
+        const inlineGeneration = client._delivery.captureInlineGeneration?.();
         await client._ensureV2SessionReady('group.pull');
         const gid = String(groupId ?? '').trim();
         if (!gid)
@@ -2117,6 +2170,7 @@ export class V2E2EECoordinator {
         const pipelineQueue = new V2PullPageQueue(V2_PULL_PIPELINE_QUEUE_CAPACITY);
         let pipelineProducer = null;
         let pipelineStopped = false;
+        let pipelineResume = null;
         const startPipeline = (startAfterSeq) => {
             if (pipelineRunning || pageCount >= maxPages || limit < V2_PULL_MAX_PAGE_LIMIT || !ownsCursor)
                 return;
@@ -2136,6 +2190,7 @@ export class V2E2EECoordinator {
                     if (pipelineStopped)
                         break;
                     const pageMessages = (Array.isArray(result?.messages) ? result.messages : []);
+                    const completed = new Promise((resolve) => { pipelineResume = resolve; });
                     const enqueued = await pipelineQueue.put({
                         result,
                         afterSeq: producerAfterSeq,
@@ -2146,6 +2201,9 @@ export class V2E2EECoordinator {
                     }, pageMessages.length);
                     if (!enqueued || pipelineStopped)
                         break;
+                    await completed;
+                    if (pipelineStopped)
+                        break;
                     const messages = deduplicateForwardPageMessages(pageMessages, producerAfterSeq);
                     const seqs = messages.map((msg) => Number(msg.seq ?? 0)).filter((seq) => Number.isFinite(seq) && seq > 0);
                     const nextAfter = Math.max(contiguousPullSeq(producerAfterSeq, seqs, result.contiguous_seq), producerAfterSeq);
@@ -2174,6 +2232,8 @@ export class V2E2EECoordinator {
         };
         const stopPipeline = async () => {
             pipelineStopped = true;
+            pipelineResume?.();
+            pipelineResume = null;
             pipelineQueue.close();
             if (pipelineProducer) {
                 const producer = pipelineProducer;
@@ -2245,9 +2305,7 @@ export class V2E2EECoordinator {
                     .map((msg) => Number(msg.seq ?? 0))
                     .filter((seq) => Number.isFinite(seq) && seq > 0);
                 const pageContigBefore = client._seqTracker.getContiguousSeq(ns);
-                const pageTrackerSnapshot = typeof client._seqTracker.snapshotNamespace === 'function'
-                    ? client._seqTracker.snapshotNamespace(ns)
-                    : null;
+                let pageTrackerSnapshot;
                 const pageMaxSeq = seqs.length > 0 ? Math.max(...seqs) : nextAfterSeq;
                 const pageContiguousSeq = contiguousPullSeq(pageContigBefore, seqs, result.contiguous_seq);
                 const deferredKeyFetches = new Map();
@@ -2383,11 +2441,19 @@ export class V2E2EECoordinator {
                 const retentionFloor = Math.max(Number(result.retention_floor_message_seq ?? result.retention_floor_seq ?? 0), Number(cursor?.retention_floor_seq ?? 0));
                 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, Number.isFinite(effectiveFloor) ? effectiveFloor : 0, ownsCursor && pageCount === 1 ? deferredServerCursor : 0, cursorCurrentSeq, blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq);
+                let commitTarget = Math.max(pageContigBefore, Number.isFinite(effectiveFloor) ? effectiveFloor : 0, ownsCursor && pageCount === 1 ? deferredServerCursor : 0, cursorCurrentSeq, blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq);
+                commitTarget = client._delivery.pendingTailDeliveryThrough?.(ns, commitTarget) ?? commitTarget;
                 let ackSeq = pageContigBefore;
                 let contigAdvanced = false;
                 if (ownsCursor) {
                     try {
+                        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                        const state = client._seqTracker.getSyncState?.(ns);
+                        const deliveryThrough = client._delivery.pendingTailDeliveryThrough?.(ns, state && commitTarget >= state.tail - 1 ? Math.max(commitTarget, state.head) : commitTarget) ?? (state && commitTarget >= state.tail - 1 ? Math.max(commitTarget, state.head) : commitTarget);
+                        await client._drainOrderedMessages(ns, undefined, false, false, deliveryThrough);
+                        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                        pageTrackerSnapshot = client._seqTracker.snapshotNamespace?.(ns);
+                        client._delivery.commitPendingTailWindow?.(ns, commitTarget);
                         if (commitTarget > pageContigBefore) {
                             client._seqTracker.forceContiguousSeq(ns, commitTarget);
                             if (effectiveFloor > pageContigBefore) {
@@ -2404,19 +2470,23 @@ export class V2E2EECoordinator {
                         contigAdvanced = ackSeq !== pageContigBefore;
                         if (contigAdvanced) {
                             await client._commitSeqTrackerState(ns);
+                            this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
                             if (pageCount === 1 && deferredServerCursor > 0)
                                 this.clearForwardCursor(ns, ackSeq);
                         }
+                        client._delivery.completePendingTailWindow?.(ns);
                     }
                     catch (exc) {
-                        if (typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
-                            client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
+                        if (Number(client._v2RuntimeGeneration ?? 0) === generation
+                            && (inlineGeneration === undefined || client._delivery.isInlineGenerationCurrent(inlineGeneration))
+                            && client._rpcPipeline?.isPullNamespaceCurrent?.(ns) !== false
+                            && pageTrackerSnapshot !== undefined
+                            && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
+                            client._seqTracker._restoreNamespaceSnapshotPreservingPush(ns, pageTrackerSnapshot);
                         }
                         client._clientLog.error?.(`group.v2.pull Forward commit rolled back: group=${gid} ns=${ns} target=${commitTarget} error=${formatE2EEError(exc)}`);
                         throw exc;
                     }
-                    if (contigAdvanced)
-                        await client._drainOrderedMessages(ns, undefined, false, false);
                 }
                 for (const fetch of deferredKeyFetches.values()) {
                     this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
@@ -2480,6 +2550,10 @@ export class V2E2EECoordinator {
                 });
                 if (!shouldContinue)
                     break;
+                if (pipelinePage) {
+                    pipelineResume?.();
+                    pipelineResume = null;
+                }
                 if (shouldContinueForPipeline && !pipelineRunning && limit >= V2_PULL_MAX_PAGE_LIMIT) {
                     if (pendingAckSeq > 0) {
                         await this.confirmForwardGroupAck(gid, pendingAckSeq, groupAid);