@agentunion/fastaun-browser 0.3.5 → 0.3.6

package/dist/client.js

@@ -453,6 +453,85 @@ function extractV2EnvelopeFromSource(source) {
     }
     return null;
 }
+function truthyBool(value) {
+    if (value === true || value === 1)
+        return true;
+    if (typeof value === 'string') {
+        const normalized = value.trim().toLowerCase();
+        return normalized === 'true' || normalized === '1' || normalized === 'yes' || normalized === 'on';
+    }
+    return false;
+}
+function isEncryptedEnvelopePayload(payload) {
+    if (!isJsonObject(payload))
+        return false;
+    const payloadType = String(payload.type ?? '').trim();
+    if (payloadType.startsWith('e2ee.'))
+        return true;
+    if (!String(payload.ciphertext ?? '').trim())
+        return false;
+    return payload.nonce !== undefined
+        || payload.tag !== undefined
+        || payload.recipient !== undefined
+        || payload.recipients !== undefined
+        || payload.wrapped_key !== undefined
+        || payload.recipients_digest !== undefined;
+}
+function encryptedPushEnvelope(msg) {
+    if (isEncryptedEnvelopePayload(msg.payload))
+        return msg.payload;
+    if (typeof msg.envelope_json === 'string' && msg.envelope_json.trim()) {
+        try {
+            const parsed = JSON.parse(msg.envelope_json);
+            if (isEncryptedEnvelopePayload(parsed))
+                return parsed;
+        }
+        catch {
+            return null;
+        }
+    }
+    return null;
+}
+function isEncryptedPushMessage(msg) {
+    if (truthyBool(msg.encrypted))
+        return true;
+    return encryptedPushEnvelope(msg) !== null;
+}
+function isV2EncryptedEnvelopePayload(envelope) {
+    if (!envelope)
+        return false;
+    const payloadType = String(envelope.type ?? '').trim();
+    if (payloadType === 'e2ee.p2p_encrypted' || payloadType === 'e2ee.group_encrypted')
+        return true;
+    return String(envelope.version ?? '').trim().toLowerCase() === 'v2' && payloadType.startsWith('e2ee.');
+}
+function safeUndecryptablePushEvent(msg, group) {
+    const event = {
+        message_id: msg.message_id ?? null,
+        from: msg.from ?? null,
+        seq: msg.seq ?? null,
+        timestamp: msg.timestamp ?? msg.t_server ?? null,
+        device_id: msg.device_id ?? null,
+        slot_id: msg.slot_id ?? null,
+        _decrypt_error: 'encrypted push payload is not decryptable on raw push path',
+        _decrypt_stage: 'push_envelope',
+    };
+    if (group) {
+        event.group_id = msg.group_id ?? null;
+    }
+    else {
+        event.to = msg.to ?? null;
+    }
+    const envelope = encryptedPushEnvelope(msg);
+    if (envelope) {
+        event._envelope_type = String(envelope.type ?? '');
+        event._suite = String(envelope.suite ?? '');
+        if (isV2EncryptedEnvelopePayload(envelope)) {
+            attachV2EnvelopeMetadata(event, v2E2eeMeta(envelope));
+        }
+    }
+    return event;
+}
 function metadataWithoutAuth(value) {
     if (!isJsonObject(value))
         return null;
@@ -1533,7 +1612,7 @@ export class AUNClient {
         // message.pull：V2 就绪时走 V2 pull
         if (method === 'message.pull' && this._v2Session) {
             this._clientLog.debug('call route: message.pull → V2 pull');
-            const messages = await this.pullV2(Number(p.after_seq ?? 0) || 0, Number(p.limit ?? 50) || 50);
+            const messages = await this.pullV2(Number(p.after_seq ?? 0) || 0, Number(p.limit ?? 50) || 50, { force: p.force === true });
             return { messages };
         }
         // message.ack：V2 就绪时走 V2 ack
@@ -1651,6 +1730,30 @@ export class AUNClient {
         // ── Group E2EE 自动编排已移除（V2-only：由 group.v2.bootstrap 驱动）────────
         return result;
     }
+    async _callRawV2Rpc(method, params) {
+        const p = { ...(params ?? {}) };
+        delete p._pull_gate_locked;
+        delete p._skip_auto_ack;
+        delete p.skip_auto_ack;
+        if (method.startsWith('group.') && p.group_id !== undefined && p.group_id !== null) {
+            p.group_id = normalizeGroupId(String(p.group_id)) || String(p.group_id);
+        }
+        if (method.startsWith('group.') && p.device_id === undefined) {
+            p.device_id = this._deviceId;
+        }
+        if (method.startsWith('group.') && p.slot_id === undefined) {
+            p.slot_id = this._slotId;
+        }
+        if (SIGNED_METHODS.has(method)) {
+            if (this._shouldSkipClientSignature(method, p)) {
+                delete p.client_signature;
+            }
+            else {
+                await this._signClientOperation(method, p);
+            }
+        }
+        return await this._transport.call(method, p);
+    }
     // ── 便利方法 ──────────────────────────────────────
     async ping(params) {
         return this.meta.ping(params);
@@ -1695,12 +1798,19 @@ export class AUNClient {
             }
             // P2P 空洞检测
             const seq = msg.seq;
+            const encryptedPush = isEncryptedPushMessage(msg);
             if (seq !== undefined && seq !== null && this._aid) {
                 const ns = `p2p:${this._aid}`;
                 // Push 修上界：先更新 maxSeenSeq
                 if (seq > 0)
                     this._seqTracker.updateMaxSeen(ns, seq);
-                const needPull = this._seqTracker.onMessageSeq(ns, seq);
+                const contigBefore = this._seqTracker.getContiguousSeq(ns);
+                const seqNeedsPull = this._seqTracker.onMessageSeq(ns, seq);
+                const published = encryptedPush
+                    ? await this._publishEncryptedPushMessage('message.received', 'message.undecryptable', ns, seq, msg, false)
+                    : await this._publishOrderedMessage('message.received', ns, seq, msg);
+                const contigAfter = this._seqTracker.getContiguousSeq(ns);
+                const needPull = seqNeedsPull && !published;
                 if (needPull) {
                     this._safeAsync(this._fillP2pGap());
                 }
@@ -1716,14 +1826,16 @@ export class AUNClient {
                     }).catch((e) => { this._clientLog.warn(`P2P auto-ack failed:${String(e)}`); });
                 }
                 // 即时持久化 cursor，异常断连后不回退
-                this._saveSeqTrackerState();
-            }
-            // 明文消息直接透传
-            if (seq !== undefined && seq !== null && this._aid) {
-                const ns = `p2p:${this._aid}`;
-                await this._publishOrderedMessage('message.received', ns, seq, msg);
+                if (contigAfter !== contigBefore)
+                    this._saveSeqTrackerState();
+                if (encryptedPush)
+                    return;
             }
             else {
+                if (encryptedPush) {
+                    await this._publishEncryptedPushMessage('message.received', 'message.undecryptable', '', seq ?? 0, msg, false);
+                    return;
+                }
                 await this._publishAppEvent('message.received', msg);
             }
         }
