@agentunion/fastaun 0.5.18 → 0.5.19

package/dist/client/v2-e2ee.js

@@ -825,11 +825,12 @@ export class V2E2EECoordinator {
                     client._clientLog.debug(`V2 sender IK pending retry delivered: key=${key}`);
                     continue;
                 }
-                pending.delete(key);
                 const seq = Number(entry.msg.seq ?? 0);
                 if (entry.groupId) {
-                    if (client._delivery.isSelfSentGroupMessage?.(entry.msg))
+                    if (client._delivery.isSelfSentGroupMessage?.(entry.msg)) {
+                        pending.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');
@@ -837,6 +838,8 @@ export class V2E2EECoordinator {
                 else {
                     await client._publishPulledMessage('message.received', `p2p:${client._aid ?? ''}`, seq, plaintext, false, 'pending_retry');
                 }
+                if (generationIsCurrent())
+                    pending.delete(key);
                 client._clientLog.debug(`V2 sender IK pending retry delivered: key=${key}`);
             }
         }
@@ -1122,6 +1125,11 @@ export class V2E2EECoordinator {
             history_error: { code: 'decrypt_failed', message: reason },
         };
     }
+    ensureDeliveryCurrent(ns, generation) {
+        if (Number(this.client._v2RuntimeGeneration ?? 0) !== generation
+            || 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);
@@ -1250,6 +1258,7 @@ export class V2E2EECoordinator {
     }
     async pullV2TailInternal(params, deferPublish = false) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
         if (params.window_mode !== 'tail')
             throw new ValidationError('window_mode must equal tail');
         if ('ack_up_to_seq' in params || params.force === true)
@@ -1264,6 +1273,14 @@ 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);
+        const decoded = [];
+        for (const msg of page.messages) {
+            this.ensureDeliveryCurrent(ns, generation);
+            const plaintext = await this.decodeP2PWindowMessage(msg, true, false, 'tail', deferPublish);
+            if (plaintext)
+                decoded.push(plaintext);
+        }
+        this.ensureDeliveryCurrent(ns, generation);
         if (ns) {
             client._seqTracker.commitTailWindow(ns, {
                 windowStartSeq: page.windowStart,
@@ -1273,12 +1290,7 @@ export class V2E2EECoordinator {
             });
             client._persistSeq(ns);
             await client._saveSeqTrackerState?.();
-        }
-        const decoded = [];
-        for (const msg of page.messages) {
-            const plaintext = await this.decodeP2PWindowMessage(msg, true, false, 'tail', deferPublish);
-            if (plaintext)
-                decoded.push(plaintext);
+            this.ensureDeliveryCurrent(ns, generation);
         }
         const ack = ns ? client._seqTracker.getContiguousSeq(ns) : 0;
         if (ns)
@@ -1308,6 +1320,7 @@ export class V2E2EECoordinator {
     }
     async pullV2Impl(afterSeq = 0, limit = 50, opts) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
         await client._ensureV2SessionReady('message.pull');
         const ns = client._aid ? `p2p:${client._aid}` : '';
         if (ns)
@@ -1351,6 +1364,7 @@ export class V2E2EECoordinator {
         const pipelineQueue = new V2PullPageQueue(V2_PULL_PIPELINE_QUEUE_CAPACITY);
         let pipelineProducer = null;
         let pipelineStopped = false;
+        const pipelineResume = { current: null };
         const startPipeline = (startAfterSeq, startVolatileCursor) => {
             if (pipelineRunning || pageCount >= maxPages || limit < V2_PULL_MAX_PAGE_LIMIT)
                 return;
@@ -1371,6 +1385,7 @@ export class V2E2EECoordinator {
                     if (pipelineStopped)
                         break;
                     const rawPageMessages = (Array.isArray(result?.messages) ? result.messages : []);
+                    const completed = new Promise((resolve) => { pipelineResume.current = resolve; });
                     const enqueued = await pipelineQueue.put({
                         result,
                         afterSeq: producerAfterSeq,
@@ -1381,6 +1396,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;
@@ -1415,6 +1433,8 @@ export class V2E2EECoordinator {
         };
         const stopPipeline = async () => {
             pipelineStopped = true;
+            pipelineResume.current?.();
+            pipelineResume.current = null;
             pipelineQueue.close();
             if (pipelineProducer) {
                 const producer = pipelineProducer;
@@ -1504,9 +1524,8 @@ 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 = null;
+                let trackerMutated = false;
                 let pageMaxSeq = nextAfterSeq;
                 if (seqs.length > 0) {
                     pageMaxSeq = Math.max(...seqs);
@@ -1624,7 +1643,17 @@ export class V2E2EECoordinator {
                     let ackSeq = pageContigBefore;
                     let contigAdvanced = false;
                     try {
+                        this.ensureDeliveryCurrent(ns, generation);
+                        const window = client._seqTracker.getSyncState?.(ns);
+                        const deliveryTarget = window && commitTarget >= window.tail - 1
+                            ? Math.max(commitTarget, window.head) : commitTarget;
+                        if (deliveryTarget > pageContigBefore) {
+                            await client._drainOrderedMessages(ns, undefined, false, false, 'pull', deliveryTarget);
+                        }
+                        this.ensureDeliveryCurrent(ns, generation);
+                        pageTrackerSnapshot = client._seqTracker.snapshotNamespace?.(ns) ?? null;
                         if (commitTarget > pageContigBefore) {
+                            trackerMutated = true;
                             client._seqTracker.forceContiguousSeq(ns, commitTarget);
                             if (retentionFloor > pageContigBefore) {
                                 client._clientLog.info(`message.v2.pull retention-floor advance: ns=${ns} contiguous=${pageContigBefore} -> retention_floor_seq=${retentionFloor}`);
@@ -1640,19 +1669,21 @@ export class V2E2EECoordinator {
                         contigAdvanced = ackSeq !== pageContigBefore;
                         if (contigAdvanced) {
                             await client._commitSeqTrackerState(ns);
+                            this.ensureDeliveryCurrent(ns, generation);
                             if (pageCount === 1 && deferredServerCursor > 0)
                                 this.clearForwardCursor(ns, ackSeq);
                         }
                     }
                     catch (exc) {
-                        if (typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
-                            client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
+                        if (trackerMutated && Number(client._v2RuntimeGeneration ?? 0) === generation
+                            && client._rpcPipeline?.isPullNamespaceCurrent?.(ns) !== false
+                            && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
+                            (client._seqTracker._restoreNamespaceSnapshotPreservingPush ?? client._seqTracker.restoreNamespaceSnapshot)
+                                .call(client._seqTracker, 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, 'pull');
                     for (const fetch of deferredKeyFetches.values()) {
                         this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
                     }
@@ -1748,6 +1779,10 @@ export class V2E2EECoordinator {
                 if (tailDelayMs > 0)
                     await v2Sleep(tailDelayMs);
                 nextAfterSeq = nextAfter;
+                if (pipelinePage) {
+                    pipelineResume.current?.();
+                    pipelineResume.current = null;
+                }
             }
         }
         finally {
@@ -2128,6 +2163,7 @@ export class V2E2EECoordinator {
     }
     async pullGroupV2TailInternal(params, deferPublish = false) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
         if (params.window_mode !== 'tail')
             throw new ValidationError('window_mode must equal tail');
         if ('ack_up_to_seq' in params || params.force === true)
@@ -2167,6 +2203,15 @@ export class V2E2EECoordinator {
         if (resultAid)
             groupAid = resultAid;
         const page = validateTailPage(result, afterSeq, limit);
+        const decoded = [];
+        for (const msg of page.messages) {
+            this.ensureDeliveryCurrent(ns, generation);
+            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);
         client._seqTracker.commitTailWindow(ns, {
             windowStartSeq: page.windowStart,
             headSeq: page.head,
@@ -2175,13 +2220,7 @@ export class V2E2EECoordinator {
         });
         client._persistSeq(ns);
         await client._saveSeqTrackerState?.();
-        const decoded = [];
-        for (const msg of page.messages) {
-            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);
         const ack = client._seqTracker.getContiguousSeq(ns);
         if (ownsCursor)
             client._delivery.syncProgress(ns, {
@@ -2229,6 +2268,7 @@ export class V2E2EECoordinator {
     }
     async pullGroupV2Impl(groupId, afterSeq = 0, limit = 50, opts) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
         await client._ensureV2SessionReady('group.pull');
         const gid = String(groupId ?? '').trim();
         if (!gid)
@@ -2294,6 +2334,7 @@ export class V2E2EECoordinator {
         const pipelineQueue = new V2PullPageQueue(V2_PULL_PIPELINE_QUEUE_CAPACITY);
         let pipelineProducer = null;
         let pipelineStopped = false;
+        const pipelineResume = { current: null };
         const startPipeline = (startAfterSeq) => {
             if (pipelineRunning || pageCount >= maxPages || limit < V2_PULL_MAX_PAGE_LIMIT || !ownsCursor)
                 return;
@@ -2313,6 +2354,7 @@ export class V2E2EECoordinator {
                     if (pipelineStopped)
                         break;
                     const pageMessages = (Array.isArray(result.messages) ? result.messages : []);
+                    const completed = new Promise((resolve) => { pipelineResume.current = resolve; });
                     const enqueued = await pipelineQueue.put({
                         result,
                         afterSeq: producerAfterSeq,
@@ -2323,6 +2365,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))
@@ -2353,6 +2398,8 @@ export class V2E2EECoordinator {
         };
         const stopPipeline = async () => {
             pipelineStopped = true;
+            pipelineResume.current?.();
+            pipelineResume.current = null;
             pipelineQueue.close();
             if (pipelineProducer) {
                 const producer = pipelineProducer;
@@ -2429,9 +2476,8 @@ 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 = null;
+                let trackerMutated = false;
                 let pageMaxSeq = nextAfterSeq;
                 if (seqs.length > 0) {
                     pageMaxSeq = Math.max(...seqs);
@@ -2582,7 +2628,17 @@ export class V2E2EECoordinator {
                 let contigAdvanced = false;
                 if (ownsCursor) {
                     try {
+                        this.ensureDeliveryCurrent(ns, generation);
+                        const window = client._seqTracker.getSyncState?.(ns);
+                        const deliveryTarget = window && commitTarget >= window.tail - 1
+                            ? Math.max(commitTarget, window.head) : commitTarget;
+                        if (deliveryTarget > pageContigBefore) {
+                            await client._drainOrderedMessages(ns, undefined, false, false, 'pull', deliveryTarget);
+                        }
+                        this.ensureDeliveryCurrent(ns, generation);
+                        pageTrackerSnapshot = client._seqTracker.snapshotNamespace?.(ns) ?? null;
                         if (commitTarget > pageContigBefore) {
+                            trackerMutated = true;
                             client._seqTracker.forceContiguousSeq(ns, commitTarget);
                             if (effectiveFloor > pageContigBefore) {
                                 client._clientLog.info(`group.v2.pull floor advance: ns=${ns} contiguous=${pageContigBefore} -> effective_floor=${effectiveFloor} retention_floor=${retentionFloor} visibility_floor=${visibilityFloor}`);
@@ -2598,19 +2654,21 @@ export class V2E2EECoordinator {
                         contigAdvanced = ackSeq !== pageContigBefore;
                         if (contigAdvanced) {
                             await client._commitSeqTrackerState(ns);
+                            this.ensureDeliveryCurrent(ns, generation);
                             if (pageCount === 1 && deferredServerCursor > 0)
                                 this.clearForwardCursor(ns, ackSeq);
                         }
                     }
                     catch (exc) {
-                        if (typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
-                            client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
+                        if (trackerMutated && Number(client._v2RuntimeGeneration ?? 0) === generation
+                            && client._rpcPipeline?.isPullNamespaceCurrent?.(ns) !== false
+                            && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
+                            (client._seqTracker._restoreNamespaceSnapshotPreservingPush ?? client._seqTracker.restoreNamespaceSnapshot)
+                                .call(client._seqTracker, 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, 'pull');
                 }
                 for (const fetch of deferredKeyFetches.values()) {
                     this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
@@ -2700,6 +2758,10 @@ export class V2E2EECoordinator {
                 if (tailDelayMs > 0)
                     await v2Sleep(tailDelayMs);
                 nextAfterSeq = nextAfter;
+                if (pipelinePage) {
+                    pipelineResume.current?.();
+                    pipelineResume.current = null;
+                }
             }
         }
         finally {
@@ -3241,6 +3303,8 @@ export class V2E2EECoordinator {
             encrypted: true,
             e2ee,
         };
+        if (typeof plaintext.type === 'string' && plaintext.type.startsWith('aun.ownership.'))
+            result.from_aid = fromAid;
         const senderDeviceId = String(aad.from_device ?? '').trim();
         if (senderDeviceId)
             result.sender_device_id = senderDeviceId;