@agentunion/fastaun 0.4.8 → 0.4.10

package/dist/client.js

@@ -114,6 +114,7 @@ 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 MAX_NOTIFY_PAYLOAD_SIZE = 64 * 1024;
 // 心跳间隔下/上限（秒）。0 = 关闭心跳；负值视为 0；其余值 clamp 到 [10, 600]。
 // 服务端通过 hello.heartbeat_interval 与 meta.ping pong 中的同名字段下发。
 const HEARTBEAT_MIN_INTERVAL_SECONDS = 10;
@@ -135,7 +136,7 @@ const NON_IDEMPOTENT_METHODS = new Set([
     'group.kick', 'group.remove_member', 'group.leave', 'group.dissolve',
     'group.update_name', 'group.update_avatar', 'group.update_announcement',
     'group.update_settings',
-    'storage.upload', 'storage.complete_upload', 'storage.delete',
+    'storage.create_upload_session', 'storage.complete_upload', 'storage.delete_object',
     'auth.create_aid', 'auth.renew_cert', 'auth.rekey',
     'message.thought.put', 'group.thought.put',
     'group.add_member',
@@ -407,6 +408,8 @@ export class AUNClient {
     _seqTrackerContext = null;
     /** 惰性群同步：已同步过的 group_id 集合 */
     _groupSynced = new Set();
+    /** 群撤回去重：group_id|sorted(message_ids)|recalled_at -> 时间戳，保证应用层只回调一次 */
+    _groupRecallSeen = new Map();
     /** 补洞去重：已完成/进行中的 key -> 开始时间戳，防止重复 pull 同一区间 */
     _gapFillDone = new Map();
     /** pull gate：按消费单元串行化 public pull / gap fill / push auto-pull。 */
@@ -584,6 +587,8 @@ export class AUNClient {
         this._dispatcher.subscribe('_raw.group.v2.message_created', (data) => this._safeAsync(this._onRawGroupV2MessageCreated(data)));
         // 群组消息推送：自动解密后 re-publish
         this._dispatcher.subscribe('_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)));
         // 群组变更事件：拦截处理成员变更触发的 epoch 轮换，然后透传
         this._dispatcher.subscribe('_raw.group.changed', (data) => this._onRawGroupChanged(data));
         // V2 epoch 轮换事件：清 bootstrap 缓存并触发 SPK rotation
@@ -836,72 +841,14 @@ export class AUNClient {
     }
     /** 关闭连接 */
     async close() {
-        const tStart = Date.now();
-        this._clientLog.debug(`close enter: state=${this._state}, aid=${this._aid ?? ''}`);
-        try {
-            this._closing = true;
-            this._saveSeqTrackerState();
-            this._stopBackgroundTasks();
-            this._stopReconnect();
-            if (this.state === ConnectionState.NO_IDENTITY || this.state === ConnectionState.CLOSED) {
-                const closableStore = this._tokenStore;
-                closableStore.close?.();
-                this._state = 'closed';
-                this._logger.close();
-                this._resetSeqTrackingState();
-                this._clientLog.debug(`close exit: elapsed=${Date.now() - tStart}ms (was no_identity/closed)`);
-                return;
-            }
-            await this._transport.close();
-            const closableStore = this._tokenStore;
-            closableStore.close?.();
-            this._state = 'closed';
-            this._logger.close();
-            await this._dispatcher.publish('state_change', { state: this._publicState(this._state) });
-            this._resetSeqTrackingState();
-            this._clientLog.debug(`close exit: elapsed=${Date.now() - tStart}ms`);
-        }
-        catch (err) {
-            this._clientLog.debug(`close exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-            throw err;
-        }
+        return this._lifecycle.close();
     }
     /**
      * 断开连接但不关闭客户端（可重新 connect，对齐 Python disconnect）。
      * disconnect 是可恢复的：停止心跳、关闭 WebSocket，但不清理 keystore 等状态。
      */
     async disconnect() {
-        const tStart = Date.now();
-        this._clientLog.debug(`disconnect enter: state=${this._state}, aid=${this._aid ?? ''}, closing=${this._closing}`);
-        try {
-            // 若 close() 已在执行中，跳过 disconnect 避免竞态
-            if (this._closing) {
-                this._clientLog.debug(`disconnect exit: elapsed=${Date.now() - tStart}ms (closing)`);
-                return;
-            }
-            if (![
-                ConnectionState.AUTHENTICATED,
-                ConnectionState.CONNECTING,
-                ConnectionState.READY,
-                ConnectionState.RETRY_BACKOFF,
-                ConnectionState.RECONNECTING,
-                ConnectionState.CONNECTION_FAILED,
-            ].includes(this.state)) {
-                this._clientLog.debug(`disconnect exit: elapsed=${Date.now() - tStart}ms (state=${this._state})`);
-                return;
-            }
-            this._saveSeqTrackerState();
-            this._stopBackgroundTasks();
-            this._stopReconnect();
-            await this._transport.close();
-            this._state = 'standby';
-            await this._dispatcher.publish('state_change', { state: this._publicState(this._state) });
-            this._clientLog.debug(`disconnect exit: elapsed=${Date.now() - tStart}ms`);
-        }
-        catch (err) {
-            this._clientLog.debug(`disconnect exit (error): elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-            throw err;
-        }
+        return this._lifecycle.disconnect();
     }
     // ── RPC ───────────────────────────────────────────────────
     /**
@@ -909,154 +856,91 @@ export class AUNClient {
      * 自动处理内部方法限制、E2EE 加解密、客户端签名等。
      */
     async call(method, params) {
-        const tStart = Date.now();
-        this._clientLog.debug(`call enter: method=${method}`);
-        try {
-            const preflight = this._rpcPipeline.preflight(method, params);
-            const p = preflight.params;
-            const rpcBackground = preflight.rpcBackground;
-            const runWithRpcPriority = async (operation) => {
-                if (!rpcBackground)
-                    return await operation();
-                return await this._withBackgroundRpc(operation);
+        return await this._rpcPipeline.call(method, params);
+    }
+    static _notifyParamsSizeOk(params) {
+        return new TextEncoder().encode(JSON.stringify(params)).length <= MAX_NOTIFY_PAYLOAD_SIZE;
+    }
+    static _validateNotifyEventMethod(method) {
+        const normalized = String(method ?? '').trim();
+        if (!normalized.startsWith('event/app.') || normalized.length <= 'event/app.'.length) {
+            throw new ValidationError('routed notify method must be event/app.*');
+        }
+        return normalized;
+    }
+    static _normalizeNotifyTtl(value) {
+        if (value === undefined || value === null)
+            return undefined;
+        const ttl = Number(value);
+        if (!Number.isInteger(ttl)) {
+            throw new ValidationError('ttl_ms must be an integer');
+        }
+        if (ttl < 0 || ttl > 60000) {
+            throw new ValidationError('ttl_ms must be between 0 and 60000');
+        }
+        return ttl;
+    }
+    /**
+     * 发送轻量在线通知，不走离线存储、seq/pull 或 ack。
+     */
+    async notify(method, params, options = {}) {
+        if (params !== undefined && params !== null && !isJsonObject(params)) {
+            throw new ValidationError('notify params must be an object');
+        }
+        const payload = { ...(params ?? {}) };
+        if (!AUNClient._notifyParamsSizeOk(payload)) {
+            throw new ValidationError('notify payload is too large');
+        }
+        const targetAid = String(options.to ?? '').trim();
+        const targetGroupId = String(options.group_id ?? options.groupId ?? '').trim();
+        const targetDeviceId = String(options.device_id ?? options.deviceId ?? '').trim();
+        const targetSlotId = String(options.slot_id ?? options.slotId ?? '').trim();
+        const ttl = AUNClient._normalizeNotifyTtl(options.ttl_ms ?? options.ttlMs);
+        if (targetAid && targetGroupId) {
+            throw new ValidationError('notify() cannot set both to and group_id');
+        }
+        if (targetSlotId && !targetDeviceId) {
+            throw new ValidationError('slot_id requires device_id for notify target');
+        }
+        if (targetAid) {
+            const eventMethod = AUNClient._validateNotifyEventMethod(method);
+            const target = { type: 'aid', aid: targetAid };
+            if (targetDeviceId)
+                target.device_id = targetDeviceId;
+            if (targetSlotId)
+                target.slot_id = targetSlotId;
+            const routeParams = {
+                target,
+                deliver: { method: eventMethod, params: payload },
             };
-            const pullGateLocked = Boolean(p._pull_gate_locked);
-            if ('_pull_gate_locked' in p) {
-                delete p._pull_gate_locked;
-            }
-            const pullGateKey = this._pullGateKeyForCall(method, p);
-            if (pullGateKey && this._isPullResponseProcessing(pullGateKey)) {
-                this._clientLog.debug(`pull skipped while processing pull response: method=${method} key=${pullGateKey}`);
-                return this._emptyPullResultForCall(method);
-            }
-            if (pullGateKey && !pullGateLocked) {
-                const lockedParams = { ...p, _pull_gate_locked: true };
-                if (rpcBackground)
-                    lockedParams._rpc_background = true;
-                const result = await this._runPullSerialized(pullGateKey, async () => this.call(method, lockedParams));
-                return result;
-            }
-            // 自动加密：message.send 默认加密（encrypt 默认 true）— V2-only
-            if (method === 'message.send') {
-                const encrypt = p.encrypt ?? true;
-                delete p.encrypt;
-                if (encrypt) {
-                    return await runWithRpcPriority(() => this._sendV2(String(p.to ?? ''), p.payload, {
-                        messageId: String(p.message_id ?? '') || undefined,
-                        timestamp: p.timestamp,
-                        protectedHeaders: this._protectedHeadersFromParams(p),
-                        context: isJsonObject(p.context) ? p.context : undefined,
-                    }));
-                }
-                // encrypt=false：明文走通用 RPC 路径；protected_headers/headers 是信封元数据，加密与否都保留
-                this._maybeAppendEchoTraceSend(p);
-            }
-            // 自动加密：group.send 默认加密（encrypt 默认 true）— V2-only
-            if (method === 'group.send') {
-                const encrypt = p.encrypt ?? true;
-                delete p.encrypt;
-                if (encrypt) {
-                    return await runWithRpcPriority(() => this._sendGroupV2(String(p.group_id ?? ''), p.payload, {
-                        messageId: String(p.message_id ?? '') || undefined,
-                        timestamp: p.timestamp,
-                        protectedHeaders: this._protectedHeadersFromParams(p),
-                        context: isJsonObject(p.context) ? p.context : undefined,
-                    }));
-                }
-                this._maybeAppendEchoTraceSend(p);
-            }
-            if (method === 'group.thought.put') {
-                const encrypt = p.encrypt ?? true;
-                delete p.encrypt;
-                if (encrypt) {
-                    const v2Error = 'V2 session not initialized; encrypted group.thought.put requires V2 (V1 E2EE removed)';
-                    if (!this._v2Session || !String(p.group_id ?? '').trim()) {
-                        throw new StateError(v2Error);
-                    }
-                    return await runWithRpcPriority(() => this._putGroupThoughtEncryptedV2(p));
-                }
-            }
-            if (method === 'message.thought.put') {
-                const encrypt = p.encrypt ?? true;
-                delete p.encrypt;
-                if (encrypt) {
-                    await this._ensureV2SessionReady('message.thought.put', 'V2 session not initialized; encrypted message.thought.put requires V2 (V1 E2EE removed)');
-                    return await runWithRpcPriority(() => this._putMessageThoughtEncryptedV2(p));
-                }
-            }
-            // V2-only：兼容入口名只作为 SDK 内部适配层存在，底层绝不能降级发 legacy RPC。
-            if (method === 'message.pull' || method === 'message.v2.pull') {
-                await this._ensureV2SessionReady('message.pull');
-                const skipAutoAck = p._skip_auto_ack === true || p.skip_auto_ack === true;
-                const force = p.force === true;
-                const afterSeq = Number(p.after_seq ?? 0) || 0;
-                const limit = Number(p.limit ?? 50) || 50;
-                const messages = skipAutoAck
-                    ? await runWithRpcPriority(() => this._pullV2(afterSeq, limit, { skipAutoAck: true, gateLocked: true, force }))
-                    : await runWithRpcPriority(() => this._pullV2(afterSeq, limit, { gateLocked: true, force }));
-                return { messages };
-            }
-            if (method === 'message.ack' || method === 'message.v2.ack') {
-                await this._ensureV2SessionReady('message.ack');
-                return await runWithRpcPriority(() => this._ackV2(Number(p.seq ?? p.up_to_seq ?? 0) || undefined));
-            }
-            if (method === 'group.pull' || method === 'group.v2.pull') {
-                if (!String(p.group_id ?? '').trim()) {
-                    throw new ValidationError('group.pull requires group_id');
-                }
-                await this._ensureV2SessionReady('group.pull');
-                const hasExplicitAfterSeq = 'after_seq' in p || 'after_message_seq' in p;
-                const cursorParams = this._explicitGroupCursorParams(p);
-                const ownsCursor = Object.keys(cursorParams).length === 0 || this._groupCursorTargetsCurrentInstance(cursorParams);
-                const pullOpts = { gateLocked: true };
-                if (hasExplicitAfterSeq)
-                    pullOpts.explicitAfterSeq = true;
-                if (Object.keys(cursorParams).length > 0)
-                    pullOpts.cursorParams = cursorParams;
-                if (!ownsCursor)
-                    pullOpts.ownsCursor = false;
-                const messages = await runWithRpcPriority(() => this._pullGroupV2(String(p.group_id), Number(p.after_seq ?? p.after_message_seq ?? 0) || 0, Number(p.limit ?? 50) || 50, pullOpts));
-                return { messages };
-            }
-            if (method === 'group.ack_messages' || method === 'group.v2.ack') {
-                if (!String(p.group_id ?? '').trim()) {
-                    throw new ValidationError('group.ack_messages requires group_id');
-                }
-                await this._ensureV2SessionReady('group.ack_messages');
-                const cursorParams = this._explicitGroupCursorParams(p);
-                const ownsCursor = Object.keys(cursorParams).length === 0 || this._groupCursorTargetsCurrentInstance(cursorParams);
-                if (method === 'group.ack_messages' && !ownsCursor) {
-                    return await runWithRpcPriority(() => this._rawGroupAckMessages(p));
-                }
-                return await runWithRpcPriority(() => this._ackGroupV2(String(p.group_id), Number(p.seq ?? p.msg_seq ?? p.up_to_seq ?? 0) || undefined));
-            }
-            if (method === 'message.pull') {
-                delete p._skip_auto_ack;
-                delete p.skip_auto_ack;
-            }
-            delete p._group_cursor_params;
-            // 关键操作自动附加客户端签名
-            this._rpcPipeline.applyClientSignature(method, p);
-            // P1-23: 非幂等方法使用更长超时
-            const callTimeout = NON_IDEMPOTENT_METHODS.has(method) ? NON_IDEMPOTENT_TIMEOUT_MS : undefined;
-            if (method === 'group.thought.get' || method === 'message.thought.get') {
-                this._clientLog.debug(`thought.get transport call start: method=${method}, params=${this._debugJson(this._messageEnvelopeFieldsForDebug(p))}`);
+            if (ttl !== undefined)
+                routeParams.ttl_ms = ttl;
+            await this._transport.notify('notification/route', routeParams);
+            return;
+        }
+        if (targetGroupId) {
+            const eventMethod = AUNClient._validateNotifyEventMethod(method);
+            const normalizedGroupId = normalizeGroupId(targetGroupId);
+            if (!normalizedGroupId) {
+                throw new ValidationError('group_id is required for group notify');
             }
-            let result = callTimeout
-                ? (rpcBackground
-                    ? await this._transport.call(method, p, callTimeout, undefined, true)
-                    : await this._transport.call(method, p, callTimeout))
-                : (rpcBackground
-                    ? await this._transport.call(method, p, undefined, undefined, true)
-                    : await this._transport.call(method, p));
-            result = await this._rpcPipeline.postprocessResult(method, p, result);
-            this._clientLog.debug(`call exit: method=${method} elapsed=${Date.now() - tStart}ms`);
-            return result;
+            const routeParams = {
+                group_id: normalizedGroupId,
+                deliver: { method: eventMethod, params: payload },
+            };
+            if (ttl !== undefined)
+                routeParams.ttl_ms = ttl;
+            await this._transport.notify('notification/group.route', routeParams);
+            return;
         }
-        catch (err) {
-            this._clientLog.debug(`call exit (error): method=${method} elapsed=${Date.now() - tStart}ms err=${err instanceof Error ? err.message : String(err)}`);
-            throw err;
+        if (targetDeviceId || targetSlotId) {
+            throw new ValidationError('device_id and slot_id require to');
         }
+        const directMethod = String(method ?? '').trim();
+        if (!directMethod.startsWith('notification/')) {
+            throw new ValidationError('direct notify method must start with notification/');
+        }
+        await this._transport.notify(directMethod, payload);
     }
     // ── 事件 ──────────────────────────────────────────────────
     /** 订阅事件 */
@@ -1120,35 +1004,17 @@ export class AUNClient {
     async _onRawMessageReceived(data) {
         return this._delivery.onRawMessageReceived(data);
     }
-    /** 实际处理推送消息的异步任务 */
-    async _processAndPublishMessage(data) {
-        return this._delivery.processAndPublishMessage(data);
-    }
     /** 处理群组消息推送：自动解密后 re-publish */
     async _onRawGroupMessageCreated(data) {
         return this._delivery.onRawGroupMessageCreated(data);
     }
-    /**
-     * 处理群组推送消息的异步任务。
-     *
-     * 带 payload 的事件（消息推送）：解密后 re-publish。
-     * 不带 payload 的事件（通知）：自动 pull 最新消息，逐条解密后 re-publish。
-     */
-    async _processAndPublishGroupMessage(data) {
-        return this._delivery.processAndPublishGroupMessage(data);
-    }
-    /** 后台补齐群消息空洞 */
-    async _fillGroupGap(groupId) {
-        return this._delivery.fillGroupGap(groupId);
+    async _onRawGroupMessageRecalled(data) {
+        return this._delivery.onRawGroupMessageRecalled(data);
     }
     /** 后台补齐 P2P 消息空洞 */
     async _fillP2pGap() {
         return this._delivery.fillP2pGap();
     }
-    /** 只按硬上限裁剪 published guard，不能按 contiguousSeq 清理。 */
-    _prunePushedSeqs(ns) {
-        this._delivery.prunePushedSeqs(ns);
-    }
     _recordPendingP2pPull(ns, seq) {
         if (!ns || seq <= 0)
             return;
@@ -1184,9 +1050,6 @@ export class AUNClient {
     _markPublishedSeq(ns, seq) {
         this._delivery.markPublishedSeq(ns, seq);
     }
-    _attachCurrentInstanceContext(payload) {
-        return this._delivery.attachCurrentInstanceContext(payload);
-    }
     _publishAppEvent(event, payload, source = 'direct') {
         return this._delivery.publishAppEvent(event, payload, source);
     }
@@ -1260,18 +1123,12 @@ export class AUNClient {
     _logMessageDebug(stage, source, event, message, opts = {}) {
         this._delivery.logMessageDebug(stage, source, event, message, opts);
     }
-    _messageTargetsCurrentInstance(message) {
-        return this._delivery.messageTargetsCurrentInstance(message);
-    }
     _tryAcquirePullGate(key) {
         return this._rpcPipeline.tryAcquirePullGate(key);
     }
     _releasePullGate(key, token) {
         this._rpcPipeline.releasePullGate(key, token);
     }
-    _pullGateKeyForCall(method, params) {
-        return this._rpcPipeline.pullGateKeyForCall(method, params);
-    }
     _isPullResponseProcessing(key) {
         if (!key)
             return false;
@@ -1396,10 +1253,6 @@ export class AUNClient {
         this._seqTracker.onMessageSeq(ns, seq);
         return this._seqTracker.getContiguousSeq(ns) !== before;
     }
-    /** 后台补齐群事件空洞 */
-    async _fillGroupEventGap(groupId) {
-        return this._delivery.fillGroupEventGap(groupId);
-    }
     _extractGroupIdFromResult(result) {
         const group = isJsonObject(result.group) ? result.group : null;
         const gid = group ? String(group.group_id ?? '') : '';
@@ -2086,9 +1939,6 @@ export class AUNClient {
     _scheduleV2SenderIKPending(args) {
         return this._v2E2EE.scheduleSenderIKPending(args);
     }
-    async _resolveV2SenderIKPending(fromAid, senderDeviceId, groupId, fetchKey) {
-        return await this._v2E2EE.resolveSenderIKPending(fromAid, senderDeviceId, groupId, fetchKey);
-    }
     /**
      * 构造 V2 P2P envelope；message.send 与 message.thought.put 共用。
      */
@@ -2784,12 +2634,6 @@ export class AUNClient {
     _validateMessageRecipient(toAid) {
         this._rpcPipeline.validateMessageRecipient(toAid);
     }
-    _validateOutboundCall(method, params) {
-        this._rpcPipeline.validateOutboundCall(method, params);
-    }
-    _injectMessageCursorContext(method, params) {
-        this._rpcPipeline.injectMessageCursorContext(method, params);
-    }
     /** 启动 V2 缓存清理后台任务 */
     _startV2MaintenanceTasks() {
         if (this._cacheCleanupTimer === null) {