@typeberry/lib 0.9.0-c9f9e4d → 0.10.0-3e244fa

package/packages/workers/api/port.js

@@ -6,27 +6,31 @@ import { EventEmitter } from "eventemitter3";
  * so there is no need for any serialization - we simply pass the data.
  */
 export class DirectPort {
-    events;
+    inbound;
+    outbound;
     threadId = 0;
     /** Create a pair of symmetrical inter-connected ports. */
     static pair() {
-        const events = new EventEmitter();
-        return [new DirectPort(events), new DirectPort(events)];
+        const left = createPortState();
+        const right = createPortState();
+        return [new DirectPort(left, right), new DirectPort(right, left)];
     }
-    constructor(events) {
-        this.events = events;
+    constructor(inbound, outbound) {
+        this.inbound = inbound;
+        this.outbound = outbound;
     }
     onClose(callback) {
-        this.events.on("error", callback);
+        this.inbound.events.on("error", callback);
     }
     on(event, _codec, callback) {
         const trigger = (args) => {
             // we simply cast the args, since there is no encoding involved.
             callback(args);
         };
-        this.events.on(event, trigger);
+        this.inbound.events.on(event, trigger);
+        this.flushPending(event, trigger);
         return () => {
-            this.events.off(event, trigger);
+            this.inbound.events.off(event, trigger);
         };
     }
     once(event, _codec, callback) {
@@ -34,16 +38,55 @@ export class DirectPort {
             // we simply cast the args, since there is no encoding involved.
             callback(args);
         };
-        this.events.once(event, trigger);
+        const pending = this.inbound.pendingMessages.get(event);
+        const pendingMessage = pending?.shift();
+        if (pending?.length === 0) {
+            this.inbound.pendingMessages.delete(event);
+        }
+        if (pendingMessage !== undefined) {
+            trigger(pendingMessage);
+            return () => { };
+        }
+        this.inbound.events.once(event, trigger);
         return () => {
-            this.events.off(event, trigger);
+            this.inbound.events.off(event, trigger);
         };
     }
     postMessage(event, _codec, msg) {
-        this.events.emit(event, msg);
+        if (this.outbound.events.listenerCount(event) === 0) {
+            this.queuePending(event, msg);
+            return;
+        }
+        this.outbound.events.emit(event, msg);
     }
     close() {
-        this.events.emit("error", new Error("closing channel"));
-        this.events.removeAllListeners();
+        this.closeState(this.inbound);
+        this.closeState(this.outbound);
     }
+    queuePending(event, msg) {
+        const pending = this.outbound.pendingMessages.get(event) ?? [];
+        pending.push(msg);
+        this.outbound.pendingMessages.set(event, pending);
+    }
+    flushPending(event, trigger) {
+        const pending = this.inbound.pendingMessages.get(event);
+        if (pending === undefined) {
+            return;
+        }
+        this.inbound.pendingMessages.delete(event);
+        for (const msg of pending) {
+            trigger(msg);
+        }
+    }
+    closeState(state) {
+        state.events.emit("error", new Error("closing channel"));
+        state.events.removeAllListeners();
+        state.pendingMessages.clear();
+    }
+}
+function createPortState() {
+    return {
+        events: new EventEmitter(),
+        pendingMessages: new Map(),
+    };
 }

package/packages/workers/api/port.test.js

@@ -25,4 +25,39 @@ describe("DirectPort", () => {
             data: tryAsU32(10),
         });
     });
+    it("should deliver messages sent before the listener is attached", () => {
+        const [txPort, rxPort] = DirectPort.pair();
+        txPort.postMessage("hello", codec.u32, {
+            responseId: "10",
+            data: tryAsU32(10),
+        });
+        let receivedMessage = null;
+        rxPort.on("hello", codec.u32, (msg) => {
+            receivedMessage = msg;
+        });
+        assert.deepStrictEqual(receivedMessage, {
+            responseId: "10",
+            data: tryAsU32(10),
+        });
+    });
+    it("should not let the sender consume its own pending message", () => {
+        const [txPort, rxPort] = DirectPort.pair();
+        txPort.postMessage("hello", codec.u32, {
+            responseId: "10",
+            data: tryAsU32(10),
+        });
+        let senderMessage = null;
+        txPort.on("hello", codec.u32, (msg) => {
+            senderMessage = msg;
+        });
+        assert.deepStrictEqual(senderMessage, null);
+        let receiverMessage = null;
+        rxPort.on("hello", codec.u32, (msg) => {
+            receiverMessage = msg;
+        });
+        assert.deepStrictEqual(receiverMessage, {
+            responseId: "10",
+            data: tryAsU32(10),
+        });
+    });
 });

