@paroicms/server-text-cache-system 1.2.3 → 1.3.1

package/ddl/text-cache.ddl.sql

@@ -1,31 +1,44 @@
 PRAGMA journal_mode = TRUNCATE;
 PRAGMA foreign_keys = 1;
 
-drop index if exists PaCacheDependency_depK_index;
-drop table if exists PaCacheDependency;
-drop table if exists PaCache;
-drop table if exists PaDbMetadata;
-
-create table PaDbMetadata (
-  dbSchema varchar(100) not null primary key,
-  dbVersion integer not null
+drop index if exists PaTextCacheScheduledInvalidation_eventK_idx;
+drop table if exists PaTextCacheScheduledInvalidation;
+drop index if exists PaTextCacheDependency_depK_idx;
+drop table if exists PaTextCacheDependency;
+drop table if exists PaTextCache;
+drop table if exists PaMetadata;
+
+create table PaMetadata (
+  dbSchema varchar(100) not null,
+  k varchar(100) not null,
+  val varchar(250) not null,
+  primary key (dbSchema, k)
 );
 
-insert into PaDbMetadata (dbSchema, dbVersion) values ('text-cache', 2);
+insert into PaMetadata (dbSchema, k, val) values ('text-cache', 'dbSchemaVersion', '3');
 
-create table PaCache (
-  id integer not null primary key autoincrement,
-  ts timestamp not null default current_timestamp,
+create table PaTextCache (
+  k varchar(250) not null primary key,
   resourceVersion varchar(100) not null,
-  k varchar(250) not null unique,
   val text not null,
-  lastUseTs timestamp not null default current_timestamp
+  modifiedAt timestamp not null default current_timestamp,
+  readAt timestamp not null default current_timestamp
 );
 
-create table PaCacheDependency (
-  cacheId integer not null references PaCache (id) on delete cascade,
+create table PaTextCacheDependency (
+  cacheK varchar(250) not null references PaTextCache (k) on delete cascade,
+  depK varchar(250) not null,
+  primary key (cacheK, depK)
+);
+
+create index PaTextCacheDependency_depK_idx on PaTextCacheDependency (depK);
+
+create table PaTextCacheScheduledInvalidation (
+  eventK varchar(250) not null,
   depK varchar(250) not null,
-  primary key (cacheId, depK)
+  scheduledAt timestamp not null,
+  scheduledSince timestamp not null default current_timestamp,
+  primary key (eventK, depK)
 );
 
-create index PaCacheDependency_depK_index on PaCacheDependency (depK);
+create index PaTextCacheScheduledInvalidation_eventK_idx on PaTextCacheScheduledInvalidation (eventK);

package/dist/cache-system.d.ts

@@ -1,7 +1,7 @@
 import type { AppLog, Tracker } from "@paroicms/server-lib";
 import type { CacheSetData, CacheValue, TextCacheSystemStorage } from "./public-types";
 export interface CreateTextCacheSystemOptions {
-    siteName: string;
+    appVersion: string;
     storage: TextCacheSystemStorage;
     appLog: AppLog;
     /**
@@ -13,13 +13,19 @@ export interface TextCacheSystem {
     setCacheValue(data: CacheSetData, tracker: Tracker): Promise<CacheValue>;
     getCacheValue(cacheKey: string, tracker: Tracker): Promise<CacheValue | undefined>;
     getDependencyKeys(cacheKey: string, tracker: Tracker): Promise<string[]>;
-    /**
-     * @returns the list of cache cacheKeys that were deleted
-     */
-    invalidate(dependencyKeys: string[]): Promise<string[]>;
+    invalidate(dependencyKeys: string[]): Promise<void>;
+    scheduleInvalidation(eventKey: string, dependencyKeys: string[], scheduledAt: Date): Promise<void>;
+    cancelScheduledInvalidation(eventKey: string): Promise<void>;
     cleanUnusedValues(): Promise<void>;
+    invalidateAll(): Promise<void>;
     clearCache(): Promise<void>;
     close(): Promise<void>;
 }
-export declare function createTextCacheSystem(options: CreateTextCacheSystemOptions): Promise<TextCacheSystem>;
-export declare function createNoTextCacheSystem(): TextCacheSystem;
+export declare function createTextCacheSystem(options: CreateTextCacheSystemOptions): Promise<{
+    textCache: TextCacheSystem;
+    isCleared: boolean;
+}>;
+export declare function createNoTextCacheSystem(): {
+    textCache: TextCacheSystem;
+    isCleared: boolean;
+};

package/dist/cache-system.js

@@ -3,14 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNoTextCacheSystem = exports.createTextCacheSystem = void 0;
 const cache_system_context_1 = require("./internal/cache-system-context");
 const queries_1 = require("./internal/queries");
+const scheduled_invalidation_queries_1 = require("./internal/scheduled-invalidation-queries");
 async function createTextCacheSystem(options) {
-    const context = await (0, cache_system_context_1.createTextCacheSystemContext)(options);
+    const { context, isCleared } = await (0, cache_system_context_1.createTextCacheSystemContext)(options);
     function checkStatus() {
         if (context.status !== "ready") {
             throw new Error(`TextCache is ${context.status}`);
         }
     }
-    return {
+    const textCache = {
         async setCacheValue(data, tracker) {
             checkStatus();
             return await (0, queries_1.insertOrUpdateCacheValue)(context.cn, data, tracker);
@@ -19,7 +20,7 @@ async function createTextCacheSystem(options) {
             checkStatus();
             const value = await (0, queries_1.getCacheValue)(context, cacheKey, tracker);
             if (value !== undefined) {
-                context.appLog.debug(`[${context.siteName}] found cache: ${cacheKey}`);
+                context.appLog.debug(`found cache: ${cacheKey}`);
             }
             return value;
         },
@@ -31,41 +32,61 @@ async function createTextCacheSystem(options) {
             checkStatus();
             const cacheKeys = await (0, queries_1.deleteCacheValues)(context.cn, { dependencyKeys });
             if (cacheKeys.length > 0) {
-                context.appLog.debug(`[${context.siteName}] ${cacheKeys.length} invalidated cache: ${cacheKeys.join(", ")}`);
+                context.appLog.debug(`${cacheKeys.length} invalidated cache: ${cacheKeys.join(", ")}`);
             }
-            return cacheKeys;
+        },
+        async scheduleInvalidation(eventKey, dependencyKeys, scheduledAt) {
+            checkStatus();
+            await (0, scheduled_invalidation_queries_1.setScheduledInvalidation)(context.cn, { eventKey, dependencyKeys, scheduledAt });
+            await context.scheduler.reset();
+        },
+        async cancelScheduledInvalidation(eventKey) {
+            checkStatus();
+            await (0, scheduled_invalidation_queries_1.deleteScheduledInvalidation)(context.cn, eventKey);
+            await context.scheduler.reset();
         },
         async cleanUnusedValues() {
             checkStatus();
             const count = await (0, queries_1.deleteUnusedCacheValues)(context);
             if (count !== undefined && count > 0) {
-                context.appLog.debug(`[${context.siteName}] ${count} unused cache values were deleted`);
+                context.appLog.debug(`${count} unused cache values were deleted`);
             }
         },
+        async invalidateAll() {
+            checkStatus();
+            await (0, queries_1.invalidateAllCacheValues)(context);
+            context.appLog.debug("cache is fully invalidated");
+        },
         async clearCache() {
             checkStatus();
             await (0, queries_1.clearCacheValues)(context);
-            context.appLog.debug(`[${context.siteName}] cache is cleared`);
+            context.appLog.debug("cache is cleared");
         },
         async close() {
             if (context.status === "destroyed")
                 return;
             context.status = "destroyed";
-            await context.mainCn.destroy();
+            await context.scheduler.stop();
+            await context.cn.destroy();
         },
     };
+    return { textCache, isCleared };
 }
 exports.createTextCacheSystem = createTextCacheSystem;
 function createNoTextCacheSystem() {
-    return {
+    const textCache = {
         setCacheValue: (data) => Promise.resolve({ value: data.value }),
         getCacheValue: () => Promise.resolve(undefined),
         getDependencyKeys: () => Promise.resolve([]),
-        invalidate: () => Promise.resolve([]),
+        invalidate: () => Promise.resolve(),
+        scheduleInvalidation: () => Promise.resolve(),
+        cancelScheduledInvalidation: () => Promise.resolve(),
         cleanUnusedValues: () => Promise.resolve(),
+        invalidateAll: () => Promise.resolve(),
         clearCache: () => Promise.resolve(),
         close: () => Promise.resolve(),
     };
+    return { textCache, isCleared: false };
 }
 exports.createNoTextCacheSystem = createNoTextCacheSystem;
 //# sourceMappingURL=cache-system.js.map

package/dist/cache-system.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache-system.js","sourceRoot":"","sources":["../src/cache-system.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cache-system.js","sourceRoot":"","sources":["../src/cache-system.ts"],"names":[],"mappings":"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"}

package/dist/db-init/db-init.d.ts

@@ -1,10 +1,11 @@
 import { type AppLog } from "@paroicms/server-lib";
 import type { DataSource } from "typeorm";
-export declare function createOrOpenMainCn({ sqliteFile, siteName, appLog, }: {
+export declare function createOrOpenConnection({ sqliteFile, appVersion, appLog, }: {
     sqliteFile: string;
-    siteName: string;
+    appVersion: string;
     appLog: AppLog;
 }): Promise<{
-    mainCn: DataSource;
+    cn: DataSource;
     logNextQuery: (count?: number | undefined) => void;
+    isCleared: boolean;
 }>;

package/dist/db-init/db-init.js

@@ -1,36 +1,56 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createOrOpenMainCn = void 0;
-const node_path_1 = require("node:path");
+exports.createOrOpenConnection = void 0;
 const server_lib_1 = require("@paroicms/server-lib");
+const node_path_1 = require("node:path");
 const constants_1 = require("../constants");
-const PaCache_entity_1 = require("../entities/PaCache.entity");
-const PaCacheDependency_entity_1 = require("../entities/PaCacheDependency.entity");
+const queries_1 = require("../internal/queries");
 const ddl_migration_1 = require("./ddl-migration");
-async function createOrOpenMainCn({ sqliteFile, siteName, appLog, }) {
-    const { logNextQuery, typeOrmLogger } = (0, server_lib_1.createSqlLogger)({ appLog, siteName, dbSchemaName: ddl_migration_1.dbSchemaName });
-    const { mainCn } = await (0, server_lib_1.createOrOpenSqliteConnection)({
-        siteName: siteName,
+const PaTextCache_entity_1 = require("./entities/PaTextCache.entity");
+const PaTextCacheDependency_entity_1 = require("./entities/PaTextCacheDependency.entity");
+async function createOrOpenConnection({ sqliteFile, appVersion, appLog, }) {
+    const { logNextQuery, typeOrmLogger } = (0, server_lib_1.createSqlLogger)({ appLog, dbSchemaName: ddl_migration_1.dbSchemaName });
+    const { cn, isNewDb, migrationReport } = await (0, server_lib_1.createOrOpenSqliteConnection)({
         canCreate: true,
         dbSchemaName: ddl_migration_1.dbSchemaName,
         sqliteFile,
         ddlFile: (0, node_path_1.join)(constants_1.packageDir, "ddl", "text-cache.ddl.sql"),
         migrateDb,
-        entities: [PaCache_entity_1.PaCacheEntity, PaCacheDependency_entity_1.PaCacheDependencyEntity],
+        entities: [PaTextCache_entity_1.PaTextCacheEntity, PaTextCacheDependency_entity_1.PaTextCacheDependencyEntity],
         logger: typeOrmLogger,
         appLog,
     });
+    let isCleared = isNewDb || migrationReport.migrated;
+    const storedAppVersion = await (0, server_lib_1.getMetadataValue)(cn, { dbSchemaName: ddl_migration_1.dbSchemaName, key: "appVersion" });
+    if (storedAppVersion !== appVersion) {
+        if (!isCleared) {
+            await (0, queries_1.clearCacheValues)({ cn });
+            isCleared = true;
+        }
+        await (0, server_lib_1.setMetadataValue)(cn, { dbSchemaName: ddl_migration_1.dbSchemaName, key: "appVersion", value: appVersion });
+        if (storedAppVersion !== undefined) {
+            appLog.info(`Cleared text cache due to app version change from ${storedAppVersion} to ${appVersion}`);
+        }
+    }
     async function migrateDb(cn) {
-        const dbVersion = await (0, ddl_migration_1.getDbVersion)(cn, { siteName });
-        if (dbVersion !== ddl_migration_1.currentVariantsDbSchemaVersion) {
-            await (0, ddl_migration_1.migrateMediasDb)(cn, {
-                fromVersion: dbVersion,
-                siteName,
-                appLog,
-            });
+        const dbVersion = await (0, server_lib_1.getMetadataDbSchemaVersion)(cn, { dbSchemaName: ddl_migration_1.dbSchemaName });
+        if (dbVersion === ddl_migration_1.currentDbSchemaVersion) {
+            return {
+                migrated: false,
+                schemaVersion: dbVersion,
+            };
         }
+        await (0, ddl_migration_1.migrateTextCacheDb)(cn, {
+            fromVersion: dbVersion,
+            appLog,
+        });
+        return {
+            migrated: true,
+            fromVersion: dbVersion,
+            schemaVersion: ddl_migration_1.currentDbSchemaVersion,
+        };
     }
-    return { mainCn, logNextQuery };
+    return { cn, logNextQuery, isCleared };
 }
-exports.createOrOpenMainCn = createOrOpenMainCn;
+exports.createOrOpenConnection = createOrOpenConnection;
 //# sourceMappingURL=db-init.js.map

package/dist/db-init/db-init.js.map

@@ -1 +1 @@
-{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../src/db-init/db-init.ts"],"names":[],"mappings":";;;AAAA,yCAAiC;AACjC,qDAAkG;AAElG,4CAA0C;AAC1C,+DAA2D;AAC3D,mFAA+E;AAC/E,mDAKyB;AAElB,KAAK,UAAU,kBAAkB,CAAC,EACvC,UAAU,EACV,QAAQ,EACR,MAAM,GACmD;IACzD,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,IAAA,4BAAe,EAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAZ,4BAAY,EAAE,CAAC,CAAC;IAE5F,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,yCAA4B,EAAC;QACpD,QAAQ,EAAE,QAAQ;QAClB,SAAS,EAAE,IAAI;QACf,YAAY,EAAZ,4BAAY;QACZ,UAAU;QACV,OAAO,EAAE,IAAA,gBAAI,EAAC,sBAAU,EAAE,KAAK,EAAE,oBAAoB,CAAC;QACtD,SAAS;QACT,QAAQ,EAAE,CAAC,8BAAa,EAAE,kDAAuB,CAAC;QAClD,MAAM,EAAE,aAAa;QACrB,MAAM;KACP,CAAC,CAAC;IAEH,KAAK,UAAU,SAAS,CAAC,EAAc;QACrC,MAAM,SAAS,GAAG,MAAM,IAAA,4BAAY,EAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvD,IAAI,SAAS,KAAK,8CAA8B,EAAE,CAAC;YACjD,MAAM,IAAA,+BAAe,EAAC,EAAE,EAAE;gBACxB,WAAW,EAAE,SAAS;gBACtB,QAAQ;gBACR,MAAM;aACP,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;AAClC,CAAC;AA/BD,gDA+BC"}
+{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../src/db-init/db-init.ts"],"names":[],"mappings":";;;AAAA,qDAQ8B;AAC9B,yCAAiC;AAEjC,4CAA0C;AAC1C,iDAAuD;AACvD,mDAA2F;AAC3F,sEAAkE;AAClE,0FAAsF;AAE/E,KAAK,UAAU,sBAAsB,CAAC,EAC3C,UAAU,EACV,UAAU,EACV,MAAM,GACqD;IAC3D,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,IAAA,4BAAe,EAAC,EAAE,MAAM,EAAE,YAAY,EAAZ,4BAAY,EAAE,CAAC,CAAC;IAElF,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,MAAM,IAAA,yCAA4B,EAAC;QAC1E,SAAS,EAAE,IAAI;QACf,YAAY,EAAZ,4BAAY;QACZ,UAAU;QACV,OAAO,EAAE,IAAA,gBAAI,EAAC,sBAAU,EAAE,KAAK,EAAE,oBAAoB,CAAC;QACtD,SAAS;QACT,QAAQ,EAAE,CAAC,sCAAiB,EAAE,0DAA2B,CAAC;QAC1D,MAAM,EAAE,aAAa;QACrB,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,SAAS,GAAG,OAAO,IAAI,eAAe,CAAC,QAAQ,CAAC;IAEpD,MAAM,gBAAgB,GAAG,MAAM,IAAA,6BAAgB,EAAC,EAAE,EAAE,EAAE,YAAY,EAAZ,4BAAY,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC;IACzF,IAAI,gBAAgB,KAAK,UAAU,EAAE,CAAC;QACpC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAA,0BAAgB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC/B,SAAS,GAAG,IAAI,CAAC;QACnB,CAAC;QACD,MAAM,IAAA,6BAAgB,EAAC,EAAE,EAAE,EAAE,YAAY,EAAZ,4BAAY,EAAE,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;QACnF,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CACT,qDAAqD,gBAAgB,OAAO,UAAU,EAAE,CACzF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,UAAU,SAAS,CAAC,EAAc;QACrC,MAAM,SAAS,GAAG,MAAM,IAAA,uCAA0B,EAAC,EAAE,EAAE,EAAE,YAAY,EAAZ,4BAAY,EAAE,CAAC,CAAC;QACzE,IAAI,SAAS,KAAK,sCAAsB,EAAE,CAAC;YACzC,OAAO;gBACL,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,SAAS;aACzB,CAAC;QACJ,CAAC;QACD,MAAM,IAAA,kCAAkB,EAAC,EAAE,EAAE;YAC3B,WAAW,EAAE,SAAS;YACtB,MAAM;SACP,CAAC,CAAC;QACH,OAAO;YACL,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,SAAS;YACtB,aAAa,EAAE,sCAAsB;SACtC,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;AACzC,CAAC;AAtDD,wDAsDC"}

package/dist/db-init/ddl-migration.d.ts

@@ -1,12 +1,8 @@
 import { type AppLog } from "@paroicms/server-lib";
 import type { DataSource } from "typeorm";
 export declare const dbSchemaName = "text-cache";
-export declare const currentVariantsDbSchemaVersion = 2;
-export declare function getDbVersion(cn: DataSource, { siteName }: {
-    siteName: string;
-}): Promise<number>;
-export declare function migrateMediasDb(cn: DataSource, { fromVersion, siteName, appLog }: {
+export declare const currentDbSchemaVersion = 3;
+export declare function migrateTextCacheDb(cn: DataSource, { fromVersion, appLog }: {
     fromVersion: number;
-    siteName: string;
     appLog: AppLog;
 }): Promise<void>;

package/dist/db-init/ddl-migration.js

@@ -1,32 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.migrateMediasDb = exports.getDbVersion = exports.currentVariantsDbSchemaVersion = exports.dbSchemaName = void 0;
-const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
+exports.migrateTextCacheDb = exports.currentDbSchemaVersion = exports.dbSchemaName = void 0;
 const server_lib_1 = require("@paroicms/server-lib");
 const node_path_1 = require("node:path");
 const constants_1 = require("../constants");
 exports.dbSchemaName = "text-cache";
-exports.currentVariantsDbSchemaVersion = 2;
-async function getDbVersion(cn, { siteName }) {
-    const [row] = await cn.query(`select dbVersion from PaDbMetadata where dbSchema = '${exports.dbSchemaName}'`);
-    if (!row)
-        throw new Error(`[${siteName}] missing dbSchema '${exports.dbSchemaName}' in database`);
-    return (0, data_formatters_lib_1.nbVal)(row.dbVersion, { varName: "dbVersion" });
-}
-exports.getDbVersion = getDbVersion;
-async function migrateMediasDb(cn, { fromVersion, siteName, appLog }) {
-    const toVersion = exports.currentVariantsDbSchemaVersion;
+exports.currentDbSchemaVersion = 3;
+async function migrateTextCacheDb(cn, { fromVersion, appLog }) {
+    const toVersion = exports.currentDbSchemaVersion;
     let currentVersion = fromVersion;
+    if (currentVersion <= 2) {
+        await cn.query("drop table if exists PaTextCacheScheduledInvalidation");
+        await cn.query("drop index if exists PaTextCacheDependency_depK_index");
+        await cn.query("drop table if exists PaTextCacheDependency");
+        await cn.query("drop table if exists PaTextCache");
+    }
     // We don't care losing cache data
     if (currentVersion < toVersion) {
-        appLog.info(`[${siteName}] reset the text-cache database`);
+        appLog.info("reset the text-cache database");
         await (0, server_lib_1.executeDdl)(cn, (0, node_path_1.join)(constants_1.packageDir, "ddl", "text-cache.ddl.sql"));
-        currentVersion = await getDbVersion(cn, { siteName });
+        currentVersion = await (0, server_lib_1.getMetadataDbSchemaVersion)(cn, { dbSchemaName: exports.dbSchemaName });
     }
     if (currentVersion !== toVersion) {
-        throw new Error(`[${siteName}] version of ${exports.dbSchemaName} database should be '${toVersion}', but is '${currentVersion}'`);
+        throw new Error(`version of ${exports.dbSchemaName} database should be '${toVersion}', but is '${currentVersion}'`);
     }
-    appLog.info(`[${siteName}] ${exports.dbSchemaName} database was migrated from ${fromVersion} to ${currentVersion}`);
+    appLog.info(`${exports.dbSchemaName} database was migrated from ${fromVersion} to ${currentVersion}`);
 }
-exports.migrateMediasDb = migrateMediasDb;
+exports.migrateTextCacheDb = migrateTextCacheDb;
 //# sourceMappingURL=ddl-migration.js.map

package/dist/db-init/ddl-migration.js.map

@@ -1 +1 @@
-{"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../src/db-init/ddl-migration.ts"],"names":[],"mappings":";;;AAAA,oEAAmD;AAEnD,qDAA+D;AAC/D,yCAAiC;AAEjC,4CAA0C;AAE7B,QAAA,YAAY,GAAG,YAAY,CAAC;AAC5B,QAAA,8BAA8B,GAAG,CAAC,CAAC;AAEzC,KAAK,UAAU,YAAY,CAAC,EAAc,EAAE,EAAE,QAAQ,EAAwB;IACnF,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,EAAE,CAAC,KAAK,CAC1B,wDAAwD,oBAAY,GAAG,CACxE,CAAC;IACF,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,IAAI,QAAQ,uBAAuB,oBAAY,eAAe,CAAC,CAAC;IAC1F,OAAO,IAAA,2BAAK,EAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;AACxD,CAAC;AAND,oCAMC;AAEM,KAAK,UAAU,eAAe,CACnC,EAAc,EACd,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAA6D;IAE5F,MAAM,SAAS,GAAG,sCAA8B,CAAC;IACjD,IAAI,cAAc,GAAG,WAAW,CAAC;IAEjC,kCAAkC;IAClC,IAAI,cAAc,GAAG,SAAS,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,IAAI,QAAQ,iCAAiC,CAAC,CAAC;QAC3D,MAAM,IAAA,uBAAU,EAAC,EAAE,EAAE,IAAA,gBAAI,EAAC,sBAAU,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC;QACpE,cAAc,GAAG,MAAM,YAAY,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,IAAI,QAAQ,gBAAgB,oBAAY,wBAAwB,SAAS,cAAc,cAAc,GAAG,CACzG,CAAC;IACJ,CAAC;IACD,MAAM,CAAC,IAAI,CACT,IAAI,QAAQ,KAAK,oBAAY,+BAA+B,WAAW,OAAO,cAAc,EAAE,CAC/F,CAAC;AACJ,CAAC;AAtBD,0CAsBC"}
+{"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../src/db-init/ddl-migration.ts"],"names":[],"mappings":";;;AAAA,qDAA2F;AAC3F,yCAAiC;AAEjC,4CAA0C;AAE7B,QAAA,YAAY,GAAG,YAAY,CAAC;AAC5B,QAAA,sBAAsB,GAAG,CAAC,CAAC;AAEjC,KAAK,UAAU,kBAAkB,CACtC,EAAc,EACd,EAAE,WAAW,EAAE,MAAM,EAA2C;IAEhE,MAAM,SAAS,GAAG,8BAAsB,CAAC;IACzC,IAAI,cAAc,GAAG,WAAW,CAAC;IAEjC,IAAI,cAAc,IAAI,CAAC,EAAE,CAAC;QACxB,MAAM,EAAE,CAAC,KAAK,CAAC,uDAAuD,CAAC,CAAC;QACxE,MAAM,EAAE,CAAC,KAAK,CAAC,uDAAuD,CAAC,CAAC;QACxE,MAAM,EAAE,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAC7D,MAAM,EAAE,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACrD,CAAC;IAED,kCAAkC;IAClC,IAAI,cAAc,GAAG,SAAS,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAC7C,MAAM,IAAA,uBAAU,EAAC,EAAE,EAAE,IAAA,gBAAI,EAAC,sBAAU,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC;QACpE,cAAc,GAAG,MAAM,IAAA,uCAA0B,EAAC,EAAE,EAAE,EAAE,YAAY,EAAZ,oBAAY,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,cAAc,oBAAY,wBAAwB,SAAS,cAAc,cAAc,GAAG,CAC3F,CAAC;IACJ,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,GAAG,oBAAY,+BAA+B,WAAW,OAAO,cAAc,EAAE,CAAC,CAAC;AAChG,CAAC;AA3BD,gDA2BC"}

package/dist/db-init/entities/PaTextCache.entity.d.ts

@@ -0,0 +1,7 @@
+export declare class PaTextCacheEntity {
+    k: string;
+    resourceVersion: string;
+    val: string;
+    modifiedAt: Date;
+    readAt: Date;
+}

package/dist/{entities/PaCache.entity.js → db-init/entities/PaTextCache.entity.js}

@@ -9,42 +9,37 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PaCacheEntity = void 0;
+exports.PaTextCacheEntity = void 0;
 const typeorm_1 = require("typeorm");
-let PaCacheEntity = class PaCacheEntity {
-    id;
-    ts;
-    resourceVersion;
-    lastUseTs;
+let PaTextCacheEntity = class PaTextCacheEntity {
     k;
+    resourceVersion;
     val;
+    modifiedAt;
+    readAt;
 };
-exports.PaCacheEntity = PaCacheEntity;
+exports.PaTextCacheEntity = PaTextCacheEntity;
 __decorate([
-    (0, typeorm_1.PrimaryGeneratedColumn)(),
+    (0, typeorm_1.Column)({ primary: true }),
     __metadata("design:type", String)
-], PaCacheEntity.prototype, "id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "datetime", default: () => "current_timestamp" }),
-    __metadata("design:type", Date)
-], PaCacheEntity.prototype, "ts", void 0);
+], PaTextCacheEntity.prototype, "k", void 0);
 __decorate([
     (0, typeorm_1.Column)(),
     __metadata("design:type", String)
-], PaCacheEntity.prototype, "resourceVersion", void 0);
+], PaTextCacheEntity.prototype, "resourceVersion", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "text" }),
+    __metadata("design:type", String)
+], PaTextCacheEntity.prototype, "val", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "datetime", default: () => "current_timestamp" }),
     __metadata("design:type", Date)
-], PaCacheEntity.prototype, "lastUseTs", void 0);
+], PaTextCacheEntity.prototype, "modifiedAt", void 0);
 __decorate([
-    (0, typeorm_1.Column)(),
-    __metadata("design:type", String)
-], PaCacheEntity.prototype, "k", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "text" }),
-    __metadata("design:type", String)
-], PaCacheEntity.prototype, "val", void 0);
-exports.PaCacheEntity = PaCacheEntity = __decorate([
-    (0, typeorm_1.Entity)("PaCache")
-], PaCacheEntity);
-//# sourceMappingURL=PaCache.entity.js.map
+    (0, typeorm_1.Column)({ type: "datetime", default: () => "current_timestamp" }),
+    __metadata("design:type", Date)
+], PaTextCacheEntity.prototype, "readAt", void 0);
+exports.PaTextCacheEntity = PaTextCacheEntity = __decorate([
+    (0, typeorm_1.Entity)("PaTextCache")
+], PaTextCacheEntity);
+//# sourceMappingURL=PaTextCache.entity.js.map

