Merge branch 'main' into prevent-duplicate-connections

Author: achingbrain

.github/dependabot.yml

@@ -1,17 +1,32 @@
 version: 2
 updates:
 - package-ecosystem: npm
-  directory: "/"
+  directories:
+    - "**/*"
   schedule:
     interval: daily
     time: "10:00"
   open-pull-requests-limit: 20
   commit-message:
     prefix: "deps"
-    prefix-development: "deps(dev)"
+    prefix-development: "chore"
+  groups:
+    helia-deps: # group all deps that should be updated when Helia deps need updated
+      patterns:
+        - "*helia*"
+        - "*libp2p*"
+        - "*multiformats*"
+    store-deps: # group all blockstore and datastore updates (interface & impl)
+      patterns:
+        - "*blockstore*"
+        - "*datastore*"
+    kubo-deps: # group kubo, kubo-rpc-client, and ipfsd-ctl updates
+      patterns:
+        - "*kubo*"
+        - "ipfsd-ctl"
 - package-ecosystem: "github-actions"
   directory: "/"
   schedule:
     interval: "weekly"
   commit-message:
-    prefix: ci
+    prefix: chore

.github/workflows/examples.yml

@@ -17,40 +17,109 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - uses: ipfs/aegir/actions/cache-node-modules@main
 
