libp2p 3.2.3 → 3.2.4-15eeedba1

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.
Files changed (21) hide show
  1. package/dist/index.min.js +9 -9
  2. package/dist/index.min.js.map +4 -4
  3. package/dist/src/address-manager/index.js +6 -6
  4. package/dist/src/address-manager/index.js.map +1 -1
  5. package/dist/src/connection-manager/address-sorter.d.ts +0 -22
  6. package/dist/src/connection-manager/address-sorter.d.ts.map +1 -1
  7. package/dist/src/connection-manager/address-sorter.js +6 -112
  8. package/dist/src/connection-manager/address-sorter.js.map +1 -1
  9. package/dist/src/connection-monitor.d.ts.map +1 -1
  10. package/dist/src/connection-monitor.js +3 -1
  11. package/dist/src/connection-monitor.js.map +1 -1
  12. package/dist/src/version.d.ts +1 -1
  13. package/dist/src/version.d.ts.map +1 -1
  14. package/dist/src/version.js +1 -1
  15. package/dist/src/version.js.map +1 -1
  16. package/package.json +10 -10
  17. package/src/address-manager/index.ts +6 -6
  18. package/src/connection-manager/address-sorter.ts +13 -137
  19. package/src/connection-monitor.ts +5 -2
  20. package/src/version.ts +1 -1
  21. package/dist/typedoc-urls.json +0 -24
package/dist/src/address-manager/index.js CHANGED
@@ -197,33 +197,33 @@ export class AddressManager {
197
197
  }
