chore: update aegir (#1027)

Updates aegir, fixes all new linting errors.
This commit is contained in:
Alex Potsides
2021-11-19 08:02:24 +00:00
committed by GitHub
parent 3fb424914f
commit 3bed7b4cb2
39 changed files with 104 additions and 102 deletions

View File

@ -38,7 +38,7 @@ async function run() {
) )
await browser.close(); await browser.close();
} catch (err) { } catch (/** @type {any} */ err) {
console.error(err) console.error(err)
process.exit(1) process.exit(1)
} finally { } finally {

View File

@ -81,7 +81,7 @@ function print ({ stream }) {
// node 3 (listening WebSockets) can dial node 1 (TCP) // node 3 (listening WebSockets) can dial node 1 (TCP)
try { try {
await node3.dialProtocol(node1.peerId, '/print') await node3.dialProtocol(node1.peerId, '/print')
} catch (err) { } catch (/** @type {any} */ err) {
console.log('node 3 failed to dial to node 1 with:', err.message) console.log('node 3 failed to dial to node 1 with:', err.message)
} }
})(); })();

View File

@ -9,7 +9,7 @@ async function isExecutable (command) {
await fs.access(command, fs.constants.X_OK) await fs.access(command, fs.constants.X_OK)
return true return true
} catch (err) { } catch (/** @type {any} */ err) {
if (err.code === 'ENOENT') { if (err.code === 'ENOENT') {
return isExecutable(await which(command)) return isExecutable(await which(command))
} }
@ -49,7 +49,7 @@ async function waitForOutput (expectedOutput, command, args = [], opts = {}) {
try { try {
await proc await proc
} catch (err) { } catch (/** @type {any} */ err) {
if (!err.killed) { if (!err.killed) {
throw err throw err
} }

View File

@ -72,7 +72,7 @@ async function test () {
{ timeout: 10000 } { timeout: 10000 }
) )
await browser.close(); await browser.close();
} catch (err) { } catch (/** @type {any} */ err) {
console.error(err) console.error(err)
process.exit(1) process.exit(1)
} finally { } finally {

View File

@ -74,7 +74,8 @@
"extends": "ipfs", "extends": "ipfs",
"ignorePatterns": [ "ignorePatterns": [
"!.aegir.js", "!.aegir.js",
"test/ts-use" "test/ts-use",
"*.d.ts"
] ]
}, },
"dependencies": { "dependencies": {
@ -137,7 +138,7 @@
"@types/node": "^16.0.1", "@types/node": "^16.0.1",
"@types/node-forge": "^0.10.1", "@types/node-forge": "^0.10.1",
"@types/varint": "^6.0.0", "@types/varint": "^6.0.0",
"aegir": "^33.1.1", "aegir": "^36.0.0",
"buffer": "^6.0.3", "buffer": "^6.0.3",
"datastore-core": "^6.0.7", "datastore-core": "^6.0.7",
"delay": "^5.0.0", "delay": "^5.0.0",

View File

@ -116,7 +116,7 @@ class AutoRelay {
this._peerStore.metadataBook.set(peerId, HOP_METADATA_KEY, uint8ArrayFromString(HOP_METADATA_VALUE)) this._peerStore.metadataBook.set(peerId, HOP_METADATA_KEY, uint8ArrayFromString(HOP_METADATA_VALUE))
await this._addListenRelay(connection, id) await this._addListenRelay(connection, id)
} }
} catch (err) { } catch (/** @type {any} */ err) {
this._onError(err) this._onError(err)
} }
} }
@ -169,7 +169,7 @@ class AutoRelay {
try { try {
await this._transportManager.listen([new Multiaddr(listenAddr)]) await this._transportManager.listen([new Multiaddr(listenAddr)])
// Announce multiaddrs will update on listen success by TransportManager event being triggered // Announce multiaddrs will update on listen success by TransportManager event being triggered
} catch (err) { } catch (/** @type {any} */ err) {
this._onError(err) this._onError(err)
this._listenRelays.delete(id) this._listenRelays.delete(id)
} }
@ -267,7 +267,7 @@ class AutoRelay {
return return
} }
} }
} catch (err) { } catch (/** @type {any} */ err) {
this._onError(err) this._onError(err)
} }
} }
@ -279,7 +279,7 @@ class AutoRelay {
try { try {
const connection = await this._libp2p.dial(peerId) const connection = await this._libp2p.dial(peerId)
await this._addListenRelay(connection, peerId.toB58String()) await this._addListenRelay(connection, peerId.toB58String())
} catch (err) { } catch (/** @type {any} */ err) {
this._onError(err, `could not connect and listen on known hop relay ${peerId.toB58String()}`) this._onError(err, `could not connect and listen on known hop relay ${peerId.toB58String()}`)
} }
} }

View File

@ -54,7 +54,7 @@ async function handleHop ({
// Validate the HOP request has the required input // Validate the HOP request has the required input
try { try {
validateAddrs(request, streamHandler) validateAddrs(request, streamHandler)
} catch (err) { } catch (/** @type {any} */ err) {
return log.error('invalid hop request via peer %s', connection.remotePeer.toB58String(), err) return log.error('invalid hop request via peer %s', connection.remotePeer.toB58String(), err)
} }
@ -93,7 +93,7 @@ async function handleHop ({
connection: destinationConnection, connection: destinationConnection,
request: stopRequest request: stopRequest
}) })
} catch (err) { } catch (/** @type {any} */ err) {
return log.error(err) return log.error(err)
} }

