Compare commits

..
Author SHA1 Message Date
Tunglies 62666b5e27 fix(proxies): derive mounted delays from shared snapshots
Remove mirrored item delay state so profile cache invalidation cannot leave reused rows blank until remount. Read current node history when the shared cache is empty and preserve snapshot identity for React subscriptions.
2026-11-11 05:47:22 +08:00
Tunglies 2db9da5d06 test(proxies): narrow delay regressions to reported failures
Remove global fake timers and deferred request scaffolding. Keep only profile-switch cache isolation and shared-key listener cleanup regressions.
2026-11-10 12:15:39 +08:00
Tunglies 371ca6e907 test(proxies): keep focused delay regression coverage
Reduce added delay coverage to profile-switch isolation and shared-key subscriptions. Append the changelog entry after existing general fixes.
2026-11-10 05:58:17 +08:00
Tunglies b02fb26c0c fix(proxies): retain independent delay listeners
Notify every mounted occurrence sharing a delay key and scope cleanup to its registered listener. Cover pending results, profile reset, and either occurrence unmounting without restoring direct unfenced updates.
2026-11-10 05:55:28 +08:00
Tunglies a2d875cebd fix(proxies): invalidate delays when switching profiles
Clear cached delays and fence old measurements when the active profile changes. Refresh proxy history on page entry without forcing automatic measurements or expanding groups.
2026-11-10 05:50:55 +08:00
179 changed files with 5756 additions and 4583 deletions
-1
View File
@@ -1,3 +1,2 @@
avoid-breaking-exported-api = true avoid-breaking-exported-api = true
allow-unwrap-in-tests = true
cognitive-complexity-threshold = 25 cognitive-complexity-threshold = 25
+3 -3
View File
@@ -4,11 +4,11 @@
"features": { "features": {
"ghcr.io/devcontainers/features/node:2": { "ghcr.io/devcontainers/features/node:2": {
"version": "26.13.1", "version": "26.13.0",
"pnpmVersion": "12.21.0" "pnpmVersion": "12.18.0"
}, },
"ghcr.io/devcontainers/features/rust:1": { "ghcr.io/devcontainers/features/rust:1": {
"version": "1.100.0", "version": "1.99.1",
"profile": "default" "profile": "default"
}, },
"ghcr.io/devcontainers/features/git:1": {}, "ghcr.io/devcontainers/features/git:1": {},
-31
View File
@@ -1,31 +0,0 @@
# Issue and PR Guidelines
These rules apply to Issue and PR work, including operations through `gh` or an
API. The root [AGENTS.md](../AGENTS.md) defines the repository-wide contract.
## Issues
When creating, drafting, triaging, splitting, or implementing from a community
issue, follow [ISSUE_GUIDELINES.md](ISSUE_GUIDELINES.md). Do not create or modify
GitHub issues without explicit authorization.
## PR Descriptions
When creating or updating a PR body, follow the
[PR template](PULL_REQUEST_TEMPLATE.md). Describe the final change; replace stale
text instead of appending work history. Omit routine check-pass declarations,
including Clippy, lint, and local tests. Keep only evidence and limitations that
help reviewers assess the change; the template defines what belongs in the body
and when Scope is needed.
Before publishing or updating a PR body, remove repetition, self-evaluation, and
details already clear from the diff. Keep only sentences that help review the
change.
## AI Disclosure
When an agent creates or co-creates a PR or Issue, append a final body line with
the model and effort used (e.g. `Assisted by: GPT-5.6 High`). Effort may be omitted
when the runtime does not report it. Human contributors are not asked to disclose
AI assistance. Disclosure is transparency only and carries no positive or
negative weight.
+1 -29
View File
@@ -1,29 +1,3 @@
<!--
Describe the final problem, approach, and evidence needed to review this change.
When updating the body, replace stale text instead of appending implementation
history or review-round summaries.
State each fact once. Omit details already clear from the diff unless they
explain a non-obvious constraint or trade-off. Describe concrete behavior instead
of self-evaluation or unsupported assurances such as "more robust" or "seamless".
Mention unchanged behavior or excluded areas only when they matter to review.
Before publishing, remove any sentence whose deletion loses no information
needed to understand the problem, approach, evidence, or material limitations.
Omit file-by-file diff summaries, internal planning scores, agent handoffs, and
routine check results such as "Clippy passed", "lint passed", or "local tests
passed". Do not add a Validation/Testing section for a command checklist.
Include concrete before/after behavior or measurements when they support the
change, and retain limitations that affect review. Link reviewer-accessible
details when needed; do not paste full scripts, logs, or test matrices into the
body, including collapsed sections.
Keep Scope only when explaining necessary changes outside the core fix, PR
dependencies, or why added tests are needed. Do not repeat Approach there.
For small changes, Problem and Approach may be combined into one short paragraph;
remove unnecessary headings instead of adding text to fill them.
-->
## Problem ## Problem
What breaks or what is missing. Product bug fixes and features require a What breaks or what is missing. Product bug fixes and features require a
@@ -40,6 +14,4 @@ Why this change solves the problem — the reasoning behind the approach, not a
## Scope ## Scope
Optional: explain necessary changes outside the core fix, PR dependencies, or What changed. If anything outside the core fix was touched, explain why it was necessary. New tests are not expected by default — if any were added, justify why each is needed.
why added tests are needed. Otherwise remove this section. New tests are not
expected by default.
+13 -58
View File
@@ -5,10 +5,10 @@
"version": "v9.0.0", "version": "v9.0.0",
"sha": "3a2844b7e9c422d3c10d287c895573f7108da1b3" "sha": "3a2844b7e9c422d3c10d287c895573f7108da1b3"
}, },
"github/gh-aw-actions/setup@v1.3.1": { "github/gh-aw-actions/setup@v1.0.1": {
"repo": "github/gh-aw-actions/setup", "repo": "github/gh-aw-actions/setup",
"version": "v1.3.1", "version": "v1.0.1",
"sha": "dfe97a19c8249d41e2adfc95f92db2b8facea58f" "sha": "221ba4f4319de6b8e809d1a15528b3ae6a818aa5"
} }
}, },
"containers": { "containers": {
@@ -32,16 +32,6 @@
"digest": "sha256:2c78aaba1c108e130e2d6d01e4f2cca334ea04c53e6f258913ac34173fe7e3b2", "digest": "sha256:2c78aaba1c108e130e2d6d01e4f2cca334ea04c53e6f258913ac34173fe7e3b2",
"pinned_image": "ghcr.io/github/gh-aw-firewall/agent:0.28.23@sha256:2c78aaba1c108e130e2d6d01e4f2cca334ea04c53e6f258913ac34173fe7e3b2" "pinned_image": "ghcr.io/github/gh-aw-firewall/agent:0.28.23@sha256:2c78aaba1c108e130e2d6d01e4f2cca334ea04c53e6f258913ac34173fe7e3b2"
}, },
"ghcr.io/github/gh-aw-firewall/agent:0.29.11": {
"image": "ghcr.io/github/gh-aw-firewall/agent:0.29.11",
"digest": "sha256:8774a73c351395b41d2ad0af4ddb4689007c67de3cd08bd9f43bb8a0e300690e",
"pinned_image": "ghcr.io/github/gh-aw-firewall/agent:0.29.11@sha256:8774a73c351395b41d2ad0af4ddb4689007c67de3cd08bd9f43bb8a0e300690e"
},
"ghcr.io/github/gh-aw-firewall/agent:0.29.14": {
"image": "ghcr.io/github/gh-aw-firewall/agent:0.29.14",
"digest": "sha256:7f649a02f2cc235325ab512f546854e0fad32b7abdc6c24c5475ddc0639e0aaa",
"pinned_image": "ghcr.io/github/gh-aw-firewall/agent:0.29.14@sha256:7f649a02f2cc235325ab512f546854e0fad32b7abdc6c24c5475ddc0639e0aaa"
},
"ghcr.io/github/gh-aw-firewall/api-proxy:0.28.13": { "ghcr.io/github/gh-aw-firewall/api-proxy:0.28.13": {
"image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.28.13", "image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.28.13",
"digest": "sha256:61f12dcff38eb008b645d87a5541763452f409d9040eb243718764944167b1a2", "digest": "sha256:61f12dcff38eb008b645d87a5541763452f409d9040eb243718764944167b1a2",
@@ -62,31 +52,6 @@
"digest": "sha256:c15c3d1208df10c5b588a3657be53742aa982ae0909d1eb1812525268794ca64", "digest": "sha256:c15c3d1208df10c5b588a3657be53742aa982ae0909d1eb1812525268794ca64",
"pinned_image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.28.23@sha256:c15c3d1208df10c5b588a3657be53742aa982ae0909d1eb1812525268794ca64" "pinned_image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.28.23@sha256:c15c3d1208df10c5b588a3657be53742aa982ae0909d1eb1812525268794ca64"
}, },
"ghcr.io/github/gh-aw-firewall/api-proxy:0.29.11": {
"image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.29.11",
"digest": "sha256:88d2d0e315a504d93fd4fb8847fd0f6b7f4469f41a6fc6047b3dc9654c56ab2c",
"pinned_image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.29.11@sha256:88d2d0e315a504d93fd4fb8847fd0f6b7f4469f41a6fc6047b3dc9654c56ab2c"
},
"ghcr.io/github/gh-aw-firewall/api-proxy:0.29.14": {
"image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.29.14",
"digest": "sha256:136785634c9207d7328c701d31d53941542ef307840bda6b348274c8842557c0",
"pinned_image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.29.14@sha256:136785634c9207d7328c701d31d53941542ef307840bda6b348274c8842557c0"
},
"ghcr.io/github/gh-aw-firewall/cli-proxy:0.29.11": {
"image": "ghcr.io/github/gh-aw-firewall/cli-proxy:0.29.11",
"digest": "sha256:97782bc0d8ff7f80f19ae2fdc5e1668517aa732a6fa077e64b8d3919238496d2",
"pinned_image": "ghcr.io/github/gh-aw-firewall/cli-proxy:0.29.11@sha256:97782bc0d8ff7f80f19ae2fdc5e1668517aa732a6fa077e64b8d3919238496d2"
},
"ghcr.io/github/gh-aw-firewall/cli-proxy:0.29.14": {
"image": "ghcr.io/github/gh-aw-firewall/cli-proxy:0.29.14",
"digest": "sha256:3f9cf5c56bfea6f845ac7a213f4bbbac8c5e16ea1587599fae898da3ab6a6e12",
"pinned_image": "ghcr.io/github/gh-aw-firewall/cli-proxy:0.29.14@sha256:3f9cf5c56bfea6f845ac7a213f4bbbac8c5e16ea1587599fae898da3ab6a6e12"
},
"ghcr.io/github/gh-aw-firewall/router:0.29.14": {
"image": "ghcr.io/github/gh-aw-firewall/router:0.29.14",
"digest": "sha256:b8822defe0cc2abebc619ee1cf49c34c67286fab117512f0d667962572564be0",
"pinned_image": "ghcr.io/github/gh-aw-firewall/router:0.29.14@sha256:b8822defe0cc2abebc619ee1cf49c34c67286fab117512f0d667962572564be0"
},
"ghcr.io/github/gh-aw-firewall/squid:0.28.13": { "ghcr.io/github/gh-aw-firewall/squid:0.28.13": {
"image": "ghcr.io/github/gh-aw-firewall/squid:0.28.13", "image": "ghcr.io/github/gh-aw-firewall/squid:0.28.13",
"digest": "sha256:58a8dc5be3fbafeef7da0532c38bd9047f86bf1b3c4cfd7d9b7d8d28e80a2b56", "digest": "sha256:58a8dc5be3fbafeef7da0532c38bd9047f86bf1b3c4cfd7d9b7d8d28e80a2b56",
@@ -107,30 +72,20 @@
"digest": "sha256:02ffc56dd40158223064ef03a78c2d9717473c93723b4e403d455ea6f0b09ae0", "digest": "sha256:02ffc56dd40158223064ef03a78c2d9717473c93723b4e403d455ea6f0b09ae0",
"pinned_image": "ghcr.io/github/gh-aw-firewall/squid:0.28.23@sha256:02ffc56dd40158223064ef03a78c2d9717473c93723b4e403d455ea6f0b09ae0" "pinned_image": "ghcr.io/github/gh-aw-firewall/squid:0.28.23@sha256:02ffc56dd40158223064ef03a78c2d9717473c93723b4e403d455ea6f0b09ae0"
}, },
"ghcr.io/github/gh-aw-firewall/squid:0.29.11": { "ghcr.io/github/gh-aw-mcpg:v0.4.25": {
"image": "ghcr.io/github/gh-aw-firewall/squid:0.29.11", "image": "ghcr.io/github/gh-aw-mcpg:v0.4.25",
"digest": "sha256:861739ecf924dd2db5e5fb652db2ad82aaafd1615623297ddabc8f41a36b2847", "digest": "sha256:9be0a86220e807a0ecc89e53d7453468f7a53fbc6b3d1efd2299025ffe01d086",
"pinned_image": "ghcr.io/github/gh-aw-firewall/squid:0.29.11@sha256:861739ecf924dd2db5e5fb652db2ad82aaafd1615623297ddabc8f41a36b2847" "pinned_image": "ghcr.io/github/gh-aw-mcpg:v0.4.25@sha256:9be0a86220e807a0ecc89e53d7453468f7a53fbc6b3d1efd2299025ffe01d086"
},
"ghcr.io/github/gh-aw-firewall/squid:0.29.14": {
"image": "ghcr.io/github/gh-aw-firewall/squid:0.29.14",
"digest": "sha256:878b9c1aaeca076004bf2157dd2be28586b68b2b3d69c3ff8fd2b5add2a3126c",
"pinned_image": "ghcr.io/github/gh-aw-firewall/squid:0.29.14@sha256:878b9c1aaeca076004bf2157dd2be28586b68b2b3d69c3ff8fd2b5add2a3126c"
},
"ghcr.io/github/gh-aw-mcpg:v0.5.10": {
"image": "ghcr.io/github/gh-aw-mcpg:v0.5.10",
"digest": "sha256:629ddcd68a48ab02e7db8af527d2756c6db563b00c1d31d8aa8fcbac96f01c59",
"pinned_image": "ghcr.io/github/gh-aw-mcpg:v0.5.10@sha256:629ddcd68a48ab02e7db8af527d2756c6db563b00c1d31d8aa8fcbac96f01c59"
}, },
"ghcr.io/github/gh-aw-node": { "ghcr.io/github/gh-aw-node": {
"image": "ghcr.io/github/gh-aw-node", "image": "ghcr.io/github/gh-aw-node",
"digest": "sha256:1fe145873f46e4dded511319d2a91dbaed5bb4d9c43d93fdc383198d1bf02b7f", "digest": "sha256:bac2192f6374d6262116399b34fc5e143d576f82719e90a18261cae7480f4d4e",
"pinned_image": "ghcr.io/github/gh-aw-node@sha256:1fe145873f46e4dded511319d2a91dbaed5bb4d9c43d93fdc383198d1bf02b7f" "pinned_image": "ghcr.io/github/gh-aw-node@sha256:bac2192f6374d6262116399b34fc5e143d576f82719e90a18261cae7480f4d4e"
}, },
"ghcr.io/github/github-mcp-server:v2.1.0": { "ghcr.io/github/github-mcp-server:v1.12.2": {
"image": "ghcr.io/github/github-mcp-server:v2.1.0", "image": "ghcr.io/github/github-mcp-server:v1.12.2",
"digest": "sha256:f6056fc10bfffcc8c81a6417a2e9ca12808647e8dd6049642a4feaadee0e0f8a", "digest": "sha256:508a0857ec762b1ab1cece29193345b501fab1dd9d1228a7b617062954cecac6",
"pinned_image": "ghcr.io/github/github-mcp-server:v2.1.0@sha256:f6056fc10bfffcc8c81a6417a2e9ca12808647e8dd6049642a4feaadee0e0f8a" "pinned_image": "ghcr.io/github/github-mcp-server:v1.12.2@sha256:508a0857ec762b1ab1cece29193345b501fab1dd9d1228a7b617062954cecac6"
} }
} }
} }
+8 -8
View File
@@ -51,7 +51,7 @@ jobs:
- name: Install Node - name: Install Node
uses: actions/setup-node@v7 uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
- name: Install dependencies - name: Install dependencies
run: pnpm install --frozen-lockfile run: pnpm install --frozen-lockfile
@@ -154,7 +154,7 @@ jobs:
- name: Install Rust Stable - name: Install Rust Stable
uses: dtolnay/rust-toolchain@master uses: dtolnay/rust-toolchain@master
with: with:
toolchain: '1.100.0' toolchain: '1.99.1'
targets: ${{ matrix.target }} targets: ${{ matrix.target }}
- name: Rust Cache - name: Rust Cache
@@ -182,7 +182,7 @@ jobs:
- name: Install Node - name: Install Node
uses: actions/setup-node@v7 uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
cache: 'pnpm' cache: 'pnpm'
- name: Pnpm install and check - name: Pnpm install and check
@@ -240,7 +240,7 @@ jobs:
- name: Install Rust Stable - name: Install Rust Stable
uses: dtolnay/rust-toolchain@master uses: dtolnay/rust-toolchain@master
with: with:
toolchain: '1.100.0' toolchain: '1.99.1'
targets: ${{ matrix.target }} targets: ${{ matrix.target }}
- name: Rust Cache - name: Rust Cache
@@ -262,7 +262,7 @@ jobs:
- name: Install Node - name: Install Node
uses: actions/setup-node@v7 uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
cache: 'pnpm' cache: 'pnpm'
- name: Pnpm install and check - name: Pnpm install and check
@@ -373,7 +373,7 @@ jobs:
- name: Install Rust Stable - name: Install Rust Stable
uses: dtolnay/rust-toolchain@master uses: dtolnay/rust-toolchain@master
with: with:
toolchain: '1.100.0' toolchain: '1.99.1'
targets: ${{ matrix.target }} targets: ${{ matrix.target }}
- name: Rust Cache - name: Rust Cache
@@ -395,7 +395,7 @@ jobs:
- name: Install Node - name: Install Node
uses: actions/setup-node@v7 uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
cache: 'pnpm' cache: 'pnpm'
- name: Pnpm install and check - name: Pnpm install and check
@@ -479,7 +479,7 @@ jobs:
- name: Install Node - name: Install Node
uses: actions/setup-node@v7 uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
- uses: pnpm/action-setup@v6.1.1 - uses: pnpm/action-setup@v6.1.1
name: Install pnpm name: Install pnpm
+1 -1
View File
@@ -63,7 +63,7 @@ jobs:
- uses: actions/setup-node@v7 - uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
cache: 'pnpm' cache: 'pnpm'
- run: pnpm install --frozen-lockfile - run: pnpm install --frozen-lockfile
+3 -3
View File
@@ -31,9 +31,9 @@ jobs:
with: with:
persist-credentials: false persist-credentials: false
- name: Install gh-aw extension - name: Install gh-aw extension
uses: github/gh-aw-actions/setup-cli@dfe97a19c8249d41e2adfc95f92db2b8facea58f # v1.3.1 uses: github/gh-aw-actions/setup-cli@406c7719e31d7fe354224d4bb8fe3d4aeb47da1c # v1.2.1
with: with:
version: v1.3.1 version: v1.0.1
- name: Install Rust Stable - name: Install Rust Stable
uses: dtolnay/rust-toolchain@stable uses: dtolnay/rust-toolchain@stable
with: with:
@@ -49,7 +49,7 @@ jobs:
- name: Install Node.js - name: Install Node.js
uses: actions/setup-node@v7 uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
cache: 'pnpm' cache: 'pnpm'
- name: Install frontend dependencies - name: Install frontend dependencies
env: env:
+1 -1
View File
@@ -43,7 +43,7 @@ jobs:
- name: Install Node - name: Install Node
uses: actions/setup-node@v7 uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
- uses: pnpm/action-setup@v6 - uses: pnpm/action-setup@v6
name: Install pnpm name: Install pnpm
+3 -3
View File
@@ -74,7 +74,7 @@ jobs:
- name: Install Rust Stable - name: Install Rust Stable
if: github.event.inputs[matrix.input] == 'true' if: github.event.inputs[matrix.input] == 'true'
uses: dtolnay/rust-toolchain@1.100.0 uses: dtolnay/rust-toolchain@1.99.1
- name: Rust Cache - name: Rust Cache
if: github.event.inputs[matrix.input] == 'true' if: github.event.inputs[matrix.input] == 'true'
@@ -104,7 +104,7 @@ jobs:
if: github.event.inputs[matrix.input] == 'true' if: github.event.inputs[matrix.input] == 'true'
uses: actions/setup-node@v7 uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
cache: 'pnpm' cache: 'pnpm'
- name: Pnpm install and check - name: Pnpm install and check
@@ -121,7 +121,7 @@ jobs:
if: github.event.inputs[matrix.input] == 'true' if: github.event.inputs[matrix.input] == 'true'
run: | run: |
# Ensure cross target is installed for the pinned toolchain; fallback without explicit toolchain if needed # Ensure cross target is installed for the pinned toolchain; fallback without explicit toolchain if needed
rustup target add ${{ matrix.target }} --toolchain 1.100.0 || rustup target add ${{ matrix.target }} rustup target add ${{ matrix.target }} --toolchain 1.99.1 || rustup target add ${{ matrix.target }}
rustup target list --installed rustup target list --installed
echo "Rust target ${{ matrix.target }} installed." echo "Rust target ${{ matrix.target }} installed."
+2 -5
View File
@@ -12,7 +12,6 @@ on:
- REVIEW.md - REVIEW.md
- src/AGENTS.md - src/AGENTS.md
- src-tauri/AGENTS.md - src-tauri/AGENTS.md
- .github/AGENTS.md
- .github/ISSUE_GUIDELINES.md - .github/ISSUE_GUIDELINES.md
- .github/agents/agentic-workflows.md - .github/agents/agentic-workflows.md
- .github/skills/agentic-workflows/SKILL.md - .github/skills/agentic-workflows/SKILL.md
@@ -31,7 +30,6 @@ on:
- REVIEW.md - REVIEW.md
- src/AGENTS.md - src/AGENTS.md
- src-tauri/AGENTS.md - src-tauri/AGENTS.md
- .github/AGENTS.md
- .github/ISSUE_GUIDELINES.md - .github/ISSUE_GUIDELINES.md
- .github/agents/agentic-workflows.md - .github/agents/agentic-workflows.md
- .github/skills/agentic-workflows/SKILL.md - .github/skills/agentic-workflows/SKILL.md
@@ -59,8 +57,7 @@ jobs:
check AGENTS.md 'Issue first' check AGENTS.md 'Issue first'
check AGENTS.md 'Author accountability' check AGENTS.md 'Author accountability'
check AGENTS.md 'pr-ai-slop-review' check AGENTS.md 'pr-ai-slop-review'
check AGENTS.md '(.github/AGENTS.md)' check AGENTS.md 'Disclose AI automation'
check .github/AGENTS.md '## AI Disclosure'
check CONTRIBUTING.md 'Assisted by:' check CONTRIBUTING.md 'Assisted by:'
check .github/workflows/pr-ai-slop-review.md '(../../CONTRIBUTING.md)' check .github/workflows/pr-ai-slop-review.md '(../../CONTRIBUTING.md)'
check .github/workflows/pr-ai-slop-review.md '(../../AGENTS.md)' check .github/workflows/pr-ai-slop-review.md '(../../AGENTS.md)'
@@ -87,7 +84,7 @@ jobs:
sources = [ sources = [
"AGENTS.md", "CONTRIBUTING.md", "REVIEW.md", "CLAUDE.md", "GEMINI.md", "AGENTS.md", "CONTRIBUTING.md", "REVIEW.md", "CLAUDE.md", "GEMINI.md",
"src/AGENTS.md", "src-tauri/AGENTS.md", ".github/AGENTS.md", ".github/ISSUE_GUIDELINES.md", "src/AGENTS.md", "src-tauri/AGENTS.md", ".github/ISSUE_GUIDELINES.md",
".github/PULL_REQUEST_TEMPLATE.md", ".github/workflows/pr-ai-slop-review.md", ".github/PULL_REQUEST_TEMPLATE.md", ".github/workflows/pr-ai-slop-review.md",
".github/workflows/pr-verify-fix.md", ".github/workflows/pr-verify-fix.md",
".github/agents/agentic-workflows.md", ".github/skills/agentic-workflows/SKILL.md", ".github/agents/agentic-workflows.md", ".github/skills/agentic-workflows/SKILL.md",
+1 -1
View File
@@ -36,7 +36,7 @@ jobs:
- uses: actions/setup-node@v7 - uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
cache: 'pnpm' cache: 'pnpm'
- run: pnpm install --frozen-lockfile - run: pnpm install --frozen-lockfile
File diff suppressed because one or more lines are too long
-5
View File
@@ -30,14 +30,9 @@ max-ai-credits: 60
max-turns: 12 max-turns: 12
max-daily-ai-credits: 5000 max-daily-ai-credits: 5000
# Routine, low-risk tasks such as triage, labeling, and summaries.
# See https://github.github.com/gh-aw/reference/model-routing/#setting-the-level-yourself
model: router/economy
permissions: permissions:
issues: read issues: read
pull-requests: read pull-requests: read
copilot-requests: none
pre-agent-steps: pre-agent-steps:
- name: Make Copilot quota exhaustion non-blocking - name: Make Copilot quota exhaustion non-blocking
+118 -314
View File
File diff suppressed because one or more lines are too long
-4
View File
@@ -26,14 +26,10 @@ imports:
max-ai-credits: 60 max-ai-credits: 60
max-turns: 12 max-turns: 12
max-daily-ai-credits: 500 max-daily-ai-credits: 500
# Routine, low-risk tasks such as triage, labeling, and summaries.
# See https://github.github.com/gh-aw/reference/model-routing/#setting-the-level-yourself
model: router/economy
permissions: permissions:
contents: read contents: read
issues: read issues: read
pull-requests: read pull-requests: read
copilot-requests: none
steps: steps:
- name: Load review rules from the base revision - name: Load review rules from the base revision
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0 uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+1 -1
View File
@@ -61,7 +61,7 @@ jobs:
- uses: actions/setup-node@v7 - uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
- uses: pnpm/action-setup@v6 - uses: pnpm/action-setup@v6
if: github.event.action != 'closed' if: github.event.action != 'closed'
+11 -11
View File
@@ -46,7 +46,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- uses: actions/setup-node@v7 - uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
- name: Validate source and publish the approved snapshot - name: Validate source and publish the approved snapshot
id: source id: source
env: env:
@@ -203,7 +203,7 @@ jobs:
- name: Install Rust Stable - name: Install Rust Stable
uses: dtolnay/rust-toolchain@master uses: dtolnay/rust-toolchain@master
with: with:
toolchain: '1.100.0' toolchain: '1.99.1'
targets: ${{ matrix.target }} targets: ${{ matrix.target }}
- name: Rust Cache - name: Rust Cache
@@ -231,7 +231,7 @@ jobs:
- name: Install Node - name: Install Node
uses: actions/setup-node@v7 uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
cache: 'pnpm' cache: 'pnpm'
- name: Pnpm install and check - name: Pnpm install and check
@@ -308,7 +308,7 @@ jobs:
- name: Install Rust Stable - name: Install Rust Stable
uses: dtolnay/rust-toolchain@master uses: dtolnay/rust-toolchain@master
with: with:
toolchain: '1.100.0' toolchain: '1.99.1'
targets: ${{ matrix.target }} targets: ${{ matrix.target }}
- name: Rust Cache - name: Rust Cache
@@ -330,7 +330,7 @@ jobs:
- name: Install Node - name: Install Node
uses: actions/setup-node@v7 uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
cache: 'pnpm' cache: 'pnpm'
- name: Pnpm install and check - name: Pnpm install and check
@@ -439,7 +439,7 @@ jobs:
- name: Install Rust Stable - name: Install Rust Stable
uses: dtolnay/rust-toolchain@master uses: dtolnay/rust-toolchain@master
with: with:
toolchain: '1.100.0' toolchain: '1.99.1'
targets: ${{ matrix.target }} targets: ${{ matrix.target }}
- name: Rust Cache - name: Rust Cache
@@ -461,7 +461,7 @@ jobs:
- name: Install Node - name: Install Node
uses: actions/setup-node@v7 uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
cache: 'pnpm' cache: 'pnpm'
- name: Pnpm install and check - name: Pnpm install and check
@@ -542,7 +542,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- uses: actions/setup-node@v7 - uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
- uses: pnpm/action-setup@v6 - uses: pnpm/action-setup@v6
with: with:
run_install: false run_install: false
@@ -565,7 +565,7 @@ jobs:
- name: Install Node - name: Install Node
uses: actions/setup-node@v7 uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
- uses: pnpm/action-setup@v6 - uses: pnpm/action-setup@v6
name: Install pnpm name: Install pnpm
@@ -593,7 +593,7 @@ jobs:
- name: Install Node - name: Install Node
uses: actions/setup-node@v7 uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
- uses: pnpm/action-setup@v6 - uses: pnpm/action-setup@v6
name: Install pnpm name: Install pnpm
@@ -661,7 +661,7 @@ jobs:
- name: Install Node - name: Install Node
uses: actions/setup-node@v7 uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
- uses: pnpm/action-setup@v6 - uses: pnpm/action-setup@v6
name: Install pnpm name: Install pnpm
File diff suppressed because one or more lines are too long
+1 -7
View File
@@ -28,17 +28,11 @@ permissions:
contents: read contents: read
issues: read issues: read
pull-requests: read pull-requests: read
copilot-requests: none
max-ai-credits: 60 max-ai-credits: 60
max-turns: 12 max-turns: 12
max-daily-ai-credits: 500 max-daily-ai-credits: 500
# Routine, low-risk tasks such as triage, labeling, and summaries.
# See https://github.github.com/gh-aw/reference/model-routing/#setting-the-level-yourself
model: router/economy
network: network:
# GitHub CLI recommend using ecosystem identifiers instead of individual domain names for better maintainability, allowed: [github, docs.rs, doc.rust-lang.org, nodejs.org, www.typescriptlang.org]
# hence "node" is prefer than "nodejs.org"
allowed: [github, docs.rs, doc.rust-lang.org, node, www.typescriptlang.org]
steps: steps:
- name: Load trusted metadata parser - name: Load trusted metadata parser
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+2 -2
View File
@@ -22,13 +22,13 @@ jobs:
- name: Install Rust - name: Install Rust
uses: dtolnay/rust-toolchain@master uses: dtolnay/rust-toolchain@master
with: with:
toolchain: '1.100.0' toolchain: '1.99.1'
targets: x86_64-pc-windows-msvc targets: x86_64-pc-windows-msvc
- name: Install Node - name: Install Node
uses: actions/setup-node@v7 uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
- name: Install pnpm - name: Install pnpm
uses: pnpm/action-setup@v6 uses: pnpm/action-setup@v6
-113
View File
@@ -1,113 +0,0 @@
name: Sync Mihomo Changelog
on:
workflow_dispatch:
inputs:
dry_run:
description: Preview the Changelog diff without creating a PR
type: boolean
default: true
schedule:
# UTC+8 Monday 11:30
- cron: '30 3 * * 1'
permissions:
contents: write
pull-requests: write
issues: write
concurrency:
group: sync-mihomo-changelog
cancel-in-progress: false
jobs:
sync:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v7
with:
ref: ${{ github.event.repository.default_branch }}
persist-credentials: false
- uses: actions/setup-node@v7
with:
node-version: '26.13.1'
- name: Sync Mihomo version
id: sync
env:
DRY_RUN: ${{ github.event_name == 'workflow_dispatch' && inputs.dry_run }}
run: |
args=()
if [[ "$DRY_RUN" == 'true' ]]; then args+=(--dry-run); fi
node scripts/sync-mihomo-version.mjs "${args[@]}"
- name: Create labeled PR and enqueue
if: steps.sync.outputs.changed == 'true' && !(github.event_name == 'workflow_dispatch' && inputs.dry_run)
uses: actions/github-script@v9
env:
MIHOMO_VERSION: ${{ steps.sync.outputs.version }}
with:
script: |
const { readFileSync } = await import('node:fs');
const { execFileSync } = await import('node:child_process');
const { owner, repo } = context.repo;
const base = context.payload.repository.default_branch;
const version = process.env.MIHOMO_VERSION;
const appVersion = JSON.parse(readFileSync('package.json', 'utf8')).version;
const branch = `chore/sync-mihomo-${appVersion}-${version}`;
const title = `chore: sync Mihomo changelog to ${version}`;
const pulls = await github.rest.pulls.list({
owner, repo, base, head: `${owner}:${branch}`, state: 'all',
});
let pr = pulls.data[0];
if (pr && (pr.state !== 'open' || pr.user.login !== 'github-actions[bot]')) {
throw new Error(`Existing candidate needs maintainer attention: ${pr.html_url}`);
}
if (!pr) {
const sha = execFileSync('git', ['rev-parse', 'HEAD'], { encoding: 'utf8' }).trim();
await github.rest.git.createRef({ owner, repo, ref: `refs/heads/${branch}`, sha });
await github.graphql(`mutation($input: CreateCommitOnBranchInput!) {
createCommitOnBranch(input: $input) { commit { oid } }
}`, {
input: {
branch: { repositoryNameWithOwner: `${owner}/${repo}`, branchName: branch },
expectedHeadOid: sha,
message: { headline: title },
fileChanges: { additions: [{
path: 'Changelog.md',
contents: readFileSync('Changelog.md').toString('base64'),
}] },
},
});
({ data: pr } = await github.rest.pulls.create({
owner, repo, base, head: branch, title,
body: `## Problem\n\nChangelog.md needs to record the latest stable Mihomo version.\n\n` +
`## Approach\n\nRead the same upstream version.txt used by the core download script.\n\n` +
`## Scope\n\nOnly the Mihomo version line in Changelog.md changes to ${version}.`,
}));
}
for (let attempt = 0; attempt < 10; attempt++) {
({ data: pr } = await github.rest.pulls.get({ owner, repo, pull_number: pr.number }));
if (pr.mergeable !== null) break;
await new Promise(resolve => setTimeout(resolve, 2000));
}
if (!pr.mergeable) throw new Error(`Sync PR is not mergeable: ${pr.html_url}`);
const files = await github.paginate(github.rest.pulls.listFiles, {
owner, repo, pull_number: pr.number,
});
if (files.length !== 1 || files[0].filename !== 'Changelog.md') {
throw new Error('The sync PR must change only Changelog.md.');
}
await github.rest.issues.addLabels({
owner, repo, issue_number: pr.number, labels: ['dependencies', 'upstream'],
});
const result = await github.graphql(`query($id: ID!) {
node(id: $id) { ... on PullRequest { mergeQueueEntry { id } } }
}`, { id: pr.node_id });
if (!result.node.mergeQueueEntry) {
await github.graphql(`mutation($input: EnqueuePullRequestInput!) {
enqueuePullRequest(input: $input) { mergeQueueEntry { id } }
}`, { input: { pullRequestId: pr.node_id, expectedHeadOid: pr.head.sha } });
}
await core.summary.addRaw(`Queued Mihomo sync PR: ${pr.html_url}\n`).write();
+1 -1
View File
@@ -34,7 +34,7 @@ jobs:
- name: Install Node - name: Install Node
uses: actions/setup-node@v7 uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
- uses: pnpm/action-setup@v6 - uses: pnpm/action-setup@v6
name: Install pnpm name: Install pnpm
+2 -2
View File
@@ -15,7 +15,7 @@ jobs:
- name: Install Node - name: Install Node
uses: actions/setup-node@v7 uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
- uses: pnpm/action-setup@v6 - uses: pnpm/action-setup@v6
name: Install pnpm name: Install pnpm
@@ -39,7 +39,7 @@ jobs:
- name: Install Node - name: Install Node
uses: actions/setup-node@v7 uses: actions/setup-node@v7
with: with:
node-version: '26.13.1' node-version: '26.13.0'
- uses: pnpm/action-setup@v6 - uses: pnpm/action-setup@v6
name: Install pnpm name: Install pnpm
+3 -3
View File
@@ -1,3 +1,3 @@
nodejs 26.13.1 nodejs 26.13.0
pnpm 12.21.0 pnpm 12.18.0
rust 1.100.0 rust 1.99.1
+12 -6
View File
@@ -48,11 +48,16 @@ the ownership evidence the AI-slop review evaluates (see
8. **Minimal diffs.** Match the surrounding code's style, naming, and comment 8. **Minimal diffs.** Match the surrounding code's style, naming, and comment
density. Do not introduce new dependencies or restructure working code unless density. Do not introduce new dependencies or restructure working code unless
the linked issue or stated task demands it. the linked issue or stated task demands it.
9. **Compiled workflows.** Agentic workflow Markdown, including the 9. **Disclose AI automation.** When an agent creates or co-creates a PR or Issue,
append a final body line with the model and effort used (e.g.
`Assisted by: GPT-5.6 High`). Effort may be omitted when the runtime does not
report it. Human contributors are not asked to disclose AI assistance.
Disclosure is transparency only and carries no positive or negative weight.
10. **Compiled workflows.** Agentic workflow Markdown, including the
[AI-slop policy](.github/workflows/pr-ai-slop-review.md) and shared imports, [AI-slop policy](.github/workflows/pr-ai-slop-review.md) and shared imports,
is compiled: after editing it, run `gh aw compile` and commit the affected is compiled: after editing it, run `gh aw compile` and commit the affected
`.lock.yml` files. Never edit lock files directly. `.lock.yml` files. Never edit lock files directly.
10. **Changelog.** Entries follow the rules in 11. **Changelog.** Entries follow the rules in
[`template/Changelog.md`](template/Changelog.md): one line per [`template/Changelog.md`](template/Changelog.md): one line per
user-visible change, no internals. user-visible change, no internals.
@@ -63,8 +68,6 @@ the ownership evidence the AI-slop review evaluates (see
- For code review and verification of review fixes, follow [REVIEW.md](REVIEW.md). - For code review and verification of review fixes, follow [REVIEW.md](REVIEW.md).
Review is read-only unless changes are authorized; findings do not expand Review is read-only unless changes are authorized; findings do not expand
that authorization to unrelated fixes, commits, pushes, or GitHub updates. that authorization to unrelated fixes, commits, pushes, or GitHub updates.
- For macOS frontend performance or WebView memory investigations, follow
[scripts/perf/AGENTS.md](scripts/perf/AGENTS.md).
- When handing work between agents or review rounds, use the - When handing work between agents or review rounds, use the
[AI context sharing guidance](REVIEW.md#ai-context-sharing). [AI context sharing guidance](REVIEW.md#ai-context-sharing).
- Read the relevant sections and linked module rules, expanding only when the - Read the relevant sections and linked module rules, expanding only when the
@@ -73,5 +76,8 @@ the ownership evidence the AI-slop review evaluates (see
## Issue and PR Workflows ## Issue and PR Workflows
For Issue and PR work, read [`.github/AGENTS.md`](.github/AGENTS.md), including When drafting, triaging, splitting, or implementing from a community issue, use
when using `gh` or an API without editing files under `.github/`. the conditional checklist in [`.github/ISSUE_GUIDELINES.md`](.github/ISSUE_GUIDELINES.md).
Do not make GitHub issue changes without explicit authorization. For PRs, follow
the directly loaded [PR template](.github/PULL_REQUEST_TEMPLATE.md); do not
duplicate its prompts here.
+3 -4
View File
@@ -168,10 +168,9 @@ to run every command for every change. Run commands from the repository root.
Tie results to the code reviewed: identify the base/head commits for branch Tie results to the code reviewed: identify the base/head commits for branch
comparisons and include task-relevant staged, unstaged, and untracked files in a comparisons and include task-relevant staged, unstaged, and untracked files in a
local review. Keep command-level results in the working conversation. For PR local review. Report
descriptions, follow the [PR template](.github/PULL_REQUEST_TEMPLATE.md): include the command or interaction, observed result, and material gaps in the existing
behavioral evidence and material gaps relevant to review, omitting routine check conversation or PR; no separate verification report is required. Static checks,
pass lists. No separate verification report is required. Static checks,
mocks, browser previews, native runs, and remote CI establish different things. mocks, browser previews, native runs, and remote CI establish different things.
When code changes after verification, repeat affected checks. Attribute a failure When code changes after verification, repeat affected checks. Attribute a failure
to the baseline only after comparing the same check on the base revision. to the baseline only after comparing the same check on the base revision.
Generated
+61 -71
View File
@@ -159,9 +159,9 @@ dependencies = [
[[package]] [[package]]
name = "arc-swap" name = "arc-swap"
version = "1.9.5" version = "1.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84a22b5d51209f6de83d37a0b33d320acb8da88823e42a94c075140708f032a5" checksum = "db4c94f57a570fce5d381be3289b3f79aef6332d72948fe82ab5772e423ccf92"
dependencies = [ dependencies = [
"rustversion", "rustversion",
] ]
@@ -912,7 +912,7 @@ checksum = "82f4b26e751e711a5302649417f2da046dce6391b2ea30a4820f37462314f0b9"
dependencies = [ dependencies = [
"semver 1.0.28", "semver 1.0.28",
"serde", "serde",
"toml 1.2.1+spec-1.1.0", "toml 1.1.6+spec-1.1.0",
] ]
[[package]] [[package]]
@@ -1123,10 +1123,12 @@ dependencies = [
"rfd 0.18.0", "rfd 0.18.0",
"runas", "runas",
"rustls", "rustls",
"scopeguard",
"serde", "serde",
"serde_json", "serde_json",
"serde_yaml_ng", "serde_yaml_ng",
"sha2 0.11.1", "sha2 0.11.1",
"smartstring",
"socket2", "socket2",
"specta", "specta",
"specta-typescript", "specta-typescript",
@@ -1154,7 +1156,6 @@ dependencies = [
"tokio-rustls", "tokio-rustls",
"tokio-util", "tokio-util",
"tracing", "tracing",
"tristr",
"warp", "warp",
"webpki-roots", "webpki-roots",
"windows 0.62.2", "windows 0.62.2",
@@ -1223,8 +1224,8 @@ dependencies = [
[[package]] [[package]]
name = "clash_verge_service_ipc" name = "clash_verge_service_ipc"
version = "2.8.1" version = "2.7.7"
source = "git+https://github.com/clash-verge-rev/clash-verge-service-ipc.git?tag=v2.8.1#9d4ea7d27fb3c43804bd18f3bb3b686528763239" source = "git+https://github.com/clash-verge-rev/clash-verge-service-ipc.git?tag=v2.7.7#3ed29700b093190b5e7addcaa892e77f172af544"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"kode-bridge", "kode-bridge",
@@ -2202,7 +2203,7 @@ dependencies = [
"cc", "cc",
"memchr", "memchr",
"rustc_version 0.4.1", "rustc_version 0.4.1",
"toml 1.2.1+spec-1.1.0", "toml 1.1.6+spec-1.1.0",
"vswhom", "vswhom",
"winreg 0.55.0", "winreg 0.55.0",
] ]
@@ -3877,16 +3878,16 @@ dependencies = [
[[package]] [[package]]
name = "kode-bridge" name = "kode-bridge"
version = "0.6.0" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b17456ae84ba9c0da0f189bf00d13019805b89563ba846cd15ccd8c4bd6a2713" checksum = "cdb14ea1ba42eebb57b46bcdd67a20f11a3f076d846ddf772c68d7439f6c6eca"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures", "futures",
"http", "http",
"httparse", "httparse",
"libc", "libc",
"parking_lot 0.13.0", "parking_lot 0.12.5",
"path-tree", "path-tree",
"pin-project-lite", "pin-project-lite",
"rand 0.10.2", "rand 0.10.2",
@@ -3896,7 +3897,7 @@ dependencies = [
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tokio-util", "tokio-util",
"toml 1.2.1+spec-1.1.0", "toml 1.1.6+spec-1.1.0",
"tracing", "tracing",
"url", "url",
"windows-sys 0.61.2", "windows-sys 0.61.2",
@@ -4356,18 +4357,6 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "nix"
version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77730ed34f01f4990cb2ea67fec715ecebc6fab9a6396cf83c5529b13f581bdc"
dependencies = [
"bitflags 2.13.2",
"cfg-if",
"cfg_aliases",
"libc",
]
[[package]] [[package]]
name = "nohash-hasher" name = "nohash-hasher"
version = "0.2.0" version = "0.2.0"
@@ -4894,7 +4883,7 @@ checksum = "9cf20a545b305cf1da722b236b5155c9bb35f1d5ceb28c048bd96ca842f41b5b"
dependencies = [ dependencies = [
"android_system_properties", "android_system_properties",
"log", "log",
"nix 0.31.3", "nix",
"objc2", "objc2",
"objc2-foundation", "objc2-foundation",
"objc2-ui-kit", "objc2-ui-kit",
@@ -6533,9 +6522,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_spanned" name = "serde_spanned"
version = "1.1.3" version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c187e0a369471c550af028cba56d4f4fa2a489ad28151ae95a4d340a2a8b782" checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
dependencies = [ dependencies = [
"serde_core", "serde_core",
] ]
@@ -6801,6 +6790,18 @@ dependencies = [
"thiserror 2.0.20", "thiserror 2.0.20",
] ]
[[package]]
name = "smartstring"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a155190f9c039a1e9b6e92efbfa50ae68daad98a0fd6d5521a5a09ef782383e8"
dependencies = [
"autocfg",
"serde",
"static_assertions",
"version_check",
]
[[package]] [[package]]
name = "socket2" name = "socket2"
version = "0.6.5" version = "0.6.5"
@@ -7072,9 +7073,9 @@ dependencies = [
[[package]] [[package]]
name = "sysinfo" name = "sysinfo"
version = "0.40.3" version = "0.40.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a86bac2f7d06e6384984118ad727f5694110f0ec44d924d05c8fdec3d030bee6" checksum = "0e8a3edbe0394ce115f3917a00349dd242be09eb5a091ed509eaf67b55cfb8a8"
dependencies = [ dependencies = [
"libc", "libc",
"memchr", "memchr",
@@ -7086,12 +7087,11 @@ dependencies = [
[[package]] [[package]]
name = "sysproxy" name = "sysproxy"
version = "0.7.2" version = "0.7.1"
source = "git+https://github.com/clash-verge-rev/sysproxy-rs.git?rev=2c9d0a538052aac6e44ad413156a6e848da262b9#2c9d0a538052aac6e44ad413156a6e848da262b9" source = "git+https://github.com/clash-verge-rev/sysproxy-rs.git?branch=main#89ad876a0942c049ae72e1472f9fc3ed62023c5e"
dependencies = [ dependencies = [
"iptools", "iptools",
"log", "log",
"serde",
"system-configuration", "system-configuration",
"thiserror 2.0.20", "thiserror 2.0.20",
"tokio", "tokio",
@@ -7145,7 +7145,7 @@ dependencies = [
"cfg-expr 0.20.9", "cfg-expr 0.20.9",
"heck 0.5.0", "heck 0.5.0",
"pkg-config", "pkg-config",
"toml 1.2.1+spec-1.1.0", "toml 1.1.6+spec-1.1.0",
"version-compare", "version-compare",
] ]
@@ -7499,7 +7499,7 @@ dependencies = [
"tauri-plugin", "tauri-plugin",
"tauri-utils", "tauri-utils",
"thiserror 2.0.20", "thiserror 2.0.20",
"toml 1.2.1+spec-1.1.0", "toml 1.1.6+spec-1.1.0",
"url", "url",
] ]
@@ -7520,15 +7520,14 @@ dependencies = [
[[package]] [[package]]
name = "tauri-plugin-http" name = "tauri-plugin-http"
version = "2.9.0" version = "2.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c278945f30912c8c32728265c66d16ca1b139509c4874d00579f5c8c5276605a" checksum = "2c57e3451553f95a1db3bfed6a358a77ce5080b6399a242c6eadac113f97abd2"
dependencies = [ dependencies = [
"bytes", "bytes",
"cookie_store", "cookie_store",
"data-url", "data-url",
"http", "http",
"percent-encoding",
"regex", "regex",
"reqwest 0.12.28", "reqwest 0.12.28",
"schemars 0.8.22", "schemars 0.8.22",
@@ -7545,8 +7544,8 @@ dependencies = [
[[package]] [[package]]
name = "tauri-plugin-mihomo" name = "tauri-plugin-mihomo"
version = "0.7.1" version = "0.6.0"
source = "git+https://github.com/clash-verge-rev/tauri-plugin-mihomo?rev=7e4fa8642cf6c394ed88b5a969420d8eab60087f#7e4fa8642cf6c394ed88b5a969420d8eab60087f" source = "git+https://github.com/clash-verge-rev/tauri-plugin-mihomo?rev=7a03d16f4d39b1bb885b7babe66b9e153e34b615#7a03d16f4d39b1bb885b7babe66b9e153e34b615"
dependencies = [ dependencies = [
"arc-swap", "arc-swap",
"clashmap", "clashmap",
@@ -7570,9 +7569,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-plugin-notification" name = "tauri-plugin-notification"
version = "2.8.1" version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14a226bfb8189ec4ab2c1936e66330ad06c44d9f6c54a674338208491dee177f" checksum = "5bc6c194a95a535abdfbe3bc1af9a43935b8b9b29c216b8e71af8b59132703cf"
dependencies = [ dependencies = [
"log", "log",
"notify-rust", "notify-rust",
@@ -7590,9 +7589,9 @@ dependencies = [
[[package]] [[package]]
name = "tauri-plugin-opener" name = "tauri-plugin-opener"
version = "2.7.3" version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54592c6718b42ab198bf11bda6a428a3553ca2f2f8e506df56f6a063ec328331" checksum = "53810be1b4fed22bb6ac3f4cab5a2b80d9391d1af436bda145607532bc0bb219"
dependencies = [ dependencies = [
"dunce", "dunce",
"glob", "glob",
@@ -7829,7 +7828,7 @@ dependencies = [
"serde_with", "serde_with",
"swift-rs", "swift-rs",
"thiserror 2.0.20", "thiserror 2.0.20",
"toml 1.2.1+spec-1.1.0", "toml 1.1.6+spec-1.1.0",
"url", "url",
"urlpattern", "urlpattern",
"uuid", "uuid",
@@ -7844,7 +7843,7 @@ checksum = "cc65d45c68858bfe420dd29e834b5d15dbecf8a07a8a16cf4d532c7b1f69d4b6"
dependencies = [ dependencies = [
"dunce", "dunce",
"embed-resource", "embed-resource",
"toml 1.2.1+spec-1.1.0", "toml 1.1.6+spec-1.1.0",
] ]
[[package]] [[package]]
@@ -8210,14 +8209,14 @@ dependencies = [
[[package]] [[package]]
name = "toml" name = "toml"
version = "1.2.1+spec-1.1.0" version = "1.1.6+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5755c51863cdac711f1956baf8eb9588e060755f7d3c4c979e70ea1e1f32cd7" checksum = "920602543f0911ab71da12c50d59701da54c196d1a2bf5cb4b75667f137a406a"
dependencies = [ dependencies = [
"indexmap 2.14.0", "indexmap 2.14.0",
"serde_core", "serde_core",
"serde_spanned 1.1.3", "serde_spanned 1.1.1",
"toml_datetime 1.1.3+spec-1.1.0", "toml_datetime 1.1.1+spec-1.1.0",
"toml_parser", "toml_parser",
"toml_writer", "toml_writer",
"winnow 1.0.4", "winnow 1.0.4",
@@ -8234,9 +8233,9 @@ dependencies = [
[[package]] [[package]]
name = "toml_datetime" name = "toml_datetime"
version = "1.1.3+spec-1.1.0" version = "1.1.1+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "173f25c883cd2176a2d8212155638c0a60d484a9d84546d270866f40f56b6e49" checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
dependencies = [ dependencies = [
"serde_core", "serde_core",
] ]
@@ -8284,16 +8283,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6975367e4d2ef766d86af01ffad14b622fecc8d4357a998fbc4deb6e9bacaf9b" checksum = "6975367e4d2ef766d86af01ffad14b622fecc8d4357a998fbc4deb6e9bacaf9b"
dependencies = [ dependencies = [
"indexmap 2.14.0", "indexmap 2.14.0",
"toml_datetime 1.1.3+spec-1.1.0", "toml_datetime 1.1.1+spec-1.1.0",
"toml_parser", "toml_parser",
"winnow 1.0.4", "winnow 1.0.4",
] ]
[[package]] [[package]]
name = "toml_parser" name = "toml_parser"
version = "1.1.5+spec-1.1.0" version = "1.1.3+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baa693a8032d7e1cada7d0041e96126df243179ff061456783ac7f12bda4744c" checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56"
dependencies = [ dependencies = [
"winnow 1.0.4", "winnow 1.0.4",
] ]
@@ -8306,9 +8305,9 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
[[package]] [[package]]
name = "toml_writer" name = "toml_writer"
version = "1.2.0+spec-1.1.0" version = "1.1.2+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "009dbb7700f11c55ef83aebbe4c0e9cf1f1ac0844bd8d6f00dc38f302026e13a" checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2"
[[package]] [[package]]
name = "tonic" name = "tonic"
@@ -8565,15 +8564,6 @@ dependencies = [
"stable_deref_trait", "stable_deref_trait",
] ]
[[package]]
name = "tristr"
version = "0.1.0"
source = "git+https://github.com/Tunglies/tristr?rev=3738d8c5785d609674c5f4f05def26b94724200c#3738d8c5785d609674c5f4f05def26b94724200c"
dependencies = [
"serde",
"specta",
]
[[package]] [[package]]
name = "try-lock" name = "try-lock"
version = "0.2.5" version = "0.2.5"
@@ -8830,9 +8820,9 @@ dependencies = [
[[package]] [[package]]
name = "warp" name = "warp"
version = "0.4.4" version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c92be475cc42b6b3913eeac77f0cbc0dd8f6a1ad6400c0722dbe36ba0c3ee799" checksum = "c0a808122a8a77eecdabaefd88ddb1913c4be5ea1465399f63ba64c7aa705fea"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures-channel", "futures-channel",
@@ -9098,9 +9088,9 @@ dependencies = [
[[package]] [[package]]
name = "webpki-roots" name = "webpki-roots"
version = "1.0.12" version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7265c9301c16a8711c992c2d8da90ee77ef54b1ed51482d6dfeb00dc756b1297" checksum = "f5f280bbb2b287bc8e7de7e3852945a0ff50d1bbcb5ed42b6c7a568c546df171"
dependencies = [ dependencies = [
"rustls-pki-types", "rustls-pki-types",
] ]
@@ -10136,9 +10126,9 @@ dependencies = [
[[package]] [[package]]
name = "zip" name = "zip"
version = "9.6.0" version = "9.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80cc68510ea7553c30a69c732de5278e94183f68765af6c642dbccefd6ec777e" checksum = "df3845f734baabdd02de353a20580e30ceccd03897def44a4eb8e9654992e294"
dependencies = [ dependencies = [
"aes", "aes",
"bzip2", "bzip2",
@@ -10152,7 +10142,7 @@ dependencies = [
"libc", "libc",
"lzma-rust2", "lzma-rust2",
"memchr", "memchr",
"nix 0.32.0", "nix",
"pbkdf2", "pbkdf2",
"ppmd-rust", "ppmd-rust",
"sha1 0.11.0", "sha1 0.11.0",
+2 -2
View File
@@ -84,8 +84,9 @@ reqwest = { version = "0.13.5", features = [
] } ] }
rust_iso3166 = "0.2.0" rust_iso3166 = "0.2.0"
smartstring = { version = "2.0.0" }
serde = { version = "1.0.229" } serde = { version = "1.0.229" }
tristr = { git = "https://github.com/Tunglies/tristr", rev = "3738d8c5785d609674c5f4f05def26b94724200c", default-features = false, features = ["serde", "specta"] }
serde_json = { version = "1.0.154" } serde_json = { version = "1.0.154" }
serde_yaml_ng = { version = "0.10.0" } serde_yaml_ng = { version = "0.10.0" }
socket2 = "0.6.5" socket2 = "0.6.5"
@@ -131,7 +132,6 @@ large_const_arrays = "warn"
large_futures = "deny" large_futures = "deny"
large_stack_arrays = "warn" large_stack_arrays = "warn"
large_types_passed_by_value = "deny" large_types_passed_by_value = "deny"
map_unwrap_or = "deny"
missing_const_for_fn = "deny" missing_const_for_fn = "deny"
mutex_atomic = "deny" mutex_atomic = "deny"
mutex_integer = "deny" mutex_integer = "deny"
+1 -20
View File
@@ -13,8 +13,6 @@
first (Windows/macOS/Linux) when the change is platform-specific; first (Windows/macOS/Linux) when the change is platform-specific;
merge sub-symptoms as 主题:症状、症状; full-width punctuation, merge sub-symptoms as 主题:症状、症状; full-width punctuation,
「」 for UI labels, backticks for config keys and commands 「」 for UI labels, backticks for config keys and commands
- omit the redundant suffix 「的问题」; end with the concrete symptom
or outcome instead
- platform entries sit under their platform heading (bold, emoji - platform entries sit under their platform heading (bold, emoji
prefixed, ordered Windows/macOS/Linux, combined for pairs like prefixed, ordered Windows/macOS/Linux, combined for pairs like
macOS/Linux) at the end of their section; macOS/Linux) at the end of their section;
@@ -23,8 +21,6 @@
GitHub, so they never reach users. --> GitHub, so they never reach users. -->
## v2.6.0 ## v2.6.0
- **Mihomo 内核升级至 v1.19.34**
<details> <details>
<summary><strong> 🐞 修复问题 </strong></summary> <summary><strong> 🐞 修复问题 </strong></summary>
@@ -33,30 +29,18 @@
- 修复全局模式默认停在 `DIRECT` 或 `REJECT` 导致流量未经代理,现自动切换到第一个策略组 - 修复全局模式默认停在 `DIRECT` 或 `REJECT` 导致流量未经代理,现自动切换到第一个策略组
- 修复订阅中未加引号的 REALITY `short-id`(如 `1234e123`)被误读为数字,导致订阅无法启用 - 修复订阅中未加引号的 REALITY `short-id`(如 `1234e123`)被误读为数字,导致订阅无法启用
- 修复订阅中唯一的代理组名为 `GLOBAL` 或没有代理组时,规则模式下代理页面显示「未获取到代理信息」 - 修复订阅中唯一的代理组名为 `GLOBAL` 或没有代理组时,规则模式下代理页面显示「未获取到代理信息」
- 修复窗口较窄时,首页「当前节点」卡片中过长的节点名把延迟标签挤出卡片 - 修复切换订阅后节点延迟显示旧订阅结果,进入代理页面时主动刷新延迟记录
- 修复断开链式代理时清空已选节点,导致再次连接需要重新选择
- 修复「连接」页表格排序时表头换行、标题位置跳动
- 修复「TUN 设置」未手动保存时,界面显示的默认 MTU 1500 未生效
- 修复「链式代理」节点列表按名称排序,未保持订阅中的节点顺序
- 修复规则模式下 Muse AI 解锁检测显示错误的出口地区
**🍎 macOS** **🍎 macOS**
- 修复 macOS TUN 模式下原有 DNS 被清除、关闭后 DNS 未恢复及联网后设置未生效 - 修复 macOS TUN 模式下原有 DNS 被清除、关闭后 DNS 未恢复及联网后设置未生效
- 修复 macOS 断网时误报代理已回退直连,恢复联网后自动重试系统代理 - 修复 macOS 断网时误报代理已回退直连,恢复联网后自动重试系统代理
- 修复 macOS 切换主题后标题栏保留原有深浅色
**🐧 Linux**
- 修复 Linux OpenRC 环境下服务安装失败
</details> </details>
<details> <details>
<summary><strong> ✨ 新增功能 </strong></summary> <summary><strong> ✨ 新增功能 </strong></summary>
- 新增连接页面按网络协议(TCP/UDP)筛选连接
- 新增规则模式下在 `url-test` 或 `fallback` 代理组选节点时,自动将首个包含该组的 `select` 代理组切换到该组,可在「杂项设置」关闭
</details> </details>
@@ -65,9 +49,6 @@
- 优化连接、规则和日志筛选:切换页面后保留过滤条件 - 优化连接、规则和日志筛选:切换页面后保留过滤条件
- 优化全局模式代理列表:仅显示 `GLOBAL` 节点,选中其中的策略组时才显示该组 - 优化全局模式代理列表:仅显示 `GLOBAL` 节点,选中其中的策略组时才显示该组
- 优化设置页开关和选项所在行的鼠标悬停高亮,便于对应说明与控件
- 优化首页「当前节点」卡片:代理组列表加入 `fallback` 代理组,切换到 `url-test` 或 `fallback` 代理组时同样联动 `select` 代理组
- 优化主页流量图表与日志、代理列表的实时刷新和滚动占用,降低高频更新时的 CPU 负载
**🍎 macOS** **🍎 macOS**
-3
View File
@@ -15,6 +15,3 @@ tokio = { workspace = true }
[dev-dependencies] [dev-dependencies]
criterion = { workspace = true } criterion = { workspace = true }
[lints]
workspace = true
@@ -19,7 +19,6 @@ fn make_draft() -> Draft<IVerge> {
} }
pub fn bench_draft(c: &mut Criterion) { pub fn bench_draft(c: &mut Criterion) {
#[allow(clippy::panic, reason = "bench setup cannot proceed without a runtime")]
let rt = Runtime::new().unwrap_or_else(|e| panic!("Tokio runtime init failed: {e}")); let rt = Runtime::new().unwrap_or_else(|e| panic!("Tokio runtime init failed: {e}"));
let mut group = c.benchmark_group("draft"); let mut group = c.benchmark_group("draft");
+1 -6
View File
@@ -102,7 +102,6 @@ impl<T: Clone> Draft<T> {
let (local, original_arc) = { let (local, original_arc) = {
let guard = self.inner.data.lock(); let guard = self.inner.data.lock();
let arc = Arc::clone(&guard.0); let arc = Arc::clone(&guard.0);
drop(guard);
((**arc).clone(), arc) ((**arc).clone(), arc)
}; };
let (new_local, res) = f(local).await?; let (new_local, res) = f(local).await?;
@@ -113,7 +112,6 @@ impl<T: Clone> Draft<T> {
)); ));
} }
guard.0 = Arc::new(Box::new(new_local)); guard.0 = Arc::new(Box::new(new_local));
drop(guard);
Ok(res) Ok(res)
} }
@@ -127,10 +125,7 @@ impl<T: Clone> Draft<T> {
} }
#[inline] #[inline]
async fn acquire_data_modify_permit(&self) -> DataModifyPermit<'_> async fn acquire_data_modify_permit(&self) -> DataModifyPermit<'_> {
where
T: Send + Sync,
{
for _ in 0..DATA_MODIFY_FAST_RETRY_YIELDS { for _ in 0..DATA_MODIFY_FAST_RETRY_YIELDS {
if let Some(permit) = self.try_acquire_data_modify_permit() { if let Some(permit) = self.try_acquire_data_modify_permit() {
return permit; return permit;
-3
View File
@@ -15,6 +15,3 @@ default = []
tokio-trace = ["tracing-estuary/tokio-trace"] tokio-trace = ["tracing-estuary/tokio-trace"]
chrome-trace = ["tracing-estuary/chrome-trace"] chrome-trace = ["tracing-estuary/chrome-trace"]
color = ["tracing-estuary/color"] color = ["tracing-estuary/color"]
[lints]
workspace = true
+11 -10
View File
@@ -160,7 +160,7 @@ pub struct Logger {
static LOGGER: OnceLock<Logger> = OnceLock::new(); static LOGGER: OnceLock<Logger> = OnceLock::new();
impl Logger { impl Logger {
const fn new() -> Self { fn new() -> Self {
Self { Self {
pipeline: OnceLock::new(), pipeline: OnceLock::new(),
sidecar_file_writer: RwLock::new(None), sidecar_file_writer: RwLock::new(None),
@@ -185,7 +185,7 @@ impl Logger {
self.store_config(cfg); self.store_config(cfg);
let pipeline = tracing_estuary::PipelineBuilder::new() let pipeline = tracing_estuary::PipelineBuilder::new()
.default_level(log_level) .default_level(log_level)
.file_writer(self.generate_file_log_writer()) .file_writer(self.generate_file_log_writer()?)
.init()?; .init()?;
self.pipeline.set(pipeline).ok(); self.pipeline.set(pipeline).ok();
Ok(()) Ok(())
@@ -206,10 +206,10 @@ impl Logger {
.map(|s| (*s).to_string()) .map(|s| (*s).to_string())
.or_else(|| info.payload().downcast_ref::<String>().cloned()) .or_else(|| info.payload().downcast_ref::<String>().cloned())
.unwrap_or_else(|| "Unknown panic payload".to_string()); .unwrap_or_else(|| "Unknown panic payload".to_string());
let location = info.location().map_or_else( let location = info
|| "Unknown location".to_string(), .location()
|loc| format!("{}:{}", loc.file(), loc.line()), .map(|loc| format!("{}:{}", loc.file(), loc.line()))
); .unwrap_or_else(|| "Unknown location".to_string());
logging!(error, Type::System, "Panic occurred at {}: {}", location, payload); logging!(error, Type::System, "Panic occurred at {}: {}", location, payload);
Self::global().flush_logs(); Self::global().flush_logs();
std::thread::sleep(Duration::from_millis(100)); std::thread::sleep(Duration::from_millis(100));
@@ -225,11 +225,11 @@ impl Logger {
self.log_max_count.store(cfg.max_count, Ordering::SeqCst); self.log_max_count.store(cfg.max_count, Ordering::SeqCst);
} }
fn generate_file_log_writer(&self) -> FileLogWriterBuilder { fn generate_file_log_writer(&self) -> Result<FileLogWriterBuilder> {
let log_dir = self.log_dir.get().cloned().unwrap_or_default(); let log_dir = self.log_dir.get().cloned().unwrap_or_default();
let log_max_size = self.log_max_size.load(Ordering::SeqCst); let log_max_size = self.log_max_size.load(Ordering::SeqCst);
let log_max_count = self.log_max_count.load(Ordering::SeqCst); let log_max_count = self.log_max_count.load(Ordering::SeqCst);
FileLogWriter::builder(FileSpec::default().directory(log_dir).basename("")) let flwb = FileLogWriter::builder(FileSpec::default().directory(log_dir).basename(""))
.format(tracing_estuary::file_format_with_level) .format(tracing_estuary::file_format_with_level)
.write_mode(flexi_logger::WriteMode::BufferAndFlushWith( .write_mode(flexi_logger::WriteMode::BufferAndFlushWith(
WRITE_BUFFER_CAPACITY, WRITE_BUFFER_CAPACITY,
@@ -239,7 +239,8 @@ impl Logger {
Criterion::Size(log_max_size * 1024), Criterion::Size(log_max_size * 1024),
ROTATE_NAMING, ROTATE_NAMING,
Cleanup::KeepLogFiles(log_max_count), Cleanup::KeepLogFiles(log_max_count),
) );
Ok(flwb)
} }
/// Ensures the sidecar writer exists and points at `builder`'s config: /// Ensures the sidecar writer exists and points at `builder`'s config:
@@ -310,7 +311,7 @@ impl Logger {
self.log_max_size.store(log_max_size, Ordering::SeqCst); self.log_max_size.store(log_max_size, Ordering::SeqCst);
self.log_max_count.store(log_max_count, Ordering::SeqCst); self.log_max_count.store(log_max_count, Ordering::SeqCst);
if let Some(pipeline) = self.pipeline.get() { if let Some(pipeline) = self.pipeline.get() {
let log_file_writer = self.generate_file_log_writer(); let log_file_writer = self.generate_file_log_writer()?;
if let Some(sink) = pipeline.sink.as_ref() { if let Some(sink) = pipeline.sink.as_ref() {
sink.reset(log_file_writer) sink.reset(log_file_writer)
.map_err(|error| anyhow::anyhow!("failed to reset log writer: {error}"))?; .map_err(|error| anyhow::anyhow!("failed to reset log writer: {error}"))?;
@@ -13,13 +13,14 @@ pub(super) async fn check_chatgpt(client: &Client) -> UnlockItem {
let web_status = get_text(client, "https://api.openai.com/compliance/cookie_requirements") let web_status = get_text(client, "https://api.openai.com/compliance/cookie_requirements")
.await .await
.map_or("Failed", |body| { .map(|body| {
if body.to_ascii_lowercase().contains("unsupported_country") { if body.to_ascii_lowercase().contains("unsupported_country") {
"Unsupported Country/Region" "Unsupported Country/Region"
} else { } else {
"Yes" "Yes"
} }
}); })
.unwrap_or("Failed");
UnlockItem::checked(CHATGPT_WEB_NAME, web_status, region) UnlockItem::checked(CHATGPT_WEB_NAME, web_status, region)
} }
@@ -157,10 +157,11 @@ async fn is_unavailable(client: &Client) -> bool {
.get("https://disneyplus.com") .get("https://disneyplus.com")
.send() .send()
.await .await
.map_or(true, |response| { .map(|response| {
let url = response.url().as_str(); let url = response.url().as_str();
url.contains("preview") || url.contains("unavailable") url.contains("preview") || url.contains("unavailable")
}) })
.unwrap_or(true)
} }
async fn fallback_region(client: &Client) -> Option<UnlockItem> { async fn fallback_region(client: &Client) -> Option<UnlockItem> {
+11 -6
View File
@@ -1,23 +1,28 @@
use reqwest::Client; use reqwest::Client;
use crate::utils::classify_restricted_status; use crate::utils::{classify_restricted_status, get_trace_location};
use super::UnlockItem; use super::UnlockItem;
pub(crate) const MUSE_AI_NAME: &str = "Muse AI"; pub(crate) const MUSE_AI_NAME: &str = "Muse AI";
const MUSE_URL: &str = "https://muse.ai"; const MUSE_URL: &str = "https://muse.ai";
const CLOUDFLARE_TRACE_URL: &str = "https://www.cloudflare.com/cdn-cgi/trace";
// The aymh ("Are You a Human") gateway answers plain HTTP requests with a // The aymh ("Are You a Human") gateway answers plain HTTP requests with a
// generic Meta error page that always contains the Facebook logo asset. // generic Meta error page that always contains the Facebook logo asset.
const AYMH_ERROR_MARKERS: &[&str] = &["Sorry, something went wrong", "static.facebook.com/images/logos"]; const AYMH_ERROR_MARKERS: &[&str] = &["Sorry, something went wrong", "static.facebook.com/images/logos"];
pub(super) async fn check_muse_ai(client: &Client) -> UnlockItem { pub(super) async fn check_muse_ai(client: &Client) -> UnlockItem {
// muse.ai is served by Vercel and does not expose a service-specific region trace endpoint. // muse.ai itself is served by Vercel, so resolve the exit region through
// Querying a generic third-party domain (e.g. www.cloudflare.com/cdn-cgi/trace) would report // the generic Cloudflare trace endpoint instead of a service-specific one.
// that domain's proxy group rather than muse.ai's actual exit in Rule mode, so leave region as None. let region = get_trace_location(client, CLOUDFLARE_TRACE_URL)
.await
.map(|code| code.trim().to_ascii_uppercase())
.map(|code| UnlockItem::region_label(&code));
let Ok(response) = client.get(MUSE_URL).send().await else { let Ok(response) = client.get(MUSE_URL).send().await else {
return UnlockItem::checked(MUSE_AI_NAME, "Failed (Network Connection)", None); return UnlockItem::checked(MUSE_AI_NAME, "Failed (Network Connection)", region);
}; };
let status = response.status(); let status = response.status();
@@ -39,5 +44,5 @@ pub(super) async fn check_muse_ai(client: &Client) -> UnlockItem {
classify_restricted_status(status).unwrap_or("Failed") classify_restricted_status(status).unwrap_or("Failed")
}; };
UnlockItem::checked(MUSE_AI_NAME, result, None) UnlockItem::checked(MUSE_AI_NAME, result, region)
} }
@@ -114,10 +114,11 @@ async fn check_netflix_cdn(client: &Client) -> UnlockItem {
} }
match response.json::<FastResponse>().await { match response.json::<FastResponse>().await {
Ok(data) => data.targets.first().map_or_else( Ok(data) => data
|| item("Unknown"), .targets
|target| UnlockItem::checked_region(NETFLIX_NAME, "Yes", &target.location.country), .first()
), .map(|target| UnlockItem::checked_region(NETFLIX_NAME, "Yes", &target.location.country))
.unwrap_or_else(|| item("Unknown")),
Err(e) => { Err(e) => {
logging!(error, Type::Network, "解析 Fast.com API 响应失败: {e}"); logging!(error, Type::Network, "解析 Fast.com API 响应失败: {e}");
item("Failed (解析错误)") item("Failed (解析错误)")
@@ -12,7 +12,7 @@ parking_lot = { workspace = true }
serde = { workspace = true, features = ["derive"] } serde = { workspace = true, features = ["derive"] }
# sysinfo 0.38.2 conflicts with dark-light # sysinfo 0.38.2 conflicts with dark-light
# see https://github.com/GuillaumeGomez/sysinfo/issues/1623 # see https://github.com/GuillaumeGomez/sysinfo/issues/1623
sysinfo = { version = "0.40.3", default-features = false, features = ["network", "system"] } sysinfo = { version = "0.40.1", default-features = false, features = ["network", "system"] }
[target.'cfg(not(windows))'.dependencies] [target.'cfg(not(windows))'.dependencies]
libc = "0.2.191" libc = "0.2.191"
@@ -118,7 +118,8 @@ fn is_binary_admin() -> bool {
#[cfg(windows)] #[cfg(windows)]
Token::with_current_process() Token::with_current_process()
.and_then(|token| token.privilege_level()) .and_then(|token| token.privilege_level())
.is_ok_and(|level| level != PrivilegeLevel::NotPrivileged) .map(|level| level != PrivilegeLevel::NotPrivileged)
.unwrap_or(false)
} }
#[inline] #[inline]
+1 -1
View File
@@ -14,7 +14,7 @@
"duplicates", "duplicates",
"cycles" "cycles"
], ],
"ignoreBinaries": ["diff", "rustc"], "ignoreBinaries": ["rustc", "cc"],
"ignoreDependencies": ["lint-staged"], "ignoreDependencies": ["lint-staged"],
"ignoreIssues": { "ignoreIssues": {
"src/types/generated/**": ["exports", "types"], "src/types/generated/**": ["exports", "types"],
+15 -8
View File
@@ -36,7 +36,11 @@
"test": "vitest run", "test": "vitest run",
"test:watch": "vitest", "test:watch": "vitest",
"knip:check": "knip", "knip:check": "knip",
"knip:report": "knip --no-exit-code" "knip:report": "knip --no-exit-code",
"perf:build": "node scripts/perf/build.mjs",
"perf:run": "node scripts/perf/run.mjs",
"perf:compare": "node scripts/perf/compare.mjs",
"perf:test": "node --test scripts/perf/report.test.mjs"
}, },
"dependencies": { "dependencies": {
"@dnd-kit/collision": "^0.5.0", "@dnd-kit/collision": "^0.5.0",
@@ -54,8 +58,8 @@
"@tauri-apps/plugin-clipboard-manager": "2.5.0", "@tauri-apps/plugin-clipboard-manager": "2.5.0",
"@tauri-apps/plugin-dialog": "2.8.4", "@tauri-apps/plugin-dialog": "2.8.4",
"@tauri-apps/plugin-fs": "2.7.1", "@tauri-apps/plugin-fs": "2.7.1",
"@tauri-apps/plugin-http": "2.9.0", "@tauri-apps/plugin-http": "2.8.3",
"@tauri-apps/plugin-opener": "2.7.3", "@tauri-apps/plugin-opener": "2.7.2",
"@tauri-apps/plugin-updater": "2.14.1", "@tauri-apps/plugin-updater": "2.14.1",
"ahooks": "^3.10.0", "ahooks": "^3.10.0",
"cidr-block": "^2.3.0", "cidr-block": "^2.3.0",
@@ -63,7 +67,7 @@
"dayjs": "1.11.23", "dayjs": "1.11.23",
"foxact": "^0.3.12", "foxact": "^0.3.12",
"foxts": "^5.9.1", "foxts": "^5.9.1",
"i18next": "^27.0.0", "i18next": "^26.4.2",
"js-yaml": "^5.4.2", "js-yaml": "^5.4.2",
"lodash-es": "^4.18.1", "lodash-es": "^4.18.1",
"meta-json-schema": "^1.19.31", "meta-json-schema": "^1.19.31",
@@ -75,7 +79,7 @@
"react-dom": "19.3.1", "react-dom": "19.3.1",
"react-error-boundary": "6.1.6", "react-error-boundary": "6.1.6",
"react-hook-form": "^7.88.0", "react-hook-form": "^7.88.0",
"react-i18next": "18.0.1", "react-i18next": "17.1.13",
"react-markdown": "10.1.0", "react-markdown": "10.1.0",
"react-router": "^8.4.0", "react-router": "^8.4.0",
"rehype-raw": "^7.0.0", "rehype-raw": "^7.0.0",
@@ -98,6 +102,7 @@
"@types/validator": "^13.15.10", "@types/validator": "^13.15.10",
"@vitejs/plugin-legacy": "^8.2.3", "@vitejs/plugin-legacy": "^8.2.3",
"@vitejs/plugin-react": "^6.1.1", "@vitejs/plugin-react": "^6.1.1",
"@wdio/tauri-service": "1.5.1",
"adm-zip": "^0.6.1", "adm-zip": "^0.6.1",
"axios": "^1.20.0", "axios": "^1.20.0",
"cli-color": "^2.0.4", "cli-color": "^2.0.4",
@@ -116,7 +121,7 @@
"https-proxy-agent": "^9.1.0", "https-proxy-agent": "^9.1.0",
"husky": "^9.1.7", "husky": "^9.1.7",
"jiti": "^2.7.0", "jiti": "^2.7.0",
"knip": "6.45.1", "knip": "6.44.2",
"lint-staged": "^17.5.1", "lint-staged": "^17.5.1",
"sass": "^1.104.1", "sass": "^1.104.1",
"tar": "^7.5.22", "tar": "^7.5.22",
@@ -126,7 +131,9 @@
"typescript-eslint": "^8.70.0", "typescript-eslint": "^8.70.0",
"vite": "^8.3.0", "vite": "^8.3.0",
"vite-plugin-svgr": "^5.2.0", "vite-plugin-svgr": "^5.2.0",
"vitest": "^5.0.1" "vitest": "^5.0.1",
"webdriverio": "10.2.0",
"ws": "8.22.2"
}, },
"lint-staged": { "lint-staged": {
"*.{ts,tsx,js,mjs}": [ "*.{ts,tsx,js,mjs}": [
@@ -138,5 +145,5 @@
] ]
}, },
"type": "module", "type": "module",
"packageManager": "pnpm@12.21.0" "packageManager": "pnpm@12.18.0"
} }
+1835 -116
View File
File diff suppressed because it is too large Load Diff
+6 -1
View File
@@ -50,7 +50,12 @@
}, },
{ {
"description": "Update Tauri npm packages and Cargo crates together so frontend and backend stay in sync", "description": "Update Tauri npm packages and Cargo crates together so frontend and backend stay in sync",
"matchPackageNames": ["@tauri-apps/**", "tauri", "tauri-*"], "matchPackageNames": [
"@tauri-apps/**",
"@wdio/tauri-service",
"tauri",
"tauri-*"
],
"groupName": "tauri", "groupName": "tauri",
"addLabels": ["tauri"] "addLabels": ["tauri"]
}, },
+1 -1
View File
@@ -1,3 +1,3 @@
[toolchain] [toolchain]
channel = "1.100.0" channel = "1.99.1"
components = ["rustfmt", "clippy"] components = ["rustfmt", "clippy"]
-50
View File
@@ -46,58 +46,8 @@ function run(command, args, options = {}) {
}) })
} }
async function checkDevelopmentServiceVersion() {
const [guiOutput, daemonOutput] = await Promise.all([
run(
'cargo',
[
'metadata',
'--locked',
'--format-version=1',
'--manifest-path',
join(repositoryRoot, 'Cargo.toml'),
],
{ stdio: ['inherit', 'pipe', 'inherit'] },
),
run(
'cargo',
[
'metadata',
'--locked',
'--no-deps',
'--format-version=1',
'--manifest-path',
serviceManifest,
],
{ stdio: ['inherit', 'pipe', 'inherit'] },
),
])
const gui = JSON.parse(guiOutput)
const daemon = JSON.parse(daemonOutput).packages.find(
(pkg) => resolve(pkg.manifest_path) === serviceManifest,
)
const app = gui.packages.find(
(pkg) =>
resolve(pkg.manifest_path) ===
join(repositoryRoot, 'src-tauri', 'Cargo.toml'),
)
const dependency = gui.resolve?.nodes
.find((node) => node.id === app?.id)
?.deps.find((dep) => dep.name === 'clash_verge_service_ipc')
const sdk = gui.packages.find((pkg) => pkg.id === dependency?.pkg)
if (!daemon || !sdk)
throw new Error('Cargo did not resolve the development Service and GUI SDK')
if (daemon.version !== sdk.version) {
throw new Error(
`Development Service ${daemon.version} does not match the resolved GUI SDK ${sdk.version} (${sdk.manifest_path}). ` +
'Align the GUI dependency explicitly before starting development. Building the sibling daemon does not update the SDK.',
)
}
}
export async function prepareDevelopmentService() { export async function prepareDevelopmentService() {
await access(serviceManifest) await access(serviceManifest)
await checkDevelopmentServiceVersion()
const output = await run( const output = await run(
'cargo', 'cargo',
[ [
-28
View File
@@ -1,28 +0,0 @@
# Product Measurement Adapter Guidelines
[GUIDE.md](GUIDE.md) defines the product adapter boundary and explicit tool invocation.
Keep real component imports, initialization and the isolated native entry here,
using product frontend/native build dependencies. Do not copy components into the
tool. Preserve perf build gates; ordinary builds must not require the external tool.
The adapter must not load or modify daily configuration or control the daily app,
Core, Service, TUN, DNS or system proxy. Preserve loopback isolation, owned-process
PID/start attribution, nonactivation, visibility/occlusion and source continuity.
Do not weaken gates or substitute Chrome/Vite for native WebView evidence. Label
JavaScript adapters separately from native plugin/IPC paths. Expected startup errors
must use the owned app's normal nonzero exit, never panic through Tauri setup.
Review adapter source changes, including initialization and native/build configuration,
for changed measurement meaning. Matching interfaces alone do not prove equivalence;
an adapter review cannot waive other acceptance conditions.
For implementation changes, run scoped ESLint, both perf TypeScript projects
(`tsconfig.json` and `tsconfig.node.json`), formatting and relevant production checks,
including Rust checks for native changes. Run scoped Rust Clippy before freezing
the optimized artifact. Check ordinary-build exclusion and application-entry prerequisites.
Follow the external AGENTS.md's
[measurement-validation requirements](https://github.com/clash-verge-rev/clash-verge-rev-harness/blob/main/AGENTS.md)
and README's
[validation order](https://github.com/clash-verge-rev/clash-verge-rev-harness/blob/main/README.md#validate-before-freezing-a-build).
These govern affected native coverage, comparison, failure cleanup and evidence reuse.
+132 -27
View File
@@ -1,35 +1,140 @@
# Product measurement adapter # macOS Traffic Performance Harness
This directory owns the isolated native entry, real Traffic/Logs/Connections This guide is the operating and maintenance contract for humans and coding agents.
imports, initialization, JavaScript socket adapter, replay receiver and minimal DOM The only scenario is the production home traffic graph in a dedicated, optimized
layer. These evolve with product APIs and use the product's React/Tauri/Wry Tauri WKWebView. It measures foreground updates, native hide, then restoration.
versions. Keep the explicit perf build gates; ordinary builds need no external tool. It does not initialize the complete homepage or run Mihomo, Service or networking.
The external [clash-verge-rev-harness operating guide](https://github.com/clash-verge-rev/clash-verge-rev-harness/blob/main/README.md) ## Build And Run
owns running, sampling, reports, comparison and owned cleanup. Follow its
[first setup and installation instructions](https://github.com/clash-verge-rev/clash-verge-rev-harness/blob/main/README.md#build-and-run), Use this repository's pnpm, Rust and Xcode Command Line Tools on macOS. No global
reusing an existing checkout. For subsequent calls, pass both absolute roots: WebDriver installation is needed. Keep each binary beside its generated manifest.
```sh ```sh
project=/absolute/path/to/clash-verge-rev pnpm install --frozen-lockfile
harness=/absolute/path/to/clash-verge-rev-harness pnpm perf:build target/perf/baseline-build
node "$harness/build.mjs" --project "$project" --output target/perf/build caffeinate -di pnpm perf:run -- --binary target/perf/baseline-build/clash-verge --output target/perf/baseline --repeat 3 --seconds 20 --warmup 10
caffeinate -di node "$harness/run.mjs" --project "$project" --binary target/perf/build/clash-verge --output target/perf/smoke --repeat 1 --seconds 5 --warmup 2 pnpm perf:compare -- target/perf/baseline target/perf/baseline
node "$harness/compare.mjs" "$project/target/perf/smoke" "$project/target/perf/smoke" pnpm perf:test
``` ```
JavaScript socket replacement does not measure native plugin IPC. DOM mutation/text `perf:build [directory]` uses release optimization, Vite `--mode perf` and the
hashes show view-input delivery, not painting or cache ownership. Adapter changes explicit Cargo `perf-harness` feature. It preserves the binary and records HEAD,
require reviewing measurement meaning under the external validation requirements. dirty state, compiled source, lockfile, frontend, build-settings and binary hashes.
Source changes during compilation reject the manifest. Each run also hashes the
external collector and runner. Ordinary builds exclude the driver and measurement
entry; debug assertions are not the gate. Do not edit compiled inputs during builds.
For virtual display mode, this adapter places only the hidden measurement window Output directories must be new and Git ignored; use `target/perf/`. JSON/CSV keep
on the exact owned NSScreen, checks complete visibleFrame containment, mode/Space raw process samples, observations, phase markers, attribution and cleanup evidence.
flags and nonactivation, and exits on drift. The tool owns helper lifecycle and topology `summary.json` and `report.md` provide distributions by independent run, phase and
restoration; see its process role. Failed runs exit nonzero and retain their evidence. The explicit
[virtual display guide](https://github.com/clash-verge-rev/clash-verge-rev-harness/blob/main/README.md#optional-virtual-display). `traffic-webview-v3` schema rejects older reports instead of silently migrating them.
`isolation.json` owns the product configuration and process watch scope; keep it ## Isolation And Visibility
aligned with product data directories and executable names. The tool owns
[command isolation snapshots](https://github.com/clash-verge-rev/clash-verge-rev-harness/blob/main/README.md#command-isolation-snapshots). The dedicated measurement main bypasses normal initialization and shutdown. It
The adapter must not load daily configuration or control Core, Service, TUN, DNS does not read or write daily configuration, subscriptions, proxy, TUN or Service.
or system proxy. It uses a distinct app identity and incognito WebView. Both automatic services
bind loopback and are owned by the current run; never kill processes by name.
The measurement window stays above ordinary windows and covers part of the screen,
without activation or mouse capture: clicks pass through to the application behind it.
Native topmost and click-through states are verified, while native focus and application
activation must remain false. WebDriver uses the embedded WebView directly; DOM focus
is recorded but not required. Daily windows are unchanged; the topmost window exits
with its owned measurement instance. You may keep using another application.
The console must be unlocked. Lock state is checked before startup and recorded
at phase boundaries; unknown state fails and observed drift rejects comparison.
Boundary checks do not provide continuous lock monitoring or unlock the computer.
No focus does not mean no visibility: shown stages require `document.hidden=false`,
fresh Worker data, advancing Canvas draw timestamps and changed Canvas pixels.
Topmost placement avoids ordinary-window occlusion; system overlays or another Space
can still pause WebKit. Such a run fails; do not weaken Canvas assertions to make it
pass. `caffeinate -di` lasts only for the command and cannot prevent deliberate lock.
Hidden stages still require continuous input and Worker data.
## Fixed Workload
The native window is 1000 x 700 logical pixels. Verify driver dimensions against
DPR and record the actual CSS viewport; titlebar space is excluded. The graph is
920 x 360 with a ten-minute range, default bezier style and real data retention.
The measurement preload sets blur pause false without changing production defaults.
Deterministic loopback WebSocket replay enters the public traffic append boundary,
then the production Worker and Canvas. It does not cover Mihomo or network traffic.
There is no history prefill. Absolute 200 ms deadlines sustain 5 Hz without cumulative
timer drift or catch-up bursts; missing a complete period fails the source.
Warmup is at least the requested duration with a five-second readiness allowance.
Fixed input anchors reserve two seconds for each native transition; measured stages
retain their full duration. Readiness uses observable state and deadlines, not sleep.
Before the first show, wait for actual replay input and Worker data so the graph's
visibility listeners are installed; then require fresh Canvas output after showing.
Total replay, including allowances, must remain below ten minutes for raw history.
Two-input endpoint variation is 400 ms; larger differences reject comparison.
Worker snapshots are asynchronous. Count/latest-value checks verify deterministic
upload/download values at the retained point count, with a joint period of 60 and
received-minus-retained count below 60. This detects net missing/duplicate points,
not every historical element or exactly cancelling losses and duplicates.
Source age must be below 2500 ms, Worker age below 3500 ms and visible draw age below
2500 ms. Future timestamps, lost sequence, process changes and failed restore fail.
## Metrics And Comparison
The native command obtains the actual WKWebView process ID using the private
`_webProcessIdentifier` selector, with availability checking. External collection
verifies the canonical system WebContent executable and process start identity.
It handles PID reuse and exits; unsupported ownership fails closed. Main and WebView
remain separate. Mihomo is not started; shared GPU/network attribution is unavailable.
CPU is cumulative process time converted from Mach ticks; interval percentages use
adjacent valid samples, with one occupied core equal to 100%. The first difference
is unavailable. Memory is RSS bytes, not physical footprint or exclusive memory.
Reports include CPU mean/P50/P95/peak/seconds, RSS median/P95/peak/delta, sample count
and time coverage. Memory slope requires at least 60 seconds of continuous samples.
RSS growth is not proof of a leak; process statistics are not function profiles.
The embedded driver adds a 20 Hz macOS runloop timer and observation overhead.
For A/B, build the candidate separately and alternate independent instances:
```sh
pnpm perf:build target/perf/candidate-build
for i in 1 2 3; do
caffeinate -di pnpm perf:run -- --binary target/perf/baseline-build/clash-verge --repeat 1 --output target/perf/ab-baseline/$i
caffeinate -di pnpm perf:run -- --binary target/perf/candidate-build/clash-verge --repeat 1 --output target/perf/ab-candidate/$i
done
pnpm perf:compare -- target/perf/ab-baseline target/perf/ab-candidate
pnpm perf:run -- --binary target/perf/candidate-build/clash-verge --repeat 1 --seconds 5 --warmup 2 --fail-phase hidden --output target/perf/failed
```
Comparison accepts summary files, run directories or groups of run directories.
Build mode, toolchain, platform, host, power, WebKit, viewport and workload must match.
Invalid and incomparable reports exit 2. A/A remains inconclusive. A/B compares
independent-run summaries, not adjacent time samples. An optional third numeric
argument is a percentage floor justified by baseline noise; there is no universal
pass threshold. Fewer than three runs per group, overlapping ranges or differences
within either group's range remain inconclusive. Background load limits inference.
## Automation Delivery Boundary
When the operator is a coding agent, the final change keeps only the
performance-optimization code. Harness additions introduced during the
work — measurement entries, configs, scripts, reports, manifests — must
stay untracked by Git and out of every commit; keep them on ignored
paths or remove them before delivery. Commits remain minimal and
necessary for the optimization itself. Track or commit harness files
only when a human explicitly requests it at the end.
## Maintenance And Acceptance
Keep measurement code behind the explicit build gates. Reuse the existing driver,
Worker, graph, attribution and cleanup; do not add mock IPC or replace real WebView
acceptance with Chrome/Vite. Preserve source/binary/report hashes and every failed run.
After changes, run scoped ESLint, both perf TypeScript projects, `pnpm perf:test`,
format checks and relevant production checks. Verify a real three-phase smoke,
three independent runs, A/A, invalid/incomparable reports and injected-failure cleanup.
Verify ordinary builds exclude measurement code and daily instance state is intact.
Changes to contracts require a schema bump and new reports. Use bounded WebKit CPU
or Allocation/Heap captures for deeper diagnosis; do not infer hotspots from counters.
-57
View File
@@ -1,57 +0,0 @@
import { MihomoWebSocket } from 'tauri-plugin-mihomo-api'
import { subscribe, scenario } from './replay'
// Only this perf entry replaces socket transport; the normal application never imports it.
export function installAdapter() {
const connect = async (kind: string) => {
const data = document.documentElement.dataset
data.perfSubscriptions = String(Number(data.perfSubscriptions || 0) + 1)
const callbacks = new Set<
(message: { type: 'Text'; data: string }) => void
>()
const unsubscribe = subscribe((frame) => {
const messages =
kind === 'logs'
? (frame.payload as ILogItem[])
: [
kind === 'traffic'
? { up: frame.sequence * 1000, down: frame.sequence * 5000 }
: frame.payload,
]
for (const payload of messages) {
const message = { type: 'Text' as const, data: JSON.stringify(payload) }
callbacks.forEach((callback) => {
callback(message)
data.perfDelivered = String(Number(data.perfDelivered || 0) + 1)
})
}
})
return {
addListener: (
callback: (message: { type: 'Text'; data: string }) => void,
) => {
callbacks.add(callback)
return () => callbacks.delete(callback)
},
close: async () => {
unsubscribe()
callbacks.clear()
data.perfSubscriptions = String(Number(data.perfSubscriptions) - 1)
},
} as unknown as MihomoWebSocket
}
MihomoWebSocket.connect_logs = async () => connect('logs')
MihomoWebSocket.connect_connections = async () => connect('connections')
MihomoWebSocket.connect_traffic = async () => connect('traffic')
if (scenario === 'logs')
localStorage.setItem(
'clash-log',
JSON.stringify({
enable: true,
logLevel: 'INFO',
logFilter: 'all',
logOrder: 'desc',
}),
)
}
+11 -217
View File
@@ -1,136 +1,5 @@
use objc2::{class, msg_send, runtime::AnyObject, sel}; use objc2::{class, msg_send, runtime::AnyObject, sel};
use objc2_foundation::{NSPoint, NSRect, ns_string}; use tauri::WebviewWindow;
use tauri::{Manager as _, WebviewWindow};
#[link(name = "CoreGraphics", kind = "framework")]
unsafe extern "C" {
fn CGDisplayCopyDisplayMode(display: u32) -> *mut std::ffi::c_void;
fn CGDisplayModeGetRefreshRate(mode: *mut std::ffi::c_void) -> f64;
fn CGDisplayModeRelease(mode: *mut std::ffi::c_void);
fn CGMainDisplayID() -> u32;
fn CGDisplayIsInMirrorSet(display: u32) -> u32;
fn CGDisplayModeGetWidth(mode: *mut std::ffi::c_void) -> usize;
fn CGDisplayModeGetHeight(mode: *mut std::ffi::c_void) -> usize;
fn CGDisplayModeGetPixelWidth(mode: *mut std::ffi::c_void) -> usize;
fn CGDisplayModeGetPixelHeight(mode: *mut std::ffi::c_void) -> usize;
}
fn expected_display() -> Result<Option<u32>, String> {
match std::env::var("PERF_DISPLAY_MODE").as_deref() {
Ok("physical") | Err(std::env::VarError::NotPresent) => Ok(None),
Ok("virtual") => {
let id = std::env::var("PERF_DISPLAY_ID")
.map_err(|e| e.to_string())?
.parse::<u32>()
.map_err(|e| e.to_string())?;
if id == 0 {
return Err("invalid owned display ID".into());
}
Ok(Some(id))
}
_ => Err("unknown measurement display mode".into()),
}
}
const fn bounds(rect: NSRect) -> [f64; 4] {
[rect.origin.x, rect.origin.y, rect.size.width, rect.size.height]
}
fn contained(frame: NSRect, screen: NSRect) -> bool {
frame.origin.x >= screen.origin.x
&& frame.origin.y >= screen.origin.y
&& frame.origin.x + frame.size.width <= screen.origin.x + screen.size.width
&& frame.origin.y + frame.size.height <= screen.origin.y + screen.size.height
}
unsafe fn screen_id(screen: *mut AnyObject) -> u32 {
unsafe {
if screen.is_null() {
return 0;
}
let dictionary: *mut AnyObject = msg_send![screen, deviceDescription];
let value: *mut AnyObject = msg_send![dictionary, objectForKey: ns_string!("NSScreenNumber")];
msg_send![value, unsignedIntValue]
}
}
unsafe fn display_state(native: &AnyObject) -> Result<Option<serde_json::Value>, String> {
let Some(wanted) = expected_display()? else {
return Ok(None);
};
unsafe {
let screen: *mut AnyObject = msg_send![native, screen];
let id = screen_id(screen);
if id == 0 || id != wanted || id == CGMainDisplayID() || CGDisplayIsInMirrorSet(id) != 0 {
return Err("owned virtual screen unavailable".into());
}
let frame: NSRect = msg_send![screen, frame];
let visible: NSRect = msg_send![screen, visibleFrame];
let window_frame: NSRect = msg_send![native, frame];
let scale: f64 = msg_send![screen, backingScaleFactor];
let behavior: usize = msg_send![native, collectionBehavior];
let mode = CGDisplayCopyDisplayMode(id);
if mode.is_null() {
return Err("owned display mode unavailable".into());
}
let rate = CGDisplayModeGetRefreshRate(mode);
let logical = [CGDisplayModeGetWidth(mode), CGDisplayModeGetHeight(mode)];
let pixels = [CGDisplayModeGetPixelWidth(mode), CGDisplayModeGetPixelHeight(mode)];
CGDisplayModeRelease(mode);
if logical != [1280, 900]
|| pixels != [2560, 1800]
|| scale != 2.0
|| (rate - 60.0).abs() > 0.01
|| frame.size.width != 1280.0
|| frame.size.height != 900.0
|| !contained(window_frame, visible)
|| behavior & 1 == 0
|| behavior & 2 != 0
{
return Err("owned virtual screen geometry/mode changed".into());
}
Ok(Some(
serde_json::json!({"id": id, "frame": bounds(frame), "visibleFrame": bounds(visible), "windowFrame": bounds(window_frame), "scale": scale, "refreshHz": rate, "collectionBehavior": behavior, "contained": true, "main": false, "mirrored": false, "logical": logical, "pixels": pixels}),
))
}
}
unsafe fn target_screen(wanted: u32) -> Result<*mut AnyObject, String> {
unsafe {
let screens: *mut AnyObject = msg_send![class!(NSScreen), screens];
let count: usize = msg_send![screens, count];
let mut target = std::ptr::null_mut::<AnyObject>();
for index in 0..count {
let screen: *mut AnyObject = msg_send![screens, objectAtIndex: index];
if screen_id(screen) == wanted {
target = screen;
break;
}
}
if target.is_null() || wanted == CGMainDisplayID() {
return Err("exact owned virtual display missing".into());
}
Ok(target)
}
}
unsafe fn place_virtual(window: &WebviewWindow) -> Result<(), String> {
unsafe {
let Some(wanted) = expected_display()? else {
return Ok(());
};
let target = target_screen(wanted)?;
let native = &*(window.ns_window().map_err(|e| e.to_string())? as *const AnyObject);
let visible: NSRect = msg_send![target, visibleFrame];
let frame: NSRect = msg_send![native, frame];
if frame.size.width > visible.size.width || frame.size.height > visible.size.height {
return Err("owned window does not fit virtual visibleFrame".into());
}
let behavior: usize = msg_send![native, collectionBehavior];
let _: () = msg_send![native, setCollectionBehavior: (behavior & !2usize) | 1usize];
let origin = NSPoint::new(
visible.origin.x + (visible.size.width - frame.size.width) / 2.0,
visible.origin.y + (visible.size.height - frame.size.height) / 2.0,
);
let _: () = msg_send![native, setFrameOrigin: origin];
display_state(native)?;
Ok(())
}
}
#[tauri::command] #[tauri::command]
async fn perf_state(window: WebviewWindow, action: String) -> Result<serde_json::Value, String> { async fn perf_state(window: WebviewWindow, action: String) -> Result<serde_json::Value, String> {
@@ -138,28 +7,16 @@ async fn perf_state(window: WebviewWindow, action: String) -> Result<serde_json:
return Err("unknown measurement action".into()); return Err("unknown measurement action".into());
} }
let (tx, rx) = std::sync::mpsc::channel(); let (tx, rx) = std::sync::mpsc::channel();
let fail_app = window.app_handle().clone();
window window
.with_webview(move |view| unsafe { .with_webview(move |view| unsafe {
let native = &*(view.ns_window() as *const AnyObject); let native = &*(view.ns_window() as *const AnyObject);
let sender = std::ptr::null::<AnyObject>(); let sender = std::ptr::null::<AnyObject>();
let display = match display_state(native) {
Ok(state) => state,
Err(error) => {
let _: () = msg_send![native, orderOut: sender];
let _ = tx.send(Err(error));
fail_app.exit(2);
return;
}
};
if action == "show" { if action == "show" {
let _: () = msg_send![native, orderBack: sender]; let _: () = msg_send![native, orderBack: sender];
} else if action == "hide" { } else if action == "hide" {
let _: () = msg_send![native, orderOut: sender]; let _: () = msg_send![native, orderOut: sender];
} }
let visible: bool = msg_send![native, isVisible]; let visible: bool = msg_send![native, isVisible];
let occlusion: usize = msg_send![native, occlusionState];
let active_space: bool = msg_send![native, isOnActiveSpace];
let focused: bool = msg_send![native, isKeyWindow]; let focused: bool = msg_send![native, isKeyWindow];
let click_through: bool = msg_send![native, ignoresMouseEvents]; let click_through: bool = msg_send![native, ignoresMouseEvents];
let app: *const AnyObject = msg_send![class!(NSApplication), sharedApplication]; let app: *const AnyObject = msg_send![class!(NSApplication), sharedApplication];
@@ -171,41 +28,21 @@ async fn perf_state(window: WebviewWindow, action: String) -> Result<serde_json:
} else { } else {
0 0
}; };
let _ = tx.send(Ok(( let _ = tx.send((pid, visible, focused, active, click_through));
pid,
visible,
focused,
active,
click_through,
occlusion & 2 == 0,
active_space,
display,
)));
}) })
.map_err(|e| e.to_string())?; .map_err(|e| e.to_string())?;
let (pid, visible, focused, active, click_through, occluded, active_space, display) = rx let (pid, visible, focused, active, click_through) = rx
.recv_timeout(std::time::Duration::from_secs(5)) .recv_timeout(std::time::Duration::from_secs(5))
.map_err(|e| e.to_string())??; .map_err(|e| e.to_string())?;
if pid <= 0 { if pid <= 0 {
return Err("WKWebView process ownership unavailable".into()); return Err("WKWebView process ownership unavailable".into());
} }
let top = window.is_always_on_top().map_err(|e| e.to_string())?; let top = window.is_always_on_top().map_err(|e| e.to_string())?;
Ok(serde_json::json!({"main": std::process::id(), "webview": pid, Ok(serde_json::json!({"main": std::process::id(), "webview": pid,
"visible": visible, "nativeFocused": focused, "appActive": active, "visible": visible, "nativeFocused": focused, "appActive": active,
"virtualScreen": display, "expectedDisplayID": expected_display()?, "top": top, "clickThrough": click_through,
"top": top, "occluded": occluded, "activeSpace": active_space, "clickThrough": click_through,
"token": std::env::var("PERF_TOKEN").map_err(|e| e.to_string())?})) "token": std::env::var("PERF_TOKEN").map_err(|e| e.to_string())?}))
} }
#[tauri::command]
const fn get_clash_logs() -> Vec<String> {
Vec::new()
}
#[tauri::command]
fn get_verge_config() -> serde_json::Value {
serde_json::json!({"language": "en", "theme_mode": "light"})
}
pub fn run() -> std::process::ExitCode { pub fn run() -> std::process::ExitCode {
#[cfg(feature = "clippy")] #[cfg(feature = "clippy")]
let context = tauri::test::mock_context(tauri::test::noop_assets()); let context = tauri::test::mock_context(tauri::test::noop_assets());
@@ -213,66 +50,23 @@ pub fn run() -> std::process::ExitCode {
let context = tauri::generate_context!(); let context = tauri::generate_context!();
let result = tauri::Builder::default() let result = tauri::Builder::default()
.plugin(tauri_plugin_wdio_webdriver::init()) .plugin(tauri_plugin_wdio_webdriver::init())
.invoke_handler(tauri::generate_handler![perf_state, get_clash_logs, get_verge_config]) .invoke_handler(tauri::generate_handler![perf_state])
.setup(|app| { .setup(|app| {
let startup = (|| -> Result<(), Box<dyn std::error::Error>> { app.handle().set_activation_policy(tauri::ActivationPolicy::Accessory)?;
app.handle()
.set_activation_policy(tauri::ActivationPolicy::Prohibited)?;
let scenario = std::env::var("PERF_SCENARIO").unwrap_or_else(|_| "traffic".into());
let layer = std::env::var("PERF_LAYER").unwrap_or_else(|_| "component".into());
if !matches!(scenario.as_str(), "traffic" | "logs" | "connections" | "proxy")
|| !matches!(layer.as_str(), "page" | "component" | "dom")
{
return Err("invalid perf scene".into());
}
if let Some(wanted) = expected_display().map_err(std::io::Error::other)? {
unsafe {
target_screen(wanted).map_err(std::io::Error::other)?;
}
}
let port: u16 = std::env::var("PERF_REPLAY_PORT")?.parse()?; let port: u16 = std::env::var("PERF_REPLAY_PORT")?.parse()?;
let window = tauri::WebviewWindowBuilder::new( tauri::WebviewWindowBuilder::new(
app, app,
"perf", "perf",
tauri::WebviewUrl::App(format!("index.html?port={port}&scenario={scenario}&layer={layer}").into()), tauri::WebviewUrl::App(format!("index.html?port={port}").into()),
) )
.title("Clash Verge - performance replay") .title("Clash Verge - performance replay")
.inner_size(1000., 700.) .inner_size(1000., 700.)
.visible(false) .visible(false)
.focused(false) .focused(false)
.focusable(false)
.always_on_top(true) .always_on_top(true)
.incognito(true) .incognito(true)
.build()?; .build()?
window.set_ignore_cursor_events(true)?; .set_ignore_cursor_events(true)?;
unsafe {
place_virtual(&window).map_err(std::io::Error::other)?;
}
if expected_display().map_err(std::io::Error::other)?.is_some() {
let handle = app.handle().clone();
window.on_window_event(move |event| {
if matches!(
event,
tauri::WindowEvent::Moved(_) | tauri::WindowEvent::ScaleFactorChanged { .. }
) && let Some(window) = handle.get_webview_window("perf")
{
let valid = window
.ns_window()
.ok()
.is_some_and(|native| unsafe { display_state(&*(native as *const AnyObject)).is_ok() });
if !valid {
let _ = window.hide();
handle.exit(2);
}
}
});
}
Ok(())
})();
if let Err(error) = startup {
eprintln!("Measurement startup failed: {error}");
app.handle().exit(1);
}
Ok(()) Ok(())
}) })
.build(context); .build(context);
+107
View File
@@ -0,0 +1,107 @@
import { execFileSync } from 'node:child_process'
import { createHash } from 'node:crypto'
import {
copyFileSync,
existsSync,
mkdirSync,
readFileSync,
writeFileSync,
} from 'node:fs'
import { resolve } from 'node:path'
const output = resolve(process.argv[2] ?? 'target/perf/build')
const hash = (bytes) => createHash('sha256').update(bytes).digest('hex')
const command = (cmd, args) =>
execFileSync(cmd, args, { encoding: 'utf8' }).trim()
const source = () =>
command('git', ['ls-files', '-co', '--exclude-standard'])
.split('\n')
.filter(existsSync)
.filter(
(path) =>
!path.startsWith('scripts/perf/') ||
/\.(rs|tsx|html|mts|json)$/.test(path),
)
.sort()
.map((path) => `${path}\0${hash(readFileSync(path))}`)
.join('\n')
mkdirSync(output, { recursive: true })
const before = hash(source())
const buildSettingsSha256 = hash(
['Cargo.toml', '.cargo/config.toml']
.filter(existsSync)
.map((path) => `${path}\0${hash(readFileSync(path))}`)
.join('\n'),
)
execFileSync(
'pnpm',
[
'exec',
'vite',
'build',
'--mode',
'perf',
'--config',
'scripts/perf/vite.mts',
],
{ stdio: 'inherit' },
)
const mode = 'release + perf-harness (build settings hash recorded)'
const buildCommand =
'TAURI_CONFIG=<scripts/perf/tauri.json> cargo build -p clash-verge --release --features perf-harness --locked --target-dir target/perf/cargo'
execFileSync(
'cargo',
[
'build',
'-p',
'clash-verge',
'--release',
'--features',
'perf-harness',
'--locked',
'--target-dir',
'target/perf/cargo',
],
{
stdio: 'inherit',
env: {
...process.env,
TAURI_CONFIG: readFileSync('scripts/perf/tauri.json', 'utf8'),
},
},
)
if (before !== hash(source()))
throw new Error('Source changed during build; refuse manifest')
const binary = `${output}/clash-verge`
copyFileSync('target/perf/cargo/release/clash-verge', binary)
const files = command('find', ['target/perf/dist', '-type', 'f'])
.split('\n')
.sort()
writeFileSync(
`${binary}.json`,
JSON.stringify(
{
head: command('git', ['rev-parse', 'HEAD']),
dirty: command('git', ['status', '--porcelain']),
sourceSha256: before,
binarySha256: hash(readFileSync(binary)),
frontendSha256: hash(
files.map((path) => `${path}\0${hash(readFileSync(path))}`).join('\n'),
),
mode,
buildSettingsSha256,
buildEnvironment: Object.fromEntries(
Object.entries(process.env).filter(([key]) =>
/^(RUSTFLAGS|CARGO_ENCODED_RUSTFLAGS|CARGO_PROFILE_|RUSTC_WRAPPER)/.test(
key,
),
),
),
buildCommand,
binary,
toolchain: `${command('rustc', ['--version'])}; node ${process.version}; pnpm ${command('pnpm', ['--version'])}`,
},
null,
2,
),
)
console.log(`Measurement binary and manifest: ${binary}`)
+41
View File
@@ -0,0 +1,41 @@
import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs'
import { join } from 'node:path'
import { compare } from './report.mjs'
const args = process.argv.slice(2).filter((v) => v !== '--')
if (args.length < 2)
throw new Error(
'Usage: pnpm perf:compare -- baseline/summary.json candidate/summary.json [noise-threshold-percent]',
)
const threshold = args[2] === undefined ? null : Number(args[2])
if (threshold !== null && (!Number.isFinite(threshold) || threshold < 0))
throw new Error(
'threshold must be a nonnegative percentage justified by baseline noise',
)
function load(path) {
if (statSync(path).isFile()) return JSON.parse(readFileSync(path))
if (existsSync(join(path, 'summary.json')))
return load(join(path, 'summary.json'))
const reports = readdirSync(path)
.sort()
.map((name) => load(join(path, name)))
const first = reports[0]
if (
!first ||
reports.some(
(r) =>
r.build?.binarySha256 !== first.build?.binarySha256 ||
['invalid', 'incomparable'].includes(compare(first, r).verdict),
)
)
throw new Error('group contains mixed builds, contracts, or invalid runs')
return { ...first, runs: reports.flatMap((r) => r.runs) }
}
let result
try {
result = compare(...args.slice(0, 2).map(load), threshold)
} catch (error) {
result = { verdict: 'invalid', reason: String(error) }
}
console.log(JSON.stringify(result, null, 2))
if (['invalid', 'incomparable'].includes(result.verdict)) process.exitCode = 2
+49 -28
View File
@@ -1,31 +1,52 @@
import { layer, scenario, startReplay } from './replay' import { ThemeProvider, createTheme } from '@mui/material'
import { useEffect } from 'react'
import { createRoot } from 'react-dom/client'
import { SWRConfig } from 'swr'
if (scenario === 'traffic') { import { EnhancedCanvasTrafficGraph } from '../../src/components/home/enhanced-canvas-traffic-graph'
await import('./traffic') import { useTrafficMonitorEnhanced } from '../../src/hooks/use-traffic-monitor'
} else if (scenario === 'proxy') { import { initializeLanguage } from '../../src/services/i18n'
await import('./proxy') import { setPreloadConfig } from '../../src/services/preload'
} else {
const root = document.getElementById('root')! setPreloadConfig({
document.body.style.cssText = 'margin:0;font:14px -apple-system,sans-serif' pause_render_traffic_stats_on_blur: false,
root.style.cssText = 'width:1000px;height:700px;overflow:hidden' } as IVergeConfig)
new MutationObserver(() => { await initializeLanguage('en')
document.documentElement.dataset.perfDraw = String(Date.now()) export function Replay() {
}).observe(root, { childList: true, characterData: true, subtree: true }) const {
window.addEventListener('error', (event) => { graphData: { appendData },
document.documentElement.dataset.perfError = event.message } = useTrafficMonitorEnhanced({ subscribe: false })
}) useEffect(() => {
window.addEventListener('unhandledrejection', (event) => { let received = 0,
document.documentElement.dataset.perfError = String(event.reason) previous = 0,
}) gaps = 0
if (layer === 'dom') { const socket = new WebSocket(
const { mount } = await import('./minimal') `ws://127.0.0.1:${new URLSearchParams(location.search).get('port')}`,
mount(root) )
} else { socket.onmessage = ({ data }) => {
if (layer === 'page') { const point = JSON.parse(data)
const { installAdapter } = await import('./adapter') appendData(point)
installAdapter() if (previous && point.sequence !== previous + 1) gaps++
previous = point.sequence
document.documentElement.dataset.perfReceived = String(++received)
document.documentElement.dataset.perfGaps = String(gaps)
document.documentElement.dataset.perfSourceTime = String(point.timestamp)
} }
await import('./scenes') return () => socket.close()
} }, [appendData])
startReplay() return (
<main
aria-label="Home traffic graph replay"
style={{ width: 920, height: 360, margin: 32 }}
>
<EnhancedCanvasTrafficGraph />
</main>
)
} }
createRoot(document.getElementById('root')!).render(
<SWRConfig value={{ revalidateOnFocus: false, revalidateOnReconnect: false }}>
<ThemeProvider theme={createTheme()}>
<Replay />
</ThemeProvider>
</SWRConfig>,
)
-137
View File
@@ -1,137 +0,0 @@
// Only this perf build aliases '@tauri-apps/api/core' to a shim that serves
// these responses for the proxy scenario; the normal application never
// imports it. The runtime-injected __TAURI_INTERNALS__ is read-only, so
// interception happens at import resolution instead. Unknown commands pass
// through to the real backend (perf_state, event plugin), keeping harness
// ownership probes and lifecycle commands working. The proxy scenario is
// therefore a JavaScript invoke adapter, not native plugin IPC.
const GROUP_COUNT = 40
const NODES_PER_GROUP = 24
const capabilities = {
udp: true,
xudp: false,
tfo: false,
mptcp: false,
smux: false,
}
const history = (delay: number) => [{ time: '2026-11-19T00:00:00Z', delay }]
const buildProxyView = () => {
const records: Record<string, unknown> = {}
const groups: {
name: string
type: string
now: string
hidden: boolean
history: { time: string; delay: number }[]
members: unknown[]
}[] = []
for (let g = 0; g < GROUP_COUNT; g++) {
const members: unknown[] = []
for (let n = 0; n < NODES_PER_GROUP; n++) {
const name = `node-${g}-${n}`
const recordId = `record-${g}-${n}`
records[recordId] = {
recordId,
name,
type: n % 3 === 0 ? 'Shadowsocks' : n % 3 === 1 ? 'Vmess' : 'Trojan',
history: history(30 + ((g * 7 + n * 13) % 40) * 10),
source: { kind: 'core', proxyName: name },
...capabilities,
}
members.push({ kind: 'node', name, recordId })
}
groups.push({
name: `group-${String(g).padStart(2, '0')}`,
type: g % 2 === 0 ? 'Selector' : 'URLTest',
now: `node-${g}-0`,
hidden: false,
history: history(20),
members,
})
}
return {
schemaVersion: 1,
orderSource: 'runtime',
providerState: 'ready',
global: {
name: 'GLOBAL',
type: 'Selector',
now: 'group-00',
hidden: true,
history: [],
members: groups.map((group) => ({ kind: 'group', name: group.name })),
...capabilities,
},
direct: 'DIRECT',
groups: groups.map((group) => ({ ...group, ...capabilities })),
records,
standalone: [],
providers: [],
}
}
const handlers: Record<string, () => unknown> = {
get_proxy_view: buildProxyView,
get_verge_config: () => ({
language: 'en',
theme_mode: 'light',
proxy_layout_column: 2,
default_latency_timeout: 10000,
enable_hover_jump_navigator: true,
hover_jump_navigator_delay: 200,
pause_render_traffic_stats_on_blur: false,
}),
get_profiles: () => ({
current: 'perf-profile',
items: [
{
uid: 'perf-profile',
type: 'remote',
name: 'Perf Profile',
desc: '',
url: '',
selected: true,
extra: {},
option: { update_interval: 0 },
},
],
}),
get_clash_info: () => ({
mixed_port: 7897,
socks_port: 0,
port: 0,
server: '127.0.0.1:9097',
secret: null,
}),
get_runtime_config: () => null,
get_sys_proxy: () => ({ enable: false, bypass: '', pac_file: '' }),
get_runtime_state: () => ({
mode: 'Sidecar',
service: 'ready',
serviceUnavailableReason: null,
pendingAction: null,
sidecarAllowed: true,
isAdmin: false,
opInFlight: false,
serviceUsable: true,
tunCapable: false,
serviceNeedsAttention: false,
}),
get_sidecar_failure: () => null,
get_pending_failures: () => [],
'plugin:mihomo|get_configs': () => ({ mode: 'rule', 'mixed-port': 7897 }),
'plugin:mihomo|get_rule_providers': () => ({ providers: {} }),
'plugin:mihomo|get_rules': () => ({ rules: [] }),
}
/** Returns the mocked response, or undefined to pass through to the backend. */
export const mockCommand = (cmd: string): unknown => {
const handler = handlers[cmd]
return handler ? handler() : undefined
}
-13
View File
@@ -1,13 +0,0 @@
{
"configRoots": [
"Library/Application Support/io.github.clash-verge-rev.clash-verge-rev",
"Library/Application Support/io.github.clash-verge-rev.clash-verge-rev.dev"
],
"configDirectories": ["profiles"],
"configExtensions": [".yaml", ".yml", ".json", ".js"],
"processNames": {
"app": "clash-verge",
"core": "verge-mihomo",
"service": "clash-verge-service"
}
}
-21
View File
@@ -1,21 +0,0 @@
import { scenario, subscribe } from './replay'
export function mount(root: HTMLElement) {
const rows = Array.from({ length: 20 }, () => {
const row = document.createElement('div')
row.style.cssText = 'height:32px;white-space:nowrap;overflow:hidden'
root.appendChild(row)
return row
})
subscribe(({ payload }) => {
const texts =
scenario === 'logs'
? (payload as ILogItem[]).map((log) => log.payload)
: (payload as IConnections).connections.map(
(connection) => connection.metadata.host,
)
rows.forEach((row, index) => {
row.textContent = texts[index % texts.length] ?? ''
})
})
}
-93
View File
@@ -1,93 +0,0 @@
import { ThemeProvider, createTheme } from '@mui/material'
import { useEffect } from 'react'
import { createRoot } from 'react-dom/client'
import { SWRConfig } from 'swr'
import { AppDataProvider } from '../../src/providers/app-data-provider'
import { initializeLanguage } from '../../src/services/i18n'
import { setPreloadConfig } from '../../src/services/preload'
import { swrConfig } from '../../src/services/query-client'
import { AppStoreProvider } from '../../src/store/app-store'
import '../../src/assets/styles/page.scss'
const root = document.getElementById('root')!
document.body.style.cssText = 'margin:0;font:14px -apple-system,sans-serif'
root.style.cssText = 'width:1000px;height:700px;overflow:hidden'
new MutationObserver(() => {
document.documentElement.dataset.perfDraw = String(Date.now())
}).observe(root, { childList: true, characterData: true, subtree: true })
setPreloadConfig({
language: 'en',
theme_mode: 'light',
pause_render_traffic_stats_on_blur: false,
} as IVergeConfig)
await initializeLanguage('en')
const ProxyPage = (await import('../../src/pages/proxies')).default
const findScroller = () => {
const elements = document.querySelectorAll<HTMLElement>('#root *')
for (const element of elements) {
const { overflowY } = getComputedStyle(element)
if (
(overflowY === 'auto' || overflowY === 'scroll') &&
element.scrollHeight > element.clientHeight
) {
return element
}
}
return null
}
// Deterministic sawtooth scrolling keeps the virtualizer measuring, the
// throttled scroll-position save running and the DOM mutating so the perfDraw
// marker tracks view-input delivery. Each applied scroll step counts as one
// delivered view input; the interval keeps delivering (throttled by the
// browser) while the window is hidden and rAF is suspended.
export const ScrollDriver = () => {
useEffect(() => {
const data = document.documentElement.dataset
let stopped = false
const step = () => {
const scroller = findScroller()
if (scroller) {
const max = scroller.scrollHeight - scroller.clientHeight
if (max > 0) {
const next =
scroller.scrollTop + 36 > max - 36 ? 0 : scroller.scrollTop + 36
scroller.scrollTop = next
data.perfScroll = String(Number(data.perfScroll || 0) + 1)
data.perfDelivered = String(Number(data.perfDelivered || 0) + 1)
}
}
}
const drive = () => {
if (stopped) return
step()
requestAnimationFrame(drive)
}
const handle = requestAnimationFrame(drive)
const timer = window.setInterval(step, 250)
return () => {
stopped = true
cancelAnimationFrame(handle)
window.clearInterval(timer)
}
}, [])
return null
}
createRoot(root).render(
<SWRConfig value={swrConfig}>
<ThemeProvider theme={createTheme()}>
<AppStoreProvider>
<AppDataProvider>
<ProxyPage />
<ScrollDriver />
</AppDataProvider>
</AppStoreProvider>
</ThemeProvider>
</SWRConfig>,
)
-17
View File
@@ -1,17 +0,0 @@
import { startReplay } from './replay'
// Thin loader: error handlers must precede scene module evaluation so any
// startup failure surfaces in perfError.
const data = document.documentElement.dataset
window.addEventListener('error', (event) => {
data.perfError = event.message
})
window.addEventListener('unhandledrejection', (event) => {
data.perfError = String(event.reason)
})
data.perfStage = 'loader'
await import('./proxy-scene')
data.perfStage = 'scene'
startReplay()
data.perfStage = 'replay'
-37
View File
@@ -1,37 +0,0 @@
export interface Frame {
sequence: number
timestamp: number
payload: ILogItem[] | IConnections
}
export const params = new URLSearchParams(location.search)
export const scenario = params.get('scenario') ?? 'traffic'
export const layer = params.get('layer') ?? 'component'
const listeners = new Set<(frame: Frame) => void>()
export const subscribe = (listener: (frame: Frame) => void) => {
listeners.add(listener)
return () => {
listeners.delete(listener)
}
}
export function startReplay() {
const data = document.documentElement.dataset
let previous = 0
data.perfReceived = '0'
data.perfGaps = '0'
const socket = new WebSocket(`ws://127.0.0.1:${params.get('port')}`)
socket.onmessage = ({ data: raw }) => {
const frame = JSON.parse(raw) as Frame
if (frame.sequence !== previous + 1)
data.perfGaps = String(Number(data.perfGaps) + 1)
previous = frame.sequence
data.perfReceived = String(previous)
data.perfSourceTime = String(frame.timestamp)
for (const listener of listeners) listener(frame)
}
socket.onerror = () => {
data.perfError = 'replay socket failed'
}
socket.onclose = () => {
data.perfError = 'replay socket closed'
}
}
+443
View File
@@ -0,0 +1,443 @@
import { isDeepStrictEqual } from 'node:util'
export const SCHEMA = 'traffic-webview-v3'
export const phases = ['foreground', 'hidden', 'restored']
export const roles = ['webview', 'main']
export const quantile = (values, p) => {
const v = values.filter(Number.isFinite).sort((a, b) => a - b)
if (!v.length) return null
const index = (v.length - 1) * p
return (
v[Math.floor(index)] +
(v[Math.ceil(index)] - v[Math.floor(index)]) * (index % 1)
)
}
export function delta(previous, next) {
if (
!previous ||
previous.pid !== next.pid ||
previous.start !== next.start ||
![previous.time, next.time, previous.cpu, next.cpu].every(
Number.isFinite,
) ||
next.time <= previous.time ||
next.cpu < previous.cpu
)
return null
return ((next.cpu - previous.cpu) / (next.time - previous.time)) * 100000
}
export function summarize(rows, seconds) {
const output = {}
for (const phase of phases)
for (const role of roles) {
const selected = rows.filter((r) => r.phase === phase && r.role === role)
const samples = selected.map((r, i) => ({
...r,
percent: delta(selected[i - 1], r),
cpuDelta: i ? r.cpu - selected[i - 1].cpu : null,
}))
const valid = samples.filter((r) => Number.isFinite(r.percent))
const memory = samples.map((r) => r.rss)
const span =
samples.length > 1 ? samples.at(-1).time - samples[0].time : 0
const continuous =
samples.length > 1 &&
samples.every(
(r) =>
[r.time, r.cpu, r.rss].every(Number.isFinite) &&
Number.isInteger(r.pid) &&
r.pid > 0 &&
/^\d+$/.test(r.start) &&
r.time >= 0 &&
r.cpu >= 0 &&
r.rss > 0,
) &&
samples.every(
(r, i) =>
!i ||
(r.time > samples[i - 1].time &&
r.time - samples[i - 1].time < 2500 &&
r.cpu >= samples[i - 1].cpu &&
r.pid === samples[i - 1].pid &&
r.start === samples[i - 1].start),
)
output[`${phase}/${role}`] = {
count: samples.length,
cpuCount: valid.length,
missing: Math.max(0, Math.floor(seconds) - samples.length),
coverage: Math.min(1, samples.length / seconds),
continuous,
observedSeconds: span / 1000,
intervalCoverage: Math.min(1, span / ((seconds - 1) * 1000)),
cpuMean: null,
cpuP50: quantile(
valid.map((r) => r.percent),
0.5,
),
cpuP95: quantile(
valid.map((r) => r.percent),
0.95,
),
cpuPeak: quantile(
valid.map((r) => r.percent),
1,
),
cpuSeconds: valid.length
? valid.reduce((sum, r) => sum + r.cpuDelta, 0)
: null,
rssP50: quantile(memory, 0.5),
rssP95: quantile(memory, 0.95),
rssPeak: quantile(memory, 1),
rssDelta: continuous ? samples.at(-1).rss - samples[0].rss : null,
rssSlopeBytesPerSecond:
span >= 60000 && continuous
? (samples.at(-1).rss - samples[0].rss) / (span / 1000)
: null,
}
output[`${phase}/${role}`].cpuMean =
valid.length && span > 0
? (output[`${phase}/${role}`].cpuSeconds / span) * 100000
: null
}
return output
}
export function replayValues(sequence) {
return {
up: 100000 + (sequence % 20) * 10000,
down: 500000 + (sequence % 30) * 20000,
}
}
export const validVisibility = (s) =>
typeof s.hidden === 'boolean' &&
(s.phase === 'hidden'
? s.visible === false && s.hidden
: phases.includes(s.phase) && s.visible === true && !s.hidden)
export const validObservation = (s) =>
validWorkload(s) &&
validVisibility(s) &&
s.nativeFocused === false &&
s.appActive === false &&
s.top === true &&
s.clickThrough === true &&
[s.now, s.source, s.worker, s.draw].every(
(v) => Number.isFinite(v) && v > 0,
) &&
s.now >= s.source &&
s.now - s.source < 2500 &&
s.now >= s.worker &&
s.now - s.worker < 3500 &&
s.now >= s.draw &&
(s.phase === 'hidden' || s.now - s.draw < 2500)
export function validWorkload(s) {
if (!s) return false
const expected = replayValues(s.points)
return (
Number.isInteger(s.received) &&
Number.isInteger(s.points) &&
s.points > 0 &&
s.received >= s.points &&
s.received - s.points < 60 &&
s.lastUp === expected.up &&
s.lastDown === expected.down &&
s.gaps === 0
)
}
export function compare(a, b, threshold = null) {
const stats = new Map()
const text = (value) => typeof value === 'string' && value.length > 0
const object = (value) =>
value && typeof value === 'object' && !Array.isArray(value)
const expectedMarks = [
'ready',
...phases.flatMap((phase) => [phase, `${phase}:end`]),
]
const valid = (x) =>
x?.schema === SCHEMA &&
text(x?.harnessSha256) &&
[
'head',
'sourceSha256',
'binarySha256',
'frontendSha256',
'buildSettingsSha256',
'mode',
'buildCommand',
'binary',
'toolchain',
].every((key) => text(x.build?.[key])) &&
typeof x.build.dirty === 'string' &&
object(x.build.buildEnvironment) &&
[
'method',
'mode',
'toolchain',
'buildSettingsSha256',
'platform',
'machine',
'arch',
'host',
'hardware',
'power',
'powerSource',
'webkit',
'replay',
'automation',
].every((key) => text(x.contract?.[key])) &&
object(x.contract.buildEnvironment) &&
x.build.buildSettingsSha256 === x.contract.buildSettingsSha256 &&
[
'warmup',
'intervalMs',
'transitionSeconds',
'readinessAllowanceSeconds',
].every((key) => Number.isFinite(x.contract[key]) && x.contract[key] > 0) &&
x.contract.scenario === 'traffic' &&
typeof x.contract.consoleLocked === 'boolean' &&
x.contract.windowPolicy === 'nonactivating-top-click-through-v1' &&
x.contract.replayMs === 200 &&
x.contract.rangeMinutes === 10 &&
['window', 'viewport'].every(
(key) =>
Array.isArray(x.contract[key]) &&
x.contract[key].length === (key === 'window' ? 2 : 3) &&
x.contract[key].every((v) => Number.isFinite(v) && v > 0),
) &&
Number.isFinite(x.contract?.seconds) &&
x.contract.seconds >= 5 &&
Array.isArray(x.contract.phaseTargets) &&
x.contract.phaseTargets.length === phases.length &&
x.contract.phaseTargets.every((n) => Number.isInteger(n) && n > 0) &&
Array.isArray(x.runs) &&
x.runs.length &&
x.runs.every((r) => {
if (
!r?.ok ||
!Array.isArray(r.samples) ||
!r.samples.every(
(s) => s && roles.includes(s.role) && phases.includes(s.phase),
) ||
!Array.isArray(r.marks) ||
!r.marks.every((m) => m && typeof m.name === 'string')
)
return false
stats.set(r, summarize(r.samples, x.contract.seconds))
return (
r.cleanup?.mainExited &&
r.cleanup?.driverClosed &&
r.cleanup?.webviewExited &&
Array.isArray(r.consoleStates) &&
r.consoleStates.length === expectedMarks.length &&
r.consoleStates.every(
(s, i) =>
s &&
s.name === (i ? expectedMarks[i] : 'initial') &&
typeof s.locked === 'boolean' &&
Number.isFinite(s.time) &&
s.time > 0 &&
(!i || s.time >= r.consoleStates[i - 1].time),
) &&
Number.isInteger(r.replay?.sent) &&
r.replay.sent > 0 &&
Number.isFinite(r.replay.maxLateMs) &&
r.replay.maxLateMs >= 0 &&
r.replay.maxLateMs < x.contract.replayMs &&
!r.replay.error &&
r.actualWarmupMs >= x.contract.warmup * 1000 &&
Array.isArray(r.observations) &&
r.observations.length > 0 &&
r.observations.every(
(s, i) =>
validObservation(s) && (!i || s.now > r.observations[i - 1].now),
) &&
r.marks.length === expectedMarks.length &&
r.marks.every(
(m, i) =>
m.name === expectedMarks[i] &&
Number.isFinite(m.time) &&
m.time > 0 &&
(!i ||
(validObservation({ ...m, phase: m.name.split(':')[0] }) &&
/^[a-f0-9]{64}$/.test(m.pixelsSha256))) &&
(!phases.includes(m.name) ||
(m.target === x.contract.phaseTargets[phases.indexOf(m.name)] &&
m.received === m.target)) &&
(!i || m.time > r.marks[i - 1].time),
) &&
roles.every((role) =>
r.samples
.filter((s) => s.role === role)
.every(
(s, i, rows) =>
!i ||
(s.pid === rows[i - 1].pid &&
s.start === rows[i - 1].start &&
s.time > rows[i - 1].time &&
s.cpu >= rows[i - 1].cpu &&
phases.indexOf(s.phase) >= phases.indexOf(rows[i - 1].phase)),
),
) &&
validStats(stats.get(r)) &&
phases.every((phase) => {
const start = r.marks.find((m) => m.name === phase)
const end = r.marks.find((m) => m.name === `${phase}:end`)
const observed = r.observations.filter((s) => s.phase === phase)
return (
start &&
end &&
observed.length > 0 &&
[
start.deadlineIndex,
end.deadlineIndex,
start.senderSent,
end.senderSent,
].every((n) => Number.isInteger(n) && n >= 0) &&
end.deadlineIndex > start.deadlineIndex &&
end.senderSent >= start.senderSent &&
end.senderSent <= r.replay.sent &&
start.senderSent >= start.received &&
end.senderSent >= end.received &&
Math.abs(
end.received -
start.received -
(end.deadlineIndex - start.deadlineIndex),
) <= 2 &&
observed.every(
(s) =>
s.now >= start.now &&
s.now <= end.now &&
s.received >= start.received &&
s.received <= end.received,
) &&
end.worker > start.worker &&
(phase === 'hidden' ||
(end.draw > start.draw &&
end.pixelsSha256 !== start.pixelsSha256))
)
})
)
})
if (![a, b].every(valid))
return { verdict: 'invalid', reason: 'failed, malformed or missing runs' }
if (
[a, b].some((x) =>
x.runs.some((r) =>
r.consoleStates.some((s) => s.locked !== x.contract.consoleLocked),
),
)
)
return {
verdict: 'incomparable',
reason: 'console lock state changed at observed boundaries',
}
if (
!isDeepStrictEqual(a.contract, b.contract) ||
['mode', 'buildCommand', 'toolchain', 'buildEnvironment'].some(
(key) => !isDeepStrictEqual(a.build[key], b.build[key]),
) ||
a.harnessSha256 !== b.harnessSha256
)
return {
verdict: 'incomparable',
reason: 'harness, platform, build mode, workload or environment differ',
}
for (const phase of phases) {
for (const name of [phase, `${phase}:end`]) {
const sizes = [a, b].map((x) =>
x.runs.map((r) => r.marks.find((m) => m.name === name)?.received),
)
if (!sizes.flat().every(Number.isFinite))
return { verdict: 'invalid', reason: 'missing observed workload size' }
if (
Math.abs(quantile(sizes[0], 0.5) - quantile(sizes[1], 0.5)) > 2 ||
sizes.some((s) => Math.max(...s) - Math.min(...s) > 2)
)
return {
verdict: 'incomparable',
reason: `${name}: input size varies by more than two replay points`,
}
}
}
const same = a.build.binarySha256 === b.build.binarySha256
const enough = a.runs.length >= 3 && b.runs.length >= 3
const metrics = {}
for (const phase of phases)
for (const role of roles)
for (const metric of ['cpuMean', 'rssP50']) {
const key = `${phase}/${role}`
const av = a.runs.map((r) => stats.get(r)[key][metric])
const bv = b.runs.map((r) => stats.get(r)[key][metric])
const before = quantile(av, 0.5),
after = quantile(bv, 0.5)
const noise = Math.max(...av) - Math.min(...av)
const candidateRange = Math.max(...bv) - Math.min(...bv)
const overlap =
Math.max(...av) >= Math.min(...bv) &&
Math.max(...bv) >= Math.min(...av)
metrics[`${key}/${metric}`] = {
before,
after,
delta: after - before,
baselineRange: noise,
candidateRange,
verdict:
same ||
!enough ||
threshold === null ||
!av.every(Number.isFinite) ||
!bv.every(Number.isFinite) ||
overlap ||
Math.abs(after - before) <=
Math.max(
noise,
candidateRange,
(Math.abs(before) * threshold) / 100,
)
? 'inconclusive'
: after < before
? 'lower'
: 'higher',
}
}
return {
verdict: 'inconclusive',
kind: same ? 'A/A' : 'A/B',
reason: same
? 'same binary; natural variation only'
: 'inspect independent-run metrics; no universal pass threshold',
metrics,
}
}
export function markdown(report) {
const lines = [
'# Home traffic graph - replay measurement',
'',
`Success: ${report.runs.filter((r) => r.ok).length}/${report.runs.length}`,
'',
'CPU: one fully occupied core = 100%. Memory: process resident size bytes, not exclusive memory. Null = unavailable; first CPU observation has no delta. Slope requires 60 seconds of continuous observations.',
'',
'| Run / stage / role | CPU mean / P50 / P95 / peak (%) | CPU s | RSS P50 / P95 / peak / delta (bytes) | Samples / coverage |',
'|---|---|---|---|---|',
]
for (const [i, run] of report.runs.entries()) {
if (run.error) lines.push(`\nRun ${i + 1} failed: ${run.error}\n`)
for (const [key, s] of Object.entries(run.stats))
lines.push(
`| ${i + 1}/${key} | ${[s.cpuMean, s.cpuP50, s.cpuP95, s.cpuPeak].map((v) => v?.toFixed(2) ?? 'unavailable').join(' / ')} | ${s.cpuSeconds?.toFixed(3) ?? 'unavailable'} | ${[s.rssP50, s.rssP95, s.rssPeak, s.rssDelta].map((v) => v ?? 'unavailable').join(' / ')} | ${s.count} / ${(s.coverage * 100).toFixed(1)}% |`,
)
}
lines.push(
'',
'Scope: loopback replay → public traffic append boundary → production Worker → homepage Canvas component. Mihomo and its network/subscription chain are not running. Shared GPU/network processes are unavailable and excluded. Process statistics do not identify function hotspots, component CPU or retained objects; memory growth is not proof of a leak.',
'',
'Next measurement: use WebKit CPU sampling for the highest-CPU foreground/restored phase; use Allocation/Heap captures for repeatable RSS growth. React Compiler is an untested local A/B candidate only.',
)
return lines.join('\n') + '\n'
}
export const validStats = (stats) =>
Object.values(stats).every(
(s) =>
s.continuous &&
s.coverage >= 0.8 &&
s.intervalCoverage >= 0.8 &&
s.cpuCount >= 3,
)
+340
View File
@@ -0,0 +1,340 @@
import assert from 'node:assert/strict'
import { execFileSync } from 'node:child_process'
import { mkdirSync } from 'node:fs'
import { test } from 'node:test'
import {
compare,
delta,
phases,
roles,
quantile,
summarize,
validWorkload,
replayValues,
SCHEMA,
validVisibility,
} from './report.mjs'
const latest = (sequence) => {
const { up, down } = replayValues(sequence)
return { lastUp: up, lastDown: down }
}
const observation = (phase, now) => ({
phase,
now,
source: now - 100,
worker: now - 100,
draw: now - 100,
visible: phase !== 'hidden',
hidden: phase === 'hidden',
focused: false,
nativeFocused: false,
appActive: false,
top: true,
clickThrough: true,
})
const rows = phases.flatMap((phase, phaseIndex) =>
roles.flatMap((role) =>
Array.from({ length: 5 }, (_, i) => ({
phase,
role,
pid: role === 'main' ? 1 : 2,
start: '1',
time: (phaseIndex * 5 + i) * 1000,
cpu: (phaseIndex * 5 + i) / 10,
rss: 100 + i,
})),
),
)
const run = {
ok: true,
samples: rows,
cleanup: { mainExited: true, driverClosed: true, webviewExited: true },
replay: { sent: 130, maxLateMs: 10 },
actualWarmupMs: 3000,
observations: phases.map((phase, i) => ({
...observation(phase, 2000 + i * 10000),
received: 35 + i * 35,
points: 34 + i * 35,
gaps: 0,
...latest(34 + i * 35),
})),
marks: [
{ name: 'ready', time: 1 },
...phases.flatMap((name, i) => [
{
name,
target: 35 + i * 35,
deadlineIndex: 35 + i * 35,
senderSent: 35 + i * 35,
received: 35 + i * 35,
points: 34 + i * 35,
...latest(34 + i * 35),
gaps: 0,
time: 1000 + i * 10000,
...observation(name, 1000 + i * 10000),
pixelsSha256: 'a'.repeat(64),
},
{
name: `${name}:end`,
deadlineIndex: 60 + i * 35,
senderSent: 60 + i * 35,
received: 60 + i * 35,
points: 59 + i * 35,
...latest(59 + i * 35),
gaps: 0,
time: 6000 + i * 10000,
...observation(name, 6000 + i * 10000),
pixelsSha256: 'b'.repeat(64),
},
]),
],
}
run.consoleStates = run.marks.map((m, i) => ({
name: i ? m.name : 'initial',
time: m.time,
locked: false,
}))
const baseline = {
schema: SCHEMA,
harnessSha256: 'fixture-harness',
build: {
head: 'fixture-head',
dirty: '',
sourceSha256: 'fixture-source',
binarySha256: 'same',
frontendSha256: 'fixture-assets',
buildSettingsSha256: 'fixture-settings',
mode: 'release',
buildCommand: 'fixture-build',
binary: '/fixture/app',
toolchain: 'fixture-tools',
buildEnvironment: {},
},
contract: {
scenario: 'traffic',
replayMs: 200,
consoleLocked: false,
windowPolicy: 'nonactivating-top-click-through-v1',
seconds: 5,
warmup: 2,
phaseTargets: [35, 70, 105],
transitionSeconds: 2,
readinessAllowanceSeconds: 5,
intervalMs: 1000,
rangeMinutes: 10,
window: [1000, 700],
viewport: [1000, 668, 2],
method: 'fixture-method',
mode: 'release',
toolchain: 'fixture-tools',
buildSettingsSha256: 'fixture-settings',
platform: 'macOS',
machine: 'fixture-model',
arch: 'arm64',
host: 'fixture-host',
hardware: 'fixture-hardware',
power: 'fixture-power',
powerSource: 'AC',
webkit: 'fixture-webkit',
replay: 'fixture-5Hz',
automation: 'fixture-wdio',
buildEnvironment: {},
},
runs: [run, run, run],
}
test('quantiles, CPU units, first observation and PID reuse', () => {
assert.equal(quantile([0, 10, 20], 0.95), 19)
assert.equal(delta(undefined, rows[0]), null)
assert.equal(delta(rows[0], rows[1]), 10)
assert.equal(delta(rows[0], { ...rows[1], start: '2' }), null)
assert.equal(delta(rows[0], { ...rows[1], time: NaN }), null)
assert.equal(summarize(rows, 5)['hidden/main'].cpuMean, 10)
assert.equal(summarize([], 5)['hidden/main'].cpuSeconds, null)
})
test('report schema: A/A, failed, incomparable and corrupt samples', () => {
assert.equal(compare(baseline, baseline).kind, 'A/A')
assert.equal(
compare(baseline, { ...baseline, schema: 'old' }).verdict,
'invalid',
)
for (const change of [
{ appActive: true },
{ nativeFocused: true },
{ top: false },
{ top: undefined },
{ clickThrough: false },
{ clickThrough: undefined },
{ hidden: true },
{ worker: 3000 },
{ now: 6000 },
{ draw: 3000 },
{ worker: null },
]) {
const invalid = structuredClone(baseline)
Object.assign(invalid.runs[0].observations[0], change)
assert.equal(compare(baseline, invalid).verdict, 'invalid')
}
for (const key of ['draw', 'pixelsSha256']) {
const stalled = structuredClone(baseline)
stalled.runs[0].marks[2][key] = stalled.runs[0].marks[1][key]
assert.equal(compare(baseline, stalled).verdict, 'invalid')
}
const missingPhase = structuredClone(baseline)
missingPhase.runs[0].observations.pop()
assert.equal(compare(baseline, missingPhase).verdict, 'invalid')
const consoleDrift = structuredClone(baseline)
consoleDrift.runs[0].consoleStates[3].locked = true
assert.equal(compare(baseline, consoleDrift).verdict, 'incomparable')
consoleDrift.runs[0].consoleStates[3].locked = null
assert.equal(compare(baseline, consoleDrift).verdict, 'invalid')
assert.equal(
validVisibility({ phase: 'restored', visible: true, hidden: true }),
false,
)
const missedPeriod = structuredClone(baseline)
missedPeriod.runs[0].replay.maxLateMs = 200
assert.equal(compare(baseline, missedPeriod).verdict, 'invalid')
const delayed = {
received: 100,
points: 97,
gaps: 0,
lastUp: 270000,
lastDown: 640000,
}
assert.equal(validWorkload(delayed), true)
assert.equal(validWorkload(null), false)
assert.equal(validWorkload({ ...delayed, points: 96 }), false)
assert.equal(validWorkload({ ...delayed, points: 98 }), false)
assert.equal(validWorkload({ ...delayed, received: 157 }), false)
assert.equal(validWorkload({ ...delayed, lastDown: 660000 }), false)
const missedAnchor = structuredClone(baseline)
missedAnchor.runs[0].marks[1].received++
assert.equal(compare(baseline, missedAnchor).verdict, 'invalid')
const droppedInputs = structuredClone(baseline)
const end = droppedInputs.runs[0].marks[2]
end.received -= 10
end.points -= 10
Object.assign(end, latest(end.points))
assert.equal(compare(droppedInputs, droppedInputs).verdict, 'invalid')
const workerLag = structuredClone(baseline)
workerLag.runs[0].observations[0].points -= 3
assert.equal(compare(baseline, workerLag).verdict, 'invalid')
const inputDrift = structuredClone(baseline)
inputDrift.runs = baseline.runs.map((r) => structuredClone(r))
inputDrift.runs[0].marks[2].received += 3
inputDrift.runs[0].marks[2].points += 3
inputDrift.runs[0].marks[2].deadlineIndex += 3
inputDrift.runs[0].marks[2].senderSent += 3
Object.assign(
inputDrift.runs[0].marks[2],
latest(inputDrift.runs[0].marks[2].points),
)
assert.equal(compare(baseline, inputDrift).verdict, 'incomparable')
const snapshotPhase = structuredClone(baseline)
snapshotPhase.runs[0].marks[2].points++
Object.assign(
snapshotPhase.runs[0].marks[2],
latest(snapshotPhase.runs[0].marks[2].points),
)
assert.equal(compare(baseline, snapshotPhase).kind, 'A/A')
const changedSettings = structuredClone(baseline)
changedSettings.build.buildSettingsSha256 =
changedSettings.contract.buildSettingsSha256 = 'changed-settings'
assert.equal(compare(baseline, changedSettings).verdict, 'incomparable')
assert.equal(
compare(baseline, { ...baseline, harnessSha256: 'changed' }).verdict,
'incomparable',
)
assert.equal(
compare(baseline, {
...baseline,
contract: { ...baseline.contract, seconds: 6 },
}).verdict,
'incomparable',
)
assert.equal(
compare(baseline, { ...baseline, runs: [{ ...run, ok: false }] }).verdict,
'invalid',
)
const corrupt = structuredClone(baseline)
corrupt.runs[0].samples[1].time = 0
assert.equal(compare(baseline, corrupt).verdict, 'invalid')
const shifted = structuredClone(baseline)
shifted.runs[0].samples
.filter((s) => s.phase === 'hidden')
.forEach((s) => {
s.time -= 5000
})
assert.equal(compare(baseline, shifted).verdict, 'invalid')
const badMarks = structuredClone(baseline)
badMarks.runs[0].marks.forEach((m) => {
m.time = -1
})
assert.equal(compare(baseline, badMarks).verdict, 'invalid')
const clustered = structuredClone(baseline)
clustered.runs[0].samples.forEach((s) => {
s.time /= 1000
})
assert.equal(compare(baseline, clustered).verdict, 'invalid')
for (const [section, key] of [
['contract', 'platform'],
['build', 'sourceSha256'],
]) {
const missing = structuredClone(baseline)
delete missing[section][key]
assert.equal(compare(missing, missing).verdict, 'invalid')
}
assert.equal(
compare(baseline, {
...baseline,
contract: { ...baseline.contract, platform: 'other-macOS' },
}).verdict,
'incomparable',
)
for (const malformed of [
null,
{},
{ runs: [null] },
{ ...baseline, runs: [{ ...run, samples: null }] },
])
assert.equal(compare(baseline, malformed).verdict, 'invalid')
const noisy = structuredClone(baseline)
noisy.runs = baseline.runs.map((r) => structuredClone(r))
noisy.build.binarySha256 = 'different'
noisy.runs.forEach((r, i) =>
r.samples.forEach((s) => {
s.cpu *= [0.1, 0.2, 10][i]
}),
)
assert.equal(
compare(baseline, noisy, 5).metrics['foreground/webview/cpuMean'].verdict,
'inconclusive',
)
})
test('macOS collector agrees with process.cpuUsage on a busy owned process', {
skip: process.platform !== 'darwin',
}, () => {
mkdirSync('target/perf', { recursive: true })
execFileSync('cc', [
'-Wall',
'-Wextra',
'-Werror',
'scripts/perf/sample.c',
'-o',
'target/perf/test-sample',
])
const sample = () =>
Number(
execFileSync('target/perf/test-sample', [String(process.pid)], {
encoding: 'utf8',
}).split(' ')[2],
)
const first = sample(),
cpu = process.cpuUsage(),
start = performance.now()
while (performance.now() - start < 500) Math.sqrt(Math.random())
const used = process.cpuUsage(cpu),
measured = sample() - first
assert.ok(Math.abs(measured - (used.user + used.system) / 1e6) < 0.05)
})
+674
View File
@@ -0,0 +1,674 @@
import { spawn, execFileSync } from 'node:child_process'
import { createHash, randomUUID } from 'node:crypto'
import {
mkdirSync,
readFileSync,
writeFileSync,
openSync,
closeSync,
realpathSync,
} from 'node:fs'
import { createServer } from 'node:net'
import { resolve, dirname } from 'node:path'
import { setTimeout as sleep } from 'node:timers/promises'
import { parseArgs } from 'node:util'
import { createTauriCapabilities } from '@wdio/tauri-service'
import { remote } from 'webdriverio'
import { WebSocketServer } from 'ws'
import {
delta,
summarize,
markdown,
phases,
roles,
validStats,
validWorkload,
replayValues,
SCHEMA,
validObservation,
validVisibility,
} from './report.mjs'
const { values } = parseArgs({
args: process.argv.slice(2).filter((v) => v !== '--'),
options: {
output: { type: 'string', default: `target/perf/runs/${Date.now()}` },
binary: { type: 'string', default: 'target/perf/build/clash-verge' },
repeat: { type: 'string', default: '3' },
seconds: { type: 'string', default: '20' },
warmup: { type: 'string', default: '10' },
'fail-phase': { type: 'string' },
},
})
const seconds = Number(values.seconds),
warmup = Number(values.warmup),
repeat = Number(values.repeat)
const replayMs = 200
if (process.platform !== 'darwin') throw new Error('macOS only')
function readConsole() {
const consoleState = JSON.parse(
execFileSync('/usr/bin/plutil', ['-convert', 'json', '-o', '-', '-'], {
input: execFileSync('/usr/sbin/ioreg', ['-n', 'Root', '-d1', '-a']),
encoding: 'utf8',
}),
)
const locked = consoleState.IOConsoleLocked
if (typeof locked !== 'boolean')
throw new Error('Environment unavailable: unknown console lock state')
return locked
}
function checkConsole() {
const locked = readConsole()
if (locked)
throw new Error(
'Environment unavailable: an unlocked graphical session is required; window focus is not required',
)
return locked
}
const consoleLocked = checkConsole()
if (
![seconds, warmup, repeat].every(Number.isFinite) ||
seconds < 5 ||
warmup < 2 ||
repeat < 1 ||
!Number.isInteger(repeat)
)
throw new Error('Require seconds >= 5, warmup >= 2, integer repeat >= 1')
const phaseTargets = phases.map(
(_, i) =>
Math.ceil(((warmup + 5) * 1000) / replayMs) +
i * Math.ceil(((seconds + 2) * 1000) / replayMs),
)
if ((phaseTargets[2] * replayMs) / 1000 + seconds + 5 >= 600)
throw new Error(
'Total replay including transition allowance must be < 10 minutes',
)
const binary = realpathSync(values.binary),
output = resolve(values.output)
const webcontentBinary = realpathSync(
'/System/Library/Frameworks/WebKit.framework/Versions/A/XPCServices/com.apple.WebKit.WebContent.xpc/Contents/MacOS/com.apple.WebKit.WebContent',
)
const build = JSON.parse(readFileSync(`${binary}.json`))
const hash = (data) => createHash('sha256').update(data).digest('hex')
if (hash(readFileSync(binary)) !== build.binarySha256)
throw new Error('Binary does not match build manifest')
try {
execFileSync('git', ['check-ignore', '-q', '--no-index', output])
} catch {
throw new Error('Output directory must be Git ignored')
}
mkdirSync(dirname(output), { recursive: true })
mkdirSync(output)
execFileSync('cc', ['-O2', 'scripts/perf/sample.c', '-o', `${output}/sample`])
const command = (name, args) =>
execFileSync(name, args, { encoding: 'utf8' }).trim()
const report = {
schema: SCHEMA,
build,
contract: {
scenario: 'traffic',
replayMs,
consoleLocked,
method: 'mach-rusage-v0-seconds/rss-bytes-v1',
mode: build.mode,
buildSettingsSha256: build.buildSettingsSha256,
buildEnvironment: build.buildEnvironment,
toolchain: build.toolchain,
platform: command('sw_vers', []),
machine: command('sysctl', ['-n', 'hw.model']),
arch: process.arch,
host: hash(command('scutil', ['--get', 'LocalHostName'])),
hardware: command('sysctl', ['hw.ncpu', 'hw.memsize']),
power: command('pmset', ['-g', 'custom']),
powerSource: command('pmset', ['-g', 'batt']).split('\n')[0],
webkit: command('defaults', [
'read',
'/System/Library/Frameworks/WebKit.framework/Resources/Info',
'CFBundleVersion',
]),
seconds,
warmup,
phaseTargets,
transitionSeconds: 2,
readinessAllowanceSeconds: 5,
intervalMs: 1000,
window: [1000, 700],
windowPolicy: 'nonactivating-top-click-through-v1',
rangeMinutes: 10,
replay:
'deterministic-v1, 5Hz, no prefill, append boundary, default bezier, blur pause false',
automation:
'wdio plugin 1.3.0; 20Hz macOS runloop pump plus one WebDriver observation/second',
},
runs: [],
}
report.units = {
time: 'monotonic milliseconds',
cpu: 'cumulative CPU seconds',
percent: 'one CPU core = 100%',
rss: 'resident size bytes',
start: 'Mach process start ticks',
}
report.monotonicOriginEpochMs = performance.timeOrigin
report.harnessSha256 = hash(
['run.mjs', 'report.mjs', 'sample.c']
.map((p) => readFileSync(`scripts/perf/${p}`))
.join('\n'),
)
let interrupted = false
const abort = new AbortController()
const pause = (ms) => sleep(ms, undefined, { signal: abort.signal })
for (const signal of ['SIGINT', 'SIGTERM'])
process.on(signal, () => {
interrupted = true
abort.abort()
})
const assert = (value, reason) => {
if (!value) throw new Error(reason)
}
const drawn = (s) => s.now >= s.draw && s.now - s.draw < 2500
const marker = (s) => ({
...s,
pixelsSha256: hash(s.pixels),
pixels: undefined,
ua: undefined,
token: undefined,
})
async function freePort() {
const server = createServer()
await new Promise((done) => server.listen(0, '127.0.0.1', done))
const port = server.address().port
await new Promise((done) => server.close(done))
return port
}
for (let iteration = 0; iteration < repeat && !interrupted; iteration++) {
const initialLocked = checkConsole()
const token = randomUUID(),
port = await freePort()
const run = {
token,
ok: false,
samples: [],
observations: [],
consoleStates: [
{ name: 'initial', locked: initialLocked, time: Date.now() },
],
marks: [],
stats: {},
cleanup: {},
replay: { sent: 0, maxLateMs: 0 },
}
report.runs.push(run)
const replay = new WebSocketServer({ host: '127.0.0.1', port: 0 })
await new Promise((done) => replay.on('listening', done))
let sequence = 0,
replayStarted,
timer
replay.on('connection', () => {
if (replayStarted !== undefined) {
run.replay.error = 'unexpected replay reconnection'
clearTimeout(timer)
return
}
replayStarted = performance.now()
timer = setTimeout(send, replayMs)
})
const deadlineIndex = () =>
Math.floor((performance.now() - replayStarted) / replayMs)
function send() {
const deadline = replayStarted + (sequence + 1) * replayMs
const late = performance.now() - deadline
if (late < 0) {
timer = setTimeout(send, Math.ceil(-late))
return
}
run.replay.maxLateMs = Math.max(run.replay.maxLateMs, late)
if (late >= replayMs) {
run.replay.error = `replay source missed a complete ${replayMs} ms period`
return
}
sequence++
run.replay.sent = sequence
const timestamp = Date.now()
const point = JSON.stringify({
sequence,
timestamp,
...replayValues(sequence),
})
for (const socket of replay.clients)
if (socket.readyState === 1) socket.send(point)
timer = setTimeout(
send,
Math.max(
0,
replayStarted + (sequence + 1) * replayMs - performance.now(),
),
)
}
const log = openSync(`${output}/${iteration + 1}.log`, 'w')
const child = spawn(binary, [], {
env: {
...process.env,
PERF_TOKEN: token,
PERF_REPLAY_PORT: String(replay.address().port),
TAURI_WEBDRIVER_PORT: String(port),
},
stdio: ['ignore', log, log],
})
closeSync(log)
let browser, childError, previous, mainStart
const identities = {}
child.on('error', (error) => {
childError = error
})
const exited = new Promise((done) => child.once('exit', done))
const alive = () =>
!childError && child.exitCode === null && child.signalCode === null
const collect = (pids) =>
command(`${output}/sample`, pids.map(String))
.split('\n')
.map((line) => {
const [pid, start, cpu, rss, ...path] = line.split(' ')
return {
pid: Number(pid),
start,
cpu: Number(cpu),
rss: Number(rss),
path: path.join(' '),
time: performance.now(),
}
})
const identify = (role, row) => {
assert(
row.path === (role === 'main' ? binary : webcontentBinary),
`unexpected ${role} process executable: ${row.path}`,
)
assert(
BigInt(row.start) >= BigInt(mainStart),
'process predates owned application',
)
const identity = `${row.pid}/${row.start}`
assert(
!identities[role] || identities[role] === identity,
'process identity changed during scenario',
)
identities[role] = identity
}
const state = async (action = 'state', pixels = false) =>
browser.execute(
async (action, pixels) => {
const native = await window.__TAURI_INTERNALS__.invoke('perf_state', {
action,
})
const canvas = document.querySelector('canvas')
return {
...native,
now: Date.now(),
hidden: document.hidden,
focused: document.hasFocus(),
received: Number(document.documentElement.dataset.perfReceived),
source: Number(document.documentElement.dataset.perfSourceTime),
gaps: Number(document.documentElement.dataset.perfGaps),
worker: Number(document.documentElement.dataset.perfWorker),
points: Number(document.documentElement.dataset.perfPoints),
lastUp: Number(document.documentElement.dataset.perfLastUp),
lastDown: Number(document.documentElement.dataset.perfLastDown),
draw: Number(canvas?.dataset.perfDraw),
pixels: pixels ? canvas?.toDataURL() : null,
ua: navigator.userAgent,
}
},
action,
pixels,
)
const checked = async (action, pixels) => {
assert(!interrupted, 'interrupted')
assert(!run.replay.error, run.replay.error)
assert(
alive(),
`owned app exited: ${childError ?? child.exitCode ?? child.signalCode}`,
)
const value = await state(action, pixels)
assert(!run.replay.error, run.replay.error)
run.lastObservation = { ...value, pixels: undefined, ua: undefined }
assert(
value.token === token && value.main === child.pid,
'instance identity mismatch',
)
if (!identities.webview) {
run.initialAttribution = collect([value.webview])[0]
identify('webview', run.initialAttribution)
}
assert(
value.nativeFocused === false && value.appActive === false,
'measurement window unexpectedly activated',
)
assert(
value.top === true && value.clickThrough === true,
'measurement window must be natively topmost and click-through',
)
return value
}
try {
mainStart = collect([child.pid])[0].start
const deadline = Date.now() + 30000
while (true) {
assert(
Date.now() < deadline && !interrupted && alive(),
'embedded WebDriver readiness deadline or app exit',
)
try {
if (
(
await fetch(`http://127.0.0.1:${port}/status`, {
signal: AbortSignal.timeout(500),
})
).ok
)
break
} catch {}
await pause(100)
}
const listener = command('lsof', [
'-nP',
'-a',
'-p',
String(child.pid),
`-iTCP:${port}`,
'-sTCP:LISTEN',
])
assert(
listener.includes(`127.0.0.1:${port}`) && !listener.includes(`*:${port}`),
'driver must belong to this app and bind loopback',
)
const capabilities = createTauriCapabilities(binary)
delete capabilities['wdio:tauriServiceOptions']
browser = await remote({
hostname: '127.0.0.1',
port,
capabilities,
logLevel: 'error',
connectionRetryCount: 0,
connectionRetryTimeout: 5000,
})
const handles = await browser.getWindowHandles()
assert(handles.length === 1, 'expected exactly one measurement WebView')
await browser.switchToWindow(handles[0])
// Replay's parent effect starts the socket after the graph installs its listeners.
await browser.waitUntil(
async () => {
const s = await checked()
return (
validWorkload(s) &&
s.received >= 3 &&
s.now >= s.worker &&
s.now - s.worker < 2500
)
},
{
timeout: 15000,
interval: 100,
timeoutMsg: 'traffic effects/Worker not ready before show',
},
)
run.initialData = run.lastObservation
await checked('show')
await browser.waitUntil(
async () => {
const s = await checked()
return validObservation({ phase: 'foreground', ...s })
},
{
timeout: 15000,
interval: 250,
timeoutMsg: 'traffic data path/page not ready',
},
)
run.userAgent = (await checked()).ua
run.backgroundLoad = command('sysctl', ['-n', 'vm.loadavg'])
const viewport = await browser.execute(() => [
innerWidth,
innerHeight,
devicePixelRatio,
])
run.viewport = { dom: viewport, driver: await browser.getWindowRect() }
const driverScale = run.viewport.driver.width / 1000
assert(
viewport[0] === 1000 &&
viewport[1] > 0 &&
viewport[1] <= 700 &&
(driverScale === 1 || driverScale === viewport[2]) &&
run.viewport.driver.height / driverScale === 700,
`unexpected window dimensions: ${JSON.stringify(run.viewport)}`,
)
assert(
!report.contract.viewport ||
JSON.stringify(report.contract.viewport) === JSON.stringify(viewport),
'viewport changed between runs',
)
report.contract.viewport = viewport
run.marks.push({ name: 'ready', time: Date.now() })
const readyAt = performance.now()
assert(
phaseTargets[0] - (await checked()).received >=
(warmup * 1000) / replayMs,
'readiness exceeded fixed replay allowance',
)
for (const phase of phases) {
run.consoleStates.push({
name: phase,
locked: readConsole(),
time: Date.now(),
})
const operation = performance.now()
let s = await checked(phase === 'hidden' ? 'hide' : 'show', true)
assert(
s.visible === (phase !== 'hidden'),
`${phase}: native visibility mismatch`,
)
const beforeDraw = s.draw
await browser.waitUntil(
async () => {
s = await checked('state', true)
return (
validVisibility({ phase, ...s }) &&
(phase === 'hidden' || (s.draw > beforeDraw && drawn(s)))
)
},
{
timeout: 5000,
interval: 100,
timeoutMsg: `${phase}: window/Canvas readiness deadline`,
},
)
const operationMs = performance.now() - operation
const target = phaseTargets[phases.indexOf(phase)]
await browser.waitUntil(
async () => {
s = await checked('state', true)
assert(
s.received <= target,
`${phase}: missed replay anchor ${target}`,
)
return s.received === target
},
{
timeout: Math.max(1000, (target - s.received) * replayMs + 1000),
interval: 50,
timeoutMsg: `${phase}: replay anchor deadline`,
},
)
assert(
validObservation({ phase, ...s }),
`${phase}: invalid traffic observation`,
)
const first = s,
start = performance.now(),
firstIndex = deadlineIndex(),
phaseEpoch = Date.now()
if (phase === 'foreground') {
run.actualWarmupMs = start - readyAt
assert(
run.actualWarmupMs >= warmup * 1000,
'insufficient actual warmup',
)
}
run.marks.push({
name: phase,
time: phaseEpoch,
operationMs,
transitionMs: start - operation,
target,
...marker(s),
deadlineIndex: firstIndex,
senderSent: run.replay.sent,
})
previous = {}
if (values['fail-phase'] === phase)
throw new Error(`injected failure at ${phase}`)
while (performance.now() - start < seconds * 1000) {
const tick = performance.now()
s = await checked()
run.observations.push({ phase, ...run.lastObservation })
assert(
validObservation({ phase, ...s }),
`${phase}: invalid visibility, workload or freshness`,
)
assert(
performance.now() - replayStarted < 600000,
'replay exceeded raw history window',
)
const samples = collect(roles.map((role) => s[role]))
run.attribution = {
main: s.main,
webview: s.webview,
observed: samples,
}
for (let i = 0; i < roles.length; i++) {
const row = { ...samples[i], phase, role: roles[i] }
identify(row.role, row)
row.percent = delta(previous[row.role], row)
row.cpuDelta =
row.percent === null ? null : row.cpu - previous[row.role].cpu
run.samples.push(row)
previous[row.role] = row
}
await pause(Math.max(0, 1000 - (performance.now() - tick)))
}
s = await checked('state', true)
const endIndex = deadlineIndex()
const expected = endIndex - firstIndex
assert(
validObservation({ phase, ...s }) &&
s.worker > first.worker &&
Math.abs(s.received - first.received - expected) <= 2,
`${phase}: unstable or lost workload`,
)
if (phase !== 'hidden')
assert(
s.draw > first.draw && s.pixels !== first.pixels,
`${phase}: Canvas did not render fresh data`,
)
run.marks.push({
name: `${phase}:end`,
time: s.now,
...marker(s),
deadlineIndex: endIndex,
senderSent: run.replay.sent,
})
run.consoleStates.push({
name: `${phase}:end`,
locked: readConsole(),
time: Date.now(),
})
}
run.stats = summarize(run.samples, seconds)
assert(
validStats(run.stats),
'insufficient coverage or process discontinuity',
)
run.ok = true
} catch (error) {
run.error = String(error)
process.exitCode = 1
} finally {
await browser?.deleteSession().catch(() => {})
try {
if (alive() && collect([child.pid])[0].start === mainStart) {
child.kill('SIGTERM')
await Promise.race([exited, sleep(5000)])
if (alive() && collect([child.pid])[0].start === mainStart) {
child.kill('SIGKILL')
await Promise.race([exited, sleep(2000)])
}
}
} catch (error) {
run.cleanup.error = String(error)
}
clearTimeout(timer)
for (const socket of replay.clients) socket.terminate()
await new Promise((done) => replay.close(done))
run.cleanup.mainExited =
child.exitCode !== null || child.signalCode !== null
if (identities.webview) {
const [pid, start] = identities.webview.split('/')
const remains = () => {
try {
return collect([pid])[0].start === start
} catch {
return false
}
}
const deadline = Date.now() + 5000
while (remains() && Date.now() < deadline) await sleep(100)
run.cleanup.webviewExited = !remains()
}
try {
await fetch(`http://127.0.0.1:${port}/status`, {
signal: AbortSignal.timeout(500),
})
run.cleanup.driverClosed = false
} catch {
run.cleanup.driverClosed = true
}
if (
!run.cleanup.mainExited ||
!run.cleanup.driverClosed ||
run.cleanup.webviewExited === false
) {
run.ok = false
run.error = `${run.error ?? ''} cleanup failed`
process.exitCode = 1
}
run.stats = summarize(run.samples, seconds)
writeFileSync(
`${output}/${iteration + 1}.json`,
JSON.stringify(run, null, 2),
)
const columns = [
'phase',
'role',
'time',
'pid',
'start',
'cpu',
'percent',
'rss',
]
writeFileSync(
`${output}/${iteration + 1}.csv`,
[
columns.join(','),
...run.samples.map((r) =>
columns.map((c) => r[c] ?? 'unavailable').join(','),
),
].join('\n'),
)
writeFileSync(`${output}/summary.json`, JSON.stringify(report, null, 2))
writeFileSync(`${output}/report.md`, markdown(report))
}
console.log(`Run ${iteration + 1}: ${run.ok ? 'passed' : run.error}`)
}
console.log(`Reports: ${output}`)
+20
View File
@@ -0,0 +1,20 @@
#include <libproc.h>
#include <mach/mach_time.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/resource.h>
int main(int argc, char **argv) {
mach_timebase_info_data_t timebase;
if (mach_timebase_info(&timebase) != KERN_SUCCESS) return 1;
for (int i = 1; i < argc; i++) {
int pid = atoi(argv[i]);
struct rusage_info_v0 r;
char path[PROC_PIDPATHINFO_MAXSIZE];
if (pid <= 0 || proc_pid_rusage(pid, RUSAGE_INFO_V0, (rusage_info_t *)&r)) return 1;
if (proc_pidpath(pid, path, sizeof(path)) <= 0) return 1;
printf("%d %llu %.9f %llu %s\n", pid, r.ri_proc_start_abstime,
((double)r.ri_user_time + r.ri_system_time) * timebase.numer / timebase.denom / 1e9, r.ri_resident_size, path);
}
return 0;
}
-81
View File
@@ -1,81 +0,0 @@
import { ThemeProvider, createTheme } from '@mui/material'
import dayjs from 'dayjs'
import relativeTime from 'dayjs/plugin/relativeTime'
import { useEffect, useState } from 'react'
import { createRoot } from 'react-dom/client'
import { SWRConfig } from 'swr'
import { VirtualList } from '../../src/components/base/virtual-list'
import { ConnectionRowItem } from '../../src/components/connection/connection-row-item'
import { useConnectionRowViews } from '../../src/components/connection/connection-row-view'
import LogItem from '../../src/components/log/log-item'
import { initializeLanguage } from '../../src/services/i18n'
import { setPreloadConfig } from '../../src/services/preload'
import { layer, scenario, subscribe } from './replay'
import '../../src/assets/styles/page.scss'
const searchState = {
text: '',
matchCase: false,
matchWholeWord: false,
useRegularExpression: false,
}
export function Components() {
const [logs, setLogs] = useState<ILogItem[]>([])
const [connections, setConnections] = useState<IConnectionsItem[]>([])
useEffect(
() =>
subscribe(({ payload }) => {
if (scenario === 'logs')
setLogs((previous) =>
previous.concat(payload as ILogItem[]).slice(-1000),
)
else setConnections((payload as IConnections).connections)
}),
[],
)
const rows = useConnectionRowViews(connections)
return (
<VirtualList
count={scenario === 'logs' ? logs.length : rows.length}
estimateSize={scenario === 'logs' ? 50 : 56}
style={{ height: 640, margin: 24 }}
renderItem={(index) =>
scenario === 'logs' ? (
<LogItem
value={logs[logs.length - 1 - index]}
searchState={searchState}
/>
) : (
<ConnectionRowItem
row={rows[index]}
closed={false}
onShowDetail={() => {}}
/>
)
}
/>
)
}
dayjs.extend(relativeTime)
const root = document.getElementById('root')!
setPreloadConfig({
language: 'en',
theme_mode: 'light',
pause_render_traffic_stats_on_blur: false,
} as IVergeConfig)
await initializeLanguage('en')
const Scene =
layer === 'component'
? Components
: scenario === 'logs'
? (await import('../../src/pages/logs')).default
: (await import('../../src/pages/connections')).default
createRoot(root).render(
<SWRConfig value={{ revalidateOnFocus: false, revalidateOnReconnect: false }}>
<ThemeProvider theme={createTheme()}>
<Scene />
</ThemeProvider>
</SWRConfig>,
)
-30
View File
@@ -1,30 +0,0 @@
// Aliased in place of '@tauri-apps/api/core' only by the perf build. The
// direct relative import keeps the original module outside the alias so this
// shim can forward to it. Invocation stays byte-identical for every scenario
// except proxy, which needs the JavaScript invoke adapter.
import {
Channel,
convertFileSrc,
invoke as realInvoke,
type InvokeArgs,
type InvokeOptions,
} from '../../node_modules/@tauri-apps/api/core.js'
import { mockCommand } from './invoke-mock'
import { scenario } from './replay'
const proxied = scenario === 'proxy'
export const invoke = async <T>(
cmd: string,
args?: InvokeArgs,
options?: InvokeOptions,
): Promise<T> => {
if (proxied) {
const mocked = mockCommand(cmd)
if (mocked !== undefined) return mocked as T
}
return realInvoke(cmd, args, options)
}
export { Channel, convertFileSrc }
-52
View File
@@ -1,52 +0,0 @@
import { ThemeProvider, createTheme } from '@mui/material'
import { useEffect } from 'react'
import { createRoot } from 'react-dom/client'
import { SWRConfig } from 'swr'
import { EnhancedCanvasTrafficGraph } from '../../src/components/home/enhanced-canvas-traffic-graph'
import { useTrafficMonitorEnhanced } from '../../src/hooks/use-traffic-monitor'
import { initializeLanguage } from '../../src/services/i18n'
import { setPreloadConfig } from '../../src/services/preload'
setPreloadConfig({
pause_render_traffic_stats_on_blur: false,
} as IVergeConfig)
await initializeLanguage('en')
export function Replay() {
const {
graphData: { appendData },
} = useTrafficMonitorEnhanced({ subscribe: false })
useEffect(() => {
let received = 0,
previous = 0,
gaps = 0
const socket = new WebSocket(
`ws://127.0.0.1:${new URLSearchParams(location.search).get('port')}`,
)
socket.onmessage = ({ data }) => {
const point = JSON.parse(data)
appendData(point)
if (previous && point.sequence !== previous + 1) gaps++
previous = point.sequence
document.documentElement.dataset.perfReceived = String(++received)
document.documentElement.dataset.perfGaps = String(gaps)
document.documentElement.dataset.perfSourceTime = String(point.timestamp)
}
return () => socket.close()
}, [appendData])
return (
<main
aria-label="Home traffic graph replay"
style={{ width: 920, height: 360, margin: 32 }}
>
<EnhancedCanvasTrafficGraph />
</main>
)
}
createRoot(document.getElementById('root')!).render(
<SWRConfig value={{ revalidateOnFocus: false, revalidateOnReconnect: false }}>
<ThemeProvider theme={createTheme()}>
<Replay />
</ThemeProvider>
</SWRConfig>,
)
+1 -1
View File
@@ -1,4 +1,4 @@
{ {
"extends": "../../tsconfig.json", "extends": "../../tsconfig.json",
"include": ["../../src", "./*.tsx", "./*.ts"] "include": ["../../src", "./*.tsx"]
} }
-6
View File
@@ -6,11 +6,5 @@ export default mergeConfig(
defineConfig({ defineConfig({
root: 'scripts/perf', root: 'scripts/perf',
build: { outDir: '../../target/perf/dist', target: 'safari16' }, build: { outDir: '../../target/perf/dist', target: 'safari16' },
resolve: {
alias: {
'@tauri-apps/api/core': new URL('./tauri-core-shim.ts', import.meta.url)
.pathname,
},
},
}), }),
) )
-88
View File
@@ -1,88 +0,0 @@
import { spawnSync } from 'node:child_process'
import { appendFileSync, readFileSync, writeFileSync } from 'node:fs'
import { parseArgs } from 'node:util'
const { values } = parseArgs({
options: {
'dry-run': { type: 'boolean', default: false },
check: { type: 'boolean', default: false },
version: { type: 'string' },
file: { type: 'string', default: 'Changelog.md' },
},
})
async function main() {
let version = values.version
if (!version) {
const response = await fetch(
'https://github.com/MetaCubeX/mihomo/releases/latest/download/version.txt',
{ signal: AbortSignal.timeout(30_000) },
)
if (!response.ok)
throw new Error(`Failed to fetch Mihomo version: ${response.status}`)
version = await response.text()
}
version = version.trim().replace(/^v?/, 'v')
if (!/^v\d+\.\d+\.\d+$/.test(version))
throw new Error(`Invalid stable Mihomo version: ${version}`)
const content = readFileSync(values.file, 'utf8')
const title = /^## .+$/m.exec(content)
if (!title) throw new Error('Could not find changelog title.')
const start = title.index + title[0].length
const end = content.indexOf('\n## ', start)
const section = content.slice(start, end === -1 ? undefined : end)
const line =
/^(\s*-\s*(?:\*\*)?\s*Mihomo(?:\(Meta\))?\s*内核升级至\s*)v?\d+(?:\.\d+)+(?:[-+][^\s*]+)?((?:\*\*)?[\t ]*)$/m
const nextSection = line.test(section)
? section.replace(line, `$1${version}$2`)
: `\n\n- **Mihomo 内核升级至 ${version}**${section.replace(/^\n*/, '\n\n')}`
const nextContent =
content.slice(0, start) +
nextSection +
(end === -1 ? '' : content.slice(end))
const changed = content !== nextContent
if (process.env.GITHUB_OUTPUT)
appendFileSync(
process.env.GITHUB_OUTPUT,
`version=${version}\nchanged=${changed}\n`,
)
if (!changed) {
console.log(`Mihomo version in changelog is already ${version}`)
return
}
const diff = spawnSync(
'diff',
[
'-u',
'--label',
`a/${values.file}`,
'--label',
`b/${values.file}`,
values.file,
'-',
],
{ input: nextContent, encoding: 'utf8' },
)
if (diff.error) throw diff.error
if (diff.status !== 1)
throw new Error(diff.stderr || 'Could not preview changelog diff.')
process.stdout.write(diff.stdout)
if (process.env.GITHUB_STEP_SUMMARY)
appendFileSync(
process.env.GITHUB_STEP_SUMMARY,
`### Mihomo ${version}\n\n\`\`\`diff\n${diff.stdout}\`\`\`\n`,
)
if (values.check) {
process.exitCode = 1
return
}
if (!values['dry-run']) writeFileSync(values.file, nextContent)
}
main().catch((error) => {
console.error('sync-mihomo-version failed:', error.message)
process.exitCode = 1
})
+14 -13
View File
@@ -8,7 +8,7 @@ repository = "https://github.com/clash-verge-rev/clash-verge-rev.git"
default-run = "clash-verge" default-run = "clash-verge"
build = "build.rs" build = "build.rs"
edition = "2024" edition = "2024"
rust-version = "1.100" rust-version = "1.99"
[lib] [lib]
name = "app_lib" name = "app_lib"
@@ -54,9 +54,9 @@ log = { workspace = true }
serde = { workspace = true, features = ["derive"] } serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true } serde_json = { workspace = true }
serde_yaml_ng = { workspace = true } serde_yaml_ng = { workspace = true }
tristr = { workspace = true } smartstring = { workspace = true, features = ["serde"] }
socket2 = { workspace = true } socket2 = { workspace = true }
warp = { version = "0.4.4", features = ["server"] } warp = { version = "0.4.3", features = ["server"] }
open = "5.4.5" open = "5.4.5"
rfd = { version = "0.18.0", default-features = false, features = ["common-controls-v6", "xdg-portal"] } rfd = { version = "0.18.0", default-features = false, features = ["common-controls-v6", "xdg-portal"] }
dirs = "7.0.0" dirs = "7.0.0"
@@ -67,17 +67,17 @@ boa_engine = "0.22.0"
http-body-util = "0.1.5" http-body-util = "0.1.5"
percent-encoding = "2.3.2" percent-encoding = "2.3.2"
reqwest = { workspace = true } reqwest = { workspace = true }
sysproxy = { git = "https://github.com/clash-verge-rev/sysproxy-rs.git", rev = "2c9d0a538052aac6e44ad413156a6e848da262b9", version = "0.7.2", features = [ sysproxy = { git = "https://github.com/clash-verge-rev/sysproxy-rs.git", branch = "main", features = [
"guard", "guard",
] } ] }
network-interface = { version = "2.0.5", features = ["serde"] } network-interface = { version = "2.0.5", features = ["serde"] }
tauri-plugin-shell = "2.6.0" tauri-plugin-shell = "2.6.0"
tauri-plugin-opener = "2.7.3" tauri-plugin-opener = "2.7.2"
tauri-plugin-dialog = "2.8.4" tauri-plugin-dialog = "2.8.4"
tauri-plugin-fs = "2.7.1" tauri-plugin-fs = "2.7.1"
tauri-plugin-deep-link = "2.6.3" tauri-plugin-deep-link = "2.6.3"
tauri-plugin-window-state = "2.5.0" tauri-plugin-window-state = "2.5.0"
zip = "9.6.0" zip = "9.4.2"
flate2 = "1.1.11" flate2 = "1.1.11"
reqwest_dav = "0.3.3" reqwest_dav = "0.3.3"
aes-gcm = { version = "0.11.1" } aes-gcm = { version = "0.11.1" }
@@ -86,20 +86,21 @@ sha2 = "0.11.1"
getrandom = "0.4.3" getrandom = "0.4.3"
futures = "0.3.34" futures = "0.3.34"
gethostname = "1.1.0" gethostname = "1.1.0"
tauri-plugin-notification = "2.8.1" scopeguard = "1.2.0"
tauri-plugin-notification = "2.8.0"
backon = { version = "1.6.0", features = ["tokio-sleep"] } backon = { version = "1.6.0", features = ["tokio-sleep"] }
tauri-plugin-http = "2.9.0" tauri-plugin-http = "2.8.3"
tracing = { workspace = true } tracing = { workspace = true }
tauri-plugin-devtools = { version = "2.2.3", optional = true } tauri-plugin-devtools = { version = "2.2.3", optional = true }
tauri-plugin-mihomo = { git = "https://github.com/clash-verge-rev/tauri-plugin-mihomo", rev = "7e4fa8642cf6c394ed88b5a969420d8eab60087f" } tauri-plugin-mihomo = { git = "https://github.com/clash-verge-rev/tauri-plugin-mihomo", rev = "7a03d16f4d39b1bb885b7babe66b9e153e34b615" }
async-trait = "0.1.92" async-trait = "0.1.92"
clash_verge_service_ipc = { git = "https://github.com/clash-verge-rev/clash-verge-service-ipc.git", tag = "v2.8.1", version = "2.8.1", features = [ clash_verge_service_ipc = { git = "https://github.com/clash-verge-rev/clash-verge-service-ipc.git", tag = "v2.7.7", version = "2.7.7", features = [
"client", "client",
] } ] }
arc-swap = "1.9.5" arc-swap = "1.9.4"
tokio-rustls = "0.26.6" tokio-rustls = "0.26.6"
rustls = { version = "0.23.46", features = ["ring"] } rustls = { version = "0.23.46", features = ["ring"] }
webpki-roots = "1.0.12" webpki-roots = "1.0.11"
dark-light = "3.0.0" dark-light = "3.0.0"
bytes = "1.12.1" bytes = "1.12.1"
tokio-util = { version = "0.7.20", features = ["time"] } tokio-util = { version = "0.7.20", features = ["time"] }
@@ -153,7 +154,7 @@ tauri-plugin-updater = "2.14.1"
[dev-dependencies] [dev-dependencies]
tokio = { workspace = true, features = ["test-util"] } tokio = { workspace = true, features = ["test-util"] }
warp = { version = "0.4.4", features = ["test"] } warp = { version = "0.4.3", features = ["test"] }
[lints] [lints]
workspace = true workspace = true
-2
View File
@@ -17,8 +17,6 @@
"autostart:allow-disable", "autostart:allow-disable",
"autostart:allow-is-enabled", "autostart:allow-is-enabled",
"core:window:allow-set-theme", "core:window:allow-set-theme",
"core:window:allow-set-background-color",
"core:webview:allow-set-webview-background-color",
"notification:default", "notification:default",
"http:default", "http:default",
"http:allow-fetch", "http:allow-fetch",
+4 -4
View File
@@ -2,10 +2,10 @@
// bundles (PR #8131), so this generator must stay an example, never a bin. // bundles (PR #8131), so this generator must stay an example, never a bin.
fn main() -> Result<(), Box<dyn std::error::Error>> { fn main() -> Result<(), Box<dyn std::error::Error>> {
let mut args = std::env::args_os().skip(1); let mut args = std::env::args_os().skip(1);
let output = args.next().map_or_else( let output = args
|| std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../src/services/bindings.ts"), .next()
std::path::PathBuf::from, .map(std::path::PathBuf::from)
); .unwrap_or_else(|| std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../src/services/bindings.ts"));
if args.next().is_some() { if args.next().is_some() {
return Err(std::io::Error::new(std::io::ErrorKind::InvalidInput, "expected at most one output path").into()); return Err(std::io::Error::new(std::io::ErrorKind::InvalidInput, "expected at most one output path").into());
} }
+1 -1
View File
@@ -8,8 +8,8 @@ use crate::{
feat, feat,
utils::dirs, utils::dirs,
}; };
use smartstring::alias::String;
use tauri::{AppHandle, Manager as _, ipc::Channel}; use tauri::{AppHandle, Manager as _, ipc::Channel};
use tristr::alias::String;
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
+1 -1
View File
@@ -1,7 +1,7 @@
use super::CmdResult; use super::CmdResult;
use crate::{cmd::StringifyErr as _, feat}; use crate::{cmd::StringifyErr as _, feat};
use feat::LocalBackupFile; use feat::LocalBackupFile;
use tristr::alias::String; use smartstring::alias::String;
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
+1 -1
View File
@@ -12,8 +12,8 @@ use crate::{
}, },
}; };
use clash_verge_logging::{Type, logging, logging_error}; use clash_verge_logging::{Type, logging, logging_error};
use smartstring::alias::String;
use tokio::fs; use tokio::fs;
use tristr::alias::String;
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
+1 -1
View File
@@ -1,5 +1,5 @@
use anyhow::Result; use anyhow::Result;
use tristr::alias::String; use smartstring::alias::String;
pub type CmdResult<T = ()> = Result<T, CommandFailure>; pub type CmdResult<T = ()> = Result<T, CommandFailure>;
+17 -9
View File
@@ -18,11 +18,9 @@ use crate::{
}; };
use clash_verge_draft::{Draft, SharedDraft}; use clash_verge_draft::{Draft, SharedDraft};
use clash_verge_logging::{Type, logging, logging_error}; use clash_verge_logging::{Type, logging, logging_error};
use std::{ use scopeguard::defer;
mem::DropGuard, use smartstring::alias::String;
sync::atomic::{AtomicBool, Ordering}, use std::sync::atomic::{AtomicBool, Ordering};
};
use tristr::alias::String;
static CURRENT_SWITCHING_PROFILE: AtomicBool = AtomicBool::new(false); static CURRENT_SWITCHING_PROFILE: AtomicBool = AtomicBool::new(false);
@@ -210,10 +208,10 @@ pub async fn delete_profile(index: std::string::String) -> CmdResult {
Ok(()) Ok(())
} }
async fn restore_previous_profile(prev_profile: &str) -> CmdResult<()> { async fn restore_previous_profile(prev_profile: &String) -> CmdResult<()> {
logging!(info, Type::Cmd, "尝试恢复到之前的配置: {}", prev_profile); logging!(info, Type::Cmd, "尝试恢复到之前的配置: {}", prev_profile);
let restore_profiles = IProfiles { let restore_profiles = IProfiles {
current: Some(prev_profile.into()), current: Some(prev_profile.to_owned()),
items: None, items: None,
}; };
Config::profiles() Config::profiles()
@@ -322,6 +320,7 @@ async fn perform_config_update(
#[derive(Default, serde::Deserialize, specta::Type)] #[derive(Default, serde::Deserialize, specta::Type)]
#[serde(default)] #[serde(default)]
pub struct ProfileSelection { pub struct ProfileSelection {
#[specta(type = Option<std::string::String>)]
pub current: Option<String>, pub current: Option<String>,
} }
@@ -329,9 +328,13 @@ pub struct ProfileSelection {
#[serde(default)] #[serde(default)]
pub struct ProfileCreate { pub struct ProfileCreate {
#[serde(rename = "type")] #[serde(rename = "type")]
#[specta(type = Option<std::string::String>)]
pub itype: Option<String>, pub itype: Option<String>,
#[specta(type = Option<std::string::String>)]
pub name: Option<String>, pub name: Option<String>,
#[specta(type = Option<std::string::String>)]
pub desc: Option<String>, pub desc: Option<String>,
#[specta(type = Option<std::string::String>)]
pub url: Option<String>, pub url: Option<String>,
pub option: Option<PrfOption>, pub option: Option<PrfOption>,
} }
@@ -353,10 +356,15 @@ impl From<ProfileCreate> for PrfItem {
#[serde(default)] #[serde(default)]
pub struct ProfilePatch { pub struct ProfilePatch {
#[serde(rename = "type")] #[serde(rename = "type")]
#[specta(type = Option<std::string::String>)]
pub itype: Option<String>, pub itype: Option<String>,
#[specta(type = Option<std::string::String>)]
pub name: Option<String>, pub name: Option<String>,
#[specta(type = Option<std::string::String>)]
pub desc: Option<String>, pub desc: Option<String>,
#[specta(type = Option<std::string::String>)]
pub file: Option<String>, pub file: Option<String>,
#[specta(type = Option<std::string::String>)]
pub url: Option<String>, pub url: Option<String>,
pub selected: Option<Vec<crate::config::PrfSelected>>, pub selected: Option<Vec<crate::config::PrfSelected>>,
pub extra: Option<crate::config::PrfExtra>, pub extra: Option<crate::config::PrfExtra>,
@@ -392,9 +400,9 @@ pub async fn patch_profiles_config(profiles: ProfileSelection) -> CmdResult<Vali
logging!(info, Type::Cmd, "当前正在切换配置,放弃请求"); logging!(info, Type::Cmd, "当前正在切换配置,放弃请求");
return Ok(ValidationOutcome::Busy); return Ok(ValidationOutcome::Busy);
} }
let _switching_profile = DropGuard::new((), |()| { defer! {
CURRENT_SWITCHING_PROFILE.store(false, Ordering::Release); CURRENT_SWITCHING_PROFILE.store(false, Ordering::Release);
}); }
let _profile_write_guard = PROFILE_WRITE_LOCK.lock().await; let _profile_write_guard = PROFILE_WRITE_LOCK.lock().await;
let profiles = IProfiles { let profiles = IProfiles {
+2 -7
View File
@@ -27,12 +27,6 @@ pub async fn switch_proxy_node(group_name: String, proxy_name: String, unfix: bo
.stringify_err() .stringify_err()
} }
#[tauri::command]
#[specta::specta]
pub async fn follow_proxy_group(group_name: String) {
crate::feat::follow_proxy_group(&group_name).await;
}
fn runtime_group_order(config: Option<&Mapping>) -> Vec<String> { fn runtime_group_order(config: Option<&Mapping>) -> Vec<String> {
let mut seen = HashSet::new(); let mut seen = HashSet::new();
@@ -89,7 +83,8 @@ fn runtime_group_scopes(config: Option<&Mapping>) -> BTreeMap<String, GroupScope
.get("exclude-type") .get("exclude-type")
.and_then(|types| types.as_str()) .and_then(|types| types.as_str())
.filter(|types| !types.is_empty()) .filter(|types| !types.is_empty())
.map_or_default(|types| types.split('|').map(str::to_owned).collect()); .map(|types| types.split('|').map(str::to_owned).collect())
.unwrap_or_default();
Some(( Some((
name, name,
GroupScope { GroupScope {
+5 -2
View File
@@ -1,8 +1,8 @@
use super::CmdResult; use super::CmdResult;
use crate::{cmd::StringifyErr as _, config::Config, core::CoreManager, utils::yaml_emitter}; use crate::{cmd::StringifyErr as _, config::Config, core::CoreManager, utils::yaml_emitter};
use anyhow::{Context as _, anyhow}; use anyhow::{Context as _, anyhow};
use smartstring::alias::String;
use std::collections::HashMap; use std::collections::HashMap;
use tristr::alias::String;
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
@@ -36,7 +36,10 @@ pub async fn get_runtime_logs() -> CmdResult<RuntimeLogs> {
#[derive(serde::Serialize, specta::Type)] #[derive(serde::Serialize, specta::Type)]
#[serde(transparent)] #[serde(transparent)]
pub struct RuntimeLogs(HashMap<String, Vec<(String, String)>>); pub struct RuntimeLogs(
#[specta(type = HashMap<std::string::String, Vec<(std::string::String, std::string::String)>>)]
HashMap<String, Vec<(String, String)>>,
);
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
+1 -1
View File
@@ -11,8 +11,8 @@ use crate::{
utils::dirs, utils::dirs,
}; };
use clash_verge_logging::{Type, logging}; use clash_verge_logging::{Type, logging};
use smartstring::alias::String;
use tokio::fs; use tokio::fs;
use tristr::alias::String;
/// 保存profiles的配置 /// 保存profiles的配置
#[tauri::command] #[tauri::command]
+1 -1
View File
@@ -4,7 +4,7 @@ use crate::{
config::{Config, IVerge}, config::{Config, IVerge},
core, feat, core, feat,
}; };
use tristr::alias::String; use smartstring::alias::String;
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
+6 -18
View File
@@ -20,10 +20,10 @@ use backon::{ExponentialBuilder, Retryable as _};
use clash_verge_draft::Draft; use clash_verge_draft::Draft;
use clash_verge_logging::{Type, logging, logging_error}; use clash_verge_logging::{Type, logging, logging_error};
use serde_yaml_ng::{Mapping, Value}; use serde_yaml_ng::{Mapping, Value};
use smartstring::alias::String;
use std::{collections::HashSet, path::PathBuf}; use std::{collections::HashSet, path::PathBuf};
use tokio::sync::{Mutex, MutexGuard, OnceCell}; use tokio::sync::{Mutex, MutexGuard, OnceCell};
use tokio::time::sleep; use tokio::time::sleep;
use tristr::alias::String;
pub(crate) struct Config { pub(crate) struct Config {
clash_config: Draft<IClashTemp>, clash_config: Draft<IClashTemp>,
@@ -34,9 +34,6 @@ pub(crate) struct Config {
static CONFIG_WRITE_LOCK: Mutex<()> = Mutex::const_new(()); static CONFIG_WRITE_LOCK: Mutex<()> = Mutex::const_new(());
static RUNTIME_YAML_CACHE: parking_lot::Mutex<Option<(u64, std::sync::Arc<std::string::String>)>> =
parking_lot::Mutex::new(None);
impl Config { impl Config {
async fn global() -> &'static Self { async fn global() -> &'static Self {
static CONFIG: OnceCell<Config> = OnceCell::const_new(); static CONFIG: OnceCell<Config> = OnceCell::const_new();
@@ -194,7 +191,7 @@ impl Config {
} }
} }
} else { } else {
let error_msg = config_result.err().map_or_default(|err| err.to_string()); let error_msg = config_result.err().map(|err| err.to_string()).unwrap_or_default();
logging!(warn, Type::Config, "生成配置文件失败,使用默认配置: {error_msg}"); logging!(warn, Type::Config, "生成配置文件失败,使用默认配置: {error_msg}");
CoreManager::global() CoreManager::global()
.use_default_config(NoticeStatus::ConfigValidateError, "") .use_default_config(NoticeStatus::ConfigValidateError, "")
@@ -208,7 +205,7 @@ impl Config {
Self::write_runtime_file(&yaml).await Self::write_runtime_file(&yaml).await
} }
pub(crate) async fn runtime_config_yaml() -> Result<std::sync::Arc<std::string::String>> { pub(crate) async fn runtime_config_yaml() -> Result<std::string::String> {
let runtime = Self::runtime().await; let runtime = Self::runtime().await;
AsyncHandler::spawn_blocking(move || { AsyncHandler::spawn_blocking(move || {
let runtime_lastest = runtime.latest_arc(); let runtime_lastest = runtime.latest_arc();
@@ -218,17 +215,8 @@ impl Config {
.as_ref() .as_ref()
.or_else(|| runtime_data.config.as_ref()) .or_else(|| runtime_data.config.as_ref())
.ok_or_else(|| anyhow!("failed to generate runtime config, might need to restart application"))?; .ok_or_else(|| anyhow!("failed to generate runtime config, might need to restart application"))?;
let mut hasher = std::collections::hash_map::DefaultHasher::new(); let yaml_str = serde_yaml_ng::to_string(config)?;
std::hash::Hash::hash(config, &mut hasher); Ok(format!("# Generated by Clash Verge\n\n{}", yaml_str))
let key = std::hash::Hasher::finish(&hasher);
if let Some((cached_key, cached)) = RUNTIME_YAML_CACHE.lock().as_ref()
&& *cached_key == key
{
return Ok(std::sync::Arc::clone(cached));
}
let yaml_str = std::sync::Arc::new(serde_yaml_ng::to_string(config)?);
*RUNTIME_YAML_CACHE.lock() = Some((key, std::sync::Arc::clone(&yaml_str)));
Ok(yaml_str)
}) })
.await .await
.map_err(|join| anyhow!("runtime serialization task failed: {join}"))? .map_err(|join| anyhow!("runtime serialization task failed: {join}"))?
@@ -236,7 +224,7 @@ impl Config {
pub(crate) async fn write_runtime_file(yaml: &str) -> Result<PathBuf> { pub(crate) async fn write_runtime_file(yaml: &str) -> Result<PathBuf> {
let path = dirs::app_home_dir()?.join(files::RUNTIME_CONFIG); let path = dirs::app_home_dir()?.join(files::RUNTIME_CONFIG);
help::save_yaml_str(&path, yaml, Some("# Generated by Clash Verge")).await?; help::save_yaml_str(&path, yaml).await?;
Ok(path) Ok(path)
} }
+5 -3
View File
@@ -1,12 +1,11 @@
use crate::core::notify::NoticeStatus; use crate::core::notify::NoticeStatus;
use crate::utils::help;
use anyhow::Result; use anyhow::Result;
use clash_verge_draft::DraftTransaction; use clash_verge_draft::DraftTransaction;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_yaml_ng::{Mapping, Value}; use serde_yaml_ng::{Mapping, Value};
use sha2::{Digest as _, Sha256}; use sha2::{Digest as _, Sha256};
use smartstring::alias::String;
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use tristr::alias::String;
use super::{Config, IVerge}; use super::{Config, IVerge};
use crate::core::handle::Handle; use crate::core::handle::Handle;
@@ -50,7 +49,9 @@ pub(crate) fn dns_override_source(profile_uid: &str, config: &Mapping) -> Result
digest.update(profile_uid.as_bytes()); digest.update(profile_uid.as_bytes());
digest.update([0]); digest.update([0]);
digest.update(serde_json::to_vec(&canonical)?); digest.update(serde_json::to_vec(&canonical)?);
Ok(Some(help::hex_encode(&digest.finalize()).into())) Ok(Some(
digest.finalize().iter().map(|byte| format!("{byte:02x}")).collect(),
))
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@@ -109,6 +110,7 @@ impl DnsOverrideState {
pub struct ProfileDnsSettings { pub struct ProfileDnsSettings {
pub enabled: bool, pub enabled: bool,
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
#[specta(type = Option<std::string::String>)]
pub confirmation: Option<String>, pub confirmation: Option<String>,
} }
+21 -6
View File
@@ -11,9 +11,9 @@ use crate::{
use anyhow::{Context as _, Result, bail}; use anyhow::{Context as _, Result, bail};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_yaml_ng::Mapping; use serde_yaml_ng::Mapping;
use smartstring::alias::String;
use std::time::Duration; use std::time::Duration;
use tokio::fs; use tokio::fs;
use tristr::alias::String;
// TODO, use other re-export // TODO, use other re-export
use reqwest_dav::re_exports::url::form_urlencoded; use reqwest_dav::re_exports::url::form_urlencoded;
use tauri::Url; use tauri::Url;
@@ -26,24 +26,30 @@ pub(super) fn normalize_profile_home_url(raw: &str) -> Option<String> {
} }
url.host_str()?; url.host_str()?;
Some(url.as_str().into()) Some(url.to_string().into())
} }
#[derive(Debug, Clone, Deserialize, Serialize, Default, specta::Type)] #[derive(Debug, Clone, Deserialize, Serialize, Default, specta::Type)]
#[serde(default)] #[serde(default)]
pub struct PrfItem { pub struct PrfItem {
#[specta(type = Option<std::string::String>)]
pub uid: Option<String>, pub uid: Option<String>,
/// enum value: remote | local | script | merge /// enum value: remote | local | script | merge
#[serde(rename = "type")] #[serde(rename = "type")]
#[specta(type = Option<std::string::String>)]
pub itype: Option<String>, pub itype: Option<String>,
#[specta(type = Option<std::string::String>)]
pub name: Option<String>, pub name: Option<String>,
#[specta(type = Option<std::string::String>)]
pub file: Option<String>, pub file: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
#[specta(type = Option<std::string::String>)]
pub desc: Option<String>, pub desc: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
#[specta(type = Option<std::string::String>)]
pub url: Option<String>, pub url: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
@@ -58,16 +64,20 @@ pub struct PrfItem {
pub option: Option<PrfOption>, pub option: Option<PrfOption>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
#[specta(type = Option<std::string::String>)]
pub home: Option<String>, pub home: Option<String>,
#[serde(skip)] #[serde(skip)]
#[specta(type = Option<std::string::String>)]
pub file_data: Option<String>, pub file_data: Option<String>,
} }
#[derive(Default, Debug, Clone, Deserialize, Serialize, PartialEq, Eq, specta::Type)] #[derive(Default, Debug, Clone, Deserialize, Serialize, PartialEq, Eq, specta::Type)]
#[serde(default)] #[serde(default)]
pub struct PrfSelected { pub struct PrfSelected {
#[specta(type = Option<std::string::String>)]
pub name: Option<String>, pub name: Option<String>,
#[specta(type = Option<std::string::String>)]
pub now: Option<String>, pub now: Option<String>,
} }
@@ -83,6 +93,7 @@ pub struct PrfExtra {
#[serde(default)] #[serde(default)]
pub struct PrfOption { pub struct PrfOption {
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
#[specta(type = Option<std::string::String>)]
pub user_agent: Option<String>, pub user_agent: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
@@ -105,10 +116,15 @@ pub struct PrfOption {
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub allow_auto_update: Option<bool>, pub allow_auto_update: Option<bool>,
#[specta(type = Option<std::string::String>)]
pub merge: Option<String>, pub merge: Option<String>,
#[specta(type = Option<std::string::String>)]
pub script: Option<String>, pub script: Option<String>,
#[specta(type = Option<std::string::String>)]
pub rules: Option<String>, pub rules: Option<String>,
#[specta(type = Option<std::string::String>)]
pub proxies: Option<String>, pub proxies: Option<String>,
#[specta(type = Option<std::string::String>)]
pub groups: Option<String>, pub groups: Option<String>,
} }
@@ -355,10 +371,9 @@ impl PrfItem {
let uid = help::get_uid("R").into(); let uid = help::get_uid("R").into();
let file = format!("{uid}.yaml").into(); let file = format!("{uid}.yaml").into();
let name = name.map_or_else( let name = name
|| filename.map_or_else(|| "Remote File".into(), |s| s.into()), .map(|s| s.to_owned())
|s| s.to_owned(), .unwrap_or_else(|| filename.map(|s| s.into()).unwrap_or_else(|| "Remote File".into()));
);
let data = resp.text(); let data = resp.text();
let data = data.trim_start_matches('\u{feff}'); let data = data.trim_start_matches('\u{feff}');
+10 -13
View File
@@ -17,6 +17,7 @@ use clash_verge_logging::{Type, logging};
use parking_lot::Mutex; use parking_lot::Mutex;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_yaml_ng::Mapping; use serde_yaml_ng::Mapping;
use smartstring::alias::String;
use std::num::NonZeroUsize; use std::num::NonZeroUsize;
use std::{ use std::{
collections::{HashMap, HashSet}, collections::{HashMap, HashSet},
@@ -29,7 +30,6 @@ use std::{
}; };
use tauri_plugin_mihomo::models::{Proxies, ProxyType}; use tauri_plugin_mihomo::models::{Proxies, ProxyType};
use tokio::{fs, task::JoinHandle}; use tokio::{fs, task::JoinHandle};
use tristr::alias::String;
pub(crate) static PROFILE_WRITE_LOCK: tokio::sync::Mutex<()> = tokio::sync::Mutex::const_new(()); pub(crate) static PROFILE_WRITE_LOCK: tokio::sync::Mutex<()> = tokio::sync::Mutex::const_new(());
@@ -51,6 +51,7 @@ const SELECTED_NODES_FIRST_PASS_BUDGET: Duration = Duration::from_secs(3);
#[derive(Default, Debug, Clone, Deserialize, Serialize, specta::Type)] #[derive(Default, Debug, Clone, Deserialize, Serialize, specta::Type)]
#[serde(default)] #[serde(default)]
pub struct IProfiles { pub struct IProfiles {
#[specta(type = Option<std::string::String>)]
pub current: Option<String>, pub current: Option<String>,
pub items: Option<Vec<PrfItem>>, pub items: Option<Vec<PrfItem>>,
@@ -604,7 +605,7 @@ async fn fetch_proxies_with_timeout() -> Result<Proxies> {
.map_err(Into::into) .map_err(Into::into)
} }
async fn select_node_with_timeout(group_name: &str, node: &str) -> Result<()> { async fn select_node_with_timeout(group_name: &String, node: &String) -> Result<()> {
tokio::time::timeout(MIHOMO_OPERATION_TIMEOUT, async { tokio::time::timeout(MIHOMO_OPERATION_TIMEOUT, async {
handle::Handle::mihomo().select_node_for_group(group_name, node).await handle::Handle::mihomo().select_node_for_group(group_name, node).await
}) })
@@ -760,7 +761,7 @@ pub(crate) async fn record_selected_node(group_name: &str, node: &str) -> Result
return Ok((profiles, false)); return Ok((profiles, false));
}; };
let selected = item.selected.get_or_insert_with(Vec::new); let mut selected = item.selected.clone().unwrap_or_default();
match selected match selected
.iter_mut() .iter_mut()
.find(|entry| entry.name.as_ref() == Some(&group_name)) .find(|entry| entry.name.as_ref() == Some(&group_name))
@@ -769,13 +770,14 @@ pub(crate) async fn record_selected_node(group_name: &str, node: &str) -> Result
if entry.now.as_ref() == Some(&node) { if entry.now.as_ref() == Some(&node) {
return Ok((profiles, false)); return Ok((profiles, false));
} }
entry.now = Some(node.clone()); entry.now = Some(node);
} }
None => selected.push(PrfSelected { None => selected.push(PrfSelected {
name: Some(group_name), name: Some(group_name),
now: Some(node), now: Some(node),
}), }),
} }
item.selected = Some(selected);
profiles.save_file().await?; profiles.save_file().await?;
Ok((profiles, true)) Ok((profiles, true))
}) })
@@ -794,17 +796,12 @@ pub(crate) async fn forget_selected_node(group_name: &str) -> Result<()> {
return Ok((profiles, false)); return Ok((profiles, false));
}; };
let Some(mut selected) = item.selected.take() else { let mut selected = item.selected.clone().unwrap_or_default();
return Ok((profiles, false));
};
if !remove_selected_node(&mut selected, group_name) { if !remove_selected_node(&mut selected, group_name) {
item.selected = Some(selected);
return Ok((profiles, false)); return Ok((profiles, false));
} }
if !selected.is_empty() { item.selected = (!selected.is_empty()).then_some(selected);
item.selected = Some(selected);
}
profiles.save_file().await?; profiles.save_file().await?;
Ok((profiles, true)) Ok((profiles, true))
}) })
@@ -812,7 +809,7 @@ pub(crate) async fn forget_selected_node(group_name: &str) -> Result<()> {
} }
async fn persist_reconciled_selected( async fn persist_reconciled_selected(
profile_uid: &str, profile_uid: &String,
original_selected: &[PrfSelected], original_selected: &[PrfSelected],
selected: Vec<PrfSelected>, selected: Vec<PrfSelected>,
generation: u64, generation: u64,
@@ -821,7 +818,7 @@ async fn persist_reconciled_selected(
return Ok(()); return Ok(());
} }
let profile_uid = String::from(profile_uid); let profile_uid = profile_uid.clone();
let original_selected = original_selected.to_vec(); let original_selected = original_selected.to_vec();
persist_selected_update(false, move |mut profiles| async move { persist_selected_update(false, move |mut profiles| async move {
if !is_activation_current(generation) || profiles.current.as_ref() != Some(&profile_uid) { if !is_activation_current(generation) || profiles.current.as_ref() != Some(&profile_uid) {
+1 -1
View File
@@ -1,6 +1,6 @@
use serde_yaml_ng::{Mapping, Value}; use serde_yaml_ng::{Mapping, Value};
use smartstring::alias::String;
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use tristr::alias::String;
use crate::enhance::field::use_keys; use crate::enhance::field::use_keys;
+36 -5
View File
@@ -8,26 +8,33 @@ use anyhow::Result;
use clash_verge_logging::{Type, logging}; use clash_verge_logging::{Type, logging};
use log::LevelFilter; use log::LevelFilter;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tristr::alias::String; use smartstring::alias::String;
/// ### `verge.yaml` schema /// ### `verge.yaml` schema
#[derive(Default, Debug, Clone, Deserialize, Serialize, specta::Type)] #[derive(Default, Debug, Clone, Deserialize, Serialize, specta::Type)]
#[serde(default)] #[serde(default)]
pub struct IVerge { pub struct IVerge {
/// silent | error | warn | info | debug | trace /// silent | error | warn | info | debug | trace
#[specta(type = Option<std::string::String>)]
pub app_log_level: Option<String>, pub app_log_level: Option<String>,
/// Maximum app log size in KiB. /// Maximum app log size in KiB.
pub app_log_max_size: Option<u64>, pub app_log_max_size: Option<u64>,
pub app_log_max_count: Option<usize>, pub app_log_max_count: Option<usize>,
#[specta(type = Option<std::string::String>)]
pub language: Option<String>, pub language: Option<String>,
/// `light` or `dark` or `system` /// `light` or `dark` or `system`
#[specta(type = Option<std::string::String>)]
pub theme_mode: Option<String>, pub theme_mode: Option<String>,
#[specta(type = Option<std::string::String>)]
pub tray_event: Option<String>, pub tray_event: Option<String>,
#[specta(type = Option<std::string::String>)]
pub env_type: Option<String>, pub env_type: Option<String>,
#[specta(type = Option<std::string::String>)]
pub start_page: Option<String>, pub start_page: Option<String>,
#[specta(type = Option<std::string::String>)]
pub startup_script: Option<String>, pub startup_script: Option<String>,
pub traffic_graph: Option<bool>, pub traffic_graph: Option<bool>,
@@ -45,18 +52,23 @@ pub struct IVerge {
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
#[specta(type = Option<std::string::String>)]
pub tray_icon: Option<String>, pub tray_icon: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
#[specta(type = Option<std::string::String>)]
pub menu_icon: Option<String>, pub menu_icon: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
#[specta(type = Option<Vec<std::string::String>>)]
pub menu_order: Option<Vec<String>>, pub menu_order: Option<Vec<String>>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
#[specta(type = Option<std::string::String>)]
pub proxy_group_tools_position: Option<String>, pub proxy_group_tools_position: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
#[specta(type = Option<std::string::String>)]
pub notice_position: Option<String>, pub notice_position: Option<String>,
pub collapse_navbar: Option<bool>, pub collapse_navbar: Option<bool>,
@@ -81,25 +93,32 @@ pub struct IVerge {
pub enable_dns_settings: Option<bool>, pub enable_dns_settings: Option<bool>,
#[serde(default, skip_serializing_if = "std::collections::BTreeMap::is_empty")] #[serde(default, skip_serializing_if = "std::collections::BTreeMap::is_empty")]
#[specta(type = std::collections::BTreeMap<std::string::String, super::dns::ProfileDnsSettings>)]
pub profile_dns_settings: std::collections::BTreeMap<String, super::dns::ProfileDnsSettings>, pub profile_dns_settings: std::collections::BTreeMap<String, super::dns::ProfileDnsSettings>,
pub use_default_bypass: Option<bool>, pub use_default_bypass: Option<bool>,
#[specta(type = Option<std::string::String>)]
pub system_proxy_bypass: Option<String>, pub system_proxy_bypass: Option<String>,
pub proxy_guard_duration: Option<u64>, pub proxy_guard_duration: Option<u64>,
pub proxy_auto_config: Option<bool>, pub proxy_auto_config: Option<bool>,
#[specta(type = Option<std::string::String>)]
pub pac_file_content: Option<String>, pub pac_file_content: Option<String>,
#[specta(type = Option<std::string::String>)]
pub proxy_host: Option<String>, pub proxy_host: Option<String>,
pub theme_setting: Option<IVergeTheme>, pub theme_setting: Option<IVergeTheme>,
#[specta(type = Option<Vec<std::string::String>>)]
pub web_ui_list: Option<Vec<String>>, pub web_ui_list: Option<Vec<String>>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
#[specta(type = Option<std::string::String>)]
pub clash_core: Option<String>, pub clash_core: Option<String>,
/// format: {func},{key} /// format: {func},{key}
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
#[specta(type = Option<Vec<std::string::String>>)]
pub hotkeys: Option<Vec<String>>, pub hotkeys: Option<Vec<String>>,
pub enable_global_hotkey: Option<bool>, pub enable_global_hotkey: Option<bool>,
@@ -109,9 +128,8 @@ pub struct IVerge {
pub auto_close_connection: Option<bool>, pub auto_close_connection: Option<bool>,
pub auto_switch_selector_group: Option<bool>,
pub auto_check_update: Option<bool>, pub auto_check_update: Option<bool>,
#[specta(type = Option<std::string::String>)]
pub default_latency_test: Option<String>, pub default_latency_test: Option<String>,
pub default_latency_timeout: Option<i16>, pub default_latency_timeout: Option<i16>,
@@ -191,6 +209,7 @@ pub struct IVerge {
pub enable_tray_speed: Option<bool>, pub enable_tray_speed: Option<bool>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
#[specta(type = Option<std::string::String>)]
pub tray_proxy_groups_display_mode: Option<String>, pub tray_proxy_groups_display_mode: Option<String>,
pub tray_inline_outbound_modes: Option<bool>, pub tray_inline_outbound_modes: Option<bool>,
@@ -210,24 +229,38 @@ pub struct IVerge {
#[derive(Default, Debug, Clone, Deserialize, Serialize, specta::Type)] #[derive(Default, Debug, Clone, Deserialize, Serialize, specta::Type)]
#[serde(default)] #[serde(default)]
pub struct IVergeTestItem { pub struct IVergeTestItem {
#[specta(type = Option<std::string::String>)]
pub uid: Option<String>, pub uid: Option<String>,
#[specta(type = Option<std::string::String>)]
pub name: Option<String>, pub name: Option<String>,
#[specta(type = Option<std::string::String>)]
pub icon: Option<String>, pub icon: Option<String>,
#[specta(type = Option<std::string::String>)]
pub url: Option<String>, pub url: Option<String>,
} }
#[derive(Default, Debug, Clone, Deserialize, Serialize, specta::Type)] #[derive(Default, Debug, Clone, Deserialize, Serialize, specta::Type)]
#[serde(default)] #[serde(default)]
pub struct IVergeTheme { pub struct IVergeTheme {
#[specta(type = Option<std::string::String>)]
pub primary_color: Option<String>, pub primary_color: Option<String>,
#[specta(type = Option<std::string::String>)]
pub secondary_color: Option<String>, pub secondary_color: Option<String>,
#[specta(type = Option<std::string::String>)]
pub primary_text: Option<String>, pub primary_text: Option<String>,
#[specta(type = Option<std::string::String>)]
pub secondary_text: Option<String>, pub secondary_text: Option<String>,
#[specta(type = Option<std::string::String>)]
pub info_color: Option<String>, pub info_color: Option<String>,
#[specta(type = Option<std::string::String>)]
pub error_color: Option<String>, pub error_color: Option<String>,
#[specta(type = Option<std::string::String>)]
pub warning_color: Option<String>, pub warning_color: Option<String>,
#[specta(type = Option<std::string::String>)]
pub success_color: Option<String>, pub success_color: Option<String>,
#[specta(type = Option<std::string::String>)]
pub font_family: Option<String>, pub font_family: Option<String>,
#[specta(type = Option<std::string::String>)]
pub css_injection: Option<String>, pub css_injection: Option<String>,
} }
@@ -370,7 +403,6 @@ impl IVerge {
use_default_bypass: Some(true), use_default_bypass: Some(true),
proxy_guard_duration: Some(30), proxy_guard_duration: Some(30),
auto_close_connection: Some(true), auto_close_connection: Some(true),
auto_switch_selector_group: Some(true),
auto_check_update: Some(true), auto_check_update: Some(true),
enable_builtin_enhanced: Some(true), enable_builtin_enhanced: Some(true),
auto_log_clean: Some(2), // 1: 1天, 2: 7天, 3: 30天, 4: 90天 auto_log_clean: Some(2), // 1: 1天, 2: 7天, 3: 30天, 4: 90天
@@ -459,7 +491,6 @@ impl IVerge {
patch_opt_field!(self, patch, enable_global_hotkey); patch_opt_field!(self, patch, enable_global_hotkey);
patch_opt_field!(self, patch, auto_close_connection); patch_opt_field!(self, patch, auto_close_connection);
patch_opt_field!(self, patch, auto_switch_selector_group);
patch_opt_field!(self, patch, auto_check_update); patch_opt_field!(self, patch, auto_check_update);
patch_opt_field!(self, patch, default_latency_test); patch_opt_field!(self, patch, default_latency_test);
patch_opt_field!(self, patch, default_latency_timeout); patch_opt_field!(self, patch, default_latency_timeout);
-2
View File
@@ -70,8 +70,6 @@ pub mod files {
pub mod tun { pub mod tun {
pub const DEFAULT_STACK: &str = "mips"; pub const DEFAULT_STACK: &str = "mips";
pub const DEFAULT_MTU: u16 = 1500;
pub const DNS_HIJACK: &[&str] = &["any:53"]; pub const DNS_HIJACK: &[&str] = &["any:53"];
/// Saved dialog fields; `enable` belongs to the verge switch. /// Saved dialog fields; `enable` belongs to the verge switch.
+2 -1
View File
@@ -279,7 +279,8 @@ async fn cleanup_auto_backups() -> Result<()> {
.and_then(|meta| meta.modified()) .and_then(|meta| meta.modified())
.ok() .ok()
.and_then(|time| time.duration_since(UNIX_EPOCH).ok()) .and_then(|time| time.duration_since(UNIX_EPOCH).ok())
.map_or(0, |dur| dur.as_secs()); .map(|dur| dur.as_secs())
.unwrap_or(0);
files.push((path, modified)); files.push((path, modified));
} }
+1 -1
View File
@@ -5,6 +5,7 @@ use arc_swap::{ArcSwap, ArcSwapOption};
use backon::{ConstantBuilder, Retryable as _}; use backon::{ConstantBuilder, Retryable as _};
use clash_verge_logging::{Type, logging}; use clash_verge_logging::{Type, logging};
use reqwest_dav::list_cmd::{ListEntity, ListFile, ListMultiStatus}; use reqwest_dav::list_cmd::{ListEntity, ListFile, ListMultiStatus};
use smartstring::alias::String;
use std::{ use std::{
collections::HashMap, collections::HashMap,
env::{consts::OS, temp_dir}, env::{consts::OS, temp_dir},
@@ -14,7 +15,6 @@ use std::{
time::Duration, time::Duration,
}; };
use tokio::{fs, time::timeout}; use tokio::{fs, time::timeout};
use tristr::alias::String;
use zip::write::SimpleFileOptions; use zip::write::SimpleFileOptions;
const APP_VERSION: &str = env!("CARGO_PKG_VERSION"); const APP_VERSION: &str = env!("CARGO_PKG_VERSION");
+1 -1
View File
@@ -7,6 +7,7 @@ use crate::{config::Config, core::handle, core::lightweight::entry_lightweight_m
use anyhow::{Result, bail}; use anyhow::{Result, bail};
use arc_swap::ArcSwap; use arc_swap::ArcSwap;
use clash_verge_logging::{Type, logging}; use clash_verge_logging::{Type, logging};
use smartstring::alias::String;
use std::{ use std::{
collections::HashMap, collections::HashMap,
fmt, fmt,
@@ -17,7 +18,6 @@ use std::{
}, },
}; };
use tauri_plugin_global_shortcut::{Code, GlobalShortcutExt as _, ShortcutState}; use tauri_plugin_global_shortcut::{Code, GlobalShortcutExt as _, ShortcutState};
use tristr::alias::String;
/// Enum representing all available hotkey functions /// Enum representing all available hotkey functions
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+6 -4
View File
@@ -539,16 +539,18 @@ fn bind_socket(claim: &BindClaim) -> io::Result<Socket> {
} }
fn is_bind_conflict(error: &io::Error) -> bool { fn is_bind_conflict(error: &io::Error) -> bool {
if error.kind() == io::ErrorKind::AddrInUse {
return true;
}
#[cfg(windows)] #[cfg(windows)]
{ {
use windows_sys::Win32::Networking::WinSock::WSAEACCES; use windows_sys::Win32::Networking::WinSock::WSAEACCES;
error.kind() == io::ErrorKind::AddrInUse || error.raw_os_error() == Some(WSAEACCES) error.raw_os_error() == Some(WSAEACCES)
} }
#[cfg(not(windows))] #[cfg(not(windows))]
{ false
error.kind() == io::ErrorKind::AddrInUse
}
} }
#[cfg(windows)] #[cfg(windows)]
+6 -6
View File
@@ -14,15 +14,15 @@ use anyhow::{Result, anyhow};
use clash_verge_draft::DraftTransaction; use clash_verge_draft::DraftTransaction;
use clash_verge_logging::{Type, logging}; use clash_verge_logging::{Type, logging};
use clash_verge_service_ipc::StageRuntimeOutcome; use clash_verge_service_ipc::StageRuntimeOutcome;
use scopeguard::defer;
use smartstring::alias::String;
use std::{ use std::{
collections::HashSet, collections::HashSet,
mem::DropGuard,
path::PathBuf, path::PathBuf,
sync::Arc, sync::Arc,
time::{Duration, Instant}, time::{Duration, Instant},
}; };
use tauri_plugin_mihomo::Error as MihomoError; use tauri_plugin_mihomo::Error as MihomoError;
use tristr::alias::String;
/// A staging result separated from the policy that acts on it. /// A staging result separated from the policy that acts on it.
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
@@ -191,9 +191,9 @@ impl CoreManager {
logging!(debug, Type::Core, "Configuration update is already running"); logging!(debug, Type::Core, "Configuration update is already running");
return Ok(ValidationOutcome::Busy); return Ok(ValidationOutcome::Busy);
} }
let _config_update = DropGuard::new((), |()| { defer! {
self.finish_config_update(); self.finish_config_update();
}); }
if !force && !self.should_update_config() { if !force && !self.should_update_config() {
logging!(debug, Type::Core, "Skipping config update due to debounce"); logging!(debug, Type::Core, "Skipping config update due to debounce");
@@ -314,9 +314,9 @@ impl CoreManager {
logging!(debug, Type::Core, "Configuration update is already running"); logging!(debug, Type::Core, "Configuration update is already running");
return Ok(ValidationOutcome::Busy); return Ok(ValidationOutcome::Busy);
} }
let _config_update = DropGuard::new((), |()| { defer! {
self.finish_config_update(); self.finish_config_update();
}); }
let runtime = Config::runtime().await; let runtime = Config::runtime().await;
let transaction = DraftTransaction::begin(vec![&runtime])?; let transaction = DraftTransaction::begin(vec![&runtime])?;
+13 -12
View File
@@ -6,10 +6,11 @@ use crate::core::proxy_control::{self, SysproxyFailure};
use crate::core::service::{SERVICE_MANAGER, ServiceStatus}; use crate::core::service::{SERVICE_MANAGER, ServiceStatus};
use anyhow::Result; use anyhow::Result;
use clash_verge_logging::{Type, logging}; use clash_verge_logging::{Type, logging};
use std::{mem::DropGuard, path::Path}; use scopeguard::defer;
use smartstring::alias::String;
use std::path::Path;
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
use tauri_plugin_clash_verge_sysinfo::is_current_app_handle_admin; use tauri_plugin_clash_verge_sysinfo::is_current_app_handle_admin;
use tristr::alias::String;
#[cfg(any(target_os = "windows", test))] #[cfg(any(target_os = "windows", test))]
const fn should_wait_for_service(tun_enabled: bool, service_ready: bool, is_admin: bool) -> bool { const fn should_wait_for_service(tun_enabled: bool, service_ready: bool, is_admin: bool) -> bool {
@@ -355,9 +356,9 @@ impl CoreManager {
if !self.try_start_config_update() { if !self.try_start_config_update() {
anyhow::bail!("configuration update is already running"); anyhow::bail!("configuration update is already running");
} }
let _config_update = DropGuard::new((), |()| { defer! {
self.finish_config_update(); self.finish_config_update();
}); }
self.start_core_during_config_update().await self.start_core_during_config_update().await
} }
@@ -382,9 +383,9 @@ impl CoreManager {
service_rejection, service_rejection,
)); ));
} }
let _config_update = DropGuard::new((), |()| { defer! {
self.finish_config_update(); self.finish_config_update();
}); }
// Lock order is config then lifecycle. disable_tun_and_persist commits the shared Verge // Lock order is config then lifecycle. disable_tun_and_persist commits the shared Verge
// draft without claiming it, so without this it can commit another transaction's staged patch. // draft without claiming it, so without this it can commit another transaction's staged patch.
let config_write = Config::lock_config_write().await; let config_write = Config::lock_config_write().await;
@@ -462,9 +463,9 @@ impl CoreManager {
if !self.try_start_config_update() { if !self.try_start_config_update() {
anyhow::bail!("configuration update is already running"); anyhow::bail!("configuration update is already running");
} }
let _config_update = DropGuard::new((), |()| { defer! {
self.finish_config_update(); self.finish_config_update();
}); }
// Lock order is config then lifecycle, for the unclaimed draft write below. // Lock order is config then lifecycle, for the unclaimed draft write below.
let _config_write = Config::lock_config_write().await; let _config_write = Config::lock_config_write().await;
let _life = self.lifecycle_lock.lock().await; let _life = self.lifecycle_lock.lock().await;
@@ -794,9 +795,9 @@ impl CoreManager {
if !self.try_start_config_update() { if !self.try_start_config_update() {
anyhow::bail!("configuration update is already running"); anyhow::bail!("configuration update is already running");
} }
let _config_update = DropGuard::new((), |()| { defer! {
self.finish_config_update(); self.finish_config_update();
}); }
self.restart_core_during_config_update().await self.restart_core_during_config_update().await
} }
@@ -965,9 +966,9 @@ impl CoreManager {
if !self.try_start_config_update() { if !self.try_start_config_update() {
return HandoffOutcome::NotReady; return HandoffOutcome::NotReady;
} }
let _config_update = DropGuard::new((), |()| { defer! {
self.finish_config_update(); self.finish_config_update();
}); }
// Lock order is config then lifecycle. // Lock order is config then lifecycle.
let _life = self.lifecycle_lock.lock().await; let _life = self.lifecycle_lock.lock().await;
+3 -6
View File
@@ -42,12 +42,9 @@ pub async fn notify_event<'a>(event: NotificationEvent<'a>) {
} }
NotificationEvent::ClashModeChanged { mode } => { NotificationEvent::ClashModeChanged { mode } => {
let title = clash_verge_i18n::t!("notifications.clashModeChanged.title"); let title = clash_verge_i18n::t!("notifications.clashModeChanged.title");
let body = clash_verge_i18n::t!("notifications.clashModeChanged.body"); let body = clash_verge_i18n::t!("notifications.clashModeChanged.body")
let body = if body.contains("{mode}") { .replace("{mode}", mode)
body.replace("{mode}", mode).into() .into();
} else {
body
};
notify(title, body); notify(title, body);
} }
NotificationEvent::SystemProxyToggled(enabled) => { NotificationEvent::SystemProxyToggled(enabled) => {
+5 -6
View File
@@ -1,13 +1,12 @@
use super::NoticeStatus; use super::NoticeStatus;
use crate::{APP_HANDLE, singleton}; use crate::{APP_HANDLE, singleton};
use smartstring::alias::String;
use std::sync::{ use std::sync::{
Arc, Arc,
atomic::{AtomicBool, Ordering}, atomic::{AtomicBool, Ordering},
}; };
use tauri::AppHandle; use tauri::AppHandle;
use tauri_plugin_mihomo::{Mihomo, MihomoExt as _}; use tauri_plugin_mihomo::{Mihomo, MihomoExt as _};
#[cfg(target_os = "macos")]
use tristr::alias::String;
use super::notification::{FrontendEvent, NotificationSystem}; use super::notification::{FrontendEvent, NotificationSystem};
@@ -56,21 +55,21 @@ impl Handle {
Self::send_event(FrontendEvent::RunStateChanged { state: state.clone() }); Self::send_event(FrontendEvent::RunStateChanged { state: state.clone() });
} }
pub fn notify_profile_changed(profile_id: &str) { pub fn notify_profile_changed(profile_id: &String) {
Self::send_event(FrontendEvent::ProfileChanged { Self::send_event(FrontendEvent::ProfileChanged {
current_profile_id: profile_id, current_profile_id: profile_id,
}); });
} }
pub fn notify_timer_updated(profile_index: &str) { pub fn notify_timer_updated(profile_index: &String) {
Self::send_event(FrontendEvent::TimerUpdated { profile_index }); Self::send_event(FrontendEvent::TimerUpdated { profile_index });
} }
pub fn notify_profile_update_started(uid: &str) { pub fn notify_profile_update_started(uid: &String) {
Self::send_event(FrontendEvent::ProfileUpdateStarted { uid }); Self::send_event(FrontendEvent::ProfileUpdateStarted { uid });
} }
pub fn notify_profile_update_completed(uid: &str) { pub fn notify_profile_update_completed(uid: &String) {
Self::send_event(FrontendEvent::ProfileUpdateCompleted { uid }); Self::send_event(FrontendEvent::ProfileUpdateCompleted { uid });
} }
+9 -6
View File
@@ -3,11 +3,11 @@ use clash_verge_logging::{Type, logging};
use parking_lot::Mutex; use parking_lot::Mutex;
#[cfg(test)] #[cfg(test)]
use serde_json::json; use serde_json::json;
use smartstring::alias::String;
use std::sync::Arc; use std::sync::Arc;
use std::sync::LazyLock; use std::sync::LazyLock;
use std::{collections::HashMap, future::Future}; use std::{collections::HashMap, future::Future};
use tauri::{AppHandle, Emitter as _, Manager as _, WebviewWindow}; use tauri::{AppHandle, Emitter as _, Manager as _, WebviewWindow};
use tristr::alias::String;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub enum FrontendEvent<'a> { pub enum FrontendEvent<'a> {
@@ -20,16 +20,16 @@ pub enum FrontendEvent<'a> {
message: Arc<str>, message: Arc<str>,
}, },
ProfileChanged { ProfileChanged {
current_profile_id: &'a str, current_profile_id: &'a String,
}, },
TimerUpdated { TimerUpdated {
profile_index: &'a str, profile_index: &'a String,
}, },
ProfileUpdateStarted { ProfileUpdateStarted {
uid: &'a str, uid: &'a String,
}, },
ProfileUpdateCompleted { ProfileUpdateCompleted {
uid: &'a str, uid: &'a String,
}, },
RunStateChanged { RunStateChanged {
state: crate::core::runstate::RunStateView, state: crate::core::runstate::RunStateView,
@@ -77,8 +77,10 @@ impl FailedOperation {
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct PendingFailure { pub struct PendingFailure {
/// Stable code used as the table key. /// Stable code used as the table key.
#[specta(type = std::string::String)]
pub code: String, pub code: String,
/// Full diagnostic context chain. /// Full diagnostic context chain.
#[specta(type = std::string::String)]
pub detail: String, pub detail: String,
pub operation: FailedOperation, pub operation: FailedOperation,
/// Monotonic identity for repeated failures under the same code. /// Monotonic identity for repeated failures under the same code.
@@ -245,6 +247,7 @@ static PENDING_FAILURES: LazyLock<FailureTable> = LazyLock::new(FailureTable::de
#[derive(Debug, Default, Clone, serde::Serialize, specta::Type)] #[derive(Debug, Default, Clone, serde::Serialize, specta::Type)]
pub struct SidecarFailureSnapshot { pub struct SidecarFailureSnapshot {
pub revision: u64, pub revision: u64,
#[specta(type = Option<std::string::String>)]
pub detail: Option<String>, pub detail: Option<String>,
} }
@@ -366,7 +369,7 @@ mod wire_tests {
/// One sample per `FrontendEvent` variant, paired with its wire name and payload. /// One sample per `FrontendEvent` variant, paired with its wire name and payload.
#[cfg(test)] #[cfg(test)]
fn sample_frontend_events(uid: &str) -> Vec<(FrontendEvent<'_>, &'static str, serde_json::Value)> { fn sample_frontend_events(uid: &String) -> Vec<(FrontendEvent<'_>, &'static str, serde_json::Value)> {
let state = crate::core::runstate::RunState { let state = crate::core::runstate::RunState {
health: Default::default(), health: Default::default(),
pending: None, pending: None,
+3 -1
View File
@@ -331,7 +331,9 @@ fn build_provider_records(
providers: Option<ProxyProviders>, providers: Option<ProxyProviders>,
records: &mut BTreeMap<String, ProxyNodeView>, records: &mut BTreeMap<String, ProxyNodeView>,
) -> (Vec<ProxyProviderView>, ProviderCandidates) { ) -> (Vec<ProxyProviderView>, ProviderCandidates) {
let providers = providers.map_or_default(|providers| providers.providers.into_iter().collect::<BTreeMap<_, _>>()); let providers = providers
.map(|providers| providers.providers.into_iter().collect::<BTreeMap<_, _>>())
.unwrap_or_default();
let mut views = Vec::new(); let mut views = Vec::new();
let mut candidates = BTreeMap::new(); let mut candidates = BTreeMap::new();
+3 -2
View File
@@ -122,11 +122,12 @@ fn allocate_provider_destination(destination: &str, url: &str, reserved: &mut Ha
digest.update(destination.as_bytes()); digest.update(destination.as_bytes());
digest.update([0]); digest.update([0]);
digest.update(url.as_bytes()); digest.update(url.as_bytes());
let digest: String = crate::utils::help::hex_encode(&digest.finalize()); let digest: String = digest.finalize().iter().map(|byte| format!("{byte:02x}")).collect();
let path = Path::new(destination); let path = Path::new(destination);
let extension = path let extension = path
.extension() .extension()
.map_or_default(|ext| format!(".{}", ext.to_string_lossy())); .map(|ext| format!(".{}", ext.to_string_lossy()))
.unwrap_or_default();
let mut suffix = String::new(); let mut suffix = String::new();
let mut sequence = 0; let mut sequence = 0;
loop { loop {

Some files were not shown because too many files have changed in this diff Show More