198
198
  removeObservedAddr(addr, options) {
199
199
  addr = stripPeerId(addr, this.components.peerId);
200
- let startingConfidence = false;
200
+ let startingConfidence = true;
201
201
  if (this.observed.has(addr)) {
202
202
  const observedStartingConfidence = this.observed.remove(addr);
203
- if (!observedStartingConfidence && startingConfidence) {
203
+ if (observedStartingConfidence && startingConfidence) {
204
204
  startingConfidence = false;
205
205
  }
206
206
  }
207
207
  if (this.transportAddresses.has(addr)) {
208
208
  const transportStartingConfidence = this.transportAddresses.unconfirm(addr, options?.ttl ?? this.addressVerificationRetry);
209
- if (!transportStartingConfidence && startingConfidence) {
209
+ if (transportStartingConfidence && startingConfidence) {
210
210
  startingConfidence = false;
211
211
  }
212
212
  }
213
213
  if (this.dnsMappings.has(addr)) {
214
214
  const dnsMappingStartingConfidence = this.dnsMappings.unconfirm(addr, options?.ttl ?? this.addressVerificationRetry);
215
- if (!dnsMappingStartingConfidence && startingConfidence) {
215
+ if (dnsMappingStartingConfidence && startingConfidence) {
216
216
  startingConfidence = false;
217
217
  }
218
218
  }
219
219
  if (this.ipMappings.has(addr)) {
220
220
  const ipMappingStartingConfidence = this.ipMappings.unconfirm(addr, options?.ttl ?? this.addressVerificationRetry);
221
- if (!ipMappingStartingConfidence && startingConfidence) {
221
+ if (ipMappingStartingConfidence && startingConfidence) {
222
222
  startingConfidence = false;
223
223
  }
224
224
  }
225
225
  // only trigger the 'self:peer:update' event if our confidence in an address has changed
226
- if (startingConfidence) {
226
+ if (!startingConfidence) {
227
227
  this._updatePeerStoreAddresses();
228
228
  }
229
229
  }
package/dist/src/address-manager/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/address-manager/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/address-manager/index.ts"],"names":[],"mappings":"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"}
package/dist/src/connection-manager/address-sorter.d.ts CHANGED
@@ -1,30 +1,8 @@
1
1
  import type { Address } from '@libp2p/interface';
2
- /**
3
- * Sorts addresses by order of reliability, where they have presented the fewest
4
- * problems:
5
- *
6
- * TCP -> WebSockets/Secure -> WebRTC -> WebRTCDirect -> WebTransport
7
- */
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
- /**
15
- * Compare function for array.sort() that moves public addresses to the start
16
- * of the array.
17
- */
18
- export declare function publicAddressesFirst(a: Address, b: Address): -1 | 0 | 1;
19
2
  /**
20
3
  * Compare function for array.sort() that moves certified addresses to the start
21
4
  * of the array.
22
5
  */
23
6
  export declare function certifiedAddressesFirst(a: Address, b: Address): -1 | 0 | 1;
24
- /**
25
- * Compare function for array.sort() that moves circuit relay addresses to the
26
- * end of the array.
27
- */
28
- export declare function circuitRelayAddressesLast(a: Address, b: Address): -1 | 0 | 1;
29
7
  export declare function defaultAddressSorter(addresses: Address[]): Address[];
30
8
  //# sourceMappingURL=address-sorter.d.ts.map
package/dist/src/connection-manager/address-sorter.d.ts.map CHANGED
@@ -1 +1 @@
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,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":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAEhD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAQ3E;AAED,wBAAgB,oBAAoB,CAAE,SAAS,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAQrE"}
package/dist/src/connection-manager/address-sorter.js CHANGED
@@ -1,94 +1,4 @@
1
- import { isLoopback, isPrivate } from '@libp2p/utils';
2
- import { Circuit, WebSockets, WebSocketsSecure, WebRTC, WebRTCDirect, WebTransport, TCP } from '@multiformats/multiaddr-matcher';
3
- /**
4
- * Sorts addresses by order of reliability, where they have presented the fewest
5
- * problems:
6
- *
7
- * TCP -> WebSockets/Secure -> WebRTC -> WebRTCDirect -> WebTransport
8
- */
9
- // eslint-disable-next-line complexity
10
- export function reliableTransportsFirst(a, b) {
11
- const isATcp = TCP.exactMatch(a.multiaddr);
12
- const isBTcp = TCP.exactMatch(b.multiaddr);
13
- if (isATcp && !isBTcp) {
14
- return -1;
15
- }
16
- if (!isATcp && isBTcp) {
17
- return 1;
18
- }
19
- const isAWebSocketSecure = WebSocketsSecure.exactMatch(a.multiaddr);
20
- const isBWebSocketSecure = WebSocketsSecure.exactMatch(b.multiaddr);
21
- if (isAWebSocketSecure && !isBWebSocketSecure) {
22
- return -1;
23
- }
24
- if (!isAWebSocketSecure && isBWebSocketSecure) {
25
- return 1;
26
- }
27
- const isAWebSocket = WebSockets.exactMatch(a.multiaddr);
28
- const isBWebSocket = WebSockets.exactMatch(b.multiaddr);
29
- if (isAWebSocket && !isBWebSocket) {
30
- return -1;
31
- }
32
- if (!isAWebSocket && isBWebSocket) {
33
- return 1;
34
- }
35
- const isAWebRTC = WebRTC.exactMatch(a.multiaddr);
36
- const isBWebRTC = WebRTC.exactMatch(b.multiaddr);
37
- if (isAWebRTC && !isBWebRTC) {
38
- return -1;
39
- }
40
- if (!isAWebRTC && isBWebRTC) {
41
- return 1;
42
- }
43
- const isAWebRTCDirect = WebRTCDirect.exactMatch(a.multiaddr);
44
- const isBWebRTCDirect = WebRTCDirect.exactMatch(b.multiaddr);
45
- if (isAWebRTCDirect && !isBWebRTCDirect) {
46
- return -1;
47
- }
48
- if (!isAWebRTCDirect && isBWebRTCDirect) {
49
- return 1;
50
- }
51
- const isAWebTransport = WebTransport.exactMatch(a.multiaddr);
52
- const isBWebTransport = WebTransport.exactMatch(b.multiaddr);
53
- if (isAWebTransport && !isBWebTransport) {
54
- return -1;
55
- }
56
- if (!isAWebTransport && isBWebTransport) {
57
- return 1;
58
- }
59
- // ... everything else
60
- return 0;
61
- }
62
- /**
63
- * Compare function for array.sort() that moves loopback addresses to the end
64
- * of the array.
65
- */
66
- export function loopbackAddressLast(a, b) {
67
- const isALoopback = isLoopback(a.multiaddr);
68
- const isBLoopback = isLoopback(b.multiaddr);
69
- if (isALoopback && !isBLoopback) {
70
- return 1;
71
- }
72
- else if (!isALoopback && isBLoopback) {
73
- return -1;
74
- }
75
- return 0;
76
- }
77
- /**
78
- * Compare function for array.sort() that moves public addresses to the start
79
- * of the array.
80
- */
81
- export function publicAddressesFirst(a, b) {
82
- const isAPrivate = isPrivate(a.multiaddr);
83
- const isBPrivate = isPrivate(b.multiaddr);
84
- if (isAPrivate && !isBPrivate) {
85
- return 1;
86
- }
87
- else if (!isAPrivate && isBPrivate) {
88
- return -1;
89
- }
90
- return 0;
91
- }
1
+ import { reliableTransportsFirst, loopbackAddressLast, publicAddressesFirst, circuitRelayAddressesLast } from '@libp2p/utils';
92
2
  /**
93
3
  * Compare function for array.sort() that moves certified addresses to the start
94
4
  * of the array.
@@ -102,27 +12,11 @@ export function certifiedAddressesFirst(a, b) {
102
12
  }
103
13
  return 0;
104
14
  }
105
- /**
106
- * Compare function for array.sort() that moves circuit relay addresses to the
107
- * end of the array.
108
- */
109
- export function circuitRelayAddressesLast(a, b) {
110
- const isACircuit = Circuit.exactMatch(a.multiaddr);
111
- const isBCircuit = Circuit.exactMatch(b.multiaddr);
112
- if (isACircuit && !isBCircuit) {
113
- return 1;
114
- }
115
- else if (!isACircuit && isBCircuit) {
116
- return -1;
117
- }
118
- return 0;
119
- }
120
15
  export function defaultAddressSorter(addresses) {
121
- return addresses
122
- .sort(reliableTransportsFirst)
123
- .sort(certifiedAddressesFirst)
124
- .sort(circuitRelayAddressesLast)
125
- .sort(publicAddressesFirst)
126
- .sort(loopbackAddressLast);
16
+ return addresses.sort((a, b) => loopbackAddressLast(a.multiaddr, b.multiaddr) ||
17
+ publicAddressesFirst(a.multiaddr, b.multiaddr) ||
18
+ circuitRelayAddressesLast(a.multiaddr, b.multiaddr) ||
19
+ certifiedAddressesFirst(a, b) ||
20
+ reliableTransportsFirst(a.multiaddr, b.multiaddr));
127
21
  }
128
22
  //# sourceMappingURL=address-sorter.js.map
package/dist/src/connection-manager/address-sorter.js.map CHANGED
@@ -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":"AAAA,OAAO,EACL,uBAAuB,EACvB,mBAAmB,EACnB,oBAAoB,EACpB,yBAAyB,EAC1B,MAAM,eAAe,CAAA;AAGtB;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CAAE,CAAU,EAAE,CAAU;IAC7D,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACpC,OAAO,CAAC,CAAC,CAAA;IACX,CAAC;SAAM,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;QAC3C,OAAO,CAAC,CAAA;IACV,CAAC;IAED,OAAO,CAAC,CAAA;AACV,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAE,SAAoB;IACxD,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAC7B,mBAAmB,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC;QAC7C,oBAAoB,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC;QAC9C,yBAAyB,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC;QACnD,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC;QAC7B,uBAAuB,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAClD,CAAA;AACH,CAAC"}
package/dist/src/connection-monitor.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"connection-monitor.d.ts","sourceRoot":"","sources":["../../src/connection-monitor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAGvD,OAAO,KAAK,EAAE,eAAe,EAAU,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AACpF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AACnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA;AASxD,MAAM,WAAW,qBAAqB;IACpC;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IAEjB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IAErB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,aAAa,GAAG,SAAS,CAAC,CAAA;IAElE;;;;OAIG;IACH,4BAA4B,CAAC,EAAE,OAAO,CAAA;IAEtC;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,eAAe,CAAA;IACvB,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,qBAAa,iBAAkB,YAAW,SAAS;IACjD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA6B;IACxD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,iBAAiB,CAAC,CAAgC;IAC1D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAQ;IACvC,OAAO,CAAC,eAAe,CAAC,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAS;gBAEzC,UAAU,EAAE,2BAA2B,EAAE,IAAI,GAAE,qBAA0B;IActF,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,gCAA+B;IAE5D,QAAQ,CAAC,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAEvC;IAED,KAAK,IAAK,IAAI;IA+Dd,IAAI,IAAK,IAAI;CAOd"}
1
+ {"version":3,"file":"connection-monitor.d.ts","sourceRoot":"","sources":["../../src/connection-monitor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAGvD,OAAO,KAAK,EAAE,eAAe,EAAU,OAAO,EAAE,SAAS,EAAU,MAAM,mBAAmB,CAAA;AAC5F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AACnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA;AASxD,MAAM,WAAW,qBAAqB;IACpC;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IAEjB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IAErB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,aAAa,GAAG,SAAS,CAAC,CAAA;IAElE;;;;OAIG;IACH,4BAA4B,CAAC,EAAE,OAAO,CAAA;IAEtC;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,eAAe,CAAA;IACvB,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,qBAAa,iBAAkB,YAAW,SAAS;IACjD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA6B;IACxD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,iBAAiB,CAAC,CAAgC;IAC1D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAQ;IACvC,OAAO,CAAC,eAAe,CAAC,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAS;gBAEzC,UAAU,EAAE,2BAA2B,EAAE,IAAI,GAAE,qBAA0B;IActF,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,gCAA+B;IAE5D,QAAQ,CAAC,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAEvC;IAED,KAAK,IAAK,IAAI;IAkEd,IAAI,IAAK,IAAI;CAOd"}
package/dist/src/connection-monitor.js CHANGED
@@ -43,8 +43,9 @@ export class ConnectionMonitor {
43
43
  const signal = this.timeout.getTimeoutSignal({
44
44
  signal: this.abortController?.signal
45
45
  });
46
+ let stream;
46
47
  try {
47
- const stream = await conn.newStream(this.protocol, {
48
+ stream = await conn.newStream(this.protocol, {
48
49
  signal,
49
50
  runOnLimitedConnection: true
50
51
  });
@@ -65,6 +66,7 @@ export class ConnectionMonitor {
65
66
  });
66
67
  }
67
68
  catch (err) {
69
+ stream?.abort(err);
68
70
  if (err.name !== 'UnsupportedProtocolError') {
69
71
  throw err;
70
72
  }
package/dist/src/connection-monitor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"connection-monitor.js","sourceRoot":"","sources":["../../src/connection-monitor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"connection-monitor.js","sourceRoot":"","sources":["../../src/connection-monitor.ts"],"names":[],"mappings":"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"}
package/dist/src/version.d.ts CHANGED
@@ -1,3 +1,3 @@
1
- export declare const version = "3.2.3";
1
+ export declare const version = "3.2.4-15eeedba1";
2
2
  export declare const name = "js-libp2p";
3
3
  //# sourceMappingURL=version.d.ts.map
package/dist/src/version.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,UAAU,CAAA;AAC9B,eAAO,MAAM,IAAI,cAAc,CAAA"}
1
+ {"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,oBAAoB,CAAA;AACxC,eAAO,MAAM,IAAI,cAAc,CAAA"}
package/dist/src/version.js CHANGED
@@ -1,3 +1,3 @@
1
- export const version = '3.2.3';
1
+ export const version = '3.2.4-15eeedba1';
2
2
  export const name = 'js-libp2p';
3
3
  //# sourceMappingURL=version.js.map
package/dist/src/version.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAA;AAC9B,MAAM,CAAC,MAAM,IAAI,GAAG,WAAW,CAAA"}
1
+ {"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,iBAAiB,CAAA;AACxC,MAAM,CAAC,MAAM,IAAI,GAAG,WAAW,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "libp2p",
3
- "version": "3.2.3",
3
+ "version": "3.2.4-15eeedba1",
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",
@@ -83,15 +83,15 @@
83
83
  "dependencies": {
84
84
  "@chainsafe/is-ip": "^2.1.0",
85
85
  "@chainsafe/netmask": "^2.0.0",
86
- "@libp2p/crypto": "^5.1.17",
87
- "@libp2p/interface": "^3.2.2",
88
- "@libp2p/interface-internal": "^3.1.3",
89
- "@libp2p/logger": "^6.2.6",
90
- "@libp2p/multistream-select": "^7.0.18",
91
- "@libp2p/peer-collections": "^7.0.18",
92
- "@libp2p/peer-id": "^6.0.8",
93
- "@libp2p/peer-store": "^12.0.18",
94
- "@libp2p/utils": "^7.1.0",
86
+ "@libp2p/crypto": "5.1.17-15eeedba1",
87
+ "@libp2p/interface": "3.2.2-15eeedba1",
88
+ "@libp2p/interface-internal": "3.1.3-15eeedba1",
89
+ "@libp2p/logger": "6.2.6-15eeedba1",
90
+ "@libp2p/multistream-select": "7.0.18-15eeedba1",
91
+ "@libp2p/peer-collections": "7.0.18-15eeedba1",
92
+ "@libp2p/peer-id": "6.0.8-15eeedba1",
93
+ "@libp2p/peer-store": "12.0.18-15eeedba1",
94
+ "@libp2p/utils": "7.1.0-15eeedba1",
95
95
  "@multiformats/dns": "^1.0.6",
96
96
  "@multiformats/multiaddr": "^13.0.1",
97
97
  "@multiformats/multiaddr-matcher": "^3.0.1",
package/src/address-manager/index.ts CHANGED
@@ -312,12 +312,12 @@ export class AddressManager implements AddressManagerInterface {
312
312
  removeObservedAddr (addr: Multiaddr, options?: ConfirmAddressOptions): void {
313
313
  addr = stripPeerId(addr, this.components.peerId)
314
314
 
315
- let startingConfidence = false
315
+ let startingConfidence = true
316
316
 
317
317
  if (this.observed.has(addr)) {
318
318
  const observedStartingConfidence = this.observed.remove(addr)
319
319
 
320
- if (!observedStartingConfidence && startingConfidence) {
320
+ if (observedStartingConfidence && startingConfidence) {
321
321
  startingConfidence = false
322
322
  }
323
323
  }
@@ -325,7 +325,7 @@ export class AddressManager implements AddressManagerInterface {
325
325
  if (this.transportAddresses.has(addr)) {
326
326
  const transportStartingConfidence = this.transportAddresses.unconfirm(addr, options?.ttl ?? this.addressVerificationRetry)
327
327
 
328
- if (!transportStartingConfidence && startingConfidence) {
328
+ if (transportStartingConfidence && startingConfidence) {
329
329
  startingConfidence = false
330
330
  }
331
331
  }
@@ -333,7 +333,7 @@ export class AddressManager implements AddressManagerInterface {
333
333
  if (this.dnsMappings.has(addr)) {
334
334
  const dnsMappingStartingConfidence = this.dnsMappings.unconfirm(addr, options?.ttl ?? this.addressVerificationRetry)
335
335
 
336
- if (!dnsMappingStartingConfidence && startingConfidence) {
336
+ if (dnsMappingStartingConfidence && startingConfidence) {
337
337
  startingConfidence = false
338
338
  }
339
339
  }
@@ -341,13 +341,13 @@ export class AddressManager implements AddressManagerInterface {
341
341
  if (this.ipMappings.has(addr)) {
342
342
  const ipMappingStartingConfidence = this.ipMappings.unconfirm(addr, options?.ttl ?? this.addressVerificationRetry)
343
343
 
344
- if (!ipMappingStartingConfidence && startingConfidence) {
344
+ if (ipMappingStartingConfidence && startingConfidence) {
345
345
  startingConfidence = false
346
346
  }
347
347
  }
348
348
 
349
349
  // only trigger the 'self:peer:update' event if our confidence in an address has changed
350
- if (startingConfidence) {
350
+ if (!startingConfidence) {
351
351
  this._updatePeerStoreAddresses()
352
352
  }
353
353
  }
package/src/connection-manager/address-sorter.ts CHANGED
@@ -1,119 +1,11 @@
1
- import { isLoopback, isPrivate } from '@libp2p/utils'
2
- import { Circuit, WebSockets, WebSocketsSecure, WebRTC, WebRTCDirect, WebTransport, TCP } from '@multiformats/multiaddr-matcher'
1
+ import {
2
+ reliableTransportsFirst,
3
+ loopbackAddressLast,
4
+ publicAddressesFirst,
5
+ circuitRelayAddressesLast
6
+ } from '@libp2p/utils'
3
7
  import type { Address } from '@libp2p/interface'
4
8
 
5
- /**
6
- * Sorts addresses by order of reliability, where they have presented the fewest
7
- * problems:
8
- *
9
- * TCP -> WebSockets/Secure -> WebRTC -> WebRTCDirect -> WebTransport
10
- */
11
- // eslint-disable-next-line complexity
12
- export function reliableTransportsFirst (a: Address, b: Address): -1 | 0 | 1 {
13
- const isATcp = TCP.exactMatch(a.multiaddr)
14
- const isBTcp = TCP.exactMatch(b.multiaddr)
15
-
16
- if (isATcp && !isBTcp) {
17
- return -1
18
- }
19
-
20
- if (!isATcp && isBTcp) {
21
- return 1
22
- }
23
-
24
- const isAWebSocketSecure = WebSocketsSecure.exactMatch(a.multiaddr)
25
- const isBWebSocketSecure = WebSocketsSecure.exactMatch(b.multiaddr)
26
-
27
- if (isAWebSocketSecure && !isBWebSocketSecure) {
28
- return -1
29
- }
30
-
31
- if (!isAWebSocketSecure && isBWebSocketSecure) {
32
- return 1
33
- }
34
-
35
- const isAWebSocket = WebSockets.exactMatch(a.multiaddr)
36
- const isBWebSocket = WebSockets.exactMatch(b.multiaddr)
37
-
38
- if (isAWebSocket && !isBWebSocket) {
39
- return -1
40
- }
41
-
42
- if (!isAWebSocket && isBWebSocket) {
43
- return 1
44
- }
45
-
46
- const isAWebRTC = WebRTC.exactMatch(a.multiaddr)
47
- const isBWebRTC = WebRTC.exactMatch(b.multiaddr)
48
-
49
- if (isAWebRTC && !isBWebRTC) {
50
- return -1
51
- }
52
-
53
- if (!isAWebRTC && isBWebRTC) {
54
- return 1
55
- }
56
-
57
- const isAWebRTCDirect = WebRTCDirect.exactMatch(a.multiaddr)
58
- const isBWebRTCDirect = WebRTCDirect.exactMatch(b.multiaddr)
59
-
60
- if (isAWebRTCDirect && !isBWebRTCDirect) {
61
- return -1
62
- }
63
-
64
- if (!isAWebRTCDirect && isBWebRTCDirect) {
65
- return 1
66
- }
67
-
68
- const isAWebTransport = WebTransport.exactMatch(a.multiaddr)
69
- const isBWebTransport = WebTransport.exactMatch(b.multiaddr)
70
-
71
- if (isAWebTransport && !isBWebTransport) {
72
- return -1
73
- }
74
-
75
- if (!isAWebTransport && isBWebTransport) {
76
- return 1
77
- }
78
-
79
- // ... everything else
80
- return 0
81
- }
82
-
83
- /**
84
- * Compare function for array.sort() that moves loopback addresses to the end
85
- * of the array.
86
- */
87
- export function loopbackAddressLast (a: Address, b: Address): -1 | 0 | 1 {
88
- const isALoopback = isLoopback(a.multiaddr)
89
- const isBLoopback = isLoopback(b.multiaddr)
90
-
91
- if (isALoopback && !isBLoopback) {
92
- return 1
93
- } else if (!isALoopback && isBLoopback) {
94
- return -1
95
- }
96
-
97
- return 0
98
- }
99
-
100
- /**
101
- * Compare function for array.sort() that moves public addresses to the start
102
- * of the array.
103
- */
104
- export function publicAddressesFirst (a: Address, b: Address): -1 | 0 | 1 {
105
- const isAPrivate = isPrivate(a.multiaddr)
106
- const isBPrivate = isPrivate(b.multiaddr)
107
-
108
- if (isAPrivate && !isBPrivate) {
109
- return 1
110
- } else if (!isAPrivate && isBPrivate) {
111
- return -1
112
- }
113
-
114
- return 0
115
- }
116
-
117
9
  /**
118
10
  * Compare function for array.sort() that moves certified addresses to the start
119
11
  * of the array.
@@ -128,28 +20,12 @@ export function certifiedAddressesFirst (a: Address, b: Address): -1 | 0 | 1 {
128
20
  return 0
129
21
  }
130
22
 
131
- /**
132
- * Compare function for array.sort() that moves circuit relay addresses to the
133
- * end of the array.
134
- */
135
- export function circuitRelayAddressesLast (a: Address, b: Address): -1 | 0 | 1 {
136
- const isACircuit = Circuit.exactMatch(a.multiaddr)
137
- const isBCircuit = Circuit.exactMatch(b.multiaddr)
138
-
139
- if (isACircuit && !isBCircuit) {
140
- return 1
141
- } else if (!isACircuit && isBCircuit) {
142
- return -1
143
- }
144
-
145
- return 0
146
- }
147
-
148
23
  export function defaultAddressSorter (addresses: Address[]): Address[] {
149
- return addresses
150
- .sort(reliableTransportsFirst)
151
- .sort(certifiedAddressesFirst)
152
- .sort(circuitRelayAddressesLast)
153
- .sort(publicAddressesFirst)
154
- .sort(loopbackAddressLast)
24
+ return addresses.sort((a, b) =>
25
+ loopbackAddressLast(a.multiaddr, b.multiaddr) ||
26
+ publicAddressesFirst(a.multiaddr, b.multiaddr) ||
27
+ circuitRelayAddressesLast(a.multiaddr, b.multiaddr) ||
28
+ certifiedAddressesFirst(a, b) ||
29
+ reliableTransportsFirst(a.multiaddr, b.multiaddr)
30
+ )
155
31
  }
package/src/connection-monitor.ts CHANGED
@@ -2,7 +2,7 @@ import { randomBytes } from '@libp2p/crypto'
2
2
  import { serviceCapabilities } from '@libp2p/interface'
3
3
  import { AdaptiveTimeout, byteStream } from '@libp2p/utils'
4
4
  import { setMaxListeners } from 'main-event'
5
- import type { ComponentLogger, Logger, Metrics, Startable } from '@libp2p/interface'
5
+ import type { ComponentLogger, Logger, Metrics, Startable, Stream } from '@libp2p/interface'
6
6
  import type { ConnectionManager } from '@libp2p/interface-internal'
7
7
  import type { AdaptiveTimeoutInit } from '@libp2p/utils'
8
8
 
@@ -99,9 +99,10 @@ export class ConnectionMonitor implements Startable {
99
99
  const signal = this.timeout.getTimeoutSignal({
100
100
  signal: this.abortController?.signal
101
101
  })
102
+ let stream: Stream | undefined
102
103
 
103
104
  try {
104
- const stream = await conn.newStream(this.protocol, {
105
+ stream = await conn.newStream(this.protocol, {
105
106
  signal,
106
107
  runOnLimitedConnection: true
107
108
  })
@@ -124,6 +125,8 @@ export class ConnectionMonitor implements Startable {
124
125
  signal
125
126
  })
126
127
  } catch (err: any) {
128
+ stream?.abort(err)
129
+
127
130
  if (err.name !== 'UnsupportedProtocolError') {
128
131
  throw err
129
132
  }
package/src/version.ts CHANGED
@@ -1,2 +1,2 @@
1
- export const version = '3.2.3'
1
+ export const version = '3.2.4-15eeedba1'
2
2
  export const name = 'js-libp2p'