@libp2p/webrtc 5.2.24-f5932c294 → 5.2.24-fb19b055d

package/dist/src/util.js

@@ -6,6 +6,25 @@ const browser = detect();
 export const isFirefox = ((browser != null) && browser.name === 'firefox');
 export const nopSource = async function* nop() { };
 export const nopSink = async (_) => { };
+// Duplex that does nothing. Needed to fulfill the interface
+export function inertDuplex() {
+    return {
+        source: {
+            [Symbol.asyncIterator]() {
+                return {
+                    async next() {
+                        // This will never resolve
+                        return new Promise(() => { });
+                    }
+                };
+            }
+        },
+        sink: async (source) => {
+            // This will never resolve
+            return new Promise(() => { });
+        }
+    };
+}
 export function drainAndClose(channel, direction, drainTimeout = DATA_CHANNEL_DRAIN_TIMEOUT, options) {
     if (channel.readyState !== 'open') {
         return;

package/dist/src/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,MAAM,MAAM,SAAS,CAAA;AAC5B,OAAO,QAAQ,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,0BAA0B,EAAE,mBAAmB,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAI9G,MAAM,OAAO,GAAG,MAAM,EAAE,CAAA;AACxB,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAA;AAE1E,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,SAAU,CAAC,CAAC,GAAG,KAA+C,CAAC,CAAA;AAE7F,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAAE,CAAM,EAAiB,EAAE,GAAE,CAAC,CAAA;AAE1D,MAAM,UAAU,aAAa,CAAE,OAAuB,EAAE,SAAiB,EAAE,eAAuB,0BAA0B,EAAE,OAAsB;IAClJ,IAAI,OAAO,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC;QAClC,OAAM;IACR,CAAC;IAED,KAAK,OAAO,CAAC,OAAO,EAAE;SACnB,IAAI,CAAC,KAAK,IAAI,EAAE;QACf,yCAAyC;QACzC,IAAI,OAAO,CAAC,cAAc,GAAG,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,GAAG,CAAC,yCAAyC,EAAE,SAAS,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;YACzF,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAA;YACzB,IAAI,OAAO,GAAG,KAAK,CAAA;YAEnB,OAAO,CAAC,0BAA0B,GAAG,CAAC,CAAA;YAEtC,MAAM,aAAa,GAAG,GAAS,EAAE;gBAC/B,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,OAAO,CAAC,GAAG,CAAC,sCAAsC,EAAE,SAAS,CAAC,CAAA;oBAC9D,QAAQ,CAAC,OAAO,EAAE,CAAA;gBACpB,CAAC;YACH,CAAC,CAAA;YAED,OAAO,CAAC,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE;gBAC/C,IAAI,EAAE,IAAI;aACX,CAAC,CAAA;YAEF,OAAO,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,GAAG,EAAE;gBACjD,OAAO,GAAG,IAAI,CAAA;gBACd,OAAO,CAAC,mBAAmB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;gBACnD,QAAQ,CAAC,OAAO,EAAE,CAAA;YACpB,CAAC,CAAC,CAAA;YAEF,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE;gBAC/B,YAAY,EAAE,YAAY;aAC3B,CAAC,CAAA;QACJ,CAAC;IACH,CAAC,CAAC;SACD,IAAI,CAAC,KAAK,IAAI,EAAE;QACf,0CAA0C;QAC1C,IAAI,OAAO,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC;YAClC,OAAO,CAAC,KAAK,EAAE,CAAA;QACjB,CAAC;IACH,CAAC,CAAC;SACD,KAAK,CAAC,GAAG,CAAC,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAA;IACzD,CAAC,CAAC,CAAA;AACN,CAAC;AAOD,MAAM,UAAU,gBAAgB,CAAE,GAAQ;IACxC,OAAO,OAAO,GAAG,CAAC,KAAK,KAAK,UAAU,CAAA;AACxC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAE,MAAgF;IACzH,MAAM,GAAG,MAAM,IAAI,EAAE,CAAA;IAErB,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;QACjC,MAAM,GAAG,MAAM,MAAM,EAAE,CAAA;IACzB,CAAC;IAED,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvE,IAAI,EAAE;YACJ,GAAG;SACJ;KACF,CAAC,CAAC,CAAA;IAEH,OAAO,MAAM,CAAA;AACf,CAAC;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,MAAc,EAAE,EAAU,EAAE;IACnD,OAAO,YAAY,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AAChI,CAAC,CAAA"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,MAAM,MAAM,SAAS,CAAA;AAC5B,OAAO,QAAQ,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,0BAA0B,EAAE,mBAAmB,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAK9G,MAAM,OAAO,GAAG,MAAM,EAAE,CAAA;AACxB,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAA;AAE1E,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,SAAU,CAAC,CAAC,GAAG,KAA+C,CAAC,CAAA;AAE7F,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAAE,CAAM,EAAiB,EAAE,GAAE,CAAC,CAAA;AAE1D,4DAA4D;AAC5D,MAAM,UAAU,WAAW;IACzB,OAAO;QACL,MAAM,EAAE;YACN,CAAC,MAAM,CAAC,aAAa,CAAC;gBACpB,OAAO;oBACL,KAAK,CAAC,IAAI;wBACR,0BAA0B;wBAC1B,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;oBAC/B,CAAC;iBACF,CAAA;YACH,CAAC;SACF;QACD,IAAI,EAAE,KAAK,EAAE,MAAmB,EAAE,EAAE;YAClC,0BAA0B;YAC1B,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;QAC/B,CAAC;KACF,CAAA;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAE,OAAuB,EAAE,SAAiB,EAAE,eAAuB,0BAA0B,EAAE,OAAsB;IAClJ,IAAI,OAAO,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC;QAClC,OAAM;IACR,CAAC;IAED,KAAK,OAAO,CAAC,OAAO,EAAE;SACnB,IAAI,CAAC,KAAK,IAAI,EAAE;QACf,yCAAyC;QACzC,IAAI,OAAO,CAAC,cAAc,GAAG,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,GAAG,CAAC,yCAAyC,EAAE,SAAS,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;YACzF,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAA;YACzB,IAAI,OAAO,GAAG,KAAK,CAAA;YAEnB,OAAO,CAAC,0BAA0B,GAAG,CAAC,CAAA;YAEtC,MAAM,aAAa,GAAG,GAAS,EAAE;gBAC/B,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,OAAO,CAAC,GAAG,CAAC,sCAAsC,EAAE,SAAS,CAAC,CAAA;oBAC9D,QAAQ,CAAC,OAAO,EAAE,CAAA;gBACpB,CAAC;YACH,CAAC,CAAA;YAED,OAAO,CAAC,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE;gBAC/C,IAAI,EAAE,IAAI;aACX,CAAC,CAAA;YAEF,OAAO,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,GAAG,EAAE;gBACjD,OAAO,GAAG,IAAI,CAAA;gBACd,OAAO,CAAC,mBAAmB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;gBACnD,QAAQ,CAAC,OAAO,EAAE,CAAA;YACpB,CAAC,CAAC,CAAA;YAEF,MAAM,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE;gBAC/B,YAAY,EAAE,YAAY;aAC3B,CAAC,CAAA;QACJ,CAAC;IACH,CAAC,CAAC;SACD,IAAI,CAAC,KAAK,IAAI,EAAE;QACf,0CAA0C;QAC1C,IAAI,OAAO,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC;YAClC,OAAO,CAAC,KAAK,EAAE,CAAA;QACjB,CAAC;IACH,CAAC,CAAC;SACD,KAAK,CAAC,GAAG,CAAC,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAA;IACzD,CAAC,CAAC,CAAA;AACN,CAAC;AAOD,MAAM,UAAU,gBAAgB,CAAE,GAAQ;IACxC,OAAO,OAAO,GAAG,CAAC,KAAK,KAAK,UAAU,CAAA;AACxC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAE,MAAgF;IACzH,MAAM,GAAG,MAAM,IAAI,EAAE,CAAA;IAErB,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;QACjC,MAAM,GAAG,MAAM,MAAM,EAAE,CAAA;IACzB,CAAC;IAED,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvE,IAAI,EAAE;YACJ,GAAG;SACJ;KACF,CAAC,CAAC,CAAA;IAEH,OAAO,MAAM,CAAA;AACf,CAAC;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,MAAc,EAAE,EAAU,EAAE;IACnD,OAAO,YAAY,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AAChI,CAAC,CAAA"}

package/dist/src/webrtc/index.d.ts

@@ -1,2 +1,2 @@
-export { RTCSessionDescription, RTCIceCandidate, RTCPeerConnection } from '@ipshipyard/node-datachannel/polyfill';
+export { RTCSessionDescription, RTCIceCandidate, RTCPeerConnection } from 'node-datachannel/polyfill';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/webrtc/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/webrtc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/webrtc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA"}

package/dist/src/webrtc/index.js

@@ -1,2 +1,2 @@
-export { RTCSessionDescription, RTCIceCandidate, RTCPeerConnection } from '@ipshipyard/node-datachannel/polyfill';
+export { RTCSessionDescription, RTCIceCandidate, RTCPeerConnection } from 'node-datachannel/polyfill';
 //# sourceMappingURL=index.js.map

package/dist/src/webrtc/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/webrtc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/webrtc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/webrtc",
-  "version": "5.2.24-f5932c294",
+  "version": "5.2.24-fb19b055d",
   "description": "A libp2p transport using WebRTC connections",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/transport-webrtc#readme",
@@ -45,52 +45,49 @@
   },
   "dependencies": {
     "@chainsafe/is-ip": "^2.1.0",
-    "@chainsafe/libp2p-noise": "^16.1.3",
-    "@ipshipyard/node-datachannel": "^0.26.6",
-    "@libp2p/crypto": "5.1.8-f5932c294",
-    "@libp2p/interface": "2.11.0-f5932c294",
-    "@libp2p/interface-internal": "2.3.19-f5932c294",
-    "@libp2p/keychain": "5.2.9-f5932c294",
-    "@libp2p/peer-id": "5.1.9-f5932c294",
-    "@libp2p/utils": "6.7.2-f5932c294",
-    "@multiformats/multiaddr": "^12.4.4",
-    "@multiformats/multiaddr-matcher": "^2.0.0",
+    "@libp2p/crypto": "5.1.8-fb19b055d",
+    "@libp2p/interface": "2.11.0-fb19b055d",
+    "@libp2p/interface-internal": "2.3.19-fb19b055d",
+    "@libp2p/keychain": "5.2.9-fb19b055d",
+    "@libp2p/noise": "16.1.4-fb19b055d",
+    "@libp2p/peer-id": "5.1.9-fb19b055d",
+    "@libp2p/utils": "6.7.2-fb19b055d",
+    "@multiformats/multiaddr": "^13.0.1",
+    "@multiformats/multiaddr-matcher": "^3.0.1",
     "@peculiar/webcrypto": "^1.5.0",
-    "@peculiar/x509": "^1.12.3",
-    "any-signal": "^4.1.1",
+    "@peculiar/x509": "^1.13.0",
     "detect-browser": "^5.3.0",
     "get-port": "^7.1.0",
-    "interface-datastore": "^8.3.1",
+    "interface-datastore": "^8.3.2",
     "it-length-prefixed": "^10.0.1",
-    "it-protobuf-stream": "^2.0.2",
+    "it-protobuf-stream": "^2.0.3",
     "it-pushable": "^3.2.3",
     "it-stream-types": "^2.0.2",
     "main-event": "^1.0.1",
-    "multiformats": "^13.3.6",
+    "multiformats": "^13.4.0",
+    "node-datachannel": "^0.29.0",
     "p-defer": "^4.0.1",
+    "p-event": "^6.0.1",
     "p-timeout": "^6.1.4",
     "p-wait-for": "^5.0.2",
     "progress-events": "^1.0.1",
-    "protons-runtime": "^5.5.0",
-    "race-event": "^1.3.0",
-    "race-signal": "^1.1.3",
-    "react-native-webrtc": "^124.0.5",
+    "protons-runtime": "^5.6.0",
+    "race-signal": "^2.0.0",
+    "react-native-webrtc": "^124.0.6",
     "uint8-varint": "^2.0.4",
     "uint8arraylist": "^2.4.8",
     "uint8arrays": "^5.1.0"
   },
   "devDependencies": {
-    "@libp2p/interface-compliance-tests": "6.5.0-f5932c294",
-    "@libp2p/logger": "5.2.0-f5932c294",
+    "@libp2p/logger": "5.2.0-fb19b055d",
     "@types/sinon": "^17.0.4",
-    "aegir": "^47.0.14",
-    "datastore-core": "^10.0.2",
+    "aegir": "^47.0.22",
+    "any-signal": "^4.1.1",
+    "datastore-core": "^10.0.4",
     "delay": "^6.0.0",
-    "it-length": "^3.0.8",
-    "it-pair": "^2.0.6",
-    "p-retry": "^6.2.1",
-    "protons": "^7.6.1",
-    "sinon": "^20.0.0",
+    "p-retry": "^7.0.0",
+    "protons": "^7.7.0",
+    "sinon": "^21.0.0",
     "sinon-ts": "^2.0.0",
     "wherearewe": "^2.0.1"
   },

