@optimystic/db-p2p 0.14.0 → 0.16.2

package/dist/src/testing/raw-storage-conformance.js

@@ -0,0 +1,313 @@
+import { expect } from 'chai';
+import { StorageRepo } from '../storage/storage-repo.js';
+import { BlockStorage } from '../storage/block-storage.js';
+const makeHeader = (id) => ({
+    id: id,
+    type: 'test',
+    collectionId: 'collection-1'
+});
+const makeBlock = (id, data) => ({
+    header: makeHeader(id),
+    ...data
+});
+const makeInsertTransforms = (blockId, block) => ({
+    inserts: { [blockId]: block },
+    updates: {},
+    deletes: []
+});
+async function collect(iter) {
+    const out = [];
+    for await (const item of iter)
+        out.push(item);
+    return out;
+}
+/**
+ * Registers a `describe(name, ...)` block asserting that a raw-storage backend
+ * behaves identically to every other backend. This is the ONE maintained parity
+ * target that replaces the four copied `test/*-storage.spec.ts` specs — each
+ * driver package calls it from its own `test/` with a factory for its backend.
+ *
+ * It covers the union of what the existing per-backend specs assert PLUS the
+ * behaviors the shared kernel makes parity-critical: clone-on-store/read (now
+ * structural via the byte boundary), promote atomicity + the exact missing-pend
+ * error, drain-before-yield iteration, and a `BlockStorage`-level slice that
+ * guards the `meta.ranges` open-ended seeding invariant and tombstone read-back.
+ */
+export function runRawStorageConformance(name, makeStorage) {
+    describe(name, () => {
+        let harness;
+        let storage;
+        beforeEach(async () => {
+            harness = await makeStorage();
+            storage = harness.storage;
+        });
+        afterEach(async () => {
+            await harness.cleanup();
+        });
+        // --- Metadata ---
+        it('getMetadata returns undefined on a miss', async () => {
+            expect(await storage.getMetadata('absent')).to.equal(undefined);
+        });
+        it('metadata round-trips, including a one-element open-ended range', async () => {
+            const blockId = 'meta-block';
+            // [1, 3] is a bounded range; [5] is OPEN-ENDED (undefined upper bound). The byte
+            // codec must preserve the open-ended encoding exactly — no range normalization.
+            const meta = { ranges: [[1, 3], [5]], latest: { rev: 5, actionId: 'tx:a5' } };
+            await storage.saveMetadata(blockId, meta);
+            const got = await storage.getMetadata(blockId);
+            expect(got).to.deep.equal({ ranges: [[1, 3], [5]], latest: { rev: 5, actionId: 'tx:a5' } });
+        });
+        // --- Revisions ---
+        it('getRevision returns undefined on a miss', async () => {
+            expect(await storage.getRevision('block', 1)).to.equal(undefined);
+        });
+        it('revision round-trips', async () => {
+            const blockId = 'rev-block';
+            await storage.saveRevision(blockId, 7, 'tx:a7');
+            expect(await storage.getRevision(blockId, 7)).to.equal('tx:a7');
+        });
+        it('listRevisions is ascending, inclusive on both bounds, and skips sparse gaps', async () => {
+            const blockId = 'list-asc';
+            await storage.saveRevision(blockId, 1, 'a1');
+            await storage.saveRevision(blockId, 2, 'a2');
+            await storage.saveRevision(blockId, 4, 'a4'); // rev 3 absent
+            const revs = await collect(storage.listRevisions(blockId, 1, 4));
+            expect(revs).to.deep.equal([
+                { rev: 1, actionId: 'a1' },
+                { rev: 2, actionId: 'a2' },
+                { rev: 4, actionId: 'a4' }
+            ]);
+        });
+        it('listRevisions descends when startRev > endRev (bounds still inclusive)', async () => {
+            const blockId = 'list-desc';
+            await storage.saveRevision(blockId, 1, 'a1');
+            await storage.saveRevision(blockId, 2, 'a2');
+            await storage.saveRevision(blockId, 4, 'a4');
+            const revs = await collect(storage.listRevisions(blockId, 4, 1));
+            expect(revs).to.deep.equal([
+                { rev: 4, actionId: 'a4' },
+                { rev: 2, actionId: 'a2' },
+                { rev: 1, actionId: 'a1' }
+            ]);
+        });
+        it('listRevisions with a single inclusive bound yields that one rev', async () => {
+            const blockId = 'list-single';
+            await storage.saveRevision(blockId, 3, 'a3');
+            expect(await collect(storage.listRevisions(blockId, 3, 3))).to.deep.equal([{ rev: 3, actionId: 'a3' }]);
+        });
+        it('listRevisions is scoped to one blockId (a second block does not leak in)', async () => {
+            const a = 'scope-a';
+            const b = 'scope-b';
+            await storage.saveRevision(a, 1, 'a1');
+            await storage.saveRevision(b, 1, 'b1');
+            await storage.saveRevision(b, 2, 'b2');
+            expect(await collect(storage.listRevisions(a, 1, 5))).to.deep.equal([{ rev: 1, actionId: 'a1' }]);
+        });
+        it('listRevisions over an empty range yields nothing', async () => {
+            expect(await collect(storage.listRevisions('empty', 1, 10))).to.deep.equal([]);
+        });
+        it('listRevisions tolerates awaits interleaved between yields (drain-before-yield)', async () => {
+            const blockId = 'drain-revs';
+            await storage.saveRevision(blockId, 1, 'a1');
+            await storage.saveRevision(blockId, 2, 'a2');
+            await storage.saveRevision(blockId, 3, 'a3');
+            const seen = [];
+            for await (const { rev, actionId } of storage.listRevisions(blockId, 1, 3)) {
+                // An unrelated storage read between yields would auto-commit / invalidate a
+                // native cursor that straddled the await, if the driver failed to drain first.
+                await storage.getMetadata('other');
+                seen.push([rev, actionId]);
+            }
+            expect(seen).to.deep.equal([[1, 'a1'], [2, 'a2'], [3, 'a3']]);
+        });
+        // --- Pending transactions ---
+        it('getPendingTransaction returns undefined on a miss', async () => {
+            expect(await storage.getPendingTransaction('block', 'a')).to.equal(undefined);
+        });
+        it('pending transaction round-trips', async () => {
+            const blockId = 'pend-block';
+            const transform = { insert: makeBlock('pend-block', { items: ['x'] }) };
+            await storage.savePendingTransaction(blockId, 'a1', transform);
+            expect(await storage.getPendingTransaction(blockId, 'a1')).to.deep.equal(transform);
+        });
+        it('listPendingTransactions is scoped to one block', async () => {
+            const a = 'pend-a';
+            const b = 'pend-b';
+            await storage.savePendingTransaction(a, 'a1', { delete: true });
+            await storage.savePendingTransaction(a, 'a2', { delete: true });
+            await storage.savePendingTransaction(b, 'b1', { delete: true });
+            const ids = new Set(await collect(storage.listPendingTransactions(a)));
+            expect(ids).to.deep.equal(new Set(['a1', 'a2']));
+        });
+        it('deletePendingTransaction removes the pending entry', async () => {
+            const blockId = 'pend-del';
+            await storage.savePendingTransaction(blockId, 'a1', { delete: true });
+            await storage.deletePendingTransaction(blockId, 'a1');
+            expect(await storage.getPendingTransaction(blockId, 'a1')).to.equal(undefined);
+            expect(await collect(storage.listPendingTransactions(blockId))).to.deep.equal([]);
+        });
+        it('listPendingTransactions tolerates awaits interleaved between yields (drain-before-yield)', async () => {
+            const blockId = 'drain-pend';
+            await storage.savePendingTransaction(blockId, 'a1', { delete: true });
+            await storage.savePendingTransaction(blockId, 'a2', { delete: true });
+            const seen = [];
+            for await (const id of storage.listPendingTransactions(blockId)) {
+                await storage.getMetadata('other');
+                seen.push(id);
+            }
+            expect(new Set(seen)).to.deep.equal(new Set(['a1', 'a2']));
+        });
+        // --- Committed transactions ---
+        it('getTransaction returns undefined on a miss', async () => {
+            expect(await storage.getTransaction('block', 'a')).to.equal(undefined);
+        });
+        it('committed transaction round-trips', async () => {
+            const blockId = 'tx-block';
+            const transform = { updates: [['items', 0, 0, ['y']]] };
+            await storage.saveTransaction(blockId, 'a1', transform);
+            expect(await storage.getTransaction(blockId, 'a1')).to.deep.equal(transform);
+        });
+        // --- Materialized blocks ---
+        it('getMaterializedBlock returns undefined on a miss', async () => {
+            expect(await storage.getMaterializedBlock('block', 'a')).to.equal(undefined);
+        });
+        it('materialized block round-trips', async () => {
+            const blockId = 'mat-block';
+            const block = makeBlock('mat-block', { items: ['z'] });
+            await storage.saveMaterializedBlock(blockId, 'a1', block);
+            expect(await storage.getMaterializedBlock(blockId, 'a1')).to.deep.equal(block);
+        });
+        it('saveMaterializedBlock(undefined) deletes; a subsequent get returns undefined', async () => {
+            const blockId = 'mat-del';
+            await storage.saveMaterializedBlock(blockId, 'a1', makeBlock('mat-del'));
+            await storage.saveMaterializedBlock(blockId, 'a1', undefined);
+            expect(await storage.getMaterializedBlock(blockId, 'a1')).to.equal(undefined);
+        });
+        // --- Promote (the only cross-key atomic op) ---
+        it('promotePendingTransaction moves pending → committed atomically', async () => {
+            const blockId = 'promote-block';
+            const transform = { insert: makeBlock('promote-block') };
+            await storage.savePendingTransaction(blockId, 'a1', transform);
+            await storage.promotePendingTransaction(blockId, 'a1');
+            expect(await storage.getTransaction(blockId, 'a1'), 'committed after promote').to.deep.equal(transform);
+            expect(await storage.getPendingTransaction(blockId, 'a1'), 'pending removed after promote').to.equal(undefined);
+        });
+        it('promotePendingTransaction throws the exact message when no pending entry exists', async () => {
+            const blockId = 'promote-missing';
+            let error;
+            try {
+                await storage.promotePendingTransaction(blockId, 'nope');
+            }
+            catch (err) {
+                error = err;
+            }
+            expect(error, 'promote of a missing pending throws').to.not.equal(undefined);
+            expect(error.message).to.equal(`Pending action nope not found for block ${blockId}`);
+        });
+        // --- Clone-on-store / clone-on-read (now structural via the byte boundary) ---
+        it('saveMetadata snapshots — a later caller mutation does not corrupt stored state', async () => {
+            const blockId = 'clone-meta';
+            const meta = { ranges: [[1, 2]], latest: { rev: 1, actionId: 'a1' } };
+            await storage.saveMetadata(blockId, meta);
+            // Mutate the caller's object AFTER saving — must not reach stored state.
+            meta.ranges.push([9, 10]);
+            meta.latest.rev = 99;
+            const stored = await storage.getMetadata(blockId);
+            expect(stored).to.deep.equal({ ranges: [[1, 2]], latest: { rev: 1, actionId: 'a1' } });
+        });
+        it('savePendingTransaction / saveTransaction snapshot — a later caller mutation does not corrupt stored state', async () => {
+            const blockId = 'clone-tx';
+            const pend = { insert: makeBlock('clone-tx', { items: ['p-original'] }) };
+            const committed = { insert: makeBlock('clone-tx', { items: ['c-original'] }) };
+            await storage.savePendingTransaction(blockId, 'p1', pend);
+            await storage.saveTransaction(blockId, 'c1', committed);
+            // Mutate both caller references AFTER saving — neither must reach stored state.
+            pend.insert.items.push('mutated');
+            pend.delete = true;
+            committed.insert.items.push('mutated');
+            const storedPend = await storage.getPendingTransaction(blockId, 'p1');
+            expect(storedPend.insert.items).to.deep.equal(['p-original']);
+            expect(storedPend.delete).to.equal(undefined);
+            const storedCommitted = await storage.getTransaction(blockId, 'c1');
+            expect(storedCommitted.insert.items).to.deep.equal(['c-original']);
+        });
+        it('getMetadata returns an independent copy each read (mutating one does not affect another)', async () => {
+            const blockId = 'clone-meta-read';
+            await storage.saveMetadata(blockId, { ranges: [[1, 2]], latest: { rev: 1, actionId: 'a1' } });
+            const first = await storage.getMetadata(blockId);
+            first.ranges.push([9, 10]);
+            const second = await storage.getMetadata(blockId);
+            expect(second.ranges).to.deep.equal([[1, 2]]);
+        });
+        it('saveMaterializedBlock snapshots and getMaterializedBlock returns a fresh object', async () => {
+            const blockId = 'clone-mat';
+            const block = makeBlock('clone-mat', { items: ['original'] });
+            await storage.saveMaterializedBlock(blockId, 'a1', block);
+            // Mutate the caller's block after saving.
+            block.items.push('mutated');
+            const stored = await storage.getMaterializedBlock(blockId, 'a1');
+            expect(stored.items, 'stored copy unaffected by post-save mutation').to.deep.equal(['original']);
+            // Mutate a returned copy; a fresh get is unaffected.
+            stored.items.push('mutated-again');
+            const reread = await storage.getMaterializedBlock(blockId, 'a1');
+            expect(reread.items, 'fresh read unaffected by mutation of a prior read').to.deep.equal(['original']);
+        });
+        // --- listBlockIds (optional; only when the driver implements it) ---
+        it('listBlockIds yields exactly the blocks with metadata', async function () {
+            const listBlockIds = storage.listBlockIds;
+            if (typeof listBlockIds !== 'function') {
+                this.skip();
+            }
+            else {
+                await storage.saveMetadata('b1', { ranges: [], latest: undefined });
+                await storage.saveMetadata('b2', { ranges: [], latest: undefined });
+                // Pended but never committed → no metadata → must not be enumerated.
+                await storage.savePendingTransaction('pending-only', 'x', { delete: true });
+                const ids = new Set(await collect(listBlockIds.call(storage)));
+                expect(ids).to.deep.equal(new Set(['b1', 'b2']));
+            }
+        });
+        it('listBlockIds yields nothing for an empty store', async function () {
+            const listBlockIds = storage.listBlockIds;
+            if (typeof listBlockIds !== 'function') {
+                this.skip();
+            }
+            else {
+                expect(await collect(listBlockIds.call(storage))).to.deep.equal([]);
+            }
+        });
+        // --- BlockStorage-level parity slice (over the same driver) ---
+        it('BlockStorage pend → commit seeds open-ended ranges [[E]] (never [[0]]) and getBlock serves it', async () => {
+            const blockId = 'parity-commit';
+            const repo = new StorageRepo((id) => new BlockStorage(id, storage));
+            await repo.pend({
+                actionId: 'a1',
+                transforms: makeInsertTransforms(blockId, makeBlock('parity-commit', { items: [] })),
+                policy: 'c'
+            });
+            const commit = await repo.commit({ actionId: 'a1', blockIds: [blockId], tailId: blockId, rev: 1 });
+            expect(commit.success, 'commit succeeded').to.equal(true);
+            const meta = await storage.getMetadata(blockId);
+            expect(meta.latest?.rev).to.equal(1);
+            // Open-ended from the earliest committed rev E=1 — NOT the over-claim [[0]].
+            expect(meta.ranges, 'coverage open-ended from E=1').to.deep.equal([[1]]);
+            const got = await new BlockStorage(blockId, storage).getBlock();
+            expect(got?.block.header.id, 'committed block served').to.equal('parity-commit');
+        });
+        it('BlockStorage saveReplica → saveDeletion reads the tombstoned rev back as undefined', async () => {
+            const blockId = 'parity-tombstone';
+            const bs = new BlockStorage(blockId, storage);
+            await bs.saveReplica(makeBlock('parity-tombstone', { items: ['live'] }), { rev: 1, actionId: 'r1' });
+            const meta = await storage.getMetadata(blockId);
+            // saveReplica seeds open-ended coverage anchored at the replica rev, never [[0]].
+            expect(meta.ranges, 'replica seeds open-ended [[1]]').to.deep.equal([[1]]);
+            const latest = await bs.saveDeletion({ rev: 2, actionId: 'd2' });
+            expect(latest.rev).to.equal(2);
+            // getBlock at the tombstone rev reverse-applies { delete: true } → absent block.
+            expect(await bs.getBlock(), 'tombstoned rev reads back undefined').to.equal(undefined);
+            // The prior revision still materializes.
+            expect((await bs.getBlock(1))?.block.header.id, 'rev 1 still serves the live block').to.equal('parity-tombstone');
+        });
+    });
+}
+//# sourceMappingURL=raw-storage-conformance.js.map