@@ -1830,12 +1942,19 @@ export class AUNClient {
                 return;
             }
             // seq 跟踪 + auto-ack
+            const encryptedPush = isEncryptedPushMessage(msg);
             if (groupId && seq !== undefined && seq !== null) {
                 const ns = `group:${groupId}`;
                 // Push 修上界：先更新 maxSeenSeq
                 if (seq > 0)
                     this._seqTracker.updateMaxSeen(ns, seq);
-                const needPull = this._seqTracker.onMessageSeq(ns, seq);
+                const contigBefore = this._seqTracker.getContiguousSeq(ns);
+                const seqNeedsPull = this._seqTracker.onMessageSeq(ns, seq);
+                const published = encryptedPush
+                    ? await this._publishEncryptedPushMessage('group.message_created', 'group.message_undecryptable', ns, seq, msg, true)
+                    : await this._publishOrderedMessage('group.message_created', ns, seq, msg);
+                const contigAfter = this._seqTracker.getContiguousSeq(ns);
+                const needPull = seqNeedsPull && !published;
                 if (needPull) {
                     this._safeAsync(this._fillGroupGap(groupId));
                 }
@@ -1850,14 +1969,16 @@ export class AUNClient {
                         slot_id: this._slotId,
                     }).catch((e) => { this._clientLog.warn('group message auto-ack failed: group=' + groupId, e); });
                 }
-                this._saveSeqTrackerState();
-            }
-            // 明文消息直接透传
-            if (groupId && seq !== undefined && seq !== null) {
-                const nsKey = `group:${groupId}`;
-                await this._publishOrderedMessage('group.message_created', nsKey, seq, msg);
+                if (contigAfter !== contigBefore)
+                    this._saveSeqTrackerState();
+                if (encryptedPush)
+                    return;
             }
             else {
+                if (encryptedPush) {
+                    await this._publishEncryptedPushMessage('group.message_created', 'group.message_undecryptable', '', seq ?? 0, msg, true);
+                    return;
+                }
                 await this._publishAppEvent('group.message_created', msg);
             }
         }
@@ -1878,6 +1999,59 @@ export class AUNClient {
             }
         }
     }
