@holo-js/cache-db 0.3.28 → 0.4.1

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Holo-JS contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/.holo-build-fingerprint

@@ -0,0 +1 @@
+191cb6e93b5151d623ad08ce145879dc5218c717208bb746de85c124a51331f6

package/dist/index.d.ts

@@ -57,7 +57,6 @@ type DatabaseCacheDriverOptions = {
     readonly connectionName: string;
     readonly table: string;
     readonly lockTable: string;
-    readonly prefix?: string;
     readonly connection: HoloProjectConnectionConfig | string;
     readonly now?: () => number;
     readonly sleep?: (milliseconds: number) => Promise<void>;
@@ -88,7 +87,7 @@ declare function isDatabaseCacheTableMissingError(error: unknown, tableName: str
 declare function normalizeDatabaseCacheTableError(error: unknown, tableName: string, lockTableName: string): never;
 declare function withDatabaseCacheTableGuard<TValue>(tableName: string, lockTableName: string, callback: () => Promise<TValue>): Promise<TValue>;
 declare function readEntry(connection: DatabaseContext, tableName: string, key: string, now: number): Promise<DatabaseReadResult<DatabaseCacheEntryRow>>;
-declare function readLock(connection: DatabaseContext, tableName: string, name: string, now: number): Promise<DatabaseReadResult<DatabaseCacheLockRow>>;
+declare function readLock(connection: DatabaseContext, tableName: string, name: string): Promise<DatabaseCacheLockRow | undefined>;
 declare function createDatabaseCacheDriver(options: DatabaseCacheDriverOptions): CacheDriverContract;
 declare const databaseCacheDriverFactory: Readonly<{
     driver: "database";
@@ -108,4 +107,5 @@ declare const cacheDbInternals: {
     withDatabaseCacheTableGuard: typeof withDatabaseCacheTableGuard;
 };
 
-export { CACHE_DATABASE_TABLE_DEFINITIONS, type CacheDatabaseTableColumnDefinition, type CacheDatabaseTableColumnKind, type CacheDatabaseTableDefinition, DEFAULT_CACHE_DATABASE_LOCK_TABLE, DEFAULT_CACHE_DATABASE_TABLE, type DatabaseCacheDriverOptions, cacheDbInternals, createDatabaseCacheDriver, databaseCacheDriverFactory };
+export { CACHE_DATABASE_TABLE_DEFINITIONS, DEFAULT_CACHE_DATABASE_LOCK_TABLE, DEFAULT_CACHE_DATABASE_TABLE, cacheDbInternals, createDatabaseCacheDriver, databaseCacheDriverFactory };
+export type { CacheDatabaseTableColumnDefinition, CacheDatabaseTableColumnKind, CacheDatabaseTableDefinition, DatabaseCacheDriverOptions };

package/dist/index.mjs

@@ -12,10 +12,14 @@ import {
   createConnectionManager,
   createSchemaService,
   createRuntimeConnectionOptions,
+  holoRuntimeInternals,
   TableQueryBuilder
 } from "@holo-js/db";
+var { driverErrorCodes, isDatabaseDeadlockError } = holoRuntimeInternals;
 var DEFAULT_CACHE_DATABASE_TABLE = "cache";
 var DEFAULT_CACHE_DATABASE_LOCK_TABLE = "cache_locks";
+var DATABASE_CACHE_LOCK_LOTTERY = { chances: 2, outOf: 100 };
+var MISSING_TABLE_DRIVER_CODES = /* @__PURE__ */ new Set(["SQLITE_ERROR", "ER_NO_SUCH_TABLE", "42P01"]);
 var CACHE_DATABASE_TABLE_DEFINITIONS = [
   {
     role: "entries",
@@ -138,9 +142,8 @@ function isDatabaseCacheTableMissingError(error, tableName, lockTableName) {
     return false;
   }
   const message = error.message.toLowerCase();
-  const errorCode = typeof Reflect.get(error, "code") === "string" ? String(Reflect.get(error, "code")).toUpperCase() : void 0;
   const mentionsCacheTable = message.includes(tableName.toLowerCase()) || message.includes(lockTableName.toLowerCase());
-  if (errorCode === "SQLITE_ERROR" || errorCode === "ER_NO_SUCH_TABLE" || errorCode === "42P01") {
+  if (driverErrorCodes(error).some((code) => MISSING_TABLE_DRIVER_CODES.has(code.toUpperCase()))) {
     return mentionsCacheTable || message.includes("no such table") || message.includes("does not exist");
   }
   return (message.includes("no such table") || message.includes("does not exist") || message.includes("doesn't exist")) && mentionsCacheTable;
@@ -183,37 +186,59 @@ async function readEntry(connection, tableName, key, now) {
     value: { ...row, expires_at: expiresAt }
   };
 }
-async function readLock(connection, tableName, name, now) {
+async function readLock(connection, tableName, name) {
   const row = await new TableQueryBuilder(tableName, connection).where("name", name).first();
   if (!row) {
-    return { state: "missing" };
+    return void 0;
   }
-  const expiresAt = normalizeDatabaseTimestamp(row.expires_at);
-  if (expiresAt <= now) {
-    await new TableQueryBuilder(tableName, connection).where("name", name).delete();
-    return { state: "missing" };
+  return { ...row, expires_at: normalizeDatabaseTimestamp(row.expires_at) };
+}
+async function retryOnDeadlock(operation) {
+  try {
+    return await operation();
+  } catch (error) {
+    if (!isDatabaseDeadlockError(error)) {
+      throw error;
+    }
+    return operation();
+  }
+}
+async function pruneExpiredLocks(connection, tableName, nowMs) {
+  try {
+    await new TableQueryBuilder(tableName, connection).where("expires_at", "<=", nowMs).delete();
+  } catch (error) {
+    if (!isDatabaseDeadlockError(error)) {
+      throw error;
+    }
   }
-  return {
-    state: "hit",
-    value: { ...row, expires_at: expiresAt }
-  };
 }
 function createDatabaseLock(connection, tableName, entryTableName, name, seconds, now, sleep, ownerFactory) {
   const owner = ownerFactory();
-  async function tryAcquire() {
-    return withDatabaseCacheTableGuard(entryTableName, tableName, async () => connection.transaction(async (tx) => {
-      const locks = new TableQueryBuilder(tableName, tx);
-      const existing = await readLock(tx, tableName, name, now());
-      if (existing.state === "hit") {
+  async function acquireInTransaction() {
+    return connection.transaction(async (tx) => {
+      const nowMs = now();
+      const existing = await readLock(tx, tableName, name);
+      if (existing && existing.expires_at > nowMs) {
         return false;
       }
-      const inserted = await locks.insertOrIgnore({
+      if (existing) {
+        await new TableQueryBuilder(tableName, tx).where("name", name).where("expires_at", "<=", nowMs).delete();
+      }
+      const inserted = await new TableQueryBuilder(tableName, tx).insertOrIgnore({
         name,
         owner,
-        expires_at: now() + seconds * 1e3
+        expires_at: nowMs + seconds * 1e3
       });
       return resolveExecutionResultAffectedRows(inserted) > 0;
-    }));
+    });
+  }
+  async function tryAcquire() {
+    return withDatabaseCacheTableGuard(entryTableName, tableName, async () => {
+      if (Math.random() * DATABASE_CACHE_LOCK_LOTTERY.outOf < DATABASE_CACHE_LOCK_LOTTERY.chances) {
+        await pruneExpiredLocks(connection, tableName, now());
+      }
+      return retryOnDeadlock(acquireInTransaction);
+    });
   }
   async function withCallback(callback) {
     if (!callback) {
@@ -234,15 +259,9 @@ function createDatabaseLock(connection, tableName, entryTableName, name, seconds
       return withCallback(callback);
     },
     async release() {
-      const deleted = await withDatabaseCacheTableGuard(entryTableName, tableName, async () => connection.transaction(async (tx) => {
-        const current = await readLock(tx, tableName, name, now());
-        if (current.state === "missing" || current.value.owner !== owner) {
-          return 0;
-        }
-        return resolveExecutionResultAffectedRows(
-          await new TableQueryBuilder(tableName, tx).where("name", name).delete()
-        );
-      }));
+      const deleted = await withDatabaseCacheTableGuard(entryTableName, tableName, async () => resolveExecutionResultAffectedRows(
+        await new TableQueryBuilder(tableName, connection).where("name", name).where("owner", owner).delete()
+      ));
       return deleted > 0;
     },
     async block(waitSeconds, callback) {
@@ -267,7 +286,6 @@ function createDatabaseCacheDriver(options) {
   const connection = createDatabaseConnection(options.connectionName, options.connection);
   const entryTableName = options.table;
   const lockTableName = options.lockTable;
-  const prefix = options.prefix ?? "";
   async function writeEntry(tx, input) {
     await new TableQueryBuilder(entryTableName, tx).upsert({
       key: input.key,
@@ -353,23 +371,9 @@ function createDatabaseCacheDriver(options) {
       });
     },
     async flush() {
-      await withDatabaseCacheTableGuard(entryTableName, lockTableName, async () => connection.transaction(async (tx) => {
-        if (!prefix) {
-          await new TableQueryBuilder(lockTableName, tx).delete();
-          await new TableQueryBuilder(entryTableName, tx).delete();
-          return;
-        }
-        const hasSqlWildcard = /[%_[]/.test(prefix);
-        if (hasSqlWildcard) {
-          const upperBound = `${prefix}\uFFFF`;
-          await new TableQueryBuilder(lockTableName, tx).where("name", ">=", prefix).where("name", "<", upperBound).delete();
-          await new TableQueryBuilder(entryTableName, tx).where("key", ">=", prefix).where("key", "<", upperBound).delete();
-          return;
-        }
-        const likePattern = `${prefix}%`;
-        await new TableQueryBuilder(lockTableName, tx).whereLike("name", likePattern).delete();
-        await new TableQueryBuilder(entryTableName, tx).whereLike("key", likePattern).delete();
-      }));
+      await withDatabaseCacheTableGuard(entryTableName, lockTableName, async () => {
+        await new TableQueryBuilder(entryTableName, connection).delete();
+      });
     },
     async increment(key, amount) {
       return mutateNumericValue(key, amount);
@@ -383,9 +387,7 @@ function createDatabaseCacheDriver(options) {
   };
   Object.defineProperty(driver, /* @__PURE__ */ Symbol.for("holo.cache.driver.dispose"), {
     value() {
-      void connection.disconnect().catch((error) => {
-        console.error(`[@holo-js/cache-db] Failed to disconnect cache driver "${options.name}".`, error);
-      });
+      return connection.disconnect();
     }
   });
   return driver;

package/package.json

@@ -1,9 +1,14 @@
 {
   "name": "@holo-js/cache-db",
-  "version": "0.3.28",
+  "version": "0.4.1",
   "description": "Holo-JS Framework - DB-backed cache driver",
   "type": "module",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/cobraprojects/holo-js.git",
+    "directory": "packages/cache-db"
+  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -14,7 +19,8 @@
   "main": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "LICENSE"
   ],
   "scripts": {
     "build": "tsup",
@@ -23,24 +29,26 @@
     "test": "vitest --run"
   },
   "peerDependencies": {
-    "@holo-js/cache": "^0.3.28",
-    "@holo-js/db": "^0.3.28",
-    "@holo-js/kernel": "^0.3.28"
+    "@holo-js/cache": "^0.4.1",
+    "@holo-js/db": "^0.4.1",
+    "@holo-js/kernel": "^0.4.1"
   },
   "dependencies": {
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@holo-js/cache": "^0.3.28",
-    "@holo-js/db": "^0.3.28",
-    "@holo-js/db-sqlite": "^0.3.28",
-    "@holo-js/kernel": "^0.3.28",
-    "@types/node": "^22.10.2",
-    "tsup": "^8.3.5",
-    "typescript": "^5.7.2",
-    "vitest": "^4.1.5"
+    "@holo-js/cache": "^0.4.1",
+    "@holo-js/db": "^0.4.1",
+    "@holo-js/db-mysql": "^0.4.1",
+    "@holo-js/db-postgres": "^0.4.1",
+    "@holo-js/db-sqlite": "^0.4.1",
+    "@holo-js/kernel": "^0.4.1",
+    "@types/node": "^22.20.5",
+    "tsup": "^9.0.0",
+    "typescript": "^6.0.3",
+    "vitest": "^5.0.5"
   },
   "engines": {
-    "node": "^22.12.0 || ^24.0.0 || ^26.0.0"
+    "node": "^22.18.0 || ^24.0.0 || ^26.0.0"
   }
 }