package/src/constants.ts

@@ -26,26 +26,11 @@ export const UFRAG_ALPHABET = Array.from('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL
  */
 export const UFRAG_PREFIX = 'libp2p+webrtc+v1/'
 
-/**
- * The multicodec code for webrtc-direct tuples
- */
-export const CODEC_WEBRTC_DIRECT = 0x0118
-
-/**
- * The multicodec code for certhash tuples
- */
-export const CODEC_CERTHASH = 0x01d2
-
 /**
  * How much can be buffered to the DataChannel at once
  */
 export const MAX_BUFFERED_AMOUNT = 2 * 1024 * 1024
 
-/**
- * How long time we wait for the 'bufferedamountlow' event to be emitted
- */
-export const BUFFERED_AMOUNT_LOW_TIMEOUT = 30 * 1000
-
 /**
  * Max message size that can be sent to the DataChannel. In browsers this is
  * 256KiB but go-libp2p and rust-libp2p only support 16KiB at the time of
@@ -82,25 +67,17 @@ function calculateProtobufOverhead (maxMessageSize = MAX_MESSAGE_SIZE): number {
  */
 export const PROTOBUF_OVERHEAD = calculateProtobufOverhead()
 
-/**
- * When closing streams we send a FIN then wait for the remote to
- * reply with a FIN_ACK. If that does not happen within this timeout
- * we close the stream anyway.
- */
-export const FIN_ACK_TIMEOUT = 5_000
-
-/**
- * When sending data messages, if the channel is not in the "open" state, wait
- * this long for the "open" event to fire.
- */
-export const OPEN_TIMEOUT = 5_000
-
 /**
  * When closing a stream, we wait for `bufferedAmount` to become 0 before
  * closing the underlying RTCDataChannel - this controls how long we wait in ms
  */
 export const DATA_CHANNEL_DRAIN_TIMEOUT = 30_000
 
+/**
+ * Wait for the remote to acknowledge our FIN for this long
+ */
+export const DEFAULT_FIN_ACK_TIMEOUT = 10_000
+
 /**
  * Set as the 'negotiated' muxer protocol name
  */

package/src/index.ts

@@ -26,8 +26,8 @@
  * WebRTC requires use of a relay to connect two nodes. The listener first discovers a relay server and makes a reservation, then the dialer can connect via the relayed address.
  *
  * ```TypeScript
- * import { noise } from '@chainsafe/libp2p-noise'
- * import { yamux } from '@chainsafe/libp2p-yamux'
+ * import { noise } from '@libp2p/noise'
+ * import { yamux } from '@libp2p/yamux'
  * import { echo } from '@libp2p/echo'
  * import { circuitRelayTransport, circuitRelayServer } from '@libp2p/circuit-relay-v2'
  * import { identify } from '@libp2p/identify'
@@ -35,7 +35,6 @@
  * import { webSockets } from '@libp2p/websockets'
  * import { WebRTC } from '@multiformats/multiaddr-matcher'
  * import delay from 'delay'
- * import { pipe } from 'it-pipe'
  * import { createLibp2p } from 'libp2p'
  * import type { Multiaddr } from '@multiformats/multiaddr'
  *
@@ -134,15 +133,11 @@
  * await relay.stop()
  *
  * // send/receive some data from the remote peer via a direct connection
- * await pipe(
- *   [new TextEncoder().encode('hello world')],
- *   stream,
- *   async source => {
- *     for await (const buf of source) {
- *       console.info(new TextDecoder().decode(buf.subarray()))
- *     }
- *   }
- * )
+ * stream.send(new TextEncoder().encode('hello world'))
+ *
+ * stream.addEventListener('message', (evt) => {
+ *   console.info(new TextDecoder().decode(evt.data.subarray()))
+ * })
  * ```
  *
  * @example WebRTC Direct
@@ -167,7 +162,6 @@
  * ```TypeScript
  * import { createLibp2p } from 'libp2p'
  * import { multiaddr } from '@multiformats/multiaddr'
- * import { pipe } from 'it-pipe'
  * import { fromString, toString } from 'uint8arrays'
  * import { webRTCDirect } from '@libp2p/webrtc'
  *
@@ -196,15 +190,11 @@
  *   signal: AbortSignal.timeout(10_000)
  * })
  *
- * await pipe(
- *   [fromString(`Hello js-libp2p-webrtc\n`)],
- *   stream,
- *   async function (source) {
- *     for await (const buf of source) {
- *       console.info(toString(buf.subarray()))
- *     }
- *   }
- * )
+ * stream.send(new TextEncoder().encode('hello world'))
+ *
+ * stream.addEventListener('message', (evt) => {
+ *   console.info(new TextDecoder().decode(evt.data.subarray()))
+ * })
  * ```
  *
  * ## WebRTC Direct certificate hashes
@@ -318,6 +308,15 @@ export interface DataChannelOptions {
    * @default 5_000
    */
   openTimeout?: number
+
+  /**
+   * Due to bugs in WebRTC implementations it's necessary for the remote end of
+   * the connection to acknowledge the FIN message we send during stream
+   * closing. A stream will wait for this many ms.
+   *
+   * @default 10_000
+   */
+  finAckTimeout?: number
 }
 
 /**

package/src/muxer.ts

@@ -1,11 +1,8 @@
+import { AbstractStreamMuxer } from '@libp2p/utils'
 import { MUXER_PROTOCOL } from './constants.js'
-import { createStream } from './stream.js'
-import { drainAndClose, nopSink, nopSource } from './util.js'
+import { createStream, WebRTCStream } from './stream.js'
 import type { DataChannelOptions } from './index.js'
-import type { ComponentLogger, Logger, Stream, CounterGroup, StreamMuxer, StreamMuxerFactory, StreamMuxerInit } from '@libp2p/interface'
-import type { AbortOptions } from '@multiformats/multiaddr'
-import type { Source, Sink } from 'it-stream-types'
-import type { Uint8ArrayList } from 'uint8arraylist'
+import type { ComponentLogger, CounterGroup, StreamMuxer, StreamMuxerFactory, CreateStreamOptions, MultiaddrConnection } from '@libp2p/interface'
 
 export interface DataChannelMuxerFactoryInit {
   /**
@@ -23,6 +20,9 @@ export interface DataChannelMuxerFactoryInit {
    */
   metrics?: CounterGroup
 
+  /**
+   * Options used to create data channels
+   */
   dataChannelOptions?: DataChannelOptions
 }
 
