@agentunion/fastaun 0.5.8 → 0.5.10

package/dist/client.js

@@ -688,7 +688,7 @@ export class AUNClient {
         this._dispatcher.subscribe('_raw.group.state_committed', (data) => this._onGroupStateCommitted(data));
         // 其他事件直接透传
         for (const evt of ['message.ack', 'storage.object_changed', 'stream/created', 'stream/closed']) {
-            this._dispatcher.subscribe(`_raw.${evt}`, (data) => this._dispatcher.publish(evt, data));
+            this._dispatcher.subscribe(`_raw.${evt}`, (data) => this._dispatcher.enqueue(evt, data));
         }
         // 服务端主动断开通知：记录日志并标记不重连
         this._dispatcher.subscribe('_raw.gateway.disconnect', (data) => this._onGatewayDisconnect(data));
@@ -852,6 +852,7 @@ export class AUNClient {
         this._peerCache.clear();
         this._certCache.clear();
         this._gatewayUrl = null;
+        this._gatewayCandidates = [];
         this._deviceId = aid.deviceId || getDeviceId(nextConfig.aunPath);
         this._slotId = aid.slotId || 'default';
         const debugFlag = nextConfig.debug;
@@ -1059,7 +1060,12 @@ export class AUNClient {
         const target = message.slice(agentPrefix.length).trim();
         if (!target || target.toLowerCase() !== String(this._aid ?? '').trim().toLowerCase())
             return false;
-        await this._agentMdManager.upload(buildDefaultAgentMd(target));
+        let agentMd = buildDefaultAgentMd(target);
+        try {
+            agentMd = this._agentMdManager.readContent(target);
+        }
+        catch { }
+        await this._agentMdManager.upload(agentMd);
         return true;
     }
     async _runGroupIdentityOperation(groupId, operation) {
@@ -1091,6 +1097,10 @@ export class AUNClient {
         }
         this._aidStore = store;
         const payload = { ...params };
+        if (payload.group_name === undefined && payload.groupName !== undefined) {
+            payload.group_name = payload.groupName;
+            delete payload.groupName;
+        }
         const isNamed = Boolean(String(payload.group_name ?? '').trim());
         payload._defer_group_ready_postprocess = true;
         if (!isNamed) {
@@ -1116,7 +1126,21 @@ export class AUNClient {
             delete postprocessParams._defer_group_ready_postprocess;
             return await this._groupState.postprocessResult('group.create', postprocessParams, result);
         }
-        const keyPair = new CryptoProvider().generateIdentity();
+        const pendingKey = `create:${String(payload.group_name).trim().toLowerCase()}`;
+        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) {
+            keyPair = new CryptoProvider().generateIdentity();
+            if (keystore && typeof keystore.savePendingGroupBind === 'function') {
+                keystore.savePendingGroupBind(pendingKey, keyPair);
+            }
+        }
+        if (!keyPair || !keyPair.public_key_der_b64 || !keyPair.private_key_pem) {
+            throw new ValidationError('createGroup: failed to generate or load key pair');
+        }
         payload.public_key = keyPair.public_key_der_b64;
         payload.curve = keyPair.curve;
         const result = await this.call('group.create', payload);
@@ -1138,6 +1162,9 @@ export class AUNClient {
             throw new ValidationError(imported.error.message);
         }
         await this._uploadGroupAgentMd(store, groupAid, payload, group);
+        if (keystore && typeof keystore.clearPendingGroupBind === 'function') {
+            keystore.clearPendingGroupBind(pendingKey);
+        }
         const postprocessParams = { ...payload };
         delete postprocessParams._defer_group_ready_postprocess;
         return await this._groupState.postprocessResult('group.create', postprocessParams, result);
@@ -1193,11 +1220,15 @@ export class AUNClient {
         }
         this._aidStore = store;
         const groupId = String(params.group_id ?? params.group_aid ?? '').trim();
+        const pendingKey = `bind:${groupId}`;
         const keystore = store._keystore; // AIDStore._keystore: LocalIdentityStore
         let keyPair = null;
         // 优先复用 pending 槽位中已暂存的待绑定密钥（崩溃/重试幂等）
         if (groupId && keystore && typeof keystore.loadPendingGroupBind === 'function') {
-            keyPair = keystore.loadPendingGroupBind(groupId);
+            keyPair = keystore.loadPendingGroupBind(pendingKey);
+            if (!keyPair || !keyPair.public_key_der_b64 || !keyPair.private_key_pem) {
+                keyPair = keystore.loadPendingGroupBind(groupId);
+            }
         }
         if (!keyPair || !keyPair.public_key_der_b64 || !keyPair.private_key_pem) {
             // 未命中 pending，生成新密钥
@@ -1209,7 +1240,7 @@ export class AUNClient {
             };
             // 发 RPC 前先落盘暂存，确保崩溃后重试能复用同一密钥
             if (groupId && keystore && typeof keystore.savePendingGroupBind === 'function') {
-                keystore.savePendingGroupBind(groupId, keyPair);
+                keystore.savePendingGroupBind(pendingKey, keyPair);
             }
         }
         if (!keyPair) {
@@ -1244,6 +1275,7 @@ export class AUNClient {
         await this._uploadGroupAgentMd(store, groupAid, payload, group);
         // 落盘成功，清除 pending 槽位
         if (groupId && keystore && typeof keystore.clearPendingGroupBind === 'function') {
+            keystore.clearPendingGroupBind(pendingKey);
             keystore.clearPendingGroupBind(groupId);
         }
         return result;
@@ -1333,7 +1365,21 @@ export class AUNClient {
             throw new ValidationError(`renewGroupAid: cannot determine old public key for ${groupAid}`);
         }
         // 生成新密钥
-        const newKeyPair = new CryptoProvider().generateIdentity();
+        const keystore = store._keystore;
+        const pendingKey = `renew:${groupId}`;
+        let newKeyPair = null;
+        if (keystore && typeof keystore.loadPendingGroupBind === 'function') {
+            newKeyPair = keystore.loadPendingGroupBind(pendingKey);
+        }
+        if (!newKeyPair || !newKeyPair.public_key_der_b64 || !newKeyPair.private_key_pem) {
+            newKeyPair = new CryptoProvider().generateIdentity();
+            if (keystore && typeof keystore.savePendingGroupBind === 'function') {
+                keystore.savePendingGroupBind(pendingKey, newKeyPair);
+            }
+        }
+        if (!newKeyPair || !newKeyPair.public_key_der_b64 || !newKeyPair.private_key_pem) {
+            throw new ValidationError('renewGroupAid: failed to generate or load key pair');
+        }
         const newPublicKey = newKeyPair.public_key_der_b64;
         const newPrivateKey = newKeyPair.private_key_pem;
         const curve = newKeyPair.curve || 'P-256';
@@ -1389,6 +1435,9 @@ export class AUNClient {
             throw new ValidationError(`renewGroupAid failed to persist group identity: ${imported.error.message}`);
         }
         await this._uploadGroupAgentMd(store, returnedGroupAid, payload, group);
+        if (keystore && typeof keystore.clearPendingGroupBind === 'function') {
+            keystore.clearPendingGroupBind(pendingKey);
+        }
         return result;
     }
     async completeGroupTransfer(params = {}, options = {}) {
@@ -1399,12 +1448,26 @@ export class AUNClient {
         if (!store) {
             throw new ValidationError('completeGroupTransfer requires aidStore');
         }
-        const keyPair = new CryptoProvider().generateIdentity();
         const payload = { ...params };
         const groupId = String(params.group_id ?? '').trim();
         if (!groupId) {
             throw new ValidationError('completeGroupTransfer requires group_id');
         }
+        const pendingKey = `complete:${groupId}`;
+        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) {
+            keyPair = new CryptoProvider().generateIdentity();
+            if (keystore && typeof keystore.savePendingGroupBind === 'function') {
+                keystore.savePendingGroupBind(pendingKey, keyPair);
+            }
+        }
+        if (!keyPair || !keyPair.public_key_der_b64 || !keyPair.private_key_pem) {
+            throw new ValidationError('completeGroupTransfer: failed to generate or load key pair');
+        }
         let groupAid = String(params.group_aid ?? '').trim();
         if (!groupAid) {
             const info = await this.call('group.get_info', { group_id: groupId, required: ['member'] });
@@ -1461,6 +1524,9 @@ export class AUNClient {
             throw new ValidationError(imported.error.message);
         }
         await this._uploadGroupAgentMd(store, returnedGroupAid, payload, group);
+        if (keystore && typeof keystore.clearPendingGroupBind === 'function') {
+            keystore.clearPendingGroupBind(pendingKey);
+        }
         return result;
     }
     /** 证书公钥校验：确保服务端返回的证书公钥 == 本地公钥（DER base64） */
@@ -1877,11 +1943,11 @@ export class AUNClient {
         }
         return true;
     }
-    async _drainOrderedMessages(ns, beforeSeq, pullResponse = false, persist = true) {
-        return this._delivery.drainOrderedMessages(ns, beforeSeq, pullResponse, persist);
+    async _drainOrderedMessages(ns, beforeSeq, pullResponse = false, persist = true, source = 'push') {
+        return this._delivery.drainOrderedMessages(ns, beforeSeq, pullResponse, persist, source);
     }
-    async _publishOrderedMessage(event, ns, seq, payload) {
-        return this._delivery.publishOrderedMessage(event, ns, seq, payload);
+    async _publishOrderedMessage(event, ns, seq, payload, source = 'push') {
+        return this._delivery.publishOrderedMessage(event, ns, seq, payload, source);
     }
     async _publishPulledMessage(event, ns, seq, payload, persist = true) {
         return this._delivery.publishPulledMessage(event, ns, seq, payload, persist);
@@ -1926,7 +1992,7 @@ export class AUNClient {
             }
             else {
                 // data 非对象也透传给用户（兼容旧版）
-                await this._dispatcher.publish('group.changed', data);
+                this._dispatcher.enqueue('group.changed', data);
             }
             this._clientLog.debug(`_onRawGroupChanged exit: elapsed=${Date.now() - tStart}ms`);
         }
@@ -1990,7 +2056,7 @@ export class AUNClient {
                     certPem = await this._fetchPeerCert(sigAid, expectedFP || undefined);
                 }
                 catch {
-                    this._dispatcher.publish('signature_pending', { aid: sigAid, method }).catch(() => { });
+                    this._dispatcher.enqueue('signature_pending', { aid: sigAid, method });
                     return false;
                 }
             }
@@ -2010,19 +2076,19 @@ export class AUNClient {
             if (!ok) {
                 this._clientLog.warn(`group event signature verification failed aid=${sigAid} method=${method}`);
                 // P1-16: 签名失败统一发布事件
-                this._dispatcher.publish('signature.verification_failed', {
+                this._dispatcher.enqueue('signature.verification_failed', {
                     aid: sigAid, method, error: 'ECDSA verification failed',
-                }).catch(() => { });
+                });
             }
             return ok;
         }
         catch (exc) {
             this._clientLog.warn(`group event signature verification error: ${formatCaughtError(exc)}`);
             // P1-16: 签名失败统一发布事件
-            this._dispatcher.publish('signature.verification_failed', {
+            this._dispatcher.enqueue('signature.verification_failed', {
                 aid: String(cs.aid ?? ''), method: String(cs._method ?? ''),
                 error: formatCaughtError(exc),
-            }).catch(() => { });
+            });
             return false;
         }
     }
@@ -2419,7 +2485,7 @@ export class AUNClient {
                 }
             }
             else {
-                await this._dispatcher.publish('state_change', statePayload);
+                this._dispatcher.enqueue('state_change', statePayload);
             }
             this._assertReconnectOwner(reconnectOwner);
             this._lifecycle.assertConnectionAttemptOwner(connectionOwner);
@@ -2761,7 +2827,7 @@ export class AUNClient {
             this._attachV2EnvelopeMetadata(event, e2eeMeta);
             this._logMessageDebug('decrypt-fail', 'v2.decrypt', undecryptableEvent, event);
             if (emitUndecryptable)
-                await this._dispatcher.publish(undecryptableEvent, event);
+                this._dispatcher.enqueue(undecryptableEvent, event);
             return null;
         }
         this._clientLog.debug(`V2 decrypt key lookup ok: seq=${String(msg.seq ?? '')}, group=${groupIdForKeys || '<p2p>'}, ik_len=${ikPriv.byteLength}, spk_len=${spkPriv?.byteLength ?? 0}`);
@@ -2800,7 +2866,7 @@ export class AUNClient {
             this._attachV2EnvelopeMetadata(event, e2eeMeta);
             this._logMessageDebug('decrypt-fail', 'v2.decrypt', undecryptableEvent, event);
             if (emitUndecryptable)
-                await this._dispatcher.publish(undecryptableEvent, event);
+                this._dispatcher.enqueue(undecryptableEvent, event);
             return null;
         }
         let plaintext;
@@ -2829,7 +2895,7 @@ export class AUNClient {
             this._attachV2EnvelopeMetadata(event, e2eeMeta);
             this._logMessageDebug('decrypt-fail', 'v2.decrypt', undecryptableEvent, event);
             if (emitUndecryptable)
-                await this._dispatcher.publish(undecryptableEvent, event);
+                this._dispatcher.enqueue(undecryptableEvent, event);
             return null;
         }
         if (plaintext === null) {
@@ -3065,6 +3131,11 @@ export class AUNClient {
         if (!resolvedAid) {
             throw new StateError('gateway discovery requires a loaded AID');
         }
+        const discovery = this._discovery;
+        const tokenStore = this._tokenStore;
+        const discoveryIsCurrent = () => (this._discovery === discovery
+            && this._tokenStore === tokenStore
+            && !this._closing);
         if (this._gatewayCandidates.length > 0)
             return [...this._gatewayCandidates];
         if (this._gatewayUrl) {
@@ -3072,9 +3143,9 @@ export class AUNClient {
             return [...this._gatewayCandidates];
         }
         try {
-            const loadMetadata = this._tokenStore.loadMetadata;
+            const loadMetadata = tokenStore.loadMetadata;
             const metadata = typeof loadMetadata === 'function'
-                ? loadMetadata.call(this._tokenStore, resolvedAid)
+                ? loadMetadata.call(tokenStore, resolvedAid)
                 : null;
             const cachedList = isJsonObject(metadata) && Array.isArray(metadata.gateway_urls)
                 ? metadata.gateway_urls.map((item) => String(item ?? '').trim()).filter(Boolean)
@@ -3101,12 +3172,13 @@ export class AUNClient {
             try {
                 // discoverAll 是生产路径；若调用方注入了旧版/测试 discovery
                 // 替身而只提供 discover，则保留单候选兼容，不影响多候选发现。
-                const discovery = this._discovery;
                 const hasInjectedDiscover = Object.prototype.hasOwnProperty.call(discovery, 'discover')
                     && typeof discovery.discover === 'function';
                 const discovered = hasInjectedDiscover
                     ? [await discovery.discover(url)]
                     : await discovery.discoverAll(url);
+                if (!discoveryIsCurrent())
+                    throw new StateError('gateway discovery superseded by identity change');
                 const gatewayUrls = [...new Set(discovered.map((item) => String(item ?? '').trim()).filter(Boolean))];
                 if (gatewayUrls.length === 0)
                     throw new ValidationError('gateway discovery returned no candidates');
@@ -3114,9 +3186,9 @@ export class AUNClient {
                 const gateway = gatewayUrls[0];
                 this._gatewayUrl = gateway;
                 try {
-                    const saveMetadata = this._tokenStore.saveMetadata;
+                    const saveMetadata = tokenStore.saveMetadata;
                     if (typeof saveMetadata === 'function') {
-                        saveMetadata.call(this._tokenStore, resolvedAid, {
+                        saveMetadata.call(tokenStore, resolvedAid, {
                             gateway_url: gateway,
                             gateway_urls: gatewayUrls,
                             gateway_cached_at: Date.now(),
@@ -3129,6 +3201,8 @@ export class AUNClient {
                 return [...gatewayUrls];
             }
             catch (err) {
+                if (!discoveryIsCurrent())
+                    throw new StateError('gateway discovery superseded by identity change');
                 lastErr = err;
                 this._clientLog.warn(`gateway discovery failed: aid=${resolvedAid} url=${url} err=${formatCaughtError(err)}`);
             }
@@ -3363,7 +3437,7 @@ export class AUNClient {
                     if (this._sessionParams !== null && identity.access_token) {
                         this._sessionParams.access_token = identity.access_token;
                     }
-                    await this._dispatcher.publish('token.refreshed', {
+                    this._dispatcher.enqueue('token.refreshed', {
                         aid: identity.aid,
                         expires_at: identity.access_token_expires_at,
                     });
@@ -3373,7 +3447,7 @@ export class AUNClient {
                     if (exc instanceof AuthError) {
                         if (authErrorRequiresRelogin(exc)) {
                             this._clientLog.warn(`token refresh requires relogin, stopping refresh loop and triggering reconnect: ${exc.message}`);
-                            await this._dispatcher.publish('token.refresh_exhausted', {
+                            this._dispatcher.enqueue('token.refresh_exhausted', {
                                 aid: this._identity?.aid ?? null,
                                 consecutive_failures: 1,
                                 last_error: String(exc),
@@ -3386,7 +3460,7 @@ export class AUNClient {
                         this._tokenRefreshFailures++;
                         if (this._tokenRefreshFailures >= 3) {
                             this._clientLog.warn(`token refresh failed ${this._tokenRefreshFailures} consecutive times, stopping refresh loop and triggering reconnect`);
-                            await this._dispatcher.publish('token.refresh_exhausted', {
+                            this._dispatcher.enqueue('token.refresh_exhausted', {
                                 aid: this._identity?.aid ?? null,
                                 consecutive_failures: this._tokenRefreshFailures,
                                 last_error: String(exc),
@@ -3398,7 +3472,7 @@ export class AUNClient {
                         this._clientLog.debug(`token refresh failed (${this._tokenRefreshFailures}/3), will retry: ${exc}`);
                     }
                     else {
-                        await this._dispatcher.publish('connection.error', { error: formatCaughtError(exc) });
+                        this._dispatcher.enqueue('connection.error', { error: formatCaughtError(exc) });
                     }
                 }
                 scheduleNext();
@@ -3469,7 +3543,7 @@ export class AUNClient {
         this._lastDisconnectInfo = { code, reason, detail };
         // 透传给应用层订阅者
         try {
-            await this._dispatcher.publish('gateway.disconnect', {
+            this._dispatcher.enqueue('gateway.disconnect', {
                 code,
                 reason,
                 detail,
@@ -3595,13 +3669,7 @@ export class AUNClient {
     async _publishReconnectEvent(owner, event, payload) {
         if (!this._ownsReconnect(owner))
             return false;
-        this._reconnectEventDispatchDepth += 1;
-        try {
-            await this._dispatcher.publish(event, payload);
-        }
-        finally {
-            this._reconnectEventDispatchDepth -= 1;
-        }
+        this._dispatcher.enqueue(event, payload);
         return this._ownsReconnect(owner);
     }
     async _cancelReconnectAndWait() {
@@ -3610,6 +3678,8 @@ export class AUNClient {
         if (!owner && !task && !this._reconnectActive)
             return;
         owner?.abort();
+        this._discovery?._cancelPending?.();
+        this._auth?._cancelPending?.();
         this._stopBackgroundTasks();
         try {
             await this._transport.close();