@agentunion/fastaun-browser 0.5.14 → 0.5.16

package/dist/client/v2-e2ee.js

@@ -1176,7 +1176,10 @@ export class V2E2EECoordinator {
         const ns = client._aid ? `p2p:${client._aid}` : '';
         if (ns)
             client._delivery.onPullStarted?.(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, {
@@ -1277,7 +1280,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) ?? 0;
                 if (actualAckSeq >= ackUpToSeq) {
@@ -1655,17 +1658,26 @@ 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.onPullStarted?.(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, _rpc_foreground: true,
-        }, groupAid));
+            group_id: groupId, window_mode: 'tail', after_seq: afterSeq, limit,
+            _group_cursor_params: explicitCursorParams, _rpc_foreground: true,
+        }, groupAid), pullGateKey);
         const resultAid = String(result.group_aid ?? result.groupAid ?? '').trim();
         if (resultAid)
             groupAid = resultAid;
@@ -1745,6 +1757,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', after_seq: afterSeq, limit,
             });
@@ -1766,12 +1779,10 @@ export class V2E2EECoordinator {
         const ownsCursor = opts?.ownsCursor !== false;
         if (ownsCursor)
             client._delivery.onPullStarted?.(ns);
-        let pullGateKey = ownsCursor
-            ? 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 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));
@@ -1796,7 +1807,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) ?? 0;
                 if (actualAckSeq >= ackUpToSeq) {