@agentunion/fastaun 0.5.16 → 0.5.18

package/dist/client.d.ts

@@ -140,6 +140,9 @@ export declare class AUNClient {
     private _pushProcessQueues;
     /** P2P pull 进行中到达的纯通知 push 上界；pull gate 释放后需要补拉一次。 */
     private _pendingP2pPullUpper;
+    /** P2P pending pull 的延迟重试定时器及次数，覆盖服务端异步落库窗口。 */
+    private _pendingP2pPullTimers;
+    private _pendingP2pPullRetries;
     /** 缺 sender IK 时暂存原始 V2 消息，后台补齐 IK 后重试解密。 */
     private _v2SenderIKPending;
     /** sender IK 后台补齐任务去重。 */

package/dist/client.js

@@ -120,6 +120,8 @@ const DEFAULT_SESSION_OPTIONS = {
 const RECONNECT_MIN_BASE_DELAY_MS = 1_000;
 const RECONNECT_MAX_BASE_DELAY_MS = 64_000;
 const TOKEN_REFRESH_CHECK_INTERVAL_MS = 30_000;
+const PENDING_P2P_PULL_DELAY_MS = 100;
+const PENDING_P2P_PULL_MAX_RETRIES = 20;
 const MAX_NOTIFY_PAYLOAD_SIZE = 64 * 1024;
 // P1-23: 非幂等方法使用更长超时（35s），避免 SDK 10s 超时 < gateway 30s 处理时间
 const NON_IDEMPOTENT_TIMEOUT_MS = 35_000;
@@ -207,7 +209,7 @@ const SIGNED_METHODS = new Set([
     'collab.tag.create', 'collab.tag.restore',
     'collab.tag.rm', 'collab.tag.prune',
     'group.commit_state',
-    'group.ban', 'group.unban',
+    'group.ban', 'group.unban', 'group.block', 'group.unblock', 'group.report_status',
     'group.dissolve', 'group.suspend', 'group.resume',
 ]);
 function clampReconnectDelayMs(value, fallback, upper = RECONNECT_MAX_BASE_DELAY_MS) {
@@ -334,6 +336,7 @@ function createAgentMdManagerForRuntime(opts) {
     return new AgentMdManager({
         aunPath: opts.config().aunPath,
         verifySsl: opts.config().verifySsl,
+        onChanged: (aid) => opts.dispatcher().enqueue('agentmd.changed', aid),
         discoveryPort: opts.config().discoveryPort,
         uploadViaGatewayHost: true,
         logger: opts.logger(),
@@ -493,6 +496,9 @@ export class AUNClient {
     _pushProcessQueues = new Map();
     /** P2P pull 进行中到达的纯通知 push 上界；pull gate 释放后需要补拉一次。 */
     _pendingP2pPullUpper = new Map();
+    /** P2P pending pull 的延迟重试定时器及次数，覆盖服务端异步落库窗口。 */
+    _pendingP2pPullTimers = new Map();
+    _pendingP2pPullRetries = new Map();
     /** 缺 sender IK 时暂存原始 V2 消息，后台补齐 IK 后重试解密。 */
     _v2SenderIKPending = new Map();
     /** sender IK 后台补齐任务去重。 */
@@ -608,6 +614,7 @@ export class AUNClient {
         this._agentMdManager = createAgentMdManagerForRuntime({
             config: () => this._configModel,
             logger: () => this._logger.for('aun_core.agent_md'),
+            dispatcher: () => this._dispatcher,
             ownerAid: () => this._aid,
             currentAid: () => this._currentAid,
             gateway: {
@@ -893,6 +900,7 @@ export class AUNClient {
         this._agentMdManager = createAgentMdManagerForRuntime({
             config: () => this._configModel,
             logger: () => this._logger.for('aun_core.agent_md'),
+            dispatcher: () => this._dispatcher,
             ownerAid: () => this._aid,
             currentAid: () => this._currentAid,
             gateway: {
@@ -1111,14 +1119,22 @@ export class AUNClient {
                 continue;
             const group = raw;
             const role = String(group.role ?? group.my_role ?? '').trim().toLowerCase();
-            if (role !== 'owner')
-                continue;
             const groupId = String(group.group_id ?? group.groupId ?? group.group_aid ?? group.groupAid ?? '').trim();
             const groupAid = String(group.group_aid ?? group.groupAid ?? groupId).trim();
             if (!groupId || !groupAid)
                 continue;
+            const keystore = store._keystore;
+            const pendingTransfer = keystore && typeof keystore.loadPendingGroupBind === 'function'
+                ? keystore.loadPendingGroupBind(`complete:${groupId}`)
+                : null;
+            if (role !== 'owner' && !pendingTransfer)
+                continue;
             try {
                 await this._runGroupIdentityOperation(groupId, async () => {
+                    if (pendingTransfer) {
+                        await this.completeGroupTransfer({ group_id: groupId, group_aid: groupAid }, { aidStore: store });
+                        return;
+                    }
                     const loaded = store.load(groupAid);
                     if (!loaded.ok || !loaded.data?.aid?.isPrivateKeyValid()) {
                         await this.bindGroupAid({ group_id: groupId, group_aid: groupAid }, { aidStore: store });
@@ -1175,6 +1191,23 @@ export class AUNClient {
         if (!isNamed) {
             delete payload.public_key;
             delete payload.curve;
+            const keystore = store._keystore;
+            const pendingName = String(payload.name ?? '').trim().toLowerCase();
+            const pendingKey = `create-anonymous:${crypto.createHash('sha256').update(pendingName, 'utf8').digest('hex')}`;
+            let keyPair = null;
+            if (keystore && typeof keystore.loadPendingGroupBind === 'function') {
+                keyPair = keystore.loadPendingGroupBind(pendingKey);
+            }
+            if (!keyPair || !keyPair.public_key_der_b64 || !keyPair.private_key_pem) {
+                keyPair = new CryptoProvider().generateIdentity();
+                if (keystore && typeof keystore.savePendingGroupBind === 'function') {
+                    keystore.savePendingGroupBind(pendingKey, keyPair);
+                }
+            }
+            if (!keyPair?.public_key_der_b64 || !keyPair.private_key_pem) {
+                throw new ValidationError('createGroup: failed to generate or load key pair');
+            }
+            payload._create_request_id = `anon:${crypto.createHash('sha256').update(keyPair.public_key_der_b64, 'utf8').digest('hex')}`;
             const created = await this.call('group.create', payload);
             const createdMap = isJsonObject(created) ? created : {};
             const createdGroup = isJsonObject(createdMap.group) ? createdMap.group : {};
@@ -1182,6 +1215,9 @@ export class AUNClient {
             if (!groupId) {
                 throw new ValidationError('group.create response missing group.group_id');
             }
+            if (keystore && typeof keystore.savePendingGroupBind === 'function') {
+                keystore.savePendingGroupBind(`bind:${groupId}`, keyPair);
+            }
             const bindParams = { group_id: groupId };
             for (const key of ['name', 'description', 'group_description', 'avatar', 'group_agent_md', 'groupAgentMd', 'content']) {
                 if (key in payload)
@@ -1193,15 +1229,28 @@ export class AUNClient {
             const result = { ...createdMap, ...boundMap, group: { ...createdGroup, ...boundGroup } };
             const postprocessParams = { ...payload };
             delete postprocessParams._defer_group_ready_postprocess;
+            delete postprocessParams._create_request_id;
             const processed = await this._groupState.postprocessResult('group.create', postprocessParams, result);
-            return await this._inviteInitialGroupMembers(processed, groupId, initialMembers);
+            const completed = await this._inviteInitialGroupMembers(processed, groupId, initialMembers);
+            if (keystore && typeof keystore.clearPendingGroupBind === 'function') {
+                keystore.clearPendingGroupBind(pendingKey);
+            }
+            return completed;
         }
-        const pendingKey = `create:${String(payload.group_name).trim().toLowerCase()}`;
+        const groupName = String(payload.group_name).trim().toLowerCase();
+        const pendingKey = `create:${groupName}`;
         const keystore = store._keystore;
         let keyPair = null;
         if (keystore && typeof keystore.loadPendingGroupBind === 'function') {
             keyPair = keystore.loadPendingGroupBind(pendingKey);
         }
+        if ((!keyPair || !keyPair.public_key_der_b64 || !keyPair.private_key_pem)
+            && keystore && typeof keystore.loadIdentity === 'function') {
+            const ownerAid = String(this._aid ?? '').trim();
+            const dot = ownerAid.indexOf('.');
+            if (dot >= 0)
+                keyPair = keystore.loadIdentity(`${groupName}.${ownerAid.slice(dot + 1).toLowerCase()}`);
+        }
         if (!keyPair || !keyPair.public_key_der_b64 || !keyPair.private_key_pem) {
             keyPair = new CryptoProvider().generateIdentity();
             if (keystore && typeof keystore.savePendingGroupBind === 'function') {
@@ -1832,6 +1881,7 @@ export class AUNClient {
         const previous = this._pendingP2pPullUpper.get(ns) ?? 0;
         if (seq > previous) {
             this._pendingP2pPullUpper.set(ns, seq);
+            this._pendingP2pPullRetries.delete(ns);
         }
         this._clientLog.debug(`P2P pending pull upper recorded: ns=${ns}, seq=${seq}, previous=${previous}, contiguous=${this._seqTracker.getContiguousSeq(ns)}`);
     }
@@ -1846,6 +1896,7 @@ export class AUNClient {
         const contig = this._seqTracker.getContiguousSeq(ns);
         if (upperSeq <= contig) {
             this._pendingP2pPullUpper.delete(ns);
+            this._pendingP2pPullRetries.delete(ns);
             this._clientLog.debug(`P2P pending pull upper already covered: ns=${ns}, upper_seq=${upperSeq}, contiguous=${contig}, reason=${reason}`);
             return false;
         }
@@ -1853,11 +1904,49 @@ export class AUNClient {
             this._clientLog.debug(`P2P pending pull postponed: ns=${ns}, upper_seq=${upperSeq}, contiguous=${contig}, state=${this._state}, closing=${this._closing}, reason=${reason}`);
             return false;
         }
-        if (this._rpcPipeline?.hasPullActivity?.(ns, false))
+        if (this._sessionOptions.background_sync === false)
+            return false;
+        if (this._rpcPipeline?.hasPullActivity?.(ns, false) || this._pendingP2pPullTimers.has(ns))
+            return false;
+        const retries = (this._pendingP2pPullRetries.get(ns) ?? 0) + 1;
+        if (retries > PENDING_P2P_PULL_MAX_RETRIES) {
+            this._pendingP2pPullUpper.delete(ns);
+            this._pendingP2pPullRetries.delete(ns);
+            this._clientLog.warn(`P2P pending pull retries exhausted: ns=${ns}, upper_seq=${upperSeq}, contiguous=${contig}, reason=${reason}`);
             return false;
-        this._pendingP2pPullUpper.delete(ns);
-        this._clientLog.info(`P2P pending push follow-up pull scheduled: ns=${ns}, upper_seq=${upperSeq}, contiguous=${contig}, reason=${reason}`);
-        this._safeAsync(this._onV2PushNotification({ seq: upperSeq }, 'v2'));
+        }
+        this._pendingP2pPullRetries.set(ns, retries);
+        this._clientLog.info(`P2P pending push follow-up pull scheduled: ns=${ns}, upper_seq=${upperSeq}, contiguous=${contig}, retry=${retries}, reason=${reason}`);
+        const timer = setTimeout(() => {
+            this._pendingP2pPullTimers.delete(ns);
+            const currentUpper = this._pendingP2pPullUpper.get(ns) ?? 0;
+            if (currentUpper <= 0 || currentUpper <= this._seqTracker.getContiguousSeq(ns)) {
+                this._pendingP2pPullUpper.delete(ns);
+                this._pendingP2pPullRetries.delete(ns);
+                return;
+            }
+            // 暂时移除上界，避免 synthetic push 被 hasPullActivity 当成自身的 pending pull 拦截。
+            this._pendingP2pPullUpper.delete(ns);
+            const retry = this._onV2PushNotification({ seq: currentUpper }, 'v2')
+                .then(() => {
+                if (this._seqTracker.getContiguousSeq(ns) < currentUpper) {
+                    const pending = this._pendingP2pPullUpper.get(ns) ?? 0;
+                    if (currentUpper > pending)
+                        this._pendingP2pPullUpper.set(ns, currentUpper);
+                }
+            })
+                .catch((error) => {
+                const pending = this._pendingP2pPullUpper.get(ns) ?? 0;
+                if (currentUpper > pending)
+                    this._pendingP2pPullUpper.set(ns, currentUpper);
+                throw error;
+            })
+                .finally(() => {
+                this._schedulePendingP2pPullIfNeeded(ns, 'pending-pull-retry-complete');
+            });
+            this._safeAsync(retry);
+        }, PENDING_P2P_PULL_DELAY_MS);
+        this._pendingP2pPullTimers.set(ns, timer);
         return true;
     }
     _markPublishedSeq(ns, seq) {
@@ -2169,6 +2258,10 @@ export class AUNClient {
             }
             const paramsHash = String(cs.params_hash ?? '');
             const timestamp = String(cs.timestamp ?? '');
+            const signedAt = Number(timestamp) * 1000;
+            if (!/^\d+$/.test(timestamp) || !Number.isSafeInteger(Number(timestamp)) || signedAt < new Date(certObj.validFrom).getTime() || signedAt > new Date(certObj.validTo).getTime()) {
+                return false;
+            }
             const signData = Buffer.from(`${method}|${sigAid}|${timestamp}|${paramsHash}`, 'utf-8');
             const sigB64 = String(cs.signature ?? '');
             const pubKey = certObj.publicKey;
@@ -2397,6 +2490,10 @@ export class AUNClient {
         this._pushedSeqs.clear();
         this._pendingOrderedMsgs.clear();
         this._pendingP2pPullUpper.clear();
+        for (const timer of this._pendingP2pPullTimers.values())
+            clearTimeout(timer);
+        this._pendingP2pPullTimers.clear();
+        this._pendingP2pPullRetries.clear();
         this._v2SenderIKPending.clear();
         this._v2SenderIKFetching.clear();
         this._groupSynced.clear();
@@ -2413,6 +2510,10 @@ export class AUNClient {
         this._pushedSeqs.clear();
         this._pendingOrderedMsgs.clear();
         this._pendingP2pPullUpper.clear();
+        for (const timer of this._pendingP2pPullTimers.values())
+            clearTimeout(timer);
+        this._pendingP2pPullTimers.clear();
+        this._pendingP2pPullRetries.clear();
         this._v2SenderIKPending.clear();
         this._v2SenderIKFetching.clear();
         this._groupSynced.clear();
@@ -3023,8 +3124,8 @@ export class AUNClient {
         return await this._v2E2EE.pullV2(afterSeq, limit, opts);
     }
     /** V2 P2P ack，并触发旧 SPK 销毁自检。 */
-    async _ackV2(upToSeq) {
-        return await this._v2E2EE.ackV2(upToSeq);
+    async _ackV2(upToSeq, opts) {
+        return await this._v2E2EE.ackV2(upToSeq, opts);
     }
     /** V2 Group 加密发送，推测性缓存失败后刷新 bootstrap 重试一次。 */
     async _sendGroupV2(groupId, payload, opts) {
@@ -3134,7 +3235,6 @@ export class AUNClient {
                 seq: msg.seq,
                 timestamp: (msg.t_server ?? msg.timestamp),
                 device_id: String(msg.device_id ?? ''),
-                slot_id: String(msg.slot_id ?? ''),
                 _decrypt_error: String(formatCaughtError(exc)),
                 _decrypt_stage: 'spk_lookup',
                 _envelope_type: String(envelope.type ?? ''),
@@ -3175,7 +3275,6 @@ export class AUNClient {
                 seq: msg.seq,
                 timestamp: (msg.t_server ?? msg.timestamp),
                 device_id: String(msg.device_id ?? ''),
-                slot_id: String(msg.slot_id ?? ''),
                 _decrypt_error: 'sender_ik_not_found',
                 _decrypt_stage: 'sender_ik',
                 _envelope_type: String(envelope.type ?? ''),
@@ -3205,7 +3304,6 @@ export class AUNClient {
                 seq: msg.seq,
                 timestamp: (msg.t_server ?? msg.timestamp),
                 device_id: String(msg.device_id ?? ''),
-                slot_id: String(msg.slot_id ?? ''),
                 _decrypt_error: String(formatCaughtError(exc)),
                 _decrypt_stage: 'decrypt',
                 _envelope_type: String(envelope.type ?? ''),
@@ -3235,12 +3333,15 @@ export class AUNClient {
             encrypted: true,
             e2ee,
         };
+        if (senderDeviceId)
+            result.sender_device_id = senderDeviceId;
         const explicitDirection = String(msg.direction ?? '').trim();
-        result.direction = explicitDirection || (fromAid && fromAid === this._aid ? 'outbound_sync' : 'inbound');
+        if (explicitDirection)
+            result.direction = explicitDirection;
+        else if (fromAid && fromAid !== this._aid)
+            result.direction = 'inbound';
         if (msg.device_id !== undefined)
             result.device_id = msg.device_id;
-        if (msg.slot_id !== undefined)
-            result.slot_id = msg.slot_id;
         attachGatewayProximity(result, msg);
         this._attachV2EnvelopeMetadata(result, e2ee);
         if (groupIdForKeys)
@@ -3437,8 +3538,8 @@ export class AUNClient {
         return this._delivery.onRawGroupV2MessageCreated(data, expectedVersion, inlineGeneration);
     }
     /** Push 通知带 payload 时的就地解密（复用 _decryptV2Message） */
-    async _decryptV2PushMessage(data) {
-        return await this._v2E2EE.decryptV2PushMessage(data);
+    async _decryptV2PushMessage(data, deferStatus) {
+        return await this._v2E2EE.decryptV2PushMessage(data, deferStatus);
     }
     /** 按当前 AID 发现 Gateway；用于 authenticate()/connect() 的新入口。 */
     async _resolveGatewayForAid(aid) {