-  # re-enable after [email protected] release
-  # test-examples:
-  #   name: Test example ${{ matrix.example.name }}
-  #   runs-on: ubuntu-latest
-  #   needs: build
-  #   continue-on-error: true
-  #   strategy:
-  #     matrix:
-  #       example:
-  #         - name: js-libp2p-example-chat
-  #           repo: https://github.com/libp2p/js-libp2p-example-chat.git
-  #           deps:
-  #             - '@libp2p/tcp@$PWD/packages/transport-tcp'
-  #             - '@libp2p/websockets@$PWD/packages/transport-websockets'
-  #             - 'libp2p@$PWD/packages/libp2p'
-  #         - name: js-libp2p-example-circuit-relay
-  #           repo: https://github.com/libp2p/js-libp2p-example-circuit-relay.git
-  #           deps:
-  #             - '@libp2p/circuit-relay-v2@$PWD/packages/transport-circuit-relay-v2'
-  #             - '@libp2p/identify@$PWD/packages/protocol-identify'
-  #             - '@libp2p/websockets@$PWD/packages/transport-websockets'
-  #             - 'libp2p@$PWD/packages/libp2p'
-  #         - name: js-libp2p-example-connection-encryption
-  #           repo: https://github.com/libp2p/js-libp2p-example-connection-encryption.git
-  #           deps:
-  #             - '@libp2p/plaintext@$PWD/packages/connection-encrypter-plaintext'
-  #             - '@libp2p/tcp@$PWD/packages/transport-tcp'
-  #             - 'libp2p@$PWD/packages/libp2p'
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - uses: actions/setup-node@v4
-  #       with:
-  #         node-version: lts/*
-  #     - uses: ipfs/aegir/actions/cache-node-modules@master
-  #     - run: npx xvfb-maybe aegir test-dependant ${{ matrix.example.repo }} --deps ${{ join(matrix.example.deps, ',') }}
+  test-examples:
+    name: Test example ${{ matrix.example.name }}
+    runs-on: ubuntu-latest
+    needs: build
+    continue-on-error: true
+    strategy:
+      matrix:
+        example:
+          - name: js-libp2p-example-browser-pubsub
+            repo: https://github.com/libp2p/js-libp2p-example-browser-pubsub.git
+            deps:
+              - '@libp2p/circuit-relay-v2@$PWD/packages/transport-circuit-relay-v2'
+              - '@libp2p/dcutr@$PWD/packages/protocol-dcutr'
+              - '@libp2p/identify@$PWD/packages/protocol-identify'
+              - '@libp2p/webrtc@$PWD/packages/transport-webrtc'
+              - '@libp2p/websockets@$PWD/packages/transport-websockets'
+              - 'libp2p@$PWD/packages/libp2p'
+          - name: js-libp2p-example-chat
+            repo: https://github.com/libp2p/js-libp2p-example-chat.git
+            deps:
+              - '@libp2p/mdns@$PWD/packages/peer-discovery-mdns'
+              - '@libp2p/tcp@$PWD/packages/transport-tcp'
+              - '@libp2p/websockets@$PWD/packages/transport-websockets'
+              - 'libp2p@$PWD/packages/libp2p'
+          - name: js-libp2p-example-circuit-relay
+            repo: https://github.com/libp2p/js-libp2p-example-circuit-relay.git
+            deps:
+              - '@libp2p/circuit-relay-v2@$PWD/packages/transport-circuit-relay-v2'
+              - '@libp2p/identify@$PWD/packages/protocol-identify'
+              - '@libp2p/websockets@$PWD/packages/transport-websockets'
+              - 'libp2p@$PWD/packages/libp2p'
+          - name: js-libp2p-example-connection-encryption
+            repo: https://github.com/libp2p/js-libp2p-example-connection-encryption.git
+            deps:
+              - '@libp2p/plaintext@$PWD/packages/connection-encrypter-plaintext'
+              - '@libp2p/tcp@$PWD/packages/transport-tcp'
+              - 'libp2p@$PWD/packages/libp2p'
+          - name: js-libp2p-example-custom-protocols
+            repo: https://github.com/libp2p/js-libp2p-example-custom-protocols.git
+            deps:
+              - '@libp2p/tcp@$PWD/packages/transport-tcp'
+              - '@libp2p/websockets@$PWD/packages/transport-websockets'
+              - 'libp2p@$PWD/packages/libp2p'
+          - name: js-libp2p-example-delegated-routing
+            repo: https://github.com/libp2p/js-libp2p-example-delegated-routing.git
+            deps:
+              - 'libp2p@$PWD/packages/libp2p'
+          - name: js-libp2p-example-discovery-mechanisms
+            repo: https://github.com/libp2p/js-libp2p-example-discovery-mechanisms.git
+            deps:
+              - '@libp2p/bootstrap@$PWD/packages/peer-discovery-bootstrap'
+              - '@libp2p/circuit-relay-v2@$PWD/packages/transport-circuit-relay-v2'
+              - '@libp2p/identify@$PWD/packages/protocol-identify'
+              - '@libp2p/kad-dht@$PWD/packages/kad-dht'
+              - '@libp2p/mdns@$PWD/packages/peer-discovery-mdns'
+              - '@libp2p/tcp@$PWD/packages/transport-tcp'
+              - 'libp2p@$PWD/packages/libp2p'
+          - name: js-libp2p-example-peer-and-content-routing
+            repo: https://github.com/libp2p/js-libp2p-example-peer-and-content-routing.git
+            deps:
+              - '@libp2p/identify@$PWD/packages/protocol-identify'
+              - '@libp2p/kad-dht@$PWD/packages/kad-dht'
+              - '@libp2p/tcp@$PWD/packages/transport-tcp'
+              - 'libp2p@$PWD/packages/libp2p'
+          - name: js-libp2p-example-pnet
+            repo: https://github.com/libp2p/js-libp2p-example-pnet.git
+            deps:
+              - '@libp2p/pnet@$PWD/packages/pnet'
+              - '@libp2p/tcp@$PWD/packages/transport-tcp'
+              - 'libp2p@$PWD/packages/libp2p'
+          - name: js-libp2p-example-protocol-and-stream-muxing
+            repo: https://github.com/libp2p/js-libp2p-example-protocol-and-stream-muxing.git
+            deps:
+              - '@libp2p/tcp@$PWD/packages/transport-tcp'
+              - 'libp2p@$PWD/packages/libp2p'
+          - name: js-libp2p-example-pubsub
+            repo: https://github.com/libp2p/js-libp2p-example-pubsub.git
+            deps:
+              - '@libp2p/identify@$PWD/packages/protocol-identify'
+              - '@libp2p/tcp@$PWD/packages/transport-tcp'
+              - 'libp2p@$PWD/packages/libp2p'
+          - name: js-libp2p-example-transports
+            repo: https://github.com/libp2p/js-libp2p-example-transports.git
+            deps:
+              - '@libp2p/tcp@$PWD/packages/transport-tcp'
+              - '@libp2p/websockets@$PWD/packages/transport-websockets'
+              - 'libp2p@$PWD/packages/libp2p'
+          - name: js-libp2p-example-webrtc-private-to-private
+            repo: https://github.com/libp2p/js-libp2p-example-webrtc-private-to-private.git
+            deps:
+              - '@libp2p/circuit-relay-v2@$PWD/packages/transport-circuit-relay-v2'
+              - '@libp2p/identify@$PWD/packages/protocol-identify'
+              - '@libp2p/ping@$PWD/packages/protocol-ping'
+              - '@libp2p/webrtc@$PWD/packages/transport-webrtc'
+              - '@libp2p/websockets@$PWD/packages/transport-websockets'
+              - 'libp2p@$PWD/packages/libp2p'
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+      - uses: ipfs/aegir/actions/cache-node-modules@main
+      - run: npx playwright install-deps
+      - run: npx xvfb-maybe aegir test-dependant ${{ matrix.example.repo }} --deps ${{ join(matrix.example.deps, ',') }}

