@agentunion/fastaun-browser 0.5.8 → 0.5.9

package/dist/client/v2-e2ee.js

@@ -4,6 +4,10 @@ import { decryptMessage, encryptGroupMessage, encryptP2PMessage, } from '../v2/e
 import { V2Session, V2KeyStore } from '../v2/session/index.js';
 import { ConnectionState, isJsonObject } from '../types.js';
 import { normalizeGroupMentionMode } from './mention-mode.js';
+function pullGateKeyForClient(client, method, params, fallback) {
+    const key = client._rpcPipeline?.pullGateKeyForCall?.(method, params);
+    return typeof key === 'string' && key ? key : fallback;
+}
 const V2_BOOTSTRAP_TTL_MS = 60 * 60 * 1000;
 const V2_RETRYABLE_CODES = new Set([-33011, -33012, -33050, -33052, -33054]);
 const V2_GROUP_STALE_BOOTSTRAP_CODE = -33054;
@@ -1152,7 +1156,9 @@ export class V2E2EECoordinator {
         const ns = client._aid ? `p2p:${client._aid}` : '';
         if (opts?.windowMode === 'tail') {
             if (!opts.gateLocked) {
-                const key = `${ns}|tail|after=${afterSeq}|limit=${limit}`;
+                const key = pullGateKeyForClient(client, 'message.v2.pull', {
+                    window_mode: 'tail', after_seq: afterSeq, limit,
+                }, `${ns}|tail|after=${afterSeq}|limit=${limit}`);
                 return await client._runPullSerialized(key, () => this.pullV2(afterSeq, limit, {
                     ...(opts ?? {}),
                     gateLocked: true,
@@ -1162,7 +1168,9 @@ export class V2E2EECoordinator {
             return Array.isArray(result.messages) ? result.messages : [];
         }
         if (ns && !opts?.gateLocked) {
-            const key = `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`;
+            const key = pullGateKeyForClient(client, 'message.v2.pull', {
+                after_seq: afterSeq, force: opts?.force === true, limit,
+            }, `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
             return await client._runPullSerialized(key, () => this.pullV2(afterSeq, limit, {
                 ...(opts ?? {}),
                 gateLocked: true,
@@ -1171,7 +1179,9 @@ export class V2E2EECoordinator {
         const decrypted = [];
         let nextAfterSeq = opts?.force ? afterSeq : (afterSeq || (ns ? client._seqTracker.getContiguousSeq(ns) : 0));
         let pullGateKey = ns
-            ? `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`
+            ? pullGateKeyForClient(client, 'message.v2.pull', {
+                after_seq: afterSeq, force: opts?.force === true, limit,
+            }, `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`)
             : '';
         const deferredServerCursor = ns ? this.pendingForwardCursor(ns, client._seqTracker.getContiguousSeq(ns)) : 0;
         const deferredForwardAck = ns ? this.pendingForwardAck(ns, client._seqTracker.getContiguousSeq(ns)) : 0;
@@ -1224,6 +1234,7 @@ export class V2E2EECoordinator {
                 : null;
             const pageMaxSeq = seqs.length > 0 ? Math.max(...seqs) : nextAfterSeq;
             const deferredKeyFetches = new Map();
+            let blockedSeq = 0;
             for (const msg of messages) {
                 const seq = Number(msg.seq ?? 0);
                 if (!Number.isFinite(seq) || seq <= 0)
@@ -1270,6 +1281,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, {
@@ -1294,7 +1308,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 = blockedSeq > 0 ? pageContigBefore : Math.max(pageContigBefore, Number.isFinite(retentionFloor) ? retentionFloor : 0, pageCount === 1 ? deferredServerCursor : 0, seqs.length > 0 ? pageMaxSeq : pageContigBefore);
                 let ackSeq = pageContigBefore;
                 let contigAdvanced = false;
                 try {
@@ -1338,7 +1352,8 @@ export class V2E2EECoordinator {
                 const knownServerAckSeq = hasServerAckSeq
                     ? serverAckSeq
                     : (pageCount === 1 ? deferredServerCursor : 0);
-                const ackNeeded = ackSeq > 0
+                const ackNeeded = blockedSeq <= 0
+                    && ackSeq > 0
                     && ackSeq > lastAutoAckSeq
                     && ((hasServerAckSeq && ackSeq > serverAckSeq)
                         || (contigAdvanced && ackSeq > knownServerAckSeq));
@@ -1358,6 +1373,8 @@ export class V2E2EECoordinator {
             }
             const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
             const rawCount = messages.length;
+            if (blockedSeq > 0)
+                break;
             const shouldContinue = shouldContinueForwardPage({
                 rawCount,
                 nextAfterSeq,
@@ -1371,7 +1388,9 @@ export class V2E2EECoordinator {
             if (!shouldContinue)
                 break;
             if (pullGateKey && opts?.gateLocked && client._rpcPipeline?.yieldPullGate) {
-                const nextKey = `${ns}|forward|after=${nextAfter}|force=${String(Boolean(opts?.force))}|limit=${limit}`;
+                const nextKey = pullGateKeyForClient(client, 'message.v2.pull', {
+                    after_seq: nextAfter, force: opts?.force === true, limit,
+                }, `${ns}|forward|after=${nextAfter}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
                 await client._rpcPipeline.yieldPullGate(pullGateKey, nextKey, true);
                 pullGateKey = nextKey;
             }
@@ -1605,7 +1624,10 @@ export class V2E2EECoordinator {
         const ns = `group:${gid}`;
         if (opts?.windowMode === 'tail') {
             if (!opts.gateLocked) {
-                const key = `${ns}|tail|after=${afterSeq}|limit=${limit}`;
+                const key = pullGateKeyForClient(client, 'group.v2.pull', {
+                    group_id: gid, window_mode: 'tail', after_seq: afterSeq, limit,
+                    _group_cursor_params: opts?.cursorParams,
+                }, `${ns}|tail|after=${afterSeq}|limit=${limit}`);
                 return await client._runPullSerialized(key, () => this.pullGroupV2(gid, afterSeq, limit, {
                     ...(opts ?? {}),
                     gateLocked: true,
@@ -1618,7 +1640,10 @@ export class V2E2EECoordinator {
             return Array.isArray(result.messages) ? result.messages : [];
         }
         if (!opts?.gateLocked) {
-            const key = `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`;
+            const key = pullGateKeyForClient(client, 'group.v2.pull', {
+                group_id: gid, after_seq: afterSeq, force: opts?.force === true, limit,
+                _group_cursor_params: opts?.cursorParams,
+            }, `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
             return await client._runPullSerialized(key, () => this.pullGroupV2(gid, afterSeq, limit, {
                 ...(opts ?? {}),
                 gateLocked: true,
@@ -1629,7 +1654,10 @@ export class V2E2EECoordinator {
         const cursorParams = opts?.cursorParams ?? {};
         const ownsCursor = opts?.ownsCursor !== false;
         let pullGateKey = ownsCursor
-            ? `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`
+            ? pullGateKeyForClient(client, 'group.v2.pull', {
+                group_id: gid, after_seq: afterSeq, force: opts?.force === true, limit,
+                _group_cursor_params: cursorParams,
+            }, `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`)
             : '';
         let nextAfterSeq = (opts?.explicitAfterSeq || opts?.force)
             ? afterSeq
@@ -1692,6 +1720,7 @@ export class V2E2EECoordinator {
                 : null;
             const pageMaxSeq = seqs.length > 0 ? Math.max(...seqs) : nextAfterSeq;
             const deferredKeyFetches = new Map();
+            let blockedSeq = 0;
             for (const msg of messages) {
                 const seq = Number(msg.seq ?? 0);
                 if (!Number.isFinite(seq) || seq <= 0)
@@ -1759,6 +1788,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, {
@@ -1781,7 +1813,7 @@ 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, seqs.length > 0 ? pageMaxSeq : pageContigBefore);
+            const commitTarget = blockedSeq > 0 ? pageContigBefore : Math.max(pageContigBefore, Number.isFinite(effectiveFloor) ? effectiveFloor : 0, ownsCursor && pageCount === 1 ? deferredServerCursor : 0, seqs.length > 0 ? pageMaxSeq : pageContigBefore);
             let ackSeq = pageContigBefore;
             let contigAdvanced = false;
             if (ownsCursor) {
@@ -1827,7 +1859,8 @@ export class V2E2EECoordinator {
             const knownServerCursorSeq = hasServerCursor
                 ? cursorCurrentSeq
                 : (ownsCursor && pageCount === 1 ? deferredServerCursor : 0);
-            const ackNeeded = ackSeq > 0
+            const ackNeeded = blockedSeq <= 0
+                && ackSeq > 0
                 && ackSeq > lastAutoAckSeq
                 && ownsCursor
                 && ((hasServerCursor && ackSeq > cursorCurrentSeq)
@@ -1849,6 +1882,8 @@ export class V2E2EECoordinator {
             if (!ownsCursor)
                 break;
             const rawCount = messages.length;
+            if (blockedSeq > 0)
+                break;
             const shouldContinue = shouldContinueForwardPage({
                 rawCount,
                 nextAfterSeq,
@@ -1862,7 +1897,10 @@ export class V2E2EECoordinator {
             if (!shouldContinue)
                 break;
             if (pullGateKey && opts?.gateLocked && client._rpcPipeline?.yieldPullGate) {
-                const nextKey = `${ns}|forward|after=${nextAfter}|force=${String(Boolean(opts?.force))}|limit=${limit}`;
+                const nextKey = pullGateKeyForClient(client, 'group.v2.pull', {
+                    group_id: gid, after_seq: nextAfter, force: opts?.force === true, limit,
+                    _group_cursor_params: cursorParams,
+                }, `${ns}|forward|after=${nextAfter}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
                 await client._rpcPipeline.yieldPullGate(pullGateKey, nextKey, true);
                 pullGateKey = nextKey;
             }