@ocap/indexdb-sqlite 1.29.11 → 1.29.13

package/esm/db/base.mjs

@@ -121,7 +121,10 @@ var SqliteBaseIndexDB = class extends BaseIndexDB {
 			]);
 			total = (senderCount?.count ?? 0) + (receiverCount?.count ?? 0) - (overlapCount?.count ?? 0);
 		} else if (isMultiTypeOnly) total = (await Promise.all(types.map((t) => this.db.selectFrom("tx").select(this.db.fn.countAll().as("count")).where("type", "=", t).executeTakeFirst()))).reduce((sum, c) => sum + (c?.count ?? 0), 0);
-		else if (!hasNonJsonFilters && activeJsonFilters.length === 0) total = (await sql`SELECT max(rowid) as c FROM tx`.execute(this.db)).rows[0]?.c ?? 0;
+		else if (validity === "VALID" && !sender && !receiver && !types.length && !txs.length && !parsedStart && !parsedEnd && activeJsonFilters.length === 0) {
+			const [approx, invalidCount] = await Promise.all([sql`SELECT max(rowid) as c FROM tx`.execute(this.db), this.db.selectFrom("tx").select(this.db.fn.countAll().as("count")).where("valid", "=", 0).executeTakeFirst()]);
+			total = (approx.rows[0]?.c ?? 0) - (invalidCount?.count ?? 0);
+		} else if (!hasNonJsonFilters && activeJsonFilters.length === 0) total = (await sql`SELECT max(rowid) as c FROM tx`.execute(this.db)).rows[0]?.c ?? 0;
 		else total = (await qb.clearSelect().select(this.db.fn.countAll().as("count")).executeTakeFirst())?.count ?? 0;
 		const orderDir = pagination.order.type === "desc" ? "desc" : "asc";
 		let rawResults;

package/esm/kysely.d.mts

