@abtnode/db-cache 1.17.3 → 1.17.4-beta-20251201-095907-eebbbbce

package/dist/index.cjs

@@ -3,12 +3,9 @@
 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 crypto = require('node:crypto');
-const lockfile = require('proper-lockfile');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
@@ -26,11 +23,8 @@ function _interopNamespaceCompat(e) {
 
 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 sqlite3__default = /*#__PURE__*/_interopDefaultCompat(sqlite3);
-const crypto__namespace = /*#__PURE__*/_interopNamespaceCompat(crypto);
-const lockfile__default = /*#__PURE__*/_interopDefaultCompat(lockfile);
 
 function ulid() {
   const alphabet = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
@@ -48,20 +42,20 @@ function ulid() {
   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);
+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;
 };
 const _RedisAdapter = class _RedisAdapter {
   constructor() {
-    __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}`);
+    __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}`);
   }
   clearAll() {
     throw new Error("Method not implemented.");
@@ -206,8 +200,8 @@ const _RedisAdapter = class _RedisAdapter {
   }
 };
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-__publicField$5(_RedisAdapter, "clients", /* @__PURE__ */ new Map());
-__publicField$5(_RedisAdapter, "initPromises", /* @__PURE__ */ new Map());
+__publicField$4(_RedisAdapter, "clients", /* @__PURE__ */ new Map());
+__publicField$4(_RedisAdapter, "initPromises", /* @__PURE__ */ new Map());
 let RedisAdapter = _RedisAdapter;
 
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
@@ -236,67 +230,6 @@ 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) => {
@@ -362,21 +295,20 @@ 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() {
+    const isMemory = this.opts.sqlitePath === ":memory:";
     if (!this.dbPath) {
-      this.dbPath = this.opts.sqlitePath === ":memory:" ? ":memory:" : path__namespace.resolve(this.opts.sqlitePath);
+      this.dbPath = isMemory ? ":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;
-      this.fileLock = new FileLock(os__namespace.tmpdir());
+      this.cleanupInterval = this.opts.cleanupInterval ?? 5 * 60 * 1e3;
     }
     if (_SqliteAdapter.clients.has(this.dbPath))
       return;
     if (!_SqliteAdapter.initPromises.has(this.dbPath)) {
-      if (this.dbPath !== ":memory:") {
+      if (!isMemory) {
         const dir = path__namespace.dirname(this.dbPath);
         if (!fs__namespace.existsSync(dir)) {
           fs__namespace.mkdirSync(dir, { recursive: true });
@@ -434,44 +366,28 @@ 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;
-    let fileLocked = false;
-    if (opts.nx && this.fileLock) {
-      fileLocked = await this.fileLock.acquire(storageKey, effectiveTtl);
-      if (!fileLocked)
-        return false;
-    }
-    try {
-      if (opts.nx) {
-        const existing = await dbGet(
-          client,
-          "SELECT value FROM kvcache WHERE key = ? AND subKey = ?",
-          [storageKey, ""]
-        );
-        if (existing) {
-          return false;
-        }
-      }
-      await dbRun(
+    if (opts.nx) {
+      const existing = await dbGet(
         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]
+        "SELECT value FROM kvcache WHERE key = ? AND subKey = ?",
+        [storageKey, ""]
       );
-      if (fileLocked && this.fileLock) {
-        await this.fileLock.release(storageKey);
-      }
-      return true;
-    } catch (err) {
-      if (fileLocked && this.fileLock) {
-        await this.fileLock.release(storageKey);
+      if (existing) {
+        return false;
       }
-      throw err;
     }
+    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]
+    );
+    return true;
   }
   async get(key) {
     const client = this.getClient();
@@ -493,9 +409,6 @@ 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();
@@ -572,9 +485,6 @@ const _SqliteAdapter = class _SqliteAdapter {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
     await dbRun(client, "DELETE FROM kvcache WHERE key = ? AND subKey = ?", [storageKey, subKey]);
-    if (this.fileLock) {
-      await this.fileLock.release(storageKey);
-    }
   }
   /* ------------------------------- misc ------------------------------- */
   async close() {

package/dist/index.mjs

@@ -1,12 +1,9 @@
 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 crypto from 'node:crypto';
-import lockfile from 'proper-lockfile';
 
 function ulid() {
   const alphabet = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
@@ -24,20 +21,20 @@ function ulid() {
   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);
+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;
 };
 const _RedisAdapter = class _RedisAdapter {
   constructor() {
-    __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}`);
+    __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}`);
   }
   clearAll() {
     throw new Error("Method not implemented.");
@@ -182,8 +179,8 @@ const _RedisAdapter = class _RedisAdapter {
   }
 };
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-__publicField$5(_RedisAdapter, "clients", /* @__PURE__ */ new Map());
-__publicField$5(_RedisAdapter, "initPromises", /* @__PURE__ */ new Map());
+__publicField$4(_RedisAdapter, "clients", /* @__PURE__ */ new Map());
+__publicField$4(_RedisAdapter, "initPromises", /* @__PURE__ */ new Map());
 let RedisAdapter = _RedisAdapter;
 
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
@@ -212,67 +209,6 @@ 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) => {
@@ -338,21 +274,20 @@ 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() {
+    const isMemory = this.opts.sqlitePath === ":memory:";
     if (!this.dbPath) {
-      this.dbPath = this.opts.sqlitePath === ":memory:" ? ":memory:" : path.resolve(this.opts.sqlitePath);
+      this.dbPath = isMemory ? ":memory:" : path.resolve(this.opts.sqlitePath);
       this.prefix = this.opts.prefix;
       this.defaultTtl = this.opts.ttl;
-      this.cleanupInterval = this.opts.cleanupInterval ?? 30 * 60 * 1e3;
-      this.fileLock = new FileLock(os.tmpdir());
+      this.cleanupInterval = this.opts.cleanupInterval ?? 5 * 60 * 1e3;
     }
     if (_SqliteAdapter.clients.has(this.dbPath))
       return;
     if (!_SqliteAdapter.initPromises.has(this.dbPath)) {
-      if (this.dbPath !== ":memory:") {
+      if (!isMemory) {
         const dir = path.dirname(this.dbPath);
         if (!fs.existsSync(dir)) {
           fs.mkdirSync(dir, { recursive: true });
@@ -410,44 +345,28 @@ 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;
-    let fileLocked = false;
-    if (opts.nx && this.fileLock) {
-      fileLocked = await this.fileLock.acquire(storageKey, effectiveTtl);
-      if (!fileLocked)
-        return false;
-    }
-    try {
-      if (opts.nx) {
-        const existing = await dbGet(
-          client,
-          "SELECT value FROM kvcache WHERE key = ? AND subKey = ?",
-          [storageKey, ""]
-        );
-        if (existing) {
-          return false;
-        }
-      }
-      await dbRun(
+    if (opts.nx) {
+      const existing = await dbGet(
         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]
+        "SELECT value FROM kvcache WHERE key = ? AND subKey = ?",
+        [storageKey, ""]
       );
-      if (fileLocked && this.fileLock) {
-        await this.fileLock.release(storageKey);
-      }
-      return true;
-    } catch (err) {
-      if (fileLocked && this.fileLock) {
-        await this.fileLock.release(storageKey);
+      if (existing) {
+        return false;
       }
-      throw err;
     }
+    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]
+    );
+    return true;
   }
   async get(key) {
     const client = this.getClient();
@@ -469,9 +388,6 @@ 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();
@@ -548,9 +464,6 @@ const _SqliteAdapter = class _SqliteAdapter {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
     await dbRun(client, "DELETE FROM kvcache WHERE key = ? AND subKey = ?", [storageKey, subKey]);
-    if (this.fileLock) {
-      await this.fileLock.release(storageKey);
-    }
   }
   /* ------------------------------- misc ------------------------------- */
   async close() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/db-cache",
-  "version": "1.17.3",
+  "version": "1.17.4-beta-20251201-095907-eebbbbce",
   "description": "Db cache use redis or sqlite as backend",
   "publishConfig": {
     "access": "public"
@@ -42,5 +42,5 @@
     "typescript": "^5.6.3",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "20fc4c3b0c0fdf05a91d995e3f6fda0f38fa1133"
+  "gitHead": "a22171e333c5e1eccd03b9980bac1ae14749735e"
 }