Skip to content

Commit 3bed7b4

Browse files
achingbrainachingbrain
authoredNov 19, 2021
chore: update aegir (#1027)
Updates aegir, fixes all new linting errors.
·
webtransport-v5.0.36auto-tls-v1.0.0
1 parent 3fb4249 commit 3bed7b4

39 files changed

+104
-102
lines changed
 

‎examples/libp2p-in-the-browser/test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ async function run() {
3838
)
3939
await browser.close();
4040

41-
} catch (err) {
41+
} catch (/** @type {any} */ err) {
4242
console.error(err)
4343
process.exit(1)
4444
} finally {

‎examples/transports/3.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ function print ({ stream }) {
8181
// node 3 (listening WebSockets) can dial node 1 (TCP)
8282
try {
8383
await node3.dialProtocol(node1.peerId, '/print')
84-
} catch (err) {
84+
} catch (/** @type {any} */ err) {
8585
console.log('node 3 failed to dial to node 1 with:', err.message)
8686
}
8787
})();

‎examples/utils.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ async function isExecutable (command) {
99
await fs.access(command, fs.constants.X_OK)
1010

1111
return true
12-
} catch (err) {
12+
} catch (/** @type {any} */ err) {
1313
if (err.code === 'ENOENT') {
1414
return isExecutable(await which(command))
1515
}
@@ -49,7 +49,7 @@ async function waitForOutput (expectedOutput, command, args = [], opts = {}) {
4949

5050
try {
5151
await proc
52-
} catch (err) {
52+
} catch (/** @type {any} */ err) {
5353
if (!err.killed) {
5454
throw err
5555
}

‎examples/webrtc-direct/test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ async function test () {
7272
{ timeout: 10000 }
7373
)
7474
await browser.close();
75-
} catch (err) {
75+
} catch (/** @type {any} */ err) {
7676
console.error(err)
7777
process.exit(1)
7878
} finally {

‎package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@
7474
"extends": "ipfs",
7575
"ignorePatterns": [
7676
"!.aegir.js",
77-
"test/ts-use"
77+
"test/ts-use",
78+
"*.d.ts"
7879
]
7980
},
8081
"dependencies": {
@@ -137,7 +138,7 @@
137138
"@types/node": "^16.0.1",
138139
"@types/node-forge": "^0.10.1",
139140
"@types/varint": "^6.0.0",
140-
"aegir": "^33.1.1",
141+
"aegir": "^36.0.0",
141142
"buffer": "^6.0.3",
142143
"datastore-core": "^6.0.7",
143144
"delay": "^5.0.0",

‎src/circuit/auto-relay.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class AutoRelay {
116116
this._peerStore.metadataBook.set(peerId, HOP_METADATA_KEY, uint8ArrayFromString(HOP_METADATA_VALUE))
117117
await this._addListenRelay(connection, id)
118118
}
119-
} catch (err) {
119+
} catch (/** @type {any} */ err) {
120120
this._onError(err)
121121
}
122122
}
@@ -169,7 +169,7 @@ class AutoRelay {
169169
try {
170170
await this._transportManager.listen([new Multiaddr(listenAddr)])
171171
// Announce multiaddrs will update on listen success by TransportManager event being triggered
172-
} catch (err) {
172+
} catch (/** @type {any} */ err) {
173173
this._onError(err)
174174
this._listenRelays.delete(id)
175175
}
@@ -267,7 +267,7 @@ class AutoRelay {
267267
return
268268
}
269269
}
270-
} catch (err) {
270+
} catch (/** @type {any} */ err) {
271271
this._onError(err)
272272
}
273273
}
@@ -279,7 +279,7 @@ class AutoRelay {
279279
try {
280280
const connection = await this._libp2p.dial(peerId)
281281
await this._addListenRelay(connection, peerId.toB58String())
282-
} catch (err) {
282+
} catch (/** @type {any} */ err) {
283283
this._onError(err, `could not connect and listen on known hop relay ${peerId.toB58String()}`)
284284
}
285285
}

