peerbit 2.0.15 → 3.0.1

package/lib/esm/libp2p.d.ts

@@ -1,10 +1,12 @@
 import { Libp2p, Libp2pOptions, ServiceFactoryMap } from "libp2p";
 import { DirectSub } from "@peerbit/pubsub";
 import { DirectBlock } from "@peerbit/blocks";
-import { CircuitRelayService } from "libp2p/dist/src/circuit-relay/index.js";
+import { CircuitRelayService } from "@libp2p/circuit-relay-v2";
+import { Keychain } from "@peerbit/keychain";
 export type Libp2pExtendServices = {
     pubsub: DirectSub;
     blocks: DirectBlock;
+    keychain: Keychain;
 };
 export type Libp2pExtended = Libp2p<{
     relay: CircuitRelayService;

package/lib/esm/libp2p.js

@@ -4,17 +4,19 @@ import { DirectBlock } from "@peerbit/blocks";
 import { noise } from "@dao-xyz/libp2p-noise";
 import { mplex } from "@libp2p/mplex";
 import { transports, relay, listen } from "./transports.js";
-import { identifyService } from "libp2p/identify";
+import { identify } from "@libp2p/identify";
 import { yamux } from "@chainsafe/libp2p-yamux";
+import { DefaultKeychain } from "@peerbit/keychain";
 export const createLibp2pExtended = (opts = {
     services: {
         blocks: (c) => new DirectBlock(c),
-        pubsub: (c) => new DirectSub(c)
+        pubsub: (c) => new DirectSub(c),
+        keychain: (c) => new DefaultKeychain()
     }
 }) => {
     const relayIdentify = {
         relay: relay(),
-        identify: identifyService()
+        identify: identify()
     };
     // https://github.com/libp2p/js-libp2p/issues/1757
     Object.keys(relayIdentify).forEach((key) => {
@@ -40,12 +42,12 @@ export const createLibp2pExtended = (opts = {
             pubsub: opts.services?.pubsub ||
                 ((c) => new DirectSub(c, {
                     canRelayMessage: true,
-                    signaturePolicy: "StrictNoSign",
-                    connectionManager: {
-                        autoDial: true
-                    }
+                    signaturePolicy: "StrictNoSign"
+                    // auto dial true
+                    // auto prune true
                 })),
             blocks: opts.services?.blocks || ((c) => new DirectBlock(c)),
+            keychain: opts.services?.keychain || ((c) => new DefaultKeychain()),
             ...opts.services
         }
     });

package/lib/esm/libp2p.js.map

@@ -1 +1 @@
-{"version":3,"file":"libp2p.js","sourceRoot":"","sources":["../../src/libp2p.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA4C,MAAM,QAAQ,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAkBhD,MAAM,CAAC,MAAM,oBAAoB,GAAG,CACnC,OAA4B;IAC3B,QAAQ,EAAE;QACT,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC;QACjC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC;KAC/B;CACD,EACyB,EAAE;IAC5B,MAAM,aAAa,GAAG;QACrB,KAAK,EAAE,KAAK,EAAE;QACd,QAAQ,EAAE,eAAe,EAAE;KAC3B,CAAC;IAEF,kDAAkD;IAClD,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC1C,IAAI,aAAa,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE;YACrC,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC;SAC1B;IACF,CAAC,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;QACnB,GAAG,IAAI;QACP,iBAAiB,EAAE;YAClB,cAAc,EAAE,CAAC;YACjB,GAAG,IAAI,CAAC,iBAAiB;SACzB;QACD,SAAS,EAAE;YACV,MAAM,EAAE,MAAM,EAAE;YAChB,GAAG,IAAI,CAAC,SAAS;SACjB;QACD,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,UAAU,EAAE;QAC3C,oBAAoB,EAAE,IAAI,CAAC,oBAAoB,IAAI,CAAC,KAAK,EAAE,CAAC;QAC5D,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC;QACrD,QAAQ,EAAE;YACT,GAAG,aAAa;YAChB,MAAM,EACL,IAAI,CAAC,QAAQ,EAAE,MAAM;gBACrB,CAAC,CAAC,CAAC,EAAE,EAAE,CACN,IAAI,SAAS,CAAC,CAAC,EAAE;oBAChB,eAAe,EAAE,IAAI;oBACrB,eAAe,EAAE,cAAc;oBAC/B,iBAAiB,EAAE;wBAClB,QAAQ,EAAE,IAAI;qBACd;iBACD,CAAC,CAAC;YACL,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;YAC5D,GAAG,IAAI,CAAC,QAAQ;SAChB;KACD,CAAC,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"libp2p.js","sourceRoot":"","sources":["../../src/libp2p.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA4C,MAAM,QAAQ,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAY,MAAM,mBAAmB,CAAC;AAmB9D,MAAM,CAAC,MAAM,oBAAoB,GAAG,CACnC,OAA4B;IAC3B,QAAQ,EAAE;QACT,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC;QACjC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC;QAC/B,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,eAAe,EAAE;KACtC;CACD,EACyB,EAAE;IAC5B,MAAM,aAAa,GAAG;QACrB,KAAK,EAAE,KAAK,EAAE;QACd,QAAQ,EAAE,QAAQ,EAAE;KACpB,CAAC;IAEF,kDAAkD;IAClD,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC1C,IAAI,aAAa,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;YACtC,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;QACnB,GAAG,IAAI;QACP,iBAAiB,EAAE;YAClB,cAAc,EAAE,CAAC;YACjB,GAAG,IAAI,CAAC,iBAAiB;SACzB;QACD,SAAS,EAAE;YACV,MAAM,EAAE,MAAM,EAAE;YAChB,GAAG,IAAI,CAAC,SAAS;SACjB;QACD,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,UAAU,EAAE;QAC3C,oBAAoB,EAAE,IAAI,CAAC,oBAAoB,IAAI,CAAC,KAAK,EAAE,CAAC;QAC5D,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC;QACrD,QAAQ,EAAE;YACT,GAAG,aAAa;YAChB,MAAM,EACL,IAAI,CAAC,QAAQ,EAAE,MAAM;gBACrB,CAAC,CAAC,CAAC,EAAE,EAAE,CACN,IAAI,SAAS,CAAC,CAAC,EAAE;oBAChB,eAAe,EAAE,IAAI;oBACrB,eAAe,EAAE,cAAc;oBAC/B,iBAAiB;oBACjB,kBAAkB;iBAClB,CAAC,CAAC;YACL,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;YAC5D,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,eAAe,EAAE,CAAC;YACnE,GAAG,IAAI,CAAC,QAAQ;SAChB;KACD,CAAC,CAAC;AACJ,CAAC,CAAC"}

package/lib/esm/peer.d.ts

@@ -1,20 +1,20 @@
-import LazyLevel from "@peerbit/lazy-level";
+import { AnyStore } from "../../../utils/any-store/lib/esm/index.js";
 import { Multiaddr } from "@multiformats/multiaddr";
-import { Ed25519Keypair, Libp2pKeychain } from "@peerbit/crypto";
+import { Ed25519Keypair } from "@peerbit/crypto";
 import { Program, Address, ProgramClient, ProgramHandler } from "@peerbit/program";
 import "@libp2p/peer-id";
 import { Libp2pExtended, Libp2pCreateOptions as ClientCreateOptions } from "./libp2p.js";
 import { OpenOptions } from "@peerbit/program";
-export declare const logger: import("pino").Logger<import("pino").LoggerOptions | import("pino").DestinationStream>;
+export declare const logger: import("pino").Logger<never>;
 export type OptionalCreateOptions = {
     libp2pExternal?: boolean;
 };
 export type CreateOptions = {
     directory?: string;
-    cache: LazyLevel;
+    memory: AnyStore;
     identity: Ed25519Keypair;
-    keychain: Libp2pKeychain;
 } & OptionalCreateOptions;
+type ExtractArgs<T> = T extends Program<infer Args> ? Args : never;
 type Libp2pOptions = {
     libp2p?: Libp2pExtended | ClientCreateOptions;
 };
@@ -23,26 +23,23 @@ type SimpleLibp2pOptions = {
 };
 export type CreateInstanceOptions = (SimpleLibp2pOptions | Libp2pOptions) & {
     directory?: string;
-    cache?: LazyLevel;
 } & OptionalCreateOptions;
 export declare class Peerbit implements ProgramClient {
     _libp2p: Libp2pExtended;
     directory?: string;
-    private _cache;
+    private _memory;
     private _libp2pExternal?;
     private _identity;
-    private _keychain;
     private _handler;
     constructor(libp2p: Libp2pExtended, options: CreateOptions);
     static create(options?: CreateInstanceOptions): Promise<Peerbit>;
     get libp2p(): Libp2pExtended;
     get identity(): Ed25519Keypair;
-    get peerId(): import("@libp2p/interface/dist/src/peer-id/index.js").PeerId;
+    get peerId(): import("@libp2p/interface").PeerId;
     get services(): {
-        relay: import("libp2p/dist/src/circuit-relay/index.js").CircuitRelayService;
+        relay: import("@libp2p/circuit-relay-v2").CircuitRelayService;
         identify: any;
     } & import("./libp2p.js").Libp2pExtendServices;
-    get keychain(): Libp2pKeychain;
     get handler(): ProgramHandler;
     getMultiaddrs(): Multiaddr[];
     /**
@@ -59,7 +56,7 @@ export declare class Peerbit implements ProgramClient {
      * @param options
      * @returns
      */
-    open<S extends Program<Args>, Args = any>(storeOrAddress: S | Address | string, options?: OpenOptions<Args, S>): Promise<S>;
-    get memory(): LazyLevel;
+    open<S extends Program<ExtractArgs<S>>>(storeOrAddress: S | Address | string, options?: OpenOptions<ExtractArgs<S>, S>): Promise<S>;
+    get memory(): AnyStore;
 }
 export {};

package/lib/esm/peer.js

@@ -1,46 +1,38 @@
-import LazyLevel from "@peerbit/lazy-level";
-import { Level } from "level";
-import { MemoryLevel } from "memory-level";
 import { multiaddr, isMultiaddr } from "@multiformats/multiaddr";
-import { Ed25519Keypair, Ed25519PublicKey, Libp2pKeychain } from "@peerbit/crypto";
+import { Ed25519Keypair, Ed25519PublicKey } from "@peerbit/crypto";
 import { ProgramHandler } from "@peerbit/program";
 import { DirectSub } from "@peerbit/pubsub";
 import sodium from "libsodium-wrappers";
 import path from "path-browserify";
 import { waitFor } from "@peerbit/time";
 import "@libp2p/peer-id";
-import { Cache } from "@peerbit/cache";
 import { createLibp2pExtended } from "./libp2p.js";
 import { DirectBlock } from "@peerbit/blocks";
 import { LevelDatastore } from "datastore-level";
-import { BinaryWriter } from "@dao-xyz/borsh";
 import { logger as loggerFn } from "@peerbit/logger";
 import { resolveBootstrapAddresses } from "./bootstrap.js";
+import { createStore } from "@peerbit/any-store";
+import { DefaultKeychain } from "@peerbit/keychain";
 export const logger = loggerFn({ module: "client" });
 const isLibp2pInstance = (libp2p) => !!libp2p.getMultiaddrs;
-const createLevel = (path) => {
-    return path
-        ? new Level(path, { valueEncoding: "view" })
-        : new MemoryLevel({ valueEncoding: "view" });
-};
 const createCache = async (directory, options) => {
-    const cache = await new LazyLevel(createLevel(directory));
+    const cache = createStore(directory);
     // "Wake up" the caches if they need it
     if (cache)
         await cache.open();
     if (options?.reset) {
-        await cache["_store"].clear();
+        await cache.clear();
     }
     return cache;
 };
+const SELF_IDENTITY_KEY_ID = new TextEncoder().encode("__self__");
 export class Peerbit {
     _libp2p;
     directory;
-    _cache;
+    _memory;
     _libp2pExternal = false;
     // Libp2p peerid in Identity form
     _identity;
-    _keychain; // Keychain + Caching + X25519 keys
     _handler;
     constructor(libp2p, options) {
         if (libp2p == null) {
@@ -55,9 +47,8 @@ export class Peerbit {
             throw new Error("Only Ed25519 peerIds are supported");
         }
         this._identity = options.identity;
-        this._keychain = options.keychain;
         this.directory = options.directory;
-        this._cache = options.cache;
+        this._memory = options.memory;
         this._libp2pExternal = options.libp2pExternal;
     }
     static async create(options = {}) {
@@ -65,49 +56,44 @@ export class Peerbit {
         let libp2pExtended = options
             .libp2p;
         const asRelay = options.relay;
-        const blocksDirectory = options.directory != null
-            ? path.join(options.directory, "/blocks").toString()
+        const directory = options.directory;
+        const hasDir = directory != null;
+        const memory = await createCache(directory != null ? path.join(directory, "/cache") : undefined);
+        const blocksDirectory = hasDir
+            ? path.join(options["directory"], "/blocks").toString()
+            : undefined;
+        const keychainDirectory = hasDir
+            ? path.join(options["directory"], "/keychain").toString()
             : undefined;
-        let libp2pExternal = false;
-        const datastore = options.directory != null
-            ? new LevelDatastore(path.join(options.directory, "/libp2p").toString())
+        const datastore = hasDir
+            ? new LevelDatastore(path.join(options["directory"], "/libp2p").toString())
             : undefined;
         if (datastore) {
             await datastore.open();
         }
-        if (!libp2pExtended) {
+        const libp2pExternal = libp2pExtended && isLibp2pInstance(libp2pExtended);
+        if (!libp2pExternal) {
+            const extendedOptions = libp2pExtended;
+            const keychain = new DefaultKeychain({
+                store: createStore(keychainDirectory)
+            });
+            const peerId = extendedOptions?.peerId ||
+                (await (await keychain.exportById(SELF_IDENTITY_KEY_ID, Ed25519Keypair))?.toPeerId());
             libp2pExtended = await createLibp2pExtended({
+                ...extendedOptions,
+                peerId,
                 services: {
+                    keychain: (c) => keychain,
                     blocks: (c) => new DirectBlock(c, {
                         canRelayMessage: asRelay,
                         directory: blocksDirectory
                     }),
-                    pubsub: (c) => new DirectSub(c, { canRelayMessage: asRelay })
+                    pubsub: (c) => new DirectSub(c, { canRelayMessage: asRelay }),
+                    ...extendedOptions?.services
                 },
-                // If directory is passed, we store keys within that directory, else we will use memory datastore (which is the default behaviour)
                 datastore
             });
         }
-        else {
-            if (isLibp2pInstance(libp2pExtended)) {
-                libp2pExternal = true; // libp2p was created outside
-            }
-            else {
-                const extendedOptions = libp2pExtended;
-                libp2pExtended = await createLibp2pExtended({
-                    ...extendedOptions,
-                    services: {
-                        blocks: (c) => new DirectBlock(c, {
-                            canRelayMessage: asRelay,
-                            directory: blocksDirectory
-                        }),
-                        pubsub: (c) => new DirectSub(c, { canRelayMessage: asRelay }),
-                        ...extendedOptions?.services
-                    },
-                    datastore
-                });
-            }
-        }
         if (datastore) {
             const stopFn = libp2pExtended.stop.bind(libp2pExtended);
             libp2pExtended.stop = async () => {
@@ -115,24 +101,20 @@ export class Peerbit {
                 await datastore?.close();
             };
         }
-        if (!libp2pExtended.isStarted()) {
+        if (libp2pExtended.status === "stopped" ||
+            libp2pExtended.status === "stopping") {
             await libp2pExtended.start();
         }
         if (libp2pExtended.peerId.type !== "Ed25519") {
             throw new Error("Unsupported id type, expecting Ed25519 but got " +
                 libp2pExtended.peerId.type);
         }
-        const directory = options.directory;
-        const cache = options.cache ||
-            (await createCache(directory ? path.join(directory, "/cache") : undefined));
         const identity = Ed25519Keypair.fromPeerId(libp2pExtended.peerId);
-        const keychain = new Libp2pKeychain(libp2pExtended.keychain, {
-            cache: new Cache({ max: 1000 })
-        });
         try {
-            const writer = new BinaryWriter();
-            writer.string("identity");
-            await keychain.import(identity, writer.finalize());
+            await libp2pExtended.services.keychain.import({
+                keypair: identity,
+                id: SELF_IDENTITY_KEY_ID
+            });
         }
         catch (error) {
             if (error.code == "ERR_KEY_ALREADY_EXISTS") {
@@ -144,10 +126,9 @@ export class Peerbit {
         }
         const peer = new Peerbit(libp2pExtended, {
             directory,
-            cache,
+            memory: memory,
             libp2pExternal,
-            identity,
-            keychain
+            identity
         });
         return peer;
     }
@@ -163,9 +144,6 @@ export class Peerbit {
     get services() {
         return this.libp2p.services;
     }
-    get keychain() {
-        return this._keychain;
-    }
     get handler() {
         return this._handler;
     }
@@ -188,15 +166,15 @@ export class Peerbit {
             this.libp2p.services.blocks.peers.has(publicKey.hashcode()))) || false);
     }
     async start() {
-        await this._cache.open();
-        if (!this.libp2p.isStarted()) {
+        await this._memory.open();
+        if (this.libp2p.status === "stopped" || this.libp2p.status === "stopping") {
             this._libp2pExternal = false; // this means we will also close libp2p client on close
             return this.libp2p.start();
         }
     }
     async stop() {
         await this._handler?.stop();
-        await this._cache.close();
+        await this._memory.close();
         // Close libp2p (after above)
         if (!this._libp2pExternal) {
             // only close it if we created it
@@ -221,7 +199,7 @@ export class Peerbit {
         return (this._handler || (this._handler = new ProgramHandler({ client: this }))).open(storeOrAddress, options);
     }
     get memory() {
-        return this._cache;
+        return this._memory;
     }
 }
 //# sourceMappingURL=peer.js.map

package/lib/esm/peer.js.map

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

package/lib/esm/transports-browser.d.ts

@@ -1,3 +1,3 @@
-export declare const transports: () => ((components: import("libp2p/dist/src/circuit-relay/transport").CircuitRelayTransportComponents) => import("@libp2p/interface/dist/src/transport").Transport)[];
+export declare const transports: () => (((components: import("@libp2p/circuit-relay-v2/dist/src/transport").CircuitRelayTransportComponents) => import("@libp2p/interface/dist/src").Transport) | ((components: import("@libp2p/webrtc/dist/src/private-to-private/transport").WebRTCTransportComponents) => import("@libp2p/interface/dist/src").Transport))[];
 export declare const relay: () => undefined;
 export declare const listen: () => string[] | undefined;

package/lib/esm/transports-browser.js

@@ -1,5 +1,5 @@
 import { webSockets } from "@libp2p/websockets";
-import { circuitRelayTransport } from "libp2p/circuit-relay";
+import { circuitRelayTransport } from "@libp2p/circuit-relay-v2";
 import { webRTC } from "@libp2p/webrtc";
 import { all } from "@libp2p/websockets/filters";
 export const transports = () => [

package/lib/esm/transports-browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"transports-browser.js","sourceRoot":"","sources":["../../src/transports-browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AAEjD,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IAC3B,qBAAqB,CAAC;QACrB,cAAc,EAAE,CAAC;KACjB,CAAC;IACF,MAAM,CAAC,EAAE,CAAC;CACV,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,SAAS,CAAC;AAErC,MAAM,CAAC,MAAM,MAAM,GAA+B,GAAG,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC"}
+{"version":3,"file":"transports-browser.js","sourceRoot":"","sources":["../../src/transports-browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AAEjD,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IAC3B,qBAAqB,CAAC;QACrB,cAAc,EAAE,CAAC;KACjB,CAAC;IACF,MAAM,CAAC,EAAE,CAAC;CACV,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,SAAS,CAAC;AAErC,MAAM,CAAC,MAAM,MAAM,GAA+B,GAAG,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC"}

package/lib/esm/transports.d.ts

@@ -1,3 +1,3 @@
-export declare const transports: () => (((components: import("libp2p/dist/src/circuit-relay/transport").CircuitRelayTransportComponents) => import("@libp2p/interface/dist/src/transport").Transport) | ((components?: import("@libp2p/tcp").TCPComponents | undefined) => import("@libp2p/interface/dist/src/transport").Transport))[];
-export declare const relay: () => (components: import("libp2p/dist/src/circuit-relay/server").CircuitRelayServerComponents) => import("libp2p/circuit-relay").CircuitRelayService;
+export declare const transports: () => (((components: import("@libp2p/circuit-relay-v2/dist/src/transport").CircuitRelayTransportComponents) => import("@libp2p/interface/dist/src").Transport) | ((components: import("@libp2p/tcp").TCPComponents) => import("@libp2p/interface/dist/src").Transport))[];
+export declare const relay: () => (components: import("@libp2p/circuit-relay-v2/dist/src/server").CircuitRelayServerComponents) => import("@libp2p/circuit-relay-v2").CircuitRelayService;
 export declare const listen: () => string[] | undefined;

package/lib/esm/transports.js

@@ -1,7 +1,7 @@
 import { webSockets } from "@libp2p/websockets";
-import { circuitRelayTransport } from "libp2p/circuit-relay";
+import { circuitRelayTransport } from "@libp2p/circuit-relay-v2";
 import { tcp } from "@libp2p/tcp";
-import { circuitRelayServer } from "libp2p/circuit-relay";
+import { circuitRelayServer } from "@libp2p/circuit-relay-v2";
 import { all } from "@libp2p/websockets/filters";
 export const transports = () => [
     webSockets({ filter: all }),

package/lib/esm/transports.js.map

@@ -1 +1 @@
-{"version":3,"file":"transports.js","sourceRoot":"","sources":["../../src/transports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AACjD,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IAC3B,qBAAqB,EAAE;IACvB,GAAG,EAAE;CACL,CAAC;AACF,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,EAAE,CACzB,kBAAkB,CAAC,EAAE,YAAY,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;AAEjE,MAAM,CAAC,MAAM,MAAM,GAA+B,GAAG,EAAE,CAAC;IACvD,sBAAsB;IACtB,yBAAyB;CACzB,CAAC"}
+{"version":3,"file":"transports.js","sourceRoot":"","sources":["../../src/transports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AACjD,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IAC3B,qBAAqB,EAAE;IACvB,GAAG,EAAE;CACL,CAAC;AACF,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,EAAE,CACzB,kBAAkB,CAAC,EAAE,YAAY,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;AAEjE,MAAM,CAAC,MAAM,MAAM,GAA+B,GAAG,EAAE,CAAC;IACvD,sBAAsB;IACtB,yBAAyB;CACzB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "peerbit",
-	"version": "2.0.15",
+	"version": "3.0.1",
 	"description": "Peerbit client",
 	"author": "dao.xyz",
 	"license": "MIT",
@@ -34,21 +34,23 @@
 		"./transports.js": "./lib/esm/transports-browser.js"
 	},
 	"dependencies": {
-		"@chainsafe/libp2p-yamux": "^5.0.0",
+		"@chainsafe/libp2p-yamux": "^6.0.1",
 		"@dao-xyz/borsh": "^5.1.8",
-		"@dao-xyz/libp2p-noise": "^13.0.1",
-		"@libp2p/mplex": "^9.0.5",
-		"@libp2p/tcp": "^8.0.5",
-		"@libp2p/webrtc": "^3.1.9",
-		"@libp2p/websockets": "^7.0.5",
-		"@peerbit/blocks": "^1.1.7",
-		"@peerbit/crypto": "1.0.10",
-		"@peerbit/lazy-level": "1.2.1",
-		"@peerbit/logger": "1.0.1",
-		"@peerbit/program": "2.4.2",
-		"@peerbit/pubsub": "^1.1.13",
+		"@dao-xyz/libp2p-noise": "^14.1.2",
+		"@libp2p/circuit-relay-v2": "^1.0.9",
+		"@libp2p/identify": "^1.0.8",
+		"@libp2p/mplex": "^10.0.9",
+		"@libp2p/tcp": "^9.0.9",
+		"@libp2p/webrtc": "^4.0.13",
+		"@libp2p/websockets": "^8.0.9",
+		"@peerbit/any-store": "^1.0.1",
+		"@peerbit/blocks": "^2.0.1",
+		"@peerbit/crypto": "2.0.0",
+		"@peerbit/logger": "1.0.2",
+		"@peerbit/program": "3.0.1",
+		"@peerbit/pubsub": "^2.0.1",
 		"@peerbit/uint8arrays": "3.0.1",
-		"datastore-level": "^10.1.4",
+		"datastore-level": "^10.1.5",
 		"level": "^8.0.0",
 		"memory-level": "^1.0.0",
 		"path-browserify": "^1.0.1"
@@ -74,5 +76,5 @@
 		"p2p",
 		"peer-to-peer"
 	],
-	"gitHead": "6b3febe03977ab07c14e22ac693e68367fab9a22"
+	"gitHead": "c48cb37d237a25b0bcc849482b43f6941d53e3d5"
 }

package/src/libp2p.ts

@@ -4,13 +4,15 @@ import { DirectBlock } from "@peerbit/blocks";
 import { noise } from "@dao-xyz/libp2p-noise";
 import { mplex } from "@libp2p/mplex";
 import { transports, relay, listen } from "./transports.js";
-import { identifyService } from "libp2p/identify";
-import { CircuitRelayService } from "libp2p/dist/src/circuit-relay/index.js";
+import { identify } from "@libp2p/identify";
+import { CircuitRelayService } from "@libp2p/circuit-relay-v2";
 import { yamux } from "@chainsafe/libp2p-yamux";
+import { DefaultKeychain, Keychain } from "@peerbit/keychain";
 
 export type Libp2pExtendServices = {
 	pubsub: DirectSub;
 	blocks: DirectBlock;
+	keychain: Keychain;
 };
 export type Libp2pExtended = Libp2p<
 	{ relay: CircuitRelayService; identify: any } & Libp2pExtendServices
@@ -28,13 +30,14 @@ export const createLibp2pExtended = (
 	opts: Libp2pCreateOptions = {
 		services: {
 			blocks: (c) => new DirectBlock(c),
-			pubsub: (c) => new DirectSub(c)
+			pubsub: (c) => new DirectSub(c),
+			keychain: (c) => new DefaultKeychain()
 		}
 	}
 ): Promise<Libp2pExtended> => {
 	const relayIdentify = {
 		relay: relay(),
-		identify: identifyService()
+		identify: identify()
 	};
 
 	// https://github.com/libp2p/js-libp2p/issues/1757
@@ -64,12 +67,12 @@ export const createLibp2pExtended = (
 				((c) =>
 					new DirectSub(c, {
 						canRelayMessage: true,
-						signaturePolicy: "StrictNoSign",
-						connectionManager: {
-							autoDial: true
-						}
+						signaturePolicy: "StrictNoSign"
+						// auto dial true
+						// auto prune true
 					})),
 			blocks: opts.services?.blocks || ((c) => new DirectBlock(c)),
+			keychain: opts.services?.keychain || ((c) => new DefaultKeychain()),
 			...opts.services
 		}
 	});

package/src/peer.ts

@@ -1,14 +1,7 @@
-import LazyLevel from "@peerbit/lazy-level";
-import { AbstractLevel } from "abstract-level";
-import { Level } from "level";
-import { MemoryLevel } from "memory-level";
+import { AnyStore } from "../../../utils/any-store/lib/esm/index.js";
 import { multiaddr, Multiaddr, isMultiaddr } from "@multiformats/multiaddr";
 import type { Libp2p } from "libp2p";
-import {
-	Ed25519Keypair,
-	Ed25519PublicKey,
-	Libp2pKeychain
-} from "@peerbit/crypto";
+import { Ed25519Keypair, Ed25519PublicKey } from "@peerbit/crypto";
 import {
 	Program,
 	Address,
@@ -20,7 +13,6 @@ import sodium from "libsodium-wrappers";
 import path from "path-browserify";
 import { waitFor } from "@peerbit/time";
 import "@libp2p/peer-id";
-import { Cache } from "@peerbit/cache";
 
 import {
 	createLibp2pExtended,
@@ -29,10 +21,11 @@ import {
 } from "./libp2p.js";
 import { DirectBlock } from "@peerbit/blocks";
 import { LevelDatastore } from "datastore-level";
-import { BinaryWriter } from "@dao-xyz/borsh";
 import { logger as loggerFn } from "@peerbit/logger";
 import { OpenOptions } from "@peerbit/program";
 import { resolveBootstrapAddresses } from "./bootstrap.js";
+import { createStore } from "@peerbit/any-store";
+import { DefaultKeychain } from "@peerbit/keychain";
 
 export const logger = loggerFn({ module: "client" });
 
@@ -41,55 +34,47 @@ export type OptionalCreateOptions = {
 };
 export type CreateOptions = {
 	directory?: string;
-	cache: LazyLevel;
+	memory: AnyStore;
 	identity: Ed25519Keypair;
-	keychain: Libp2pKeychain;
 } & OptionalCreateOptions;
-
+type ExtractArgs<T> = T extends Program<infer Args> ? Args : never;
 type Libp2pOptions = { libp2p?: Libp2pExtended | ClientCreateOptions };
 type SimpleLibp2pOptions = { relay?: boolean };
 export type CreateInstanceOptions = (SimpleLibp2pOptions | Libp2pOptions) & {
 	directory?: string;
-	cache?: LazyLevel;
 } & OptionalCreateOptions;
 
 const isLibp2pInstance = (libp2p: Libp2pExtended | ClientCreateOptions) =>
 	!!(libp2p as Libp2p).getMultiaddrs;
 
-const createLevel = (path?: string): AbstractLevel<any, string, Uint8Array> => {
-	return path
-		? new Level(path, { valueEncoding: "view" })
-		: new MemoryLevel({ valueEncoding: "view" });
-};
-
 const createCache = async (
 	directory: string | undefined,
 	options?: { reset?: boolean }
 ) => {
-	const cache = await new LazyLevel(createLevel(directory));
+	const cache = createStore(directory);
 
 	// "Wake up" the caches if they need it
 	if (cache) await cache.open();
 	if (options?.reset) {
-		await cache["_store"].clear();
+		await cache.clear();
 	}
-
 	return cache;
 };
 
+const SELF_IDENTITY_KEY_ID = new TextEncoder().encode("__self__");
+
 export class Peerbit implements ProgramClient {
 	_libp2p: Libp2pExtended;
 
 	directory?: string;
 
-	private _cache: LazyLevel;
+	private _memory: AnyStore;
 	private _libp2pExternal?: boolean = false;
 
 	// Libp2p peerid in Identity form
 	private _identity: Ed25519Keypair;
-
-	private _keychain: Libp2pKeychain; // Keychain + Caching + X25519 keys
 	private _handler: ProgramHandler;
+
 	constructor(libp2p: Libp2pExtended, options: CreateOptions) {
 		if (libp2p == null) {
 			throw new Error("Libp2p required");
@@ -107,10 +92,8 @@ export class Peerbit implements ProgramClient {
 		}
 
 		this._identity = options.identity;
-		this._keychain = options.keychain;
-
 		this.directory = options.directory;
-		this._cache = options.cache;
+		this._memory = options.memory;
 		this._libp2pExternal = options.libp2pExternal;
 	}
 
@@ -121,52 +104,58 @@ export class Peerbit implements ProgramClient {
 			.libp2p as Libp2pExtended;
 		const asRelay = (options as SimpleLibp2pOptions).relay;
 
-		const blocksDirectory =
-			options.directory != null
-				? path.join(options.directory, "/blocks").toString()
-				: undefined;
-		let libp2pExternal = false;
+		const directory = options.directory;
+		const hasDir = directory != null;
+
+		const memory = await createCache(
+			directory != null ? path.join(directory, "/cache") : undefined
+		);
+
+		const blocksDirectory = hasDir
+			? path.join(options["directory"], "/blocks").toString()
+			: undefined;
+
+		const keychainDirectory = hasDir
+			? path.join(options["directory"], "/keychain").toString()
+			: undefined;
+
+		const datastore = hasDir
+			? new LevelDatastore(
+					path.join(options["directory"], "/libp2p").toString()
+				)
+			: undefined;
 
-		const datastore =
-			options.directory != null
-				? new LevelDatastore(path.join(options.directory, "/libp2p").toString())
-				: undefined;
 		if (datastore) {
 			await datastore.open();
 		}
 
-		if (!libp2pExtended) {
+		const libp2pExternal = libp2pExtended && isLibp2pInstance(libp2pExtended);
+		if (!libp2pExternal) {
+			const extendedOptions: ClientCreateOptions | undefined =
+				libp2pExtended as any as ClientCreateOptions;
+			const keychain = new DefaultKeychain({
+				store: createStore(keychainDirectory)
+			});
+			const peerId =
+				extendedOptions?.peerId ||
+				(await (
+					await keychain.exportById(SELF_IDENTITY_KEY_ID, Ed25519Keypair)
+				)?.toPeerId());
 			libp2pExtended = await createLibp2pExtended({
+				...extendedOptions,
+				peerId,
 				services: {
+					keychain: (c) => keychain,
 					blocks: (c) =>
 						new DirectBlock(c, {
 							canRelayMessage: asRelay,
 							directory: blocksDirectory
 						}),
-					pubsub: (c) => new DirectSub(c, { canRelayMessage: asRelay })
+					pubsub: (c) => new DirectSub(c, { canRelayMessage: asRelay }),
+					...extendedOptions?.services
 				},
-				// If directory is passed, we store keys within that directory, else we will use memory datastore (which is the default behaviour)
 				datastore
 			});
-		} else {
-			if (isLibp2pInstance(libp2pExtended)) {
-				libp2pExternal = true; // libp2p was created outside
-			} else {
-				const extendedOptions = libp2pExtended as any as ClientCreateOptions;
-				libp2pExtended = await createLibp2pExtended({
-					...extendedOptions,
-					services: {
-						blocks: (c) =>
-							new DirectBlock(c, {
-								canRelayMessage: asRelay,
-								directory: blocksDirectory
-							}),
-						pubsub: (c) => new DirectSub(c, { canRelayMessage: asRelay }),
-						...extendedOptions?.services
-					},
-					datastore
-				});
-			}
 		}
 		if (datastore) {
 			const stopFn = libp2pExtended.stop.bind(libp2pExtended);
@@ -176,7 +165,10 @@ export class Peerbit implements ProgramClient {
 			};
 		}
 
-		if (!libp2pExtended.isStarted()) {
+		if (
+			libp2pExtended.status === "stopped" ||
+			libp2pExtended.status === "stopping"
+		) {
 			await libp2pExtended.start();
 		}
 
@@ -187,22 +179,12 @@ export class Peerbit implements ProgramClient {
 			);
 		}
 
-		const directory = options.directory;
-		const cache =
-			options.cache ||
-			(await createCache(
-				directory ? path.join(directory, "/cache") : undefined
-			));
-
 		const identity = Ed25519Keypair.fromPeerId(libp2pExtended.peerId);
-		const keychain = new Libp2pKeychain(libp2pExtended.keychain, {
-			cache: new Cache({ max: 1000 })
-		});
-
 		try {
-			const writer = new BinaryWriter();
-			writer.string("identity");
-			await keychain.import(identity, writer.finalize());
+			await libp2pExtended.services.keychain.import({
+				keypair: identity,
+				id: SELF_IDENTITY_KEY_ID
+			});
 		} catch (error: any) {
 			if (error.code == "ERR_KEY_ALREADY_EXISTS") {
 				// Do nothing
@@ -213,10 +195,9 @@ export class Peerbit implements ProgramClient {
 
 		const peer = new Peerbit(libp2pExtended, {
 			directory,
-			cache,
+			memory: memory,
 			libp2pExternal,
-			identity,
-			keychain
+			identity
 		});
 		return peer;
 	}
@@ -236,10 +217,6 @@ export class Peerbit implements ProgramClient {
 		return this.libp2p.services;
 	}
 
-	get keychain(): Libp2pKeychain {
-		return this._keychain;
-	}
-
 	get handler(): ProgramHandler {
 		return this._handler;
 	}
@@ -257,8 +234,8 @@ export class Peerbit implements ProgramClient {
 			typeof address == "string"
 				? multiaddr(address)
 				: isMultiaddr(address) || Array.isArray(address)
-				? address
-				: address.getMultiaddrs();
+					? address
+					: address.getMultiaddrs();
 		const connection = await this.libp2p.dial(maddress);
 		const publicKey = Ed25519PublicKey.fromPeerId(connection.remotePeer);
 
@@ -273,16 +250,16 @@ export class Peerbit implements ProgramClient {
 	}
 
 	async start() {
-		await this._cache.open();
+		await this._memory.open();
 
-		if (!this.libp2p.isStarted()) {
+		if (this.libp2p.status === "stopped" || this.libp2p.status === "stopping") {
 			this._libp2pExternal = false; // this means we will also close libp2p client on close
 			return this.libp2p.start();
 		}
 	}
 	async stop() {
 		await this._handler?.stop();
-		await this._cache.close();
+		await this._memory.close();
 
 		// Close libp2p (after above)
 		if (!this._libp2pExternal) {
@@ -307,9 +284,9 @@ export class Peerbit implements ProgramClient {
 	 * @returns
 	 */
 
-	async open<S extends Program<Args>, Args = any>(
+	async open<S extends Program<ExtractArgs<S>>>(
 		storeOrAddress: S | Address | string,
-		options: OpenOptions<Args, S> = {}
+		options: OpenOptions<ExtractArgs<S>, S> = {}
 	): Promise<S> {
 		return (
 			this._handler || (this._handler = new ProgramHandler({ client: this }))
@@ -317,6 +294,6 @@ export class Peerbit implements ProgramClient {
 	}
 
 	get memory() {
-		return this._cache;
+		return this._memory;
 	}
 }

package/src/transports-browser.ts

@@ -1,5 +1,5 @@
 import { webSockets } from "@libp2p/websockets";
-import { circuitRelayTransport } from "libp2p/circuit-relay";
+import { circuitRelayTransport } from "@libp2p/circuit-relay-v2";
 import { webRTC } from "@libp2p/webrtc";
 import { all } from "@libp2p/websockets/filters";
 

package/src/transports.ts

@@ -1,7 +1,7 @@
 import { webSockets } from "@libp2p/websockets";
-import { circuitRelayTransport } from "libp2p/circuit-relay";
+import { circuitRelayTransport } from "@libp2p/circuit-relay-v2";
 import { tcp } from "@libp2p/tcp";
-import { circuitRelayServer } from "libp2p/circuit-relay";
+import { circuitRelayServer } from "@libp2p/circuit-relay-v2";
 import { all } from "@libp2p/websockets/filters";
 export const transports = () => [
 	webSockets({ filter: all }),