@agentunion/fastaun 0.5.13 → 0.5.15

package/dist/client.js

@@ -575,6 +575,7 @@ export class AUNClient {
             aunPath: this._configModel.aunPath,
         });
         this._logger.bindDeviceId(this._deviceId);
+        this._logger.bindAid(initAid ?? '');
         this._clientLog = this._logger.for('aun_core.client');
         if (debugFlag) {
             this._clientLog.info(`AUNClient initialized (debug=true, aunPath=${this._configModel.aunPath})`);
@@ -624,13 +625,13 @@ export class AUNClient {
         });
         this._transport = new RPCTransport({
             eventDispatcher: this._dispatcher,
-            timeout: 10_000,
-            onDisconnect: (err, closeCode) => this._handleTransportDisconnect(err, closeCode),
+            timeout: 35_000,
             verifySsl: this._configModel.verifySsl,
             logger: this._logger.for('aun_core.transport'),
             dnsNet,
         });
-        this._transport.setMetaObserver((meta) => this._observeRpcMeta(meta));
+        this._transport.setProtocolMetaObserver((meta) => this._observeRpcMeta(meta));
+        this._transport.setProtocolDisconnectCallback((err, closeCode) => this._handleTransportDisconnect(err, closeCode));
         this._runtime = new ClientRuntime(this);
         this._identityRuntime = new IdentityRuntimeManager(this._runtime);
         this._peerDirectory = new PeerDirectory(this._runtime);
@@ -654,11 +655,11 @@ export class AUNClient {
             }
         }
         // 内部订阅：推送消息自动解密后 re-publish 给用户
-        this._dispatcher.subscribe('_raw.message.received', (data) => this._onRawMessageReceived(data));
+        this._dispatcher.subscribeProtocol('_raw.message.received', (data) => this._onRawMessageReceived(data));
         // P2P 消息撤回推送：在线 push 与 pull tombstone 去重后再发布给应用层
-        this._dispatcher.subscribe('_raw.message.recalled', (data) => this._safeAsync(this._onRawMessageRecalled(data)));
+        this._dispatcher.subscribeProtocol('_raw.message.recalled', (data) => this._safeAsync(this._onRawMessageRecalled(data)));
         // V2 P2P 推送通知：收到通知后自动走 message.v2.pull 拉取并解密
