@peerbit/blocks 1.1.7 → 2.0.2

package/lib/esm/remote.js

@@ -0,0 +1,245 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { stringifyCid, cidifyString, codecCodes, checkDecodeBlock } from "./block.js";
+import { variant, field } from "@dao-xyz/borsh";
+import PQueue from "p-queue";
+import { AbortError } from "@peerbit/time";
+import { TypedEventEmitter, CustomEvent } from "@libp2p/interface";
+export class BlockMessage {
+}
+let BlockRequest = class BlockRequest extends BlockMessage {
+    cid;
+    constructor(cid) {
+        super();
+        this.cid = cid;
+    }
+};
+__decorate([
+    field({ type: "string" }),
+    __metadata("design:type", String)
+], BlockRequest.prototype, "cid", void 0);
+BlockRequest = __decorate([
+    variant(0),
+    __metadata("design:paramtypes", [String])
+], BlockRequest);
+export { BlockRequest };
+let BlockResponse = class BlockResponse extends BlockMessage {
+    cid;
+    bytes;
+    constructor(cid, bytes) {
+        super();
+        this.cid = cid;
+        this.bytes = bytes;
+    }
+};
+__decorate([
+    field({ type: "string" }),
+    __metadata("design:type", String)
+], BlockResponse.prototype, "cid", void 0);
+__decorate([
+    field({ type: Uint8Array }),
+    __metadata("design:type", Uint8Array)
+], BlockResponse.prototype, "bytes", void 0);
+BlockResponse = __decorate([
+    variant(1),
+    __metadata("design:paramtypes", [String, Uint8Array])
+], BlockResponse);
+export { BlockResponse };
+export class RemoteBlocks {
+    options;
+    localStore;
+    _responseHandler;
+    _resolvers;
+    _loadFetchQueue;
+    _readFromPeersPromises;
+    _open = false;
+    _events;
+    closeController;
+    constructor(options) {
+        this.options = options;
+        const localTimeout = options?.localTimeout || 1000;
+        this._loadFetchQueue = new PQueue({
+            concurrency: options?.messageProcessingConcurrency || 10
+        });
+        this.localStore = options?.local;
+        this._resolvers = new Map();
+        this._readFromPeersPromises = new Map();
+        /* this._responseHandler = (async (evt: CustomEvent<DataMessage>) => {
+            if (!evt) {
+                return;
+            }
+            const message = evt.detail;
+            if (!message.data) {
+                return;
+            }
+
+            try {
+                const decoded = deserialize(message.data, BlockMessage);
+                if (decoded instanceof BlockRequest && this._localStore) {
+                    this._loadFetchQueue.add(() =>
+                        this.handleFetchRequest(decoded, localTimeout)
+                    );
+                } else if (decoded instanceof BlockResponse) {
+                    // TODO make sure we are not storing too much bytes in ram (like filter large blocks)
+
+                    this._resolvers.get(decoded.cid)?.(decoded.bytes);
+                }
+            } catch (error) {
+                console.error("Got error for libp2p block transport: ", error);
+                return; // timeout o r invalid cid
+            }
+        }) */
+        this._responseHandler = async (message) => {
+            try {
+                if (message instanceof BlockRequest && this.localStore) {
+                    this._loadFetchQueue.add(() => this.handleFetchRequest(message, localTimeout));
+                }
+                else if (message instanceof BlockResponse) {
+                    // TODO make sure we are not storing too much bytes in ram (like filter large blocks)
+                    this._resolvers.get(message.cid)?.(message.bytes);
+                }
+            }
+            catch (error) {
+                console.error("Got error for libp2p block transport: ", error);
+                return; // timeout o r invalid cid
+            }
+        };
+    }
+    async put(bytes) {
+        if (!this.localStore) {
+            throw new Error("Local store not set");
+        }
+        return this.localStore.put(bytes);
+    }
+    async has(cid) {
+        return this.localStore.has(cid);
+    }
+    async get(cid, options) {
+        const cidObject = cidifyString(cid);
+        let value = this.localStore
+            ? await this.localStore.get(cid, options)
+            : undefined;
+        if (!value) {
+            // try to get it remotelly
+            value = await this._readFromPeers(cid, cidObject, options);
+            if (options?.replicate && value) {
+                this.localStore.put(value);
+            }
+        }
+        return value;
+    }
+    async rm(cid) {
+        await this.localStore?.rm(cid);
+    }
+    async *iterator() {
+        for await (const [key, value] of this.localStore.iterator()) {
+            yield [key, value];
+        }
+    }
+    async start() {
+        this._events = new TypedEventEmitter();
+        this.closeController = new AbortController();
+        await this.localStore?.start();
+        this._open = true;
+    }
+    onMessage(data) {
+        return this._responseHandler(data);
+    }
+    onReachable(publicKey) {
+        this._events.dispatchEvent(new CustomEvent("peer:reachable", { detail: publicKey }));
+    }
+    async handleFetchRequest(request, localTimeout) {
+        const cid = stringifyCid(request.cid);
+        const bytes = await this.localStore.get(cid, {
+            timeout: localTimeout
+        });
+        if (!bytes) {
+            return;
+        }
+        await this.options.publish(new BlockResponse(cid, bytes));
+    }
+    async _readFromPeers(cidString, cidObject, options = {}) {
+        const codec = codecCodes[cidObject.code];
+        let promise = this._readFromPeersPromises.get(cidString);
+        if (!promise) {
+            promise = new Promise((resolve, reject) => {
+                const timeoutCallback = setTimeout(() => {
+                    resolve(undefined);
+                }, options.timeout || 30 * 1000);
+                const abortHandler = () => {
+                    clearTimeout(timeoutCallback);
+                    this._resolvers.delete(cidString);
+                    this.closeController.signal.removeEventListener("abort", abortHandler);
+                    reject(new AbortError());
+                };
+                this.closeController.signal.addEventListener("abort", abortHandler);
+                this._resolvers.set(cidString, async (bytes) => {
+                    const value = await checkDecodeBlock(cidObject, bytes, {
+                        codec,
+                        hasher: options?.hasher
+                    });
+                    clearTimeout(timeoutCallback);
+                    this._resolvers.delete(cidString); // TODO concurrency might not work as expected here
+                    this.closeController.signal.removeEventListener("abort", abortHandler);
+                    resolve(value);
+                });
+            });
+            this._readFromPeersPromises.set(cidString, promise);
+            const publish = (to) => {
+                if (!options?.from || options.from.includes(to))
+                    this.options.publish(new BlockRequest(cidString), { to: [to] });
+            };
+            const publishOnNewPeers = (e) => {
+                return publish(e.detail.hashcode());
+            };
+            this._events.addEventListener("peer:reachable", publishOnNewPeers);
+            this.options.publish(new BlockRequest(cidString), {
+                to: options.from
+            });
+            // we want to make sure that if some new peers join, we also try to ask them
+            const result = await promise;
+            this._readFromPeersPromises.delete(cidString);
+            // stop asking new peers, because we already got an response
+            this._events.removeEventListener("peer:reachable", publishOnNewPeers);
+            return result?.bytes;
+        }
+        else {
+            const result = await promise;
+            return result?.bytes;
+        }
+    }
+    async stop() {
+        // Dont listen for more incoming messages
+        // Wait for processing request
+        this.closeController.abort();
+        this._loadFetchQueue.clear();
+        await this._loadFetchQueue.onIdle(); // wait for pending
+        await this.localStore?.stop();
+        this._readFromPeersPromises.clear();
+        this._resolvers.clear();
+        this._open = false;
+        // we dont cleanup subscription because we dont know if someone else is sbuscribing also
+    }
+    waitFor(peer) {
+        return this.options.waitFor(peer);
+    }
+    async size() {
+        return this.localStore.size();
+    }
+    get status() {
+        if (this._open) {
+            return this.localStore?.status();
+        }
+        else {
+            return "closed";
+        }
+    }
+}
+//# sourceMappingURL=remote.js.map

