@agentunion/fastaun 0.5.8 → 0.5.10

package/dist/client/v2-e2ee.js

@@ -298,6 +298,10 @@ export class V2E2EECoordinator {
         this.pendingForwardCursors.clear();
         this.pendingForwardAcks.clear();
     }
+    hasPendingSenderIKWork() {
+        return this.senderIKSyncFetches.size > 0
+            || Boolean(this.client._v2SenderIKFetching?.size);
+    }
     pendingForwardCursor(ns, localAck) {
         if (!ns)
             return 0;
@@ -648,6 +652,7 @@ export class V2E2EECoordinator {
         finally {
             if (this.senderIKSyncFetches.get(fetchKey) === task)
                 this.senderIKSyncFetches.delete(fetchKey);
+            client._rpcPipeline?.requestPullDrainedCheck?.();
         }
     }
     scheduleSenderIKPending(args) {
@@ -679,6 +684,10 @@ export class V2E2EECoordinator {
     }
     async resolveSenderIKPending(fromAid, senderDeviceId, groupId, fetchKey) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
+        const pending = client._v2SenderIKPending;
+        const fetching = client._v2SenderIKFetching;
+        const generationIsCurrent = () => Number(client._v2RuntimeGeneration ?? 0) === generation;
         try {
             const session = client._v2Session;
             if (session && fromAid) {
@@ -718,7 +727,9 @@ export class V2E2EECoordinator {
                     await this.getV2SenderPubDer(fromAid, senderDeviceId);
                 }
             }
-            const pendingItems = [...client._v2SenderIKPending.entries()].filter(([, entry]) => entry.fromAid === fromAid && entry.senderDeviceId === senderDeviceId && entry.groupId === groupId);
+            if (!generationIsCurrent())
+                return;
+            const pendingItems = [...pending.entries()].filter(([, entry]) => entry.fromAid === fromAid && entry.senderDeviceId === senderDeviceId && entry.groupId === groupId);
             for (const [key, entry] of pendingItems) {
                 let plaintext = null;
                 const retryStatus = {};
@@ -727,9 +738,12 @@ export class V2E2EECoordinator {
                 }
                 catch (exc) {
                     client._clientLog.warn(`V2 sender IK pending retry raised: key=${key} err=${formatE2EEError(exc)}`);
-                    client._v2SenderIKPending.delete(key);
+                    if (generationIsCurrent())
+                        pending.delete(key);
                     continue;
                 }
+                if (!generationIsCurrent())
+                    return;
                 if (plaintext === null) {
                     if (retryStatus.deferred) {
                         client._clientLog.warn(`V2 pending retry still missing key material: key=${key}`);
@@ -741,10 +755,16 @@ export class V2E2EECoordinator {
                     const safeEvent = this.safeUndecryptablePushEvent(entry.msg, isGroup);
                     safeEvent._decrypt_error = 'sender IK pending retry failed';
                     safeEvent._decrypt_stage = 'sender_ik_pending_retry';
-                    await client._publishAppEvent(eventName, safeEvent, 'pending_retry');
+                    try {
+                        await client._publishAppEvent(eventName, safeEvent, 'pending_retry');
+                    }
+                    finally {
+                        if (generationIsCurrent())
+                            pending.delete(key);
+                    }
                     continue;
                 }
-                client._v2SenderIKPending.delete(key);
+                pending.delete(key);
                 const seq = Number(entry.msg.seq ?? 0);
                 if (entry.groupId) {
                     plaintext = normalizeGroupMentionMode(plaintext, entry.msg, entry.msg.envelope_json);
@@ -758,7 +778,10 @@ export class V2E2EECoordinator {
             }
         }
         finally {
-            client._v2SenderIKFetching.delete(fetchKey);
+            if (generationIsCurrent() && client._v2SenderIKFetching === fetching) {
+                fetching.delete(fetchKey);
+                client._rpcPipeline?.requestPullDrainedCheck?.();
+            }
         }
     }
     async buildV2P2PEnvelope(opts) {
@@ -924,9 +947,10 @@ export class V2E2EECoordinator {
             throw new ValidationError("message.send requires 'to'");
         if (!isJsonObject(payload))
             throw new ValidationError('message.send payload must be a dict for V2 encryption');
+        const messageId = String(opts?.messageId ?? '').trim() || `m-${crypto.randomUUID().replace(/-/g, '')}`;
         client._logMessageDebug('send-plaintext', 'message.send.v2', 'message.send', {
             to: toAid,
-            message_id: opts?.messageId ?? '',
+            message_id: messageId,
             payload,
         }, { payloadOverride: payload });
         const attempt = async (useCache) => {
@@ -934,7 +958,7 @@ export class V2E2EECoordinator {
             const envelope = await client._buildV2P2PEnvelope({
                 to: toAid,
                 payload,
-                messageId: opts?.messageId,
+                messageId,
                 timestamp: opts?.timestamp,
                 protectedHeaders: opts?.protectedHeaders,
                 context: opts?.context,
@@ -943,6 +967,7 @@ export class V2E2EECoordinator {
             const result = await client.call('message.send', {
                 to: toAid,
                 payload: envelope,
+                message_id: messageId,
                 encrypt: false,
                 _skip_send_result_envelope: true,
             });
@@ -954,7 +979,7 @@ export class V2E2EECoordinator {
             return client._delivery.attachSendResultEnvelope('message.send', {
                 to: toAid,
                 payload,
-                message_id: opts?.messageId,
+                message_id: messageId,
                 timestamp: opts?.timestamp,
                 protected_headers: opts?.protectedHeaders,
                 context: opts?.context,
@@ -969,7 +994,7 @@ export class V2E2EECoordinator {
                 return client._delivery.attachSendResultEnvelope('message.send', {
                     to: toAid,
                     payload,
-                    message_id: opts?.messageId,
+                    message_id: messageId,
                     timestamp: opts?.timestamp,
                     protected_headers: opts?.protectedHeaders,
                     context: opts?.context,
@@ -1022,7 +1047,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);
+                await client._delivery.publishOrderedMessage(event.event, client._aid ? `p2p:${client._aid}` : '', seq, event.payload, source);
             }
             else {
                 await client._publishAppEvent(event.event, event.payload, source);
@@ -1079,7 +1104,7 @@ export class V2E2EECoordinator {
         }
         if (publish) {
             if (orderedPublish) {
-                await client._delivery.publishOrderedMessage('group.message_created', `group:${groupId}`, seq, plaintext);
+                await client._delivery.publishOrderedMessage('group.message_created', `group:${groupId}`, seq, plaintext, source);
             }
             else {
                 await client._publishAppEvent('group.message_created', plaintext, source);
@@ -1227,6 +1252,7 @@ export class V2E2EECoordinator {
                 pageMaxSeq = Math.max(...seqs);
             }
             const deferredKeyFetches = new Map();
+            let blockedSeq = 0;
             for (const msg of messages) {
                 const seq = Number(msg.seq ?? 0);
                 if (!Number.isFinite(seq) || seq <= 0)
@@ -1275,6 +1301,9 @@ export class V2E2EECoordinator {
                 }
                 const deferStatus = {};
                 const plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true);
+                if (deferStatus.deferred) {
+                    blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq) : seq;
+                }
                 if (deferStatus.deferred && deferStatus.fromAid) {
                     const key = `${deferStatus.fromAid}\u0000${deferStatus.senderDeviceId ?? ''}\u0000${deferStatus.groupId ?? ''}`;
                     deferredKeyFetches.set(key, {
@@ -1301,7 +1330,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, seqs.length > 0 ? pageMaxSeq : pageContigBefore);
+                const commitTarget = Math.max(pageContigBefore, Number.isFinite(retentionFloor) ? retentionFloor : 0, pageCount === 1 ? deferredServerCursor : 0, blockedSeq > 0 ? blockedSeq - 1 : (seqs.length > 0 ? pageMaxSeq : pageContigBefore));
                 let ackSeq = pageContigBefore;
                 let contigAdvanced = false;
                 try {
@@ -1333,7 +1362,7 @@ export class V2E2EECoordinator {
                     throw exc;
                 }
                 if (contigAdvanced)
-                    await client._drainOrderedMessages(ns, undefined, false, false);
+                    await client._drainOrderedMessages(ns, undefined, false, false, 'pull');
                 for (const fetch of deferredKeyFetches.values()) {
                     this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
                 }
@@ -1352,7 +1381,7 @@ export class V2E2EECoordinator {
                 if (ackNeeded) {
                     this.recordForwardAck(ns, ackSeq);
                     const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
-                    const canContinuePage = messages.length > 0 && nextAfter > nextAfterSeq;
+                    const canContinuePage = blockedSeq <= 0 && messages.length > 0 && nextAfter > nextAfterSeq;
                     if (canContinuePage) {
                         pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
                         lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
@@ -1483,9 +1512,10 @@ export class V2E2EECoordinator {
         const groupAid = String(opts?.groupAid ?? '').trim();
         if (!isJsonObject(payload))
             throw new ValidationError('group.send payload must be a dict for V2 encryption');
+        const messageId = String(opts?.messageId ?? '').trim() || `m-${crypto.randomUUID().replace(/-/g, '')}`;
         client._logMessageDebug('send-plaintext', 'group.send.v2', 'group.send', withExplicitGroupAid({
             group_id: gid,
-            message_id: opts?.messageId ?? '',
+            message_id: messageId,
             payload,
         }, groupAid), { payloadOverride: payload });
         const attempt = async (useCache) => {
@@ -1493,7 +1523,7 @@ export class V2E2EECoordinator {
             const envelope = await client._buildV2GroupEnvelope({
                 groupId: gid,
                 payload,
-                messageId: opts?.messageId,
+                messageId,
                 timestamp: opts?.timestamp,
                 protectedHeaders: opts?.protectedHeaders,
                 context: opts?.context,
@@ -1525,7 +1555,7 @@ export class V2E2EECoordinator {
             return client._delivery.attachSendResultEnvelope('group.send', withExplicitGroupAid({
                 group_id: gid,
                 payload,
-                message_id: opts?.messageId,
+                message_id: messageId,
                 timestamp: opts?.timestamp,
                 protected_headers: opts?.protectedHeaders,
                 context: opts?.context,
@@ -1541,7 +1571,7 @@ export class V2E2EECoordinator {
                 return client._delivery.attachSendResultEnvelope('group.send', withExplicitGroupAid({
                     group_id: gid,
                     payload,
-                    message_id: opts?.messageId,
+                    message_id: messageId,
                     timestamp: opts?.timestamp,
                     protected_headers: opts?.protectedHeaders,
                     context: opts?.context,
@@ -1885,6 +1915,7 @@ export class V2E2EECoordinator {
                 pageMaxSeq = Math.max(...seqs);
             }
             const deferredKeyFetches = new Map();
+            let blockedSeq = 0;
             for (const msg of messages) {
                 const seq = Number(msg.seq ?? 0);
                 if (!Number.isFinite(seq) || seq <= 0)
@@ -1954,6 +1985,9 @@ export class V2E2EECoordinator {
                 }
                 const deferStatus = {};
                 let plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true);
+                if (deferStatus.deferred) {
+                    blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq) : seq;
+                }
                 if (deferStatus.deferred && deferStatus.fromAid) {
                     const key = `${deferStatus.fromAid}\u0000${deferStatus.senderDeviceId ?? ''}\u0000${deferStatus.groupId ?? ''}`;
                     deferredKeyFetches.set(key, {
@@ -1979,7 +2013,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, seqs.length > 0 ? pageMaxSeq : pageContigBefore);
+            const commitTarget = Math.max(pageContigBefore, effectiveFloor, ownsCursor && pageCount === 1 ? deferredServerCursor : 0, blockedSeq > 0 ? blockedSeq - 1 : (seqs.length > 0 ? pageMaxSeq : pageContigBefore));
             let ackSeq = pageContigBefore;
             let contigAdvanced = false;
             if (ownsCursor) {
@@ -2012,7 +2046,7 @@ export class V2E2EECoordinator {
                     throw exc;
                 }
                 if (contigAdvanced)
-                    await client._drainOrderedMessages(ns, undefined, false, false);
+                    await client._drainOrderedMessages(ns, undefined, false, false, 'pull');
             }
             for (const fetch of deferredKeyFetches.values()) {
                 this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
@@ -2033,7 +2067,7 @@ export class V2E2EECoordinator {
             if (ackNeeded) {
                 this.recordForwardAck(ns, ackSeq);
                 const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
-                const canContinuePage = messages.length > 0 && nextAfter > nextAfterSeq && ownsCursor;
+                const canContinuePage = blockedSeq <= 0 && messages.length > 0 && nextAfter > nextAfterSeq && ownsCursor;
                 if (canContinuePage) {
                     pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
                     lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);