chore(deps): bump the actions-dependencies group across 1 directory with 5 updates

.envrc

@@ -1 +1 @@
-use flake path:.
+use flake

.github/dependabot.yaml

@@ -16,4 +16,11 @@ updates:
       actions-dependencies:
         patterns:
           - "*"
-
+  - package-ecosystem: "npm"
+    directory: "/clash-dashboard"
+    schedule:
+      interval: monthly
+    groups:
+      npm-dependencies:
+        patterns:
+          - "*"

.github/workflows/ci.yml

@@ -28,8 +28,79 @@ env:
 
 # Arm builder https://github.blog/changelog/2024-09-03-github-actions-arm64-linux-and-windows-runners-are-now-generally-available/
 jobs:
+  dashboard:
+    name: Dashboard
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+      - uses: actions/setup-node@v7
+        with:
+          node-version: 22
+          cache: npm
+          cache-dependency-path: clash-dashboard/package-lock.json
+      - name: Install dashboard dependencies
+        working-directory: clash-dashboard
+        run: npm ci
+      - name: Lint dashboard
+        working-directory: clash-dashboard
+        run: npm run lint
+      - name: Build dashboard
+        working-directory: clash-dashboard
+        run: npm run build
+      - name: Mark dashboard as prebuilt
+        run: touch clash-dashboard/dist/chimera-prebuilt.marker
+      - name: Upload dashboard build
+        uses: actions/upload-artifact@v7
+        with:
+          name: dashboard-dist
+          path: clash-dashboard/dist/
+          retention-days: 1
+
+  quality:
+    name: Rust quality (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          submodules: true
+      - uses: actions/cache@v6
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target
+          key: quality-${{ matrix.os }}-${{ hashFiles('**/Cargo.toml') }}
+          restore-keys: quality-${{ matrix.os }}-
+      - uses: ilammy/setup-nasm@v1
+        if: runner.os == 'Windows'
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.RUSTUP_TOOLCHAIN }}
+          components: rustfmt,clippy
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v3
+        with:
+          version: "23.x"
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Cargo fmt
+        if: runner.os == 'Linux'
+        run: cargo fmt --all -- --check
+      - name: Cargo clippy
+        run: cargo clippy -p clash-lib --all-targets --all-features -- -D warnings
+      - name: Test LAN proxy
+        run: cargo test -p clash-lib --test lan_proxy_tests --all-features
+
   compile:
     name: ${{ matrix.release-name || matrix.target || 'Unknown' }}
+    needs: [dashboard, quality]
     runs-on: ${{ matrix.os || 'ubuntu-latest' }}
     strategy:
       fail-fast: false
@@ -107,10 +178,15 @@ jobs:
             extra-args: -F "standard"
             no-test: true
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           submodules: true
-      - uses: actions/cache@v5
+      - name: Download dashboard build
+        uses: actions/download-artifact@v8
+        with:
+          name: dashboard-dist
+          path: clash-dashboard/dist
+      - uses: actions/cache@v6
         with:
           path: |
             ~/.cargo/registry
@@ -208,15 +284,15 @@ jobs:
         uses: actions/upload-artifact@v7
         if: ${{ !matrix.no-release }}
         with:
-          name: ${{ matrix.release-name || matrix.target }}
+          name: binary-${{ matrix.release-name || matrix.target }}
           path: ${{ env.PACKAGE }}-${{ matrix.release-name || matrix.target }}${{ matrix.postfix }}
 
       - name: Setup tmate session
-        if: ${{ failure() }}
+        if: ${{ failure() && github.actor != 'dependabot[bot]' }}
+        timeout-minutes: 15
         uses: mxschmitt/action-tmate@v3
         with:
           detached: true
-          timeout-minutes: 15
           limit-access-to-actor: true
 
   release:
@@ -226,7 +302,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
           fetch-tags: true
@@ -235,7 +311,7 @@ jobs:
         uses: actions/upload-artifact/merge@v7
         with:
           name: binaries
-          pattern: "*"
+          pattern: "binary-*"
           retention-days: 1
 
       - name: Download binaries

.github/workflows/coverage.yml

@@ -53,7 +53,7 @@ jobs:
           CLASH_DOCKER_TEST: ${{ startsWith(matrix.os, 'ubuntu') && 'true' || 'false' }}
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v6
+        uses: codecov/codecov-action@v7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: codecov.json

.github/workflows/proxy-throughput-release.yml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
@@ -109,6 +109,17 @@ jobs:
             e2e_throughput \
             -- --test-threads=4 --nocapture 2>&1 | tee throughput-test.log
 
