@aztec/kv-store 0.0.1-commit.9badcec54 → 0.0.1-commit.9ebd450e8

package/dest/lmdb-v2/read_transaction.js

@@ -51,18 +51,19 @@ export class ReadTransaction {
     }
     async *#iterate(db, startKey, endKey, reverse, limit, map) {
         this.assertIsOpen();
-        const response = await this.channel.sendMessage(LMDBMessageType.START_CURSOR, {
-            key: startKey,
-            reverse,
-            count: typeof limit === 'number' ? Math.min(limit, CURSOR_PAGE_SIZE) : CURSOR_PAGE_SIZE,
-            onePage: typeof limit === 'number' && limit < CURSOR_PAGE_SIZE,
-            db
-        });
-        const cursor = response.cursor;
-        let entries = response.entries;
-        let done = typeof cursor !== 'number';
-        let count = 0;
+        let cursor;
         try {
+            const response = await this.channel.sendMessage(LMDBMessageType.START_CURSOR, {
+                key: startKey,
+                reverse,
+                count: typeof limit === 'number' ? Math.min(limit, CURSOR_PAGE_SIZE) : CURSOR_PAGE_SIZE,
+                onePage: typeof limit === 'number' && limit < CURSOR_PAGE_SIZE,
+                db
+            });
+            cursor = response.cursor ?? undefined;
+            let entries = response.entries;
+            let done = typeof cursor !== 'number';
+            let count = 0;
             // emit the first page and any subsequent pages in a while loop
             // NB: end contition is in the middle of the while loop
             while(entries.length > 0){
@@ -106,15 +107,16 @@ export class ReadTransaction {
     }
     async #countEntries(db, startKey, endKey, reverse) {
         this.assertIsOpen();
-        const response = await this.channel.sendMessage(LMDBMessageType.START_CURSOR, {
-            key: startKey,
-            reverse,
-            count: 0,
-            onePage: false,
-            db
-        });
-        const cursor = response.cursor;
+        let cursor;
         try {
+            const response = await this.channel.sendMessage(LMDBMessageType.START_CURSOR, {
+                key: startKey,
+                reverse,
+                count: 0,
+                onePage: false,
+                db
+            });
+            cursor = response.cursor ?? undefined;
             if (!cursor) {
                 return 0;
             }

package/dest/sqlite-opfs/worker.js

@@ -18,13 +18,11 @@ const DEFAULT_SAH_POOL_DIRECTORY = '.aztec-kv';
 const SAH_POOL_VFS_NAME = 'aztec-kv-opfs';
 let sqlite3;
 let pool;
-let poolDirectory;
 let db;
 let dbPath;
 async function ensurePool(directory) {
     sqlite3 ??= await sqlite3InitModule();
     if (!pool) {
-        poolDirectory = directory;
         pool = await sqlite3.installOpfsSAHPoolVfs({
             name: SAH_POOL_VFS_NAME,
             directory,
@@ -58,16 +56,23 @@ async function handleExport() {
     }
     return await pool.exportFile(dbPath);
 }
-async function handleDeleteDb(dbName) {
+function handleDeleteDb(dbName) {
     const path = normalizeDbPath(dbName);
     if (db && dbPath === path) {
         db.close();
         db = undefined;
         dbPath = undefined;
     }
-    const p = await ensurePool(poolDirectory ?? DEFAULT_SAH_POOL_DIRECTORY);
+    // Ephemeral :memory: DBs never back a file — skip installing a pool just to unlink
+    // nothing. installOpfsSAHPoolVfs acquires an exclusive lock on the OPFS SAH
+    // directory, and under heavy test churn that can contend with workers from
+    // previous tests whose OPFS handles Chromium hasn't yet released, hanging the RPC
+    // and then the whole test run.
+    if (!pool) {
+        return;
+    }
     try {
-        p.unlink(path);
+        pool.unlink(path);
     } catch  {
     // File may not exist; ignore.
     }
@@ -122,7 +127,7 @@ self.onmessage = async (ev)=>{
                     id: req.id
                 });
             case 'deleteDb':
-                await handleDeleteDb(req.dbName);
+                handleDeleteDb(req.dbName);
                 return respond({
                     type: 'ok',
                     id: req.id

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/kv-store",
-  "version": "0.0.1-commit.9badcec54",
+  "version": "0.0.1-commit.9ebd450e8",
   "type": "module",
   "exports": {
     ".": "./dest/interfaces/index.js",
@@ -18,7 +18,7 @@
     "test:node": "NODE_NO_WARNINGS=1 mocha --config ./.mocharc.json",
     "test:browser": "vitest run --config ./vitest.config.ts",
     "bench:browser": "VITE_BENCH=1 vitest run --config ./vitest.config.ts src/bench",
-    "test": "yarn test:node && yarn test:browser",
+    "test": "yarn test:node",
     "test:jest": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
@@ -26,11 +26,11 @@
     "./package.local.json"
   ],
   "dependencies": {
-    "@aztec/constants": "0.0.1-commit.9badcec54",
-    "@aztec/ethereum": "0.0.1-commit.9badcec54",
-    "@aztec/foundation": "0.0.1-commit.9badcec54",
-    "@aztec/native": "0.0.1-commit.9badcec54",
-    "@aztec/stdlib": "0.0.1-commit.9badcec54",
+    "@aztec/constants": "0.0.1-commit.9ebd450e8",
+    "@aztec/ethereum": "0.0.1-commit.9ebd450e8",
+    "@aztec/foundation": "0.0.1-commit.9ebd450e8",
+    "@aztec/native": "0.0.1-commit.9ebd450e8",
+    "@aztec/stdlib": "0.0.1-commit.9ebd450e8",
     "@sqlite.org/sqlite-wasm": "3.50.4-build1",
     "idb": "^8.0.0",
     "lmdb": "^3.2.0",

package/src/lmdb-v2/read_transaction.ts

@@ -66,20 +66,20 @@ export class ReadTransaction {
   ): AsyncIterable<[Uint8Array, T]> {
     this.assertIsOpen();
 
-    const response = await this.channel.sendMessage(LMDBMessageType.START_CURSOR, {
-      key: startKey,
-      reverse,
-      count: typeof limit === 'number' ? Math.min(limit, CURSOR_PAGE_SIZE) : CURSOR_PAGE_SIZE,
-      onePage: typeof limit === 'number' && limit < CURSOR_PAGE_SIZE,
-      db,
-    });
-
-    const cursor = response.cursor;
-    let entries = response.entries;
-    let done = typeof cursor !== 'number';
-    let count = 0;
-
+    let cursor: number | undefined;
     try {
+      const response = await this.channel.sendMessage(LMDBMessageType.START_CURSOR, {
+        key: startKey,
+        reverse,
+        count: typeof limit === 'number' ? Math.min(limit, CURSOR_PAGE_SIZE) : CURSOR_PAGE_SIZE,
+        onePage: typeof limit === 'number' && limit < CURSOR_PAGE_SIZE,
+        db,
+      });
+
+      cursor = response.cursor ?? undefined;
+      let entries = response.entries;
+      let done = typeof cursor !== 'number';
+      let count = 0;
       // emit the first page and any subsequent pages in a while loop
       // NB: end contition is in the middle of the while loop
       while (entries.length > 0) {
@@ -125,17 +125,17 @@ export class ReadTransaction {
   async #countEntries(db: string, startKey: Uint8Array, endKey: Uint8Array, reverse: boolean): Promise<number> {
     this.assertIsOpen();
 
-    const response = await this.channel.sendMessage(LMDBMessageType.START_CURSOR, {
-      key: startKey,
-      reverse,
-      count: 0,
-      onePage: false,
-      db,
-    });
-
-    const cursor = response.cursor;
-
+    let cursor: number | undefined;
     try {
+      const response = await this.channel.sendMessage(LMDBMessageType.START_CURSOR, {
+        key: startKey,
+        reverse,
+        count: 0,
+        onePage: false,
+        db,
+      });
+
+      cursor = response.cursor ?? undefined;
       if (!cursor) {
         return 0;
       }

package/src/sqlite-opfs/worker.ts

@@ -23,14 +23,12 @@ const SAH_POOL_VFS_NAME = 'aztec-kv-opfs';
 
 let sqlite3: Sqlite3Static | undefined;
 let pool: SAHPoolUtil | undefined;
-let poolDirectory: string | undefined;
 let db: Database | undefined;
 let dbPath: string | undefined;
 
 async function ensurePool(directory: string): Promise<SAHPoolUtil> {
   sqlite3 ??= await sqlite3InitModule();
   if (!pool) {
-    poolDirectory = directory;
     pool = await sqlite3.installOpfsSAHPoolVfs({
       name: SAH_POOL_VFS_NAME,
       directory,
@@ -68,16 +66,23 @@ async function handleExport(): Promise<Uint8Array> {
   return await pool.exportFile(dbPath);
 }
 
-async function handleDeleteDb(dbName: string): Promise<void> {
+function handleDeleteDb(dbName: string): void {
   const path = normalizeDbPath(dbName);
   if (db && dbPath === path) {
     db.close();
     db = undefined;
     dbPath = undefined;
   }
-  const p = await ensurePool(poolDirectory ?? DEFAULT_SAH_POOL_DIRECTORY);
+  // Ephemeral :memory: DBs never back a file — skip installing a pool just to unlink
+  // nothing. installOpfsSAHPoolVfs acquires an exclusive lock on the OPFS SAH
+  // directory, and under heavy test churn that can contend with workers from
+  // previous tests whose OPFS handles Chromium hasn't yet released, hanging the RPC
+  // and then the whole test run.
+  if (!pool) {
+    return;
+  }
   try {
-    p.unlink(path);
+    pool.unlink(path);
   } catch {
     // File may not exist; ignore.
   }
@@ -122,7 +127,7 @@ function respond(msg: WorkerResponse): void {
         handleClose();
         return respond({ type: 'ok', id: req.id });
       case 'deleteDb':
-        await handleDeleteDb(req.dbName);
+        handleDeleteDb(req.dbName);
         return respond({ type: 'ok', id: req.id });
       case 'run': {
         const { changes } = runSql(req.sql, req.bind);