@agentunion/fastaun 0.5.9 → 0.5.11

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));
@@ -1068,6 +1068,62 @@ export class AUNClient {
         await this._agentMdManager.upload(agentMd);
         return true;
     }
+    async _checkIdentityAdmissionAfterConnect() {
+        const aid = String(this._aid ?? this._currentAid?.aid ?? '').trim();
+        if (!aid)
+            return;
+        try {
+            const checked = await this._agentMdManager.check(aid);
+            if (!checked.remote_found) {
+                const content = this._agentMdManager.readContent(aid) || buildDefaultAgentMd(aid);
+                await this._agentMdManager.upload(content);
+            }
+        }
+        catch (exc) {
+            this._clientLog.warn(`post-connect agent.md check failed: ${formatCaughtError(exc)}`);
+        }
+        const store = this._aidStore;
+        if (!store)
+            return;
+        let listed;
+        try {
+            listed = await this.call('group.list_my', {});
+        }
+        catch (exc) {
+            this._clientLog.warn(`post-connect group identity check failed: ${formatCaughtError(exc)}`);
+            return;
+        }
+        const result = isJsonObject(listed) ? listed : {};
+        const groups = Array.isArray(result.groups) ? result.groups : (Array.isArray(result.items) ? result.items : []);
+        for (const raw of groups) {
+            if (!isJsonObject(raw))
+                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;
+            try {
+                await this._runGroupIdentityOperation(groupId, async () => {
+                    const loaded = store.load(groupAid);
+                    if (!loaded.ok || !loaded.data?.aid?.isPrivateKeyValid()) {
+                        await this.bindGroupAid({ group_id: groupId, group_aid: groupAid }, { aidStore: store });
+                        return;
+                    }
+                    const checked = await this._agentMdManager.check(groupAid);
+                    if (!checked.remote_found) {
+                        await this._uploadGroupAgentMd(store, groupAid, {}, {});
+                    }
+                });
+            }
+            catch (exc) {
+                this._clientLog.warn(`post-connect group identity check failed: group=${groupId} err=${formatCaughtError(exc)}`);
+            }
+        }
+    }
     async _runGroupIdentityOperation(groupId, operation) {
         const aid = String(this._aid ?? '').trim();
         const dot = aid.indexOf('.');
@@ -1943,14 +1999,14 @@ 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);
+    async _publishPulledMessage(event, ns, seq, payload, persist = true, source = 'pull') {
+        return this._delivery.publishPulledMessage(event, ns, seq, payload, persist, source);
     }
     _markOrderedSeqDelivered(ns, seq) {
         if (!ns || !Number.isFinite(seq) || !Number.isInteger(seq) || seq <= 0)
@@ -1992,7 +2048,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`);
         }
@@ -2056,7 +2112,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;
                 }
             }
@@ -2076,19 +2132,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;
         }
     }
@@ -2485,7 +2541,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);
@@ -2517,6 +2573,7 @@ export class AUNClient {
                     this._clientLog.warn(`schedule post-connect P2P gap fill failed: ${formatCaughtError(exc)}`);
                 });
             }
+            this._safeAsync(this._checkIdentityAdmissionAfterConnect());
             this._clientLog.debug(`_connectOnce exit: elapsed=${Date.now() - tStart}ms gateway=${gatewayUrl}, aid=${this._aid ?? ''}`);
         }
         catch (err) {
@@ -2730,7 +2787,7 @@ export class AUNClient {
         return await this._v2E2EE.ackGroupV2(groupId, upToSeq, groupAid);
     }
     /** 解密单条 V2 pull 消息。缺 sender IK 时先入 pending，后台补齐后重试。 */
-    async _decryptV2Message(msg, allowPending = true, emitUndecryptable = true, rotateKeys = true, observeAgentMd = true, deferStatus, deferKeyFetch = false) {
+    async _decryptV2Message(msg, allowPending = true, emitUndecryptable = true, rotateKeys = true, observeAgentMd = true, deferStatus, deferKeyFetch = false, source = 'pull') {
         const session = this._v2Session;
         if (!session)
             return null;
@@ -2823,11 +2880,12 @@ export class AUNClient {
                 _envelope_type: String(envelope.type ?? ''),
                 _suite: String(envelope.suite ?? ''),
                 _spk_id: spkId,
+                source,
             };
             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}`);
@@ -2862,11 +2920,12 @@ export class AUNClient {
                 _decrypt_stage: 'sender_ik',
                 _envelope_type: String(envelope.type ?? ''),
                 _suite: String(envelope.suite ?? ''),
+                source,
             };
             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;
@@ -2891,11 +2950,12 @@ export class AUNClient {
                 _decrypt_stage: 'decrypt',
                 _envelope_type: String(envelope.type ?? ''),
                 _suite: String(envelope.suite ?? ''),
+                source,
             };
             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) {
@@ -3437,7 +3497,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,
                     });
@@ -3447,7 +3507,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),
@@ -3460,7 +3520,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),
@@ -3472,7 +3532,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();
@@ -3543,7 +3603,7 @@ export class AUNClient {
         this._lastDisconnectInfo = { code, reason, detail };
         // 透传给应用层订阅者
         try {
-            await this._dispatcher.publish('gateway.disconnect', {
+            this._dispatcher.enqueue('gateway.disconnect', {
                 code,
                 reason,
                 detail,
@@ -3669,13 +3729,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() {