@gscdump/engine-sqlite 0.17.2 → 0.17.4

package/dist/index.d.mts

@@ -8,6 +8,22 @@ import { SqliteRemoteDatabase } from "drizzle-orm/sqlite-proxy";
 import { ManifestStore } from "@gscdump/engine";
 import { ComparisonMode, ResolveWindowOptions, ResolvedWindow, WindowPreset, resolveWindow } from "@gscdump/engine/period";
 import { DrizzleD1Database } from "drizzle-orm/d1";
+interface CachedManifestStoreOptions {
+  ttlMs?: number;
+}
+interface CachedManifestStore extends ManifestStore {
+  bust: (scope: {
+    userId: string | number;
+    siteId?: string;
+    table?: string;
+    searchType?: string;
+  }) => void;
+  clear: () => void;
+  stats: () => {
+    size: number;
+  };
+}
+declare function createCachedManifestStore(inner: ManifestStore, options?: CachedManifestStoreOptions): CachedManifestStore;
 /**
  * Drizzle sqlite-core table definitions for the GSC analytics schema on D1.
  *
@@ -3189,4 +3205,4 @@ interface CreateSqliteResolverAdapterFromExecutorOptions {
  * an executor handy.
  */
 declare function createSqliteResolverAdapterFromExecutor(options: CreateSqliteResolverAdapterFromExecutorOptions): Promise<ResolverAdapter<TableKey>>;
-export { type AnalyticsManifestDb, type ComparisonMode, type EngineConfig, type R2LockInsert, type R2LockSelect, type R2ManifestInsert, type R2ManifestSelect, type R2ShadowDiffInsert, type R2ShadowDiffSelect, type R2SyncStateInsert, type R2SyncStateSelect, type R2WatermarkInsert, type R2WatermarkSelect, type R2WriteErrorInsert, type R2WriteErrorSelect, type ResolveWindowOptions, type ResolvedWindow, type SQL, type Schema, type ScopedRunnerOptions, type SqliteInsightRunner, type SqliteInsightRunnerOptions, type SqliteQueryExecutor, type SqliteRowExecutor, type TableKey, type TableScope, type WindowPreset, aggClicks, aggCtr, aggImpressions, aggPosition, and, compileSqlite, createD1ManifestStore, createEngine, createSqliteInsightRunner, createSqliteResolverAdapter, createSqliteResolverAdapterFromExecutor, eq, gsc_countries, gsc_devices, gsc_keywords, gsc_page_keywords, gsc_pages, gte, lte, mergeScope, probeSqliteRegex, r2Locks, r2Manifest, r2ShadowDiffs, r2SyncStates, r2Watermarks, r2WriteErrors, resolveWindow, schema, scopeFor, sql, sqliteResolverAdapter };
+export { type AnalyticsManifestDb, type CachedManifestStore, type CachedManifestStoreOptions, type ComparisonMode, type EngineConfig, type R2LockInsert, type R2LockSelect, type R2ManifestInsert, type R2ManifestSelect, type R2ShadowDiffInsert, type R2ShadowDiffSelect, type R2SyncStateInsert, type R2SyncStateSelect, type R2WatermarkInsert, type R2WatermarkSelect, type R2WriteErrorInsert, type R2WriteErrorSelect, type ResolveWindowOptions, type ResolvedWindow, type SQL, type Schema, type ScopedRunnerOptions, type SqliteInsightRunner, type SqliteInsightRunnerOptions, type SqliteQueryExecutor, type SqliteRowExecutor, type TableKey, type TableScope, type WindowPreset, aggClicks, aggCtr, aggImpressions, aggPosition, and, compileSqlite, createCachedManifestStore, createD1ManifestStore, createEngine, createSqliteInsightRunner, createSqliteResolverAdapter, createSqliteResolverAdapterFromExecutor, eq, gsc_countries, gsc_devices, gsc_keywords, gsc_page_keywords, gsc_pages, gte, lte, mergeScope, probeSqliteRegex, r2Locks, r2Manifest, r2ShadowDiffs, r2SyncStates, r2Watermarks, r2WriteErrors, resolveWindow, schema, scopeFor, sql, sqliteResolverAdapter };