View File

@ -34,7 +34,7 @@ module.exports.handleStop = function handleStop ({
// Validate the STOP request has the required input // Validate the STOP request has the required input
try { try {
validateAddrs(request, streamHandler) validateAddrs(request, streamHandler)
} catch (err) { } catch (/** @type {any} */ err) {
return log.error('invalid stop request via peer %s', connection.remotePeer.toB58String(), err) return log.error('invalid stop request via peer %s', connection.remotePeer.toB58String(), err)
} }

View File

@ -34,7 +34,7 @@ function validateAddrs (msg, streamHandler) {
return new Multiaddr(addr) return new Multiaddr(addr)
}) })
} }
} catch (err) { } catch (/** @type {any} */ err) {
writeResponse(streamHandler, msg.type === CircuitRelay.Type.HOP writeResponse(streamHandler, msg.type === CircuitRelay.Type.HOP
? CircuitRelay.Status.HOP_DST_MULTIADDR_INVALID ? CircuitRelay.Status.HOP_DST_MULTIADDR_INVALID
: CircuitRelay.Status.STOP_DST_MULTIADDR_INVALID) : CircuitRelay.Status.STOP_DST_MULTIADDR_INVALID)
@ -47,7 +47,7 @@ function validateAddrs (msg, streamHandler) {
return new Multiaddr(addr) return new Multiaddr(addr)
}) })
} }
} catch (err) { } catch (/** @type {any} */ err) {
writeResponse(streamHandler, msg.type === CircuitRelay.Type.HOP writeResponse(streamHandler, msg.type === CircuitRelay.Type.HOP
? CircuitRelay.Status.HOP_SRC_MULTIADDR_INVALID ? CircuitRelay.Status.HOP_SRC_MULTIADDR_INVALID
: CircuitRelay.Status.STOP_SRC_MULTIADDR_INVALID) : CircuitRelay.Status.STOP_SRC_MULTIADDR_INVALID)

View File

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

View File

@ -171,7 +171,7 @@ class Circuit {
log('new outbound connection %s', maConn.remoteAddr) log('new outbound connection %s', maConn.remoteAddr)
return this._upgrader.upgradeOutbound(maConn) return this._upgrader.upgradeOutbound(maConn)
} catch (err) { } catch (/** @type {any} */ err) {
log.error('Circuit relay dial failed', err) log.error('Circuit relay dial failed', err)
disconnectOnFailure && await relayConnection.close() disconnectOnFailure && await relayConnection.close()
throw err throw err

View File

@ -350,7 +350,7 @@ class ConnectionManager extends EventEmitter {
if (!this._started) { if (!this._started) {
return return
} }
} catch (err) { } catch (/** @type {any} */ err) {
log.error('could not connect to peerStore stored peer', err) log.error('could not connect to peerStore stored peer', err)
} }
} }

View File