package/dist/db-init/entities/PaTextCache.entity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PaTextCache.entity.js","sourceRoot":"","sources":["../../../src/db-init/entities/PaTextCache.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AAGlC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAE5B,CAAC,CAAU;IAGX,eAAe,CAAU;IAGzB,GAAG,CAAU;IAGb,UAAU,CAAQ;IAGlB,MAAM,CAAQ;CACf,CAAA;AAfY,8CAAiB;AAE5B;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;4CACf;AAGX;IADC,IAAA,gBAAM,GAAE;;0DACgB;AAGzB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;8CACZ;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC;8BACpD,IAAI;qDAAC;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC;8BACxD,IAAI;iDAAC;4BAdH,iBAAiB;IAD7B,IAAA,gBAAM,EAAC,aAAa,CAAC;GACT,iBAAiB,CAe7B"}

package/dist/db-init/entities/PaTextCacheDependency.entity.d.ts

@@ -0,0 +1,4 @@
+export declare class PaTextCacheDependencyEntity {
+    cacheK: string;
+    depK: string;
+}

package/dist/{entities/PaCacheDependency.entity.js → db-init/entities/PaTextCacheDependency.entity.js}

@@ -9,22 +9,22 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PaCacheDependencyEntity = void 0;
+exports.PaTextCacheDependencyEntity = void 0;
 const typeorm_1 = require("typeorm");
