@agentunion/fastaun-browser 0.5.9 → 0.5.10

package/dist/client/delivery.d.ts

@@ -1,12 +1,20 @@
 import type { EventPayload } from '../events.js';
 import { type JsonObject, type Message, type RpcParams } from '../types.js';
 import type { ClientRuntime } from './runtime.js';
+export type DeliveryChangeBatch = {
+    generation: number;
+    trigger: 'push' | 'inline_push';
+    changes: Map<string, number>;
+    closed: boolean;
+};
 type GroupEventGapOptions = {
     afterSeq?: number;
     singlePage?: boolean;
 };
 export declare class MessageDeliveryEngine {
     private readonly runtime;
+    private pendingPullDeliveryChanges;
+    private deliveryGeneration;
     private realtimeTailResults;
     private realtimeSyncing;
     private pendingP2pPullUpper;
@@ -22,7 +30,7 @@ export declare class MessageDeliveryEngine {
     private seqTrackerWriteChain;
     constructor(runtime: ClientRuntime);
     resetInlineAckState(): void;
-    private isInlineGenerationCurrent;
+    isInlineGenerationCurrent(generation: number): boolean;
     private isPullOperationCurrent;
     private ensurePullOperationCurrent;
     captureInlineGeneration(): number;
@@ -30,6 +38,14 @@ export declare class MessageDeliveryEngine {
     private endRealtimeSync;
     hasPendingPull(ns: string): boolean;
     onPullGateIdle(ns: string): void;
+    onPullWorkSettled(): void;
+    private deliveryChangeNamespace;
+    private isDeliverableMessageBody;
+    private recordDeliveryChange;
+    private deliveryChangesPayload;
+    private createDeliveryChangeBatch;
+    private flushRealtimeDeliveryChanges;
+    private flushPullDeliveryChanges;
     private recordPendingPull;
     private consumePendingPull;
     private markPendingPullNoProgress;
@@ -70,9 +86,9 @@ export declare class MessageDeliveryEngine {
         rawCount: number;
         publishedCount: number;
     }>;
-    enqueueOrderedMessage(ns: string, event: string, seq: number, payload: EventPayload): void;
+    enqueueOrderedMessage(ns: string, event: string, seq: number, payload: EventPayload, source?: string): void;
     isGroupEventNamespace(ns: string): boolean;
-    publishOrderedQueueItem(ns: string, event: string, seq: number, payload: EventPayload, pullResponse?: boolean): Promise<void>;
+    publishOrderedQueueItem(ns: string, event: string, seq: number, payload: EventPayload, pullResponse?: boolean, source?: string, batch?: DeliveryChangeBatch): Promise<void>;
     publishOrderedGroupChanged(payload: EventPayload): Promise<void>;
     isInstanceScopedMessageEvent(event: string): boolean;
     attachCurrentInstanceContext(payload: EventPayload): EventPayload;
@@ -98,7 +114,7 @@ export declare class MessageDeliveryEngine {
     groupRecallDedupKey(groupId: string, payload: JsonObject): string;
     publishGroupRecallTombstone(groupId: string, seq: unknown, message: EventPayload): Promise<boolean>;
     onRawGroupMessageRecalled(data: EventPayload): Promise<void>;
-    publishAppEvent(event: string, payload: EventPayload): Promise<void>;
+    publishAppEvent(event: string, payload: EventPayload, source?: string, ns?: string, batch?: DeliveryChangeBatch): Promise<void>;
     messageTargetsCurrentInstance(message: EventPayload): boolean;
     private strictTargetString;
     runPushProcessSerialized(ns: string, operation: () => Promise<void>, inlineGeneration?: number): Promise<void>;
@@ -171,9 +187,9 @@ export declare class MessageDeliveryEngine {
     persistRepairedSeq(ns: string): void;
     clampAckSeq(method: string, field: string, ns: string, seq: number): number;
     clampAckParams(method: string, params: RpcParams): RpcParams;
-    drainOrderedMessages(ns: string, beforeSeq?: number, pullResponse?: boolean, persist?: boolean): Promise<void>;
-    publishOrderedMessage(event: string, ns: string, seq: unknown, payload: EventPayload): Promise<boolean>;
-    publishPulledMessage(event: string, ns: string, seq: unknown, payload: EventPayload, persist?: boolean): Promise<boolean>;
+    drainOrderedMessages(ns: string, beforeSeq?: number, pullResponse?: boolean, persist?: boolean, batch?: DeliveryChangeBatch, source?: string): Promise<void>;
+    publishOrderedMessage(event: string, ns: string, seq: unknown, payload: EventPayload, source?: string, operationBatch?: DeliveryChangeBatch): Promise<boolean>;
+    publishPulledMessage(event: string, ns: string, seq: unknown, payload: EventPayload, persist?: boolean, source?: string, operationBatch?: DeliveryChangeBatch): Promise<boolean>;
 }
 export {};
 //# sourceMappingURL=delivery.d.ts.map

package/dist/client/delivery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delivery.d.ts","sourceRoot":"","sources":["../../src/client/delivery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"delivery.d.ts","sourceRoot":"","sources":["../../src/client/delivery.ts"],"names":[],"mappings":"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"}

package/dist/client/delivery.js

@@ -1,4 +1,5 @@
 import { slotIsolationKey } from '../config.js';
+import { normalizeGroupAid } from '../group-id.js';
 import { ConnectionState, isJsonObject } from '../types.js';
 import { hasGroupMentionModeField, normalizeGroupMentionMode } from './mention-mode.js';
 const PUSHED_SEQS_LIMIT = 50_000;
@@ -94,6 +95,8 @@ function p2pAppEventFromPlainPullMessage(message) {
 }
 export class MessageDeliveryEngine {
     runtime;
+    pendingPullDeliveryChanges = null;
+    deliveryGeneration = 0;
     realtimeTailResults = null;
     realtimeSyncing = null;
     pendingP2pPullUpper = null;
@@ -114,6 +117,8 @@ export class MessageDeliveryEngine {
     }
     resetInlineAckState() {
         this.inlineGeneration += 1;
+        this.deliveryGeneration += 1;
+        this.pendingPullDeliveryChanges = null;
         void this.runtime.client._rpcPipeline?.invalidatePulls?.();
         this.realtimeSyncing = null;
         this.pendingP2pPullUpper = null;
@@ -167,6 +172,85 @@ export class MessageDeliveryEngine {
             return;
         this.schedulePendingPullIfNeeded(ns, 'pull-gate-idle');
     }
+    onPullWorkSettled() {
+        const pipeline = this.runtime.client._rpcPipeline;
+        if (pipeline?.hasAnyPullActivity?.() === true)
+            return;
+        void this.flushPullDeliveryChanges();
+    }
+    deliveryChangeNamespace(event, payload, ns = '') {
+        if (event === 'message.received')
+            return 'p2p';
+        if (event !== 'group.message_created')
+            return '';
+        if (!isJsonObject(payload))
+            return '';
+        const aid = String(this.runtime.client._aid ?? '').trim().toLowerCase();
+        const dot = aid.indexOf('.');
+        const localIssuer = dot > 0 ? aid.slice(dot + 1) : '';
+        const fallback = ns.startsWith('group:') ? ns.slice('group:'.length) : '';
+        const groupAid = normalizeGroupAid(payload.group_aid ?? payload.group_id ?? fallback, { localIssuer });
+        return groupAid.includes('.') ? `group:${groupAid}` : '';
+    }
+    isDeliverableMessageBody(event, payload) {
+        if ((event !== 'message.received' && event !== 'group.message_created') || !isJsonObject(payload))
+            return false;
+        const messageId = typeof payload.message_id === 'string' && payload.message_id.trim().length > 0;
+        const seq = typeof payload.seq === 'number' && Number.isSafeInteger(payload.seq) && payload.seq > 0;
+        return messageId || seq;
+    }
+    recordDeliveryChange(changes, event, payload, ns, generation) {
+        if (generation !== this.deliveryGeneration || !this.isDeliverableMessageBody(event, payload))
+            return;
+        const namespace = this.deliveryChangeNamespace(event, payload, ns);
+        if (!namespace)
+            return;
+        changes.set(namespace, (changes.get(namespace) ?? 0) + 1);
+    }
+    deliveryChangesPayload(changes) {
+        return [...changes.entries()]
+            .filter(([, deliveredCount]) => deliveredCount > 0)
+            .sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0)
+            .map(([namespace, deliveredCount]) => ({ namespace, delivered_count: deliveredCount }));
+    }
+    createDeliveryChangeBatch(trigger) {
+        return { generation: this.deliveryGeneration, trigger, changes: new Map(), closed: false };
+    }
+    async flushRealtimeDeliveryChanges(batch) {
+        if (batch.closed)
+            return;
+        batch.closed = true;
+        if (batch.generation !== this.deliveryGeneration)
+            return;
+        if (this.deliveryChangesPayload(batch.changes).length === 0)
+            return;
+        const pendingPull = this.pendingPullDeliveryChanges;
+        this.pendingPullDeliveryChanges = null;
+        if (pendingPull) {
+            for (const [namespace, count] of pendingPull) {
+                batch.changes.set(namespace, (batch.changes.get(namespace) ?? 0) + count);
+            }
+        }
+        if (batch.generation !== this.deliveryGeneration)
+            return;
+        const changes = this.deliveryChangesPayload(batch.changes);
+        if (changes.length === 0)
+            return;
+        this.runtime.client._dispatcher.enqueue('delivery.changed', { trigger: batch.trigger, changes });
+    }
+    async flushPullDeliveryChanges() {
+        const generation = this.deliveryGeneration;
+        const pending = this.pendingPullDeliveryChanges;
+        if (!pending || pending.size === 0 || generation !== this.deliveryGeneration)
+            return;
+        this.pendingPullDeliveryChanges = null;
+        if (generation !== this.deliveryGeneration)
+            return;
+        const changes = this.deliveryChangesPayload(pending);
+        if (changes.length === 0)
+            return;
+        this.runtime.client._dispatcher.enqueue('delivery.changed', { trigger: 'pull_drained', changes });
+    }
     recordPendingPull(ns, seq) {
         if (!ns || !Number.isSafeInteger(seq) || seq <= 0)
             return;
@@ -837,14 +921,14 @@ export class MessageDeliveryEngine {
         }
         return { rawCount: messages.length, publishedCount };
     }
-    enqueueOrderedMessage(ns, event, seq, payload) {
+    enqueueOrderedMessage(ns, event, seq, payload, source = 'push') {
         const client = this.runtime.client;
         let queue = client._pendingOrderedMsgs.get(ns);
         if (!queue) {
             queue = new Map();
             client._pendingOrderedMsgs.set(ns, queue);
         }
-        queue.set(seq, { event, payload });
+        queue.set(seq, { event, payload, source });
         if (queue.size > PENDING_ORDERED_LIMIT) {
             const drop = [...queue.keys()].sort((a, b) => a - b).slice(0, queue.size - PENDING_ORDERED_LIMIT);
             for (const oldSeq of drop)
@@ -854,7 +938,7 @@ export class MessageDeliveryEngine {
     isGroupEventNamespace(ns) {
         return ns.startsWith('group_event:');
     }
-    async publishOrderedQueueItem(ns, event, seq, payload, pullResponse = false) {
+    async publishOrderedQueueItem(ns, event, seq, payload, pullResponse = false, source = 'push', batch) {
         const client = this.runtime.client;
         if (event === 'group.changed' && this.isGroupEventNamespace(ns)) {
             await this.publishOrderedGroupChanged(payload);
@@ -865,10 +949,10 @@ export class MessageDeliveryEngine {
             return;
         }
         if (pullResponse) {
-            await client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload));
+            await client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source, ns, batch));
             return;
         }
-        await client._publishAppEvent(event, payload);
+        await client._publishAppEvent(event, payload, source, ns, batch);
     }
     async publishOrderedGroupChanged(payload) {
         const client = this.runtime.client;
@@ -1043,6 +1127,7 @@ export class MessageDeliveryEngine {
         setIfPresent('type', firstValue(body.type, params.type, params.message_type, params.payload_type));
         setIfPresent('kind', firstValue(body.kind, params.kind));
         setIfPresent('version', firstValue(body.version, params.version));
+        setIfPresent('message_id', firstValue(params.message_id, body.message_id, resultObj.message_id));
         setIfPresent('timestamp', firstValue(params.timestamp, resultObj.timestamp, resultObj.created_at, resultObj.t_server, Date.now()));
         envelope.encrypted = Boolean(encrypted);
         const context = this.envelopeMetadata(params.context);
@@ -1385,8 +1470,9 @@ export class MessageDeliveryEngine {
         if (contig !== contigBefore)
             this.persistSeq(ns);
     }
-    async publishAppEvent(event, payload) {
+    async publishAppEvent(event, payload, source = '', ns = '', batch) {
         const client = this.runtime.client;
+        const generation = this.deliveryGeneration;
         if ((event === 'message.received' || event === 'group.message_created') && isJsonObject(payload)) {
             client._maybeAppendEchoTraceReceive(payload);
         }
@@ -1406,7 +1492,25 @@ export class MessageDeliveryEngine {
                 client._clientLog.debug(`agent_md etag inject skipped: ${String(exc)}`);
             }
         }
-        await client._dispatcher.publish(event, this.normalizePublishedMessagePayload(event, payload));
+        client._dispatcher.enqueue(event, this.normalizePublishedMessagePayload(event, payload));
+        if (generation !== this.deliveryGeneration)
+            return;
+        if (source !== 'pull' && source !== 'tail' && source !== 'pending_retry'
+            && source !== 'push' && source !== 'inline_push')
+            return;
+        if (source === 'push' || source === 'inline_push') {
+            const localBatch = batch ?? this.createDeliveryChangeBatch(source);
+            this.recordDeliveryChange(localBatch.changes, event, payload, ns, generation);
+            if (!batch)
+                await this.flushRealtimeDeliveryChanges(localBatch);
+        }
+        else {
+            const changes = this.pendingPullDeliveryChanges ?? new Map();
+            this.pendingPullDeliveryChanges = changes;
+            this.recordDeliveryChange(changes, event, payload, ns, generation);
+            if (client._rpcPipeline?.hasAnyPullActivity?.() !== true)
+                await this.flushPullDeliveryChanges();
+        }
     }
     messageTargetsCurrentInstance(message) {
         if (!isJsonObject(message))
@@ -1562,7 +1666,7 @@ export class MessageDeliveryEngine {
         const client = this.runtime.client;
         try {
             if (!isJsonObject(data)) {
-                await client._publishAppEvent('message.received', data);
+                await client._publishAppEvent('message.received', data, 'push');
                 return;
             }
             const msg = { ...data };
@@ -1614,7 +1718,7 @@ export class MessageDeliveryEngine {
                     await client._publishEncryptedPushMessage('message.received', 'message.undecryptable', '', seq ?? 0, msg, false);
                     return;
                 }
-                await client._publishAppEvent('message.received', msg);
+                await client._publishAppEvent('message.received', msg, 'push');
             }
         }
         catch (exc) {
@@ -1658,7 +1762,7 @@ export class MessageDeliveryEngine {
         const client = this.runtime.client;
         try {
             if (!isJsonObject(data)) {
-                await client._publishAppEvent('group.message_created', data);
+                await client._publishAppEvent('group.message_created', data, 'push');
                 return;
             }
             const msg = { ...data };
@@ -1737,7 +1841,7 @@ export class MessageDeliveryEngine {
                     await client._publishEncryptedPushMessage('group.message_created', 'group.message_undecryptable', '', seq ?? 0, msg, true);
                     return;
                 }
-                await client._publishAppEvent('group.message_created', msg);
+                await client._publishAppEvent('group.message_created', msg, 'push');
             }
         }
         catch (exc) {
@@ -1821,12 +1925,15 @@ export class MessageDeliveryEngine {
             return;
         const delayMs = Math.min(P2P_GAP_FILL_RETRY_BASE_MS * retryAttempt, P2P_GAP_FILL_RETRY_MAX_MS);
         client._gapFillDone.add(retryKey);
+        const releasePullWork = client._rpcPipeline?.reservePullWork?.() ?? (() => { });
         client._clientLog.debug(`P2P message gap-fill retry scheduled: ns=${ns} attempt=${retryAttempt} delay_ms=${delayMs}`);
         globalThis.setTimeout(() => {
             client._gapFillDone.delete(retryKey);
-            if (client.state !== ConnectionState.READY || client._closing)
+            if (client.state !== ConnectionState.READY || client._closing) {
+                releasePullWork();
                 return;
-            client._safeAsync(this.fillP2pGap(retryAttempt));
+            }
+            client._safeAsync(this.fillP2pGap(retryAttempt).finally(releasePullWork));
         }, delayMs);
     }
     async fillP2pGap(retryAttempt = 0) {
@@ -2527,7 +2634,7 @@ export class MessageDeliveryEngine {
             ? tracker.snapshotNamespace(ns)
             : null;
         try {
-            const published = await this.publishPulledMessage(event, ns, seq, payload);
+            const published = await this.publishPulledMessage(event, ns, seq, payload, true, 'inline_push');
             if (!this.isInlineGenerationCurrent(generation))
                 return false;
             if (!published)
@@ -3107,13 +3214,13 @@ export class MessageDeliveryEngine {
             }
         }
         catch (exc) {
-            client._dispatcher.publish('seq_tracker.persist_error', {
+            client._dispatcher.enqueue('seq_tracker.persist_error', {
                 phase: 'restore',
                 aid,
                 device_id: deviceId,
                 slot_id: slotId,
                 error: String(exc),
-            }).catch(() => { });
+            });
         }
     }
     async migrateSeqStateGroupIds(state) {
@@ -3321,13 +3428,13 @@ export class MessageDeliveryEngine {
         catch (exc) {
             const error = formatDeliveryError(exc);
             client._clientLog.warn(`save SeqTracker state failed: ${error}`);
-            client._dispatcher.publish('seq_tracker.persist_error', {
+            client._dispatcher.enqueue('seq_tracker.persist_error', {
                 phase: 'save',
                 aid,
                 device_id: deviceId,
                 slot_id: slotId,
                 error: String(error),
-            }).catch(() => { });
+            });
             if (throwOnError)
                 throw exc;
         }
@@ -3446,7 +3553,7 @@ export class MessageDeliveryEngine {
         }
         return params;
     }
-    async drainOrderedMessages(ns, beforeSeq, pullResponse = false, persist = true) {
+    async drainOrderedMessages(ns, beforeSeq, pullResponse = false, persist = true, batch, source = 'pull') {
         const client = this.runtime.client;
         this.ensurePullOperationCurrent();
         const queue = client._pendingOrderedMsgs.get(ns);
@@ -3457,16 +3564,34 @@ export class MessageDeliveryEngine {
             .filter((seq) => seq <= contig && (beforeSeq === undefined || seq < beforeSeq))
             .sort((a, b) => a - b);
         let delivered = false;
-        for (const seq of ready) {
-            this.ensurePullOperationCurrent();
-            const item = queue.get(seq);
-            queue.delete(seq);
-            if (!item || client._pushedSeqs.get(ns)?.has(seq))
-                continue;
-            await this.publishOrderedQueueItem(ns, item.event, seq, item.payload, pullResponse);
-            this.ensurePullOperationCurrent();
-            this.markPublishedSeq(ns, seq);
-            delivered = true;
+        const drainBatches = new Map();
+        try {
+            for (const seq of ready) {
+                this.ensurePullOperationCurrent();
+                const item = queue.get(seq);
+                queue.delete(seq);
+                if (!item || client._pushedSeqs.get(ns)?.has(seq))
+                    continue;
+                const itemSource = item.source ?? source;
+                let itemBatch = batch;
+                if ((itemSource === 'push' || itemSource === 'inline_push')
+                    && (!batch || batch.trigger !== itemSource)) {
+                    itemBatch = drainBatches.get(itemSource);
+                    if (!itemBatch) {
+                        itemBatch = this.createDeliveryChangeBatch(itemSource);
+                        drainBatches.set(itemSource, itemBatch);
+                    }
+                }
+                await this.publishOrderedQueueItem(ns, item.event, seq, item.payload, pullResponse, itemSource, itemBatch);
+                this.ensurePullOperationCurrent();
+                this.markPublishedSeq(ns, seq);
+                delivered = true;
+            }
+        }
+        finally {
+            for (const drainBatch of drainBatches.values()) {
+                await this.flushRealtimeDeliveryChanges(drainBatch);
+            }
         }
         if (queue.size === 0) {
             client._pendingOrderedMsgs.delete(ns);
@@ -3476,75 +3601,91 @@ export class MessageDeliveryEngine {
             }
         }
     }
-    async publishOrderedMessage(event, ns, seq, payload) {
+    async publishOrderedMessage(event, ns, seq, payload, source = 'push', operationBatch) {
         const client = this.runtime.client;
-        const seqNum = Number(seq);
-        if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0) {
-            await this.publishOrderedQueueItem(ns, event, seqNum, payload);
-            return true;
-        }
-        if (client._pushedSeqs.get(ns)?.has(seqNum)) {
+        const ownsBatch = !operationBatch && (source === 'push' || source === 'inline_push');
+        const batch = operationBatch ?? (ownsBatch ? this.createDeliveryChangeBatch(source) : undefined);
+        try {
+            const seqNum = Number(seq);
+            if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0) {
+                await this.publishOrderedQueueItem(ns, event, seqNum, payload, false, source, batch);
+                return true;
+            }
+            if (client._pushedSeqs.get(ns)?.has(seqNum)) {
+                const queue = client._pendingOrderedMsgs.get(ns);
+                queue?.delete(seqNum);
+                if (queue && queue.size === 0)
+                    client._pendingOrderedMsgs.delete(ns);
+                return false;
+            }
+            const contig = client._seqTracker.getContiguousSeq(ns);
+            if (seqNum > contig) {
+                this.enqueueOrderedMessage(ns, event, seqNum, payload, source);
+                return false;
+            }
+            await this.drainOrderedMessages(ns, seqNum, true, true, batch, source);
+            if (client._pushedSeqs.get(ns)?.has(seqNum))
+                return false;
             const queue = client._pendingOrderedMsgs.get(ns);
             queue?.delete(seqNum);
             if (queue && queue.size === 0)
                 client._pendingOrderedMsgs.delete(ns);
-            return false;
+            await this.publishOrderedQueueItem(ns, event, seqNum, payload, false, source, batch);
+            this.markPublishedSeq(ns, seqNum);
+            await this.drainOrderedMessages(ns, undefined, false, true, batch, source);
+            if (!client._pendingOrderedMsgs.get(ns))
+                await this.saveSeqTrackerState();
+            return true;
         }
-        const contig = client._seqTracker.getContiguousSeq(ns);
-        if (seqNum > contig) {
-            this.enqueueOrderedMessage(ns, event, seqNum, payload);
-            return false;
+        finally {
+            if (ownsBatch && batch)
+                await this.flushRealtimeDeliveryChanges(batch);
         }
-        await this.drainOrderedMessages(ns, seqNum, true);
-        if (client._pushedSeqs.get(ns)?.has(seqNum))
-            return false;
-        const queue = client._pendingOrderedMsgs.get(ns);
-        queue?.delete(seqNum);
-        if (queue && queue.size === 0)
-            client._pendingOrderedMsgs.delete(ns);
-        await this.publishOrderedQueueItem(ns, event, seqNum, payload);
-        this.markPublishedSeq(ns, seqNum);
-        await this.drainOrderedMessages(ns);
-        if (!client._pendingOrderedMsgs.get(ns))
-            await this.saveSeqTrackerState();
-        return true;
     }
-    async publishPulledMessage(event, ns, seq, payload, persist = true) {
+    async publishPulledMessage(event, ns, seq, payload, persist = true, source = 'pull', operationBatch) {
         const client = this.runtime.client;
-        this.ensurePullOperationCurrent();
-        const seqNum = Number(seq);
-        if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0 || !ns) {
-            if (event === 'message.recalled') {
-                const published = await client._withPullResponseProcessing(ns, () => this.publishMessageRecallTombstone(seq, payload));
+        const ownsBatch = !operationBatch && (source === 'push' || source === 'inline_push');
+        const batch = operationBatch ?? (ownsBatch ? this.createDeliveryChangeBatch(source) : undefined);
+        try {
+            this.ensurePullOperationCurrent();
+            const seqNum = Number(seq);
+            if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0 || !ns) {
+                if (event === 'message.recalled') {
+                    const published = await client._withPullResponseProcessing(ns, () => this.publishMessageRecallTombstone(seq, payload));
+                    this.ensurePullOperationCurrent();
+                    return published;
+                }
+                await client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source, ns, batch));
                 this.ensurePullOperationCurrent();
-                return published;
+                return true;
+            }
+            const queue = client._pendingOrderedMsgs.get(ns);
+            if (client._pushedSeqs.get(ns)?.has(seqNum)) {
+                queue?.delete(seqNum);
+                if (queue && queue.size === 0)
+                    client._pendingOrderedMsgs.delete(ns);
+                return false;
             }
-            await client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload));
+            await this.drainOrderedMessages(ns, seqNum, false, persist, batch, source);
             this.ensurePullOperationCurrent();
-            return true;
-        }
-        const queue = client._pendingOrderedMsgs.get(ns);
-        if (client._pushedSeqs.get(ns)?.has(seqNum)) {
             queue?.delete(seqNum);
             if (queue && queue.size === 0)
                 client._pendingOrderedMsgs.delete(ns);
-            return false;
-        }
-        await this.drainOrderedMessages(ns, seqNum, false, persist);
-        this.ensurePullOperationCurrent();
-        queue?.delete(seqNum);
-        if (queue && queue.size === 0)
-            client._pendingOrderedMsgs.delete(ns);
-        if (event === 'message.recalled') {
-            const published = await client._withPullResponseProcessing(ns, () => this.publishMessageRecallTombstone(seqNum, payload));
+            if (event === 'message.recalled') {
+                const published = await client._withPullResponseProcessing(ns, () => this.publishMessageRecallTombstone(seqNum, payload));
+                this.ensurePullOperationCurrent();
+                this.markPublishedSeq(ns, seqNum);
+                return published;
+            }
+            await client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source, ns, batch));
             this.ensurePullOperationCurrent();
             this.markPublishedSeq(ns, seqNum);
-            return published;
+            return true;
+        }
+        finally {
+            if (ownsBatch && batch)
+                await this.flushRealtimeDeliveryChanges(batch);
         }
-        await client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload));
-        this.ensurePullOperationCurrent();
-        this.markPublishedSeq(ns, seqNum);
-        return true;
     }
 }
 //# sourceMappingURL=delivery.js.map