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

chore: replace err-code with CodeError #242

Merged
merged 1 commit into from
Jan 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,11 @@
"dependencies": {
"@libp2p/interface-connection": "^3.0.1",
"@libp2p/interface-stream-muxer": "^3.0.0",
"@libp2p/interfaces": "^3.2.0",
"@libp2p/logger": "^2.0.0",
"abortable-iterator": "^4.0.2",
"any-signal": "^3.0.0",
"benchmark": "^2.1.4",
"err-code": "^3.0.1",
"it-batched-bytes": "^1.0.0",
"it-pushable": "^3.1.0",
"it-stream-types": "^1.0.4",
Expand Down
6 changes: 3 additions & 3 deletions src/mplex.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { MessageTypes, MessageTypeNames, Message } from './message-types.js'
import { createStream } from './stream.js'
import { toString as uint8ArrayToString } from 'uint8arrays'
import { logger } from '@libp2p/logger'
import errCode from 'err-code'
import { CodeError } from '@libp2p/interfaces/errors'
import { RateLimiterMemory } from 'rate-limiter-flexible'
import type { Sink } from 'it-stream-types'
import type { StreamMuxer, StreamMuxerInit } from '@libp2p/interface-stream-muxer'
Expand Down Expand Up @@ -157,7 +157,7 @@ export class MplexStreamMuxer implements StreamMuxer {
log('new %s stream %s', type, id)

if (type === 'initiator' && this._streams.initiators.size === (this._init.maxOutboundStreams ?? MAX_STREAMS_OUTBOUND_STREAMS_PER_CONNECTION)) {
throw errCode(new Error('Too many outbound streams open'), 'ERR_TOO_MANY_OUTBOUND_STREAMS')
throw new CodeError('Too many outbound streams open', 'ERR_TOO_MANY_OUTBOUND_STREAMS')
}

if (registry.has(id)) {
Expand Down Expand Up @@ -303,7 +303,7 @@ export class MplexStreamMuxer implements StreamMuxer {
})

// Inform the stream consumer they are not fast enough
const error = errCode(new Error('Input buffer full - increase Mplex maxBufferSize to accommodate slow consumers'), 'ERR_STREAM_INPUT_BUFFER_FULL')
const error = new CodeError('Input buffer full - increase Mplex maxBufferSize to accommodate slow consumers', 'ERR_STREAM_INPUT_BUFFER_FULL')
stream.abort(error)

return
Expand Down
8 changes: 4 additions & 4 deletions src/stream.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { abortableSource } from 'abortable-iterator'
import { pushable } from 'it-pushable'
import errCode from 'err-code'
import { CodeError } from '@libp2p/interfaces/errors'
import { MAX_MSG_SIZE } from './decode.js'
import { anySignal } from 'any-signal'
import { InitiatorMessageTypes, ReceiverMessageTypes } from './message-types.js'
Expand Down Expand Up @@ -143,21 +143,21 @@ export function createStream (options: Options): MplexStream {

// Close immediately for reading and writing (remote error)
reset: () => {
const err = errCode(new Error('stream reset'), ERR_STREAM_RESET)
const err = new CodeError('stream reset', ERR_STREAM_RESET)
resetController.abort()
streamSource.end(err)
onSinkEnd(err)
},

sink: async (source: Source<Uint8ArrayList | Uint8Array>) => {
if (sinkSunk) {
throw errCode(new Error('sink already called on stream'), ERR_DOUBLE_SINK)
throw new CodeError('sink already called on stream', ERR_DOUBLE_SINK)
}

sinkSunk = true

if (sinkEnded) {
throw errCode(new Error('stream closed for writing'), ERR_SINK_ENDED)
throw new CodeError('stream closed for writing', ERR_SINK_ENDED)
}

source = abortableSource(source, anySignal([
Expand Down