package/lib/esm/remote.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@peerbit/blocks",
-	"version": "1.1.7",
+	"version": "2.0.2",
 	"description": "Block store streaming",
 	"type": "module",
 	"sideEffects": false,
@@ -49,18 +49,16 @@
 		"dao.xyz"
 	],
 	"devDependencies": {
-		"@peerbit/libp2p-test-utils": "1.0.8"
+		"@peerbit/libp2p-test-utils": "2.0.0"
 	},
 	"dependencies": {
 		"@dao-xyz/borsh": "^5.1.8",
 		"@ipld/dag-cbor": "^9.0.2",
-		"@peerbit/blocks-interface": "1.1.3",
-		"@peerbit/crypto": "1.0.10",
-		"@peerbit/lazy-level": "1.2.1",
-		"@peerbit/stream": "1.0.20",
-		"abstract-level": "^1.0.3",
-		"libp2p": "0.46.9",
-		"memory-level": "^1.0.0"
+		"@peerbit/any-store": "^1.0.2",
+		"@peerbit/blocks-interface": "1.2.1",
+		"@peerbit/crypto": "2.1.0",
+		"@peerbit/stream": "2.0.2",
+		"libp2p": "^1.1.0"
 	},
-	"gitHead": "1a57e60b02b5ea1c0c743871a92404a0115ed683"
+	"gitHead": "cba5d4b1a6f3343f044c7d3194494c3572710cc8"
 }

package/src/{level.ts → any-blockstore.ts}

@@ -7,24 +7,18 @@ import {
 	stringifyCid
 } from "./block.js";
 import * as Block from "multiformats/block";
-import { AbstractLevel } from "abstract-level";
-import { MemoryLevel } from "memory-level";
 import { waitFor } from "@peerbit/time";