package/dist/src/testing/raw-storage-conformance.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimystic/db-p2p",
-  "version": "0.14.0",
+  "version": "0.16.2",
   "type": "module",
   "description": "P2P database functionality for Optimystic",
   "main": "dist/src/index.js",
@@ -81,7 +81,7 @@
     "@libp2p/tcp": "^11.0.10",
     "@libp2p/websockets": "^10.1.3",
     "@multiformats/multiaddr": "^13.0.1",
-    "@optimystic/db-core": "^0.14.0",
+    "@optimystic/db-core": "^0.16.2",
     "async-mutex": "^0.5.0",
     "debug": "^4.4.3",
     "it-all": "^3.0.9",
@@ -90,9 +90,9 @@
     "it-pushable": "^3.2.3",
     "libp2p": "^3.1.3",
     "multiformats": "^13.4.2",
-    "p2p-fret": "^0.5.0",
+    "p2p-fret": "^0.6.0",
     "protons-runtime": "^6.0.0",
     "uint8arraylist": "^2.4.8",
-    "uint8arrays": "^5.1.0"
+    "uint8arrays": "^6.1.1"
   }
 }

package/src/cluster/block-transfer-service.ts

@@ -5,6 +5,7 @@ import * as lp from 'it-length-prefixed';
 import { fromString as u8FromString } from 'uint8arrays/from-string';
 import { toString as u8ToString } from 'uint8arrays/to-string';
 import { ProtocolClient } from '../protocol-client.js';
