@agentunion/fastaun 0.3.0 → 0.3.2

package/dist/client.js

@@ -1577,6 +1577,20 @@ export class AUNClient {
                 if (groupId && action === 'upsert' && this._v2Session) {
                     this._safeAsync(this._v2AutoProposeState(groupId, { leaderDelay: true }));
                 }
+                // Group SPK 编排：成员变更触发注册/轮换
+                if (this._v2Session && groupId) {
+                    const callFn = async (method, params) => this.call(method, params);
+                    if (action === 'joined' || action === 'join_approved') {
+                        this._v2Session.ensureGroupRegistered?.(groupId, callFn)?.catch(exc => {
+                            this._clientLog.debug(`group SPK registration failed (non-fatal): group=${groupId} action=${action} err=${formatCaughtError(exc)}`);
+                        });
+                    }
+                    else if (['member_added', 'member_left', 'member_removed', 'role_changed', 'owner_transferred'].includes(action)) {
+                        this._v2Session.rotateGroupSPK?.(groupId, callFn)?.catch(exc => {
+                            this._clientLog.debug(`group SPK rotation failed (non-fatal): group=${groupId} action=${action} err=${formatCaughtError(exc)}`);
+                        });
+                    }
+                }
                 // event_seq 空洞检测：持久化后的 group.changed 会携带 event_seq。
                 // 用 onMessageSeq 返回值决定是否补拉，与 P2P / group.message 路径对齐。
                 let needPull = false;
@@ -2641,13 +2655,22 @@ export class AUNClient {
         const result = isJsonObject(raw)
             ? { ...raw }
             : { result: raw };
-        result.ack_seq = seq;
+        let actualAckSeq = seq;
+        if ('effective_ack_seq' in result)
+            actualAckSeq = Number(result.effective_ack_seq ?? 0);
+        else if ('ack_seq' in result)
+            actualAckSeq = Number(result.ack_seq ?? 0);
+        else if ('cursor' in result)
+            actualAckSeq = Number(result.cursor ?? 0);
+        if (!Number.isFinite(actualAckSeq))
+            actualAckSeq = seq;
+        result.ack_seq = actualAckSeq;
         result.success = true;
         if (Number(result.acked ?? 0) === 0)
-            result.acked = seq;
+            result.acked = actualAckSeq;
         if (this._v2Session) {
             try {
-                const destroyed = this._v2Session.maybeDestroyOldSPKs(seq);
+                const destroyed = this._v2Session.maybeDestroyOldSPKs(actualAckSeq);
                 if (destroyed.length > 0) {
                     this._clientLog.info(`V2 destroyed old SPKs after ack: ${destroyed.slice(0, 3).join(',')} (PFS)`);
                 }
@@ -2932,15 +2955,44 @@ export class AUNClient {
             return null;
         }
         let spkId = '';
+        let recipientKeySource = '';
         if (isJsonObject(envelope.recipient)) {
-            spkId = String(envelope.recipient.spk_id ?? '');
+            const recipient = envelope.recipient;
+            spkId = String(recipient.spk_id ?? '');
+            recipientKeySource = String(recipient.key_source ?? '');
         }
         else if (Array.isArray(envelope.recipients)) {
             spkId = String(msg.spk_id ?? '');
+            // 从 recipients 数组中查找本设备对应行，提取 key_source（index 3）
+            const recipients = envelope.recipients;
+            for (const row of recipients) {
+                if (Array.isArray(row) && row.length >= 6
+                    && String(row[0] ?? '') === this._aid
+                    && String(row[1] ?? '') === this._deviceId) {
+                    if (!spkId)
+                        spkId = String(row[5] ?? '');
+                    if (row.length > 3)
+                        recipientKeySource = String(row[3] ?? '');
+                    break;
+                }
+            }
         }
-        const { ikPriv, spkPriv } = session.getDecryptKeys(spkId);
-        const fromAid = String(msg.from_aid ?? '');
+        // 根据 aad.group_id 判断使用 group SPK 还是 P2P SPK
         const aad = isJsonObject(envelope.aad) ? envelope.aad : {};
+        const groupIdForKeys = String(aad.group_id ?? msg.group_id ?? '').trim();
+        let ikPriv;
+        let spkPriv;
+        if (groupIdForKeys) {
+            const keys = session.getGroupDecryptKeys(groupIdForKeys, spkId);
+            ikPriv = keys.ikPriv;
+            spkPriv = keys.spkPriv ?? undefined;
+        }
+        else {
+            const keys = session.getDecryptKeys(spkId);
+            ikPriv = keys.ikPriv;
+            spkPriv = keys.spkPriv;
+        }
+        const fromAid = String(msg.from_aid ?? '');
         const senderDeviceId = String(aad.from_device ?? '');
         const senderPubDer = await this._getV2SenderPubDer(fromAid, senderDeviceId);
         if (!senderPubDer) {
@@ -2968,10 +3020,27 @@ export class AUNClient {
         }
         if (plaintext === null)
             return null;
-        if (session.isCurrentSPK(spkId)) {
-            this._safeAsync(session.rotateSPK(this._v2CallFn()).then(() => {
-                this._clientLog.debug(`V2 SPK rotated after consumption: aid=${this._aid ?? ''}`);
-            }));
+        // 消费触发 SPK 轮换
+        if (groupIdForKeys && recipientKeySource === 'group_device_prekey' && session.isLastUploadedGroupSPK(groupIdForKeys, spkId)) {
+            // Group SPK 消费触发轮换
+            const callFn = async (method, params) => this.call(method, params);
+            session.rotateGroupSPK(groupIdForKeys, callFn).catch(exc => {
+                this._clientLog.debug(`V2 group SPK rotation failed (non-fatal): group=${groupIdForKeys} err=${formatCaughtError(exc)}`);
+            });
+        }
+        else if (groupIdForKeys && recipientKeySource === 'peer_device_prekey') {
+            // peer_device_prekey fallback：补注册 group SPK
+            const callFn = async (method, params) => this.call(method, params);
+            session.ensureGroupRegistered(groupIdForKeys, callFn).catch(exc => {
+                this._clientLog.debug(`V2 group SPK registration after peer fallback failed (non-fatal): group=${groupIdForKeys} err=${formatCaughtError(exc)}`);
+            });
+        }
+        else if (!groupIdForKeys && session.isLastUploadedSPK(spkId)) {
+            // P2P SPK 消费触发轮换
+            const callFn = async (method, params) => this.call(method, params);
+            session.rotateSPK(callFn).catch(exc => {
+                this._clientLog.debug(`V2 SPK rotation failed (non-fatal): ${formatCaughtError(exc)}`);
+            });
         }
         const suite = String(envelope.suite ?? '');
         return {
@@ -3642,9 +3711,55 @@ export class AUNClient {
             this._clientLog.debug(`V2 auto confirm pending proposals failed (non-fatal): ${formatCaughtError(exc)}`);
         }
     }
-    async _onV2PushNotification(_data) {
+    async _onV2PushNotification(data) {
         if (!this._v2Session)
             return;
+        // 提取 push 通知中的元数据
+        const pushSeq = isJsonObject(data) ? Number(data.seq ?? 0) || 0 : 0;
+        const pushFrom = isJsonObject(data) ? String(data.from_aid ?? '') : '';
+        const pushMsgId = isJsonObject(data) ? String(data.message_id ?? '') : '';
+        const envelopeJson = isJsonObject(data) ? data.envelope_json : undefined;
+        const ns = this._aid ? `p2p:${this._aid}` : '';
+        let contigBefore = ns ? this._seqTracker.getContiguousSeq(ns) : 0;
+        this._clientLog.debug(`_onV2PushNotification: push_seq=${pushSeq || 'null'} push_from=${pushFrom} push_msg_id=${pushMsgId} has_payload=${!!envelopeJson} contiguous_seq=${contigBefore}`);
+        // ── 带 payload 的 push：尝试就地解密 ──
+        if (envelopeJson && pushSeq > 0 && ns) {
+            try {
+                const decrypted = await this._decryptV2PushMessage(data);
+                if (decrypted) {
+                    // 解密成功：contiguous_seq 上界 = push_seq
+                    this._seqTracker.onMessageSeq(ns, pushSeq);
+                    if (pushSeq === contigBefore + 1) {
+                        this._seqTracker.forceContiguousSeq(ns, pushSeq);
+                    }
+                    await this._publishOrderedMessage('message.received', ns, pushSeq, decrypted);
+                    const newContig = this._seqTracker.getContiguousSeq(ns);
+                    if (newContig !== contigBefore) {
+                        this._saveSeqTrackerState();
+                    }
+                    if (newContig > 0 && newContig !== contigBefore) {
+                        this._transport.call('message.v2.ack', { up_to_seq: newContig })
+                            .catch(e => this._clientLog.debug(`V2 P2P push-ack failed: ${formatCaughtError(e)}`));
+                    }
+                    this._clientLog.debug(`_onV2PushNotification: push 带 payload 解密成功, contiguous_seq=${contigBefore}->${newContig} push_seq=${pushSeq}`);
+                    return;
+                }
+            }
+            catch (exc) {
+                this._clientLog.debug(`_onV2PushNotification: push payload 解密失败, fallback to pull: ${formatCaughtError(exc)}`);
+            }
+        }
+        // ── 不带 payload 或解密失败：触发 pull ──
+        // 纯通知只表示服务端已有 pushSeq 这条消息，内容还没有进入本地，不能先推进 contiguousSeq。
+        // 后续 pull 必须从当前 contiguousSeq 开始，否则会跳过 pushSeq 本身。
+        if (pushSeq > 0 && ns) {
+            if (contigBefore >= pushSeq) {
+                this._clientLog.warn(`_onV2PushNotification: contiguous_seq=${contigBefore} 越界（>= push_seq=${pushSeq}），强制修复为 ${pushSeq - 1}`);
+                this._seqTracker.forceContiguousSeq(ns, pushSeq - 1);
+                contigBefore = pushSeq - 1;
+            }
+            this._clientLog.debug(`_onV2PushNotification: 纯通知 push_seq=${pushSeq} > contiguous_seq=${contigBefore}, 触发 pull(after_seq=${contigBefore})`);
+        }
         if (this._v2PullInflight) {
             this._v2PullPending = true;
             return;
@@ -3654,10 +3769,13 @@ export class AUNClient {
             do {
                 this._v2PullPending = false;
                 await this.pullV2();
+                const newContig = ns ? this._seqTracker.getContiguousSeq(ns) : -1;
+                this._clientLog.debug(`_onV2PushNotification pull done: contiguous_seq=${contigBefore}->${newContig} (push_seq=${pushSeq || 'null'})`);
             } while (this._v2PullPending);
         }
         catch (exc) {
-            this._clientLog.warn(`V2 push auto-pull failed: ${formatCaughtError(exc)}`);
+            const newContig = ns ? this._seqTracker.getContiguousSeq(ns) : -1;
+            this._clientLog.warn(`V2 push auto-pull failed: contiguous_seq=${contigBefore}->${newContig} err=${formatCaughtError(exc)}`);
         }
         finally {
             this._v2PullInflight = false;
@@ -3726,6 +3844,12 @@ export class AUNClient {
             this._gapFillDone.delete(dedupKey);
         }
     }
+    /** Push 通知带 payload 时的就地解密（复用 _decryptV2Message） */
+    async _decryptV2PushMessage(data) {
+        if (!isJsonObject(data))
+            return null;
+        return await this._decryptV2Message(data);
+    }
     async _onV2EpochRotated(data) {
         if (!isJsonObject(data))
             return;