@keepkit/core 0.28.6 → 0.28.7

package/dist/core.js

@@ -20,7 +20,7 @@ import {
   reconcileKeepItems,
   reorderKeepItems,
   revalidateKeepItems
-} from "./chunk-5XSSH3TO.js";
+} from "./chunk-EMOPFB5D.js";
 import {
   KeepSchemaValidationError,
   parseKeepMeta,
@@ -54,7 +54,23 @@ import {
   isKeepSyncAuthError,
   isSameKeepScope,
   normalizeKeepTags
-} from "./chunk-QRPQYE7K.js";
+} from "./chunk-SLH4DFYQ.js";
+
+// src/features/persistence/write-lock.ts
+var writeQueues = /* @__PURE__ */ new Map();
+function withLocalStorageWriteLock(key, operation, lockUnavailableError) {
+  const lockName = `keepkit:local-storage:${key}`;
+  if (typeof navigator !== "undefined" && navigator.locks) {
+    return navigator.locks.request(lockName, operation);
+  }
+  if (typeof window !== "undefined") return Promise.reject(lockUnavailableError);
+  const previous = writeQueues.get(lockName) ?? Promise.resolve();
+  const next = previous.catch(() => void 0).then(operation);
+  writeQueues.set(lockName, next);
+  return next.finally(() => {
+    if (writeQueues.get(lockName) === next) writeQueues.delete(lockName);
+  });
+}
 
 // src/features/items/activity.ts
 var DEFAULT_KEEP_HISTORY_KEY = "keepkit:view-history";
