Skip to content
This repository was archived by the owner on Jul 21, 2023. It is now read-only.

Commit dc53728

Browse files
dependabot[bot]achingbrain
dependabot[bot]
and
achingbrain
authored
deps(dev): bump aegir from 38.1.8 to 39.0.5 (#468)
* deps(dev): bump aegir from 38.1.8 to 39.0.5 Bumps [aegir](https://github.com/ipfs/aegir) from 38.1.8 to 39.0.5. - [Release notes](https://github.com/ipfs/aegir/releases) - [Changelog](https://github.com/ipfs/aegir/blob/master/CHANGELOG.md) - [Commits](ipfs/aegir@v38.1.8...v39.0.5) --- updated-dependencies: - dependency-name: aegir dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * chore: fix linting --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Potsides <[email protected]>
1 parent d764986 commit dc53728

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+340
-348
lines changed

‎package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@
162162
"@libp2p/record": "^3.0.0",
163163
"@libp2p/topology": "^4.0.0",
164164
"@multiformats/multiaddr": "^12.0.0",
165+
"@types/sinon": "^10.0.14",
165166
"abortable-iterator": "^5.0.1",
166167
"any-signal": "^4.1.1",
167168
"datastore-core": "^9.0.1",
@@ -197,7 +198,7 @@
197198
"@types/lodash.range": "^3.2.6",
198199
"@types/varint": "^6.0.0",
199200
"@types/which": "^3.0.0",
200-
"aegir": "^38.1.2",
201+
"aegir": "^39.0.5",
201202
"datastore-level": "^10.0.0",
202203
"delay": "^5.0.0",
203204
"execa": "^7.0.0",

‎src/content-fetching/index.ts

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
import { CodeError } from '@libp2p/interfaces/errors'
2-
import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
2+
import { logger } from '@libp2p/logger'
33
import { Libp2pRecord } from '@libp2p/record'
4-
import { verifyRecord } from '@libp2p/record/validators'
54
import { bestRecord } from '@libp2p/record/selectors'
6-
import parallel from 'it-parallel'
5+
import { verifyRecord } from '@libp2p/record/validators'
76
import map from 'it-map'
8-
import {
9-
valueEvent,
10-
queryErrorEvent
11-
} from '../query/events.js'
12-
import { Message, MESSAGE_TYPE } from '../message/index.js'
7+
import parallel from 'it-parallel'
138
import { pipe } from 'it-pipe'
9+
import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
1410
import {
1511
ALPHA
1612
} from '../constants.js'
13+
import { Message, MESSAGE_TYPE } from '../message/index.js'
14+
import {
15+
valueEvent,
16+
queryErrorEvent
17+
} from '../query/events.js'
1718
import { createPutRecord, convertBuffer, bufferToRecordKey } from '../utils.js'
18-
import { logger } from '@libp2p/logger'
19-
import type { Validators, Selectors, ValueEvent, QueryOptions, QueryEvent } from '@libp2p/interface-dht'
19+
import type { KadDHTComponents } from '../index.js'
20+
import type { Network } from '../network.js'
2021
import type { PeerRouting } from '../peer-routing/index.js'
2122
import type { QueryManager } from '../query/manager.js'
23+
import type { QueryFunc } from '../query/types.js'
2224
import type { RoutingTable } from '../routing-table/index.js'
23-
import type { Network } from '../network.js'
24-
import type { Logger } from '@libp2p/logger'
25+
import type { Validators, Selectors, ValueEvent, QueryOptions, QueryEvent } from '@libp2p/interface-dht'
2526
import type { AbortOptions } from '@libp2p/interfaces'
26-
import type { QueryFunc } from '../query/types.js'
27-
import type { KadDHTComponents } from '../index.js'
27+
import type { Logger } from '@libp2p/logger'
2828

2929
export interface ContentFetchingInit {
3030
validators: Validators

‎src/content-routing/index.ts

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
import { Message, MESSAGE_TYPE } from '../message/index.js'
2-
import parallel from 'it-parallel'
1+
import { logger } from '@libp2p/logger'
32
import map from 'it-map'
4-
import { convertBuffer } from '../utils.js'
5-
import { ALPHA } from '../constants.js'
3+
import parallel from 'it-parallel'
64
import { pipe } from 'it-pipe'
5+
import { ALPHA } from '../constants.js'
6+
import { Message, MESSAGE_TYPE } from '../message/index.js'
77
import {
88
queryErrorEvent,
99
peerResponseEvent,
1010
providerEvent
1111
} from '../query/events.js'
12-
import { logger } from '@libp2p/logger'
13-
import type { PeerResponseEvent, ProviderEvent, QueryEvent, QueryOptions } from '@libp2p/interface-dht'
14-
import type { PeerRouting } from '../peer-routing/index.js'
15-
import type { QueryManager } from '../query/manager.js'
16-
import type { RoutingTable } from '../routing-table/index.js'
12+
import { convertBuffer } from '../utils.js'
13+
import type { KadDHTComponents } from '../index.js'
1714
import type { Network } from '../network.js'
18-
import type { Logger } from '@libp2p/logger'
15+
import type { PeerRouting } from '../peer-routing/index.js'
1916
import type { Providers } from '../providers.js'
17+
import type { QueryManager } from '../query/manager.js'
2018
import type { QueryFunc } from '../query/types.js'
21-
import type { CID } from 'multiformats/cid'
19+
import type { RoutingTable } from '../routing-table/index.js'
20+
import type { PeerResponseEvent, ProviderEvent, QueryEvent, QueryOptions } from '@libp2p/interface-dht'
21+
import type { PeerInfo } from '@libp2p/interface-peer-info'
2222
import type { AbortOptions } from '@libp2p/interfaces'
23+
import type { Logger } from '@libp2p/logger'
2324
import type { Multiaddr } from '@multiformats/multiaddr'
24-
import type { PeerInfo } from '@libp2p/interface-peer-info'
25-
import type { KadDHTComponents } from '../index.js'
25+
import type { CID } from 'multiformats/cid'
2626

2727
export interface ContentRoutingInit {
2828
network: Network

‎src/dual-kad-dht.ts

+9-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import { logger } from '@libp2p/logger'
1+
import { symbol } from '@libp2p/interface-peer-discovery'
22
import { CodeError } from '@libp2p/interfaces/errors'
3+
import { EventEmitter, CustomEvent } from '@libp2p/interfaces/events'
4+
import { logger } from '@libp2p/logger'
35
import merge from 'it-merge'
46
import { queryErrorEvent } from './query/events.js'
7+
import type { KadDHTComponents } from './index.js'
58
import type { KadDHT } from './kad-dht.js'
69
import type { DualDHT, QueryEvent, QueryOptions } from '@libp2p/interface-dht'
10+
import type { PeerDiscoveryEvents } from '@libp2p/interface-peer-discovery'
11+
import type { PeerId } from '@libp2p/interface-peer-id'
712
import type { AbortOptions } from '@libp2p/interfaces'
8-
import { EventEmitter, CustomEvent } from '@libp2p/interfaces/events'
913
import type { CID } from 'multiformats'
10-
import type { PeerId } from '@libp2p/interface-peer-id'
11-
import type { PeerDiscoveryEvents } from '@libp2p/interface-peer-discovery'
12-
import { symbol } from '@libp2p/interface-peer-discovery'
13-
import type { KadDHTComponents } from './index.js'
1414

1515
const log = logger('libp2p:kad-dht')
1616

@@ -43,13 +43,9 @@ export class DualKadDHT extends EventEmitter<PeerDiscoveryEvents> implements Dua
4343
})
4444
}
4545

46-
get [symbol] (): true {
47-
return true
48-
}
46+
readonly [symbol] = true
4947

50-
get [Symbol.toStringTag] (): '@libp2p/dual-kad-dht' {
51-
return '@libp2p/dual-kad-dht'
52-
}
48+
readonly [Symbol.toStringTag] = '@libp2p/dual-kad-dht'
5349

5450
/**
5551
* Is this DHT running.
@@ -62,7 +58,7 @@ export class DualKadDHT extends EventEmitter<PeerDiscoveryEvents> implements Dua
6258
* If 'server' this node will respond to DHT queries, if 'client' this node will not
6359
*/
6460
async getMode (): Promise<'client' | 'server'> {
65-
return await this.wan.getMode()
61+
return this.wan.getMode()
6662
}
6763

6864
/**

‎src/index.ts

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
import { KadDHT as SingleKadDHT } from './kad-dht.js'
2-
import { DualKadDHT } from './dual-kad-dht.js'
3-
import drain from 'it-drain'
1+
import { type ContentRouting, contentRouting } from '@libp2p/interface-content-routing'
2+
import { type PeerDiscovery, peerDiscovery } from '@libp2p/interface-peer-discovery'
3+
import { type PeerRouting, peerRouting } from '@libp2p/interface-peer-routing'
44
import { CodeError } from '@libp2p/interfaces/errors'
5-
import type { DHT, DualDHT, Selectors, Validators } from '@libp2p/interface-dht'
6-
import { ContentRouting, contentRouting } from '@libp2p/interface-content-routing'
7-
import type { CID } from 'multiformats/cid'
8-
import type { AbortOptions } from '@libp2p/interfaces'
9-
import type { PeerInfo } from '@libp2p/interface-peer-info'
5+
import drain from 'it-drain'
6+
import { DualKadDHT } from './dual-kad-dht.js'
7+
import { KadDHT as SingleKadDHT } from './kad-dht.js'
108
import type { ProvidersInit } from './providers.js'
11-
import type { Registrar } from '@libp2p/interface-registrar'
129
import type { AddressManager } from '@libp2p/interface-address-manager'
13-
import type { PeerStore } from '@libp2p/interface-peer-store'
1410
import type { ConnectionManager } from '@libp2p/interface-connection-manager'
11+
import type { DHT, DualDHT, Selectors, Validators } from '@libp2p/interface-dht'
1512
import type { Metrics } from '@libp2p/interface-metrics'
16-
import type { Datastore } from 'interface-datastore'
17-
import { PeerRouting, peerRouting } from '@libp2p/interface-peer-routing'
18-
import { PeerDiscovery, peerDiscovery } from '@libp2p/interface-peer-discovery'
1913
import type { PeerId } from '@libp2p/interface-peer-id'
14+
import type { PeerInfo } from '@libp2p/interface-peer-info'
15+
import type { PeerStore } from '@libp2p/interface-peer-store'
16+
import type { Registrar } from '@libp2p/interface-registrar'
17+
import type { AbortOptions } from '@libp2p/interfaces'
18+
import type { Datastore } from 'interface-datastore'
19+
import type { CID } from 'multiformats/cid'
2020

2121
export interface KadDHTInit {
2222
/**

‎src/kad-dht.ts

+16-20
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
import { RoutingTable } from './routing-table/index.js'
2-
import { RoutingTableRefresh } from './routing-table/refresh.js'
3-
import { Network } from './network.js'
1+
import { symbol } from '@libp2p/interface-peer-discovery'
2+
import { CustomEvent, EventEmitter } from '@libp2p/interfaces/events'
3+
import { type Logger, logger } from '@libp2p/logger'
4+
import { selectors as recordSelectors } from '@libp2p/record/selectors'
5+
import { validators as recordValidators } from '@libp2p/record/validators'
6+
import pDefer from 'p-defer'
7+
import { PROTOCOL_DHT, PROTOCOL_PREFIX, LAN_PREFIX } from './constants.js'
48
import { ContentFetching } from './content-fetching/index.js'
59
import { ContentRouting } from './content-routing/index.js'
10+
import { Network } from './network.js'
611
import { PeerRouting } from './peer-routing/index.js'
712
import { Providers } from './providers.js'
813
import { QueryManager } from './query/manager.js'
14+
import { QuerySelf } from './query-self.js'
15+
import { RoutingTable } from './routing-table/index.js'
16+
import { RoutingTableRefresh } from './routing-table/refresh.js'
917
import { RPC } from './rpc/index.js'
1018
import { TopologyListener } from './topology-listener.js'
11-
import { QuerySelf } from './query-self.js'
1219
import {
1320
removePrivateAddresses,
1421
removePublicAddresses
1522
} from './utils.js'
16-
import { Logger, logger } from '@libp2p/logger'
23+
import type { KadDHTComponents, KadDHTInit } from './index.js'
1724
import type { QueryOptions, Validators, Selectors, DHT, QueryEvent } from '@libp2p/interface-dht'
18-
import type { PeerInfo } from '@libp2p/interface-peer-info'
19-
import { CustomEvent, EventEmitter } from '@libp2p/interfaces/events'
25+
import type { PeerDiscoveryEvents } from '@libp2p/interface-peer-discovery'
2026
import type { PeerId } from '@libp2p/interface-peer-id'
27+
import type { PeerInfo } from '@libp2p/interface-peer-info'
2128
import type { CID } from 'multiformats/cid'
22-
import type { PeerDiscoveryEvents } from '@libp2p/interface-peer-discovery'
23-
import type { KadDHTComponents, KadDHTInit } from './index.js'
24-
import { validators as recordValidators } from '@libp2p/record/validators'
25-
import { selectors as recordSelectors } from '@libp2p/record/selectors'
26-
import { symbol } from '@libp2p/interface-peer-discovery'
27-
import { PROTOCOL_DHT, PROTOCOL_PREFIX, LAN_PREFIX } from './constants.js'
28-
import pDefer from 'p-defer'
2929

3030
export const DEFAULT_MAX_INBOUND_STREAMS = 32
3131
export const DEFAULT_MAX_OUTBOUND_STREAMS = 64
@@ -219,13 +219,9 @@ export class KadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT {
219219
})
220220
}
221221

222-
get [symbol] (): true {
223-
return true
224-
}
222+
readonly [symbol] = true
225223

226-
get [Symbol.toStringTag] (): '@libp2p/kad-dht' {
227-
return '@libp2p/kad-dht'
228-
}
224+
readonly [Symbol.toStringTag] = '@libp2p/kad-dht'
229225

230226
async onPeerConnect (peerData: PeerInfo): Promise<void> {
231227
this.log('peer %p connected with protocols', peerData.id, peerData.protocols)

‎src/message/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { peerIdFromBytes } from '@libp2p/peer-id'
2-
import { multiaddr } from '@multiformats/multiaddr'
32
import { Libp2pRecord } from '@libp2p/record'
3+
import { multiaddr } from '@multiformats/multiaddr'
44
import { Message as PBMessage } from './dht.js'
55
import type { PeerInfo } from '@libp2p/interface-peer-info'
66
import type { Uint8ArrayList } from 'uint8arraylist'

‎src/network.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
import { CodeError } from '@libp2p/interfaces/errors'
2-
import { pipe } from 'it-pipe'
3-
import * as lp from 'it-length-prefixed'
2+
import { EventEmitter, CustomEvent } from '@libp2p/interfaces/events'
3+
import { logger } from '@libp2p/logger'
4+
import { abortableDuplex } from 'abortable-iterator'
45
import drain from 'it-drain'
56
import first from 'it-first'
7+
import * as lp from 'it-length-prefixed'
8+
import { pipe } from 'it-pipe'
69
import { Message } from './message/index.js'
7-
import { EventEmitter, CustomEvent } from '@libp2p/interfaces/events'
810
import {
911
dialingPeerEvent,
1012
sendingQueryEvent,
1113
peerResponseEvent,
1214
queryErrorEvent
1315
} from './query/events.js'
14-
import { logger } from '@libp2p/logger'
16+
import type { KadDHTComponents } from './index.js'
17+
import type { Stream } from '@libp2p/interface-connection'
18+
import type { QueryEvent } from '@libp2p/interface-dht'
1519
import type { PeerId } from '@libp2p/interface-peer-id'
20+
import type { PeerInfo } from '@libp2p/interface-peer-info'
1621
import type { AbortOptions } from '@libp2p/interfaces'
1722
import type { Startable } from '@libp2p/interfaces/startable'
1823
import type { Logger } from '@libp2p/logger'
1924
import type { Duplex, Source } from 'it-stream-types'
20-
import type { PeerInfo } from '@libp2p/interface-peer-info'
21-
import type { Stream } from '@libp2p/interface-connection'
22-
import { abortableDuplex } from 'abortable-iterator'
2325
import type { Uint8ArrayList } from 'uint8arraylist'
24-
import type { KadDHTComponents } from './index.js'
25-
import type { QueryEvent } from '@libp2p/interface-dht'
2626

2727
export interface NetworkInit {
2828
protocol: string

‎src/peer-list/peer-distance-list.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import * as utils from '../utils.js'
21
import { compare as uint8ArrayCompare } from 'uint8arrays/compare'
32
import { xor as uint8ArrayXor } from 'uint8arrays/xor'
3+
import * as utils from '../utils.js'
44
import type { PeerId } from '@libp2p/interface-peer-id'
55

66
interface PeerDistance {

‎src/peer-routing/index.ts

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1+
import { keys } from '@libp2p/crypto'
12
import { CodeError } from '@libp2p/interfaces/errors'
3+
import { logger } from '@libp2p/logger'
4+
import { peerIdFromKeys } from '@libp2p/peer-id'
5+
import { Libp2pRecord } from '@libp2p/record'
26
import { verifyRecord } from '@libp2p/record/validators'
37
import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
48
import { Message, MESSAGE_TYPE } from '../message/index.js'
5-
import * as utils from '../utils.js'
9+
import { PeerDistanceList } from '../peer-list/peer-distance-list.js'
610
import {
711
queryErrorEvent,
812
finalPeerEvent,
913
valueEvent
1014
} from '../query/events.js'
11-
import { PeerDistanceList } from '../peer-list/peer-distance-list.js'
12-
import { Libp2pRecord } from '@libp2p/record'
13-
import { logger } from '@libp2p/logger'
14-
import { keys } from '@libp2p/crypto'
15-
import { peerIdFromKeys } from '@libp2p/peer-id'
16-
import type { DHTRecord, DialingPeerEvent, FinalPeerEvent, QueryEvent, Validators } from '@libp2p/interface-dht'
17-
import type { RoutingTable } from '../routing-table/index.js'
18-
import type { QueryManager, QueryOptions } from '../query/manager.js'
15+
import * as utils from '../utils.js'
16+
import type { KadDHTComponents } from '../index.js'
1917
import type { Network } from '../network.js'
20-
import type { Logger } from '@libp2p/logger'
21-
import type { AbortOptions } from '@libp2p/interfaces'
18+
import type { QueryManager, QueryOptions } from '../query/manager.js'
2219
import type { QueryFunc } from '../query/types.js'
23-
import type { PeerInfo } from '@libp2p/interface-peer-info'
20+
import type { RoutingTable } from '../routing-table/index.js'
21+
import type { DHTRecord, DialingPeerEvent, FinalPeerEvent, QueryEvent, Validators } from '@libp2p/interface-dht'
2422
import type { PeerId } from '@libp2p/interface-peer-id'
25-
import type { KadDHTComponents } from '../index.js'
23+
import type { PeerInfo } from '@libp2p/interface-peer-info'
24+
import type { AbortOptions } from '@libp2p/interfaces'
25+
import type { Logger } from '@libp2p/logger'
2626

2727
export interface PeerRoutingInit {
2828
routingTable: RoutingTable

‎src/providers.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1+
import { logger } from '@libp2p/logger'
2+
import { peerIdFromString } from '@libp2p/peer-id'
13
import cache from 'hashlru'
2-
import varint from 'varint'
34
import { Key } from 'interface-datastore/key'
45
import Queue from 'p-queue'
6+
import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
7+
import varint from 'varint'
58
import {
69
PROVIDERS_CLEANUP_INTERVAL,
710
PROVIDERS_VALIDITY,
811
PROVIDERS_LRU_CACHE_SIZE,
912
PROVIDER_KEY_PREFIX
1013
} from './constants.js'
11-
import { logger } from '@libp2p/logger'
12-
import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
13-
import { peerIdFromString } from '@libp2p/peer-id'
14-
import type { Datastore } from 'interface-datastore'
14+
import type { PeerId } from '@libp2p/interface-peer-id'
1515
import type { Startable } from '@libp2p/interfaces/startable'
16+
import type { Datastore } from 'interface-datastore'
1617
import type { CID } from 'multiformats'
17-
import type { PeerId } from '@libp2p/interface-peer-id'
1818

1919
const log = logger('libp2p:kad-dht:providers')
2020

@@ -209,7 +209,7 @@ export class Providers implements Startable {
209209
* Get a list of providers for the given CID
210210
*/
211211
async getProviders (cid: CID): Promise<PeerId[]> {
212-
return await this.syncQueue.add(async () => {
212+
return this.syncQueue.add(async () => {
213213
log('get providers for %s', cid)
214214
const provs = await this._getProvidersMap(cid)
215215

0 commit comments

Comments
 (0)