@aztec/kv-store 0.0.1-commit.b9865e97 → 0.0.1-commit.be03c316

package/dest/sqlite-opfs/pool_integrity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pool_integrity.d.ts","sourceRoot":"","sources":["../../src/sqlite-opfs/pool_integrity.ts"],"names":[],"mappings":"AAyCA,eAAO,MAAM,8BAA8B,6BAA6B,CAAC;AAEzE,MAAM,WAAW,wBAAwB;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,sBAAsB;IACrC,aAAa,EAAE,CAAC,CAAC;IACjB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB,EAAE,wBAAwB,EAAE,CAAC;CACnD;AAED,MAAM,WAAW,oBAAqB,SAAQ,sBAAsB;IAClE,mBAAmB,EAAE,MAAM,CAAC;CAC7B;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CA6C9G"}

package/dest/sqlite-opfs/pool_integrity.js

@@ -0,0 +1,282 @@
+import { normalizePoolDirectory } from './pool_lock.js';
+// The constants below mirror the opaque-file header format of the pinned opfs-sahpool VFS
+// (`yarn-project/sqlite3mc-wasm/vendor/jswasm/sqlite3.mjs`, class `OpfsSAHPool`). The pool names its files randomly
+// under `.opaque/` and prepends a header that maps each one back to its logical SQLite path:
+//
+//   bytes [0, 512)    logical path, NUL-terminated UTF-8 (HEADER_MAX_PATH_SIZE)
+//   bytes [512, 516)  SQLite open-flags of the file, big-endian uint32 (HEADER_FLAGS_SIZE)
+//   bytes [516, 524)  digest over the preceding 516 bytes, two uint32 words (HEADER_DIGEST_SIZE)
+//
+// Database content starts at byte 4096 (the pool's SECTOR_SIZE). We re-read the header ourselves rather than asking
+// the VFS because the upstream pool "repairs" anything it cannot validate by disassociating the file — destroying
+// exactly the evidence this module exists to quarantine. The browser regression test writes a real pool through the
+// pinned VFS before duplicating an opaque file, so a vendor upgrade that changes the layout breaks detection loudly
+// rather than silently.
+const OPAQUE_DIRECTORY = '.opaque';
+const HEADER_MAX_PATH_SIZE = 512;
+const HEADER_FLAGS_SIZE = 4;
+const HEADER_DIGEST_SIZE = 8;
+const HEADER_CORPUS_SIZE = HEADER_MAX_PATH_SIZE + HEADER_FLAGS_SIZE;
+const HEADER_SIZE = HEADER_CORPUS_SIZE + HEADER_DIGEST_SIZE;
+// Standard SQLite open-flag bit values (sqlite3.h). Restated as literals because the header stores them numerically
+// and this module runs on the main thread, without the sqlite3 WASM bundle that defines `capi.SQLITE_OPEN_*`.
+const SQLITE_OPEN_DELETEONCLOSE = 0x00000008;
+const SQLITE_OPEN_MEMORY = 0x00000080;
+const SQLITE_OPEN_MAIN_DB = 0x00000100;
+const SQLITE_OPEN_MAIN_JOURNAL = 0x00000800;
+const SQLITE_OPEN_SUPER_JOURNAL = 0x00004000;
+const SQLITE_OPEN_WAL = 0x00080000;
+// A live association must name one of the file types the pool persists; transient types (temp DBs, statement
+// journals) never survive in a valid header.
+const PERSISTENT_FILE_TYPES = SQLITE_OPEN_MAIN_DB | SQLITE_OPEN_MAIN_JOURNAL | SQLITE_OPEN_SUPER_JOURNAL | SQLITE_OPEN_WAL;
+// The upstream VFS repurposes SQLITE_OPEN_MEMORY — meaningless for a file that exists on disk — as a header version
+// marker: headers written with it set carry a real digest, while legacy headers leave it unset and store all-zero
+// digest words.
+const FLAG_COMPUTE_DIGEST_V2 = SQLITE_OPEN_MEMORY;
+export const OPFS_QUARANTINE_ROOT_DIRECTORY = '.aztec-sqlite-quarantine';
+/**
+ * Detects duplicate SAH logical-file associations and, if found, copies the complete pool into quarantine before
+ * removing the original. The caller must hold the pool's exclusive Web Lock for the whole operation.
+ */ export async function quarantineDuplicatePool(poolDirectory) {
+    poolDirectory = normalizePoolDirectory(poolDirectory);
+    const root = await navigator.storage.getDirectory();
+    const source = await getDirectory(root, poolDirectory);
+    if (!source) {
+        return undefined;
+    }
+    const opaque = await getChildDirectory(source, OPAQUE_DIRECTORY);
+    if (!opaque) {
+        return undefined;
+    }
+    const duplicateAssociations = await findDuplicateAssociations(opaque);
+    if (duplicateAssociations.length === 0) {
+        return undefined;
+    }
+    const quarantineRoot = await root.getDirectoryHandle(OPFS_QUARANTINE_ROOT_DIRECTORY, {
+        create: true
+    });
+    const quarantineName = createQuarantineName();
+    const destination = await quarantineRoot.getDirectoryHandle(quarantineName, {
+        create: true
+    });
+    const metadata = {
+        formatVersion: 1,
+        originalPoolDirectory: poolDirectory,
+        quarantinedAt: new Date().toISOString(),
+        duplicateAssociations
+    };
+    let quarantineComplete = false;
+    try {
+        await copyDirectory(source, destination);
+        await verifyDirectoryCopy(source, destination);
+        await writeJson(destination, 'quarantine.json', metadata);
+        quarantineComplete = true;
+        await removeDirectory(root, poolDirectory);
+    } catch (err) {
+        if (!quarantineComplete) {
+            await quarantineRoot.removeEntry(quarantineName, {
+                recursive: true
+            }).catch(()=>{});
+        }
+        throw err;
+    }
+    return {
+        ...metadata,
+        quarantineDirectory: `${OPFS_QUARANTINE_ROOT_DIRECTORY}/${quarantineName}`
+    };
+}
+async function findDuplicateAssociations(opaque) {
+    const associations = new Map();
+    for await (const [opaqueName, handle] of opaque.entries()){
+        if (handle.kind !== 'file') {
+            continue;
+        }
+        const logicalPath = await readAssociatedPath(handle);
+        if (logicalPath) {
+            const names = associations.get(logicalPath) ?? [];
+            names.push(opaqueName);
+            associations.set(logicalPath, names);
+        }
+    }
+    return [
+        ...associations.entries()
+    ].filter(([, names])=>names.length > 1).map(([logicalPath, opaqueFileNames])=>({
+            logicalPath,
+            opaqueFileNames: opaqueFileNames.sort()
+        })).sort((a, b)=>a.logicalPath.localeCompare(b.logicalPath));
+}
+/**
+ * Returns the logical SQLite path an opaque SAH file is associated with, or undefined if the file is not a live,
+ * valid association. Applies the same checks as the vendored pool's `getAssociatedPath`: a non-empty NUL-terminated
+ * path, open-flags naming a persistent file type without DELETEONCLOSE, and a matching header digest. Files failing
+ * any check are the pool's free-list or garbage entries — the VFS itself would disassociate them on open — so they
+ * cannot participate in a duplicate mapping.
+ */ async function readAssociatedPath(handle) {
+    const file = await handle.getFile();
+    if (file.size < HEADER_SIZE) {
+        return undefined;
+    }
+    const header = new Uint8Array(await file.slice(0, HEADER_SIZE).arrayBuffer());
+    const pathEnd = header.subarray(0, HEADER_MAX_PATH_SIZE).indexOf(0);
+    if (pathEnd <= 0) {
+        return undefined;
+    }
+    const dataView = new DataView(header.buffer, header.byteOffset, header.byteLength);
+    const flags = dataView.getUint32(HEADER_MAX_PATH_SIZE);
+    if ((flags & SQLITE_OPEN_DELETEONCLOSE) !== 0 || (flags & PERSISTENT_FILE_TYPES) === 0) {
+        return undefined;
+    }
+    if (!hasValidDigest(header, flags)) {
+        return undefined;
+    }
+    try {
+        return new TextDecoder('utf-8', {
+            fatal: true
+        }).decode(header.subarray(0, pathEnd));
+    } catch  {
+        return undefined;
+    }
+}
+/**
+ * Byte-for-byte port of the vendored pool's `computeDigest`, checked against the digest words stored in the header.
+ */ function hasValidDigest(header, flags) {
+    let expected0 = 0;
+    let expected1 = 0;
+    if ((flags & FLAG_COMPUTE_DIGEST_V2) !== 0) {
+        // These seeds (0xdeadbeef, 0x41c6ce57) and odd multipliers (2654435761, 104729) are the upstream author's choices
+        // (a cyrb53-hash variant) and carry no meaning here beyond having to match the vendored implementation bit for
+        // bit.
+        expected0 = 0xdeadbeef;
+        expected1 = 0x41c6ce57;
+        for (const value of header.subarray(0, HEADER_CORPUS_SIZE)){
+            expected0 = Math.imul(expected0 ^ value, 2654435761);
+            expected1 = Math.imul(expected1 ^ value, 104729);
+        }
+        expected0 >>>= 0;
+        expected1 >>>= 0;
+    }
+    const dataView = new DataView(header.buffer, header.byteOffset, header.byteLength);
+    return dataView.getUint32(HEADER_CORPUS_SIZE, true) === expected0 && dataView.getUint32(HEADER_CORPUS_SIZE + 4, true) === expected1;
+}
+async function getDirectory(root, path) {
+    let current = root;
+    try {
+        for (const segment of path.split('/')){
+            current = await current.getDirectoryHandle(segment);
+        }
+        return current;
+    } catch (err) {
+        if (err instanceof DOMException && err.name === 'NotFoundError') {
+            return undefined;
+        }
+        throw err;
+    }
+}
+async function getChildDirectory(parent, name) {
+    try {
+        return await parent.getDirectoryHandle(name);
+    } catch (err) {
+        if (err instanceof DOMException && err.name === 'NotFoundError') {
+            return undefined;
+        }
+        throw err;
+    }
+}
+async function removeDirectory(root, path) {
+    const segments = path.split('/');
+    const name = segments.pop();
+    let parent = root;
+    for (const segment of segments){
+        parent = await parent.getDirectoryHandle(segment);
+    }
+    await parent.removeEntry(name, {
+        recursive: true
+    });
+}
+async function copyDirectory(source, destination) {
+    for await (const [name, handle] of source.entries()){
+        if (handle.kind === 'directory') {
+            const childDestination = await destination.getDirectoryHandle(name, {
+                create: true
+            });
+            await copyDirectory(handle, childDestination);
+            continue;
+        }
+        const sourceFile = await handle.getFile();
+        const destinationHandle = await destination.getFileHandle(name, {
+            create: true
+        });
+        const writable = await destinationHandle.createWritable();
+        try {
+            await writable.write(sourceFile);
+            await writable.close();
+        } catch (err) {
+            await writable.abort().catch(()=>{});
+            throw err;
+        }
+    }
+}
+async function verifyDirectoryCopy(source, destination) {
+    const sourceEntries = await getSortedEntries(source);
+    const destinationEntries = await getSortedEntries(destination);
+    if (sourceEntries.length !== destinationEntries.length || sourceEntries.some(([name, handle], index)=>{
+        const destinationEntry = destinationEntries[index];
+        return name !== destinationEntry[0] || handle.kind !== destinationEntry[1].kind;
+    })) {
+        throw new Error('Failed to verify quarantined OPFS directory structure');
+    }
+    for(let i = 0; i < sourceEntries.length; i++){
+        const [, sourceHandle] = sourceEntries[i];
+        const [, destinationHandle] = destinationEntries[i];
+        if (sourceHandle.kind === 'directory') {
+            await verifyDirectoryCopy(sourceHandle, destinationHandle);
+        } else {
+            await verifyFilesEqual(sourceHandle, destinationHandle);
+        }
+    }
+}
+async function getSortedEntries(directory) {
+    const entries = [];
+    for await (const entry of directory.entries()){
+        entries.push(entry);
+    }
+    return entries.sort(([a], [b])=>a.localeCompare(b));
+}
+async function verifyFilesEqual(sourceHandle, destinationHandle) {
+    const source = await sourceHandle.getFile();
+    const destination = await destinationHandle.getFile();
+    if (source.size !== destination.size) {
+        throw new Error(`Failed to verify quarantined OPFS file "${source.name}"`);
+    }
+    const chunkSize = 1024 * 1024;
+    for(let offset = 0; offset < source.size; offset += chunkSize){
+        const [sourceChunk, destinationChunk] = await Promise.all([
+            source.slice(offset, offset + chunkSize).arrayBuffer(),
+            destination.slice(offset, offset + chunkSize).arrayBuffer()
+        ]);
+        const sourceBytes = new Uint8Array(sourceChunk);
+        const destinationBytes = new Uint8Array(destinationChunk);
+        if (sourceBytes.some((value, index)=>value !== destinationBytes[index])) {
+            throw new Error(`Failed to verify quarantined OPFS file "${source.name}"`);
+        }
+    }
+}
+async function writeJson(directory, name, value) {
+    const handle = await directory.getFileHandle(name, {
+        create: true
+    });
+    const writable = await handle.createWritable();
+    try {
+        await writable.write(JSON.stringify(value, undefined, 2));
+        await writable.close();
+    } catch (err) {
+        await writable.abort().catch(()=>{});
+        throw err;
+    }
+}
+function createQuarantineName() {
+    const random = globalThis.crypto.getRandomValues(new Uint8Array(8));
+    return `${Date.now()}-${[
+        ...random
+    ].map((byte)=>byte.toString(16).padStart(2, '0')).join('')}`;
+}