-        this._dispatcher.subscribe('_raw.peer.v2.message_received', (data) => {
+        this._dispatcher.subscribeProtocol('_raw.peer.v2.message_received', (data) => {
             const ns = this._aid ? `p2p:${this._aid}` : '';
             const hasInline = isJsonObject(data)
                 && isJsonObject(data.inline_message);
@@ -668,7 +669,7 @@ export class AUNClient {
                 : this._onV2PushNotification(data, 'v2'));
         });
         // V2 群组消息推送通知：收到通知后自动走 group.v2.pull 拉取并解密
-        this._dispatcher.subscribe('_raw.group.v2.message_created', (data) => {
+        this._dispatcher.subscribeProtocol('_raw.group.v2.message_created', (data) => {
             const groupId = isJsonObject(data)
                 ? String(data.group_id ?? '').trim()
                 : '';
@@ -681,26 +682,26 @@ export class AUNClient {
                 : this._onRawGroupV2MessageCreated(data, 'v2'));
         });
         // 群组消息推送：自动解密后 re-publish
-        this._dispatcher.subscribe('_raw.group.message_created', (data) => this._onRawGroupMessageCreated(data));
+        this._dispatcher.subscribeProtocol('_raw.group.message_created', (data) => this._onRawGroupMessageCreated(data));
         // 群组消息撤回推送：在线 push 通道，与 pull 双 tombstone 兜底互补（SDK 去重只回调一次）
-        this._dispatcher.subscribe('_raw.group.message_recalled', (data) => this._safeAsync(this._onRawGroupMessageRecalled(data)));
+        this._dispatcher.subscribeProtocol('_raw.group.message_recalled', (data) => this._safeAsync(this._onRawGroupMessageRecalled(data)));
         // 群组变更事件：透传并触发 V2 state/SPK 维护
-        this._dispatcher.subscribe('_raw.group.changed', (data) => this._onRawGroupChanged(data));
+        this._dispatcher.subscribeProtocol('_raw.group.changed', (data) => this._onRawGroupChanged(data));
         // 定向邀请底层事件：按群 + 目标 AID 聚合后向应用层只提示一次。
-        this._dispatcher.subscribe('_raw.group.invite_created', (data) => this._onRawGroupInviteCreated(data));
-        this._dispatcher.subscribe('_raw.group.invite_finalized', (data) => this._onRawGroupInviteFinalized(data));
+        this._dispatcher.subscribeProtocol('_raw.group.invite_created', (data) => this._onRawGroupInviteCreated(data));
+        this._dispatcher.subscribeProtocol('_raw.group.invite_finalized', (data) => this._onRawGroupInviteFinalized(data));
         // V2 state proposal 服务平面事件：owner/admin 负责确认或重新提案
-        this._dispatcher.subscribe('_raw.group.v2.state_proposed', (data) => this._safeAsync(this._onV2StateProposed(data)));
-        this._dispatcher.subscribe('_raw.group.v2.state_retry_needed', (data) => this._safeAsync(this._onV2StateRetryNeeded(data)));
-        this._dispatcher.subscribe('_raw.group.v2.state_confirmed', (data) => this._safeAsync(this._onV2StateConfirmed(data)));
+        this._dispatcher.subscribeProtocol('_raw.group.v2.state_proposed', (data) => this._safeAsync(this._onV2StateProposed(data)));
+        this._dispatcher.subscribeProtocol('_raw.group.v2.state_retry_needed', (data) => this._safeAsync(this._onV2StateRetryNeeded(data)));
+        this._dispatcher.subscribeProtocol('_raw.group.v2.state_confirmed', (data) => this._safeAsync(this._onV2StateConfirmed(data)));
         // 群组状态提交事件：验证 state_hash 链并更新本地存储
-        this._dispatcher.subscribe('_raw.group.state_committed', (data) => this._onGroupStateCommitted(data));
+        this._dispatcher.subscribeProtocol('_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.enqueue(evt, data));
+            this._dispatcher.subscribeProtocol(`_raw.${evt}`, (data) => this._dispatcher.enqueue(evt, data));
         }
         // 服务端主动断开通知：记录日志并标记不重连
-        this._dispatcher.subscribe('_raw.gateway.disconnect', (data) => this._onGatewayDisconnect(data));
+        this._dispatcher.subscribeProtocol('_raw.gateway.disconnect', (data) => this._onGatewayDisconnect(data));
     }
     // ── 属性 ──────────────────────────────────────────────────
     /** 当前 AID */
@@ -867,6 +868,7 @@ export class AUNClient {
         const debugFlag = nextConfig.debug;
         this._logger = new AUNLogger({ debug: debugFlag, aunPath: nextConfig.aunPath });
         this._logger.bindDeviceId(this._deviceId);
+        this._logger.bindAid(aid.aid);
         this._clientLog = this._logger.for('aun_core.client');
         const dnsNet = new DnsResilientNet({
             verifySsl: nextConfig.verifySsl,
@@ -908,13 +910,13 @@ export class AUNClient {
         });
         this._transport = new RPCTransport({
             eventDispatcher: this._dispatcher,
-            timeout: 10_000,
-            onDisconnect: (err, closeCode) => this._handleTransportDisconnect(err, closeCode),
+            timeout: 35_000,
             verifySsl: nextConfig.verifySsl,
             logger: this._logger.for('aun_core.transport'),
             dnsNet,
         });
-        this._transport.setMetaObserver((meta) => this._observeRpcMeta(meta));
+        this._transport.setProtocolMetaObserver((meta) => this._observeRpcMeta(meta));
+        this._transport.setProtocolDisconnectCallback((err, closeCode) => this._handleTransportDisconnect(err, closeCode));
     }
     loadIdentity(aid) {
         this._identityRuntime.loadIdentity(aid);
@@ -1740,7 +1742,7 @@ export class AUNClient {
         this._clientLog.debug(`on exit: elapsed=${Date.now() - tStart}ms event=${event}`);
         return result;
     }
-    async _callRawV2Rpc(method, params) {
+    async _callRawV2Rpc(method, params, pullGateKey = '') {
         const p = { ...(params ?? {}) };
         const forceForeground = Boolean(p._rpc_foreground);
         const rpcBackground = !forceForeground
@@ -1769,7 +1771,10 @@ export class AUNClient {
         if (method.startsWith('group.') && p.slot_id === undefined) {
             p.slot_id = this._slotId;
         }
-        return await this._rpcPipeline.rawCall(method, p, { background: rpcBackground });
+        return await this._rpcPipeline.rawCall(method, p, {
+            background: rpcBackground,
+            ...(pullGateKey ? { pullGateKey } : {}),
+        });
     }
     /** P2-13: 取消订阅事件（对齐 Python/JS off 方法） */
     off(event, handler) {