-let PaCacheDependencyEntity = class PaCacheDependencyEntity {
-    cacheId;
+let PaTextCacheDependencyEntity = class PaTextCacheDependencyEntity {
+    cacheK;
     depK;
 };
-exports.PaCacheDependencyEntity = PaCacheDependencyEntity;
+exports.PaTextCacheDependencyEntity = PaTextCacheDependencyEntity;
 __decorate([
-    (0, typeorm_1.Column)({ type: "integer", primary: true }),
+    (0, typeorm_1.Column)({ primary: true }),
     __metadata("design:type", String)
-], PaCacheDependencyEntity.prototype, "cacheId", void 0);
+], PaTextCacheDependencyEntity.prototype, "cacheK", void 0);
 __decorate([
     (0, typeorm_1.Column)({ primary: true }),
     __metadata("design:type", String)
-], PaCacheDependencyEntity.prototype, "depK", void 0);
-exports.PaCacheDependencyEntity = PaCacheDependencyEntity = __decorate([
-    (0, typeorm_1.Entity)("PaCacheDependency")
-], PaCacheDependencyEntity);
-//# sourceMappingURL=PaCacheDependency.entity.js.map
+], PaTextCacheDependencyEntity.prototype, "depK", void 0);
+exports.PaTextCacheDependencyEntity = PaTextCacheDependencyEntity = __decorate([
+    (0, typeorm_1.Entity)("PaTextCacheDependency")
+], PaTextCacheDependencyEntity);
+//# sourceMappingURL=PaTextCacheDependency.entity.js.map

