@rapidmx/web-client 0.4.0 → 0.6.0

package/apps/shared/search/localIndexRpcClient.ts

@@ -9,38 +9,69 @@
  * a per-mailbox connection map (see that file's own doc comment).
  *
  * `postMessage` has no native request/response pairing, so every call generates its own numeric `id` and
- * this module correlates the eventual matching response via a pending-request map - the same shape the
- * `__spike__` validation harness used during development, now the real thing.
+ * this module correlates the eventual matching response via a pending-request map.
+ *
+ * **Generations**: `nextLocalIndexGeneration()` hands out one monotonic counter shared by build passes and
+ * destroys, so the Worker can reject a build call issued before the index was destroyed (see
+ * `GenerationParams`).
+ *
+ * **Sign-out reaches every tab**: `destroyAllLocalIndexes()` broadcasts on a `BroadcastChannel`; any other
+ * tab running a Worker closes its connections and refuses further `init`s.
+ *
+ * **Failed deletions are retried**: a destroy that couldn't remove a directory (another tab held it, the page
+ * navigated away first) is recorded in `localStorage` and retried before this tab's first `init`.
  */
 import type { ParsedSearchQuery } from "@rapidmx/react-shared/search/queryGrammar.js";
 import type {
     Coverage,
+    DestroyParams,
+    GenerationParams,
     IndexEntitiesParams,
+    IndexEntitiesResult,
+    IndexedVersionsParams,
     InitParams,
     LocalIndexRequest,
     LocalIndexResponse,
     LocalSearchPage,
+    MoveEntityParams,
+    PruneEntitiesParams,
     RemoveEntityParams,
     SearchParams,
     SetBuildingParams,
     SetWindowParams,
+    WindowState,
 } from "./localIndexWorker.js";
 import type { LocalIndexEntity } from "./localIndexSchema.js";
+import { removeLocalIndexDirectories, removeLocalIndexDirectory } from "./localIndexStorage.js";
 
 let worker: Worker | undefined;
 let nextRequestId = 1;
 const pending = new Map<number, { resolve: (value: unknown) => void; reject: (err: Error) => void }>();
 
-/** Every mailboxUid `initLocalIndex()` has opened this session, not yet `destroyLocalIndex()`-ed - lets
- * `destroyAllLocalIndexes()` (called from `AppShell.tsx`'s sign-out, which has no mailboxUid of its own
- * to pass - see that call site's own comment) destroy every open index without needing one threaded
- * through. Mirrors `keySession.ts`'s own module-level `sessions` map in spirit - session-scoped,
- * intentionally never persisted. */
+/** Every mailboxUid `initLocalIndex()` has opened this session, not yet `destroyLocalIndex()`-ed. Gates
+ * the in-session mutation helpers (`removeLocalEntity()`/`moveLocalEntity()`) so a delete/move in a
+ * mailbox this tab never indexed doesn't spin up the Worker just to no-op. */
 const initializedMailboxes = new Set<string>();
 
