@libp2p/webtransport 5.0.51-8484de8a2 → 5.0.51-87bc8d4fb

package/dist/src/stream.js

@@ -1,96 +1,67 @@
-import { AbstractStream } from '@libp2p/utils';
+import { AbstractStream } from '@libp2p/utils/abstract-stream';
 import { raceSignal } from 'race-signal';
-export class WebTransportStream extends AbstractStream {
+import { Uint8ArrayList } from 'uint8arraylist';
+class WebTransportStream extends AbstractStream {
     writer;
     reader;
     constructor(init) {
         super(init);
-        this.writer = init.stream.writable.getWriter();
-        this.reader = init.stream.readable.getReader();
-        void this.writer.closed
-            .then(() => {
-            this.log('writer closed gracefully');
-        })
-            .catch((err) => {
-            // chrome/ff send different messages
-            if (err.message.includes('STOP_SENDING') || err.message.includes('StopSending')) {
-                // err.code === 0 so we may be able to use this to detect remote close
-                // read instead?
-                this.onRemoteCloseRead();
-            }
-            else if (err.message.includes('RESET_STREAM') || err.message.includes('Reset')) {
-                this.onRemoteReset();
-            }
-            else {
-                this.log('writer close promise rejected - %e', err);
-            }
-        });
-        this.readData();
-    }
-    readData() {
+        this.writer = init.bidiStream.writable.getWriter();
+        this.reader = init.bidiStream.readable.getReader();
         Promise.resolve()
             .then(async () => {
             while (true) {
                 const result = await this.reader.read();
-                if (result.value != null) {
-                    this.onData(result.value);
-                }
                 if (result.done) {
-                    this.log('remote closed write');
-                    this.onRemoteCloseWrite();
+                    init.log('remote closed write');
                     return;
                 }
-                if (this.readStatus === 'paused') {
-                    break;
+                if (result.value != null) {
+                    this.sourcePush(new Uint8ArrayList(result.value));
                 }
             }
         })
             .catch(err => {
+            init.log.error('error reading from stream', err);
             this.abort(err);
         })
             .finally(() => {
-            this.reader.releaseLock();
+            this.remoteCloseWrite();
+        });
+        void this.writer.closed
+            .then(() => {
+            init.log('writer closed');
+        })
+            .catch((err) => {
+            init.log('writer close promise rejected', err);
+        })
+            .finally(() => {
+            this.remoteCloseRead();
         });
     }
-    sendData(data) {
-        // the streams spec recommends not waiting for data to be sent
-        // https://streams.spec.whatwg.org/#example-manual-write-dont-await
-        for (const buf of data) {
-            this.writer.write(buf)
+    sendNewStream(options) {
+        // this is a no-op
+    }
+    async sendData(buf, options) {
+        for (const chunk of buf) {
+            this.log('sendData waiting for writer to be ready');
+            await raceSignal(this.writer.ready, options?.signal);
+            // the streams spec recommends not waiting for data to be sent
+            // https://streams.spec.whatwg.org/#example-manual-write-dont-await
+            this.writer.write(chunk)
                 .catch(err => {
-                this.abort(err);
-            });
-        }
-        this.log.trace('desired size after sending %d bytes is %d bytes', data.byteLength, this.writer.desiredSize);
-        // null means the stream has errored - https://streams.spec.whatwg.org/#writable-stream-default-writer-get-desired-size
-        if (this.writer.desiredSize == null) {
-            return {
-                sentBytes: data.byteLength,
-                canSendMore: false
-            };
-        }
-        const canSendMore = this.writer.desiredSize > 0;
-        if (!canSendMore) {
-            this.writer.ready.then(() => {
-                this.safeDispatchEvent('drain');
-            }, (err) => {
-                this.abort(err);
+                this.log.error('error sending stream data', err);
             });
         }
-        return {
-            sentBytes: data.byteLength,
-            canSendMore
-        };
     }
-    sendReset(err) {
-        this.writer.abort(err)
-            .catch(err => {
-            this.log.error('error aborting writer - %e', err);
-        });
+    async sendReset(options) {
+        this.log('sendReset aborting writer');
+        await raceSignal(this.writer.abort(), options?.signal);
+        this.log('sendReset aborted writer');
     }
     async sendCloseWrite(options) {
         this.log('sendCloseWrite closing writer');
-        await raceSignal(this.writer.close().catch(() => { }), options?.signal);
+        await raceSignal(this.writer.close(), options?.signal);
         this.log('sendCloseWrite closed writer');
     }
     async sendCloseRead(options) {
@@ -98,20 +69,21 @@ export class WebTransportStream extends AbstractStream {
         await raceSignal(this.reader.cancel(), options?.signal);
         this.log('sendCloseRead cancelled reader');
     }
-    sendPause() {
-    }
-    sendResume() {
-        this.readData();
-    }
 }
-export function webtransportBiDiStreamToStream(stream, streamId, direction, log, options) {
-    return new WebTransportStream({
-        ...options,
-        stream,
+export async function webtransportBiDiStreamToStream(bidiStream, streamId, direction, activeStreams, onStreamEnd, log) {
+    const stream = new WebTransportStream({
+        bidiStream,
         id: streamId,
         direction,
         log: log.newScope(`${direction}:${streamId}`),
-        protocol: ''
+        onEnd: () => {
+            const index = activeStreams.findIndex(s => s === stream);
+            if (index !== -1) {
+                activeStreams.splice(index, 1);
+            }
+            onStreamEnd?.(stream);
+        }
     });
+    return stream;
 }
 //# sourceMappingURL=stream.js.map

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/dist/src/utils/inert-duplex.d.ts

@@ -0,0 +1,3 @@
+import type { Duplex } from 'it-stream-types';
+export declare function inertDuplex(): Duplex<any, any, any>;
+//# sourceMappingURL=inert-duplex.d.ts.map

package/dist/src/utils/inert-duplex.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inert-duplex.d.ts","sourceRoot":"","sources":["../../../src/utils/inert-duplex.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAU,MAAM,iBAAiB,CAAA;AAGrD,wBAAgB,WAAW,IAAK,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAiBpD"}

package/dist/src/utils/inert-duplex.js

@@ -0,0 +1,20 @@
+// 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(() => { });
+        }
+    };
+}
+//# sourceMappingURL=inert-duplex.js.map

package/dist/src/utils/inert-duplex.js.map

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

package/dist/src/utils/parse-multiaddr.d.ts

@@ -4,7 +4,7 @@ import type { MultihashDigest } from 'multiformats/hashes/interface';
 export interface ParsedMultiaddr {
     url: string;
     certhashes: MultihashDigest[];
-    remotePeer: PeerId;
+    remotePeer?: PeerId;
 }
 export declare function parseMultiaddr(ma: Multiaddr): ParsedMultiaddr;
 //# sourceMappingURL=parse-multiaddr.d.ts.map

package/dist/src/utils/parse-multiaddr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-multiaddr.d.ts","sourceRoot":"","sources":["../../../src/utils/parse-multiaddr.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AASpE,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,eAAe,EAAE,CAAA;IAC7B,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,wBAAgB,cAAc,CAAE,EAAE,EAAE,SAAS,GAAG,eAAe,CA4C9D"}
+{"version":3,"file":"parse-multiaddr.d.ts","sourceRoot":"","sources":["../../../src/utils/parse-multiaddr.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AASpE,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,eAAe,EAAE,CAAA;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,wBAAgB,cAAc,CAAE,EAAE,EAAE,SAAS,GAAG,eAAe,CAoC9D"}

package/dist/src/utils/parse-multiaddr.js

@@ -1,6 +1,6 @@
 import { InvalidMultiaddrError } from '@libp2p/interface';
 import { peerIdFromString } from '@libp2p/peer-id';
-import { getNetConfig } from '@libp2p/utils';
+import { protocols } from '@multiformats/multiaddr';
 import { WebTransport } from '@multiformats/multiaddr-matcher';
 import { bases, digest } from 'multiformats/basics';
 // @ts-expect-error - Not easy to combine these types.
@@ -12,23 +12,17 @@ export function parseMultiaddr(ma) {
     if (!WebTransport.matches(ma)) {
         throw new InvalidMultiaddrError('Invalid multiaddr, was not a WebTransport address');
     }
-    const certhashes = [];
-    let remotePeer;
-    for (const components of ma.getComponents()) {
-        if (components.name === 'certhash') {
-            certhashes.push(decodeCerthashStr(components.value ?? ''));
-        }
-        // only take the first peer id in the multiaddr as it may be a relay
-        if (components.name === 'p2p' && remotePeer == null) {
-            remotePeer = peerIdFromString(components.value ?? '');
-        }
-    }
-    if (remotePeer == null) {
-        throw new InvalidMultiaddrError('Remote peer must be present in multiaddr');
-    }
-    const opts = getNetConfig(ma);
+    const parts = ma.stringTuples();
+    const certhashes = parts
+        .filter(([name, _]) => name === protocols('certhash').code)
+        .map(([_, value]) => decodeCerthashStr(value ?? ''));
+    // only take the first peer id in the multiaddr as it may be a relay
+    const remotePeer = parts
+        .filter(([name, _]) => name === protocols('p2p').code)
+        .map(([_, value]) => peerIdFromString(value ?? ''))[0];
+    const opts = ma.toOptions();
     let host = opts.host;
-    if (opts.type === 'ip6' && host.includes(':')) {
+    if (opts.family === 6 && host?.includes(':')) {
         /**
          * This resolves cases where `new WebTransport()` fails to construct because of an invalid URL being passed.
          *

package/dist/src/utils/parse-multiaddr.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-multiaddr.js","sourceRoot":"","sources":["../../../src/utils/parse-multiaddr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAKnD,sDAAsD;AACtD,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;AAE3F,SAAS,iBAAiB,CAAE,CAAS;IACnC,OAAO,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;AAClD,CAAC;AAQD,MAAM,UAAU,cAAc,CAAE,EAAa;IAC3C,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,qBAAqB,CAAC,mDAAmD,CAAC,CAAA;IACtF,CAAC;IAED,MAAM,UAAU,GAAsB,EAAE,CAAA;IACxC,IAAI,UAA8B,CAAA;IAElC,KAAK,MAAM,UAAU,IAAI,EAAE,CAAC,aAAa,EAAE,EAAE,CAAC;QAC5C,IAAI,UAAU,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YACnC,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAA;QAC5D,CAAC;QAED,oEAAoE;QACpE,IAAI,UAAU,CAAC,IAAI,KAAK,KAAK,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;YACpD,UAAU,GAAG,gBAAgB,CAAC,UAAU,CAAC,KAAK,IAAI,EAAE,CAAC,CAAA;QACvD,CAAC;IACH,CAAC;IAED,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,IAAI,qBAAqB,CAAC,0CAA0C,CAAC,CAAA;IAC7E,CAAC;IAED,MAAM,IAAI,GAAG,YAAY,CAAC,EAAE,CAAC,CAAA;IAC7B,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;IAEpB,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9C;;;;;;;WAOG;QACH,IAAI,GAAG,IAAI,IAAI,GAAG,CAAA;IACpB,CAAC;IAED,OAAO;QACL,kCAAkC;QAClC,GAAG,EAAE,WAAW,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;QACnC,UAAU;QACV,UAAU;KACX,CAAA;AACH,CAAC"}
+{"version":3,"file":"parse-multiaddr.js","sourceRoot":"","sources":["../../../src/utils/parse-multiaddr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAKnD,sDAAsD;AACtD,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;AAE3F,SAAS,iBAAiB,CAAE,CAAS;IACnC,OAAO,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;AAClD,CAAC;AAQD,MAAM,UAAU,cAAc,CAAE,EAAa;IAC3C,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,qBAAqB,CAAC,mDAAmD,CAAC,CAAA;IACtF,CAAC;IAED,MAAM,KAAK,GAAG,EAAE,CAAC,YAAY,EAAE,CAAA;IAC/B,MAAM,UAAU,GAAG,KAAK;SACrB,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC;SAC1D,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAA;IAEtD,oEAAoE;IACpE,MAAM,UAAU,GAAG,KAAK;SACrB,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC;SACrD,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAExD,MAAM,IAAI,GAAG,EAAE,CAAC,SAAS,EAAE,CAAA;IAC3B,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;IAEpB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7C;;;;;;;WAOG;QACH,IAAI,GAAG,IAAI,IAAI,GAAG,CAAA;IACpB,CAAC;IAED,OAAO;QACL,kCAAkC;QAClC,GAAG,EAAE,WAAW,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;QACnC,UAAU;QACV,UAAU;KACX,CAAA;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/webtransport",
-  "version": "5.0.51-8484de8a2",
+  "version": "5.0.51-87bc8d4fb",
   "description": "JavaScript implementation of the WebTransport module that libp2p uses and that implements the interface-transport spec",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/transport-webtransport#readme",
@@ -40,35 +40,36 @@
     "build": "aegir build",
     "test": "aegir test -t browser -t webworker",
     "test:chrome": "aegir test -t browser --cov",
-    "test:chrome-webworker": "aegir test -t webworker",
-    "test:firefox": "aegir test -t browser -- --browser firefox"
+    "test:chrome-webworker": "aegir test -t webworker"
   },
   "dependencies": {
-    "@libp2p/interface": "2.11.0-8484de8a2",
-    "@libp2p/noise": "16.1.4-8484de8a2",
-    "@libp2p/peer-id": "5.1.9-8484de8a2",
-    "@libp2p/utils": "6.7.2-8484de8a2",
-    "@multiformats/multiaddr": "^13.0.1",
-    "@multiformats/multiaddr-matcher": "^3.0.1",
+    "@chainsafe/libp2p-noise": "^16.1.3",
+    "@libp2p/interface": "2.11.0-87bc8d4fb",
+    "@libp2p/peer-id": "5.1.9-87bc8d4fb",
+    "@libp2p/utils": "6.7.2-87bc8d4fb",
+    "@multiformats/multiaddr": "^12.4.4",
+    "@multiformats/multiaddr-matcher": "^2.0.0",
+    "it-stream-types": "^2.0.2",
     "multiformats": "^13.3.6",
     "progress-events": "^1.0.1",
-    "race-signal": "^2.0.0",
+    "race-signal": "^1.1.3",
     "uint8arraylist": "^2.4.8",
     "uint8arrays": "^5.1.0"
   },
   "devDependencies": {
-    "@libp2p/crypto": "5.1.8-8484de8a2",
-    "@libp2p/daemon-client": "9.0.8-8484de8a2",
-    "@libp2p/logger": "5.2.0-8484de8a2",
-    "@libp2p/ping": "2.0.37-8484de8a2",
+    "@libp2p/crypto": "5.1.8-87bc8d4fb",
+    "@libp2p/daemon-client": "^9.0.6",
+    "@libp2p/logger": "5.2.0-87bc8d4fb",
+    "@libp2p/ping": "2.0.37-87bc8d4fb",
     "@noble/hashes": "^1.8.0",
-    "aegir": "^47.0.21",
-    "execa": "^9.6.0",
+    "aegir": "^47.0.14",
+    "execa": "^9.5.3",
     "go-libp2p": "^1.6.0",
-    "it-all": "^3.0.9",
-    "libp2p": "2.10.0-8484de8a2",
+    "it-map": "^3.1.3",
+    "it-to-buffer": "^4.0.9",
+    "libp2p": "2.10.0-87bc8d4fb",
     "p-defer": "^4.0.1",
-    "p-event": "^6.0.1",
+    "p-wait-for": "^5.0.2",
     "sinon-ts": "^2.0.0"
   },
   "browser": {

package/src/constants.ts

@@ -0,0 +1 @@
+export const MAX_INBOUND_STREAMS = 1_000

package/src/index.ts

@@ -3,18 +3,20 @@
  *
  * A [libp2p transport](https://docs.libp2p.io/concepts/transports/overview/) based on [WebTransport](https://www.w3.org/TR/webtransport/).
  *
+ * >
  * > ⚠️ **Note**
  * >
  * > This WebTransport implementation currently only allows dialing to other nodes. It does not yet allow listening for incoming dials. This feature requires QUIC support to land in Node JS first.
  * >
  * > QUIC support in Node JS is actively being worked on. You can keep an eye on the progress by watching the [related issues on the Node JS issue tracker](https://github.com/nodejs/node/labels/quic)
+ * >
  *
  * @example
  *
  * ```TypeScript
  * import { createLibp2p } from 'libp2p'
  * import { webTransport } from '@libp2p/webtransport'
- * import { noise } from '@libp2p/noise'
+ * import { noise } from '@chainsafe/libp2p-noise'
  *
  * const node = await createLibp2p({
  *   transports: [
@@ -27,21 +29,24 @@
  * ```
  */
 
+import { noise } from '@chainsafe/libp2p-noise'
 import { InvalidCryptoExchangeError, InvalidParametersError, serviceCapabilities, transportSymbol } from '@libp2p/interface'
-import { noise } from '@libp2p/noise'
 import { WebTransport as WebTransportMatcher } from '@multiformats/multiaddr-matcher'
 import { CustomProgressEvent } from 'progress-events'
+import { raceSignal } from 'race-signal'
+import { MAX_INBOUND_STREAMS } from './constants.js'
 import createListener from './listener.js'
 import { webtransportMuxer } from './muxer.js'
-import { toMultiaddrConnection } from './session-to-conn.ts'
+import { inertDuplex } from './utils/inert-duplex.js'
 import { isSubset } from './utils/is-subset.js'
 import { parseMultiaddr } from './utils/parse-multiaddr.js'
-import { WebTransportMessageStream } from './utils/webtransport-message-stream.ts'
 import WebTransport from './webtransport.js'
 import type { Upgrader, Transport, CreateListenerOptions, DialTransportOptions, Listener, ComponentLogger, Logger, Connection, MultiaddrConnection, CounterGroup, Metrics, PeerId, OutboundConnectionUpgradeEvents, PrivateKey } from '@libp2p/interface'
 import type { Multiaddr } from '@multiformats/multiaddr'
+import type { Source } from 'it-stream-types'
 import type { MultihashDigest } from 'multiformats/hashes/interface'
 import type { ProgressEvent } from 'progress-events'
+import type { Uint8ArrayList } from 'uint8arraylist'
 
 /**
  * PEM format server certificate and private key
@@ -58,6 +63,7 @@ interface WebTransportSessionCleanup {
 }
 
 export interface WebTransportInit {
+  maxInboundStreams?: number
   certificates?: WebTransportCertificate[]
 }
 
@@ -82,7 +88,6 @@ export type WebTransportDialEvents =
 
 interface AuthenticateWebTransportOptions extends DialTransportOptions<WebTransportDialEvents> {
   wt: WebTransport
-  maConn: MultiaddrConnection
   remotePeer?: PeerId
   certhashes: Array<MultihashDigest<number>>
 }
@@ -98,6 +103,7 @@ class WebTransportTransport implements Transport<WebTransportDialEvents> {
     this.components = components
     this.config = {
       ...init,
+      maxInboundStreams: init.maxInboundStreams ?? MAX_INBOUND_STREAMS,
       certificates: init.certificates ?? []
     }
 
@@ -196,32 +202,36 @@ class WebTransportTransport implements Transport<WebTransportDialEvents> {
           cleanUpWTSession('remote_close')
         })
 
-      this.metrics?.dialerEvents.increment({ open: true })
-
-      maConn = toMultiaddrConnection({
-        remoteAddr: ma,
-        cleanUpWTSession,
-        direction: 'outbound',
-        log: this.components.logger.forComponent('libp2p:webtransport:connection')
-      })
-
-      authenticated = await this.authenticateWebTransport({
-        wt,
-        maConn,
-        remotePeer,
-        certhashes,
-        ...options
-      })
+      authenticated = await raceSignal(this.authenticateWebTransport({ wt, remotePeer, certhashes, ...options }), options.signal)
 
       if (!authenticated) {
         throw new InvalidCryptoExchangeError('Failed to authenticate webtransport')
       }
 
+      this.metrics?.dialerEvents.increment({ open: true })
+
+      maConn = {
+        close: async () => {
+          this.log('closing webtransport')
+          cleanUpWTSession('close')
+        },
+        abort: (err: Error) => {
+          this.log('aborting webtransport due to passed err', err)
+          cleanUpWTSession('abort')
+        },
+        remoteAddr: ma,
+        timeline: {
+          open: Date.now()
+        },
+        log: this.components.logger.forComponent('libp2p:webtransport:maconn'),
+        // This connection is never used directly since webtransport supports native streams.
+        ...inertDuplex()
+      }
+
       return await options.upgrader.upgradeOutbound(maConn, {
         ...options,
         skipEncryption: true,
-        remotePeer,
-        muxerFactory: webtransportMuxer(wt),
+        muxerFactory: webtransportMuxer(wt, wt.incomingBidirectionalStreams.getReader(), this.log, this.config),
         skipProtection: true
       })
     } catch (err: any) {
@@ -243,34 +253,61 @@ class WebTransportTransport implements Transport<WebTransportDialEvents> {
     }
   }
 
-  async authenticateWebTransport ({ wt, maConn, remotePeer, certhashes, onProgress, signal }: AuthenticateWebTransportOptions): Promise<boolean> {
+  async authenticateWebTransport ({ wt, remotePeer, certhashes, onProgress, signal }: AuthenticateWebTransportOptions): Promise<boolean> {
+    signal?.throwIfAborted()
+
     onProgress?.(new CustomProgressEvent('webtransport:open-authentication-stream'))
     const stream = await wt.createBidirectionalStream()
-    signal?.throwIfAborted()
+    const writer = stream.writable.getWriter()
+    const reader = stream.readable.getReader()
 
-    const messages = new WebTransportMessageStream({
-      stream,
-      log: maConn.log.newScope('muxer')
-    })
+    const duplex = {
+      source: (async function * () {
+        while (true) {
+          const val = await reader.read()
+
+          if (val.value != null) {
+            yield val.value
+          }
+
+          if (val.done) {
+            break
+          }
+        }
+      })(),
+      sink: async (source: Source<Uint8Array | Uint8ArrayList>) => {
+        for await (const chunk of source) {
+          await raceSignal(writer.ready, signal)
+
+          const buf = chunk instanceof Uint8Array ? chunk : chunk.subarray()
+
+          writer.write(buf).catch(err => {
+            this.log.error('could not write chunk during authentication of WebTransport stream', err)
+          })
+        }
+      }
+    }
 
     const n = noise()(this.components)
 
     onProgress?.(new CustomProgressEvent('webtransport:secure-outbound-connection'))
-    const { remoteExtensions } = await n.secureOutbound(messages, {
+    const { remoteExtensions } = await n.secureOutbound(duplex, {
       signal,
       remotePeer,
       skipStreamMuxerNegotiation: true
     })
 
     onProgress?.(new CustomProgressEvent('webtransport:close-authentication-stream'))
-
     // We're done with this authentication stream
-    await messages.close({
-      signal
+    writer.close().catch((err: Error) => {
+      this.log.error(`Failed to close authentication stream writer: ${err.message}`)
+    })
+
+    reader.cancel().catch((err: Error) => {
+      this.log.error(`Failed to close authentication stream reader: ${err.message}`)
     })
 
-    // Verify the certhashes we used when dialing are a subset of the certhashes
-    // relayed by the remote peer
+    // Verify the certhashes we used when dialing are a subset of the certhashes relayed by the remote peer
     if (!isSubset(remoteExtensions?.webtransportCerthashes ?? [], certhashes.map(ch => ch.bytes))) {
       throw new InvalidParametersError("Our certhashes are not a subset of the remote's reported certhashes")
     }
@@ -281,7 +318,8 @@ class WebTransportTransport implements Transport<WebTransportDialEvents> {
   createListener (options: CreateListenerOptions): Listener {
     return createListener(this.components, {
       ...options,
-      certificates: this.config.certificates
+      certificates: this.config.certificates,
+      maxInboundStreams: this.config.maxInboundStreams
     })
   }
 

package/src/listener.ts

@@ -11,6 +11,7 @@ export interface WebTransportListenerInit extends CreateListenerOptions {
   handler?(conn: Connection): void
   upgrader: Upgrader
   certificates?: WebTransportCertificate[]
+  maxInboundStreams?: number
 }
 
 export default function createListener (components: WebTransportListenerComponents, options: WebTransportListenerInit): Listener {