@agentunion/fastaun 0.5.13 → 0.5.14

package/dist/client/delivery.d.ts

@@ -25,6 +25,7 @@ export declare class MessageDeliveryEngine {
     constructor(runtime: ClientRuntime);
     private isPullOperationCurrent;
     private ensurePullOperationCurrent;
+    private isPullScopedSource;
     private forwardCoordinator;
     private confirmPlainForwardAck;
     commitPlainForwardPage(ns: string, afterSeq: number, method: 'message.pull' | 'group.pull', result: unknown, groupId?: string): Promise<{

package/dist/client/delivery.js

@@ -91,20 +91,19 @@ export class MessageDeliveryEngine {
     constructor(runtime) {
         this.runtime = runtime;
     }
-    isPullOperationCurrent() {
-        const client = this.runtime.client;
-        const generation = client._pullOperationGeneration;
-        if (generation === undefined)
-            return true;
-        const pipeline = client._rpcPipeline;
-        return typeof pipeline?.isPullGenerationCurrent === 'function'
-            ? pipeline.isPullGenerationCurrent(generation)
+    isPullOperationCurrent(namespace = '') {
+        const pipeline = this.runtime.client._rpcPipeline;
+        return typeof pipeline?.isPullNamespaceCurrent === 'function'
+            ? pipeline.isPullNamespaceCurrent(namespace)
             : true;
     }
-    ensurePullOperationCurrent() {
-        if (!this.isPullOperationCurrent())
+    ensurePullOperationCurrent(namespace = '') {
+        if (!this.isPullOperationCurrent(namespace))
             throw new Error('pull invalidated');
     }
+    isPullScopedSource(source) {
+        return source === 'pull';
+    }
     forwardCoordinator() {
         const coordinator = this.runtime.client._v2E2EE;
         if (!coordinator
@@ -120,7 +119,7 @@ export class MessageDeliveryEngine {
     }
     async confirmPlainForwardAck(ns, method, ackSeq, groupId = '') {
         const client = this.runtime.client;
-        this.ensurePullOperationCurrent();
+        this.ensurePullOperationCurrent(ns);
         const coordinator = this.forwardCoordinator();
         const generation = this.captureInlineAckGeneration();
         coordinator.recordForwardAck(ns, ackSeq);
@@ -139,7 +138,7 @@ export class MessageDeliveryEngine {
                 _rpc_background: true,
             };
         const result = await client._rpcPipeline.rawCall(method, params, { background: true });
-        this.ensurePullOperationCurrent();
+        this.ensurePullOperationCurrent(ns);
         const actualAckSeq = this.resolveForwardAckSeq(result, ackSeq);
         if (actualAckSeq < ackSeq) {
             throw new Error(`${method} server ACK watermark ${actualAckSeq} is below requested ${ackSeq}`);
@@ -157,7 +156,7 @@ export class MessageDeliveryEngine {
             throw new Error(`${method} response must be an object`);
         }
         const client = this.runtime.client;
-        this.ensurePullOperationCurrent();
+        this.ensurePullOperationCurrent(ns);
         this.syncStarted(ns);
         const response = result;
         const messages = deduplicatePlainForwardPageMessages(response.messages, afterSeq);
@@ -189,20 +188,20 @@ export class MessageDeliveryEngine {
         let committed = false;
         try {
             for (const rawMessage of messages) {
-                this.ensurePullOperationCurrent();
+                this.ensurePullOperationCurrent(ns);
                 const seq = positiveSafeSequenceHint(rawMessage.seq);
                 if (method === 'message.pull') {
                     const appEvent = this.p2pAppEventForMessage(rawMessage);
                     if (await this.publishPulledMessage(appEvent.event, ns, seq, appEvent.payload, false)) {
                         publishedCount += 1;
                     }
-                    this.ensurePullOperationCurrent();
+                    this.ensurePullOperationCurrent(ns);
                     continue;
                 }
                 const message = normalizeGroupMentionMode(rawMessage);
                 if (this.recallEventFromGroupMessage(message)) {
                     if (await this.publishGroupRecallTombstone(groupId, seq, message, 'pull')) {
-                        this.ensurePullOperationCurrent();
+                        this.ensurePullOperationCurrent(ns);
                         this.markPublishedSeq(ns, seq);
                         publishedCount += 1;
                     }
@@ -211,11 +210,11 @@ export class MessageDeliveryEngine {
                     this.markPublishedSeq(ns, seq);
                 }
                 else if (await this.publishPulledMessage('group.message_created', ns, seq, message, false)) {
-                    this.ensurePullOperationCurrent();
+                    this.ensurePullOperationCurrent(ns);
                     publishedCount += 1;
                 }
             }
-            this.ensurePullOperationCurrent();
+            this.ensurePullOperationCurrent(ns);
             client._seqTracker.onPullResult(ns, messages, afterSeq, Number.isSafeInteger(result.contiguous_seq)
                 ? result.contiguous_seq
                 : undefined);
@@ -224,21 +223,21 @@ export class MessageDeliveryEngine {
                 client._seqTracker.forceContiguousSeq(ns, commitTarget);
             }
             if (client._seqTracker.getContiguousSeq(ns) !== pageContigBefore) {
-                this.ensurePullOperationCurrent();
+                this.ensurePullOperationCurrent(ns);
                 await this.drainOrderedMessages(ns, undefined, false, false, 'pull');
-                this.ensurePullOperationCurrent();
+                this.ensurePullOperationCurrent(ns);
                 await client._commitSeqTrackerState(ns);
             }
             committed = true;
         }
         catch (exc) {
-            if (this.isPullOperationCurrent() && !committed && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
+            if (this.isPullOperationCurrent(ns) && !committed && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
                 client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
                 this.dropSeqTrackerPending(ns);
             }
             throw exc;
         }
-        this.ensurePullOperationCurrent();
+        this.ensurePullOperationCurrent(ns);
         const committedAck = client._seqTracker.getContiguousSeq(ns);
         if (deferredServerCursor > 0 && committedAck >= deferredServerCursor) {
             coordinator.clearForwardCursor(ns, committedAck);
@@ -269,7 +268,7 @@ export class MessageDeliveryEngine {
             if (clampedAckSeq < pendingAckSeq) {
                 throw new Error(`${ackMethod} cannot confirm pending Forward watermark ${pendingAckSeq}`);
             }
-            this.ensurePullOperationCurrent();
+            this.ensurePullOperationCurrent(ns);
             await this.confirmPlainForwardAck(ns, ackMethod, pendingAckSeq, groupId);
         }
         this.syncProgress(ns, {
@@ -654,15 +653,19 @@ export class MessageDeliveryEngine {
     }
     async publishOrderedQueueItem(ns, event, seq, payload, source, pullResponse = false, deliveryContext) {
         const client = this.runtime.client;
-        this.ensurePullOperationCurrent();
+        const pullScoped = this.isPullScopedSource(source);
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         if (event === 'group.changed' && this.isGroupEventNamespace(ns)) {
             await this.publishOrderedGroupChanged(payload, source);
-            this.ensurePullOperationCurrent();
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             return;
         }
         if (event === 'message.recalled') {
             await this.publishMessageRecallTombstone(seq, payload, source);
-            this.ensurePullOperationCurrent();
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             return;
         }
         if (pullResponse) {
@@ -675,7 +678,8 @@ export class MessageDeliveryEngine {
             if (isPromiseLike(published))
                 await published;
         }
-        this.ensurePullOperationCurrent();
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
     }
     async publishOrderedGroupChanged(payload, source = 'ordered') {
         const client = this.runtime.client;
@@ -3489,7 +3493,9 @@ export class MessageDeliveryEngine {
     }
     async drainOrderedMessages(ns, beforeSeq, pullResponse = false, persist = true, source = 'push', context) {
         const client = this.runtime.client;
-        this.ensurePullOperationCurrent();
+        const pullScoped = this.isPullScopedSource(source);
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         const queue = client._pendingOrderedMsgs.get(ns);
         if (!queue || queue.size === 0)
             return;
@@ -3498,7 +3504,8 @@ export class MessageDeliveryEngine {
         const drainContexts = new Map();
         try {
             while (true) {
-                this.ensurePullOperationCurrent();
+                if (pullScoped)
+                    this.ensurePullOperationCurrent(ns);
                 const contig = client._seqTracker.getContiguousSeq(ns);
                 const ready = [...queue.keys()]
                     .filter((seq) => seq <= contig && (beforeSeq === undefined || seq < beforeSeq))
@@ -3536,7 +3543,8 @@ export class MessageDeliveryEngine {
                     }
                 }
                 await this.publishOrderedQueueItem(ns, item.event, seq, item.payload, itemSource, pullResponse, itemContext);
-                this.ensurePullOperationCurrent();
+                if (pullScoped)
+                    this.ensurePullOperationCurrent(ns);
                 this.markPublishedSeq(ns, seq);
                 client._markOrderedSeqDelivered(ns, seq);
                 delivered = true;
@@ -3552,7 +3560,8 @@ export class MessageDeliveryEngine {
         if (queue.size === 0) {
             client._pendingOrderedMsgs.delete(ns);
             if (delivered && persist) {
-                this.ensurePullOperationCurrent();
+                if (pullScoped)
+                    this.ensurePullOperationCurrent(ns);
                 await this.saveSeqTrackerState();
             }
         }
@@ -3581,12 +3590,15 @@ export class MessageDeliveryEngine {
     }
     async publishOrderedMessageInternal(event, ns, seq, payload, source, context) {
         const client = this.runtime.client;
-        this.ensurePullOperationCurrent();
+        const pullScoped = this.isPullScopedSource(source);
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         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)}`);
             await this.publishOrderedQueueItem(ns, event, seqNum, payload, source, false, context);
-            this.ensurePullOperationCurrent();
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             return true;
         }
         if (client._pushedSeqs.get(ns)?.has(seqNum)) {
@@ -3604,7 +3616,8 @@ export class MessageDeliveryEngine {
             return false;
         }
         await this.drainOrderedMessages(ns, seqNum, false, true, source, context);
-        this.ensurePullOperationCurrent();
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         if (client._pushedSeqs.get(ns)?.has(seqNum)) {
             client._clientLog.debug(`publish ordered skipped after-drain duplicate: event=${event}, ns=${ns}, seq=${seqNum}`);
             return false;
@@ -3614,32 +3627,38 @@ export class MessageDeliveryEngine {
         if (queue && queue.size === 0)
             client._pendingOrderedMsgs.delete(ns);
         await this.publishOrderedQueueItem(ns, event, seqNum, payload, source, false, context);
-        this.ensurePullOperationCurrent();
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         this.markPublishedSeq(ns, seqNum);
         client._markOrderedSeqDelivered(ns, seqNum);
         client._clientLog.debug(`publish ordered delivered: event=${event}, ns=${ns}, seq=${seqNum}`);
         await this.drainOrderedMessages(ns, undefined, false, true, source, context);
         if (!client._pendingOrderedMsgs.get(ns)) {
-            this.ensurePullOperationCurrent();
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             await this.saveSeqTrackerState();
         }
         return true;
     }
     async publishPulledMessage(event, ns, seq, payload, persist = true, source = 'pull') {
         const client = this.runtime.client;
-        this.ensurePullOperationCurrent();
+        const pullScoped = this.isPullScopedSource(source);
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         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, source);
-                this.ensurePullOperationCurrent();
+                if (pullScoped)
+                    this.ensurePullOperationCurrent(ns);
                 return published;
             }
             const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source));
             if (isPromiseLike(published))
                 await published;
-            this.ensurePullOperationCurrent();
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             return true;
         }
         const queue = client._pendingOrderedMsgs.get(ns);
@@ -3651,27 +3670,32 @@ export class MessageDeliveryEngine {
             return false;
         }
         await this.drainOrderedMessages(ns, seqNum, true, persist, source);
-        this.ensurePullOperationCurrent();
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         queue?.delete(seqNum);
         if (queue && queue.size === 0)
             client._pendingOrderedMsgs.delete(ns);
         if (event === 'message.recalled') {
             const recallPublished = await this.publishMessageRecallTombstone(seqNum, payload, source);
-            this.ensurePullOperationCurrent();
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             this.markPublishedSeq(ns, seqNum);
             client._clientLog.debug(`publish pulled delivered: event=${event}, ns=${ns}, seq=${seqNum}`);
             await this.drainOrderedMessages(ns, undefined, true, persist, source);
-            this.ensurePullOperationCurrent();
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             return recallPublished;
         }
         const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source));
         if (isPromiseLike(published))
             await published;
-        this.ensurePullOperationCurrent();
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         this.markPublishedSeq(ns, seqNum);
         client._clientLog.debug(`publish pulled delivered: event=${event}, ns=${ns}, seq=${seqNum}`);
         await this.drainOrderedMessages(ns, undefined, true, persist, source);
-        this.ensurePullOperationCurrent();
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         return true;
     }
 }