@gscdump/engine-sqlite 0.37.2 → 0.37.4

package/dist/index.mjs

@@ -16,15 +16,22 @@ function cacheKey(filter) {
 function createCachedManifestStore(inner, options = {}) {
 	const ttlMs = options.ttlMs ?? DEFAULT_TTL_MS;
 	const cache = /* @__PURE__ */ new Map();
+	const inflight = /* @__PURE__ */ new Map();
+	let generation = 0;
+	function invalidateKey(key) {
+		cache.delete(key);
+		inflight.delete(key);
+	}
 	function bust(scope) {
+		generation++;
 		const userId = String(scope.userId);
 		if (scope.siteId && scope.table && scope.searchType !== void 0) {
-			cache.delete(`${userId}\0${scope.siteId}\0${scope.table}\0${scope.searchType}`);
-			cache.delete(`${userId}\0${scope.siteId}\0${scope.table}\0`);
+			invalidateKey(`${userId}\0${scope.siteId}\0${scope.table}\0${scope.searchType}`);
+			invalidateKey(`${userId}\0${scope.siteId}\0${scope.table}\0`);
 			return;
 		}
 		const prefix = scope.siteId && scope.table ? `${userId}\0${scope.siteId}\0${scope.table}\0` : scope.siteId ? `${userId}\0${scope.siteId}\0` : `${userId}\0`;
-		for (const k of cache.keys()) if (k.startsWith(prefix)) cache.delete(k);
+		for (const key of /* @__PURE__ */ new Set([...cache.keys(), ...inflight.keys()])) if (key.startsWith(prefix)) invalidateKey(key);
 	}
 	return {
 		listLive: async (filter) => {
@@ -33,12 +40,20 @@ function createCachedManifestStore(inner, options = {}) {
 			const now = Date.now();
 			const hit = cache.get(k);
 			if (hit && hit.expiresAt > now) return hit.value;
-			const value = await inner.listLive(filter);
-			cache.set(k, {
-				value,
-				expiresAt: now + ttlMs
+			const pending = inflight.get(k);
+			if (pending) return pending;
+			const loadGeneration = generation;
+			const load = inner.listLive(filter).then((value) => {
+				if (generation === loadGeneration && inflight.get(k) === load) cache.set(k, {
+					value,
+					expiresAt: Date.now() + ttlMs
+				});
+				return value;
+			}).finally(() => {
+				if (inflight.get(k) === load) inflight.delete(k);
 			});
-			return value;
+			inflight.set(k, load);
+			return load;
 		},
 		listAll: inner.listAll.bind(inner),
 		registerVersion: async (entry, superseding) => {
@@ -95,7 +110,11 @@ function createCachedManifestStore(inner, options = {}) {
 			return result;
 		},
 		bust,
-		clear: () => cache.clear(),
+		clear: () => {
+			generation++;
+			cache.clear();
+			inflight.clear();
+		},
 		stats: () => ({ size: cache.size })
 	};
 }
@@ -608,7 +627,9 @@ function createD1ManifestStore(db) {
 			await new Promise((resolve) => setTimeout(resolve, jitterDelay()));
 		}
 		return await fn().finally(async () => {
-			await Promise.resolve(db.delete(r2Locks).where(and$1(eq$1(r2Locks.scope, key), eq$1(r2Locks.holderId, holderId))).run()).catch(() => {});
+			await Promise.resolve(db.delete(r2Locks).where(and$1(eq$1(r2Locks.scope, key), eq$1(r2Locks.holderId, holderId))).run()).catch((error) => {
+				console.warn(`[gscdump/engine-sqlite] failed to release manifest lock ${key}; lease will expire`, error);
+			});
 		});
 	}
 	async function purgeTenant(filter) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/engine-sqlite",
   "type": "module",
-  "version": "0.37.2",
+  "version": "0.37.4",
   "description": "SQLite / D1 engine adapter for @gscdump/analysis — typed analytics over sqlite-proxy executors (Cloudflare D1, libsql).",
   "author": {
     "name": "Harlan Wilton",
@@ -44,8 +44,8 @@
     "drizzle-orm": "1.0.0-rc.3"
   },
   "dependencies": {
-    "@gscdump/engine": "0.37.2",
-    "gscdump": "0.37.2"
+    "gscdump": "0.37.4",
+    "@gscdump/engine": "0.37.4"
   },
   "devDependencies": {
     "drizzle-orm": "1.0.0-rc.3",