Merge branch 'main' into dependabot/github_actions/codecov/codecov-ac…

…tion-4.3.1

.github/workflows/automerge.yml

@@ -0,0 +1,8 @@
+name: Automerge
+on: [ pull_request ]
+
+jobs:
+  automerge:
+    uses: protocol/.github/.github/workflows/automerge.yml@master
+    with:
+      job: 'automerge'

.github/workflows/js-test-and-release.yml

@@ -0,0 +1,182 @@
+name: test & maybe release
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+
+  check:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: lts/*
+    - uses: ipfs/aegir/actions/cache-node-modules@master
+    - run: npm run --if-present lint
+    - run: npm run --if-present dep-check
+    - run: npm run --if-present doc-check
+
+  test-node:
+    needs: check
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-latest, ubuntu-latest, macos-latest]
+        node: [lts/*]
+      fail-fast: true
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - run: npm run --if-present test:node
+      - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
+        with:
+          flags: node
+
+  test-chrome:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
+      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - run: npm run --if-present test:chrome
+      - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
+        with:
+          flags: chrome
+
+  test-chrome-webworker:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
+      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - run: npm run --if-present test:chrome-webworker
+      - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
+        with:
+          flags: chrome-webworker
+
+  test-firefox:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
+      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - run: npm run --if-present test:firefox
+      - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
+        with:
+          flags: firefox
+
+  test-firefox-webworker:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
+      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - run: npm run --if-present test:firefox-webworker
+      - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
+        with:
+          flags: firefox-webworker
+
+  test-webkit:
+    needs: check
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        node: [lts/*]
+      fail-fast: true
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
+      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - run: npm run --if-present test:webkit
+      - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
+        with:
+          flags: webkit
+
+  test-webkit-webworker:
+    needs: check
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        node: [lts/*]
+      fail-fast: true
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
+      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - run: npm run --if-present test:webkit-webworker
+      - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
+        with:
+          flags: webkit-webworker
+
+  test-electron-main:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
+      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - run: npx xvfb-maybe npm run --if-present test:electron-main
+      - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
+        with:
+          flags: electron-main
+
+  test-electron-renderer:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
+      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - run: npx xvfb-maybe npm run --if-present test:electron-renderer
+      - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
+        with:
+          flags: electron-renderer
+
+  release:
+    needs: [test-node, test-chrome, test-chrome-webworker, test-firefox, test-firefox-webworker, test-webkit, test-webkit-webworker, test-electron-main, test-electron-renderer]
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
+      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - uses: ipfs/aegir/actions/docker-login@master
+        with:
+          docker-token: ${{ secrets.DOCKER_TOKEN }}
+          docker-username: ${{ secrets.DOCKER_USERNAME }}
+      - run: npm run --if-present release
+        env:
+          GITHUB_TOKEN: ${{ secrets.UCI_GITHUB_TOKEN || github.token }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.release-please-manifest.json

@@ -1 +1 @@
-{"interop":"2.0.31","packages/connection-encrypter-plaintext":"1.0.22","packages/connection-encrypter-tls":"1.0.9","packages/crypto":"4.1.1","packages/interface":"1.3.1","packages/interface-compliance-tests":"5.4.3","packages/interface-internal":"1.2.0","packages/kad-dht":"12.0.15","packages/keychain":"4.0.14","packages/libp2p":"1.5.1","packages/logger":"4.0.12","packages/metrics-prometheus":"3.0.22","packages/multistream-select":"5.1.9","packages/peer-collections":"5.2.0","packages/peer-discovery-bootstrap":"10.0.22","packages/peer-discovery-mdns":"10.0.22","packages/peer-id":"4.1.1","packages/peer-id-factory":"4.1.1","packages/peer-record":"7.0.16","packages/peer-store":"10.0.17","packages/protocol-autonat":"1.0.19","packages/protocol-dcutr":"1.0.19","packages/protocol-echo":"1.0.5","packages/protocol-fetch":"1.0.16","packages/protocol-identify":"2.0.0","packages/protocol-perf":"3.0.22","packages/protocol-ping":"1.0.17","packages/pubsub":"9.0.17","packages/pubsub-floodsub":"9.0.18","packages/record":"4.0.1","packages/stream-multiplexer-mplex":"10.0.22","packages/transport-circuit-relay-v2":"1.0.22","packages/transport-tcp":"9.0.24","packages/transport-webrtc":"4.0.31","packages/transport-websockets":"8.0.22","packages/transport-webtransport":"4.0.30","packages/upnp-nat":"1.0.20","packages/utils":"5.4.0"}
+{"interop":"2.0.32","packages/connection-encrypter-plaintext":"1.0.23","packages/connection-encrypter-tls":"1.0.10","packages/crypto":"4.1.1","packages/interface":"1.3.1","packages/interface-compliance-tests":"5.4.4","packages/interface-internal":"1.2.1","packages/kad-dht":"12.0.16","packages/keychain":"4.0.14","packages/libp2p":"1.5.2","packages/logger":"4.0.12","packages/metrics-prometheus":"3.0.23","packages/multistream-select":"5.1.9","packages/peer-collections":"5.2.1","packages/peer-discovery-bootstrap":"10.0.23","packages/peer-discovery-mdns":"10.0.23","packages/peer-id":"4.1.1","packages/peer-id-factory":"4.1.1","packages/peer-record":"7.0.17","packages/peer-store":"10.0.18","packages/protocol-autonat":"1.0.20","packages/protocol-dcutr":"1.0.20","packages/protocol-echo":"1.0.6","packages/protocol-fetch":"1.0.17","packages/protocol-identify":"2.0.1","packages/protocol-perf":"3.0.23","packages/protocol-ping":"1.0.18","packages/pubsub":"9.0.18","packages/pubsub-floodsub":"9.0.19","packages/record":"4.0.1","packages/stream-multiplexer-mplex":"10.0.23","packages/transport-circuit-relay-v2":"1.0.23","packages/transport-tcp":"9.0.25","packages/transport-webrtc":"4.0.32","packages/transport-websockets":"8.0.23","packages/transport-webtransport":"4.0.31","packages/upnp-nat":"1.0.21","packages/utils":"5.4.1"}

interop/CHANGELOG.md

@@ -168,6 +168,23 @@
     * @libp2p/webtransport bumped from ^4.0.18 to ^4.0.19
     * libp2p bumped from ^1.2.2 to ^1.2.3
 
+## [2.0.32](https://github.com/libp2p/js-libp2p/compare/multidim-interop-v2.0.31...multidim-interop-v2.0.32) (2024-05-14)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @libp2p/circuit-relay-v2 bumped from ^1.0.22 to ^1.0.23
+    * @libp2p/identify bumped from ^2.0.0 to ^2.0.1
+    * @libp2p/mplex bumped from ^10.0.22 to ^10.0.23
+    * @libp2p/ping bumped from ^1.0.17 to ^1.0.18
+    * @libp2p/tcp bumped from ^9.0.24 to ^9.0.25
+    * @libp2p/webrtc bumped from ^4.0.31 to ^4.0.32
+    * @libp2p/websockets bumped from ^8.0.22 to ^8.0.23
+    * @libp2p/webtransport bumped from ^4.0.30 to ^4.0.31
+    * libp2p bumped from ^1.5.1 to ^1.5.2
+
 ## [2.0.31](https://github.com/libp2p/js-libp2p/compare/multidim-interop-v2.0.30...multidim-interop-v2.0.31) (2024-05-01)
 
 

interop/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18
+FROM node:20
 
 WORKDIR /app
 COPY package.json .

interop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/multidim-interop",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "description": "Multidimensional interop tests",
   "author": "Glen De Cauwsemaecker <[email protected]> / @marcopolo",
   "license": "Apache-2.0 OR MIT",
@@ -57,18 +57,18 @@
   "dependencies": {
     "@chainsafe/libp2p-noise": "^15.0.0",
     "@chainsafe/libp2p-yamux": "^6.0.2",
-    "@libp2p/circuit-relay-v2": "^1.0.22",
-    "@libp2p/identify": "^2.0.0",
-    "@libp2p/mplex": "^10.0.22",
-    "@libp2p/ping": "^1.0.17",
-    "@libp2p/tcp": "^9.0.24",
-    "@libp2p/webrtc": "^4.0.31",
-    "@libp2p/websockets": "^8.0.22",
-    "@libp2p/webtransport": "^4.0.30",
+    "@libp2p/circuit-relay-v2": "^1.0.23",
+    "@libp2p/identify": "^2.0.1",
+    "@libp2p/mplex": "^10.0.23",
+    "@libp2p/ping": "^1.0.18",
+    "@libp2p/tcp": "^9.0.25",
+    "@libp2p/webrtc": "^4.0.32",
+    "@libp2p/websockets": "^8.0.23",
+    "@libp2p/webtransport": "^4.0.31",
     "@multiformats/mafmt": "^12.1.6",
     "@multiformats/multiaddr": "^12.2.1",
     "aegir": "^42.2.5",
-    "libp2p": "^1.5.1",
+    "libp2p": "^1.5.2",
     "redis": "^4.6.13"
   },
   "browser": {

interop/relay.js

@@ -20,7 +20,12 @@ export async function createRelay () {
     streamMuxers: [yamux()],
     services: {
       identify: identify(),
-      relay: circuitRelayServer()
+      relay: circuitRelayServer({
+        reservations: {
+          maxReservations: Infinity,
+          applyDefaultLimit: false
+        }
+      })
     }
   })
   return server

interop/test/ping.spec.ts

@@ -192,13 +192,17 @@ describe('ping test', function () {
           throw new Error('No relayAddr')
         }
         // const conn = await node.dial(multiaddr(relayAddr))
+        console.error('dial relay')
         await node.dial(multiaddr(relayAddr))
+        console.error('wait for relay reservation')
         multiaddrs = await hasWebrtcMultiaddr
       }
 
+      console.error('inform redis of dial address')
       // Send the listener addr over the proxy server so this works on both the Browser and Node
       await redisProxy(['RPUSH', 'listenerAddr', multiaddrs[0]])
       // Wait
+      console.error('wait for incoming ping')
       await new Promise(resolve => setTimeout(resolve, 1000 * parseInt(timeoutSecs, 10)))
     } catch (err) {
       // Show all errors in an aggregated error
@@ -220,12 +224,12 @@ describe('ping test', function () {
       otherMaStr = otherMaStr.replace('/tls/ws', '/wss')
 
       const otherMa = multiaddr(otherMaStr)
-
-      console.error(`node ${node.peerId.toString()} pings: ${otherMa}`)
       const handshakeStartInstant = Date.now()
 
+      console.error(`node ${node.peerId.toString()} dials: ${otherMa}`)
       await node.dial(otherMa)
 
+      console.error(`node ${node.peerId.toString()} pings: ${otherMa}`)
       const pingRTT = await node.services.ping.ping(multiaddr(otherMa))
       const handshakePlusOneRTT = Date.now() - handshakeStartInstant
       console.log(JSON.stringify({

packages/connection-encrypter-plaintext/CHANGELOG.md

@@ -72,6 +72,15 @@
   * devDependencies
     * @libp2p/interface-compliance-tests bumped from ^5.3.0 to ^5.3.1
 
+## [1.0.23](https://github.com/libp2p/js-libp2p/compare/plaintext-v1.0.22...plaintext-v1.0.23) (2024-05-14)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @libp2p/interface-compliance-tests bumped from ^5.4.3 to ^5.4.4
+
 ## [1.0.22](https://github.com/libp2p/js-libp2p/compare/plaintext-v1.0.21...plaintext-v1.0.22) (2024-05-01)
 
 

packages/connection-encrypter-plaintext/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/plaintext",
-  "version": "1.0.22",
+  "version": "1.0.23",
   "description": "An insecure connection encrypter",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/connection-encrypter-plaintext#readme",
@@ -60,7 +60,7 @@
     "uint8arraylist": "^2.4.8"
   },
   "devDependencies": {
-    "@libp2p/interface-compliance-tests": "^5.4.3",
+    "@libp2p/interface-compliance-tests": "^5.4.4",
     "@libp2p/logger": "^4.0.12",
     "@libp2p/peer-id-factory": "^4.1.1",
     "@multiformats/multiaddr": "^12.2.1",

packages/connection-encrypter-tls/CHANGELOG.md

@@ -6,6 +6,15 @@
   * devDependencies
     * @libp2p/interface-compliance-tests bumped from ^5.3.0 to ^5.3.1
 
+## [1.0.10](https://github.com/libp2p/js-libp2p/compare/tls-v1.0.9...tls-v1.0.10) (2024-05-14)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @libp2p/interface-compliance-tests bumped from ^5.4.3 to ^5.4.4
+
 ## [1.0.9](https://github.com/libp2p/js-libp2p/compare/tls-v1.0.8...tls-v1.0.9) (2024-05-01)
 
 

packages/connection-encrypter-tls/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/tls",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "A connection encrypter that uses TLS 1.3",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/connection-encrypter-tls#readme",
@@ -63,7 +63,7 @@
     "uint8arrays": "^5.0.3"
   },
   "devDependencies": {
-    "@libp2p/interface-compliance-tests": "^5.4.3",
+    "@libp2p/interface-compliance-tests": "^5.4.4",
     "@libp2p/logger": "^4.0.12",
     "@libp2p/peer-id-factory": "^4.1.1",
     "@multiformats/multiaddr": "^12.2.1",

packages/integration-tests/package.json

@@ -65,7 +65,7 @@
     "@multiformats/multiaddr": "^12.2.1",
     "aegir": "^42.2.5",
     "delay": "^6.0.0",
-    "execa": "^8.0.1",
+    "execa": "^9.0.2",
     "go-libp2p": "^1.1.1",
     "it-all": "^3.0.4",
     "it-pipe": "^3.0.1",