@abtnode/db-cache 1.17.3-beta-20251118-061144-335cd35d → 1.17.3-beta-20251119-102907-28b69b76

package/dist/index.cjs

@@ -1,10 +1,14 @@
 'use strict';
 
-const path = require('path');
+const path$1 = require('path');
 const redis = require('redis');
+const fs = require('node:fs');
+const os = require('node:os');
+const path = require('node:path');
+const node_util = require('node:util');
 const sqlite3 = require('sqlite3');
-const fs = require('fs');
-const util = require('util');
+const crypto = require('node:crypto');
+const lockfile = require('proper-lockfile');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
@@ -20,25 +24,44 @@ function _interopNamespaceCompat(e) {
   return n;
 }
 
+const path__default = /*#__PURE__*/_interopDefaultCompat(path$1);
+const fs__namespace = /*#__PURE__*/_interopNamespaceCompat(fs);
+const os__namespace = /*#__PURE__*/_interopNamespaceCompat(os);
 const path__namespace = /*#__PURE__*/_interopNamespaceCompat(path);
-const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const sqlite3__default = /*#__PURE__*/_interopDefaultCompat(sqlite3);
-const fs__namespace = /*#__PURE__*/_interopNamespaceCompat(fs);
+const crypto__namespace = /*#__PURE__*/_interopNamespaceCompat(crypto);
+const lockfile__default = /*#__PURE__*/_interopDefaultCompat(lockfile);
 
