@agentunion/fastaun 0.4.10 → 0.4.12

package/dist/client/delivery.js

@@ -4,6 +4,17 @@ import { isJsonObject } from '../types.js';
 const PUSHED_SEQS_LIMIT = 50_000;
 const PENDING_ORDERED_LIMIT = 50_000;
 const GROUP_RECALL_SEEN_LIMIT = 10_000;
+const APP_MESSAGE_ENVELOPE_KEYS = [
+    'module_id', 'message_id', 'id', 'seq', 'msg_seq', 'message_type', 'type', 'kind', 'version',
+    'from', 'from_aid', 'sender_aid', 'to', 'to_aid', 'group_id',
+    'timestamp', 'created_at', 't_server', 'encrypted', 'status', 'delivery_mode',
+    'dispatch_mode', 'dispatch', 'device_id', 'slot_id',
+];
+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',
+];
 function isPromiseLike(value) {
     return Boolean(value && typeof value.then === 'function');
 }
@@ -52,6 +63,41 @@ export class MessageDeliveryEngine {
                 queue.delete(oldSeq);
         }
     }
+    isGroupEventNamespace(ns) {
+        return ns.startsWith('group_event:');
+    }
+    async publishOrderedQueueItem(ns, event, seq, payload, source, pullResponse = false) {
+        const client = this.runtime.client;
+        if (event === 'group.changed' && this.isGroupEventNamespace(ns)) {
+            await this.publishOrderedGroupChanged(payload, source);
+            return;
+        }
+        if (pullResponse) {
+            const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source));
+            if (isPromiseLike(published))
+                await published;
+        }
+        else {
+            const published = client._publishAppEvent(event, payload, source);
+            if (isPromiseLike(published))
+                await published;
+        }
+    }
+    async publishOrderedGroupChanged(payload, source = 'ordered') {
+        const client = this.runtime.client;
+        if (isJsonObject(payload)) {
+            const eventPayload = payload;
+            client._groupState?.handleGroupChangedV2Membership?.(eventPayload);
+            if (eventPayload.action === 'dissolved') {
+                const groupId = normalizeGroupId(String(eventPayload.group_id ?? '')) || String(eventPayload.group_id ?? '').trim();
+                if (groupId)
+                    client._cleanupDissolvedGroup?.(groupId);
+            }
+        }
+        const published = client._publishAppEvent('group.changed', payload, source);
+        if (isPromiseLike(published))
+            await published;
+    }
     isInstanceScopedMessageEvent(event) {
         return event === 'message.received'
             || event === 'message.recalled'
@@ -74,9 +120,54 @@ export class MessageDeliveryEngine {
         return result;
     }
     normalizePublishedMessagePayload(event, payload) {
-        if (!this.isInstanceScopedMessageEvent(event))
+        if (this.isInstanceScopedMessageEvent(event)) {
+            return this.attachAppMessageEnvelope(this.stripInternalSenderDeviceFields(this.attachCurrentInstanceContext(payload)));
+        }
+        if (this.isGroupScopedEvent(event)) {
+            return this.attachAppGroupEventEnvelope(this.attachCurrentInstanceContext(payload));
+        }
+        return payload;
+    }
+    appMessageEnvelope(payload) {
+        if (!isJsonObject(payload))
+            return {};
+        const message = payload;
+        const envelope = {};
+        for (const key of APP_MESSAGE_ENVELOPE_KEYS) {
+            if (Object.prototype.hasOwnProperty.call(message, key))
+                envelope[key] = message[key];
+        }
+        return envelope;
+    }
+    isGroupScopedEvent(event) {
+        return event === 'group.changed';
+    }
+    appGroupEventEnvelope(payload) {
+        if (!isJsonObject(payload))
+            return {};
+        const groupEvent = payload;
+        const envelope = {};
+        for (const key of APP_GROUP_EVENT_ENVELOPE_KEYS) {
+            if (Object.prototype.hasOwnProperty.call(groupEvent, key))
+                envelope[key] = groupEvent[key];
+        }
+        return envelope;
+    }
+    attachAppMessageEnvelope(payload) {
+        if (!isJsonObject(payload))
             return payload;
-        return this.stripInternalSenderDeviceFields(this.attachCurrentInstanceContext(payload));
+        const result = { ...payload };
+        // 兼容期保留顶层信封字段；下一个大版本 0.5.* 将移除这些顶层别名，请通过 envelope.* 访问。
+        result.envelope = this.appMessageEnvelope(result);
+        return result;
+    }
+    attachAppGroupEventEnvelope(payload) {
+        if (!isJsonObject(payload))
+            return payload;
+        const result = { ...payload };
+        // 兼容期保留顶层群事件信封字段；下一个大版本 0.5.* 将移除这些顶层别名，请通过 envelope.* 访问。
+        result.envelope = this.appGroupEventEnvelope(result);
+        return result;
     }
     stripInternalSenderDeviceFields(payload) {
         if (!isJsonObject(payload))
@@ -99,6 +190,11 @@ export class MessageDeliveryEngine {
         if (msgType !== 'message.recalled' && payloadType !== 'message.recalled')
             return null;
         const event = { ...payload };
+        for (const key of APP_MESSAGE_ENVELOPE_KEYS) {
+            if (Object.prototype.hasOwnProperty.call(msg, key) && !(key in event)) {
+                event[key] = msg[key];
+            }
+        }
         const rawIds = event.message_ids;
         let messageIds = Array.isArray(rawIds)
             ? rawIds.map((item) => String(item ?? '').trim()).filter(Boolean)
@@ -123,8 +219,11 @@ export class MessageDeliveryEngine {
             event.timestamp = msg.timestamp ?? msg.t_server ?? event.recalled_at ?? 0;
         if ('seq' in msg && !('seq' in event))
             event.seq = msg.seq;
-        if ('message_id' in msg && !('tombstone_message_id' in event))
-            event.tombstone_message_id = msg.message_id;
+        if ('message_id' in msg) {
+            event.message_id = msg.message_id;
+            if (!('tombstone_message_id' in event))
+                event.tombstone_message_id = msg.message_id;
+        }
         if ('device_id' in msg && !('device_id' in event))
             event.device_id = msg.device_id;
         if ('slot_id' in msg && !('slot_id' in event))
@@ -148,6 +247,11 @@ export class MessageDeliveryEngine {
         if (msgType !== 'group.message_recalled' && payloadType !== 'group.message_recalled')
             return null;
         const event = { ...payload };
+        for (const key of APP_MESSAGE_ENVELOPE_KEYS) {
+            if (Object.prototype.hasOwnProperty.call(msg, key) && !(key in event)) {
+                event[key] = msg[key];
+            }
+        }
         const rawIds = event.message_ids;
         let messageIds = Array.isArray(rawIds)
             ? rawIds.map((item) => String(item ?? '').trim()).filter(Boolean)
@@ -170,8 +274,11 @@ export class MessageDeliveryEngine {
             event.timestamp = msg.timestamp ?? msg.t_server ?? event.recalled_at ?? 0;
         if ('seq' in msg)
             event.seq = msg.seq;
-        if ('message_id' in msg && !('tombstone_message_id' in event))
-            event.tombstone_message_id = msg.message_id;
+        if ('message_id' in msg) {
+            event.message_id = msg.message_id;
+            if (!('tombstone_message_id' in event))
+                event.tombstone_message_id = msg.message_id;
+        }
         return event;
     }
     groupRecallDedupKey(groupId, payload) {
@@ -703,20 +810,27 @@ export class MessageDeliveryEngine {
                 if (eventObjects.length > 0) {
                     client._seqTracker.onPullResult(ns, eventObjects, nextAfterSeq);
                 }
-                const retentionFloor = client._pullRetentionFloor(result, 'retention_floor_event_seq', 'retention_floor_event_seq');
+                const cursor = isJsonObject(result.cursor)
+                    ? result.cursor
+                    : null;
+                const cursorCurrentSeq = Number(cursor?.current_seq ?? 0);
+                const retentionFloor = Math.max(client._pullRetentionFloor(result, 'retention_floor_event_seq', 'retention_floor_event_seq'), Number.isFinite(cursorCurrentSeq) ? cursorCurrentSeq : 0);
                 if (retentionFloor > 0) {
                     const contigBeforeFloor = client._seqTracker.getContiguousSeq(ns);
                     if (contigBeforeFloor < retentionFloor) {
-                        client._clientLog.info(`group.pull_events retention-floor advance: ns=${ns} contiguous=${contigBeforeFloor} -> retention_floor=${retentionFloor}`);
+                        client._clientLog.info(`group.pull_events cursor/floor advance: ns=${ns} contiguous=${contigBeforeFloor} -> cursor.current_seq=${cursorCurrentSeq} floor=${retentionFloor}`);
                         client._seqTracker.forceContiguousSeq(ns, retentionFloor);
                     }
                 }
                 const eventSeqs = [];
+                let hasDissolvedEvent = false;
                 for (const evt of eventObjects) {
                     const eventSeq = Number(evt.event_seq ?? 0);
                     if (Number.isFinite(eventSeq) && eventSeq > 0)
                         eventSeqs.push(eventSeq);
                     evt._from_gap_fill = true;
+                    if (evt.action === 'dissolved')
+                        hasDissolvedEvent = true;
                     const et = String(evt.event_type ?? '');
                     if (et !== 'group.message_created') {
                         const cs = evt.client_signature;
@@ -728,19 +842,19 @@ export class MessageDeliveryEngine {
                                 evt._verified = await client._verifyEventSignatureAsync(evt, cs);
                             }
                         }
-                        await client._dispatcher.publish('group.changed', evt);
-                    }
-                    if (Number.isFinite(eventSeq) && eventSeq > 0) {
-                        client._markPulledSeqDelivered(ns, eventSeq);
+                        if (Number.isFinite(eventSeq) && eventSeq > 0 && !client._pushedSeqs.get(ns)?.has(eventSeq)) {
+                            this.enqueueOrderedMessage(ns, 'group.changed', eventSeq, evt);
+                        }
                     }
                     filled += 1;
                 }
-                const contig = client._seqTracker.getContiguousSeq(ns);
-                if (contig !== pageContigBefore) {
+                const ackContig = client._seqTracker.getContiguousSeq(ns);
+                await this.drainOrderedMessages(ns);
+                if (ackContig !== pageContigBefore && !hasDissolvedEvent) {
                     this.saveSeqTrackerState();
                 }
-                if (eventObjects.length > 0 && contig > 0 && contig !== pageContigBefore) {
-                    const ackSeq = this.clampAckSeq('group.ack_events', 'event_seq', ns, contig);
+                if (eventObjects.length > 0 && ackContig > 0 && ackContig !== pageContigBefore) {
+                    const ackSeq = this.clampAckSeq('group.ack_events', 'event_seq', ns, ackContig);
                     client._transport.call('group.ack_events', {
                         group_id: groupId,
                         event_seq: ackSeq,
@@ -771,36 +885,65 @@ export class MessageDeliveryEngine {
             }
         }
     }
-    handleGroupChangedEventSeq(data, groupId) {
+    async handleGroupChangedEventSeq(data, groupId) {
         const client = this.runtime.client;
         let needPull = false;
         const rawEventSeq = data.event_seq;
-        if (rawEventSeq != null && groupId) {
-            const es = Number(rawEventSeq);
-            if (Number.isFinite(es) && es > 0) {
-                needPull = client._seqTracker.onMessageSeq(`group_event:${groupId}`, es);
-            }
-            this.saveSeqTrackerState();
-            const ns = `group_event:${groupId}`;
+        const eventSeq = Number(rawEventSeq);
+        if (!groupId || !Number.isFinite(eventSeq) || !Number.isInteger(eventSeq) || eventSeq <= 0) {
+            await this.publishOrderedGroupChanged(data, 'legacy');
+            return;
+        }
+        const ns = `group_event:${groupId}`;
+        if (this.isSelfJoinGroupChanged(data)) {
             const contig = client._seqTracker.getContiguousSeq(ns);
-            if (contig > 0) {
-                const ackSeq = this.clampAckSeq('group.ack_events', 'event_seq', ns, contig);
-                client._transport.call('group.ack_events', {
-                    group_id: groupId,
-                    event_seq: ackSeq,
-                    device_id: client._deviceId,
-                    slot_id: client._slotId,
-                }, undefined, undefined, true).catch((e) => {
-                    client._clientLog.debug(`group event push auto-ack failed: group=${groupId} ${formatDeliveryError(e)}`);
-                });
+            const maxSeen = client._seqTracker.getMaxSeenSeq(ns);
+            if (contig === 0 && maxSeen === 0 && eventSeq > 1) {
+                client._clientLog.debug(`group.changed self-join baseline: group=${groupId}, event_seq=${eventSeq}, baseline=${eventSeq - 1}`);
+                client._seqTracker.forceContiguousSeq(ns, eventSeq - 1);
             }
         }
+        const contigBefore = client._seqTracker.getContiguousSeq(ns);
+        if (eventSeq <= contigBefore || client._pushedSeqs.get(ns)?.has(eventSeq)) {
+            client._clientLog.debug(`group.changed skipped duplicate/stale: group=${groupId}, event_seq=${eventSeq}, contiguous=${contigBefore}`);
+            return;
+        }
+        this.enqueueOrderedMessage(ns, 'group.changed', eventSeq, data);
+        needPull = client._seqTracker.onMessageSeq(ns, eventSeq);
+        const ackContig = client._seqTracker.getContiguousSeq(ns);
+        await this.drainOrderedMessages(ns);
+        if (ackContig > 0 && ackContig !== contigBefore) {
+            if (data.action !== 'dissolved')
+                this.saveSeqTrackerState();
+            const ackSeq = this.clampAckSeq('group.ack_events', 'event_seq', ns, ackContig);
+            client._transport.call('group.ack_events', {
+                group_id: groupId,
+                event_seq: ackSeq,
+                device_id: client._deviceId,
+                slot_id: client._slotId,
+            }, undefined, undefined, true).catch((e) => {
+                client._clientLog.debug(`group event push auto-ack failed: group=${groupId} ${formatDeliveryError(e)}`);
+            });
+        }
         if (needPull && groupId && !data._from_gap_fill) {
             this.fillGroupEventGap(groupId).catch((exc) => {
                 client._clientLog.warn(`background gap fill trigger failed: ${formatDeliveryError(exc)}`);
             });
         }
     }
+    isSelfJoinGroupChanged(data) {
+        const action = String(data.action ?? '').trim();
+        if (!['member_added', 'joined', 'join_approved', 'invite_code_used'].includes(action))
+            return false;
+        const selfAid = String(this.runtime.client._aid ?? '').trim();
+        if (!selfAid)
+            return false;
+        const joinedAid = String(data.joined_aid ?? data.member_aid ?? data.aid ?? '').trim();
+        if (joinedAid === selfAid)
+            return true;
+        const actorAid = String(data.actor_aid ?? '').trim();
+        return !joinedAid && ['joined', 'invite_code_used'].includes(action) && actorAid === selfAid;
+    }
     async onV2PushNotification(data) {
         const client = this.runtime.client;
         if (!client._v2Session)
@@ -1205,16 +1348,7 @@ export class MessageDeliveryEngine {
                 client._markOrderedSeqDelivered(ns, seq);
                 continue;
             }
-            if (pullResponse) {
-                const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(item.event, item.payload, 'ordered-drain'));
-                if (isPromiseLike(published))
-                    await published;
-            }
-            else {
-                const published = client._publishAppEvent(item.event, item.payload, 'ordered-drain');
-                if (isPromiseLike(published))
-                    await published;
-            }
+            await this.publishOrderedQueueItem(ns, item.event, seq, item.payload, 'ordered-drain', pullResponse);
             this.markPublishedSeq(ns, seq);
             client._markOrderedSeqDelivered(ns, seq);
             client._clientLog.debug(`publish ordered drain delivered: ns=${ns}, seq=${seq}, event=${item.event}`);
@@ -1227,9 +1361,7 @@ export class MessageDeliveryEngine {
         const seqNum = Number(seq);
         if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0) {
             client._clientLog.debug(`publish ordered direct(no-seq): event=${event}, ns=${ns || '<none>'}, seq=${String(seq)}`);
-            const published = client._publishAppEvent(event, payload, 'ordered');
-            if (isPromiseLike(published))
-                await published;
+            await this.publishOrderedQueueItem(ns, event, seqNum, payload, 'ordered');
             return true;
         }
         if (client._pushedSeqs.get(ns)?.has(seqNum)) {
@@ -1263,9 +1395,7 @@ export class MessageDeliveryEngine {
         queue?.delete(seqNum);
         if (queue && queue.size === 0)
             client._pendingOrderedMsgs.delete(ns);
-        const published = client._publishAppEvent(event, payload, 'ordered');
-        if (isPromiseLike(published))
-            await published;
+        await this.publishOrderedQueueItem(ns, event, seqNum, payload, 'ordered');
         this.markPublishedSeq(ns, seqNum);
         client._markOrderedSeqDelivered(ns, seqNum);
         client._clientLog.debug(`publish ordered delivered: event=${event}, ns=${ns}, seq=${seqNum}`);