@ -95,7 +95,7 @@ class Dialer {
for (const dial of this._pendingDials.values()) { for (const dial of this._pendingDials.values()) {
try { try {
dial.controller.abort() dial.controller.abort()
} catch (err) { } catch (/** @type {any} */ err) {
log.error(err) log.error(err)
} }
} }
@ -129,7 +129,7 @@ class Dialer {
const connection = await pendingDial.promise const connection = await pendingDial.promise
log('dial succeeded to %s', dialTarget.id) log('dial succeeded to %s', dialTarget.id)
return connection return connection
} catch (err) { } catch (/** @type {any} */ err) {
// Error is a timeout // Error is a timeout
if (pendingDial.controller.signal.aborted) { if (pendingDial.controller.signal.aborted) {
err.code = codes.ERR_TIMEOUT err.code = codes.ERR_TIMEOUT

View File

@ -32,7 +32,7 @@ function getPeer (peer) {
try { try {
peer = PeerId.createFromB58String(idStr) peer = PeerId.createFromB58String(idStr)
} catch (err) { } catch (/** @type {any} */ err) {
throw errCode( throw errCode(
new Error(`${peer} is not a valid peer type`), new Error(`${peer} is not a valid peer type`),
codes.ERR_INVALID_MULTIADDR codes.ERR_INVALID_MULTIADDR

View File

@ -124,7 +124,7 @@ class IdentifyService {
stream, stream,
consume consume
) )
} catch (err) { } catch (/** @type {any} */ err) {
// Just log errors // Just log errors
log.error('could not push identify update to peer', err) log.error('could not push identify update to peer', err)
} }
@ -182,7 +182,7 @@ class IdentifyService {
let message let message
try { try {
message = Message.Identify.decode(data) message = Message.Identify.decode(data)
} catch (err) { } catch (/** @type {any} */ err) {
throw errCode(err, codes.ERR_INVALID_MESSAGE) throw errCode(err, codes.ERR_INVALID_MESSAGE)
} }
@ -211,14 +211,14 @@ class IdentifyService {
this.peerStore.metadataBook.set(id, 'ProtocolVersion', uint8ArrayFromString(message.protocolVersion)) this.peerStore.metadataBook.set(id, 'ProtocolVersion', uint8ArrayFromString(message.protocolVersion))
return return
} }
} catch (err) { } catch (/** @type {any} */ err) {
log('received invalid envelope, discard it and fallback to listenAddrs is available', err) log('received invalid envelope, discard it and fallback to listenAddrs is available', err)
} }
// LEGACY: Update peers data in PeerStore // LEGACY: Update peers data in PeerStore
try { try {
this.peerStore.addressBook.set(id, listenAddrs.map((addr) => new Multiaddr(addr))) this.peerStore.addressBook.set(id, listenAddrs.map((addr) => new Multiaddr(addr)))
} catch (err) { } catch (/** @type {any} */ err) {
log.error('received invalid addrs', err) log.error('received invalid addrs', err)
} }
@ -287,7 +287,7 @@ class IdentifyService {
stream, stream,
consume consume
) )
} catch (err) { } catch (/** @type {any} */ err) {
log.error('could not respond to identify request', err) log.error('could not respond to identify request', err)
} }
} }
@ -313,7 +313,7 @@ class IdentifyService {
collect collect
) )
message = Message.Identify.decode(data) message = Message.Identify.decode(data)
} catch (err) { } catch (/** @type {any} */ err) {
return log.error('received invalid message', err) return log.error('received invalid message', err)
} }
@ -325,7 +325,7 @@ class IdentifyService {
this.peerStore.protoBook.set(id, message.protocols) this.peerStore.protoBook.set(id, message.protocols)
return return
} }
} catch (err) { } catch (/** @type {any} */ err) {
log('received invalid envelope, discard it and fallback to listenAddrs is available', err) log('received invalid envelope, discard it and fallback to listenAddrs is available', err)
} }
@ -333,7 +333,7 @@ class IdentifyService {
try { try {
this.peerStore.addressBook.set(id, this.peerStore.addressBook.set(id,
message.listenAddrs.map((addr) => new Multiaddr(addr))) message.listenAddrs.map((addr) => new Multiaddr(addr)))
} catch (err) { } catch (/** @type {any} */ err) {
log.error('received invalid addrs', err) log.error('received invalid addrs', err)
} }

View File

@ -363,7 +363,7 @@ class Libp2p extends EventEmitter {
await this._onStarting() await this._onStarting()
await this._onDidStart() await this._onDidStart()
log('libp2p has started') log('libp2p has started')
} catch (err) { } catch (/** @type {any} */ err) {
this.emit('error', err) this.emit('error', err)
log.error('An error occurred starting libp2p', err) log.error('An error occurred starting libp2p', err)
await this.stop() await this.stop()
@ -408,7 +408,7 @@ class Libp2p extends EventEmitter {
ping.unmount(this) ping.unmount(this)
this.dialer.destroy() this.dialer.destroy()
} catch (err) { } catch (/** @type {any} */ err) {
if (err) { if (err) {
log.error(err) log.error(err)
this.emit('error', err) this.emit('error', err)
@ -431,7 +431,7 @@ class Libp2p extends EventEmitter {
try { try {
await this.keychain.findKeyByName('self') await this.keychain.findKeyByName('self')
} catch (err) { } catch (/** @type {any} */ err) {
await this.keychain.importPeer('self', this.peerId) await this.keychain.importPeer('self', this.peerId)
} }
} }
@ -698,7 +698,7 @@ class Libp2p extends EventEmitter {
log('connecting to discovered peer %s', peerId.toB58String()) log('connecting to discovered peer %s', peerId.toB58String())
try { try {
await this.dialer.connectToPeer(peerId) await this.dialer.connectToPeer(peerId)
} catch (err) { } catch (/** @type {any} */ err) {
log.error(`could not connect to discovered peer ${peerId.toB58String()} with ${err}`) log.error(`could not connect to discovered peer ${peerId.toB58String()} with ${err}`)
} }
} }

View File

@ -55,7 +55,7 @@ async function encrypt (localId, conn, remoteId) {
let peerId let peerId
try { try {
peerId = await PeerId.createFromPubKey(id.pubkey.Data) peerId = await PeerId.createFromPubKey(id.pubkey.Data)
} catch (err) { } catch (/** @type {any} */ err) {
log.error(err) log.error(err)
throw new InvalidCryptoExchangeError('Remote did not provide its public key') throw new InvalidCryptoExchangeError('Remote did not provide its public key')
} }

View File

@ -90,7 +90,7 @@ class CMS {
const obj = forge.asn1.fromDer(buf) const obj = forge.asn1.fromDer(buf)
// @ts-ignore not defined // @ts-ignore not defined
cms = forge.pkcs7.messageFromAsn1(obj) cms = forge.pkcs7.messageFromAsn1(obj)
} catch (err) { } catch (/** @type {any} */ err) {
throw errcode(new Error('Invalid CMS: ' + err.message), 'ERR_INVALID_CMS') throw errcode(new Error('Invalid CMS: ' + err.message), 'ERR_INVALID_CMS')
} }
@ -114,7 +114,7 @@ class CMS {
try { try {
const key = await this.keychain.findKeyById(recipient.keyId) const key = await this.keychain.findKeyById(recipient.keyId)
if (key) return true if (key) return true
} catch (err) { } catch (/** @type {any} */ err) {
return false return false
} }
return false return false

View File

@ -248,7 +248,7 @@ class Keychain {
batch.put(DsInfoName(name), uint8ArrayFromString(JSON.stringify(keyInfo))) batch.put(DsInfoName(name), uint8ArrayFromString(JSON.stringify(keyInfo)))
await batch.commit() await batch.commit()
} catch (err) { } catch (/** @type {any} */ err) {
return throwDelayed(err) return throwDelayed(err)
} }
@ -284,7 +284,7 @@ class Keychain {
try { try {
const keys = await this.listKeys() const keys = await this.listKeys()
return keys.find((k) => k.id === id) return keys.find((k) => k.id === id)
} catch (err) { } catch (/** @type {any} */ err) {
return throwDelayed(err) return throwDelayed(err)
} }
} }
@ -304,7 +304,7 @@ class Keychain {
try { try {
const res = await this.store.get(dsname) const res = await this.store.get(dsname)
return JSON.parse(uint8ArrayToString(res)) return JSON.parse(uint8ArrayToString(res))
} catch (err) { } catch (/** @type {any} */ err) {
return throwDelayed(errcode(new Error(`Key '${name}' does not exist. ${err.message}`), 'ERR_KEY_NOT_FOUND')) return throwDelayed(errcode(new Error(`Key '${name}' does not exist. ${err.message}`), 'ERR_KEY_NOT_FOUND'))
} }
} }
@ -365,7 +365,7 @@ class Keychain {
batch.delete(oldInfoName) batch.delete(oldInfoName)
await batch.commit() await batch.commit()
return keyInfo return keyInfo
} catch (err) { } catch (/** @type {any} */ err) {
return throwDelayed(err) return throwDelayed(err)
} }
} }
@ -393,7 +393,7 @@ class Keychain {
const dek = privates.get(this).dek const dek = privates.get(this).dek
const privateKey = await crypto.keys.import(pem, dek) const privateKey = await crypto.keys.import(pem, dek)
return privateKey.export(password) return privateKey.export(password)
} catch (err) { } catch (/** @type {any} */ err) {
return throwDelayed(err) return throwDelayed(err)
} }
} }
@ -421,7 +421,7 @@ class Keychain {
let privateKey let privateKey
try { try {
privateKey = await crypto.keys.import(pem, password) privateKey = await crypto.keys.import(pem, password)
} catch (err) { } catch (/** @type {any} */ err) {
return throwDelayed(errcode(new Error('Cannot read the key, most likely the password is wrong'), 'ERR_CANNOT_READ_KEY')) return throwDelayed(errcode(new Error('Cannot read the key, most likely the password is wrong'), 'ERR_CANNOT_READ_KEY'))
} }
@ -431,7 +431,7 @@ class Keychain {
/** @type {string} */ /** @type {string} */
const dek = privates.get(this).dek const dek = privates.get(this).dek
pem = await privateKey.export(dek) pem = await privateKey.export(dek)
} catch (err) { } catch (/** @type {any} */ err) {
return throwDelayed(err) return throwDelayed(err)
} }
@ -482,7 +482,7 @@ class Keychain {
batch.put(DsInfoName(name), uint8ArrayFromString(JSON.stringify(keyInfo))) batch.put(DsInfoName(name), uint8ArrayFromString(JSON.stringify(keyInfo)))
await batch.commit() await batch.commit()
return keyInfo return keyInfo
} catch (err) { } catch (/** @type {any} */ err) {
return throwDelayed(err) return throwDelayed(err)
} }
} }
@ -502,7 +502,7 @@ class Keychain {
const dsname = DsName(name) const dsname = DsName(name)
const res = await this.store.get(dsname) const res = await this.store.get(dsname)
return uint8ArrayToString(res) return uint8ArrayToString(res)
} catch (err) { } catch (/** @type {any} */ err) {
return throwDelayed(errcode(new Error(`Key '${name}' does not exist. ${err.message}`), 'ERR_KEY_NOT_FOUND')) return throwDelayed(errcode(new Error(`Key '${name}' does not exist. ${err.message}`), 'ERR_KEY_NOT_FOUND'))
} }
} }

