@optimystic/db-p2p-storage-ns 0.14.1 → 0.16.3

package/dist/src/sqlite-storage.d.ts

@@ -1,38 +1,61 @@
-import type { ActionId, ActionRev, BlockId, IBlock, Transform } from '@optimystic/db-core';
-import type { BlockMetadata, IRawStorage } from '@optimystic/db-p2p';
+import type { ActionId, BlockId } from '@optimystic/db-core';
+import { KvRawStorage, type RawStoreDriver } from '@optimystic/db-p2p';
 import type { SqliteDb } from './db.js';
 /**
- * SQLite-backed `IRawStorage` implementation for NativeScript peers.
+ * SQLite {@link RawStoreDriver}: the five logical block-storage stores mapped to
+ * the five relational tables (`metadata`, `revisions`, `pending`, `transactions`,
+ * `materialized`) with their original columns and keys. This is a code refactor,
+ * not a storage-format change at the SQL level.
  *
- * Every CRUD operation goes through a prepared statement bound once in the
- * constructor. `listRevisions` and `listPendingTransactions` issue
- * `SELECT … ORDER BY` queries bounded by `block_id` (and `rev` for revisions)
- * and drain the results into an array before yielding — matching the
- * `IndexedDBRawStorage` pattern, where holding a cursor live across consumer
- * awaits would invalidate the underlying transaction.
- *
- * `promotePendingTransaction` runs as a single `BEGIN; INSERT…; DELETE…; COMMIT;`
- * via `SqliteDb.transaction(fn)`, so the move is atomic across crashes —
- * unlike the MMKV adapter, which has to maintain a separate pending-index row.
+ * `KvRawStorage` now owns all JSON serialization, so this driver only ever
+ * reads/writes `Uint8Array` values: the value columns are BLOB and SQLite binds
+ * a `Uint8Array` as a BLOB and returns it as a `Uint8Array`, so no codec lives
+ * here (a TEXT column would risk UTF-8 coercion corrupting non-ASCII JSON bytes).
+ * Everything SQLite-specific stays: each CRUD op goes through a prepared
+ * statement bound once in the constructor; range/list queries drain their rows
+ * (`.all(...)`) before yielding so no cursor straddles a consumer's `await`; and
+ * `promote` runs as a single `db.transaction(fn)` — `BEGIN IMMEDIATE; INSERT…;
+ * DELETE…; COMMIT;` — whose three statements are re-prepared against the OPEN
+ * transaction so they run on the held mutex slot without re-locking (which would
+ * deadlock — see `st-nativescript-sqlite-transaction-mutex`).
  */
