@agentunion/fastaun-browser 0.5.12 → 0.5.14

package/dist/client/delivery.js

@@ -165,20 +165,19 @@ export class MessageDeliveryEngine {
     isInlineGenerationCurrent(generation) {
         return generation === this.inlineGeneration;
     }
-    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';
+    }
     captureInlineGeneration() {
         return this.inlineGeneration;
     }
@@ -899,7 +898,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.captureInlineGeneration();
         coordinator.recordForwardAck(ns, ackSeq);
@@ -918,7 +917,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}`);
@@ -936,7 +935,7 @@ export class MessageDeliveryEngine {
             throw new Error(`${method} response must be an object`);
         }
         const client = this.runtime.client;
-        this.ensurePullOperationCurrent();
+        this.ensurePullOperationCurrent(ns);
         const response = result;
         const messages = deduplicatePlainForwardPageMessages(response.messages, afterSeq);
         const coordinator = this.forwardCoordinator();
@@ -967,20 +966,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 = p2pAppEventFromPlainPullMessage(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;
                     }
@@ -989,11 +988,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);
             const contiguousSeq = Number.isSafeInteger(result.contiguous_seq)
                 ? result.contiguous_seq
                 : undefined;
@@ -1006,21 +1005,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);
-                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);
@@ -1051,7 +1050,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);
         }
         const remaining = typeof response.remaining === 'number' && Number.isSafeInteger(response.remaining) && response.remaining >= 0
@@ -1078,12 +1077,19 @@ export class MessageDeliveryEngine {
     }
     async publishOrderedQueueItem(ns, event, seq, payload, pullResponse = false, source = 'push', batch) {
         const client = this.runtime.client;
+        const pullScoped = this.isPullScopedSource(source);
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         if (event === 'group.changed' && this.isGroupEventNamespace(ns)) {
             await this.publishOrderedGroupChanged(payload, source);
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             return;
         }
         if (event === 'message.recalled') {
             await this.publishMessageRecallTombstone(seq, payload, source);
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             return;
         }
         if (pullResponse) {
@@ -1091,6 +1097,8 @@ export class MessageDeliveryEngine {
             return;
         }
         await client._publishAppEvent(event, payload, source, ns, batch);
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
     }
     async publishOrderedGroupChanged(payload, source = 'ordered') {
         const client = this.runtime.client;
@@ -3623,7 +3631,9 @@ export class MessageDeliveryEngine {
     }
     async drainOrderedMessages(ns, beforeSeq, pullResponse = false, persist = true, batch, source = 'pull') {
         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;
@@ -3635,7 +3645,8 @@ export class MessageDeliveryEngine {
         const drainBatches = new Map();
         try {
             for (const seq of ready) {
-                this.ensurePullOperationCurrent();
+                if (pullScoped)
+                    this.ensurePullOperationCurrent(ns);
                 const item = queue.get(seq);
                 queue.delete(seq);
                 if (!item || client._pushedSeqs.get(ns)?.has(seq))
@@ -3651,7 +3662,8 @@ export class MessageDeliveryEngine {
                     }
                 }
                 await this.publishOrderedQueueItem(ns, item.event, seq, item.payload, pullResponse, itemSource, itemBatch);
-                this.ensurePullOperationCurrent();
+                if (pullScoped)
+                    this.ensurePullOperationCurrent(ns);
                 this.markPublishedSeq(ns, seq);
                 delivered = true;
             }
@@ -3664,7 +3676,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();
             }
         }
@@ -3714,17 +3727,21 @@ export class MessageDeliveryEngine {
         const client = this.runtime.client;
         const ownsBatch = !operationBatch && (source === 'push' || source === 'inline_push');
         const batch = operationBatch ?? (ownsBatch ? this.createDeliveryChangeBatch(source) : undefined);
+        const pullScoped = this.isPullScopedSource(source);
         try {
-            this.ensurePullOperationCurrent();
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             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, source));
-                    this.ensurePullOperationCurrent();
+                    if (pullScoped)
+                        this.ensurePullOperationCurrent(ns);
                     return published;
                 }
                 await client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source, ns, batch));
-                this.ensurePullOperationCurrent();
+                if (pullScoped)
+                    this.ensurePullOperationCurrent(ns);
                 return true;
             }
             const queue = client._pendingOrderedMsgs.get(ns);
@@ -3735,18 +3752,21 @@ export class MessageDeliveryEngine {
                 return false;
             }
             await this.drainOrderedMessages(ns, seqNum, false, persist, batch, 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 published = await client._withPullResponseProcessing(ns, () => this.publishMessageRecallTombstone(seqNum, payload, source));
-                this.ensurePullOperationCurrent();
+                if (pullScoped)
+                    this.ensurePullOperationCurrent(ns);
                 this.markPublishedSeq(ns, seqNum);
                 return published;
             }
             await client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source, ns, batch));
-            this.ensurePullOperationCurrent();
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             this.markPublishedSeq(ns, seqNum);
             return true;
         }