package/dist/db-init/entities/PaTextCacheDependency.entity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PaTextCacheDependency.entity.js","sourceRoot":"","sources":["../../../src/db-init/entities/PaTextCacheDependency.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AAGlC,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAEtC,MAAM,CAAU;IAGhB,IAAI,CAAU;CACf,CAAA;AANY,kEAA2B;AAEtC;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;2DACV;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;yDACZ;sCALH,2BAA2B;IADvC,IAAA,gBAAM,EAAC,uBAAuB,CAAC;GACnB,2BAA2B,CAMvC"}

package/dist/db-init/entities/PaTextCacheScheduledInvalidation.entity.d.ts

@@ -0,0 +1,6 @@
+export declare class PaTextCacheScheduledInvalidationEntity {
+    eventK: string;
+    depK: string;
+    scheduledAt: Date;
+    scheduledSince: Date;
+}

package/dist/db-init/entities/PaTextCacheScheduledInvalidation.entity.js

@@ -0,0 +1,40 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PaTextCacheScheduledInvalidationEntity = void 0;
+const typeorm_1 = require("typeorm");
+let PaTextCacheScheduledInvalidationEntity = class PaTextCacheScheduledInvalidationEntity {
+    eventK;
+    depK;
+    scheduledAt;
+    scheduledSince;
+};
+exports.PaTextCacheScheduledInvalidationEntity = PaTextCacheScheduledInvalidationEntity;
+__decorate([
+    (0, typeorm_1.Column)({ primary: true }),
+    __metadata("design:type", String)
+], PaTextCacheScheduledInvalidationEntity.prototype, "eventK", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ primary: true }),
+    __metadata("design:type", String)
+], PaTextCacheScheduledInvalidationEntity.prototype, "depK", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "datetime" }),
+    __metadata("design:type", Date)
+], PaTextCacheScheduledInvalidationEntity.prototype, "scheduledAt", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "datetime", default: () => "current_timestamp" }),
+    __metadata("design:type", Date)
+], PaTextCacheScheduledInvalidationEntity.prototype, "scheduledSince", void 0);
+exports.PaTextCacheScheduledInvalidationEntity = PaTextCacheScheduledInvalidationEntity = __decorate([
+    (0, typeorm_1.Entity)("PaTextCacheScheduledInvalidation")
+], PaTextCacheScheduledInvalidationEntity);
+//# sourceMappingURL=PaTextCacheScheduledInvalidation.entity.js.map