View File

@ -188,7 +188,7 @@ class NatManager {
try { try {
await this._client.destroy() await this._client.destroy()
this._client = null this._client = null
} catch (err) { } catch (/** @type {any} */ err) {
log.error(err) log.error(err)
} }
} }

View File

@ -79,7 +79,7 @@ class PeerRouting {
try { try {
// nb getClosestPeers adds the addresses to the address book // nb getClosestPeers adds the addresses to the address book
await drain(this.getClosestPeers(this._peerId.id)) await drain(this.getClosestPeers(this._peerId.id))
} catch (err) { } catch (/** @type {any} */ err) {
log.error(err) log.error(err)
} }
} }

View File

@ -83,7 +83,7 @@ class AddressBook extends Book {
let peerRecord let peerRecord
try { try {
peerRecord = PeerRecord.createFromProtobuf(envelope.payload) peerRecord = PeerRecord.createFromProtobuf(envelope.payload)
} catch (err) { } catch (/** @type {any} */ err) {
log.error('invalid peer record received') log.error('invalid peer record received')
return false return false
} }

View File

@ -80,10 +80,11 @@ class MetadataBook extends Book {
/** /**
* Set data into the datastructure * Set data into the datastructure
* *
* @override
* @param {PeerId} peerId * @param {PeerId} peerId
* @param {string} key * @param {string} key
* @param {Uint8Array} value * @param {Uint8Array} value
* @param {object} [opts]
* @param {boolean} [opts.emit]
*/ */
_setValue (peerId, key, value, { emit = true } = {}) { _setValue (peerId, key, value, { emit = true } = {}) {
const id = peerId.toB58String() const id = peerId.toB58String()

View File

@ -249,7 +249,7 @@ class PersistentPeerStore extends PeerStore {
}).finish() }).finish()
batch.put(key, encodedData) batch.put(key, encodedData)
} catch (err) { } catch (/** @type {any} */ err) {
log.error(err) log.error(err)
} }
} }
@ -275,7 +275,7 @@ class PersistentPeerStore extends PeerStore {
const encodedData = peerId.marshalPubKey() const encodedData = peerId.marshalPubKey()
batch.put(key, encodedData) batch.put(key, encodedData)
} catch (err) { } catch (/** @type {any} */ err) {
log.error(err) log.error(err)
} }
} }
@ -302,7 +302,7 @@ class PersistentPeerStore extends PeerStore {
batch.delete(key) batch.delete(key)
} }
}) })
} catch (err) { } catch (/** @type {any} */ err) {
log.error(err) log.error(err)
} }
} }
@ -330,7 +330,7 @@ class PersistentPeerStore extends PeerStore {
const encodedData = Protocols.encode({ protocols }).finish() const encodedData = Protocols.encode({ protocols }).finish()
batch.put(key, encodedData) batch.put(key, encodedData)
} catch (err) { } catch (/** @type {any} */ err) {
log.error(err) log.error(err)
} }
} }
@ -399,7 +399,7 @@ class PersistentPeerStore extends PeerStore {
default: default:
log('invalid data persisted for: ', key.toString()) log('invalid data persisted for: ', key.toString())
} }
} catch (err) { } catch (/** @type {any} */ err) {
log.error(err) log.error(err)
} }
} }

