@korajs/sync 1.0.0-beta.6 → 1.0.0-beta.9

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { S as SyncScopeMap, D as DeltaCursor, a as SyncMessage, b as SerializedOperation, W as WireFormat, c as SyncTransport, T as TransportOptions, d as TransportMessageHandler, e as TransportCloseHandler, f as TransportErrorHandler, B as BlobChunkRequestMessage, g as BlobChunkResponseMessage, h as BlobChunkPushMessage, i as SyncEncryptionConfig, V as VersionedKey, Y as YjsDocUpdateMessage, Q as QueueStorage, j as SyncState, k as SyncStatusInfo, l as SyncConfig, R as RejectedOperationStorage, m as SyncStatePersistence, n as SyncQuerySubset, o as RejectedOperation } from './transport-ByWfWBbB.cjs';
-export { A as AcknowledgmentMessage, p as AwarenessStateWire, q as AwarenessUpdateMessage, E as EncryptedPayload, r as ErrorMessage, H as HandshakeMessage, s as HandshakeResponseMessage, I as InvalidScopeError, M as MemoryRejectedOperationStorage, O as OperationBatchMessage, t as OperationRejectedMessage, u as SYNC_STATES, v as SYNC_STATUSES, w as ScopeViolationError, x as SyncEncryptionAlgorithm, y as SyncScopeContext, z as SyncStatus, C as dedupeQuerySubsets, F as isAcknowledgmentMessage, G as isAwarenessUpdateMessage, J as isBlobChunkPushMessage, K as isBlobChunkRequestMessage, L as isBlobChunkResponseMessage, N as isErrorMessage, P as isHandshakeMessage, U as isHandshakeResponseMessage, X as isOperationBatchMessage, Z as isOperationRejectedMessage, _ as isSyncMessage, $ as isYjsDocUpdateMessage, a0 as operationMatchesQuerySubsets } from './transport-ByWfWBbB.cjs';
+import { S as SyncScopeMap, D as DeltaCursor, a as SyncMessage, b as SerializedOperation, W as WireFormat, c as SyncTransport, T as TransportOptions, d as TransportMessageHandler, e as TransportCloseHandler, f as TransportErrorHandler, B as BlobChunkRequestMessage, g as BlobChunkResponseMessage, h as BlobChunkPushMessage, i as SyncEncryptionConfig, V as VersionedKey, Y as YjsDocUpdateMessage, Q as QueueStorage, j as SyncState, k as SyncStatusInfo, l as SyncConfig, R as RejectedOperationStorage, m as SyncStatePersistence, n as SyncQuerySubset, o as RejectedOperation } from './transport-B2GQerqJ.cjs';
+export { A as AcknowledgmentMessage, p as AwarenessStateWire, q as AwarenessUpdateMessage, E as EncryptedPayload, r as ErrorMessage, H as HandshakeMessage, s as HandshakeResponseMessage, I as InvalidScopeError, M as MemoryRejectedOperationStorage, O as OperationBatchMessage, t as OperationRejectedMessage, u as SYNC_STATES, v as SYNC_STATUSES, w as ScopeViolationError, x as SyncEncryptionAlgorithm, y as SyncScopeContext, z as SyncStatus, C as dedupeQuerySubsets, F as isAcknowledgmentMessage, G as isAwarenessUpdateMessage, J as isBlobChunkPushMessage, K as isBlobChunkRequestMessage, L as isBlobChunkResponseMessage, N as isErrorMessage, P as isHandshakeMessage, U as isHandshakeResponseMessage, X as isOperationBatchMessage, Z as isOperationRejectedMessage, _ as isSyncMessage, $ as isYjsDocUpdateMessage, a0 as operationMatchesQuerySubsets } from './transport-B2GQerqJ.cjs';
 import * as _korajs_core from '@korajs/core';
 import { Operation, VersionVector, ApplyResult, KoraEventEmitter, TimeSource, SyncError, ConnectionQuality } from '@korajs/core';
 export { ApplyFailureReason, ApplyResult } from '@korajs/core';