package/packages/workers/api-node/config.d.ts

@@ -2,10 +2,20 @@ import type { MessagePort } from "node:worker_threads";
 import { type Decode, type Encode } from "#@typeberry/codec";
 import { ChainSpec } from "#@typeberry/config";
 import { type BlocksDb, type RootDb, type SerializedStatesDb } from "#@typeberry/database";
+import { FjallValuesSession } from "#@typeberry/database-fjall";
 import { Blake2b } from "#@typeberry/hash";
 import type { WorkerConfig } from "#@typeberry/workers-api";
 import { ThreadPort, type TransferablePort } from "./port.js";
-/** A worker config that's usable in node.js and uses LMDB database backend. */
+export { FjallValuesSession };
+/** Persistent regular-node backend. */
+export type PersistentBackend = "lmdb" | "fjall";
+/** Transferable worker config for persistent regular-node workers. */
+export type PersistentWorkerConfig<T> = LmdbWorkerConfig<T> | FjallWorkerConfig<T>;
+/**
+ * Worker config for node.js, backed by the LMDB database.
+ *
+ * @deprecated lmdb is retained as an explicit fallback. Use `FjallWorkerConfig` for regular nodes.
+ */
 export declare class LmdbWorkerConfig<T = void> implements WorkerConfig<T, BlocksDb, SerializedStatesDb> {
     readonly nodeName: string;
     readonly chainSpec: ChainSpec;
@@ -28,18 +38,51 @@ export declare class LmdbWorkerConfig<T = void> implements WorkerConfig<T, Block
     private constructor();
     openDatabase(options?: {
         readonly: boolean;
-    }): RootDb<BlocksDb, SerializedStatesDb>;
+    }): Promise<RootDb<BlocksDb, SerializedStatesDb>>;
+    /** Convert this config into a thread-transferable object. */
+    intoTransferable(paramsCodec: Encode<T>): TransferableConfig;
+}
+/** Worker config for node.js, backed by a shared fjall engine. */
+export declare class FjallWorkerConfig<T = void> implements WorkerConfig<T, BlocksDb, SerializedStatesDb> {
+    readonly nodeName: string;
+    readonly chainSpec: ChainSpec;
+    readonly workerParams: T;
+    readonly dbPath: string;
+    readonly blake2b: Blake2b;
+    readonly ports: Map<string, ThreadPort>;
+    readonly ephemeral: boolean;
+    readonly cacheSizeBytes: number | undefined;
+    static new<T>({ nodeName, chainSpec, workerParams, dbPath, blake2b, ports, ephemeral, cacheSizeBytes, }: {
+        nodeName: string;
+        chainSpec: ChainSpec;
+        workerParams: T;
+        dbPath: string;
+        blake2b: Blake2b;
+        ports?: Map<string, ThreadPort>;
+        ephemeral?: boolean;
+        cacheSizeBytes?: number;
+    }): FjallWorkerConfig<T>;
+    /** Restore node config from a transferable config object. */
+    static fromTransferable<T>(decodeParams: Decode<T>, config: TransferableConfig): Promise<FjallWorkerConfig<T>>;
+    private constructor();
+    openDatabase(options?: {
+        readonly: boolean;
+    }): Promise<RootDb<BlocksDb, SerializedStatesDb>>;
     /** Convert this config into a thread-transferable object. */
     intoTransferable(paramsCodec: Encode<T>): TransferableConfig;
 }
 /** Config that's safe to transfer between worker threads. */
 export type TransferableConfig = {
+    databaseBackend: PersistentBackend;
     nodeName: string;
     chainSpec: ChainSpec;
     workerParams: Uint8Array;
     dbPath: string;
     workerPorts: [string, TransferablePort][];
+    cacheSizeBytes?: number;
 };
