peerbit 4.0.7-aa577a5 → 4.0.7-cccc078

package/dist/benchmark/start-stop.js

@@ -1,6 +1,6 @@
 import B from "benchmark";
 import { Peerbit } from "../src/peer.js";
-// Run with "node --loader ts-node/esm ./src/__benchmark__/start-stop.ts"
+// Run with "node --loader ts-node/esm ./benchmark/start-stop.ts"
 // start and stop x 91.15 ops/sec ±0.95% (87 runs sampled)
 const suite = new B.Suite();
 suite
@@ -11,7 +11,7 @@ suite
         await node.stop();
         deferred.resolve();
     },
-    defer: true
+    defer: true,
 })
     .on("cycle", (event) => {
     console.log(String(event.target));

package/dist/benchmark/start-stop.js.map

@@ -1 +1 @@
-{"version":3,"file":"start-stop.js","sourceRoot":"","sources":["../../benchmark/start-stop.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,WAAW,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,yEAAyE;AAEzE,0DAA0D;AAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;AAC5B,KAAK;KACH,GAAG,CAAC,gBAAgB,EAAE;IACtB,EAAE,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;QAC3B,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;QACpC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,QAAQ,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC;IACD,KAAK,EAAE,IAAI;CACX,CAAC;KACD,EAAE,CAAC,OAAO,EAAE,CAAC,KAAU,EAAE,EAAE;IAC3B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;AACnC,CAAC,CAAC;KACD,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC"}
+{"version":3,"file":"start-stop.js","sourceRoot":"","sources":["../../benchmark/start-stop.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,WAAW,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,iEAAiE;AAEjE,0DAA0D;AAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;AAC5B,KAAK;KACH,GAAG,CAAC,gBAAgB,EAAE;IACtB,EAAE,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;QAC3B,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;QACpC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,QAAQ,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC;IACD,KAAK,EAAE,IAAI;CACX,CAAC;KACD,EAAE,CAAC,OAAO,EAAE,CAAC,KAAU,EAAE,EAAE;IAC3B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;AACnC,CAAC,CAAC;KACD,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC"}

package/dist/src/bootstrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../src/bootstrap.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,yBAAyB,OAClC,MAAM,KACP,QAAQ,MAAM,EAAE,CAWlB,CAAC"}
+{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../src/bootstrap.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,yBAAyB,OAClC,MAAM,KACP,OAAO,CAAC,MAAM,EAAE,CAWlB,CAAC"}

package/dist/src/index.d.ts

@@ -1,3 +1,3 @@
 export * from "./peer.js";
-export { createLibp2pExtended, type Libp2pExtendServices, type Libp2pExtended, type Libp2pCreateOptions, type Libp2pCreateOptionsWithServices } from "./libp2p.js";
+export { createLibp2pExtended, type Libp2pExtendServices, type Libp2pExtended, type Libp2pCreateOptions, type Libp2pCreateOptionsWithServices, } from "./libp2p.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,OAAO,EACN,oBAAoB,EACpB,KAAK,oBAAoB,EACzB,KAAK,cAAc,EACnB,KAAK,mBAAmB,EACxB,KAAK,+BAA+B,EACpC,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,OAAO,EACN,oBAAoB,EACpB,KAAK,oBAAoB,EACzB,KAAK,cAAc,EACnB,KAAK,mBAAmB,EACxB,KAAK,+BAA+B,GACpC,MAAM,aAAa,CAAC"}

package/dist/src/index.js

@@ -1,3 +1,3 @@
 export * from "./peer.js";
-export { createLibp2pExtended } from "./libp2p.js";
+export { createLibp2pExtended, } from "./libp2p.js";
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,OAAO,EACN,oBAAoB,EAKpB,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,OAAO,EACN,oBAAoB,GAKpB,MAAM,aAAa,CAAC"}

package/dist/src/libp2p.d.ts

@@ -1,8 +1,8 @@
-import { type Libp2p, type Libp2pOptions, type ServiceFactoryMap } from "libp2p";
-import { DirectSub } from "@peerbit/pubsub";
-import { DirectBlock } from "@peerbit/blocks";
 import type { CircuitRelayService } from "@libp2p/circuit-relay-v2";
+import { DirectBlock } from "@peerbit/blocks";
 import { type Keychain } from "@peerbit/keychain";
+import { DirectSub } from "@peerbit/pubsub";
+import { type Libp2p, type Libp2pOptions, type ServiceFactoryMap } from "libp2p";
 export type Libp2pExtendServices = {
     pubsub: DirectSub;
     blocks: DirectBlock;
@@ -12,12 +12,16 @@ export type Libp2pExtended = Libp2p<{
     relay: CircuitRelayService;
     identify: any;
 } & Libp2pExtendServices>;
-export type Libp2pCreateOptions = Libp2pOptions<Libp2pExtendServices & {
+export type Libp2pCreateOptions = Libp2pOptions<Partial<Libp2pExtendServices & {
+    relay: CircuitRelayService;
+    identify: any;
+}>>;
+export type PartialLibp2pCreateOptions = Libp2pOptions<Partial<Libp2pExtendServices & {
     relay: CircuitRelayService;
     identify: any;
-}>;
+}>>;
 export type Libp2pCreateOptionsWithServices = Libp2pCreateOptions & {
     services: ServiceFactoryMap<Libp2pExtendServices>;
 };
-export declare const createLibp2pExtended: (opts?: Libp2pCreateOptions) => Promise<Libp2pExtended>;
+export declare const createLibp2pExtended: (opts?: PartialLibp2pCreateOptions) => Promise<Libp2pExtended>;
 //# sourceMappingURL=libp2p.d.ts.map

package/dist/src/libp2p.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libp2p.d.ts","sourceRoot":"","sources":["../../src/libp2p.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,MAAM,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAC/F,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAI9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAEnE,MAAM,MAAM,oBAAoB,GAAG;IAClC,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,QAAQ,CAAC;CACnB,CAAC;AACF,MAAM,MAAM,cAAc,GAAG,MAAM,CAClC;IAAE,KAAK,EAAE,mBAAmB,CAAC;IAAC,QAAQ,EAAE,GAAG,CAAA;CAAE,GAAG,oBAAoB,CACpE,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,aAAa,CAC9C,oBAAoB,GAAG;IAAE,KAAK,EAAE,mBAAmB,CAAC;IAAC,QAAQ,EAAE,GAAG,CAAA;CAAE,CACpE,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,mBAAmB,GAAG;IACnE,QAAQ,EAAE,iBAAiB,CAAC,oBAAoB,CAAC,CAAC;CAClD,CAAC;AAEF,eAAO,MAAM,oBAAoB,UAC1B,mBAAmB,KAOvB,QAAQ,cAAc,CAyCxB,CAAC"}
+{"version":3,"file":"libp2p.d.ts","sourceRoot":"","sources":["../../src/libp2p.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACN,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,iBAAiB,EAEtB,MAAM,QAAQ,CAAC;AAGhB,MAAM,MAAM,oBAAoB,GAAG;IAClC,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,QAAQ,CAAC;CACnB,CAAC;AACF,MAAM,MAAM,cAAc,GAAG,MAAM,CAClC;IAAE,KAAK,EAAE,mBAAmB,CAAC;IAAC,QAAQ,EAAE,GAAG,CAAA;CAAE,GAAG,oBAAoB,CACpE,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,aAAa,CAC9C,OAAO,CAAC,oBAAoB,GAAG;IAAE,KAAK,EAAE,mBAAmB,CAAC;IAAC,QAAQ,EAAE,GAAG,CAAA;CAAE,CAAC,CAC7E,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,aAAa,CACrD,OAAO,CAAC,oBAAoB,GAAG;IAAE,KAAK,EAAE,mBAAmB,CAAC;IAAC,QAAQ,EAAE,GAAG,CAAA;CAAE,CAAC,CAC7E,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,mBAAmB,GAAG;IACnE,QAAQ,EAAE,iBAAiB,CAAC,oBAAoB,CAAC,CAAC;CAClD,CAAC;AAEF,eAAO,MAAM,oBAAoB,UAC1B,0BAA0B,KAO9B,OAAO,CAAC,cAAc,CA0CxB,CAAC"}

package/dist/src/libp2p.js

@@ -1,53 +1,54 @@
-import { createLibp2p } from "libp2p";
-import { DirectSub } from "@peerbit/pubsub";
-import { DirectBlock } from "@peerbit/blocks";
+import { yamux } from "@chainsafe/libp2p-yamux";
 import { noise } from "@dao-xyz/libp2p-noise";
-import { transports, relay, listen } from "./transports.js";
 import { identify } from "@libp2p/identify";
-import { yamux } from "@chainsafe/libp2p-yamux";
+import { DirectBlock } from "@peerbit/blocks";
 import { DefaultKeychain } from "@peerbit/keychain";
+import { DirectSub } from "@peerbit/pubsub";
+import { createLibp2p, } from "libp2p";
+import { listen, relay, transports } from "./transports.js";
 export const createLibp2pExtended = (opts = {
     services: {
         blocks: (c) => new DirectBlock(c),
         pubsub: (c) => new DirectSub(c),
-        keychain: (c) => new DefaultKeychain()
-    }
+        keychain: () => new DefaultKeychain(),
+    },
 }) => {
-    const relayIdentify = {
-        relay: relay(),
-        identify: identify()
-    };
-    // https://github.com/libp2p/js-libp2p/issues/1757
-    Object.keys(relayIdentify).forEach((key) => {
-        if (relayIdentify[key] === undefined) {
-            delete relayIdentify[key];
+    let extraServices = {};
+    if (!opts.services?.["relay"]) {
+        const relayComponent = relay();
+        if (relayComponent) {
+            // will be null in browser
+            extraServices["relay"] = relayComponent;
         }
-    });
+    }
+    if (!opts.services?.["identify"]) {
+        extraServices["identify"] = identify();
+    }
     return createLibp2p({
         ...opts,
         connectionManager: {
             minConnections: 0,
-            ...opts.connectionManager
+            ...opts.connectionManager,
         },
         addresses: {
             listen: listen(),
-            ...opts.addresses
+            ...opts.addresses,
         },
         transports: opts.transports || transports(),
         connectionEncryption: opts.connectionEncryption || [noise()],
         streamMuxers: opts.streamMuxers || [yamux()],
         services: {
-            ...relayIdentify,
             pubsub: opts.services?.pubsub ||
                 ((c) => new DirectSub(c, {
-                    canRelayMessage: true
+                    canRelayMessage: true,
                     // auto dial true
                     // auto prune true
                 })),
             blocks: opts.services?.blocks || ((c) => new DirectBlock(c)),
             keychain: opts.services?.keychain || ((c) => new DefaultKeychain()),
-            ...opts.services
-        }
+            ...opts.services,
+            ...extraServices,
+        },
     });
 };
 //# sourceMappingURL=libp2p.js.map

package/dist/src/libp2p.js.map

@@ -1 +1 @@
-{"version":3,"file":"libp2p.js","sourceRoot":"","sources":["../../src/libp2p.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA2D,MAAM,QAAQ,CAAC;AAC/F,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,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,EAAiB,MAAM,mBAAmB,CAAC;AAmBnE,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,GAAQ;QAC1B,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,CAAC;QAC5C,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,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"}
+{"version":3,"file":"libp2p.js","sourceRoot":"","sources":["../../src/libp2p.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAE9C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAiB,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAIN,YAAY,GACZ,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAuB5D,MAAM,CAAC,MAAM,oBAAoB,GAAG,CACnC,OAAmC;IAClC,QAAQ,EAAE;QACT,MAAM,EAAE,CAAC,CAAM,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC;QACtC,MAAM,EAAE,CAAC,CAAM,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC;QACpC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,eAAe,EAAE;KACrC;CACD,EACyB,EAAE;IAC5B,IAAI,aAAa,GAAQ,EAAE,CAAC;IAE5B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/B,MAAM,cAAc,GAAG,KAAK,EAAE,CAAC;QAC/B,IAAI,cAAc,EAAE,CAAC;YACpB,0BAA0B;YAC1B,aAAa,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC;QACzC,CAAC;IACF,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC;QAClC,aAAa,CAAC,UAAU,CAAC,GAAG,QAAQ,EAAE,CAAC;IACxC,CAAC;IAED,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,CAAC;QAC5C,QAAQ,EAAE;YACT,MAAM,EACL,IAAI,CAAC,QAAQ,EAAE,MAAM;gBACrB,CAAC,CAAC,CAAC,EAAE,EAAE,CACN,IAAI,SAAS,CAAC,CAAC,EAAE;oBAChB,eAAe,EAAE,IAAI;oBACrB,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;YAChB,GAAG,aAAa;SAChB;KACD,CAAC,CAAC;AACJ,CAAC,CAAC"}

package/dist/src/peer.d.ts

@@ -1,11 +1,10 @@
-import { type Multiaddr } from "@multiformats/multiaddr";
-import { Ed25519Keypair } from "@peerbit/crypto";
-import { Program, type Address, type ProgramClient, ProgramHandler } from "@peerbit/program";
 import "@libp2p/peer-id";
-import { type Libp2pExtended, type Libp2pCreateOptions as ClientCreateOptions } from "./libp2p.js";
-import { type OpenOptions } from "@peerbit/program";
+import { type Multiaddr } from "@multiformats/multiaddr";
 import { type AnyStore } from "@peerbit/any-store";
-import { type ExtractArgs } from "@peerbit/program";
+import { Ed25519Keypair } from "@peerbit/crypto";
+import type { Indices } from "@peerbit/indexer-interface";
+import { type Address, type ExtractArgs, type OpenOptions, type Program, type ProgramClient, ProgramHandler } from "@peerbit/program";
+import { type Libp2pExtended, type PartialLibp2pCreateOptions } from "./libp2p.js";
 export declare const logger: import("pino").Logger<never>;
 export type OptionalCreateOptions = {
     libp2pExternal?: boolean;
@@ -13,21 +12,24 @@ export type OptionalCreateOptions = {
 export type CreateOptions = {
     directory?: string;
     storage: AnyStore;
+    indexer: Indices;
     identity: Ed25519Keypair;
 } & OptionalCreateOptions;
 type Libp2pOptions = {
-    libp2p?: Libp2pExtended | ClientCreateOptions;
+    libp2p?: Libp2pExtended | PartialLibp2pCreateOptions;
 };
 type SimpleLibp2pOptions = {
     relay?: boolean;
 };
 export type CreateInstanceOptions = (SimpleLibp2pOptions | Libp2pOptions) & {
     directory?: string;
+    indexer?: (directory?: string) => Promise<Indices> | Indices;
 } & OptionalCreateOptions;
 export declare class Peerbit implements ProgramClient {
     _libp2p: Libp2pExtended;
     directory?: string;
     private _storage;
+    private _indexer;
     private _libp2pExternal?;
     private _identity;
     private _handler;
@@ -58,6 +60,7 @@ export declare class Peerbit implements ProgramClient {
      */
     open<S extends Program<ExtractArgs<S>>>(storeOrAddress: S | Address | string, options?: OpenOptions<S>): Promise<S>;
     get storage(): AnyStore;
+    get indexer(): Indices;
 }
 export {};
 //# sourceMappingURL=peer.d.ts.map

package/dist/src/peer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"peer.d.ts","sourceRoot":"","sources":["../../src/peer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,SAAS,EAAe,MAAM,yBAAyB,CAAC;AAEjF,OAAO,EAAE,cAAc,EAAoB,MAAM,iBAAiB,CAAC;AACnE,OAAO,EACN,OAAO,EACP,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,cAAc,EACd,MAAM,kBAAkB,CAAC;AAK1B,OAAO,iBAAiB,CAAC;AAEzB,OAAO,EAEN,KAAK,cAAc,EACnB,KAAK,mBAAmB,IAAI,mBAAmB,EAC/C,MAAM,aAAa,CAAC;AAIrB,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,KAAK,QAAQ,EAAe,MAAM,oBAAoB,CAAC;AAEhE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,eAAO,MAAM,MAAM,8BAAiC,CAAC;AAErD,MAAM,MAAM,qBAAqB,GAAG;IACnC,cAAc,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AACF,MAAM,MAAM,aAAa,GAAG;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,QAAQ,CAAC;IAClB,QAAQ,EAAE,cAAc,CAAC;CACzB,GAAG,qBAAqB,CAAC;AAC1B,KAAK,aAAa,GAAG;IAAE,MAAM,CAAC,EAAE,cAAc,GAAG,mBAAmB,CAAA;CAAE,CAAC;AACvE,KAAK,mBAAmB,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAC/C,MAAM,MAAM,qBAAqB,GAAG,CAAC,mBAAmB,GAAG,aAAa,CAAC,GAAG;IAC3E,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,qBAAqB,CAAC;AAqB1B,qBAAa,OAAQ,YAAW,aAAa;IAC5C,OAAO,EAAE,cAAc,CAAC;IAExB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,eAAe,CAAC,CAAkB;IAG1C,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,QAAQ,CAAiB;gBAErB,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa;WAsB7C,MAAM,CAAC,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,OAAO,CAAC;IAwG1E,IAAI,MAAM,IAAI,cAAc,CAE3B;IAED,IAAI,QAAQ,IAAI,cAAc,CAE7B;IAED,IAAI,MAAM,uCAET;IAED,IAAI,QAAQ;;;mDAEX;IAED,IAAI,OAAO,IAAI,cAAc,CAE5B;IAED,aAAa,IAAI,SAAS,EAAE;IAG5B;;OAEG;IACG,IAAI,CACT,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,EAAE,GAAG,aAAa,GACvD,OAAO,CAAC,OAAO,CAAC;IAoBb,KAAK;IAQL,IAAI;IAWJ,SAAS;IA0Bf;;;;;;OAMG;IAEG,IAAI,CAAC,CAAC,SAAS,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAC3C,cAAc,EAAE,CAAC,GAAG,OAAO,GAAG,MAAM,EACpC,OAAO,GAAE,WAAW,CAAC,CAAC,CAAM,GAC1B,OAAO,CAAC,CAAC,CAAC;IAMb,IAAI,OAAO,aAEV;CACD"}
+{"version":3,"file":"peer.d.ts","sourceRoot":"","sources":["../../src/peer.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,CAAC;AACzB,OAAO,EACN,KAAK,SAAS,EAGd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,KAAK,QAAQ,EAAe,MAAM,oBAAoB,CAAC;AAEhE,OAAO,EAAE,cAAc,EAAoB,MAAM,iBAAiB,CAAC;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAI1D,OAAO,EACN,KAAK,OAAO,EACZ,KAAK,WAAW,EAChB,KAAK,WAAW,EAChB,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,cAAc,EACd,MAAM,kBAAkB,CAAC;AAQ1B,OAAO,EAEN,KAAK,cAAc,EACnB,KAAK,0BAA0B,EAE/B,MAAM,aAAa,CAAC;AAErB,eAAO,MAAM,MAAM,8BAAiC,CAAC;AAErD,MAAM,MAAM,qBAAqB,GAAG;IACnC,cAAc,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AACF,MAAM,MAAM,aAAa,GAAG;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,QAAQ,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,cAAc,CAAC;CACzB,GAAG,qBAAqB,CAAC;AAC1B,KAAK,aAAa,GAAG;IAAE,MAAM,CAAC,EAAE,cAAc,GAAG,0BAA0B,CAAA;CAAE,CAAC;AAC9E,KAAK,mBAAmB,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAC/C,MAAM,MAAM,qBAAqB,GAAG,CAAC,mBAAmB,GAAG,aAAa,CAAC,GAAG;IAC3E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;CAC7D,GAAG,qBAAqB,CAAC;AAqB1B,qBAAa,OAAQ,YAAW,aAAa;IAC5C,OAAO,EAAE,cAAc,CAAC;IAExB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,eAAe,CAAC,CAAkB;IAG1C,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,QAAQ,CAAiB;gBAErB,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa;WAuB7C,MAAM,CAAC,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,OAAO,CAAC;IAiH1E,IAAI,MAAM,IAAI,cAAc,CAE3B;IAED,IAAI,QAAQ,IAAI,cAAc,CAE7B;IAED,IAAI,MAAM,uCAET;IAED,IAAI,QAAQ;;;mDAEX;IAED,IAAI,OAAO,IAAI,cAAc,CAE5B;IAED,aAAa,IAAI,SAAS,EAAE;IAG5B;;OAEG;IACG,IAAI,CACT,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,EAAE,GAAG,aAAa,GACvD,OAAO,CAAC,OAAO,CAAC;IAoBb,KAAK;IASL,IAAI;IAYJ,SAAS;IA0Bf;;;;;;OAMG;IAEG,IAAI,CAAC,CAAC,SAAS,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAC3C,cAAc,EAAE,CAAC,GAAG,OAAO,GAAG,MAAM,EACpC,OAAO,GAAE,WAAW,CAAC,CAAC,CAAM,GAC1B,OAAO,CAAC,CAAC,CAAC;IAMb,IAAI,OAAO,aAEV;IAED,IAAI,OAAO,YAEV;CACD"}

package/dist/src/peer.js

@@ -1,20 +1,19 @@
-import { multiaddr, isMultiaddr } from "@multiformats/multiaddr";
+import "@libp2p/peer-id";
+import { isMultiaddr, multiaddr, } from "@multiformats/multiaddr";
+import { createStore } from "@peerbit/any-store";
+import { DirectBlock } from "@peerbit/blocks";
 import { Ed25519Keypair, Ed25519PublicKey } from "@peerbit/crypto";
-import { Program, ProgramHandler } from "@peerbit/program";
+import { create as createSQLiteIndexer } from "@peerbit/indexer-sqlite3";
+import { DefaultKeychain } from "@peerbit/keychain";
+import { logger as loggerFn } from "@peerbit/logger";
+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 { createLibp2pExtended } from "./libp2p.js";
-import { DirectBlock } from "@peerbit/blocks";
 import { LevelDatastore } from "datastore-level";
-import { logger as loggerFn } from "@peerbit/logger";
-import {} from "@peerbit/program";
+import sodium from "libsodium-wrappers";
+import path from "path-browserify";
 import { resolveBootstrapAddresses } from "./bootstrap.js";
-import { createStore } from "@peerbit/any-store";
-import { DefaultKeychain } from "@peerbit/keychain";
-import {} from "@peerbit/program";
+import { createLibp2pExtended, } from "./libp2p.js";
 export const logger = loggerFn({ module: "client" });
 const isLibp2pInstance = (libp2p) => !!libp2p.getMultiaddrs;
 const createCache = async (directory, options) => {
@@ -32,6 +31,7 @@ export class Peerbit {
     _libp2p;
     directory;
     _storage;
+    _indexer;
     _libp2pExternal = false;
     // Libp2p peerid in Identity form
     _identity;
@@ -52,6 +52,7 @@ export class Peerbit {
         this.directory = options.directory;
         this._storage = options.storage;
         this._libp2pExternal = options.libp2pExternal;
+        this._indexer = options.indexer;
     }
     static async create(options = {}) {
         await sodium.ready; // Some of the modules depends on sodium to be readyy
@@ -61,6 +62,10 @@ export class Peerbit {
         const directory = options.directory;
         const hasDir = directory != null;
         const storage = await createCache(directory != null ? path.join(directory, "/cache") : undefined);
+        const indexerFn = options.indexer || createSQLiteIndexer;
+        const indexer = directory != null
+            ? await indexerFn(path.join(directory, "/index"))
+            : await indexerFn();
         const blocksDirectory = hasDir
             ? path.join(directory, "/blocks").toString()
             : undefined;
@@ -76,8 +81,10 @@ export class Peerbit {
         const libp2pExternal = libp2pExtended && isLibp2pInstance(libp2pExtended);
         if (!libp2pExternal) {
             const extendedOptions = libp2pExtended;
+            const store = createStore(keychainDirectory);
+            await store.open();
             const keychain = new DefaultKeychain({
-                store: createStore(keychainDirectory)
+                store,
             });
             const peerId = extendedOptions?.peerId ||
                 (await (await keychain.exportById(SELF_IDENTITY_KEY_ID, Ed25519Keypair))?.toPeerId());
@@ -88,12 +95,12 @@ export class Peerbit {
                     keychain: (c) => keychain,
                     blocks: (c) => new DirectBlock(c, {
                         canRelayMessage: asRelay,
-                        directory: blocksDirectory
+                        directory: blocksDirectory,
                     }),
                     pubsub: (c) => new DirectSub(c, { canRelayMessage: asRelay }),
-                    ...extendedOptions?.services
-                },
-                datastore
+                    ...extendedOptions?.services,
+                }, // TODO types are funky
+                datastore,
             });
         }
         if (datastore) {
@@ -115,11 +122,11 @@ export class Peerbit {
         try {
             await libp2pExtended.services.keychain.import({
                 keypair: identity,
-                id: SELF_IDENTITY_KEY_ID
+                id: SELF_IDENTITY_KEY_ID,
             });
         }
         catch (error) {
-            if (error.code == "ERR_KEY_ALREADY_EXISTS") {
+            if (error.code === "ERR_KEY_ALREADY_EXISTS") {
                 // Do nothing
             }
             else {
@@ -128,9 +135,10 @@ export class Peerbit {
         }
         const peer = new Peerbit(libp2pExtended, {
             directory,
-            storage: storage,
+            storage,
             libp2pExternal,
-            identity
+            identity,
+            indexer,
         });
         return peer;
     }
@@ -156,7 +164,7 @@ export class Peerbit {
      * Dial a peer with an Ed25519 peerId
      */
     async dial(address) {
-        const maddress = typeof address == "string"
+        const maddress = typeof address === "string"
             ? multiaddr(address)
             : isMultiaddr(address) || Array.isArray(address)
                 ? address
@@ -169,6 +177,7 @@ export class Peerbit {
     }
     async start() {
         await this._storage.open();
+        await this.indexer.start();
         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();
@@ -177,6 +186,7 @@ export class Peerbit {
     async stop() {
         await this._handler?.stop();
         await this._storage.close();
+        await this.indexer.stop();
         // Close libp2p (after above)
         if (!this._libp2pExternal) {
             // only close it if we created it
@@ -218,5 +228,8 @@ export class Peerbit {
     get storage() {
         return this._storage;
     }
+    get indexer() {
+        return this._indexer;
+    }
 }
 //# sourceMappingURL=peer.js.map

package/dist/src/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":"AAAA,OAAO,iBAAiB,CAAC;AACzB,OAAO,EAEN,WAAW,EACX,SAAS,GACT,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAiB,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAAE,MAAM,IAAI,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,MAAM,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAMN,cAAc,GACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,IAAI,MAAM,iBAAiB,CAAC;AACnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAIN,oBAAoB,GACpB,MAAM,aAAa,CAAC;AAErB,MAAM,CAAC,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;AAkBrD,MAAM,gBAAgB,GAAG,CAAC,MAA4C,EAAE,EAAE,CACzE,CAAC,CAAE,MAAiB,CAAC,aAAa,CAAC;AAEpC,MAAM,WAAW,GAAG,KAAK,EACxB,SAA6B,EAC7B,OAA6B,EAC5B,EAAE;IACH,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;IAErC,uCAAuC;IACvC,IAAI,KAAK;QAAE,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;IAC9B,IAAI,OAAO,EAAE,KAAK,EAAE,CAAC;QACpB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;AAElE,MAAM,OAAO,OAAO;IACnB,OAAO,CAAiB;IAExB,SAAS,CAAU;IAEX,QAAQ,CAAW;IACnB,QAAQ,CAAU;IAClB,eAAe,GAAa,KAAK,CAAC;IAE1C,iCAAiC;IACzB,SAAS,CAAiB;IAC1B,QAAQ,CAAiB;IAEjC,YAAY,MAAsB,EAAE,OAAsB;QACzD,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CACd,iDAAiD;gBAChD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CACxB,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACvD,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;QAChC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;QAC9C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,UAAiC,EAAE;QACtD,MAAM,MAAM,CAAC,KAAK,CAAC,CAAC,qDAAqD;QAEzE,IAAI,cAAc,GAAgC,OAAyB;aACzE,MAAwB,CAAC;QAE3B,MAAM,OAAO,GAAI,OAA+B,CAAC,KAAK,CAAC;QAEvD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACpC,MAAM,MAAM,GAAG,SAAS,IAAI,IAAI,CAAC;QAEjC,MAAM,OAAO,GAAG,MAAM,WAAW,CAChC,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAC9D,CAAC;QAEF,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,IAAI,mBAAmB,CAAC;QACzD,MAAM,OAAO,GACZ,SAAS,IAAI,IAAI;YAChB,CAAC,CAAC,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YACjD,CAAC,CAAC,MAAM,SAAS,EAAE,CAAC;QAEtB,MAAM,eAAe,GAAG,MAAM;YAC7B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,EAAE;YAC5C,CAAC,CAAC,SAAS,CAAC;QAEb,MAAM,iBAAiB,GAAG,MAAM;YAC/B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,QAAQ,EAAE;YAC9C,CAAC,CAAC,SAAS,CAAC;QAEb,MAAM,SAAS,GAAG,MAAM;YACvB,CAAC,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;YAChE,CAAC,CAAC,SAAS,CAAC;QAEb,IAAI,SAAS,EAAE,CAAC;YACf,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;QACxB,CAAC;QAED,MAAM,cAAc,GAAG,cAAc,IAAI,gBAAgB,CAAC,cAAc,CAAC,CAAC;QAC1E,IAAI,CAAC,cAAc,EAAE,CAAC;YACrB,MAAM,eAAe,GACpB,cAA4C,CAAC;YAC9C,MAAM,KAAK,GAAG,WAAW,CAAC,iBAAiB,CAAC,CAAC;YAC7C,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;YAEnB,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC;gBACpC,KAAK;aACL,CAAC,CAAC;YACH,MAAM,MAAM,GACX,eAAe,EAAE,MAAM;gBACvB,CAAC,MAAM,CACN,MAAM,QAAQ,CAAC,UAAU,CAAC,oBAAoB,EAAE,cAAc,CAAC,CAC/D,EAAE,QAAQ,EAAE,CAAC,CAAC;YAChB,cAAc,GAAG,MAAM,oBAAoB,CAAC;gBAC3C,GAAG,eAAe;gBAClB,MAAM;gBACN,QAAQ,EAAE;oBACT,QAAQ,EAAE,CAAC,CAAM,EAAE,EAAE,CAAC,QAAQ;oBAC9B,MAAM,EAAE,CAAC,CAAM,EAAE,EAAE,CAClB,IAAI,WAAW,CAAC,CAAC,EAAE;wBAClB,eAAe,EAAE,OAAO;wBACxB,SAAS,EAAE,eAAe;qBAC1B,CAAC;oBACH,MAAM,EAAE,CAAC,CAAM,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,CAAC,EAAE,EAAE,eAAe,EAAE,OAAO,EAAE,CAAC;oBAClE,GAAG,eAAe,EAAE,QAAQ;iBACrB,EAAE,uBAAuB;gBACjC,SAAS;aACT,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,SAAS,EAAE,CAAC;YACf,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACxD,cAAc,CAAC,IAAI,GAAG,KAAK,IAAI,EAAE;gBAChC,MAAM,MAAM,EAAE,CAAC;gBACf,MAAM,SAAS,EAAE,KAAK,EAAE,CAAC;YAC1B,CAAC,CAAC;QACH,CAAC;QAED,IACC,cAAc,CAAC,MAAM,KAAK,SAAS;YACnC,cAAc,CAAC,MAAM,KAAK,UAAU,EACnC,CAAC;YACF,MAAM,cAAc,CAAC,KAAK,EAAE,CAAC;QAC9B,CAAC;QAED,IAAI,cAAc,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC9C,MAAM,IAAI,KAAK,CACd,iDAAiD;gBAChD,cAAc,CAAC,MAAM,CAAC,IAAI,CAC3B,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GAAG,cAAc,CAAC,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAClE,IAAI,CAAC;YACJ,MAAM,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC7C,OAAO,EAAE,QAAQ;gBACjB,EAAE,EAAE,oBAAoB;aACxB,CAAC,CAAC;QACJ,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACrB,IAAI,KAAK,CAAC,IAAI,KAAK,wBAAwB,EAAE,CAAC;gBAC7C,aAAa;YACd,CAAC;iBAAM,CAAC;gBACP,MAAM,KAAK,CAAC;YACb,CAAC;QACF,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,OAAO,CAAC,cAAc,EAAE;YACxC,SAAS;YACT,OAAO;YACP,cAAc;YACd,QAAQ;YACR,OAAO;SACP,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACb,CAAC;IACD,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAED,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAED,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;IAC7B,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAED,aAAa;QACZ,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;IACpC,CAAC;IACD;;OAEG;IACH,KAAK,CAAC,IAAI,CACT,OAAyD;QAEzD,MAAM,QAAQ,GACb,OAAO,OAAO,KAAK,QAAQ;YAC1B,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC;YACpB,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;gBAC/C,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QAC7B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,gBAAgB,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAErE,0FAA0F;QAC1F,OAAO,CACN,CAAC,MAAM,OAAO,CACb,GAAG,EAAE,CACJ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YAC3D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAC5D,CAAC,IAAI,KAAK,CACX,CAAC;IACH,CAAC;IAED,KAAK,CAAC,KAAK;QACV,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC3B,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAE3B,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAC3E,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,CAAC,uDAAuD;YACrF,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC5B,CAAC;IACF,CAAC;IACD,KAAK,CAAC,IAAI;QACT,MAAM,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;QAC5B,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAC5B,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAE1B,6BAA6B;QAC7B,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;YAC3B,iCAAiC;YACjC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC1B,CAAC;IACF,CAAC;IAED,KAAK,CAAC,SAAS;QACd,MAAM,SAAS,GAAG,MAAM,yBAAyB,EAAE,CAAC;QACpD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CACvC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAClC,CAAC;QACF,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,KAAK,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YAC7C,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;gBACnC,IAAI,GAAG,IAAI,CAAC;YACb,CAAC;iBAAM,CAAC;gBACP,MAAM,CAAC,IAAI,CACV,uCAAuC;oBACtC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;oBAC5B,YAAY;oBACZ,MAAM,CAAC,MAAM,CACd,CAAC;YACH,CAAC;QACF,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QACjE,CAAC;IACF,CAAC;IAED;;;;;;OAMG;IAEH,KAAK,CAAC,IAAI,CACT,cAAoC,EACpC,UAA0B,EAAE;QAE5B,OAAO,CACN,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,cAAc,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CACvE,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;CACD"}

package/dist/src/transports.browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transports.browser.d.ts","sourceRoot":"","sources":["../../src/transports.browser.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,UAAU,8SAMtB,CAAC;AAEF,eAAO,MAAM,KAAK,WAAyB,CAAC;AAE5C,eAAO,MAAM,MAAM,EAAE,MAAM,MAAM,EAAE,GAAG,SAA6B,CAAC"}
+{"version":3,"file":"transports.browser.d.ts","sourceRoot":"","sources":["../../src/transports.browser.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,UAAU,8SAOtB,CAAC;AAEF,eAAO,MAAM,KAAK,QAAsB,GAAG,CAAC;AAE5C,eAAO,MAAM,MAAM,EAAE,MAAM,MAAM,EAAE,GAAG,SAA6B,CAAC"}

package/dist/src/transports.browser.js

@@ -1,13 +1,14 @@
-import { webSockets } from "@libp2p/websockets";
 import { circuitRelayTransport } from "@libp2p/circuit-relay-v2";
 import { webRTC } from "@libp2p/webrtc";
+import { webSockets } from "@libp2p/websockets";
 import { all } from "@libp2p/websockets/filters";
 export const transports = () => [
     webSockets({ filter: all }),
     circuitRelayTransport({
-        discoverRelays: 1
+        discoverRelays: 1,
+        reservationCompletionTimeout: 5000,
     }),
-    webRTC({})
+    webRTC({}),
 ];
 export const relay = () => undefined;
 export const listen = () => ["/webrtc"];

package/dist/src/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,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,SAAgB,CAAC;AAE5C,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,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,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;QACjB,4BAA4B,EAAE,IAAI;KAClC,CAAC;IACF,MAAM,CAAC,EAAE,CAAC;CACV,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,SAAgB,CAAC;AAE5C,MAAM,CAAC,MAAM,MAAM,GAA+B,GAAG,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC"}

package/dist/src/transports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transports.d.ts","sourceRoot":"","sources":["../../src/transports.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,UAAU,yPAItB,CAAC;AACF,eAAO,MAAM,KAAK,+JAC8C,CAAC;AAEjE,eAAO,MAAM,MAAM,EAAE,MAAM,MAAM,EAAE,GAAG,SAGrC,CAAC"}
+{"version":3,"file":"transports.d.ts","sourceRoot":"","sources":["../../src/transports.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,UAAU,yPAMtB,CAAC;AACF,eAAO,MAAM,KAAK,+JAIf,CAAC;AAEJ,eAAO,MAAM,MAAM,EAAE,MAAM,MAAM,EAAE,GAAG,SAGrC,CAAC"}

package/dist/src/transports.js

@@ -1,16 +1,21 @@
-import { webSockets } from "@libp2p/websockets";
-import { circuitRelayTransport } from "@libp2p/circuit-relay-v2";
+import { circuitRelayServer, circuitRelayTransport, } from "@libp2p/circuit-relay-v2";
 import { tcp } from "@libp2p/tcp";
-import { circuitRelayServer } from "@libp2p/circuit-relay-v2";
+import { webSockets } from "@libp2p/websockets";
 import { all } from "@libp2p/websockets/filters";
 export const transports = () => [
     webSockets({ filter: all }),
-    circuitRelayTransport(),
-    tcp()
+    circuitRelayTransport({
+        reservationCompletionTimeout: 5000,
+    }),
+    tcp(),
 ];
-export const relay = () => circuitRelayServer({ reservations: { maxReservations: 1000 } });
+export const relay = () => 
+// applyDefaultLimit: false because of https://github.com/libp2p/js-libp2p/issues/2622
+circuitRelayServer({
+    reservations: { applyDefaultLimit: false, maxReservations: 1000 },
+});
 export const listen = () => [
     "/ip4/127.0.0.1/tcp/0",
-    "/ip4/127.0.0.1/tcp/0/ws"
+    "/ip4/127.0.0.1/tcp/0/ws",
 ];
 //# sourceMappingURL=transports.js.map

package/dist/src/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,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"}
+{"version":3,"file":"transports.js","sourceRoot":"","sources":["../../src/transports.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,kBAAkB,EAClB,qBAAqB,GACrB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,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,4BAA4B,EAAE,IAAI;KAClC,CAAC;IACF,GAAG,EAAE;CACL,CAAC;AACF,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,EAAE;AACzB,sFAAsF;AACtF,kBAAkB,CAAC;IAClB,YAAY,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE;CACjE,CAAC,CAAC;AAEJ,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": "4.0.7-aa577a5",
+  "version": "4.0.7-cccc078",
   "description": "Peerbit client",
   "author": "dao.xyz",
   "license": "MIT",
@@ -37,7 +37,7 @@
     }
   },
   "eslintConfig": {
-    "extends": "ipfs",
+    "extends": "peerbit",
     "parserOptions": {
       "project": true,
       "sourceType": "module"
@@ -62,21 +62,23 @@
     "./dist/src/transports.js": "./dist/src/transports.browser.js"
   },
   "dependencies": {
-    "@dao-xyz/borsh": "^5.2.2",
-    "@peerbit/any-store": "2.0.2-aa577a5",
-    "@peerbit/crypto": "2.2.0-aa577a5",
-    "@peerbit/logger": "1.0.2-aa577a5",
-    "@peerbit/program": "4.0.7-aa577a5",
-    "@peerbit/pubsub": "3.0.5-aa577a5",
-    "@peerbit/blocks": "2.0.32-aa577a5",
+    "@dao-xyz/borsh": "^5.2.3",
+    "@peerbit/any-store": "2.0.2-cccc078",
+    "@peerbit/crypto": "2.2.0-cccc078",
+    "@peerbit/logger": "1.0.2-cccc078",
+    "@peerbit/program": "4.0.7-cccc078",
+    "@peerbit/pubsub": "3.0.5-cccc078",
+    "@peerbit/blocks": "2.0.32-cccc078",
+    "@peerbit/indexer-simple": "0.0.1-cccc078",
+    "@peerbit/indexer-sqlite3": "0.0.1-cccc078",
     "datastore-level": "^10.1.5",
     "@dao-xyz/libp2p-noise": "^14.1.2",
     "@chainsafe/libp2p-yamux": "^6.0.2",
-    "@libp2p/webrtc": "^4.0.17",
-    "@libp2p/websockets": "^8.0.15",
-    "@libp2p/identify": "^1.0.12",
-    "@libp2p/circuit-relay-v2": "^1.0.13",
-    "@libp2p/tcp": "^9.0.15",
+    "@libp2p/webrtc": "^4.1.1",
+    "@libp2p/websockets": "^8.1.2",
+    "@libp2p/identify": "^2.1.2",
+    "@libp2p/circuit-relay-v2": "^1.1.2",
+    "@libp2p/tcp": "^9.1.1",
     "level": "^8.0.0",
     "memory-level": "^1.0.0",
     "path-browserify": "^1.0.1"
@@ -89,7 +91,8 @@
   "scripts": {
     "clean": "aegir clean",
     "build": "aegir build --no-bundle",
-    "test": "aegir test -t node"
+    "test": "aegir test -t node",
+    "lint": "aegir lint"
   },
   "localMaintainers": [
     "dao.xyz"

package/src/bootstrap.ts

@@ -1,11 +1,11 @@
 export const resolveBootstrapAddresses = async (
-	v: string = "4"
+	v: string = "4",
 ): Promise<string[]> => {
 	// Bootstrap addresses for network
 	return (
 		await (
 			await fetch(
-				`https://raw.githubusercontent.com/dao-xyz/peerbit-bootstrap/master/bootstrap${v ? "-" + v : ""}.env`
+				`https://raw.githubusercontent.com/dao-xyz/peerbit-bootstrap/master/bootstrap${v ? "-" + v : ""}.env`,
 			)
 		).text()
 	)

package/src/index.ts

@@ -4,5 +4,5 @@ export {
 	type Libp2pExtendServices,
 	type Libp2pExtended,
 	type Libp2pCreateOptions,
-	type Libp2pCreateOptionsWithServices
+	type Libp2pCreateOptionsWithServices,
 } from "./libp2p.js";

package/src/libp2p.ts

@@ -1,12 +1,17 @@
-import { createLibp2p, type Libp2p, type Libp2pOptions, type ServiceFactoryMap } from "libp2p";
-import { DirectSub } from "@peerbit/pubsub";
-import { DirectBlock } from "@peerbit/blocks";
+import { yamux } from "@chainsafe/libp2p-yamux";
 import { noise } from "@dao-xyz/libp2p-noise";
-import { transports, relay, listen } from "./transports.js";
-import { identify } from "@libp2p/identify";
 import type { CircuitRelayService } from "@libp2p/circuit-relay-v2";
-import { yamux } from "@chainsafe/libp2p-yamux";
+import { identify } from "@libp2p/identify";
+import { DirectBlock } from "@peerbit/blocks";
 import { DefaultKeychain, type Keychain } from "@peerbit/keychain";
+import { DirectSub } from "@peerbit/pubsub";
+import {
+	type Libp2p,
+	type Libp2pOptions,
+	type ServiceFactoryMap,
+	createLibp2p,
+} from "libp2p";
+import { listen, relay, transports } from "./transports.js";
 
 export type Libp2pExtendServices = {
 	pubsub: DirectSub;
@@ -18,7 +23,11 @@ export type Libp2pExtended = Libp2p<
 >;
 
 export type Libp2pCreateOptions = Libp2pOptions<
-	Libp2pExtendServices & { relay: CircuitRelayService; identify: any }
+	Partial<Libp2pExtendServices & { relay: CircuitRelayService; identify: any }>
+>;
+
+export type PartialLibp2pCreateOptions = Libp2pOptions<
+	Partial<Libp2pExtendServices & { relay: CircuitRelayService; identify: any }>
 >;
 
 export type Libp2pCreateOptionsWithServices = Libp2pCreateOptions & {
@@ -26,52 +35,53 @@ export type Libp2pCreateOptionsWithServices = Libp2pCreateOptions & {
 };
 
 export const createLibp2pExtended = (
-	opts: Libp2pCreateOptions = {
+	opts: PartialLibp2pCreateOptions = {
 		services: {
-			blocks: (c) => new DirectBlock(c),
-			pubsub: (c) => new DirectSub(c),
-			keychain: (c) => new DefaultKeychain()
-		}
-	}
+			blocks: (c: any) => new DirectBlock(c),
+			pubsub: (c: any) => new DirectSub(c),
+			keychain: () => new DefaultKeychain(),
+		},
+	},
 ): Promise<Libp2pExtended> => {
-	const relayIdentify: any = {
-		relay: relay(),
-		identify: identify()
-	};
+	let extraServices: any = {};
 
-	// https://github.com/libp2p/js-libp2p/issues/1757
-	Object.keys(relayIdentify).forEach((key) => {
-		if (relayIdentify[key] === undefined) {
-			delete relayIdentify[key];
+	if (!opts.services?.["relay"]) {
+		const relayComponent = relay();
+		if (relayComponent) {
+			// will be null in browser
+			extraServices["relay"] = relayComponent;
 		}
-	});
+	}
+	if (!opts.services?.["identify"]) {
+		extraServices["identify"] = identify();
+	}
 
 	return createLibp2p({
 		...opts,
 		connectionManager: {
 			minConnections: 0,
-			...opts.connectionManager
+			...opts.connectionManager,
 		},
 		addresses: {
 			listen: listen(),
-			...opts.addresses
+			...opts.addresses,
 		},
 		transports: opts.transports || transports(),
 		connectionEncryption: opts.connectionEncryption || [noise()],
 		streamMuxers: opts.streamMuxers || [yamux()],
 		services: {
-			...relayIdentify,
 			pubsub:
 				opts.services?.pubsub ||
 				((c) =>
 					new DirectSub(c, {
-						canRelayMessage: true
+						canRelayMessage: true,
 						// auto dial true
 						// auto prune true
 					})),
 			blocks: opts.services?.blocks || ((c) => new DirectBlock(c)),
 			keychain: opts.services?.keychain || ((c) => new DefaultKeychain()),
-			...opts.services
-		}
+			...opts.services,
+			...extraServices,
+		},
 	});
 };

package/src/peer.ts

@@ -1,31 +1,37 @@
-import { multiaddr, type Multiaddr, isMultiaddr } from "@multiformats/multiaddr";
-import type { Libp2p } from "libp2p";
+import "@libp2p/peer-id";
+import {
+	type Multiaddr,
+	isMultiaddr,
+	multiaddr,
+} from "@multiformats/multiaddr";
+import { type AnyStore, createStore } from "@peerbit/any-store";
+import { DirectBlock } from "@peerbit/blocks";
 import { Ed25519Keypair, Ed25519PublicKey } from "@peerbit/crypto";
+import type { Indices } from "@peerbit/indexer-interface";
+import { create as createSQLiteIndexer } from "@peerbit/indexer-sqlite3";
+import { DefaultKeychain } from "@peerbit/keychain";
+import { logger as loggerFn } from "@peerbit/logger";
 import {
-	Program,
 	type Address,
+	type ExtractArgs,
+	type OpenOptions,
+	type Program,
 	type ProgramClient,
-	ProgramHandler
+	ProgramHandler,
 } from "@peerbit/program";
 import { DirectSub } from "@peerbit/pubsub";
+import { waitFor } from "@peerbit/time";
+import { LevelDatastore } from "datastore-level";
+import type { Libp2p } from "libp2p";
 import sodium from "libsodium-wrappers";
 import path from "path-browserify";
-import { waitFor } from "@peerbit/time";
-import "@libp2p/peer-id";
-
+import { resolveBootstrapAddresses } from "./bootstrap.js";
 import {
-	createLibp2pExtended,
+	type Libp2pCreateOptions as ClientCreateOptions,
 	type Libp2pExtended,
-	type Libp2pCreateOptions as ClientCreateOptions
+	type PartialLibp2pCreateOptions,
+	createLibp2pExtended,
 } from "./libp2p.js";
-import { DirectBlock } from "@peerbit/blocks";
-import { LevelDatastore } from "datastore-level";
-import { logger as loggerFn } from "@peerbit/logger";
-import { type OpenOptions } from "@peerbit/program";
-import { resolveBootstrapAddresses } from "./bootstrap.js";
-import { type AnyStore, createStore } from "@peerbit/any-store";
-import { DefaultKeychain } from "@peerbit/keychain";
-import { type ExtractArgs } from "@peerbit/program";
 
 export const logger = loggerFn({ module: "client" });
 
@@ -35,12 +41,14 @@ export type OptionalCreateOptions = {
 export type CreateOptions = {
 	directory?: string;
 	storage: AnyStore;
+	indexer: Indices;
 	identity: Ed25519Keypair;
 } & OptionalCreateOptions;
-type Libp2pOptions = { libp2p?: Libp2pExtended | ClientCreateOptions };
+type Libp2pOptions = { libp2p?: Libp2pExtended | PartialLibp2pCreateOptions };
 type SimpleLibp2pOptions = { relay?: boolean };
 export type CreateInstanceOptions = (SimpleLibp2pOptions | Libp2pOptions) & {
 	directory?: string;
+	indexer?: (directory?: string) => Promise<Indices> | Indices;
 } & OptionalCreateOptions;
 
 const isLibp2pInstance = (libp2p: Libp2pExtended | ClientCreateOptions) =>
@@ -48,7 +56,7 @@ const isLibp2pInstance = (libp2p: Libp2pExtended | ClientCreateOptions) =>
 
 const createCache = async (
 	directory: string | undefined,
-	options?: { reset?: boolean }
+	options?: { reset?: boolean },
 ) => {
 	const cache = createStore(directory);
 
@@ -68,6 +76,7 @@ export class Peerbit implements ProgramClient {
 	directory?: string;
 
 	private _storage: AnyStore;
+	private _indexer: Indices;
 	private _libp2pExternal?: boolean = false;
 
 	// Libp2p peerid in Identity form
@@ -82,7 +91,7 @@ export class Peerbit implements ProgramClient {
 		if (this.libp2p.peerId.type !== "Ed25519") {
 			throw new Error(
 				"Unsupported id type, expecting Ed25519 but got " +
-				this.libp2p.peerId.type
+					this.libp2p.peerId.type,
 			);
 		}
 
@@ -94,6 +103,7 @@ export class Peerbit implements ProgramClient {
 		this.directory = options.directory;
 		this._storage = options.storage;
 		this._libp2pExternal = options.libp2pExternal;
+		this._indexer = options.indexer;
 	}
 
 	static async create(options: CreateInstanceOptions = {}): Promise<Peerbit> {
@@ -101,15 +111,22 @@ export class Peerbit implements ProgramClient {
 
 		let libp2pExtended: Libp2pExtended | undefined = (options as Libp2pOptions)
 			.libp2p as Libp2pExtended;
+
 		const asRelay = (options as SimpleLibp2pOptions).relay;
 
 		const directory = options.directory;
 		const hasDir = directory != null;
 
 		const storage = await createCache(
-			directory != null ? path.join(directory, "/cache") : undefined
+			directory != null ? path.join(directory, "/cache") : undefined,
 		);
 
+		const indexerFn = options.indexer || createSQLiteIndexer;
+		const indexer =
+			directory != null
+				? await indexerFn(path.join(directory, "/index"))
+				: await indexerFn();
+
 		const blocksDirectory = hasDir
 			? path.join(directory, "/blocks").toString()
 			: undefined;
@@ -119,9 +136,7 @@ export class Peerbit implements ProgramClient {
 			: undefined;
 
 		const datastore = hasDir
-			? new LevelDatastore(
-				path.join(directory, "/libp2p").toString()
-			)
+			? new LevelDatastore(path.join(directory, "/libp2p").toString())
 			: undefined;
 
 		if (datastore) {
@@ -132,8 +147,11 @@ export class Peerbit implements ProgramClient {
 		if (!libp2pExternal) {
 			const extendedOptions: ClientCreateOptions | undefined =
 				libp2pExtended as any as ClientCreateOptions;
+			const store = createStore(keychainDirectory);
+			await store.open();
+
 			const keychain = new DefaultKeychain({
-				store: createStore(keychainDirectory)
+				store,
 			});
 			const peerId =
 				extendedOptions?.peerId ||
@@ -144,16 +162,16 @@ export class Peerbit implements ProgramClient {
 				...extendedOptions,
 				peerId,
 				services: {
-					keychain: (c) => keychain,
-					blocks: (c) =>
+					keychain: (c: any) => keychain,
+					blocks: (c: any) =>
 						new DirectBlock(c, {
 							canRelayMessage: asRelay,
-							directory: blocksDirectory
+							directory: blocksDirectory,
 						}),
-					pubsub: (c) => new DirectSub(c, { canRelayMessage: asRelay }),
-					...extendedOptions?.services
-				},
-				datastore
+					pubsub: (c: any) => new DirectSub(c, { canRelayMessage: asRelay }),
+					...extendedOptions?.services,
+				} as any, // TODO types are funky
+				datastore,
 			});
 		}
 		if (datastore) {
@@ -174,7 +192,7 @@ export class Peerbit implements ProgramClient {
 		if (libp2pExtended.peerId.type !== "Ed25519") {
 			throw new Error(
 				"Unsupported id type, expecting Ed25519 but got " +
-				libp2pExtended.peerId.type
+					libp2pExtended.peerId.type,
 			);
 		}
 
@@ -182,10 +200,10 @@ export class Peerbit implements ProgramClient {
 		try {
 			await libp2pExtended.services.keychain.import({
 				keypair: identity,
-				id: SELF_IDENTITY_KEY_ID
+				id: SELF_IDENTITY_KEY_ID,
 			});
 		} catch (error: any) {
-			if (error.code == "ERR_KEY_ALREADY_EXISTS") {
+			if (error.code === "ERR_KEY_ALREADY_EXISTS") {
 				// Do nothing
 			} else {
 				throw error;
@@ -194,9 +212,10 @@ export class Peerbit implements ProgramClient {
 
 		const peer = new Peerbit(libp2pExtended, {
 			directory,
-			storage: storage,
+			storage,
 			libp2pExternal,
-			identity
+			identity,
+			indexer,
 		});
 		return peer;
 	}
@@ -227,10 +246,10 @@ export class Peerbit implements ProgramClient {
 	 * Dial a peer with an Ed25519 peerId
 	 */
 	async dial(
-		address: string | Multiaddr | Multiaddr[] | ProgramClient
+		address: string | Multiaddr | Multiaddr[] | ProgramClient,
 	): Promise<boolean> {
 		const maddress =
-			typeof address == "string"
+			typeof address === "string"
 				? multiaddr(address)
 				: isMultiaddr(address) || Array.isArray(address)
 					? address
@@ -243,13 +262,14 @@ export class Peerbit implements ProgramClient {
 			(await waitFor(
 				() =>
 					this.libp2p.services.pubsub.peers.has(publicKey.hashcode()) &&
-					this.libp2p.services.blocks.peers.has(publicKey.hashcode())
+					this.libp2p.services.blocks.peers.has(publicKey.hashcode()),
 			)) || false
 		);
 	}
 
 	async start() {
 		await this._storage.open();
+		await this.indexer.start();
 
 		if (this.libp2p.status === "stopped" || this.libp2p.status === "stopping") {
 			this._libp2pExternal = false; // this means we will also close libp2p client on close
@@ -259,6 +279,7 @@ export class Peerbit implements ProgramClient {
 	async stop() {
 		await this._handler?.stop();
 		await this._storage.close();
+		await this.indexer.stop();
 
 		// Close libp2p (after above)
 		if (!this._libp2pExternal) {
@@ -273,7 +294,7 @@ export class Peerbit implements ProgramClient {
 			throw new Error("Failed to find any addresses to dial");
 		}
 		const settled = await Promise.allSettled(
-			addresses.map((x) => this.dial(x))
+			addresses.map((x) => this.dial(x)),
 		);
 		let once = false;
 		for (const [i, result] of settled.entries()) {
@@ -282,9 +303,9 @@ export class Peerbit implements ProgramClient {
 			} else {
 				logger.warn(
 					"Failed to dial bootstrap address(s): " +
-					JSON.stringify(addresses[i]) +
-					". Reason: " +
-					result.reason
+						JSON.stringify(addresses[i]) +
+						". Reason: " +
+						result.reason,
 				);
 			}
 		}
@@ -303,7 +324,7 @@ export class Peerbit implements ProgramClient {
 
 	async open<S extends Program<ExtractArgs<S>>>(
 		storeOrAddress: S | Address | string,
-		options: OpenOptions<S> = {}
+		options: OpenOptions<S> = {},
 	): Promise<S> {
 		return (
 			this._handler || (this._handler = new ProgramHandler({ client: this }))
@@ -313,4 +334,8 @@ export class Peerbit implements ProgramClient {
 	get storage() {
 		return this._storage;
 	}
+
+	get indexer() {
+		return this._indexer;
+	}
 }

package/src/transports.browser.ts

@@ -1,14 +1,15 @@
-import { webSockets } from "@libp2p/websockets";
 import { circuitRelayTransport } from "@libp2p/circuit-relay-v2";
 import { webRTC } from "@libp2p/webrtc";
+import { webSockets } from "@libp2p/websockets";
 import { all } from "@libp2p/websockets/filters";
 
 export const transports = () => [
 	webSockets({ filter: all }),
 	circuitRelayTransport({
-		discoverRelays: 1
+		discoverRelays: 1,
+		reservationCompletionTimeout: 5000,
 	}),
-	webRTC({})
+	webRTC({}),
 ];
 
 export const relay = () => undefined as any;

package/src/transports.ts

@@ -1,17 +1,25 @@
-import { webSockets } from "@libp2p/websockets";
-import { circuitRelayTransport } from "@libp2p/circuit-relay-v2";
+import {
+	circuitRelayServer,
+	circuitRelayTransport,
+} from "@libp2p/circuit-relay-v2";
 import { tcp } from "@libp2p/tcp";
-import { circuitRelayServer } from "@libp2p/circuit-relay-v2";
+import { webSockets } from "@libp2p/websockets";
 import { all } from "@libp2p/websockets/filters";
+
 export const transports = () => [
 	webSockets({ filter: all }),
-	circuitRelayTransport(),
-	tcp()
+	circuitRelayTransport({
+		reservationCompletionTimeout: 5000,
+	}),
+	tcp(),
 ];
 export const relay = () =>
-	circuitRelayServer({ reservations: { maxReservations: 1000 } });
+	// applyDefaultLimit: false because of https://github.com/libp2p/js-libp2p/issues/2622
+	circuitRelayServer({
+		reservations: { applyDefaultLimit: false, maxReservations: 1000 },
+	});
 
 export const listen: () => string[] | undefined = () => [
 	"/ip4/127.0.0.1/tcp/0",
-	"/ip4/127.0.0.1/tcp/0/ws"
+	"/ip4/127.0.0.1/tcp/0/ws",
 ];