@agentunion/fastaun-browser 0.5.16 → 0.5.17

package/dist/client/v2-e2ee.js

@@ -948,6 +948,12 @@ export class V2E2EECoordinator {
                     await client._publishAppEvent(eventName, safeEvent, 'pending_retry');
                     continue;
                 }
+                if (!entry.groupId && String(entry.msg.storage ?? '') === 'volatile') {
+                    await this.publishPendingV2VolatileMessage(entry.msg, plaintext, 'pending_retry');
+                    client._v2SenderIKPending.delete(key);
+                    client._clientLog.debug(`V2 sender IK pending retry delivered: key=${key}`);
+                    continue;
+                }
                 client._v2SenderIKPending.delete(key);
                 const seq = Number(entry.msg.seq ?? 0);
                 if (entry.groupId) {
@@ -967,10 +973,35 @@ export class V2E2EECoordinator {
             client._v2SenderIKFetching.delete(fetchKey);
         }
     }
+    async publishPendingV2VolatileMessage(rawMessage, plaintext, source) {
+        const delivery = this.client._delivery;
+        const claim = delivery.beginVolatileDelivery(rawMessage);
+        if (claim === 'inflight')
+            return;
+        if (claim === 'seen') {
+            await delivery.ackVolatileMessages([rawMessage], true, false);
+            return;
+        }
+        try {
+            const publicMessage = delivery.publicVolatileMessage(plaintext);
+            for (const key of ['storage', 'volatile_cursor', 'created_at', 'expires_at', 'persist']) {
+                if (key in rawMessage)
+                    publicMessage[key] = rawMessage[key];
+            }
+            const appEvent = delivery.p2pAppEventForMessage(publicMessage);
+            await this.client._publishAppEvent(appEvent.event, appEvent.payload, source);
+            delivery.markVolatileSeen(rawMessage);
+        }
+        finally {
+            delivery.finishVolatileDelivery(rawMessage);
+        }
+        await delivery.ackVolatileMessages([rawMessage], true, false);
+    }
     async sendV2(to, payload, opts) {
         const client = this.client;
         await client._ensureV2SessionReady('message.send', 'V2 session not initialized; encrypted message.send requires V2 (V1 E2EE removed)');
         const toAid = String(to ?? '').trim();
+        const targetDeviceId = String(opts?.deviceId ?? '').trim();
         if (!toAid)
             throw new ValidationError("message.send requires 'to'");
         if (!isJsonObject(payload))
@@ -981,6 +1012,7 @@ export class V2E2EECoordinator {
                 payload,
                 messageId: opts?.messageId,
                 timestamp: opts?.timestamp,
+                deviceId: targetDeviceId || undefined,
                 protectedHeaders: opts?.protectedHeaders,
                 context: opts?.context,
                 useCache,
@@ -989,6 +1021,8 @@ export class V2E2EECoordinator {
                 to: toAid,
                 payload: envelope,
                 message_id: opts?.messageId,
+                ...(opts?.ttl !== undefined ? { ttl: opts.ttl } : {}),
+                ...(targetDeviceId ? { device_id: targetDeviceId } : {}),
                 encrypt: false,
                 _skip_send_result_envelope: true,
             });
@@ -1232,6 +1266,7 @@ export class V2E2EECoordinator {
         const client = this.client;
         await client._ensureV2SessionReady('message.pull');
         const ns = client._aid ? `p2p:${client._aid}` : '';
+        let volatileCursor = String(opts?.afterVolatileCursor ?? client._delivery.volatilePullCursor() ?? '').trim();
         if (ns)
             client._delivery.onPullStarted?.(ns);
         if (opts?.windowMode === 'tail') {
@@ -1249,7 +1284,7 @@ export class V2E2EECoordinator {
         }
         if (ns && !opts?.gateLocked) {
             const key = pullGateKeyForClient(client, 'message.v2.pull', {
-                after_seq: afterSeq, force: opts?.force === true, limit,
+                after_seq: afterSeq, after_volatile_cursor: volatileCursor, force: opts?.force === true, limit,
             }, `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
             return await client._runPullSerialized(key, () => this.pullV2Impl(afterSeq, limit, {
                 ...(opts ?? {}),
@@ -1260,7 +1295,7 @@ export class V2E2EECoordinator {
         let nextAfterSeq = opts?.force ? afterSeq : (afterSeq || (ns ? client._seqTracker.getContiguousSeq(ns) : 0));
         let pullGateKey = ns
             ? pullGateKeyForClient(client, 'message.v2.pull', {
-                after_seq: afterSeq, force: opts?.force === true, limit,
+                after_seq: afterSeq, after_volatile_cursor: volatileCursor, force: opts?.force === true, limit,
             }, `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`)
             : '';
         const deferredServerCursor = ns ? this.pendingForwardCursor(ns, client._seqTracker.getContiguousSeq(ns)) : 0;
@@ -1271,16 +1306,30 @@ export class V2E2EECoordinator {
         const maxPages = Math.max(1, Math.min(100, Math.trunc(Number(opts?.maxPages ?? 100) || 100)));
         while (pageCount < maxPages) {
             pageCount += 1;
+            const volatileCursorBeforePage = volatileCursor;
             const ackUpToSeq = pendingAckSeq;
             const pendingInlineGeneration = ackUpToSeq > 0
                 ? client._delivery?.pendingP2PInlineAckGeneration?.(ns) ?? null
                 : null;
-            const result = await client._callRawV2Rpc('message.v2.pull', {
-                after_seq: nextAfterSeq,
-                limit,
-                ...(opts?.force ? { force: true } : {}),
-                ...(ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}),
-            }, pullGateKey);
+            let result;
+            try {
+                result = await client._callRawV2Rpc('message.v2.pull', {
+                    after_seq: nextAfterSeq,
+                    limit,
+                    ...(volatileCursor ? { after_volatile_cursor: volatileCursor } : {}),
+                    ...(opts?.force ? { force: true } : {}),
+                    ...(ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}),
+                }, pullGateKey);
+            }
+            catch (exc) {
+                const text = exc instanceof Error ? exc.message : String(exc);
+                if (!volatileCursor || !text.toLowerCase().includes('volatile cursor epoch mismatch'))
+                    throw exc;
+                client._delivery.resetVolatilePullCursor();
+                volatileCursor = '';
+                pageCount -= 1;
+                continue;
+            }
             if (ackUpToSeq > 0) {
                 const actualAckSeq = client._delivery?.resolveP2PPullAckSeq?.(result, ackUpToSeq) ?? 0;
                 if (actualAckSeq >= ackUpToSeq) {
@@ -1299,6 +1348,12 @@ export class V2E2EECoordinator {
                 }
             }
             const pageMessages = (Array.isArray(result?.messages) ? result.messages : []);
+            const volatileMessages = client._delivery.volatileMessages(pageMessages);
+            if (volatileMessages.length > 0) {
+                decrypted.push(...await this.publishV2VolatileMessages(volatileMessages, 'pull', true));
+                volatileCursor = client._delivery.volatilePullCursor();
+            }
+            const volatileAdvanced = Boolean(volatileCursor) && volatileCursor !== volatileCursorBeforePage;
             const messages = deduplicateForwardPageMessages(pageMessages, nextAfterSeq);
             const cursor = isJsonObject(result.cursor) ? result.cursor : null;
             const hasMoreField = Object.prototype.hasOwnProperty.call(result, 'has_more');
@@ -1477,7 +1532,7 @@ export class V2E2EECoordinator {
             const rawCount = messages.length;
             if (blockedSeq > 0)
                 break;
-            const shouldContinue = shouldContinueForwardPage({
+            let shouldContinue = shouldContinueForwardPage({
                 rawCount,
                 nextAfterSeq,
                 nextAfter,
@@ -1489,11 +1544,16 @@ export class V2E2EECoordinator {
                 observedUpper: typeof client._seqTracker.getMaxSeenSeq === 'function'
                     ? client._seqTracker.getMaxSeenSeq(ns) : nextAfter,
             });
+            const volatileHasMoreField = Object.prototype.hasOwnProperty.call(result, 'volatile_has_more');
+            const volatileHasMore = result.volatile_has_more === true;
+            if (!shouldContinue && volatileAdvanced && (volatileHasMore || hasMore || (!volatileHasMoreField && limit > 0 && pageMessages.length >= limit))) {
+                shouldContinue = true;
+            }
             if (!shouldContinue)
                 break;
             if (pullGateKey && opts?.gateLocked && client._rpcPipeline?.yieldPullGate) {
                 const nextKey = pullGateKeyForClient(client, 'message.v2.pull', {
-                    after_seq: nextAfter, force: opts?.force === true, limit,
+                    after_seq: nextAfter, after_volatile_cursor: volatileCursor, force: opts?.force === true, limit,
                 }, `${ns}|forward|after=${nextAfter}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
                 await client._rpcPipeline.yieldPullGate(pullGateKey, nextKey, true);
                 pullGateKey = nextKey;
@@ -1513,6 +1573,73 @@ export class V2E2EECoordinator {
         client._delivery.onPullWorkSettled?.();
         return deduplicatePulledResults(decrypted);
     }
+    async publishV2VolatileMessages(messages, source, advanceCursor) {
+        const client = this.client;
+        if (!client._v2Session)
+            return [];
+        const processed = [];
+        const plaintextMessages = [];
+        let complete = true;
+        for (const rawMessage of messages) {
+            const claim = client._delivery.beginVolatileDelivery(rawMessage);
+            if (claim === 'seen') {
+                processed.push(rawMessage);
+                continue;
+            }
+            if (claim === 'inflight') {
+                complete = false;
+                continue;
+            }
+            let plaintext;
+            try {
+                if (client._isEncryptedPushMessage(rawMessage)) {
+                    plaintext = await client._decryptV2Message(rawMessage, true, true, true, true, undefined, false, source);
+                }
+                else {
+                    const legacy = isJsonObject(rawMessage.legacy_v1)
+                        ? rawMessage.legacy_v1
+                        : {};
+                    plaintext = {
+                        message_id: String(rawMessage.message_id ?? ''),
+                        from: String(rawMessage.from_aid ?? rawMessage.from ?? ''),
+                        to: String(legacy.to ?? rawMessage.to ?? client._aid ?? ''),
+                        type: String(rawMessage.type ?? ''),
+                        timestamp: rawMessage.t_server ?? rawMessage.timestamp,
+                        payload: legacy.payload !== undefined ? legacy.payload : rawMessage.payload,
+                        encrypted: false,
+                    };
+                    for (const key of ['context', 'protected_headers', 'headers', 'client_signature']) {
+                        if (key in rawMessage)
+                            plaintext[key] = rawMessage[key];
+                    }
+                    if (rawMessage.sender_device_id !== undefined)
+                        plaintext.sender_device_id = rawMessage.sender_device_id;
+                    attachGatewayProximity(plaintext, rawMessage);
+                }
+                if (!plaintext) {
+                    complete = false;
+                    continue;
+                }
+                const publicMessage = client._delivery.publicVolatileMessage(plaintext);
+                for (const key of ['storage', 'volatile_cursor', 'created_at', 'expires_at', 'persist']) {
+                    if (key in rawMessage)
+                        publicMessage[key] = rawMessage[key];
+                }
+                const appEvent = client._delivery.p2pAppEventForMessage(publicMessage);
+                await client._publishAppEvent(appEvent.event, appEvent.payload, source);
+                client._delivery.markVolatileSeen(rawMessage);
+                processed.push(rawMessage);
+                plaintextMessages.push(publicMessage);
+            }
+            finally {
+                client._delivery.finishVolatileDelivery(rawMessage);
+            }
+        }
+        if (processed.length > 0) {
+            await client._delivery.ackVolatileMessages(processed, true, advanceCursor && complete && processed.length === messages.length);
+        }
+        return plaintextMessages;
+    }
     async confirmForwardP2PAck(upToSeq, inlineGeneration) {
         const ns = this.client._aid ? `p2p:${this.client._aid}` : '';
         try {
@@ -1528,41 +1655,51 @@ export class V2E2EECoordinator {
             throw exc;
         }
     }
-    async ackV2(upToSeq, inlineGeneration) {
-        return this.ackV2WithConfirmation(upToSeq, inlineGeneration, false);
+    async ackV2(upToSeq, inlineGeneration, volatileCursors = [], volatileIds = []) {
+        return this.ackV2WithConfirmation(upToSeq, inlineGeneration, false, volatileCursors, volatileIds);
     }
     async ackV2ForForward(upToSeq, inlineGeneration) {
         return this.ackV2WithConfirmation(upToSeq, inlineGeneration, true);
     }
-    async ackV2WithConfirmation(upToSeq, inlineGeneration, requireServerWatermark) {
+    async ackV2WithConfirmation(upToSeq, inlineGeneration, requireServerWatermark, volatileCursors = [], volatileIds = []) {
         const client = this.client;
         const ns = client._aid ? `p2p:${client._aid}` : '';
         let seq = upToSeq ?? (ns ? client._seqTracker.getContiguousSeq(ns) : 0);
         if (typeof seq !== 'number' || !Number.isSafeInteger(seq) || seq <= 0)
+            seq = 0;
+        if (seq <= 0 && volatileCursors.length === 0 && volatileIds.length === 0)
             return { acked: 0 };
-        seq = client._clampAckSeq('message.v2.ack', 'up_to_seq', ns, seq);
-        if (!Number.isSafeInteger(seq) || seq <= 0)
+        if (seq > 0)
+            seq = client._clampAckSeq('message.v2.ack', 'up_to_seq', ns, seq);
+        if ((!Number.isSafeInteger(seq) || seq <= 0) && volatileCursors.length === 0 && volatileIds.length === 0) {
             return { acked: 0 };
+        }
         // ACK 发出前绑定当时的 inline pending；迟到响应不得结算重置后新建的 pending。
         const ackGeneration = inlineGeneration ?? client._delivery?.pendingP2PInlineAckGeneration?.(ns) ?? null;
         const v2SessionAtStart = client._v2Session;
         const v2RuntimeGenerationAtStart = Number(client._v2RuntimeGeneration ?? 0);
-        const raw = await client._callRawV2Rpc('message.v2.ack', { up_to_seq: seq });
+        const raw = await client._callRawV2Rpc('message.v2.ack', {
+            ...(seq > 0 ? { up_to_seq: seq } : {}),
+            ...(volatileCursors.length > 0 ? { volatile_cursors: volatileCursors } : {}),
+            ...(volatileIds.length > 0 ? { volatile_ids: volatileIds } : {}),
+        });
         const result = isJsonObject(raw)
             ? { ...raw }
             : { result: raw };
-        const actualAckSeq = requireServerWatermark
-            ? (client._delivery?.resolveForwardAckSeq?.(result, seq) ?? 0)
-            : (client._delivery?.resolveActualAckSeq?.(result, seq) ?? seq);
-        if (requireServerWatermark && actualAckSeq < seq) {
+        const actualAckSeq = seq > 0
+            ? (requireServerWatermark
+                ? (client._delivery?.resolveForwardAckSeq?.(result, seq) ?? 0)
+                : (client._delivery?.resolveActualAckSeq?.(result, seq) ?? seq))
+            : 0;
+        if (seq > 0 && requireServerWatermark && actualAckSeq < seq) {
             throw new E2EEError(`message.v2.ack server ACK watermark ${actualAckSeq} is below requested ${seq}`);
         }
         result.ack_seq = actualAckSeq;
         result.success = true;
-        if (ackGeneration !== null) {
+        if (seq > 0 && ackGeneration !== null) {
             client._delivery?.completePendingP2PInlineAckUpTo?.(ns, actualAckSeq, ackGeneration);
         }
-        if (v2SessionAtStart
+        if (seq > 0 && v2SessionAtStart
             && client._v2Session === v2SessionAtStart
             && Number(client._v2RuntimeGeneration ?? 0) === v2RuntimeGenerationAtStart) {
             try {
@@ -2546,7 +2683,6 @@ export class V2E2EECoordinator {
             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',
         };
@@ -2590,13 +2726,14 @@ export class V2E2EECoordinator {
             encrypted: true,
             e2ee: e2eeMeta,
         };
+        const senderDeviceId = String(aad.from_device ?? '').trim();
+        if (senderDeviceId)
+            result.sender_device_id = senderDeviceId;
         result.direction = fromAid && fromAid === client._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;
         attachGatewayProximity(result, msg);
         if (group) {
             result.group_id = msg.group_id ?? aad.group_id ?? envelope.group_id ?? null;
@@ -2674,6 +2811,10 @@ export class V2E2EECoordinator {
         if (peerDevices.length === 0) {
             throw new E2EEError(`V2 bootstrap: no devices found for ${to}`);
         }
+        const targetDeviceId = String(opts.deviceId ?? '').trim();
+        if (targetDeviceId && !peerDevices.some((dev) => String(dev.device_id ?? '').trim() === targetDeviceId)) {
+            throw new E2EEError(`V2 bootstrap: target device ${targetDeviceId} not found for ${to}`);
+        }
         let targetSet = useCache ? this.getTargetSetCache(to) : undefined;
         if (targetSet) {
             targetSet = this.cloneP2PTargetSet(targetSet);
@@ -2751,6 +2892,20 @@ export class V2E2EECoordinator {
             });
             targetSet = this.cloneP2PTargetSet(targetSet);
         }
+        if (targetDeviceId) {
+            let peerTargetFound = false;
+            targetSet.targets = targetSet.targets.filter((target) => {
+                const isPeerTarget = target.aid === to
+                    && (target.deviceId === targetDeviceId || (wrapPolicy?.scope === 'aid' && !target.deviceId))
+                    && target.role !== 'self_sync';
+                if (isPeerTarget)
+                    peerTargetFound = true;
+                return isPeerTarget || target.role === 'self_sync';
+            });
+            if (!peerTargetFound) {
+                throw new E2EEError(`V2 bootstrap: target device ${targetDeviceId} not found for ${to}`);
+            }
+        }
         const sender = await session.getSenderIdentity();
         const envelope = await encryptP2PMessage(sender, targetSet, opts.payload, { messageId: opts.messageId, timestamp: opts.timestamp, protectedHeaders: opts.protectedHeaders, context: opts.context });
         return envelope;