@libp2p/mplex 1.0.0 → 1.0.3

package/dist/src/stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/stream.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/stream.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/mplex",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "JavaScript implementation of https://github.com/libp2p/mplex",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p-mplex#readme",
@@ -126,38 +126,38 @@
     ]
   },
   "scripts": {
+    "clean": "aegir clean",
     "lint": "aegir lint",
     "dep-check": "aegir dep-check",
-    "build": "tsc",
-    "pretest": "npm run build",
-    "test": "aegir test -f ./dist/test",
-    "test:chrome": "npm run test -- -t browser --cov",
-    "test:chrome-webworker": "npm run test -- -t webworker",
-    "test:firefox": "npm run test -- -t browser -- --browser firefox",
-    "test:firefox-webworker": "npm run test -- -t webworker -- --browser firefox",
-    "test:node": "npm run test -- -t node --cov",
-    "test:electron-main": "npm run test -- -t electron-main",
-    "release": "semantic-release"
+    "build": "aegir build",
+    "test": "aegir test",
+    "test:chrome": "aegir test -t browser --cov",
+    "test:chrome-webworker": "aegir test -t webworker",
+    "test:firefox": "aegir test -t browser -- --browser firefox",
+    "test:firefox-webworker": "aegir test -t webworker -- --browser firefox",
+    "test:node": "aegir test -t node --cov",
+    "test:electron-main": "aegir test -t electron-main",
+    "release": "aegir release"
   },
   "dependencies": {
-    "@libp2p/logger": "^1.0.3",
-    "@libp2p/tracked-map": "^1.0.1",
+    "@libp2p/logger": "^1.1.3",
+    "@libp2p/tracked-map": "^1.0.5",
     "abortable-iterator": "^4.0.2",
     "any-signal": "^3.0.0",
     "err-code": "^3.0.1",
     "it-pipe": "^2.0.3",
     "it-pushable": "^2.0.1",
     "it-stream-types": "^1.0.4",
-    "uint8arraylist": "^1.2.0",
+    "uint8arraylist": "^1.4.0",
     "varint": "^6.0.0"
   },
   "devDependencies": {
-    "@libp2p/interface-compliance-tests": "^1.0.7",
-    "@libp2p/interfaces": "^1.1.1",
+    "@libp2p/interface-compliance-tests": "^1.1.21",
+    "@libp2p/interfaces": "^1.3.20",
     "@types/varint": "^6.0.0",
-    "aegir": "^36.1.3",
-    "cborg": "^1.2.1",
-    "iso-random-stream": "^2.0.0",
+    "aegir": "^37.0.10",
+    "cborg": "^1.8.1",
+    "iso-random-stream": "^2.0.2",
     "it-all": "^1.0.6",
     "it-drain": "^1.0.5",
     "it-foreach": "^0.1.1",

package/src/index.ts

@@ -1,281 +1,15 @@
-import { pipe } from 'it-pipe'
-import { Pushable, pushableV } from 'it-pushable'
-import { abortableSource } from 'abortable-iterator'
-import { encode } from './encode.js'
-import { decode } from './decode.js'
-import { restrictSize } from './restrict-size.js'
-import { MessageTypes, MessageTypeNames, Message } from './message-types.js'
-import { createStream } from './stream.js'
-import { toString as uint8ArrayToString } from 'uint8arrays'
-import { trackedMap } from '@libp2p/tracked-map'
-import { logger } from '@libp2p/logger'
-import type { AbortOptions } from '@libp2p/interfaces'
-import type { Sink } from 'it-stream-types'
-import type { Muxer } from '@libp2p/interfaces/stream-muxer'
-import type { Stream } from '@libp2p/interfaces/connection'
-import type { ComponentMetricsTracker } from '@libp2p/interfaces/metrics'
-import each from 'it-foreach'
+import type { Components } from '@libp2p/interfaces/components'
+import type { StreamMuxerFactory, StreamMuxerInit } from '@libp2p/interfaces/stream-muxer'
+import { MplexStreamMuxer } from './mplex.js'
 
-const log = logger('libp2p:mplex')
-
-function printMessage (msg: Message) {
-  const output: any = {
-    ...msg,
-    type: `${MessageTypeNames[msg.type]} (${msg.type})`
-  }
-
-  if (msg.type === MessageTypes.NEW_STREAM) {
-    output.data = uint8ArrayToString(msg.data instanceof Uint8Array ? msg.data : msg.data.slice())
-  }
-
-  if (msg.type === MessageTypes.MESSAGE_INITIATOR || msg.type === MessageTypes.MESSAGE_RECEIVER) {
-    output.data = uint8ArrayToString(msg.data instanceof Uint8Array ? msg.data : msg.data.slice(), 'base16')
-  }
-
-  return output
-}
-
-export interface MplexStream extends Stream {
-  source: Pushable<Uint8Array>
-}
-
-export interface MplexOptions extends AbortOptions {
-  onStream?: (...args: any[]) => void
-  onStreamEnd?: (...args: any[]) => void
+export interface MplexInit extends StreamMuxerInit {
   maxMsgSize?: number
-  metrics?: ComponentMetricsTracker
 }
 
-export class Mplex implements Muxer {
-  static multicodec = '/mplex/6.7.0'
-
-  public sink: Sink<Uint8Array>
-  public source: AsyncIterable<Uint8Array>
-
-  private _streamId: number
-  private readonly _streams: { initiators: Map<number, MplexStream>, receivers: Map<number, MplexStream> }
-  private readonly _options: MplexOptions
-  private readonly _source: { push: (val: Message) => void, end: (err?: Error) => void }
-
-  constructor (options?: MplexOptions) {
-    options = options ?? {}
-
-    this._streamId = 0
-    this._streams = {
-      /**
-       * Stream to ids map
-       */
-      initiators: trackedMap<number, MplexStream>({ metrics: options.metrics, component: 'mplex', metric: 'initiatorStreams' }),
-      /**
-       * Stream to ids map
-       */
-      receivers: trackedMap<number, MplexStream>({ metrics: options.metrics, component: 'mplex', metric: 'receiverStreams' })
-    }
-    this._options = options
-
-    /**
-     * An iterable sink
-     */
-    this.sink = this._createSink()
-
-    /**
-     * An iterable source
-     */
-    const source = this._createSource()
-    this._source = source
-    this.source = source
-  }
-
-  /**
-   * Returns a Map of streams and their ids
-   */
-  get streams () {
-    // Inbound and Outbound streams may have the same ids, so we need to make those unique
-    const streams: Stream[] = []
-    this._streams.initiators.forEach(stream => {
-      streams.push(stream)
-    })
-    this._streams.receivers.forEach(stream => {
-      streams.push(stream)
-    })
-    return streams
-  }
-
-  /**
-   * Initiate a new stream with the given name. If no name is
-   * provided, the id of the stream will be used.
-   */
-  newStream (name?: string): Stream {
-    const id = this._streamId++
-    name = name == null ? id.toString() : name.toString()
-    const registry = this._streams.initiators
-    return this._newStream({ id, name, type: 'initiator', registry })
-  }
-
-  /**
-   * Called whenever an inbound stream is created
-   */
-  _newReceiverStream (options: { id: number, name: string }) {
-    const { id, name } = options
-    const registry = this._streams.receivers
-    return this._newStream({ id, name, type: 'receiver', registry })
-  }
-
-  _newStream (options: { id: number, name: string, type: 'initiator' | 'receiver', registry: Map<number, MplexStream> }) {
-    const { id, name, type, registry } = options
-
-    log('new %s stream %s %s', type, id, name)
-
-    if (registry.has(id)) {
-      throw new Error(`${type} stream ${id} already exists!`)
-    }
-
-    const send = (msg: Message) => {
-      if (log.enabled) {
-        log('%s stream %s send', type, id, printMessage(msg))
-      }
-
-      if (msg.type === MessageTypes.NEW_STREAM || msg.type === MessageTypes.MESSAGE_INITIATOR || msg.type === MessageTypes.MESSAGE_RECEIVER) {
-        msg.data = msg.data instanceof Uint8Array ? msg.data : msg.data.slice()
-      }
-
-      this._source.push(msg)
-    }
-
-    const onEnd = () => {
-      log('%s stream %s %s ended', type, id, name)
-      registry.delete(id)
-
-      if (this._options.onStreamEnd != null) {
-        this._options.onStreamEnd(stream)
-      }
-    }
-
-    const stream = createStream({ id, name, send, type, onEnd, maxMsgSize: this._options.maxMsgSize })
-    registry.set(id, stream)
-    return stream
-  }
-
-  /**
-   * Creates a sink with an abortable source. Incoming messages will
-   * also have their size restricted. All messages will be varint decoded.
-   */
-  _createSink () {
-    const sink: Sink<Uint8Array> = async source => {
-      if (this._options.signal != null) {
-        source = abortableSource(source, this._options.signal)
-      }
-
-      try {
-        await pipe(
-          source,
-          source => each(source, (buf) => {
-            // console.info('incoming', uint8ArrayToString(buf, 'base64'))
-          }),
-          decode,
-          restrictSize(this._options.maxMsgSize),
-          async source => {
-            for await (const msg of source) {
-              this._handleIncoming(msg)
-            }
-          }
-        )
-
-        this._source.end()
-      } catch (err: any) {
-        log('error in sink', err)
-        this._source.end(err) // End the source with an error
-      }
-    }
-
-    return sink
-  }
-
-  /**
-   * Creates a source that restricts outgoing message sizes
-   * and varint encodes them
-   */
-  _createSource () {
-    const onEnd = (err?: Error) => {
-      const { initiators, receivers } = this._streams
-      // Abort all the things!
-      for (const s of initiators.values()) {
-        s.abort(err)
-      }
-      for (const s of receivers.values()) {
-        s.abort(err)
-      }
-    }
-    const source = pushableV<Message>({ onEnd })
-    /*
-    const p = pipe(
-      source,
-      source => each(source, (msgs) => {
-        if (log.enabled) {
-          msgs.forEach(msg => {
-            log('outgoing message', printMessage(msg))
-          })
-        }
-      }),
-      source => encode(source),
-      source => each(source, (buf) => {
-        console.info('outgoing', uint8ArrayToString(buf, 'base64'))
-      })
-    )
-
-    return Object.assign(p, {
-      push: source.push,
-      end: source.end,
-      return: source.return
-    })
-*/
-    return Object.assign(encode(source), {
-      push: source.push,
-      end: source.end,
-      return: source.return
-    })
-  }
-
-  _handleIncoming (message: Message) {
-    const { id, type } = message
-
-    if (log.enabled) {
-      log('incoming message', printMessage(message))
-    }
-
-    // Create a new stream?
-    if (message.type === MessageTypes.NEW_STREAM) {
-      const stream = this._newReceiverStream({ id, name: uint8ArrayToString(message.data instanceof Uint8Array ? message.data : message.data.slice()) })
-
-      if (this._options.onStream != null) {
-        this._options.onStream(stream)
-      }
-
-      return
-    }
-
-    const list = (type & 1) === 1 ? this._streams.initiators : this._streams.receivers
-    const stream = list.get(id)
-
-    if (stream == null) {
-      return log('missing stream %s', id)
-    }
+export class Mplex implements StreamMuxerFactory {
+  public protocol = '/mplex/6.7.0'
 
-    switch (type) {
-      case MessageTypes.MESSAGE_INITIATOR:
-      case MessageTypes.MESSAGE_RECEIVER:
-        stream.source.push(message.data.slice())
-        break
-      case MessageTypes.CLOSE_INITIATOR:
-      case MessageTypes.CLOSE_RECEIVER:
-        stream.close()
-        break
-      case MessageTypes.RESET_INITIATOR:
-      case MessageTypes.RESET_RECEIVER:
-        stream.reset()
-        break
-      default:
-        log('unknown message type %s', type)
-    }
+  createStreamMuxer (components: Components, init?: MplexInit) {
+    return new MplexStreamMuxer(components, init)
   }
 }

package/src/mplex.ts

@@ -0,0 +1,256 @@
+import { pipe } from 'it-pipe'
+import { Pushable, pushableV } from 'it-pushable'
+import { abortableSource } from 'abortable-iterator'
+import { encode } from './encode.js'
+import { decode } from './decode.js'
+import { restrictSize } from './restrict-size.js'
+import { MessageTypes, MessageTypeNames, Message } from './message-types.js'
+import { createStream } from './stream.js'
+import { toString as uint8ArrayToString } from 'uint8arrays'
+import { trackedMap } from '@libp2p/tracked-map'
+import { logger } from '@libp2p/logger'
+import type { Components } from '@libp2p/interfaces/components'
+import type { Sink } from 'it-stream-types'
+import type { StreamMuxer, StreamMuxerInit } from '@libp2p/interfaces/stream-muxer'
+import type { Stream } from '@libp2p/interfaces/connection'
+
+const log = logger('libp2p:mplex')
+
+function printMessage (msg: Message) {
+  const output: any = {
+    ...msg,
+    type: `${MessageTypeNames[msg.type]} (${msg.type})`
+  }
+
+  if (msg.type === MessageTypes.NEW_STREAM) {
+    output.data = uint8ArrayToString(msg.data instanceof Uint8Array ? msg.data : msg.data.slice())
+  }
+
+  if (msg.type === MessageTypes.MESSAGE_INITIATOR || msg.type === MessageTypes.MESSAGE_RECEIVER) {
+    output.data = uint8ArrayToString(msg.data instanceof Uint8Array ? msg.data : msg.data.slice(), 'base16')
+  }
+
+  return output
+}
+
+export interface MplexStream extends Stream {
+  source: Pushable<Uint8Array>
+}
+
+export interface MplexInit extends StreamMuxerInit {
+  maxMsgSize?: number
+}
+
+export class MplexStreamMuxer implements StreamMuxer {
+  public protocol = '/mplex/6.7.0'
+
+  public sink: Sink<Uint8Array>
+  public source: AsyncIterable<Uint8Array>
+
+  private _streamId: number
+  private readonly _streams: { initiators: Map<number, MplexStream>, receivers: Map<number, MplexStream> }
+  private readonly _init: MplexInit
+  private readonly _source: { push: (val: Message) => void, end: (err?: Error) => void }
+
+  constructor (components: Components, init?: MplexInit) {
+    init = init ?? {}
+
+    this._streamId = 0
+    this._streams = {
+      /**
+       * Stream to ids map
+       */
+      initiators: trackedMap<number, MplexStream>({ metrics: components.getMetrics(), component: 'mplex', metric: 'initiatorStreams' }),
+      /**
+       * Stream to ids map
+       */
+      receivers: trackedMap<number, MplexStream>({ metrics: components.getMetrics(), component: 'mplex', metric: 'receiverStreams' })
+    }
+    this._init = init
+
+    /**
+     * An iterable sink
+     */
+    this.sink = this._createSink()
+
+    /**
+     * An iterable source
+     */
+    const source = this._createSource()
+    this._source = source
+    this.source = source
+  }
+
+  init (components: Components) {
+
+  }
+
+  /**
+   * Returns a Map of streams and their ids
+   */
+  get streams () {
+    // Inbound and Outbound streams may have the same ids, so we need to make those unique
+    const streams: Stream[] = []
+    this._streams.initiators.forEach(stream => {
+      streams.push(stream)
+    })
+    this._streams.receivers.forEach(stream => {
+      streams.push(stream)
+    })
+    return streams
+  }
+
+  /**
+   * Initiate a new stream with the given name. If no name is
+   * provided, the id of the stream will be used.
+   */
+  newStream (name?: string): Stream {
+    const id = this._streamId++
+    name = name == null ? id.toString() : name.toString()
+    const registry = this._streams.initiators
+    return this._newStream({ id, name, type: 'initiator', registry })
+  }
+
+  /**
+   * Called whenever an inbound stream is created
+   */
+  _newReceiverStream (options: { id: number, name: string }) {
+    const { id, name } = options
+    const registry = this._streams.receivers
+    return this._newStream({ id, name, type: 'receiver', registry })
+  }
+
+  _newStream (options: { id: number, name: string, type: 'initiator' | 'receiver', registry: Map<number, MplexStream> }) {
+    const { id, name, type, registry } = options
+
+    log('new %s stream %s %s', type, id, name)
+
+    if (registry.has(id)) {
+      throw new Error(`${type} stream ${id} already exists!`)
+    }
+
+    const send = (msg: Message) => {
+      if (log.enabled) {
+        log.trace('%s stream %s send', type, id, printMessage(msg))
+      }
+
+      if (msg.type === MessageTypes.NEW_STREAM || msg.type === MessageTypes.MESSAGE_INITIATOR || msg.type === MessageTypes.MESSAGE_RECEIVER) {
+        msg.data = msg.data instanceof Uint8Array ? msg.data : msg.data.slice()
+      }
+
+      this._source.push(msg)
+    }
+
+    const onEnd = () => {
+      log('%s stream %s %s ended', type, id, name)
+      registry.delete(id)
+
+      if (this._init.onStreamEnd != null) {
+        this._init.onStreamEnd(stream)
+      }
+    }
+
+    const stream = createStream({ id, name, send, type, onEnd, maxMsgSize: this._init.maxMsgSize })
+    registry.set(id, stream)
+    return stream
+  }
+
+  /**
+   * Creates a sink with an abortable source. Incoming messages will
+   * also have their size restricted. All messages will be varint decoded.
+   */
+  _createSink () {
+    const sink: Sink<Uint8Array> = async source => {
+      if (this._init.signal != null) {
+        source = abortableSource(source, this._init.signal)
+      }
+
+      try {
+        await pipe(
+          source,
+          decode,
+          restrictSize(this._init.maxMsgSize),
+          async source => {
+            for await (const msg of source) {
+              this._handleIncoming(msg)
+            }
+          }
+        )
+
+        this._source.end()
+      } catch (err: any) {
+        log('error in sink', err)
+        this._source.end(err) // End the source with an error
+      }
+    }
+
+    return sink
+  }
+
+  /**
+   * Creates a source that restricts outgoing message sizes
+   * and varint encodes them
+   */
+  _createSource () {
+    const onEnd = (err?: Error) => {
+      const { initiators, receivers } = this._streams
+      // Abort all the things!
+      for (const s of initiators.values()) {
+        s.abort(err)
+      }
+      for (const s of receivers.values()) {
+        s.abort(err)
+      }
+    }
+    const source = pushableV<Message>({ onEnd })
+
+    return Object.assign(encode(source), {
+      push: source.push,
+      end: source.end,
+      return: source.return
+    })
+  }
+
+  _handleIncoming (message: Message) {
+    const { id, type } = message
+
+    if (log.enabled) {
+      log.trace('incoming message', printMessage(message))
+    }
+
+    // Create a new stream?
+    if (message.type === MessageTypes.NEW_STREAM) {
+      const stream = this._newReceiverStream({ id, name: uint8ArrayToString(message.data instanceof Uint8Array ? message.data : message.data.slice()) })
+
+      if (this._init.onIncomingStream != null) {
+        this._init.onIncomingStream(stream)
+      }
+
+      return
+    }
+
+    const list = (type & 1) === 1 ? this._streams.initiators : this._streams.receivers
+    const stream = list.get(id)
+
+    if (stream == null) {
+      return log('missing stream %s', id)
+    }
+
+    switch (type) {
+      case MessageTypes.MESSAGE_INITIATOR:
+      case MessageTypes.MESSAGE_RECEIVER:
+        stream.source.push(message.data.slice())
+        break
+      case MessageTypes.CLOSE_INITIATOR:
+      case MessageTypes.CLOSE_RECEIVER:
+        stream.close()
+        break
+      case MessageTypes.RESET_INITIATOR:
+      case MessageTypes.RESET_RECEIVER:
+        stream.reset()
+        break
+      default:
+        log('unknown message type %s', type)
+    }
+  }
+}

package/src/stream.ts

@@ -10,7 +10,7 @@ import { logger } from '@libp2p/logger'
 import type { Message } from './message-types.js'
 import type { Timeline } from '@libp2p/interfaces/connection'
 import type { Source } from 'it-stream-types'
-import type { MplexStream } from './index.js'
+import type { MplexStream } from './mplex.js'
 
 const log = logger('libp2p:mplex:stream')
 
@@ -49,7 +49,7 @@ export function createStream (options: Options): MplexStream {
     }
 
     sourceEnded = true
-    log('%s stream %s source end', type, streamName, err)
+    log.trace('%s stream %s source end', type, streamName, err)
 
     if (err != null && endErr == null) {
       endErr = err
@@ -70,7 +70,7 @@ export function createStream (options: Options): MplexStream {
     }
 
     sinkEnded = true
-    log('%s stream %s sink end - err: %o', type, streamName, err)
+    log.trace('%s stream %s sink end - err: %o', type, streamName, err)
 
     if (err != null && endErr == null) {
       endErr = err
@@ -92,7 +92,7 @@ export function createStream (options: Options): MplexStream {
     },
     // Close for reading and writing (local error)
     abort: (err?: Error) => {
-      log('%s stream %s abort', type, streamName, err)
+      log.trace('%s stream %s abort', type, streamName, err)
       // End the source with the passed error
       stream.source.end(err)
       abortController.abort()
@@ -148,13 +148,13 @@ export function createStream (options: Options): MplexStream {
 
         // Send no more data if this stream was remotely reset
         if (err.code === ERR_MPLEX_STREAM_RESET) {
-          log('%s stream %s reset', type, name)
+          log.trace('%s stream %s reset', type, name)
         } else {
-          log('%s stream %s error', type, name, err)
+          log.trace('%s stream %s error', type, name, err)
           try {
             send({ id, type: Types.RESET })
           } catch (err) {
-            log('%s stream %s error sending reset', type, name, err)
+            log.trace('%s stream %s error sending reset', type, name, err)
           }
         }
 
@@ -166,7 +166,7 @@ export function createStream (options: Options): MplexStream {
       try {
         send({ id, type: Types.CLOSE })
       } catch (err) {
-        log('%s stream %s error sending close', type, name, err)
+        log.trace('%s stream %s error sending close', type, name, err)
       }
 
       onSinkEnd()