chore: firefox webrtc

doc/package.json

@@ -17,7 +17,7 @@
     "doc-check": "aegir doc-check"
   },
   "devDependencies": {
-    "aegir": "^47.0.21"
+    "aegir": "^47.0.22"
   },
   "private": true
 }

interop/Dockerfile

@@ -1,5 +1,5 @@
 # install node and browsers
-FROM mcr.microsoft.com/playwright:v1.50.1
+FROM mcr.microsoft.com/playwright:v1.55.0
 
 WORKDIR /app
 

interop/package.json

@@ -24,7 +24,7 @@
     "@libp2p/websockets": "^9.2.19",
     "@libp2p/webtransport": "^5.0.51",
     "@multiformats/multiaddr": "^13.0.1",
-    "aegir": "^47.0.21",
+    "aegir": "^47.0.22",
     "libp2p": "^2.10.0",
     "p-event": "^6.0.1",
     "redis": "^4.7.1"

interop/test/fixtures/get-libp2p.ts

@@ -15,7 +15,7 @@ import { yamux } from '@libp2p/yamux'
 import { createLibp2p } from 'libp2p'
 import type { Identify } from '@libp2p/identify'
 import type { Libp2p } from '@libp2p/interface'
-import type { PingService } from '@libp2p/ping'
+import type { Ping } from '@libp2p/ping'
 import type { Libp2pOptions } from 'libp2p'
 
 const isDialer: boolean = process.env.is_dialer === 'true'
@@ -26,8 +26,8 @@ const SECURE_CHANNEL = process.env.security
 const MUXER = process.env.muxer
 const IP = process.env.ip ?? '0.0.0.0'
 
-export async function getLibp2p (): Promise<Libp2p<{ ping: PingService }>> {
-  const options: Libp2pOptions<{ ping: PingService, identify: Identify }> = {
+export async function getLibp2p (): Promise<Libp2p<{ ping: Ping }>> {
+  const options: Libp2pOptions<{ ping: Ping, identify: Identify }> = {
     start: true,
     connectionGater: {
       denyDialMultiaddr: async () => false

package.json

@@ -39,12 +39,15 @@
     "docs:no-publish": "aegir docs --publish false -- --exclude interop --exclude doc"
   },
   "devDependencies": {
-    "aegir": "^47.0.6",
+    "aegir": "^47.0.22",
     "npm-run-all": "^4.1.5"
   },
   "workspaces": [
     "doc",
     "interop",
     "packages/*"
-  ]
+  ],
+  "overrides": {
+    "playwright-core": "next"
+  }
 }

packages/config/package.json

@@ -46,7 +46,7 @@
     "interface-datastore": "^8.3.2"
   },
   "devDependencies": {
-    "aegir": "^47.0.21",
+    "aegir": "^47.0.22",
     "datastore-core": "^10.0.4"
   },
   "sideEffects": false

packages/connection-encrypter-noise/package.json

@@ -76,7 +76,7 @@
     "@libp2p/yamux": "^7.0.1",
     "@multiformats/multiaddr": "^13.0.1",
     "@types/sinon": "^17.0.4",
-    "aegir": "^47.0.21",
+    "aegir": "^47.0.22",
     "execa": "^9.6.0",
     "go-libp2p": "^1.6.0",
     "iso-random-stream": "^2.0.2",

packages/connection-encrypter-plaintext/package.json

@@ -56,7 +56,7 @@
   "devDependencies": {
     "@libp2p/crypto": "^5.1.8",
     "@libp2p/logger": "^5.2.0",
-    "aegir": "^47.0.21",
+    "aegir": "^47.0.22",
     "protons": "^7.7.0",
     "sinon": "^21.0.0"
   },

packages/connection-encrypter-tls/package.json

@@ -57,7 +57,7 @@
   },
   "devDependencies": {
     "@libp2p/logger": "^5.2.0",
-    "aegir": "^47.0.21",
+    "aegir": "^47.0.22",
     "protons": "^7.7.0",
     "sinon": "^21.0.0",
     "sinon-ts": "^2.0.0"

packages/crypto/package.json

@@ -95,7 +95,7 @@
   },
   "devDependencies": {
     "@types/mocha": "^10.0.10",
-    "aegir": "^47.0.21",
+    "aegir": "^47.0.22",
     "asn1js": "^3.0.6",
     "benchmark": "^2.1.4",
     "protons": "^7.7.0"

packages/integration-tests/.aegir.js

@@ -155,6 +155,9 @@ export default {
       await before.libp2p?.stop()
       await before.goLibp2pRelay?.proc.kill()
       await before.libp2pLimitedRelay?.stop()
+
+      // node-datachannel sometimes causes the process to hang
+      process.exit(0)
     }
   }
 }

packages/integration-tests/package.json

@@ -9,8 +9,10 @@
     "test": "aegir test -- --exit",
     "clean": "aegir clean",
     "lint": "aegir lint",
-    "test:chrome": "aegir test -t browser --cov",
+    "test:chrome": "aegir test -t browser --cov -- --exit",
     "test:chrome-webworker": "aegir test -t webworker",