+    async _decryptEncryptedPushPayload(msg, group) {
+        const envelope = encryptedPushEnvelope(msg);
+        if (!isV2EncryptedEnvelopePayload(envelope))
+            return null;
+        const aad = isJsonObject(envelope.aad) ? envelope.aad : {};
+        const fromAid = String(msg.from_aid ?? msg.from ?? msg.sender_aid ?? aad.from ?? '').trim();
+        const plaintext = await this._decryptV2EnvelopeForThought({ envelope, fromAid });
+        if (!plaintext)
+            return null;
+        const e2eeMeta = v2E2eeMeta(envelope);
+        const result = {
+            message_id: String(msg.message_id ?? ''),
+            from: fromAid,
+            seq: msg.seq ?? null,
+            timestamp: msg.t_server ?? msg.timestamp ?? null,
+            payload: plaintext,
+            encrypted: true,
+            e2ee: e2eeMeta,
+        };
+        result.direction = fromAid && fromAid === this._aid ? 'outbound_sync' : 'inbound';
+        if (msg.t_server !== undefined)
+            result.t_server = msg.t_server;
+        if (msg.device_id !== undefined)
+            result.device_id = msg.device_id;
+        if (msg.slot_id !== undefined)
+            result.slot_id = msg.slot_id;
+        if (group) {
+            result.group_id = msg.group_id ?? aad.group_id ?? envelope.group_id ?? null;
+        }
+        else {
+            result.to = msg.to ?? this._aid ?? '';
+        }
+        attachV2EnvelopeMetadata(result, e2eeMeta);
+        return result;
+    }
+    async _publishEncryptedPushAsUndecryptable(event, ns, seq, msg, group) {
+        const safeEvent = safeUndecryptablePushEvent(msg, group);
+        if (ns) {
+            return this._publishOrderedMessage(event, ns, seq, safeEvent);
+        }
+        await this._publishAppEvent(event, safeEvent);
+        return true;
+    }
+    async _publishEncryptedPushMessage(normalEvent, undecryptableEvent, ns, seq, msg, group) {
+        const decrypted = await this._decryptEncryptedPushPayload(msg, group);
+        if (decrypted) {
+            if (ns)
+                return this._publishOrderedMessage(normalEvent, ns, seq, decrypted);
+            await this._publishAppEvent(normalEvent, decrypted);
+            return true;
+        }
+        return this._publishEncryptedPushAsUndecryptable(undecryptableEvent, ns, seq, msg, group);
+    }
     /** 收到不带 payload 的 group.message_created 通知后，自动 pull 最新消息 */
     async _autoPullGroupMessages(notification) {
         const groupId = (notification.group_id ?? '');
@@ -4088,7 +4262,27 @@ export class AUNClient {
     async initV2Session() {
         if (!this._aid)
             return;
-        const identity = this._identity;
+        let identity = this._identity;
+        if (!identity?.private_key_pem) {
+            // fallback：缓存的 identity 可能被 instance_state 污染，重新从 keystore 加载
+            try {
+                const reloaded = await this._keystore.loadIdentity(this._aid);
+                if (reloaded?.private_key_pem) {
+                    this._identity = reloaded;
+                    identity = reloaded;
+                    this._clientLog.warn('V2 session init: identity cache was stale, reloaded from keystore');
+                    // 自愈：重新持久化，清理 instance_state 中的脏数据
+                    try {
+                        const persistIdentity = this._auth._persistIdentity;
+                        if (typeof persistIdentity === 'function') {
+                            await persistIdentity.call(this._auth, reloaded);
+                        }
+                    }
+                    catch { /* best-effort */ }
+                }
+            }
+            catch { /* ignore */ }
+        }
         if (!identity?.private_key_pem) {
             this._clientLog.warn('V2 session init skipped: no AID private key');
             return;
@@ -4414,20 +4608,21 @@ export class AUNClient {
      * @param afterSeq 从此 seq 之后开始拉取（0/省略 = 从当前 contiguous 开始）
      * @param limit 最多拉取条数
      */
-    async pullV2(afterSeq = 0, limit = 50) {
+    async pullV2(afterSeq = 0, limit = 50, opts) {
         if (!this._v2Session) {
             throw new StateError('V2 session not initialized (not connected?)');
         }
         const ns = this._aid ? `p2p:${this._aid}` : '';
         const decrypted = [];
-        let nextAfterSeq = afterSeq || (ns ? this._seqTracker.getContiguousSeq(ns) : 0);
+        let nextAfterSeq = opts?.force ? afterSeq : (afterSeq || (ns ? this._seqTracker.getContiguousSeq(ns) : 0));
         let pageCount = 0;
         const maxPages = 100;
         while (pageCount < maxPages) {
             pageCount += 1;
-            const result = await this.call('message.v2.pull', {
+            const result = await this._callRawV2Rpc('message.v2.pull', {
                 after_seq: nextAfterSeq,
                 limit,
+                ...(opts?.force ? { force: true } : {}),
             });
             const messages = (Array.isArray(result?.messages) ? result.messages : []);
             const seqs = messages
@@ -4747,6 +4942,12 @@ export class AUNClient {
             encrypted: true,
             e2ee: e2ee,
         };
+        const explicitDirection = String(msg.direction ?? '').trim();
+        result.direction = explicitDirection || (fromAid && fromAid === this._aid ? 'outbound_sync' : 'inbound');
+        if (msg.device_id !== undefined)
+            result.device_id = msg.device_id;
+        if (msg.slot_id !== undefined)
+            result.slot_id = msg.slot_id;
         attachV2EnvelopeMetadata(result, e2ee);
         return result;
     }