fix: webtrc protocol comes before peer id but after p2p-circuit (#6)

Fixes expected/valid WebRTC address format

Author: achingbrain

src/index.ts

@@ -586,7 +586,7 @@ const _Circuit = and(_P2P, literal('p2p-circuit'), peerId())
 export const Circuit = fmt(_Circuit)
 
 const _WebRTC = or(
-  and(_Circuit, literal('webrtc')),
+  and(_P2P, literal('p2p-circuit'), literal('webrtc'), peerId()),
   and(_P2P, literal('webrtc'), optional(peerId())),
   literal('webrtc')
 )
@@ -600,7 +600,7 @@ const _WebRTC = or(
  * import { multiaddr } from '@multiformats/multiaddr'
  * import { WebRTC } from '@multiformats/multiaddr-matcher'
  *
- * WebRTC.matches(multiaddr('/ip4/123.123.123.123/tcp/1234/p2p/QmRelay/p2p-circuit/p2p/QmTarget/webrtc')) // true
+ * WebRTC.matches(multiaddr('/ip4/123.123.123.123/tcp/1234/p2p/QmRelay/p2p-circuit/webrtc/p2p/QmTarget')) // true
  * ```
  */
 export const WebRTC = fmt(_WebRTC)

test/index.spec.ts

@@ -210,8 +210,9 @@ describe('multiaddr matcher', () => {
   ]
 
   const goodWebRTC = [
-    '/dnsaddr/example.org/wss/p2p/12D3KooWAzabxK2xhwGQuTUYjbcFT9SZcNvPS1cvj7bPMe2Rh9qF/p2p-circuit/p2p/12D3KooWA6L4J1yRwqLwdXPZBxz3UL4E8pEE6AEhFkqDH5LTQyfq/webrtc',
-    '/ip4/127.0.0.1/tcp/59119/ws/p2p/12D3KooWAzabxK2xhwGQuTUYjbcFT9SZcNvPS1cvj7bPMe2Rh9qF/p2p-circuit/p2p/12D3KooWA6L4J1yRwqLwdXPZBxz3UL4E8pEE6AEhFkqDH5LTQyfq/webrtc',
+    '/ip4/195.201.24.91/udp/4001/quic-v1/webtransport/certhash/uEiCsrVjg8IHCNqD-5x91Rv6CiOQmvCZBGdjxZQBoFYVo9g/certhash/uEiBdh-sKr7lCAwlJRWkmOM-LwW5jGhqq5J4jM-EEvNLucg/p2p/12D3KooWLBjadARix9eMbThfGjCYTdB3Jq6LZVzkReEYqBCaZPiA/p2p-circuit/webrtc/p2p/12D3KooWHHdY2cWY7HKsTuQeBgDydapRVxy1XGUSzeZXv52vsdav',
+    '/dnsaddr/example.org/wss/p2p/12D3KooWAzabxK2xhwGQuTUYjbcFT9SZcNvPS1cvj7bPMe2Rh9qF/p2p-circuit/webrtc/p2p/12D3KooWA6L4J1yRwqLwdXPZBxz3UL4E8pEE6AEhFkqDH5LTQyfq',
+    '/ip4/127.0.0.1/tcp/59119/ws/p2p/12D3KooWAzabxK2xhwGQuTUYjbcFT9SZcNvPS1cvj7bPMe2Rh9qF/p2p-circuit/webrtc/p2p/12D3KooWA6L4J1yRwqLwdXPZBxz3UL4E8pEE6AEhFkqDH5LTQyfq',
     '/ip4/0.0.0.0/udp/4004/webrtc-direct/certhash/uEiAeP0OEmBbGVTH5Bhnm3WopwRNSQ0et46xNkn2dIagnGw/webrtc',
     '/webrtc'
   ]