+import { MAX_BLOCK_MESSAGE_BYTES } from '../protocol-limits.js';
 import { createLogger } from '../logger.js';
 
 const log = createLogger('block-transfer-service');
@@ -125,7 +126,7 @@ export class BlockTransferService implements Startable {
 			// keeps both sides live.
 			const responses = pipe(
 				stream,
-				(source) => lp.decode(source),
+				(source) => lp.decode(source, { maxDataLength: MAX_BLOCK_MESSAGE_BYTES }),
 				async function* (source) {
 					for await (const msg of source) {
 						const request = JSON.parse(u8ToString(msg.subarray(), 'utf8')) as BlockTransferRequest;
@@ -263,7 +264,7 @@ export class BlockTransferClient extends ProtocolClient {
 		options?: { signal?: AbortSignal; dialTimeoutMs?: number; responseTimeoutMs?: number }
 	): Promise<BlockTransferResponse> {
 		const request: BlockTransferRequest = { type: 'pull', blockIds, reason };
-		return await this.processMessage<BlockTransferResponse>(request, this.protocol, options);
+		return await this.processMessage<BlockTransferResponse>(request, this.protocol, { ...options, maxDataLength: MAX_BLOCK_MESSAGE_BYTES });
 	}
 
 	/**
@@ -291,6 +292,6 @@ export class BlockTransferClient extends ProtocolClient {
 			blockData[blockIds[i]!] = Buffer.from(blockDataBuffers[i]!).toString('base64');
 		}
 		const request: BlockTransferRequest = { type: 'push', blockIds, reason, blockData, ...(blockMeta ? { blockMeta } : {}) };
-		return await this.processMessage<BlockTransferResponse>(request, this.protocol, options);
+		return await this.processMessage<BlockTransferResponse>(request, this.protocol, { ...options, maxDataLength: MAX_BLOCK_MESSAGE_BYTES });
 	}
 }