View File

@ -77,7 +77,7 @@ module.exports.decodeV1PSK = (pskBuffer) => {
codecName: codec, codecName: codec,
psk: psk psk: psk
} }
} catch (err) { } catch (/** @type {any} */ err) {
log.error(err) log.error(err)
throw new Error(Errors.INVALID_PSK) throw new Error(Errors.INVALID_PSK)
} }

View File

@ -28,6 +28,6 @@ try {
// @ts-ignore // @ts-ignore
generate(process.stdout) generate(process.stdout)
} }
} catch (error) { } catch (/** @type {any} */ error) {
} }

View File

@ -109,7 +109,7 @@ class TransportManager {
try { try {
return await transport.dial(ma, options) return await transport.dial(ma, options)
} catch (err) { } catch (/** @type {any} */ err) {
if (!err.code) err.code = codes.ERR_TRANSPORT_DIAL_FAILED if (!err.code) err.code = codes.ERR_TRANSPORT_DIAL_FAILED
throw err throw err
} }

View File

@ -106,7 +106,7 @@ class Upgrader {
} else { } else {
upgradedConn = encryptedConn upgradedConn = encryptedConn
} }
} catch (err) { } catch (/** @type {any} */ err) {
log.error('Failed to upgrade inbound connection', err) log.error('Failed to upgrade inbound connection', err)
await maConn.close(err) await maConn.close(err)
throw err throw err
@ -181,7 +181,7 @@ class Upgrader {
} else { } else {
upgradedConn = encryptedConn upgradedConn = encryptedConn
} }
} catch (err) { } catch (/** @type {any} */ err) {
log.error('Failed to upgrade outbound connection', err) log.error('Failed to upgrade outbound connection', err)
await maConn.close(err) await maConn.close(err)
throw err throw err
@ -245,7 +245,7 @@ class Upgrader {
if (this.metrics) this.metrics.trackStream({ stream, remotePeer, protocol }) if (this.metrics) this.metrics.trackStream({ stream, remotePeer, protocol })
connection.addStream(muxedStream, { protocol }) connection.addStream(muxedStream, { protocol })
this._onStream({ connection, stream: { ...muxedStream, ...stream }, protocol }) this._onStream({ connection, stream: { ...muxedStream, ...stream }, protocol })
} catch (err) { } catch (/** @type {any} */ err) {
log.error(err) log.error(err)
} }
}, },
@ -263,7 +263,7 @@ class Upgrader {
const { stream, protocol } = await mss.select(protocols) const { stream, protocol } = await mss.select(protocols)
if (this.metrics) this.metrics.trackStream({ stream, remotePeer, protocol }) if (this.metrics) this.metrics.trackStream({ stream, remotePeer, protocol })
return { stream: { ...muxedStream, ...stream }, protocol } return { stream: { ...muxedStream, ...stream }, protocol }
} catch (err) { } catch (/** @type {any} */ err) {
log.error('could not create new stream', err) log.error('could not create new stream', err)
throw errCode(err, codes.ERR_UNSUPPORTED_PROTOCOL) throw errCode(err, codes.ERR_UNSUPPORTED_PROTOCOL)
} }
@ -283,7 +283,7 @@ class Upgrader {
if (connection.stat.status === 'open') { if (connection.stat.status === 'open') {
await connection.close() await connection.close()
} }
} catch (err) { } catch (/** @type {any} */ err) {
log.error(err) log.error(err)
} finally { } finally {
this.onConnectionEnd(connection) this.onConnectionEnd(connection)
@ -371,7 +371,7 @@ class Upgrader {
...await crypto.secureInbound(localPeer, stream), ...await crypto.secureInbound(localPeer, stream),
protocol protocol
} }
} catch (err) { } catch (/** @type {any} */ err) {
throw errCode(err, codes.ERR_ENCRYPTION_FAILED) throw errCode(err, codes.ERR_ENCRYPTION_FAILED)
} }
} }
@ -406,7 +406,7 @@ class Upgrader {
...await crypto.secureOutbound(localPeer, stream, remotePeerId), ...await crypto.secureOutbound(localPeer, stream, remotePeerId),
protocol protocol
} }
} catch (err) { } catch (/** @type {any} */ err) {
throw errCode(err, codes.ERR_ENCRYPTION_FAILED) throw errCode(err, codes.ERR_ENCRYPTION_FAILED)
} }
} }
@ -430,7 +430,7 @@ class Upgrader {
log('%s selected as muxer protocol', protocol) log('%s selected as muxer protocol', protocol)
const Muxer = muxers.get(protocol) const Muxer = muxers.get(protocol)
return { stream, Muxer } return { stream, Muxer }
} catch (err) { } catch (/** @type {any} */ err) {
throw errCode(err, codes.ERR_MUXER_UNAVAILABLE) throw errCode(err, codes.ERR_MUXER_UNAVAILABLE)
} }
} }
@ -453,7 +453,7 @@ class Upgrader {
const { stream, protocol } = await listener.handle(protocols) const { stream, protocol } = await listener.handle(protocols)
const Muxer = muxers.get(protocol) const Muxer = muxers.get(protocol)
return { stream, Muxer } return { stream, Muxer }
} catch (err) { } catch (/** @type {any} */ err) {
throw errCode(err, codes.ERR_MUXER_UNAVAILABLE) throw errCode(err, codes.ERR_MUXER_UNAVAILABLE)
} }
} }