-import LazyLevel, { LazyLevelOptions } from "@peerbit/lazy-level";
-import { PutOptions } from "@peerbit/blocks-interface";
 import { PeerId } from "@libp2p/interface/peer-id";
 import { PublicSignKey } from "@peerbit/crypto";
+import { AnyStore, createStore } from "@peerbit/any-store";
 
-export class LevelBlockStore implements Blocks {
-	private _level: LazyLevel;
+export class AnyBlockStore implements Blocks {
+	private _store: AnyStore;
 	private _opening: Promise<any>;
-	private _closed = false;
 	private _onClose: (() => any) | undefined;
-	constructor(
-		level: AbstractLevel<any, string, Uint8Array>,
-		options?: LazyLevelOptions
-	) {
-		this._level = new LazyLevel(level, options);
+	private _closeController: AbortController;
+	constructor(store: AnyStore = createStore()) {
+		this._store = store;
 	}
 
 	async get(
@@ -38,7 +32,7 @@ export class LevelBlockStore implements Blocks {
 	): Promise<Uint8Array | undefined> {
 		const cidObject = cidifyString(cid);
 		try {
-			const bytes = await this._level.get(cid);
+			const bytes = await this._store.get(cid);
 			if (!bytes) {
 				return undefined;
 			}
@@ -64,36 +58,37 @@ export class LevelBlockStore implements Blocks {
 		const block = await createBlock(bytes, "raw");
 		const cid = stringifyCid(block.cid);
 		const bbytes = block.bytes;
-		await this._level.put(cid, bbytes);
+		await this._store.put(cid, bbytes);
 		return cid;
 	}
 
 	async rm(cid: string): Promise<void> {
-		await this._level.del(cid);
+		await this._store.del(cid);
 	}
 
 	async *iterator(): AsyncGenerator<[string, Uint8Array], void, void> {
-		for await (const [key, value] of this._level.iterator()) {
+		for await (const [key, value] of this._store.iterator()) {
 			yield [key, value];
 		}
 	}
 
 	async has(cid: string) {
-		return !!(await this._level.get(cid));
+		return !!(await this._store.get(cid));
 	}
 
 	async start(): Promise<void> {
-		this._closed = false;
-		await this._level.open();
+		await this._store.open();
+		this._closeController = new AbortController();
 
 		try {
-			this._opening = waitFor(() => this._level.status() === "open", {
-				delayInterval: 100,
-				timeout: 10 * 1000,
-				stopperCallback: (fn) => {
-					this._onClose = fn;
+			this._opening = waitFor(
+				async () => (await this._store.status()) === "open",
+				{
+					delayInterval: 100,
+					timeout: 10 * 1000,
+					signal: this._closeController.signal
 				}
-			});
+			);
 			await this._opening;
 		} finally {
 			this._onClose = undefined;
@@ -101,26 +96,19 @@ export class LevelBlockStore implements Blocks {
 	}
 
 	async stop(): Promise<void> {
-		await this.idle();
-		this._closed = true;
 		this._onClose && this._onClose();
-		return this._level.close();
-	}
-
-	async idle(): Promise<void> {
-		await this._level.idle();
+		this._closeController.abort();
+		return this._store.close();
 	}
 
 	status() {
-		return this._level.status();
+		return this._store.status();
 	}
 	async waitFor(peer: PeerId | PublicSignKey): Promise<void> {
 		return; // Offline storage // TODO this feels off resolving
 	}
-}
 
-export class MemoryLevelBlockStore extends LevelBlockStore {
-	constructor(options?: LazyLevelOptions) {
-		super(new MemoryLevel({ valueEncoding: "view" }), options);
+	async size() {
+		return this._store.size();
 	}
 }

package/src/block.ts

@@ -4,7 +4,7 @@ import * as dagCbor from "@ipld/dag-cbor";
 import { sha256 } from "multiformats/hashes/sha2";
 import { base58btc } from "multiformats/bases/base58";
 import * as Block from "multiformats/block";
-import type { MultihashHasher } from "multiformats/hashes/hasher";
+import type { MultihashHasher } from "multiformats/hashes/interface";
 
 const unsupportedCodecError = () => new Error("unsupported codec");
 

package/src/index.ts

@@ -5,6 +5,7 @@ export {
 	getBlockValue
 } from "./block.js";
 export { DirectBlock } from "./libp2p.js";
-export * from "./store.js";
-export * from "./level.js";
+export * from "./interface.js";
+export * from "./any-blockstore.js";
 export * from "./libp2p.js";
+export * from "./remote.js";

package/src/{store.ts → interface.ts}

@@ -1,6 +1,9 @@
+import { MaybePromise } from "@peerbit/any-store";
 import { Blocks as IBlockStore } from "@peerbit/blocks-interface";
 
-export type StoreStatus = "open" | "opening" | "closed" | "closing";
+export type StoreStatus = MaybePromise<
+	"open" | "opening" | "closed" | "closing"
+>;
 export interface BlockStore extends IBlockStore {
 	start(): Promise<void>;
 	stop(): Promise<void>;