package/dest/sqlite-opfs/pool_lock.d.ts

@@ -0,0 +1,8 @@
+export declare const DEFAULT_SAH_POOL_DIRECTORY = ".aztec-kv";
+export interface PoolLockLease {
+    release(): Promise<void>;
+}
+export declare function normalizePoolDirectory(poolDirectory?: string): string;
+export declare function acquirePoolLock(poolDirectory?: string): Promise<PoolLockLease>;
+export declare function withPoolLock<T>(poolDirectory: string, callback: () => Promise<T>): Promise<T>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9vbF9sb2NrLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3FsaXRlLW9wZnMvcG9vbF9sb2NrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLGVBQU8sTUFBTSwwQkFBMEIsY0FBYyxDQUFDO0FBSXRELE1BQU0sV0FBVyxhQUFhO0lBQzVCLE9BQU8sSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7Q0FDMUI7QUFFRCx3QkFBZ0Isc0JBQXNCLENBQUMsYUFBYSxDQUFDLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0FNckU7QUFFRCx3QkFBc0IsZUFBZSxDQUFDLGFBQWEsQ0FBQyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsYUFBYSxDQUFDLENBa0NwRjtBQUVELHdCQUFzQixZQUFZLENBQUMsQ0FBQyxFQUFFLGFBQWEsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FPbkcifQ==