package/dist/db-init/entities/PaTextCacheScheduledInvalidation.entity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PaTextCacheScheduledInvalidation.entity.js","sourceRoot":"","sources":["../../../src/db-init/entities/PaTextCacheScheduledInvalidation.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AAGlC,IAAM,sCAAsC,GAA5C,MAAM,sCAAsC;IAEjD,MAAM,CAAU;IAGhB,IAAI,CAAU;IAGd,WAAW,CAAQ;IAGnB,cAAc,CAAQ;CACvB,CAAA;AAZY,wFAAsC;AAEjD;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;sEACV;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;oEACZ;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;8BACf,IAAI;2EAAC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC;8BAChD,IAAI;8EAAC;iDAXX,sCAAsC;IADlD,IAAA,gBAAM,EAAC,kCAAkC,CAAC;GAC9B,sCAAsC,CAYlD"}

package/dist/internal/cache-system-context.d.ts

@@ -1,14 +1,18 @@
 import type { AppLog } from "@paroicms/server-lib";
-import type { DataSource, EntityManager } from "typeorm";
+import type { DataSource } from "typeorm";
 import type { CreateTextCacheSystemOptions } from "../cache-system";
 import type { TextCacheSystemStorage } from "../public-types";
+import { type InvalidationScheduler } from "./scheduler";
 export interface TextCacheSystemContext extends CreateTextCacheSystemOptions {
     status: "ready" | "destroyed";
     appLog: AppLog;
-    mainCn: DataSource;
-    cn: EntityManager;
+    cn: DataSource;
     storage: TextCacheSystemStorage;
     logNextQuery: (count?: number) => void;
     timeToIdleDays?: number;
+    scheduler: InvalidationScheduler;
 }
-export declare function createTextCacheSystemContext(options: CreateTextCacheSystemOptions): Promise<TextCacheSystemContext>;
+export declare function createTextCacheSystemContext(options: CreateTextCacheSystemOptions): Promise<{
+    context: TextCacheSystemContext;
+    isCleared: boolean;
+}>;

package/dist/internal/cache-system-context.js

@@ -3,20 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTextCacheSystemContext = void 0;
 const anywhere_lib_1 = require("@paroicms/anywhere-lib");
 const db_init_1 = require("../db-init/db-init");