package/dist/index.mjs

@@ -6,6 +6,70 @@ import { SQLiteAsyncDialect, index, integer, primaryKey, real, sqliteTable, text
 import { drizzle } from "drizzle-orm/sqlite-proxy";
 import { inferSearchType } from "@gscdump/engine";
 import { resolveWindow } from "@gscdump/engine/period";
+const DEFAULT_TTL_MS = 3e4;
+function cacheKey(filter) {
+	if (!filter.siteId || !filter.table || filter.partitions || filter.tier) return null;
+	const st = filter.searchType ?? "";
+	return `${filter.userId}\0${filter.siteId}\0${filter.table}\0${st}`;
+}
+function createCachedManifestStore(inner, options = {}) {
+	const ttlMs = options.ttlMs ?? DEFAULT_TTL_MS;
+	const cache = /* @__PURE__ */ new Map();
+	function bust(scope) {
+		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}`);
+			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);
+	}
+	return {
+		listLive: async (filter) => {
+			const k = cacheKey(filter);
+			if (!k) return inner.listLive(filter);
+			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
+			});
+			return value;
+		},
+		listAll: inner.listAll.bind(inner),
+		registerVersion: async (entry, superseding) => {
+			await inner.registerVersion(entry, superseding);
+			bust({
+				userId: entry.userId,
+				siteId: entry.siteId ?? "",
+				table: entry.table,
+				searchType: entry.searchType
+			});
+		},
+		registerVersions: async (entries, superseding) => {
+			await inner.registerVersions(entries, superseding);
+			for (const e of entries) bust({
+				userId: e.userId,
+				siteId: e.siteId ?? "",
+				table: e.table,
+				searchType: e.searchType
+			});
+		},
+		listRetired: inner.listRetired.bind(inner),
+		delete: inner.delete.bind(inner),
+		getWatermarks: inner.getWatermarks.bind(inner),
+		bumpWatermark: inner.bumpWatermark.bind(inner),
+		getSyncStates: inner.getSyncStates.bind(inner),
+		setSyncState: inner.setSyncState.bind(inner),
+		withLock: inner.withLock.bind(inner),
+		purgeTenant: inner.purgeTenant.bind(inner),
+		bust,
+		clear: () => cache.clear(),
+		stats: () => ({ size: cache.size })
+	};
+}
 function metricCols() {
 	return {
 		clicks: integer("clicks").notNull().default(0),
@@ -500,4 +564,4 @@ function createD1ManifestStore(db) {
 		purgeTenant
 	};
 }
-export { aggClicks, aggCtr, aggImpressions, aggPosition, and, compileSqlite, createD1ManifestStore, createEngine, createSqliteInsightRunner, createSqliteResolverAdapter, createSqliteResolverAdapterFromExecutor, eq, gsc_countries, gsc_devices, gsc_keywords, gsc_page_keywords, gsc_pages, gte, lte, mergeScope, probeSqliteRegex, r2Locks, r2Manifest, r2ShadowDiffs, r2SyncStates, r2Watermarks, r2WriteErrors, resolveWindow, schema, scopeFor, sql, sqliteResolverAdapter };
+export { aggClicks, aggCtr, aggImpressions, aggPosition, and, compileSqlite, createCachedManifestStore, createD1ManifestStore, createEngine, createSqliteInsightRunner, createSqliteResolverAdapter, createSqliteResolverAdapterFromExecutor, eq, gsc_countries, gsc_devices, gsc_keywords, gsc_page_keywords, gsc_pages, gte, lte, mergeScope, probeSqliteRegex, r2Locks, r2Manifest, r2ShadowDiffs, r2SyncStates, r2Watermarks, r2WriteErrors, resolveWindow, schema, scopeFor, sql, sqliteResolverAdapter };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/engine-sqlite",
   "type": "module",
-  "version": "0.17.2",
+  "version": "0.17.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": "^0.45.2"
   },
   "dependencies": {
-    "@gscdump/engine": "0.17.2",
-    "gscdump": "0.17.2"
+    "@gscdump/engine": "0.17.4",
+    "gscdump": "0.17.4"
   },
   "devDependencies": {
     "drizzle-orm": "^0.45.2",