helia 5.1.1-e45e1de → 5.2.0-6542cf2

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

@@ -1 +1 @@
-{"version":3,"file":"libp2p.d.ts","sourceRoot":"","sources":["../../../src/utils/libp2p.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC5E,OAAO,KAAK,EAAY,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC9D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AAE3C,MAAM,WAAW,mBAAmB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACpE,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,CAAA;IACzB,MAAM,CAAC,EAAE,eAAe,CAAA;IACxB,QAAQ,CAAC,EAAE,YAAY,CAAA;IACvB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AAED,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,QAAQ,CAAC,EAAE,YAAY,CAAA;IACvB,GAAG,CAAC,EAAE,GAAG,CAAA;CACV;AAED,wBAAsB,YAAY,CAAE,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,qBAAqB,EAAG,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAuCnJ"}
+{"version":3,"file":"libp2p.d.ts","sourceRoot":"","sources":["../../../src/utils/libp2p.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AAE3C,MAAM,WAAW,mBAAmB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACpE,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,CAAA;IACzB,MAAM,CAAC,EAAE,eAAe,CAAA;IACxB,QAAQ,CAAC,EAAE,YAAY,CAAA;IACvB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AAED,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,QAAQ,CAAC,EAAE,YAAY,CAAA;IACvB,GAAG,CAAC,EAAE,GAAG,CAAA;CACV;AAED,wBAAsB,YAAY,CAAE,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,qBAAqB,EAAG,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAmBnJ"}

package/dist/src/utils/libp2p.js

@@ -1,39 +1,18 @@
-import { generateKeyPair } from '@libp2p/crypto/keys';
-import { keychain } from '@libp2p/keychain';
-import { defaultLogger } from '@libp2p/logger';
-import { Key } from 'interface-datastore';
+import { loadOrCreateSelfKey } from '@libp2p/config';
 import { createLibp2p as create } from 'libp2p';
 import { libp2pDefaults } from './libp2p-defaults.js';
 export async function createLibp2p(options) {
-    const privateKey = options.libp2p?.privateKey;
-    const logger = options.logger ?? defaultLogger();
-    const selfKey = new Key('/pkcs8/self');
-    let chain;
+    const libp2pOptions = options.libp2p ?? {};
     // if no peer id was passed, try to load it from the keychain
-    if (privateKey == null && options.datastore != null) {
-        chain = keychain(options.keychain)({
-            datastore: options.datastore,
-            logger
-        });
-        options.libp2p = options.libp2p ?? {};
-        if (await options.datastore.has(selfKey)) {
-            // load the peer id from the keychain
-            options.libp2p.privateKey = await chain.exportKey('self');
-        }
-        else {
-            const privateKey = await generateKeyPair('Ed25519');
-            options.libp2p.privateKey = privateKey;
-            // persist the peer id in the keychain for next time
-            await chain.importKey('self', privateKey);
-        }
+    if (libp2pOptions.privateKey == null && options.datastore != null) {
+        libp2pOptions.privateKey = await loadOrCreateSelfKey(options.datastore, options.keychain);
     }
-    const defaults = libp2pDefaults(options);
+    const defaults = libp2pDefaults(libp2pOptions);
     defaults.datastore = defaults.datastore ?? options.datastore;
-    options = options ?? {};
     // @ts-expect-error derived ServiceMap is not compatible with ServiceFactoryMap
     const node = await create({
         ...defaults,
-        ...options.libp2p,
+        ...libp2pOptions,
         start: false
     });
     return node;

package/dist/src/utils/libp2p.js.map

@@ -1 +1 @@
-{"version":3,"file":"libp2p.js","sourceRoot":"","sources":["../../../src/utils/libp2p.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AACzC,OAAO,EAAE,YAAY,IAAI,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAsBrD,MAAM,CAAC,KAAK,UAAU,YAAY,CAA8D,OAA+B;IAC7H,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,UAAU,CAAA;IAC7C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,aAAa,EAAE,CAAA;IAChD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,CAAA;IACtC,IAAI,KAA2B,CAAA;IAE/B,6DAA6D;IAC7D,IAAI,UAAU,IAAI,IAAI,IAAI,OAAO,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;QACpD,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACjC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,MAAM;SACP,CAAC,CAAA;QAEF,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,EAAE,CAAA;QAErC,IAAI,MAAM,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YACzC,qCAAqC;YACrC,OAAO,CAAC,MAAM,CAAC,UAAU,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QAC3D,CAAC;aAAM,CAAC;YACN,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC,CAAA;YACnD,OAAO,CAAC,MAAM,CAAC,UAAU,GAAG,UAAU,CAAA;YAEtC,oDAAoD;YACpD,MAAM,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;QAC3C,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;IACxC,QAAQ,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,IAAI,OAAO,CAAC,SAAS,CAAA;IAC5D,OAAO,GAAG,OAAO,IAAI,EAAE,CAAA;IAEvB,+EAA+E;IAC/E,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC;QACxB,GAAG,QAAQ;QACX,GAAG,OAAO,CAAC,MAAM;QACjB,KAAK,EAAE,KAAK;KACb,CAAC,CAAA;IAEF,OAAO,IAAI,CAAA;AACb,CAAC"}
+{"version":3,"file":"libp2p.js","sourceRoot":"","sources":["../../../src/utils/libp2p.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,EAAE,YAAY,IAAI,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAsBrD,MAAM,CAAC,KAAK,UAAU,YAAY,CAA8D,OAA+B;IAC7H,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,IAAI,EAAE,CAAA;IAE1C,6DAA6D;IAC7D,IAAI,aAAa,CAAC,UAAU,IAAI,IAAI,IAAI,OAAO,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;QAClE,aAAa,CAAC,UAAU,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC3F,CAAC;IAED,MAAM,QAAQ,GAAG,cAAc,CAAC,aAAa,CAAC,CAAA;IAC9C,QAAQ,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,IAAI,OAAO,CAAC,SAAS,CAAA;IAE5D,+EAA+E;IAC/E,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC;QACxB,GAAG,QAAQ;QACX,GAAG,aAAa;QAChB,KAAK,EAAE,KAAK;KACb,CAAC,CAAA;IAEF,OAAO,IAAI,CAAA;AACb,CAAC"}

package/dist/src/version.d.ts

@@ -1,3 +1,3 @@
-export declare const version = "5.1.1-e45e1de";
+export declare const version = "5.2.0-6542cf2";
 export declare const name = "helia";
 //# sourceMappingURL=version.d.ts.map

package/dist/src/version.js

@@ -1,3 +1,3 @@
-export const version = '5.1.1-e45e1de';
+export const version = '5.2.0-6542cf2';
 export const name = 'helia';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "helia",
-  "version": "5.1.1-e45e1de",
+  "version": "5.2.0-6542cf2",
   "description": "An implementation of IPFS in JavaScript",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/ipfs/helia/tree/main/packages/helia#readme",
@@ -57,28 +57,27 @@
   "dependencies": {
     "@chainsafe/libp2p-noise": "^16.0.0",
     "@chainsafe/libp2p-yamux": "^7.0.1",
-    "@helia/block-brokers": "4.0.2-e45e1de",
+    "@helia/block-brokers": "4.0.3-6542cf2",
     "@helia/delegated-routing-v1-http-api-client": "^4.2.1",
-    "@helia/interface": "5.1.0-e45e1de",
-    "@helia/routers": "2.2.0-e45e1de",
-    "@helia/utils": "1.1.0-e45e1de",
+    "@helia/interface": "5.2.0-6542cf2",
+    "@helia/routers": "3.0.0-6542cf2",
+    "@helia/utils": "1.2.0-6542cf2",
     "@libp2p/auto-tls": "^1.0.4",
     "@libp2p/autonat": "^2.0.12",
     "@libp2p/bootstrap": "^11.0.13",
     "@libp2p/circuit-relay-v2": "^3.1.3",
-    "@libp2p/crypto": "^5.0.7",
+    "@libp2p/config": "^1.0.1",
     "@libp2p/dcutr": "^2.0.12",
     "@libp2p/identify": "^3.0.12",
     "@libp2p/interface": "^2.2.1",
     "@libp2p/kad-dht": "^14.1.3",
     "@libp2p/keychain": "^5.0.10",
-    "@libp2p/logger": "^5.1.4",
     "@libp2p/mdns": "^11.0.13",
     "@libp2p/mplex": "^11.0.13",
     "@libp2p/ping": "^2.0.12",
     "@libp2p/tcp": "^10.0.13",
     "@libp2p/tls": "^2.0.11",
-    "@libp2p/upnp-nat": "^2.0.12",
+    "@libp2p/upnp-nat": "^3.0.4",
     "@libp2p/webrtc": "^5.0.19",
     "@libp2p/websockets": "^9.0.13",
     "@multiformats/dns": "^1.0.6",

package/src/utils/libp2p.ts

@@ -1,12 +1,9 @@
-import { generateKeyPair } from '@libp2p/crypto/keys'
-import { keychain } from '@libp2p/keychain'
-import { defaultLogger } from '@libp2p/logger'
-import { Key } from 'interface-datastore'
+import { loadOrCreateSelfKey } from '@libp2p/config'
 import { createLibp2p as create } from 'libp2p'
 import { libp2pDefaults } from './libp2p-defaults.js'
 import type { DefaultLibp2pServices } from './libp2p-defaults.js'
 import type { ComponentLogger, Libp2p, PrivateKey } from '@libp2p/interface'
-import type { Keychain, KeychainInit } from '@libp2p/keychain'
+import type { KeychainInit } from '@libp2p/keychain'
 import type { DNS } from '@multiformats/dns'
 import type { Datastore } from 'interface-datastore'
 import type { Libp2pOptions } from 'libp2p'
@@ -26,40 +23,20 @@ export interface Libp2pDefaultsOptions {
 }
 
 export async function createLibp2p <T extends Record<string, unknown> = DefaultLibp2pServices> (options: CreateLibp2pOptions<T>): Promise<Libp2p<T>> {
-  const privateKey = options.libp2p?.privateKey
-  const logger = options.logger ?? defaultLogger()
-  const selfKey = new Key('/pkcs8/self')
-  let chain: Keychain | undefined
+  const libp2pOptions = options.libp2p ?? {}
 
   // if no peer id was passed, try to load it from the keychain
-  if (privateKey == null && options.datastore != null) {
-    chain = keychain(options.keychain)({
-      datastore: options.datastore,
-      logger
-    })
-
-    options.libp2p = options.libp2p ?? {}
-
-    if (await options.datastore.has(selfKey)) {
-      // load the peer id from the keychain
-      options.libp2p.privateKey = await chain.exportKey('self')
-    } else {
-      const privateKey = await generateKeyPair('Ed25519')
-      options.libp2p.privateKey = privateKey
-
-      // persist the peer id in the keychain for next time
-      await chain.importKey('self', privateKey)
-    }
+  if (libp2pOptions.privateKey == null && options.datastore != null) {
+    libp2pOptions.privateKey = await loadOrCreateSelfKey(options.datastore, options.keychain)
   }
 
-  const defaults = libp2pDefaults(options)
+  const defaults = libp2pDefaults(libp2pOptions)
   defaults.datastore = defaults.datastore ?? options.datastore
-  options = options ?? {}
 
   // @ts-expect-error derived ServiceMap is not compatible with ServiceFactoryMap
   const node = await create({
     ...defaults,
-    ...options.libp2p,
+    ...libp2pOptions,
     start: false
   })
 

package/src/version.ts

@@ -1,2 +1,2 @@
-export const version = '5.1.1-e45e1de'
+export const version = '5.2.0-6542cf2'
 export const name = 'helia'