+const scheduler_1 = require("./scheduler");
 async function createTextCacheSystemContext(options) {
-    const { mainCn, logNextQuery } = await (0, db_init_1.createOrOpenMainCn)({
-        siteName: options.siteName,
+    const { cn, logNextQuery, isCleared } = await (0, db_init_1.createOrOpenConnection)({
+        appVersion: options.appVersion,
         sqliteFile: options.storage.file,
         appLog: options.appLog,
     });
-    return {
+    const context = {
         ...options,
         status: "ready",
-        mainCn,
-        cn: mainCn.manager,
+        cn,
         logNextQuery,
         timeToIdleDays: options.timeToIdle === undefined ? undefined : (0, anywhere_lib_1.parseTimeWithUnit)(options.timeToIdle).delay,
+        scheduler: undefined,
     };
+    context.scheduler = (0, scheduler_1.startScheduler)(context);
+    return { context, isCleared };
 }
 exports.createTextCacheSystemContext = createTextCacheSystemContext;
 //# sourceMappingURL=cache-system-context.js.map

package/dist/internal/cache-system-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache-system-context.js","sourceRoot":"","sources":["../../src/internal/cache-system-context.ts"],"names":[],"mappings":";;;AAAA,yDAA2D;AAI3D,gDAAwD;AAajD,KAAK,UAAU,4BAA4B,CAChD,OAAqC;IAErC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,4BAAkB,EAAC;QACxD,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI;QAChC,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,OAAO;QACV,MAAM,EAAE,OAAO;QACf,MAAM;QACN,EAAE,EAAE,MAAM,CAAC,OAAO;QAClB,YAAY;QACZ,cAAc,EACZ,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,gCAAiB,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC,KAAK;KAC7F,CAAC;AACJ,CAAC;AAlBD,oEAkBC"}
+{"version":3,"file":"cache-system-context.js","sourceRoot":"","sources":["../../src/internal/cache-system-context.ts"],"names":[],"mappings":";;;AAAA,yDAA2D;AAI3D,gDAA4D;AAE5D,2CAAyE;AAYlE,KAAK,UAAU,4BAA4B,CAChD,OAAqC;IAErC,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,gCAAsB,EAAC;QACnE,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI;QAChC,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG;QACd,GAAG,OAAO;QACV,MAAM,EAAE,OAAgC;QACxC,EAAE;QACF,YAAY;QACZ,cAAc,EACZ,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,gCAAiB,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC,KAAK;QAC5F,SAAS,EAAE,SAAgB;KAC5B,CAAC;IAEF,OAAO,CAAC,SAAS,GAAG,IAAA,0BAAc,EAAC,OAAO,CAAC,CAAC;IAE5C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AAChC,CAAC;AAtBD,oEAsBC"}

package/dist/internal/queries.d.ts

@@ -1,18 +1,18 @@
-import { type Tracker } from "@paroicms/server-lib";
-import type { EntityManager } from "typeorm";
+import { type QueryBuilderConnection, type Tracker } from "@paroicms/server-lib";
 import type { CacheSetData, CacheValue } from "../public-types";
 import type { TextCacheSystemContext } from "./cache-system-context";
-export declare function insertOrUpdateCacheValue(cn: EntityManager, data: CacheSetData, tracker: Tracker): Promise<CacheValue>;
-export declare function getCacheValue({ cn, timeToIdleDays, appLog, siteName }: TextCacheSystemContext, cacheKey: string, tracker: Tracker): Promise<CacheValue | undefined>;
+export declare function insertOrUpdateCacheValue(cn: QueryBuilderConnection, data: CacheSetData, tracker: Tracker): Promise<CacheValue>;
+export declare function getCacheValue({ cn, timeToIdleDays, appLog }: TextCacheSystemContext, cacheKey: string, tracker: Tracker): Promise<CacheValue | undefined>;
 export declare function getDependencyKeys({ cn }: TextCacheSystemContext, cacheKey: string, tracker: Tracker): Promise<string[]>;
 /**
  * @returns the list of cache cacheKeys that were deleted
  */
-export declare function deleteCacheValues(cn: EntityManager, options: {
+export declare function deleteCacheValues(cn: QueryBuilderConnection, options: {
     dependencyKeys: string[];
 }): Promise<string[]>;
 /**
  * @returns the number of cache identifiers that were deleted
  */
 export declare function deleteUnusedCacheValues({ cn, timeToIdleDays, }: TextCacheSystemContext): Promise<number | undefined>;
-export declare function clearCacheValues({ cn }: TextCacheSystemContext): Promise<void>;
+export declare function invalidateAllCacheValues({ cn, }: Pick<TextCacheSystemContext, "cn">): Promise<void>;
+export declare function clearCacheValues({ cn }: Pick<TextCacheSystemContext, "cn">): Promise<void>;

package/dist/internal/queries.js

@@ -1,89 +1,72 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearCacheValues = exports.deleteUnusedCacheValues = exports.deleteCacheValues = exports.getDependencyKeys = exports.getCacheValue = exports.insertOrUpdateCacheValue = void 0;
+exports.clearCacheValues = exports.invalidateAllCacheValues = exports.deleteUnusedCacheValues = exports.deleteCacheValues = exports.getDependencyKeys = exports.getCacheValue = exports.insertOrUpdateCacheValue = void 0;
 const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
 const anywhere_lib_1 = require("@paroicms/anywhere-lib");
 const server_lib_1 = require("@paroicms/server-lib");
 const ddl_migration_1 = require("../db-init/ddl-migration");
 async function insertOrUpdateCacheValue(cn, data, tracker) {
     const resourceVersion = (0, server_lib_1.generateResourceVersion)();
-    const result = await cn
+    await cn
+        .createQueryBuilder()
+        .delete()
+        .from("PaTextCache")
+        .where("k = :k", { k: data.cacheKey })
+        .execute();
+    tracker.trackAccess(ddl_migration_1.dbSchemaName, "PaTextCache", "delete");
+    await cn
         .createQueryBuilder()
         .insert()
-        .into("PaCache")
+        .into("PaTextCache")
         .values({
         k: data.cacheKey,
         val: data.value,
         resourceVersion,
-        ts: () => "current_timestamp",
-        lastUseTs: () => "current_timestamp",
+        modifiedAt: () => "current_timestamp",
+        readAt: () => "current_timestamp",
     })
-        .orUpdate(["val", "resourceVersion", "ts", "lastUseTs"], ["k"])
         .execute();
-    tracker.trackAccess(ddl_migration_1.dbSchemaName, "PaCache", "write");
-    let newId = (0, data_formatters_lib_1.strValOrUndef)(result.identifiers[0].id, { varName: "PaCache.id" });
-    if (newId === undefined) {
-        const row = await cn
-            .createQueryBuilder()
-            .select("c.id", "id")
-            .from("PaCache", "c")
-            .where("c.k = :cacheKey", { cacheKey: data.cacheKey })
-            .getRawOne();
-        if (!row)
-            throw new Error(`unable to find cache row '${data.cacheKey}'`);
-        tracker.trackAccess(ddl_migration_1.dbSchemaName, "PaCache", "read");
-        newId = (0, data_formatters_lib_1.strVal)(row.id);
-    }
+    tracker.trackAccess(ddl_migration_1.dbSchemaName, "PaTextCache", "write");
     await cn
         .createQueryBuilder()
         .insert()
-        .into("PaCacheDependency")
+        .into("PaTextCacheDependency")
         .values(data.dependencyKeys.map((depK) => ({
-        cacheId: newId,
+        cacheK: data.cacheKey,
         depK,
     })))
         .execute();
-    tracker.trackAccess(ddl_migration_1.dbSchemaName, "PaCacheDependency", "write");
-    const row = await cn
-        .createQueryBuilder()
-        .select("c.ts", "ts")
-        .from("PaCache", "c")
-        .where("c.id = :id", { id: newId })
-        .getRawOne();
-    tracker.trackAccess(ddl_migration_1.dbSchemaName, "PaCacheDependency", "read");
-    if (!row)
-        throw new Error(`missing cache row: ${newId}`);
+    tracker.trackAccess(ddl_migration_1.dbSchemaName, "PaTextCacheDependency", "write");
     return {
         resourceVersion,
         value: data.value,
     };
 }
 exports.insertOrUpdateCacheValue = insertOrUpdateCacheValue;
-async function getCacheValue({ cn, timeToIdleDays, appLog, siteName }, cacheKey, tracker) {
+async function getCacheValue({ cn, timeToIdleDays, appLog }, cacheKey, tracker) {
     const row = await cn
         .createQueryBuilder()
         .select("c.val", "val")
         .addSelect("c.resourceVersion", "resourceVersion")
-        .addSelect("c.ts", "ts")
-        .addSelect("c.lastUseTs", "lastUseTs")
-        .from("PaCache", "c")
-        .where("c.k = :cacheKey", { cacheKey })
+        .addSelect("c.readAt", "readAt")
+        .from("PaTextCache", "c")
+        .where("c.k = :k", { k: cacheKey })
         .getRawOne();
-    tracker.trackAccess(ddl_migration_1.dbSchemaName, "PaCache", "read");
+    tracker.trackAccess(ddl_migration_1.dbSchemaName, "PaTextCache", "read");
     if (!row)
         return;
-    const lastUseTs = (0, data_formatters_lib_1.dateVal)(row.lastUseTs);
-    if (timeToIdleDays !== undefined && !(0, anywhere_lib_1.isSameTimeUnit)(lastUseTs, "day")) {
-        appLog.debug(`[${siteName}] updating lastUseTs of cache: ${cacheKey}`);
+    const readAt = (0, data_formatters_lib_1.dateVal)(row.readAt);
+    if (timeToIdleDays !== undefined && !(0, anywhere_lib_1.isSameTimeUnit)(readAt, "day")) {
+        appLog.debug(`updating readAt of cache: ${cacheKey}`);
         await cn
             .createQueryBuilder()
-            .update("PaCache")
+            .update("PaTextCache")
             .set({
-            lastUseTs: () => "current_timestamp",
+            readAt: () => "current_timestamp",
         })
-            .where("k = :cacheKey", { cacheKey })
+            .where("k = :k", { k: cacheKey })
             .execute();
-        tracker.trackAccess(ddl_migration_1.dbSchemaName, "PaCache", "write");
+        tracker.trackAccess(ddl_migration_1.dbSchemaName, "PaTextCache", "write");
     }
     return {
         value: (0, data_formatters_lib_1.strVal)(row.val),
@@ -95,11 +78,11 @@ async function getDependencyKeys({ cn }, cacheKey, tracker) {
     const rows = await cn
         .createQueryBuilder()
         .select("d.depK", "depK")
-        .from("PaCacheDependency", "d")
-        .innerJoin("PaCache", "c", "c.id = d.cacheId")
-        .where("c.k = :cacheKey", { cacheKey })
+        .from("PaTextCacheDependency", "d")
+        .innerJoin("PaTextCache", "c", "c.k = d.cacheK")
+        .where("c.k = :k", { k: cacheKey })
         .getRawMany();
-    tracker.trackAccess(ddl_migration_1.dbSchemaName, "PaCacheDependency", "read");
+    tracker.trackAccess(ddl_migration_1.dbSchemaName, "PaTextCacheDependency", "read");
     return rows.map((row) => (0, data_formatters_lib_1.strVal)(row.depK));
 }
 exports.getDependencyKeys = getDependencyKeys;
@@ -109,19 +92,17 @@ exports.getDependencyKeys = getDependencyKeys;
 async function deleteCacheValues(cn, options) {
     const rows = await cn
         .createQueryBuilder()
-        .select("c.id", "id")
-        .addSelect("c.k", "k")
-        .from("PaCache", "c")
-        .innerJoin("PaCacheDependency", "d", "d.cacheId = c.id")
+        .select("c.k", "k")
+        .from("PaTextCache", "c")
+        .innerJoin("PaTextCacheDependency", "d", "d.cacheK = c.k")
         .where("d.depK in (:...dependencyKeys)", { dependencyKeys: options.dependencyKeys })
         .getRawMany();
     const cacheKeys = rows.map((row) => (0, data_formatters_lib_1.strVal)(row.k));
-    const cacheIds = rows.map((row) => (0, data_formatters_lib_1.strVal)(row.id));
     await cn
         .createQueryBuilder()
         .delete()
-        .from("PaCache")
-        .where("id in (:...cacheIds)", { cacheIds: cacheIds })
+        .from("PaTextCache")
+        .where("k in (:...cacheKeys)", { cacheKeys })
         .execute();
     return cacheKeys;
 }
@@ -130,18 +111,25 @@ exports.deleteCacheValues = deleteCacheValues;
  * @returns the number of cache identifiers that were deleted
  */
 async function deleteUnusedCacheValues({ cn, timeToIdleDays, }) {
+    if (timeToIdleDays === undefined)
+        return;
     const result = await cn
         .createQueryBuilder()
         .delete()
-        .from("PaCache")
-        .where(`date(lastUseTs) < date(current_timestamp, '-${timeToIdleDays} day')`)
+        .from("PaTextCache")
+        .where(`date(readAt) < date(current_timestamp, '-${timeToIdleDays} day')`)
         .execute();
     return result.affected ?? undefined;
 }
 exports.deleteUnusedCacheValues = deleteUnusedCacheValues;
+async function invalidateAllCacheValues({ cn, }) {
+    await cn.createQueryBuilder().delete().from("PaTextCacheDependency").execute();
+    await cn.createQueryBuilder().delete().from("PaTextCache").execute();
+}
+exports.invalidateAllCacheValues = invalidateAllCacheValues;
 async function clearCacheValues({ cn }) {
-    await cn.createQueryBuilder().delete().from("PaCacheDependency").execute();
-    await cn.createQueryBuilder().delete().from("PaCache").execute();
+    await invalidateAllCacheValues({ cn });
+    await cn.createQueryBuilder().delete().from("PaTextCacheScheduledInvalidation").execute();
 }
 exports.clearCacheValues = clearCacheValues;
 //# sourceMappingURL=queries.js.map

package/dist/internal/queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/internal/queries.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/internal/queries.ts"],"names":[],"mappings":";;;AAAA,oEAA6D;AAC7D,yDAAkE;AAClE,qDAI8B;AAC9B,4DAAwD;AAIjD,KAAK,UAAU,wBAAwB,CAC5C,EAA0B,EAC1B,IAAkB,EAClB,OAAgB;IAEhB,MAAM,eAAe,GAAG,IAAA,oCAAuB,GAAE,CAAC;IAElD,MAAM,EAAE;SACL,kBAAkB,EAAE;SACpB,MAAM,EAAE;SACR,IAAI,CAAC,aAAa,CAAC;SACnB,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;SACrC,OAAO,EAAE,CAAC;IACb,OAAO,CAAC,WAAW,CAAC,4BAAY,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;IAE3D,MAAM,EAAE;SACL,kBAAkB,EAAE;SACpB,MAAM,EAAE;SACR,IAAI,CAAC,aAAa,CAAC;SACnB,MAAM,CAAC;QACN,CAAC,EAAE,IAAI,CAAC,QAAQ;QAChB,GAAG,EAAE,IAAI,CAAC,KAAK;QACf,eAAe;QACf,UAAU,EAAE,GAAG,EAAE,CAAC,mBAAmB;QACrC,MAAM,EAAE,GAAG,EAAE,CAAC,mBAAmB;KAClC,CAAC;SACD,OAAO,EAAE,CAAC;IACb,OAAO,CAAC,WAAW,CAAC,4BAAY,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;IAE1D,MAAM,EAAE;SACL,kBAAkB,EAAE;SACpB,MAAM,EAAE;SACR,IAAI,CAAC,uBAAuB,CAAC;SAC7B,MAAM,CACL,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACjC,MAAM,EAAE,IAAI,CAAC,QAAQ;QACrB,IAAI;KACL,CAAC,CAAC,CACJ;SACA,OAAO,EAAE,CAAC;IACb,OAAO,CAAC,WAAW,CAAC,4BAAY,EAAE,uBAAuB,EAAE,OAAO,CAAC,CAAC;IAEpE,OAAO;QACL,eAAe;QACf,KAAK,EAAE,IAAI,CAAC,KAAK;KAClB,CAAC;AACJ,CAAC;AA9CD,4DA8CC;AAEM,KAAK,UAAU,aAAa,CACjC,EAAE,EAAE,EAAE,cAAc,EAAE,MAAM,EAA0B,EACtD,QAAgB,EAChB,OAAgB;IAEhB,MAAM,GAAG,GAAG,MAAM,EAAE;SACjB,kBAAkB,EAAE;SACpB,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC;SACtB,SAAS,CAAC,mBAAmB,EAAE,iBAAiB,CAAC;SACjD,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC;SAC/B,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC;SACxB,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC;SAClC,SAAS,EAAO,CAAC;IACpB,OAAO,CAAC,WAAW,CAAC,4BAAY,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;IAEzD,IAAI,CAAC,GAAG;QAAE,OAAO;IAEjB,MAAM,MAAM,GAAG,IAAA,6BAAO,EAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACnC,IAAI,cAAc,KAAK,SAAS,IAAI,CAAC,IAAA,6BAAc,EAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC;QACnE,MAAM,CAAC,KAAK,CAAC,6BAA6B,QAAQ,EAAE,CAAC,CAAC;QACtD,MAAM,EAAE;aACL,kBAAkB,EAAE;aACpB,MAAM,CAAC,aAAa,CAAC;aACrB,GAAG,CAAC;YACH,MAAM,EAAE,GAAG,EAAE,CAAC,mBAAmB;SAClC,CAAC;aACD,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC;aAChC,OAAO,EAAE,CAAC;QACb,OAAO,CAAC,WAAW,CAAC,4BAAY,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO;QACL,KAAK,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,GAAG,CAAC;QACtB,eAAe,EAAE,IAAA,4BAAM,EAAC,GAAG,CAAC,eAAe,CAAC;KAC7C,CAAC;AACJ,CAAC;AAnCD,sCAmCC;AAEM,KAAK,UAAU,iBAAiB,CACrC,EAAE,EAAE,EAA0B,EAC9B,QAAgB,EAChB,OAAgB;IAEhB,MAAM,IAAI,GAAG,MAAM,EAAE;SAClB,kBAAkB,EAAE;SACpB,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC;SACxB,IAAI,CAAC,uBAAuB,EAAE,GAAG,CAAC;SAClC,SAAS,CAAC,aAAa,EAAE,GAAG,EAAE,gBAAgB,CAAC;SAC/C,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC;SAClC,UAAU,EAAO,CAAC;IACrB,OAAO,CAAC,WAAW,CAAC,4BAAY,EAAE,uBAAuB,EAAE,MAAM,CAAC,CAAC;IAEnE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,4BAAM,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;AAC7C,CAAC;AAfD,8CAeC;AAED;;GAEG;AACI,KAAK,UAAU,iBAAiB,CACrC,EAA0B,EAC1B,OAAqC;IAErC,MAAM,IAAI,GAAG,MAAM,EAAE;SAClB,kBAAkB,EAAE;SACpB,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC;SAClB,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC;SACxB,SAAS,CAAC,uBAAuB,EAAE,GAAG,EAAE,gBAAgB,CAAC;SACzD,KAAK,CAAC,gCAAgC,EAAE,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC;SACnF,UAAU,EAAO,CAAC;IAErB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,4BAAM,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnD,MAAM,EAAE;SACL,kBAAkB,EAAE;SACpB,MAAM,EAAE;SACR,IAAI,CAAC,aAAa,CAAC;SACnB,KAAK,CAAC,sBAAsB,EAAE,EAAE,SAAS,EAAE,CAAC;SAC5C,OAAO,EAAE,CAAC;IAEb,OAAO,SAAS,CAAC;AACnB,CAAC;AAtBD,8CAsBC;AAED;;GAEG;AACI,KAAK,UAAU,uBAAuB,CAAC,EAC5C,EAAE,EACF,cAAc,GACS;IACvB,IAAI,cAAc,KAAK,SAAS;QAAE,OAAO;IAEzC,MAAM,MAAM,GAAG,MAAM,EAAE;SACpB,kBAAkB,EAAE;SACpB,MAAM,EAAE;SACR,IAAI,CAAC,aAAa,CAAC;SACnB,KAAK,CAAC,4CAA4C,cAAc,QAAQ,CAAC;SACzE,OAAO,EAAE,CAAC;IAEb,OAAO,MAAM,CAAC,QAAQ,IAAI,SAAS,CAAC;AACtC,CAAC;AAdD,0DAcC;AAEM,KAAK,UAAU,wBAAwB,CAAC,EAC7C,EAAE,GACiC;IACnC,MAAM,EAAE,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/E,MAAM,EAAE,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,CAAC;AACvE,CAAC;AALD,4DAKC;AAEM,KAAK,UAAU,gBAAgB,CAAC,EAAE,EAAE,EAAsC;IAC/E,MAAM,wBAAwB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACvC,MAAM,EAAE,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC,OAAO,EAAE,CAAC;AAC5F,CAAC;AAHD,4CAGC"}

package/dist/internal/scheduled-invalidation-queries.d.ts

@@ -0,0 +1,14 @@
+import type { QueryBuilderConnection } from "@paroicms/server-lib";
+import type { TextCacheSystemContext } from "./cache-system-context";
+export declare function getNextScheduledDate({ cn, }: Pick<TextCacheSystemContext, "cn">): Promise<Date | undefined>;
+export declare function getScheduledInvalidationEventsToFire({ cn, }: Pick<TextCacheSystemContext, "cn">): Promise<{
+    eventKey: string;
+    dependencyKeys: string[];
+}[]>;
+export declare function setScheduledInvalidation(cn: QueryBuilderConnection, options: {
+    eventKey: string;
+    dependencyKeys: string[];
+    scheduledAt: Date;
+}): Promise<void>;
+export declare function deleteScheduledInvalidation(cn: QueryBuilderConnection, eventKey: string): Promise<void>;
+export declare function deleteScheduledInvalidations(cn: QueryBuilderConnection, eventKeys: string[]): Promise<void>;

package/dist/internal/scheduled-invalidation-queries.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deleteScheduledInvalidations = exports.deleteScheduledInvalidation = exports.setScheduledInvalidation = exports.getScheduledInvalidationEventsToFire = exports.getNextScheduledDate = void 0;
+const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
+async function getNextScheduledDate({ cn, }) {
+    const row = await cn
+        .createQueryBuilder()
+        .select("s.scheduledAt", "scheduledAt")
+        .from("PaTextCacheScheduledInvalidation", "s")
+        .orderBy("s.scheduledAt")
+        .limit(1)
+        .getRawOne();
+    return row ? (0, data_formatters_lib_1.dateVal)(row.scheduledAt) : undefined;
+}
+exports.getNextScheduledDate = getNextScheduledDate;
+async function getScheduledInvalidationEventsToFire({ cn, }) {
+    const rows = await cn
+        .createQueryBuilder()
+        .select("s.eventK", "eventK")
+        .addSelect("s.depK", "depK")
+        .from("PaTextCacheScheduledInvalidation", "s")
+        .where("s.scheduledAt <= current_timestamp")
+        .getRawMany();
+    const events = new Map();
+    for (const row of rows) {
+        const eventKey = (0, data_formatters_lib_1.strVal)(row.eventK);
+        const depKey = (0, data_formatters_lib_1.strVal)(row.depK);
+        const dependencyKeys = events.get(eventKey);
+        if (dependencyKeys) {
+            dependencyKeys.push(depKey);
+        }
+        else {
+            events.set(eventKey, [depKey]);
+        }
+    }
+    return Array.from(events.entries()).map(([eventKey, dependencyKeys]) => ({
+        eventKey,
+        dependencyKeys,
+    }));
+}
+exports.getScheduledInvalidationEventsToFire = getScheduledInvalidationEventsToFire;
+async function setScheduledInvalidation(cn, options) {
+    await deleteScheduledInvalidation(cn, options.eventKey);
+    await cn
+        .createQueryBuilder()
+        .insert()
+        .into("PaTextCacheScheduledInvalidation")
+        .values(options.dependencyKeys.map((depK) => ({
+        eventK: options.eventKey,
+        depK,
+        scheduledAt: options.scheduledAt,
+        scheduledSince: () => "current_timestamp",
+    })))
+        .execute();
+}
+exports.setScheduledInvalidation = setScheduledInvalidation;
+async function deleteScheduledInvalidation(cn, eventKey) {
+    await cn
+        .createQueryBuilder()
+        .delete()
+        .from("PaTextCacheScheduledInvalidation")
+        .where("eventK = :eventK", { eventK: eventKey })
+        .execute();
+}
+exports.deleteScheduledInvalidation = deleteScheduledInvalidation;
+async function deleteScheduledInvalidations(cn, eventKeys) {
+    await cn
+        .createQueryBuilder()
+        .delete()
+        .from("PaTextCacheScheduledInvalidation")
+        .where("eventK in (:...eventKeys)", { eventKeys })
+        .execute();
+}
+exports.deleteScheduledInvalidations = deleteScheduledInvalidations;
+//# sourceMappingURL=scheduled-invalidation-queries.js.map

package/dist/internal/scheduled-invalidation-queries.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scheduled-invalidation-queries.js","sourceRoot":"","sources":["../../src/internal/scheduled-invalidation-queries.ts"],"names":[],"mappings":"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"}

package/dist/internal/scheduler.d.ts

@@ -0,0 +1,7 @@
+import type { TextCacheSystemContext } from "./cache-system-context";
+export interface InvalidationScheduler {
+    reset(): Promise<void>;
+    stop(): Promise<void>;
+}
+export type SchedulerContext = Omit<TextCacheSystemContext, "scheduler">;
+export declare function startScheduler(context: SchedulerContext): InvalidationScheduler;

package/dist/internal/scheduler.js

@@ -0,0 +1,93 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startScheduler = void 0;
+const async_lib_1 = require("@paroi/async-lib");
+const queries_1 = require("./queries");
+const scheduled_invalidation_queries_1 = require("./scheduled-invalidation-queries");
+const MAX_DELAY_MS = 1000 * 60 * 60 * 24; // 1 day
+function startScheduler(context) {
+    const variables = {
+        currentWait: undefined,
+    };
+    let promise = run(context, variables);
+    return {
+        async reset() {
+            if (variables.currentWait) {
+                variables.currentWait.cancel();
+                variables.currentWait = undefined;
+            }
+            await promise;
+            promise = run(context, variables);
+        },
+        async stop() {
+            if (variables.currentWait) {
+                variables.currentWait.cancel();
+                variables.currentWait = undefined;
+            }
+            await promise;
+        },
+    };
+}
+exports.startScheduler = startScheduler;
+async function run(context, variables) {
+    let suspiciousDelayCount = 0;
+    let errorCount = 0;
+    while (1) {
+        try {
+            if (variables.currentWait) {
+                variables.currentWait.cancel();
+                variables.currentWait = undefined;
+            }
+            await processScheduledInvalidations(context);
+            const scheduledAt = await (0, scheduled_invalidation_queries_1.getNextScheduledDate)(context);
+            if (!scheduledAt)
+                break;
+            let delayMs = scheduledAt.getTime() - Date.now() + 500;
+            if (delayMs >= 0) {
+                suspiciousDelayCount = 0;
+            }
+            else if (++suspiciousDelayCount > 5) {
+                context.appLog.error(`Too many negative delays (${delayMs}ms), stop the scheduler`);
+                break;
+            }
+            if (delayMs < 500) {
+                delayMs = 500;
+            }
+            else if (delayMs > MAX_DELAY_MS) {
+                delayMs = MAX_DELAY_MS;
+            }
+            variables.currentWait = (0, async_lib_1.waitOrCancel)(delayMs);
+            const shouldStop = await variables.currentWait.promise;
+            variables.currentWait = undefined;
+            if (shouldStop)
+                break;
+            errorCount = 0;
+        }
+        catch (error) {
+            context.appLog.error("Invalidation scheduler failed", error);
+            if (++errorCount > 5) {
+                context.appLog.error("Too many errors, stop the scheduler");
+                break;
+            }
+            variables.currentWait = (0, async_lib_1.waitOrCancel)(1000 * 60 * 60 * 2); // next attempt in 2 hours
+            const shouldStop = await variables.currentWait.promise;
+            variables.currentWait = undefined;
+            if (shouldStop)
+                break;
+        }
+    }
+}
+async function processScheduledInvalidations(context) {
+    const events = await (0, scheduled_invalidation_queries_1.getScheduledInvalidationEventsToFire)(context);
+    if (events.length === 0)
+        return;
+    const eventKeys = events.map((e) => e.eventKey);
+    context.appLog.info(`Fire ${eventKeys.length} scheduled invalidation events: "${eventKeys.join('", "')}"`);
+    const dependencyKeys = events.flatMap((e) => e.dependencyKeys);
+    const cacheKeys = await (0, queries_1.deleteCacheValues)(context.cn, { dependencyKeys });
+    if (cacheKeys.length > 0) {
+        context.appLog.debug(`Deleted ${cacheKeys.length} invalidated cache: ${cacheKeys.join(", ")}`);
+    }
+    await (0, scheduled_invalidation_queries_1.deleteScheduledInvalidations)(context.cn, eventKeys);
+}
+//# sourceMappingURL=scheduler.js.map

package/dist/internal/scheduler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../src/internal/scheduler.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paroicms/server-text-cache-system",
-  "version": "1.2.3",
+  "version": "1.3.1",
   "description": "Cache system.",
   "keywords": [
     "paroicms",
@@ -28,10 +28,10 @@
     "eslint": "eslint ."
   },
   "dependencies": {
-    "@paroi/async-lib": "~0.1.2",
-    "@paroi/data-formatters-lib": "~0.1.2",
-    "@paroicms/server-lib": "1.2.3",
-    "@paroicms/anywhere-lib": "1.6.0"
+    "@paroi/async-lib": "~0.2.0",
+    "@paroi/data-formatters-lib": "~0.3.0",
+    "@paroicms/server-lib": "1.4.0",
+    "@paroicms/anywhere-lib": "1.7.0"
   },
   "devDependencies": {
     "@types/node": "~20.12.8",

package/dist/entities/PaCache.entity.d.ts

@@ -1,8 +0,0 @@
-export declare class PaCacheEntity {
-    id: string;
-    ts: Date;
-    resourceVersion: string;
-    lastUseTs: Date;
-    k: string;
-    val: string;
-}

package/dist/entities/PaCache.entity.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"PaCache.entity.js","sourceRoot":"","sources":["../../src/entities/PaCache.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,aAAa,GAAnB,MAAM,aAAa;IAExB,EAAE,CAAU;IAGZ,EAAE,CAAQ;IAGV,eAAe,CAAU;IAGzB,SAAS,CAAQ;IAGjB,CAAC,CAAU;IAGX,GAAG,CAAU;CACd,CAAA;AAlBY,sCAAa;AAExB;IADC,IAAA,gCAAsB,GAAE;;yCACb;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC;8BAC5D,IAAI;yCAAC;AAGV;IADC,IAAA,gBAAM,GAAE;;sDACgB;AAGzB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC;8BACrD,IAAI;gDAAC;AAGjB;IADC,IAAA,gBAAM,GAAE;;wCACE;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;0CACZ;wBAjBF,aAAa;IADzB,IAAA,gBAAM,EAAC,SAAS,CAAC;GACL,aAAa,CAkBzB"}

package/dist/entities/PaCacheDependency.entity.d.ts

@@ -1,4 +0,0 @@
-export declare class PaCacheDependencyEntity {
-    cacheId: string;
-    depK: string;
-}

package/dist/entities/PaCacheDependency.entity.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"PaCacheDependency.entity.js","sourceRoot":"","sources":["../../src/entities/PaCacheDependency.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AAGlC,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAElC,OAAO,CAAU;IAGjB,IAAI,CAAU;CACf,CAAA;AANY,0DAAuB;AAElC;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;wDAC1B;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;qDACZ;kCALH,uBAAuB;IADnC,IAAA,gBAAM,EAAC,mBAAmB,CAAC;GACf,uBAAuB,CAMnC"}