+      - name: Run network reset reconnect tests
+        env:
+          RUST_LOG: ${{ env.RUST_LOG }}
+          CLASH_RS_CI: "true"
+        run: |
+          set -o pipefail
+          RUSTFLAGS="--cfg docker_test --cfg throughput_test" \
+          cargo test -p clash-lib --release --all-features \
+            proxy::hysteria2::e2e::e2e_network_reset_reauthenticates_hysteria2 \
+            -- --exact --nocapture 2>&1 | tee network-reset-test.log
+
       - name: Format results as Markdown
         if: always()
         env:
@@ -142,6 +153,7 @@ jobs:
             ${{ env.THROUGHPUT_RESULTS_FILE }}
             throughput-comment.md
             throughput-test.log
+            network-reset-test.log
           retention-days: 90
 
       - name: Post PR comment

.github/workflows/proxy-throughput.yml

@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
@@ -82,6 +82,7 @@ jobs:
         run: |
           docker pull v2fly/v2fly-core:v4.45.2
           docker pull p4gefau1t/trojan-go:latest
+          docker pull tobyxdd/hysteria:latest
           docker pull nicolaka/netshoot:latest
 
       # Download once so parallel clash-rs instances don't race to fetch it
@@ -107,6 +108,17 @@ jobs:
             e2e_throughput \
             -- --test-threads=4 --nocapture 2>&1 | tee throughput-test.log
 
+      - name: Run network reset reconnect tests
+        env:
+          RUST_LOG: ${{ env.RUST_LOG }}
+          CLASH_RS_CI: "true"
+        run: |
+          set -o pipefail
+          RUSTFLAGS="--cfg docker_test --cfg throughput_test" \
+          cargo test -p clash-lib --all-features \
+            proxy::hysteria2::e2e::e2e_network_reset_reauthenticates_hysteria2 \
+            -- --exact --nocapture 2>&1 | tee network-reset-test.log
+
       - name: Format results as Markdown
         if: always()
         env:
@@ -140,6 +152,7 @@ jobs:
             ${{ env.THROUGHPUT_RESULTS_FILE }}
             throughput-comment.md
             throughput-test.log
+            network-reset-test.log
           retention-days: 90
 
       - name: Post PR comment

.github/workflows/release.yml

@@ -16,13 +16,18 @@ on:
 permissions:
   contents: write
 
+concurrency:
+  group: release
+  cancel-in-progress: false
+
 jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
+          ref: master
           token: ${{ secrets.ADMIN_PAT }}
 
       - name: Configure Git
@@ -36,6 +41,11 @@ jobs:
       - name: Install cargo-edit
         run: cargo install cargo-edit
 
+      - name: Sync latest master
+        run: |
+          git fetch origin master
+          git rebase origin/master
+
       - name: Bump version
         run: cargo set-version --bump ${{ github.event.inputs.version_type }}
 
@@ -51,10 +61,30 @@ jobs:
           git add Cargo.toml clash-bin/Cargo.toml clash-dns/Cargo.toml clash-doc/Cargo.toml clash-ffi/Cargo.toml clash-lib/Cargo.toml Cargo.lock
           git commit -m "chore: bump version to ${{ steps.version.outputs.version }}"
 
-      - name: Create tag
-        run: git tag ${{ steps.version.outputs.version }}
-
-      - name: Push changes
+      - name: Push release atomically
+        env:
+          VERSION: ${{ steps.version.outputs.version }}
         run: |
-          git push origin master
-          git push origin ${{ steps.version.outputs.version }}
+          set -euo pipefail
+
+          for attempt in 1 2 3 4 5; do
+            echo "Push attempt $attempt/5"
+
+            # The branch may have advanced while this release job was running.
+            # Rebase the version bump onto the latest master before publishing.
+            git fetch origin master
+            git rebase origin/master
+            git update-ref "refs/tags/$VERSION" HEAD
+
+            if git push --atomic origin HEAD:master "refs/tags/$VERSION"; then
+              exit 0
+            fi
+
+            git update-ref -d "refs/tags/$VERSION" || true
+            if [ "$attempt" -eq 5 ]; then
+              echo "Failed to publish release after 5 attempts"
+              exit 1
+            fi
+
+            sleep $((attempt * 2))
+          done

.github/workflows/spell-check.yml

@@ -14,6 +14,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Actions Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - name: Spell Check Repo
-        uses: crate-ci/typos@v1.46.0
+        uses: crate-ci/typos@v1.50.0

.gitignore

@@ -4,7 +4,7 @@ docs/
 start*.*
 release*.*
 
-config*.yaml
+config*.yaml*
 
 cache.db
 scripts/
@@ -17,4 +17,4 @@ Country.mmdb
 
 geosite.dat
 
-xray*
+xray*