From bc9f8f0d1a31e422635e891eb3874a2e772178ec Mon Sep 17 00:00:00 2001 From: tabcat Date: Sun, 8 Jan 2023 20:16:52 -0600 Subject: [PATCH] chore: replace err-code with CodeError Replaces [err-code](https://github.com/IndigoUnited/js-err-code/blob/master/index.js) with [CodeError](https://github.com/libp2p/js-libp2p-interfaces/pull/314) Related: #1269 Changes - removes err-code from dependencies - adds @libp2p/interfaces@3.2.0 to dependencies - uses CodeError in place of err-code --- packages/libp2p-daemon-client/package.json | 2 +- packages/libp2p-daemon-client/src/dht.ts | 60 ++++++++++----------- packages/libp2p-daemon-client/src/index.ts | 42 +++++++-------- packages/libp2p-daemon-client/src/pubsub.ts | 24 ++++----- 4 files changed, 64 insertions(+), 64 deletions(-) diff --git a/packages/libp2p-daemon-client/package.json b/packages/libp2p-daemon-client/package.json index 16f8d856..5341e83a 100644 --- a/packages/libp2p-daemon-client/package.json +++ b/packages/libp2p-daemon-client/package.json @@ -138,11 +138,11 @@ "@libp2p/interface-peer-id": "^2.0.0", "@libp2p/interface-peer-info": "^1.0.1", "@libp2p/interface-transport": "^2.0.0", + "@libp2p/interfaces": "^3.2.0", "@libp2p/logger": "^2.0.0", "@libp2p/peer-id": "^2.0.0", "@libp2p/tcp": "^6.0.8", "@multiformats/multiaddr": "^11.0.0", - "err-code": "^3.0.1", "it-stream-types": "^1.0.4", "multiformats": "^11.0.0", "uint8arraylist": "^2.3.2" diff --git a/packages/libp2p-daemon-client/src/dht.ts b/packages/libp2p-daemon-client/src/dht.ts index e9e2fa5c..b2943a1a 100644 --- a/packages/libp2p-daemon-client/src/dht.ts +++ b/packages/libp2p-daemon-client/src/dht.ts @@ -1,6 +1,6 @@ import { CID } from 'multiformats/cid' import { multiaddr } from '@multiformats/multiaddr' -import errcode from 'err-code' +import { CodeError } from '@libp2p/interfaces/errors' import { Request, Response, @@ -24,11 +24,11 @@ export class DHT { */ async put (key: Uint8Array, value: Uint8Array): Promise { if (!(key instanceof Uint8Array)) { - throw errcode(new Error('invalid key received'), 'ERR_INVALID_KEY') + throw new CodeError('invalid key received', 'ERR_INVALID_KEY') } if (!(value instanceof Uint8Array)) { - throw errcode(new Error('value received is not a Uint8Array'), 'ERR_INVALID_VALUE') + throw new CodeError('value received is not a Uint8Array', 'ERR_INVALID_VALUE') } const sh = await this.client.send({ @@ -43,7 +43,7 @@ export class DHT { const message = await sh.read() if (message == null) { - throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE') + throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE') } const response = Response.decode(message) @@ -51,7 +51,7 @@ export class DHT { await sh.close() if (response.type !== Response.Type.OK) { - throw errcode(new Error(response.error?.msg ?? 'DHT put failed'), 'ERR_DHT_PUT_FAILED') + throw new CodeError(response.error?.msg ?? 'DHT put failed', 'ERR_DHT_PUT_FAILED') } } @@ -60,7 +60,7 @@ export class DHT { */ async get (key: Uint8Array): Promise { if (!(key instanceof Uint8Array)) { - throw errcode(new Error('invalid key received'), 'ERR_INVALID_KEY') + throw new CodeError('invalid key received', 'ERR_INVALID_KEY') } const sh = await this.client.send({ @@ -74,7 +74,7 @@ export class DHT { const message = await sh.read() if (message == null) { - throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE') + throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE') } const response = Response.decode(message) @@ -82,11 +82,11 @@ export class DHT { await sh.close() if (response.type !== Response.Type.OK) { - throw errcode(new Error(response.error?.msg ?? 'DHT get failed'), 'ERR_DHT_GET_FAILED') + throw new CodeError(response.error?.msg ?? 'DHT get failed', 'ERR_DHT_GET_FAILED') } if (response.dht == null || response.dht.value == null) { - throw errcode(new Error('Invalid DHT get response'), 'ERR_DHT_GET_FAILED') + throw new CodeError('Invalid DHT get response', 'ERR_DHT_GET_FAILED') } return response.dht.value @@ -97,7 +97,7 @@ export class DHT { */ async findPeer (peerId: PeerId): Promise { if (!isPeerId(peerId)) { - throw errcode(new Error('invalid peer id received'), 'ERR_INVALID_PEER_ID') + throw new CodeError('invalid peer id received', 'ERR_INVALID_PEER_ID') } const sh = await this.client.send({ @@ -111,7 +111,7 @@ export class DHT { const message = await sh.read() if (message == null) { - throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE') + throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE') } const response = Response.decode(message) @@ -119,11 +119,11 @@ export class DHT { await sh.close() if (response.type !== Response.Type.OK) { - throw errcode(new Error(response.error?.msg ?? 'DHT find peer failed'), 'ERR_DHT_FIND_PEER_FAILED') + throw new CodeError(response.error?.msg ?? 'DHT find peer failed', 'ERR_DHT_FIND_PEER_FAILED') } if (response.dht == null || response.dht.peer == null || response.dht.peer.addrs == null) { - throw errcode(new Error('Invalid response'), 'ERR_DHT_FIND_PEER_FAILED') + throw new CodeError('Invalid response', 'ERR_DHT_FIND_PEER_FAILED') } return { @@ -138,7 +138,7 @@ export class DHT { */ async provide (cid: CID) { if (cid == null || CID.asCID(cid) == null) { - throw errcode(new Error('invalid cid received'), 'ERR_INVALID_CID') + throw new CodeError('invalid cid received', 'ERR_INVALID_CID') } const sh = await this.client.send({ @@ -152,7 +152,7 @@ export class DHT { const message = await sh.read() if (message == null) { - throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE') + throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE') } const response = Response.decode(message) @@ -160,7 +160,7 @@ export class DHT { await sh.close() if (response.type !== Response.Type.OK) { - throw errcode(new Error(response.error?.msg ?? 'DHT provide failed'), 'ERR_DHT_PROVIDE_FAILED') + throw new CodeError(response.error?.msg ?? 'DHT provide failed', 'ERR_DHT_PROVIDE_FAILED') } } @@ -169,7 +169,7 @@ export class DHT { */ async * findProviders (cid: CID, count: number = 1): AsyncIterable { if (cid == null || CID.asCID(cid) == null) { - throw errcode(new Error('invalid cid received'), 'ERR_INVALID_CID') + throw new CodeError('invalid cid received', 'ERR_INVALID_CID') } const sh = await this.client.send({ @@ -184,7 +184,7 @@ export class DHT { let message = await sh.read() if (message == null) { - throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE') + throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE') } // stream begin message @@ -192,14 +192,14 @@ export class DHT { if (response.type !== Response.Type.OK) { await sh.close() - throw errcode(new Error(response.error?.msg ?? 'DHT find providers failed'), 'ERR_DHT_FIND_PROVIDERS_FAILED') + throw new CodeError(response.error?.msg ?? 'DHT find providers failed', 'ERR_DHT_FIND_PROVIDERS_FAILED') } while (true) { message = await sh.read() if (message == null) { - throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE') + throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE') } const response = DHTResponse.decode(message) @@ -220,7 +220,7 @@ export class DHT { } else { // Unexpected message received await sh.close() - throw errcode(new Error('unexpected message received'), 'ERR_UNEXPECTED_MESSAGE_RECEIVED') + throw new CodeError('unexpected message received', 'ERR_UNEXPECTED_MESSAGE_RECEIVED') } } } @@ -230,7 +230,7 @@ export class DHT { */ async * getClosestPeers (key: Uint8Array): AsyncIterable { if (!(key instanceof Uint8Array)) { - throw errcode(new Error('invalid key received'), 'ERR_INVALID_KEY') + throw new CodeError('invalid key received', 'ERR_INVALID_KEY') } const sh = await this.client.send({ @@ -245,21 +245,21 @@ export class DHT { let message = await sh.read() if (message == null) { - throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE') + throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE') } const response = Response.decode(message) if (response.type !== Response.Type.OK) { await sh.close() - throw errcode(new Error(response.error?.msg ?? 'DHT find providers failed'), 'ERR_DHT_FIND_PROVIDERS_FAILED') + throw new CodeError(response.error?.msg ?? 'DHT find providers failed', 'ERR_DHT_FIND_PROVIDERS_FAILED') } while (true) { message = await sh.read() if (message == null) { - throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE') + throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE') } const response = DHTResponse.decode(message) @@ -282,7 +282,7 @@ export class DHT { } else { // Unexpected message received await sh.close() - throw errcode(new Error('unexpected message received'), 'ERR_UNEXPECTED_MESSAGE_RECEIVED') + throw new CodeError('unexpected message received', 'ERR_UNEXPECTED_MESSAGE_RECEIVED') } } } @@ -292,7 +292,7 @@ export class DHT { */ async getPublicKey (peerId: PeerId) { if (!isPeerId(peerId)) { - throw errcode(new Error('invalid peer id received'), 'ERR_INVALID_PEER_ID') + throw new CodeError('invalid peer id received', 'ERR_INVALID_PEER_ID') } const sh = await this.client.send({ @@ -306,7 +306,7 @@ export class DHT { const message = await sh.read() if (message == null) { - throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE') + throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE') } const response = Response.decode(message) @@ -314,11 +314,11 @@ export class DHT { await sh.close() if (response.type !== Response.Type.OK) { - throw errcode(new Error(response.error?.msg ?? 'DHT get public key failed'), 'ERR_DHT_GET_PUBLIC_KEY_FAILED') + throw new CodeError(response.error?.msg ?? 'DHT get public key failed', 'ERR_DHT_GET_PUBLIC_KEY_FAILED') } if (response.dht == null) { - throw errcode(new Error('Invalid response'), 'ERR_DHT_GET_PUBLIC_KEY_FAILED') + throw new CodeError('Invalid response', 'ERR_DHT_GET_PUBLIC_KEY_FAILED') } return response.dht.value diff --git a/packages/libp2p-daemon-client/src/index.ts b/packages/libp2p-daemon-client/src/index.ts index 7f67c033..c6f55e03 100644 --- a/packages/libp2p-daemon-client/src/index.ts +++ b/packages/libp2p-daemon-client/src/index.ts @@ -1,4 +1,4 @@ -import errcode from 'err-code' +import { CodeError } from '@libp2p/interfaces/errors' import { tcp } from '@libp2p/tcp' import { PSMessage, Request, Response, StreamInfo } from '@libp2p/daemon-protocol' import { StreamHandler } from '@libp2p/daemon-protocol/stream-handler' @@ -64,16 +64,16 @@ class Client implements DaemonClient { */ async connect (peerId: PeerId, addrs: Multiaddr[]) { if (!isPeerId(peerId)) { - throw errcode(new Error('invalid peer id received'), 'ERR_INVALID_PEER_ID') + throw new CodeError('invalid peer id received', 'ERR_INVALID_PEER_ID') } if (!Array.isArray(addrs)) { - throw errcode(new Error('addrs received are not in an array'), 'ERR_INVALID_ADDRS_TYPE') + throw new CodeError('addrs received are not in an array', 'ERR_INVALID_ADDRS_TYPE') } addrs.forEach((addr) => { if (!isMultiaddr(addr)) { - throw errcode(new Error('received an address that is not a multiaddr'), 'ERR_NO_MULTIADDR_RECEIVED') + throw new CodeError('received an address that is not a multiaddr', 'ERR_NO_MULTIADDR_RECEIVED') } }) @@ -87,13 +87,13 @@ class Client implements DaemonClient { const message = await sh.read() if (message == null) { - throw errcode(new Error('unspecified'), 'ERR_CONNECT_FAILED') + throw new CodeError('unspecified', 'ERR_CONNECT_FAILED') } const response = Response.decode(message) if (response.type !== Response.Type.OK) { const errResponse = response.error ?? { msg: 'unspecified' } - throw errcode(new Error(errResponse.msg ?? 'unspecified'), 'ERR_CONNECT_FAILED') + throw new CodeError(errResponse.msg ?? 'unspecified', 'ERR_CONNECT_FAILED') } await sh.close() @@ -116,17 +116,17 @@ class Client implements DaemonClient { const message = await sh.read() if (message == null) { - throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE') + throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE') } const response = Response.decode(message) if (response.type !== Response.Type.OK) { - throw errcode(new Error(response.error?.msg ?? 'Identify failed'), 'ERR_IDENTIFY_FAILED') + throw new CodeError(response.error?.msg ?? 'Identify failed', 'ERR_IDENTIFY_FAILED') } if (response.identify == null || response.identify.addrs == null) { - throw errcode(new Error('Invalid response'), 'ERR_IDENTIFY_FAILED') + throw new CodeError('Invalid response', 'ERR_IDENTIFY_FAILED') } const peerId = peerIdFromBytes(response.identify?.id) @@ -148,13 +148,13 @@ class Client implements DaemonClient { const message = await sh.read() if (message == null) { - throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE') + throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE') } const response = Response.decode(message) if (response.type !== Response.Type.OK) { - throw errcode(new Error(response.error?.msg ?? 'List peers failed'), 'ERR_LIST_PEERS_FAILED') + throw new CodeError(response.error?.msg ?? 'List peers failed', 'ERR_LIST_PEERS_FAILED') } await sh.close() @@ -167,11 +167,11 @@ class Client implements DaemonClient { */ async openStream (peerId: PeerId, protocol: string): Promise> { if (!isPeerId(peerId)) { - throw errcode(new Error('invalid peer id received'), 'ERR_INVALID_PEER_ID') + throw new CodeError('invalid peer id received', 'ERR_INVALID_PEER_ID') } if (typeof protocol !== 'string') { - throw errcode(new Error('invalid protocol received'), 'ERR_INVALID_PROTOCOL') + throw new CodeError('invalid protocol received', 'ERR_INVALID_PROTOCOL') } const sh = await this.send({ @@ -185,14 +185,14 @@ class Client implements DaemonClient { const message = await sh.read() if (message == null) { - throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE') + throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE') } const response = Response.decode(message) if (response.type !== Response.Type.OK) { await sh.close() - throw errcode(new Error(response.error?.msg ?? 'Open stream failed'), 'ERR_OPEN_STREAM_FAILED') + throw new CodeError(response.error?.msg ?? 'Open stream failed', 'ERR_OPEN_STREAM_FAILED') } return sh.rest() @@ -203,7 +203,7 @@ class Client implements DaemonClient { */ async registerStreamHandler (protocol: string, handler: StreamHandlerFunction): Promise { if (typeof protocol !== 'string') { - throw errcode(new Error('invalid protocol received'), 'ERR_INVALID_PROTOCOL') + throw new CodeError('invalid protocol received', 'ERR_INVALID_PROTOCOL') } // open a tcp port, pipe any data from it to the handler function @@ -219,13 +219,13 @@ class Client implements DaemonClient { const message = await sh.read() if (message == null) { - throw errcode(new Error('Could not read open stream response'), 'ERR_OPEN_STREAM_FAILED') + throw new CodeError('Could not read open stream response', 'ERR_OPEN_STREAM_FAILED') } const response = StreamInfo.decode(message) if (response.proto !== protocol) { - throw errcode(new Error('Incorrect protocol'), 'ERR_OPEN_STREAM_FAILED') + throw new CodeError('Incorrect protocol', 'ERR_OPEN_STREAM_FAILED') } await handler(sh.rest()) @@ -246,7 +246,7 @@ class Client implements DaemonClient { const address = listener.getAddrs()[0] if (address == null) { - throw errcode(new Error('Could not listen on port'), 'ERR_REGISTER_STREAM_HANDLER_FAILED') + throw new CodeError('Could not listen on port', 'ERR_REGISTER_STREAM_HANDLER_FAILED') } const sh = await this.send({ @@ -260,7 +260,7 @@ class Client implements DaemonClient { const message = await sh.read() if (message == null) { - throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE') + throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE') } const response = Response.decode(message) @@ -268,7 +268,7 @@ class Client implements DaemonClient { await sh.close() if (response.type !== Response.Type.OK) { - throw errcode(new Error(response.error?.msg ?? 'Register stream handler failed'), 'ERR_REGISTER_STREAM_HANDLER_FAILED') + throw new CodeError(response.error?.msg ?? 'Register stream handler failed', 'ERR_REGISTER_STREAM_HANDLER_FAILED') } } } diff --git a/packages/libp2p-daemon-client/src/pubsub.ts b/packages/libp2p-daemon-client/src/pubsub.ts index b1c7ba67..aef35a98 100644 --- a/packages/libp2p-daemon-client/src/pubsub.ts +++ b/packages/libp2p-daemon-client/src/pubsub.ts @@ -1,4 +1,4 @@ -import errcode from 'err-code' +import { CodeError } from '@libp2p/interfaces/errors' import { Request, Response, @@ -30,7 +30,7 @@ export class Pubsub { const message = await sh.read() if (message == null) { - throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE') + throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE') } const response = Response.decode(message) @@ -38,11 +38,11 @@ export class Pubsub { await sh.close() if (response.type !== Response.Type.OK) { - throw errcode(new Error(response.error?.msg ?? 'Pubsub get topics failed'), 'ERR_PUBSUB_GET_TOPICS_FAILED') + throw new CodeError(response.error?.msg ?? 'Pubsub get topics failed', 'ERR_PUBSUB_GET_TOPICS_FAILED') } if (response.pubsub == null || response.pubsub.topics == null) { - throw errcode(new Error('Invalid response'), 'ERR_PUBSUB_GET_TOPICS_FAILED') + throw new CodeError('Invalid response', 'ERR_PUBSUB_GET_TOPICS_FAILED') } return response.pubsub.topics @@ -53,11 +53,11 @@ export class Pubsub { */ async publish (topic: string, data: Uint8Array) { if (typeof topic !== 'string') { - throw errcode(new Error('invalid topic received'), 'ERR_INVALID_TOPIC') + throw new CodeError('invalid topic received', 'ERR_INVALID_TOPIC') } if (!(data instanceof Uint8Array)) { - throw errcode(new Error('data received is not a Uint8Array'), 'ERR_INVALID_DATA') + throw new CodeError('data received is not a Uint8Array', 'ERR_INVALID_DATA') } const sh = await this.client.send({ @@ -72,7 +72,7 @@ export class Pubsub { const message = await sh.read() if (message == null) { - throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE') + throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE') } const response = Response.decode(message) @@ -80,7 +80,7 @@ export class Pubsub { await sh.close() if (response.type !== Response.Type.OK) { - throw errcode(new Error(response.error?.msg ?? 'Pubsub publish failed'), 'ERR_PUBSUB_PUBLISH_FAILED') + throw new CodeError(response.error?.msg ?? 'Pubsub publish failed', 'ERR_PUBSUB_PUBLISH_FAILED') } } @@ -89,7 +89,7 @@ export class Pubsub { */ async * subscribe (topic: string) { if (typeof topic !== 'string') { - throw errcode(new Error('invalid topic received'), 'ERR_INVALID_TOPIC') + throw new CodeError('invalid topic received', 'ERR_INVALID_TOPIC') } const sh = await this.client.send({ @@ -103,13 +103,13 @@ export class Pubsub { let message = await sh.read() if (message == null) { - throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE') + throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE') } const response = Response.decode(message) if (response.type !== Response.Type.OK) { - throw errcode(new Error(response.error?.msg ?? 'Pubsub publish failed'), 'ERR_PUBSUB_PUBLISH_FAILED') + throw new CodeError(response.error?.msg ?? 'Pubsub publish failed', 'ERR_PUBSUB_PUBLISH_FAILED') } // stream messages @@ -117,7 +117,7 @@ export class Pubsub { message = await sh.read() if (message == null) { - throw errcode(new Error('Empty response from remote'), 'ERR_EMPTY_RESPONSE') + throw new CodeError('Empty response from remote', 'ERR_EMPTY_RESPONSE') } yield PSMessage.decode(message)