@@ -30,12 +30,6 @@ export interface DataChannelMuxerFactoryComponents {
   logger: ComponentLogger
 }
 
-interface BufferedStream {
-  stream: Stream
-  channel: RTCDataChannel
-  onEnd(err?: Error): void
-}
-
 export class DataChannelMuxerFactory implements StreamMuxerFactory {
   public readonly protocol: string
 
@@ -43,69 +37,28 @@ export class DataChannelMuxerFactory implements StreamMuxerFactory {
    * WebRTC Peer Connection
    */
   private readonly peerConnection: RTCPeerConnection
-  private bufferedStreams: BufferedStream[] = []
   private readonly metrics?: CounterGroup
   private readonly dataChannelOptions?: DataChannelOptions
-  private readonly components: DataChannelMuxerFactoryComponents
-  private readonly log: Logger
 
-  constructor (components: DataChannelMuxerFactoryComponents, init: DataChannelMuxerFactoryInit) {
-    this.components = components
+  constructor (init: DataChannelMuxerFactoryInit) {
     this.peerConnection = init.peerConnection
     this.metrics = init.metrics
     this.protocol = init.protocol ?? MUXER_PROTOCOL
     this.dataChannelOptions = init.dataChannelOptions ?? {}
-    this.log = components.logger.forComponent('libp2p:webrtc:muxerfactory')
-
-    // store any data channels opened before upgrade has been completed
-    this.peerConnection.ondatachannel = ({ channel }) => {
-      this.log.trace('incoming early datachannel with channel id %d and label "%s"', channel.id)
-
-      // 'init' channel is only used during connection establishment
-      if (channel.label === 'init') {
-        this.log.trace('closing early init channel')
-        channel.close()
-
-        return
-      }
-
-      // @ts-expect-error fields are set below
-      const bufferedStream: BufferedStream = {}
-
-      const stream = createStream({
-        channel,
-        direction: 'inbound',
-        onEnd: (err) => {
-          bufferedStream.onEnd(err)
-        },
-        log: this.log,
-        ...this.dataChannelOptions
-      })
-
-      bufferedStream.stream = stream
-      bufferedStream.channel = channel
-      bufferedStream.onEnd = () => {
-        this.bufferedStreams = this.bufferedStreams.filter(s => s.stream.id !== stream.id)
-      }
-
-      this.bufferedStreams.push(bufferedStream)
-    }
   }
 
-  createStreamMuxer (init?: StreamMuxerInit): StreamMuxer {
-    return new DataChannelMuxer(this.components, {
-      ...init,
+  createStreamMuxer (maConn: MultiaddrConnection): StreamMuxer {
+    return new DataChannelMuxer(maConn, {
       peerConnection: this.peerConnection,
       dataChannelOptions: this.dataChannelOptions,
       metrics: this.metrics,
-      streams: this.bufferedStreams,
       protocol: this.protocol
     })
   }
 }
 
-export interface DataChannelMuxerInit extends DataChannelMuxerFactoryInit, StreamMuxerInit {
-  streams: BufferedStream[]
+export interface DataChannelMuxerInit extends DataChannelMuxerFactoryInit {
+  protocol: string
 }
 
 export interface DataChannelMuxerComponents {
@@ -115,26 +68,18 @@ export interface DataChannelMuxerComponents {
 /**
  * A libp2p data channel stream muxer
  */
-export class DataChannelMuxer implements StreamMuxer {
-  /**
-   * Array of streams in the data channel
-   */
-  public streams: Stream[]
-  public protocol: string
-
-  private readonly log: Logger
+export class DataChannelMuxer extends AbstractStreamMuxer<WebRTCStream> implements StreamMuxer<WebRTCStream> {
   private readonly peerConnection: RTCPeerConnection
   private readonly dataChannelOptions: DataChannelOptions
-  private readonly metrics?: CounterGroup
-  private readonly logger: ComponentLogger
 
-  constructor (components: DataChannelMuxerComponents, readonly init: DataChannelMuxerInit) {
-    this.log = init.log?.newScope('muxer') ?? components.logger.forComponent('libp2p:webrtc:muxer')
-    this.logger = components.logger
-    this.streams = init.streams.map(s => s.stream)
+  constructor (maConn: MultiaddrConnection, init: DataChannelMuxerInit) {
+    super(maConn, {
+      ...init,
+      name: 'muxer'
+    })
+
     this.peerConnection = init.peerConnection
     this.protocol = init.protocol ?? MUXER_PROTOCOL
-    this.metrics = init.metrics
     this.dataChannelOptions = init.dataChannelOptions ?? {}
 
     /**
@@ -144,125 +89,50 @@ export class DataChannelMuxer implements StreamMuxer {
      * {@link https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/datachannel_event}
      */
     this.peerConnection.ondatachannel = ({ channel }) => {
-      this.log.trace('incoming datachannel with channel id %d', channel.id)
+      this.log.trace('incoming %s datachannel with channel id %d, protocol %s and status %s', channel.protocol, channel.id, channel.protocol, channel.readyState)
 
-      // 'init' channel is only used during connection establishment
+      // 'init' channel is only used during connection establishment, it is
+      // closed by the initiator
       if (channel.label === 'init') {
-        this.log.trace('closing init channel')
+        this.log.trace('closing init channel %d', channel.id)
         channel.close()
 
         return
       }
 
-      // lib-datachannel throws if `.getId` is called on a closed channel so
-      // memoize it
-      const id = channel.id
-
       const stream = createStream({
+        ...this.streamOptions,
+        ...this.dataChannelOptions,
         channel,
         direction: 'inbound',
-        onEnd: () => {
-          this.#onStreamEnd(stream, channel)
-          this.log('incoming channel %s ended', id)
-        },
-        log: this.log,
-        ...this.dataChannelOptions
-      })
-
-      this.streams.push(stream)
-      this.metrics?.increment({ incoming_stream: true })
-      init?.onIncomingStream?.(stream)
-    }
-
-    // the DataChannelMuxer constructor is called during set up of the
-    // connection by the upgrader.
-    //
-    // If we invoke `init.onIncomingStream` immediately, the connection object
-    // will not be set up yet so add a tiny delay before letting the
-    // connection know about early streams
-    if (this.init.streams.length > 0) {
-      queueMicrotask(() => {
-        this.init.streams.forEach(bufferedStream => {
-          bufferedStream.onEnd = () => {
-            this.log('incoming early channel %s ended with state %s', bufferedStream.channel.id, bufferedStream.channel.readyState)
-            this.#onStreamEnd(bufferedStream.stream, bufferedStream.channel)
-          }
-
-          this.metrics?.increment({ incoming_stream: true })
-          this.init?.onIncomingStream?.(bufferedStream.stream)
-        })
-      })
-    }
-  }
-
-  #onStreamEnd (stream: Stream, channel: RTCDataChannel): void {
-    this.log.trace('stream %s %s %s onEnd', stream.direction, stream.id, stream.protocol)
-    drainAndClose(
-      channel,
-      `${stream.direction} ${stream.id} ${stream.protocol}`,
-      this.dataChannelOptions.drainTimeout, {
         log: this.log
-      }
-    )
-    this.streams = this.streams.filter(s => s.id !== stream.id)
-    this.metrics?.increment({ stream_end: true })
-    this.init?.onStreamEnd?.(stream)
-  }
-
-  /**
-   * Gracefully close all tracked streams and stop the muxer
-   */
-  async close (options?: AbortOptions): Promise<void> {
-    try {
-      await Promise.all(
-        this.streams.map(async stream => stream.close(options))
-      )
-    } catch (err: any) {
-      this.abort(err)
-    }
-  }
+      })
 
-  /**
-   * Abort all tracked streams and stop the muxer
-   */
-  abort (err: Error): void {
-    for (const stream of this.streams) {
-      stream.abort(err)
+      this.onRemoteStream(stream)
     }
   }
 
-  /**
-   * 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
-
-  newStream (): Stream {
+  async onCreateStream (options?: CreateStreamOptions): Promise<WebRTCStream> {
     // The spec says the label MUST be an empty string: https://github.com/libp2p/specs/blob/master/webrtc/README.md#rtcdatachannel-label
-    const channel = this.peerConnection.createDataChannel('')
-    // lib-datachannel throws if `.getId` is called on a closed channel so
-    // memoize it
-    const id = channel.id
+    const channel = this.peerConnection.createDataChannel('', {
+      // TODO: pre-negotiate stream protocol
+      // protocol: options?.protocol
+    })
 
-    this.log.trace('opened outgoing datachannel with channel id %s', id)
+    this.log('open channel %d for protocol %s', channel.id, options?.protocol)
 
     const stream = createStream({
+      ...options,
+      ...this.dataChannelOptions,
       channel,
       direction: 'outbound',
-      onEnd: () => {
-        this.#onStreamEnd(stream, channel)
-        this.log('outgoing channel %s ended', id)
-      },
-      log: this.log,
-      ...this.dataChannelOptions
+      log: this.log
     })
-    this.streams.push(stream)
-    this.metrics?.increment({ outgoing_stream: true })
 
     return stream
   }
+
+  onData (): void {
+
+  }
 }