‎src/circuit/circuit/hop.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ async function handleHop ({
5454
// Validate the HOP request has the required input
5555
try {
5656
validateAddrs(request, streamHandler)
57-
} catch (err) {
57+
} catch (/** @type {any} */ err) {
5858
return log.error('invalid hop request via peer %s', connection.remotePeer.toB58String(), err)
5959
}
6060

@@ -93,7 +93,7 @@ async function handleHop ({
9393
connection: destinationConnection,
9494
request: stopRequest
9595
})
96-
} catch (err) {
96+
} catch (/** @type {any} */ err) {
9797
return log.error(err)
9898
}
9999

‎src/circuit/circuit/stop.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ module.exports.handleStop = function handleStop ({
3434
// Validate the STOP request has the required input
3535
try {
3636
validateAddrs(request, streamHandler)
37-
} catch (err) {
37+
} catch (/** @type {any} */ err) {
3838
return log.error('invalid stop request via peer %s', connection.remotePeer.toB58String(), err)
3939
}
4040

‎src/circuit/circuit/utils.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function validateAddrs (msg, streamHandler) {
3434
return new Multiaddr(addr)
3535
})
3636
}
37-
} catch (err) {
37+
} catch (/** @type {any} */ err) {
3838
writeResponse(streamHandler, msg.type === CircuitRelay.Type.HOP
3939
? CircuitRelay.Status.HOP_DST_MULTIADDR_INVALID
4040
: CircuitRelay.Status.STOP_DST_MULTIADDR_INVALID)
@@ -47,7 +47,7 @@ function validateAddrs (msg, streamHandler) {
4747
return new Multiaddr(addr)
4848
})
4949
}
50-
} catch (err) {
50+
} catch (/** @type {any} */ err) {
5151
writeResponse(streamHandler, msg.type === CircuitRelay.Type.HOP
5252
? CircuitRelay.Status.HOP_SRC_MULTIADDR_INVALID
5353
: CircuitRelay.Status.STOP_SRC_MULTIADDR_INVALID)

‎src/circuit/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class Relay {
8787
try {
8888
const cid = await namespaceToCid(RELAY_RENDEZVOUS_NS)
8989
await this._libp2p.contentRouting.provide(cid)
90-
} catch (err) {
90+
} catch (/** @type {any} */ err) {
9191
if (err.code === 'NO_ROUTERS_AVAILABLE') {
9292
log.error('a content router, such as a DHT, must be provided in order to advertise the relay service', err)
9393
// Stop the advertise

‎src/circuit/transport.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ class Circuit {
171171
log('new outbound connection %s', maConn.remoteAddr)
172172

173173
return this._upgrader.upgradeOutbound(maConn)
174-
} catch (err) {
174+
} catch (/** @type {any} */ err) {
175175
log.error('Circuit relay dial failed', err)
176176
disconnectOnFailure && await relayConnection.close()
177177
throw err

‎src/connection-manager/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ class ConnectionManager extends EventEmitter {
350350
if (!this._started) {
351351
return
352352
}
353-
} catch (err) {
353+
} catch (/** @type {any} */ err) {
354354
log.error('could not connect to peerStore stored peer', err)
355355
}
356356
}

‎src/dialer/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class Dialer {
9595
for (const dial of this._pendingDials.values()) {
9696
try {
9797
dial.controller.abort()
98-
} catch (err) {
98+
} catch (/** @type {any} */ err) {
9999
log.error(err)
100100
}
101101
}
@@ -129,7 +129,7 @@ class Dialer {
129129
const connection = await pendingDial.promise
130130
log('dial succeeded to %s', dialTarget.id)
131131
return connection
132-
} catch (err) {
132+
} catch (/** @type {any} */ err) {
133133
// Error is a timeout
134134
if (pendingDial.controller.signal.aborted) {
135135
err.code = codes.ERR_TIMEOUT

‎src/get-peer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function getPeer (peer) {
3232

3333
try {
3434
peer = PeerId.createFromB58String(idStr)
35-
} catch (err) {
35+
} catch (/** @type {any} */ err) {
3636
throw errCode(
3737
new Error(`${peer} is not a valid peer type`),
3838
codes.ERR_INVALID_MULTIADDR

‎src/identify/index.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class IdentifyService {
124124
stream,
125125
consume
126126
)
127-
} catch (err) {
127+
} catch (/** @type {any} */ err) {
128128
// Just log errors
129129
log.error('could not push identify update to peer', err)
130130
}
@@ -182,7 +182,7 @@ class IdentifyService {
182182
let message
183183
try {
184184
message = Message.Identify.decode(data)
185-
} catch (err) {
185+
} catch (/** @type {any} */ err) {
186186
throw errCode(err, codes.ERR_INVALID_MESSAGE)
187187
}
188188

@@ -211,14 +211,14 @@ class IdentifyService {
211211
this.peerStore.metadataBook.set(id, 'ProtocolVersion', uint8ArrayFromString(message.protocolVersion))
212212
return
213213
}
214-
} catch (err) {
214+
} catch (/** @type {any} */ err) {
215215
log('received invalid envelope, discard it and fallback to listenAddrs is available', err)
216216
}
217217

218218
// LEGACY: Update peers data in PeerStore
219219
try {
220220
this.peerStore.addressBook.set(id, listenAddrs.map((addr) => new Multiaddr(addr)))
221-
} catch (err) {
221+
} catch (/** @type {any} */ err) {
222222
log.error('received invalid addrs', err)
223223
}
224224

@@ -287,7 +287,7 @@ class IdentifyService {
287287
stream,
288288
consume
289289
)
290-
} catch (err) {
290+
} catch (/** @type {any} */ err) {
291291
log.error('could not respond to identify request', err)
292292
}
293293
}
@@ -313,7 +313,7 @@ class IdentifyService {
313313
collect
314314
)
315315
message = Message.Identify.decode(data)
316-
} catch (err) {
316+
} catch (/** @type {any} */ err) {
317317
return log.error('received invalid message', err)
318318
}
319319

@@ -325,15 +325,15 @@ class IdentifyService {
325325
this.peerStore.protoBook.set(id, message.protocols)
326326
return
327327
}
328-
} catch (err) {
328+
} catch (/** @type {any} */ err) {
329329
log('received invalid envelope, discard it and fallback to listenAddrs is available', err)
330330
}
331331

332332
// LEGACY: Update peers data in PeerStore
333333
try {
334334
this.peerStore.addressBook.set(id,
335335
message.listenAddrs.map((addr) => new Multiaddr(addr)))
336-
} catch (err) {
336+
} catch (/** @type {any} */ err) {
337337
log.error('received invalid addrs', err)
338338
}
339339

‎src/index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ class Libp2p extends EventEmitter {
363363
await this._onStarting()
364364
await this._onDidStart()
365365
log('libp2p has started')
366-
} catch (err) {
366+
} catch (/** @type {any} */ err) {
367367
this.emit('error', err)
368368
log.error('An error occurred starting libp2p', err)
369369
await this.stop()
@@ -408,7 +408,7 @@ class Libp2p extends EventEmitter {
408408

409409
ping.unmount(this)
410410
this.dialer.destroy()
411-
} catch (err) {
411+
} catch (/** @type {any} */ err) {
412412
if (err) {
413413
log.error(err)
414414
this.emit('error', err)
@@ -431,7 +431,7 @@ class Libp2p extends EventEmitter {
431431

432432
try {
433433
await this.keychain.findKeyByName('self')
434-
} catch (err) {
434+
} catch (/** @type {any} */ err) {
435435
await this.keychain.importPeer('self', this.peerId)
436436
}
437437
}
@@ -698,7 +698,7 @@ class Libp2p extends EventEmitter {
698698
log('connecting to discovered peer %s', peerId.toB58String())
699699
try {
700700
await this.dialer.connectToPeer(peerId)
701-
} catch (err) {
701+
} catch (/** @type {any} */ err) {
702702
log.error(`could not connect to discovered peer ${peerId.toB58String()} with ${err}`)
703703
}
704704
}

‎src/insecure/plaintext.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ async function encrypt (localId, conn, remoteId) {
5555
let peerId
5656
try {
5757
peerId = await PeerId.createFromPubKey(id.pubkey.Data)
58-
} catch (err) {
58+
} catch (/** @type {any} */ err) {
5959
log.error(err)
6060
throw new InvalidCryptoExchangeError('Remote did not provide its public key')
6161
}

‎src/keychain/cms.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class CMS {
9090
const obj = forge.asn1.fromDer(buf)
9191
// @ts-ignore not defined
9292
cms = forge.pkcs7.messageFromAsn1(obj)
93-
} catch (err) {
93+
} catch (/** @type {any} */ err) {
9494
throw errcode(new Error('Invalid CMS: ' + err.message), 'ERR_INVALID_CMS')
9595
}
9696

@@ -114,7 +114,7 @@ class CMS {
114114
try {
115115
const key = await this.keychain.findKeyById(recipient.keyId)
116116
if (key) return true
117-
} catch (err) {
117+
} catch (/** @type {any} */ err) {
118118
return false
119119
}
120120
return false

‎src/keychain/index.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ class Keychain {
248248
batch.put(DsInfoName(name), uint8ArrayFromString(JSON.stringify(keyInfo)))
249249

250250
await batch.commit()
251-
} catch (err) {
251+
} catch (/** @type {any} */ err) {
252252
return throwDelayed(err)
253253
}
254254

@@ -284,7 +284,7 @@ class Keychain {
284284
try {
285285
const keys = await this.listKeys()
286286
return keys.find((k) => k.id === id)
287-
} catch (err) {
287+
} catch (/** @type {any} */ err) {
288288
return throwDelayed(err)
289289
}
290290
}
@@ -304,7 +304,7 @@ class Keychain {
304304
try {
305305
const res = await this.store.get(dsname)
306306
return JSON.parse(uint8ArrayToString(res))
307-
} catch (err) {
307+
} catch (/** @type {any} */ err) {
308308
return throwDelayed(errcode(new Error(`Key '${name}' does not exist. ${err.message}`), 'ERR_KEY_NOT_FOUND'))
309309
}
310310
}
@@ -365,7 +365,7 @@ class Keychain {
365365
batch.delete(oldInfoName)
366366
await batch.commit()
367367
return keyInfo
368-
} catch (err) {
368+
} catch (/** @type {any} */ err) {
369369
return throwDelayed(err)
370370
}
371371
}
@@ -393,7 +393,7 @@ class Keychain {
393393
const dek = privates.get(this).dek
394394
const privateKey = await crypto.keys.import(pem, dek)
395395
return privateKey.export(password)
396-
} catch (err) {
396+
} catch (/** @type {any} */ err) {
397397
return throwDelayed(err)
398398
}
399399
}
@@ -421,7 +421,7 @@ class Keychain {
421421
let privateKey
422422
try {
423423
privateKey = await crypto.keys.import(pem, password)
424-
} catch (err) {
424+
} catch (/** @type {any} */ err) {
425425
return throwDelayed(errcode(new Error('Cannot read the key, most likely the password is wrong'), 'ERR_CANNOT_READ_KEY'))
426426
}
427427

@@ -431,7 +431,7 @@ class Keychain {
431431
/** @type {string} */
432432
const dek = privates.get(this).dek
433433
pem = await privateKey.export(dek)
434-
} catch (err) {
434+
} catch (/** @type {any} */ err) {
435435
return throwDelayed(err)
436436
}
437437

@@ -482,7 +482,7 @@ class Keychain {
482482
batch.put(DsInfoName(name), uint8ArrayFromString(JSON.stringify(keyInfo)))
483483
await batch.commit()
484484
return keyInfo
485-
} catch (err) {
485+
} catch (/** @type {any} */ err) {
486486
return throwDelayed(err)
487487
}
488488
}
@@ -502,7 +502,7 @@ class Keychain {
502502
const dsname = DsName(name)
503503
const res = await this.store.get(dsname)
504504
return uint8ArrayToString(res)
505-
} catch (err) {
505+
} catch (/** @type {any} */ err) {
506506
return throwDelayed(errcode(new Error(`Key '${name}' does not exist. ${err.message}`), 'ERR_KEY_NOT_FOUND'))
507507
}
508508
}

‎src/nat-manager.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ class NatManager {
188188
try {
189189
await this._client.destroy()
190190
this._client = null
191-
} catch (err) {
191+
} catch (/** @type {any} */ err) {
192192
log.error(err)
193193
}
194194
}

‎src/peer-routing.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class PeerRouting {
7979
try {
8080
// nb getClosestPeers adds the addresses to the address book
8181
await drain(this.getClosestPeers(this._peerId.id))
82-
} catch (err) {
82+
} catch (/** @type {any} */ err) {
8383
log.error(err)
8484
}
8585
}

‎src/peer-store/address-book.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class AddressBook extends Book {
8383
let peerRecord
8484
try {
8585
peerRecord = PeerRecord.createFromProtobuf(envelope.payload)
86-
} catch (err) {
86+
} catch (/** @type {any} */ err) {
8787
log.error('invalid peer record received')
8888
return false
8989
}

‎src/peer-store/metadata-book.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,11 @@ class MetadataBook extends Book {
8080
/**
8181
* Set data into the datastructure
8282
*
83-
* @override
8483
* @param {PeerId} peerId
8584
* @param {string} key
8685
* @param {Uint8Array} value
86+
* @param {object} [opts]
87+
* @param {boolean} [opts.emit]
8788
*/
8889
_setValue (peerId, key, value, { emit = true } = {}) {
8990
const id = peerId.toB58String()

‎src/peer-store/persistent/index.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ class PersistentPeerStore extends PeerStore {
249249
}).finish()
250250

251251
batch.put(key, encodedData)
252-
} catch (err) {
252+
} catch (/** @type {any} */ err) {
253253
log.error(err)
254254
}
255255
}
@@ -275,7 +275,7 @@ class PersistentPeerStore extends PeerStore {
275275
const encodedData = peerId.marshalPubKey()
276276

277277
batch.put(key, encodedData)
278-
} catch (err) {
278+
} catch (/** @type {any} */ err) {
279279
log.error(err)
280280
}
281281
}
@@ -302,7 +302,7 @@ class PersistentPeerStore extends PeerStore {
302302
batch.delete(key)
303303
}
304304
})
305-
} catch (err) {
305+
} catch (/** @type {any} */ err) {
306306
log.error(err)
307307
}
308308
}
@@ -330,7 +330,7 @@ class PersistentPeerStore extends PeerStore {
330330
const encodedData = Protocols.encode({ protocols }).finish()
331331

332332
batch.put(key, encodedData)
333-
} catch (err) {
333+
} catch (/** @type {any} */ err) {
334334
log.error(err)
335335
}
336336
}
@@ -399,7 +399,7 @@ class PersistentPeerStore extends PeerStore {
399399
default:
400400
log('invalid data persisted for: ', key.toString())
401401
}
402-
} catch (err) {
402+
} catch (/** @type {any} */ err) {
403403
log.error(err)
404404
}
405405
}