+/** Restore a persistent worker config from its transferable form. */
+export declare function persistentConfigFromTransferable<T>(decodeParams: Decode<T>, config: TransferableConfig): Promise<PersistentWorkerConfig<T>>;
 /**
  * Collect the transferable objects (communication ports) embedded in a config.
  *
@@ -69,17 +112,16 @@ export declare class InMemWorkerConfig<T = undefined> implements WorkerConfig<T,
     private constructor();
     openDatabase(_options?: {
         readonly: boolean;
-    }): RootDb<BlocksDb, SerializedStatesDb>;
+    }): Promise<RootDb<BlocksDb, SerializedStatesDb>>;
 }
 /** Persistent values store backing the hybrid config. */
 export type HybridBackend = "lmdb" | "fjall";
 /**
  * Hybrid worker config for the fuzz target: in-memory blocks and leaf sets,
- * but large values persisted to disk (LMDB or fjall, selected by `backend`).
+ * but large values persisted to disk. The `backend` picks where the values go
+ * (lmdb or fjall).
  *
- * The fjall backend is opt-in so its performance can be compared against LMDB
- * before committing to it. fjall opens its keyspace asynchronously, hence the
- * async `new`.
+ * fjall opens its keyspace asynchronously, that is why `new` here is async.
  *
  * Like `InMemWorkerConfig`, the blocks and leaf sets are shared across the
  * open/close/reopen dance that genesis init performs, so `openDatabase`
@@ -99,7 +141,7 @@ export declare class HybridWorkerConfig<T = undefined> implements WorkerConfig<T
     readonly ephemeral: boolean;
     readonly compression: boolean;
     private readonly states;
-    static new<T>({ nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral, compression, backend, }: {
+    static new<T>({ nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral, compression, backend, sharedFjallSession, }: {
         nodeName: string;
         chainSpec: ChainSpec;
         workerParams: T;
@@ -108,11 +150,18 @@ export declare class HybridWorkerConfig<T = undefined> implements WorkerConfig<T
         ephemeral?: boolean;
         compression?: boolean;
         backend?: HybridBackend;
+        /**
+         * Reuse an already-open fjall values session instead of opening a fresh
+         * keyspace. The fuzz target opens one per run and passes it on every reset,
+         * so only the in-memory blocks/leaf sets are rebuilt per vector. Ignored
+         * unless `backend === "fjall"`.
+         */
+        sharedFjallSession?: FjallValuesSession;
     }): Promise<HybridWorkerConfig<T>>;
     private readonly blocks;
     private constructor();
     openDatabase(_options?: {
         readonly: boolean;
-    }): RootDb<BlocksDb, SerializedStatesDb>;
+    }): Promise<RootDb<BlocksDb, SerializedStatesDb>>;
 }
 //# sourceMappingURL=config.d.ts.map

package/packages/workers/api-node/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/api-node/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/api-node/config.ts"],"names":[],"mappings":"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"}

package/packages/workers/api-node/config.js

@@ -1,11 +1,18 @@
 import { Decoder, Encoder } from "#@typeberry/codec";
 import { ChainSpec } from "#@typeberry/config";
 import { InMemoryBlocks, InMemorySerializedStates, } from "#@typeberry/database";
-import { HybridSerializedStates as FjallHybridSerializedStates } from "#@typeberry/database-fjall";
+import { FjallBlocks, HybridSerializedStates as FjallHybridSerializedStates, FjallRoot, FjallStates, FjallValuesSession, } from "#@typeberry/database-fjall";
 import { LmdbBlocks, HybridSerializedStates as LmdbHybridSerializedStates, LmdbRoot, LmdbStates, } from "#@typeberry/database-lmdb";
 import { Blake2b } from "#@typeberry/hash";
 import { ThreadPort } from "./port.js";