+    "test:firefox": "aegir test -t browser -- --browser firefox",
+    "test:firefox-webworker": "aegir test -t webworker -- --browser firefox",
     "test:node": "aegir test -t node -f dist/test/node.js -f dist/test/**/*.spec.js --cov -- --exit",
     "test:interop": "aegir test -t node -f dist/test/interop.js",
     "dep-check": "aegir dep-check"
@@ -51,7 +53,7 @@
     "@multiformats/dns": "^1.0.6",
     "@multiformats/multiaddr": "^13.0.1",
     "@multiformats/multiaddr-matcher": "^3.0.1",
-    "aegir": "^47.0.21",
+    "aegir": "^47.0.22",
     "delay": "^6.0.0",
     "detect-browser": "^5.3.0",
     "execa": "^9.6.0",

packages/integration-tests/test/bootstrap.spec.ts

@@ -31,11 +31,8 @@ describe('bootstrap', () => {
   let libp2p: Libp2p
 
   beforeEach(async () => {
-    [remotePeerId1, remotePeerId2] = await Promise.all([
-      peerIdFromPrivateKey(await generateKeyPair('Ed25519')),
-      peerIdFromPrivateKey(await generateKeyPair('Ed25519')),
-      peerIdFromPrivateKey(await generateKeyPair('Ed25519'))
-    ])
+    remotePeerId1 = peerIdFromPrivateKey(await generateKeyPair('Ed25519'))
+    remotePeerId2 = peerIdFromPrivateKey(await generateKeyPair('Ed25519'))
   })
 
   afterEach(async () => {

packages/integration-tests/test/dht.node.ts

@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 
 import { identify } from '@libp2p/identify'
+import { start, stop } from '@libp2p/interface'
 import { kadDHT, passthroughMapper } from '@libp2p/kad-dht'
 import { mplex } from '@libp2p/mplex'
 import { ping } from '@libp2p/ping'
@@ -97,10 +98,10 @@ describe('DHT subsystem operates correctly', () => {
         }
       })
 
-      await Promise.all([
-        libp2p.start(),
-        remoteLibp2p.start()
-      ])
+      await start(
+        libp2p,
+        remoteLibp2p
+      )
 
       await libp2p.peerStore.patch(remoteLibp2p.peerId, {
         multiaddrs: [remoteListenAddr]
@@ -109,13 +110,10 @@ describe('DHT subsystem operates correctly', () => {
     })
 
     afterEach(async () => {
-      if (libp2p != null) {
-        await libp2p.stop()
-      }
-
-      if (remoteLibp2p != null) {
-        await remoteLibp2p.stop()
-      }
+      await stop(
+        libp2p,
+        remoteLibp2p
+      )
     })
 
     it('should get notified of connected peers on dial', async () => {
@@ -186,11 +184,11 @@ describe('DHT subsystem operates correctly', () => {
       }
     })
 
-    await Promise.all([
-      libp2p.start(),
-      remoteLibp2p1.start(),
-      remoteLibp2p2.start()
-    ])
+    await start(
+      libp2p,
+      remoteLibp2p1,
+      remoteLibp2p2
+    )
 
     await libp2p.peerStore.patch(remoteLibp2p1.peerId, {
       multiaddrs: remoteLibp2p1.getMultiaddrs()
@@ -208,9 +206,9 @@ describe('DHT subsystem operates correctly', () => {
     ])
 
     await deferred.promise
-    return Promise.all([
-      remoteLibp2p1.stop(),
-      remoteLibp2p2.stop()
-    ])
+    return stop(
+      remoteLibp2p1,
+      remoteLibp2p2
+    )
   })
 })

packages/integration-tests/test/events.spec.ts

@@ -69,10 +69,10 @@ describe('events', () => {
     await dialer.dial(listener.getMultiaddrs())
 
     // Verify onConnection is called with the connection
-    const connections = await Promise.all([
+    const connections = [
       ...dialer.getConnections(listener.peerId),
       ...listener.getConnections(dialer.peerId)
-    ])
+    ]
     expect(connections).to.have.lengthOf(2)
 
     await Promise.all([

packages/integration-tests/test/mdns.node.ts

@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 
 import { randomBytes } from '@libp2p/crypto'
+import { start, stop } from '@libp2p/interface'
 import { mdns } from '@libp2p/mdns'
 import { tcp } from '@libp2p/tcp'
 import { multiaddr } from '@multiformats/multiaddr'
@@ -70,15 +71,17 @@ describe('mdns', () => {
       }
     })
 
-    await Promise.all([
-      remoteLibp2p1.start(),
-      remoteLibp2p2.start(),
-      libp2p.start()
-    ])
+    await start(
+      remoteLibp2p1,
+      remoteLibp2p2,
+      libp2p
+    )
 
     await deferred.promise
 
-    await remoteLibp2p1.stop()
-    await remoteLibp2p2.stop()
+    await stop(
+      remoteLibp2p1,
+      remoteLibp2p2
+    )
   })
 })

packages/interface-compliance-tests/package.json

@@ -92,7 +92,7 @@
     "@libp2p/utils": "^6.7.2",
     "@multiformats/multiaddr": "^13.0.1",
     "@multiformats/multiaddr-matcher": "^3.0.1",
-    "aegir": "^47.0.21",
+    "aegir": "^47.0.22",
     "delay": "^6.0.0",
     "it-all": "^3.0.9",
     "it-drain": "^3.0.10",

packages/interface-compliance-tests/src/stream-muxer/close-test.ts

@@ -368,6 +368,7 @@ export default (common: TestSetup<StreamMuxerFactory>): void => {
 
       await Promise.all([
         pEvent(listenerStream, 'close'),
+        // eslint-disable-next-line @typescript-eslint/await-thenable
         dialerStream.abort(new Error('Urk!'))
       ])
 

packages/interface-compliance-tests/src/stream-muxer/stream-test.ts

@@ -259,6 +259,7 @@ export default (common: TestSetup<StreamMuxerFactory>): void => {
 
       await Promise.all([
         pEvent(outboundStream, 'close'),
+        // eslint-disable-next-line @typescript-eslint/await-thenable
         inboundStream.abort(new Error('Urk!'))
       ])
 

packages/interface-compliance-tests/src/transport/index.ts

@@ -250,8 +250,9 @@ export default (common: TestSetup<TransportTestFixtures>): void => {
       expect(connection).to.have.property('streams').that.has.lengthOf(5)
 
       if (remoteConn != null) {
-        await pWaitFor(() => remoteConn.streams.length === 5, {
-          timeout: 5000
+        await pWaitFor(() => remoteConn.streams.filter(s => s.protocol === '/echo/1.0.0').length === 5, {
+          timeout: 5_000,
+          interval: 1_000
         })
       }
 
@@ -360,7 +361,7 @@ export default (common: TestSetup<TransportTestFixtures>): void => {
       const connection = await dialer.dial(dialAddrs[0])
       const echoProtocol = dialer.services.echo.protocol
 
-      for (let i = 0; i < 2000; i++) {
+      for (let i = 0; i < 2_000; i++) {
         const input = new Uint8Array(1024).fill(5)
         const output = await dialer.services.echo.echo(connection.remotePeer, input, {
           signal: AbortSignal.timeout(timeout)

packages/interface-compliance-tests/src/transport/utils.ts

@@ -28,7 +28,8 @@ export async function createPeer (config: Partial<Libp2pOptions> = {}): Promise<
     services: {
       ...config.services,
       echo: echo({
-        maxInboundStreams: 5_000
+        maxInboundStreams: 5_000,
+        timeout: 180_000
       })
     }
   })

packages/interface-internal/package.json

@@ -47,7 +47,7 @@
     "progress-events": "^1.0.1"
   },
   "devDependencies": {
-    "aegir": "^47.0.21"
+    "aegir": "^47.0.22"
   },
   "sideEffects": false
 }

packages/interface/package.json

@@ -50,7 +50,7 @@
     "uint8arraylist": "^2.4.8"
   },
   "devDependencies": {
-    "aegir": "^47.0.21"
+    "aegir": "^47.0.22"
   },
   "sideEffects": false
 }

packages/interface/src/stream-muxer.ts

@@ -142,7 +142,7 @@ export interface StreamMuxer<MuxedStream extends Stream = Stream> extends TypedE
   /**
    * Create a new stream
    */
-  createStream(options?: CreateStreamOptions): MuxedStream | Promise<MuxedStream>
+  createStream(options?: CreateStreamOptions): Promise<MuxedStream>
 
   /**
    * Immediately close the muxer, abort every open stream and discard any

packages/interop/package.json

@@ -57,10 +57,10 @@
     "uint8arrays": "^5.1.0"
   },
   "devDependencies": {
-    "aegir": "^47.0.21",
+    "aegir": "^47.0.22",
     "protons": "^7.7.0"
   },
   "peerDependencies": {
-    "aegir": "^47.0.21"
+    "aegir": "^47.0.22"
   }
 }

packages/kad-dht/package.json

@@ -86,7 +86,7 @@
     "@types/lodash.range": "^3.2.9",
     "@types/sinon": "^17.0.4",
     "@types/which": "^3.0.4",
-    "aegir": "^47.0.21",
+    "aegir": "^47.0.22",
     "benchmark": "^2.1.4",
     "datastore-core": "^10.0.4",
     "delay": "^6.0.0",

packages/keychain/package.json

@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "@libp2p/logger": "^5.2.0",
-    "aegir": "^47.0.21",
+    "aegir": "^47.0.22",
     "datastore-core": "^10.0.4"
   },
   "sideEffects": false

packages/libp2p-daemon-client/package.json

@@ -55,7 +55,7 @@
     "@chainsafe/libp2p-gossipsub": "^14.1.1",
     "@libp2p/daemon-server": "^8.0.6",
     "@libp2p/kad-dht": "^15.1.11",
-    "aegir": "^47.0.21",
+    "aegir": "^47.0.22",
     "it-all": "^3.0.9",
     "p-event": "^6.0.1",
     "sinon": "^21.0.0",