.github/workflows/main.yml

@@ -7,6 +7,12 @@ on:
     branches:
       - '**'
 
+env:
+  CACHE_DIRS: |
+    ./interop/dist
+    ./interop/node_modules
+    ./doc/node_modules
+
 jobs:
 
   build:
@@ -16,12 +22,9 @@ jobs:
     - uses: actions/setup-node@v4
       with:
         node-version: lts/*
-    - uses: ipfs/aegir/actions/cache-node-modules@master
+    - uses: ipfs/aegir/actions/cache-node-modules@main
       with:
-        directories: |
-          ./interop/dist
-          ./interop/node_modules
-          ./doc/node_modules
+        directories: ${{ env.CACHE_DIRS }}
 
   check:
     needs: build
@@ -31,7 +34,9 @@ jobs:
     - uses: actions/setup-node@v4
       with:
         node-version: lts/*
-    - uses: ipfs/aegir/actions/cache-node-modules@master
+    - uses: ipfs/aegir/actions/cache-node-modules@main
+      with:
+        directories: ${{ env.CACHE_DIRS }}
     - run: npm run --if-present lint
     - run: npm run --if-present dep-check
     - run: npm run --if-present docs:no-publish
@@ -49,9 +54,11 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
-      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - uses: ipfs/aegir/actions/cache-node-modules@main
+        with:
+          directories: ${{ env.CACHE_DIRS }}
       - run: npm run --if-present test:node
-      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
+      - uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
         with:
           flags: node
           files: .coverage/*,packages/*/.coverage/*
@@ -65,9 +72,11 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - uses: ipfs/aegir/actions/cache-node-modules@main
+        with:
+          directories: ${{ env.CACHE_DIRS }}
       - run: npm run --if-present test:chrome
-      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
+      - uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
         with:
           flags: chrome
           files: .coverage/*,packages/*/.coverage/*
@@ -81,9 +90,11 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - uses: ipfs/aegir/actions/cache-node-modules@main
+        with:
+          directories: ${{ env.CACHE_DIRS }}
       - run: npm run --if-present test:chrome-webworker
-      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
+      - uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
         with:
           flags: chrome-webworker
           files: .coverage/*,packages/*/.coverage/*
@@ -97,9 +108,11 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - uses: ipfs/aegir/actions/cache-node-modules@main
+        with:
+          directories: ${{ env.CACHE_DIRS }}
       - run: npm run --if-present test:firefox
-      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
+      - uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
         with:
           flags: firefox
           files: .coverage/*,packages/*/.coverage/*
@@ -113,9 +126,11 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - uses: ipfs/aegir/actions/cache-node-modules@main
+        with:
+          directories: ${{ env.CACHE_DIRS }}
       - run: npm run --if-present test:firefox-webworker
-      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
+      - uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
         with:
           flags: firefox-webworker
           files: .coverage/*,packages/*/.coverage/*
@@ -129,14 +144,16 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - uses: ipfs/aegir/actions/cache-node-modules@main
+        with:
+          directories: ${{ env.CACHE_DIRS }}
       # https://github.com/actions/runner-images/issues/9733#issuecomment-2074590278
       - run: |
           sudo rm /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get update
       - run: npx playwright install-deps
       - run: npm run --if-present test:webkit
-      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
+      - uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
         with:
           flags: webkit
           files: .coverage/*,packages/*/.coverage/*
@@ -150,9 +167,11 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - uses: ipfs/aegir/actions/cache-node-modules@main
+        with:
+          directories: ${{ env.CACHE_DIRS }}
       - run: npx xvfb-maybe npm run --if-present test:electron-main
-      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
+      - uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
         with:
           flags: electron-main
           files: .coverage/*,packages/*/.coverage/*
@@ -166,9 +185,11 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - uses: ipfs/aegir/actions/cache-node-modules@main
+        with:
+          directories: ${{ env.CACHE_DIRS }}
       - run: npx xvfb-maybe npm run --if-present test:electron-renderer
-      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
+      - uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
         with:
           flags: electron-renderer
           files: .coverage/*,packages/*/.coverage/*
@@ -182,7 +203,9 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - uses: ipfs/aegir/actions/cache-node-modules@main
+        with:
+          directories: ${{ env.CACHE_DIRS }}
       - run: npm run test:interop -- --bail
 
   transport-interop:
@@ -193,11 +216,9 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
+      - uses: ipfs/aegir/actions/cache-node-modules@main
         with:
-          directories: |
-            ./interop/dist
-            ./interop/node_modules
+         directories: ${{ env.CACHE_DIRS }}
       - name: Build images
         run: (cd interop && make -j 4)
       - name: Save package-lock.json as artifact
@@ -248,8 +269,10 @@ jobs:
         with:
           node-version: lts/*
           registry-url: 'https://registry.npmjs.org'
-      - uses: ipfs/aegir/actions/cache-node-modules@master
-      - uses: ipfs/aegir/actions/docker-login@master
+      - uses: ipfs/aegir/actions/cache-node-modules@main
+        with:
+          directories: ${{ env.CACHE_DIRS }}
+      - uses: ipfs/aegir/actions/docker-login@main
         with:
           docker-token: ${{ secrets.DOCKER_TOKEN }}
           docker-username: ${{ secrets.DOCKER_USERNAME }}

.release-please-manifest.json

@@ -1 +1 @@
-{"packages/connection-encrypter-plaintext":"2.0.6","packages/connection-encrypter-tls":"2.0.6","packages/crypto":"5.0.4","packages/interface":"2.1.2","packages/interface-compliance-tests":"6.1.4","packages/interface-internal":"2.0.6","packages/kad-dht":"13.1.1","packages/keychain":"5.0.6","packages/libp2p":"2.1.4","packages/logger":"5.1.0","packages/metrics-devtools":"1.1.4","packages/metrics-prometheus":"4.2.0","packages/metrics-simple":"1.2.3","packages/multistream-select":"6.0.5","packages/peer-collections":"6.0.6","packages/peer-discovery-bootstrap":"11.0.6","packages/peer-discovery-mdns":"11.0.6","packages/peer-id":"5.0.4","packages/peer-record":"8.0.6","packages/peer-store":"11.0.6","packages/pnet":"2.0.6","packages/protocol-autonat":"2.0.6","packages/protocol-dcutr":"2.0.6","packages/protocol-echo":"2.0.6","packages/protocol-fetch":"2.0.6","packages/protocol-identify":"3.0.6","packages/protocol-perf":"4.0.6","packages/protocol-ping":"2.0.6","packages/pubsub":"10.0.6","packages/pubsub-floodsub":"10.1.4","packages/record":"4.0.4","packages/stream-multiplexer-mplex":"11.0.6","packages/transport-circuit-relay-v2":"2.1.1","packages/transport-tcp":"10.0.6","packages/transport-webrtc":"5.0.8","packages/transport-websockets":"9.0.6","packages/transport-webtransport":"5.0.8","packages/upnp-nat":"2.0.6","packages/utils":"6.0.6"}
+{"packages/auto-tls":"1.0.4","packages/config":"1.0.1","packages/connection-encrypter-plaintext":"2.0.13","packages/connection-encrypter-tls":"2.0.13","packages/crypto":"5.0.9","packages/interface":"2.4.0","packages/interface-compliance-tests":"6.2.3","packages/interface-internal":"2.2.2","packages/kad-dht":"14.2.0","packages/keychain":"5.0.12","packages/libp2p":"2.5.0","packages/logger":"5.1.6","packages/metrics-devtools":"1.2.0","packages/metrics-opentelemetry":"1.0.0","packages/metrics-prometheus":"4.3.0","packages/metrics-simple":"1.3.0","packages/multistream-select":"6.0.11","packages/peer-collections":"6.0.14","packages/peer-discovery-bootstrap":"11.0.17","packages/peer-discovery-mdns":"11.0.17","packages/peer-id":"5.0.10","packages/peer-record":"8.0.14","packages/peer-store":"11.0.14","packages/pnet":"2.0.17","packages/protocol-autonat":"2.0.16","packages/protocol-dcutr":"2.0.15","packages/protocol-echo":"2.1.6","packages/protocol-fetch":"3.0.0","packages/protocol-identify":"3.0.15","packages/protocol-perf":"4.0.17","packages/protocol-ping":"2.0.15","packages/pubsub":"10.0.15","packages/pubsub-floodsub":"10.1.16","packages/record":"4.0.4","packages/stream-multiplexer-mplex":"11.0.17","packages/transport-circuit-relay-v2":"3.1.7","packages/transport-memory":"1.0.3","packages/transport-tcp":"10.0.15","packages/transport-webrtc":"5.0.23","packages/transport-websockets":"9.1.2","packages/transport-webtransport":"5.0.22","packages/upnp-nat":"3.0.4","packages/utils":"6.3.1"}