-export declare class SqliteRawStorage implements IRawStorage {
+export declare class SqliteStoreDriver implements RawStoreDriver {
     private readonly db;
     private readonly stmts;
     constructor(db: SqliteDb);
-    getMetadata(blockId: BlockId): Promise<BlockMetadata | undefined>;
-    saveMetadata(blockId: BlockId, metadata: BlockMetadata): Promise<void>;
-    getRevision(blockId: BlockId, rev: number): Promise<ActionId | undefined>;
-    saveRevision(blockId: BlockId, rev: number, actionId: ActionId): Promise<void>;
-    listRevisions(blockId: BlockId, startRev: number, endRev: number): AsyncIterable<ActionRev>;
-    getPendingTransaction(blockId: BlockId, actionId: ActionId): Promise<Transform | undefined>;
-    savePendingTransaction(blockId: BlockId, actionId: ActionId, transform: Transform): Promise<void>;
-    deletePendingTransaction(blockId: BlockId, actionId: ActionId): Promise<void>;
-    listPendingTransactions(blockId: BlockId): AsyncIterable<ActionId>;
-    getTransaction(blockId: BlockId, actionId: ActionId): Promise<Transform | undefined>;
-    saveTransaction(blockId: BlockId, actionId: ActionId, transform: Transform): Promise<void>;
-    getMaterializedBlock(blockId: BlockId, actionId: ActionId): Promise<IBlock | undefined>;
-    saveMaterializedBlock(blockId: BlockId, actionId: ActionId, block?: IBlock): Promise<void>;
-    getApproximateBytesUsed(): Promise<number>;
-    promotePendingTransaction(blockId: BlockId, actionId: ActionId): Promise<void>;
+    getMetadata(blockId: BlockId): Promise<Uint8Array | undefined>;
+    putMetadata(blockId: BlockId, value: Uint8Array): Promise<void>;
+    getRevision(blockId: BlockId, rev: number): Promise<Uint8Array | undefined>;
+    putRevision(blockId: BlockId, rev: number, value: Uint8Array): Promise<void>;
+    rangeRevisions(blockId: BlockId, lo: number, hi: number, reverse: boolean): AsyncIterable<[number, Uint8Array]>;
+    getPending(blockId: BlockId, actionId: ActionId): Promise<Uint8Array | undefined>;
+    putPending(blockId: BlockId, actionId: ActionId, value: Uint8Array): Promise<void>;
+    deletePending(blockId: BlockId, actionId: ActionId): Promise<void>;
+    listPendingActionIds(blockId: BlockId): AsyncIterable<ActionId>;
+    getTransaction(blockId: BlockId, actionId: ActionId): Promise<Uint8Array | undefined>;
+    putTransaction(blockId: BlockId, actionId: ActionId, value: Uint8Array): Promise<void>;
+    getMaterialized(blockId: BlockId, actionId: ActionId): Promise<Uint8Array | undefined>;
+    putMaterialized(blockId: BlockId, actionId: ActionId, value: Uint8Array): Promise<void>;
+    deleteMaterialized(blockId: BlockId, actionId: ActionId): Promise<void>;
+    promote(blockId: BlockId, actionId: ActionId): Promise<void>;
+    listBlockIds(): AsyncIterable<BlockId>;
+    approximateBytesUsed(): Promise<number>;
+}
+/**
+ * SQLite-backed {@link IRawStorage} for NativeScript peers, now a thin shell over
+ * the shared {@link KvRawStorage} kernel driven by a {@link SqliteStoreDriver}.
+ * The public name/constructor (`new SqliteRawStorage(db)`) is unchanged so
+ * existing imports keep resolving; the kernel supplies the `IRawStorage` surface
+ * and the driver supplies SQLite behavior.
+ *
+ * `listBlockIds`/`getApproximateBytesUsed` are re-declared here as always-present
+ * (the SQLite driver always implements them, so the kernel constructor always
+ * wires them) — the base declares them optional, but every NS consumer relies on
+ * them.
+ */
+export declare class SqliteRawStorage extends KvRawStorage {
+    listBlockIds: () => AsyncIterable<BlockId>;
+    getApproximateBytesUsed: () => Promise<number>;
+    constructor(db: SqliteDb);
 }
 //# sourceMappingURL=sqlite-storage.d.ts.map

package/dist/src/sqlite-storage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sqlite-storage.d.ts","sourceRoot":"","sources":["../../src/sqlite-storage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC3F,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,KAAK,EAAE,QAAQ,EAAmB,MAAM,SAAS,CAAC;AAKzD;;;;;;;;;;;;;GAaG;AACH,qBAAa,gBAAiB,YAAW,WAAW;IAqBvC,OAAO,CAAC,QAAQ,CAAC,EAAE;IApB/B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAkBpB;gBAE2B,EAAE,EAAE,QAAQ;IAsBnC,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAMjE,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IAKzE,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7E,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC;IAW5F,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAM3F,sBAAsB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjG,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC;IAOnE,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAMpF,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1F,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAMvF,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ1F,uBAAuB,IAAI,OAAO,CAAC,MAAM,CAAC;IAa1C,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAUpF"}
+{"version":3,"file":"sqlite-storage.d.ts","sourceRoot":"","sources":["../../src/sqlite-storage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAmB,MAAM,SAAS,CAAC;AAKzD;;;;;;;;;;;;;;;;;GAiBG;AACH,qBAAa,iBAAkB,YAAW,cAAc;IAsB3C,OAAO,CAAC,QAAQ,CAAC,EAAE;IArB/B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAmBpB;gBAE2B,EAAE,EAAE,QAAQ;IA6BnC,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAK9D,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAK3E,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3E,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,aAAa,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAYhH,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAKjF,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlF,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjE,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC;IAUhE,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAKrF,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAMtF,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAKtF,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvF,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAMvE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB3D,YAAY,IAAI,aAAa,CAAC,OAAO,CAAC;IAOvC,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC;CAY7C;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,gBAAiB,SAAQ,YAAY;IACzC,YAAY,EAAE,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;IAC3C,uBAAuB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;gBAE3C,EAAE,EAAE,QAAQ;CAGxB"}

package/dist/src/sqlite-storage.js

@@ -1,20 +1,25 @@
+import { KvRawStorage } from '@optimystic/db-p2p';
 import { createLogger } from './logger.js';
 const log = createLogger('storage:sqlite');
 /**
- * SQLite-backed `IRawStorage` implementation for NativeScript peers.
+ * SQLite {@link RawStoreDriver}: the five logical block-storage stores mapped to
+ * the five relational tables (`metadata`, `revisions`, `pending`, `transactions`,
+ * `materialized`) with their original columns and keys. This is a code refactor,
+ * not a storage-format change at the SQL level.
  *
- * Every CRUD operation goes through a prepared statement bound once in the
- * constructor. `listRevisions` and `listPendingTransactions` issue
- * `SELECT … ORDER BY` queries bounded by `block_id` (and `rev` for revisions)
- * and drain the results into an array before yielding — matching the
- * `IndexedDBRawStorage` pattern, where holding a cursor live across consumer
- * awaits would invalidate the underlying transaction.
- *
- * `promotePendingTransaction` runs as a single `BEGIN; INSERT…; DELETE…; COMMIT;`
- * via `SqliteDb.transaction(fn)`, so the move is atomic across crashes —
- * unlike the MMKV adapter, which has to maintain a separate pending-index row.
+ * `KvRawStorage` now owns all JSON serialization, so this driver only ever
+ * reads/writes `Uint8Array` values: the value columns are BLOB and SQLite binds
+ * a `Uint8Array` as a BLOB and returns it as a `Uint8Array`, so no codec lives
+ * here (a TEXT column would risk UTF-8 coercion corrupting non-ASCII JSON bytes).
+ * Everything SQLite-specific stays: each CRUD op goes through a prepared
+ * statement bound once in the constructor; range/list queries drain their rows
+ * (`.all(...)`) before yielding so no cursor straddles a consumer's `await`; and
+ * `promote` runs as a single `db.transaction(fn)` — `BEGIN IMMEDIATE; INSERT…;
+ * DELETE…; COMMIT;` — whose three statements are re-prepared against the OPEN
+ * transaction so they run on the held mutex slot without re-locking (which would
+ * deadlock — see `st-nativescript-sqlite-transaction-mutex`).
  */
-export class SqliteRawStorage {
+export class SqliteStoreDriver {
     db;
     stmts;
     constructor(db) {
@@ -30,6 +35,11 @@ export class SqliteRawStorage {
             savePending: db.prepare('INSERT OR REPLACE INTO pending (block_id, action_id, value) VALUES (?, ?, ?)'),
             deletePending: db.prepare('DELETE FROM pending WHERE block_id = ? AND action_id = ?'),
             listPending: db.prepare('SELECT action_id FROM pending WHERE block_id = ? ORDER BY action_id ASC'),
+            // metadata.block_id is the PRIMARY KEY, so each row is a distinct block id —
+            // no dedup needed. NOTE: drains the whole metadata table up front; if a peer
+            // ever holds millions of blocks and this SELECT becomes a startup-latency
+            // problem, page it (LIMIT/OFFSET or keyset) — fine at current scale.
+            listBlockIds: db.prepare('SELECT block_id FROM metadata'),
             getTransaction: db.prepare('SELECT value FROM transactions WHERE block_id = ? AND action_id = ?'),
             saveTransaction: db.prepare('INSERT OR REPLACE INTO transactions (block_id, action_id, value) VALUES (?, ?, ?)'),
             getMaterialized: db.prepare('SELECT value FROM materialized WHERE block_id = ? AND action_id = ?'),
@@ -39,74 +49,93 @@ export class SqliteRawStorage {
             pageSize: db.prepare('PRAGMA page_size'),
         };
     }
+    // --- metadata ---
     async getMetadata(blockId) {
         const row = await this.stmts.getMetadata.get(blockId);
-        if (!row)
-            return undefined;
-        return JSON.parse(row.value);
+        return row ? row.value : undefined;
     }
-    async saveMetadata(blockId, metadata) {
-        await this.stmts.saveMetadata.run(blockId, JSON.stringify(metadata));
+    async putMetadata(blockId, value) {
+        await this.stmts.saveMetadata.run(blockId, value);
     }
+    // --- revisions ---
     async getRevision(blockId, rev) {
         const row = await this.stmts.getRevision.get(blockId, rev);
         return row ? row.action_id : undefined;
     }
-    async saveRevision(blockId, rev, actionId) {
-        await this.stmts.saveRevision.run(blockId, rev, actionId);
+    async putRevision(blockId, rev, value) {
+        await this.stmts.saveRevision.run(blockId, rev, value);
     }
-    async *listRevisions(blockId, startRev, endRev) {
-        const ascending = startRev <= endRev;
-        const lo = ascending ? startRev : endRev;
-        const hi = ascending ? endRev : startRev;
-        const stmt = ascending ? this.stmts.listRevisionsAsc : this.stmts.listRevisionsDesc;
+    async *rangeRevisions(blockId, lo, hi, reverse) {
+        // `.all(...)` materializes every row before we yield, so no SQLite cursor
+        // straddles the consumer's awaits (the kernel's drain-before-yield contract).
+        const stmt = reverse ? this.stmts.listRevisionsDesc : this.stmts.listRevisionsAsc;
         const rows = await stmt.all(blockId, lo, hi);
         for (const row of rows) {
-            yield { rev: row.rev, actionId: row.action_id };
+            yield [row.rev, row.action_id];
         }
     }
-    async getPendingTransaction(blockId, actionId) {
+    // --- pending ---
+    async getPending(blockId, actionId) {
         const row = await this.stmts.getPending.get(blockId, actionId);
-        if (!row)
-            return undefined;
-        return JSON.parse(row.value);
+        return row ? row.value : undefined;
     }
-    async savePendingTransaction(blockId, actionId, transform) {
-        await this.stmts.savePending.run(blockId, actionId, JSON.stringify(transform));
+    async putPending(blockId, actionId, value) {
+        await this.stmts.savePending.run(blockId, actionId, value);
     }
-    async deletePendingTransaction(blockId, actionId) {
+    async deletePending(blockId, actionId) {
         await this.stmts.deletePending.run(blockId, actionId);
     }
-    async *listPendingTransactions(blockId) {
+    async *listPendingActionIds(blockId) {
+        // Drained by `.all(...)` before yielding — same rationale as rangeRevisions.
         const rows = await this.stmts.listPending.all(blockId);
         for (const row of rows) {
             yield row.action_id;
         }
     }
+    // --- transactions ---
     async getTransaction(blockId, actionId) {
         const row = await this.stmts.getTransaction.get(blockId, actionId);
-        if (!row)
-            return undefined;
-        return JSON.parse(row.value);
+        return row ? row.value : undefined;
     }
-    async saveTransaction(blockId, actionId, transform) {
-        await this.stmts.saveTransaction.run(blockId, actionId, JSON.stringify(transform));
+    async putTransaction(blockId, actionId, value) {
+        await this.stmts.saveTransaction.run(blockId, actionId, value);
     }
-    async getMaterializedBlock(blockId, actionId) {
+    // --- materialized ---
+    async getMaterialized(blockId, actionId) {
         const row = await this.stmts.getMaterialized.get(blockId, actionId);
-        if (!row)
-            return undefined;
-        return JSON.parse(row.value);
+        return row ? row.value : undefined;
+    }
+    async putMaterialized(blockId, actionId, value) {
+        await this.stmts.saveMaterialized.run(blockId, actionId, value);
+    }
+    async deleteMaterialized(blockId, actionId) {
+        await this.stmts.deleteMaterialized.run(blockId, actionId);
+    }
+    // --- promote (the only cross-key atomic op) ---
+    async promote(blockId, actionId) {
+        await this.db.transaction(async (tx) => {
+            // Prepare against the open transaction so these three statements run on
+            // the held mutex slot without re-locking the connection (which would
+            // deadlock). Re-preparing is cheap — the driver caches by SQL text.
+            const getPending = tx.prepare('SELECT value FROM pending WHERE block_id = ? AND action_id = ?');
+            const saveTransaction = tx.prepare('INSERT OR REPLACE INTO transactions (block_id, action_id, value) VALUES (?, ?, ?)');
+            const deletePending = tx.prepare('DELETE FROM pending WHERE block_id = ? AND action_id = ?');
+            const row = await getPending.get(blockId, actionId);
+            if (!row) {
+                throw new Error(`Pending action ${actionId} not found for block ${blockId}`);
+            }
+            await saveTransaction.run(blockId, actionId, row.value);
+            await deletePending.run(blockId, actionId);
+        });
     }
-    async saveMaterializedBlock(blockId, actionId, block) {
-        if (block) {
-            await this.stmts.saveMaterialized.run(blockId, actionId, JSON.stringify(block));
-        }
-        else {
-            await this.stmts.deleteMaterialized.run(blockId, actionId);
+    // --- optional passthroughs ---
+    async *listBlockIds() {
+        const rows = await this.stmts.listBlockIds.all();
+        for (const row of rows) {
+            yield row.block_id;
         }
     }
-    async getApproximateBytesUsed() {
+    async approximateBytesUsed() {
         try {
             const pageCountRow = await this.stmts.pageCount.get();
             const pageSizeRow = await this.stmts.pageSize.get();
@@ -119,15 +148,22 @@ export class SqliteRawStorage {
             return 0;
         }
     }
-    async promotePendingTransaction(blockId, actionId) {
-        await this.db.transaction(async () => {
-            const row = await this.stmts.getPending.get(blockId, actionId);
-            if (!row) {
-                throw new Error(`Pending action ${actionId} not found for block ${blockId}`);
-            }
-            await this.stmts.saveTransaction.run(blockId, actionId, row.value);
-            await this.stmts.deletePending.run(blockId, actionId);
-        });
+}
+/**
+ * SQLite-backed {@link IRawStorage} for NativeScript peers, now a thin shell over
+ * the shared {@link KvRawStorage} kernel driven by a {@link SqliteStoreDriver}.
+ * The public name/constructor (`new SqliteRawStorage(db)`) is unchanged so
+ * existing imports keep resolving; the kernel supplies the `IRawStorage` surface
+ * and the driver supplies SQLite behavior.
+ *
+ * `listBlockIds`/`getApproximateBytesUsed` are re-declared here as always-present
+ * (the SQLite driver always implements them, so the kernel constructor always
+ * wires them) — the base declares them optional, but every NS consumer relies on
+ * them.
+ */
+export class SqliteRawStorage extends KvRawStorage {
+    constructor(db) {
+        super(new SqliteStoreDriver(db));
     }
 }
 //# sourceMappingURL=sqlite-storage.js.map

package/dist/src/sqlite-storage.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimystic/db-p2p-storage-ns",
-  "version": "0.14.1",
+  "version": "0.16.3",
   "type": "module",
   "description": "NativeScript SQLite storage backend for @optimystic/db-p2p",
   "main": "dist/src/index.js",
@@ -53,8 +53,8 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@optimystic/db-core": "^0.14.1",
-    "@optimystic/db-p2p": "^0.14.1",
+    "@optimystic/db-core": "^0.16.3",
+    "@optimystic/db-p2p": "^0.16.3",
     "debug": "^4.4.3"
   },
   "peerDependencies": {

package/src/connection-mutex.ts

@@ -0,0 +1,33 @@
+/**
+ * Per-connection FIFO mutex for the shared SQLite handle.
+ *
+ * SQLite allows at most one open transaction per connection, so every mutating
+ * operation on a shared connection (plain writes AND transaction bodies) must be
+ * serialized or a concurrent `BEGIN` will nest and cross-rollback another
+ * operation's still-open writes.
+ *
+ * This is deliberately NOT the global `Latches` keyed map from
+ * `@optimystic/db-core` — that is process-wide and keyed by string. Here we want
+ * one mutex bound to one connection instance, so the wrapper holds its own.
+ *
+ * The chain tail is kept non-rejecting: a failing task must not poison the queue
+ * for the operations behind it, so `serialize` continues the chain regardless of
+ * the prior task's outcome while still surfacing each task's own result/error to
+ * its own caller.
+ */
+export class ConnectionMutex {
+	private tail: Promise<unknown> = Promise.resolve();
+
+	/**
+	 * Queue `task` behind all previously-queued tasks and run it once they settle.
+	 * Resolves/rejects with `task`'s own outcome; never rejects the shared tail.
+	 */
+	serialize<T>(task: () => Promise<T> | T): Promise<T> {
+		// Run `task` whether the prior task fulfilled or rejected.
+		const run = this.tail.then(task, task);
+		// Advance the tail with a settled-either-way promise so a rejection here
+		// does not reject the next task's `.then(task, task)` prematurely.
+		this.tail = run.then(() => undefined, () => undefined);
+		return run;
+	}
+}

package/src/db.ts

@@ -22,7 +22,7 @@ export type SqliteRow = Record<string, SqliteParam>;
  *
  * Both `node:sqlite` and `@nativescript-community/sqlite` cache parsed SQL
  * internally, so re-binding a prepared statement is cheaper than re-parsing a
- * raw `execSQL`. The storage classes prepare each query once per instance.
+ * raw `execute`. The storage classes prepare each query once per instance.
  */
 export interface SqliteStatement {
 	/** Execute with the given bind parameters, ignoring any returned rows. */
@@ -33,20 +33,51 @@ export interface SqliteStatement {
 	all(...params: SqliteParam[]): Promise<SqliteRow[]>;
 }
 
+/**
+ * Statements that execute directly on an already-OPEN transaction.
+ *
+ * Handed to the `transaction(fn)` callback. Its prepared statements run on the
+ * raw connection *inside* the mutex slot the transaction already holds, so they
+ * must NOT re-acquire the connection mutex — doing so would deadlock (the
+ * transaction body holds the only slot). This is the explicit-context seam the
+ * fix threads through instead of a shared `inTransaction` flag, which cannot
+ * tell an inner statement (bypass the lock) from a concurrent external write
+ * (block on it).
+ */
+export interface SqliteTransaction {
+	/** Prepare a statement bound to the open transaction; bypasses the mutex. */
+	prepare(sql: string): SqliteStatement;
+}
+
 /**
  * Minimal SQLite driver surface used by this package.
  *
  * Wraps either the NativeScript plugin (in production) or a Node SQLite
  * driver (in tests). Async on every method so the NS plugin's I/O can be
  * Promised — even where the underlying call is synchronous.
+ *
+ * A single connection is shared across the storage classes, so every mutating
+ * operation (`exec`, statement `run`, and `transaction` bodies) is serialized on
+ * a per-connection FIFO mutex. Reads (`get`/`all`) are intentionally left
+ * unserialized to preserve read concurrency.
  */
 export interface SqliteDb {
-	/** Execute one or more semicolon-separated statements; no result rows. */
+	/** Execute one or more semicolon-separated statements; no result rows. Mutex-guarded. */
 	exec(sql: string): Promise<void>;
-	/** Prepare a parameterized statement for repeated execution. */
+	/** Prepare a parameterized statement for repeated execution (writes are mutex-guarded). */
 	prepare(sql: string): SqliteStatement;
-	/** Run `fn` inside `BEGIN ... COMMIT` (rolls back on throw). */
-	transaction<T>(fn: () => Promise<T>): Promise<T>;
+	/**
+	 * Run `fn` inside `BEGIN IMMEDIATE ... COMMIT` (rolls back on throw), holding
+	 * the connection mutex for the whole body. `fn` receives a `SqliteTransaction`
+	 * whose statements run directly on the open transaction without re-locking.
+	 *
+	 * NOTE: `fn` must issue its writes through the provided `tx`, never through a
+	 * class-level statement from `db.prepare(...)` (those re-acquire the mutex and
+	 * deadlock behind the slot this transaction holds), and must not call
+	 * `db.transaction(...)` again — nested calls deadlock for the same reason. No
+	 * current caller does either; guard here if that ever changes.
+	 */
+	transaction<T>(fn: (tx: SqliteTransaction) => Promise<T>): Promise<T>;
 	/** Release the underlying handle. */
 	close(): Promise<void>;
 }
@@ -57,47 +88,63 @@ export const DEFAULT_DB_VERSION = 1;
 /**
  * Schema for the NativeScript storage backend.
  *
- * Mirrors the IndexedDB object stores 1:1:
- * - `metadata` → per-block `BlockMetadata` (JSON).
- * - `revisions` → revision lookup keyed by `(block_id, rev)`.
- * - `pending` → uncommitted transforms keyed by `(block_id, action_id)`.
- * - `transactions` → committed transforms keyed by `(block_id, action_id)`.
- * - `materialized` → materialized blocks keyed by `(block_id, action_id)`.
+ * Mirrors the IndexedDB object stores 1:1. The five block-storage stores keep
+ * their original columns and keys, but their value columns are now BLOB: the
+ * shared `KvRawStorage` kernel (driven by `SqliteStoreDriver`) owns all JSON /
+ * UTF-8 (de)serialization, so the driver only ever binds/reads the kernel's raw
+ * `Uint8Array` values. SQLite stores a `Uint8Array` as a BLOB and returns it as
+ * a `Uint8Array`, so bytes round-trip exactly (a TEXT column would risk UTF-8
+ * coercion corrupting non-ASCII JSON bytes). Keys stay TEXT/INTEGER.
+ * - `metadata` → per-block `BlockMetadata` bytes keyed by `block_id`.
+ * - `revisions` → revision lookup keyed by `(block_id, rev)`; `action_id` column
+ *   holds the kernel's encoded `ActionId` bytes (BLOB).
+ * - `pending` → uncommitted transform bytes keyed by `(block_id, action_id)`.
+ * - `transactions` → committed transform bytes keyed by `(block_id, action_id)`.
+ * - `materialized` → materialized block bytes keyed by `(block_id, action_id)`.
  * - `kv` → generic string keyspace shared by `IKVStore` (`s_val`) and the
- *   identity helper (`b_val`). The two columns avoid a base64 round-trip
- *   for the libp2p private key.
+ *   identity helper (`b_val`). NOT kernel-backed; unchanged. The two columns
+ *   avoid a base64 round-trip for the libp2p private key.
+ *
+ * NOTE: value columns changed TEXT→BLOB with the kernel refactor, but every
+ * statement is `CREATE TABLE IF NOT EXISTS` — so a database file created by a
+ * pre-refactor build keeps its old TEXT-column schema, and its rows hold JSON
+ * *strings* the kernel now reads back and `TextDecoder.decode`s (garbling /
+ * throwing). There is no migration. Safe today because this backend is
+ * NativeScript-only with no shipped production data; if a build ever ships to
+ * devices that later upgrade, add a `user_version` bump that drops+recreates
+ * these five tables (or a real migration) before assuming BLOB rows.
  */
 export const SCHEMA_SQL = `
 CREATE TABLE IF NOT EXISTS metadata (
 	block_id TEXT PRIMARY KEY,
-	value    TEXT NOT NULL
+	value    BLOB NOT NULL
 );
 
 CREATE TABLE IF NOT EXISTS revisions (
 	block_id  TEXT    NOT NULL,
 	rev       INTEGER NOT NULL,
-	action_id TEXT    NOT NULL,
+	action_id BLOB    NOT NULL,
 	PRIMARY KEY (block_id, rev)
 );
 
 CREATE TABLE IF NOT EXISTS pending (
 	block_id  TEXT NOT NULL,
 	action_id TEXT NOT NULL,
-	value     TEXT NOT NULL,
+	value     BLOB NOT NULL,
 	PRIMARY KEY (block_id, action_id)
 );
 
 CREATE TABLE IF NOT EXISTS transactions (
 	block_id  TEXT NOT NULL,
 	action_id TEXT NOT NULL,
-	value     TEXT NOT NULL,
+	value     BLOB NOT NULL,
 	PRIMARY KEY (block_id, action_id)
 );
 
 CREATE TABLE IF NOT EXISTS materialized (
 	block_id  TEXT NOT NULL,
 	action_id TEXT NOT NULL,
-	value     TEXT NOT NULL,
+	value     BLOB NOT NULL,
 	PRIMARY KEY (block_id, action_id)
 );
 
@@ -108,8 +155,8 @@ CREATE TABLE IF NOT EXISTS kv (
 );
 `;
 
+// Assignment-form pragmas return no rows, so they go through exec()/execute().
 const PRAGMAS_SQL = `
-PRAGMA journal_mode = WAL;
 PRAGMA synchronous = NORMAL;
 PRAGMA foreign_keys = OFF;
 `;
@@ -119,6 +166,12 @@ PRAGMA foreign_keys = OFF;
  * migrations can branch on it. Idempotent — safe to call on every open.
  */
 export async function applySchema(db: SqliteDb, version: number = DEFAULT_DB_VERSION): Promise<void> {
+	// `PRAGMA journal_mode = WAL` returns the resulting mode as a row. The NS
+	// Android plugin maps exec()→execSQL, which rejects row-returning statements
+	// ("Queries can be performed using ... query or rawQuery methods only"), so
+	// this pragma must run through a query method. prepare().get() does that on
+	// every driver (NS plugin → get()/rawQuery; node:sqlite/better-sqlite3 → get()).
+	await db.prepare('PRAGMA journal_mode = WAL').get();
 	await db.exec(PRAGMAS_SQL);
 	await db.exec(SCHEMA_SQL);
 	await db.exec(`PRAGMA user_version = ${version}`);

package/src/index.ts

@@ -1,6 +1,6 @@
 export type { OptimysticNSDBHandle, SqliteDb, SqliteStatement, SqliteParam, SqliteRow } from './db.js';
 export { DEFAULT_DB_NAME, DEFAULT_DB_VERSION } from './db.js';
 export { openOptimysticNSDb, wrapNSPluginDb } from './ns-opener.js';
-export { SqliteRawStorage } from './sqlite-storage.js';
+export { SqliteRawStorage, SqliteStoreDriver } from './sqlite-storage.js';
 export { SqliteKVStore } from './sqlite-kv-store.js';
 export { loadOrCreateNSPeerKey, DEFAULT_PEER_KEY_NAME } from './identity.js';