@enbox/agent 0.7.7 → 0.7.9

package/src/sync-link-id.ts

@@ -1,4 +1,4 @@
-/** Separator used in compound runtime/legacy cursor keys. */
+/** Separator used in compound replication link identifiers. */
 export const LINK_ID_SEPARATOR = '^';
 
 /** Opaque runtime identifier for a replication link. */
@@ -7,18 +7,13 @@ export type LinkId = string;
 /**
  * Build the runtime identifier for a replication link.
  *
- * Runtime identity is `(tenantDid, remoteEndpoint, scopeId)`.
+ * Runtime identity is `(tenantDid, remoteEndpoint, projectionId, authorizationEpoch)`.
  */
-export function buildLinkId(tenantDid: string, remoteEndpoint: string, scopeId: string): LinkId {
-  return `${tenantDid}${LINK_ID_SEPARATOR}${remoteEndpoint}${LINK_ID_SEPARATOR}${scopeId}`;
-}
-
-/**
- * Build the legacy cursor key used by the deprecated `syncCursors` sublevel.
- *
- * This remains only for one-time migration of pre-Phase-1f data.
- */
-export function buildLegacyCursorKey(tenantDid: string, remoteEndpoint: string, protocol?: string): string {
-  const base = `${tenantDid}${LINK_ID_SEPARATOR}${remoteEndpoint}`;
-  return protocol ? `${base}${LINK_ID_SEPARATOR}${protocol}` : base;
+export function buildLinkId(
+  tenantDid: string,
+  remoteEndpoint: string,
+  projectionId: string,
+  authorizationEpoch: string,
+): LinkId {
+  return `${tenantDid}${LINK_ID_SEPARATOR}${remoteEndpoint}${LINK_ID_SEPARATOR}${projectionId}${LINK_ID_SEPARATOR}${authorizationEpoch}`;
 }

package/src/sync-link-reconciler.ts

@@ -2,6 +2,8 @@ import type { GenericMessage, MessagesSyncDiffEntry } from '@enbox/dwn-sdk-js';
 
 import type { PushResult } from './types/sync.js';
 
+import { SyncPullAbortedError } from './sync-messages.js';
+
 export type ReconcileDirection = 'pull' | 'push';
 
 export type ReconcileTarget = {
@@ -9,6 +11,7 @@ export type ReconcileTarget = {
   dwnUrl: string;
   delegateDid?: string;
   protocol?: string;
+  permissionGrantIds?: string[];
 };
 
 export type ReconcileOutcome = {
@@ -25,28 +28,42 @@ export type ReconcileOutcome = {
 };
 
 type ReconcileDeps = {
-  getLocalRoot: (did: string, delegateDid?: string, protocol?: string) => Promise<string>;
-  getRemoteRoot: (did: string, dwnUrl: string, delegateDid?: string, protocol?: string) => Promise<string>;
+  getLocalRoot: (
+    did: string,
+    delegateDid?: string,
+    protocol?: string,
+    permissionGrantIds?: string[],
+  ) => Promise<string>;
+  getRemoteRoot: (
+    did: string,
+    dwnUrl: string,
+    delegateDid?: string,
+    protocol?: string,
+    permissionGrantIds?: string[],
+  ) => Promise<string>;
   diffWithRemote: (target: ReconcileTarget) => Promise<{ onlyRemote: MessagesSyncDiffEntry[]; onlyLocal: string[] }>;
   pullMessages: (params: {
     did: string;
     dwnUrl: string;
     delegateDid?: string;
     protocol?: string;
+    permissionGrantIds?: string[];
     messageCids: string[];
     prefetched: (MessagesSyncDiffEntry & { message: GenericMessage })[];
+    shouldContinue?: () => boolean;
   }) => Promise<void>;
   pushMessages: (params: {
     did: string;
     dwnUrl: string;
     delegateDid?: string;
     protocol?: string;
+    permissionGrantIds?: string[];
     messageCids: string[];
   }) => Promise<PushResult>;
   shouldContinue?: () => boolean;
 };
 
-function partitionRemoteEntries(entries: MessagesSyncDiffEntry[]): {
+export function partitionRemoteEntries(entries: MessagesSyncDiffEntry[]): {
   prefetched: (MessagesSyncDiffEntry & { message: GenericMessage })[];
   needsFetchCids: string[];
 } {
@@ -82,15 +99,15 @@ export class SyncLinkReconciler {
     direction?: ReconcileDirection;
     verifyConvergence?: boolean;
   }): Promise<ReconcileOutcome> {
-    const { did, dwnUrl, delegateDid, protocol } = target;
+    const { did, dwnUrl, delegateDid, protocol, permissionGrantIds } = target;
     const direction = options?.direction;
     const verifyConvergence = options?.verifyConvergence ?? false;
     const shouldContinue = this._deps.shouldContinue;
 
-    const localRoot = await this._deps.getLocalRoot(did, delegateDid, protocol);
+    const localRoot = await this._deps.getLocalRoot(did, delegateDid, protocol, permissionGrantIds);
     if (shouldContinue && !shouldContinue()) { return { aborted: true, changed: false, didPull: false, didPush: false }; }
 
-    const remoteRoot = await this._deps.getRemoteRoot(did, dwnUrl, delegateDid, protocol);
+    const remoteRoot = await this._deps.getRemoteRoot(did, dwnUrl, delegateDid, protocol, permissionGrantIds);
     if (shouldContinue && !shouldContinue()) { return { aborted: true, changed: false, didPull: false, didPush: false }; }
 
     let didPull = false;
@@ -103,14 +120,30 @@ export class SyncLinkReconciler {
 
       if ((!direction || direction === 'pull') && diff.onlyRemote.length > 0) {
         const { prefetched, needsFetchCids } = partitionRemoteEntries(diff.onlyRemote);
-        await this._deps.pullMessages({ did, dwnUrl, delegateDid, protocol, messageCids: needsFetchCids, prefetched });
+        try {
+          await this._deps.pullMessages({
+            did,
+            dwnUrl,
+            delegateDid,
+            protocol,
+            permissionGrantIds,
+            messageCids: needsFetchCids,
+            prefetched,
+            shouldContinue,
+          });
+        } catch (error) {
+          if (error instanceof SyncPullAbortedError) {
+            return { aborted: true, changed: true, didPull: false, didPush: false, localRoot, remoteRoot };
+          }
+          throw error;
+        }
         if (shouldContinue && !shouldContinue()) { return { aborted: true, changed: true, didPull: true, didPush: false, localRoot, remoteRoot }; }
         didPull = true;
       }
 
       if ((!direction || direction === 'push') && diff.onlyLocal.length > 0) {
         pushResult = await this._deps.pushMessages({
-          did, dwnUrl, delegateDid, protocol, messageCids: diff.onlyLocal,
+          did, dwnUrl, delegateDid, protocol, permissionGrantIds, messageCids: diff.onlyLocal,
         });
         if (shouldContinue && !shouldContinue()) {
           return { aborted: true, changed: true, didPull, didPush: true, localRoot, remoteRoot, pushResult };
@@ -130,12 +163,12 @@ export class SyncLinkReconciler {
       };
     }
 
-    const postLocalRoot = await this._deps.getLocalRoot(did, delegateDid, protocol);
+    const postLocalRoot = await this._deps.getLocalRoot(did, delegateDid, protocol, permissionGrantIds);
     if (shouldContinue && !shouldContinue()) {
       return { aborted: true, changed: localRoot !== remoteRoot, didPull, didPush, localRoot, remoteRoot, pushResult };
     }
 
-    const postRemoteRoot = await this._deps.getRemoteRoot(did, dwnUrl, delegateDid, protocol);
+    const postRemoteRoot = await this._deps.getRemoteRoot(did, dwnUrl, delegateDid, protocol, permissionGrantIds);
     if (shouldContinue && !shouldContinue()) {
       return { aborted: true, changed: localRoot !== remoteRoot, didPull, didPush, localRoot, remoteRoot, pushResult };
     }