@libp2p/webrtc 5.2.23-cf9aab5c8 → 5.2.24-a02cb0461

package/src/util.ts

@@ -2,8 +2,9 @@ import { detect } from 'detect-browser'
 import pDefer from 'p-defer'
 import pTimeout from 'p-timeout'
 import { DATA_CHANNEL_DRAIN_TIMEOUT, DEFAULT_ICE_SERVERS, UFRAG_ALPHABET, UFRAG_PREFIX } from './constants.js'
-import type { PeerConnection } from '@ipshipyard/node-datachannel'
 import type { LoggerOptions } from '@libp2p/interface'
+import type { Duplex, Source } from 'it-stream-types'
+import type { PeerConnection } from 'node-datachannel'
 
 const browser = detect()
 export const isFirefox = ((browser != null) && browser.name === 'firefox')
@@ -12,6 +13,26 @@ export const nopSource = async function * nop (): AsyncGenerator<Uint8Array, any
 
 export const nopSink = async (_: any): Promise<void> => {}
 
+// Duplex that does nothing. Needed to fulfill the interface
+export function inertDuplex (): Duplex<any, any, any> {
+  return {
+    source: {
+      [Symbol.asyncIterator] () {
+        return {
+          async next () {
+            // This will never resolve
+            return new Promise(() => { })
+          }
+        }
+      }
+    },
+    sink: async (source: Source<any>) => {
+      // This will never resolve
+      return new Promise(() => { })
+    }
+  }
+}
+
 export function drainAndClose (channel: RTCDataChannel, direction: string, drainTimeout: number = DATA_CHANNEL_DRAIN_TIMEOUT, options: LoggerOptions): void {
   if (channel.readyState !== 'open') {
     return

package/src/webrtc/index.ts

@@ -1 +1 @@
-export { RTCSessionDescription, RTCIceCandidate, RTCPeerConnection } from '@ipshipyard/node-datachannel/polyfill'
+export { RTCSessionDescription, RTCIceCandidate, RTCPeerConnection } from 'node-datachannel/polyfill'

package/dist/src/maconn.d.ts

@@ -1,58 +0,0 @@
-import type { RTCPeerConnection } from './webrtc/index.js';
-import type { ComponentLogger, Logger, MultiaddrConnection, MultiaddrConnectionTimeline, CounterGroup } from '@libp2p/interface';
-import type { AbortOptions, Multiaddr } from '@multiformats/multiaddr';
-import type { Source, Sink } from 'it-stream-types';
-import type { Uint8ArrayList } from 'uint8arraylist';
-interface WebRTCMultiaddrConnectionInit {
-    /**
-     * WebRTC Peer Connection
-     */
-    peerConnection: RTCPeerConnection;
-    /**
-     * The multiaddr address used to communicate with the remote peer
-     */
-    remoteAddr: Multiaddr;
-    /**
-     * Holds the relevant events timestamps of the connection
-     */
-    timeline: MultiaddrConnectionTimeline;
-    /**
-     * Optional metrics counter group for this connection
-     */
-    metrics?: CounterGroup;
-}
-export interface WebRTCMultiaddrConnectionComponents {
-    logger: ComponentLogger;
-}
-export declare class WebRTCMultiaddrConnection implements MultiaddrConnection {
-    readonly log: Logger;
-    /**
-     * WebRTC Peer Connection
-     */
-    readonly peerConnection: RTCPeerConnection;
-    /**
-     * The multiaddr address used to communicate with the remote peer
-     */
-    remoteAddr: Multiaddr;
-    /**
-     * Holds the life cycle times of the connection
-     */
-    timeline: MultiaddrConnectionTimeline;
-    /**
-     * Optional metrics counter group for this connection
-     */
-    metrics?: CounterGroup;
-    /**
-     * The stream source, a no-op as the transport natively supports multiplexing
-     */
-    source: AsyncGenerator<Uint8Array, any, unknown>;
-    /**
-     * The stream destination, a no-op as the transport natively supports multiplexing
-     */
-    sink: Sink<Source<Uint8Array | Uint8ArrayList>, Promise<void>>;
-    constructor(components: WebRTCMultiaddrConnectionComponents, init: WebRTCMultiaddrConnectionInit);
-    close(options?: AbortOptions): Promise<void>;
-    abort(err: Error): void;
-}
-export {};
-//# sourceMappingURL=maconn.d.ts.map

package/dist/src/maconn.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"maconn.d.ts","sourceRoot":"","sources":["../../src/maconn.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChI,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAEpD,UAAU,6BAA6B;IACrC;;OAEG;IACH,cAAc,EAAE,iBAAiB,CAAA;IAEjC;;OAEG;IACH,UAAU,EAAE,SAAS,CAAA;IAErB;;OAEG;IACH,QAAQ,EAAE,2BAA2B,CAAA;IAErC;;OAEG;IACH,OAAO,CAAC,EAAE,YAAY,CAAA;CACvB;AAED,MAAM,WAAW,mCAAmC;IAClD,MAAM,EAAE,eAAe,CAAA;CACxB;AAED,qBAAa,yBAA0B,YAAW,mBAAmB;IACnE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IAEpB;;OAEG;IACH,QAAQ,CAAC,cAAc,EAAE,iBAAiB,CAAA;IAE1C;;OAEG;IACH,UAAU,EAAE,SAAS,CAAA;IAErB;;OAEG;IACH,QAAQ,EAAE,2BAA2B,CAAA;IAErC;;OAEG;IACH,OAAO,CAAC,EAAE,YAAY,CAAA;IAEtB;;OAEG;IACH,MAAM,EAAE,cAAc,CAAC,UAAU,EAAE,GAAG,EAAE,OAAO,CAAC,CAAc;IAE9D;;OAEG;IACH,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,cAAc,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAU;gBAE3D,UAAU,EAAE,mCAAmC,EAAE,IAAI,EAAE,6BAA6B;IAmB3F,KAAK,CAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAQnD,KAAK,CAAE,GAAG,EAAE,KAAK,GAAG,IAAI;CAOzB"}

package/dist/src/maconn.js

@@ -1,56 +0,0 @@
-import { nopSink, nopSource } from './util.js';
-export class WebRTCMultiaddrConnection {
-    log;
-    /**
-     * WebRTC Peer Connection
-     */
-    peerConnection;
-    /**
-     * The multiaddr address used to communicate with the remote peer
-     */
-    remoteAddr;
-    /**
-     * Holds the life cycle times of the connection
-     */
-    timeline;
-    /**
-     * Optional metrics counter group for this connection
-     */
-    metrics;
-    /**
-     * The stream source, a no-op as the transport natively supports multiplexing
-     */
-    source = nopSource();
-    /**
-     * The stream destination, a no-op as the transport natively supports multiplexing
-     */
-    sink = nopSink;
-    constructor(components, init) {
-        this.log = components.logger.forComponent('libp2p:webrtc:maconn');
-        this.remoteAddr = init.remoteAddr;
-        this.timeline = init.timeline;
-        this.peerConnection = init.peerConnection;
-        const peerConnection = this.peerConnection;
-        const initialState = peerConnection.connectionState;
-        this.peerConnection.onconnectionstatechange = () => {
-            this.log.trace('peer connection state change', peerConnection.connectionState, 'initial state', initialState);
-            if (peerConnection.connectionState === 'disconnected' || peerConnection.connectionState === 'failed' || peerConnection.connectionState === 'closed') {
-                // nothing else to do but close the connection
-                this.timeline.close = Date.now();
-            }
-        };
-    }
-    async close(options) {
-        this.log.trace('closing connection');
-        this.peerConnection.close();
-        this.timeline.close = Date.now();
-        this.metrics?.increment({ close: true });
-    }
-    abort(err) {
-        this.log.error('closing connection due to error', err);
-        this.peerConnection.close();
-        this.timeline.close = Date.now();
-        this.metrics?.increment({ abort: true });
-    }
-}
-//# sourceMappingURL=maconn.js.map

package/dist/src/maconn.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"maconn.js","sourceRoot":"","sources":["../../src/maconn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAiC9C,MAAM,OAAO,yBAAyB;IAC3B,GAAG,CAAQ;IAEpB;;OAEG;IACM,cAAc,CAAmB;IAE1C;;OAEG;IACH,UAAU,CAAW;IAErB;;OAEG;IACH,QAAQ,CAA6B;IAErC;;OAEG;IACH,OAAO,CAAe;IAEtB;;OAEG;IACH,MAAM,GAA6C,SAAS,EAAE,CAAA;IAE9D;;OAEG;IACH,IAAI,GAA6D,OAAO,CAAA;IAExE,YAAa,UAA+C,EAAE,IAAmC;QAC/F,IAAI,CAAC,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAA;QACjE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAA;QACjC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;QAC7B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAA;QAEzC,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAA;QAC1C,MAAM,YAAY,GAAG,cAAc,CAAC,eAAe,CAAA;QAEnD,IAAI,CAAC,cAAc,CAAC,uBAAuB,GAAG,GAAG,EAAE;YACjD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,cAAc,CAAC,eAAe,EAAE,eAAe,EAAE,YAAY,CAAC,CAAA;YAE7G,IAAI,cAAc,CAAC,eAAe,KAAK,cAAc,IAAI,cAAc,CAAC,eAAe,KAAK,QAAQ,IAAI,cAAc,CAAC,eAAe,KAAK,QAAQ,EAAE,CAAC;gBACpJ,8CAA8C;gBAC9C,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAClC,CAAC;QACH,CAAC,CAAA;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAE,OAAsB;QACjC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAA;QAEpC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAA;QAC3B,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAChC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAC1C,CAAC;IAED,KAAK,CAAE,GAAU;QACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iCAAiC,EAAE,GAAG,CAAC,CAAA;QAEtD,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAA;QAC3B,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAChC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAC1C,CAAC;CACF"}

package/src/maconn.ts

@@ -1,101 +0,0 @@
-import { nopSink, nopSource } from './util.js'
-import type { RTCPeerConnection } from './webrtc/index.js'
-import type { ComponentLogger, Logger, MultiaddrConnection, MultiaddrConnectionTimeline, CounterGroup } from '@libp2p/interface'
-import type { AbortOptions, Multiaddr } from '@multiformats/multiaddr'
-import type { Source, Sink } from 'it-stream-types'
-import type { Uint8ArrayList } from 'uint8arraylist'
-
-interface WebRTCMultiaddrConnectionInit {
-  /**
-   * WebRTC Peer Connection
-   */
-  peerConnection: RTCPeerConnection
-
-  /**
-   * The multiaddr address used to communicate with the remote peer
-   */
-  remoteAddr: Multiaddr
-
-  /**
-   * Holds the relevant events timestamps of the connection
-   */
-  timeline: MultiaddrConnectionTimeline
-
-  /**
-   * Optional metrics counter group for this connection
-   */
-  metrics?: CounterGroup
-}
-
-export interface WebRTCMultiaddrConnectionComponents {
-  logger: ComponentLogger
-}
-
-export class WebRTCMultiaddrConnection implements MultiaddrConnection {
-  readonly log: Logger
-
-  /**
-   * WebRTC Peer Connection
-   */
-  readonly peerConnection: RTCPeerConnection
-
-  /**
-   * The multiaddr address used to communicate with the remote peer
-   */
-  remoteAddr: Multiaddr
-
-  /**
-   * Holds the life cycle times of the connection
-   */
-  timeline: MultiaddrConnectionTimeline
-
-  /**
-   * Optional metrics counter group for this connection
-   */
-  metrics?: CounterGroup
-
-  /**
-   * The stream source, a no-op as the transport natively supports multiplexing
-   */
-  source: AsyncGenerator<Uint8Array, any, unknown> = nopSource()
-
-  /**
-   * The stream destination, a no-op as the transport natively supports multiplexing
-   */
-  sink: Sink<Source<Uint8Array | Uint8ArrayList>, Promise<void>> = nopSink
-
-  constructor (components: WebRTCMultiaddrConnectionComponents, init: WebRTCMultiaddrConnectionInit) {
-    this.log = components.logger.forComponent('libp2p:webrtc:maconn')
-    this.remoteAddr = init.remoteAddr
-    this.timeline = init.timeline
-    this.peerConnection = init.peerConnection
-
-    const peerConnection = this.peerConnection
-    const initialState = peerConnection.connectionState
-
-    this.peerConnection.onconnectionstatechange = () => {
-      this.log.trace('peer connection state change', peerConnection.connectionState, 'initial state', initialState)
-
-      if (peerConnection.connectionState === 'disconnected' || peerConnection.connectionState === 'failed' || peerConnection.connectionState === 'closed') {
-        // nothing else to do but close the connection
-        this.timeline.close = Date.now()
-      }
-    }
-  }
-
-  async close (options?: AbortOptions): Promise<void> {
-    this.log.trace('closing connection')
-
-    this.peerConnection.close()
-    this.timeline.close = Date.now()
-    this.metrics?.increment({ close: true })
-  }
-
-  abort (err: Error): void {
-    this.log.error('closing connection due to error', err)
-
-    this.peerConnection.close()
-    this.timeline.close = Date.now()
-    this.metrics?.increment({ abort: true })
-  }
-}