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

Commit a5ed24c

Browse files
achingbrainachingbrain
authored
chore: change error type (#236)
Recent typescript has changed the default error type from `any` to `unknown` so we have to explicitly change it back to `any`.
1 parent 8490ece commit a5ed24c

File tree

19 files changed

+32
-32
lines changed

19 files changed

+32
-32
lines changed

‎src/content-fetching/index.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ module.exports = (dht) => {
6666
if (dht._isSelf(v.from)) {
6767
try {
6868
await dht._putLocal(key, fixupRec)
69-
} catch (err) {
69+
} catch (/** @type {any} */ err) {
7070
dht._log.error('Failed error correcting self', err)
7171
}
7272
return
@@ -75,7 +75,7 @@ module.exports = (dht) => {
7575
// send correction
7676
try {
7777
await dht._putValueToPeer(key, fixupRec, v.from)
78-
} catch (err) {
78+
} catch (/** @type {any} */ err) {
7979
dht._log.error('Failed error correcting entry', err)
8080
}
8181
}))
@@ -118,7 +118,7 @@ module.exports = (dht) => {
118118
counterAll += 1
119119
await dht._putValueToPeer(key, record, peer)
120120
counterSuccess += 1
121-
} catch (err) {
121+
} catch (/** @type {any} */ err) {
122122
dht._log.error('Failed to put to peer (%b): %s', peer.id, err)
123123
}
124124
})
@@ -152,7 +152,7 @@ module.exports = (dht) => {
152152

153153
try {
154154
i = libp2pRecord.selection.bestRecord(dht.selectors, key, recs)
155-
} catch (err) {
155+
} catch (/** @type {any} */ err) {
156156
// Assume the first record if no selector available
157157
if (err.code !== 'ERR_NO_SELECTOR_FUNCTION_FOR_RECORD_KEY') {
158158
throw err
@@ -189,7 +189,7 @@ module.exports = (dht) => {
189189

190190
try {
191191
localRec = await getLocal(key)
192-
} catch (err) {
192+
} catch (/** @type {any} */ err) {
193193
if (nvals === 0) {
194194
throw err
195195
}
@@ -243,7 +243,7 @@ module.exports = (dht) => {
243243
const results = await dht._getValueOrPeers(peer, key)
244244
rec = results.record
245245
peers = results.peers
246-
} catch (err) {
246+
} catch (/** @type {any} */ err) {
247247
// If we have an invalid record we just want to continue and fetch a new one.
248248
if (err.code !== 'ERR_INVALID_RECORD') {
249249
throw err
@@ -288,7 +288,7 @@ module.exports = (dht) => {
288288

289289
try {
290290
await pTimeout(query.run(rtp), options.timeout)
291-
} catch (err) {
291+
} catch (/** @type {any} */ err) {
292292
if (vals.length === 0) {
293293
throw err
294294
}

‎src/content-routing/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ module.exports = (dht) => {
6161
dht._log(`putProvider ${key} to ${peer.toB58String()}`)
6262
try {
6363
await dht.network.sendMessage(peer, msg)
64-
} catch (err) {
64+
} catch (/** @type {any} */ err) {
6565
errors.push(err)
6666
}
6767
}
@@ -175,7 +175,7 @@ module.exports = (dht) => {
175175
query.run(peers),
176176
providerTimeout
177177
)
178-
} catch (err) {
178+
} catch (/** @type {any} */ err) {
179179
if (err.name !== pTimeout.TimeoutError.name) {
180180
throw err
181181
}

‎src/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ class KadDHT extends EventEmitter {
288288

289289
try {
290290
await this.datastore.delete(dsKey)
291-
} catch (err) {
291+
} catch (/** @type {any} */ err) {
292292
if (err.code === 'ERR_NOT_FOUND') {
293293
return undefined
294294
}
@@ -443,7 +443,7 @@ class KadDHT extends EventEmitter {
443443
let rawRecord
444444
try {
445445
rawRecord = await this.datastore.get(dsKey)
446-
} catch (err) {
446+
} catch (/** @type {any} */ err) {
447447
if (err.code === 'ERR_NOT_FOUND') {
448448
return undefined
449449
}
@@ -536,7 +536,7 @@ class KadDHT extends EventEmitter {
536536
// We have a record
537537
try {
538538
await this._verifyRecordOnline(record)
539-
} catch (err) {
539+
} catch (/** @type {any} */ err) {
540540
const errMsg = 'invalid record received, discarded'
541541
this._log(errMsg)
542542
throw errcode(new Error(errMsg), 'ERR_INVALID_RECORD')

‎src/peer-routing/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ module.exports = (dht) => {
282282

283283
try {
284284
pk = await getPublicKeyFromNode(peer)
285-
} catch (err) {
285+
} catch (/** @type {any} */ err) {
286286
// try dht directly
287287
const pkKey = utils.keyForPublicKey(peer)
288288
const value = await dht.get(pkKey)

‎src/providers.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class Providers {
128128
deleted.set(cid, peers)
129129
}
130130
count++
131-
} catch (err) {
131+
} catch (/** @type {any} */ err) {
132132
this._log.error(err.message)
133133
}
134134
}

‎src/query/worker-queue.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ class WorkerQueue {
167167
let continueQuerying, continueQueryingError
168168
try {
169169
continueQuerying = await this.run.continueQuerying(this)
170-
} catch (err) {
170+
} catch (/** @type {any} */ err) {
171171
continueQueryingError = err
172172
}
173173

@@ -199,7 +199,7 @@ class WorkerQueue {
199199
let state, execError
200200
try {
201201
state = await this.execQuery(peer)
202-
} catch (err) {
202+
} catch (/** @type {any} */ err) {
203203
execError = err
204204
}
205205

@@ -239,7 +239,7 @@ class WorkerQueue {
239239
let res, queryError
240240
try {
241241
res = await this.path.queryFunc(peer)
242-
} catch (err) {
242+
} catch (/** @type {any} */ err) {
243243
queryError = err
244244
}
245245

‎src/routing-table/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,12 @@ class RoutingTable {
130130
for (let n = index + 1; n < lastCpl + 1; n++) {
131131
try {
132132
await this._refreshCommonPrefixLength(n, lastRefresh, force === true)
133-
} catch (err) {
133+
} catch (/** @type {any} */ err) {
134134
log.error(err)
135135
}
136136
}
137137
}
138-
} catch (err) {
138+
} catch (/** @type {any} */ err) {
139139
log.error(err)
140140
}
141141
})

‎src/rpc/handlers/add-provider.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ module.exports = (dht) => {
3232
let cid
3333
try {
3434
cid = CID.decode(msg.key)
35-
} catch (err) {
35+
} catch (/** @type {any} */ err) {
3636
const errMsg = `Invalid CID: ${err.message}`
3737
throw errcode(new Error(errMsg), 'ERR_INVALID_CID')
3838
}

‎src/rpc/handlers/get-providers.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ module.exports = (dht) => {
2626
let cid
2727
try {
2828
cid = CID.decode(msg.key)
29-
} catch (err) {
29+
} catch (/** @type {any} */ err) {
3030
throw errcode(new Error(`Invalid CID: ${err.message}`), 'ERR_INVALID_CID')
3131
}
3232

‎src/rpc/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = (dht) => {
3131

3232
try {
3333
await dht._add(peerId)
34-
} catch (err) {
34+
} catch (/** @type {any} */ err) {
3535
log.error('Failed to update the kbucket store', err)
3636
}
3737

@@ -55,7 +55,7 @@ module.exports = (dht) => {
5555

5656
try {
5757
await dht._add(peerId)
58-
} catch (err) {
58+
} catch (/** @type {any} */ err) {
5959
log.error(err)
6060
}
6161

0 commit comments

Comments
 (0)