@recordtimelabel/core 0.6.13 → 0.6.15

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.13`; 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.15`; verify that its registry tarball and lockfile integrity are available before updating consumers:
 
 ```json
-"@recordtimelabel/core": "0.6.13"
+"@recordtimelabel/core": "0.6.15"
 ```
 
 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.13",
+  "version": "0.6.15",
   "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.13';
+export const RECORD_TIMELABEL_CORE_VERSION = '0.6.15';
 export const RTL_SYNC_PROTOCOL_VERSION = 2;
 export const RECORD_TIMELABEL_DURABLE_ENGINE_CAPABILITIES = Object.freeze([
   'fifo-retry-fence',
@@ -3660,7 +3660,11 @@ const rtlClearBootstrapResumeMeta = (syncMeta) => {
 };
 
 const rtlRebindSameOwnerWorkspaceEpoch = (workspace, captured, now) => {
-  const ownerUid = rtlNormalizeUid(captured?.uid);
+  const ownerUid = rtlNormalizeUid(
+    captured?.localOnly
+      ? (captured?.retainedOwnerUid || captured?.ownerUid || captured?.uid)
+      : captured?.uid
+  );
   const workspaceEpoch = rtlNormalizeWorkspaceEpoch(captured?.workspaceEpoch, 0);
   const next = clone(workspace);
   next.ownerUid = ownerUid;
@@ -4013,6 +4017,7 @@ const rtlSessionContext = (captured, workspace, client) => ({
   uid: captured?.uid ?? (captured?.hasSession ? null : workspace?.ownerUid ?? null),
   ownerUid: captured?.uid ?? (captured?.hasSession ? null : workspace?.ownerUid ?? null),
   workspaceEpoch: workspace?.workspaceEpoch ?? captured?.workspaceEpoch ?? 0,
+  localOnly: captured?.localOnly === true,
   client: clone(client)
 });
 
@@ -4386,7 +4391,7 @@ export const createRecordTimeLabelSyncEngine = ({
     }
   };
 
-  const normalizeBootstrapResponse = (response) => {
+  const normalizeBootstrapResponse = (response, context = null) => {
     if (!rtlEnvelopeSuccess(response)) {
       const source = response && typeof response === 'object' ? response : {
         message: 'recordtimelabel_bootstrap_failed',
@@ -4397,6 +4402,14 @@ export const createRecordTimeLabelSyncEngine = ({
     }
     const remote = rtlEnvelopePayload(response);
     if (remote?.localOnly === true) {
+      if (context?.localOnly !== true) {
+        throw toRecordTimeLabelCloudFailureError({
+          code: 'recordtimelabel_invalid_bootstrap_response',
+          reason: 'recordtimelabel_invalid_bootstrap_response',
+          message: 'recordtimelabel_invalid_bootstrap_response',
+          retryable: false
+        });
+      }
       const localState = remote.state ?? remote.data;
       if (!rtlDurableIsObject(localState)) {
         throw toRecordTimeLabelCloudFailureError({
@@ -4436,7 +4449,7 @@ export const createRecordTimeLabelSyncEngine = ({
   const runBootstrapAttempt = async (context, mode) => {
     const options = bootstrapAttemptOptions(mode, context);
     try {
-      const baseline = normalizeBootstrapResponse(await cloud.bootstrap(context, options));
+      const baseline = normalizeBootstrapResponse(await cloud.bootstrap(context, options), context);
       clearBootstrapAttempt(mode, options);
       return baseline;
     } catch (error) {
@@ -4534,7 +4547,7 @@ export const createRecordTimeLabelSyncEngine = ({
           ...createBootstrapAttemptOptions(`${mode}-catchup`)
         });
         if (rtlEnvelopeSuccess(caught)) {
-          return requireBootstrapRevision(normalizeBootstrapResponse(caught), targetRevision);
+          return requireBootstrapRevision(normalizeBootstrapResponse(caught, context), targetRevision);
         }
         const failure = normalizeRecordTimeLabelCloudFailure(caught);
         if (failure.class !== RECORD_TIMELABEL_CLOUD_FAILURE_CLASSES.BOOTSTRAP_REQUIRED) {
@@ -4570,6 +4583,9 @@ export const createRecordTimeLabelSyncEngine = ({
     const sourceOwnerUid = rtlNormalizeUid(source.ownerUid);
     const sourcePending = toArray(source.pendingOperations ?? source.pendingOps);
     const sourceHasBoundOperation = sourcePending.some((operation) => rtlNormalizeUid(operation?.ownerUid));
+    const currentUid = captured?.localOnly
+      ? (captured?.retainedOwnerUid || captured?.ownerUid || null)
+      : captured?.uid;
     const loadedWorkspace = rtlNormalizeDurableWorkspace(
       hasDurableShape ? source : {
         ...source,
@@ -4578,15 +4594,12 @@ export const createRecordTimeLabelSyncEngine = ({
         syncMeta: source.syncMeta || {}
       },
       {
-        ownerUid: captured?.uid,
+        ownerUid: currentUid,
         workspaceEpoch: captured?.workspaceEpoch,
         client,
         now
       }
     );
-    const currentUid = captured?.localOnly
-      ? (captured?.retainedOwnerUid || captured?.ownerUid || null)
-      : captured?.uid;
     const currentEpoch = captured?.workspaceEpoch ?? loadedWorkspace.workspaceEpoch;
     const anonymousMigration = Boolean(
       currentUid &&
@@ -5417,16 +5430,18 @@ export const createRecordTimeLabelSyncEngine = ({
         // 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 (adapterCatchUpProof) {
+          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 = {
@@ -5763,7 +5778,8 @@ export const createRecordTimeLabelSyncEngine = ({
     }
     if (!(await isCurrent(captured))) return {success: false, reason: 'stale_session'};
     if (!workspaceMatchesSession(captured)) {
-      resetForSessionIdentity(captured);
+      const transition = resetForSessionIdentity(captured);
+      if (transition?.stale) return transition;
       return {success: false, code: 'recordtimelabel_hydration_required'};
     }
     const blockedFailure = workspace.syncMeta?.terminalFailureBlock;