libp2p 2.4.2 → 2.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
- import type { AbortOptions, ComponentLogger, ContentRouting, PeerInfo, PeerRouting, PeerStore, RoutingOptions, Startable } from '@libp2p/interface';
1
+ import type { AbortOptions, ComponentLogger, ContentRouting, Metrics, PeerInfo, PeerRouting, PeerStore, RoutingOptions, Startable } from '@libp2p/interface';
2
2
  import type { CID } from 'multiformats/cid';
3
3
  export interface CompoundContentRoutingInit {
4
4
  routers: ContentRouting[];
@@ -7,6 +7,7 @@ export interface CompoundContentRoutingComponents {
7
7
  peerStore: PeerStore;
8
8
  peerRouting: PeerRouting;
9
9
  logger: ComponentLogger;
10
+ metrics?: Metrics;
10
11
  }
11
12
  export declare class CompoundContentRouting implements ContentRouting, Startable {
12
13
  private readonly routers;
@@ -20,7 +21,7 @@ export declare class CompoundContentRouting implements ContentRouting, Startable
20
21
  /**
21
22
  * Iterates over all content routers in parallel to find providers of the given key
22
23
  */
23
- findProviders(key: CID, options?: RoutingOptions): AsyncIterable<PeerInfo>;
24
+ findProviders(key: CID, options?: RoutingOptions): AsyncGenerator<PeerInfo>;
24
25
  /**
25
26
  * Iterates over all content routers in parallel to notify it is
26
27
  * a provider of the given key
@@ -1 +1 @@
1
- {"version":3,"file":"content-routing.d.ts","sourceRoot":"","sources":["../../src/content-routing.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AACnJ,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAE3C,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,cAAc,EAAE,CAAA;CAC1B;AAED,MAAM,WAAW,gCAAgC;IAC/C,SAAS,EAAE,SAAS,CAAA;IACpB,WAAW,EAAE,WAAW,CAAA;IACxB,MAAM,EAAE,eAAe,CAAA;CACxB;AAED,qBAAa,sBAAuB,YAAW,cAAc,EAAE,SAAS;IACtE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;IAC1C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkC;gBAEhD,UAAU,EAAE,gCAAgC,EAAE,IAAI,EAAE,0BAA0B;IAM3F,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,6BAA4B;IAEzD,SAAS,IAAK,OAAO;IAIf,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;IAIvB,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAI5B;;OAEG;IACK,aAAa,CAAE,GAAG,EAAE,GAAG,EAAE,OAAO,GAAE,cAAmB,GAAG,aAAa,CAAC,QAAQ,CAAC;IAmCvF;;;OAGG;IACG,OAAO,CAAE,GAAG,EAAE,GAAG,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D,eAAe,CAAE,GAAG,EAAE,GAAG,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3E;;OAEG;IACG,GAAG,CAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrF;;;OAGG;IACG,GAAG,CAAE,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC;CASzE"}
1
+ {"version":3,"file":"content-routing.d.ts","sourceRoot":"","sources":["../../src/content-routing.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC5J,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAE3C,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,cAAc,EAAE,CAAA;CAC1B;AAED,MAAM,WAAW,gCAAgC;IAC/C,SAAS,EAAE,SAAS,CAAA;IACpB,WAAW,EAAE,WAAW,CAAA;IACxB,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,qBAAa,sBAAuB,YAAW,cAAc,EAAE,SAAS;IACtE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;IAC1C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkC;gBAEhD,UAAU,EAAE,gCAAgC,EAAE,IAAI,EAAE,0BAA0B;IAwD3F,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,6BAA4B;IAEzD,SAAS,IAAK,OAAO;IAIf,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;IAIvB,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAI5B;;OAEG;IACK,aAAa,CAAE,GAAG,EAAE,GAAG,EAAE,OAAO,GAAE,cAAmB,GAAG,cAAc,CAAC,QAAQ,CAAC;IAmCxF;;;OAGG;IACG,OAAO,CAAE,GAAG,EAAE,GAAG,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D,eAAe,CAAE,GAAG,EAAE,GAAG,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3E;;OAEG;IACG,GAAG,CAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrF;;;OAGG;IACG,GAAG,CAAE,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC;CASzE"}
@@ -1,6 +1,7 @@
1
1
  import { NotStartedError } from '@libp2p/interface';
2
2
  import { PeerSet } from '@libp2p/peer-collections';
3
3
  import merge from 'it-merge';
4
+ import { toString as uint8ArrayToString } from 'uint8arrays/to-string';
4
5
  import { NoContentRoutersError } from './errors.js';
5
6
  export class CompoundContentRouting {
6
7
  routers;
@@ -10,6 +11,55 @@ export class CompoundContentRouting {
10
11
  this.routers = init.routers ?? [];
11
12
  this.started = false;
12
13
  this.components = components;
14
+ this.findProviders = components.metrics?.traceFunction('libp2p.contentRouting.findProviders', this.findProviders.bind(this), {
15
+ optionsIndex: 1,
16
+ getAttributesFromArgs: ([cid], attrs) => {
17
+ return {
18
+ ...attrs,
19
+ cid: cid.toString()
20
+ };
21
+ },
22
+ getAttributesFromYieldedValue: (value, attrs) => {
23
+ return {
24
+ ...attrs,
25
+ providers: [...(Array.isArray(attrs.providers) ? attrs.providers : []), value.id.toString()]
26
+ };
27
+ }
28
+ }) ?? this.findProviders;
29
+ this.provide = components.metrics?.traceFunction('libp2p.contentRouting.provide', this.provide.bind(this), {
30
+ optionsIndex: 1,
31
+ getAttributesFromArgs: ([cid], attrs) => {
32
+ return {
33
+ ...attrs,
34
+ cid: cid.toString()
35
+ };
36
+ }
37
+ }) ?? this.provide;
38
+ this.cancelReprovide = components.metrics?.traceFunction('libp2p.contentRouting.cancelReprovide', this.cancelReprovide.bind(this), {
39
+ optionsIndex: 1,
40
+ getAttributesFromArgs: ([cid], attrs) => {
41
+ return {
42
+ ...attrs,
43
+ cid: cid.toString()
44
+ };
45
+ }
46
+ }) ?? this.cancelReprovide;
47
+ this.put = components.metrics?.traceFunction('libp2p.contentRouting.put', this.put.bind(this), {
48
+ optionsIndex: 2,
49
+ getAttributesFromArgs: ([key]) => {
50
+ return {
51
+ key: uint8ArrayToString(key, 'base36')
52
+ };
53
+ }
54
+ }) ?? this.put;
55
+ this.get = components.metrics?.traceFunction('libp2p.contentRouting.get', this.get.bind(this), {
56
+ optionsIndex: 1,
57
+ getAttributesFromArgs: ([key]) => {
58
+ return {
59
+ key: uint8ArrayToString(key, 'base36')
60
+ };
61
+ }
62
+ }) ?? this.get;
13
63
  }
14
64
  [Symbol.toStringTag] = '@libp2p/content-routing';
15
65
  isStarted() {
@@ -1 +1 @@
1
- {"version":3,"file":"content-routing.js","sourceRoot":"","sources":["../../src/content-routing.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"content-routing.js","sourceRoot":"","sources":["../../src/content-routing.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { PeerId, PeerInfo, PeerRouting, PeerStore, RoutingOptions } from '@libp2p/interface';
1
+ import type { Metrics, PeerId, PeerInfo, PeerRouting, PeerStore, RoutingOptions } from '@libp2p/interface';
2
2
  import type { ComponentLogger } from '@libp2p/logger';
3
3
  export interface PeerRoutingInit {
4
4
  routers?: PeerRouting[];
@@ -7,6 +7,7 @@ export interface DefaultPeerRoutingComponents {
7
7
  peerId: PeerId;
8
8
  peerStore: PeerStore;
9
9
  logger: ComponentLogger;
10
+ metrics?: Metrics;
10
11
  }
11
12
  export declare class DefaultPeerRouting implements PeerRouting {
12
13
  private readonly log;
@@ -22,6 +23,6 @@ export declare class DefaultPeerRouting implements PeerRouting {
22
23
  /**
23
24
  * Attempt to find the closest peers on the network to the given key
24
25
  */
25
- getClosestPeers(key: Uint8Array, options?: RoutingOptions): AsyncIterable<PeerInfo>;
26
+ getClosestPeers(key: Uint8Array, options?: RoutingOptions): AsyncGenerator<PeerInfo>;
26
27
  }
27
28
  //# sourceMappingURL=peer-routing.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"peer-routing.d.ts","sourceRoot":"","sources":["../../src/peer-routing.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAU,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACzG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAErD,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,WAAW,EAAE,CAAA;CACxB;AAED,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,eAAe,CAAA;CACxB;AAED,qBAAa,kBAAmB,YAAW,WAAW;IACpD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;gBAE1B,UAAU,EAAE,4BAA4B,EAAE,IAAI,GAAE,eAAoB;IAOjF,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,0BAAyB;IAEtD;;OAEG;IACG,QAAQ,CAAE,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC;IAsCxE;;OAEG;IACK,eAAe,CAAE,GAAG,EAAE,UAAU,EAAE,OAAO,GAAE,cAAmB,GAAG,aAAa,CAAC,QAAQ,CAAC;CAuDjG"}
1
+ {"version":3,"file":"peer-routing.d.ts","sourceRoot":"","sources":["../../src/peer-routing.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAU,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAErD,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,WAAW,EAAE,CAAA;CACxB;AAED,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,qBAAa,kBAAmB,YAAW,WAAW;IACpD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;gBAE1B,UAAU,EAAE,4BAA4B,EAAE,IAAI,GAAE,eAAoB;IAgCjF,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,0BAAyB;IAEtD;;OAEG;IACG,QAAQ,CAAE,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC;IAsCxE;;OAEG;IACK,eAAe,CAAE,GAAG,EAAE,UAAU,EAAE,OAAO,GAAE,cAAmB,GAAG,cAAc,CAAC,QAAQ,CAAC;CAuDlG"}
@@ -2,6 +2,7 @@ import { NotFoundError } from '@libp2p/interface';
2
2
  import { createScalableCuckooFilter } from '@libp2p/utils/filters';
3
3
  import merge from 'it-merge';
4
4
  import parallel from 'it-parallel';
5
+ import { toString as uint8ArrayToString } from 'uint8arrays/to-string';
5
6
  import { NoPeerRoutersError, QueriedForSelfError } from './errors.js';
6
7
  export class DefaultPeerRouting {
7
8
  log;
@@ -13,6 +14,30 @@ export class DefaultPeerRouting {
13
14
  this.peerId = components.peerId;
14
15
  this.peerStore = components.peerStore;
15
16
  this.routers = init.routers ?? [];
17
+ this.findPeer = components.metrics?.traceFunction('libp2p.peerRouting.findPeer', this.findPeer.bind(this), {
18
+ optionsIndex: 1,
19
+ getAttributesFromArgs: ([peer], attrs) => {
20
+ return {
21
+ ...attrs,
22
+ peer: peer.toString()
23
+ };
24
+ }
25
+ }) ?? this.findPeer;
26
+ this.getClosestPeers = components.metrics?.traceFunction('libp2p.peerRouting.getClosestPeers', this.getClosestPeers.bind(this), {
27
+ optionsIndex: 1,
28
+ getAttributesFromArgs: ([key], attrs) => {
29
+ return {
30
+ ...attrs,
31
+ key: uint8ArrayToString(key, 'base36')
32
+ };
33
+ },
34
+ getAttributesFromYieldedValue: (value, attrs) => {
35
+ return {
36
+ ...attrs,
37
+ peers: [...(Array.isArray(attrs.peers) ? attrs.peers : []), value.id.toString()]
38
+ };
39
+ }
40
+ }) ?? this.getClosestPeers;
16
41
  }
17
42
  [Symbol.toStringTag] = '@libp2p/peer-routing';
18
43
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"peer-routing.js","sourceRoot":"","sources":["../../src/peer-routing.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"peer-routing.js","sourceRoot":"","sources":["../../src/peer-routing.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,3 @@
1
- export declare const version = "2.4.2";
1
+ export declare const version = "2.5.0";
2
2
  export declare const name = "js-libp2p";
3
3
  //# sourceMappingURL=version.d.ts.map
@@ -1,3 +1,3 @@
1
- export const version = '2.4.2';
1
+ export const version = '2.5.0';
2
2
  export const name = 'js-libp2p';
3
3
  //# sourceMappingURL=version.js.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "libp2p",
3
- "version": "2.4.2",
3
+ "version": "2.5.0",
4
4
  "description": "JavaScript implementation of libp2p, a modular peer to peer network stack",
5
5
  "license": "Apache-2.0 OR MIT",
6
6
  "homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/libp2p#readme",
@@ -87,15 +87,15 @@
87
87
  "dependencies": {
88
88
  "@chainsafe/is-ip": "^2.0.2",
89
89
  "@chainsafe/netmask": "^2.0.0",
90
- "@libp2p/crypto": "^5.0.8",
91
- "@libp2p/interface": "^2.3.0",
92
- "@libp2p/interface-internal": "^2.2.1",
93
- "@libp2p/logger": "^5.1.5",
94
- "@libp2p/multistream-select": "^6.0.10",
95
- "@libp2p/peer-collections": "^6.0.13",
96
- "@libp2p/peer-id": "^5.0.9",
97
- "@libp2p/peer-store": "^11.0.13",
98
- "@libp2p/utils": "^6.3.0",
90
+ "@libp2p/crypto": "^5.0.9",
91
+ "@libp2p/interface": "^2.4.0",
92
+ "@libp2p/interface-internal": "^2.2.2",
93
+ "@libp2p/logger": "^5.1.6",
94
+ "@libp2p/multistream-select": "^6.0.11",
95
+ "@libp2p/peer-collections": "^6.0.14",
96
+ "@libp2p/peer-id": "^5.0.10",
97
+ "@libp2p/peer-store": "^11.0.14",
98
+ "@libp2p/utils": "^6.3.1",
99
99
  "@multiformats/dns": "^1.0.6",
100
100
  "@multiformats/multiaddr": "^12.3.3",
101
101
  "@multiformats/multiaddr-matcher": "^1.6.0",
@@ -1,8 +1,9 @@
1
1
  import { NotStartedError } from '@libp2p/interface'
2
2
  import { PeerSet } from '@libp2p/peer-collections'
3
3
  import merge from 'it-merge'
4
+ import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
4
5
  import { NoContentRoutersError } from './errors.js'
5
- import type { AbortOptions, ComponentLogger, ContentRouting, PeerInfo, PeerRouting, PeerStore, RoutingOptions, Startable } from '@libp2p/interface'
6
+ import type { AbortOptions, ComponentLogger, ContentRouting, Metrics, PeerInfo, PeerRouting, PeerStore, RoutingOptions, Startable } from '@libp2p/interface'
6
7
  import type { CID } from 'multiformats/cid'
7
8
 
8
9
  export interface CompoundContentRoutingInit {
@@ -13,6 +14,7 @@ export interface CompoundContentRoutingComponents {
13
14
  peerStore: PeerStore
14
15
  peerRouting: PeerRouting
15
16
  logger: ComponentLogger
17
+ metrics?: Metrics
16
18
  }
17
19
 
18
20
  export class CompoundContentRouting implements ContentRouting, Startable {
@@ -24,6 +26,56 @@ export class CompoundContentRouting implements ContentRouting, Startable {
24
26
  this.routers = init.routers ?? []
25
27
  this.started = false
26
28
  this.components = components
29
+
30
+ this.findProviders = components.metrics?.traceFunction('libp2p.contentRouting.findProviders', this.findProviders.bind(this), {
31
+ optionsIndex: 1,
32
+ getAttributesFromArgs: ([cid], attrs) => {
33
+ return {
34
+ ...attrs,
35
+ cid: cid.toString()
36
+ }
37
+ },
38
+ getAttributesFromYieldedValue: (value, attrs: { providers?: string[] }) => {
39
+ return {
40
+ ...attrs,
41
+ providers: [...(Array.isArray(attrs.providers) ? attrs.providers : []), value.id.toString()]
42
+ }
43
+ }
44
+ }) ?? this.findProviders
45
+ this.provide = components.metrics?.traceFunction('libp2p.contentRouting.provide', this.provide.bind(this), {
46
+ optionsIndex: 1,
47
+ getAttributesFromArgs: ([cid], attrs) => {
48
+ return {
49
+ ...attrs,
50
+ cid: cid.toString()
51
+ }
52
+ }
53
+ }) ?? this.provide
54
+ this.cancelReprovide = components.metrics?.traceFunction('libp2p.contentRouting.cancelReprovide', this.cancelReprovide.bind(this), {
55
+ optionsIndex: 1,
56
+ getAttributesFromArgs: ([cid], attrs) => {
57
+ return {
58
+ ...attrs,
59
+ cid: cid.toString()
60
+ }
61
+ }
62
+ }) ?? this.cancelReprovide
63
+ this.put = components.metrics?.traceFunction('libp2p.contentRouting.put', this.put.bind(this), {
64
+ optionsIndex: 2,
65
+ getAttributesFromArgs: ([key]) => {
66
+ return {
67
+ key: uint8ArrayToString(key, 'base36')
68
+ }
69
+ }
70
+ }) ?? this.put
71
+ this.get = components.metrics?.traceFunction('libp2p.contentRouting.get', this.get.bind(this), {
72
+ optionsIndex: 1,
73
+ getAttributesFromArgs: ([key]) => {
74
+ return {
75
+ key: uint8ArrayToString(key, 'base36')
76
+ }
77
+ }
78
+ }) ?? this.get
27
79
  }
28
80
 
29
81
  readonly [Symbol.toStringTag] = '@libp2p/content-routing'
@@ -43,7 +95,7 @@ export class CompoundContentRouting implements ContentRouting, Startable {
43
95
  /**
44
96
  * Iterates over all content routers in parallel to find providers of the given key
45
97
  */
46
- async * findProviders (key: CID, options: RoutingOptions = {}): AsyncIterable<PeerInfo> {
98
+ async * findProviders (key: CID, options: RoutingOptions = {}): AsyncGenerator<PeerInfo> {
47
99
  if (this.routers.length === 0) {
48
100
  throw new NoContentRoutersError('No content routers available')
49
101
  }
@@ -2,8 +2,9 @@ import { NotFoundError } from '@libp2p/interface'
2
2
  import { createScalableCuckooFilter } from '@libp2p/utils/filters'
3
3
  import merge from 'it-merge'
4
4
  import parallel from 'it-parallel'
5
+ import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
5
6
  import { NoPeerRoutersError, QueriedForSelfError } from './errors.js'
6
- import type { Logger, PeerId, PeerInfo, PeerRouting, PeerStore, RoutingOptions } from '@libp2p/interface'
7
+ import type { Logger, Metrics, PeerId, PeerInfo, PeerRouting, PeerStore, RoutingOptions } from '@libp2p/interface'
7
8
  import type { ComponentLogger } from '@libp2p/logger'
8
9
 
9
10
  export interface PeerRoutingInit {
@@ -14,6 +15,7 @@ export interface DefaultPeerRoutingComponents {
14
15
  peerId: PeerId
15
16
  peerStore: PeerStore
16
17
  logger: ComponentLogger
18
+ metrics?: Metrics
17
19
  }
18
20
 
19
21
  export class DefaultPeerRouting implements PeerRouting {
@@ -27,6 +29,31 @@ export class DefaultPeerRouting implements PeerRouting {
27
29
  this.peerId = components.peerId
28
30
  this.peerStore = components.peerStore
29
31
  this.routers = init.routers ?? []
32
+
33
+ this.findPeer = components.metrics?.traceFunction('libp2p.peerRouting.findPeer', this.findPeer.bind(this), {
34
+ optionsIndex: 1,
35
+ getAttributesFromArgs: ([peer], attrs) => {
36
+ return {
37
+ ...attrs,
38
+ peer: peer.toString()
39
+ }
40
+ }
41
+ }) ?? this.findPeer
42
+ this.getClosestPeers = components.metrics?.traceFunction('libp2p.peerRouting.getClosestPeers', this.getClosestPeers.bind(this), {
43
+ optionsIndex: 1,
44
+ getAttributesFromArgs: ([key], attrs) => {
45
+ return {
46
+ ...attrs,
47
+ key: uint8ArrayToString(key, 'base36')
48
+ }
49
+ },
50
+ getAttributesFromYieldedValue: (value, attrs: { peers?: string[] }) => {
51
+ return {
52
+ ...attrs,
53
+ peers: [...(Array.isArray(attrs.peers) ? attrs.peers : []), value.id.toString()]
54
+ }
55
+ }
56
+ }) ?? this.getClosestPeers
30
57
  }
31
58
 
32
59
  readonly [Symbol.toStringTag] = '@libp2p/peer-routing'
@@ -75,7 +102,7 @@ export class DefaultPeerRouting implements PeerRouting {
75
102
  /**
76
103
  * Attempt to find the closest peers on the network to the given key
77
104
  */
78
- async * getClosestPeers (key: Uint8Array, options: RoutingOptions = {}): AsyncIterable<PeerInfo> {
105
+ async * getClosestPeers (key: Uint8Array, options: RoutingOptions = {}): AsyncGenerator<PeerInfo> {
79
106
  if (this.routers.length === 0) {
80
107
  throw new NoPeerRoutersError('No peer routers available')
81
108
  }
package/src/version.ts CHANGED
@@ -1,2 +1,2 @@
1
- export const version = '2.4.2'
1
+ export const version = '2.5.0'
2
2
  export const name = 'js-libp2p'