‎src/pnet/crypto.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ module.exports.decodeV1PSK = (pskBuffer) => {
7777
codecName: codec,
7878
psk: psk
7979
}
80-
} catch (err) {
80+
} catch (/** @type {any} */ err) {
8181
log.error(err)
8282
throw new Error(Errors.INVALID_PSK)
8383
}

‎src/pnet/key-generator.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ try {
2828
// @ts-ignore
2929
generate(process.stdout)
3030
}
31-
} catch (error) {
31+
} catch (/** @type {any} */ error) {
3232

3333
}

‎src/transport-manager.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class TransportManager {
109109

110110
try {
111111
return await transport.dial(ma, options)
112-
} catch (err) {
112+
} catch (/** @type {any} */ err) {
113113
if (!err.code) err.code = codes.ERR_TRANSPORT_DIAL_FAILED
114114
throw err
115115
}

‎src/upgrader.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class Upgrader {
106106
} else {
107107
upgradedConn = encryptedConn
108108
}
109-
} catch (err) {
109+
} catch (/** @type {any} */ err) {
110110
log.error('Failed to upgrade inbound connection', err)
111111
await maConn.close(err)
112112
throw err
@@ -181,7 +181,7 @@ class Upgrader {
181181
} else {
182182
upgradedConn = encryptedConn
183183
}
184-
} catch (err) {
184+
} catch (/** @type {any} */ err) {
185185
log.error('Failed to upgrade outbound connection', err)
186186
await maConn.close(err)
187187
throw err
@@ -245,7 +245,7 @@ class Upgrader {
245245
if (this.metrics) this.metrics.trackStream({ stream, remotePeer, protocol })
246246
connection.addStream(muxedStream, { protocol })
247247
this._onStream({ connection, stream: { ...muxedStream, ...stream }, protocol })
248-
} catch (err) {
248+
} catch (/** @type {any} */ err) {
249249
log.error(err)
250250
}
251251
},
@@ -263,7 +263,7 @@ class Upgrader {
263263
const { stream, protocol } = await mss.select(protocols)
264264
if (this.metrics) this.metrics.trackStream({ stream, remotePeer, protocol })
265265
return { stream: { ...muxedStream, ...stream }, protocol }
266-
} catch (err) {
266+
} catch (/** @type {any} */ err) {
267267
log.error('could not create new stream', err)
268268
throw errCode(err, codes.ERR_UNSUPPORTED_PROTOCOL)
269269
}
@@ -283,7 +283,7 @@ class Upgrader {
283283
if (connection.stat.status === 'open') {
284284
await connection.close()
285285
}
286-
} catch (err) {
286+
} catch (/** @type {any} */ err) {
287287
log.error(err)
288288
} finally {
289289
this.onConnectionEnd(connection)
@@ -371,7 +371,7 @@ class Upgrader {
371371
...await crypto.secureInbound(localPeer, stream),
372372
protocol
373373
}
374-
} catch (err) {
374+
} catch (/** @type {any} */ err) {
375375
throw errCode(err, codes.ERR_ENCRYPTION_FAILED)
376376
}
377377
}
@@ -406,7 +406,7 @@ class Upgrader {
406406
...await crypto.secureOutbound(localPeer, stream, remotePeerId),
407407
protocol
408408
}
409-
} catch (err) {
409+
} catch (/** @type {any} */ err) {
410410
throw errCode(err, codes.ERR_ENCRYPTION_FAILED)
411411
}
412412
}
@@ -430,7 +430,7 @@ class Upgrader {
430430
log('%s selected as muxer protocol', protocol)
431431
const Muxer = muxers.get(protocol)
432432
return { stream, Muxer }
433-
} catch (err) {
433+
} catch (/** @type {any} */ err) {
434434
throw errCode(err, codes.ERR_MUXER_UNAVAILABLE)
435435
}
436436
}
@@ -453,7 +453,7 @@ class Upgrader {
453453
const { stream, protocol } = await listener.handle(protocols)
454454
const Muxer = muxers.get(protocol)
455455
return { stream, Muxer }
456-
} catch (err) {
456+
} catch (/** @type {any} */ err) {
457457
throw errCode(err, codes.ERR_MUXER_UNAVAILABLE)
458458
}
459459
}

