@agentunion/fastaun 0.5.16 → 0.5.17

package/dist/client/delivery.js

@@ -7,6 +7,7 @@ const PUSHED_SEQS_LIMIT = 50_000;
 const PENDING_ORDERED_LIMIT = 50_000;
 const MESSAGE_RECALL_SEEN_LIMIT = 10_000;
 const GROUP_RECALL_SEEN_LIMIT = 10_000;
+const VOLATILE_SEEN_LIMIT = 10_000;
 const SEQ_TRACKER_PERSIST_FLUSH_DELAY_MS = 200;
 const DELIVERY_CHANGED_MESSAGE_EVENTS = new Set([
     'message.received',
@@ -35,7 +36,7 @@ const APP_SEND_ENVELOPE_METHODS = new Set([
 const APP_GROUP_EVENT_ENVELOPE_KEYS = [
     'module_id', 'event_id', 'event_seq', 'seq', 'event_type', 'action', 'group_id',
     'actor_aid', 'sender_aid', 'member_aid', 'target_aid', 'operator_aid',
-    'created_at', 'timestamp', 't_server', 'status', 'device_id', 'slot_id',
+    'created_at', 'timestamp', 't_server', 'status', 'device_id',
 ];
 function isPromiseLike(value) {
     return Boolean(value && typeof value.then === 'function');
@@ -87,6 +88,10 @@ export class MessageDeliveryEngine {
     deliveryChangedGeneration = 0;
     syncRun = 0;
     syncSessions = null;
+    volatileContext = '';
+    volatileCursor = '';
+    volatileSeenMessages = new Map();
+    volatileInFlightMessages = new Set();
     // 同一实例的 tracker 写入必须串行，避免旧的延迟 flush 覆盖新的 Forward 提交。
     seqTrackerWriteChain = Promise.resolve();
     constructor(runtime) {
@@ -157,9 +162,13 @@ export class MessageDeliveryEngine {
             throw new Error(`${method} response must be an object`);
         }
         const client = this.runtime.client;
+        const response = result;
+        const volatileMessages = method === 'message.pull' ? this.volatileMessages(response.messages) : [];
+        if (volatileMessages.length > 0) {
+            await this.publishPlainVolatileMessages(volatileMessages, 'pull', true);
+        }
         this.ensurePullOperationCurrent(ns);
         this.syncStarted(ns);
-        const response = result;
         const messages = deduplicatePlainForwardPageMessages(response.messages, afterSeq);
         const coordinator = this.forwardCoordinator();
         const pageContigBefore = client._seqTracker.getContiguousSeq(ns);
@@ -279,8 +288,121 @@ export class MessageDeliveryEngine {
             hasMore: typeof response.has_more === 'boolean' ? response.has_more : undefined,
             currentSeq: client._seqTracker.getContiguousSeq(ns),
         });
+        response.messages = (Array.isArray(response.messages) ? response.messages : [])
+            .map((message) => this.stripInternalSenderDeviceFields(message));
         return { rawCount: messages.length, publishedCount };
     }
+    isVolatileMessage(message) {
+        return isJsonObject(message)
+            && String(message.storage ?? '') === 'volatile';
+    }
+    volatileMessages(value) {
+        if (!Array.isArray(value))
+            return [];
+        return value.filter((item) => this.isVolatileMessage(item)).map((item) => ({ ...item }));
+    }
+    ensureVolatileContext() {
+        const client = this.runtime.client;
+        const context = JSON.stringify([client._aid ?? '', client._deviceId ?? '', client._slotId ?? '']);
+        if (context === this.volatileContext)
+            return;
+        this.volatileContext = context;
+        this.volatileCursor = '';
+        this.volatileSeenMessages.clear();
+        this.volatileInFlightMessages.clear();
+    }
+    volatilePullCursor() {
+        this.ensureVolatileContext();
+        return this.volatileCursor;
+    }
+    resetVolatilePullCursor() {
+        this.ensureVolatileContext();
+        this.volatileCursor = '';
+    }
+    volatileSeenKey(message) {
+        const messageId = String(message.message_id ?? '').trim();
+        const sender = String(message.from_aid ?? message.from ?? '').trim();
+        const cursor = String(message.volatile_cursor ?? '').trim();
+        return `${sender}|${messageId || cursor}`;
+    }
+    isVolatileSeen(message) {
+        this.ensureVolatileContext();
+        const now = Date.now();
+        for (const [key, expiresAt] of this.volatileSeenMessages) {
+            if (expiresAt <= now)
+                this.volatileSeenMessages.delete(key);
+        }
+        return this.volatileSeenMessages.has(this.volatileSeenKey(message));
+    }
+    markVolatileSeen(message) {
+        this.ensureVolatileContext();
+        const now = Date.now();
+        const expiresAt = Math.max(now + 60_000, Number(message.expires_at ?? now + 1_800_000) || now + 1_800_000);
+        this.volatileSeenMessages.set(this.volatileSeenKey(message), expiresAt);
+        while (this.volatileSeenMessages.size > VOLATILE_SEEN_LIMIT) {
+            const first = this.volatileSeenMessages.keys().next().value;
+            if (first === undefined)
+                break;
+            this.volatileSeenMessages.delete(first);
+        }
+    }
+    beginVolatileDelivery(message) {
+        if (this.isVolatileSeen(message))
+            return 'seen';
+        const key = this.volatileSeenKey(message);
+        if (this.volatileInFlightMessages.has(key))
+            return 'inflight';
+        this.volatileInFlightMessages.add(key);
+        return 'claimed';
+    }
+    finishVolatileDelivery(message) {
+        this.ensureVolatileContext();
+        this.volatileInFlightMessages.delete(this.volatileSeenKey(message));
+    }
+    publicVolatileMessage(message) {
+        const result = this.stripInternalSenderDeviceFields(message);
+        delete result.seq;
+        return result;
+    }
+    async ackVolatileMessages(messages, v2, advanceCursor) {
+        const cursors = [...new Set(messages
+                .map((message) => String(message.volatile_cursor ?? '').trim())
+                .filter(Boolean))];
+        if (cursors.length === 0)
+            return undefined;
+        const result = await this.runtime.client._callRawV2Rpc(v2 ? 'message.v2.ack' : 'message.ack', { volatile_cursors: cursors, _rpc_background: true });
+        if (advanceCursor) {
+            this.ensureVolatileContext();
+            this.volatileCursor = cursors[cursors.length - 1] ?? '';
+        }
+        return result;
+    }
+    async publishPlainVolatileMessages(messages, source, advanceCursor) {
+        const processed = [];
+        for (const rawMessage of messages) {
+            const message = this.publicVolatileMessage(rawMessage);
+            const claim = this.beginVolatileDelivery(message);
+            if (claim === 'seen') {
+                processed.push(rawMessage);
+                continue;
+            }
+            if (claim === 'inflight')
+                continue;
+            try {
+                const appEvent = this.p2pAppEventForMessage(message);
+                await this.runtime.client._publishAppEvent(appEvent.event, appEvent.payload, source);
+                this.markVolatileSeen(message);
+            }
+            finally {
+                this.finishVolatileDelivery(message);
+            }
+            processed.push(rawMessage);
+        }
+        if (processed.length > 0) {
+            await this.ackVolatileMessages(processed, false, advanceCursor);
+        }
+        return processed.map((message) => this.publicVolatileMessage(message));
+    }
     resetInlineAckState() {
         this.syncStopped('aborted');
         this.deliveryChangedGeneration += 1;
@@ -714,9 +836,6 @@ export class MessageDeliveryEngine {
         if (!('device_id' in result)) {
             result.device_id = client._deviceId;
         }
-        if (!('slot_id' in result)) {
-            result.slot_id = client._slotId;
-        }
         return result;
     }
     normalizePublishedMessagePayload(event, payload, source = 'direct') {
@@ -728,7 +847,7 @@ export class MessageDeliveryEngine {
             normalized = this.attachAppMessageEnvelope(this.stripInternalSenderDeviceFields(this.attachCurrentInstanceContext(payload)));
         }
         else if (this.isGroupScopedEvent(event)) {
-            normalized = this.attachAppGroupEventEnvelope(this.attachCurrentInstanceContext(payload));
+            normalized = this.attachAppGroupEventEnvelope(this.stripInternalSenderDeviceFields(this.attachCurrentInstanceContext(payload)));
         }
         else {
             normalized = payload;
@@ -901,7 +1020,7 @@ export class MessageDeliveryEngine {
             const authoritativeSource = hasGroupMentionModeField(serverSource) ? serverSource : out;
             out = normalizeGroupMentionMode(out, authoritativeSource);
         }
-        return out;
+        return this.stripInternalSenderDeviceFields(out);
     }
     attachAppGroupEventEnvelope(payload) {
         if (!isJsonObject(payload))
@@ -915,10 +1034,13 @@ export class MessageDeliveryEngine {
         if (!isJsonObject(payload))
             return payload;
         const result = { ...payload };
-        delete result.sender_device_id;
         delete result._sender_device_id;
         delete result.from_device_id;
         delete result.from_device;
+        delete result.slot_id;
+        delete result.sender_slot_id;
+        delete result.target_slot_id;
+        delete result.owner_slot_id;
         return result;
     }
     recallEventFromMessage(message) {
@@ -973,9 +1095,7 @@ export class MessageDeliveryEngine {
         }
         if ('device_id' in msg && !('device_id' in event))
             event.device_id = msg.device_id;
-        if ('slot_id' in msg && !('slot_id' in event))
-            event.slot_id = msg.slot_id;
-        return event;
+        return this.stripInternalSenderDeviceFields(event);
     }
     p2pAppEventForMessage(message) {
         const recall = this.recallEventFromMessage(message);
@@ -1082,7 +1202,7 @@ export class MessageDeliveryEngine {
             if (!('tombstone_message_id' in event))
                 event.tombstone_message_id = msg.message_id;
         }
-        return event;
+        return this.stripInternalSenderDeviceFields(event);
     }
     groupRecallDedupKey(groupId, payload) {
         // 群撤回去重键：group_id + 原始消息标识。
@@ -1460,6 +1580,10 @@ export class MessageDeliveryEngine {
             client._clientLog.debug(`P2P push filtered by instance: message_id=${String(msg.message_id ?? '')}, seq=${String(msg.seq ?? '')}, target_device=${String(msg.device_id ?? '')}, target_slot=${String(msg.slot_id ?? '')}, local_device=${client._deviceId}, local_slot=${client._slotId}`);
             return;
         }
+        if (this.isVolatileMessage(msg)) {
+            await this.publishPlainVolatileMessages([msg], 'push', false);
+            return;
+        }
         // 新 SDK 的所有带合法 seq P2P Push 都只作为 Head 通知处理。
         // 新服务端为兼容旧 SDK 仍可能发送 message.received；V2 会话下必须
         // 在旧 seq tracking / ordered publish 之前转入前台 Tail 协调器。
@@ -2923,6 +3047,10 @@ export class MessageDeliveryEngine {
         const ns = client._aid ? `p2p:${client._aid}` : '';
         if (!pushData || !ns)
             return;
+        if (this.isVolatileMessage(pushData)) {
+            await client._v2E2EE.publishV2VolatileMessages([pushData], 'push', false);
+            return;
+        }
         if (String(pushData.kind ?? '').trim() === 'message.online_unread_hint') {
             if (client._sessionOptions?.background_sync === false)
                 return;