+let generationCounter = 0;
+
+/** A fresh generation - see this module's doc comment. */
+export function nextLocalIndexGeneration(): number {
+    generationCounter += 1;
+    return generationCounter;
+}
+
+/** Set once this tab (or another one) signed out - no index may be opened again in this page load. */
+let signedOut = false;
+
+export const SIGN_OUT_CHANNEL = "rapidmx-localsearch";
+let channel: BroadcastChannel | undefined;
+
 function getWorker(): Worker {
     if (!worker) {
-        worker = new Worker(new URL("./localIndexWorker.ts", import.meta.url), { type: "module" });
+        // Named by its compiled `.js` file, like every other relative import: tsc copies the literal into
+        // `dist` unchanged, where only the `.js` file exists, and Vite maps it back to the `.ts` source.
+        worker = new Worker(new URL("./localIndexWorker.js", import.meta.url), { type: "module" });
         worker.addEventListener("message", (event: MessageEvent<LocalIndexResponse>) => {
             const entry = pending.get(event.data.id);
             if (!entry) {
@@ -53,29 +84,147 @@ function getWorker(): Worker {
                 entry.reject(new Error(event.data.error));
             }
         });
+        // Only a tab with a Worker has connections to close when another tab signs out.
+        listenForSignOut();
     }
     return worker;
 }
 
+function getChannel(): BroadcastChannel | undefined {
+    if (!channel && typeof BroadcastChannel !== "undefined") {
+        channel = new BroadcastChannel(SIGN_OUT_CHANNEL);
+    }
+    return channel;
+}
+
+function listenForSignOut(): void {
+    getChannel()?.addEventListener("message", (event: MessageEvent<{ type?: string }>) => {
+        if (event.data?.type === "sign-out") {
+            void closeEverythingInThisTab();
+        }
+    });
+}
+
+/** Another tab signed out: stop every build here and close this tab's connections (which also removes their
+ * directories, now that nothing holds them open). Never rejects. */
+async function closeEverythingInThisTab(): Promise<void> {
+    signedOut = true;
+    initializedMailboxes.clear();
+    await call("destroyAll", { generation: nextLocalIndexGeneration() } satisfies GenerationParams).catch(() => undefined);
+}
+
 function call<T>(method: LocalIndexRequest["method"], params?: unknown): Promise<T> {
     const id = nextRequestId++;
     return new Promise<T>((resolve, reject) => {
         pending.set(id, { resolve: resolve as (value: unknown) => void, reject });
-        getWorker().postMessage({ id, method, params } satisfies LocalIndexRequest);
+        try {
+            getWorker().postMessage({ id, method, params } satisfies LocalIndexRequest);
+        } catch (err) {
+            pending.delete(id);
+            reject(err instanceof Error ? err : new Error(String(err)));
+        }
     });
 }
 
+export const PENDING_DELETIONS_KEY = "rapidmx-localsearch-pending-deletions";
+/** Stands for "every index on this device" in the pending-deletions list - recorded before a sign-out starts,
+ * so a navigation that kills it midway still gets finished on the next load. */
+const ALL_INDEXES = "*";
+
+function readPendingDeletions(): string[] {
+    try {
+        const parsed: unknown = JSON.parse(localStorage.getItem(PENDING_DELETIONS_KEY) ?? "[]");
+        return Array.isArray(parsed) ? parsed.filter((uid): uid is string => typeof uid === "string") : [];
+    } catch {
+        return [];
+    }
+}
+
+function writePendingDeletions(uids: Iterable<string>): void {
+    try {
+        const list = [...new Set(uids)];
+        if (list.length === 0) {
+            localStorage.removeItem(PENDING_DELETIONS_KEY);
+        } else {
+            localStorage.setItem(PENDING_DELETIONS_KEY, JSON.stringify(list));
+        }
+    } catch {
+        // Storage blocked - nothing to retry from, the same as before this existed.
+    }
+}
+
+function updatePendingDeletions(update: (current: Set<string>) => void): void {
+    const current = new Set(readPendingDeletions());
+    update(current);
+    writePendingDeletions(current);
+}
+
+let pendingRetry: Promise<void> | undefined;
+
+/** Retries every deletion an earlier page load couldn't finish. Runs once per page load (memoized), before
+ * this tab's first `init` - so it never races an index this tab itself opens. Never rejects. */
+export function retryPendingLocalIndexDeletions(): Promise<void> {
+    pendingRetry ??= (async () => {
+        const uids = readPendingDeletions();
+        if (uids.length === 0) {
+            return;
+        }
+        const failed: string[] = [];
+        if (uids.includes(ALL_INDEXES)) {
+            const result = await removeLocalIndexDirectories().catch(() => ({ failed: [ALL_INDEXES] }));
+            failed.push(...result.failed);
+        } else {
+            for (const uid of uids) {
+                await removeLocalIndexDirectory(uid).catch(() => failed.push(uid));
+            }
+        }
+        writePendingDeletions(failed);
+    })();
+    return pendingRetry;
+}
+
 export async function initLocalIndex(params: InitParams): Promise<void> {
+    await retryPendingLocalIndexDeletions();
+    if (signedOut) {
+        throw new Error("Signed out - the local search index is unavailable in this tab.");
+    }
     await call("init", params);
     initializedMailboxes.add(params.mailboxUid);
 }
 
-export function indexLocalEntities(mailboxUid: string, entities: LocalIndexEntity[]): Promise<void> {
-    return call("indexEntities", { mailboxUid, entities } satisfies IndexEntitiesParams);
+export function indexLocalEntities(mailboxUid: string, entities: LocalIndexEntity[], generation?: number): Promise<IndexEntitiesResult> {
+    return call("indexEntities", { mailboxUid, entities, generation } satisfies IndexEntitiesParams);
+}
+
+/** Drops one message from this session's local index (a delete). A no-op for a mailbox not indexed in
+ * this tab - a later build pass prunes it instead. Never rejects: best-effort housekeeping. */
+export async function removeLocalEntity(mailboxUid: string, entityUid: string): Promise<void> {
+    if (!initializedMailboxes.has(mailboxUid)) {
+        return;
+    }
+    await call("removeEntity", { mailboxUid, entityUid } satisfies RemoveEntityParams).catch(() => undefined);
+}
+
+/** Re-points one indexed message at its new folder (archive, cancel-scheduled-send) so `folder:`-scoped
+ * local searches stay correct. Same no-op/never-rejects rules as `removeLocalEntity()`. */
+export async function moveLocalEntity(mailboxUid: string, entityUid: string, folderUid: string): Promise<void> {
+    if (!initializedMailboxes.has(mailboxUid)) {
+        return;
+    }
+    await call("moveEntity", { mailboxUid, entityUid, folderUid } satisfies MoveEntityParams).catch(() => undefined);
+}
+
+export function getIndexedVersions(mailboxUid: string, entityUids: string[]): Promise<Record<string, string>> {
+    return call("indexedVersions", { mailboxUid, entityUids } satisfies IndexedVersionsParams);
 }
 
-export function removeLocalEntity(mailboxUid: string, entityUid: string): Promise<void> {
-    return call("removeEntity", { mailboxUid, entityUid } satisfies RemoveEntityParams);
+export function pruneLocalEntities(
+    mailboxUid: string,
+    keepEntityUids: string[],
+    since: string | undefined,
+    options: { folderUids?: string[]; generation?: number } = {},
+): Promise<number> {
+    return call("pruneEntities", { mailboxUid, keepEntityUids, since, ...options } satisfies PruneEntitiesParams);
 }
 
 export function searchLocal(mailboxUid: string, parsed: ParsedSearchQuery, limit: number, offset = 0): Promise<LocalSearchPage> {
@@ -86,31 +235,84 @@ export function getLocalCoverage(mailboxUid: string): Promise<Coverage> {
     return call("coverage", mailboxUid);
 }
 
-export function setLocalIndexWindow(mailboxUid: string, timeFloorMonths: number, byteBudgetBytes: number): Promise<void> {
-    return call("setWindow", { mailboxUid, timeFloorMonths, byteBudgetBytes } satisfies SetWindowParams);
+export function setLocalIndexWindow(mailboxUid: string, timeFloorMonths: number, byteBudgetBytes: number, generation?: number): Promise<WindowState> {
+    return call("setWindow", { mailboxUid, timeFloorMonths, byteBudgetBytes, generation } satisfies SetWindowParams);
 }
 
-export function setLocalIndexBuilding(mailboxUid: string, building: boolean): Promise<void> {
-    return call("setBuilding", { mailboxUid, building } satisfies SetBuildingParams);
+export function setLocalIndexBuilding(
+    mailboxUid: string,
+    building: boolean,
+    completion: { complete: boolean; coveredFrom?: string; coveredUntil?: string; generation?: number } = { complete: false },
+): Promise<void> {
+    return call("setBuilding", { mailboxUid, building, ...completion } satisfies SetBuildingParams);
 }
 
 /** Destroys one mailbox's local index (both the SQLite connection and its on-disk OPFS storage) - spec
- * §11 "MUST be destroyed on the same events that destroy private keys." Never throws: called from
- * lifecycle hooks (idle timeout, logout, the manual "destroy keys now" button) where a destroy failure
- * shouldn't block the key-destruction it's piggybacking on. */
-export async function destroyLocalIndex(mailboxUid: string): Promise<void> {
+ * §11 "MUST be destroyed on the same events that destroy private keys." Never rejects (it's called from
+ * lifecycle hooks where a failure mustn't block key destruction) but resolves `false` - and logs why -
+ * when the index could not be removed, e.g. because another tab still has it open; the deletion is then
+ * retried on the next page load. */
+export async function destroyLocalIndex(mailboxUid: string): Promise<boolean> {
+    updatePendingDeletions((current) => current.add(mailboxUid));
     try {
-        await call("destroy", mailboxUid);
-    } catch {
-        // Best-effort - see this function's own doc comment.
+        await call("destroy", { mailboxUid, generation: nextLocalIndexGeneration() } satisfies DestroyParams);
+        updatePendingDeletions((current) => current.delete(mailboxUid));
+        return true;
+    } catch (err) {
+        // `call()` only ever rejects with an Error.
+        console.warn(`Could not destroy the local search index for mailbox ${mailboxUid}: ${(err as Error).message}`);
+        return false;
     } finally {
         initializedMailboxes.delete(mailboxUid);
     }
 }
 
-/** Destroys every mailbox's local index this session has opened - for a caller (`AppShell.tsx`'s
- * sign-out) that has no specific mailboxUid of its own, the same "clear everything" shape
- * `destroyUnlockedKeys()` itself offers when called with no argument. */
-export async function destroyAllLocalIndexes(): Promise<void> {
-    await Promise.all([...initializedMailboxes].map((mailboxUid) => destroyLocalIndex(mailboxUid)));
+/** How long sign-out waits for local index destruction before navigating anyway. */
+export const DESTROY_ALL_TIMEOUT_MS = 3_000;
+
+/**
+ * Destroys **every** local index on this device - not just the mailboxes this page load opened (sign-out
+ * from Calendar, say, never opened any), by enumerating OPFS for the index directory prefix - and tells every
+ * other tab to close its own connections. Closes this tab's own open connections through the Worker first
+ * (only if one was ever spawned - there's nothing to close otherwise, and booting one just to delete files
+ * would be waste), then removes the directories. Anything left behind is retried on the next load. Resolves
+ * `true` when everything was removed within `timeoutMs`; never rejects.
+ */
+export async function destroyAllLocalIndexes(timeoutMs = DESTROY_ALL_TIMEOUT_MS): Promise<boolean> {
+    signedOut = true;
+    writePendingDeletions([ALL_INDEXES]);
+    try {
+        getChannel()?.postMessage({ type: "sign-out" });
+    } catch {
+        // A closed/unsupported channel only loses the cross-tab notification.
+    }
+    const work = (async () => {
+        let ok = true;
+        if (worker) {
+            const { failed } = await call<{ failed: string[] }>("destroyAll", { generation: nextLocalIndexGeneration() } satisfies GenerationParams).catch(() => ({
+                failed: ["(worker)"],
+            }));
+            ok = failed.length === 0;
+        }
+        initializedMailboxes.clear();
+        const { failed } = await removeLocalIndexDirectories();
+        writePendingDeletions(failed);
+        return ok && failed.length === 0;
+    })().catch(() => false);
+    let timer: ReturnType<typeof setTimeout> | undefined;
+    const timeout = new Promise<boolean>((resolve) => {
+        timer = setTimeout(() => resolve(false), timeoutMs);
+    });
+    const result = await Promise.race([work, timeout]);
+    clearTimeout(timer);
+    if (!result) {
+        console.warn("Could not destroy every local search index before signing out.");
+    }
+    return result;
+}
+
+/** Removes local indexes for mailboxes outside `accessibleMailboxUids` - e.g. left behind by a different
+ * user who signed in on this device without signing out. Never rejects. */
+export async function pruneInaccessibleLocalIndexes(accessibleMailboxUids: Iterable<string>): Promise<void> {
+    await removeLocalIndexDirectories(new Set(accessibleMailboxUids)).catch(() => undefined);
 }

package/apps/shared/search/localIndexSchema.ts

@@ -15,8 +15,11 @@
  */
 
 /** Bump whenever `CREATE_SCHEMA_SQL` changes in a way existing on-disk databases can't be reconciled
- * with in place. */
-export const SCHEMA_VERSION = 1;
+ * with in place. A mismatch deletes and recreates the whole database file (not just its rows), so
+ * creation-time-only settings like `auto_vacuum` also apply to upgraded indexes.
+ *
+ * 2 - added `entities.entity_version` (incremental rebuild skip) and `auto_vacuum=INCREMENTAL`. */
+export const SCHEMA_VERSION = 2;
 
 /**
  * `entities` is the real row store (metadata + the plaintext content fields), `entities_fts` is an FTS5
@@ -51,7 +54,8 @@ CREATE TABLE IF NOT EXISTS entities (
     subject TEXT,
     body TEXT,
     attachment_text TEXT,
-    byte_size INTEGER NOT NULL DEFAULT 0
+    byte_size INTEGER NOT NULL DEFAULT 0,
+    entity_version TEXT
 );
 CREATE INDEX IF NOT EXISTS idx_entities_date ON entities(date_for_sort);
 CREATE INDEX IF NOT EXISTS idx_entities_mailbox ON entities(mailbox_uid);
@@ -105,18 +109,22 @@ export interface LocalIndexEntity {
     /** Rough on-disk cost of this entity's own content, in bytes - what `localIndexBuilder.ts`'s
      * byte-budget accounting (spec §11) sums against the configured budget. */
     byteSize: number;
+    /** Opaque change marker for the source entity (the builder uses the message's `version` plus its
+     * folder) - lets a rebuild skip re-fetching/decrypting anything already indexed unchanged. */
+    entityVersion?: string;
 }
 
 /** `entity_uid` upsert - `ON CONFLICT` (SQLite's UPSERT syntax) rather than a separate delete-then-insert,
  * so re-indexing an already-present message (a flag changed, a folder move) updates it in place and the
  * `entities_au` trigger keeps `entities_fts` in sync automatically. */
 export const UPSERT_ENTITY_SQL = `
-INSERT INTO entities (entity_type, entity_uid, mailbox_uid, folder_uid, date_for_sort, participants, flags, has_attachments, subject, body, attachment_text, byte_size)
-VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+INSERT INTO entities (entity_type, entity_uid, mailbox_uid, folder_uid, date_for_sort, participants, flags, has_attachments, subject, body, attachment_text, byte_size, entity_version)
+VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 ON CONFLICT(entity_uid) DO UPDATE SET
     folder_uid = excluded.folder_uid, date_for_sort = excluded.date_for_sort, participants = excluded.participants,
     flags = excluded.flags, has_attachments = excluded.has_attachments, subject = excluded.subject,
-    body = excluded.body, attachment_text = excluded.attachment_text, byte_size = excluded.byte_size
+    body = excluded.body, attachment_text = excluded.attachment_text, byte_size = excluded.byte_size,
+    entity_version = excluded.entity_version
 `;
 
 /** Bind values for `UPSERT_ENTITY_SQL`, in column order - kept alongside it so the two can never drift
@@ -135,6 +143,7 @@ export function entityBindValues(entity: LocalIndexEntity): (string | number)[]
         entity.body ?? null!,
         entity.attachmentText ?? null!,
         entity.byteSize,
+        entity.entityVersion ?? null!,
     ];
 }
 

package/apps/shared/search/localIndexStorage.ts

@@ -0,0 +1,98 @@
+///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2026 Jean-Philippe Steinmetz
+// SPDX-License-Identifier: MPL-2.0
+///////////////////////////////////////////////////////////////////////////////
+/**
+ * The Tier 2 local index's on-disk naming and bulk-removal helpers, shared by the Worker
+ * (`localIndexWorker.ts`) and the main thread (`localIndexRpcClient.ts`). Deliberately free of any
+ * wa-sqlite import so the main thread can use it without pulling the WASM build into its own bundle.
+ *
+ * Every mailbox's index lives in its own top-level OPFS directory named `rapidmx-localsearch-<mailboxUid>`
+ * (`AccessHandlePoolVFS` creates it from the VFS name). Enumerating that prefix is how sign-out destroys
+ * *every* index on this device - including ones for mailboxes this page load never opened, which the
+ * RPC client's own session-scoped bookkeeping can't know about - and how a sign-in prunes indexes left
+ * behind for mailboxes the current user can no longer access.
+ */
+
+export const LOCAL_INDEX_POOL_PREFIX = "rapidmx-localsearch-";
+
+/** The OPFS directory name (and `EncryptingVFS` name) a mailbox's index lives under. */
+export function poolNameFor(mailboxUid: string): string {
+    return `${LOCAL_INDEX_POOL_PREFIX}${mailboxUid}`;
+}
+
+/** Inverse of `poolNameFor()`; `undefined` for any OPFS entry that isn't a local index directory. */
+export function mailboxUidFromPoolName(name: string): string | undefined {
+    return name.startsWith(LOCAL_INDEX_POOL_PREFIX) && name.length > LOCAL_INDEX_POOL_PREFIX.length
+        ? name.slice(LOCAL_INDEX_POOL_PREFIX.length)
+        : undefined;
+}
+
+/** `navigator.storage.getDirectory()`, or `undefined` where OPFS isn't available at all (older browsers,
+ * jsdom/node) - there is nothing on disk to remove in that case. */
+async function getOpfsRoot(): Promise<FileSystemDirectoryHandle | undefined> {
+    const storage = typeof navigator === "undefined" ? undefined : navigator.storage;
+    if (!storage?.getDirectory) {
+        return undefined;
+    }
+    return storage.getDirectory();
+}
+
+function isNotFound(err: unknown): boolean {
+    return (err as { name?: string } | undefined)?.name === "NotFoundError";
+}
+
+/** Removes one mailbox's index directory. Resolves quietly when it doesn't exist; rejects for any other
+ * failure (most commonly `NoModificationAllowedError` - another tab still holds its access handles). */
+export async function removeLocalIndexDirectory(mailboxUid: string): Promise<void> {
+    const root = await getOpfsRoot();
+    if (!root) {
+        return;
+    }
+    try {
+        await root.removeEntry(poolNameFor(mailboxUid), { recursive: true });
+    } catch (err) {
+        if (!isNotFound(err)) {
+            throw err;
+        }
+    }
+}
+
+export interface LocalIndexRemovalResult {
+    removed: string[];
+    /** Mailbox uids whose directory could not be removed (e.g. still open in another tab). */
+    failed: string[];
+}
+
+/** Every mailbox uid that has a local index directory on this origin. */
+export async function listLocalIndexMailboxUids(): Promise<string[]> {
+    const root = await getOpfsRoot();
+    if (!root) {
+        return [];
+    }
+    const mailboxUids: string[] = [];
+    // `keys()` is part of the OPFS spec and every browser that has `getDirectory()` at all, but isn't in
+    // this TypeScript version's DOM lib yet.
+    for await (const name of (root as unknown as { keys(): AsyncIterable<string> }).keys()) {
+        const mailboxUid = mailboxUidFromPoolName(name);
+        if (mailboxUid) {
+            mailboxUids.push(mailboxUid);
+        }
+    }
+    return mailboxUids;
+}
+
+/** Removes every local index directory on this origin except those whose mailbox uid is in `keep`. */
+export async function removeLocalIndexDirectories(keep: ReadonlySet<string> = new Set()): Promise<LocalIndexRemovalResult> {
+    const result: LocalIndexRemovalResult = { removed: [], failed: [] };
+    const mailboxUids = (await listLocalIndexMailboxUids()).filter((mailboxUid) => !keep.has(mailboxUid));
+    for (const mailboxUid of mailboxUids) {
+        try {
+            await removeLocalIndexDirectory(mailboxUid);
+            result.removed.push(mailboxUid);
+        } catch {
+            result.failed.push(mailboxUid);
+        }
+    }
+    return result;
+}

package/apps/shared/search/localIndexVFS.ts

@@ -186,7 +186,38 @@ export class EncryptingVFS extends FacadeVFS {
         return this.#inner.jWrite(pFile, physical, blockIndex * PHYSICAL_BLOCK_SIZE);
     }
 
+    /** Set once any block has failed to decrypt/authenticate (or the inner VFS failed a read/write outright)
+     * - `localIndexWorker.ts` checks this after a failed SQLite call to tell real corruption (discard and
+     * rebuild, spec §11 "Invalidation") apart from an ordinary error such as a malformed FTS5 query. */
+    corruptionDetected = false;
+
+    /**
+     * `jRead`/`jWrite` MUST NOT throw: with the Asyncify build, an exception escaping an async VFS method
+     * never reaches the awaiting `sqlite3.*` call - it surfaces only as an unhandled rejection and the
+     * SQLite call hangs forever (confirmed by direct reproduction in node against the real wa-sqlite build).
+     * A thrown `PageCorruptedError` therefore used to wedge the whole connection instead of triggering a
+     * rebuild. Errors are converted to an I/O error return code here, which SQLite does propagate as a
+     * normal `SQLiteError`, and recorded on `corruptionDetected`.
+     */
     async jRead(pFile: number, pData: Uint8Array, iOffset: number): Promise<number> {
+        try {
+            return await this.#jReadBlocks(pFile, pData, iOffset);
+        } catch {
+            this.corruptionDetected = true;
+            return VFS.SQLITE_IOERR_READ;
+        }
+    }
+
+    async jWrite(pFile: number, pData: Uint8Array, iOffset: number): Promise<number> {
+        try {
+            return await this.#jWriteBlocks(pFile, pData, iOffset);
+        } catch {
+            this.corruptionDetected = true;
+            return VFS.SQLITE_IOERR_WRITE;
+        }
+    }
+
+    async #jReadBlocks(pFile: number, pData: Uint8Array, iOffset: number): Promise<number> {
         const filename = this.#filenamesByFileId.get(pFile) ?? `(unknown:${pFile})`;
         const startBlock = Math.floor(iOffset / LOGICAL_BLOCK_SIZE);
         const endBlock = Math.floor((iOffset + pData.length - 1) / LOGICAL_BLOCK_SIZE);
@@ -207,7 +238,7 @@ export class EncryptingVFS extends FacadeVFS {
         return anyAbsent ? VFS.SQLITE_IOERR_SHORT_READ : VFS.SQLITE_OK;
     }
 
-    async jWrite(pFile: number, pData: Uint8Array, iOffset: number): Promise<number> {
+    async #jWriteBlocks(pFile: number, pData: Uint8Array, iOffset: number): Promise<number> {
         const filename = this.#filenamesByFileId.get(pFile) ?? `(unknown:${pFile})`;
         const startBlock = Math.floor(iOffset / LOGICAL_BLOCK_SIZE);
         const endBlock = Math.floor((iOffset + pData.length - 1) / LOGICAL_BLOCK_SIZE);