-var __defProp$4 = Object.defineProperty;
-var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$4 = (obj, key, value) => {
-  __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
+function ulid() {
+  const alphabet = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
+  let t = Date.now();
+  let timeStr = "";
+  for (let i = 0; i < 10; i++) {
+    timeStr = alphabet[t % 32] + timeStr;
+    t = Math.floor(t / 32);
+  }
+  let rand = Math.random().toString(32).substring(2);
+  while (rand.length < 16) {
+    rand += Math.random().toString(32).substring(2);
+  }
+  rand = rand.substring(0, 16).toUpperCase();
+  return timeStr + rand;
+}
+
+var __defProp$5 = Object.defineProperty;
+var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$5 = (obj, key, value) => {
+  __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
 const _RedisAdapter = class _RedisAdapter {
   constructor() {
-    __publicField$4(this, "opts", null);
-    __publicField$4(this, "defaultTtl", 1e3 * 60 * 60);
-    __publicField$4(this, "url", "");
-    __publicField$4(this, "prefix", "");
-    __publicField$4(this, "prefixKey", (key) => `${this.prefix}:${key}`);
-    __publicField$4(this, "prefixKeyGroup", (key) => `${this.prefix}:group:${key}`);
+    __publicField$5(this, "opts", null);
+    __publicField$5(this, "defaultTtl", 1e3 * 60 * 60);
+    __publicField$5(this, "url", "");
+    __publicField$5(this, "prefix", "");
+    __publicField$5(this, "prefixKey", (key) => `${this.prefix}:${key}`);
+    __publicField$5(this, "prefixKeyGroup", (key) => `${this.prefix}:group:${key}`);
   }
   clearAll() {
     throw new Error("Method not implemented.");
@@ -56,10 +79,15 @@ const _RedisAdapter = class _RedisAdapter {
       _RedisAdapter.initPromises.set(
         this.url,
         (async () => {
-          const cli = redis.createClient({ url: this.url });
+          const { url } = this;
+          if (!url) {
+            throw new Error("Redis URL is not set");
+          }
+          const cli = redis.createClient({ url });
           cli.on("error", console.error);
           await cli.connect();
-          _RedisAdapter.clients.set(this.url, cli);
+          await cli.ping();
+          _RedisAdapter.clients.set(url, cli);
         })()
       );
     }
@@ -70,7 +98,11 @@ const _RedisAdapter = class _RedisAdapter {
     if (!this.url || !_RedisAdapter.clients.has(this.url)) {
       throw new Error("Redis not initialized");
     }
-    return _RedisAdapter.clients.get(this.url);
+    const client = _RedisAdapter.clients.get(this.url);
+    if (!client) {
+      throw new Error("Redis client not found");
+    }
+    return client;
   }
   serialize(value) {
     return JSON.stringify({ v: value });
@@ -88,12 +120,21 @@ const _RedisAdapter = class _RedisAdapter {
   async set(key, value, { ttl, nx }) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
-    if (ttl && ttl > 0) {
-      await client.set(storageKey, this.serialize(value), { PX: ttl, NX: nx });
+    const effectiveTtl = ttl !== void 0 ? ttl : this.defaultTtl;
+    let result;
+    if (effectiveTtl && effectiveTtl > 0) {
+      result = await client.set(storageKey, this.serialize(value), { PX: effectiveTtl, NX: nx });
     } else {
-      await client.set(storageKey, this.serialize(value), { NX: nx });
+      result = await client.set(storageKey, this.serialize(value), { NX: nx });
     }
-    return true;
+    if (result !== "OK") {
+      const storedValue = await client.get(storageKey);
+      if (storedValue === this.serialize(value)) {
+        return true;
+      }
+      return false;
+    }
+    return result === "OK";
   }
   async get(key) {
     const client = this.getClient();
@@ -152,9 +193,11 @@ const _RedisAdapter = class _RedisAdapter {
   async close() {
     if (this.url && _RedisAdapter.clients.has(this.url)) {
       const client = _RedisAdapter.clients.get(this.url);
-      await client.quit();
-      _RedisAdapter.clients.delete(this.url);
-      _RedisAdapter.initPromises.delete(this.url);
+      if (client) {
+        await client.quit();
+        _RedisAdapter.clients.delete(this.url);
+        _RedisAdapter.initPromises.delete(this.url);
+      }
     }
   }
   async flushAll() {
@@ -163,8 +206,8 @@ const _RedisAdapter = class _RedisAdapter {
   }
 };
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-__publicField$4(_RedisAdapter, "clients", /* @__PURE__ */ new Map());
-__publicField$4(_RedisAdapter, "initPromises", /* @__PURE__ */ new Map());
+__publicField$5(_RedisAdapter, "clients", /* @__PURE__ */ new Map());
+__publicField$5(_RedisAdapter, "initPromises", /* @__PURE__ */ new Map());
 let RedisAdapter = _RedisAdapter;
 
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
@@ -193,6 +236,67 @@ async function withRetry(fn, {
   }
 }
 
+var __defProp$4 = Object.defineProperty;
+var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$4 = (obj, key, value) => {
+  __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class FileLock {
+  // 默认 10 分钟
+  constructor(baseDir, defaultTtl) {
+    __publicField$4(this, "baseDir");
+    __publicField$4(this, "defaultTtl", 10 * 60 * 1e3);
+    this.baseDir = baseDir;
+    if (defaultTtl !== void 0) {
+      this.defaultTtl = defaultTtl;
+    }
+  }
+  getLockFilePath(storageKey) {
+    const lockDir = path__namespace.join(this.baseDir, "locks");
+    if (!fs__namespace.existsSync(lockDir)) {
+      fs__namespace.mkdirSync(lockDir, { recursive: true });
+    }
+    const safeName = crypto__namespace.createHash("sha256").update(storageKey).digest("hex");
+    return path__namespace.join(lockDir, `${safeName}.lock`);
+  }
+  /**
+   * acquire 返回 true 代表成功加锁
+   * 返回 false 代表有其他进程/线程持有锁
+   */
+  async acquire(storageKey, ttl) {
+    const lockPath = this.getLockFilePath(storageKey);
+    const effectiveTtl = ttl !== void 0 ? ttl : this.defaultTtl;
+    try {
+      try {
+        fs__namespace.writeFileSync(lockPath, "", { flag: "wx" });
+      } catch (_createErr) {
+      }
+      await lockfile__default.lock(lockPath, {
+        realpath: true,
+        stale: effectiveTtl,
+        // 超时自动释放
+        update: Math.floor(effectiveTtl / 3),
+        // 定期续租，避免长任务过期
+        retries: 0
+      });
+      return true;
+    } catch (_err) {
+      return false;
+    }
+  }
+  /**
+   * 释放锁
+   */
+  async release(storageKey) {
+    const lockPath = this.getLockFilePath(storageKey);
+    try {
+      await lockfile__default.unlock(lockPath);
+    } catch (_err) {
+    }
+  }
+}
+
 var __defProp$3 = Object.defineProperty;
 var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$3 = (obj, key, value) => {
@@ -229,11 +333,11 @@ async function initSqliteWithRetry(db) {
     await dbExec(
       db,
       `
-  PRAGMA journal_mode = WAL;
-  PRAGMA synchronous = normal;
-  PRAGMA wal_autocheckpoint = 5000;
-  PRAGMA busy_timeout = 5000;
-`
+        PRAGMA journal_mode = WAL;
+        PRAGMA synchronous = normal;
+        PRAGMA wal_autocheckpoint = 5000;
+        PRAGMA busy_timeout = 5000;
+      `
     );
     await dbRun(
       db,
@@ -245,7 +349,7 @@ async function initSqliteWithRetry(db) {
           expiresAt INTEGER,
           PRIMARY KEY (key, subKey)
         )
-        `
+      `
     );
   } catch (err) {
     throw new Error(`SQLite init failed: ${err}`);
@@ -258,28 +362,36 @@ const _SqliteAdapter = class _SqliteAdapter {
     __publicField$3(this, "defaultTtl", 1e3 * 60 * 60);
     __publicField$3(this, "cleanupInterval", 5 * 60 * 1e3);
     __publicField$3(this, "dbPath", "");
+    __publicField$3(this, "fileLock", null);
   }
+  /* ------------------------------- init ------------------------------- */
   async ensure() {
     if (!this.dbPath) {
       this.dbPath = this.opts.sqlitePath === ":memory:" ? ":memory:" : path__namespace.resolve(this.opts.sqlitePath);
       this.prefix = this.opts.prefix;
       this.defaultTtl = this.opts.ttl;
       this.cleanupInterval = this.opts.cleanupInterval ?? 30 * 60 * 1e3;
+      if (this.dbPath !== ":memory:") {
+        const baseDir = path__namespace.dirname(this.dbPath);
+        this.fileLock = new FileLock(baseDir);
+      } else {
+        const randomId = Math.random().toString(36).substring(2, 15);
+        const baseDir = path__namespace.join(os__namespace.tmpdir(), `db-cache-locks-${randomId}`);
+        this.fileLock = new FileLock(baseDir);
+      }
     }
     if (_SqliteAdapter.clients.has(this.dbPath))
       return;
     if (!_SqliteAdapter.initPromises.has(this.dbPath)) {
-      const dir = path__namespace.dirname(this.dbPath);
-      if (!fs__namespace.existsSync(dir)) {
-        fs__namespace.mkdirSync(dir, { recursive: true });
+      if (this.dbPath !== ":memory:") {
+        const dir = path__namespace.dirname(this.dbPath);
+        if (!fs__namespace.existsSync(dir)) {
+          fs__namespace.mkdirSync(dir, { recursive: true });
+        }
       }
       _SqliteAdapter.initPromises.set(
         this.dbPath,
         (async () => {
-          const dbDir = path__namespace.dirname(this.dbPath);
-          if (!fs__namespace.existsSync(dbDir)) {
-            fs__namespace.mkdirSync(dbDir, { recursive: true });
-          }
           const db = new sqlite3__default.Database(this.dbPath);
           await initSqliteWithRetry(db);
           _SqliteAdapter.clients.set(this.dbPath, db);
@@ -303,16 +415,12 @@ const _SqliteAdapter = class _SqliteAdapter {
     }
     return _SqliteAdapter.clients.get(this.dbPath);
   }
+  /* ------------------------------- cleanup ------------------------------- */
   async cleanup() {
     const client = this.getClient();
-    await new Promise((res, rej) => {
-      client.run(
-        "DELETE FROM kvcache WHERE expiresAt IS NOT NULL AND expiresAt <= ?",
-        [Date.now()],
-        (err) => err ? rej(err) : res()
-      );
-    });
+    await dbRun(client, "DELETE FROM kvcache WHERE expiresAt IS NOT NULL AND expiresAt <= ?", [Date.now()]);
   }
+  /* ------------------------------- core ------------------------------- */
   prefixKey(key) {
     return `${this.prefix}:${key}`;
   }
@@ -323,8 +431,7 @@ const _SqliteAdapter = class _SqliteAdapter {
     if (raw === null || raw === void 0)
       return null;
     try {
-      const obj = JSON.parse(raw);
-      return obj.v;
+      return JSON.parse(raw).v;
     } catch {
       return null;
     }
@@ -334,33 +441,52 @@ const _SqliteAdapter = class _SqliteAdapter {
     const storageKey = this.prefixKey(key);
     const effectiveTtl = opts.ttl !== void 0 ? opts.ttl : this.defaultTtl;
     const expiresAt = effectiveTtl > 0 ? Date.now() + effectiveTtl : null;
-    const subKey = "";
-    if (opts.nx) {
-      const exists = await this.has(key);
-      if (exists)
+    let fileLocked = false;
+    if (opts.nx && this.fileLock) {
+      fileLocked = await this.fileLock.acquire(storageKey, effectiveTtl);
+      if (!fileLocked)
         return false;
     }
-    await dbRun(
-      client,
-      `
-    INSERT INTO kvcache (key, subKey, value, expiresAt)
-    VALUES (?, ?, ?, ?)
-    ON CONFLICT(key, subKey) DO UPDATE SET
-      value = excluded.value,
-      expiresAt = excluded.expiresAt
-    `,
-      [storageKey, subKey, this.serialize(value), expiresAt]
-    );
-    return true;
+    try {
+      if (opts.nx) {
+        const existing = await dbGet(
+          client,
+          "SELECT value FROM kvcache WHERE key = ? AND subKey = ?",
+          [storageKey, ""]
+        );
+        if (existing) {
+          return false;
+        }
+      }
+      await dbRun(
+        client,
+        `
+          INSERT INTO kvcache (key, subKey, value, expiresAt)
+          VALUES (?, ?, ?, ?)
+          ON CONFLICT(key, subKey) DO UPDATE SET
+            value = excluded.value,
+            expiresAt = excluded.expiresAt
+        `,
+        [storageKey, "", this.serialize(value), expiresAt]
+      );
+      if (fileLocked && this.fileLock) {
+        await this.fileLock.release(storageKey);
+      }
+      return true;
+    } catch (err) {
+      if (fileLocked && this.fileLock) {
+        await this.fileLock.release(storageKey);
+      }
+      throw err;
+    }
   }
   async get(key) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
-    const subKey = "";
     const row = await dbGet(
       client,
       'SELECT value, "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
-      [storageKey, subKey]
+      [storageKey, ""]
     );
     if (!row)
       return null;
@@ -374,15 +500,17 @@ const _SqliteAdapter = class _SqliteAdapter {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
     await dbRun(client, "DELETE FROM kvcache WHERE key = ?", [storageKey]);
+    if (this.fileLock) {
+      await this.fileLock.release(storageKey);
+    }
   }
   async has(key) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
-    const subKey = "";
     const row = await dbGet(
       client,
       'SELECT "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
-      [storageKey, subKey]
+      [storageKey, ""]
     );
     if (!row)
       return false;
@@ -392,6 +520,7 @@ const _SqliteAdapter = class _SqliteAdapter {
     }
     return true;
   }
+  /* ------------------------------- group APIs ------------------------------- */
   async groupSet(key, subKey, value, opts) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
@@ -405,11 +534,11 @@ const _SqliteAdapter = class _SqliteAdapter {
     await dbRun(
       client,
       `
-      INSERT INTO kvcache (key, subKey, value, expiresAt)
-      VALUES (?, ?, ?, ?)
-      ON CONFLICT(key, subKey) DO UPDATE SET
-        value = excluded.value,
-        expiresAt = excluded.expiresAt
+        INSERT INTO kvcache (key, subKey, value, expiresAt)
+        VALUES (?, ?, ?, ?)
+        ON CONFLICT(key, subKey) DO UPDATE SET
+          value = excluded.value,
+          expiresAt = excluded.expiresAt
       `,
       [storageKey, subKey, this.serialize(value), expiresAt]
     );
@@ -449,8 +578,12 @@ const _SqliteAdapter = class _SqliteAdapter {
   async groupDel(key, subKey) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
-    return dbRun(client, "DELETE FROM kvcache WHERE key = ? AND subKey = ?", [storageKey, subKey]);
+    await dbRun(client, "DELETE FROM kvcache WHERE key = ? AND subKey = ?", [storageKey, subKey]);
+    if (this.fileLock) {
+      await this.fileLock.release(storageKey);
+    }
   }
+  /* ------------------------------- misc ------------------------------- */
   async close() {
     if (this.dbPath) {
       const timer = _SqliteAdapter.cleanupTimers.get(this.dbPath);
@@ -468,7 +601,7 @@ const _SqliteAdapter = class _SqliteAdapter {
   }
   async flushAll() {
     const client = this.getClient();
-    const run = util.promisify(client.run.bind(client));
+    const run = node_util.promisify(client.run.bind(client));
     await run("DELETE FROM kvcache");
   }
 };
@@ -730,12 +863,8 @@ class LockDBCache extends SingleFlightDBCache {
     }
     this._inFlight.set(key, Date.now());
     try {
-      const exists = await this.has(key);
-      if (!exists) {
-        const result = await this.set(key, Date.now(), { ttl: this.defaultTtl, nx: true });
-        return result;
-      }
-      return false;
+      const result = await this.set(key, ulid(), { ttl: this.defaultTtl, nx: true });
+      return result;
     } finally {
       this._inFlight.delete(key);
       for (const [key2, value] of this._inFlight.entries()) {

package/dist/index.mjs

@@ -1,24 +1,43 @@
-import * as path from 'path';
-import path__default from 'path';
+import path$1 from 'path';
 import { createClient } from 'redis';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import { promisify } from 'node:util';
 import sqlite3 from 'sqlite3';
-import * as fs from 'fs';
-import { promisify } from 'util';
+import * as crypto from 'node:crypto';
+import lockfile from 'proper-lockfile';
 
-var __defProp$4 = Object.defineProperty;
-var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$4 = (obj, key, value) => {
-  __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
+function ulid() {
+  const alphabet = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
+  let t = Date.now();
+  let timeStr = "";
+  for (let i = 0; i < 10; i++) {
+    timeStr = alphabet[t % 32] + timeStr;
+    t = Math.floor(t / 32);
+  }
+  let rand = Math.random().toString(32).substring(2);
+  while (rand.length < 16) {
+    rand += Math.random().toString(32).substring(2);
+  }
+  rand = rand.substring(0, 16).toUpperCase();
+  return timeStr + rand;
+}
+
+var __defProp$5 = Object.defineProperty;
+var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$5 = (obj, key, value) => {
+  __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
 const _RedisAdapter = class _RedisAdapter {
   constructor() {
-    __publicField$4(this, "opts", null);
-    __publicField$4(this, "defaultTtl", 1e3 * 60 * 60);
-    __publicField$4(this, "url", "");
-    __publicField$4(this, "prefix", "");
-    __publicField$4(this, "prefixKey", (key) => `${this.prefix}:${key}`);
-    __publicField$4(this, "prefixKeyGroup", (key) => `${this.prefix}:group:${key}`);
+    __publicField$5(this, "opts", null);
+    __publicField$5(this, "defaultTtl", 1e3 * 60 * 60);
+    __publicField$5(this, "url", "");
+    __publicField$5(this, "prefix", "");
+    __publicField$5(this, "prefixKey", (key) => `${this.prefix}:${key}`);
+    __publicField$5(this, "prefixKeyGroup", (key) => `${this.prefix}:group:${key}`);
   }
   clearAll() {
     throw new Error("Method not implemented.");
@@ -36,10 +55,15 @@ const _RedisAdapter = class _RedisAdapter {
       _RedisAdapter.initPromises.set(
         this.url,
         (async () => {
-          const cli = createClient({ url: this.url });
+          const { url } = this;
+          if (!url) {
+            throw new Error("Redis URL is not set");
+          }
+          const cli = createClient({ url });
           cli.on("error", console.error);
           await cli.connect();
-          _RedisAdapter.clients.set(this.url, cli);
+          await cli.ping();
+          _RedisAdapter.clients.set(url, cli);
         })()
       );
     }
@@ -50,7 +74,11 @@ const _RedisAdapter = class _RedisAdapter {
     if (!this.url || !_RedisAdapter.clients.has(this.url)) {
       throw new Error("Redis not initialized");
     }
-    return _RedisAdapter.clients.get(this.url);
+    const client = _RedisAdapter.clients.get(this.url);
+    if (!client) {
+      throw new Error("Redis client not found");
+    }
+    return client;
   }
   serialize(value) {
     return JSON.stringify({ v: value });
@@ -68,12 +96,21 @@ const _RedisAdapter = class _RedisAdapter {
   async set(key, value, { ttl, nx }) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
-    if (ttl && ttl > 0) {
-      await client.set(storageKey, this.serialize(value), { PX: ttl, NX: nx });
+    const effectiveTtl = ttl !== void 0 ? ttl : this.defaultTtl;
+    let result;
+    if (effectiveTtl && effectiveTtl > 0) {
+      result = await client.set(storageKey, this.serialize(value), { PX: effectiveTtl, NX: nx });
     } else {
-      await client.set(storageKey, this.serialize(value), { NX: nx });
+      result = await client.set(storageKey, this.serialize(value), { NX: nx });
     }
-    return true;
+    if (result !== "OK") {
+      const storedValue = await client.get(storageKey);
+      if (storedValue === this.serialize(value)) {
+        return true;
+      }
+      return false;
+    }
+    return result === "OK";
   }
   async get(key) {
     const client = this.getClient();
@@ -132,9 +169,11 @@ const _RedisAdapter = class _RedisAdapter {
   async close() {
     if (this.url && _RedisAdapter.clients.has(this.url)) {
       const client = _RedisAdapter.clients.get(this.url);
-      await client.quit();
-      _RedisAdapter.clients.delete(this.url);
-      _RedisAdapter.initPromises.delete(this.url);
+      if (client) {
+        await client.quit();
+        _RedisAdapter.clients.delete(this.url);
+        _RedisAdapter.initPromises.delete(this.url);
+      }
     }
   }
   async flushAll() {
@@ -143,8 +182,8 @@ const _RedisAdapter = class _RedisAdapter {
   }
 };
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-__publicField$4(_RedisAdapter, "clients", /* @__PURE__ */ new Map());
-__publicField$4(_RedisAdapter, "initPromises", /* @__PURE__ */ new Map());
+__publicField$5(_RedisAdapter, "clients", /* @__PURE__ */ new Map());
+__publicField$5(_RedisAdapter, "initPromises", /* @__PURE__ */ new Map());
 let RedisAdapter = _RedisAdapter;
 
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
@@ -173,6 +212,67 @@ async function withRetry(fn, {
   }
 }
 
+var __defProp$4 = Object.defineProperty;
+var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$4 = (obj, key, value) => {
+  __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class FileLock {
+  // 默认 10 分钟
+  constructor(baseDir, defaultTtl) {
+    __publicField$4(this, "baseDir");
+    __publicField$4(this, "defaultTtl", 10 * 60 * 1e3);
+    this.baseDir = baseDir;
+    if (defaultTtl !== void 0) {
+      this.defaultTtl = defaultTtl;
+    }
+  }
+  getLockFilePath(storageKey) {
+    const lockDir = path.join(this.baseDir, "locks");
+    if (!fs.existsSync(lockDir)) {
+      fs.mkdirSync(lockDir, { recursive: true });
+    }
+    const safeName = crypto.createHash("sha256").update(storageKey).digest("hex");
+    return path.join(lockDir, `${safeName}.lock`);
+  }
+  /**
+   * acquire 返回 true 代表成功加锁
+   * 返回 false 代表有其他进程/线程持有锁
+   */
+  async acquire(storageKey, ttl) {
+    const lockPath = this.getLockFilePath(storageKey);
+    const effectiveTtl = ttl !== void 0 ? ttl : this.defaultTtl;
+    try {
+      try {
+        fs.writeFileSync(lockPath, "", { flag: "wx" });
+      } catch (_createErr) {
+      }
+      await lockfile.lock(lockPath, {
+        realpath: true,
+        stale: effectiveTtl,
+        // 超时自动释放
+        update: Math.floor(effectiveTtl / 3),
+        // 定期续租，避免长任务过期
+        retries: 0
+      });
+      return true;
+    } catch (_err) {
+      return false;
+    }
+  }
+  /**
+   * 释放锁
+   */
+  async release(storageKey) {
+    const lockPath = this.getLockFilePath(storageKey);
+    try {
+      await lockfile.unlock(lockPath);
+    } catch (_err) {
+    }
+  }
+}
+
 var __defProp$3 = Object.defineProperty;
 var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$3 = (obj, key, value) => {
@@ -209,11 +309,11 @@ async function initSqliteWithRetry(db) {
     await dbExec(
       db,
       `
-  PRAGMA journal_mode = WAL;
-  PRAGMA synchronous = normal;
-  PRAGMA wal_autocheckpoint = 5000;
-  PRAGMA busy_timeout = 5000;
-`
+        PRAGMA journal_mode = WAL;
+        PRAGMA synchronous = normal;
+        PRAGMA wal_autocheckpoint = 5000;
+        PRAGMA busy_timeout = 5000;
+      `
     );
     await dbRun(
       db,
@@ -225,7 +325,7 @@ async function initSqliteWithRetry(db) {
           expiresAt INTEGER,
           PRIMARY KEY (key, subKey)
         )
-        `
+      `
     );
   } catch (err) {
     throw new Error(`SQLite init failed: ${err}`);
@@ -238,28 +338,36 @@ const _SqliteAdapter = class _SqliteAdapter {
     __publicField$3(this, "defaultTtl", 1e3 * 60 * 60);
     __publicField$3(this, "cleanupInterval", 5 * 60 * 1e3);
     __publicField$3(this, "dbPath", "");
+    __publicField$3(this, "fileLock", null);
   }
+  /* ------------------------------- init ------------------------------- */
   async ensure() {
     if (!this.dbPath) {
       this.dbPath = this.opts.sqlitePath === ":memory:" ? ":memory:" : path.resolve(this.opts.sqlitePath);
       this.prefix = this.opts.prefix;
       this.defaultTtl = this.opts.ttl;
       this.cleanupInterval = this.opts.cleanupInterval ?? 30 * 60 * 1e3;
+      if (this.dbPath !== ":memory:") {
+        const baseDir = path.dirname(this.dbPath);
+        this.fileLock = new FileLock(baseDir);
+      } else {
+        const randomId = Math.random().toString(36).substring(2, 15);
+        const baseDir = path.join(os.tmpdir(), `db-cache-locks-${randomId}`);
+        this.fileLock = new FileLock(baseDir);
+      }
     }
     if (_SqliteAdapter.clients.has(this.dbPath))
       return;
     if (!_SqliteAdapter.initPromises.has(this.dbPath)) {
-      const dir = path.dirname(this.dbPath);
-      if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir, { recursive: true });
+      if (this.dbPath !== ":memory:") {
+        const dir = path.dirname(this.dbPath);
+        if (!fs.existsSync(dir)) {
+          fs.mkdirSync(dir, { recursive: true });
+        }
       }
       _SqliteAdapter.initPromises.set(
         this.dbPath,
         (async () => {
-          const dbDir = path.dirname(this.dbPath);
-          if (!fs.existsSync(dbDir)) {
-            fs.mkdirSync(dbDir, { recursive: true });
-          }
           const db = new sqlite3.Database(this.dbPath);
           await initSqliteWithRetry(db);
           _SqliteAdapter.clients.set(this.dbPath, db);
@@ -283,16 +391,12 @@ const _SqliteAdapter = class _SqliteAdapter {
     }
     return _SqliteAdapter.clients.get(this.dbPath);
   }
+  /* ------------------------------- cleanup ------------------------------- */
   async cleanup() {
     const client = this.getClient();
-    await new Promise((res, rej) => {
-      client.run(
-        "DELETE FROM kvcache WHERE expiresAt IS NOT NULL AND expiresAt <= ?",
-        [Date.now()],
-        (err) => err ? rej(err) : res()
-      );
-    });
+    await dbRun(client, "DELETE FROM kvcache WHERE expiresAt IS NOT NULL AND expiresAt <= ?", [Date.now()]);
   }
+  /* ------------------------------- core ------------------------------- */
   prefixKey(key) {
     return `${this.prefix}:${key}`;
   }
@@ -303,8 +407,7 @@ const _SqliteAdapter = class _SqliteAdapter {
     if (raw === null || raw === void 0)
       return null;
     try {
-      const obj = JSON.parse(raw);
-      return obj.v;
+      return JSON.parse(raw).v;
     } catch {
       return null;
     }
@@ -314,33 +417,52 @@ const _SqliteAdapter = class _SqliteAdapter {
     const storageKey = this.prefixKey(key);
     const effectiveTtl = opts.ttl !== void 0 ? opts.ttl : this.defaultTtl;
     const expiresAt = effectiveTtl > 0 ? Date.now() + effectiveTtl : null;
-    const subKey = "";
-    if (opts.nx) {
-      const exists = await this.has(key);
-      if (exists)
+    let fileLocked = false;
+    if (opts.nx && this.fileLock) {
+      fileLocked = await this.fileLock.acquire(storageKey, effectiveTtl);
+      if (!fileLocked)
         return false;
     }
-    await dbRun(
-      client,
-      `
-    INSERT INTO kvcache (key, subKey, value, expiresAt)
-    VALUES (?, ?, ?, ?)
-    ON CONFLICT(key, subKey) DO UPDATE SET
-      value = excluded.value,
-      expiresAt = excluded.expiresAt
-    `,
-      [storageKey, subKey, this.serialize(value), expiresAt]
-    );
-    return true;
+    try {
+      if (opts.nx) {
+        const existing = await dbGet(
+          client,
+          "SELECT value FROM kvcache WHERE key = ? AND subKey = ?",
+          [storageKey, ""]
+        );
+        if (existing) {
+          return false;
+        }
+      }
+      await dbRun(
+        client,
+        `
+          INSERT INTO kvcache (key, subKey, value, expiresAt)
+          VALUES (?, ?, ?, ?)
+          ON CONFLICT(key, subKey) DO UPDATE SET
+            value = excluded.value,
+            expiresAt = excluded.expiresAt
+        `,
+        [storageKey, "", this.serialize(value), expiresAt]
+      );
+      if (fileLocked && this.fileLock) {
+        await this.fileLock.release(storageKey);
+      }
+      return true;
+    } catch (err) {
+      if (fileLocked && this.fileLock) {
+        await this.fileLock.release(storageKey);
+      }
+      throw err;
+    }
   }
   async get(key) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
-    const subKey = "";
     const row = await dbGet(
       client,
       'SELECT value, "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
-      [storageKey, subKey]
+      [storageKey, ""]
     );
     if (!row)
       return null;
@@ -354,15 +476,17 @@ const _SqliteAdapter = class _SqliteAdapter {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
     await dbRun(client, "DELETE FROM kvcache WHERE key = ?", [storageKey]);
+    if (this.fileLock) {
+      await this.fileLock.release(storageKey);
+    }
   }
   async has(key) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
-    const subKey = "";
     const row = await dbGet(
       client,
       'SELECT "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
-      [storageKey, subKey]
+      [storageKey, ""]
     );
     if (!row)
       return false;
@@ -372,6 +496,7 @@ const _SqliteAdapter = class _SqliteAdapter {
     }
     return true;
   }
+  /* ------------------------------- group APIs ------------------------------- */
   async groupSet(key, subKey, value, opts) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
@@ -385,11 +510,11 @@ const _SqliteAdapter = class _SqliteAdapter {
     await dbRun(
       client,
       `
-      INSERT INTO kvcache (key, subKey, value, expiresAt)
-      VALUES (?, ?, ?, ?)
-      ON CONFLICT(key, subKey) DO UPDATE SET
-        value = excluded.value,
-        expiresAt = excluded.expiresAt
+        INSERT INTO kvcache (key, subKey, value, expiresAt)
+        VALUES (?, ?, ?, ?)
+        ON CONFLICT(key, subKey) DO UPDATE SET
+          value = excluded.value,
+          expiresAt = excluded.expiresAt
       `,
       [storageKey, subKey, this.serialize(value), expiresAt]
     );
@@ -429,8 +554,12 @@ const _SqliteAdapter = class _SqliteAdapter {
   async groupDel(key, subKey) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
-    return dbRun(client, "DELETE FROM kvcache WHERE key = ? AND subKey = ?", [storageKey, subKey]);
+    await dbRun(client, "DELETE FROM kvcache WHERE key = ? AND subKey = ?", [storageKey, subKey]);
+    if (this.fileLock) {
+      await this.fileLock.release(storageKey);
+    }
   }
+  /* ------------------------------- misc ------------------------------- */
   async close() {
     if (this.dbPath) {
       const timer = _SqliteAdapter.cleanupTimers.get(this.dbPath);
@@ -710,12 +839,8 @@ class LockDBCache extends SingleFlightDBCache {
     }
     this._inFlight.set(key, Date.now());
     try {
-      const exists = await this.has(key);
-      if (!exists) {
-        const result = await this.set(key, Date.now(), { ttl: this.defaultTtl, nx: true });
-        return result;
-      }
-      return false;
+      const result = await this.set(key, ulid(), { ttl: this.defaultTtl, nx: true });
+      return result;
     } finally {
       this._inFlight.delete(key);
       for (const [key2, value] of this._inFlight.entries()) {
@@ -809,7 +934,7 @@ const isJestTest = () => {
   return process.env.NODE_ENV === "test" || process.env.BABEL_ENV === "test";
 };
 const getAbtNodeRedisAndSQLiteUrl = () => {
-  const blockletCacheDir = process.env.BLOCKLET_DATA_DIR ? path__default.join(process.env.BLOCKLET_DATA_DIR, "__default-cache-store.db") : void 0;
+  const blockletCacheDir = process.env.BLOCKLET_DATA_DIR ? path$1.join(process.env.BLOCKLET_DATA_DIR, "__default-cache-store.db") : void 0;
   const params = {
     redisUrl: process.env.ABT_NODE_CACHE_REDIS_URL,
     sqlitePath: isJestTest() ? ":memory:" : blockletCacheDir || process.env.ABT_NODE_CACHE_SQLITE_PATH

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/db-cache",
-  "version": "1.17.3-beta-20251118-061144-335cd35d",
+  "version": "1.17.3-beta-20251119-102907-28b69b76",
   "description": "Db cache use redis or sqlite as backend",
   "publishConfig": {
     "access": "public"
@@ -27,6 +27,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@types/proper-lockfile": "^4.1.4",
+    "proper-lockfile": "^4.1.2",
     "redis": "^5.1.1",
     "sqlite3": "^5.1.7"
   },
@@ -40,5 +42,5 @@
     "typescript": "^5.6.3",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "8e2245b336c9b4cdfd8e53012ab44a11b68c5665"
+  "gitHead": "6ae74784386f183ac410a226b6b9334c0f722fcc"
 }