package/dest/sqlite-opfs/pool_lock.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pool_lock.d.ts","sourceRoot":"","sources":["../../src/sqlite-opfs/pool_lock.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,0BAA0B,cAAc,CAAC;AAItD,MAAM,WAAW,aAAa;IAC5B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,wBAAgB,sBAAsB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAMrE;AAED,wBAAsB,eAAe,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAkCpF;AAED,wBAAsB,YAAY,CAAC,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAOnG"}

package/dest/sqlite-opfs/pool_lock.js

@@ -0,0 +1,47 @@
+import { SqlitePoolBusyError, SqliteWebLocksUnavailableError } from './errors.js';
+export const DEFAULT_SAH_POOL_DIRECTORY = '.aztec-kv';
+const WEB_LOCK_PREFIX = 'aztec.sqlite-opfs.pool:';
+export function normalizePoolDirectory(poolDirectory) {
+    const path = poolDirectory?.split('/').filter((segment)=>segment.length > 0).join('/');
+    return path || DEFAULT_SAH_POOL_DIRECTORY;
+}
+export async function acquirePoolLock(poolDirectory) {
+    if (!navigator.locks) {
+        throw new SqliteWebLocksUnavailableError();
+    }
+    const normalizedDirectory = normalizePoolDirectory(poolDirectory);
+    const acquired = Promise.withResolvers();
+    const hold = Promise.withResolvers();
+    const request = navigator.locks.request(`${WEB_LOCK_PREFIX}${normalizedDirectory}`, {
+        mode: 'exclusive',
+        ifAvailable: true
+    }, async (lock)=>{
+        acquired.resolve(lock);
+        if (lock) {
+            await hold.promise;
+        }
+    });
+    request.catch(acquired.reject);
+    if (!await acquired.promise) {
+        await request;
+        throw new SqlitePoolBusyError(normalizedDirectory);
+    }
+    let released = false;
+    return {
+        release: async ()=>{
+            if (!released) {
+                released = true;
+                hold.resolve();
+            }
+            await request;
+        }
+    };
+}
+export async function withPoolLock(poolDirectory, callback) {
+    const lease = await acquirePoolLock(poolDirectory);
+    try {
+        return await callback();
+    } finally{
+        await lease.release();
+    }
+}

