@agentunion/fastaun-browser 0.3.3 → 0.3.5

package/dist/client.js

@@ -270,6 +270,63 @@ function isGroupServiceAid(value) {
     const [name, ...issuerParts] = text.split('.');
     return name === 'group' && issuerParts.join('.').length > 0;
 }
+function normalizeV2WrapPolicy(raw) {
+    if (!raw || typeof raw !== 'object' || Array.isArray(raw))
+        return undefined;
+    const obj = raw;
+    let protocol = String(obj.protocol ?? '').trim().toUpperCase();
+    let scope = String(obj.scope ?? '').trim().toLowerCase();
+    if (scope !== 'aid' && scope !== 'device') {
+        if (obj.per_aid_wrap === true)
+            scope = 'aid';
+        else if (obj.per_device_wrap === true)
+            scope = 'device';
+        else
+            scope = '';
+    }
+    if (protocol !== '1DH' && protocol !== '3DH')
+        protocol = '';
+    if (scope === 'aid')
+        protocol = '1DH';
+    if (!protocol && !scope)
+        return undefined;
+    return {
+        protocol: protocol ? protocol : undefined,
+        scope: scope ? scope : undefined,
+    };
+}
+function v2WrapCapabilities() {
+    return {
+        version: 'v2.1',
+        protocols: ['1DH', '3DH'],
+        scopes: ['aid', 'device'],
+        per_aid_wrap: true,
+        per_device_wrap: true,
+    };
+}
+function applyV2WrapPolicyToTargets(targets, policy) {
+    if (!policy)
+        return targets;
+    const normalized = targets.map((target) => {
+        const row = { ...target };
+        if (policy.protocol === '1DH') {
+            row.keySource = 'aid_master';
+            row.spkPkDer = undefined;
+            row.spkId = '';
+        }
+        return row;
+    });
+    if (policy.scope !== 'aid')
+        return normalized;
+    const collapsed = new Map();
+    for (const target of normalized) {
+        const key = `${target.aid}\u0000${target.role}`;
+        if (!collapsed.has(key)) {
+            collapsed.set(key, { ...target, deviceId: '' });
+        }
+    }
+    return Array.from(collapsed.values());
+}
 /** 32 字节左侧零填充（用于 P-256 私钥 scalar 规范化） */
 function _v2LeftPad32(b) {
     if (b.length === 32)
@@ -529,7 +586,7 @@ export class AUNClient {
     _agentMdPath = '';
     _agentMdCache = new Map();
     _agentMdFetchInflight = new Set();
-    _agentMdListLock = Promise.resolve();
+    _agentMdLock = Promise.resolve();
     /** 消息序列号跟踪器（群消息 + P2P 空洞检测） */
     _seqTracker = new SeqTracker();
     _seqTrackerContext = null;
@@ -543,6 +600,9 @@ export class AUNClient {
     _groupSynced = new Set();
     /** gap fill 来源标记：true 表示当前正在补洞（pull 触发），false 表示非补洞 */
     _gapFillActive = false;
+    // Pull Gate：序列化同一 key 的并发 pull 操作，防止重复拉取
+    _pullGates = new Map();
+    static _PULL_GATE_STALE_MS = 30000;
     // 重连相关
     _reconnectActive = false;
     _reconnectAbort = null;
@@ -583,7 +643,7 @@ export class AUNClient {
         this._clientLog.info(`AUNClient initialized: debug=${_debug} aunPath=${this.configModel.aunPath} aid=${initAid ?? '-'}`);
         this._dispatcher = new EventDispatcher();
         this._discovery = new GatewayDiscovery();
-        this._keystore = new IndexedDBKeyStore();
+        this._keystore = new IndexedDBKeyStore({ encryptionSeed: this.configModel.seedPassword ?? undefined });
         this._slotId = '';
         this._connectDeliveryMode = normalizeDeliveryModeConfig({ mode: 'fanout' });
         this._defaultConnectDeliveryMode = { ...this._connectDeliveryMode };
@@ -693,7 +753,7 @@ export class AUNClient {
     }
     /**
      * 浏览器版本 publishAgentMd。默认从 {agentMdPath}/{self_aid}/agent.md 的等价 IndexedDB 正文读取，
-     * 然后签名、上传，并刷新 list.json 元数据。
+     * 然后签名、上传，并刷新 agentmd.json 元数据。
      *
      * 兼容旧浏览器调用：传入 content 时会先写入等价正文，再从该正文发布。
      */
@@ -736,7 +796,7 @@ export class AUNClient {
     }
     /**
      * 浏览器版本 fetchAgentMd。aid 缺省时取自身；下载后的正文固定写入
-     * {agentMdPath}/{aid}/agent.md 的等价 IndexedDB 正文，list.json 只保存元数据。
+     * {agentMdPath}/{aid}/agent.md 的等价 IndexedDB 正文，agentmd.json 只保存元数据。
      */
     async fetchAgentMd(aid) {
         const target = String(aid ?? this._aid ?? '').trim();
@@ -809,8 +869,8 @@ export class AUNClient {
         }
         return target;
     }
-    _agentMdListKey() {
-        return 'list.json';
+    _agentMdMetaKey(aid) {
+        return `${this._agentMdSafeAid(aid)}/agentmd.json`;
     }
     _agentMdContentKey(aid) {
         return `${this._agentMdSafeAid(aid)}/agent.md`;
@@ -844,18 +904,11 @@ export class AUNClient {
             fetched_at: Date.now(),
         });
     }
-    async _listAgentMdContentAids() {
-        const list = this._keystore.listAgentMdContentAids;
-        if (typeof list !== 'function') {
-            throw new Error('IndexedDB agent.md storage unavailable');
-        }
-        return await list.call(this._keystore, this._agentMdRoot());
-    }
-    async _withAgentMdListLock(fn) {
-        const previous = this._agentMdListLock.catch(() => undefined);
+    async _withAgentMdLock(fn) {
+        const previous = this._agentMdLock.catch(() => undefined);
         let release;
         const current = new Promise((resolve) => { release = resolve; });
-        this._agentMdListLock = previous.then(() => current);
+        this._agentMdLock = previous.then(() => current);
         await previous;
         try {
             return await fn();
@@ -864,79 +917,39 @@ export class AUNClient {
             release();
         }
     }
-    _normalizeAgentMdList(data) {
-        const records = {};
-        let iterable = [];
-        if (isJsonObject(data)) {
-            const payload = data;
-            if (Array.isArray(payload.records))
-                iterable = payload.records;
-            else if (isJsonObject(payload.records))
-                iterable = Object.values(payload.records);
-        }
-        else if (Array.isArray(data)) {
-            iterable = data;
+    _normalizeAgentMdRecord(aid, data) {
+        if (!isJsonObject(data))
+            return {};
+        const record = {};
+        for (const [key, value] of Object.entries(data)) {
+            if (key !== 'content')
+                record[key] = value;
         }
-        for (const item of iterable) {
-            if (!isJsonObject(item))
-                continue;
-            const raw = item;
-            const aid = String(raw.aid ?? '').trim();
-            if (!aid)
-                continue;
-            const record = {};
-            for (const [key, value] of Object.entries(raw)) {
-                if (key !== 'content')
-                    record[key] = value;
-            }
-            record.aid = aid;
-            for (const key of ['fetched_at', 'observed_at', 'checked_at', 'updated_at']) {
-                record[key] = Number(record[key] ?? 0) || 0;
-            }
-            records[aid] = record;
+        record.aid = this._agentMdSafeAid(String(record.aid ?? aid));
+        for (const key of ['fetched_at', 'observed_at', 'checked_at', 'updated_at']) {
+            record[key] = Number(record[key] ?? 0) || 0;
         }
-        return records;
-    }
-    async _writeAgentMdListUnlocked(records) {
-        const sorted = {};
-        for (const aid of Object.keys(records).sort())
-            sorted[aid] = records[aid];
-        await this._writeAgentMdStorage(this._agentMdListKey(), `${JSON.stringify({ version: 1, updated_at: Date.now(), records: sorted }, null, 2)}\n`);
+        return record;
     }
-    async _rebuildAgentMdListUnlocked() {
-        const records = {};
-        const now = Date.now();
-        for (const aid of await this._listAgentMdContentAids()) {
-            try {
-                const content = await this._readAgentMdStorage(this._agentMdContentKey(aid));
-                if (content === null)
-                    continue;
-                records[aid] = {
-                    aid,
-                    local_etag: await this._agentMdContentEtag(content),
-                    fetched_at: now,
-                    updated_at: now,
-                };
-            }
-            catch (err) {
-                this._clientLog.warn(`agent.md rebuild skipped unreadable file aid=${aid} err=${err instanceof Error ? err.message : String(err)}`);
-            }
+    async _writeAgentMdRecordUnlocked(aid, record) {
+        const payload = {};
+        for (const [key, value] of Object.entries(record)) {
+            if (key !== 'content' && value !== undefined && value !== null)
+                payload[key] = value;
         }
-        await this._writeAgentMdListUnlocked(records);
-        this._agentMdCache.clear();
-        return records;
+        payload.aid = this._agentMdSafeAid(aid);
+        await this._writeAgentMdStorage(this._agentMdMetaKey(aid), `${JSON.stringify(payload, null, 2)}\n`);
     }
-    async _readAgentMdListUnlocked() {
-        const raw = await this._readAgentMdStorage(this._agentMdListKey());
-        if (raw === null) {
-            return await this._rebuildAgentMdListUnlocked();
-        }
+    async _readAgentMdRecordUnlocked(aid) {
+        const raw = await this._readAgentMdStorage(this._agentMdMetaKey(aid));
+        if (raw === null)
+            return {};
         try {
-            return this._normalizeAgentMdList(JSON.parse(raw));
+            return this._normalizeAgentMdRecord(aid, JSON.parse(raw));
         }
         catch (err) {
-            this._clientLog.warn(`agent.md list.json damaged, rebuilding: ${err instanceof Error ? err.message : String(err)}`);
-            return await this._rebuildAgentMdListUnlocked();
+            this._clientLog.warn(`agent.md metadata damaged, ignoring: aid=${aid} err=${err instanceof Error ? err.message : String(err)}`);
+            return {};
         }
     }
     async _readAgentMdContent(aid) {
@@ -960,21 +973,32 @@ export class AUNClient {
         if (!target)
             return null;
         try {
-            const records = await this._withAgentMdListLock(async () => await this._readAgentMdListUnlocked());
-            const record = records[target];
-            if (record && typeof record === 'object') {
-                const loaded = { ...record, aid: target };
-                const content = await this._readAgentMdContent(target);
-                if (content !== null) {
-                    loaded.content = content;
-                    loaded.local_etag = await this._agentMdContentEtag(content);
+            const loaded = await this._withAgentMdLock(async () => {
+                const record = await this._readAgentMdRecordUnlocked(target);
+                const next = Object.keys(record).length > 0 ? { ...record, aid: target } : { aid: target };
+                try {
+                    const content = await this._readAgentMdContent(target);
+                    if (content !== null) {
+                        next.content = content;
+                        next.local_etag = await this._agentMdContentEtag(content);
+                    }
+                    else {
+                        // 元数据存在但正文缺失
+                        const metaRaw = await this._readAgentMdStorage(this._agentMdMetaKey(target));
+                        if (metaRaw !== null) {
+                            this._clientLog.warn(`agent.md content read failed: aid=${target}`);
+                        }
+                    }
                 }
-                else {
-                    this._clientLog.warn(`agent.md content read failed: aid=${target}`);
+                catch (err) {
+                    this._clientLog.warn(`agent.md content read failed: aid=${target} err=${err instanceof Error ? err.message : String(err)}`);
                 }
-                this._agentMdCache.set(target, { ...loaded });
-                return { ...loaded };
-            }
+                return next;
+            });
+            if (Object.keys(loaded).length <= 1)
+                return null;
+            this._agentMdCache.set(target, { ...loaded });
+            return { ...loaded };
         }
         catch (err) {
             this._clientLog.debug(`agent.md cache load skipped: aid=${target} err=${err instanceof Error ? err.message : String(err)}`);
@@ -997,16 +1021,14 @@ export class AUNClient {
                     inputFields.fetched_at = Date.now();
             }
             delete inputFields.content;
-            const record = await this._withAgentMdListLock(async () => {
-                const records = await this._readAgentMdListUnlocked();
-                const next = { ...(records[target] ?? {}), aid: target };
+            const record = await this._withAgentMdLock(async () => {
+                const next = { ...(await this._readAgentMdRecordUnlocked(target)), aid: target };
                 for (const [key, value] of Object.entries(inputFields)) {
                     if (value !== undefined && value !== null)
                         next[key] = value;
                 }
                 next.updated_at = Date.now();
-                records[target] = { ...next };
-                await this._writeAgentMdListUnlocked(records);
+                await this._writeAgentMdRecordUnlocked(target, next);
                 return next;
             });
             const loaded = { ...record };
@@ -1494,6 +1516,20 @@ export class AUNClient {
                 return this._putMessageThoughtEncryptedV2(p);
             }
         }
+        // Pull Gate：序列化同一 key 的 pull 操作，防止并发重复拉取
+        const pullGateKey = this._pullGateKeyForCall(method, p);
+        if (pullGateKey) {
+            return await this._runPullSerialized(pullGateKey, async () => {
+                return await this._callImplInner(method, p);
+            });
+        }
+        return await this._callImplInner(method, p);
+    }
+    /**
+     * _callImpl 的内层：pull gate 之后的实际 RPC 分发逻辑。
+     * 拆分出来以便 pull gate 包裹整个操作。
+     */
+    async _callImplInner(method, p) {
         // message.pull：V2 就绪时走 V2 pull
         if (method === 'message.pull' && this._v2Session) {
             this._clientLog.debug('call route: message.pull → V2 pull');
@@ -4265,7 +4301,10 @@ export class AUNClient {
             const session = this._v2Session;
             if (session && fromAid) {
                 try {
-                    const bs = await this.call('message.v2.bootstrap', { peer_aid: fromAid });
+                    const bs = await this.call('message.v2.bootstrap', {
+                        peer_aid: fromAid,
+                        e2ee_wrap_capabilities: v2WrapCapabilities(),
+                    });
                     const peers = (Array.isArray(bs?.peer_devices) ? bs.peer_devices : []);
                     for (const dev of peers)
                         this._cacheV2PeerIKFromDevice(dev, fromAid);
@@ -4275,7 +4314,10 @@ export class AUNClient {
                 }
                 if (groupId) {
                     try {
-                        const gbs = await this.call('group.v2.bootstrap', { group_id: groupId });
+                        const gbs = await this.call('group.v2.bootstrap', {
+                            group_id: groupId,
+                            e2ee_wrap_capabilities: v2WrapCapabilities(),
+                        });
                         const devices = (Array.isArray(gbs?.devices) ? gbs.devices : []);
                         const audit = (Array.isArray(gbs?.audit_recipients) ? gbs.audit_recipients : []);
                         for (const dev of devices)
@@ -4559,7 +4601,7 @@ export class AUNClient {
             // 从 recipients 数组中查找本设备的 row 以获取 key_source
             if (!spkId) {
                 for (const row of envelope.recipients) {
-                    if (Array.isArray(row) && row.length >= 6 && row[0] === this._aid && row[1] === this._deviceId) {
+                    if (Array.isArray(row) && row.length >= 6 && row[0] === this._aid && (row[1] === this._deviceId || row[1] === '')) {
                         spkId = String(row[5] ?? '');
                         recipientKeySource = row.length > 3 ? String(row[3] ?? '') : '';
                         break;
@@ -4568,7 +4610,7 @@ export class AUNClient {
             }
             else {
                 for (const row of envelope.recipients) {
-                    if (Array.isArray(row) && row.length >= 6 && row[0] === this._aid && row[1] === this._deviceId) {
+                    if (Array.isArray(row) && row.length >= 6 && row[0] === this._aid && (row[1] === this._deviceId || row[1] === '')) {
                         recipientKeySource = row.length > 3 ? String(row[3] ?? '') : '';
                         break;
                     }
@@ -4932,20 +4974,27 @@ export class AUNClient {
         const useCache = opts.useCache !== false;
         let peerDevices = [];
         let auditRaw = [];
+        let wrapPolicy;
         const cached = useCache ? this._v2BootstrapCache.get(to) : undefined;
         if (cached && (Date.now() - cached.cachedAt) < AUNClient.V2_BOOTSTRAP_TTL_MS) {
             peerDevices = cached.devices;
             auditRaw = cached.auditRecipients;
+            wrapPolicy = cached.wrapPolicy;
         }
         else {
-            const bs = await this.call('message.v2.bootstrap', { peer_aid: to });
+            const bs = await this.call('message.v2.bootstrap', {
+                peer_aid: to,
+                e2ee_wrap_capabilities: v2WrapCapabilities(),
+            });
             peerDevices = (Array.isArray(bs?.peer_devices) ? bs.peer_devices : []);
             auditRaw = (Array.isArray(bs?.audit_recipients) ? bs.audit_recipients : []);
+            wrapPolicy = normalizeV2WrapPolicy(bs?.e2ee_wrap_policy);
             if (peerDevices.length > 0) {
                 this._v2BootstrapCache.set(to, {
                     devices: peerDevices,
                     auditRecipients: auditRaw,
                     cachedAt: Date.now(),
+                    wrapPolicy,
                 });
             }
         }
@@ -4985,7 +5034,10 @@ export class AUNClient {
                     selfDevices = selfCached.devices;
                 }
                 else {
-                    const selfBs = await this.call('message.v2.bootstrap', { peer_aid: this._aid });
+                    const selfBs = await this.call('message.v2.bootstrap', {
+                        peer_aid: this._aid,
+                        e2ee_wrap_capabilities: v2WrapCapabilities(),
+                    });
                     selfDevices = (Array.isArray(selfBs?.peer_devices) ? selfBs.peer_devices : []);
                     if (selfDevices.length > 0) {
                         this._v2BootstrapCache.set(this._aid, {
@@ -5015,7 +5067,8 @@ export class AUNClient {
             }
         }
         const sender = await session.getSenderIdentity();
-        const envelope = await encryptP2PMessage(sender, { targets, auditRecipients: [] }, opts.payload, { messageId: opts.messageId, timestamp: opts.timestamp, protectedHeaders: opts.protectedHeaders, context: opts.context });
+        const sendTargets = applyV2WrapPolicyToTargets(targets, wrapPolicy);
+        const envelope = await encryptP2PMessage(sender, { targets: sendTargets, auditRecipients: [] }, opts.payload, { messageId: opts.messageId, timestamp: opts.timestamp, protectedHeaders: opts.protectedHeaders, context: opts.context });
         return envelope;
     }
     /**
@@ -5089,18 +5142,24 @@ export class AUNClient {
         let epoch = 0;
         let stateCommitment = { state_version: 0, state_hash: '', state_chain: '' };
         let auditRecipientsRaw = [];
+        let wrapPolicy;
         const cached = useCache ? this._v2BootstrapCache.get(cacheKey) : undefined;
         if (cached && (Date.now() - cached.cachedAt) < AUNClient.V2_BOOTSTRAP_TTL_MS) {
             allDevices = cached.devices;
             epoch = cached.epoch ?? 0;
             stateCommitment = cached.stateCommitment ?? { state_version: 0, state_hash: '', state_chain: '' };
             auditRecipientsRaw = cached.auditRecipients;
+            wrapPolicy = cached.wrapPolicy;
         }
         else {
-            const bs = await this.call('group.v2.bootstrap', { group_id: groupId });
+            const bs = await this.call('group.v2.bootstrap', {
+                group_id: groupId,
+                e2ee_wrap_capabilities: v2WrapCapabilities(),
+            });
             allDevices = (Array.isArray(bs?.devices) ? bs.devices : []);
             epoch = Number(bs?.epoch ?? 0);
             auditRecipientsRaw = (Array.isArray(bs?.audit_recipients) ? bs.audit_recipients : []);
+            wrapPolicy = normalizeV2WrapPolicy(bs?.e2ee_wrap_policy);
             await this._v2CheckFork(groupId, String(bs?.state_chain ?? ''));
             await this._v2VerifyStateSignature(groupId, bs);
             await this._publishV2GroupSecurityLevel(groupId, bs);
@@ -5116,6 +5175,7 @@ export class AUNClient {
                     cachedAt: Date.now(),
                     epoch,
                     stateCommitment: stateCommitment,
+                    wrapPolicy,
                 });
             }
             // lazy sync 触发：发现 pending members 时异步发起提案
@@ -5159,7 +5219,8 @@ export class AUNClient {
             throw new E2EEError(`V2 group: no target devices for ${groupId}`);
         }
         const sender = await session.getSenderIdentity();
-        const envelope = await encryptGroupMessage(sender, groupId, epoch, targets, opts.payload, { messageId: opts.messageId, timestamp: opts.timestamp, protectedHeaders: opts.protectedHeaders, context: opts.context }, stateCommitment);
+        const sendTargets = applyV2WrapPolicyToTargets(targets, wrapPolicy);
+        const envelope = await encryptGroupMessage(sender, groupId, epoch, sendTargets, opts.payload, { messageId: opts.messageId, timestamp: opts.timestamp, protectedHeaders: opts.protectedHeaders, context: opts.context }, stateCommitment);
         return envelope;
     }
     async _publishV2GroupSecurityLevel(groupId, bootstrap) {
@@ -5242,7 +5303,7 @@ export class AUNClient {
         if (Array.isArray(recipients)) {
             for (const row of recipients) {
                 if (Array.isArray(row) && row.length >= 6) {
-                    if (row[0] === this._aid && row[1] === this._deviceId) {
+                    if (row[0] === this._aid && (row[1] === this._deviceId || row[1] === '')) {
                         spkId = String(row[5] ?? '');
                         recipientKeySource = row.length > 3 ? String(row[3] ?? '') : '';
                         break;
@@ -5554,7 +5615,10 @@ export class AUNClient {
             }
             if (myRole !== 'owner' && myRole !== 'admin')
                 return false;
-            const bootstrapResp = await this.call('group.v2.bootstrap', { group_id: groupId });
+            const bootstrapResp = await this.call('group.v2.bootstrap', {
+                group_id: groupId,
+                e2ee_wrap_capabilities: v2WrapCapabilities(),
+            });
             const devices = (Array.isArray(bootstrapResp?.devices) ? bootstrapResp.devices : []);
             const candidates = [];
             for (const dev of devices) {
@@ -5656,7 +5720,10 @@ export class AUNClient {
                 }
             }
             // 获取群所有成员的设备列表（V2 bootstrap）
-            const bootstrapResp = await this.call('group.v2.bootstrap', { group_id: groupId });
+            const bootstrapResp = await this.call('group.v2.bootstrap', {
+                group_id: groupId,
+                e2ee_wrap_capabilities: v2WrapCapabilities(),
+            });
             const allDevices = (Array.isArray(bootstrapResp?.devices) ? bootstrapResp.devices : []);
             const auditRecipients = (Array.isArray(bootstrapResp?.audit_recipients) ? bootstrapResp.audit_recipients : []);
             const auditAidsList = [...new Set(auditRecipients.map(r => String(r.aid ?? '').trim()).filter(Boolean))].sort();
@@ -6000,6 +6067,66 @@ export class AUNClient {
             this._clientLog.warn(`background task exception:${String(exc)}`);
         });
     }
+    // ── Pull Gate（序列化同一 key 的并发 pull）──────────────────
+    _pullGateKeyForCall(method, params) {
+        if (method === 'message.pull' || method === 'message.v2.pull') {
+            return this._aid ? `p2p:${this._aid}` : '';
+        }
+        if (method === 'group.pull' || method === 'group.v2.pull') {
+            const gid = String(params.group_id ?? '').trim();
+            return gid ? `group:${gid}` : '';
+        }
+        if (method === 'group.pull_events') {
+            const gid = String(params.group_id ?? '').trim();
+            return gid ? `group_event:${gid}` : '';
+        }
+        return '';
+    }
+    _tryAcquirePullGate(key) {
+        if (!key)
+            return 0;
+        const now = Date.now();
+        const gate = this._pullGates.get(key) ?? { inflight: false, startedAt: 0, token: 0 };
+        if (gate.inflight && now - gate.startedAt <= AUNClient._PULL_GATE_STALE_MS) {
+            return null;
+        }
+        if (gate.inflight) {
+            this._clientLog.warn(`pull in-flight stale reset: key=${key} age=${now - gate.startedAt}ms`);
+        }
+        gate.token += 1;
+        gate.inflight = true;
+        gate.startedAt = now;
+        this._pullGates.set(key, gate);
+        return gate.token;
+    }
+    _releasePullGate(key, token) {
+        if (!key || token == null)
+            return;
+        const gate = this._pullGates.get(key);
+        if (!gate || gate.token !== token)
+            return;
+        gate.inflight = false;
+        gate.startedAt = 0;
+    }
+    async _runPullSerialized(key, operation) {
+        let token = this._tryAcquirePullGate(key);
+        if (token === null) {
+            const deadline = Date.now() + AUNClient._PULL_GATE_STALE_MS + 100;
+            while (token === null && Date.now() <= deadline) {
+                await this._sleep(25);
+                token = this._tryAcquirePullGate(key);
+            }
+            if (token === null) {
+                throw new StateError(`pull already in-flight for ${key}`);
+            }
+        }
+        try {
+            return await operation();
+        }
+        finally {
+            this._releasePullGate(key, token);
+        }
+    }
     /** 可取消的 sleep */
     _sleep(ms) {
         return new Promise((resolve) => {