@recordtimelabel/core 0.6.12 → 0.6.13

package/README.md

@@ -17,10 +17,10 @@ During local development an app can consume a sibling checkout with:
 "@recordtimelabel/core": "file:../recordtimelabel-core"
 ```
 
-For release builds, consume a fixed npm package, git tag, or private registry version so builds do not depend on a sibling folder path. The release target is `0.6.12`; verify that its registry tarball and lockfile integrity are available before updating consumers:
+For release builds, consume a fixed npm package, git tag, or private registry version so builds do not depend on a sibling folder path. The release target is `0.6.13`; verify that its registry tarball and lockfile integrity are available before updating consumers:
 
 ```json
-"@recordtimelabel/core": "0.6.12"
+"@recordtimelabel/core": "0.6.13"
 ```
 
 If this checkout's `package.json` is ahead of the published version, publish the new package before updating consumers to that version.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@recordtimelabel/core",
-  "version": "0.6.12",
+  "version": "0.6.13",
   "type": "module",
   "description": "Shared RecordTimeLabel data model, merge logic, operations, and sync engine.",
   "main": "./src/index.js",

package/src/index.js

@@ -147,7 +147,7 @@ export {
   selectBestMatchingTwitchVod
 };
 
-export const RECORD_TIMELABEL_CORE_VERSION = '0.6.12';
+export const RECORD_TIMELABEL_CORE_VERSION = '0.6.13';
 export const RTL_SYNC_PROTOCOL_VERSION = 2;
 export const RECORD_TIMELABEL_DURABLE_ENGINE_CAPABILITIES = Object.freeze([
   'fifo-retry-fence',
@@ -5412,6 +5412,21 @@ export const createRecordTimeLabelSyncEngine = ({
           latestRootObservationRevision ?? 0,
           observedRevision
         );
+        // A successful root callback has already processed (or proven) this
+        // revision. Prefer that proof over an adapter-ready receipt that may
+        // have resolved earlier with an older revision.
+        const currentRevision = Number(adapterCatchUpProof?.revision);
+        const currentCaughtUp = Number(adapterCatchUpProof?.caughtUpToRevision);
+        adapterCatchUpProof = {
+          ...(adapterCatchUpProof || {}),
+          success: true,
+          revision: Number.isSafeInteger(currentRevision)
+            ? Math.max(currentRevision, observedRevision)
+            : observedRevision,
+          caughtUpToRevision: Number.isSafeInteger(currentCaughtUp)
+            ? Math.max(currentCaughtUp, observedRevision)
+            : observedRevision
+        };
       }
       if (!adapterReadyExpected) {
         adapterCatchUpProof = {
@@ -5483,9 +5498,20 @@ export const createRecordTimeLabelSyncEngine = ({
             }
           ));
         } else {
-          adapterCatchUpProof = result && typeof result === 'object'
+          const nextProof = result && typeof result === 'object'
             ? {...result, success: true}
             : {success: true};
+          const currentRevision = Number(adapterCatchUpProof?.revision);
+          const currentCaughtUp = Number(adapterCatchUpProof?.caughtUpToRevision);
+          adapterCatchUpProof = {
+            ...nextProof,
+            ...(Number.isSafeInteger(currentRevision) && Number.isSafeInteger(Number(nextProof.revision))
+              ? {revision: Math.max(currentRevision, Number(nextProof.revision))}
+              : {}),
+            ...(Number.isSafeInteger(currentCaughtUp) && Number.isSafeInteger(Number(nextProof.caughtUpToRevision))
+              ? {caughtUpToRevision: Math.max(currentCaughtUp, Number(nextProof.caughtUpToRevision))}
+              : {})
+          };
           settleReadyIfProven();
         }
       }).catch((error) => {