@abtnode/db-cache 1.16.47-beta-20250715-030340-f15b794e → 1.16.47-beta-20250717-221700-2d886a18

package/dist/index.cjs

@@ -172,6 +172,7 @@ 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));
 async function initSqliteWithRetry(db) {
   const sql = `
     PRAGMA journal_mode = WAL;
@@ -205,6 +206,8 @@ 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", "");
@@ -312,38 +315,51 @@ const _SqliteAdapter = class _SqliteAdapter {
       if (exists)
         return false;
     }
-    await new Promise((res, rej) => {
-      client.run(
-        `
+    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()
-      );
-    });
+          [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;
+    }
     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 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);
+        }
+      );
+    });
     if (!row)
       return null;
     if (row.expiresAt !== null && Date.now() > row.expiresAt) {
@@ -356,11 +372,7 @@ const _SqliteAdapter = class _SqliteAdapter {
     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()
-      );
+      client.run("DELETE FROM kvcache WHERE key = ?", [storageKey], (err) => err ? rej(err) : res());
     });
   }
   async has(key) {
@@ -393,36 +405,49 @@ const _SqliteAdapter = class _SqliteAdapter {
       if (exists)
         return;
     }
-    await new Promise((res, rej) => {
-      client.run(
-        `
+    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()
-      );
-    });
+          [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;
+    }
   }
   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 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);
+        }
+      );
+    });
     if (!row)
       return null;
     if (row.expiresAt !== null && Date.now() > row.expiresAt) {
@@ -841,7 +866,7 @@ const getAbtNodeRedisAndSQLiteUrl = () => {
   const blockletCacheDir = process.env.BLOCKLET_DATA_DIR ? path__default.join(process.env.BLOCKLET_DATA_DIR, "__default-cache-store.db") : void 0;
   const params = {
     redisUrl: process.env.ABT_NODE_CACHE_REDIS_URL,
-    sqlitePath: isJestTest() ? "test.db" : process.env.ABT_NODE_CACHE_SQLITE_PATH || blockletCacheDir
+    sqlitePath: isJestTest() ? "test.db" : blockletCacheDir || process.env.ABT_NODE_CACHE_SQLITE_PATH
   };
   if (process.env.ABT_NODE_NO_CACHE === "true") {
     params.ttl = 1;

package/dist/index.mjs

@@ -152,6 +152,7 @@ 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));
 async function initSqliteWithRetry(db) {
   const sql = `
     PRAGMA journal_mode = WAL;
@@ -185,6 +186,8 @@ 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", "");
@@ -292,38 +295,51 @@ const _SqliteAdapter = class _SqliteAdapter {
       if (exists)
         return false;
     }
-    await new Promise((res, rej) => {
-      client.run(
-        `
+    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()
-      );
-    });
+          [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;
+    }
     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 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);
+        }
+      );
+    });
     if (!row)
       return null;
     if (row.expiresAt !== null && Date.now() > row.expiresAt) {
@@ -336,11 +352,7 @@ const _SqliteAdapter = class _SqliteAdapter {
     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()
-      );
+      client.run("DELETE FROM kvcache WHERE key = ?", [storageKey], (err) => err ? rej(err) : res());
     });
   }
   async has(key) {
@@ -373,36 +385,49 @@ const _SqliteAdapter = class _SqliteAdapter {
       if (exists)
         return;
     }
-    await new Promise((res, rej) => {
-      client.run(
-        `
+    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()
-      );
-    });
+          [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;
+    }
   }
   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 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);
+        }
+      );
+    });
     if (!row)
       return null;
     if (row.expiresAt !== null && Date.now() > row.expiresAt) {
@@ -821,7 +846,7 @@ const getAbtNodeRedisAndSQLiteUrl = () => {
   const blockletCacheDir = process.env.BLOCKLET_DATA_DIR ? path__default.join(process.env.BLOCKLET_DATA_DIR, "__default-cache-store.db") : void 0;
   const params = {
     redisUrl: process.env.ABT_NODE_CACHE_REDIS_URL,
-    sqlitePath: isJestTest() ? "test.db" : process.env.ABT_NODE_CACHE_SQLITE_PATH || blockletCacheDir
+    sqlitePath: isJestTest() ? "test.db" : blockletCacheDir || process.env.ABT_NODE_CACHE_SQLITE_PATH
   };
   if (process.env.ABT_NODE_NO_CACHE === "true") {
     params.ttl = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/db-cache",
-  "version": "1.16.47-beta-20250715-030340-f15b794e",
+  "version": "1.16.47-beta-20250717-221700-2d886a18",
   "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": "615430ebd6f20c09fa7982fc47a18f77c3f17f6d"
+  "gitHead": "e8c5b883906dd53ba9c288cd5609cf7d023d90b3"
 }