libp2p 2.7.0-2b49a5f74 → 2.7.0-d98cc46e4

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 +1 @@
1
- {"version":3,"file":"transport-addresses.d.ts","sourceRoot":"","sources":["../../../src/address-manager/transport-addresses.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,eAAO,MAAM,aAAa;;CAEzB,CAAA;AAQD,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAuC;IACjE,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAQ;gBAEhC,UAAU,EAAE,wBAAwB,EAAE,IAAI,GAAE,kBAAuB;IAMhF,GAAG,CAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,WAAW;IAgCpD,GAAG,CAAE,EAAE,EAAE,SAAS,GAAG,OAAO;IAK5B,MAAM,CAAE,EAAE,EAAE,SAAS,GAAG,OAAO;IAU/B,OAAO,CAAE,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO;IAmB7C,SAAS,CAAE,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO;IAiB/C,OAAO,CAAC,KAAK;CAUd"}
1
+ {"version":3,"file":"transport-addresses.d.ts","sourceRoot":"","sources":["../../../src/address-manager/transport-addresses.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,eAAO,MAAM,aAAa;;CAEzB,CAAA;AAQD,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAuC;IACjE,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAQ;gBAEhC,UAAU,EAAE,wBAAwB,EAAE,IAAI,GAAE,kBAAuB;IAMhF,GAAG,CAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,WAAW;IAgCpD,GAAG,CAAE,EAAE,EAAE,SAAS,GAAG,OAAO;IAK5B,MAAM,CAAE,EAAE,EAAE,SAAS,GAAG,OAAO;IAU/B,OAAO,CAAE,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO;IAmB7C,SAAS,CAAE,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO;IAiB/C,OAAO,CAAC,KAAK;CAKd"}
@@ -1,4 +1,3 @@
1
- import { isNetworkAddress } from '@libp2p/utils/multiaddr/is-network-address';
2
1
  import { isPrivate } from '@libp2p/utils/multiaddr/is-private';
3
2
  export const defaultValues = {
4
3
  maxObservedAddresses: 10
@@ -26,7 +25,7 @@ export class TransportAddresses {
26
25
  let metadata = this.addresses.get(key);
27
26
  if (metadata == null) {
28
27
  metadata = {
29
- verified: !isNetworkAddress(multiaddr),
28
+ verified: false,
30
29
  expires: 0
31
30
  };
32
31
  this.addresses.set(key, metadata);
@@ -77,12 +76,8 @@ export class TransportAddresses {
77
76
  return startingConfidence;
78
77
  }
79
78
  toKey(ma) {
80
- if (isNetworkAddress(ma)) {
81
- // only works for dns/ip based addresses
82
- const options = ma.toOptions();
83
- return `${options.host}-${options.port}-${options.transport}`;
84
- }
85
- return ma.toString();
79
+ const options = ma.toOptions();
80
+ return `${options.host}-${options.port}-${options.transport}`;
86
81
  }
87
82
  }
88
83
  //# sourceMappingURL=transport-addresses.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"transport-addresses.js","sourceRoot":"","sources":["../../../src/address-manager/transport-addresses.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"transport-addresses.js","sourceRoot":"","sources":["../../../src/address-manager/transport-addresses.ts"],"names":[],"mappings":"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"}
@@ -6,11 +6,6 @@ import type { Address } from '@libp2p/interface';
6
6
  * TCP -> WebSockets/Secure -> WebRTC -> WebRTCDirect -> WebTransport
7
7
  */
8
8
  export declare function reliableTransportsFirst(a: Address, b: Address): -1 | 0 | 1;
9
- /**
10
- * Compare function for array.sort() that moves loopback addresses to the end
11
- * of the array.
12
- */
13
- export declare function loopbackAddressLast(a: Address, b: Address): -1 | 0 | 1;
14
9
  /**
15
10
  * Compare function for array.sort() that moves public addresses to the start
16
11
  * of the array.
@@ -1 +1 @@
1
- {"version":3,"file":"address-sorter.d.ts","sourceRoot":"","sources":["../../../src/connection-manager/address-sorter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAEhD;;;;;GAKG;AAEH,wBAAgB,uBAAuB,CAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAqE3E;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAWvE;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAWxE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAQ3E;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAW7E;AAED,wBAAgB,oBAAoB,CAAE,SAAS,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAOrE"}
1
+ {"version":3,"file":"address-sorter.d.ts","sourceRoot":"","sources":["../../../src/connection-manager/address-sorter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAEhD;;;;;GAKG;AAEH,wBAAgB,uBAAuB,CAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAqE3E;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAWxE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAQ3E;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAW7E;AAED,wBAAgB,oBAAoB,CAAE,SAAS,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAMrE"}
@@ -1,4 +1,3 @@
1
- import { isLoopback } from '@libp2p/utils/multiaddr/is-loopback';
2
1
  import { isPrivate } from '@libp2p/utils/multiaddr/is-private';
3
2
  import { Circuit, WebSockets, WebSocketsSecure, WebRTC, WebRTCDirect, WebTransport, TCP } from '@multiformats/multiaddr-matcher';
4
3
  /**
@@ -60,21 +59,6 @@ export function reliableTransportsFirst(a, b) {
60
59
  // ... everything else
61
60
  return 0;
62
61
  }
63
- /**
64
- * Compare function for array.sort() that moves loopback addresses to the end
65
- * of the array.
66
- */
67
- export function loopbackAddressLast(a, b) {
68
- const isALoopback = isLoopback(a.multiaddr);
69
- const isBLoopback = isLoopback(b.multiaddr);
70
- if (isALoopback && !isBLoopback) {
71
- return 1;
72
- }
73
- else if (!isALoopback && isBLoopback) {
74
- return -1;
75
- }
76
- return 0;
77
- }
78
62
  /**
79
63
  * Compare function for array.sort() that moves public addresses to the start
80
64
  * of the array.
@@ -123,7 +107,6 @@ export function defaultAddressSorter(addresses) {
123
107
  .sort(reliableTransportsFirst)
124
108
  .sort(certifiedAddressesFirst)
125
109
  .sort(circuitRelayAddressesLast)
126
- .sort(publicAddressesFirst)
127
- .sort(loopbackAddressLast);
110
+ .sort(publicAddressesFirst);
128
111
  }
129
112
  //# sourceMappingURL=address-sorter.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"address-sorter.js","sourceRoot":"","sources":["../../../src/connection-manager/address-sorter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"address-sorter.js","sourceRoot":"","sources":["../../../src/connection-manager/address-sorter.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,3 @@
1
- export declare const version = "2.7.0-2b49a5f74";
1
+ export declare const version = "2.7.0-d98cc46e4";
2
2
  export declare const name = "js-libp2p";
3
3
  //# sourceMappingURL=version.d.ts.map
@@ -1,3 +1,3 @@
1
- export const version = '2.7.0-2b49a5f74';
1
+ export const version = '2.7.0-d98cc46e4';
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.7.0-2b49a5f74",
3
+ "version": "2.7.0-d98cc46e4",
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",
@@ -92,15 +92,15 @@
92
92
  "dependencies": {
93
93
  "@chainsafe/is-ip": "^2.0.2",
94
94
  "@chainsafe/netmask": "^2.0.0",
95
- "@libp2p/crypto": "5.0.12-2b49a5f74",
96
- "@libp2p/interface": "2.6.0-2b49a5f74",
97
- "@libp2p/interface-internal": "2.3.2-2b49a5f74",
98
- "@libp2p/logger": "5.1.9-2b49a5f74",
99
- "@libp2p/multistream-select": "6.0.15-2b49a5f74",
100
- "@libp2p/peer-collections": "6.0.18-2b49a5f74",
101
- "@libp2p/peer-id": "5.0.13-2b49a5f74",
102
- "@libp2p/peer-store": "11.0.18-2b49a5f74",
103
- "@libp2p/utils": "6.5.2-2b49a5f74",
95
+ "@libp2p/crypto": "5.0.12-d98cc46e4",
96
+ "@libp2p/interface": "2.6.0-d98cc46e4",
97
+ "@libp2p/interface-internal": "2.3.2-d98cc46e4",
98
+ "@libp2p/logger": "5.1.9-d98cc46e4",
99
+ "@libp2p/multistream-select": "6.0.15-d98cc46e4",
100
+ "@libp2p/peer-collections": "6.0.18-d98cc46e4",
101
+ "@libp2p/peer-id": "5.0.13-d98cc46e4",
102
+ "@libp2p/peer-store": "11.0.18-d98cc46e4",
103
+ "@libp2p/utils": "6.5.2-d98cc46e4",
104
104
  "@multiformats/dns": "^1.0.6",
105
105
  "@multiformats/multiaddr": "^12.3.5",
106
106
  "@multiformats/multiaddr-matcher": "^1.6.0",
@@ -1,4 +1,3 @@
1
- import { isNetworkAddress } from '@libp2p/utils/multiaddr/is-network-address'
2
1
  import { isPrivate } from '@libp2p/utils/multiaddr/is-private'
3
2
  import type { AddressManagerComponents, AddressManagerInit } from './index.js'
4
3
  import type { Logger } from '@libp2p/interface'
@@ -42,7 +41,7 @@ export class TransportAddresses {
42
41
 
43
42
  if (metadata == null) {
44
43
  metadata = {
45
- verified: !isNetworkAddress(multiaddr),
44
+ verified: false,
46
45
  expires: 0
47
46
  }
48
47
 
@@ -110,13 +109,8 @@ export class TransportAddresses {
110
109
  }
111
110
 
112
111
  private toKey (ma: Multiaddr): string {
113
- if (isNetworkAddress(ma)) {
114
- // only works for dns/ip based addresses
115
- const options = ma.toOptions()
112
+ const options = ma.toOptions()
116
113
 
117
- return `${options.host}-${options.port}-${options.transport}`
118
- }
119
-
120
- return ma.toString()
114
+ return `${options.host}-${options.port}-${options.transport}`
121
115
  }
122
116
  }
@@ -1,4 +1,3 @@
1
- import { isLoopback } from '@libp2p/utils/multiaddr/is-loopback'
2
1
  import { isPrivate } from '@libp2p/utils/multiaddr/is-private'
3
2
  import { Circuit, WebSockets, WebSocketsSecure, WebRTC, WebRTCDirect, WebTransport, TCP } from '@multiformats/multiaddr-matcher'
4
3
  import type { Address } from '@libp2p/interface'
@@ -81,23 +80,6 @@ export function reliableTransportsFirst (a: Address, b: Address): -1 | 0 | 1 {
81
80
  return 0
82
81
  }
83
82
 
84
- /**
85
- * Compare function for array.sort() that moves loopback addresses to the end
86
- * of the array.
87
- */
88
- export function loopbackAddressLast (a: Address, b: Address): -1 | 0 | 1 {
89
- const isALoopback = isLoopback(a.multiaddr)
90
- const isBLoopback = isLoopback(b.multiaddr)
91
-
92
- if (isALoopback && !isBLoopback) {
93
- return 1
94
- } else if (!isALoopback && isBLoopback) {
95
- return -1
96
- }
97
-
98
- return 0
99
- }
100
-
101
83
  /**
102
84
  * Compare function for array.sort() that moves public addresses to the start
103
85
  * of the array.
@@ -152,5 +134,4 @@ export function defaultAddressSorter (addresses: Address[]): Address[] {
152
134
  .sort(certifiedAddressesFirst)
153
135
  .sort(circuitRelayAddressesLast)
154
136
  .sort(publicAddressesFirst)
155
- .sort(loopbackAddressLast)
156
137
  }
package/src/version.ts CHANGED
@@ -1,2 +1,2 @@
1
- export const version = '2.7.0-2b49a5f74'
1
+ export const version = '2.7.0-d98cc46e4'
2
2
  export const name = 'js-libp2p'