package/dest/sqlite-opfs/store.d.ts

@@ -21,6 +21,7 @@ import type { ResultRow, SqlValue } from './messages.js';
 export declare class AztecSQLiteOPFSStore implements AztecAsyncKVStore {
     #private;
     readonly isEphemeral: boolean;
+    private readonly poolLock?;
     private constructor();
     /**
      * Opens (or creates) a SQLite database stored in the OPFS SAH Pool. When `ephemeral`
@@ -29,6 +30,10 @@ export declare class AztecSQLiteOPFSStore implements AztecAsyncKVStore {
      * required when multiple stores coexist in the same tab, because the SAH Pool holds
      * an exclusive lock on its directory.
      *
+     * Persistent stores hold an origin-wide Web Lock for the pool directory until close
+     * or delete. If another store instance already owns it, open fails immediately with
+     * `SqlitePoolBusyError`.
+     *
      * Pass `encryptionKey` (exactly 32 bytes) to enable at-rest encryption via sqlite3mc's
      * ChaCha20 page cipher. The key buffer is **transferred** to the worker — its
      * ArrayBuffer detaches on the caller side after `postMessage`. This is intentional:
@@ -76,4 +81,4 @@ export declare class AztecSQLiteOPFSStore implements AztecAsyncKVStore {
     /** Runs a SELECT statement and returns rows in array row-mode. */
     allAsync(sql: string, bind?: SqlValue[]): Promise<ResultRow[]>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zcWxpdGUtb3Bmcy9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUdwRCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxHQUFHLEVBQUUsU0FBUyxFQUFFLEtBQUssRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDMUQsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUNyRSxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ3RFLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFJaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLFFBQVEsRUFBaUMsTUFBTSxlQUFlLENBQUM7QUFLeEY7Ozs7Ozs7OztHQVNHO0FBQ0gscUJBQWEsb0JBQXFCLFlBQVcsaUJBQWlCOzthQWMxQyxXQUFXLEVBQUUsT0FBTztJQUp0QyxPQUFPLGVBd0JOO0lBRUQ7Ozs7Ozs7Ozs7Ozs7OztPQWVHO0lBQ0gsT0FBYSxJQUFJLENBQ2YsR0FBRyxFQUFFLE1BQU0sRUFDWCxJQUFJLENBQUMsRUFBRSxNQUFNLEVBQ2IsU0FBUyxHQUFFLE9BQWUsRUFDMUIsYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUN0QixhQUFhLENBQUMsRUFBRSxVQUFVLEdBQ3pCLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQWlDL0I7SUFFRCxPQUFPLENBQUMsQ0FBQyxTQUFTLEdBQUcsRUFBRSxDQUFDLFNBQVMsS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLEdBQUcsYUFBYSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FFekU7SUFFRCxPQUFPLENBQUMsQ0FBQyxTQUFTLEdBQUcsRUFBRSxJQUFJLEVBQUUsTUFBTSxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FFckQ7SUFFRCxZQUFZLENBQUMsQ0FBQyxTQUFTLEdBQUcsRUFBRSxDQUFDLFNBQVMsS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLEdBQUcsa0JBQWtCLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUVuRjtJQUVELFdBQVcsQ0FBQyxDQUFDLFNBQVMsR0FBRyxFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcsaUJBQWlCLENBQUMsQ0FBQyxDQUFDLENBRTlEO0lBRUQsU0FBUyxDQUFDLENBQUMsU0FBUyxLQUFLLEVBQUUsSUFBSSxFQUFFLE1BQU0sR0FBRyxlQUFlLENBQUMsQ0FBQyxDQUFDLENBRTNEO0lBRUQsYUFBYSxDQUFDLENBQUMsU0FBUyxLQUFLLEVBQUUsSUFBSSxFQUFFLE1BQU0sR0FBRyxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsQ0FFbkU7SUFFRCxnQkFBZ0IsQ0FBQyxDQUFDLEVBQUUsUUFBUSxFQUFFLE1BQU0sT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0F3QjFEO0lBRUssS0FBSyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFM0I7SUFFSyxNQUFNLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQVc1QjtJQUVEOzs7Ozs7O09BT0c7SUFDSCxZQUFZLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUVqQztJQUVLLEtBQUssSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBUzNCO0lBRUQsUUFBUSxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsUUFBUSxDQUFDLEVBQUUsT0FBTyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFNUQ7SUFFRDs7OztPQUlHO0lBQ0csUUFBUSxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FNcEM7SUFFRDs7OztPQUlHO0lBQ0gsUUFBUSxDQUFDLEdBQUcsRUFBRSxNQUFNLEVBQUUsSUFBSSxDQUFDLEVBQUUsUUFBUSxFQUFFLEdBQUcsT0FBTyxDQUFDO1FBQUUsT0FBTyxFQUFFLE1BQU0sQ0FBQTtLQUFFLENBQUMsQ0FNckU7SUFFRCxrRUFBa0U7SUFDbEUsUUFBUSxDQUFDLEdBQUcsRUFBRSxNQUFNLEVBQUUsSUFBSSxDQUFDLEVBQUUsUUFBUSxFQUFFLEdBQUcsT0FBTyxDQUFDLFNBQVMsRUFBRSxDQUFDLENBSTdEO0NBZ0RGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zcWxpdGUtb3Bmcy9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUdwRCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxHQUFHLEVBQUUsU0FBUyxFQUFFLEtBQUssRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDMUQsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUNyRSxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ3RFLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFJaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLFFBQVEsRUFBaUMsTUFBTSxlQUFlLENBQUM7QUFPeEY7Ozs7Ozs7OztHQVNHO0FBQ0gscUJBQWEsb0JBQXFCLFlBQVcsaUJBQWlCOzthQWUxQyxXQUFXLEVBQUUsT0FBTztJQUNwQyxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQztJQUw1QixPQUFPLGVBMEJOO0lBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FtQkc7SUFDSCxPQUFhLElBQUksQ0FDZixHQUFHLEVBQUUsTUFBTSxFQUNYLElBQUksQ0FBQyxFQUFFLE1BQU0sRUFDYixTQUFTLEdBQUUsT0FBZSxFQUMxQixhQUFhLENBQUMsRUFBRSxNQUFNLEVBQ3RCLGFBQWEsQ0FBQyxFQUFFLFVBQVUsR0FDekIsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBMkMvQjtJQUVELE9BQU8sQ0FBQyxDQUFDLFNBQVMsR0FBRyxFQUFFLENBQUMsU0FBUyxLQUFLLEVBQUUsSUFBSSxFQUFFLE1BQU0sR0FBRyxhQUFhLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUV6RTtJQUVELE9BQU8sQ0FBQyxDQUFDLFNBQVMsR0FBRyxFQUFFLElBQUksRUFBRSxNQUFNLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxDQUVyRDtJQUVELFlBQVksQ0FBQyxDQUFDLFNBQVMsR0FBRyxFQUFFLENBQUMsU0FBUyxLQUFLLEVBQUUsSUFBSSxFQUFFLE1BQU0sR0FBRyxrQkFBa0IsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBRW5GO0lBRUQsV0FBVyxDQUFDLENBQUMsU0FBUyxHQUFHLEVBQUUsS0FBSyxFQUFFLE1BQU0sR0FBRyxpQkFBaUIsQ0FBQyxDQUFDLENBQUMsQ0FFOUQ7SUFFRCxTQUFTLENBQUMsQ0FBQyxTQUFTLEtBQUssRUFBRSxJQUFJLEVBQUUsTUFBTSxHQUFHLGVBQWUsQ0FBQyxDQUFDLENBQUMsQ0FFM0Q7SUFFRCxhQUFhLENBQUMsQ0FBQyxTQUFTLEtBQUssRUFBRSxJQUFJLEVBQUUsTUFBTSxHQUFHLG1CQUFtQixDQUFDLENBQUMsQ0FBQyxDQUVuRTtJQUVELGdCQUFnQixDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsTUFBTSxPQUFPLENBQUMsQ0FBQyxDQUFDLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQXdCMUQ7SUFFSyxLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUUzQjtJQUVLLE1BQU0sSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBZTVCO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILFlBQVksSUFBSSxPQUFPLENBQUMsU0FBUyxDQUFDLENBRWpDO0lBRUssS0FBSyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FhM0I7SUFFRCxRQUFRLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxRQUFRLENBQUMsRUFBRSxPQUFPLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUU1RDtJQUVEOzs7O09BSUc7SUFDRyxRQUFRLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQU1wQztJQUVEOzs7O09BSUc7SUFDSCxRQUFRLENBQUMsR0FBRyxFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUMsRUFBRSxRQUFRLEVBQUUsR0FBRyxPQUFPLENBQUM7UUFBRSxPQUFPLEVBQUUsTUFBTSxDQUFBO0tBQUUsQ0FBQyxDQU1yRTtJQUVELGtFQUFrRTtJQUNsRSxRQUFRLENBQUMsR0FBRyxFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUMsRUFBRSxRQUFRLEVBQUUsR0FBRyxPQUFPLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FJN0Q7Q0F1REYifQ==

package/dest/sqlite-opfs/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/sqlite-opfs/store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/sqlite-opfs/store.ts"],"names":[],"mappings":"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"}

package/dest/sqlite-opfs/store.js

@@ -1,8 +1,10 @@
 import { SerialQueue } from '@aztec/foundation/queue';
 import { SQLiteOPFSAztecArray } from './array.js';
-import { SqliteEncryptionError } from './errors.js';
+import { SqliteCorruptionError, SqliteEncryptionError, isCorruptionMessage } from './errors.js';
 import { SQLiteOPFSAztecMap } from './map.js';
 import { SQLiteOPFSAztecMultiMap } from './multi_map.js';
+import { quarantineDuplicatePool } from './pool_integrity.js';
+import { acquirePoolLock, normalizePoolDirectory } from './pool_lock.js';
 import { SQLiteOPFSAztecSet } from './set.js';
 import { SQLiteOPFSAztecSingleton } from './singleton.js';
 /**
@@ -16,6 +18,7 @@ import { SQLiteOPFSAztecSingleton } from './singleton.js';
  * nested ops bypass it to avoid deadlock.
  */ export class AztecSQLiteOPFSStore {
     isEphemeral;
+    poolLock;
     #worker;
     #pending;
     #txQueue;
@@ -24,13 +27,16 @@ import { SQLiteOPFSAztecSingleton } from './singleton.js';
     #nextId;
     #inTx;
     #closed;
-    constructor(worker, name, log, isEphemeral){
+    #workerFailed;
+    constructor(worker, name, log, isEphemeral, poolLock){
         this.isEphemeral = isEphemeral;
+        this.poolLock = poolLock;
         this.#pending = new Map();
         this.#txQueue = new SerialQueue();
         this.#nextId = 0;
         this.#inTx = false;
         this.#closed = false;
+        this.#workerFailed = false;
         this.#worker = worker;
         this.#name = name;
         this.#log = log;
@@ -45,6 +51,7 @@ import { SQLiteOPFSAztecSingleton } from './singleton.js';
             handler.resolve(ev.data);
         };
         this.#worker.onerror = (ev)=>{
+            this.#workerFailed = true;
             this.#log.error(`SQLite worker crashed: ${ev.message}`);
             this.#rejectPending(`SQLite worker crashed: ${ev.message}`);
         };
@@ -57,6 +64,10 @@ import { SQLiteOPFSAztecSingleton } from './singleton.js';
    * required when multiple stores coexist in the same tab, because the SAH Pool holds
    * an exclusive lock on its directory.
    *
+   * Persistent stores hold an origin-wide Web Lock for the pool directory until close
+   * or delete. If another store instance already owns it, open fails immediately with
+   * `SqlitePoolBusyError`.
+   *
    * Pass `encryptionKey` (exactly 32 bytes) to enable at-rest encryption via sqlite3mc's
    * ChaCha20 page cipher. The key buffer is **transferred** to the worker — its
    * ArrayBuffer detaches on the caller side after `postMessage`. This is intentional:
@@ -74,30 +85,40 @@ import { SQLiteOPFSAztecSingleton } from './singleton.js';
         }
         const dbName = name && !ephemeral ? name : `tmp-${globalThis.crypto.getRandomValues(new Uint8Array(8)).join('')}`;
         log.debug(`Opening SQLite-OPFS ${ephemeral ? 'ephemeral ' : ''}${encryptionKey ? 'encrypted ' : ''}database ${dbName}`);
-        const worker = new Worker(new URL('./worker.js', import.meta.url), {
-            type: 'module'
-        });
-        const store = new AztecSQLiteOPFSStore(worker, dbName, log, ephemeral);
-        // Transfer (not clone) the key buffer to the worker so we don't leave a
-        // second copy on the main thread. Caveat: this detaches the caller's
-        // encryptionKey.buffer — subsequent reads from the same Uint8Array are empty.
-        const transfer = encryptionKey ? [
-            encryptionKey.buffer
-        ] : undefined;
+        const effectivePoolDirectory = ephemeral ? undefined : normalizePoolDirectory(poolDirectory);
+        const poolLock = effectivePoolDirectory ? await acquirePoolLock(effectivePoolDirectory) : undefined;
+        let worker;
         try {
+            if (effectivePoolDirectory) {
+                const quarantine = await quarantineDuplicatePool(effectivePoolDirectory);
+                if (quarantine) {
+                    log.warn(`Quarantined SQLite-OPFS pool with duplicate logical file mappings`, quarantine);
+                }
+            }
+            worker = new Worker(new URL('./worker.js', import.meta.url), {
+                type: 'module'
+            });
+            const store = new AztecSQLiteOPFSStore(worker, dbName, log, ephemeral, poolLock);
+            // Transfer (not clone) the key buffer to the worker so we don't leave a
+            // second copy on the main thread. Caveat: this detaches the caller's
+            // encryptionKey.buffer — subsequent reads from the same Uint8Array are empty.
+            const transfer = encryptionKey ? [
+                encryptionKey.buffer
+            ] : undefined;
             await store.#sendRequest({
                 type: 'init',
                 id: store.#allocId(),
                 dbName,
                 ephemeral,
-                poolDirectory,
+                poolDirectory: effectivePoolDirectory,
                 encryptionKey
             }, transfer);