-/** A worker config that's usable in node.js and uses LMDB database backend. */
+// Re-exported so the fuzz target can open one values session per run and reuse
+// it across resets (see `HybridWorkerConfig` / `mainFuzz`).
+export { FjallValuesSession };
+/**
+ * Worker config for node.js, backed by the LMDB database.
+ *
+ * @deprecated lmdb is retained as an explicit fallback. Use `FjallWorkerConfig` for regular nodes.
+ */
 export class LmdbWorkerConfig {
     nodeName;
     chainSpec;
@@ -19,10 +26,10 @@ export class LmdbWorkerConfig {
     }
     /** Restore node config from a transferable config object. */
     static async fromTransferable(decodeParams, config) {
-        const blake2b = await Blake2b.createHasher();
-        const chainSpec = ChainSpec.new(config.chainSpec);
-        const workerParams = Decoder.decodeObject(decodeParams, config.workerParams, chainSpec);
-        const ports = new Map(config.workerPorts.map(([name, port]) => [name, ThreadPort.fromTransferable(chainSpec, port)]));
+        if (config.databaseBackend !== "lmdb") {
+            throw new Error(`Expected lmdb worker config, got ${config.databaseBackend}.`);
+        }
+        const { blake2b, chainSpec, workerParams, ports } = await decodeTransferableConfig(decodeParams, config);
         return LmdbWorkerConfig.new({
             nodeName: config.nodeName,
             chainSpec,
@@ -33,7 +40,7 @@ export class LmdbWorkerConfig {
         });
     }
     constructor(nodeName, chainSpec, workerParams, dbPath, blake2b, ports, 
-    // When set, the underlying LMDB skips fsync. Only safe for throwaway
+    // When set, the underlying database skips fsync. Only safe for throwaway
     // databases (the fuzz target wipes on reset). Not transferred to worker
     // threads, so the durable main node path always gets the default.
     ephemeral = false) {
@@ -45,7 +52,7 @@ export class LmdbWorkerConfig {
         this.ports = ports;
         this.ephemeral = ephemeral;
     }
-    openDatabase(options = { readonly: true }) {
+    async openDatabase(options = { readonly: true }) {
         const lmdb = LmdbRoot.new(this.dbPath, {
             readOnly: options.readonly,
             ephemeral: this.ephemeral,
@@ -59,14 +66,128 @@ export class LmdbWorkerConfig {
     /** Convert this config into a thread-transferable object. */
     intoTransferable(paramsCodec) {
         return {
+            databaseBackend: "lmdb",
+            nodeName: this.nodeName,
+            chainSpec: this.chainSpec,
+            workerParams: Encoder.encodeObject(paramsCodec, this.workerParams, this.chainSpec).raw,
+            dbPath: this.dbPath,
+            workerPorts: Array.from(this.ports.entries()).map(([name, port]) => [name, port.intoTransferable()]),
+        };
+    }
+}
+/** Worker config for node.js, backed by a shared fjall engine. */
+export class FjallWorkerConfig {
+    nodeName;
+    chainSpec;
+    workerParams;
+    dbPath;
+    blake2b;
+    ports;
+    ephemeral;
+    cacheSizeBytes;
+    static new({ nodeName, chainSpec, workerParams, dbPath, blake2b, ports = new Map(), ephemeral = false, cacheSizeBytes, }) {
+        return new FjallWorkerConfig(nodeName, chainSpec, workerParams, dbPath, blake2b, ports, ephemeral, cacheSizeBytes);
+    }
+    /** Restore node config from a transferable config object. */
+    static async fromTransferable(decodeParams, config) {
+        if (config.databaseBackend !== "fjall") {
+            throw new Error(`Expected fjall worker config, got ${config.databaseBackend}.`);
+        }
+        const { blake2b, chainSpec, workerParams, ports } = await decodeTransferableConfig(decodeParams, config);
+        return FjallWorkerConfig.new({
+            nodeName: config.nodeName,
+            chainSpec,
+            workerParams,
+            dbPath: config.dbPath,
+            blake2b,
+            ports,
+            cacheSizeBytes: config.cacheSizeBytes,
+        });
+    }
+    constructor(nodeName, chainSpec, workerParams, dbPath, blake2b, ports, 
+    // Kept for the fuzz/importer path. When set, persist() is skipped.
+    ephemeral = false, cacheSizeBytes = undefined) {
+        this.nodeName = nodeName;
+        this.chainSpec = chainSpec;
+        this.workerParams = workerParams;
+        this.dbPath = dbPath;
+        this.blake2b = blake2b;
+        this.ports = ports;
+        this.ephemeral = ephemeral;
+        this.cacheSizeBytes = cacheSizeBytes;
+    }
+    async openDatabase(options = { readonly: true }) {
+        const fjall = await FjallRoot.open(this.dbPath, {
+            readOnly: options.readonly,
+            ephemeral: this.ephemeral,
+            cacheSizeBytes: this.cacheSizeBytes,
+        });
+        let blocks = null;
+        let states = null;
+        try {
+            [blocks, states] = await Promise.all([
+                FjallBlocks.open(this.chainSpec, fjall),
+                FjallStates.open(this.chainSpec, this.blake2b, fjall),
+            ]);
+        }
+        catch (e) {
+            await fjall.close();
+            throw e;
+        }
+        return {
+            getBlocksDb: () => {
+                if (blocks === null) {
+                    throw new Error("Fjall database is closed.");
+                }
+                return blocks;
+            },
+            getStatesDb: () => {
+                if (states === null) {
+                    throw new Error("Fjall database is closed.");
+                }
+                return states;
+            },
+            close: async () => {
+                blocks = null;
+                states = null;
+                await fjall.close();
+            },
+        };
+    }
+    /** Convert this config into a thread-transferable object. */
+    intoTransferable(paramsCodec) {
+        return {
+            databaseBackend: "fjall",
             nodeName: this.nodeName,
             chainSpec: this.chainSpec,
             workerParams: Encoder.encodeObject(paramsCodec, this.workerParams, this.chainSpec).raw,
             dbPath: this.dbPath,
             workerPorts: Array.from(this.ports.entries()).map(([name, port]) => [name, port.intoTransferable()]),
+            cacheSizeBytes: this.cacheSizeBytes,
         };
     }
 }
+async function decodeTransferableConfig(decodeParams, config) {
+    const blake2b = await Blake2b.createHasher();
+    const chainSpec = ChainSpec.new(config.chainSpec);
+    const workerParams = Decoder.decodeObject(decodeParams, config.workerParams, chainSpec);
+    const ports = new Map(config.workerPorts.map(([name, port]) => [name, ThreadPort.fromTransferable(chainSpec, port)]));
+    return {
+        blake2b,
+        chainSpec,
+        workerParams,
+        ports,
+    };
+}
+/** Restore a persistent worker config from its transferable form. */
+export async function persistentConfigFromTransferable(decodeParams, config) {
+    switch (config.databaseBackend) {
+        case "lmdb":
+            return LmdbWorkerConfig.fromTransferable(decodeParams, config);
+        case "fjall":
+            return FjallWorkerConfig.fromTransferable(decodeParams, config);
+    }
+}
 /**
  * Collect the transferable objects (communication ports) embedded in a config.
  *
@@ -100,7 +221,7 @@ export class InMemWorkerConfig {
         this.blocks = InMemoryBlocks.new();
         this.states = InMemorySerializedStates.withHasher({ chainSpec, blake2b });
     }
-    openDatabase(_options = { readonly: true }) {
+    async openDatabase(_options = { readonly: true }) {
         // opening/closing db doesn't do anything, we persist the state.
         return {
             getBlocksDb: () => this.blocks,
@@ -111,11 +232,10 @@ export class InMemWorkerConfig {
 }
 /**
  * Hybrid worker config for the fuzz target: in-memory blocks and leaf sets,
- * but large values persisted to disk (LMDB or fjall, selected by `backend`).
+ * but large values persisted to disk. The `backend` picks where the values go
+ * (lmdb or fjall).
  *
- * The fjall backend is opt-in so its performance can be compared against LMDB
- * before committing to it. fjall opens its keyspace asynchronously, hence the
- * async `new`.
+ * fjall opens its keyspace asynchronously, that is why `new` here is async.
  *
  * Like `InMemWorkerConfig`, the blocks and leaf sets are shared across the
  * open/close/reopen dance that genesis init performs, so `openDatabase`
@@ -135,11 +255,13 @@ export class HybridWorkerConfig {
     ephemeral;
     compression;
     states;
-    static async new({ nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral = false, compression = true, backend = "lmdb", }) {
-        // fjall opens its keyspace asynchronously; LMDB is synchronous. Either way
-        // the values store is created once here and shared across reopen.
+    static async new({ nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral = false, compression = true, backend = "lmdb", sharedFjallSession, }) {
+        // The values store is created once here and shared across reopen. When a
+        // session is given (fuzz reset reuse) we wrap it instead of opening a new one.
         const states = backend === "fjall"
-            ? await FjallHybridSerializedStates.new({ spec: chainSpec, blake2b, dbPath, ephemeral })
+            ? sharedFjallSession !== undefined
+                ? FjallHybridSerializedStates.fromSession(chainSpec, blake2b, sharedFjallSession)
+                : await FjallHybridSerializedStates.new({ spec: chainSpec, blake2b, dbPath, ephemeral })
             : LmdbHybridSerializedStates.new({ spec: chainSpec, blake2b, dbPath, ephemeral, compression, readOnly: false });
         return new HybridWorkerConfig(nodeName, chainSpec, workerParams, blake2b, dbPath, ephemeral, compression, states);
     }
@@ -155,7 +277,7 @@ export class HybridWorkerConfig {
         this.states = states;
         this.blocks = InMemoryBlocks.new();
     }
-    openDatabase(_options = { readonly: true }) {
+    async openDatabase(_options = { readonly: true }) {
         return {
             getBlocksDb: () => this.blocks,
             getStatesDb: () => this.states,

package/packages/workers/api-node/config.test.js

@@ -2,11 +2,12 @@ import assert from "node:assert";
 import * as fs from "node:fs";
 import { describe, it } from "node:test";
 import { MessageChannel } from "node:worker_threads";
+import { Bytes } from "#@typeberry/bytes";
 import { codec } from "#@typeberry/codec";
 import { tinyChainSpec } from "#@typeberry/config";
-import { Blake2b } from "#@typeberry/hash";
+import { Blake2b, HASH_SIZE } from "#@typeberry/hash";
 import { tryAsU32 } from "#@typeberry/numbers";
-import { configTransferList, HybridWorkerConfig, LmdbWorkerConfig } from "./config.js";
+import { configTransferList, FjallWorkerConfig, HybridWorkerConfig, LmdbWorkerConfig } from "./config.js";
 import { ThreadPort } from "./port.js";
 const spec = tinyChainSpec;
 describe("LmdbWorkerConfig transfer list", () => {
@@ -40,6 +41,54 @@ describe("LmdbWorkerConfig transfer list", () => {
         }
     });
 });
+describe("FjallWorkerConfig transfer list", () => {
+    it("surfaces embedded worker ports and marks the backend", async () => {
+        const blake2b = await Blake2b.createHasher();
+        const [portA, portB] = ThreadPort.pair(spec);
+        const config = FjallWorkerConfig.new({
+            nodeName: "node",
+            chainSpec: spec,
+            workerParams: tryAsU32(7),
+            dbPath: "db",
+            blake2b,
+            ports: new Map([["authorship-network", portA]]),
+        });
+        try {
+            const transferable = config.intoTransferable(codec.varU32);
+            assert.strictEqual(transferable.databaseBackend, "fjall");
+            assert.strictEqual(configTransferList(transferable).length, 1);
+        }
+        finally {
+            portA.close();
+            portB.close();
+        }
+    });
+    it("opens writable and read-only handles over one shared fjall path", async () => {
+        const blake2b = await Blake2b.createHasher();
+        const dbPath = fs.mkdtempSync("typeberry-fjall-worker-");
+        const config = FjallWorkerConfig.new({
+            nodeName: "node",
+            chainSpec: spec,
+            workerParams: undefined,
+            dbPath,
+            blake2b,
+        });
+        let writer = null;
+        let reader = null;
+        try {
+            writer = await config.openDatabase({ readonly: false });
+            reader = await config.openDatabase({ readonly: true });
+            const best = Bytes.fill(HASH_SIZE, 9).asOpaque();
+            await writer.getBlocksDb().setBestHeaderHash(best);
+            assert.strictEqual(reader.getBlocksDb().getBestHeaderHash().toString(), best.toString());
+        }
+        finally {
+            await reader?.close();
+            await writer?.close();
+            fs.rmSync(dbPath, { recursive: true, force: true });
+        }
+    });
+});
 describe("HybridWorkerConfig", () => {
     // Both persistent backends must construct asynchronously and hand out a
     // working db. fjall is the experimental backend we want to benchmark.
@@ -57,7 +106,7 @@ describe("HybridWorkerConfig", () => {
                     ephemeral: true,
                     backend,
                 });
-                const db = config.openDatabase({ readonly: false });
+                const db = await config.openDatabase({ readonly: false });
                 const states = db.getStatesDb();
                 try {
                     assert.notStrictEqual(db.getBlocksDb(), undefined);

package/packages/workers/api-node/port.d.ts

@@ -18,6 +18,7 @@ export declare class ThreadPort implements Port {
     static pair(spec: ChainSpec): [ThreadPort, ThreadPort];
     readonly threadId: number;
     private readonly events;
+    private readonly pendingMessages;
     static new(spec: ChainSpec, port: MessagePort): ThreadPort;
     private constructor();
     static fromTransferable(spec: ChainSpec, { port }: TransferablePort): ThreadPort;
@@ -28,5 +29,7 @@ export declare class ThreadPort implements Port {
     on<T>(event: string, codec: Codec<T>, callback: (msg: Envelope<T>) => void): () => void;
     once<T>(event: string, codec: Codec<T>, callback: (msg: Envelope<T>) => void): () => void;
     postMessage<T>(event: string, codec: Codec<T>, msg: Envelope<T>): void;
+    private queuePending;
+    private flushPending;
 }
 //# sourceMappingURL=port.d.ts.map

package/packages/workers/api-node/port.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"port.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/api-node/port.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,WAAW,EAA+B,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,KAAK,KAAK,EAAoB,MAAM,kBAAkB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAGnD,OAAO,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,gCAAgC,CAAC;AAErE,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,UAAU,CAAC;CAClB,CAAC;AAIF,qDAAqD;AACrD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AACF,qBAAa,UAAW,YAAW,IAAI;IAenC,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAfvB,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC;IAMtD,SAAgB,QAAQ,SAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;IAE7C,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW;IAI7C,OAAO;IAgBP,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,EAAE,gBAAgB;IAInE,gBAAgB,IAAI,gBAAgB;IAIpC,KAAK,IAAI,IAAI;IAIb,OAAO,CAAC,cAAc;IAkBtB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI3C,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI;IASvF,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI;IASzF,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI;CAWvE"}
+{"version":3,"file":"port.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/api-node/port.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,WAAW,EAA+B,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,KAAK,KAAK,EAAoB,MAAM,kBAAkB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,gCAAgC,CAAC;AAErE,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,UAAU,CAAC;CAClB,CAAC;AAIF,qDAAqD;AACrD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AACF,qBAAa,UAAW,YAAW,IAAI;IAgBnC,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAhBvB,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC;IAMtD,SAAgB,QAAQ,SAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAgC;IAEhE,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW;IAI7C,OAAO;IAmBP,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,EAAE,gBAAgB;IAInE,gBAAgB,IAAI,gBAAgB;IAIpC,KAAK,IAAI,IAAI;IAKb,OAAO,CAAC,cAAc;IAkBtB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI3C,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI;IAUvF,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI;IAoBzF,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI;IAYtE,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,YAAY;CAUrB"}