@@ -15,6 +15,8 @@ interface SqliteConfig {
   create?: boolean;
   /** Enable WAL mode (default: true) */
   walMode?: boolean;
+  /** Busy timeout in ms (default: SQLITE_BUSY_TIMEOUT env or 5000) */
+  busyTimeout?: number;
 }
 /**
  * Create a Kysely instance with SQLite dialect

package/esm/kysely.mjs

@@ -2,6 +2,7 @@ import { __require } from "./_virtual/rolldown_runtime.mjs";
 import { Kysely, SqliteDialect } from "kysely";
 
 //#region src/kysely.ts
+const DEFAULT_BUSY_TIMEOUT = Number(process.env.SQLITE_BUSY_TIMEOUT) || 5e3;
 function isBunRuntime() {
 	return typeof globalThis.Bun !== "undefined";
 }
@@ -34,7 +35,7 @@ function createKysely(config) {
 			sqlite$1.exec("PRAGMA synchronous = NORMAL");
 		}
 		sqlite$1.exec("PRAGMA foreign_keys = ON");
-		sqlite$1.exec("PRAGMA busy_timeout = 5000");
+		sqlite$1.exec(`PRAGMA busy_timeout = ${config.busyTimeout ?? DEFAULT_BUSY_TIMEOUT}`);
 		return new Kysely({ dialect: new BunSqliteDialect({ database: sqlite$1 }) });
 	}
 	const sqlite = new (__require("better-sqlite3"))(config.filename, {
@@ -46,7 +47,7 @@ function createKysely(config) {
 		sqlite.pragma("synchronous = NORMAL");
 	}
 	sqlite.pragma("foreign_keys = ON");
-	sqlite.pragma("busy_timeout = 5000");
+	sqlite.pragma(`busy_timeout = ${config.busyTimeout ?? DEFAULT_BUSY_TIMEOUT}`);
 	return new Kysely({ dialect: new SqliteDialect({ database: sqlite }) });
 }
 /**

package/lib/db/base.cjs

@@ -125,7 +125,10 @@ var SqliteBaseIndexDB = class extends _ocap_indexdb.BaseIndexDB {
 			]);
 			total = (senderCount?.count ?? 0) + (receiverCount?.count ?? 0) - (overlapCount?.count ?? 0);
 		} else if (isMultiTypeOnly) total = (await Promise.all(types.map((t) => this.db.selectFrom("tx").select(this.db.fn.countAll().as("count")).where("type", "=", t).executeTakeFirst()))).reduce((sum, c) => sum + (c?.count ?? 0), 0);
-		else if (!hasNonJsonFilters && activeJsonFilters.length === 0) total = (await kysely.sql`SELECT max(rowid) as c FROM tx`.execute(this.db)).rows[0]?.c ?? 0;
+		else if (validity === "VALID" && !sender && !receiver && !types.length && !txs.length && !parsedStart && !parsedEnd && activeJsonFilters.length === 0) {
+			const [approx, invalidCount] = await Promise.all([kysely.sql`SELECT max(rowid) as c FROM tx`.execute(this.db), this.db.selectFrom("tx").select(this.db.fn.countAll().as("count")).where("valid", "=", 0).executeTakeFirst()]);
+			total = (approx.rows[0]?.c ?? 0) - (invalidCount?.count ?? 0);
+		} else if (!hasNonJsonFilters && activeJsonFilters.length === 0) total = (await kysely.sql`SELECT max(rowid) as c FROM tx`.execute(this.db)).rows[0]?.c ?? 0;
 		else total = (await qb.clearSelect().select(this.db.fn.countAll().as("count")).executeTakeFirst())?.count ?? 0;
 		const orderDir = pagination.order.type === "desc" ? "desc" : "asc";
 		let rawResults;

package/lib/kysely.cjs

@@ -2,6 +2,7 @@ const require_rolldown_runtime = require('./_virtual/rolldown_runtime.cjs');
 let kysely = require("kysely");
 
 //#region src/kysely.ts
+const DEFAULT_BUSY_TIMEOUT = Number(process.env.SQLITE_BUSY_TIMEOUT) || 5e3;
 function isBunRuntime() {
 	return typeof globalThis.Bun !== "undefined";
 }
@@ -34,7 +35,7 @@ function createKysely(config) {
 			sqlite$1.exec("PRAGMA synchronous = NORMAL");
 		}
 		sqlite$1.exec("PRAGMA foreign_keys = ON");
-		sqlite$1.exec("PRAGMA busy_timeout = 5000");
+		sqlite$1.exec(`PRAGMA busy_timeout = ${config.busyTimeout ?? DEFAULT_BUSY_TIMEOUT}`);
 		return new kysely.Kysely({ dialect: new BunSqliteDialect({ database: sqlite$1 }) });
 	}
 	const sqlite = new (require("better-sqlite3"))(config.filename, {
@@ -46,7 +47,7 @@ function createKysely(config) {
 		sqlite.pragma("synchronous = NORMAL");
 	}
 	sqlite.pragma("foreign_keys = ON");
-	sqlite.pragma("busy_timeout = 5000");
+	sqlite.pragma(`busy_timeout = ${config.busyTimeout ?? DEFAULT_BUSY_TIMEOUT}`);
 	return new kysely.Kysely({ dialect: new kysely.SqliteDialect({ database: sqlite }) });
 }
 /**

package/lib/kysely.d.cts

@@ -15,6 +15,8 @@ interface SqliteConfig {
   create?: boolean;
   /** Enable WAL mode (default: true) */
   walMode?: boolean;
+  /** Busy timeout in ms (default: SQLITE_BUSY_TIMEOUT env or 5000) */
+  busyTimeout?: number;
 }
 /**
  * Create a Kysely instance with SQLite dialect

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ocap/indexdb-sqlite",
   "description": "OCAP indexdb adapter that uses SQLite as backend",
-  "version": "1.29.11",
+  "version": "1.29.13",
   "author": "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)",
   "bugs": {
     "url": "https://github.com/ArcBlock/blockchain/issues",
@@ -14,7 +14,7 @@
     "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)"
   ],
   "devDependencies": {
-    "@ocap/indexdb-test": "1.29.11"
+    "@ocap/indexdb-test": "1.29.13"
   },
   "homepage": "https://github.com/ArcBlock/blockchain/tree/master/indexdb/sqlite",
   "keywords": [
@@ -63,10 +63,10 @@
     "clean": "rm -rf lib esm"
   },
   "dependencies": {
-    "@arcblock/did": "1.29.11",
-    "@ocap/indexdb": "1.29.11",
-    "@ocap/types": "1.29.11",
-    "@ocap/util": "1.29.11",
+    "@arcblock/did": "1.29.13",
+    "@ocap/indexdb": "1.29.13",
+    "@ocap/types": "1.29.13",
+    "@ocap/util": "1.29.13",
     "debug": "^4.4.3",
     "better-sqlite3": "^11.8.1",
     "kysely": "^0.27.0",