fix: update interface tests (#5)

The tests still fail but now they run with the new suite.

Author: achingbrain

package.json

@@ -55,15 +55,15 @@
   "dependencies": {
     "@libp2p/crypto": "^5.0.1",
     "@libp2p/interface": "^2.0.1",
-    "@multiformats/mafmt": "^12.1.6",
     "@multiformats/multiaddr": "^12.3.1",
+    "@multiformats/multiaddr-matcher": "^1.6.0",
     "it-stream-types": "^2.0.2",
     "uint8arraylist": "^2.4.8"
   },
   "devDependencies": {
-    "@napi-rs/cli": "^3.0.0-alpha.64",
     "@libp2p/interface-compliance-tests": "^6.0.1",
     "@libp2p/logger": "^5.0.1",
+    "@napi-rs/cli": "^3.0.0-alpha.64",
     "aegir": "^44.1.1"
   },
   "packageManager": "[email protected]+sha256.c17d3797fb9a9115bf375e31bfd30058cac6bc9c3b8807a3d8cb2094794b51ca"

src/filter.ts

@@ -1,5 +1,5 @@
 import type { Multiaddr } from "@multiformats/multiaddr"
-import * as mafmt from '@multiformats/mafmt'
+import { QUICV1 } from '@multiformats/multiaddr-matcher'
 
 // p2p multi-address code
 export const CODE_P2P = 421
@@ -8,11 +8,7 @@ export const CODE_UNIX = 400
 
 export function listenFilter(multiaddrs: Multiaddr[]): Multiaddr[] {
   return multiaddrs.filter((ma) => {
-    if (ma.protoCodes().includes(CODE_CIRCUIT)) {
-    return false
-    }
-
-    return mafmt.QUICV1.matches(ma.decapsulateCode(CODE_P2P))
+    return QUICV1.exactMatch(ma)
   })
 }
 

src/listener.ts

@@ -26,7 +26,7 @@ type QuicListenerState = {
   listener: napi.Server
   listenAddr: Multiaddr
   controller: AbortController
-  connections: Set<Connection>
+  connections: Set<QuicConnection>
 } | {
   status: 'closed'
 }
@@ -143,7 +143,7 @@ export class QuicListener extends TypedEventEmitter<ListenerEvents> implements L
     })
 
     try {
-      const conn = await this.options.upgrader.upgradeInbound(maConn, {
+      await this.options.upgrader.upgradeInbound(maConn, {
         skipEncryption: true,
         skipProtection: true,
         muxerFactory: new QuicStreamMuxerFactory({
@@ -152,15 +152,12 @@ export class QuicListener extends TypedEventEmitter<ListenerEvents> implements L
         }),
       })
 
-      this.state.connections.add(conn)
+      this.state.connections.add(maConn)
       maConn.addEventListener('close', () => {
         if (this.state.status === 'listening') {
-          this.state.connections.delete(conn)
+          this.state.connections.delete(maConn)
         }
       }, { once: true })
-
-      this.safeDispatchEvent('connection', { detail: conn })
-      this.options.handler?.(conn)
     } catch (err) {
       this.log.error('%s error handling inbound connection', this.state.listenAddr.toString(), err)
       maConn.abort(err as Error)

src/transport.ts

@@ -97,6 +97,7 @@ export class QuicTransport implements Transport {
         connection,
         logger: this.components.logger,
       }),
+      signal: options.signal
     })
   }
 

test/compliance.spec.ts

@@ -1,40 +1,70 @@
 import transportCompliance from '@libp2p/interface-compliance-tests/transport'
-import { multiaddr } from '@multiformats/multiaddr'
-
+import { QUICV1 } from '@multiformats/multiaddr-matcher'
 import { quic } from '../src/index.js'
-import { QuicTransport } from '../src/transport.js'
-import { createComponents } from './util.js'
 
-describe.only('Interface compliance tests', () => {
+describe.only('Interface compliance tests (IPv4)', () => {
   // Fails these listener tests:
   // - close listener with connections, through timeout
   // - should not handle connection if upgradeInbound throws
   transportCompliance({
     async setup () {
-      const transport = quic()(await createComponents())
-
-      const addrs = [
-        multiaddr('/ip4/127.0.0.1/udp/9091/quic-v1'),
-        multiaddr('/ip4/127.0.0.1/udp/9092/quic-v1'),
-        multiaddr('/ip4/127.0.0.1/udp/9093/quic-v1'),
-        multiaddr('/ip6/::/udp/9094/quic-v1'),
-      ]
+      const dialer = {
+        transports: [
+          quic()
+        ],
+        connectionMonitor: {
+          enabled: false
+        }
+      }
 
-      const dial = QuicTransport.prototype.dial
-      // Used by the dial tests to simulate a delayed connect
-      const connector = {
-        delay (delayMs: number) {
-          QuicTransport.prototype.dial = async function (...args) {
-            await new Promise((resolve) => setTimeout(resolve, delayMs))
-            return dial.bind(this)(...args)
-          }
+      return {
+        dialer,
+        listener: {
+          addresses: {
+            listen: [
+              '/ip4/127.0.0.1/udp/9091/quic-v1',
+              '/ip4/127.0.0.1/udp/9092/quic-v1'
+            ]
+          },
+          ...dialer
         },
-        restore () {
-          QuicTransport.prototype.dial = dial
+        dialMultiaddrMatcher: QUICV1,
+        listenMultiaddrMatcher: QUICV1
+      }
+    },
+    async teardown () {}
+  })
+})
+
+describe('Interface compliance tests (IPv6)', () => {
+  // Fails these listener tests:
+  // - close listener with connections, through timeout
+  // - should not handle connection if upgradeInbound throws
+  transportCompliance({
+    async setup () {
+      const dialer = {
+        transports: [
+          quic()
+        ],
+        connectionMonitor: {
+          enabled: false
         }
       }
 
-      return { dialer: transport, listener: transport, listenAddrs: addrs, dialAddrs: addrs, connector }
+      return {
+        dialer,
+        listener: {
+          addresses: {
+            listen: [
+              '/ip6/::/udp/9091/quic-v1',
+              '/ip6/::/udp/9092/quic-v1'
+            ]
+          },
+          ...dialer
+        },
+        dialMultiaddrMatcher: QUICV1,
+        listenMultiaddrMatcher: QUICV1
+      }
     },
     async teardown () {}
   })