View File

@ -34,7 +34,7 @@ describe('content-routing', () => {
try { try {
for await (const _ of node.contentRouting.findProviders('a cid')) {} // eslint-disable-line for await (const _ of node.contentRouting.findProviders('a cid')) {} // eslint-disable-line
throw new Error('.findProviders should return an error') throw new Error('.findProviders should return an error')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err).to.exist() expect(err).to.exist()
expect(err.code).to.equal('NO_ROUTERS_AVAILABLE') expect(err.code).to.equal('NO_ROUTERS_AVAILABLE')
} }
@ -238,7 +238,7 @@ describe('content-routing', () => {
try { try {
for await (const _ of node.contentRouting.findProviders(cid)) { } // eslint-disable-line for await (const _ of node.contentRouting.findProviders(cid)) { } // eslint-disable-line
throw new Error('should handle errors when finding providers') throw new Error('should handle errors when finding providers')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err).to.exist() expect(err).to.exist()
} }

View File

@ -125,7 +125,7 @@ describe('Dial Request', () => {
try { try {
await dialRequest.run({ signal: controller.signal }) await dialRequest.run({ signal: controller.signal })
expect.fail('Should have thrown') expect.fail('Should have thrown')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err).to.be.an.instanceof(AggregateError) expect(err).to.be.an.instanceof(AggregateError)
} }
@ -162,7 +162,7 @@ describe('Dial Request', () => {
try { try {
await dialRequest.run({ signal: controller.signal }) await dialRequest.run({ signal: controller.signal })
expect.fail('Should have thrown') expect.fail('Should have thrown')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err).to.be.an.instanceof(AggregateError) expect(err).to.be.an.instanceof(AggregateError)
} }
@ -212,7 +212,7 @@ describe('Dial Request', () => {
setTimeout(() => controller.abort(), 100) setTimeout(() => controller.abort(), 100)
await dialRequest.run({ signal: controller.signal }) await dialRequest.run({ signal: controller.signal })
expect.fail('dial should have failed') expect.fail('dial should have failed')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err).to.be.an.instanceof(AggregateError) expect(err).to.be.an.instanceof(AggregateError)
} }

View File

@ -277,7 +277,7 @@ describe('Dialing (direct, TCP)', () => {
try { try {
await libp2p.dial(remoteLibp2p.transportManager.getAddrs()[0]) await libp2p.dial(remoteLibp2p.transportManager.getAddrs()[0])
} catch (err) { } catch (/** @type {any} */ err) {
expect(err).to.have.property('code', ErrorCodes.ERR_INVALID_MULTIADDR) expect(err).to.have.property('code', ErrorCodes.ERR_INVALID_MULTIADDR)
return return
} }

View File

@ -304,7 +304,7 @@ describe('Dialing (direct, WebSockets)', () => {
dialer.destroy() dialer.destroy()
await dialPromise await dialPromise
expect.fail('should have failed') expect.fail('should have failed')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err).to.be.an.instanceof(AggregateError) expect(err).to.be.an.instanceof(AggregateError)
expect(dialer._pendingDials.size).to.equal(0) // 1 dial request expect(dialer._pendingDials.size).to.equal(0) // 1 dial request
} }

View File

@ -519,7 +519,7 @@ describe('keychain', () => {
it('should validate newPass is a string', async () => { it('should validate newPass is a string', async () => {
try { try {
await kc.rotateKeychainPass(oldPass, 1234567890) await kc.rotateKeychainPass(oldPass, 1234567890)
} catch (err) { } catch (/** @type {any} */ err) {
expect(err).to.exist() expect(err).to.exist()
} }
}) })
@ -527,7 +527,7 @@ describe('keychain', () => {
it('should validate oldPass is a string', async () => { it('should validate oldPass is a string', async () => {
try { try {
await kc.rotateKeychainPass(1234, 'newInsecurePassword1') await kc.rotateKeychainPass(1234, 'newInsecurePassword1')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err).to.exist() expect(err).to.exist()
} }
}) })
@ -535,7 +535,7 @@ describe('keychain', () => {
it('should validate newPass is at least 20 characters', async () => { it('should validate newPass is at least 20 characters', async () => {
try { try {
await kc.rotateKeychainPass(oldPass, 'not20Chars') await kc.rotateKeychainPass(oldPass, 'not20Chars')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err).to.exist() expect(err).to.exist()
} }
}) })
@ -586,7 +586,7 @@ describe('libp2p.keychain', () => {
try { try {
await libp2p.keychain.createKey('keyName', 'rsa', 2048) await libp2p.keychain.createKey('keyName', 'rsa', 2048)
} catch (err) { } catch (/** @type {any} */ err) {
expect(err).to.exist() expect(err).to.exist()
return return
} }

View File

@ -43,7 +43,7 @@ describe('peer-routing', () => {
try { try {
for await (const _ of node.peerRouting.getClosestPeers('a cid')) { } // eslint-disable-line for await (const _ of node.peerRouting.getClosestPeers('a cid')) { } // eslint-disable-line
throw new Error('.getClosestPeers should return an error') throw new Error('.getClosestPeers should return an error')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err).to.exist() expect(err).to.exist()
expect(err.code).to.equal('NO_ROUTERS_AVAILABLE') expect(err.code).to.equal('NO_ROUTERS_AVAILABLE')
} }
@ -275,7 +275,7 @@ describe('peer-routing', () => {
try { try {
for await (const _ of node.peerRouting.getClosestPeers(peerId.id)) { } // eslint-disable-line for await (const _ of node.peerRouting.getClosestPeers(peerId.id)) { } // eslint-disable-line
throw new Error('should handle errors when getting the closest peers') throw new Error('should handle errors when getting the closest peers')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err).to.exist() expect(err).to.exist()
} }

View File

@ -45,7 +45,7 @@ describe('addressBook', () => {
it('throwns invalid parameters error if invalid PeerId is provided', () => { it('throwns invalid parameters error if invalid PeerId is provided', () => {
try { try {
ab.set('invalid peerId') ab.set('invalid peerId')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }
@ -55,7 +55,7 @@ describe('addressBook', () => {
it('throwns invalid parameters error if no addresses provided', () => { it('throwns invalid parameters error if no addresses provided', () => {
try { try {
ab.set(peerId) ab.set(peerId)
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }
@ -65,7 +65,7 @@ describe('addressBook', () => {
it('throwns invalid parameters error if invalid multiaddrs are provided', () => { it('throwns invalid parameters error if invalid multiaddrs are provided', () => {
try { try {
ab.set(peerId, ['invalid multiaddr']) ab.set(peerId, ['invalid multiaddr'])
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }
@ -159,7 +159,7 @@ describe('addressBook', () => {
it('throwns invalid parameters error if invalid PeerId is provided', () => { it('throwns invalid parameters error if invalid PeerId is provided', () => {
try { try {
ab.add('invalid peerId') ab.add('invalid peerId')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }
@ -169,7 +169,7 @@ describe('addressBook', () => {
it('throwns invalid parameters error if no addresses provided', () => { it('throwns invalid parameters error if no addresses provided', () => {
try { try {
ab.add(peerId) ab.add(peerId)
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }
@ -179,7 +179,7 @@ describe('addressBook', () => {
it('throwns invalid parameters error if invalid multiaddrs are provided', () => { it('throwns invalid parameters error if invalid multiaddrs are provided', () => {
try { try {
ab.add(peerId, ['invalid multiaddr']) ab.add(peerId, ['invalid multiaddr'])
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }
@ -308,7 +308,7 @@ describe('addressBook', () => {
it('throwns invalid parameters error if invalid PeerId is provided', () => { it('throwns invalid parameters error if invalid PeerId is provided', () => {
try { try {
ab.get('invalid peerId') ab.get('invalid peerId')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }
@ -343,7 +343,7 @@ describe('addressBook', () => {
it('throwns invalid parameters error if invalid PeerId is provided', () => { it('throwns invalid parameters error if invalid PeerId is provided', () => {
try { try {
ab.getMultiaddrsForPeer('invalid peerId') ab.getMultiaddrsForPeer('invalid peerId')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }
@ -391,7 +391,7 @@ describe('addressBook', () => {
it('throwns invalid parameters error if invalid PeerId is provided', () => { it('throwns invalid parameters error if invalid PeerId is provided', () => {
try { try {
ab.delete('invalid peerId') ab.delete('invalid peerId')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }

View File

@ -23,7 +23,7 @@ describe('keyBook', () => {
it('throws invalid parameters error if invalid PeerId is provided in set', () => { it('throws invalid parameters error if invalid PeerId is provided in set', () => {
try { try {
kb.set('invalid peerId') kb.set('invalid peerId')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }
@ -33,7 +33,7 @@ describe('keyBook', () => {
it('throws invalid parameters error if invalid PeerId is provided in get', () => { it('throws invalid parameters error if invalid PeerId is provided in get', () => {
try { try {
kb.get('invalid peerId') kb.get('invalid peerId')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }

View File

@ -34,7 +34,7 @@ describe('metadataBook', () => {
it('throws invalid parameters error if invalid PeerId is provided', () => { it('throws invalid parameters error if invalid PeerId is provided', () => {
try { try {
mb.set('invalid peerId') mb.set('invalid peerId')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }
@ -44,7 +44,7 @@ describe('metadataBook', () => {
it('throws invalid parameters error if no key provided', () => { it('throws invalid parameters error if no key provided', () => {
try { try {
mb.set(peerId) mb.set(peerId)
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }
@ -54,7 +54,7 @@ describe('metadataBook', () => {
it('throws invalid parameters error if no value provided', () => { it('throws invalid parameters error if no value provided', () => {
try { try {
mb.set(peerId, 'location') mb.set(peerId, 'location')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }
@ -64,7 +64,7 @@ describe('metadataBook', () => {
it('throws invalid parameters error if value is not a buffer', () => { it('throws invalid parameters error if value is not a buffer', () => {
try { try {
mb.set(peerId, 'location', 'mars') mb.set(peerId, 'location', 'mars')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }
@ -163,7 +163,7 @@ describe('metadataBook', () => {
it('throws invalid parameters error if invalid PeerId is provided', () => { it('throws invalid parameters error if invalid PeerId is provided', () => {
try { try {
mb.get('invalid peerId') mb.get('invalid peerId')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }
@ -199,7 +199,7 @@ describe('metadataBook', () => {
it('throws invalid parameters error if invalid PeerId is provided', () => { it('throws invalid parameters error if invalid PeerId is provided', () => {
try { try {
mb.getValue('invalid peerId') mb.getValue('invalid peerId')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }
@ -248,7 +248,7 @@ describe('metadataBook', () => {
it('throwns invalid parameters error if invalid PeerId is provided', () => { it('throwns invalid parameters error if invalid PeerId is provided', () => {
try { try {
mb.delete('invalid peerId') mb.delete('invalid peerId')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }
@ -305,7 +305,7 @@ describe('metadataBook', () => {
it('throws invalid parameters error if invalid PeerId is provided', () => { it('throws invalid parameters error if invalid PeerId is provided', () => {
try { try {
mb.deleteValue('invalid peerId') mb.deleteValue('invalid peerId')
} catch (err) { } catch (/** @type {any} */ err) {
expect(err.code).to.equal(ERR_INVALID_PARAMETERS) expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
return return
} }

View File

@ -201,7 +201,7 @@ describe('libp2p.transportManager (dial only)', () => {
try { try {
await libp2p.start() await libp2p.start()
} catch (err) { } catch (/** @type {any} */ err) {
expect(err).to.exist() expect(err).to.exist()
expect(err.code).to.equal(ErrorCodes.ERR_NO_VALID_ADDRESSES) expect(err.code).to.equal(ErrorCodes.ERR_NO_VALID_ADDRESSES)
return return

View File

@ -108,7 +108,7 @@ function createConnection ({
// Need to be able to notify a peer of this this._onStream({ connection, stream, protocol }) // Need to be able to notify a peer of this this._onStream({ connection, stream, protocol })
const handler = protocols.get(protocol) const handler = protocols.get(protocol)
handler({ connection, stream, protocol }) handler({ connection, stream, protocol })
} catch (err) { } catch (/** @type {any} */ err) {
// Do nothing // Do nothing
} }
}, },
@ -124,7 +124,7 @@ function createConnection ({
try { try {
const { stream, protocol } = await mss.select(protocols) const { stream, protocol } = await mss.select(protocols)
return { stream: { ...muxedStream, ...stream }, protocol } return { stream: { ...muxedStream, ...stream }, protocol }
} catch (err) { } catch (/** @type {any} */ err) {
throw errCode(err, codes.ERR_UNSUPPORTED_PROTOCOL) throw errCode(err, codes.ERR_UNSUPPORTED_PROTOCOL)
} }
} }