Skip to content

Commit c330fd5

Browse files
tabcattabcat
authored
chore: replace err-code with CodeError (#172)
Replaces [err-code](https://github.com/IndigoUnited/js-err-code/blob/master/index.js) with [CodeError](libp2p/js-libp2p-interfaces#314) Related: #1269 Changes - removes err-code from dependencies - adds @libp2p/[email protected] to dependencies - uses CodeError in place of err-code
1 parent 367f912 commit c330fd5

File tree

4 files changed

+64
-64
lines changed

4 files changed

+64
-64
lines changed

‎packages/libp2p-daemon-client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,11 @@
138138
"@libp2p/interface-peer-id": "^2.0.0",
139139
"@libp2p/interface-peer-info": "^1.0.1",
140140
"@libp2p/interface-transport": "^2.0.0",
141+
"@libp2p/interfaces": "^3.2.0",
141142
"@libp2p/logger": "^2.0.0",
142143
"@libp2p/peer-id": "^2.0.0",
143144
"@libp2p/tcp": "^6.0.8",
144145
"@multiformats/multiaddr": "^11.0.0",
145-
"err-code": "^3.0.1",
146146
"it-stream-types": "^1.0.4",
147147
"multiformats": "^11.0.0",
148148
"uint8arraylist": "^2.3.2"

‎packages/libp2p-daemon-client/src/dht.ts

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { CID } from 'multiformats/cid'
22
import { multiaddr } from '@multiformats/multiaddr'
3-
import errcode from 'err-code'
3+
import { CodeError } from '@libp2p/interfaces/errors'
44
import {
55
Request,
66
Response,
@@ -24,11 +24,11 @@ export class DHT {
2424
*/
2525
async put (key: Uint8Array, value: Uint8Array): Promise<void> {
2626
if (!(key instanceof Uint8Array)) {
27-
throw errcode(new Error('invalid key received'), 'ERR_INVALID_KEY')
27+
throw new CodeError('invalid key received', 'ERR_INVALID_KEY')
2828
}
2929

3030
if (!(value instanceof Uint8Array)) {
31-
throw errcode(new Error('value received is not a Uint8Array'), 'ERR_INVALID_VALUE')
31+
throw new CodeError('value received is not a Uint8Array', 'ERR_INVALID_VALUE')
3232
}
3333

3434
const sh = await this.client.send({
@@ -43,15 +43,15 @@ export class DHT {
4343
const message = await sh.read()
4444

4545
if (message == null) {
46-
throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE')
46+
throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE')
4747
}
4848

4949
const response = Response.decode(message)
5050

5151
await sh.close()
5252

5353
if (response.type !== Response.Type.OK) {
54-
throw errcode(new Error(response.error?.msg ?? 'DHT put failed'), 'ERR_DHT_PUT_FAILED')
54+
throw new CodeError(response.error?.msg ?? 'DHT put failed', 'ERR_DHT_PUT_FAILED')
5555
}
5656
}
5757

@@ -60,7 +60,7 @@ export class DHT {
6060
*/
6161
async get (key: Uint8Array): Promise<Uint8Array> {
6262
if (!(key instanceof Uint8Array)) {
63-
throw errcode(new Error('invalid key received'), 'ERR_INVALID_KEY')
63+
throw new CodeError('invalid key received', 'ERR_INVALID_KEY')
6464
}
6565

6666
const sh = await this.client.send({
@@ -74,19 +74,19 @@ export class DHT {
7474
const message = await sh.read()
7575

7676
if (message == null) {
77-
throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE')
77+
throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE')
7878
}
7979

8080
const response = Response.decode(message)
8181

8282
await sh.close()
8383

8484
if (response.type !== Response.Type.OK) {
85-
throw errcode(new Error(response.error?.msg ?? 'DHT get failed'), 'ERR_DHT_GET_FAILED')
85+
throw new CodeError(response.error?.msg ?? 'DHT get failed', 'ERR_DHT_GET_FAILED')
8686
}
8787

8888
if (response.dht == null || response.dht.value == null) {
89-
throw errcode(new Error('Invalid DHT get response'), 'ERR_DHT_GET_FAILED')
89+
throw new CodeError('Invalid DHT get response', 'ERR_DHT_GET_FAILED')
9090
}
9191

9292
return response.dht.value
@@ -97,7 +97,7 @@ export class DHT {
9797
*/
9898
async findPeer (peerId: PeerId): Promise<PeerInfo> {
9999
if (!isPeerId(peerId)) {
100-
throw errcode(new Error('invalid peer id received'), 'ERR_INVALID_PEER_ID')
100+
throw new CodeError('invalid peer id received', 'ERR_INVALID_PEER_ID')
101101
}
102102

103103
const sh = await this.client.send({
@@ -111,19 +111,19 @@ export class DHT {
111111
const message = await sh.read()
112112

113113
if (message == null) {
114-
throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE')
114+
throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE')
115115
}
116116

117117
const response = Response.decode(message)
118118

119119
await sh.close()
120120

121121
if (response.type !== Response.Type.OK) {
122-
throw errcode(new Error(response.error?.msg ?? 'DHT find peer failed'), 'ERR_DHT_FIND_PEER_FAILED')
122+
throw new CodeError(response.error?.msg ?? 'DHT find peer failed', 'ERR_DHT_FIND_PEER_FAILED')
123123
}
124124

125125
if (response.dht == null || response.dht.peer == null || response.dht.peer.addrs == null) {
126-
throw errcode(new Error('Invalid response'), 'ERR_DHT_FIND_PEER_FAILED')
126+
throw new CodeError('Invalid response', 'ERR_DHT_FIND_PEER_FAILED')
127127
}
128128

129129
return {
@@ -138,7 +138,7 @@ export class DHT {
138138
*/
139139
async provide (cid: CID) {
140140
if (cid == null || CID.asCID(cid) == null) {
141-
throw errcode(new Error('invalid cid received'), 'ERR_INVALID_CID')
141+
throw new CodeError('invalid cid received', 'ERR_INVALID_CID')
142142
}
143143

144144
const sh = await this.client.send({
@@ -152,15 +152,15 @@ export class DHT {
152152
const message = await sh.read()
153153

154154
if (message == null) {
155-
throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE')
155+
throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE')
156156
}
157157

158158
const response = Response.decode(message)
159159

160160
await sh.close()
161161

162162
if (response.type !== Response.Type.OK) {
163-
throw errcode(new Error(response.error?.msg ?? 'DHT provide failed'), 'ERR_DHT_PROVIDE_FAILED')
163+
throw new CodeError(response.error?.msg ?? 'DHT provide failed', 'ERR_DHT_PROVIDE_FAILED')
164164
}
165165
}
166166

@@ -169,7 +169,7 @@ export class DHT {
169169
*/
170170
async * findProviders (cid: CID, count: number = 1): AsyncIterable<PeerInfo> {
171171
if (cid == null || CID.asCID(cid) == null) {
172-
throw errcode(new Error('invalid cid received'), 'ERR_INVALID_CID')
172+
throw new CodeError('invalid cid received', 'ERR_INVALID_CID')
173173
}
174174

175175
const sh = await this.client.send({
@@ -184,22 +184,22 @@ export class DHT {
184184
let message = await sh.read()
185185

186186
if (message == null) {
187-
throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE')
187+
throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE')
188188
}
189189

190190
// stream begin message
191191
const response = Response.decode(message)
192192

193193
if (response.type !== Response.Type.OK) {
194194
await sh.close()
195-
throw errcode(new Error(response.error?.msg ?? 'DHT find providers failed'), 'ERR_DHT_FIND_PROVIDERS_FAILED')
195+
throw new CodeError(response.error?.msg ?? 'DHT find providers failed', 'ERR_DHT_FIND_PROVIDERS_FAILED')
196196
}
197197

198198
while (true) {
199199
message = await sh.read()
200200

201201
if (message == null) {
202-
throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE')
202+
throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE')
203203
}
204204

205205
const response = DHTResponse.decode(message)
@@ -220,7 +220,7 @@ export class DHT {
220220
} else {
221221
// Unexpected message received
222222
await sh.close()
223-
throw errcode(new Error('unexpected message received'), 'ERR_UNEXPECTED_MESSAGE_RECEIVED')
223+
throw new CodeError('unexpected message received', 'ERR_UNEXPECTED_MESSAGE_RECEIVED')
224224
}
225225
}
226226
}
@@ -230,7 +230,7 @@ export class DHT {
230230
*/
231231
async * getClosestPeers (key: Uint8Array): AsyncIterable<PeerInfo> {
232232
if (!(key instanceof Uint8Array)) {
233-
throw errcode(new Error('invalid key received'), 'ERR_INVALID_KEY')
233+
throw new CodeError('invalid key received', 'ERR_INVALID_KEY')
234234
}
235235

236236
const sh = await this.client.send({
@@ -245,21 +245,21 @@ export class DHT {
245245
let message = await sh.read()
246246

247247
if (message == null) {
248-
throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE')
248+
throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE')
249249
}
250250

251251
const response = Response.decode(message)
252252

253253
if (response.type !== Response.Type.OK) {
254254
await sh.close()
255-
throw errcode(new Error(response.error?.msg ?? 'DHT find providers failed'), 'ERR_DHT_FIND_PROVIDERS_FAILED')
255+
throw new CodeError(response.error?.msg ?? 'DHT find providers failed', 'ERR_DHT_FIND_PROVIDERS_FAILED')
256256
}
257257

258258
while (true) {
259259
message = await sh.read()
260260

261261
if (message == null) {
262-
throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE')
262+
throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE')
263263
}
264264

265265
const response = DHTResponse.decode(message)
@@ -282,7 +282,7 @@ export class DHT {
282282
} else {
283283
// Unexpected message received
284284
await sh.close()
285-
throw errcode(new Error('unexpected message received'), 'ERR_UNEXPECTED_MESSAGE_RECEIVED')
285+
throw new CodeError('unexpected message received', 'ERR_UNEXPECTED_MESSAGE_RECEIVED')
286286
}
287287
}
288288
}
@@ -292,7 +292,7 @@ export class DHT {
292292
*/
293293
async getPublicKey (peerId: PeerId) {
294294
if (!isPeerId(peerId)) {
295-
throw errcode(new Error('invalid peer id received'), 'ERR_INVALID_PEER_ID')
295+
throw new CodeError('invalid peer id received', 'ERR_INVALID_PEER_ID')
296296
}
297297

298298
const sh = await this.client.send({
@@ -306,19 +306,19 @@ export class DHT {
306306
const message = await sh.read()
307307

308308
if (message == null) {
309-
throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE')
309+
throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE')
310310
}
311311

312312
const response = Response.decode(message)
313313

314314
await sh.close()
315315

316316
if (response.type !== Response.Type.OK) {
317-
throw errcode(new Error(response.error?.msg ?? 'DHT get public key failed'), 'ERR_DHT_GET_PUBLIC_KEY_FAILED')
317+
throw new CodeError(response.error?.msg ?? 'DHT get public key failed', 'ERR_DHT_GET_PUBLIC_KEY_FAILED')
318318
}
319319

320320
if (response.dht == null) {
321-
throw errcode(new Error('Invalid response'), 'ERR_DHT_GET_PUBLIC_KEY_FAILED')
321+
throw new CodeError('Invalid response', 'ERR_DHT_GET_PUBLIC_KEY_FAILED')
322322
}
323323

324324
return response.dht.value

0 commit comments

Comments
 (0)