@libp2p/webrtc 2.0.2 → 2.0.4

package/src/muxer.ts

@@ -1,71 +1,96 @@
-import { WebRTCStream } from './stream.js'
+import { createStream } from './stream.js'
 import { nopSink, nopSource } from './util.js'
+import type { DataChannelOpts } from './stream.js'
 import type { Stream } from '@libp2p/interface-connection'
 import type { CounterGroup } from '@libp2p/interface-metrics'
 import type { StreamMuxer, StreamMuxerFactory, StreamMuxerInit } from '@libp2p/interface-stream-muxer'
 import type { Source, Sink } from 'it-stream-types'
 import type { Uint8ArrayList } from 'uint8arraylist'
 
+const PROTOCOL = '/webrtc'
+
 export interface DataChannelMuxerFactoryInit {
+  /**
+   * WebRTC Peer Connection
+   */
   peerConnection: RTCPeerConnection
+
+  /**
+   * Optional metrics for this data channel muxer
+   */
   metrics?: CounterGroup
+
+  /**
+   * Data channel options
+   */
+  dataChannelOptions?: Partial<DataChannelOpts>
+
+  /**
+   * The protocol to use
+   */
+  protocol?: string
 }
 
 export class DataChannelMuxerFactory implements StreamMuxerFactory {
+  public readonly protocol: string
+
   /**
    * WebRTC Peer Connection
    */
   private readonly peerConnection: RTCPeerConnection
-  private streamBuffer: WebRTCStream[] = []
+  private streamBuffer: Stream[] = []
   private readonly metrics?: CounterGroup
+  private readonly dataChannelOptions?: Partial<DataChannelOpts>
+
+  constructor (init: DataChannelMuxerFactoryInit) {
+    this.peerConnection = init.peerConnection
+    this.metrics = init.metrics
+    this.protocol = init.protocol ?? PROTOCOL
+    this.dataChannelOptions = init.dataChannelOptions
 
-  constructor (peerConnection: RTCPeerConnection, metrics?: CounterGroup, readonly protocol = '/webrtc') {
-    this.peerConnection = peerConnection
     // store any datachannels opened before upgrade has been completed
     this.peerConnection.ondatachannel = ({ channel }) => {
-      const stream = new WebRTCStream({
+      const stream = createStream({
         channel,
-        stat: {
-          direction: 'inbound',
-          timeline: { open: 0 }
-        },
-        closeCb: (_stream) => {
-          this.streamBuffer = this.streamBuffer.filter(s => !_stream.eq(s))
+        direction: 'inbound',
+        dataChannelOptions: init.dataChannelOptions,
+        onEnd: () => {
+          this.streamBuffer = this.streamBuffer.filter(s => s.id !== stream.id)
         }
       })
       this.streamBuffer.push(stream)
     }
-    this.metrics = metrics
   }
 
-  createStreamMuxer (init?: StreamMuxerInit | undefined): StreamMuxer {
-    return new DataChannelMuxer(this.peerConnection, this.streamBuffer, this.protocol, init, this.metrics)
+  createStreamMuxer (init?: StreamMuxerInit): StreamMuxer {
+    return new DataChannelMuxer({
+      ...init,
+      peerConnection: this.peerConnection,
+      dataChannelOptions: this.dataChannelOptions,
+      metrics: this.metrics,
+      streams: this.streamBuffer,
+      protocol: this.protocol
+    })
   }
 }
 
+export interface DataChannelMuxerInit extends DataChannelMuxerFactoryInit, StreamMuxerInit {
+  streams: Stream[]
+}
+
 /**
  * A libp2p data channel stream muxer
  */
 export class DataChannelMuxer implements StreamMuxer {
-  /**
-   * WebRTC Peer Connection
-   */
-  private readonly peerConnection: RTCPeerConnection
-
-  /**
-   * Optional metrics for this data channel muxer
-   */
-  private readonly metrics?: CounterGroup
-
   /**
    * Array of streams in the data channel
    */
-  streams: Stream[] = []
+  public streams: Stream[]
+  public protocol: string
 
-  /**
-   * Initialized stream muxer
-   */
-  init?: StreamMuxerInit
+  private readonly peerConnection: RTCPeerConnection
+  private readonly dataChannelOptions?: DataChannelOpts
+  private readonly metrics?: CounterGroup
 
   /**
    * Close or abort all tracked streams and stop the muxer
@@ -82,16 +107,11 @@ export class DataChannelMuxer implements StreamMuxer {
    */
   sink: Sink<Source<Uint8Array | Uint8ArrayList>, Promise<void>> = nopSink
 
-  constructor (peerConnection: RTCPeerConnection, streams: Stream[], readonly protocol: string = '/webrtc', init?: StreamMuxerInit, metrics?: CounterGroup) {
-    /**
-     * Initialized stream muxer
-     */
-    this.init = init
-
-    /**
-     * WebRTC Peer Connection
-     */
-    this.peerConnection = peerConnection
+  constructor (readonly init: DataChannelMuxerInit) {
+    this.streams = init.streams
+    this.peerConnection = init.peerConnection
+    this.protocol = init.protocol ?? PROTOCOL
+    this.metrics = init.metrics
 
     /**
      * Fired when a data channel has been added to the connection has been
@@ -100,15 +120,15 @@ export class DataChannelMuxer implements StreamMuxer {
      * {@link https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/datachannel_event}
      */
     this.peerConnection.ondatachannel = ({ channel }) => {
-      const stream = new WebRTCStream({
+      const stream = createStream({
         channel,
-        stat: {
-          direction: 'inbound',
-          timeline: {
-            open: 0
-          }
-        },
-        closeCb: this.wrapStreamEnd(init?.onIncomingStream)
+        direction: 'inbound',
+        dataChannelOptions: this.dataChannelOptions,
+        onEnd: () => {
+          this.streams = this.streams.filter(s => s.id !== stream.id)
+          this.metrics?.increment({ stream_end: true })
+          init?.onStreamEnd?.(stream)
+        }
       })
 
       this.streams.push(stream)
@@ -118,13 +138,6 @@ export class DataChannelMuxer implements StreamMuxer {
       }
     }
 
-    // wrap open streams with the onStreamEnd callback
-    this.streams = streams
-      .filter(stream => stream.stat.timeline.close == null)
-      .map(stream => {
-        (stream as WebRTCStream).closeCb = this.wrapStreamEnd(init?.onStreamEnd)
-        return stream
-      })
     const onIncomingStream = init?.onIncomingStream
     if (onIncomingStream != null) {
       this.streams.forEach(s => { onIncomingStream(s) })
@@ -134,33 +147,19 @@ export class DataChannelMuxer implements StreamMuxer {
   newStream (): Stream {
     // The spec says the label SHOULD be an empty string: https://github.com/libp2p/specs/blob/master/webrtc/README.md#rtcdatachannel-label
     const channel = this.peerConnection.createDataChannel('')
-    const closeCb = (stream: Stream): void => {
-      this.metrics?.increment({ stream_end: true })
-      this.init?.onStreamEnd?.(stream)
-    }
-    const stream = new WebRTCStream({
+    const stream = createStream({
       channel,
-      stat: {
-        direction: 'outbound',
-        timeline: {
-          open: 0
-        }
-      },
-      closeCb: this.wrapStreamEnd(closeCb)
+      direction: 'outbound',
+      dataChannelOptions: this.dataChannelOptions,
+      onEnd: () => {
+        this.streams = this.streams.filter(s => s.id !== stream.id)
+        this.metrics?.increment({ stream_end: true })
+        this.init?.onStreamEnd?.(stream)
+      }
     })
     this.streams.push(stream)
     this.metrics?.increment({ outgoing_stream: true })
 
     return stream
   }
-
-  private wrapStreamEnd (onStreamEnd?: (s: Stream) => void): (stream: Stream) => void {
-    const self = this
-    return (_stream) => {
-      self.streams = self.streams.filter(s => !(_stream instanceof WebRTCStream && (_stream).eq(s)))
-      if (onStreamEnd != null) {
-        onStreamEnd(_stream)
-      }
-    }
-  }
 }

package/src/private-to-private/handler.ts

@@ -5,6 +5,7 @@ import pDefer, { type DeferredPromise } from 'p-defer'
 import { DataChannelMuxerFactory } from '../muxer.js'
 import { Message } from './pb/message.js'
 import { readCandidatesUntilConnected, resolveOnConnected } from './util.js'
+import type { DataChannelOpts } from '../stream.js'
 import type { Stream } from '@libp2p/interface-connection'
 import type { IncomingStreamData } from '@libp2p/interface-registrar'
 import type { StreamMuxerFactory } from '@libp2p/interface-stream-muxer'
@@ -13,14 +14,13 @@ const DEFAULT_TIMEOUT = 30 * 1000
 
 const log = logger('libp2p:webrtc:peer')
 
-export type IncomingStreamOpts = { rtcConfiguration?: RTCConfiguration } & IncomingStreamData
+export type IncomingStreamOpts = { rtcConfiguration?: RTCConfiguration, dataChannelOptions?: Partial<DataChannelOpts> } & IncomingStreamData
 
-export async function handleIncomingStream ({ rtcConfiguration, stream: rawStream }: IncomingStreamOpts): Promise<{ pc: RTCPeerConnection, muxerFactory: StreamMuxerFactory, remoteAddress: string }> {
+export async function handleIncomingStream ({ rtcConfiguration, dataChannelOptions, stream: rawStream }: IncomingStreamOpts): Promise<{ pc: RTCPeerConnection, muxerFactory: StreamMuxerFactory, remoteAddress: string }> {
   const signal = AbortSignal.timeout(DEFAULT_TIMEOUT)
   const stream = pbStream(abortableDuplex(rawStream, signal)).pb(Message)
   const pc = new RTCPeerConnection(rtcConfiguration)
-  const muxerFactory = new DataChannelMuxerFactory(pc)
-
+  const muxerFactory = new DataChannelMuxerFactory({ peerConnection: pc, dataChannelOptions })
   const connectedPromise: DeferredPromise<void> = pDefer()
   const answerSentPromise: DeferredPromise<void> = pDefer()
 
@@ -86,13 +86,14 @@ export interface ConnectOptions {
   stream: Stream
   signal: AbortSignal
   rtcConfiguration?: RTCConfiguration
+  dataChannelOptions?: Partial<DataChannelOpts>
 }
 
-export async function initiateConnection ({ rtcConfiguration, signal, stream: rawStream }: ConnectOptions): Promise<{ pc: RTCPeerConnection, muxerFactory: StreamMuxerFactory, remoteAddress: string }> {
+export async function initiateConnection ({ rtcConfiguration, dataChannelOptions, signal, stream: rawStream }: ConnectOptions): Promise<{ pc: RTCPeerConnection, muxerFactory: StreamMuxerFactory, remoteAddress: string }> {
   const stream = pbStream(abortableDuplex(rawStream, signal)).pb(Message)
   // setup peer connection
   const pc = new RTCPeerConnection(rtcConfiguration)
-  const muxerFactory = new DataChannelMuxerFactory(pc)
+  const muxerFactory = new DataChannelMuxerFactory({ peerConnection: pc, dataChannelOptions })
 
   const connectedPromise: DeferredPromise<void> = pDefer()
   resolveOnConnected(pc, connectedPromise)

package/src/private-to-private/transport.ts

@@ -7,6 +7,7 @@ import { codes } from '../error.js'
 import { WebRTCMultiaddrConnection } from '../maconn.js'
 import { initiateConnection, handleIncomingStream } from './handler.js'
 import { WebRTCPeerListener } from './listener.js'
+import type { DataChannelOpts } from '../stream.js'
 import type { Connection } from '@libp2p/interface-connection'
 import type { PeerId } from '@libp2p/interface-peer-id'
 import type { IncomingStreamData, Registrar } from '@libp2p/interface-registrar'
@@ -21,6 +22,7 @@ const WEBRTC_CODE = protocols('webrtc').code
 
 export interface WebRTCTransportInit {
   rtcConfiguration?: RTCConfiguration
+  dataChannel?: Partial<DataChannelOpts>
 }
 
 export interface WebRTCTransportComponents {
@@ -35,7 +37,7 @@ export class WebRTCTransport implements Transport, Startable {
 
   constructor (
     private readonly components: WebRTCTransportComponents,
-    private readonly init: WebRTCTransportInit
+    private readonly init: WebRTCTransportInit = {}
   ) {
   }
 
@@ -123,6 +125,7 @@ export class WebRTCTransport implements Transport, Startable {
       const { pc, muxerFactory, remoteAddress } = await initiateConnection({
         stream: signalingStream,
         rtcConfiguration: this.init.rtcConfiguration,
+        dataChannelOptions: this.init.dataChannel,
         signal: options.signal
       })
 
@@ -154,7 +157,8 @@ export class WebRTCTransport implements Transport, Startable {
       const { pc, muxerFactory, remoteAddress } = await handleIncomingStream({
         rtcConfiguration: this.init.rtcConfiguration,
         connection,
-        stream
+        stream,
+        dataChannelOptions: this.init.dataChannel
       })
 
       await this.components.upgrader.upgradeInbound(new WebRTCMultiaddrConnection({

package/src/private-to-public/transport.ts

@@ -9,11 +9,12 @@ import { fromString as uint8arrayFromString } from 'uint8arrays/from-string'
 import { dataChannelError, inappropriateMultiaddr, unimplemented, invalidArgument } from '../error.js'
 import { WebRTCMultiaddrConnection } from '../maconn.js'
 import { DataChannelMuxerFactory } from '../muxer.js'
-import { WebRTCStream } from '../stream.js'
+import { createStream } from '../stream.js'
 import { isFirefox } from '../util.js'
 import * as sdp from './sdp.js'
 import { genUfrag } from './util.js'
 import type { WebRTCDialOptions } from './options.js'
+import type { DataChannelOpts } from '../stream.js'
 import type { Connection } from '@libp2p/interface-connection'
 import type { CounterGroup, Metrics } from '@libp2p/interface-metrics'
 import type { PeerId } from '@libp2p/interface-peer-id'
@@ -52,12 +53,17 @@ export interface WebRTCMetrics {
   dialerEvents: CounterGroup
 }
 
+export interface WebRTCTransportDirectInit {
+  dataChannel?: Partial<DataChannelOpts>
+}
+
 export class WebRTCDirectTransport implements Transport {
   private readonly metrics?: WebRTCMetrics
   private readonly components: WebRTCDirectTransportComponents
-
-  constructor (components: WebRTCDirectTransportComponents) {
+  private readonly init: WebRTCTransportDirectInit
+  constructor (components: WebRTCDirectTransportComponents, init: WebRTCTransportDirectInit = {}) {
     this.components = components
+    this.init = init
     if (components.metrics != null) {
       this.metrics = {
         dialerEvents: components.metrics.registerCounterGroup('libp2p_webrtc_dialer_events_total', {
@@ -185,7 +191,7 @@ export class WebRTCDirectTransport implements Transport {
     // we pass in undefined for these parameters.
     const noise = Noise({ prologueBytes: fingerprintsPrologue })()
 
-    const wrappedChannel = new WebRTCStream({ channel: handshakeDataChannel, stat: { direction: 'inbound', timeline: { open: 1 } } })
+    const wrappedChannel = createStream({ channel: handshakeDataChannel, direction: 'inbound', dataChannelOptions: this.init.dataChannel })
     const wrappedDuplex = {
       ...wrappedChannel,
       sink: wrappedChannel.sink.bind(wrappedChannel),
@@ -231,7 +237,7 @@ export class WebRTCDirectTransport implements Transport {
     // Track opened peer connection
     this.metrics?.dialerEvents.increment({ peer_connection: true })
 
-    const muxerFactory = new DataChannelMuxerFactory(peerConnection, this.metrics?.dialerEvents)
+    const muxerFactory = new DataChannelMuxerFactory({ peerConnection, metrics: this.metrics?.dialerEvents, dataChannelOptions: this.init.dataChannel })
 
     // For outbound connections, the remote is expected to start the noise handshake.
     // Therefore, we need to secure an inbound noise connection from the remote.