@@ -825,6 +825,13 @@ declare class OutboundQueue {
      * Acknowledge a batch, removing its operations permanently.
      */
     acknowledge(batchId: string): Promise<void>;
+    /**
+     * Acknowledge only operations in an in-flight batch whose local sequence number is
+     * covered by the server's ack. Any later operations return to the front of the
+     * queue for retry. This is required when the server accepts a prefix but rejects a
+     * later operation retriably (for example a stale-scope push after auth changed).
+     */
+    acknowledgeThrough(batchId: string, lastSequenceNumber: number): Promise<void>;
     /**
      * Return a failed batch to the front of the queue for retry.
      * Prepends the operations to maintain priority.
@@ -927,6 +934,8 @@ interface SyncDiagnostics {
     pendingOperations: number;
     hasInFlightBatch: boolean;
     reconnecting: boolean;
+    deliveryWatermark: number;
+    deliveryGapRepeatCount: number;
     timestamp: number;
 }
 /**
@@ -961,6 +970,7 @@ declare class SyncEngine {
     private lastSuccessfulPull;
     private conflictCount;
     private currentBatch;
+    private currentBatchRequiresPartialAck;
     private reconnecting;
     private schemaBlocked;
     private clockBlocked;
@@ -969,6 +979,7 @@ declare class SyncEngine {
     private outboundAckTimer;
     private startPromise;
     private stopPromise;
+    private reconnectPromise;
     private deltaBatchesReceived;
     private deltaReceiveComplete;
     private deltaSendComplete;
@@ -1007,6 +1018,8 @@ declare class SyncEngine {
      * so a view switch resolves synchronously (no race with the reconnect it triggers).
      */
     private readonly deliverySignatureWatermarks;
+    private deliveryGapRepeatCount;
+    private lastDeliveryGapKey;
     constructor(options: SyncEngineOptions);
     /**
      * Start the sync engine: connect → handshake → delta exchange → streaming.
@@ -1075,6 +1088,13 @@ declare class SyncEngine {
      * or in error state, restarts the sync. If already connected, no-op.
      */
     retryNow(): Promise<void>;
+    /**
+     * Atomically refresh the transport session. Overlapping callers share one
+     * reconnect, in-flight outbound batches are returned to the queue by stop(), and the
+     * next start handshakes with the latest auth token, sync scope, and query subsets.
+     */
+    reconnect(): Promise<void>;
+    private reconnectInternal;
     /**
      * Export a diagnostics snapshot for debugging and support tickets.
      * Contains connection state, timing info, and queue metrics.

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { S as SyncScopeMap, D as DeltaCursor, a as SyncMessage, b as SerializedOperation, W as WireFormat, c as SyncTransport, T as TransportOptions, d as TransportMessageHandler, e as TransportCloseHandler, f as TransportErrorHandler, B as BlobChunkRequestMessage, g as BlobChunkResponseMessage, h as BlobChunkPushMessage, i as SyncEncryptionConfig, V as VersionedKey, Y as YjsDocUpdateMessage, Q as QueueStorage, j as SyncState, k as SyncStatusInfo, l as SyncConfig, R as RejectedOperationStorage, m as SyncStatePersistence, n as SyncQuerySubset, o as RejectedOperation } from './transport-ByWfWBbB.js';
-export { A as AcknowledgmentMessage, p as AwarenessStateWire, q as AwarenessUpdateMessage, E as EncryptedPayload, r as ErrorMessage, H as HandshakeMessage, s as HandshakeResponseMessage, I as InvalidScopeError, M as MemoryRejectedOperationStorage, O as OperationBatchMessage, t as OperationRejectedMessage, u as SYNC_STATES, v as SYNC_STATUSES, w as ScopeViolationError, x as SyncEncryptionAlgorithm, y as SyncScopeContext, z as SyncStatus, C as dedupeQuerySubsets, F as isAcknowledgmentMessage, G as isAwarenessUpdateMessage, J as isBlobChunkPushMessage, K as isBlobChunkRequestMessage, L as isBlobChunkResponseMessage, N as isErrorMessage, P as isHandshakeMessage, U as isHandshakeResponseMessage, X as isOperationBatchMessage, Z as isOperationRejectedMessage, _ as isSyncMessage, $ as isYjsDocUpdateMessage, a0 as operationMatchesQuerySubsets } from './transport-ByWfWBbB.js';
+import { S as SyncScopeMap, D as DeltaCursor, a as SyncMessage, b as SerializedOperation, W as WireFormat, c as SyncTransport, T as TransportOptions, d as TransportMessageHandler, e as TransportCloseHandler, f as TransportErrorHandler, B as BlobChunkRequestMessage, g as BlobChunkResponseMessage, h as BlobChunkPushMessage, i as SyncEncryptionConfig, V as VersionedKey, Y as YjsDocUpdateMessage, Q as QueueStorage, j as SyncState, k as SyncStatusInfo, l as SyncConfig, R as RejectedOperationStorage, m as SyncStatePersistence, n as SyncQuerySubset, o as RejectedOperation } from './transport-B2GQerqJ.js';
+export { A as AcknowledgmentMessage, p as AwarenessStateWire, q as AwarenessUpdateMessage, E as EncryptedPayload, r as ErrorMessage, H as HandshakeMessage, s as HandshakeResponseMessage, I as InvalidScopeError, M as MemoryRejectedOperationStorage, O as OperationBatchMessage, t as OperationRejectedMessage, u as SYNC_STATES, v as SYNC_STATUSES, w as ScopeViolationError, x as SyncEncryptionAlgorithm, y as SyncScopeContext, z as SyncStatus, C as dedupeQuerySubsets, F as isAcknowledgmentMessage, G as isAwarenessUpdateMessage, J as isBlobChunkPushMessage, K as isBlobChunkRequestMessage, L as isBlobChunkResponseMessage, N as isErrorMessage, P as isHandshakeMessage, U as isHandshakeResponseMessage, X as isOperationBatchMessage, Z as isOperationRejectedMessage, _ as isSyncMessage, $ as isYjsDocUpdateMessage, a0 as operationMatchesQuerySubsets } from './transport-B2GQerqJ.js';
 import * as _korajs_core from '@korajs/core';
 import { Operation, VersionVector, ApplyResult, KoraEventEmitter, TimeSource, SyncError, ConnectionQuality } from '@korajs/core';
 export { ApplyFailureReason, ApplyResult } from '@korajs/core';
@@ -825,6 +825,13 @@ declare class OutboundQueue {
      * Acknowledge a batch, removing its operations permanently.
      */
     acknowledge(batchId: string): Promise<void>;
+    /**
+     * Acknowledge only operations in an in-flight batch whose local sequence number is
+     * covered by the server's ack. Any later operations return to the front of the
+     * queue for retry. This is required when the server accepts a prefix but rejects a
+     * later operation retriably (for example a stale-scope push after auth changed).
+     */
+    acknowledgeThrough(batchId: string, lastSequenceNumber: number): Promise<void>;
     /**
      * Return a failed batch to the front of the queue for retry.
      * Prepends the operations to maintain priority.
@@ -927,6 +934,8 @@ interface SyncDiagnostics {
     pendingOperations: number;
     hasInFlightBatch: boolean;
     reconnecting: boolean;
+    deliveryWatermark: number;
+    deliveryGapRepeatCount: number;
     timestamp: number;
 }
 /**
@@ -961,6 +970,7 @@ declare class SyncEngine {
     private lastSuccessfulPull;
     private conflictCount;
     private currentBatch;
+    private currentBatchRequiresPartialAck;
     private reconnecting;
     private schemaBlocked;
     private clockBlocked;
@@ -969,6 +979,7 @@ declare class SyncEngine {
     private outboundAckTimer;
     private startPromise;
     private stopPromise;
+    private reconnectPromise;
     private deltaBatchesReceived;
     private deltaReceiveComplete;
     private deltaSendComplete;
@@ -1007,6 +1018,8 @@ declare class SyncEngine {
      * so a view switch resolves synchronously (no race with the reconnect it triggers).
      */
     private readonly deliverySignatureWatermarks;
+    private deliveryGapRepeatCount;
+    private lastDeliveryGapKey;
     constructor(options: SyncEngineOptions);
     /**
      * Start the sync engine: connect → handshake → delta exchange → streaming.
@@ -1075,6 +1088,13 @@ declare class SyncEngine {
      * or in error state, restarts the sync. If already connected, no-op.
      */
     retryNow(): Promise<void>;
+    /**
+     * Atomically refresh the transport session. Overlapping callers share one
+     * reconnect, in-flight outbound batches are returned to the queue by stop(), and the
+     * next start handshakes with the latest auth token, sync scope, and query subsets.
+     */
+    reconnect(): Promise<void>;
+    private reconnectInternal;
     /**
      * Export a diagnostics snapshot for debugging and support tickets.
      * Contains connection state, timing info, and queue metrics.

package/dist/index.js

@@ -14,6 +14,7 @@ var SYNC_STATES = [
 ];
 var SYNC_STATUSES = [
   "connected",
+  "reconnecting",
   "syncing",
   "synced",
   "offline",
@@ -2500,6 +2501,32 @@ var OutboundQueue = class {
     const ids = ops.map((op) => op.id);
     await this.storage.dequeue(ids);
   }
+  /**
+   * Acknowledge only operations in an in-flight batch whose local sequence number is
+   * covered by the server's ack. Any later operations return to the front of the
+   * queue for retry. This is required when the server accepts a prefix but rejects a
+   * later operation retriably (for example a stale-scope push after auth changed).
+   */
+  async acknowledgeThrough(batchId, lastSequenceNumber) {
+    const ops = this.inFlight.get(batchId);
+    if (!ops) return;
+    this.inFlight.delete(batchId);
+    const acknowledged = ops.filter((op) => op.sequenceNumber <= lastSequenceNumber);
+    const retry = ops.filter((op) => op.sequenceNumber > lastSequenceNumber);
+    if (retry.length > 0) {
+      this.queue.unshift(...retry);
+      if (this.queue.length > 1) {
+        this.queue = topologicalSort(this.queue);
+      }
+    }
+    if (acknowledged.length > 0) {
+      const ids = acknowledged.map((op) => op.id);
+      for (const id of ids) {
+        this.seen.delete(id);
+      }
+      await this.storage.dequeue(ids);
+    }
+  }
   /**
    * Return a failed batch to the front of the queue for retry.
    * Prepends the operations to maintain priority.
@@ -2681,6 +2708,7 @@ var SyncEngine = class {
   lastSuccessfulPull = null;
   conflictCount = 0;
   currentBatch = null;
+  currentBatchRequiresPartialAck = false;
   reconnecting = false;
   schemaBlocked = false;
   clockBlocked = false;
@@ -2689,6 +2717,7 @@ var SyncEngine = class {
   outboundAckTimer = null;
   startPromise = null;
   stopPromise = null;
+  reconnectPromise = null;
   // Track delta exchange state
   deltaBatchesReceived = 0;
   deltaReceiveComplete = false;
@@ -2728,6 +2757,8 @@ var SyncEngine = class {
    * so a view switch resolves synchronously (no race with the reconnect it triggers).
    */
   deliverySignatureWatermarks = /* @__PURE__ */ new Map();
+  deliveryGapRepeatCount = 0;
+  lastDeliveryGapKey = null;
   constructor(options) {
     this.transport = options.transport;
     this.store = options.store;
@@ -2875,6 +2906,7 @@ var SyncEngine = class {
     if (this.currentBatch) {
       this.outboundQueue.returnBatch(this.currentBatch.batchId);
       this.currentBatch = null;
+      this.currentBatchRequiresPartialAck = false;
     }
     try {
       await this.transport.disconnect();
@@ -2924,6 +2956,7 @@ var SyncEngine = class {
   getStatus() {
     const pendingOperations = this.syncState ? this.cachedUnsyncedCount : this.outboundQueue.totalPending;
     const base = {
+      reconnecting: this.reconnecting,
       pendingOperations,
       lastSyncedAt: this.lastSyncedAt,
       lastSuccessfulPush: this.lastSuccessfulPush,
@@ -2943,7 +2976,7 @@ var SyncEngine = class {
       case "connecting":
       case "handshaking":
       case "syncing":
-        return { ...base, status: this.reconnecting ? "offline" : "syncing" };
+        return { ...base, status: this.reconnecting ? "reconnecting" : "syncing" };
       case "streaming":
         return { ...base, status: pendingOperations > 0 ? "syncing" : "synced" };
       case "error":
@@ -3028,6 +3061,24 @@ var SyncEngine = class {
       await this.start();
     }
   }
+  /**
+   * Atomically refresh the transport session. Overlapping callers share one
+   * reconnect, in-flight outbound batches are returned to the queue by stop(), and the
+   * next start handshakes with the latest auth token, sync scope, and query subsets.
+   */
+  async reconnect() {
+    if (this.schemaBlocked) return;
+    if (this.reconnectPromise) return this.reconnectPromise;
+    this.reconnecting = false;
+    this.reconnectPromise = this.reconnectInternal().finally(() => {
+      this.reconnectPromise = null;
+    });
+    return this.reconnectPromise;
+  }
+  async reconnectInternal() {
+    await this.stop();
+    await this.start();
+  }
   /**
    * Export a diagnostics snapshot for debugging and support tickets.
    * Contains connection state, timing info, and queue metrics.
@@ -3046,6 +3097,8 @@ var SyncEngine = class {
       pendingOperations: this.outboundQueue.totalPending,
       hasInFlightBatch: this.currentBatch !== null,
       reconnecting: this.reconnecting,
+      deliveryWatermark: this.deliveryWatermark,
+      deliveryGapRepeatCount: this.deliveryGapRepeatCount,
       timestamp: Date.now()
     };
   }
@@ -3235,7 +3288,7 @@ var SyncEngine = class {
         await this.handleOperationBatch(message);
         break;
       case "acknowledgment":
-        this.handleAcknowledgment(message);
+        await this.handleAcknowledgment(message);
         break;
       case "error":
         this.handleError(message);
@@ -3474,6 +3527,17 @@ var SyncEngine = class {
     if (isDeliveryBatch) {
       const base = msg.baseDeliverySequence ?? 0;
       if (base > this.deliveryWatermark) {
+        const gapKey = `${this.deliveryWatermark}:${base}`;
+        this.deliveryGapRepeatCount = this.lastDeliveryGapKey === gapKey ? this.deliveryGapRepeatCount + 1 : 1;
+        this.lastDeliveryGapKey = gapKey;
+        this.emitter?.emit({
+          type: "sync:delivery-gap",
+          expectedBase: this.deliveryWatermark,
+          receivedBase: base,
+          currentWatermark: this.deliveryWatermark,
+          messageId: msg.messageId,
+          repeatCount: this.deliveryGapRepeatCount
+        });
         return;
       }
       if (base < this.deliveryWatermark) {
@@ -3538,6 +3602,8 @@ var SyncEngine = class {
       });
     }
     if (isDeliveryBatch && fullyApplied && msg.maxDeliverySequence !== void 0) {
+      this.deliveryGapRepeatCount = 0;
+      this.lastDeliveryGapKey = null;
       this.deliveryWatermark = msg.maxDeliverySequence;
       this.setViewWatermark(this.deliverySignature(), this.deliveryWatermark);
       await this.persistDeliveryWatermark(this.deliveryWatermark);
@@ -3579,22 +3645,29 @@ var SyncEngine = class {
     };
     this.transport.send(ack);
   }
-  handleAcknowledgment(msg) {
+  async handleAcknowledgment(msg) {
     this.clearOutboundAckTimer();
     if (this.state === "syncing" && this.config.strictHandshake) {
       this.pendingDeltaBatchAcks.delete(msg.acknowledgedMessageId);
       this.markDeltaSendCompleteIfReady();
     }
     if (this.currentBatch) {
-      this.outboundQueue.acknowledge(this.currentBatch.batchId);
+      if (this.currentBatchRequiresPartialAck) {
+        await this.outboundQueue.acknowledgeThrough(
+          this.currentBatch.batchId,
+          msg.lastSequenceNumber
+        );
+      } else {
+        await this.outboundQueue.acknowledge(this.currentBatch.batchId);
+      }
       this.currentBatch = null;
+      this.currentBatchRequiresPartialAck = false;
       const now = Date.now();
       this.lastSyncedAt = now;
       this.lastSuccessfulPush = now;
     }
-    void this.advanceLastAckedForLocalNode(msg.lastSequenceNumber).then(
-      () => this.refreshPendingCount()
-    );
+    await this.advanceLastAckedForLocalNode(msg.lastSequenceNumber);
+    await this.refreshPendingCount();
     if (this.state === "streaming" && this.outboundQueue.hasOperations) {
       this.flushQueue();
     }
@@ -3604,6 +3677,7 @@ var SyncEngine = class {
     if (this.currentBatch) {
       this.outboundQueue.returnBatch(this.currentBatch.batchId);
       this.currentBatch = null;
+      this.currentBatchRequiresPartialAck = false;
     }
     this.transitionTo("error");
     if (msg.code === "AUTH_FAILED") {
@@ -3631,6 +3705,20 @@ var SyncEngine = class {
    * signal, so the connection stays up.
    */
   async handleOperationRejected(msg) {
+    if (msg.retriable) {
+      this.currentBatchRequiresPartialAck = true;
+      await this.refreshPendingCount();
+      this.emitter?.emit({
+        type: "sync:operation-rejected",
+        operationId: msg.operationId,
+        collection: msg.collection,
+        recordId: msg.recordId,
+        code: msg.code,
+        message: msg.message,
+        retriable: true
+      });
+      return;
+    }
     await this.outboundQueue.reject(msg.operationId);
     await this.rejectedStorage.record({
       operationId: msg.operationId,
@@ -3776,6 +3864,7 @@ var SyncEngine = class {
     const batch = this.outboundQueue.takeBatch(this.batchSize);
     if (!batch) return;
     this.currentBatch = batch;
+    this.currentBatchRequiresPartialAck = false;
     if (this.encryptor) {
       this.encryptor.encryptBatch(batch.operations).then(
         (encrypted) => {
@@ -3798,6 +3887,7 @@ var SyncEngine = class {
         (err) => {
           this.outboundQueue.returnBatch(batch.batchId);
           this.currentBatch = null;
+          this.currentBatchRequiresPartialAck = false;
           this.emitter?.emit({
             type: "sync:disconnected",
             reason: err instanceof Error ? err.message : "Encryption failed"
@@ -3838,6 +3928,7 @@ var SyncEngine = class {
     if (!this.currentBatch || this.currentBatch.batchId !== batchId) return;
     this.outboundQueue.returnBatch(batchId);
     this.currentBatch = null;
+    this.currentBatchRequiresPartialAck = false;
     this.clearOutboundAckTimer();
     await this.refreshPendingCount();
     if (this.state === "disconnected") return;
@@ -3862,6 +3953,7 @@ var SyncEngine = class {
     if (this.currentBatch) {
       this.outboundQueue.returnBatch(this.currentBatch.batchId);
       this.currentBatch = null;
+      this.currentBatchRequiresPartialAck = false;
     }
     if (this.schemaBlocked) {
       return;
@@ -3952,8 +4044,7 @@ var SyncEngine = class {
     }, 500);
   }
   async reconnectForQuerySubsets() {
-    await this.stop();
-    await this.start();
+    await this.reconnect();
   }
 };
 function awarenessStatesToWire(states) {
@@ -4634,6 +4725,7 @@ function fromBase642(str) {
 // src/reactivity/sync-status-controller.ts
 var OFFLINE_SYNC_STATUS = Object.freeze({
   status: "offline",
+  reconnecting: false,
   pendingOperations: 0,
   lastSyncedAt: null,
   lastSuccessfulPush: null,
@@ -4651,6 +4743,7 @@ var SYNC_STATUS_EVENT_TYPES = [
   "sync:received",
   "sync:acknowledged",
   "sync:apply-failed",
+  "sync:delivery-gap",
   "sync:diagnostics",
   "sync:initial-sync-progress"
 ];