@@ -62,7 +78,6 @@ var DEFAULT_KEEP_VIEWING_RECORDS_KEY = "keepkit:viewing-records";
 var DEFAULT_KEEP_HISTORY_LIMIT = 100;
 var LocalStorageKeepHistoryStorage = class {
   constructor(options = {}) {
-    this.writes = Promise.resolve();
     this.key = options.key ?? DEFAULT_KEEP_HISTORY_KEY;
     this.limitKey = `${this.key}:limit`;
     this.storage = options.storage ?? getBrowserStorage();
@@ -125,9 +140,12 @@ var LocalStorageKeepHistoryStorage = class {
     this.writeRaw(this.key, JSON.stringify(entries), "history");
   }
   withWriteLock(operation) {
-    const next = this.writes.then(operation);
-    this.writes = next.catch(() => void 0);
-    return next;
+    if (!this.storage) return operation();
+    return withLocalStorageWriteLock(
+      this.key,
+      operation,
+      new KeepActivityStorageError("KeepKit needs the Web Locks API to safely update history across tabs.", this.key)
+    );
   }
   async read(key, validate, label) {
     const raw = this.readRaw(key, label);
@@ -155,7 +173,6 @@ var LocalStorageKeepHistoryStorage = class {
 };
 var LocalStorageKeepViewingRecordStorage = class {
   constructor(options = {}) {
-    this.writes = Promise.resolve();
     this.key = options.key ?? DEFAULT_KEEP_VIEWING_RECORDS_KEY;
     this.storage = options.storage ?? getBrowserStorage();
     this.now = options.now ?? Date.now;
@@ -186,11 +203,14 @@ var LocalStorageKeepViewingRecordStorage = class {
     return this.withWriteLock(async () => {
       const records = await this.readRecords();
       const previous = records.find((entry) => entry.id === normalized.id);
+      if (previous?.updatedAt !== void 0 && normalized.updatedAt !== void 0 && previous.updatedAt > normalized.updatedAt) {
+        return { ...previous };
+      }
       const now = this.now();
       const next = {
         ...normalized,
         createdAt: previous?.createdAt ?? normalized.createdAt ?? now,
-        updatedAt: now
+        updatedAt: Math.max(now, (previous?.updatedAt ?? -1) + 1, normalized.updatedAt ?? -1)
       };
       this.writeRecords([...records.filter((entry) => entry.id !== normalized.id), next]);
       return { ...next };
@@ -237,9 +257,15 @@ var LocalStorageKeepViewingRecordStorage = class {
     }
   }
   withWriteLock(operation) {
-    const next = this.writes.then(operation);
-    this.writes = next.catch(() => void 0);
-    return next;
+    if (!this.storage) return operation();
+    return withLocalStorageWriteLock(
+      this.key,
+      operation,
+      new KeepActivityStorageError(
+        "KeepKit needs the Web Locks API to safely update viewing records across tabs.",
+        this.key
+      )
+    );
   }
 };
 var KeepActivityStorageError = class extends Error {
@@ -320,6 +346,7 @@ function createRecordId() {
 }
 
 // src/features/items/collections.ts
+var collectionMutationQueues = /* @__PURE__ */ new WeakMap();
 async function getKeepCollectionItems(storage, collectionId) {
   const memberships = await requireMemberships(storage);
   const items = await storage.getAll();
@@ -330,48 +357,62 @@ async function getKeepCollectionItems(storage, collectionId) {
   });
 }
 async function addKeepItemToCollection(storage, collectionId, itemId, order) {
-  if (!(await storage.getAll()).some((item) => item.id === itemId)) {
-    throw new Error(`KeepKit cannot add missing item "${itemId}" to a collection.`);
-  }
-  const collectionMemberships = (await requireMemberships(storage)).filter((membership) => membership.collectionId === collectionId).filter((membership) => membership.itemId !== itemId).sort((left, right) => left.order - right.order);
-  const insertionIndex = order ?? collectionMemberships.length;
-  if (!Number.isInteger(insertionIndex) || insertionIndex < 0) {
-    throw new RangeError("Collection order must be a non-negative integer.");
-  }
-  collectionMemberships.splice(Math.min(insertionIndex, collectionMemberships.length), 0, {
-    collectionId,
-    itemId,
-    order: insertionIndex
+  return withCollectionMutationLock(storage, async () => {
+    if (!(await storage.getAll()).some((item) => item.id === itemId)) {
+      throw new Error(`KeepKit cannot add missing item "${itemId}" to a collection.`);
+    }
+    const collectionMemberships = (await requireMemberships(storage)).filter((membership) => membership.collectionId === collectionId).filter((membership) => membership.itemId !== itemId).sort((left, right) => left.order - right.order);
+    const insertionIndex = order ?? collectionMemberships.length;
+    if (!Number.isInteger(insertionIndex) || insertionIndex < 0) {
+      throw new RangeError("Collection order must be a non-negative integer.");
+    }
+    collectionMemberships.splice(Math.min(insertionIndex, collectionMemberships.length), 0, {
+      collectionId,
+      itemId,
+      order: insertionIndex
+    });
+    const reordered = collectionMemberships.map((membership, index) => ({ ...membership, order: index }));
+    for (const membership of reordered) await storage.setCollectionMembership?.(membership);
+    const added = reordered.find((membership) => membership.itemId === itemId);
+    if (!added) throw new Error("KeepKit failed to add the collection membership.");
+    return added;
   });
-  const reordered = collectionMemberships.map((membership, index) => ({ ...membership, order: index }));
-  for (const membership of reordered) await storage.setCollectionMembership?.(membership);
-  const added = reordered.find((membership) => membership.itemId === itemId);
-  if (!added) throw new Error("KeepKit failed to add the collection membership.");
-  return added;
 }
 async function removeKeepItemFromCollection(storage, collectionId, itemId) {
-  const memberships = await requireMemberships(storage);
-  await storage.removeCollectionMembership?.(collectionId, itemId);
-  const remaining = memberships.filter((membership) => membership.collectionId === collectionId && membership.itemId !== itemId).sort((left, right) => left.order - right.order).map((membership, order) => ({ ...membership, order }));
-  for (const membership of remaining) await storage.setCollectionMembership?.(membership);
+  await withCollectionMutationLock(storage, async () => {
+    const memberships = await requireMemberships(storage);
+    await storage.removeCollectionMembership?.(collectionId, itemId);
+    const remaining = memberships.filter((membership) => membership.collectionId === collectionId && membership.itemId !== itemId).sort((left, right) => left.order - right.order).map((membership, order) => ({ ...membership, order }));
+    for (const membership of remaining) await storage.setCollectionMembership?.(membership);
+  });
 }
 async function reorderKeepCollectionItems(storage, collectionId, itemIds) {
-  const allMemberships = await requireMemberships(storage);
-  const current = allMemberships.filter((membership) => membership.collectionId === collectionId).sort((left, right) => left.order - right.order);
-  const currentIds = new Set(current.map((membership) => membership.itemId));
-  const orderedIds = [...itemIds.filter((id, index) => currentIds.has(id) && itemIds.indexOf(id) === index)];
-  for (const membership of current) {
-    if (!orderedIds.includes(membership.itemId)) orderedIds.push(membership.itemId);
-  }
-  const currentByItemId = new Map(current.map((membership) => [membership.itemId, membership]));
-  const reordered = orderedIds.map((itemId, order) => ({
-    ...currentByItemId.get(itemId) ?? {},
-    collectionId,
-    itemId,
-    order
-  }));
-  for (const membership of reordered) await storage.setCollectionMembership?.(membership);
-  return reordered;
+  return withCollectionMutationLock(storage, async () => {
+    const allMemberships = await requireMemberships(storage);
+    const current = allMemberships.filter((membership) => membership.collectionId === collectionId).sort((left, right) => left.order - right.order);
+    const currentIds = new Set(current.map((membership) => membership.itemId));
+    const orderedIds = [...itemIds.filter((id, index) => currentIds.has(id) && itemIds.indexOf(id) === index)];
+    for (const membership of current) {
+      if (!orderedIds.includes(membership.itemId)) orderedIds.push(membership.itemId);
+    }
+    const currentByItemId = new Map(current.map((membership) => [membership.itemId, membership]));
+    const reordered = orderedIds.map((itemId, order) => ({
+      ...currentByItemId.get(itemId) ?? {},
+      collectionId,
+      itemId,
+      order
+    }));
+    for (const membership of reordered) await storage.setCollectionMembership?.(membership);
+    return reordered;
+  });
+}
+function withCollectionMutationLock(storage, operation) {
+  const previous = collectionMutationQueues.get(storage) ?? Promise.resolve();
+  const next = previous.catch(() => void 0).then(operation);
+  collectionMutationQueues.set(storage, next);
+  return next.finally(() => {
+    if (collectionMutationQueues.get(storage) === next) collectionMutationQueues.delete(storage);
+  });
 }
 async function requireMemberships(storage) {
   if (!storage.getCollectionMemberships || !storage.setCollectionMembership || !storage.removeCollectionMembership) {
@@ -411,7 +452,6 @@ var createKeepKitSetup = createKeepKitPreset;
 var DEFAULT_KEEP_PROGRESS_KEY = "keepkit:progress";
 var LocalStorageKeepProgressStorage = class {
   constructor(options = {}) {
-    this.writes = Promise.resolve();
     this.key = options.key ?? DEFAULT_KEEP_PROGRESS_KEY;
     this.storage = options.storage ?? getBrowserStorage2();
     this.now = options.now ?? Date.now;
@@ -443,32 +483,53 @@ var LocalStorageKeepProgressStorage = class {
     return record;
   }
   async saveCourse(courseId, currentItemId) {
-    const record = {
-      kind: "course",
-      courseId: normalizeId2(courseId, "course"),
-      ...currentItemId?.trim() ? { currentItemId: currentItemId.trim() } : {},
-      updatedAt: this.now()
-    };
-    await this.set(record);
-    return record;
+    const id = normalizeId2(courseId, "course");
+    return this.withWriteLock(async () => {
+      const records = await this.getAll();
+      const previous = records.find((entry) => entry.kind === "course" && entry.courseId === id);
+      const record = {
+        kind: "course",
+        courseId: id,
+        ...currentItemId?.trim() ? { currentItemId: currentItemId.trim() } : {},
+        updatedAt: Math.max(this.now(), (previous?.updatedAt ?? -1) + 1)
+      };
+      this.writeRecords([
+        ...records.filter((entry) => getProgressIdentity(entry) !== getProgressIdentity(record)),
+        record
+      ]);
+      return record;
+    });
   }
   async saveItem(itemId, progress) {
-    const record = {
-      kind: "item",
-      itemId: normalizeId2(itemId, "item"),
-      ...progress,
-      ...progress.audioId?.trim() ? { audioId: progress.audioId.trim() } : {},
-      updatedAt: this.now()
-    };
-    await this.set(record);
-    return record;
+    const id = normalizeId2(itemId, "item");
+    return this.withWriteLock(async () => {
+      const records = await this.getAll();
+      const previous = records.find((entry) => entry.kind === "item" && entry.itemId === id);
+      const record = {
+        ...previous,
+        ...progress,
+        kind: "item",
+        itemId: id,
+        ...progress.audioId !== void 0 ? progress.audioId.trim() ? { audioId: progress.audioId.trim() } : { audioId: void 0 } : {},
+        updatedAt: Math.max(this.now(), (previous?.updatedAt ?? -1) + 1)
+      };
+      const normalized = normalizeProgressRecord(record);
+      if (normalized.kind !== "item") throw new TypeError("KeepKit progress record is invalid.");
+      this.writeRecords([
+        ...records.filter((entry) => getProgressIdentity(entry) !== getProgressIdentity(normalized)),
+        normalized
+      ]);
+      return normalized;
+    });
   }
   async set(record) {
     await this.withWriteLock(async () => {
       const normalized = normalizeProgressRecord(record);
       const records = await this.getAll();
       const identity = getProgressIdentity(normalized);
-      this.writeRecords([...records.filter((entry) => getProgressIdentity(entry) !== identity), normalized]);
+      const previous = records.find((entry) => getProgressIdentity(entry) === identity);
+      const resolved = previous && previous.updatedAt > normalized.updatedAt ? previous : normalized;
+      this.writeRecords([...records.filter((entry) => getProgressIdentity(entry) !== identity), resolved]);
     });
   }
   async resetCourse(courseId) {
@@ -504,9 +565,12 @@ var LocalStorageKeepProgressStorage = class {
     }
   }
   withWriteLock(operation) {
-    const next = this.writes.then(operation);
-    this.writes = next.catch(() => void 0);
-    return next;
+    if (!this.storage) return operation();
+    return withLocalStorageWriteLock(
+      this.key,
+      operation,
+      new KeepProgressStorageError("KeepKit needs the Web Locks API to safely update progress across tabs.", this.key)
+    );
   }
 };
 function isProgressCompatible(record, compatibility) {