@korajs/sync 1.0.0-beta.11 → 1.0.0-beta.12

package/dist/index.cjs

@@ -684,7 +684,8 @@ function toProtoEnvelope(message) {
         schemaVersion: message.schemaVersion,
         authToken: message.authToken,
         supportedWireFormats: message.supportedWireFormats,
-        ...message.lastDeliverySequence !== void 0 ? { lastDeliverySequence: message.lastDeliverySequence } : {}
+        ...message.lastDeliverySequence !== void 0 ? { lastDeliverySequence: message.lastDeliverySequence } : {},
+        scopeExitPolicy: message.scopeExitPolicy
       };
     case "handshake-response":
       return {
@@ -701,7 +702,10 @@ function toProtoEnvelope(message) {
         selectedWireFormat: message.selectedWireFormat,
         serverTime: message.serverTime,
         blobStorageEnabled: message.blobStorageEnabled,
-        ...message.serverMaxDeliverySequence !== void 0 ? { serverMaxDeliverySequence: message.serverMaxDeliverySequence } : {}
+        ...message.serverMaxDeliverySequence !== void 0 ? { serverMaxDeliverySequence: message.serverMaxDeliverySequence } : {},
+        acceptedScopeJson: message.acceptedScope ? JSON.stringify(message.acceptedScope) : void 0,
+        acceptedDownlinkScopesJson: message.acceptedDownlinkScopes ? JSON.stringify(message.acceptedDownlinkScopes) : void 0,
+        acceptedUplinkScopesJson: message.acceptedUplinkScopes ? JSON.stringify(message.acceptedUplinkScopes) : void 0
       };
     case "operation-batch":
       return {
@@ -711,7 +715,8 @@ function toProtoEnvelope(message) {
         isFinal: message.isFinal,
         batchIndex: message.batchIndex,
         ...message.baseDeliverySequence !== void 0 ? { baseDeliverySequence: message.baseDeliverySequence } : {},
-        ...message.maxDeliverySequence !== void 0 ? { maxDeliverySequence: message.maxDeliverySequence } : {}
+        ...message.maxDeliverySequence !== void 0 ? { maxDeliverySequence: message.maxDeliverySequence } : {},
+        retractionsJson: message.retractions ? JSON.stringify(message.retractions) : void 0
       };
     case "acknowledgment":
       return {
@@ -785,7 +790,8 @@ function fromProtoEnvelope(envelope) {
         supportedWireFormats: envelope.supportedWireFormats?.filter(
           (format) => format === "json" || format === "protobuf"
         ),
-        ...envelope.lastDeliverySequence !== void 0 ? { lastDeliverySequence: envelope.lastDeliverySequence } : {}
+        ...envelope.lastDeliverySequence !== void 0 ? { lastDeliverySequence: envelope.lastDeliverySequence } : {},
+        ...envelope.scopeExitPolicy === "retain" || envelope.scopeExitPolicy === "retract" ? { scopeExitPolicy: envelope.scopeExitPolicy } : {}
       };
     case "handshake-response":
       return {
@@ -803,7 +809,10 @@ function fromProtoEnvelope(envelope) {
         // automatic timestamp rebase work over the protobuf wire, not just JSON.
         ...envelope.serverTime !== void 0 ? { serverTime: envelope.serverTime } : {},
         ...envelope.blobStorageEnabled !== void 0 ? { blobStorageEnabled: envelope.blobStorageEnabled } : {},
-        ...envelope.serverMaxDeliverySequence !== void 0 ? { serverMaxDeliverySequence: envelope.serverMaxDeliverySequence } : {}
+        ...envelope.serverMaxDeliverySequence !== void 0 ? { serverMaxDeliverySequence: envelope.serverMaxDeliverySequence } : {},
+        ...envelope.acceptedScopeJson ? { acceptedScope: JSON.parse(envelope.acceptedScopeJson) } : {},
+        ...envelope.acceptedDownlinkScopesJson ? { acceptedDownlinkScopes: JSON.parse(envelope.acceptedDownlinkScopesJson) } : {},
+        ...envelope.acceptedUplinkScopesJson ? { acceptedUplinkScopes: JSON.parse(envelope.acceptedUplinkScopesJson) } : {}
       };
     case "operation-batch":
       return {
@@ -813,7 +822,8 @@ function fromProtoEnvelope(envelope) {
         isFinal: envelope.isFinal ?? false,
         batchIndex: envelope.batchIndex ?? 0,
         ...envelope.baseDeliverySequence !== void 0 ? { baseDeliverySequence: envelope.baseDeliverySequence } : {},
-        ...envelope.maxDeliverySequence !== void 0 ? { maxDeliverySequence: envelope.maxDeliverySequence } : {}
+        ...envelope.maxDeliverySequence !== void 0 ? { maxDeliverySequence: envelope.maxDeliverySequence } : {},
+        ...envelope.retractionsJson ? { retractions: JSON.parse(envelope.retractionsJson) } : {}
       };
     case "acknowledgment":
       return {
@@ -1031,6 +1041,13 @@ function encodeEnvelope(envelope) {
   if (envelope.deliverySequence !== void 0) writer.uint32(256).int64(envelope.deliverySequence);
   if (envelope.serverMaxDeliverySequence !== void 0)
     writer.uint32(264).int64(envelope.serverMaxDeliverySequence);
+  if (envelope.acceptedScopeJson) writer.uint32(274).string(envelope.acceptedScopeJson);
+  if (envelope.acceptedDownlinkScopesJson)
+    writer.uint32(282).string(envelope.acceptedDownlinkScopesJson);
+  if (envelope.acceptedUplinkScopesJson)
+    writer.uint32(290).string(envelope.acceptedUplinkScopesJson);
+  if (envelope.retractionsJson) writer.uint32(298).string(envelope.retractionsJson);
+  if (envelope.scopeExitPolicy) writer.uint32(306).string(envelope.scopeExitPolicy);
   return writer.finish();
 }
 function decodeEnvelope(bytes) {
@@ -1141,6 +1158,21 @@ function decodeEnvelope(bytes) {
       case 33:
         envelope.serverMaxDeliverySequence = longToNumber(reader.int64());
         break;
+      case 34:
+        envelope.acceptedScopeJson = reader.string();
+        break;
+      case 35:
+        envelope.acceptedDownlinkScopesJson = reader.string();
+        break;
+      case 36:
+        envelope.acceptedUplinkScopesJson = reader.string();
+        break;
+      case 37:
+        envelope.retractionsJson = reader.string();
+        break;
+      case 38:
+        envelope.scopeExitPolicy = reader.string();
+        break;
       default:
         reader.skipType(tag & 7);
     }
@@ -2806,6 +2838,18 @@ var OutboundQueue = class {
     await this.storage.dequeue([opId]);
     return removed;
   }
+  /** Remove every pending/in-flight operation for a record so authorization loss cannot upload it. */
+  async rejectRecord(collection, recordId) {
+    const matching = [...this.queue, ...[...this.inFlight.values()].flat()].filter(
+      (op) => op.collection === collection && op.recordId === recordId
+    );
+    const removed = [];
+    for (const operation of matching) {
+      const rejected = await this.reject(operation.id);
+      if (rejected) removed.push(rejected);
+    }
+    return removed;
+  }
   /**
    * Remove operations by id from queue and persistent storage.
    * Used when ops were already sent during handshake delta exchange.
@@ -2825,6 +2869,8 @@ var OutboundQueue = class {
 var DEFAULT_BATCH_SIZE = 100;
 var DEFAULT_SCHEMA_VERSION = 1;
 var DEFAULT_OUTBOUND_ACK_TIMEOUT_MS = 3e4;
+var DEFAULT_OUTBOUND_RETRY_BASE_DELAY_MS = 250;
+var DEFAULT_OUTBOUND_RETRY_MAX_DELAY_MS = 3e4;
 var VALID_TRANSITIONS = {
   disconnected: ["connecting"],
   connecting: ["handshaking", "error", "disconnected"],
@@ -2860,6 +2906,8 @@ var SyncEngine = class {
   rejectedStorage;
   batchSize;
   outboundAckTimeoutMs;
+  outboundRetryBaseDelayMs;
+  outboundRetryMaxDelayMs;
   encryptor;
   awarenessManager;
   richtextDocChannel;
@@ -2875,6 +2923,9 @@ var SyncEngine = class {
   conflictCount = 0;
   currentBatch = null;
   currentBatchRequiresPartialAck = false;
+  currentBatchRequiresRetryBackoff = false;
+  outboundRetryAttempt = 0;
+  outboundRetryTimer = null;
   reconnecting = false;
   schemaBlocked = false;
   clockBlocked = false;
@@ -2903,6 +2954,9 @@ var SyncEngine = class {
    * with the server-accepted scope (server is authoritative).
    */
   activeScope;
+  /** Server-authoritative upload authorization, separate from the downloaded view. */
+  activeUplinkScope;
+  hasDirectionalScopes = false;
   /** Live query subsets registered from reactive subscriptions */
   querySubsets = /* @__PURE__ */ new Map();
   staticQuerySubsets = [];
@@ -2939,9 +2993,18 @@ var SyncEngine = class {
     this.emitter = options.emitter ?? null;
     this.batchSize = options.config.batchSize ?? DEFAULT_BATCH_SIZE;
     this.outboundAckTimeoutMs = options.config.outboundAckTimeoutMs ?? DEFAULT_OUTBOUND_ACK_TIMEOUT_MS;
+    this.outboundRetryBaseDelayMs = Math.max(
+      0,
+      options.config.outboundRetryBaseDelayMs ?? DEFAULT_OUTBOUND_RETRY_BASE_DELAY_MS
+    );
+    this.outboundRetryMaxDelayMs = Math.max(
+      this.outboundRetryBaseDelayMs,
+      options.config.outboundRetryMaxDelayMs ?? DEFAULT_OUTBOUND_RETRY_MAX_DELAY_MS
+    );
     this.encryptor = options.encryptor ?? null;
     this.syncState = options.syncState ?? null;
     this.activeScope = options.config.scopeMap;
+    this.activeUplinkScope = options.config.scopeMap;
     const queueStorage = options.queueStorage ?? new MemoryQueueStorage();
     this.outboundQueue = new OutboundQueue(queueStorage);
     this.rejectedStorage = options.rejectedStorage ?? new MemoryRejectedOperationStorage();
@@ -3064,6 +3127,7 @@ var SyncEngine = class {
         authToken,
         supportedWireFormats: ["json", "protobuf"],
         ...this.config.scopeMap ? { syncScope: this.config.scopeMap } : {},
+        ...this.config.scopeExit ? { scopeExitPolicy: this.config.scopeExit } : {},
         ...activeQuerySubsets.length > 0 ? { syncQueries: activeQuerySubsets } : {},
         ...this.resumeDeltaCursor ? { deltaCursor: encodeDeltaCursor(this.resumeDeltaCursor) } : {},
         // Resume the server's gap-free delivery stream from our watermark. A server
@@ -3088,13 +3152,15 @@ var SyncEngine = class {
     return this.stopPromise;
   }
   async stopInternal() {
-    if (this.state === "disconnected") return;
     this.clearOutboundAckTimer();
+    this.clearOutboundRetryTimer();
+    if (this.state === "disconnected") return;
     this.awarenessManager.stopCleanupTimer();
     if (this.currentBatch) {
       this.outboundQueue.returnBatch(this.currentBatch.batchId);
       this.currentBatch = null;
       this.currentBatchRequiresPartialAck = false;
+      this.currentBatchRequiresRetryBackoff = false;
     }
     try {
       await this.transport.disconnect();
@@ -3377,6 +3443,8 @@ var SyncEngine = class {
   updateScope(scopeMap) {
     const previousSignature = this.deliverySignature();
     this.activeScope = scopeMap;
+    this.activeUplinkScope = scopeMap;
+    this.hasDirectionalScopes = false;
     this.config.scopeMap = scopeMap;
     this.switchDeliveryView(previousSignature);
   }
@@ -3460,6 +3528,10 @@ var SyncEngine = class {
   getActiveScope() {
     return this.activeScope;
   }
+  /** Get the server-accepted upload authorization scope. */
+  getActiveUplinkScope() {
+    return this.activeUplinkScope;
+  }
   /**
    * Register a live query subset that narrows synced data for a collection.
    * Takes effect on the next connection; reconnects when already connected.
@@ -3662,8 +3734,17 @@ var SyncEngine = class {
     if (msg.selectedWireFormat) {
       this.setSerializerWireFormat(msg.selectedWireFormat);
     }
-    if (msg.acceptedScope) {
-      this.activeScope = msg.acceptedScope;
+    if (msg.acceptedDownlinkScopes ?? msg.acceptedScope) {
+      this.activeScope = msg.acceptedDownlinkScopes ?? msg.acceptedScope;
+    }
+    this.hasDirectionalScopes = msg.acceptedUplinkScopes !== void 0;
+    this.activeUplinkScope = msg.acceptedUplinkScopes ?? msg.acceptedScope ?? this.activeScope;
+    if (this.config.scopeExit === "retract" && this.activeScope && this.store.applyScopeNarrowing) {
+      const narrowed = await this.store.applyScopeNarrowing(this.activeScope);
+      for (const retraction of narrowed) {
+        await this.applyScopeRetraction(retraction, false);
+      }
+      await this.refreshPendingCount();
     }
     this.emitter?.emit({ type: "sync:connected", nodeId: this.store.getNodeId() });
     this.metricsCollector.recordConnected();
@@ -3828,6 +3909,14 @@ var SyncEngine = class {
     const targetSchemaVersion = this.config.schemaVersion ?? DEFAULT_SCHEMA_VERSION;
     const transforms = this.config.operationTransforms ?? [];
     let fullyApplied = true;
+    for (const retraction of msg.retractions ?? []) {
+      try {
+        await this.applyScopeRetraction(retraction, true);
+      } catch {
+        fullyApplied = false;
+      }
+    }
+    await this.refreshPendingCount();
     for (const op of inScopeOps) {
       const transformed = transforms.length > 0 ? (0, import_core7.applyOperationTransforms)(op, targetSchemaVersion, transforms) : op;
       if (transformed === null) {
@@ -3935,6 +4024,7 @@ var SyncEngine = class {
   }
   async handleAcknowledgment(msg) {
     this.clearOutboundAckTimer();
+    const requiresRetryBackoff = this.currentBatchRequiresRetryBackoff;
     if (this.state === "syncing" && this.config.strictHandshake) {
       this.pendingDeltaBatchAcks.delete(msg.acknowledgedMessageId);
       this.markDeltaSendCompleteIfReady();
@@ -3950,6 +4040,7 @@ var SyncEngine = class {
       }
       this.currentBatch = null;
       this.currentBatchRequiresPartialAck = false;
+      this.currentBatchRequiresRetryBackoff = false;
       const now = Date.now();
       this.lastSyncedAt = now;
       this.lastSuccessfulPush = now;
@@ -3957,7 +4048,14 @@ var SyncEngine = class {
     await this.advanceLastAckedForLocalNode(msg.lastSequenceNumber);
     await this.refreshPendingCount();
     if (this.state === "streaming" && this.outboundQueue.hasOperations) {
-      this.flushQueue();
+      if (requiresRetryBackoff) {
+        this.scheduleOutboundRetry();
+      } else {
+        this.outboundRetryAttempt = 0;
+        this.flushQueue();
+      }
+    } else if (!requiresRetryBackoff) {
+      this.outboundRetryAttempt = 0;
     }
   }
   handleError(msg) {
@@ -3966,6 +4064,7 @@ var SyncEngine = class {
       this.outboundQueue.returnBatch(this.currentBatch.batchId);
       this.currentBatch = null;
       this.currentBatchRequiresPartialAck = false;
+      this.currentBatchRequiresRetryBackoff = false;
     }
     this.transitionTo("error");
     if (msg.code === "AUTH_FAILED" || msg.code === "DEVICE_REVOKED") {
@@ -3995,9 +4094,39 @@ var SyncEngine = class {
    * the app can reconcile. Unlike {@link handleError}, this is a normal per-op
    * signal, so the connection stays up.
    */
+  async applyScopeRetraction(retraction, applyToStore) {
+    if (applyToStore) {
+      if (!this.store.applyScopeRetraction) {
+        throw new Error("The configured sync store does not support scope retractions");
+      }
+      await this.store.applyScopeRetraction(retraction.collection, retraction.recordId);
+    }
+    const quarantined = await this.outboundQueue.rejectRecord(
+      retraction.collection,
+      retraction.recordId
+    );
+    for (const operation of quarantined) {
+      await this.rejectedStorage.record({
+        operationId: operation.id,
+        collection: operation.collection,
+        recordId: operation.recordId,
+        code: "SCOPE_RETRACTED",
+        message: "Authorization changed before this operation could be uploaded.",
+        retriable: false,
+        rejectedAt: Date.now()
+      });
+    }
+    this.emitter?.emit({
+      type: "sync:scope-retracted",
+      collection: retraction.collection,
+      recordId: retraction.recordId,
+      quarantinedOperationIds: quarantined.map((operation) => operation.id)
+    });
+  }
   async handleOperationRejected(msg) {
     if (msg.retriable) {
       this.currentBatchRequiresPartialAck = true;
+      this.currentBatchRequiresRetryBackoff = true;
       await this.refreshPendingCount();
       this.emitter?.emit({
         type: "sync:operation-rejected",
@@ -4151,11 +4280,13 @@ var SyncEngine = class {
   }
   flushQueue() {
     if (this.currentBatch) return;
+    if (this.outboundRetryTimer) return;
     if (!this.outboundQueue.hasOperations) return;
     const batch = this.outboundQueue.takeBatch(this.batchSize);
     if (!batch) return;
     this.currentBatch = batch;
     this.currentBatchRequiresPartialAck = false;
+    this.currentBatchRequiresRetryBackoff = false;
     if (this.encryptor) {
       this.encryptor.encryptBatch(batch.operations).then(
         (encrypted) => {
@@ -4179,6 +4310,7 @@ var SyncEngine = class {
           this.outboundQueue.returnBatch(batch.batchId);
           this.currentBatch = null;
           this.currentBatchRequiresPartialAck = false;
+          this.currentBatchRequiresRetryBackoff = false;
           this.emitter?.emit({
             type: "sync:disconnected",
             reason: err instanceof Error ? err.message : "Encryption failed"
@@ -4215,11 +4347,29 @@ var SyncEngine = class {
     clearTimeout(this.outboundAckTimer);
     this.outboundAckTimer = null;
   }
+  scheduleOutboundRetry() {
+    if (this.outboundRetryTimer || !this.outboundQueue.hasOperations) return;
+    const delay = Math.min(
+      this.outboundRetryMaxDelayMs,
+      this.outboundRetryBaseDelayMs * 2 ** this.outboundRetryAttempt
+    );
+    this.outboundRetryAttempt += 1;
+    this.outboundRetryTimer = setTimeout(() => {
+      this.outboundRetryTimer = null;
+      if (this.state === "streaming") this.flushQueue();
+    }, delay);
+  }
+  clearOutboundRetryTimer() {
+    if (!this.outboundRetryTimer) return;
+    clearTimeout(this.outboundRetryTimer);
+    this.outboundRetryTimer = null;
+  }
   async handleOutboundAckTimeout(batchId) {
     if (!this.currentBatch || this.currentBatch.batchId !== batchId) return;
     this.outboundQueue.returnBatch(batchId);
     this.currentBatch = null;
     this.currentBatchRequiresPartialAck = false;
+    this.currentBatchRequiresRetryBackoff = false;
     this.clearOutboundAckTimer();
     await this.refreshPendingCount();
     if (this.state === "disconnected") return;
@@ -4241,10 +4391,12 @@ var SyncEngine = class {
   }
   handleTransportClose(reason) {
     this.clearOutboundAckTimer();
+    this.clearOutboundRetryTimer();
     if (this.currentBatch) {
       this.outboundQueue.returnBatch(this.currentBatch.batchId);
       this.currentBatch = null;
       this.currentBatchRequiresPartialAck = false;
+      this.currentBatchRequiresRetryBackoff = false;
     }
     if (this.schemaBlocked) {
       return;
@@ -4287,10 +4439,10 @@ var SyncEngine = class {
     return this.matchesScopeAndSubsets(op, fullRecord);
   }
   matchesScopeAndSubsets(op, fullRecord) {
-    if (!operationMatchesScope(op, this.activeScope, fullRecord)) {
+    if (!operationMatchesScope(op, this.activeUplinkScope, fullRecord)) {
       return false;
     }
-    return operationMatchesQuerySubsets(op, this.getActiveQuerySubsets(), fullRecord);
+    return this.hasDirectionalScopes || operationMatchesQuerySubsets(op, this.getActiveQuerySubsets(), fullRecord);
   }
   async readRecordForBackfill(op) {
     if (!this.store.readRecordFields) {