@libp2p/webtransport 3.0.10-4db2f5f5 → 3.0.10-d9159dd5

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

@@ -1,9 +1,10 @@
 import { type Multiaddr } from '@multiformats/multiaddr';
 import type { PeerId } from '@libp2p/interface/peer-id';
 import type { MultihashDigest } from 'multiformats/hashes/interface';
-export declare function parseMultiaddr(ma: Multiaddr): {
+export interface ParsedMultiaddr {
     url: string;
     certhashes: MultihashDigest[];
     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":"AACA,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,yBAAyB,CAAA;AAEnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AASpE,wBAAgB,cAAc,CAAE,EAAE,EAAE,SAAS,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,eAAe,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAqElH"}
+{"version":3,"file":"parse-multiaddr.d.ts","sourceRoot":"","sources":["../../../src/utils/parse-multiaddr.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,yBAAyB,CAAA;AAGnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AACvD,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,5 +1,7 @@
+import { CodeError } from '@libp2p/interface/errors';
 import { peerIdFromString } from '@libp2p/peer-id';
 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.
 const multibaseDecoder = Object.values(bases).map(b => b.decoder).reduce((d, b) => d.or(b));
@@ -7,71 +9,35 @@ function decodeCerthashStr(s) {
     return digest.decode(multibaseDecoder.decode(s));
 }
 export function parseMultiaddr(ma) {
+    if (!WebTransport.matches(ma)) {
+        throw new CodeError('Invalid multiaddr, was not a WebTransport address', 'ERR_INVALID_MULTIADDR');
+    }
     const parts = ma.stringTuples();
-    // This is simpler to have inline than extract into a separate function
-    // eslint-disable-next-line complexity
-    const { url, certhashes, remotePeer } = parts.reduce((state, [proto, value]) => {
-        switch (proto) {
-            case protocols('ip6').code:
-            // @ts-expect-error - ts error on switch fallthrough
-            case protocols('dns6').code:
-                if (value?.includes(':') === true) {
-                    /**
-                     * This resolves cases where `new globalThis.WebTransport` fails to construct because of an invalid URL being passed.
-                     *
-                     * `new URL('https://::1:4001/blah')` will throw a `TypeError: Failed to construct 'URL': Invalid URL`
-                     * `new URL('https://[::1]:4001/blah')` is valid and will not.
-                     *
-                     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2
-                     */
-                    value = `[${value}]`;
-                }
-            // eslint-disable-next-line no-fallthrough
-            case protocols('ip4').code:
-            case protocols('dns4').code:
-                if (state.seenHost || state.seenPort) {
-                    throw new Error('Invalid multiaddr, saw host and already saw the host or port');
-                }
-                return {
-                    ...state,
-                    url: `${state.url}${value ?? ''}`,
-                    seenHost: true
-                };
-            case protocols('quic').code:
-            case protocols('quic-v1').code:
-            case protocols('webtransport').code:
-                if (!state.seenHost || !state.seenPort) {
-                    throw new Error("Invalid multiaddr, Didn't see host and port, but saw quic/webtransport");
-                }
-                return state;
-            case protocols('udp').code:
-                if (state.seenPort) {
-                    throw new Error('Invalid multiaddr, saw port but already saw the port');
-                }
-                return {
-                    ...state,
-                    url: `${state.url}:${value ?? ''}`,
-                    seenPort: true
-                };
-            case protocols('certhash').code:
-                if (!state.seenHost || !state.seenPort) {
-                    throw new Error('Invalid multiaddr, saw the certhash before seeing the host and port');
-                }
-                return {
-                    ...state,
-                    certhashes: state.certhashes.concat([decodeCerthashStr(value ?? '')])
-                };
-            case protocols('p2p').code:
-                return {
-                    ...state,
-                    remotePeer: peerIdFromString(value ?? '')
-                };
-            default:
-                throw new Error(`unexpected component in multiaddr: ${proto} ${protocols(proto).name} ${value ?? ''} `);
-        }
-    }, 
-    // All webtransport urls are https
-    { url: 'https://', seenHost: false, seenPort: false, certhashes: [] });
-    return { url, certhashes, remotePeer };
+    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.family === 6 && host?.includes(':')) {
+        /**
+         * This resolves cases where `new WebTransport()` fails to construct because of an invalid URL being passed.
+         *
+         * `new URL('https://::1:4001/blah')` will throw a `TypeError: Failed to construct 'URL': Invalid URL`
+         * `new URL('https://[::1]:4001/blah')` is valid and will not.
+         *
+         * @see https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2
+         */
+        host = `[${host}]`;
+    }
+    return {
+        // All webtransport urls are https
+        url: `https://${host}:${opts.port}`,
+        certhashes,
+        remotePeer
+    };
 }
 //# sourceMappingURL=parse-multiaddr.js.map

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":"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"}
+{"version":3,"file":"parse-multiaddr.js","sourceRoot":"","sources":["../../../src/utils/parse-multiaddr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAkB,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAInD,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;QAC7B,MAAM,IAAI,SAAS,CAAC,mDAAmD,EAAE,uBAAuB,CAAC,CAAA;KAClG;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;QAC5C;;;;;;;WAOG;QACH,IAAI,GAAG,IAAI,IAAI,GAAG,CAAA;KACnB;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": "3.0.10-4db2f5f5",
+  "version": "3.0.10-d9159dd5",
   "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/master/packages/transport-webtransport#readme",
@@ -61,10 +61,11 @@
   },
   "dependencies": {
     "@chainsafe/libp2p-noise": "^13.0.0",
-    "@libp2p/interface": "0.1.2-4db2f5f5",
-    "@libp2p/logger": "3.0.2-4db2f5f5",
-    "@libp2p/peer-id": "3.0.2-4db2f5f5",
+    "@libp2p/interface": "0.1.2-d9159dd5",
+    "@libp2p/logger": "3.0.2-d9159dd5",
+    "@libp2p/peer-id": "3.0.2-d9159dd5",
     "@multiformats/multiaddr": "^12.1.5",
+    "@multiformats/multiaddr-matcher": "^1.0.1",
     "it-stream-types": "^2.0.1",
     "multiformats": "^12.0.1",
     "uint8arraylist": "^2.4.3",
@@ -72,7 +73,7 @@
   },
   "devDependencies": {
     "aegir": "^40.0.8",
-    "libp2p": "0.46.10-4db2f5f5",
+    "libp2p": "0.46.10-d9159dd5",
     "p-defer": "^4.0.0"
   },
   "browser": {

package/src/utils/parse-multiaddr.ts

@@ -1,5 +1,7 @@
+import { CodeError } from '@libp2p/interface/errors'
 import { peerIdFromString } from '@libp2p/peer-id'
 import { type Multiaddr, protocols } from '@multiformats/multiaddr'
+import { WebTransport } from '@multiformats/multiaddr-matcher'
 import { bases, digest } from 'multiformats/basics'
 import type { PeerId } from '@libp2p/interface/peer-id'
 import type { MultihashDigest } from 'multiformats/hashes/interface'
@@ -11,73 +13,46 @@ function decodeCerthashStr (s: string): MultihashDigest {
   return digest.decode(multibaseDecoder.decode(s))
 }
 
-export function parseMultiaddr (ma: Multiaddr): { url: string, certhashes: MultihashDigest[], remotePeer?: PeerId } {
+export interface ParsedMultiaddr {
+  url: string
+  certhashes: MultihashDigest[]
+  remotePeer?: PeerId
+}
+
+export function parseMultiaddr (ma: Multiaddr): ParsedMultiaddr {
+  if (!WebTransport.matches(ma)) {
+    throw new CodeError('Invalid multiaddr, was not a WebTransport address', 'ERR_INVALID_MULTIADDR')
+  }
+
   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
 
-  // This is simpler to have inline than extract into a separate function
-  // eslint-disable-next-line complexity
-  const { url, certhashes, remotePeer } = parts.reduce((state: { url: string, certhashes: MultihashDigest[], seenHost: boolean, seenPort: boolean, remotePeer?: PeerId }, [proto, value]) => {
-    switch (proto) {
-      case protocols('ip6').code:
-      // @ts-expect-error - ts error on switch fallthrough
-      case protocols('dns6').code:
-        if (value?.includes(':') === true) {
-          /**
-           * This resolves cases where `new globalThis.WebTransport` fails to construct because of an invalid URL being passed.
-           *
-           * `new URL('https://::1:4001/blah')` will throw a `TypeError: Failed to construct 'URL': Invalid URL`
-           * `new URL('https://[::1]:4001/blah')` is valid and will not.
-           *
-           * @see https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2
-           */
-          value = `[${value}]`
-        }
-      // eslint-disable-next-line no-fallthrough
-      case protocols('ip4').code:
-      case protocols('dns4').code:
-        if (state.seenHost || state.seenPort) {
-          throw new Error('Invalid multiaddr, saw host and already saw the host or port')
-        }
-        return {
-          ...state,
-          url: `${state.url}${value ?? ''}`,
-          seenHost: true
-        }
-      case protocols('quic').code:
-      case protocols('quic-v1').code:
-      case protocols('webtransport').code:
-        if (!state.seenHost || !state.seenPort) {
-          throw new Error("Invalid multiaddr, Didn't see host and port, but saw quic/webtransport")
-        }
-        return state
-      case protocols('udp').code:
-        if (state.seenPort) {
-          throw new Error('Invalid multiaddr, saw port but already saw the port')
-        }
-        return {
-          ...state,
-          url: `${state.url}:${value ?? ''}`,
-          seenPort: true
-        }
-      case protocols('certhash').code:
-        if (!state.seenHost || !state.seenPort) {
-          throw new Error('Invalid multiaddr, saw the certhash before seeing the host and port')
-        }
-        return {
-          ...state,
-          certhashes: state.certhashes.concat([decodeCerthashStr(value ?? '')])
-        }
-      case protocols('p2p').code:
-        return {
-          ...state,
-          remotePeer: peerIdFromString(value ?? '')
-        }
-      default:
-        throw new Error(`unexpected component in multiaddr: ${proto} ${protocols(proto).name} ${value ?? ''} `)
-    }
-  },
-  // All webtransport urls are https
-  { url: 'https://', seenHost: false, seenPort: false, certhashes: [] })
+  if (opts.family === 6 && host?.includes(':')) {
+    /**
+     * This resolves cases where `new WebTransport()` fails to construct because of an invalid URL being passed.
+     *
+     * `new URL('https://::1:4001/blah')` will throw a `TypeError: Failed to construct 'URL': Invalid URL`
+     * `new URL('https://[::1]:4001/blah')` is valid and will not.
+     *
+     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2
+     */
+    host = `[${host}]`
+  }
 
-  return { url, certhashes, remotePeer }
+  return {
+    // All webtransport urls are https
+    url: `https://${host}:${opts.port}`,
+    certhashes,
+    remotePeer
+  }
 }