@optimystic/db-p2p 0.1.1 → 0.1.3

package/src/sync/service.ts

@@ -132,8 +132,9 @@ export class SyncService implements Startable {
 	private async readRequest(stream: Stream): Promise<SyncRequest> {
 		const messages: Uint8Array[] = [];
 
+		// Stream is now directly AsyncIterable in libp2p v3
 		await pipe(
-			stream.source,
+			stream,
 			lp.decode,
 			async (source) => {
 				for await (const msg of source) {
@@ -157,11 +158,11 @@ export class SyncService implements Startable {
 		const json = JSON.stringify(response);
 		const bytes = u8FromString(json, 'utf8');
 
-		await pipe(
-			[bytes],
-			lp.encode,
-			stream.sink
-		);
+		// Use stream.send() instead of piping to stream.sink in libp2p v3
+		const encoded = pipe([bytes], lp.encode);
+		for await (const chunk of encoded) {
+			stream.send(chunk);
+		}
 	}
 
 	/**

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

@@ -1,30 +0,0 @@
-import type { BlockId, IBlock, Transform, ActionId, ActionRev } from "@optimystic/db-core";
-import type { BlockMetadata } from "./struct.js";
-import type { IRawStorage } from "./i-raw-storage.js";
-export declare class FileRawStorage implements IRawStorage {
-    private readonly basePath;
-    constructor(basePath: string);
-    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>;
-    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>;
-    listRevisions(blockId: BlockId, startRev: number, endRev: number): AsyncIterable<ActionRev>;
-    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>;
-    promotePendingTransaction(blockId: BlockId, actionId: ActionId): Promise<void>;
-    private getBlockPath;
-    private getMetadataPath;
-    private getRevisionPath;
-    private getPendingActionPath;
-    private getActionPath;
-    private getMaterializedPath;
-    private readIfExists;
-    private ensureAndWriteFile;
-}
-//# sourceMappingURL=file-storage.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"file-storage.d.ts","sourceRoot":"","sources":["../../../src/storage/file-storage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC3F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAKtD,qBAAa,cAAe,YAAW,WAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,MAAM;IAIvC,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAIjE,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtE,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IAIzE,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9E,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAI3F,sBAAsB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAOjG,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAS5E,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC;IAYnE,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAInF,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC;IAU5F,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAO1F,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIvF,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAe1F,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBpF,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,mBAAmB;YAIb,YAAY;YASZ,kBAAkB;CAIhC"}

package/dist/src/storage/file-storage.js

@@ -1,127 +0,0 @@
-import { promises as fs } from 'fs';
-import * as path from 'path';
-import { createLogger } from '../logger.js';
-const log = createLogger('storage:file');
-export class FileRawStorage {
-    basePath;
-    constructor(basePath) {
-        this.basePath = basePath;
-        // TODO: use https://www.npmjs.com/package/proper-lockfile to take a lock on the basePath, also introduce explicit dispose pattern
-    }
-    async getMetadata(blockId) {
-        return this.readIfExists(this.getMetadataPath(blockId));
-    }
-    async saveMetadata(blockId, metadata) {
-        await this.ensureAndWriteFile(this.getMetadataPath(blockId), JSON.stringify(metadata));
-    }
-    async getRevision(blockId, rev) {
-        return this.readIfExists(this.getRevisionPath(blockId, rev));
-    }
-    async saveRevision(blockId, rev, actionId) {
-        await this.ensureAndWriteFile(this.getRevisionPath(blockId, rev), actionId);
-    }
-    async getPendingTransaction(blockId, actionId) {
-        return this.readIfExists(this.getPendingActionPath(blockId, actionId));
-    }
-    async savePendingTransaction(blockId, actionId, transform) {
-        await this.ensureAndWriteFile(this.getPendingActionPath(blockId, actionId), JSON.stringify(transform));
-    }
-    async deletePendingTransaction(blockId, actionId) {
-        const pendingPath = this.getPendingActionPath(blockId, actionId);
-        await fs.unlink(pendingPath)
-            .catch((err) => {
-            // Ignore if file doesn't exist
-            if (err?.code !== 'ENOENT')
-                log('deletePendingTransaction unlink failed for %s/%s - %o', blockId, actionId, err);
-        });
-    }
-    async *listPendingTransactions(blockId) {
-        const pendingPath = path.join(this.getBlockPath(blockId), 'pend');
-        const files = await fs.readdir(pendingPath).catch((err) => { log('listPendingTransactions readdir failed for %s - %o', blockId, err); return []; });
-        for (const file of files) {
-            if (!file.endsWith('.json'))
-                continue;
-            const rawActionId = file.slice(0, -5);
-            if (!/^[\w\d]+-[\w\d]+-[\w\d]+-[\w\d]+-[\w\d]+$/.test(rawActionId))
-                continue;
-            yield rawActionId;
-        }
-    }
-    async getTransaction(blockId, actionId) {
-        return this.readIfExists(this.getActionPath(blockId, actionId));
-    }
-    async *listRevisions(blockId, startRev, endRev) {
-        // TODO: Optimize this for sparse revs
-        for (let rev = startRev; startRev <= endRev ? rev <= endRev : rev >= endRev; startRev <= endRev ? ++rev : --rev) {
-            const actionId = await this.getRevision(blockId, rev);
-            if (actionId) {
-                yield { actionId, rev };
-            }
-        }
-    }
-    async saveTransaction(blockId, actionId, transform) {
-        await this.ensureAndWriteFile(this.getActionPath(blockId, actionId), JSON.stringify(transform));
-    }
-    async getMaterializedBlock(blockId, actionId) {
-        return this.readIfExists(this.getMaterializedPath(blockId, actionId));
-    }
-    async saveMaterializedBlock(blockId, actionId, block) {
-        if (block) {
-            await this.ensureAndWriteFile(this.getMaterializedPath(blockId, actionId), JSON.stringify(block));
-        }
-        else {
-            await fs.unlink(this.getMaterializedPath(blockId, actionId))
-                .catch((err) => {
-                // Ignore if file doesn't exist
-                if (err?.code !== 'ENOENT')
-                    log('saveMaterializedBlock unlink failed for %s/%s - %o', blockId, actionId, err);
-            });
-        }
-    }
-    async promotePendingTransaction(blockId, actionId) {
-        const pendingPath = this.getPendingActionPath(blockId, actionId);
-        const actionPath = this.getActionPath(blockId, actionId);
-        // Ensure target directory exists
-        await fs.mkdir(path.dirname(actionPath), { recursive: true });
-        return fs.rename(pendingPath, actionPath)
-            .catch(err => {
-            if (err.code === 'ENOENT') {
-                throw new Error(`Pending action ${actionId} not found for block ${blockId}`);
-            }
-            log('promotePendingTransaction rename failed for %s/%s - %o', blockId, actionId, err);
-            throw err;
-        });
-    }
-    getBlockPath(blockId) {
-        return path.join(this.basePath, blockId);
-    }
-    getMetadataPath(blockId) {
-        return path.join(this.getBlockPath(blockId), 'meta.json');
-    }
-    getRevisionPath(blockId, rev) {
-        return path.join(this.getBlockPath(blockId), 'revs', `${rev}.json`);
-    }
-    getPendingActionPath(blockId, actionId) {
-        return path.join(this.getBlockPath(blockId), 'pend', `${actionId}.json`);
-    }
-    getActionPath(blockId, actionId) {
-        return path.join(this.getBlockPath(blockId), 'actions', `${actionId}.json`);
-    }
-    getMaterializedPath(blockId, actionId) {
-        return path.join(this.getBlockPath(blockId), 'blocks', `${actionId}.json`);
-    }
-    async readIfExists(filePath) {
-        return fs.readFile(filePath, 'utf-8')
-            .then(content => JSON.parse(content))
-            .catch(err => {
-            if (err.code === 'ENOENT')
-                return undefined;
-            throw err;
-        });
-    }
-    async ensureAndWriteFile(filePath, content) {
-        await fs.mkdir(path.dirname(filePath), { recursive: true });
-        await fs.writeFile(filePath, content);
-    }
-}
-//# sourceMappingURL=file-storage.js.map

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

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

package/src/storage/file-storage.ts

@@ -1,163 +0,0 @@
-import { promises as fs } from 'fs';
-import * as path from 'path';
-import type { BlockId, IBlock, Transform, ActionId, ActionRev } from "@optimystic/db-core";
-import type { BlockMetadata } from "./struct.js";
-import type { IRawStorage } from "./i-raw-storage.js";
-import { createLogger } from '../logger.js'
-
-const log = createLogger('storage:file')
-
-export class FileRawStorage implements IRawStorage {
-	constructor(private readonly basePath: string) {
-		// TODO: use https://www.npmjs.com/package/proper-lockfile to take a lock on the basePath, also introduce explicit dispose pattern
-	 }
-
-	async getMetadata(blockId: BlockId): Promise<BlockMetadata | undefined> {
-		return this.readIfExists<BlockMetadata>(this.getMetadataPath(blockId));
-	}
-
-	async saveMetadata(blockId: BlockId, metadata: BlockMetadata): Promise<void> {
-		await this.ensureAndWriteFile(
-			this.getMetadataPath(blockId),
-			JSON.stringify(metadata)
-		);
-	}
-
-	async getRevision(blockId: BlockId, rev: number): Promise<ActionId | undefined> {
-		return this.readIfExists<ActionId>(this.getRevisionPath(blockId, rev));
-	}
-
-	async saveRevision(blockId: BlockId, rev: number, actionId: ActionId): Promise<void> {
-		await this.ensureAndWriteFile(
-			this.getRevisionPath(blockId, rev),
-			actionId
-		);
-	}
-
-	async getPendingTransaction(blockId: BlockId, actionId: ActionId): Promise<Transform | undefined> {
-		return this.readIfExists<Transform>(this.getPendingActionPath(blockId, actionId));
-	}
-
-	async savePendingTransaction(blockId: BlockId, actionId: ActionId, transform: Transform): Promise<void> {
-		await this.ensureAndWriteFile(
-			this.getPendingActionPath(blockId, actionId),
-			JSON.stringify(transform)
-		);
-	}
-
-	async deletePendingTransaction(blockId: BlockId, actionId: ActionId): Promise<void> {
-		const pendingPath = this.getPendingActionPath(blockId, actionId);
-		await fs.unlink(pendingPath)
-			.catch((err) => {
-				// Ignore if file doesn't exist
-				if ((err as NodeJS.ErrnoException)?.code !== 'ENOENT') log('deletePendingTransaction unlink failed for %s/%s - %o', blockId, actionId, err)
-			});
-	}
-
-	async *listPendingTransactions(blockId: BlockId): AsyncIterable<ActionId> {
-		const pendingPath = path.join(this.getBlockPath(blockId), 'pend');
-
-		const files = await fs.readdir(pendingPath).catch((err) => { log('listPendingTransactions readdir failed for %s - %o', blockId, err); return [] as string[] });
-		for (const file of files) {
-			if (!file.endsWith('.json')) continue;
-			const rawActionId = file.slice(0, -5);
-			if (!/^[\w\d]+-[\w\d]+-[\w\d]+-[\w\d]+-[\w\d]+$/.test(rawActionId)) continue;
-			yield rawActionId as ActionId;
-		}
-	}
-
-	async getTransaction(blockId: BlockId, actionId: ActionId): Promise<Transform | undefined> {
-		return this.readIfExists<Transform>(this.getActionPath(blockId, actionId));
-	}
-
-	async *listRevisions(blockId: BlockId, startRev: number, endRev: number): AsyncIterable<ActionRev> {
-		// TODO: Optimize this for sparse revs
-		for (let rev = startRev; startRev <= endRev ? rev <= endRev : rev >= endRev; startRev <= endRev ? ++rev : --rev) {
-			const actionId = await this.getRevision(blockId, rev);
-			if (actionId) {
-				yield { actionId, rev };
-			}
-		}
-	}
-
-	async saveTransaction(blockId: BlockId, actionId: ActionId, transform: Transform): Promise<void> {
-		await this.ensureAndWriteFile(
-			this.getActionPath(blockId, actionId),
-			JSON.stringify(transform)
-		);
-	}
-
-	async getMaterializedBlock(blockId: BlockId, actionId: ActionId): Promise<IBlock | undefined> {
-		return this.readIfExists<IBlock>(this.getMaterializedPath(blockId, actionId));
-	}
-
-	async saveMaterializedBlock(blockId: BlockId, actionId: ActionId, block?: IBlock): Promise<void> {
-		if (block) {
-			await this.ensureAndWriteFile(
-				this.getMaterializedPath(blockId, actionId),
-				JSON.stringify(block)
-			);
-		} else {
-			await fs.unlink(this.getMaterializedPath(blockId, actionId))
-				.catch((err) => {
-					// Ignore if file doesn't exist
-					if ((err as NodeJS.ErrnoException)?.code !== 'ENOENT') log('saveMaterializedBlock unlink failed for %s/%s - %o', blockId, actionId, err)
-				});
-		}
-	}
-
-	async promotePendingTransaction(blockId: BlockId, actionId: ActionId): Promise<void> {
-		const pendingPath = this.getPendingActionPath(blockId, actionId);
-		const actionPath = this.getActionPath(blockId, actionId);
-
-		// Ensure target directory exists
-		await fs.mkdir(path.dirname(actionPath), { recursive: true });
-
-		return fs.rename(pendingPath, actionPath)
-			.catch(err => {
-				if (err.code === 'ENOENT') {
-					throw new Error(`Pending action ${actionId} not found for block ${blockId}`);
-				}
-				log('promotePendingTransaction rename failed for %s/%s - %o', blockId, actionId, err)
-				throw err;
-			});
-	}
-
-	private getBlockPath(blockId: BlockId): string {
-		return path.join(this.basePath, blockId);
-	}
-
-	private getMetadataPath(blockId: BlockId): string {
-		return path.join(this.getBlockPath(blockId), 'meta.json');
-	}
-
-	private getRevisionPath(blockId: BlockId, rev: number): string {
-		return path.join(this.getBlockPath(blockId), 'revs', `${rev}.json`);
-	}
-
-	private getPendingActionPath(blockId: BlockId, actionId: ActionId): string {
-		return path.join(this.getBlockPath(blockId), 'pend', `${actionId}.json`);
-	}
-
-	private getActionPath(blockId: BlockId, actionId: ActionId): string {
-		return path.join(this.getBlockPath(blockId), 'actions', `${actionId}.json`);
-	}
-
-	private getMaterializedPath(blockId: BlockId, actionId: ActionId): string {
-		return path.join(this.getBlockPath(blockId), 'blocks', `${actionId}.json`);
-	}
-
-	private async readIfExists<T>(filePath: string): Promise<T | undefined> {
-		return fs.readFile(filePath, 'utf-8')
-			.then(content => JSON.parse(content) as T)
-			.catch(err => {
-				if (err.code === 'ENOENT') return undefined;
-				throw err;
-			});
-	}
-
-	private async ensureAndWriteFile(filePath: string, content: string): Promise<void> {
-		await fs.mkdir(path.dirname(filePath), { recursive: true });
-		await fs.writeFile(filePath, content);
-	}
-}