From 3bed7b4cb25157191b29d4b058cb6222eb3bfcd7 Mon Sep 17 00:00:00 2001 From: Alex Potsides Date: Fri, 19 Nov 2021 08:02:24 +0000 Subject: [PATCH] chore: update aegir (#1027) Updates aegir, fixes all new linting errors. --- examples/libp2p-in-the-browser/test.js | 2 +- examples/transports/3.js | 2 +- examples/utils.js | 4 ++-- examples/webrtc-direct/test.js | 2 +- package.json | 5 +++-- src/circuit/auto-relay.js | 8 ++++---- src/circuit/circuit/hop.js | 4 ++-- src/circuit/circuit/stop.js | 2 +- src/circuit/circuit/utils.js | 4 ++-- src/circuit/index.js | 2 +- src/circuit/transport.js | 2 +- src/connection-manager/index.js | 2 +- src/dialer/index.js | 4 ++-- src/get-peer.js | 2 +- src/identify/index.js | 16 ++++++++-------- src/index.js | 8 ++++---- src/insecure/plaintext.js | 2 +- src/keychain/cms.js | 4 ++-- src/keychain/index.js | 18 +++++++++--------- src/nat-manager.js | 2 +- src/peer-routing.js | 2 +- src/peer-store/address-book.js | 2 +- src/peer-store/metadata-book.js | 3 ++- src/peer-store/persistent/index.js | 10 +++++----- src/pnet/crypto.js | 2 +- src/pnet/key-generator.js | 2 +- src/transport-manager.js | 2 +- src/upgrader.js | 18 +++++++++--------- test/content-routing/content-routing.node.js | 4 ++-- test/dialing/dial-request.spec.js | 6 +++--- test/dialing/direct.node.js | 2 +- test/dialing/direct.spec.js | 2 +- test/keychain/keychain.spec.js | 8 ++++---- test/peer-routing/peer-routing.node.js | 4 ++-- test/peer-store/address-book.spec.js | 18 +++++++++--------- test/peer-store/key-book.spec.js | 4 ++-- test/peer-store/metadata-book.spec.js | 16 ++++++++-------- test/transports/transport-manager.spec.js | 2 +- test/utils/mockConnection.js | 4 ++-- 39 files changed, 104 insertions(+), 102 deletions(-) diff --git a/examples/libp2p-in-the-browser/test.js b/examples/libp2p-in-the-browser/test.js index 574e5739..97e65224 100644 --- a/examples/libp2p-in-the-browser/test.js +++ b/examples/libp2p-in-the-browser/test.js @@ -38,7 +38,7 @@ async function run() { ) await browser.close(); - } catch (err) { + } catch (/** @type {any} */ err) { console.error(err) process.exit(1) } finally { diff --git a/examples/transports/3.js b/examples/transports/3.js index 90fc1b17..b3843b15 100644 --- a/examples/transports/3.js +++ b/examples/transports/3.js @@ -81,7 +81,7 @@ function print ({ stream }) { // node 3 (listening WebSockets) can dial node 1 (TCP) try { 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) } })(); diff --git a/examples/utils.js b/examples/utils.js index aec6df54..95b509ce 100644 --- a/examples/utils.js +++ b/examples/utils.js @@ -9,7 +9,7 @@ async function isExecutable (command) { await fs.access(command, fs.constants.X_OK) return true - } catch (err) { + } catch (/** @type {any} */ err) { if (err.code === 'ENOENT') { return isExecutable(await which(command)) } @@ -49,7 +49,7 @@ async function waitForOutput (expectedOutput, command, args = [], opts = {}) { try { await proc - } catch (err) { + } catch (/** @type {any} */ err) { if (!err.killed) { throw err } diff --git a/examples/webrtc-direct/test.js b/examples/webrtc-direct/test.js index 6f990073..d6603f36 100644 --- a/examples/webrtc-direct/test.js +++ b/examples/webrtc-direct/test.js @@ -72,7 +72,7 @@ async function test () { { timeout: 10000 } ) await browser.close(); - } catch (err) { + } catch (/** @type {any} */ err) { console.error(err) process.exit(1) } finally { diff --git a/package.json b/package.json index 1c653f29..919d16a8 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,8 @@ "extends": "ipfs", "ignorePatterns": [ "!.aegir.js", - "test/ts-use" + "test/ts-use", + "*.d.ts" ] }, "dependencies": { @@ -137,7 +138,7 @@ "@types/node": "^16.0.1", "@types/node-forge": "^0.10.1", "@types/varint": "^6.0.0", - "aegir": "^33.1.1", + "aegir": "^36.0.0", "buffer": "^6.0.3", "datastore-core": "^6.0.7", "delay": "^5.0.0", diff --git a/src/circuit/auto-relay.js b/src/circuit/auto-relay.js index c27bfc56..1c238f54 100644 --- a/src/circuit/auto-relay.js +++ b/src/circuit/auto-relay.js @@ -116,7 +116,7 @@ class AutoRelay { this._peerStore.metadataBook.set(peerId, HOP_METADATA_KEY, uint8ArrayFromString(HOP_METADATA_VALUE)) await this._addListenRelay(connection, id) } - } catch (err) { + } catch (/** @type {any} */ err) { this._onError(err) } } @@ -169,7 +169,7 @@ class AutoRelay { try { await this._transportManager.listen([new Multiaddr(listenAddr)]) // Announce multiaddrs will update on listen success by TransportManager event being triggered - } catch (err) { + } catch (/** @type {any} */ err) { this._onError(err) this._listenRelays.delete(id) } @@ -267,7 +267,7 @@ class AutoRelay { return } } - } catch (err) { + } catch (/** @type {any} */ err) { this._onError(err) } } @@ -279,7 +279,7 @@ class AutoRelay { try { const connection = await this._libp2p.dial(peerId) 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()}`) } } diff --git a/src/circuit/circuit/hop.js b/src/circuit/circuit/hop.js index b2ce72de..73d9b1f8 100644 --- a/src/circuit/circuit/hop.js +++ b/src/circuit/circuit/hop.js @@ -54,7 +54,7 @@ async function handleHop ({ // Validate the HOP request has the required input try { validateAddrs(request, streamHandler) - } catch (err) { + } catch (/** @type {any} */ err) { return log.error('invalid hop request via peer %s', connection.remotePeer.toB58String(), err) } @@ -93,7 +93,7 @@ async function handleHop ({ connection: destinationConnection, request: stopRequest }) - } catch (err) { + } catch (/** @type {any} */ err) { return log.error(err) } diff --git a/src/circuit/circuit/stop.js b/src/circuit/circuit/stop.js index 6fa92a07..8efd00f8 100644 --- a/src/circuit/circuit/stop.js +++ b/src/circuit/circuit/stop.js @@ -34,7 +34,7 @@ module.exports.handleStop = function handleStop ({ // Validate the STOP request has the required input try { validateAddrs(request, streamHandler) - } catch (err) { + } catch (/** @type {any} */ err) { return log.error('invalid stop request via peer %s', connection.remotePeer.toB58String(), err) } diff --git a/src/circuit/circuit/utils.js b/src/circuit/circuit/utils.js index a69dcb50..624d0ba4 100644 --- a/src/circuit/circuit/utils.js +++ b/src/circuit/circuit/utils.js @@ -34,7 +34,7 @@ function validateAddrs (msg, streamHandler) { return new Multiaddr(addr) }) } - } catch (err) { + } catch (/** @type {any} */ err) { writeResponse(streamHandler, msg.type === CircuitRelay.Type.HOP ? CircuitRelay.Status.HOP_DST_MULTIADDR_INVALID : CircuitRelay.Status.STOP_DST_MULTIADDR_INVALID) @@ -47,7 +47,7 @@ function validateAddrs (msg, streamHandler) { return new Multiaddr(addr) }) } - } catch (err) { + } catch (/** @type {any} */ err) { writeResponse(streamHandler, msg.type === CircuitRelay.Type.HOP ? CircuitRelay.Status.HOP_SRC_MULTIADDR_INVALID : CircuitRelay.Status.STOP_SRC_MULTIADDR_INVALID) diff --git a/src/circuit/index.js b/src/circuit/index.js index da8e879e..4d180b6e 100644 --- a/src/circuit/index.js +++ b/src/circuit/index.js @@ -87,7 +87,7 @@ class Relay { try { const cid = await namespaceToCid(RELAY_RENDEZVOUS_NS) await this._libp2p.contentRouting.provide(cid) - } catch (err) { + } catch (/** @type {any} */ err) { 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) // Stop the advertise diff --git a/src/circuit/transport.js b/src/circuit/transport.js index 1dc284ca..5d0ad50d 100644 --- a/src/circuit/transport.js +++ b/src/circuit/transport.js @@ -171,7 +171,7 @@ class Circuit { log('new outbound connection %s', maConn.remoteAddr) return this._upgrader.upgradeOutbound(maConn) - } catch (err) { + } catch (/** @type {any} */ err) { log.error('Circuit relay dial failed', err) disconnectOnFailure && await relayConnection.close() throw err diff --git a/src/connection-manager/index.js b/src/connection-manager/index.js index d63ebf75..802c9fe6 100644 --- a/src/connection-manager/index.js +++ b/src/connection-manager/index.js @@ -350,7 +350,7 @@ class ConnectionManager extends EventEmitter { if (!this._started) { return } - } catch (err) { + } catch (/** @type {any} */ err) { log.error('could not connect to peerStore stored peer', err) } } diff --git a/src/dialer/index.js b/src/dialer/index.js index 65afe266..630e9c50 100644 --- a/src/dialer/index.js +++ b/src/dialer/index.js @@ -95,7 +95,7 @@ class Dialer { for (const dial of this._pendingDials.values()) { try { dial.controller.abort() - } catch (err) { + } catch (/** @type {any} */ err) { log.error(err) } } @@ -129,7 +129,7 @@ class Dialer { const connection = await pendingDial.promise log('dial succeeded to %s', dialTarget.id) return connection - } catch (err) { + } catch (/** @type {any} */ err) { // Error is a timeout if (pendingDial.controller.signal.aborted) { err.code = codes.ERR_TIMEOUT diff --git a/src/get-peer.js b/src/get-peer.js index a0de9ef8..afad64df 100644 --- a/src/get-peer.js +++ b/src/get-peer.js @@ -32,7 +32,7 @@ function getPeer (peer) { try { peer = PeerId.createFromB58String(idStr) - } catch (err) { + } catch (/** @type {any} */ err) { throw errCode( new Error(`${peer} is not a valid peer type`), codes.ERR_INVALID_MULTIADDR diff --git a/src/identify/index.js b/src/identify/index.js index b198b450..d08d1196 100644 --- a/src/identify/index.js +++ b/src/identify/index.js @@ -124,7 +124,7 @@ class IdentifyService { stream, consume ) - } catch (err) { + } catch (/** @type {any} */ err) { // Just log errors log.error('could not push identify update to peer', err) } @@ -182,7 +182,7 @@ class IdentifyService { let message try { message = Message.Identify.decode(data) - } catch (err) { + } catch (/** @type {any} */ err) { throw errCode(err, codes.ERR_INVALID_MESSAGE) } @@ -211,14 +211,14 @@ class IdentifyService { this.peerStore.metadataBook.set(id, 'ProtocolVersion', uint8ArrayFromString(message.protocolVersion)) return } - } catch (err) { + } catch (/** @type {any} */ err) { log('received invalid envelope, discard it and fallback to listenAddrs is available', err) } // LEGACY: Update peers data in PeerStore try { this.peerStore.addressBook.set(id, listenAddrs.map((addr) => new Multiaddr(addr))) - } catch (err) { + } catch (/** @type {any} */ err) { log.error('received invalid addrs', err) } @@ -287,7 +287,7 @@ class IdentifyService { stream, consume ) - } catch (err) { + } catch (/** @type {any} */ err) { log.error('could not respond to identify request', err) } } @@ -313,7 +313,7 @@ class IdentifyService { collect ) message = Message.Identify.decode(data) - } catch (err) { + } catch (/** @type {any} */ err) { return log.error('received invalid message', err) } @@ -325,7 +325,7 @@ class IdentifyService { this.peerStore.protoBook.set(id, message.protocols) return } - } catch (err) { + } catch (/** @type {any} */ err) { log('received invalid envelope, discard it and fallback to listenAddrs is available', err) } @@ -333,7 +333,7 @@ class IdentifyService { try { this.peerStore.addressBook.set(id, message.listenAddrs.map((addr) => new Multiaddr(addr))) - } catch (err) { + } catch (/** @type {any} */ err) { log.error('received invalid addrs', err) } diff --git a/src/index.js b/src/index.js index 3bd1fbfe..b06393bd 100644 --- a/src/index.js +++ b/src/index.js @@ -363,7 +363,7 @@ class Libp2p extends EventEmitter { await this._onStarting() await this._onDidStart() log('libp2p has started') - } catch (err) { + } catch (/** @type {any} */ err) { this.emit('error', err) log.error('An error occurred starting libp2p', err) await this.stop() @@ -408,7 +408,7 @@ class Libp2p extends EventEmitter { ping.unmount(this) this.dialer.destroy() - } catch (err) { + } catch (/** @type {any} */ err) { if (err) { log.error(err) this.emit('error', err) @@ -431,7 +431,7 @@ class Libp2p extends EventEmitter { try { await this.keychain.findKeyByName('self') - } catch (err) { + } catch (/** @type {any} */ err) { await this.keychain.importPeer('self', this.peerId) } } @@ -698,7 +698,7 @@ class Libp2p extends EventEmitter { log('connecting to discovered peer %s', peerId.toB58String()) try { await this.dialer.connectToPeer(peerId) - } catch (err) { + } catch (/** @type {any} */ err) { log.error(`could not connect to discovered peer ${peerId.toB58String()} with ${err}`) } } diff --git a/src/insecure/plaintext.js b/src/insecure/plaintext.js index 2ea04583..99921e53 100644 --- a/src/insecure/plaintext.js +++ b/src/insecure/plaintext.js @@ -55,7 +55,7 @@ async function encrypt (localId, conn, remoteId) { let peerId try { peerId = await PeerId.createFromPubKey(id.pubkey.Data) - } catch (err) { + } catch (/** @type {any} */ err) { log.error(err) throw new InvalidCryptoExchangeError('Remote did not provide its public key') } diff --git a/src/keychain/cms.js b/src/keychain/cms.js index 286e75a4..e9361882 100644 --- a/src/keychain/cms.js +++ b/src/keychain/cms.js @@ -90,7 +90,7 @@ class CMS { const obj = forge.asn1.fromDer(buf) // @ts-ignore not defined cms = forge.pkcs7.messageFromAsn1(obj) - } catch (err) { + } catch (/** @type {any} */ err) { throw errcode(new Error('Invalid CMS: ' + err.message), 'ERR_INVALID_CMS') } @@ -114,7 +114,7 @@ class CMS { try { const key = await this.keychain.findKeyById(recipient.keyId) if (key) return true - } catch (err) { + } catch (/** @type {any} */ err) { return false } return false diff --git a/src/keychain/index.js b/src/keychain/index.js index 20d974de..b25be5a8 100644 --- a/src/keychain/index.js +++ b/src/keychain/index.js @@ -248,7 +248,7 @@ class Keychain { batch.put(DsInfoName(name), uint8ArrayFromString(JSON.stringify(keyInfo))) await batch.commit() - } catch (err) { + } catch (/** @type {any} */ err) { return throwDelayed(err) } @@ -284,7 +284,7 @@ class Keychain { try { const keys = await this.listKeys() return keys.find((k) => k.id === id) - } catch (err) { + } catch (/** @type {any} */ err) { return throwDelayed(err) } } @@ -304,7 +304,7 @@ class Keychain { try { const res = await this.store.get(dsname) 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')) } } @@ -365,7 +365,7 @@ class Keychain { batch.delete(oldInfoName) await batch.commit() return keyInfo - } catch (err) { + } catch (/** @type {any} */ err) { return throwDelayed(err) } } @@ -393,7 +393,7 @@ class Keychain { const dek = privates.get(this).dek const privateKey = await crypto.keys.import(pem, dek) return privateKey.export(password) - } catch (err) { + } catch (/** @type {any} */ err) { return throwDelayed(err) } } @@ -421,7 +421,7 @@ class Keychain { let privateKey try { 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')) } @@ -431,7 +431,7 @@ class Keychain { /** @type {string} */ const dek = privates.get(this).dek pem = await privateKey.export(dek) - } catch (err) { + } catch (/** @type {any} */ err) { return throwDelayed(err) } @@ -482,7 +482,7 @@ class Keychain { batch.put(DsInfoName(name), uint8ArrayFromString(JSON.stringify(keyInfo))) await batch.commit() return keyInfo - } catch (err) { + } catch (/** @type {any} */ err) { return throwDelayed(err) } } @@ -502,7 +502,7 @@ class Keychain { const dsname = DsName(name) const res = await this.store.get(dsname) 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')) } } diff --git a/src/nat-manager.js b/src/nat-manager.js index c5e45cec..247401c7 100644 --- a/src/nat-manager.js +++ b/src/nat-manager.js @@ -188,7 +188,7 @@ class NatManager { try { await this._client.destroy() this._client = null - } catch (err) { + } catch (/** @type {any} */ err) { log.error(err) } } diff --git a/src/peer-routing.js b/src/peer-routing.js index aaf06745..bc22f8e4 100644 --- a/src/peer-routing.js +++ b/src/peer-routing.js @@ -79,7 +79,7 @@ class PeerRouting { try { // nb getClosestPeers adds the addresses to the address book await drain(this.getClosestPeers(this._peerId.id)) - } catch (err) { + } catch (/** @type {any} */ err) { log.error(err) } } diff --git a/src/peer-store/address-book.js b/src/peer-store/address-book.js index eda90bdc..4e28eca9 100644 --- a/src/peer-store/address-book.js +++ b/src/peer-store/address-book.js @@ -83,7 +83,7 @@ class AddressBook extends Book { let peerRecord try { peerRecord = PeerRecord.createFromProtobuf(envelope.payload) - } catch (err) { + } catch (/** @type {any} */ err) { log.error('invalid peer record received') return false } diff --git a/src/peer-store/metadata-book.js b/src/peer-store/metadata-book.js index c2769a0a..3eb5b38e 100644 --- a/src/peer-store/metadata-book.js +++ b/src/peer-store/metadata-book.js @@ -80,10 +80,11 @@ class MetadataBook extends Book { /** * Set data into the datastructure * - * @override * @param {PeerId} peerId * @param {string} key * @param {Uint8Array} value + * @param {object} [opts] + * @param {boolean} [opts.emit] */ _setValue (peerId, key, value, { emit = true } = {}) { const id = peerId.toB58String() diff --git a/src/peer-store/persistent/index.js b/src/peer-store/persistent/index.js index 40c81f61..5655d207 100644 --- a/src/peer-store/persistent/index.js +++ b/src/peer-store/persistent/index.js @@ -249,7 +249,7 @@ class PersistentPeerStore extends PeerStore { }).finish() batch.put(key, encodedData) - } catch (err) { + } catch (/** @type {any} */ err) { log.error(err) } } @@ -275,7 +275,7 @@ class PersistentPeerStore extends PeerStore { const encodedData = peerId.marshalPubKey() batch.put(key, encodedData) - } catch (err) { + } catch (/** @type {any} */ err) { log.error(err) } } @@ -302,7 +302,7 @@ class PersistentPeerStore extends PeerStore { batch.delete(key) } }) - } catch (err) { + } catch (/** @type {any} */ err) { log.error(err) } } @@ -330,7 +330,7 @@ class PersistentPeerStore extends PeerStore { const encodedData = Protocols.encode({ protocols }).finish() batch.put(key, encodedData) - } catch (err) { + } catch (/** @type {any} */ err) { log.error(err) } } @@ -399,7 +399,7 @@ class PersistentPeerStore extends PeerStore { default: log('invalid data persisted for: ', key.toString()) } - } catch (err) { + } catch (/** @type {any} */ err) { log.error(err) } } diff --git a/src/pnet/crypto.js b/src/pnet/crypto.js index 6ef946b6..eb9cb223 100644 --- a/src/pnet/crypto.js +++ b/src/pnet/crypto.js @@ -77,7 +77,7 @@ module.exports.decodeV1PSK = (pskBuffer) => { codecName: codec, psk: psk } - } catch (err) { + } catch (/** @type {any} */ err) { log.error(err) throw new Error(Errors.INVALID_PSK) } diff --git a/src/pnet/key-generator.js b/src/pnet/key-generator.js index 4bd3bab9..ad94b140 100644 --- a/src/pnet/key-generator.js +++ b/src/pnet/key-generator.js @@ -28,6 +28,6 @@ try { // @ts-ignore generate(process.stdout) } -} catch (error) { +} catch (/** @type {any} */ error) { } diff --git a/src/transport-manager.js b/src/transport-manager.js index 1993edf8..8a7303ef 100644 --- a/src/transport-manager.js +++ b/src/transport-manager.js @@ -109,7 +109,7 @@ class TransportManager { try { return await transport.dial(ma, options) - } catch (err) { + } catch (/** @type {any} */ err) { if (!err.code) err.code = codes.ERR_TRANSPORT_DIAL_FAILED throw err } diff --git a/src/upgrader.js b/src/upgrader.js index 8ee6c654..8b07be97 100644 --- a/src/upgrader.js +++ b/src/upgrader.js @@ -106,7 +106,7 @@ class Upgrader { } else { upgradedConn = encryptedConn } - } catch (err) { + } catch (/** @type {any} */ err) { log.error('Failed to upgrade inbound connection', err) await maConn.close(err) throw err @@ -181,7 +181,7 @@ class Upgrader { } else { upgradedConn = encryptedConn } - } catch (err) { + } catch (/** @type {any} */ err) { log.error('Failed to upgrade outbound connection', err) await maConn.close(err) throw err @@ -245,7 +245,7 @@ class Upgrader { if (this.metrics) this.metrics.trackStream({ stream, remotePeer, protocol }) connection.addStream(muxedStream, { protocol }) this._onStream({ connection, stream: { ...muxedStream, ...stream }, protocol }) - } catch (err) { + } catch (/** @type {any} */ err) { log.error(err) } }, @@ -263,7 +263,7 @@ class Upgrader { const { stream, protocol } = await mss.select(protocols) if (this.metrics) this.metrics.trackStream({ stream, remotePeer, protocol }) return { stream: { ...muxedStream, ...stream }, protocol } - } catch (err) { + } catch (/** @type {any} */ err) { log.error('could not create new stream', err) throw errCode(err, codes.ERR_UNSUPPORTED_PROTOCOL) } @@ -283,7 +283,7 @@ class Upgrader { if (connection.stat.status === 'open') { await connection.close() } - } catch (err) { + } catch (/** @type {any} */ err) { log.error(err) } finally { this.onConnectionEnd(connection) @@ -371,7 +371,7 @@ class Upgrader { ...await crypto.secureInbound(localPeer, stream), protocol } - } catch (err) { + } catch (/** @type {any} */ err) { throw errCode(err, codes.ERR_ENCRYPTION_FAILED) } } @@ -406,7 +406,7 @@ class Upgrader { ...await crypto.secureOutbound(localPeer, stream, remotePeerId), protocol } - } catch (err) { + } catch (/** @type {any} */ err) { throw errCode(err, codes.ERR_ENCRYPTION_FAILED) } } @@ -430,7 +430,7 @@ class Upgrader { log('%s selected as muxer protocol', protocol) const Muxer = muxers.get(protocol) return { stream, Muxer } - } catch (err) { + } catch (/** @type {any} */ err) { throw errCode(err, codes.ERR_MUXER_UNAVAILABLE) } } @@ -453,7 +453,7 @@ class Upgrader { const { stream, protocol } = await listener.handle(protocols) const Muxer = muxers.get(protocol) return { stream, Muxer } - } catch (err) { + } catch (/** @type {any} */ err) { throw errCode(err, codes.ERR_MUXER_UNAVAILABLE) } } diff --git a/test/content-routing/content-routing.node.js b/test/content-routing/content-routing.node.js index 0a8db15b..7206b199 100644 --- a/test/content-routing/content-routing.node.js +++ b/test/content-routing/content-routing.node.js @@ -34,7 +34,7 @@ describe('content-routing', () => { try { for await (const _ of node.contentRouting.findProviders('a cid')) {} // eslint-disable-line throw new Error('.findProviders should return an error') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err).to.exist() expect(err.code).to.equal('NO_ROUTERS_AVAILABLE') } @@ -238,7 +238,7 @@ describe('content-routing', () => { try { for await (const _ of node.contentRouting.findProviders(cid)) { } // eslint-disable-line throw new Error('should handle errors when finding providers') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err).to.exist() } diff --git a/test/dialing/dial-request.spec.js b/test/dialing/dial-request.spec.js index fd56620a..2c72fb7b 100644 --- a/test/dialing/dial-request.spec.js +++ b/test/dialing/dial-request.spec.js @@ -125,7 +125,7 @@ describe('Dial Request', () => { try { await dialRequest.run({ signal: controller.signal }) expect.fail('Should have thrown') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err).to.be.an.instanceof(AggregateError) } @@ -162,7 +162,7 @@ describe('Dial Request', () => { try { await dialRequest.run({ signal: controller.signal }) expect.fail('Should have thrown') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err).to.be.an.instanceof(AggregateError) } @@ -212,7 +212,7 @@ describe('Dial Request', () => { setTimeout(() => controller.abort(), 100) await dialRequest.run({ signal: controller.signal }) expect.fail('dial should have failed') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err).to.be.an.instanceof(AggregateError) } diff --git a/test/dialing/direct.node.js b/test/dialing/direct.node.js index 57a80084..6db0cb6b 100644 --- a/test/dialing/direct.node.js +++ b/test/dialing/direct.node.js @@ -277,7 +277,7 @@ describe('Dialing (direct, TCP)', () => { try { await libp2p.dial(remoteLibp2p.transportManager.getAddrs()[0]) - } catch (err) { + } catch (/** @type {any} */ err) { expect(err).to.have.property('code', ErrorCodes.ERR_INVALID_MULTIADDR) return } diff --git a/test/dialing/direct.spec.js b/test/dialing/direct.spec.js index 7f56b91d..1617322b 100644 --- a/test/dialing/direct.spec.js +++ b/test/dialing/direct.spec.js @@ -304,7 +304,7 @@ describe('Dialing (direct, WebSockets)', () => { dialer.destroy() await dialPromise expect.fail('should have failed') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err).to.be.an.instanceof(AggregateError) expect(dialer._pendingDials.size).to.equal(0) // 1 dial request } diff --git a/test/keychain/keychain.spec.js b/test/keychain/keychain.spec.js index 032a1b11..0404ebf0 100644 --- a/test/keychain/keychain.spec.js +++ b/test/keychain/keychain.spec.js @@ -519,7 +519,7 @@ describe('keychain', () => { it('should validate newPass is a string', async () => { try { await kc.rotateKeychainPass(oldPass, 1234567890) - } catch (err) { + } catch (/** @type {any} */ err) { expect(err).to.exist() } }) @@ -527,7 +527,7 @@ describe('keychain', () => { it('should validate oldPass is a string', async () => { try { await kc.rotateKeychainPass(1234, 'newInsecurePassword1') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err).to.exist() } }) @@ -535,7 +535,7 @@ describe('keychain', () => { it('should validate newPass is at least 20 characters', async () => { try { await kc.rotateKeychainPass(oldPass, 'not20Chars') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err).to.exist() } }) @@ -586,7 +586,7 @@ describe('libp2p.keychain', () => { try { await libp2p.keychain.createKey('keyName', 'rsa', 2048) - } catch (err) { + } catch (/** @type {any} */ err) { expect(err).to.exist() return } diff --git a/test/peer-routing/peer-routing.node.js b/test/peer-routing/peer-routing.node.js index 9cb9ca0f..fd76ee79 100644 --- a/test/peer-routing/peer-routing.node.js +++ b/test/peer-routing/peer-routing.node.js @@ -43,7 +43,7 @@ describe('peer-routing', () => { try { for await (const _ of node.peerRouting.getClosestPeers('a cid')) { } // eslint-disable-line throw new Error('.getClosestPeers should return an error') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err).to.exist() expect(err.code).to.equal('NO_ROUTERS_AVAILABLE') } @@ -275,7 +275,7 @@ describe('peer-routing', () => { try { for await (const _ of node.peerRouting.getClosestPeers(peerId.id)) { } // eslint-disable-line throw new Error('should handle errors when getting the closest peers') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err).to.exist() } diff --git a/test/peer-store/address-book.spec.js b/test/peer-store/address-book.spec.js index ea71ed0b..929a45fb 100644 --- a/test/peer-store/address-book.spec.js +++ b/test/peer-store/address-book.spec.js @@ -45,7 +45,7 @@ describe('addressBook', () => { it('throwns invalid parameters error if invalid PeerId is provided', () => { try { ab.set('invalid peerId') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } @@ -55,7 +55,7 @@ describe('addressBook', () => { it('throwns invalid parameters error if no addresses provided', () => { try { ab.set(peerId) - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } @@ -65,7 +65,7 @@ describe('addressBook', () => { it('throwns invalid parameters error if invalid multiaddrs are provided', () => { try { ab.set(peerId, ['invalid multiaddr']) - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } @@ -159,7 +159,7 @@ describe('addressBook', () => { it('throwns invalid parameters error if invalid PeerId is provided', () => { try { ab.add('invalid peerId') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } @@ -169,7 +169,7 @@ describe('addressBook', () => { it('throwns invalid parameters error if no addresses provided', () => { try { ab.add(peerId) - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } @@ -179,7 +179,7 @@ describe('addressBook', () => { it('throwns invalid parameters error if invalid multiaddrs are provided', () => { try { ab.add(peerId, ['invalid multiaddr']) - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } @@ -308,7 +308,7 @@ describe('addressBook', () => { it('throwns invalid parameters error if invalid PeerId is provided', () => { try { ab.get('invalid peerId') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } @@ -343,7 +343,7 @@ describe('addressBook', () => { it('throwns invalid parameters error if invalid PeerId is provided', () => { try { ab.getMultiaddrsForPeer('invalid peerId') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } @@ -391,7 +391,7 @@ describe('addressBook', () => { it('throwns invalid parameters error if invalid PeerId is provided', () => { try { ab.delete('invalid peerId') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } diff --git a/test/peer-store/key-book.spec.js b/test/peer-store/key-book.spec.js index 4e06ea2f..8c439a90 100644 --- a/test/peer-store/key-book.spec.js +++ b/test/peer-store/key-book.spec.js @@ -23,7 +23,7 @@ describe('keyBook', () => { it('throws invalid parameters error if invalid PeerId is provided in set', () => { try { kb.set('invalid peerId') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } @@ -33,7 +33,7 @@ describe('keyBook', () => { it('throws invalid parameters error if invalid PeerId is provided in get', () => { try { kb.get('invalid peerId') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } diff --git a/test/peer-store/metadata-book.spec.js b/test/peer-store/metadata-book.spec.js index a1b0d2a1..478dfff5 100644 --- a/test/peer-store/metadata-book.spec.js +++ b/test/peer-store/metadata-book.spec.js @@ -34,7 +34,7 @@ describe('metadataBook', () => { it('throws invalid parameters error if invalid PeerId is provided', () => { try { mb.set('invalid peerId') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } @@ -44,7 +44,7 @@ describe('metadataBook', () => { it('throws invalid parameters error if no key provided', () => { try { mb.set(peerId) - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } @@ -54,7 +54,7 @@ describe('metadataBook', () => { it('throws invalid parameters error if no value provided', () => { try { mb.set(peerId, 'location') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } @@ -64,7 +64,7 @@ describe('metadataBook', () => { it('throws invalid parameters error if value is not a buffer', () => { try { mb.set(peerId, 'location', 'mars') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } @@ -163,7 +163,7 @@ describe('metadataBook', () => { it('throws invalid parameters error if invalid PeerId is provided', () => { try { mb.get('invalid peerId') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } @@ -199,7 +199,7 @@ describe('metadataBook', () => { it('throws invalid parameters error if invalid PeerId is provided', () => { try { mb.getValue('invalid peerId') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } @@ -248,7 +248,7 @@ describe('metadataBook', () => { it('throwns invalid parameters error if invalid PeerId is provided', () => { try { mb.delete('invalid peerId') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } @@ -305,7 +305,7 @@ describe('metadataBook', () => { it('throws invalid parameters error if invalid PeerId is provided', () => { try { mb.deleteValue('invalid peerId') - } catch (err) { + } catch (/** @type {any} */ err) { expect(err.code).to.equal(ERR_INVALID_PARAMETERS) return } diff --git a/test/transports/transport-manager.spec.js b/test/transports/transport-manager.spec.js index 1fb5be1e..23006cdd 100644 --- a/test/transports/transport-manager.spec.js +++ b/test/transports/transport-manager.spec.js @@ -201,7 +201,7 @@ describe('libp2p.transportManager (dial only)', () => { try { await libp2p.start() - } catch (err) { + } catch (/** @type {any} */ err) { expect(err).to.exist() expect(err.code).to.equal(ErrorCodes.ERR_NO_VALID_ADDRESSES) return diff --git a/test/utils/mockConnection.js b/test/utils/mockConnection.js index 66c659fb..6c1439aa 100644 --- a/test/utils/mockConnection.js +++ b/test/utils/mockConnection.js @@ -108,7 +108,7 @@ function createConnection ({ // Need to be able to notify a peer of this this._onStream({ connection, stream, protocol }) const handler = protocols.get(protocol) handler({ connection, stream, protocol }) - } catch (err) { + } catch (/** @type {any} */ err) { // Do nothing } }, @@ -124,7 +124,7 @@ function createConnection ({ try { const { stream, protocol } = await mss.select(protocols) return { stream: { ...muxedStream, ...stream }, protocol } - } catch (err) { + } catch (/** @type {any} */ err) { throw errCode(err, codes.ERR_UNSUPPORTED_PROTOCOL) } }