@libp2p/kad-dht 0.28.7 → 1.0.2
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.
- package/dist/src/content-fetching/index.d.ts +6 -9
- package/dist/src/content-fetching/index.d.ts.map +1 -1
- package/dist/src/content-fetching/index.js +14 -11
- package/dist/src/content-fetching/index.js.map +1 -1
- package/dist/src/content-routing/index.d.ts +6 -9
- package/dist/src/content-routing/index.d.ts.map +1 -1
- package/dist/src/content-routing/index.js +15 -13
- package/dist/src/content-routing/index.js.map +1 -1
- package/dist/src/dual-kad-dht.d.ts +6 -6
- package/dist/src/dual-kad-dht.d.ts.map +1 -1
- package/dist/src/dual-kad-dht.js +9 -4
- package/dist/src/dual-kad-dht.js.map +1 -1
- package/dist/src/index.d.ts +14 -3
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +14 -12
- package/dist/src/index.js.map +1 -1
- package/dist/src/kad-dht.d.ts +12 -52
- package/dist/src/kad-dht.d.ts.map +1 -1
- package/dist/src/kad-dht.js +45 -48
- package/dist/src/kad-dht.js.map +1 -1
- package/dist/src/network.d.ts +7 -7
- package/dist/src/network.d.ts.map +1 -1
- package/dist/src/network.js +10 -6
- package/dist/src/network.js.map +1 -1
- package/dist/src/peer-routing/index.d.ts +6 -8
- package/dist/src/peer-routing/index.d.ts.map +1 -1
- package/dist/src/peer-routing/index.js +18 -16
- package/dist/src/peer-routing/index.js.map +1 -1
- package/dist/src/providers.d.ts +6 -6
- package/dist/src/providers.d.ts.map +1 -1
- package/dist/src/providers.js +11 -7
- package/dist/src/providers.js.map +1 -1
- package/dist/src/query/manager.d.ts +6 -8
- package/dist/src/query/manager.d.ts.map +1 -1
- package/dist/src/query/manager.js +10 -7
- package/dist/src/query/manager.js.map +1 -1
- package/dist/src/query/query-path.d.ts.map +1 -1
- package/dist/src/query/query-path.js +2 -3
- package/dist/src/query/query-path.js.map +1 -1
- package/dist/src/query-self.d.ts +6 -6
- package/dist/src/query-self.d.ts.map +1 -1
- package/dist/src/query-self.js +8 -4
- package/dist/src/query-self.js.map +1 -1
- package/dist/src/routing-table/index.d.ts +10 -14
- package/dist/src/routing-table/index.d.ts.map +1 -1
- package/dist/src/routing-table/index.js +12 -10
- package/dist/src/routing-table/index.js.map +1 -1
- package/dist/src/routing-table/refresh.d.ts +5 -3
- package/dist/src/routing-table/refresh.d.ts.map +1 -1
- package/dist/src/routing-table/refresh.js +4 -2
- package/dist/src/routing-table/refresh.js.map +1 -1
- package/dist/src/rpc/handlers/add-provider.d.ts +5 -3
- package/dist/src/rpc/handlers/add-provider.d.ts.map +1 -1
- package/dist/src/rpc/handlers/add-provider.js +4 -2
- package/dist/src/rpc/handlers/add-provider.js.map +1 -1
- package/dist/src/rpc/handlers/find-node.d.ts +5 -3
- package/dist/src/rpc/handlers/find-node.d.ts.map +1 -1
- package/dist/src/rpc/handlers/find-node.js +4 -2
- package/dist/src/rpc/handlers/find-node.js.map +1 -1
- package/dist/src/rpc/handlers/get-providers.d.ts +6 -6
- package/dist/src/rpc/handlers/get-providers.d.ts.map +1 -1
- package/dist/src/rpc/handlers/get-providers.js +8 -4
- package/dist/src/rpc/handlers/get-providers.js.map +1 -1
- package/dist/src/rpc/handlers/get-value.d.ts +6 -9
- package/dist/src/rpc/handlers/get-value.d.ts.map +1 -1
- package/dist/src/rpc/handlers/get-value.js +10 -7
- package/dist/src/rpc/handlers/get-value.js.map +1 -1
- package/dist/src/rpc/handlers/ping.d.ts +3 -1
- package/dist/src/rpc/handlers/ping.d.ts.map +1 -1
- package/dist/src/rpc/handlers/ping.js +2 -0
- package/dist/src/rpc/handlers/ping.js.map +1 -1
- package/dist/src/rpc/handlers/put-value.d.ts +7 -8
- package/dist/src/rpc/handlers/put-value.d.ts.map +1 -1
- package/dist/src/rpc/handlers/put-value.js +10 -7
- package/dist/src/rpc/handlers/put-value.js.map +1 -1
- package/dist/src/rpc/index.d.ts +6 -10
- package/dist/src/rpc/index.d.ts.map +1 -1
- package/dist/src/rpc/index.js +14 -9
- package/dist/src/rpc/index.js.map +1 -1
- package/dist/src/topology-listener.d.ts +6 -6
- package/dist/src/topology-listener.d.ts.map +1 -1
- package/dist/src/topology-listener.js +9 -5
- package/dist/src/topology-listener.js.map +1 -1
- package/package.json +21 -21
- package/src/content-fetching/index.ts +17 -19
- package/src/content-routing/index.ts +18 -21
- package/src/dual-kad-dht.ts +12 -9
- package/src/index.ts +22 -14
- package/src/kad-dht.ts +59 -117
- package/src/network.ts +14 -12
- package/src/peer-routing/index.ts +21 -23
- package/src/providers.ts +14 -11
- package/src/query/manager.ts +13 -14
- package/src/query/query-path.ts +2 -3
- package/src/query-self.ts +11 -9
- package/src/routing-table/index.ts +20 -23
- package/src/routing-table/refresh.ts +9 -4
- package/src/rpc/handlers/add-provider.ts +9 -4
- package/src/rpc/handlers/find-node.ts +9 -4
- package/src/rpc/handlers/get-providers.ts +11 -9
- package/src/rpc/handlers/get-value.ts +13 -15
- package/src/rpc/handlers/ping.ts +6 -1
- package/src/rpc/handlers/put-value.ts +14 -15
- package/src/rpc/index.ts +19 -18
- package/src/topology-listener.ts +12 -10
- package/dist/src/routing-table/types.d.ts +0 -24
- package/dist/src/routing-table/types.d.ts.map +0 -1
- package/dist/src/rpc/handlers/index.d.ts +0 -13
- package/dist/src/rpc/handlers/index.d.ts.map +0 -1
- package/dist/src/rpc/types.d.ts +0 -6
- package/dist/src/rpc/types.d.ts.map +0 -1
- package/dist/src/types.d.ts +0 -143
- package/dist/src/types.d.ts.map +0 -1
package/dist/src/kad-dht.js
CHANGED
|
@@ -12,6 +12,9 @@ import { QuerySelf } from './query-self.js';
|
|
|
12
12
|
import { removePrivateAddresses, removePublicAddresses } from './utils.js';
|
|
13
13
|
import { logger } from '@libp2p/logger';
|
|
14
14
|
import { CustomEvent, EventEmitter } from '@libp2p/interfaces';
|
|
15
|
+
import { Components } from '@libp2p/interfaces/components';
|
|
16
|
+
import { validators as recordValidators } from '@libp2p/record/validators';
|
|
17
|
+
import { selectors as recordSelectors } from '@libp2p/record/selectors';
|
|
15
18
|
/**
|
|
16
19
|
* A DHT implementation modelled after Kademlia with S/Kademlia modifications.
|
|
17
20
|
* Original implementation in go: https://github.com/libp2p/go-libp2p-kad-dht.
|
|
@@ -20,100 +23,83 @@ export class KadDHT extends EventEmitter {
|
|
|
20
23
|
/**
|
|
21
24
|
* Create a new KadDHT
|
|
22
25
|
*/
|
|
23
|
-
constructor(
|
|
26
|
+
constructor(init) {
|
|
24
27
|
super();
|
|
25
|
-
|
|
28
|
+
this.components = new Components();
|
|
29
|
+
const { kBucketSize, clientMode, validators, selectors, querySelfInterval, lan, protocolPrefix } = init;
|
|
26
30
|
this.running = false;
|
|
27
|
-
this.
|
|
28
|
-
this.
|
|
31
|
+
this.lan = Boolean(lan);
|
|
32
|
+
this.log = logger(`libp2p:kad-dht:${lan === true ? 'lan' : 'wan'}`);
|
|
33
|
+
this.protocol = `${protocolPrefix ?? '/ipfs'}${lan === true ? '/lan' : ''}/kad/1.0.0`;
|
|
29
34
|
this.kBucketSize = kBucketSize ?? 20;
|
|
30
35
|
this.clientMode = clientMode ?? true;
|
|
31
|
-
this.bootstrapPeers = bootstrapPeers ?? [];
|
|
32
|
-
this.addressable = addressable;
|
|
33
|
-
this.registrar = registrar;
|
|
34
36
|
this.routingTable = new RoutingTable({
|
|
35
|
-
peerId,
|
|
36
|
-
dialer,
|
|
37
37
|
kBucketSize,
|
|
38
|
-
|
|
39
|
-
lan
|
|
40
|
-
});
|
|
41
|
-
this.providers = new Providers({
|
|
42
|
-
datastore
|
|
38
|
+
lan: this.lan
|
|
43
39
|
});
|
|
44
|
-
this.
|
|
45
|
-
this.validators =
|
|
46
|
-
|
|
40
|
+
this.providers = new Providers();
|
|
41
|
+
this.validators = {
|
|
42
|
+
...recordValidators,
|
|
43
|
+
...validators
|
|
44
|
+
};
|
|
45
|
+
this.selectors = {
|
|
46
|
+
...recordSelectors,
|
|
47
|
+
...selectors
|
|
48
|
+
};
|
|
47
49
|
this.network = new Network({
|
|
48
|
-
dialer,
|
|
49
50
|
protocol: this.protocol,
|
|
50
|
-
lan
|
|
51
|
-
peerId
|
|
51
|
+
lan: this.lan
|
|
52
52
|
});
|
|
53
53
|
this.queryManager = new QueryManager({
|
|
54
|
-
peerId: peerId,
|
|
55
54
|
// Number of disjoint query paths to use - This is set to `kBucketSize/2` per the S/Kademlia paper
|
|
56
55
|
disjointPaths: Math.ceil(this.kBucketSize / 2),
|
|
57
|
-
metrics,
|
|
58
56
|
lan
|
|
59
57
|
});
|
|
60
58
|
// DHT components
|
|
61
59
|
this.peerRouting = new PeerRouting({
|
|
62
|
-
peerId,
|
|
63
60
|
routingTable: this.routingTable,
|
|
64
|
-
peerStore,
|
|
65
61
|
network: this.network,
|
|
66
62
|
validators: this.validators,
|
|
67
63
|
queryManager: this.queryManager,
|
|
68
|
-
lan
|
|
64
|
+
lan: this.lan
|
|
69
65
|
});
|
|
70
66
|
this.contentFetching = new ContentFetching({
|
|
71
|
-
peerId,
|
|
72
|
-
datastore,
|
|
73
67
|
validators: this.validators,
|
|
74
68
|
selectors: this.selectors,
|
|
75
69
|
peerRouting: this.peerRouting,
|
|
76
70
|
queryManager: this.queryManager,
|
|
77
71
|
routingTable: this.routingTable,
|
|
78
72
|
network: this.network,
|
|
79
|
-
lan
|
|
73
|
+
lan: this.lan
|
|
80
74
|
});
|
|
81
75
|
this.contentRouting = new ContentRouting({
|
|
82
|
-
peerId,
|
|
83
76
|
network: this.network,
|
|
84
77
|
peerRouting: this.peerRouting,
|
|
85
78
|
queryManager: this.queryManager,
|
|
86
79
|
routingTable: this.routingTable,
|
|
87
80
|
providers: this.providers,
|
|
88
|
-
|
|
89
|
-
lan
|
|
81
|
+
lan: this.lan
|
|
90
82
|
});
|
|
91
83
|
this.routingTableRefresh = new RoutingTableRefresh({
|
|
92
84
|
peerRouting: this.peerRouting,
|
|
93
85
|
routingTable: this.routingTable,
|
|
94
|
-
lan
|
|
86
|
+
lan: this.lan
|
|
95
87
|
});
|
|
96
88
|
this.rpc = new RPC({
|
|
97
|
-
peerId,
|
|
98
89
|
routingTable: this.routingTable,
|
|
99
90
|
providers: this.providers,
|
|
100
91
|
peerRouting: this.peerRouting,
|
|
101
|
-
datastore,
|
|
102
92
|
validators: this.validators,
|
|
103
|
-
|
|
104
|
-
addressBook: peerStore.addressBook,
|
|
105
|
-
lan
|
|
93
|
+
lan: this.lan
|
|
106
94
|
});
|
|
107
95
|
this.topologyListener = new TopologyListener({
|
|
108
|
-
registrar,
|
|
109
96
|
protocol: this.protocol,
|
|
110
|
-
lan
|
|
97
|
+
lan: this.lan
|
|
111
98
|
});
|
|
112
99
|
this.querySelf = new QuerySelf({
|
|
113
|
-
peerId,
|
|
114
100
|
peerRouting: this.peerRouting,
|
|
115
101
|
interval: querySelfInterval,
|
|
116
|
-
lan
|
|
102
|
+
lan: this.lan
|
|
117
103
|
});
|
|
118
104
|
// handle peers being discovered during processing of DHT messages
|
|
119
105
|
this.network.addEventListener('peer', (evt) => {
|
|
@@ -129,7 +115,7 @@ export class KadDHT extends EventEmitter {
|
|
|
129
115
|
this.topologyListener.addEventListener('peer', (evt) => {
|
|
130
116
|
const peerId = evt.detail;
|
|
131
117
|
Promise.resolve().then(async () => {
|
|
132
|
-
const multiaddrs = await
|
|
118
|
+
const multiaddrs = await this.components.getPeerStore().addressBook.get(peerId);
|
|
133
119
|
const peerData = {
|
|
134
120
|
id: peerId,
|
|
135
121
|
multiaddrs: multiaddrs.map(addr => addr.multiaddr),
|
|
@@ -141,6 +127,20 @@ export class KadDHT extends EventEmitter {
|
|
|
141
127
|
});
|
|
142
128
|
});
|
|
143
129
|
}
|
|
130
|
+
init(components) {
|
|
131
|
+
this.components = components;
|
|
132
|
+
this.routingTable.init(components);
|
|
133
|
+
this.providers.init(components);
|
|
134
|
+
this.network.init(components);
|
|
135
|
+
this.queryManager.init(components);
|
|
136
|
+
this.peerRouting.init(components);
|
|
137
|
+
this.contentFetching.init(components);
|
|
138
|
+
this.contentRouting.init(components);
|
|
139
|
+
this.routingTableRefresh.init(components);
|
|
140
|
+
this.rpc.init(components);
|
|
141
|
+
this.topologyListener.init(components);
|
|
142
|
+
this.querySelf.init(components);
|
|
143
|
+
}
|
|
144
144
|
async onPeerConnect(peerData) {
|
|
145
145
|
this.log('peer %p connected', peerData.id);
|
|
146
146
|
if (this.lan) {
|
|
@@ -176,9 +176,7 @@ export class KadDHT extends EventEmitter {
|
|
|
176
176
|
* If 'server' this node will respond to DHT queries, if 'client' this node will not
|
|
177
177
|
*/
|
|
178
178
|
async setMode(mode) {
|
|
179
|
-
|
|
180
|
-
await this.registrar.unhandle(this.registrarHandleId);
|
|
181
|
-
}
|
|
179
|
+
await this.components.getRegistrar().unhandle(this.protocol);
|
|
182
180
|
if (mode === 'client') {
|
|
183
181
|
this.log('enabling client mode');
|
|
184
182
|
this.clientMode = true;
|
|
@@ -186,7 +184,7 @@ export class KadDHT extends EventEmitter {
|
|
|
186
184
|
else {
|
|
187
185
|
this.log('enabling server mode');
|
|
188
186
|
this.clientMode = false;
|
|
189
|
-
|
|
187
|
+
await this.components.getRegistrar().handle(this.protocol, this.rpc.onIncomingStream.bind(this.rpc));
|
|
190
188
|
}
|
|
191
189
|
}
|
|
192
190
|
/**
|
|
@@ -204,7 +202,6 @@ export class KadDHT extends EventEmitter {
|
|
|
204
202
|
this.topologyListener.start(),
|
|
205
203
|
this.querySelf.start()
|
|
206
204
|
]);
|
|
207
|
-
await Promise.all(this.bootstrapPeers.map(async (peerData) => await this.routingTable.add(peerData.id)));
|
|
208
205
|
await this.routingTableRefresh.start();
|
|
209
206
|
}
|
|
210
207
|
/**
|
|
@@ -240,7 +237,7 @@ export class KadDHT extends EventEmitter {
|
|
|
240
237
|
* Announce to the network that we can provide given key's value
|
|
241
238
|
*/
|
|
242
239
|
async *provide(key, options = {}) {
|
|
243
|
-
yield* this.contentRouting.provide(key, this.
|
|
240
|
+
yield* this.contentRouting.provide(key, this.components.getAddressManager().getAddresses(), options);
|
|
244
241
|
}
|
|
245
242
|
/**
|
|
246
243
|
* Search the dht for providers of the given CID
|
package/dist/src/kad-dht.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kad-dht.js","sourceRoot":"","sources":["../../src/kad-dht.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EACL,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAU,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAG/C,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"kad-dht.js","sourceRoot":"","sources":["../../src/kad-dht.ts"],"names":[],"mappings":"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"}
|
package/dist/src/network.d.ts
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
import { Message } from './message/index.js';
|
|
2
2
|
import { EventEmitter } from '@libp2p/interfaces';
|
|
3
3
|
import type { PeerId } from '@libp2p/interfaces/peer-id';
|
|
4
|
-
import type { AbortOptions,
|
|
4
|
+
import type { AbortOptions, Startable } from '@libp2p/interfaces';
|
|
5
5
|
import type { Duplex } from 'it-stream-types';
|
|
6
6
|
import type { PeerData } from '@libp2p/interfaces/peer-data';
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
import { Components, Initializable } from '@libp2p/interfaces/components';
|
|
8
|
+
export interface NetworkInit {
|
|
9
9
|
protocol: string;
|
|
10
10
|
lan: boolean;
|
|
11
|
-
peerId: PeerId;
|
|
12
11
|
}
|
|
13
12
|
interface NetworkEvents {
|
|
14
13
|
'peer': CustomEvent<PeerData>;
|
|
@@ -16,15 +15,16 @@ interface NetworkEvents {
|
|
|
16
15
|
/**
|
|
17
16
|
* Handle network operations for the dht
|
|
18
17
|
*/
|
|
19
|
-
export declare class Network extends EventEmitter<NetworkEvents> implements Startable {
|
|
18
|
+
export declare class Network extends EventEmitter<NetworkEvents> implements Startable, Initializable {
|
|
20
19
|
private readonly log;
|
|
21
|
-
dialer: Dialer;
|
|
22
20
|
private readonly protocol;
|
|
23
21
|
private running;
|
|
22
|
+
private components;
|
|
24
23
|
/**
|
|
25
24
|
* Create a new network
|
|
26
25
|
*/
|
|
27
|
-
constructor(
|
|
26
|
+
constructor(init: NetworkInit);
|
|
27
|
+
init(components: Components): void;
|
|
28
28
|
/**
|
|
29
29
|
* Start the network
|
|
30
30
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../src/network.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAuB,MAAM,oBAAoB,CAAA;AACjE,OAAO,EAAE,YAAY,EAAe,MAAM,oBAAoB,CAAA;AAQ9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../src/network.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAuB,MAAM,oBAAoB,CAAA;AACjE,OAAO,EAAE,YAAY,EAAe,MAAM,oBAAoB,CAAA;AAQ9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAEjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAEzE,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,OAAO,CAAA;CACb;AAED,UAAU,aAAa;IACrB,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAA;CAC9B;AAED;;GAEG;AACH,qBAAa,OAAQ,SAAQ,YAAY,CAAC,aAAa,CAAE,YAAW,SAAS,EAAE,aAAa;IAC1F,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,UAAU,CAA+B;IAEjD;;OAEG;gBACU,IAAI,EAAE,WAAW;IAS9B,IAAI,CAAE,UAAU,EAAE,UAAU,GAAG,IAAI;IAInC;;OAEG;IACG,KAAK;IAQX;;OAEG;IACG,IAAI;IAIV;;OAEG;IACH,SAAS;IAIT;;OAEG;IACK,WAAW,CAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,GAAE,YAAiB;IA4BzE;;OAEG;IACK,WAAW,CAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,GAAE,YAAiB;IAsBzE;;OAEG;IACG,aAAa,CAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,UAAU;IAShE;;;;OAIG;IACG,iBAAiB,CAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,UAAU;CAiCrE"}
|
package/dist/src/network.js
CHANGED
|
@@ -7,6 +7,7 @@ import { Message, MESSAGE_TYPE_LOOKUP } from './message/index.js';
|
|
|
7
7
|
import { EventEmitter, CustomEvent } from '@libp2p/interfaces';
|
|
8
8
|
import { dialingPeerEvent, sendingQueryEvent, peerResponseEvent, queryErrorEvent } from './query/events.js';
|
|
9
9
|
import { logger } from '@libp2p/logger';
|
|
10
|
+
import { Components } from '@libp2p/interfaces/components';
|
|
10
11
|
/**
|
|
11
12
|
* Handle network operations for the dht
|
|
12
13
|
*/
|
|
@@ -14,14 +15,17 @@ export class Network extends EventEmitter {
|
|
|
14
15
|
/**
|
|
15
16
|
* Create a new network
|
|
16
17
|
*/
|
|
17
|
-
constructor(
|
|
18
|
+
constructor(init) {
|
|
18
19
|
super();
|
|
19
|
-
|
|
20
|
-
|
|
20
|
+
this.components = new Components();
|
|
21
|
+
const { protocol, lan } = init;
|
|
22
|
+
this.log = logger(`libp2p:kad-dht:${lan ? 'lan' : 'wan'}:network`);
|
|
21
23
|
this.running = false;
|
|
22
|
-
this.dialer = dialer;
|
|
23
24
|
this.protocol = protocol;
|
|
24
25
|
}
|
|
26
|
+
init(components) {
|
|
27
|
+
this.components = components;
|
|
28
|
+
}
|
|
25
29
|
/**
|
|
26
30
|
* Start the network
|
|
27
31
|
*/
|
|
@@ -53,7 +57,7 @@ export class Network extends EventEmitter {
|
|
|
53
57
|
this.log('sending %s to %p', MESSAGE_TYPE_LOOKUP[msg.type], to);
|
|
54
58
|
try {
|
|
55
59
|
yield dialingPeerEvent({ peer: to });
|
|
56
|
-
const { stream } = await this.
|
|
60
|
+
const { stream } = await this.components.getDialer().dialProtocol(to, this.protocol, options);
|
|
57
61
|
yield sendingQueryEvent({ to, type: msg.type });
|
|
58
62
|
const response = await this._writeReadMessage(stream, msg.serialize());
|
|
59
63
|
yield peerResponseEvent({
|
|
@@ -77,7 +81,7 @@ export class Network extends EventEmitter {
|
|
|
77
81
|
}
|
|
78
82
|
this.log('sending %s to %p', MESSAGE_TYPE_LOOKUP[msg.type], to);
|
|
79
83
|
yield dialingPeerEvent({ peer: to });
|
|
80
|
-
const { stream } = await this.
|
|
84
|
+
const { stream } = await this.components.getDialer().dialProtocol(to, this.protocol, options);
|
|
81
85
|
yield sendingQueryEvent({ to, type: msg.type });
|
|
82
86
|
try {
|
|
83
87
|
await this._writeMessage(stream, msg.serialize());
|
package/dist/src/network.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../src/network.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,UAAU,CAAA;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAA;AACxC,OAAO,KAAK,MAAM,UAAU,CAAA;AAC5B,OAAO,KAAK,MAAM,UAAU,CAAA;AAC5B,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACjE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAC9D,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EAChB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../src/network.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,29 +1,27 @@
|
|
|
1
1
|
import type { DHTRecord, QueryOptions, Validators } from '@libp2p/interfaces/dht';
|
|
2
2
|
import type { RoutingTable } from '../routing-table/index.js';
|
|
3
|
-
import type { PeerStore } from '@libp2p/interfaces/peer-store';
|
|
4
3
|
import type { QueryManager } from '../query/manager.js';
|
|
5
4
|
import type { Network } from '../network.js';
|
|
6
5
|
import type { AbortOptions } from '@libp2p/interfaces';
|
|
7
6
|
import type { PeerData } from '@libp2p/interfaces/peer-data';
|
|
8
7
|
import type { PeerId } from '@libp2p/interfaces/peer-id';
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
import { Components, Initializable } from '@libp2p/interfaces/components';
|
|
9
|
+
export interface PeerRoutingInit {
|
|
11
10
|
routingTable: RoutingTable;
|
|
12
|
-
peerStore: PeerStore;
|
|
13
11
|
network: Network;
|
|
14
12
|
validators: Validators;
|
|
15
13
|
queryManager: QueryManager;
|
|
16
14
|
lan: boolean;
|
|
17
15
|
}
|
|
18
|
-
export declare class PeerRouting {
|
|
16
|
+
export declare class PeerRouting implements Initializable {
|
|
17
|
+
private components;
|
|
19
18
|
private readonly log;
|
|
20
|
-
private readonly peerId;
|
|
21
19
|
private readonly routingTable;
|
|
22
|
-
private readonly peerStore;
|
|
23
20
|
private readonly network;
|
|
24
21
|
private readonly validators;
|
|
25
22
|
private readonly queryManager;
|
|
26
|
-
constructor(
|
|
23
|
+
constructor(init: PeerRoutingInit);
|
|
24
|
+
init(components: Components): void;
|
|
27
25
|
/**
|
|
28
26
|
* Look if we are connected to a peer with the given id.
|
|
29
27
|
* Returns its id and addresses, if found, otherwise `undefined`.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/peer-routing/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/peer-routing/index.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACjF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAE5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAEzE,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,YAAY,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,EAAE,UAAU,CAAA;IACtB,YAAY,EAAE,YAAY,CAAA;IAC1B,GAAG,EAAE,OAAO,CAAA;CACb;AAED,qBAAa,WAAY,YAAW,aAAa;IAC/C,OAAO,CAAC,UAAU,CAA+B;IACjD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAc;gBAE9B,IAAI,EAAE,eAAe;IAUlC,IAAI,CAAE,UAAU,EAAE,UAAU,GAAG,IAAI;IAInC;;;OAGG;IACG,aAAa,CAAE,IAAI,EAAE,MAAM;;;;;IAqCjC;;OAEG;IACK,eAAe,CAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,OAAO,GAAE,YAAiB;IAKlF;;OAEG;IACK,oBAAoB,CAAE,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB;IAyBtE;;OAEG;IACK,QAAQ,CAAE,EAAE,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB;IA8ExD;;;OAGG;IACK,eAAe,CAAE,GAAG,EAAE,UAAU,EAAE,OAAO,GAAE,YAAiB;IAsCpE;;;;;OAKG;IACK,eAAe,CAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,OAAO,GAAE,YAAiB;IAqBlF;;;OAGG;IACG,mBAAmB,CAAE,MAAM,EAAE,SAAS;IAI5C;;;OAGG;IACG,qBAAqB,CAAE,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM;CAkCjE"}
|
|
@@ -6,21 +6,23 @@ import * as utils from '../utils.js';
|
|
|
6
6
|
import { queryErrorEvent, finalPeerEvent, valueEvent } from '../query/events.js';
|
|
7
7
|
import { PeerDistanceList } from '../peer-list/peer-distance-list.js';
|
|
8
8
|
import { Libp2pRecord } from '@libp2p/record';
|
|
9
|
-
import { base58btc } from 'multiformats/bases/base58';
|
|
10
9
|
import { logger } from '@libp2p/logger';
|
|
11
10
|
import { keys } from '@libp2p/crypto';
|
|
12
11
|
import { peerIdFromKeys } from '@libp2p/peer-id';
|
|
12
|
+
import { Components } from '@libp2p/interfaces/components';
|
|
13
13
|
export class PeerRouting {
|
|
14
|
-
constructor(
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
constructor(init) {
|
|
15
|
+
this.components = new Components();
|
|
16
|
+
const { routingTable, network, validators, queryManager, lan } = init;
|
|
17
17
|
this.routingTable = routingTable;
|
|
18
|
-
this.peerStore = peerStore;
|
|
19
18
|
this.network = network;
|
|
20
19
|
this.validators = validators;
|
|
21
20
|
this.queryManager = queryManager;
|
|
22
21
|
this.log = logger(`libp2p:kad-dht:${lan ? 'lan' : 'wan'}:peer-routing`);
|
|
23
22
|
}
|
|
23
|
+
init(components) {
|
|
24
|
+
this.components = components;
|
|
25
|
+
}
|
|
24
26
|
/**
|
|
25
27
|
* Look if we are connected to a peer with the given id.
|
|
26
28
|
* Returns its id and addresses, if found, otherwise `undefined`.
|
|
@@ -31,7 +33,7 @@ export class PeerRouting {
|
|
|
31
33
|
if (p != null) {
|
|
32
34
|
this.log('findPeerLocal found %p in routing table', peer);
|
|
33
35
|
try {
|
|
34
|
-
peerData = await this.
|
|
36
|
+
peerData = await this.components.getPeerStore().get(p);
|
|
35
37
|
}
|
|
36
38
|
catch (err) {
|
|
37
39
|
if (err.code !== 'ERR_NOT_FOUND') {
|
|
@@ -41,7 +43,7 @@ export class PeerRouting {
|
|
|
41
43
|
}
|
|
42
44
|
if (peerData == null) {
|
|
43
45
|
try {
|
|
44
|
-
peerData = await this.
|
|
46
|
+
peerData = await this.components.getPeerStore().get(peer);
|
|
45
47
|
}
|
|
46
48
|
catch (err) {
|
|
47
49
|
if (err.code !== 'ERR_NOT_FOUND') {
|
|
@@ -84,7 +86,7 @@ export class PeerRouting {
|
|
|
84
86
|
yield valueEvent({ from: peer, value: recPeer.publicKey });
|
|
85
87
|
}
|
|
86
88
|
}
|
|
87
|
-
throw errcode(new Error(`Node not responding with its public key: ${peer.toString(
|
|
89
|
+
throw errcode(new Error(`Node not responding with its public key: ${peer.toString()}`), 'ERR_INVALID_RECORD');
|
|
88
90
|
}
|
|
89
91
|
/**
|
|
90
92
|
* Search for a peer with the given ID
|
|
@@ -97,7 +99,7 @@ export class PeerRouting {
|
|
|
97
99
|
if (pi != null) {
|
|
98
100
|
this.log('found local');
|
|
99
101
|
yield finalPeerEvent({
|
|
100
|
-
from: this.
|
|
102
|
+
from: this.components.getPeerId(),
|
|
101
103
|
peer: pi
|
|
102
104
|
});
|
|
103
105
|
return;
|
|
@@ -108,10 +110,10 @@ export class PeerRouting {
|
|
|
108
110
|
const match = peers.find((p) => p.equals(id));
|
|
109
111
|
if (match != null) {
|
|
110
112
|
try {
|
|
111
|
-
const peer = await this.
|
|
113
|
+
const peer = await this.components.getPeerStore().get(id);
|
|
112
114
|
this.log('found in peerStore');
|
|
113
115
|
yield finalPeerEvent({
|
|
114
|
-
from: this.
|
|
116
|
+
from: this.components.getPeerId(),
|
|
115
117
|
peer: {
|
|
116
118
|
id: peer.id,
|
|
117
119
|
multiaddrs: peer.addresses.map((address) => address.multiaddr),
|
|
@@ -148,7 +150,7 @@ export class PeerRouting {
|
|
|
148
150
|
yield event;
|
|
149
151
|
}
|
|
150
152
|
if (!foundPeer) {
|
|
151
|
-
yield queryErrorEvent({ from: this.
|
|
153
|
+
yield queryErrorEvent({ from: this.components.getPeerId(), error: errcode(new Error('Not found'), 'ERR_NOT_FOUND') });
|
|
152
154
|
}
|
|
153
155
|
}
|
|
154
156
|
/**
|
|
@@ -176,10 +178,10 @@ export class PeerRouting {
|
|
|
176
178
|
this.log('found %d peers close to %b', peers.length, key);
|
|
177
179
|
for (const peer of peers.peers) {
|
|
178
180
|
yield finalPeerEvent({
|
|
179
|
-
from: this.
|
|
181
|
+
from: this.components.getPeerId(),
|
|
180
182
|
peer: {
|
|
181
183
|
id: peer,
|
|
182
|
-
multiaddrs: (await (this.
|
|
184
|
+
multiaddrs: (await (this.components.getPeerStore().addressBook.get(peer)) ?? []).map(addr => addr.multiaddr),
|
|
183
185
|
protocols: []
|
|
184
186
|
}
|
|
185
187
|
});
|
|
@@ -230,8 +232,8 @@ export class PeerRouting {
|
|
|
230
232
|
continue;
|
|
231
233
|
}
|
|
232
234
|
try {
|
|
233
|
-
const addresses = await this.
|
|
234
|
-
const protocols = await this.
|
|
235
|
+
const addresses = await this.components.getPeerStore().addressBook.get(peerId);
|
|
236
|
+
const protocols = await this.components.getPeerStore().protoBook.get(peerId);
|
|
235
237
|
output.push({
|
|
236
238
|
id: peerId,
|
|
237
239
|
multiaddrs: addresses.map((address) => address.multiaddr),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/peer-routing/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,UAAU,CAAA;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,QAAQ,IAAI,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AACtE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,KAAK,KAAK,MAAM,aAAa,CAAA;AACpC,OAAO,EACL,eAAe,EACf,cAAc,EACd,UAAU,EACX,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAA;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/peer-routing/index.ts"],"names":[],"mappings":"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"}
|
package/dist/src/providers.d.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import type { Datastore } from 'interface-datastore';
|
|
2
1
|
import type { Startable } from '@libp2p/interfaces';
|
|
3
2
|
import type { CID } from 'multiformats';
|
|
4
3
|
import type { PeerId } from '@libp2p/interfaces/peer-id';
|
|
5
|
-
|
|
6
|
-
|
|
4
|
+
import { Components, Initializable } from '@libp2p/interfaces/components';
|
|
5
|
+
export interface ProvidersInit {
|
|
7
6
|
cacheSize?: number;
|
|
8
7
|
/**
|
|
9
8
|
* How often invalid records are cleaned. (in seconds)
|
|
@@ -26,15 +25,16 @@ export interface ProvidersOptions {
|
|
|
26
25
|
* providers are stored in the datastore, but to ensure
|
|
27
26
|
* access is fast there is an LRU cache in front of that.
|
|
28
27
|
*/
|
|
29
|
-
export declare class Providers implements Startable {
|
|
30
|
-
private
|
|
28
|
+
export declare class Providers implements Startable, Initializable {
|
|
29
|
+
private components;
|
|
31
30
|
private readonly cache;
|
|
32
31
|
private readonly cleanupInterval;
|
|
33
32
|
private readonly provideValidity;
|
|
34
33
|
private readonly syncQueue;
|
|
35
34
|
private started;
|
|
36
35
|
private cleaner?;
|
|
37
|
-
constructor(
|
|
36
|
+
constructor(init?: ProvidersInit);
|
|
37
|
+
init(components: Components): void;
|
|
38
38
|
isStarted(): boolean;
|
|
39
39
|
/**
|
|
40
40
|
* Start the provider cleanup service
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../src/providers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../src/providers.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AACvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAIzE,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,SAAU,YAAW,SAAS,EAAE,aAAa;IACxD,OAAO,CAAC,UAAU,CAA+B;IACjD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA0B;IAChD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAQ;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAQ;IACxC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAO;IACjC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,OAAO,CAAC,CAAc;gBAEjB,IAAI,GAAE,aAAkB;IAUrC,IAAI,CAAE,UAAU,EAAE,UAAU,GAAG,IAAI;IAInC,SAAS;IAIT;;OAEG;IACG,KAAK;IAiBX;;OAEG;IACG,IAAI;IASV;;OAEG;IACG,QAAQ;IAkEd;;OAEG;IACG,gBAAgB,CAAE,GAAG,EAAE,GAAG;IAYhC;;OAEG;IACG,WAAW,CAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM;IAgB7C;;OAEG;IACG,YAAY,CAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAUjD"}
|