@agentunion/fastaun 0.5.17 → 0.5.18

package/dist/client/delivery.js

@@ -1460,6 +1460,24 @@ export class MessageDeliveryEngine {
             return false;
         return senderDevice.trim() === String(client._deviceId).trim();
     }
+    isSelfSentP2PMessage(message) {
+        if (!isJsonObject(message))
+            return false;
+        const client = this.runtime.client;
+        if (String(message.direction ?? '').trim() !== 'outbound_sync')
+            return false;
+        const selfAid = String(client._aid ?? '').trim().toLowerCase();
+        const senderAid = String(message.sender_aid ?? message.from_aid ?? message.from ?? '').trim().toLowerCase();
+        if (!selfAid || senderAid !== selfAid)
+            return false;
+        const senderDevice = Object.prototype.hasOwnProperty.call(message, 'sender_device_id')
+            ? message.sender_device_id
+            : message.from_device_id;
+        return typeof senderDevice === 'string'
+            && Boolean(senderDevice.trim())
+            && Boolean(String(client._deviceId ?? '').trim())
+            && senderDevice.trim() === String(client._deviceId).trim();
+    }
     async runPushProcessSerialized(ns, operation, inlineGeneration) {
         const client = this.runtime.client;
         if (inlineGeneration === undefined) {
@@ -1589,7 +1607,7 @@ export class MessageDeliveryEngine {
         // 在旧 seq tracking / ordered publish 之前转入前台 Tail 协调器。
         const inlinePresent = hasNonEmptyInlineMessage(msg.inline_message);
         const legacyPushSeq = this.realtimeHeadSeq(msg.seq, inlinePresent);
-        if (client._v2Session && client._aid && (msg.seq !== undefined && msg.seq !== null || inlinePresent)) {
+        if ((client._v2Session || inlinePresent) && client._aid && (msg.seq !== undefined && msg.seq !== null || inlinePresent)) {
             if (legacyPushSeq === null) {
                 if (inlinePresent)
                     await this.recoverInvalidP2PRealtimeHead(`p2p:${client._aid}`, msg.seq);
@@ -1606,10 +1624,18 @@ export class MessageDeliveryEngine {
             const ns = `p2p:${client._aid}`;
             if (seq > 0)
                 client._seqTracker.updateMaxSeen(ns, seq);
+            if (encryptedPush) {
+                if (Number(seq) > client._seqTracker.getContiguousSeq(ns) && client._sessionOptions?.background_sync !== false) {
+                    client._clientLog.debug(`P2P push triggering Forward: ns=${ns}, seq=${seq}, contiguous=${client._seqTracker.getContiguousSeq(ns)}`);
+                    this.fillP2pGap().catch((exc) => client._clientLog.warn(`background gap fill trigger failed: ${formatDeliveryError(exc)}`));
+                }
+                return;
+            }
             if (Number(seq) > client._seqTracker.getContiguousSeq(ns) && client._sessionOptions?.background_sync !== false) {
                 client._clientLog.debug(`P2P push triggering Forward: ns=${ns}, seq=${seq}, contiguous=${client._seqTracker.getContiguousSeq(ns)}`);
                 this.fillP2pGap().catch((exc) => client._clientLog.warn(`background gap fill trigger failed: ${formatDeliveryError(exc)}`));
             }
+            await this.publishOrderedMessage('message.received', ns, seq, msg, 'push');
             return;
         }
         else {
@@ -1617,6 +1643,8 @@ export class MessageDeliveryEngine {
                 await client._publishEncryptedPushMessage('message.received', 'message.undecryptable', '', seq ?? 0, msg, false);
                 return;
             }
+            if (this.isSelfSentP2PMessage(msg))
+                return;
             await client._publishAppEvent('message.received', msg, 'push');
         }
     }
@@ -1671,7 +1699,7 @@ export class MessageDeliveryEngine {
         // 不能让 payload 路径直接推进旧 ordered publish 状态。
         const inlinePresent = hasNonEmptyInlineMessage(msg.inline_message);
         const legacyPushSeq = this.realtimeHeadSeq(seq, inlinePresent);
-        if (client._v2Session && groupId && (seq !== undefined && seq !== null || inlinePresent)) {
+        if ((client._v2Session || inlinePresent) && groupId && (seq !== undefined && seq !== null || inlinePresent)) {
             if (legacyPushSeq === null) {
                 if (inlinePresent)
                     await this.recoverInvalidGroupRealtimeHead(groupId, `group:${groupId}`, seq);
@@ -1694,10 +1722,20 @@ export class MessageDeliveryEngine {
             const ns = `group:${groupId}`;
             if (seq > 0)
                 client._seqTracker.updateMaxSeen(ns, seq);
+            if (encryptedPush) {
+                if (Number(seq) > client._seqTracker.getContiguousSeq(ns) && client._sessionOptions?.background_sync !== false) {
+                    client._clientLog.debug(`group push triggering Forward: group=${groupId}, seq=${seq}, contiguous=${client._seqTracker.getContiguousSeq(ns)}`);
+                    this.fillGroupGap(groupId).catch((exc) => client._clientLog.warn(`background gap fill trigger failed: ${formatDeliveryError(exc)}`));
+                }
+                return;
+            }
             if (Number(seq) > client._seqTracker.getContiguousSeq(ns) && client._sessionOptions?.background_sync !== false) {
                 client._clientLog.debug(`group push triggering Forward: group=${groupId}, seq=${seq}, contiguous=${client._seqTracker.getContiguousSeq(ns)}`);
                 this.fillGroupGap(groupId).catch((exc) => client._clientLog.warn(`background gap fill trigger failed: ${formatDeliveryError(exc)}`));
             }
+            if (!this.isSelfSentGroupMessage(msg)) {
+                await this.publishOrderedMessage('group.message_created', ns, seq, msg, 'group-push');
+            }
             return;
         }
         else {
@@ -2374,7 +2412,7 @@ export class MessageDeliveryEngine {
                 after_seq: state.ack,
                 limit: pageLimit,
                 ...(headForward ? { max_pages: Math.max(2, requiredPages) } : order[0] === 'tail' ? { max_pages: requiredPages } : {}),
-            }, !foregroundForward, headForward || tailMissedDuringPull);
+            }, true, headForward || tailMissedDuringPull);
         }
         if (tailHead !== null && this.syncState(ns).ack < this.syncState(ns).tail - 1) {
             this.scheduleRealtimeWindowForward(ns);
@@ -2451,7 +2489,7 @@ export class MessageDeliveryEngine {
                 after_seq: state.ack,
                 limit: pageLimit,
                 ...(headForward ? { max_pages: Math.max(2, requiredPages) } : order[0] === 'tail' ? { max_pages: requiredPages } : {}),
-            }, !foregroundForward, headForward || tailMissedDuringPull);
+            }, true, headForward || tailMissedDuringPull);
         }
         if (tailHead !== null && this.syncState(ns).ack < this.syncState(ns).tail - 1) {
             this.scheduleRealtimeWindowForward(ns, groupId);
@@ -2722,10 +2760,10 @@ export class MessageDeliveryEngine {
         const pending = client._pendingOrderedMsgs.get(ns);
         return !pending || pending.size === 0;
     }
-    async decodeInlineP2P(row) {
+    async decodeInlineP2P(row, deferStatus) {
         const client = this.runtime.client;
         if (this.inlineRowKind(row) === 'v2') {
-            const decrypted = await client._decryptV2PushMessage(row);
+            const decrypted = await client._decryptV2PushMessage(row, deferStatus);
             return isJsonObject(decrypted) ? decrypted : null;
         }
         const legacy = isJsonObject(row.legacy_v1) ? row.legacy_v1 : null;
@@ -2750,16 +2788,20 @@ export class MessageDeliveryEngine {
             timestamp: row.t_server,
             payload: payload,
             encrypted: false,
-            direction: String(row.direction ?? '').trim() || (fromAid && fromAid === client._aid ? 'outbound_sync' : 'inbound'),
         };
+        const direction = String(row.direction ?? '').trim();
+        if (direction)
+            result.direction = direction;
+        else if (fromAid && fromAid !== client._aid)
+            result.direction = 'inbound';
         if (row.sender_device_id !== undefined)
             result.sender_device_id = row.sender_device_id;
         return result;
     }
-    async decodeInlineGroup(row, groupId, groupAid) {
+    async decodeInlineGroup(row, groupId, groupAid, deferStatus) {
         const client = this.runtime.client;
         if (this.inlineRowKind(row) === 'v2') {
-            const decrypted = await client._decryptV2PushMessage(row);
+            const decrypted = await client._decryptV2PushMessage(row, deferStatus);
             if (!isJsonObject(decrypted))
                 return null;
             const decoded = decrypted;
@@ -2825,9 +2867,13 @@ export class MessageDeliveryEngine {
         const snapshot = typeof tracker.snapshotNamespace === 'function' ? tracker.snapshotNamespace(ns) : null;
         let delivered = false;
         try {
-            const published = client._publishAppEvent(event, payload, 'inline-push');
-            if (isPromiseLike(published))
-                await published;
+            const selfSync = (event === 'message.received' && this.isSelfSentP2PMessage(payload))
+                || (event === 'group.message_created' && this.isSelfSentGroupMessage(payload));
+            if (!selfSync) {
+                const published = client._publishAppEvent(event, payload, 'inline-push');
+                if (isPromiseLike(published))
+                    await published;
+            }
             if (!this.inlineGenerationIsCurrent(generation))
                 return false;
             delivered = true;
@@ -2864,6 +2910,34 @@ export class MessageDeliveryEngine {
             return false;
         }
     }
+    async commitInlineTerminalDecryptSeq(ns, seq, generation) {
+        const client = this.runtime.client;
+        const tracker = client._seqTracker;
+        if (!this.inlineGenerationIsCurrent(generation) || !this.inlineStateIsCaughtUp(ns, seq))
+            return false;
+        const snapshot = typeof tracker.snapshotNamespace === 'function' ? tracker.snapshotNamespace(ns) : null;
+        try {
+            const needsPull = Boolean(tracker.onMessageSeq(ns, seq));
+            tracker.commitTailWindow(ns, {
+                windowStartSeq: seq,
+                headSeq: seq,
+                coveredThroughSeq: seq,
+                pageLimit: 1,
+            });
+            const committed = this.syncState(ns);
+            if (needsPull || committed.ack !== seq || committed.tail !== seq || committed.head !== seq) {
+                throw new Error('inline realtime terminal cursor did not collapse after consume');
+            }
+            await client._commitSeqTrackerState(ns);
+            return true;
+        }
+        catch (exc) {
+            if (typeof tracker.restoreNamespaceSnapshot === 'function')
+                tracker.restoreNamespaceSnapshot(ns, snapshot);
+            client._clientLog.debug(`inline realtime terminal consume rolled back: ns=${ns} seq=${seq} err=${formatDeliveryError(exc)}`);
+            return false;
+        }
+    }
     async tryConsumeInlineP2P(head, ns, pushSeq, expectedVersion, inlineGeneration) {
         const client = this.runtime.client;
         if (!isJsonObject(head.inline_message))
@@ -2883,7 +2957,14 @@ export class MessageDeliveryEngine {
                 return false;
             let committed = false;
             try {
-                const decoded = await this.decodeInlineP2P(row);
+                const decryptStatus = {};
+                const decoded = await this.decodeInlineP2P(row, decryptStatus);
+                if (!decoded && decryptStatus.terminal) {
+                    if (!await this.commitInlineTerminalDecryptSeq(ns, pushSeq, generation))
+                        return false;
+                    committed = this.markPendingP2PInlineAckCommitted(ns, pushSeq);
+                    return committed;
+                }
                 if (!this.inlineGenerationIsCurrent(generation) || !decoded || !this.inlineStateIsCaughtUp(ns, pushSeq)
                     || !this.decodedInlineMatches(head, decoded, pushSeq))
                     return false;
@@ -2921,7 +3002,14 @@ export class MessageDeliveryEngine {
                 return false;
             let committed = false;
             try {
-                const decoded = await this.decodeInlineGroup(row, groupId, groupAid || groupId);
+                const decryptStatus = {};
+                const decoded = await this.decodeInlineGroup(row, groupId, groupAid || groupId, decryptStatus);
+                if (!decoded && decryptStatus.terminal) {
+                    if (!await this.commitInlineTerminalDecryptSeq(ns, pushSeq, generation))
+                        return false;
+                    committed = this.markPendingGroupInlineAckCommitted(ns, pushSeq);
+                    return committed;
+                }
                 if (!this.inlineGenerationIsCurrent(generation) || !decoded || !this.inlineStateIsCaughtUp(ns, pushSeq)
                     || !this.decodedInlineMatches(head, decoded, pushSeq, groupId))
                     return false;
@@ -3040,13 +3128,14 @@ export class MessageDeliveryEngine {
         const client = this.runtime.client;
         if (inlineGeneration !== undefined && !this.inlineGenerationIsCurrent(inlineGeneration))
             return;
-        if (!client._v2Session)
-            return;
         const pushData = isJsonObject(data) ? data : null;
         const rawPushSeq = pushData?.seq;
         const ns = client._aid ? `p2p:${client._aid}` : '';
         if (!pushData || !ns)
             return;
+        const inlinePresent = hasNonEmptyInlineMessage(pushData.inline_message);
+        if (!client._v2Session && !(expectedVersion === 'v1' && inlinePresent))
+            return;
         if (this.isVolatileMessage(pushData)) {
             await client._v2E2EE.publishV2VolatileMessages([pushData], 'push', false);
             return;
@@ -3057,7 +3146,6 @@ export class MessageDeliveryEngine {
             this.enqueueOnlineUnreadP2pHint(pushData);
             return;
         }
-        const inlinePresent = hasNonEmptyInlineMessage(pushData.inline_message);
         const pushSeq = this.realtimeHeadSeq(rawPushSeq, inlinePresent);
         if (pushSeq === null) {
             if (inlinePresent) {
@@ -3154,8 +3242,8 @@ export class MessageDeliveryEngine {
         const client = this.runtime.client;
         if (inlineGeneration !== undefined && !this.inlineGenerationIsCurrent(inlineGeneration))
             return;
-        if (!isJsonObject(data) || !client._v2Session) {
-            client._clientLog.debug(`_onRawGroupV2MessageCreated skipped: is_object=${String(isJsonObject(data))}, has_v2_session=${String(!!client._v2Session)}`);
+        if (!isJsonObject(data)) {
+            client._clientLog.debug('_onRawGroupV2MessageCreated skipped: is_object=false');
             return;
         }
         const d = data;
@@ -3163,6 +3251,8 @@ export class MessageDeliveryEngine {
         const groupId = typeof d.group_id === 'string' ? d.group_id.trim() : '';
         const rawSeq = d.seq;
         const inlinePresent = hasNonEmptyInlineMessage(d.inline_message);
+        if (!client._v2Session && !(expectedVersion === 'v1' && inlinePresent))
+            return;
         const seq = this.realtimeHeadSeq(rawSeq, inlinePresent);
         if (!groupId) {
             client._clientLog.debug(`_onRawGroupV2MessageCreated skipped: group=${groupId || '<empty>'}, seq=${String(d.seq ?? '')}`);
@@ -3739,6 +3829,11 @@ export class MessageDeliveryEngine {
                 client._pendingOrderedMsgs.delete(ns);
             return false;
         }
+        if (event === 'message.received' && this.isSelfSentP2PMessage(payload)) {
+            this.markPublishedSeq(ns, seqNum);
+            client._clientLog.debug(`publish ordered skipped current-device self-sync: ns=${ns}, seq=${seqNum}`);
+            return false;
+        }
         const contig = client._seqTracker.getContiguousSeq(ns);
         if (seqNum > contig && seqNum !== contig + 1) {
             client._clientLog.debug(`publish ordered enqueue(gap): event=${event}, ns=${ns}, seq=${seqNum}, contiguous=${contig}`);
@@ -3752,6 +3847,11 @@ export class MessageDeliveryEngine {
             client._clientLog.debug(`publish ordered skipped after-drain duplicate: event=${event}, ns=${ns}, seq=${seqNum}`);
             return false;
         }
+        if (event === 'message.received' && this.isSelfSentP2PMessage(payload)) {
+            this.markPublishedSeq(ns, seqNum);
+            client._clientLog.debug(`publish pulled skipped current-device self-sync: ns=${ns}, seq=${seqNum}`);
+            return false;
+        }
         const queue = client._pendingOrderedMsgs.get(ns);
         queue?.delete(seqNum);
         if (queue && queue.size === 0)
@@ -3799,6 +3899,11 @@ export class MessageDeliveryEngine {
                 client._pendingOrderedMsgs.delete(ns);
             return false;
         }
+        if (event === 'message.received' && this.isSelfSentP2PMessage(payload)) {
+            this.markPublishedSeq(ns, seqNum);
+            client._clientLog.debug('publish pulled skipped current-device self-sync');
+            return source === 'inline_push';
+        }
         await this.drainOrderedMessages(ns, seqNum, true, persist, source);
         if (pullScoped)
             this.ensurePullOperationCurrent(ns);