‎test/content-routing/content-routing.node.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ describe('content-routing', () => {
3434
try {
3535
for await (const _ of node.contentRouting.findProviders('a cid')) {} // eslint-disable-line
3636
throw new Error('.findProviders should return an error')
37-
} catch (err) {
37+
} catch (/** @type {any} */ err) {
3838
expect(err).to.exist()
3939
expect(err.code).to.equal('NO_ROUTERS_AVAILABLE')
4040
}
@@ -238,7 +238,7 @@ describe('content-routing', () => {
238238
try {
239239
for await (const _ of node.contentRouting.findProviders(cid)) { } // eslint-disable-line
240240
throw new Error('should handle errors when finding providers')
241-
} catch (err) {
241+
} catch (/** @type {any} */ err) {
242242
expect(err).to.exist()
243243
}
244244

‎test/dialing/dial-request.spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ describe('Dial Request', () => {
125125
try {
126126
await dialRequest.run({ signal: controller.signal })
127127
expect.fail('Should have thrown')
128-
} catch (err) {
128+
} catch (/** @type {any} */ err) {
129129
expect(err).to.be.an.instanceof(AggregateError)
130130
}
131131

@@ -162,7 +162,7 @@ describe('Dial Request', () => {
162162
try {
163163
await dialRequest.run({ signal: controller.signal })
164164
expect.fail('Should have thrown')
165-
} catch (err) {
165+
} catch (/** @type {any} */ err) {
166166
expect(err).to.be.an.instanceof(AggregateError)
167167
}
168168

@@ -212,7 +212,7 @@ describe('Dial Request', () => {
212212
setTimeout(() => controller.abort(), 100)
213213
await dialRequest.run({ signal: controller.signal })
214214
expect.fail('dial should have failed')
215-
} catch (err) {
215+
} catch (/** @type {any} */ err) {
216216
expect(err).to.be.an.instanceof(AggregateError)
217217
}
218218

‎test/dialing/direct.node.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ describe('Dialing (direct, TCP)', () => {
277277

278278
try {
279279
await libp2p.dial(remoteLibp2p.transportManager.getAddrs()[0])
280-
} catch (err) {
280+
} catch (/** @type {any} */ err) {
281281
expect(err).to.have.property('code', ErrorCodes.ERR_INVALID_MULTIADDR)
282282
return
283283
}

‎test/dialing/direct.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ describe('Dialing (direct, WebSockets)', () => {
304304
dialer.destroy()
305305
await dialPromise
306306
expect.fail('should have failed')
307-
} catch (err) {
307+
} catch (/** @type {any} */ err) {
308308
expect(err).to.be.an.instanceof(AggregateError)
309309
expect(dialer._pendingDials.size).to.equal(0) // 1 dial request
310310
}

‎test/keychain/keychain.spec.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -519,23 +519,23 @@ describe('keychain', () => {
519519
it('should validate newPass is a string', async () => {
520520
try {
521521
await kc.rotateKeychainPass(oldPass, 1234567890)
522-
} catch (err) {
522+
} catch (/** @type {any} */ err) {
523523
expect(err).to.exist()
524524
}
525525
})
526526

527527
it('should validate oldPass is a string', async () => {
528528
try {
529529
await kc.rotateKeychainPass(1234, 'newInsecurePassword1')
530-
} catch (err) {
530+
} catch (/** @type {any} */ err) {
531531
expect(err).to.exist()
532532
}
533533
})
534534

535535
it('should validate newPass is at least 20 characters', async () => {
536536
try {
537537
await kc.rotateKeychainPass(oldPass, 'not20Chars')
538-
} catch (err) {
538+
} catch (/** @type {any} */ err) {
539539
expect(err).to.exist()
540540
}
541541
})
@@ -586,7 +586,7 @@ describe('libp2p.keychain', () => {
586586

587587
try {
588588
await libp2p.keychain.createKey('keyName', 'rsa', 2048)
589-
} catch (err) {
589+
} catch (/** @type {any} */ err) {
590590
expect(err).to.exist()
591591
return
592592
}

‎test/peer-routing/peer-routing.node.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ describe('peer-routing', () => {
4343
try {
4444
for await (const _ of node.peerRouting.getClosestPeers('a cid')) { } // eslint-disable-line
4545
throw new Error('.getClosestPeers should return an error')
46-
} catch (err) {
46+
} catch (/** @type {any} */ err) {
4747
expect(err).to.exist()
4848
expect(err.code).to.equal('NO_ROUTERS_AVAILABLE')
4949
}
@@ -275,7 +275,7 @@ describe('peer-routing', () => {
275275
try {
276276
for await (const _ of node.peerRouting.getClosestPeers(peerId.id)) { } // eslint-disable-line
277277
throw new Error('should handle errors when getting the closest peers')
278-
} catch (err) {
278+
} catch (/** @type {any} */ err) {
279279
expect(err).to.exist()
280280
}
281281

‎test/peer-store/address-book.spec.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ describe('addressBook', () => {
4545
it('throwns invalid parameters error if invalid PeerId is provided', () => {
4646
try {
4747
ab.set('invalid peerId')
48-
} catch (err) {
48+
} catch (/** @type {any} */ err) {
4949
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
5050
return
5151
}
@@ -55,7 +55,7 @@ describe('addressBook', () => {
5555
it('throwns invalid parameters error if no addresses provided', () => {
5656
try {
5757
ab.set(peerId)
58-
} catch (err) {
58+
} catch (/** @type {any} */ err) {
5959
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
6060
return
6161
}
@@ -65,7 +65,7 @@ describe('addressBook', () => {
6565
it('throwns invalid parameters error if invalid multiaddrs are provided', () => {
6666
try {
6767
ab.set(peerId, ['invalid multiaddr'])
68-
} catch (err) {
68+
} catch (/** @type {any} */ err) {
6969
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
7070
return
7171
}
@@ -159,7 +159,7 @@ describe('addressBook', () => {
159159
it('throwns invalid parameters error if invalid PeerId is provided', () => {
160160
try {
161161
ab.add('invalid peerId')
162-
} catch (err) {
162+
} catch (/** @type {any} */ err) {
163163
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
164164
return
165165
}
@@ -169,7 +169,7 @@ describe('addressBook', () => {
169169
it('throwns invalid parameters error if no addresses provided', () => {
170170
try {
171171
ab.add(peerId)
172-
} catch (err) {
172+
} catch (/** @type {any} */ err) {
173173
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
174174
return
175175
}
@@ -179,7 +179,7 @@ describe('addressBook', () => {
179179
it('throwns invalid parameters error if invalid multiaddrs are provided', () => {
180180
try {
181181
ab.add(peerId, ['invalid multiaddr'])
182-
} catch (err) {
182+
} catch (/** @type {any} */ err) {
183183
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
184184
return
185185
}
@@ -308,7 +308,7 @@ describe('addressBook', () => {
308308
it('throwns invalid parameters error if invalid PeerId is provided', () => {
309309
try {
310310
ab.get('invalid peerId')
311-
} catch (err) {
311+
} catch (/** @type {any} */ err) {
312312
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
313313
return
314314
}
@@ -343,7 +343,7 @@ describe('addressBook', () => {
343343
it('throwns invalid parameters error if invalid PeerId is provided', () => {
344344
try {
345345
ab.getMultiaddrsForPeer('invalid peerId')
346-
} catch (err) {
346+
} catch (/** @type {any} */ err) {
347347
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
348348
return
349349
}
@@ -391,7 +391,7 @@ describe('addressBook', () => {
391391
it('throwns invalid parameters error if invalid PeerId is provided', () => {
392392
try {
393393
ab.delete('invalid peerId')
394-
} catch (err) {
394+
} catch (/** @type {any} */ err) {
395395
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
396396
return
397397
}

‎test/peer-store/key-book.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ describe('keyBook', () => {
2323
it('throws invalid parameters error if invalid PeerId is provided in set', () => {
2424
try {
2525
kb.set('invalid peerId')
26-
} catch (err) {
26+
} catch (/** @type {any} */ err) {
2727
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
2828
return
2929
}
@@ -33,7 +33,7 @@ describe('keyBook', () => {
3333
it('throws invalid parameters error if invalid PeerId is provided in get', () => {
3434
try {
3535
kb.get('invalid peerId')
36-
} catch (err) {
36+
} catch (/** @type {any} */ err) {
3737
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
3838
return
3939
}

‎test/peer-store/metadata-book.spec.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ describe('metadataBook', () => {
3434
it('throws invalid parameters error if invalid PeerId is provided', () => {
3535
try {
3636
mb.set('invalid peerId')
37-
} catch (err) {
37+
} catch (/** @type {any} */ err) {
3838
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
3939
return
4040
}
@@ -44,7 +44,7 @@ describe('metadataBook', () => {
4444
it('throws invalid parameters error if no key provided', () => {
4545
try {
4646
mb.set(peerId)
47-
} catch (err) {
47+
} catch (/** @type {any} */ err) {
4848
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
4949
return
5050
}
@@ -54,7 +54,7 @@ describe('metadataBook', () => {
5454
it('throws invalid parameters error if no value provided', () => {
5555
try {
5656
mb.set(peerId, 'location')
57-
} catch (err) {
57+
} catch (/** @type {any} */ err) {
5858
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
5959
return
6060
}
@@ -64,7 +64,7 @@ describe('metadataBook', () => {
6464
it('throws invalid parameters error if value is not a buffer', () => {
6565
try {
6666
mb.set(peerId, 'location', 'mars')
67-
} catch (err) {
67+
} catch (/** @type {any} */ err) {
6868
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
6969
return
7070
}
@@ -163,7 +163,7 @@ describe('metadataBook', () => {
163163
it('throws invalid parameters error if invalid PeerId is provided', () => {
164164
try {
165165
mb.get('invalid peerId')
166-
} catch (err) {
166+
} catch (/** @type {any} */ err) {
167167
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
168168
return
169169
}
@@ -199,7 +199,7 @@ describe('metadataBook', () => {
199199
it('throws invalid parameters error if invalid PeerId is provided', () => {
200200
try {
201201
mb.getValue('invalid peerId')
202-
} catch (err) {
202+
} catch (/** @type {any} */ err) {
203203
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
204204
return
205205
}
@@ -248,7 +248,7 @@ describe('metadataBook', () => {
248248
it('throwns invalid parameters error if invalid PeerId is provided', () => {
249249
try {
250250
mb.delete('invalid peerId')
251-
} catch (err) {
251+
} catch (/** @type {any} */ err) {
252252
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
253253
return
254254
}
@@ -305,7 +305,7 @@ describe('metadataBook', () => {
305305
it('throws invalid parameters error if invalid PeerId is provided', () => {
306306
try {
307307
mb.deleteValue('invalid peerId')
308-
} catch (err) {
308+
} catch (/** @type {any} */ err) {
309309
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
310310
return
311311
}

‎test/transports/transport-manager.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ describe('libp2p.transportManager (dial only)', () => {
201201

202202
try {
203203
await libp2p.start()
204-
} catch (err) {
204+
} catch (/** @type {any} */ err) {
205205
expect(err).to.exist()
206206
expect(err.code).to.equal(ErrorCodes.ERR_NO_VALID_ADDRESSES)
207207
return

‎test/utils/mockConnection.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ function createConnection ({
108108
// Need to be able to notify a peer of this this._onStream({ connection, stream, protocol })
109109
const handler = protocols.get(protocol)
110110
handler({ connection, stream, protocol })
111-
} catch (err) {
111+
} catch (/** @type {any} */ err) {
112112
// Do nothing
113113
}
114114
},
@@ -124,7 +124,7 @@ function createConnection ({
124124
try {
125125
const { stream, protocol } = await mss.select(protocols)
126126
return { stream: { ...muxedStream, ...stream }, protocol }
127-
} catch (err) {
127+
} catch (/** @type {any} */ err) {
128128
throw errCode(err, codes.ERR_UNSUPPORTED_PROTOCOL)
129129
}
130130
}

0 commit comments

Comments
 (0)
Please sign in to comment.