@agentunion/fastaun 0.5.10 → 0.5.11

package/dist/client/delivery.js

@@ -80,6 +80,8 @@ export class MessageDeliveryEngine {
     inlineAckGeneration = 0;
     pendingDeliveryChanges = null;
     deliveryChangedGeneration = 0;
+    syncRun = 0;
+    syncSessions = null;
     // 同一实例的 tracker 写入必须串行，避免旧的延迟 flush 覆盖新的 Forward 提交。
     seqTrackerWriteChain = Promise.resolve();
     constructor(runtime) {
@@ -152,6 +154,7 @@ export class MessageDeliveryEngine {
         }
         const client = this.runtime.client;
         this.ensurePullOperationCurrent();
+        this.syncStarted(ns);
         const response = result;
         const messages = deduplicatePlainForwardPageMessages(response.messages, afterSeq);
         const coordinator = this.forwardCoordinator();
@@ -194,7 +197,7 @@ export class MessageDeliveryEngine {
                 }
                 const message = normalizeGroupMentionMode(rawMessage);
                 if (this.recallEventFromGroupMessage(message)) {
-                    if (await this.publishGroupRecallTombstone(groupId, seq, message)) {
+                    if (await this.publishGroupRecallTombstone(groupId, seq, message, 'pull')) {
                         this.ensurePullOperationCurrent();
                         this.markPublishedSeq(ns, seq);
                         publishedCount += 1;
@@ -261,9 +264,17 @@ export class MessageDeliveryEngine {
             this.ensurePullOperationCurrent();
             await this.confirmPlainForwardAck(ns, ackMethod, pendingAckSeq, groupId);
         }
+        this.syncProgress(ns, {
+            rawCount: messages.length,
+            pulledCount: publishedCount,
+            remaining: response.remaining,
+            hasMore: typeof response.has_more === 'boolean' ? response.has_more : undefined,
+            currentSeq: client._seqTracker.getContiguousSeq(ns),
+        });
         return { rawCount: messages.length, publishedCount };
     }
     resetInlineAckState() {
+        this.syncStopped('aborted');
         this.deliveryChangedGeneration += 1;
         this.pendingDeliveryChanges = null;
         this.inlineAckGeneration += 1;
@@ -276,6 +287,7 @@ export class MessageDeliveryEngine {
         this.onlineUnreadHintTargets = null;
         this.onlineUnreadHintTasks = null;
         this.realtimeTailHeads = null;
+        this.syncSessions = null;
     }
     deliveryChangedNamespace(event, payload) {
         if (event === 'group.message_created' && isJsonObject(payload)) {
@@ -301,9 +313,9 @@ export class MessageDeliveryEngine {
             || (typeof seq === 'number' && Number.isSafeInteger(seq) && seq > 0);
     }
     deliveryChangedTrigger(source) {
-        if (source === 'inline-push')
+        if (source === 'inline-push' || source === 'inline_push')
             return 'inline_push';
-        if (source === 'pull' || source === 'tail')
+        if (source === 'pull' || source === 'tail' || source === 'pending-retry' || source === 'pending_retry')
             return 'pull_drained';
         if (source === 'push' || source === 'group-push' || source === 'ordered')
             return 'push';
@@ -336,7 +348,7 @@ export class MessageDeliveryEngine {
         pending.clear();
         if (changes.length === 0)
             return;
-        const payload = { trigger, changes };
+        const payload = { source: trigger === 'pull_drained' ? 'pull' : trigger, trigger, changes };
         const dispatcher = this.runtime.client._dispatcher;
         const published = typeof dispatcher.enqueue === 'function'
             ? (dispatcher.enqueue('delivery.changed', payload), undefined)
@@ -348,8 +360,119 @@ export class MessageDeliveryEngine {
                 this.runtime.client._clientLog.warn(`delivery.changed handler failed: ${formatDeliveryError(exc)}`);
             });
     }
+    publishSyncLifecycle(event, payload) {
+        const dispatcher = this.runtime.client._dispatcher;
+        const published = typeof dispatcher.enqueue === 'function'
+            ? (dispatcher.enqueue(event, payload), undefined)
+            : typeof dispatcher.publishSyncAware === 'function'
+                ? dispatcher.publishSyncAware(event, payload)
+                : dispatcher.publish?.(event, payload);
+        if (isPromiseLike(published))
+            void Promise.resolve(published).catch((exc) => {
+                this.runtime.client._clientLog.warn(`${event} handler failed: ${formatDeliveryError(exc)}`);
+            });
+    }
+    syncStarted(ns) {
+        const namespace = String(ns ?? '').trim();
+        if (!namespace)
+            return;
+        const sessions = this.syncSessions ?? new Map();
+        this.syncSessions = sessions;
+        if (sessions.has(namespace))
+            return;
+        if (sessions.size === 0) {
+            this.syncRun += 1;
+            this.publishSyncLifecycle('sync.started', {
+                run_id: this.syncRun,
+                source: 'pull',
+                syncing: true,
+                namespaces_pending: 1,
+                received_total: 0,
+                namespace,
+                started_at: Date.now(),
+            });
+        }
+        const session = { pages: 0, pulled: 0, startedAt: Date.now() };
+        sessions.set(namespace, session);
+    }
+    syncProgress(ns, progress = {}) {
+        const namespace = String(ns ?? '').trim();
+        if (!namespace)
+            return;
+        this.syncStarted(namespace);
+        const session = this.syncSessions?.get(namespace);
+        if (!session)
+            return;
+        const pulledCount = Math.max(0, Number(progress.pulledCount ?? progress.rawCount ?? 0) || 0);
+        const rawCount = Math.max(0, Number(progress.rawCount ?? pulledCount) || 0);
+        session.pages += 1;
+        session.pulled += pulledCount;
+        const payload = {
+            run_id: this.syncRun,
+            source: 'pull',
+            namespace,
+            page: session.pages,
+            page_pulled_count: pulledCount,
+            page_raw_count: rawCount,
+            pulled_count: session.pulled,
+            received_total: session.pulled,
+            batch_size: pulledCount,
+        };
+        if (typeof progress.remaining === 'number'
+            && Number.isSafeInteger(progress.remaining) && progress.remaining >= 0) {
+            payload.remaining = progress.remaining;
+            payload.estimated_remaining = payload.remaining;
+        }
+        if (progress.hasMore !== undefined) {
+            payload.has_more = Boolean(progress.hasMore);
+            if (progress.remaining === undefined || progress.remaining === null) {
+                payload.estimated_remaining = progress.hasMore ? undefined : 0;
+            }
+        }
+        if (progress.currentSeq !== undefined && Number.isFinite(Number(progress.currentSeq))) {
+            payload.current_seq = Math.max(0, Number(progress.currentSeq));
+        }
+        if (progress.targetSeq !== undefined && Number.isFinite(Number(progress.targetSeq))) {
+            payload.target_seq = Math.max(0, Number(progress.targetSeq));
+        }
+        this.publishSyncLifecycle('sync.progress', payload);
+    }
     onPullDrained() {
         this.flushDeliveryChanged('pull_drained');
+        this.syncStopped('pull_drained');
+    }
+    onPullAborted() {
+        this.syncStopped('aborted');
+    }
+    syncStopped(reason = 'completed') {
+        const sessions = this.syncSessions;
+        if (!sessions || sessions.size === 0)
+            return;
+        const entries = [...sessions.entries()];
+        const receivedTotal = entries.reduce((total, [, session]) => total + session.pulled, 0);
+        const payload = {
+            run_id: this.syncRun,
+            source: 'pull',
+            syncing: false,
+            namespaces_pending: 0,
+            received_total: receivedTotal,
+            reason,
+            stopped_at: Date.now(),
+        };
+        if (entries.length === 1) {
+            const [namespace, session] = entries[0];
+            payload.namespace = namespace;
+            payload.pages = session.pages;
+            payload.pulled_count = session.pulled;
+        }
+        else {
+            payload.namespaces = entries.map(([namespace]) => namespace);
+            payload.pages = entries.reduce((total, [, session]) => total + session.pages, 0);
+            payload.pulled_count = receivedTotal;
+        }
+        sessions.clear();
+        this.syncSessions = null;
+        this.publishSyncLifecycle('sync.stopped', payload);
     }
     flushDeliveryChangedContext(context, trigger) {
         if (context.generation !== this.deliveryChangedGeneration || context.changes.size === 0)
@@ -369,7 +492,7 @@ export class MessageDeliveryEngine {
         if (changes.length === 0)
             return;
         const dispatcher = this.runtime.client._dispatcher;
-        const payload = { trigger, changes };
+        const payload = { trigger, source: trigger, changes };
         const published = typeof dispatcher.enqueue === 'function'
             ? (dispatcher.enqueue('delivery.changed', payload), undefined)
             : typeof dispatcher.publishSyncAware === 'function'
@@ -527,7 +650,7 @@ export class MessageDeliveryEngine {
             return;
         }
         if (event === 'message.recalled') {
-            await this.publishMessageRecallTombstone(seq, payload);
+            await this.publishMessageRecallTombstone(seq, payload, source);
             this.ensurePullOperationCurrent();
             return;
         }
@@ -580,17 +703,27 @@ export class MessageDeliveryEngine {
         }
         return result;
     }
-    normalizePublishedMessagePayload(event, payload) {
+    normalizePublishedMessagePayload(event, payload, source = 'direct') {
         payload = this.stripInlineInternalFields(payload);
+        let normalized;
         if (this.isInstanceScopedMessageEvent(event)) {
             if (event === 'group.message_created')
                 payload = normalizeGroupMentionMode(payload);
-            return this.attachAppMessageEnvelope(this.stripInternalSenderDeviceFields(this.attachCurrentInstanceContext(payload)));
+            normalized = this.attachAppMessageEnvelope(this.stripInternalSenderDeviceFields(this.attachCurrentInstanceContext(payload)));
+        }
+        else if (this.isGroupScopedEvent(event)) {
+            normalized = this.attachAppGroupEventEnvelope(this.attachCurrentInstanceContext(payload));
         }
-        if (this.isGroupScopedEvent(event)) {
-            return this.attachAppGroupEventEnvelope(this.attachCurrentInstanceContext(payload));
+        else {
+            normalized = payload;
         }
-        return payload;
+        if (source === 'direct' || !isJsonObject(normalized))
+            return normalized;
+        const canonicalSource = source === 'group-push' || source === 'ordered' || source === 'legacy' || source === 'tail'
+            ? (source === 'tail' ? 'pull' : 'push')
+            : source === 'inline-push' || source === 'inline_push' ? 'inline_push'
+                : source === 'pending-retry' || source === 'pending_retry' ? 'pending_retry' : source;
+        return { ...normalized, source: canonicalSource };
     }
     stripInlineInternalFields(payload) {
         if (!isJsonObject(payload))
@@ -860,7 +993,7 @@ export class MessageDeliveryEngine {
             return `p2p|tombstone:${tombstoneId}`;
         return `p2p|unknown:${Date.now()}:${Math.random()}`;
     }
-    async publishMessageRecallTombstone(seq, message) {
+    async publishMessageRecallTombstone(seq, message, source = 'push') {
         const client = this.runtime.client;
         const eventPayload = this.recallEventFromMessage(message);
         if (!eventPayload)
@@ -881,7 +1014,7 @@ export class MessageDeliveryEngine {
             for (const [oldKey] of drop)
                 seen.delete(oldKey);
         }
-        await client._publishAppEvent('message.recalled', eventPayload, 'message-recall');
+        await client._publishAppEvent('message.recalled', eventPayload, source);
         client._clientLog.debug(`message.recalled published: seq=${String(seq)} ids=${JSON.stringify(eventPayload.message_ids)}`);
         return true;
     }
@@ -964,7 +1097,7 @@ export class MessageDeliveryEngine {
             return `${normalizedGroupId}|tombstone:${tombstoneId}`;
         return `${normalizedGroupId}|unknown:${Date.now()}:${Math.random()}`;
     }
-    async publishGroupRecallTombstone(groupId, seq, message) {
+    async publishGroupRecallTombstone(groupId, seq, message, source = 'push') {
         const client = this.runtime.client;
         const eventPayload = this.recallEventFromGroupMessage(message);
         if (!eventPayload)
@@ -987,7 +1120,7 @@ export class MessageDeliveryEngine {
             for (const [oldKey] of drop)
                 seen.delete(oldKey);
         }
-        await client._publishAppEvent('group.message_recalled', eventPayload, 'group-recall');
+        await client._publishAppEvent('group.message_recalled', eventPayload, source);
         client._clientLog.debug(`group.message_recalled published: group=${groupId} seq=${String(seq)} ids=${JSON.stringify(eventPayload.message_ids)}`);
         return true;
     }
@@ -1078,7 +1211,7 @@ export class MessageDeliveryEngine {
             }
         }
         const generation = this.deliveryChangedGeneration;
-        const normalized = this.normalizePublishedMessagePayload(event, payload);
+        const normalized = this.normalizePublishedMessagePayload(event, payload, source);
         const dispatcher = client._dispatcher;
         const result = typeof dispatcher.enqueue === 'function'
             ? (dispatcher.enqueue(event, normalized), undefined)
@@ -1279,7 +1412,7 @@ export class MessageDeliveryEngine {
                     _decrypt_error: String(exc),
                 };
                 client._attachV2EnvelopeMetadataFromSource(safeEvent, data);
-                Promise.resolve(client._publishAppEvent('message.undecryptable', safeEvent)).catch(() => { });
+                Promise.resolve(client._publishAppEvent('message.undecryptable', safeEvent, 'push')).catch(() => { });
             }
         });
         client._clientLog.debug(`_onRawMessageReceived exit: elapsed=${Date.now() - tStart}ms (handler dispatched)`);
@@ -1411,7 +1544,7 @@ export class MessageDeliveryEngine {
                     _decrypt_error: String(exc),
                 };
                 client._attachV2EnvelopeMetadataFromSource(safeEvent, data);
-                Promise.resolve(client._publishAppEvent('group.message_undecryptable', safeEvent)).catch(() => { });
+                Promise.resolve(client._publishAppEvent('group.message_undecryptable', safeEvent, 'push')).catch(() => { });
             }
         });
         client._clientLog.debug(`_onRawGroupMessageCreated exit: elapsed=${Date.now() - tStart}ms (handler dispatched)`);
@@ -1507,7 +1640,7 @@ export class MessageDeliveryEngine {
         const client = this.runtime.client;
         let groupId = String(notification.group_id ?? '').trim();
         if (!groupId) {
-            await client._publishAppEvent('group.message_created', notification);
+            await client._publishAppEvent('group.message_created', notification, 'push');
             return;
         }
         if (client._sessionOptions?.background_sync === false) {
@@ -1657,8 +1790,10 @@ export class MessageDeliveryEngine {
             }
         }
         client._gapFillDone.set(dedupKey, Date.now());
+        this.syncStarted(ns);
         let filled = 0;
         let continuationAfterSeq = 0;
+        let failed = false;
         try {
             let nextAfterSeq = afterSeq;
             const maxPages = singlePage ? 1 : 100;
@@ -1710,6 +1845,7 @@ export class MessageDeliveryEngine {
                 }
                 const eventSeqs = [];
                 let hasDissolvedEvent = false;
+                let publishedEventCount = 0;
                 for (const evt of eventObjects) {
                     const eventSeq = Number(evt.event_seq ?? 0);
                     if (Number.isFinite(eventSeq) && eventSeq > 0)
@@ -1729,10 +1865,12 @@ export class MessageDeliveryEngine {
                             }
                         }
                         if (Number.isFinite(eventSeq) && eventSeq > 0 && !client._pushedSeqs.get(ns)?.has(eventSeq)) {
-                            this.enqueueOrderedMessage(ns, 'group.changed', eventSeq, evt);
+                            this.enqueueOrderedMessage(ns, 'group.changed', eventSeq, evt, 'pull');
+                            publishedEventCount += 1;
                         }
                     }
-                    filled += 1;
+                    if (et !== 'group.message_created')
+                        filled += 1;
                 }
                 const ackContig = client._seqTracker.getContiguousSeq(ns);
                 await this.drainOrderedMessages(ns);
@@ -1759,6 +1897,15 @@ export class MessageDeliveryEngine {
                         client._clientLog.debug(`group event auto-ack failed: group=${groupId} ${formatDeliveryError(e)}`);
                     }
                 }
+                this.syncProgress(ns, {
+                    rawCount: eventObjects.length,
+                    pulledCount: publishedEventCount,
+                    remaining: result.remaining,
+                    hasMore: typeof result.has_more === 'boolean'
+                        ? Boolean(result.has_more) : undefined,
+                    currentSeq: ackContig,
+                    targetSeq: Math.max(Number(cursor?.latest_seq ?? 0), Number(result.latest_event_seq ?? 0)),
+                });
                 const nextAfter = Math.max(eventSeqs.length > 0 ? Math.max(...eventSeqs) : nextAfterSeq, nextAfterSeq);
                 if (singlePage && result.has_more === true && nextAfter > nextAfterSeq) {
                     continuationAfterSeq = nextAfter;
@@ -1773,6 +1920,7 @@ export class MessageDeliveryEngine {
             client._clientLog.debug(`group event gap fill done: group=${groupId}, after_seq=${afterSeq}, filled=${filled}`);
         }
         catch (exc) {
+            failed = true;
             client._clientLog.warn(`group event gap fill failed: ${formatDeliveryError(exc)}`);
         }
         finally {
@@ -1789,6 +1937,8 @@ export class MessageDeliveryEngine {
             else if (!singlePage && filled > 0 && client._seqTracker.getContiguousSeq(ns) > afterSeq) {
                 void this.fillGroupEventGap(groupId);
             }
+            if (!client._rpcPipeline)
+                this.syncStopped(failed ? 'aborted' : 'pull_drained');
         }
     }
     enqueueOnlineUnreadEventHint(data) {
@@ -3628,18 +3778,18 @@ export class MessageDeliveryEngine {
         }
         return true;
     }
-    async publishPulledMessage(event, ns, seq, payload, persist = true) {
+    async publishPulledMessage(event, ns, seq, payload, persist = true, source = 'pull') {
         const client = this.runtime.client;
         this.ensurePullOperationCurrent();
         const seqNum = Number(seq);
         if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0 || !ns) {
             client._clientLog.debug(`publish pulled direct(no-seq): event=${event}, ns=${ns || '<none>'}, seq=${String(seq)}`);
             if (event === 'message.recalled') {
-                const published = await this.publishMessageRecallTombstone(seq, payload);
+                const published = await this.publishMessageRecallTombstone(seq, payload, source);
                 this.ensurePullOperationCurrent();
                 return published;
             }
-            const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, 'pull'));
+            const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source));
             if (isPromiseLike(published))
                 await published;
             this.ensurePullOperationCurrent();
@@ -3653,27 +3803,27 @@ export class MessageDeliveryEngine {
                 client._pendingOrderedMsgs.delete(ns);
             return false;
         }
-        await this.drainOrderedMessages(ns, seqNum, true, persist, 'pull');
+        await this.drainOrderedMessages(ns, seqNum, true, persist, source);
         this.ensurePullOperationCurrent();
         queue?.delete(seqNum);
         if (queue && queue.size === 0)
             client._pendingOrderedMsgs.delete(ns);
         if (event === 'message.recalled') {
-            const recallPublished = await this.publishMessageRecallTombstone(seqNum, payload);
+            const recallPublished = await this.publishMessageRecallTombstone(seqNum, payload, source);
             this.ensurePullOperationCurrent();
             this.markPublishedSeq(ns, seqNum);
             client._clientLog.debug(`publish pulled delivered: event=${event}, ns=${ns}, seq=${seqNum}`);
-            await this.drainOrderedMessages(ns, undefined, true, persist, 'pull');
+            await this.drainOrderedMessages(ns, undefined, true, persist, source);
             this.ensurePullOperationCurrent();
             return recallPublished;
         }
-        const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, 'pull'));
+        const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source));
         if (isPromiseLike(published))
             await published;
         this.ensurePullOperationCurrent();
         this.markPublishedSeq(ns, seqNum);
         client._clientLog.debug(`publish pulled delivered: event=${event}, ns=${ns}, seq=${seqNum}`);
-        await this.drainOrderedMessages(ns, undefined, true, persist, 'pull');
+        await this.drainOrderedMessages(ns, undefined, true, persist, source);
         this.ensurePullOperationCurrent();
         return true;
     }