+            return store;
         } catch (err) {
-            worker.terminate();
+            worker?.terminate();
+            await poolLock?.release();
             throw err;
         }
-        return store;
     }
     openMap(name) {
         return new SQLiteOPFSAztecMap(this, name);
@@ -157,14 +178,18 @@ import { SQLiteOPFSAztecSingleton } from './singleton.js';
             return;
         }
         this.#closed = true;
-        await this.#txQueue.end();
-        await this.#sendRequest({
-            type: 'deleteDb',
-            id: this.#allocId(),
-            dbName: this.#name
-        }).catch((err)=>this.#log.warn(`SQLite deleteDb failed: ${err instanceof Error ? err.message : err}`));
-        this.#worker.terminate();
-        this.#rejectPending('SQLite store deleted');
+        try {
+            await this.#txQueue.end();
+            await this.#sendRequest({
+                type: 'deleteDb',
+                id: this.#allocId(),
+                dbName: this.#name
+            }).catch((err)=>this.#log.warn(`SQLite deleteDb failed: ${err instanceof Error ? err.message : err}`));
+        } finally{
+            this.#worker.terminate();
+            this.#rejectPending('SQLite store deleted');
+            await this.poolLock?.release();
+        }
     }
     /**
    * Placeholder — returns zeros to mirror the IndexedDB backend. SQLite exposes real
@@ -186,13 +211,17 @@ import { SQLiteOPFSAztecSingleton } from './singleton.js';
             return;
         }
         this.#closed = true;
-        await this.#txQueue.end();
-        await this.#sendRequest({
-            type: 'close',
-            id: this.#allocId()
-        }).catch(()=>{});
-        this.#worker.terminate();
-        this.#rejectPending('SQLite store closed');
+        try {
+            await this.#txQueue.end();
+            await this.#sendRequest({
+                type: 'close',
+                id: this.#allocId()
+            }).catch(()=>{});
+        } finally{
+            this.#worker.terminate();
+            this.#rejectPending('SQLite store closed');
+            await this.poolLock?.release();
+        }
     }
     backupTo(_dstPath, _compact) {
         throw new Error('Method not implemented.');
@@ -253,15 +282,22 @@ import { SQLiteOPFSAztecSingleton } from './singleton.js';
         this.#pending.clear();
     }
     #sendRequest(req, transfer) {
+        if (this.#workerFailed) {
+            return Promise.reject(new Error('SQLite worker has crashed'));
+        }
         return new Promise((resolve, reject)=>{
             this.#pending.set(req.id, {
                 resolve: (resp)=>{
                     if (resp.type === 'err') {
-                        // Re-hydrate encryption-shaped errors as the typed class so consumers
-                        // can pattern-match on `instanceof SqliteEncryptionError`. Plain
-                        // errors stay plain — the wire protocol only tags encryption paths.
+                        // Re-hydrate typed errors so consumers can pattern-match on
+                        // `instanceof`. Encryption is tagged on the wire (some cases are
+                        // pre-flight throws with no message to match); corruption is a
+                        // single unambiguous message, so we classify it here rather than
+                        // adding a redundant wire field. Everything else stays a plain Error.
                         if (resp.encryptionCode !== undefined) {
                             reject(new SqliteEncryptionError(resp.encryptionCode, resp.message));
+                        } else if (isCorruptionMessage(resp.message)) {
+                            reject(new SqliteCorruptionError(resp.message));
                         } else {
                             reject(new Error(resp.message));
                         }