@abtnode/db-cache 1.16.47-beta-20250730-070104-87a128a5 → 1.16.47-beta-20250731-014139-e860268f

package/dist/index.cjs

@@ -166,48 +166,94 @@ __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));
+async function withRetry(fn, {
+  max = 15,
+  backoffBase = 200,
+  backoffExponent = 1.1,
+  backoffJitter = 100,
+  needRetry = () => true
+  // eslint-disable-next-line @typescript-eslint/comma-dangle
+} = {}) {
+  let attempt = 0;
+  while (true) {
+    try {
+      return await fn();
+    } catch (err) {
+      if (!needRetry(err) || ++attempt > max) {
+        throw err;
+      }
+      const exp = backoffExponent ** (attempt - 1);
+      const expDelay = backoffBase * exp;
+      const jitter = Math.random() * backoffJitter;
+      const waitTime = Math.floor(expDelay + jitter);
+      await sleep(waitTime);
+    }
+  }
+}
+
 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) => {
   __defNormalProp$3(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+const retryOptions = {
+  needRetry: (err) => err.message?.includes("SQLITE_BUSY")
+};
+const dbRun = (db, sql, params) => {
+  return withRetry(() => {
+    return new Promise((res, rej) => {
+      db.run(sql, params, (err) => err ? rej(err) : res());
+    });
+  }, retryOptions);
+};
+const dbExec = (db, sql) => {
+  return withRetry(() => {
+    return new Promise((res, rej) => {
+      db.exec(sql, (err) => err ? rej(err) : res());
+    });
+  }, retryOptions);
+};
+const dbGet = (db, sql, params) => {
+  return withRetry(() => {
+    return new Promise((res, rej) => {
+      db.get(sql, params, (err, result) => err ? rej(err) : res(result));
+    });
+  }, retryOptions);
+};
 async function initSqliteWithRetry(db) {
-  const sql = `
-    PRAGMA journal_mode = WAL;
-    PRAGMA synchronous = OFF;
-    PRAGMA busy_timeout = 20000;
-    PRAGMA wal_autocheckpoint = 10000;
-  `;
-  const maxRetries = 10;
-  const delayMs = 2e3;
-  for (let attempt = 1; attempt <= maxRetries; attempt++) {
-    try {
-      await new Promise((resolve, reject) => {
-        db.exec(sql, (err) => {
-          if (err)
-            reject(err);
-          else
-            resolve();
-        });
-      });
-      return;
-    } catch (err) {
-      if (attempt < maxRetries) {
-        await new Promise((resolve) => setTimeout(resolve, delayMs));
-      } else {
-        throw new Error(`SQLite init failed, retried ${maxRetries} times: ${err}`);
-      }
-    }
+  db.configure("busyTimeout", 5e3);
+  try {
+    await dbExec(
+      db,
+      `
+  PRAGMA journal_mode = WAL;
+  PRAGMA synchronous = normal;
+  PRAGMA wal_autocheckpoint = 5000;
+  PRAGMA busy_timeout = 5000;
+`
+    );
+    await dbRun(
+      db,
+      `
+        CREATE TABLE IF NOT EXISTS kvcache (
+          key TEXT NOT NULL,
+          subKey TEXT NOT NULL,
+          value TEXT NOT NULL,
+          expiresAt INTEGER,
+          PRIMARY KEY (key, subKey)
+        )
+        `
+    );
+  } catch (err) {
+    throw new Error(`SQLite init failed: ${err}`);
   }
 }
 const _SqliteAdapter = class _SqliteAdapter {
   constructor() {
     __publicField$3(this, "opts", null);
     __publicField$3(this, "prefix", "");
-    __publicField$3(this, "sqliteBusyRetryCount", 0);
-    __publicField$3(this, "sqliteBusyRetryGroupCount", 0);
     __publicField$3(this, "defaultTtl", 1e3 * 60 * 60);
     __publicField$3(this, "cleanupInterval", 5 * 60 * 1e3);
     __publicField$3(this, "dbPath", "");
@@ -235,28 +281,6 @@ const _SqliteAdapter = class _SqliteAdapter {
           }
           const db = new sqlite3__default.Database(this.dbPath);
           await initSqliteWithRetry(db);
-          await new Promise(
-            (res, rej) => db.run(
-              `
-              CREATE TABLE IF NOT EXISTS kvcache (
-                key TEXT NOT NULL,
-                subKey TEXT NOT NULL,
-                value TEXT NOT NULL,
-                expiresAt INTEGER,
-                PRIMARY KEY (key, subKey)
-              )
-              `,
-              (err) => err ? rej(err) : res()
-            )
-          );
-          await new Promise(
-            (res, rej) => db.run(
-              `
-              PRAGMA shrink_memory;
-              `,
-              (err) => err ? rej(err) : res()
-            )
-          );
           _SqliteAdapter.clients.set(this.dbPath, db);
           _SqliteAdapter.cleanupTimers.set(
             this.dbPath,
@@ -315,51 +339,28 @@ const _SqliteAdapter = class _SqliteAdapter {
       if (exists)
         return false;
     }
-    try {
-      await new Promise((res, rej) => {
-        client.run(
-          `
-        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],
-          (err) => err ? rej(err) : res()
-        );
-      });
-    } catch (error) {
-      if (error.message?.includes("SQLITE_BUSY")) {
-        if (this.sqliteBusyRetryCount > 10) {
-          this.sqliteBusyRetryCount = 0;
-          throw error;
-        }
-        this.sqliteBusyRetryCount++;
-        await sleep(2e3);
-        const out = await this.set(key, value, opts);
-        this.sqliteBusyRetryCount = 0;
-        return out;
-      }
-      throw error;
-    }
+    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;
   }
   async get(key) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
     const subKey = "";
-    const row = await new Promise((res, rej) => {
-      client.get(
-        'SELECT value, "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
-        [storageKey, subKey],
-        (err, result) => {
-          if (err)
-            return rej(err);
-          return res(result);
-        }
-      );
-    });
+    const row = await dbGet(
+      client,
+      'SELECT value, "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
+      [storageKey, subKey]
+    );
     if (!row)
       return null;
     if (row.expiresAt !== null && Date.now() > row.expiresAt) {
@@ -371,22 +372,17 @@ const _SqliteAdapter = class _SqliteAdapter {
   async del(key) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
-    await new Promise((res, rej) => {
-      client.run("DELETE FROM kvcache WHERE key = ?", [storageKey], (err) => err ? rej(err) : res());
-    });
+    await dbRun(client, "DELETE FROM kvcache WHERE key = ?", [storageKey]);
   }
   async has(key) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
     const subKey = "";
-    const row = await new Promise((res, rej) => {
-      client.get(
-        'SELECT "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
-        [storageKey, subKey],
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (err, result) => err ? rej(err) : res(result)
-      );
-    });
+    const row = await dbGet(
+      client,
+      'SELECT "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
+      [storageKey, subKey]
+    );
     if (!row)
       return false;
     if (row.expiresAt !== null && Date.now() > row.expiresAt) {
@@ -405,49 +401,26 @@ const _SqliteAdapter = class _SqliteAdapter {
       if (exists)
         return;
     }
-    try {
-      await new Promise((res, rej) => {
-        client.run(
-          `
-        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],
-          (err) => err ? rej(err) : res()
-        );
-      });
-    } catch (error) {
-      if (error.message?.includes("SQLITE_BUSY")) {
-        if (this.sqliteBusyRetryGroupCount > 10) {
-          this.sqliteBusyRetryGroupCount = 0;
-          throw error;
-        }
-        this.sqliteBusyRetryGroupCount++;
-        await sleep(2e3);
-        await this.groupSet(key, subKey, value, opts);
-        this.sqliteBusyRetryGroupCount = 0;
-        return;
-      }
-      throw error;
-    }
+    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]
+    );
   }
   async groupGet(key, subKey) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
-    const row = await new Promise((res, rej) => {
-      client.get(
-        'SELECT value, "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
-        [storageKey, subKey],
-        (err, result) => {
-          if (err)
-            return rej(err);
-          return res(result);
-        }
-      );
-    });
+    const row = await dbGet(
+      client,
+      'SELECT value, "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
+      [storageKey, subKey]
+    );
     if (!row)
       return null;
     if (row.expiresAt !== null && Date.now() > row.expiresAt) {
@@ -459,14 +432,11 @@ const _SqliteAdapter = class _SqliteAdapter {
   async groupHas(key, subKey) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
-    const row = await new Promise((res, rej) => {
-      client.get(
-        'SELECT "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
-        [storageKey, subKey],
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (err, result) => err ? rej(err) : res(result)
-      );
-    });
+    const row = await dbGet(
+      client,
+      'SELECT "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
+      [storageKey, subKey]
+    );
     if (!row)
       return false;
     if (row.expiresAt !== null && Date.now() > row.expiresAt) {
@@ -478,13 +448,7 @@ const _SqliteAdapter = class _SqliteAdapter {
   async groupDel(key, subKey) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
-    await new Promise((res, rej) => {
-      client.run(
-        "DELETE FROM kvcache WHERE key = ? AND subKey = ?",
-        [storageKey, subKey],
-        (err) => err ? rej(err) : res()
-      );
-    });
+    return dbRun(client, "DELETE FROM kvcache WHERE key = ? AND subKey = ?", [storageKey, subKey]);
   }
   async close() {
     if (this.dbPath) {
@@ -876,3 +840,4 @@ const getAbtNodeRedisAndSQLiteUrl = () => {
 
 exports.DBCache = LockDBCache;
 exports.getAbtNodeRedisAndSQLiteUrl = getAbtNodeRedisAndSQLiteUrl;
+exports.withRetry = withRetry;

package/dist/index.d.cts

@@ -120,9 +120,23 @@ declare class LockDBCache extends SingleFlightDBCache {
     private _formatLockKey;
 }
 
+interface WithRetryOptions {
+    /** 最大重试次数 */
+    max?: number;
+    /** 初始退避时长，单位 ms */
+    backoffBase?: number;
+    /** 每次重试时的指数倍数 */
+    backoffExponent?: number;
+    /** 抖动范围，0~backoffJitter 毫秒 */
+    backoffJitter?: number;
+    /** 判断是否需要重试的函数 */
+    needRetry?: (err: any) => boolean;
+}
+declare function withRetry<T>(fn: () => Promise<T>, { max, backoffBase, backoffExponent, backoffJitter, needRetry, }?: WithRetryOptions): Promise<T>;
+
 declare const getAbtNodeRedisAndSQLiteUrl: () => {
     redisUrl: string | undefined;
     sqlitePath: string | undefined;
 };
 
-export { type BaseDBCacheOptions, LockDBCache as DBCache, type IDBAdapter, getAbtNodeRedisAndSQLiteUrl };
+export { type BaseDBCacheOptions, LockDBCache as DBCache, type IDBAdapter, getAbtNodeRedisAndSQLiteUrl, withRetry };

package/dist/index.d.mts

@@ -120,9 +120,23 @@ declare class LockDBCache extends SingleFlightDBCache {
     private _formatLockKey;
 }
 
+interface WithRetryOptions {
+    /** 最大重试次数 */
+    max?: number;
+    /** 初始退避时长，单位 ms */
+    backoffBase?: number;
+    /** 每次重试时的指数倍数 */
+    backoffExponent?: number;
+    /** 抖动范围，0~backoffJitter 毫秒 */
+    backoffJitter?: number;
+    /** 判断是否需要重试的函数 */
+    needRetry?: (err: any) => boolean;
+}
+declare function withRetry<T>(fn: () => Promise<T>, { max, backoffBase, backoffExponent, backoffJitter, needRetry, }?: WithRetryOptions): Promise<T>;
+
 declare const getAbtNodeRedisAndSQLiteUrl: () => {
     redisUrl: string | undefined;
     sqlitePath: string | undefined;
 };
 
-export { type BaseDBCacheOptions, LockDBCache as DBCache, type IDBAdapter, getAbtNodeRedisAndSQLiteUrl };
+export { type BaseDBCacheOptions, LockDBCache as DBCache, type IDBAdapter, getAbtNodeRedisAndSQLiteUrl, withRetry };

package/dist/index.d.ts

@@ -120,9 +120,23 @@ declare class LockDBCache extends SingleFlightDBCache {
     private _formatLockKey;
 }
 
+interface WithRetryOptions {
+    /** 最大重试次数 */
+    max?: number;
+    /** 初始退避时长，单位 ms */
+    backoffBase?: number;
+    /** 每次重试时的指数倍数 */
+    backoffExponent?: number;
+    /** 抖动范围，0~backoffJitter 毫秒 */
+    backoffJitter?: number;
+    /** 判断是否需要重试的函数 */
+    needRetry?: (err: any) => boolean;
+}
+declare function withRetry<T>(fn: () => Promise<T>, { max, backoffBase, backoffExponent, backoffJitter, needRetry, }?: WithRetryOptions): Promise<T>;
+
 declare const getAbtNodeRedisAndSQLiteUrl: () => {
     redisUrl: string | undefined;
     sqlitePath: string | undefined;
 };
 
-export { type BaseDBCacheOptions, LockDBCache as DBCache, type IDBAdapter, getAbtNodeRedisAndSQLiteUrl };
+export { type BaseDBCacheOptions, LockDBCache as DBCache, type IDBAdapter, getAbtNodeRedisAndSQLiteUrl, withRetry };

package/dist/index.mjs

@@ -146,48 +146,94 @@ __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));
+async function withRetry(fn, {
+  max = 15,
+  backoffBase = 200,
+  backoffExponent = 1.1,
+  backoffJitter = 100,
+  needRetry = () => true
+  // eslint-disable-next-line @typescript-eslint/comma-dangle
+} = {}) {
+  let attempt = 0;
+  while (true) {
+    try {
+      return await fn();
+    } catch (err) {
+      if (!needRetry(err) || ++attempt > max) {
+        throw err;
+      }
+      const exp = backoffExponent ** (attempt - 1);
+      const expDelay = backoffBase * exp;
+      const jitter = Math.random() * backoffJitter;
+      const waitTime = Math.floor(expDelay + jitter);
+      await sleep(waitTime);
+    }
+  }
+}
+
 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) => {
   __defNormalProp$3(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+const retryOptions = {
+  needRetry: (err) => err.message?.includes("SQLITE_BUSY")
+};
+const dbRun = (db, sql, params) => {
+  return withRetry(() => {
+    return new Promise((res, rej) => {
+      db.run(sql, params, (err) => err ? rej(err) : res());
+    });
+  }, retryOptions);
+};
+const dbExec = (db, sql) => {
+  return withRetry(() => {
+    return new Promise((res, rej) => {
+      db.exec(sql, (err) => err ? rej(err) : res());
+    });
+  }, retryOptions);
+};
+const dbGet = (db, sql, params) => {
+  return withRetry(() => {
+    return new Promise((res, rej) => {
+      db.get(sql, params, (err, result) => err ? rej(err) : res(result));
+    });
+  }, retryOptions);
+};
 async function initSqliteWithRetry(db) {
-  const sql = `
-    PRAGMA journal_mode = WAL;
-    PRAGMA synchronous = OFF;
-    PRAGMA busy_timeout = 20000;
-    PRAGMA wal_autocheckpoint = 10000;
-  `;
-  const maxRetries = 10;
-  const delayMs = 2e3;
-  for (let attempt = 1; attempt <= maxRetries; attempt++) {
-    try {
-      await new Promise((resolve, reject) => {
-        db.exec(sql, (err) => {
-          if (err)
-            reject(err);
-          else
-            resolve();
-        });
-      });
-      return;
-    } catch (err) {
-      if (attempt < maxRetries) {
-        await new Promise((resolve) => setTimeout(resolve, delayMs));
-      } else {
-        throw new Error(`SQLite init failed, retried ${maxRetries} times: ${err}`);
-      }
-    }
+  db.configure("busyTimeout", 5e3);
+  try {
+    await dbExec(
+      db,
+      `
+  PRAGMA journal_mode = WAL;
+  PRAGMA synchronous = normal;
+  PRAGMA wal_autocheckpoint = 5000;
+  PRAGMA busy_timeout = 5000;
+`
+    );
+    await dbRun(
+      db,
+      `
+        CREATE TABLE IF NOT EXISTS kvcache (
+          key TEXT NOT NULL,
+          subKey TEXT NOT NULL,
+          value TEXT NOT NULL,
+          expiresAt INTEGER,
+          PRIMARY KEY (key, subKey)
+        )
+        `
+    );
+  } catch (err) {
+    throw new Error(`SQLite init failed: ${err}`);
   }
 }
 const _SqliteAdapter = class _SqliteAdapter {
   constructor() {
     __publicField$3(this, "opts", null);
     __publicField$3(this, "prefix", "");
-    __publicField$3(this, "sqliteBusyRetryCount", 0);
-    __publicField$3(this, "sqliteBusyRetryGroupCount", 0);
     __publicField$3(this, "defaultTtl", 1e3 * 60 * 60);
     __publicField$3(this, "cleanupInterval", 5 * 60 * 1e3);
     __publicField$3(this, "dbPath", "");
@@ -215,28 +261,6 @@ const _SqliteAdapter = class _SqliteAdapter {
           }
           const db = new sqlite3.Database(this.dbPath);
           await initSqliteWithRetry(db);
-          await new Promise(
-            (res, rej) => db.run(
-              `
-              CREATE TABLE IF NOT EXISTS kvcache (
-                key TEXT NOT NULL,
-                subKey TEXT NOT NULL,
-                value TEXT NOT NULL,
-                expiresAt INTEGER,
-                PRIMARY KEY (key, subKey)
-              )
-              `,
-              (err) => err ? rej(err) : res()
-            )
-          );
-          await new Promise(
-            (res, rej) => db.run(
-              `
-              PRAGMA shrink_memory;
-              `,
-              (err) => err ? rej(err) : res()
-            )
-          );
           _SqliteAdapter.clients.set(this.dbPath, db);
           _SqliteAdapter.cleanupTimers.set(
             this.dbPath,
@@ -295,51 +319,28 @@ const _SqliteAdapter = class _SqliteAdapter {
       if (exists)
         return false;
     }
-    try {
-      await new Promise((res, rej) => {
-        client.run(
-          `
-        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],
-          (err) => err ? rej(err) : res()
-        );
-      });
-    } catch (error) {
-      if (error.message?.includes("SQLITE_BUSY")) {
-        if (this.sqliteBusyRetryCount > 10) {
-          this.sqliteBusyRetryCount = 0;
-          throw error;
-        }
-        this.sqliteBusyRetryCount++;
-        await sleep(2e3);
-        const out = await this.set(key, value, opts);
-        this.sqliteBusyRetryCount = 0;
-        return out;
-      }
-      throw error;
-    }
+    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;
   }
   async get(key) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
     const subKey = "";
-    const row = await new Promise((res, rej) => {
-      client.get(
-        'SELECT value, "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
-        [storageKey, subKey],
-        (err, result) => {
-          if (err)
-            return rej(err);
-          return res(result);
-        }
-      );
-    });
+    const row = await dbGet(
+      client,
+      'SELECT value, "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
+      [storageKey, subKey]
+    );
     if (!row)
       return null;
     if (row.expiresAt !== null && Date.now() > row.expiresAt) {
@@ -351,22 +352,17 @@ const _SqliteAdapter = class _SqliteAdapter {
   async del(key) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
-    await new Promise((res, rej) => {
-      client.run("DELETE FROM kvcache WHERE key = ?", [storageKey], (err) => err ? rej(err) : res());
-    });
+    await dbRun(client, "DELETE FROM kvcache WHERE key = ?", [storageKey]);
   }
   async has(key) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
     const subKey = "";
-    const row = await new Promise((res, rej) => {
-      client.get(
-        'SELECT "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
-        [storageKey, subKey],
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (err, result) => err ? rej(err) : res(result)
-      );
-    });
+    const row = await dbGet(
+      client,
+      'SELECT "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
+      [storageKey, subKey]
+    );
     if (!row)
       return false;
     if (row.expiresAt !== null && Date.now() > row.expiresAt) {
@@ -385,49 +381,26 @@ const _SqliteAdapter = class _SqliteAdapter {
       if (exists)
         return;
     }
-    try {
-      await new Promise((res, rej) => {
-        client.run(
-          `
-        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],
-          (err) => err ? rej(err) : res()
-        );
-      });
-    } catch (error) {
-      if (error.message?.includes("SQLITE_BUSY")) {
-        if (this.sqliteBusyRetryGroupCount > 10) {
-          this.sqliteBusyRetryGroupCount = 0;
-          throw error;
-        }
-        this.sqliteBusyRetryGroupCount++;
-        await sleep(2e3);
-        await this.groupSet(key, subKey, value, opts);
-        this.sqliteBusyRetryGroupCount = 0;
-        return;
-      }
-      throw error;
-    }
+    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]
+    );
   }
   async groupGet(key, subKey) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
-    const row = await new Promise((res, rej) => {
-      client.get(
-        'SELECT value, "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
-        [storageKey, subKey],
-        (err, result) => {
-          if (err)
-            return rej(err);
-          return res(result);
-        }
-      );
-    });
+    const row = await dbGet(
+      client,
+      'SELECT value, "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
+      [storageKey, subKey]
+    );
     if (!row)
       return null;
     if (row.expiresAt !== null && Date.now() > row.expiresAt) {
@@ -439,14 +412,11 @@ const _SqliteAdapter = class _SqliteAdapter {
   async groupHas(key, subKey) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
-    const row = await new Promise((res, rej) => {
-      client.get(
-        'SELECT "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
-        [storageKey, subKey],
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (err, result) => err ? rej(err) : res(result)
-      );
-    });
+    const row = await dbGet(
+      client,
+      'SELECT "expiresAt" FROM kvcache WHERE key = ? AND subKey = ?',
+      [storageKey, subKey]
+    );
     if (!row)
       return false;
     if (row.expiresAt !== null && Date.now() > row.expiresAt) {
@@ -458,13 +428,7 @@ const _SqliteAdapter = class _SqliteAdapter {
   async groupDel(key, subKey) {
     const client = this.getClient();
     const storageKey = this.prefixKey(key);
-    await new Promise((res, rej) => {
-      client.run(
-        "DELETE FROM kvcache WHERE key = ? AND subKey = ?",
-        [storageKey, subKey],
-        (err) => err ? rej(err) : res()
-      );
-    });
+    return dbRun(client, "DELETE FROM kvcache WHERE key = ? AND subKey = ?", [storageKey, subKey]);
   }
   async close() {
     if (this.dbPath) {
@@ -854,4 +818,4 @@ const getAbtNodeRedisAndSQLiteUrl = () => {
   return params;
 };
 
-export { LockDBCache as DBCache, getAbtNodeRedisAndSQLiteUrl };
+export { LockDBCache as DBCache, getAbtNodeRedisAndSQLiteUrl, withRetry };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/db-cache",
-  "version": "1.16.47-beta-20250730-070104-87a128a5",
+  "version": "1.16.47-beta-20250731-014139-e860268f",
   "description": "Db cache use redis or sqlite as backend",
   "publishConfig": {
     "access": "public"
@@ -45,5 +45,5 @@
     "typescript": "^5.6.3",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "a202f415488de553a2534d1a3d2a489dda27936c"
+  "gitHead": "85b5870be6b7a531cd7a86bd132112d68547fde1"
 }