@agentunion/fastaun 0.5.24 → 0.5.25

package/dist/client.d.ts

@@ -121,6 +121,7 @@ export declare class AUNClient {
     /** Gateway URL */
     private _gatewayUrl;
     private _gatewayCandidates;
+    private _peerGatewayCache;
     /** 是否正在关闭 */
     private _closing;
     private _disconnecting;

package/dist/client.js

@@ -352,7 +352,9 @@ function createAgentMdManagerForRuntime(opts) {
         entitySignerResolver: opts.fetchEntitySigner,
         gatewayResolver: async (aid) => {
             const gatewayUrl = await opts.gateway.resolve(aid);
-            opts.gateway.set(gatewayUrl);
+            const localAid = opts.ownerAid();
+            if (localAid && aid.slice(aid.indexOf('.') + 1).trim().toLowerCase() === localAid.slice(localAid.indexOf('.') + 1).trim().toLowerCase())
+                opts.gateway.set(gatewayUrl);
             return gatewayUrl;
         },
         accessTokenResolver: async (aid, gatewayUrl) => {
@@ -446,7 +448,7 @@ function createAgentMdManagerForRuntime(opts) {
             }
             if (!opts.gateway.get()) {
                 try {
-                    opts.gateway.set(await opts.gateway.resolve(target));
+                    opts.gateway.set(await opts.gateway.resolve(opts.ownerAid() ?? target));
                 }
                 catch { /* best effort before cert fetch */ }
             }
@@ -763,6 +765,7 @@ export class AUNClient {
     /** Gateway URL */
     _gatewayUrl = null;
     _gatewayCandidates = [];
+    _peerGatewayCache = new Map();
     /** 是否正在关闭 */
     _closing = false;
     _disconnecting = false;
@@ -1360,6 +1363,7 @@ export class AUNClient {
         this._certCache.clear();
         this._gatewayUrl = null;
         this._gatewayCandidates = [];
+        this._peerGatewayCache.clear();
         this._deviceId = aid.deviceId || getDeviceId(nextConfig.aunPath);
         this._slotId = aid.slotId || 'default';
         const debugFlag = nextConfig.debug;
@@ -1522,6 +1526,7 @@ export class AUNClient {
     }
     /** 关闭连接 */
     async close() {
+        this._peerGatewayCache.clear();
         return this._lifecycle.close();
     }
     /**
@@ -2667,9 +2672,11 @@ export class AUNClient {
     on(event, handler) {
         const tStart = Date.now();
         this._clientLog.debug(`on enter: event=${event}`);
+        const messageEvent = event === 'message.received' || event === 'message.recalled' || event === 'message.batch';
+        const hadMessageConsumer = messageEvent && [...this._dispatcher._snapshotApplicationHandlers(['message.received', 'message.recalled', 'message.batch']).values()].some((handlers) => handlers.length > 0);
         const result = this._dispatcher.subscribe(event, handler);
-        if (event === 'message.received' || event === 'message.recalled' || event === 'message.batch') {
-            if (this._p2pPeerPullEnabled)
+        if (messageEvent) {
+            if (this._p2pPeerPullEnabled && !hadMessageConsumer)
                 this._delivery.refreshPendingPeers();
             this._delivery.requestBackgroundPullRecovery();
         }
@@ -4701,20 +4708,15 @@ export class AUNClient {
         return gateways[0];
     }
     async _resolveOwnershipCertificateGateway(aid) {
-        const issuer = aid.slice(aid.indexOf('.') + 1);
-        if (issuer === this._aid?.slice(this._aid.indexOf('.') + 1))
+        const issuer = aid.slice(aid.indexOf('.') + 1).trim().toLowerCase();
+        if (issuer === this._aid?.slice(this._aid.indexOf('.') + 1).trim().toLowerCase())
             return this._resolveGatewayForAid(aid);
-        const port = this._configModel.discoveryPort ? `:${this._configModel.discoveryPort}` : '';
-        let lastError;
-        for (const host of [aid, `gateway.${issuer}`]) {
-            try {
-                return await this._discovery.discover(`https://${host}${port}/.well-known/aun-gateway`);
-            }
-            catch (error) {
-                lastError = error;
-            }
+        try {
+            return await this._resolveGatewayForAid(aid);
+        }
+        catch (error) {
+            throw ownershipFailure('unavailable', error instanceof Error ? error.message : 'signer Gateway discovery failed', true);
         }
-        throw ownershipFailure('unavailable', lastError instanceof Error ? lastError.message : 'signer Gateway discovery failed', true);
     }
     /** 发现并缓存全部 Gateway 候选，供首连和自动重连故障转移使用。 */
     async _resolveGatewayCandidatesForAid(aid) {
@@ -4722,17 +4724,26 @@ export class AUNClient {
         if (!resolvedAid) {
             throw new StateError('gateway discovery requires a loaded AID');
         }
+        const dotIdx = resolvedAid.indexOf('.');
+        const issuerDomain = (dotIdx >= 0 ? resolvedAid.slice(dotIdx + 1) : resolvedAid).trim().toLowerCase();
+        const currentAid = this._aid;
+        const sameIssuer = currentAid !== null && issuerDomain === currentAid.slice(currentAid.indexOf('.') + 1).trim().toLowerCase();
         const discovery = this._discovery;
         const tokenStore = this._tokenStore;
         const discoveryIsCurrent = () => (this._discovery === discovery
             && this._tokenStore === tokenStore
             && !this._closing);
-        if (this._gatewayCandidates.length > 0)
+        if (sameIssuer && this._gatewayCandidates.length > 0)
             return [...this._gatewayCandidates];
-        if (this._gatewayUrl) {
+        if (sameIssuer && this._gatewayUrl) {
             this._gatewayCandidates = [this._gatewayUrl];
             return [...this._gatewayCandidates];
         }
+        if (!sameIssuer) {
+            const cached = this._peerGatewayCache.get(issuerDomain);
+            if (cached)
+                return [...cached];
+        }
         try {
             const loadMetadata = tokenStore.loadMetadata;
             const metadata = typeof loadMetadata === 'function'
@@ -4744,16 +4755,19 @@ export class AUNClient {
             const cachedGateway = cachedList[0]
                 ?? (isJsonObject(metadata) ? String(metadata.gateway_url ?? '').trim() : '');
             if (cachedGateway) {
-                this._gatewayCandidates = [...new Set([cachedGateway, ...cachedList])];
-                this._gatewayUrl = this._gatewayCandidates[0];
-                return [...this._gatewayCandidates];
+                const gatewayUrls = [...new Set([cachedGateway, ...cachedList])];
+                if (sameIssuer) {
+                    this._gatewayCandidates = gatewayUrls;
+                    this._gatewayUrl = gatewayUrls[0];
+                }
+                else
+                    this._peerGatewayCache.set(issuerDomain, gatewayUrls);
+                return [...gatewayUrls];
             }
         }
         catch {
             // 缓存读取失败不影响发现流程。
         }
-        const dotIdx = resolvedAid.indexOf('.');
-        const issuerDomain = dotIdx >= 0 ? resolvedAid.slice(dotIdx + 1) : resolvedAid;
         const portSuffix = this._configModel.discoveryPort ? `:${this._configModel.discoveryPort}` : '';
         const aidUrl = `https://${resolvedAid}${portSuffix}/.well-known/aun-gateway`;
         const gatewayDomainUrl = `https://gateway.${issuerDomain}${portSuffix}/.well-known/aun-gateway`;
@@ -4773,9 +4787,13 @@ export class AUNClient {
                 const gatewayUrls = [...new Set(discovered.map((item) => String(item ?? '').trim()).filter(Boolean))];
                 if (gatewayUrls.length === 0)
                     throw new ValidationError('gateway discovery returned no candidates');
-                this._gatewayCandidates = gatewayUrls;
                 const gateway = gatewayUrls[0];
-                this._gatewayUrl = gateway;
+                if (sameIssuer) {
+                    this._gatewayCandidates = gatewayUrls;
+                    this._gatewayUrl = gateway;
+                }
+                else
+                    this._peerGatewayCache.set(issuerDomain, gatewayUrls);
                 try {
                     const saveMetadata = tokenStore.saveMetadata;
                     if (typeof saveMetadata === 'function') {