@agentunion/fastaun 0.5.13 → 0.5.15

package/dist/client/v2-e2ee.js

@@ -10,6 +10,10 @@ const V2_GROUP_STALE_BOOTSTRAP_CODE = -33054;
 const V2_PULL_DEFAULT_PAGE_LIMIT = 50;
 const V2_PULL_MAX_PAGE_LIMIT = 50;
 const V2_SENDER_IK_SYNC_FETCH_TIMEOUT_MS = 3_000;
+function pullGateKeyForClient(client, method, params, fallback) {
+    const key = client._rpcPipeline?.pullGateKeyForCall?.(method, params);
+    return typeof key === 'string' && key ? key : fallback;
+}
 function strictWindowSeq(value, field, positive = false) {
     if (!Number.isSafeInteger(value))
         throw new ValidationError(`${field} must be an integer`);
@@ -1145,7 +1149,10 @@ export class V2E2EECoordinator {
         const ns = client._aid ? `p2p:${client._aid}` : '';
         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 pullGateKey = pullGateKeyForClient(client, 'message.v2.pull', {
+            window_mode: 'tail', after_seq: afterSeq, limit,
+        }, `${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, {
@@ -1197,14 +1204,18 @@ export class V2E2EECoordinator {
             client._delivery.syncStarted(ns);
         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.pullV2Impl(afterSeq, limit, { ...opts, gateLocked: true }), false));
             }
             const result = await this.pullV2TailInternal({ window_mode: 'tail', after_seq: afterSeq, limit });
             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, async () => this.pullV2Impl(afterSeq, limit, {
                 ...(opts ?? {}),
                 gateLocked: true,
@@ -1214,7 +1225,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, ns ? client._seqTracker.getContiguousSeq(ns) : 0) : 0;
         const deferredForwardAck = ns ? this.pendingForwardAck(ns, client._seqTracker.getContiguousSeq(ns)) : 0;
@@ -1234,7 +1247,7 @@ export class V2E2EECoordinator {
                 limit,
                 ...(opts?.force ? { force: true } : {}),
                 ...(ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}),
-            });
+            }, pullGateKey);
             if (ackUpToSeq > 0) {
                 const actualAckSeq = client._delivery.resolveP2PPullAckSeq(result, ackUpToSeq);
                 if (actualAckSeq >= ackUpToSeq) {
@@ -1470,7 +1483,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;
             }
@@ -1793,21 +1808,30 @@ export class V2E2EECoordinator {
         const afterSeq = strictWindowSeq(params.after_seq ?? 0, 'after_seq');
         const limit = strictWindowLimit(params.limit ?? V2_PULL_DEFAULT_PAGE_LIMIT);
         const ns = `group:${groupId}`;
-        const cursorParams = isJsonObject(params._group_cursor_params)
-            ? params._group_cursor_params : params;
+        const explicitCursorParams = isJsonObject(params._group_cursor_params)
+            ? params._group_cursor_params : {};
+        const cursorParams = Object.keys(explicitCursorParams).length > 0 ? explicitCursorParams : params;
         const requestDeviceId = String(cursorParams.device_id ?? '').trim();
         const requestSlotId = String(cursorParams.slot_id ?? '').trim();
         const ownsCursor = (!requestDeviceId || requestDeviceId === String(client._deviceId ?? ''))
             && (!requestSlotId || requestSlotId === String(client._slotId ?? ''));
         if (ownsCursor)
             client._delivery.syncStarted(ns);
+        const pullGateKey = pullGateKeyForClient(client, 'group.v2.pull', {
+            group_id: groupId,
+            window_mode: 'tail',
+            after_seq: afterSeq,
+            limit,
+            _group_cursor_params: explicitCursorParams,
+        }, `${ns}|tail|after=${afterSeq}|limit=${limit}`);
         const result = await client._callRawV2Rpc('group.v2.pull', withExplicitGroupAid({
             group_id: groupId,
             window_mode: 'tail',
             after_seq: afterSeq,
             limit,
+            _group_cursor_params: explicitCursorParams,
             _rpc_foreground: true,
-        }, groupAid));
+        }, groupAid), pullGateKey);
         const resultAid = String(result.group_aid ?? result.groupAid ?? '').trim();
         if (resultAid)
             groupAid = resultAid;
@@ -1884,7 +1908,10 @@ export class V2E2EECoordinator {
             client._delivery.syncStarted(ns);
         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.pullGroupV2Impl(gid, afterSeq, limit, {
                     ...opts,
                     gateLocked: true,
@@ -1892,6 +1919,7 @@ export class V2E2EECoordinator {
             }
             const result = await this.pullGroupV2TailInternal({
                 ...(opts?.cursorParams ?? {}),
+                _group_cursor_params: opts?.cursorParams,
                 group_id: String(opts.wireGroupId ?? gid),
                 group_aid: groupAid || undefined,
                 window_mode: 'tail',
@@ -1901,7 +1929,10 @@ export class V2E2EECoordinator {
             return (Array.isArray(result.messages) ? result.messages : []);
         }
         if (!opts?.gateLocked) {
-            const key = `${ns}|forward|after=${afterSeq}|force=${opts?.force === true}|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=${opts?.force === true}|limit=${limit}`);
             return await client._runPullSerialized(key, async () => this.pullGroupV2Impl(gid, afterSeq, limit, {
                 ...(opts ?? {}),
                 gateLocked: true,
@@ -1912,9 +1943,10 @@ export class V2E2EECoordinator {
         const wireGroupId = String(opts?.wireGroupId ?? groupId ?? '').trim() || gid;
         const cursorParams = opts?.cursorParams ?? {};
         const ownsCursor = opts?.ownsCursor !== false;
-        let pullGateKey = ownsCursor
-            ? `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`
-            : '';
+        let pullGateKey = 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
             : (afterSeq || client._seqTracker.getContiguousSeq(ns));
@@ -1940,7 +1972,7 @@ export class V2E2EECoordinator {
                 ...cursorParams,
                 ...(opts?.force ? { force: true } : {}),
                 ...(ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}),
-            }, groupAid));
+            }, groupAid), pullGateKey);
             if (ackUpToSeq > 0) {
                 const actualAckSeq = client._delivery.resolveGroupPullAckSeq(result, ackUpToSeq);
                 if (actualAckSeq >= ackUpToSeq) {
@@ -2214,7 +2246,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;
             }