mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-10-26 05:42:07 +08:00
Compare commits
32
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
10ca0a5d0c | ||
|
|
324c8c9016 | ||
|
|
02520d7392 | ||
|
|
5b8edbaead | ||
|
|
1ed8050947 | ||
|
|
3d9a79a3fb | ||
|
|
8b88ddb7f2 | ||
|
|
02bd739ab6 | ||
|
|
b6c7af82a7 | ||
|
|
5e6a696087 | ||
|
|
27d8a71d41 | ||
|
|
9dd5aa676b | ||
|
|
4e5ac8683b | ||
|
|
7965711945 | ||
|
|
396d343a3a | ||
|
|
b729e59650 | ||
|
|
a3cc58013b | ||
|
|
cef66cd745 | ||
|
|
3b7bfa10fd | ||
|
|
b238175f18 | ||
|
|
8f00096a9f | ||
|
|
9f498a85d0 | ||
|
|
e014b913d2 | ||
|
|
f38ceae3fb | ||
|
|
089635c8bf | ||
|
|
dc5a8a5ff4 | ||
|
|
476ddb63c3 | ||
|
|
c6b51171a1 | ||
|
|
d4287970bc | ||
|
|
b20fdc9b96 | ||
|
|
5b10331022 | ||
|
|
3ec858eb9f |
@@ -4,11 +4,11 @@
|
|||||||
|
|
||||||
"features": {
|
"features": {
|
||||||
"ghcr.io/devcontainers/features/node:2": {
|
"ghcr.io/devcontainers/features/node:2": {
|
||||||
"version": "24.21.0",
|
"version": "24.22.1",
|
||||||
"pnpmVersion": "12.11.2"
|
"pnpmVersion": "12.15.0"
|
||||||
},
|
},
|
||||||
"ghcr.io/devcontainers/features/rust:1": {
|
"ghcr.io/devcontainers/features/rust:1": {
|
||||||
"version": "1.99.0",
|
"version": "1.99.1",
|
||||||
"profile": "default"
|
"profile": "default"
|
||||||
},
|
},
|
||||||
"ghcr.io/devcontainers/features/git:1": {},
|
"ghcr.io/devcontainers/features/git:1": {},
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
# Issue Guidelines / Issue 提交指引
|
||||||
|
|
||||||
|
Use these suggestions to make reports easier to assess. State what you observed
|
||||||
|
and what you could not verify; unknown details are fine.
|
||||||
|
|
||||||
|
以下建议有助于维护者评估问题。请说明实际观察到的现象和无法确认的部分;未知信息可以留空。
|
||||||
|
|
||||||
|
- Search existing issues by symptom, conditions, and outcome. Add new evidence
|
||||||
|
to an existing report when it describes the same problem.
|
||||||
|
按现象、条件和结果搜索已有 Issue。若描述的是同一问题,请在原 Issue 中补充新证据。
|
||||||
|
- Keep each issue to one distinct user problem or requested outcome. Split
|
||||||
|
unrelated findings instead of bundling an audit or checklist.
|
||||||
|
每个 Issue 聚焦一个独立的问题或需求结果;无关发现请拆开,不要把审计清单打包成一个 Issue。
|
||||||
|
- For bugs, include the version, operating system, steps, and actual versus
|
||||||
|
expected behavior when known. A root-cause diagnosis is not required. Share
|
||||||
|
only relevant logs and redact tokens or personal information.
|
||||||
|
反馈 Bug 时,尽可能提供版本、操作系统、复现步骤及实际与预期行为。无需先判断根因;只提供相关日志,并遮盖令牌和个人信息。
|
||||||
|
- For feature requests, describe the user task, current limitation, desired
|
||||||
|
outcome, and affected platforms. An implementation proposal is optional.
|
||||||
|
提交功能请求时,请描述用户要完成的任务、当前限制、期望结果和适用平台;实现方案不是必填项。
|
||||||
|
- Separate observations from guesses. An AI or scanner finding is a hypothesis
|
||||||
|
until its affected configuration, concrete impact, and supporting evidence
|
||||||
|
are stated; do not present a list of theoretical risks as confirmed bugs.
|
||||||
|
区分观察结果和推测。AI 或扫描器的发现应先视为假设;请说明受影响的配置、具体影响和支持证据,不要把理论风险清单写成已确认的 Bug。
|
||||||
|
- Do not post secrets, personal data, or sensitive exploit details in a public
|
||||||
|
issue. Ask maintainers how to share sensitive security information safely.
|
||||||
|
请勿在公开 Issue 中发布密钥、个人信息或敏感利用细节;如涉及安全敏感信息,请先询问维护者如何安全提供。
|
||||||
|
- AI assistance is welcome; human contributors do not need to disclose it. If
|
||||||
|
an AI agent or automation creates or co-authors an issue, add a final body line
|
||||||
|
such as `Assisted by: GPT-5.6 High`. Omit effort when the runtime does not
|
||||||
|
report it. Disclosure is transparency only, not evidence for or against issue
|
||||||
|
quality.
|
||||||
|
欢迎使用 AI 辅助,人工提交者无需披露。如果 Issue 由 AI Agent 或自动化创建或共同撰写,请在正文末尾添加披露行,例如 `Assisted by: GPT-5.6 High`。运行环境未提供 effort 时可省略。披露仅用于提高透明度,不作为 Issue 质量的正面或负面证据。
|
||||||
@@ -10,6 +10,8 @@ body:
|
|||||||
value: |
|
value: |
|
||||||
## 在提交问题之前,请确认以下事项:
|
## 在提交问题之前,请确认以下事项:
|
||||||
|
|
||||||
|
提交前可参考 [Issue 提交指引](https://github.com/clash-verge-rev/clash-verge-rev/blob/dev/.github/ISSUE_GUIDELINES.md),说明可观察到的问题和证据;不确定的原因请标为猜测。
|
||||||
|
|
||||||
1. 请 **确保** 您已经查阅了 [Clash Verge Rev 官方文档](https://clash-verge-rev.github.io/guide/term.html) 以及 [常见问题](https://clash-verge-rev.github.io/faq/windows.html)
|
1. 请 **确保** 您已经查阅了 [Clash Verge Rev 官方文档](https://clash-verge-rev.github.io/guide/term.html) 以及 [常见问题](https://clash-verge-rev.github.io/faq/windows.html)
|
||||||
2. 请 **确保** [已有的问题](https://github.com/clash-verge-rev/clash-verge-rev/issues?q=is%3Aissue) 中没有人提交过相似 issue,否则请在已有的 issue 下进行讨论
|
2. 请 **确保** [已有的问题](https://github.com/clash-verge-rev/clash-verge-rev/issues?q=is%3Aissue) 中没有人提交过相似 issue,否则请在已有的 issue 下进行讨论
|
||||||
3. 请 **务必** 给 issue 填写一个简洁明了的标题,以便他人快速检索
|
3. 请 **务必** 给 issue 填写一个简洁明了的标题,以便他人快速检索
|
||||||
@@ -19,6 +21,8 @@ body:
|
|||||||
|
|
||||||
## Before submitting the issue, please make sure of the following checklist:
|
## Before submitting the issue, please make sure of the following checklist:
|
||||||
|
|
||||||
|
See the [Issue guidelines](https://github.com/clash-verge-rev/clash-verge-rev/blob/dev/.github/ISSUE_GUIDELINES.md) for how to describe observed behavior and evidence; mark uncertain causes as hypotheses.
|
||||||
|
|
||||||
1. Please make sure you have read the [Clash Verge Rev official documentation](https://clash-verge-rev.github.io/guide/term.html) and [FAQ](https://clash-verge-rev.github.io/faq/windows.html)
|
1. Please make sure you have read the [Clash Verge Rev official documentation](https://clash-verge-rev.github.io/guide/term.html) and [FAQ](https://clash-verge-rev.github.io/faq/windows.html)
|
||||||
2. Please make sure there is no similar issue in the [existing issues](https://github.com/clash-verge-rev/clash-verge-rev/issues?q=is%3Aissue), otherwise please discuss under the existing issue
|
2. Please make sure there is no similar issue in the [existing issues](https://github.com/clash-verge-rev/clash-verge-rev/issues?q=is%3Aissue), otherwise please discuss under the existing issue
|
||||||
3. Please be sure to fill in a concise and clear title for the issue so that others can quickly search
|
3. Please be sure to fill in a concise and clear title for the issue so that others can quickly search
|
||||||
|
|||||||
@@ -9,12 +9,16 @@ body:
|
|||||||
attributes:
|
attributes:
|
||||||
value: |
|
value: |
|
||||||
## 在提交问题之前,请确认以下事项:
|
## 在提交问题之前,请确认以下事项:
|
||||||
|
可参考 [Issue 提交指引](https://github.com/clash-verge-rev/clash-verge-rev/blob/dev/.github/ISSUE_GUIDELINES.md),描述用户任务、当前限制和期望结果。
|
||||||
|
|
||||||
1. 请 **确保** 您已经查阅了 [Clash Verge Rev 官方文档](https://clash-verge-rev.github.io/guide/term.html) 确认软件不存在类似的功能
|
1. 请 **确保** 您已经查阅了 [Clash Verge Rev 官方文档](https://clash-verge-rev.github.io/guide/term.html) 确认软件不存在类似的功能
|
||||||
2. 请 **确保** [已有的问题](https://github.com/clash-verge-rev/clash-verge-rev/issues?q=is%3Aissue) 中没有人提交过相似 issue,否则请在已有的 issue 下进行讨论
|
2. 请 **确保** [已有的问题](https://github.com/clash-verge-rev/clash-verge-rev/issues?q=is%3Aissue) 中没有人提交过相似 issue,否则请在已有的 issue 下进行讨论
|
||||||
3. 请 **务必** 给issue填写一个简洁明了的标题,以便他人快速检索
|
3. 请 **务必** 给issue填写一个简洁明了的标题,以便他人快速检索
|
||||||
4. 请 **务必** 先下载 [AutoBuild](https://github.com/clash-verge-rev/clash-verge-rev/releases/tag/autobuild) 版本测试,确保该功能还未实现
|
4. 请 **务必** 先下载 [AutoBuild](https://github.com/clash-verge-rev/clash-verge-rev/releases/tag/autobuild) 版本测试,确保该功能还未实现
|
||||||
5. 请 **务必** 按照模板规范详细描述问题,否则 issue 将会被关闭
|
5. 请 **务必** 按照模板规范详细描述问题,否则 issue 将会被关闭
|
||||||
## Before submitting the issue, please make sure of the following checklist:
|
## Before submitting the issue, please make sure of the following checklist:
|
||||||
|
See the [Issue guidelines](https://github.com/clash-verge-rev/clash-verge-rev/blob/dev/.github/ISSUE_GUIDELINES.md) for describing the user task, current limitation, and desired outcome.
|
||||||
|
|
||||||
1. Please make sure you have read the [Clash Verge Rev official documentation](https://clash-verge-rev.github.io/guide/term.html) to confirm that the software does not have similar functions
|
1. Please make sure you have read the [Clash Verge Rev official documentation](https://clash-verge-rev.github.io/guide/term.html) to confirm that the software does not have similar functions
|
||||||
2. Please make sure there is no similar issue in the [existing issues](https://github.com/clash-verge-rev/clash-verge-rev/issues?q=is%3Aissue), otherwise please discuss under the existing issue
|
2. Please make sure there is no similar issue in the [existing issues](https://github.com/clash-verge-rev/clash-verge-rev/issues?q=is%3Aissue), otherwise please discuss under the existing issue
|
||||||
3. Please be sure to fill in a concise and clear title for the issue so that others can quickly search
|
3. Please be sure to fill in a concise and clear title for the issue so that others can quickly search
|
||||||
|
|||||||
@@ -1,6 +1,12 @@
|
|||||||
## Problem
|
## Problem
|
||||||
|
|
||||||
What breaks or what is missing. Link the issue if one exists (`Fixes #123`).
|
What breaks or what is missing. Product bug fixes and features require a
|
||||||
|
pre-existing issue; link it here (`Fixes #123` only when this PR fully resolves
|
||||||
|
it). Maintenance work (such as chore, perf, docs, refactor, test, CI/build,
|
||||||
|
dependency, style, routine localization, or release changes) does not require
|
||||||
|
an issue link; link one when it defines the scope. For reverts, link the PR or
|
||||||
|
commit being reverted. For security-sensitive fixes that cannot be tracked
|
||||||
|
publicly, follow maintainer-approved private tracking.
|
||||||
|
|
||||||
## Approach
|
## Approach
|
||||||
|
|
||||||
|
|||||||
@@ -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: '24.21.0'
|
node-version: '24.22.1'
|
||||||
|
|
||||||
- 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.99.0'
|
toolchain: '1.99.1'
|
||||||
targets: ${{ matrix.target }}
|
targets: ${{ matrix.target }}
|
||||||
|
|
||||||
- name: Add Rust Target
|
- name: Add Rust Target
|
||||||
@@ -185,7 +185,7 @@ jobs:
|
|||||||
- name: Install Node
|
- name: Install Node
|
||||||
uses: actions/setup-node@v7
|
uses: actions/setup-node@v7
|
||||||
with:
|
with:
|
||||||
node-version: '24.21.0'
|
node-version: '24.22.1'
|
||||||
cache: 'pnpm'
|
cache: 'pnpm'
|
||||||
|
|
||||||
- name: Pnpm Cache
|
- name: Pnpm Cache
|
||||||
@@ -206,7 +206,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Add Rust Target
|
- name: Add Rust Target
|
||||||
run: |
|
run: |
|
||||||
rustup target add ${{ matrix.target }} --toolchain 1.99.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."
|
||||||
|
|
||||||
@@ -257,7 +257,7 @@ jobs:
|
|||||||
- name: Install Rust Stable
|
- name: Install Rust Stable
|
||||||
uses: dtolnay/rust-toolchain@master
|
uses: dtolnay/rust-toolchain@master
|
||||||
with:
|
with:
|
||||||
toolchain: '1.99.0'
|
toolchain: '1.99.1'
|
||||||
targets: ${{ matrix.target }}
|
targets: ${{ matrix.target }}
|
||||||
|
|
||||||
- name: Add Rust Target
|
- name: Add Rust Target
|
||||||
@@ -282,7 +282,7 @@ jobs:
|
|||||||
- name: Install Node
|
- name: Install Node
|
||||||
uses: actions/setup-node@v7
|
uses: actions/setup-node@v7
|
||||||
with:
|
with:
|
||||||
node-version: '24.21.0'
|
node-version: '24.22.1'
|
||||||
cache: 'pnpm'
|
cache: 'pnpm'
|
||||||
|
|
||||||
- name: Pnpm Cache
|
- name: Pnpm Cache
|
||||||
@@ -347,7 +347,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Add Rust Target
|
- name: Add Rust Target
|
||||||
run: |
|
run: |
|
||||||
rustup target add ${{ matrix.target }} --toolchain 1.99.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."
|
||||||
|
|
||||||
@@ -426,7 +426,7 @@ jobs:
|
|||||||
- name: Install Node
|
- name: Install Node
|
||||||
uses: actions/setup-node@v7
|
uses: actions/setup-node@v7
|
||||||
with:
|
with:
|
||||||
node-version: '24.21.0'
|
node-version: '24.22.1'
|
||||||
cache: 'pnpm'
|
cache: 'pnpm'
|
||||||
|
|
||||||
- name: Pnpm Cache
|
- name: Pnpm Cache
|
||||||
@@ -454,7 +454,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Add Rust Target
|
- name: Add Rust Target
|
||||||
run: |
|
run: |
|
||||||
rustup target add ${{ matrix.target }} --toolchain 1.99.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."
|
||||||
|
|
||||||
@@ -524,7 +524,7 @@ jobs:
|
|||||||
- name: Install Node
|
- name: Install Node
|
||||||
uses: actions/setup-node@v7
|
uses: actions/setup-node@v7
|
||||||
with:
|
with:
|
||||||
node-version: '24.21.0'
|
node-version: '24.22.1'
|
||||||
|
|
||||||
- uses: pnpm/action-setup@v6.1.0
|
- uses: pnpm/action-setup@v6.1.0
|
||||||
name: Install pnpm
|
name: Install pnpm
|
||||||
|
|||||||
@@ -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: '24.21.0'
|
node-version: '24.22.1'
|
||||||
|
|
||||||
- uses: pnpm/action-setup@v6
|
- uses: pnpm/action-setup@v6
|
||||||
name: Install pnpm
|
name: Install pnpm
|
||||||
|
|||||||
@@ -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.99.0
|
uses: dtolnay/rust-toolchain@1.99.1
|
||||||
|
|
||||||
- name: Rust Cache
|
- name: Rust Cache
|
||||||
uses: Swatinem/rust-cache@v2
|
uses: Swatinem/rust-cache@v2
|
||||||
@@ -103,7 +103,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: '24.21.0'
|
node-version: '24.22.1'
|
||||||
cache: 'pnpm'
|
cache: 'pnpm'
|
||||||
|
|
||||||
- name: Pnpm Cache
|
- name: Pnpm Cache
|
||||||
@@ -129,7 +129,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.99.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."
|
||||||
|
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ jobs:
|
|||||||
- uses: actions/setup-node@v7
|
- uses: actions/setup-node@v7
|
||||||
if: steps.check_frontend.outputs.frontend == 'true'
|
if: steps.check_frontend.outputs.frontend == 'true'
|
||||||
with:
|
with:
|
||||||
node-version: '24.21.0'
|
node-version: '24.22.1'
|
||||||
cache: 'pnpm'
|
cache: 'pnpm'
|
||||||
|
|
||||||
- name: Restore pnpm cache
|
- name: Restore pnpm cache
|
||||||
@@ -138,7 +138,7 @@ jobs:
|
|||||||
- uses: actions/setup-node@v7
|
- uses: actions/setup-node@v7
|
||||||
if: steps.check_inputs.outputs.contract == 'true'
|
if: steps.check_inputs.outputs.contract == 'true'
|
||||||
with:
|
with:
|
||||||
node-version: '24.21.0'
|
node-version: '24.22.1'
|
||||||
cache: 'pnpm'
|
cache: 'pnpm'
|
||||||
|
|
||||||
- run: pnpm install --frozen-lockfile
|
- run: pnpm install --frozen-lockfile
|
||||||
|
|||||||
@@ -204,7 +204,7 @@ jobs:
|
|||||||
- name: Install Rust Stable
|
- name: Install Rust Stable
|
||||||
uses: dtolnay/rust-toolchain@master
|
uses: dtolnay/rust-toolchain@master
|
||||||
with:
|
with:
|
||||||
toolchain: '1.99.0'
|
toolchain: '1.99.1'
|
||||||
targets: ${{ matrix.target }}
|
targets: ${{ matrix.target }}
|
||||||
|
|
||||||
- name: Add Rust Target
|
- name: Add Rust Target
|
||||||
@@ -230,7 +230,7 @@ jobs:
|
|||||||
- name: Install Node
|
- name: Install Node
|
||||||
uses: actions/setup-node@v7
|
uses: actions/setup-node@v7
|
||||||
with:
|
with:
|
||||||
node-version: '24.21.0'
|
node-version: '24.22.1'
|
||||||
|
|
||||||
- uses: pnpm/action-setup@v6
|
- uses: pnpm/action-setup@v6
|
||||||
name: Install pnpm
|
name: Install pnpm
|
||||||
@@ -244,7 +244,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Add Rust Target
|
- name: Add Rust Target
|
||||||
run: |
|
run: |
|
||||||
rustup target add ${{ matrix.target }} --toolchain 1.99.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."
|
||||||
|
|
||||||
@@ -311,7 +311,7 @@ jobs:
|
|||||||
- name: Install Rust Stable
|
- name: Install Rust Stable
|
||||||
uses: dtolnay/rust-toolchain@master
|
uses: dtolnay/rust-toolchain@master
|
||||||
with:
|
with:
|
||||||
toolchain: '1.99.0'
|
toolchain: '1.99.1'
|
||||||
targets: ${{ matrix.target }}
|
targets: ${{ matrix.target }}
|
||||||
|
|
||||||
- name: Add Rust Target
|
- name: Add Rust Target
|
||||||
@@ -331,7 +331,7 @@ jobs:
|
|||||||
- name: Install Node
|
- name: Install Node
|
||||||
uses: actions/setup-node@v7
|
uses: actions/setup-node@v7
|
||||||
with:
|
with:
|
||||||
node-version: '24.21.0'
|
node-version: '24.22.1'
|
||||||
|
|
||||||
- name: Install pnpm
|
- name: Install pnpm
|
||||||
uses: pnpm/action-setup@v6
|
uses: pnpm/action-setup@v6
|
||||||
@@ -389,7 +389,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Add Rust Target
|
- name: Add Rust Target
|
||||||
run: |
|
run: |
|
||||||
rustup target add ${{ matrix.target }} --toolchain 1.99.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."
|
||||||
|
|
||||||
@@ -446,7 +446,7 @@ jobs:
|
|||||||
- name: Install Rust Stable
|
- name: Install Rust Stable
|
||||||
uses: dtolnay/rust-toolchain@master
|
uses: dtolnay/rust-toolchain@master
|
||||||
with:
|
with:
|
||||||
toolchain: '1.99.0'
|
toolchain: '1.99.1'
|
||||||
targets: ${{ matrix.target }}
|
targets: ${{ matrix.target }}
|
||||||
|
|
||||||
- name: Add Rust Target
|
- name: Add Rust Target
|
||||||
@@ -466,7 +466,7 @@ jobs:
|
|||||||
- name: Install Node
|
- name: Install Node
|
||||||
uses: actions/setup-node@v7
|
uses: actions/setup-node@v7
|
||||||
with:
|
with:
|
||||||
node-version: '24.21.0'
|
node-version: '24.22.1'
|
||||||
|
|
||||||
- uses: pnpm/action-setup@v6
|
- uses: pnpm/action-setup@v6
|
||||||
name: Install pnpm
|
name: Install pnpm
|
||||||
@@ -487,7 +487,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Add Rust Target
|
- name: Add Rust Target
|
||||||
run: |
|
run: |
|
||||||
rustup target add ${{ matrix.target }} --toolchain 1.99.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."
|
||||||
|
|
||||||
@@ -547,7 +547,7 @@ jobs:
|
|||||||
- name: Install Node
|
- name: Install Node
|
||||||
uses: actions/setup-node@v7
|
uses: actions/setup-node@v7
|
||||||
with:
|
with:
|
||||||
node-version: '24.21.0'
|
node-version: '24.22.1'
|
||||||
|
|
||||||
- uses: pnpm/action-setup@v6
|
- uses: pnpm/action-setup@v6
|
||||||
name: Install pnpm
|
name: Install pnpm
|
||||||
@@ -573,7 +573,7 @@ jobs:
|
|||||||
- name: Install Node
|
- name: Install Node
|
||||||
uses: actions/setup-node@v7
|
uses: actions/setup-node@v7
|
||||||
with:
|
with:
|
||||||
node-version: '24.21.0'
|
node-version: '24.22.1'
|
||||||
|
|
||||||
- uses: pnpm/action-setup@v6
|
- uses: pnpm/action-setup@v6
|
||||||
name: Install pnpm
|
name: Install pnpm
|
||||||
@@ -638,7 +638,7 @@ jobs:
|
|||||||
- name: Install Node
|
- name: Install Node
|
||||||
uses: actions/setup-node@v7
|
uses: actions/setup-node@v7
|
||||||
with:
|
with:
|
||||||
node-version: '24.21.0'
|
node-version: '24.22.1'
|
||||||
|
|
||||||
- uses: pnpm/action-setup@v6
|
- uses: pnpm/action-setup@v6
|
||||||
name: Install pnpm
|
name: Install pnpm
|
||||||
|
|||||||
@@ -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.99.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: '24.21.0'
|
node-version: '24.22.1'
|
||||||
|
|
||||||
- name: Install pnpm
|
- name: Install pnpm
|
||||||
uses: pnpm/action-setup@v6
|
uses: pnpm/action-setup@v6
|
||||||
|
|||||||
@@ -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: '24.21.0'
|
node-version: '24.22.1'
|
||||||
|
|
||||||
- uses: pnpm/action-setup@v6
|
- uses: pnpm/action-setup@v6
|
||||||
name: Install pnpm
|
name: Install pnpm
|
||||||
|
|||||||
@@ -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: '24.21.0'
|
node-version: '24.22.1'
|
||||||
|
|
||||||
- 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: '24.21.0'
|
node-version: '24.22.1'
|
||||||
|
|
||||||
- uses: pnpm/action-setup@v6
|
- uses: pnpm/action-setup@v6
|
||||||
name: Install pnpm
|
name: Install pnpm
|
||||||
|
|||||||
+3
-3
@@ -1,3 +1,3 @@
|
|||||||
nodejs 24.21.0
|
nodejs 24.22.1
|
||||||
pnpm 12.11.2
|
pnpm 12.15.0
|
||||||
rust 1.99.0
|
rust 1.99.1
|
||||||
|
|||||||
@@ -18,22 +18,25 @@ These rules apply to every change, whether human- or agent-authored. They match
|
|||||||
the ownership evidence the AI-slop review evaluates (see
|
the ownership evidence the AI-slop review evaluates (see
|
||||||
[`pr-ai-slop-review.md`](.github/workflows/pr-ai-slop-review.md)).
|
[`pr-ai-slop-review.md`](.github/workflows/pr-ai-slop-review.md)).
|
||||||
|
|
||||||
1. **Issue first.** Non-trivial changes require a pre-existing issue describing
|
1. **Issue first.** Product bug fixes and features require a pre-existing issue;
|
||||||
the problem. If none exists, ask the maintainers to open or approve one
|
self-scoped maintenance work does not. Follow the PR template for linkage and
|
||||||
before implementing.
|
revert references. If a required issue is missing, ask maintainers to open or
|
||||||
|
approve one before implementing. For security-sensitive fixes that cannot be
|
||||||
|
tracked publicly, follow maintainer-approved private tracking.
|
||||||
2. **Scope discipline.** Every changed file must be justifiable from the linked
|
2. **Scope discipline.** Every changed file must be justifiable from the linked
|
||||||
issue. No drive-by refactors, renames, formatting churn, or dependency bumps
|
issue or the stated PR scope. No drive-by refactors, renames, formatting
|
||||||
unrelated to the problem being fixed.
|
churn, or dependency bumps unrelated to the work.
|
||||||
3. **Author accountability.** AI assistance is welcome, but the contributor owns
|
3. **Author accountability.** AI assistance is welcome, but the contributor owns
|
||||||
the result: understand the change, describe the problem and approach in your
|
the result: understand the change, describe the problem and approach in your
|
||||||
own words, and verify the change against the reported behavior before
|
own words, and verify the change against the reported behavior before
|
||||||
submitting.
|
submitting.
|
||||||
4. **Tests are justified, not default.** Do not add tests, test scaffolding, or
|
4. **Tests are justified, not default.** Do not add tests, test scaffolding, or
|
||||||
speculative defensive code unless the linked issue demands them. When a test
|
speculative defensive code unless the linked issue or stated task demands
|
||||||
is genuinely necessary — it reproduces the reported regression or guards
|
them. When a test is genuinely necessary — it reproduces the reported
|
||||||
behavior whose breakage would otherwise go unnoticed — keep it minimal and
|
regression or guards behavior whose breakage would otherwise go unnoticed —
|
||||||
state in the PR body why it is needed. Bulk test files and defensive
|
keep it minimal and state in the PR body why it is needed. Bulk test files
|
||||||
programming for hypothetical failure modes are PR bloat, not rigor.
|
and defensive programming for hypothetical failure modes are PR bloat, not
|
||||||
|
rigor.
|
||||||
5. **Comments state constraints, not narration.** Write a comment only for a
|
5. **Comments state constraints, not narration.** Write a comment only for a
|
||||||
non-obvious constraint the code cannot express; never restate what the code
|
non-obvious constraint the code cannot express; never restate what the code
|
||||||
does.
|
does.
|
||||||
@@ -44,13 +47,12 @@ the ownership evidence the AI-slop review evaluates (see
|
|||||||
real evidence instead: reproduction steps, failure output, targeted tests.
|
real evidence instead: reproduction steps, failure output, targeted tests.
|
||||||
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 issue demands it.
|
the linked issue or stated task demands it.
|
||||||
9. **Disclose AI automation.** When an agent produces or co-produces a change,
|
9. **Disclose AI automation.** When an agent creates or co-creates a PR or Issue,
|
||||||
append a footer line to the PR body with the model and effort used (e.g.
|
append a final body line with the model and effort used (e.g.
|
||||||
`Assisted by: GPT-5.6 High`). The PR template intentionally omits this line —
|
`Assisted by: GPT-5.6 High`). Effort may be omitted when the runtime does not
|
||||||
the agent adds it itself, humans are not asked to declare anything. Effort may
|
report it. Human contributors are not asked to disclose AI assistance.
|
||||||
be omitted when the runtime does not report it. Disclosure is transparency
|
Disclosure is transparency only and carries no positive or negative weight.
|
||||||
only; it does not substitute for any rule above.
|
|
||||||
10. **Compiled workflows.** The AI-slop review policy in
|
10. **Compiled workflows.** The AI-slop review policy in
|
||||||
[pr-ai-slop-review.md](.github/workflows/pr-ai-slop-review.md) is compiled:
|
[pr-ai-slop-review.md](.github/workflows/pr-ai-slop-review.md) is compiled:
|
||||||
after editing it, run `gh aw compile` and commit the regenerated
|
after editing it, run `gh aw compile` and commit the regenerated
|
||||||
@@ -59,8 +61,10 @@ the ownership evidence the AI-slop review evaluates (see
|
|||||||
[`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.
|
||||||
|
|
||||||
## Pull Request Shape
|
## Issue and PR Workflows
|
||||||
|
|
||||||
Describe three things, briefly: the problem (with issue link), why this approach
|
When drafting, triaging, splitting, or implementing from a community issue, use
|
||||||
solves it, and what changed. See
|
the conditional checklist in [`.github/ISSUE_GUIDELINES.md`](.github/ISSUE_GUIDELINES.md).
|
||||||
[`PULL_REQUEST_TEMPLATE.md`](.github/PULL_REQUEST_TEMPLATE.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.
|
||||||
|
|||||||
Generated
+107
-191
@@ -1119,7 +1119,7 @@ dependencies = [
|
|||||||
"getrandom 0.4.3",
|
"getrandom 0.4.3",
|
||||||
"libc",
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
"minisign-verify 0.3.0",
|
"minisign-verify",
|
||||||
"nanoid",
|
"nanoid",
|
||||||
"network-interface",
|
"network-interface",
|
||||||
"objc2",
|
"objc2",
|
||||||
@@ -1138,7 +1138,7 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"serde_yaml_ng",
|
"serde_yaml_ng",
|
||||||
"sha2 0.11.0",
|
"sha2 0.11.1",
|
||||||
"smartstring",
|
"smartstring",
|
||||||
"socket2",
|
"socket2",
|
||||||
"specta",
|
"specta",
|
||||||
@@ -1175,7 +1175,7 @@ dependencies = [
|
|||||||
"windows-service",
|
"windows-service",
|
||||||
"windows-sys 0.61.2",
|
"windows-sys 0.61.2",
|
||||||
"winreg 0.56.0",
|
"winreg 0.56.0",
|
||||||
"zip 9.0.1",
|
"zip 9.0.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1247,7 +1247,7 @@ dependencies = [
|
|||||||
"once_cell",
|
"once_cell",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"sha2 0.11.0",
|
"sha2 0.11.1",
|
||||||
"strum",
|
"strum",
|
||||||
"strum_macros",
|
"strum_macros",
|
||||||
"sysproxy",
|
"sysproxy",
|
||||||
@@ -1462,9 +1462,12 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "constant_time_eq"
|
name = "constant_time_eq"
|
||||||
version = "0.4.2"
|
version = "0.6.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b"
|
checksum = "9eb6feb175df65d0a3ccd3e73484e940d0ac664e8034f0519fd49a93db3071d9"
|
||||||
|
dependencies = [
|
||||||
|
"rustversion",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cookie"
|
name = "cookie"
|
||||||
@@ -3951,9 +3954,9 @@ checksum = "34b357333733e8260735ba5894eb928c02ecc69c78715f01a8019e7fa7f2db4c"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
version = "0.2.190"
|
version = "0.2.191"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ce5d3ddc6d3fa000eb1536d85e147bfe31aacaba692ed6a876f95cb7c855be78"
|
checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libdbus-sys"
|
name = "libdbus-sys"
|
||||||
@@ -4048,11 +4051,11 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lzma-rust2"
|
name = "lzma-rust2"
|
||||||
version = "0.21.0"
|
version = "0.22.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "fde178a3caf126c440fa15628147772d8ee590a39477d711353fbe2e58a73a5b"
|
checksum = "7277c9742229dc25243236d578b6471a798c554512c6f6a04365ec2e87c2a3bb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"sha2 0.11.0",
|
"sha2 0.11.1",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -4167,12 +4170,6 @@ dependencies = [
|
|||||||
"unicase",
|
"unicase",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "minisign-verify"
|
|
||||||
version = "0.2.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "22f9645cb765ea72b8111f36c522475d2daa0d22c957a9826437e97534bc4e9e"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "minisign-verify"
|
name = "minisign-verify"
|
||||||
version = "0.3.0"
|
version = "0.3.0"
|
||||||
@@ -5343,9 +5340,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ppmd-rust"
|
name = "ppmd-rust"
|
||||||
version = "1.4.0"
|
version = "1.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "efca4c95a19a79d1c98f791f10aebd5c1363b473244630bb7dbde1dc98455a24"
|
checksum = "196a7c80b9a7652aba7cc070827516c2abe4ccdf53d128e1944003cf5726cff1"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ppv-lite86"
|
name = "ppv-lite86"
|
||||||
@@ -5996,12 +5993,13 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rust-ini"
|
name = "rust-ini"
|
||||||
version = "0.21.3"
|
version = "0.21.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "796e8d2b6696392a43bea58116b667fb4c29727dc5abd27d6acf338bb4f688c7"
|
checksum = "4e310ef0e1b6eeb79169a1171daf9abcb87a2e17c03bee2c4bb100b55c75409f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"ordered-multimap",
|
"ordered-multimap",
|
||||||
|
"trim-in-place",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -6067,9 +6065,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rustls"
|
name = "rustls"
|
||||||
version = "0.23.45"
|
version = "0.23.46"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634"
|
checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aws-lc-rs",
|
"aws-lc-rs",
|
||||||
"log",
|
"log",
|
||||||
@@ -6410,9 +6408,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_json"
|
name = "serde_json"
|
||||||
version = "1.0.151"
|
version = "1.0.154"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
|
checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"itoa",
|
"itoa",
|
||||||
"memchr",
|
"memchr",
|
||||||
@@ -6597,9 +6595,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sha2"
|
name = "sha2"
|
||||||
version = "0.11.0"
|
version = "0.11.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
|
checksum = "47d7069beb7d6ac7b9acd1039986e73443f24234f41074da099d6f994ac9ad19"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"cpufeatures 0.3.0",
|
"cpufeatures 0.3.0",
|
||||||
@@ -6622,7 +6620,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "1e362d9935bc50f019969e2f9ecd66786612daae13e8f277be7bfb66e8bed3f7"
|
checksum = "1e362d9935bc50f019969e2f9ecd66786612daae13e8f277be7bfb66e8bed3f7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"sigchld",
|
|
||||||
"windows-sys 0.60.2",
|
"windows-sys 0.60.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -6642,17 +6639,6 @@ version = "2.0.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
|
checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "sigchld"
|
|
||||||
version = "0.2.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "47106eded3c154e70176fc83df9737335c94ce22f821c32d17ed1db1f83badb1"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
"os_pipe",
|
|
||||||
"signal-hook 0.3.18",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "signal-hook"
|
name = "signal-hook"
|
||||||
version = "0.1.17"
|
version = "0.1.17"
|
||||||
@@ -6663,16 +6649,6 @@ dependencies = [
|
|||||||
"signal-hook-registry",
|
"signal-hook-registry",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "signal-hook"
|
|
||||||
version = "0.3.18"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
"signal-hook-registry",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "signal-hook-registry"
|
name = "signal-hook-registry"
|
||||||
version = "1.4.8"
|
version = "1.4.8"
|
||||||
@@ -6878,6 +6854,12 @@ version = "1.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "static_vcruntime"
|
||||||
|
version = "3.0.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ff7589a1859b09232522bb9edf076ca7fcf14ded96685d3fa629db73023ffbb7"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "string_cache"
|
name = "string_cache"
|
||||||
version = "0.9.0"
|
version = "0.9.0"
|
||||||
@@ -6937,9 +6919,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "swift-rs"
|
name = "swift-rs"
|
||||||
version = "1.0.8"
|
version = "1.0.9"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e45c444e496845d3f2a351146bff59aae4975b2280238df1dfaa0c7d1846f38e"
|
checksum = "cefd87076fd385308ee4aff597256c902f1fbb4d031de1558efc12f8ffefadd9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.21.7",
|
"base64 0.21.7",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -7186,9 +7168,9 @@ checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri"
|
name = "tauri"
|
||||||
version = "2.12.1"
|
version = "2.12.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ed99ee9694a2deb776d91cae48ac7411ddfc89ecae2f9b5041111d8c88f2ace9"
|
checksum = "f316751027fc2644221d1a448564d519efb07067fda584879d9cda966391d212"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bytes",
|
"bytes",
|
||||||
@@ -7234,16 +7216,16 @@ dependencies = [
|
|||||||
"tray-icon",
|
"tray-icon",
|
||||||
"url",
|
"url",
|
||||||
"webkit2gtk",
|
"webkit2gtk",
|
||||||
"webview2-com 0.39.1",
|
"webview2-com",
|
||||||
"window-vibrancy",
|
"window-vibrancy",
|
||||||
"windows 0.62.2",
|
"windows 0.62.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-build"
|
name = "tauri-build"
|
||||||
version = "2.7.1"
|
version = "2.7.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "59563ca5b331fd97f27ee9672ec8d36d33bb3c9e2c9f6710a1a5687256052e45"
|
checksum = "641dd5fd297c99ab92717b0428cca5b9c6f960b2ac96ca131b3eebc9d70b8ddc"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"cargo_toml",
|
"cargo_toml",
|
||||||
@@ -7255,6 +7237,8 @@ dependencies = [
|
|||||||
"semver 1.0.28",
|
"semver 1.0.28",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
|
"static_vcruntime",
|
||||||
|
"strsim",
|
||||||
"tauri-utils",
|
"tauri-utils",
|
||||||
"tauri-winres",
|
"tauri-winres",
|
||||||
"walkdir",
|
"walkdir",
|
||||||
@@ -7262,11 +7246,11 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-codegen"
|
name = "tauri-codegen"
|
||||||
version = "2.7.1"
|
version = "2.7.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e50213e463086ecc283d7e9f51c30cc0fd304ad457425158018be26dbf0d0a80"
|
checksum = "a6585c5b536c00f039d12ce70a9755172d5423bbcfd3969863baa70314c3e02f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.22.1",
|
"base64 0.23.1",
|
||||||
"brotli",
|
"brotli",
|
||||||
"ico",
|
"ico",
|
||||||
"json-patch",
|
"json-patch",
|
||||||
@@ -7289,9 +7273,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-macros"
|
name = "tauri-macros"
|
||||||
version = "2.7.1"
|
version = "2.7.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8129fb43bb6e0d6b73ad3315cd172beaab17cd28899c594b1b32c80edbbfd99c"
|
checksum = "e2e83a0cfa1bae376e8fbbdc0b1692707aed50cd6072ce85cae4789af5d6c19f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"heck 0.5.0",
|
"heck 0.5.0",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
@@ -7347,9 +7331,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-clipboard-manager"
|
name = "tauri-plugin-clipboard-manager"
|
||||||
version = "2.4.1"
|
version = "2.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "333d3b6beeb1c2c7fc040233d4ea7b6c03a9f8f039592b7400833c43fb5b568a"
|
checksum = "9be5ed8d94c33afe8377e885119069f6508780659271d0a25cfc54d441f2bc81"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arboard",
|
"arboard",
|
||||||
"log",
|
"log",
|
||||||
@@ -7362,9 +7346,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-deep-link"
|
name = "tauri-plugin-deep-link"
|
||||||
version = "2.6.1"
|
version = "2.6.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4ac7a92a46ab5c88f44532ca50906d6e448a948d4ddf8c5376ab125e3260f736"
|
checksum = "1b3c64e24ebcbc63aaa2d88a9c51e2507084b46620baf39ecb0baa0738a08bb4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dunce",
|
"dunce",
|
||||||
"plist",
|
"plist",
|
||||||
@@ -7410,9 +7394,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-dialog"
|
name = "tauri-plugin-dialog"
|
||||||
version = "2.8.1"
|
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 = "daf9a5c92e39bdd84f22f6be9230e39d0c4e140345f71ffe6058dca4f71127cf"
|
checksum = "b7461aaacf1901915ea7b9f5cd74f8224a351ed96af0a62c07fce934003cb34b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
@@ -7428,9 +7412,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-fs"
|
name = "tauri-plugin-fs"
|
||||||
version = "2.6.0"
|
version = "2.7.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "466eb32466fe5021b6728b06862f9ff14a9f7e1af890047654e03a96d7c0e1bb"
|
checksum = "5d58eb1d4984e535f47a642ffec09a2da6f5c18a12b5902d12126cb7626d628b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"dunce",
|
"dunce",
|
||||||
@@ -7452,9 +7436,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-global-shortcut"
|
name = "tauri-plugin-global-shortcut"
|
||||||
version = "2.4.0"
|
version = "2.4.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0bd2e1f725891a1613af8f25bf918ba3357654b0fd3f2d794c0ce76cbdd92ed2"
|
checksum = "93ff17919fe09852d269bd37b1d3d2e993b9dbb514afe7acbf3346c1d3627e2d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"global-hotkey",
|
"global-hotkey",
|
||||||
"log",
|
"log",
|
||||||
@@ -7467,9 +7451,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-http"
|
name = "tauri-plugin-http"
|
||||||
version = "2.8.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 = "93e9d6b3319e101bc1be27cfa0fb4054d7784a12509c67ead0033b82180e5ed1"
|
checksum = "2c57e3451553f95a1db3bfed6a358a77ce5080b6399a242c6eadac113f97abd2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"cookie_store",
|
"cookie_store",
|
||||||
@@ -7486,13 +7470,13 @@ dependencies = [
|
|||||||
"thiserror 2.0.20",
|
"thiserror 2.0.20",
|
||||||
"tokio",
|
"tokio",
|
||||||
"url",
|
"url",
|
||||||
"urlpattern 0.3.0",
|
"urlpattern",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-mihomo"
|
name = "tauri-plugin-mihomo"
|
||||||
version = "0.6.0"
|
version = "0.6.0"
|
||||||
source = "git+https://github.com/clash-verge-rev/tauri-plugin-mihomo?branch=main#7a03d16f4d39b1bb885b7babe66b9e153e34b615"
|
source = "git+https://github.com/clash-verge-rev/tauri-plugin-mihomo?rev=7a03d16f4d39b1bb885b7babe66b9e153e34b615#7a03d16f4d39b1bb885b7babe66b9e153e34b615"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
"clashmap",
|
"clashmap",
|
||||||
@@ -7516,9 +7500,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-notification"
|
name = "tauri-plugin-notification"
|
||||||
version = "2.5.1"
|
version = "2.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "533770889abb60a0407d5a32096182f0e6463f5a3dfaa675be94580aa14070e1"
|
checksum = "b939d7b19c8af1381a72ef8474b3aba2b56c1ddac2c23f0c8e96abbcf86b198b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"notify-rust",
|
"notify-rust",
|
||||||
@@ -7531,13 +7515,14 @@ dependencies = [
|
|||||||
"thiserror 2.0.20",
|
"thiserror 2.0.20",
|
||||||
"time",
|
"time",
|
||||||
"url",
|
"url",
|
||||||
|
"zbus",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-opener"
|
name = "tauri-plugin-opener"
|
||||||
version = "2.7.0"
|
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 = "d39404b2572927e0d3ed30a7ca226037f7508d22e79c96ee6ef0d42b6a4b3345"
|
checksum = "53810be1b4fed22bb6ac3f4cab5a2b80d9391d1af436bda145607532bc0bb219"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dunce",
|
"dunce",
|
||||||
"glob",
|
"glob",
|
||||||
@@ -7567,11 +7552,12 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-shell"
|
name = "tauri-plugin-shell"
|
||||||
version = "2.4.0"
|
version = "2.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "094bdbc47e5efe36544ba21b3a53ab5c724150236cf55e6c9be46191deb6eab6"
|
checksum = "8567d42b2c7264355daa1df415ec77f52aa42e885924c86a969be2e920e05521"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"encoding_rs",
|
"encoding_rs",
|
||||||
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
"open",
|
"open",
|
||||||
"os_pipe",
|
"os_pipe",
|
||||||
@@ -7584,13 +7570,14 @@ dependencies = [
|
|||||||
"tauri-plugin",
|
"tauri-plugin",
|
||||||
"thiserror 2.0.20",
|
"thiserror 2.0.20",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
"windows-sys 0.60.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-updater"
|
name = "tauri-plugin-updater"
|
||||||
version = "2.13.1"
|
version = "2.14.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3cb0b2ea3e85ca287990d3859a29cc5cb18024240fd78f62e027fb7963670f18"
|
checksum = "7259989d4fe11b2bf51f7d671642249b1837c4ae2da1430dc713ae38f98ceeec"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"dirs 7.0.0",
|
"dirs 7.0.0",
|
||||||
@@ -7598,8 +7585,9 @@ dependencies = [
|
|||||||
"futures-util",
|
"futures-util",
|
||||||
"http",
|
"http",
|
||||||
"infer",
|
"infer",
|
||||||
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
"minisign-verify 0.2.5",
|
"minisign-verify",
|
||||||
"osakit",
|
"osakit",
|
||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
"reqwest 0.13.5",
|
"reqwest 0.13.5",
|
||||||
@@ -7621,9 +7609,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-wdio-webdriver"
|
name = "tauri-plugin-wdio-webdriver"
|
||||||
version = "1.4.0"
|
version = "1.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "52c5e97428174a52b7f4357bbc4535fcce52c6a06c8ee7a379502f7cda1b6045"
|
checksum = "4f76676d510d271d80abcf8b0552987b5b4f0eae5e3f906e9b5660d43c97c62e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"axum",
|
"axum",
|
||||||
@@ -7647,9 +7635,9 @@ dependencies = [
|
|||||||
"tracing",
|
"tracing",
|
||||||
"uuid",
|
"uuid",
|
||||||
"webkit2gtk",
|
"webkit2gtk",
|
||||||
"webview2-com 0.38.2",
|
"webview2-com",
|
||||||
"windows 0.61.3",
|
"windows 0.62.2",
|
||||||
"windows-core 0.61.2",
|
"windows-core 0.62.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -7669,9 +7657,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-runtime"
|
name = "tauri-runtime"
|
||||||
version = "2.12.1"
|
version = "2.12.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c2a57a2a9b8c8b7fc00d35b510fe808ded7f9f1b44fc1cdda6aee38632ea5413"
|
checksum = "7c55766d99cea69055904d1735b93c2049302b2e09effd462120deb5581d78e9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cookie",
|
"cookie",
|
||||||
"dpi",
|
"dpi",
|
||||||
@@ -7688,15 +7676,15 @@ dependencies = [
|
|||||||
"thiserror 2.0.20",
|
"thiserror 2.0.20",
|
||||||
"url",
|
"url",
|
||||||
"webkit2gtk",
|
"webkit2gtk",
|
||||||
"webview2-com 0.39.1",
|
"webview2-com",
|
||||||
"windows 0.62.2",
|
"windows 0.62.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-runtime-wry"
|
name = "tauri-runtime-wry"
|
||||||
version = "2.12.1"
|
version = "2.12.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7f9e7e0c9f80a5130773cfabb6df4dc924518fb1b2c923726966804634b57d22"
|
checksum = "8d61892587aea2a85245bcaec98c6fe46268874c0a0deae5535fb71ca7b93eae"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"gtk",
|
"gtk",
|
||||||
"http",
|
"http",
|
||||||
@@ -7714,7 +7702,7 @@ dependencies = [
|
|||||||
"tracing",
|
"tracing",
|
||||||
"url",
|
"url",
|
||||||
"webkit2gtk",
|
"webkit2gtk",
|
||||||
"webview2-com 0.39.1",
|
"webview2-com",
|
||||||
"windows 0.62.2",
|
"windows 0.62.2",
|
||||||
"wry",
|
"wry",
|
||||||
]
|
]
|
||||||
@@ -7752,9 +7740,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-utils"
|
name = "tauri-utils"
|
||||||
version = "2.10.1"
|
version = "2.10.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2ff55a614843b9a3f010f211df637c94df2607175b8d0f6e0f4a7c19e18621ee"
|
checksum = "362ab21cd4cc713f2a02b1a9b5688198b1541cfb6907c4281e9190e0f0ef4aa3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"brotli",
|
"brotli",
|
||||||
@@ -7783,7 +7771,7 @@ dependencies = [
|
|||||||
"thiserror 2.0.20",
|
"thiserror 2.0.20",
|
||||||
"toml 1.1.6+spec-1.1.0",
|
"toml 1.1.6+spec-1.1.0",
|
||||||
"url",
|
"url",
|
||||||
"urlpattern 0.6.0",
|
"urlpattern",
|
||||||
"uuid",
|
"uuid",
|
||||||
"walkdir",
|
"walkdir",
|
||||||
]
|
]
|
||||||
@@ -7902,7 +7890,7 @@ dependencies = [
|
|||||||
"regex",
|
"regex",
|
||||||
"semver 0.11.0",
|
"semver 0.11.0",
|
||||||
"sha2 0.9.9",
|
"sha2 0.9.9",
|
||||||
"signal-hook 0.1.17",
|
"signal-hook",
|
||||||
"terminfo",
|
"terminfo",
|
||||||
"termios",
|
"termios",
|
||||||
"thiserror 1.0.69",
|
"thiserror 1.0.69",
|
||||||
@@ -8073,9 +8061,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio"
|
name = "tokio"
|
||||||
version = "1.53.2"
|
version = "1.53.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e95f91fcc7a621e8b030f6aa23c71fe9838ae2fb4d8118b75602a328f5144044"
|
checksum = "ce3335fa71841cda333a58d7615b03901380ecf09d59b3296d21f8bbac0dde4e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"libc",
|
"libc",
|
||||||
@@ -8135,9 +8123,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio-util"
|
name = "tokio-util"
|
||||||
version = "0.7.19"
|
version = "0.7.20"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "494815d09bf52b5548659851081238f0ca39ff638363907596da739561c62c52"
|
checksum = "e464cf451ba96ebfc6f9b6542f17ee8b8956e33f1e40d9690624e59d7a7f8a4b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"futures-core",
|
"futures-core",
|
||||||
@@ -8500,6 +8488,12 @@ dependencies = [
|
|||||||
"petgraph",
|
"petgraph",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "trim-in-place"
|
||||||
|
version = "0.1.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "daa60874b45b168f67f3f9ba1ee821ad77144d6fa19cef1cd1874a7450a948da"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "triomphe"
|
name = "triomphe"
|
||||||
version = "0.1.16"
|
version = "0.1.16"
|
||||||
@@ -8592,47 +8586,6 @@ dependencies = [
|
|||||||
"windows-sys 0.61.2",
|
"windows-sys 0.61.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "unic-char-property"
|
|
||||||
version = "0.9.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221"
|
|
||||||
dependencies = [
|
|
||||||
"unic-char-range",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "unic-char-range"
|
|
||||||
version = "0.9.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "unic-common"
|
|
||||||
version = "0.9.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "unic-ucd-ident"
|
|
||||||
version = "0.9.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987"
|
|
||||||
dependencies = [
|
|
||||||
"unic-char-property",
|
|
||||||
"unic-char-range",
|
|
||||||
"unic-ucd-version",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "unic-ucd-version"
|
|
||||||
version = "0.9.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4"
|
|
||||||
dependencies = [
|
|
||||||
"unic-common",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicase"
|
name = "unicase"
|
||||||
version = "2.9.0"
|
version = "2.9.0"
|
||||||
@@ -8692,18 +8645,6 @@ dependencies = [
|
|||||||
"serde_derive",
|
"serde_derive",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "urlpattern"
|
|
||||||
version = "0.3.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d"
|
|
||||||
dependencies = [
|
|
||||||
"regex",
|
|
||||||
"serde",
|
|
||||||
"unic-ucd-ident",
|
|
||||||
"url",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "urlpattern"
|
name = "urlpattern"
|
||||||
version = "0.6.0"
|
version = "0.6.0"
|
||||||
@@ -9095,20 +9036,6 @@ dependencies = [
|
|||||||
"rustls-pki-types",
|
"rustls-pki-types",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "webview2-com"
|
|
||||||
version = "0.38.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "7130243a7a5b33c54a444e54842e6a9e133de08b5ad7b5861cd8ed9a6a5bc96a"
|
|
||||||
dependencies = [
|
|
||||||
"webview2-com-macros",
|
|
||||||
"webview2-com-sys 0.38.2",
|
|
||||||
"windows 0.61.3",
|
|
||||||
"windows-core 0.61.2",
|
|
||||||
"windows-implement",
|
|
||||||
"windows-interface",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "webview2-com"
|
name = "webview2-com"
|
||||||
version = "0.39.1"
|
version = "0.39.1"
|
||||||
@@ -9116,7 +9043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "3f89fca7a704cee10dcb3654c1dbb8941d1783132f1917358af75bec37a7d7e6"
|
checksum = "3f89fca7a704cee10dcb3654c1dbb8941d1783132f1917358af75bec37a7d7e6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"webview2-com-macros",
|
"webview2-com-macros",
|
||||||
"webview2-com-sys 0.39.1",
|
"webview2-com-sys",
|
||||||
"windows 0.62.2",
|
"windows 0.62.2",
|
||||||
"windows-core 0.62.2",
|
"windows-core 0.62.2",
|
||||||
]
|
]
|
||||||
@@ -9132,17 +9059,6 @@ dependencies = [
|
|||||||
"syn 2.0.119",
|
"syn 2.0.119",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "webview2-com-sys"
|
|
||||||
version = "0.38.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c"
|
|
||||||
dependencies = [
|
|
||||||
"thiserror 2.0.20",
|
|
||||||
"windows 0.61.3",
|
|
||||||
"windows-core 0.61.2",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "webview2-com-sys"
|
name = "webview2-com-sys"
|
||||||
version = "0.39.1"
|
version = "0.39.1"
|
||||||
@@ -9882,7 +9798,7 @@ dependencies = [
|
|||||||
"url",
|
"url",
|
||||||
"webkit2gtk",
|
"webkit2gtk",
|
||||||
"webkit2gtk-sys",
|
"webkit2gtk-sys",
|
||||||
"webview2-com 0.39.1",
|
"webview2-com",
|
||||||
"windows 0.62.2",
|
"windows 0.62.2",
|
||||||
"windows-core 0.62.2",
|
"windows-core 0.62.2",
|
||||||
"windows-version",
|
"windows-version",
|
||||||
@@ -10150,9 +10066,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zip"
|
name = "zip"
|
||||||
version = "9.0.1"
|
version = "9.0.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e49ade69c4434c55dd651d36fe05f38e0578db948b773cbc01c48c4b5e560692"
|
checksum = "a954114b47a54df49f83d2722814e86b23d4bb1b54a1b90fb7d92b41619ddc22"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aes",
|
"aes",
|
||||||
"bzip2",
|
"bzip2",
|
||||||
@@ -10202,27 +10118,27 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zstd"
|
name = "zstd"
|
||||||
version = "0.13.3"
|
version = "0.14.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
|
checksum = "db3ae9bf90af6e40197bef767eeefc46ad6397420fe873830bd85e5fbbfb3c70"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"zstd-safe",
|
"zstd-safe",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zstd-safe"
|
name = "zstd-safe"
|
||||||
version = "7.2.4"
|
version = "8.2.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
|
checksum = "ded520f16b29e1a9b771c722221b2b0a0398c2316d9bb3c42b458a5414d7434b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"zstd-sys",
|
"zstd-sys",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zstd-sys"
|
name = "zstd-sys"
|
||||||
version = "2.0.16+zstd.1.5.7"
|
version = "2.1.2+zstd.1.5.7"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
|
checksum = "481ada9c543b2323cbb7bbdbb5249177fbf0188ed959ed2c15e4b22421c84ed3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc",
|
"cc",
|
||||||
"pkg-config",
|
"pkg-config",
|
||||||
|
|||||||
+4
-4
@@ -61,13 +61,13 @@ tracing-estuary = { git = "https://github.com/Tunglies/tracing-estuary.git", bra
|
|||||||
tauri-plugin-clash-verge-sysinfo = { path = "crates/tauri-plugin-clash-verge-sysinfo" }
|
tauri-plugin-clash-verge-sysinfo = { path = "crates/tauri-plugin-clash-verge-sysinfo" }
|
||||||
tracing = "0.1.44"
|
tracing = "0.1.44"
|
||||||
|
|
||||||
tauri = { version = "2.12.1" }
|
tauri = { version = "2.12.4" }
|
||||||
tauri-plugin-clipboard-manager = "2.4.1"
|
tauri-plugin-clipboard-manager = "2.5.0"
|
||||||
parking_lot = { version = "0.12.5", features = ["hardware-lock-elision"] }
|
parking_lot = { version = "0.12.5", features = ["hardware-lock-elision"] }
|
||||||
anyhow = "1.0.104"
|
anyhow = "1.0.104"
|
||||||
chrono = "0.4.45"
|
chrono = "0.4.45"
|
||||||
criterion = { version = "0.8.2", features = ["async_tokio"] }
|
criterion = { version = "0.8.2", features = ["async_tokio"] }
|
||||||
tokio = { version = "1.53.2", features = [
|
tokio = { version = "1.53.3", features = [
|
||||||
"rt-multi-thread",
|
"rt-multi-thread",
|
||||||
"macros",
|
"macros",
|
||||||
"time",
|
"time",
|
||||||
@@ -88,7 +88,7 @@ rust_iso3166 = "0.2.0"
|
|||||||
smartstring = { version = "1.0.1" }
|
smartstring = { version = "1.0.1" }
|
||||||
|
|
||||||
serde = { version = "1.0.229" }
|
serde = { version = "1.0.229" }
|
||||||
serde_json = { version = "1.0.151" }
|
serde_json = { version = "1.0.154" }
|
||||||
serde_yaml_ng = { version = "0.10.0" }
|
serde_yaml_ng = { version = "0.10.0" }
|
||||||
bitflags = { version = "2.13.2" }
|
bitflags = { version = "2.13.2" }
|
||||||
socket2 = "0.6.5"
|
socket2 = "0.6.5"
|
||||||
|
|||||||
+10
-2
@@ -3,20 +3,28 @@
|
|||||||
<details>
|
<details>
|
||||||
<summary><strong> 🐞 修复问题 </strong></summary>
|
<summary><strong> 🐞 修复问题 </strong></summary>
|
||||||
|
|
||||||
- 修复通过 URL 导入订阅时,即使导入的订阅并非当前使用的订阅,也会重新加载当前配置的问题
|
- 修复托盘测速与代理页行为不一致的问题,移除托盘「测试延迟」入口
|
||||||
- 修复「首页」网站测速失败后卡片一直显示测试中的问题
|
- 修复通过 URL 导入订阅时,即使导入的订阅并非当前使用的订阅,也会重新加载当前配置
|
||||||
|
- 修复 首页 网站测速失败后卡片一直显示测试中
|
||||||
|
- 修复 代理 页展开分组后不显示最新测速结果,需切换节点才刷新
|
||||||
|
|
||||||
|
**🐧 Linux**
|
||||||
|
|
||||||
|
- Linux:修复 deb/rpm 安装包错误包含多余的 `frontend-contract` 可执行文件,导致下游重新打包失败的问题
|
||||||
|
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
<details>
|
<details>
|
||||||
<summary><strong> ✨ 新增功能 </strong></summary>
|
<summary><strong> ✨ 新增功能 </strong></summary>
|
||||||
|
|
||||||
|
- 新增虚拟网卡设置的「DNS 模式」选项,支持配置 mihomo 系统 DNS 行为
|
||||||
|
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
<details>
|
<details>
|
||||||
<summary><strong> 🚀 优化改进 </strong></summary>
|
<summary><strong> 🚀 优化改进 </strong></summary>
|
||||||
|
|
||||||
|
- 优化「链式代理」:开启前需确认网速影响提示,空面板新增「关闭」按钮
|
||||||
|
|
||||||
**🖥️ Windows**
|
**🖥️ Windows**
|
||||||
|
|
||||||
|
|||||||
@@ -70,8 +70,6 @@ tray:
|
|||||||
global: عام
|
global: عام
|
||||||
profiles: الملفات التعريفية
|
profiles: الملفات التعريفية
|
||||||
proxies: وكلاء
|
proxies: وكلاء
|
||||||
testLatency: اختبار التأخير
|
|
||||||
testingLatency: جارٍ اختبار التأخير…
|
|
||||||
systemProxy: وكيل النظام
|
systemProxy: وكيل النظام
|
||||||
tunMode: وضع TUN
|
tunMode: وضع TUN
|
||||||
closeAllConnections: إغلاق كل الاتصالات
|
closeAllConnections: إغلاق كل الاتصالات
|
||||||
|
|||||||
@@ -70,8 +70,6 @@ tray:
|
|||||||
global: Global
|
global: Global
|
||||||
profiles: Profile
|
profiles: Profile
|
||||||
proxies: Proxy
|
proxies: Proxy
|
||||||
testLatency: Latenz testen
|
|
||||||
testingLatency: Latenz wird getestet…
|
|
||||||
systemProxy: Systemproxy
|
systemProxy: Systemproxy
|
||||||
tunMode: TUN-Modus
|
tunMode: TUN-Modus
|
||||||
closeAllConnections: Alle Verbindungen schließen
|
closeAllConnections: Alle Verbindungen schließen
|
||||||
|
|||||||
@@ -70,8 +70,6 @@ tray:
|
|||||||
global: Global
|
global: Global
|
||||||
profiles: Profiles
|
profiles: Profiles
|
||||||
proxies: Proxies
|
proxies: Proxies
|
||||||
testLatency: Test Latency
|
|
||||||
testingLatency: Testing latency…
|
|
||||||
systemProxy: System Proxy
|
systemProxy: System Proxy
|
||||||
tunMode: TUN Mode
|
tunMode: TUN Mode
|
||||||
closeAllConnections: Close All Connections
|
closeAllConnections: Close All Connections
|
||||||
|
|||||||
@@ -70,8 +70,6 @@ tray:
|
|||||||
global: Global
|
global: Global
|
||||||
profiles: Perfiles
|
profiles: Perfiles
|
||||||
proxies: Proxies
|
proxies: Proxies
|
||||||
testLatency: Probar latencia
|
|
||||||
testingLatency: Probando latencia…
|
|
||||||
systemProxy: Proxy del sistema
|
systemProxy: Proxy del sistema
|
||||||
tunMode: Modo TUN
|
tunMode: Modo TUN
|
||||||
closeAllConnections: Cerrar todas las conexiones
|
closeAllConnections: Cerrar todas las conexiones
|
||||||
|
|||||||
@@ -70,8 +70,6 @@ tray:
|
|||||||
global: سراسری
|
global: سراسری
|
||||||
profiles: پروفایلها
|
profiles: پروفایلها
|
||||||
proxies: پروکسیها
|
proxies: پروکسیها
|
||||||
testLatency: آزمایش تأخیر
|
|
||||||
testingLatency: در حال آزمایش تأخیر…
|
|
||||||
systemProxy: پروکسی سیستم
|
systemProxy: پروکسی سیستم
|
||||||
tunMode: حالت TUN
|
tunMode: حالت TUN
|
||||||
closeAllConnections: بستن همه اتصالها
|
closeAllConnections: بستن همه اتصالها
|
||||||
|
|||||||
@@ -70,8 +70,6 @@ tray:
|
|||||||
global: Global
|
global: Global
|
||||||
profiles: Profil
|
profiles: Profil
|
||||||
proxies: Proksi
|
proxies: Proksi
|
||||||
testLatency: Uji Latensi
|
|
||||||
testingLatency: Menguji latensi…
|
|
||||||
systemProxy: Proksi Sistem
|
systemProxy: Proksi Sistem
|
||||||
tunMode: Mode TUN
|
tunMode: Mode TUN
|
||||||
closeAllConnections: Tutup Semua Koneksi
|
closeAllConnections: Tutup Semua Koneksi
|
||||||
|
|||||||
@@ -70,8 +70,6 @@ tray:
|
|||||||
global: グローバル
|
global: グローバル
|
||||||
profiles: プロファイル
|
profiles: プロファイル
|
||||||
proxies: プロキシ
|
proxies: プロキシ
|
||||||
testLatency: 遅延テスト
|
|
||||||
testingLatency: 遅延をテスト中…
|
|
||||||
systemProxy: システムプロキシ
|
systemProxy: システムプロキシ
|
||||||
tunMode: TUN モード
|
tunMode: TUN モード
|
||||||
closeAllConnections: すべての接続を閉じる
|
closeAllConnections: すべての接続を閉じる
|
||||||
|
|||||||
@@ -70,8 +70,6 @@ tray:
|
|||||||
global: 글로벌
|
global: 글로벌
|
||||||
profiles: 프로필
|
profiles: 프로필
|
||||||
proxies: 프록시
|
proxies: 프록시
|
||||||
testLatency: 지연 테스트
|
|
||||||
testingLatency: 지연 테스트 중…
|
|
||||||
systemProxy: 시스템 프록시
|
systemProxy: 시스템 프록시
|
||||||
tunMode: TUN 모드
|
tunMode: TUN 모드
|
||||||
closeAllConnections: 모든 연결 닫기
|
closeAllConnections: 모든 연결 닫기
|
||||||
|
|||||||
@@ -70,8 +70,6 @@ tray:
|
|||||||
global: Global
|
global: Global
|
||||||
profiles: Perfis
|
profiles: Perfis
|
||||||
proxies: Proxies
|
proxies: Proxies
|
||||||
testLatency: Test Latency
|
|
||||||
testingLatency: Testing latency…
|
|
||||||
systemProxy: Proxy do sistema
|
systemProxy: Proxy do sistema
|
||||||
tunMode: Modo TUN
|
tunMode: Modo TUN
|
||||||
closeAllConnections: Fechar todas as conexões
|
closeAllConnections: Fechar todas as conexões
|
||||||
|
|||||||
@@ -70,8 +70,6 @@ tray:
|
|||||||
global: Глобальный
|
global: Глобальный
|
||||||
profiles: Профили
|
profiles: Профили
|
||||||
proxies: Прокси
|
proxies: Прокси
|
||||||
testLatency: Проверить задержку
|
|
||||||
testingLatency: Проверка задержки…
|
|
||||||
systemProxy: Системный прокси
|
systemProxy: Системный прокси
|
||||||
tunMode: Режим TUN
|
tunMode: Режим TUN
|
||||||
closeAllConnections: Закрыть все соединения
|
closeAllConnections: Закрыть все соединения
|
||||||
|
|||||||
@@ -70,8 +70,6 @@ tray:
|
|||||||
global: Küresel
|
global: Küresel
|
||||||
profiles: Profiller
|
profiles: Profiller
|
||||||
proxies: Vekil'ler
|
proxies: Vekil'ler
|
||||||
testLatency: Gecikmeyi Test Et
|
|
||||||
testingLatency: Gecikme test ediliyor…
|
|
||||||
systemProxy: Sistem Vekil'i
|
systemProxy: Sistem Vekil'i
|
||||||
tunMode: TUN Modu
|
tunMode: TUN Modu
|
||||||
closeAllConnections: Tüm Bağlantıları Kapat
|
closeAllConnections: Tüm Bağlantıları Kapat
|
||||||
|
|||||||
@@ -70,8 +70,6 @@ tray:
|
|||||||
global: Глобаль
|
global: Глобаль
|
||||||
profiles: Профильләр
|
profiles: Профильләр
|
||||||
proxies: Проксилар
|
proxies: Проксилар
|
||||||
testLatency: Кичектерүне тикшерү
|
|
||||||
testingLatency: Кичектерү тикшерелә…
|
|
||||||
systemProxy: Системалы прокси
|
systemProxy: Системалы прокси
|
||||||
tunMode: TUN режимы
|
tunMode: TUN режимы
|
||||||
closeAllConnections: Барлык тоташуларны ябу
|
closeAllConnections: Барлык тоташуларны ябу
|
||||||
|
|||||||
@@ -70,8 +70,6 @@ tray:
|
|||||||
global: 全局
|
global: 全局
|
||||||
profiles: 订阅
|
profiles: 订阅
|
||||||
proxies: 代理
|
proxies: 代理
|
||||||
testLatency: 测试延迟
|
|
||||||
testingLatency: 正在测试延迟…
|
|
||||||
systemProxy: 系统代理
|
systemProxy: 系统代理
|
||||||
tunMode: TUN 模式
|
tunMode: TUN 模式
|
||||||
closeAllConnections: 关闭所有连接
|
closeAllConnections: 关闭所有连接
|
||||||
|
|||||||
@@ -70,8 +70,6 @@ tray:
|
|||||||
global: 全域
|
global: 全域
|
||||||
profiles: 訂閱
|
profiles: 訂閱
|
||||||
proxies: 代理
|
proxies: 代理
|
||||||
testLatency: 測試延遲
|
|
||||||
testingLatency: 正在測試延遲…
|
|
||||||
systemProxy: 系統代理
|
systemProxy: 系統代理
|
||||||
tunMode: 虛擬網路介面卡模式
|
tunMode: 虛擬網路介面卡模式
|
||||||
closeAllConnections: 關閉所有連線
|
closeAllConnections: 關閉所有連線
|
||||||
|
|||||||
@@ -1,3 +1,15 @@
|
|||||||
|
//! Linux-only termination signal bridge.
|
||||||
|
//!
|
||||||
|
//! Upstream Tauri delivers session-end and termination events to the app on
|
||||||
|
//! Windows and macOS, but has no equivalent on Linux: a desktop session may
|
||||||
|
//! end without any window or run event reaching the process. Linux builds
|
||||||
|
//! keep this crate to listen for SIGTERM, SIGINT and SIGHUP and forward them
|
||||||
|
//! to the app quit flow, so system proxy and TUN cleanup still runs before
|
||||||
|
//! the process dies. Non-Linux builds compile this crate to nothing and must
|
||||||
|
//! not depend on it.
|
||||||
|
|
||||||
|
#![cfg(target_os = "linux")]
|
||||||
|
|
||||||
use std::sync::{
|
use std::sync::{
|
||||||
OnceLock,
|
OnceLock,
|
||||||
atomic::{AtomicBool, Ordering},
|
atomic::{AtomicBool, Ordering},
|
||||||
@@ -5,20 +17,13 @@ use std::sync::{
|
|||||||
|
|
||||||
use clash_verge_logging::{Type, logging};
|
use clash_verge_logging::{Type, logging};
|
||||||
|
|
||||||
#[cfg(unix)]
|
|
||||||
mod unix;
|
mod unix;
|
||||||
#[cfg(windows)]
|
|
||||||
mod windows;
|
|
||||||
|
|
||||||
pub(crate) static RUNTIME: OnceLock<Option<tokio::runtime::Runtime>> = OnceLock::new();
|
pub(crate) static RUNTIME: OnceLock<Option<tokio::runtime::Runtime>> = OnceLock::new();
|
||||||
pub(crate) static SHUTDOWN_LATCH: ShutdownLatch = ShutdownLatch::new();
|
pub(crate) static SHUTDOWN_LATCH: ShutdownLatch = ShutdownLatch::new();
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
|
/// Serializes signal-triggered cleanups: a signal arriving while a quit
|
||||||
pub enum ShutdownOutcome {
|
/// attempt is still in flight is dropped instead of overlapping it.
|
||||||
Committed,
|
|
||||||
Canceled,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) struct ShutdownLatch {
|
pub(crate) struct ShutdownLatch {
|
||||||
is_cleaning_up: AtomicBool,
|
is_cleaning_up: AtomicBool,
|
||||||
}
|
}
|
||||||
@@ -36,17 +41,18 @@ impl ShutdownLatch {
|
|||||||
.is_ok()
|
.is_ok()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn finish(&self, outcome: ShutdownOutcome) {
|
fn finish(&self) {
|
||||||
if matches!(outcome, ShutdownOutcome::Canceled) {
|
|
||||||
self.is_cleaning_up.store(false, Ordering::Release);
|
self.is_cleaning_up.store(false, Ordering::Release);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Spawns the Linux signal loop on a dedicated runtime so it survives the
|
||||||
|
/// teardown of any app-owned runtime. The handler runs once per accepted
|
||||||
|
/// signal; the quit flow it invokes owns the exit-or-cancel decision.
|
||||||
pub fn register<F, Fut>(f: F)
|
pub fn register<F, Fut>(f: F)
|
||||||
where
|
where
|
||||||
F: Fn() -> Fut + Send + Sync + 'static,
|
F: Fn() -> Fut + Send + Sync + 'static,
|
||||||
Fut: Future<Output = ShutdownOutcome> + Send + 'static,
|
Fut: Future<Output = ()> + Send + 'static,
|
||||||
{
|
{
|
||||||
RUNTIME.get_or_init(|| match tokio::runtime::Runtime::new() {
|
RUNTIME.get_or_init(|| match tokio::runtime::Runtime::new() {
|
||||||
Ok(rt) => Some(rt),
|
Ok(rt) => Some(rt),
|
||||||
@@ -61,36 +67,22 @@ where
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
#[cfg(unix)]
|
|
||||||
unix::register(f);
|
unix::register(f);
|
||||||
|
|
||||||
#[cfg(windows)]
|
|
||||||
windows::register(f);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::{ShutdownLatch, ShutdownOutcome};
|
use super::ShutdownLatch;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn canceled_shutdown_releases_latch_and_permits_next_attempt() {
|
fn finished_attempt_releases_latch_for_the_next_signal() {
|
||||||
let latch = ShutdownLatch::new();
|
let latch = ShutdownLatch::new();
|
||||||
|
|
||||||
assert!(latch.try_begin());
|
assert!(latch.try_begin());
|
||||||
assert!(!latch.try_begin());
|
assert!(!latch.try_begin());
|
||||||
|
|
||||||
latch.finish(ShutdownOutcome::Canceled);
|
latch.finish();
|
||||||
|
|
||||||
assert!(latch.try_begin());
|
assert!(latch.try_begin());
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn committed_shutdown_retains_latch_and_suppresses_repeats() {
|
|
||||||
let latch = ShutdownLatch::new();
|
|
||||||
|
|
||||||
assert!(latch.try_begin());
|
|
||||||
latch.finish(ShutdownOutcome::Committed);
|
|
||||||
|
|
||||||
assert!(!latch.try_begin());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
use clash_verge_logging::{Type, logging};
|
use clash_verge_logging::{Type, logging};
|
||||||
use tokio::signal::unix::{SignalKind, signal};
|
use tokio::signal::unix::{SignalKind, signal};
|
||||||
|
|
||||||
use crate::{RUNTIME, SHUTDOWN_LATCH, ShutdownOutcome};
|
use crate::{RUNTIME, SHUTDOWN_LATCH};
|
||||||
|
|
||||||
pub fn register<F, Fut>(f: F)
|
pub fn register<F, Fut>(f: F)
|
||||||
where
|
where
|
||||||
F: Fn() -> Fut + Send + Sync + 'static,
|
F: Fn() -> Fut + Send + Sync + 'static,
|
||||||
Fut: Future<Output = ShutdownOutcome> + Send + 'static,
|
Fut: Future<Output = ()> + Send + 'static,
|
||||||
{
|
{
|
||||||
if let Some(Some(rt)) = RUNTIME.get() {
|
if let Some(Some(rt)) = RUNTIME.get() {
|
||||||
rt.spawn(async move {
|
rt.spawn(async move {
|
||||||
@@ -60,7 +60,8 @@ where
|
|||||||
}
|
}
|
||||||
logging!(info, Type::SystemSignal, "Caught signal {}", signal_name);
|
logging!(info, Type::SystemSignal, "Caught signal {}", signal_name);
|
||||||
|
|
||||||
SHUTDOWN_LATCH.finish(f().await);
|
f().await;
|
||||||
|
SHUTDOWN_LATCH.finish();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1,83 +0,0 @@
|
|||||||
use clash_verge_logging::{Type, logging};
|
|
||||||
use tokio::signal::windows;
|
|
||||||
|
|
||||||
use crate::{RUNTIME, SHUTDOWN_LATCH, ShutdownOutcome};
|
|
||||||
|
|
||||||
pub fn register<F, Fut>(f: F)
|
|
||||||
where
|
|
||||||
F: Fn() -> Fut + Send + Sync + 'static,
|
|
||||||
Fut: Future<Output = ShutdownOutcome> + Send + 'static,
|
|
||||||
{
|
|
||||||
if let Some(Some(rt)) = RUNTIME.get() {
|
|
||||||
rt.spawn(async move {
|
|
||||||
let mut ctrl_c = match windows::ctrl_c() {
|
|
||||||
Ok(s) => s,
|
|
||||||
Err(e) => {
|
|
||||||
logging!(error, Type::SystemSignal, "Failed to register Ctrl+C: {}", e);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut ctrl_close = match windows::ctrl_close() {
|
|
||||||
Ok(s) => s,
|
|
||||||
Err(e) => {
|
|
||||||
logging!(error, Type::SystemSignal, "Failed to register Ctrl+Close: {}", e);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut ctrl_shutdown = match windows::ctrl_shutdown() {
|
|
||||||
Ok(s) => s,
|
|
||||||
Err(e) => {
|
|
||||||
logging!(error, Type::SystemSignal, "Failed to register Ctrl+Shutdown: {}", e);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut ctrl_logoff = match windows::ctrl_logoff() {
|
|
||||||
Ok(s) => s,
|
|
||||||
Err(e) => {
|
|
||||||
logging!(error, Type::SystemSignal, "Failed to register Ctrl+Logoff: {}", e);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
loop {
|
|
||||||
let signal_name;
|
|
||||||
tokio::select! {
|
|
||||||
_ = ctrl_c.recv() => {
|
|
||||||
signal_name = "Ctrl+C";
|
|
||||||
}
|
|
||||||
_ = ctrl_close.recv() => {
|
|
||||||
signal_name = "Ctrl+Close";
|
|
||||||
}
|
|
||||||
_ = ctrl_shutdown.recv() => {
|
|
||||||
signal_name = "Ctrl+Shutdown";
|
|
||||||
}
|
|
||||||
_ = ctrl_logoff.recv() => {
|
|
||||||
signal_name = "Ctrl+Logoff";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !SHUTDOWN_LATCH.try_begin() {
|
|
||||||
logging!(
|
|
||||||
info,
|
|
||||||
Type::SystemSignal,
|
|
||||||
"Already shutting down, ignoring repeated signal: {}",
|
|
||||||
signal_name
|
|
||||||
);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
logging!(info, Type::SystemSignal, "Caught Windows signal: {}", signal_name);
|
|
||||||
|
|
||||||
SHUTDOWN_LATCH.finish(f().await);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
logging!(
|
|
||||||
error,
|
|
||||||
Type::SystemSignal,
|
|
||||||
"register shutdown signal failed, RUNTIME is not available"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -15,7 +15,7 @@ serde = { workspace = true, features = ["derive"] }
|
|||||||
sysinfo = { version = "0.39.6", features = ["network", "system"] }
|
sysinfo = { version = "0.39.6", features = ["network", "system"] }
|
||||||
|
|
||||||
[target.'cfg(not(windows))'.dependencies]
|
[target.'cfg(not(windows))'.dependencies]
|
||||||
libc = "0.2.190"
|
libc = "0.2.191"
|
||||||
|
|
||||||
[target.'cfg(windows)'.dependencies]
|
[target.'cfg(windows)'.dependencies]
|
||||||
deelevate = { workspace = true }
|
deelevate = { workspace = true }
|
||||||
|
|||||||
+15
-15
@@ -54,13 +54,13 @@
|
|||||||
"@mui/icons-material": "^9.4.0",
|
"@mui/icons-material": "^9.4.0",
|
||||||
"@mui/material": "^9.4.0",
|
"@mui/material": "^9.4.0",
|
||||||
"@tanstack/react-virtual": "^3.14.13",
|
"@tanstack/react-virtual": "^3.14.13",
|
||||||
"@tauri-apps/api": "2.12.1",
|
"@tauri-apps/api": "2.12.4",
|
||||||
"@tauri-apps/plugin-clipboard-manager": "2.4.0",
|
"@tauri-apps/plugin-clipboard-manager": "2.5.0",
|
||||||
"@tauri-apps/plugin-dialog": "2.8.0",
|
"@tauri-apps/plugin-dialog": "2.8.3",
|
||||||
"@tauri-apps/plugin-fs": "2.6.0",
|
"@tauri-apps/plugin-fs": "2.7.1",
|
||||||
"@tauri-apps/plugin-http": "2.8.0",
|
"@tauri-apps/plugin-http": "2.8.3",
|
||||||
"@tauri-apps/plugin-opener": "2.7.0",
|
"@tauri-apps/plugin-opener": "2.7.2",
|
||||||
"@tauri-apps/plugin-updater": "2.13.1",
|
"@tauri-apps/plugin-updater": "2.14.0",
|
||||||
"ahooks": "^3.10.0",
|
"ahooks": "^3.10.0",
|
||||||
"cidr-block": "^2.3.0",
|
"cidr-block": "^2.3.0",
|
||||||
"compare-versions": "^6.1.1",
|
"compare-versions": "^6.1.1",
|
||||||
@@ -75,11 +75,11 @@
|
|||||||
"monaco-yaml": "^5.5.1",
|
"monaco-yaml": "^5.5.1",
|
||||||
"nanoid": "^6.0.1",
|
"nanoid": "^6.0.1",
|
||||||
"qrcode.react": "^4.2.0",
|
"qrcode.react": "^4.2.0",
|
||||||
"react": "19.3.0",
|
"react": "19.3.1",
|
||||||
"react-dom": "19.3.0",
|
"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": "17.0.15",
|
"react-i18next": "17.1.8",
|
||||||
"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",
|
||||||
@@ -95,7 +95,7 @@
|
|||||||
"@biomejs/biome": "^2.5.14",
|
"@biomejs/biome": "^2.5.14",
|
||||||
"@eslint-react/eslint-plugin": "^5.20.5",
|
"@eslint-react/eslint-plugin": "^5.20.5",
|
||||||
"@eslint/js": "^10.0.1",
|
"@eslint/js": "^10.0.1",
|
||||||
"@tauri-apps/cli": "2.12.1",
|
"@tauri-apps/cli": "2.12.3",
|
||||||
"@types/lodash-es": "^4.17.12",
|
"@types/lodash-es": "^4.17.12",
|
||||||
"@types/node": "^24.13.6",
|
"@types/node": "^24.13.6",
|
||||||
"@types/react": "19.3.0",
|
"@types/react": "19.3.0",
|
||||||
@@ -103,7 +103,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.4.0",
|
"@wdio/tauri-service": "1.5.0",
|
||||||
"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",
|
||||||
@@ -123,7 +123,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.39.0",
|
"knip": "6.43.0",
|
||||||
"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",
|
||||||
@@ -133,7 +133,7 @@
|
|||||||
"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.0.0",
|
"webdriverio": "10.1.0",
|
||||||
"ws": "8.22.0"
|
"ws": "8.22.0"
|
||||||
},
|
},
|
||||||
"lint-staged": {
|
"lint-staged": {
|
||||||
@@ -146,5 +146,5 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"packageManager": "pnpm@12.11.2"
|
"packageManager": "pnpm@12.15.0"
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+528
-728
File diff suppressed because it is too large
Load Diff
@@ -45,6 +45,17 @@
|
|||||||
"matchManagers": ["npm"],
|
"matchManagers": ["npm"],
|
||||||
"groupName": "npm dependencies"
|
"groupName": "npm dependencies"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"description": "Update Tauri npm packages and Cargo crates together so frontend and backend stay in sync",
|
||||||
|
"matchPackageNames": [
|
||||||
|
"@tauri-apps/**",
|
||||||
|
"@wdio/tauri-service",
|
||||||
|
"tauri",
|
||||||
|
"tauri-*"
|
||||||
|
],
|
||||||
|
"groupName": "tauri",
|
||||||
|
"addLabels": ["tauri"]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"description": "Group all GitHub Actions updates into a single PR",
|
"description": "Group all GitHub Actions updates into a single PR",
|
||||||
"matchManagers": ["github-actions"],
|
"matchManagers": ["github-actions"],
|
||||||
|
|||||||
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
[toolchain]
|
[toolchain]
|
||||||
channel = "1.99.0"
|
channel = "1.99.1"
|
||||||
components = ["rustfmt", "clippy"]
|
components = ["rustfmt", "clippy"]
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ try {
|
|||||||
'run',
|
'run',
|
||||||
'-p',
|
'-p',
|
||||||
'clash-verge',
|
'clash-verge',
|
||||||
'--bin',
|
'--example',
|
||||||
'frontend-contract',
|
'frontend-contract',
|
||||||
'--locked',
|
'--locked',
|
||||||
'-q',
|
'-q',
|
||||||
|
|||||||
@@ -434,12 +434,13 @@ for (let iteration = 0; iteration < repeat && !interrupted; iteration++) {
|
|||||||
devicePixelRatio,
|
devicePixelRatio,
|
||||||
])
|
])
|
||||||
run.viewport = { dom: viewport, driver: await browser.getWindowRect() }
|
run.viewport = { dom: viewport, driver: await browser.getWindowRect() }
|
||||||
|
const driverScale = run.viewport.driver.width / 1000
|
||||||
assert(
|
assert(
|
||||||
run.viewport.driver.width / viewport[2] === 1000 &&
|
|
||||||
run.viewport.driver.height / viewport[2] === 700 &&
|
|
||||||
viewport[0] === 1000 &&
|
viewport[0] === 1000 &&
|
||||||
viewport[1] > 0 &&
|
viewport[1] > 0 &&
|
||||||
viewport[1] <= 700,
|
viewport[1] <= 700 &&
|
||||||
|
(driverScale === 1 || driverScale === viewport[2]) &&
|
||||||
|
run.viewport.driver.height / driverScale === 700,
|
||||||
`unexpected window dimensions: ${JSON.stringify(run.viewport)}`,
|
`unexpected window dimensions: ${JSON.stringify(run.viewport)}`,
|
||||||
)
|
)
|
||||||
assert(
|
assert(
|
||||||
|
|||||||
+21
-18
@@ -29,13 +29,12 @@ perf-harness = ["dep:tauri-plugin-wdio-webdriver"]
|
|||||||
identifier = "io.github.clash-verge-rev.clash-verge-rev"
|
identifier = "io.github.clash-verge-rev.clash-verge-rev"
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
tauri-build = { version = "2.7.1", features = [] }
|
tauri-build = { version = "2.7.3", features = [] }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
clash-verge-draft = { workspace = true }
|
clash-verge-draft = { workspace = true }
|
||||||
clash-verge-media-unlock = { workspace = true }
|
clash-verge-media-unlock = { workspace = true }
|
||||||
clash-verge-logging = { workspace = true }
|
clash-verge-logging = { workspace = true }
|
||||||
clash-verge-signal = { workspace = true }
|
|
||||||
clash-verge-i18n = { workspace = true }
|
clash-verge-i18n = { workspace = true }
|
||||||
clash-verge-limiter = { workspace = true }
|
clash-verge-limiter = { workspace = true }
|
||||||
tauri-plugin-clash-verge-sysinfo = { workspace = true }
|
tauri-plugin-clash-verge-sysinfo = { workspace = true }
|
||||||
@@ -73,51 +72,55 @@ sysproxy = { git = "https://github.com/clash-verge-rev/sysproxy-rs.git", branch
|
|||||||
"guard",
|
"guard",
|
||||||
] }
|
] }
|
||||||
network-interface = { version = "2.0.5", features = ["serde"] }
|
network-interface = { version = "2.0.5", features = ["serde"] }
|
||||||
tauri-plugin-shell = "2.4.0"
|
tauri-plugin-shell = "2.5.0"
|
||||||
tauri-plugin-opener = "2.7.0"
|
tauri-plugin-opener = "2.7.2"
|
||||||
tauri-plugin-dialog = "2.8.1"
|
tauri-plugin-dialog = "2.8.3"
|
||||||
tauri-plugin-fs = "2.6.0"
|
tauri-plugin-fs = "2.7.1"
|
||||||
tauri-plugin-process = "2.4.0"
|
tauri-plugin-process = "2.4.0"
|
||||||
tauri-plugin-deep-link = "2.6.1"
|
tauri-plugin-deep-link = "2.6.2"
|
||||||
tauri-plugin-window-state = "2.5.0"
|
tauri-plugin-window-state = "2.5.0"
|
||||||
zip = "9.0.1"
|
zip = "9.0.4"
|
||||||
flate2 = "1.1.10"
|
flate2 = "1.1.10"
|
||||||
reqwest_dav = "0.3.3"
|
reqwest_dav = "0.3.3"
|
||||||
aes-gcm = { version = "0.11.1" }
|
aes-gcm = { version = "0.11.1" }
|
||||||
base64 = "0.23.1"
|
base64 = "0.23.1"
|
||||||
minisign-verify = "0.3.0"
|
minisign-verify = "0.3.0"
|
||||||
sha2 = "0.11"
|
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"
|
||||||
scopeguard = "1.2.0"
|
scopeguard = "1.2.0"
|
||||||
tauri-plugin-notification = "2.5.1"
|
tauri-plugin-notification = "2.7.0"
|
||||||
tokio-stream = "0.1.19"
|
tokio-stream = "0.1.19"
|
||||||
backon = { version = "1.6.0", features = ["tokio-sleep"] }
|
backon = { version = "1.6.0", features = ["tokio-sleep"] }
|
||||||
tauri-plugin-http = "2.8.0"
|
tauri-plugin-http = "2.8.3"
|
||||||
tracing = { workspace = true }
|
tracing = { workspace = true }
|
||||||
tauri-plugin-devtools = { version = "2.2.2", optional = true }
|
tauri-plugin-devtools = { version = "2.2.2", optional = true }
|
||||||
tauri-plugin-mihomo = { git = "https://github.com/clash-verge-rev/tauri-plugin-mihomo", branch = "main" }
|
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.7.6", version = "2.7.6", features = [
|
clash_verge_service_ipc = { git = "https://github.com/clash-verge-rev/clash-verge-service-ipc.git", tag = "v2.7.6", version = "2.7.6", features = [
|
||||||
"client",
|
"client",
|
||||||
] }
|
] }
|
||||||
arc-swap = "1.9.2"
|
arc-swap = "1.9.2"
|
||||||
tokio-rustls = "0.26.6"
|
tokio-rustls = "0.26.6"
|
||||||
rustls = { version = "0.23.45", features = ["ring"] }
|
rustls = { version = "0.23.46", features = ["ring"] }
|
||||||
webpki-roots = "1.0.9"
|
webpki-roots = "1.0.9"
|
||||||
dark-light = "3.0.0"
|
dark-light = "3.0.0"
|
||||||
bytes = "1.12.1"
|
bytes = "1.12.1"
|
||||||
tokio-util = { version = "0.7.19", features = ["time"] }
|
tokio-util = { version = "0.7.20", features = ["time"] }
|
||||||
specta = { version = "=2.0.0-rc.25", features = ["derive", "function", "serde_json"] }
|
specta = { version = "=2.0.0-rc.25", features = ["derive", "function", "serde_json"] }
|
||||||
tauri-specta = { version = "=2.0.0-rc.25", features = ["derive", "typescript"] }
|
tauri-specta = { version = "=2.0.0-rc.25", features = ["derive", "typescript"] }
|
||||||
specta-typescript = "=0.0.12"
|
specta-typescript = "=0.0.12"
|
||||||
|
|
||||||
[target.'cfg(unix)'.dependencies]
|
[target.'cfg(unix)'.dependencies]
|
||||||
libc = "0.2.190"
|
libc = "0.2.191"
|
||||||
|
|
||||||
|
[target.'cfg(target_os = "linux")'.dependencies]
|
||||||
|
# Upstream has no session-end signal support on Linux; see crates/clash-verge-signal.
|
||||||
|
clash-verge-signal = { workspace = true }
|
||||||
|
|
||||||
[target.'cfg(target_os = "macos")'.dependencies]
|
[target.'cfg(target_os = "macos")'.dependencies]
|
||||||
tauri-plugin-wdio-webdriver = { version = "=1.4.0", optional = true }
|
tauri-plugin-wdio-webdriver = { version = "=1.5.0", optional = true }
|
||||||
objc2 = "0.6.5"
|
objc2 = "0.6.5"
|
||||||
objc2-foundation = { version = "0.3.2", features = [
|
objc2-foundation = { version = "0.3.2", features = [
|
||||||
"NSString",
|
"NSString",
|
||||||
@@ -150,8 +153,8 @@ windows-sys.workspace = true
|
|||||||
|
|
||||||
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
|
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
|
||||||
tauri-plugin-autostart = "2.7.0"
|
tauri-plugin-autostart = "2.7.0"
|
||||||
tauri-plugin-global-shortcut = "2.4.0"
|
tauri-plugin-global-shortcut = "2.4.1"
|
||||||
tauri-plugin-updater = "2.13.1"
|
tauri-plugin-updater = "2.14.0"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
criterion = { workspace = true }
|
criterion = { workspace = true }
|
||||||
|
|||||||
+9
-4
@@ -1,10 +1,9 @@
|
|||||||
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
if std::env::var("CARGO_CFG_TARGET_OS").as_deref() == Ok("windows")
|
if std::env::var("CARGO_CFG_TARGET_OS").as_deref() == Ok("windows")
|
||||||
&& std::env::var("CARGO_CFG_TARGET_ENV").as_deref() == Ok("msvc")
|
&& std::env::var("CARGO_CFG_TARGET_ENV").as_deref() == Ok("msvc")
|
||||||
&& std::env::var_os("CARGO_FEATURE_CLIPPY").is_some()
|
|
||||||
{
|
{
|
||||||
// Tauri's resource is linked to the app binary, but not to Rust unit-test harnesses.
|
// Tauri's resource is linked to the app binary, but not to Rust unit-test harnesses or examples.
|
||||||
// Give mock-context builds their own manifest so tests can resolve TaskDialogIndirect.
|
// Give non-app targets their own manifest so tests and examples can resolve TaskDialogIndirect.
|
||||||
let out_dir = std::env::var_os("OUT_DIR").ok_or_else(|| std::io::Error::other("OUT_DIR is not set"))?;
|
let out_dir = std::env::var_os("OUT_DIR").ok_or_else(|| std::io::Error::other("OUT_DIR is not set"))?;
|
||||||
let manifest_path = std::path::PathBuf::from(out_dir).join("windows-test-manifest.xml");
|
let manifest_path = std::path::PathBuf::from(out_dir).join("windows-test-manifest.xml");
|
||||||
std::fs::write(
|
std::fs::write(
|
||||||
@@ -25,8 +24,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
</assembly>
|
</assembly>
|
||||||
"#,
|
"#,
|
||||||
)?;
|
)?;
|
||||||
|
let manifest_display = manifest_path.display();
|
||||||
|
if std::env::var_os("CARGO_FEATURE_CLIPPY").is_some() {
|
||||||
println!("cargo:rustc-link-arg=/MANIFEST:EMBED");
|
println!("cargo:rustc-link-arg=/MANIFEST:EMBED");
|
||||||
println!("cargo:rustc-link-arg=/MANIFESTINPUT:{}", manifest_path.display());
|
println!("cargo:rustc-link-arg=/MANIFESTINPUT:{manifest_display}");
|
||||||
|
} else {
|
||||||
|
println!("cargo:rustc-link-arg-examples=/MANIFEST:EMBED");
|
||||||
|
println!("cargo:rustc-link-arg-examples=/MANIFESTINPUT:{manifest_display}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(feature = "clippy")]
|
#[cfg(feature = "clippy")]
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
// Dev-only target: Tauri ships everything under src/bin/ to /usr/bin in deb/rpm
|
||||||
|
// 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
|
let output = args
|
||||||
@@ -282,7 +282,9 @@ async fn handle_validation_failure(
|
|||||||
) -> CmdResult<ValidationOutcome> {
|
) -> CmdResult<ValidationOutcome> {
|
||||||
logging!(warn, Type::Cmd, "配置验证失败: {}", outcome);
|
logging!(warn, Type::Cmd, "配置验证失败: {}", outcome);
|
||||||
discard_and_restore(current_profile).await?;
|
discard_and_restore(current_profile).await?;
|
||||||
|
if !matches!(outcome, ValidationOutcome::Busy) {
|
||||||
handle_validation_notice(&outcome, ValidationNoticeTarget::Runtime, "运行时配置");
|
handle_validation_notice(&outcome, ValidationNoticeTarget::Runtime, "运行时配置");
|
||||||
|
}
|
||||||
Ok(outcome)
|
Ok(outcome)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -311,9 +313,6 @@ async fn perform_config_update(
|
|||||||
current_value: Option<&String>,
|
current_value: Option<&String>,
|
||||||
current_profile: Option<&String>,
|
current_profile: Option<&String>,
|
||||||
) -> CmdResult<ValidationOutcome> {
|
) -> CmdResult<ValidationOutcome> {
|
||||||
defer! {
|
|
||||||
CURRENT_SWITCHING_PROFILE.store(false, Ordering::Release);
|
|
||||||
}
|
|
||||||
let update_result = run_profile_config_update_transition(|| CoreManager::global().update_config_forced()).await;
|
let update_result = run_profile_config_update_transition(|| CoreManager::global().update_config_forced()).await;
|
||||||
|
|
||||||
match update_result {
|
match update_result {
|
||||||
@@ -373,8 +372,6 @@ pub struct ProfilePatch {
|
|||||||
#[specta(type = Option<std::string::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>>,
|
||||||
#[specta(type = Option<std::collections::BTreeMap<std::string::String, std::string::String>>)]
|
|
||||||
pub latency_test_urls: Option<std::collections::BTreeMap<String, String>>,
|
|
||||||
pub extra: Option<crate::config::PrfExtra>,
|
pub extra: Option<crate::config::PrfExtra>,
|
||||||
pub updated: Option<usize>,
|
pub updated: Option<usize>,
|
||||||
pub option: Option<PrfOption>,
|
pub option: Option<PrfOption>,
|
||||||
@@ -389,7 +386,6 @@ impl From<ProfilePatch> for PrfItem {
|
|||||||
file: patch.file,
|
file: patch.file,
|
||||||
url: patch.url,
|
url: patch.url,
|
||||||
selected: patch.selected,
|
selected: patch.selected,
|
||||||
latency_test_urls: patch.latency_test_urls,
|
|
||||||
extra: patch.extra,
|
extra: patch.extra,
|
||||||
updated: patch.updated,
|
updated: patch.updated,
|
||||||
option: patch.option,
|
option: patch.option,
|
||||||
@@ -409,6 +405,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);
|
||||||
}
|
}
|
||||||
|
defer! {
|
||||||
|
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 {
|
||||||
|
|||||||
@@ -108,32 +108,20 @@ fn runtime_group_scopes(config: Option<&Mapping>) -> BTreeMap<String, GroupScope
|
|||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
#[specta::specta]
|
#[specta::specta]
|
||||||
pub async fn get_proxy_view() -> CmdResult<ProxyViewV1> {
|
pub async fn get_proxy_view() -> CmdResult<ProxyViewV1> {
|
||||||
proxy_view(None).await
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) async fn proxy_view(provider_timeout: Option<std::time::Duration>) -> CmdResult<ProxyViewV1> {
|
|
||||||
let runtime = Config::runtime().await;
|
let runtime = Config::runtime().await;
|
||||||
let latest_runtime = runtime.latest_arc();
|
let latest_runtime = runtime.latest_arc();
|
||||||
let runtime_group_order = runtime_group_order(latest_runtime.config.as_ref());
|
let runtime_group_order = runtime_group_order(latest_runtime.config.as_ref());
|
||||||
let group_scopes = runtime_group_scopes(latest_runtime.config.as_ref());
|
let group_scopes = runtime_group_scopes(latest_runtime.config.as_ref());
|
||||||
|
|
||||||
let mihomo = Handle::mihomo();
|
let mihomo = Handle::mihomo();
|
||||||
let (proxies, providers) = tokio::join!(mihomo.get_proxies(), async {
|
let (proxies, providers) = tokio::join!(mihomo.get_proxies(), mihomo.get_proxy_providers(),);
|
||||||
match provider_timeout {
|
|
||||||
Some(timeout) => tokio::time::timeout(timeout, mihomo.get_proxy_providers())
|
|
||||||
.await
|
|
||||||
.ok()
|
|
||||||
.and_then(Result::ok),
|
|
||||||
None => mihomo.get_proxy_providers().await.ok(),
|
|
||||||
}
|
|
||||||
});
|
|
||||||
let proxies = proxies.stringify_err()?;
|
let proxies = proxies.stringify_err()?;
|
||||||
|
|
||||||
Ok(ProxyViewBuilder::build(ProxyViewInput {
|
Ok(ProxyViewBuilder::build(ProxyViewInput {
|
||||||
runtime_group_order,
|
runtime_group_order,
|
||||||
group_scopes,
|
group_scopes,
|
||||||
proxies,
|
proxies,
|
||||||
providers,
|
providers: providers.ok(),
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -53,10 +53,6 @@ pub struct PrfItem {
|
|||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
pub selected: Option<Vec<PrfSelected>>,
|
pub selected: Option<Vec<PrfSelected>>,
|
||||||
|
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
#[specta(type = Option<std::collections::BTreeMap<std::string::String, std::string::String>>)]
|
|
||||||
pub latency_test_urls: Option<std::collections::BTreeMap<String, String>>,
|
|
||||||
|
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
pub extra: Option<PrfExtra>,
|
pub extra: Option<PrfExtra>,
|
||||||
|
|
||||||
@@ -233,7 +229,6 @@ impl PrfItem {
|
|||||||
desc: Some(desc),
|
desc: Some(desc),
|
||||||
file: Some(file),
|
file: Some(file),
|
||||||
url: None,
|
url: None,
|
||||||
latency_test_urls: None,
|
|
||||||
selected: None,
|
selected: None,
|
||||||
extra: None,
|
extra: None,
|
||||||
option: Some(PrfOption {
|
option: Some(PrfOption {
|
||||||
@@ -413,7 +408,6 @@ impl PrfItem {
|
|||||||
desc: desc.cloned(),
|
desc: desc.cloned(),
|
||||||
file: Some(file),
|
file: Some(file),
|
||||||
url: Some(url.as_str().into()),
|
url: Some(url.as_str().into()),
|
||||||
latency_test_urls: None,
|
|
||||||
selected: None,
|
selected: None,
|
||||||
extra,
|
extra,
|
||||||
option: Some(PrfOption {
|
option: Some(PrfOption {
|
||||||
|
|||||||
@@ -250,7 +250,6 @@ impl IProfiles {
|
|||||||
patch!(each, item, file);
|
patch!(each, item, file);
|
||||||
patch!(each, item, url);
|
patch!(each, item, url);
|
||||||
patch!(each, item, selected);
|
patch!(each, item, selected);
|
||||||
patch!(each, item, latency_test_urls);
|
|
||||||
patch!(each, item, extra);
|
patch!(each, item, extra);
|
||||||
patch!(each, item, updated);
|
patch!(each, item, updated);
|
||||||
patch!(each, item, option);
|
patch!(each, item, option);
|
||||||
|
|||||||
@@ -75,6 +75,7 @@ pub mod tun {
|
|||||||
"auto-redirect",
|
"auto-redirect",
|
||||||
"auto-detect-interface",
|
"auto-detect-interface",
|
||||||
"dns-hijack",
|
"dns-hijack",
|
||||||
|
"dns-mode",
|
||||||
"strict-route",
|
"strict-route",
|
||||||
"mtu",
|
"mtu",
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
use std::collections::{BTreeMap, BTreeSet, HashMap};
|
use std::collections::{BTreeMap, BTreeSet};
|
||||||
|
|
||||||
use serde::{Serialize, Serializer, ser::SerializeMap as _};
|
use serde::Serialize;
|
||||||
use tauri_plugin_mihomo::models::{
|
use tauri_plugin_mihomo::models::{
|
||||||
DelayHistory, Extra, Proxies, Proxy, ProxyProvider, ProxyProviders, ProxyType, VehicleType,
|
DelayHistory, Proxies, Proxy, ProxyProvider, ProxyProviders, ProxyType, VehicleType,
|
||||||
};
|
};
|
||||||
|
|
||||||
pub struct ProxyViewInput {
|
pub struct ProxyViewInput {
|
||||||
@@ -57,28 +57,6 @@ pub struct ProxyCapabilities {
|
|||||||
pub smux: bool,
|
pub smux: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, specta::Type)]
|
|
||||||
struct ProxyLatencyHistory<'a> {
|
|
||||||
#[specta(type = Vec<crate::ipc::DelayHistory>)]
|
|
||||||
history: &'a [DelayHistory],
|
|
||||||
}
|
|
||||||
|
|
||||||
fn serialize_proxy_latency_history<S: Serializer>(
|
|
||||||
extra: &HashMap<String, Extra>,
|
|
||||||
serializer: S,
|
|
||||||
) -> Result<S::Ok, S::Error> {
|
|
||||||
let mut map = serializer.serialize_map(Some(extra.len()))?;
|
|
||||||
for (url, extra) in extra {
|
|
||||||
map.serialize_entry(
|
|
||||||
url,
|
|
||||||
&ProxyLatencyHistory {
|
|
||||||
history: &extra.history,
|
|
||||||
},
|
|
||||||
)?;
|
|
||||||
}
|
|
||||||
map.end()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Eq, Serialize, specta::Type)]
|
#[derive(Debug, PartialEq, Eq, Serialize, specta::Type)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct ProxyGroupView {
|
pub struct ProxyGroupView {
|
||||||
@@ -98,9 +76,6 @@ pub struct ProxyGroupView {
|
|||||||
pub test_url: Option<String>,
|
pub test_url: Option<String>,
|
||||||
#[specta(type = Vec<crate::ipc::DelayHistory>)]
|
#[specta(type = Vec<crate::ipc::DelayHistory>)]
|
||||||
pub history: Vec<DelayHistory>,
|
pub history: Vec<DelayHistory>,
|
||||||
#[serde(serialize_with = "serialize_proxy_latency_history")]
|
|
||||||
#[specta(type = HashMap<String, ProxyLatencyHistory<'static>>)]
|
|
||||||
pub extra: HashMap<String, Extra>,
|
|
||||||
#[serde(flatten)]
|
#[serde(flatten)]
|
||||||
pub capabilities: ProxyCapabilities,
|
pub capabilities: ProxyCapabilities,
|
||||||
pub members: Vec<ProxyMemberRef>,
|
pub members: Vec<ProxyMemberRef>,
|
||||||
@@ -116,9 +91,6 @@ pub struct ProxyNodeView {
|
|||||||
pub proxy_type: ProxyType,
|
pub proxy_type: ProxyType,
|
||||||
#[specta(type = Vec<crate::ipc::DelayHistory>)]
|
#[specta(type = Vec<crate::ipc::DelayHistory>)]
|
||||||
pub history: Vec<DelayHistory>,
|
pub history: Vec<DelayHistory>,
|
||||||
#[serde(serialize_with = "serialize_proxy_latency_history")]
|
|
||||||
#[specta(type = HashMap<String, ProxyLatencyHistory<'static>>)]
|
|
||||||
pub extra: HashMap<String, Extra>,
|
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
pub id: Option<String>,
|
pub id: Option<String>,
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
@@ -284,7 +256,7 @@ impl ProxyViewBuilder {
|
|||||||
} else {
|
} else {
|
||||||
ProxyViewProviderState::Unavailable
|
ProxyViewProviderState::Unavailable
|
||||||
};
|
};
|
||||||
let (mut core_groups, core_nodes) = partition_core(proxies, providers.is_some());
|
let (mut core_groups, core_nodes) = partition_core(proxies);
|
||||||
let (mut records, core_node_ids) = build_core_records(core_nodes);
|
let (mut records, core_node_ids) = build_core_records(core_nodes);
|
||||||
let (providers, provider_candidates) = build_provider_records(providers, &mut records);
|
let (providers, provider_candidates) = build_provider_records(providers, &mut records);
|
||||||
let resolver = MemberResolver {
|
let resolver = MemberResolver {
|
||||||
@@ -317,14 +289,14 @@ impl ProxyViewBuilder {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn partition_core(proxies: Proxies, providers_available: bool) -> (BTreeMap<String, Proxy>, BTreeMap<String, Proxy>) {
|
fn partition_core(proxies: Proxies) -> (BTreeMap<String, Proxy>, BTreeMap<String, Proxy>) {
|
||||||
let mut groups = BTreeMap::new();
|
let mut groups = BTreeMap::new();
|
||||||
let mut nodes = BTreeMap::new();
|
let mut nodes = BTreeMap::new();
|
||||||
|
|
||||||
for (name, proxy) in proxies.proxies {
|
for (name, proxy) in proxies.proxies {
|
||||||
if proxy.all.is_some() {
|
if proxy.all.is_some() {
|
||||||
groups.insert(name, proxy);
|
groups.insert(name, proxy);
|
||||||
} else if !providers_available || proxy.provider_name.is_empty() {
|
} else {
|
||||||
nodes.insert(name, proxy);
|
nodes.insert(name, proxy);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -431,7 +403,6 @@ fn build_group(name: String, proxy: Proxy, resolver: &MemberResolver<'_>) -> Pro
|
|||||||
now,
|
now,
|
||||||
test_url,
|
test_url,
|
||||||
history,
|
history,
|
||||||
extra,
|
|
||||||
udp,
|
udp,
|
||||||
xudp,
|
xudp,
|
||||||
tfo,
|
tfo,
|
||||||
@@ -464,7 +435,6 @@ fn build_group(name: String, proxy: Proxy, resolver: &MemberResolver<'_>) -> Pro
|
|||||||
icon,
|
icon,
|
||||||
test_url,
|
test_url,
|
||||||
history,
|
history,
|
||||||
extra,
|
|
||||||
capabilities: ProxyCapabilities {
|
capabilities: ProxyCapabilities {
|
||||||
udp,
|
udp,
|
||||||
xudp,
|
xudp,
|
||||||
@@ -483,7 +453,6 @@ fn build_node(record_id: String, name: String, proxy: Proxy, source: ProxyNodeSo
|
|||||||
icon,
|
icon,
|
||||||
test_url,
|
test_url,
|
||||||
history,
|
history,
|
||||||
extra,
|
|
||||||
udp,
|
udp,
|
||||||
xudp,
|
xudp,
|
||||||
tfo,
|
tfo,
|
||||||
@@ -498,7 +467,6 @@ fn build_node(record_id: String, name: String, proxy: Proxy, source: ProxyNodeSo
|
|||||||
name,
|
name,
|
||||||
proxy_type,
|
proxy_type,
|
||||||
history,
|
history,
|
||||||
extra,
|
|
||||||
id,
|
id,
|
||||||
hidden,
|
hidden,
|
||||||
icon,
|
icon,
|
||||||
@@ -552,62 +520,3 @@ fn build_standalone(core_node_ids: &BTreeMap<String, String>) -> Vec<String> {
|
|||||||
);
|
);
|
||||||
standalone
|
standalone
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
use serde_json::json;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn provider_echo_in_proxies_does_not_override_group_membership() -> anyhow::Result<()> {
|
|
||||||
let view = ProxyViewBuilder::build(ProxyViewInput {
|
|
||||||
runtime_group_order: vec!["A".into(), "B".into()],
|
|
||||||
group_scopes: ["A", "B"]
|
|
||||||
.into_iter()
|
|
||||||
.map(|name| {
|
|
||||||
(
|
|
||||||
name.into(),
|
|
||||||
GroupScope {
|
|
||||||
providers: vec![name.into()],
|
|
||||||
exclude_types: vec![],
|
|
||||||
},
|
|
||||||
)
|
|
||||||
})
|
|
||||||
.collect(),
|
|
||||||
proxies: serde_json::from_value(json!({"proxies": {
|
|
||||||
"A": {"all": ["node"], "type": "Selector"},
|
|
||||||
"B": {"all": ["node"], "type": "Selector"},
|
|
||||||
"node": {"name": "node", "provider-name": "A", "history": [{"time": "2026-10-08T00:00:00Z", "delay": 32}]}
|
|
||||||
}}))?,
|
|
||||||
providers: Some(serde_json::from_value(json!({"providers": {
|
|
||||||
"A": {"vehicleType": "Inline", "proxies": [{"name": "node", "history": [{"time": "2026-10-08T00:00:00Z", "delay": 32}]}]},
|
|
||||||
"B": {"vehicleType": "Inline", "proxies": [{"name": "node", "history": [{"time": "2026-10-08T00:00:00Z", "delay": 123}]}]}
|
|
||||||
}}))?),
|
|
||||||
});
|
|
||||||
for (group, expected) in view.groups.iter().zip([32, 123]) {
|
|
||||||
let ProxyMemberRef::Node { record_id, .. } = &group.members[0] else {
|
|
||||||
anyhow::bail!("Expected node")
|
|
||||||
};
|
|
||||||
let record = &view.records[record_id];
|
|
||||||
assert_eq!(record.history.last().map(|entry| entry.delay), Some(expected));
|
|
||||||
assert!(
|
|
||||||
matches!(&record.source, ProxyNodeSource::Provider { provider_name, .. } if provider_name == &group.name)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
#[test]
|
|
||||||
fn unavailable_provider_keeps_core_echo_interactable() -> anyhow::Result<()> {
|
|
||||||
let view = ProxyViewBuilder::build(ProxyViewInput {
|
|
||||||
runtime_group_order: vec!["A".into()],
|
|
||||||
group_scopes: BTreeMap::new(),
|
|
||||||
proxies: serde_json::from_value(json!({"proxies": {
|
|
||||||
"A": {"all": ["node"], "type": "Selector"},
|
|
||||||
"node": {"name": "node", "provider-name": "provider"}
|
|
||||||
}}))?,
|
|
||||||
providers: None,
|
|
||||||
});
|
|
||||||
assert!(matches!(&view.groups[0].members[0], ProxyMemberRef::Node { .. }));
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,156 +0,0 @@
|
|||||||
use super::Tray;
|
|
||||||
use crate::{
|
|
||||||
Type, cmd,
|
|
||||||
config::Config,
|
|
||||||
core::{
|
|
||||||
handle,
|
|
||||||
notify::{Refresh, announce},
|
|
||||||
proxy_view::{ProxyMemberRef, ProxyNodeSource},
|
|
||||||
},
|
|
||||||
logging,
|
|
||||||
};
|
|
||||||
|
|
||||||
const TRAY_DELAY_TEST_CONCURRENCY: usize = 10;
|
|
||||||
const TRAY_DEFAULT_LATENCY_URL: &str = "http://cp.cloudflare.com/generate_204";
|
|
||||||
|
|
||||||
fn is_latency_test_url(raw: &str) -> bool {
|
|
||||||
let raw = raw.trim();
|
|
||||||
raw.split_once("://")
|
|
||||||
.is_some_and(|(scheme, _)| scheme.eq_ignore_ascii_case("http") || scheme.eq_ignore_ascii_case("https"))
|
|
||||||
&& tauri::Url::parse(raw).is_ok_and(|url| url.has_host() && matches!(url.scheme(), "http" | "https"))
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(super) fn test_url(
|
|
||||||
group: &crate::core::proxy_view::ProxyGroupView,
|
|
||||||
verge: &crate::config::IVerge,
|
|
||||||
profiles: &crate::config::IProfiles,
|
|
||||||
) -> String {
|
|
||||||
let custom_url = profiles
|
|
||||||
.current
|
|
||||||
.as_ref()
|
|
||||||
.and_then(|uid| profiles.get_item(uid).ok())
|
|
||||||
.and_then(|profile| profile.latency_test_urls.as_ref())
|
|
||||||
.and_then(|urls| urls.get(group.name.as_str()))
|
|
||||||
.map(|url| url.as_str())
|
|
||||||
.filter(|url| !url.trim().is_empty());
|
|
||||||
let group_url = group.test_url.as_deref().filter(|url| !url.trim().is_empty());
|
|
||||||
let default_url = verge
|
|
||||||
.default_latency_test
|
|
||||||
.as_deref()
|
|
||||||
.filter(|url| !url.trim().is_empty());
|
|
||||||
custom_url
|
|
||||||
.or(group_url)
|
|
||||||
.or(default_url)
|
|
||||||
.filter(|&url| is_latency_test_url(url))
|
|
||||||
.unwrap_or(TRAY_DEFAULT_LATENCY_URL)
|
|
||||||
.trim()
|
|
||||||
.to_owned()
|
|
||||||
}
|
|
||||||
|
|
||||||
static RUNNING: parking_lot::Mutex<std::collections::BTreeSet<String>> =
|
|
||||||
parking_lot::Mutex::new(std::collections::BTreeSet::new());
|
|
||||||
|
|
||||||
pub(super) fn is_running(group_name: &str) -> bool {
|
|
||||||
RUNNING.lock().contains(group_name)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(super) async fn test_proxy_group_delay(group_name: &str) {
|
|
||||||
if !RUNNING.lock().insert(group_name.to_owned()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
Tray::global().refresh_latency_item(group_name);
|
|
||||||
let _running = scopeguard::guard(group_name, |name| {
|
|
||||||
RUNNING.lock().remove(name);
|
|
||||||
Tray::global().refresh_latency_item(name);
|
|
||||||
});
|
|
||||||
use futures::{StreamExt as _, stream};
|
|
||||||
|
|
||||||
let view = match cmd::proxy::get_proxy_view().await {
|
|
||||||
Ok(view) => view,
|
|
||||||
Err(err) => {
|
|
||||||
logging!(warn, Type::Tray, "Failed to read proxies for tray latency test: {err}");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
let verge = Config::verge().await.latest_arc();
|
|
||||||
|
|
||||||
let group = view
|
|
||||||
.groups
|
|
||||||
.iter()
|
|
||||||
.chain(view.global.iter())
|
|
||||||
.find(|group| group.name.as_str() == group_name);
|
|
||||||
let Some(group) = group else {
|
|
||||||
logging!(warn, Type::Tray, "Tray latency test group not found: {group_name}");
|
|
||||||
return;
|
|
||||||
};
|
|
||||||
|
|
||||||
let profiles = Config::profiles().await.latest_arc();
|
|
||||||
let url = test_url(group, &verge, &profiles);
|
|
||||||
let timeout = verge
|
|
||||||
.default_latency_timeout
|
|
||||||
.filter(|timeout| *timeout > 0)
|
|
||||||
.unwrap_or(10000) as u32;
|
|
||||||
|
|
||||||
let mut targets: Vec<(std::string::String, Option<std::string::String>)> = Vec::with_capacity(group.members.len());
|
|
||||||
for member in &group.members {
|
|
||||||
match member {
|
|
||||||
ProxyMemberRef::Node { name, record_id } => match view.records.get(record_id).map(|node| &node.source) {
|
|
||||||
Some(ProxyNodeSource::Provider {
|
|
||||||
provider_name,
|
|
||||||
proxy_name,
|
|
||||||
}) => targets.push((proxy_name.clone(), Some(provider_name.clone()))),
|
|
||||||
_ => targets.push((name.clone(), None)),
|
|
||||||
},
|
|
||||||
ProxyMemberRef::Group { name } => targets.push((name.clone(), None)),
|
|
||||||
ProxyMemberRef::Unresolved { .. } => {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let mihomo = handle::Handle::mihomo();
|
|
||||||
|
|
||||||
stream::iter(targets.into_iter().map(move |(member, provider)| {
|
|
||||||
let url = url.clone();
|
|
||||||
async move {
|
|
||||||
let result = match provider {
|
|
||||||
Some(provider_name) => {
|
|
||||||
mihomo
|
|
||||||
.healthcheck_node_in_provider(&provider_name, &member, &url, timeout)
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
None => mihomo.delay_proxy_by_name(&member, &url, timeout).await,
|
|
||||||
};
|
|
||||||
if let Err(err) = result {
|
|
||||||
logging!(debug, Type::Tray, "Tray latency test failed: {member} - {err}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}))
|
|
||||||
.buffer_unordered(TRAY_DELAY_TEST_CONCURRENCY)
|
|
||||||
.for_each(|()| std::future::ready(()))
|
|
||||||
.await;
|
|
||||||
|
|
||||||
if let Err(err) = cmd::proxy::sync_tray_proxy_selection().await {
|
|
||||||
logging!(warn, Type::Tray, "Failed to refresh tray after latency test: {err}");
|
|
||||||
}
|
|
||||||
|
|
||||||
announce(Refresh::Proxies);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn latency_urls_require_a_valid_http_host_and_port() {
|
|
||||||
for invalid in [
|
|
||||||
"http://?",
|
|
||||||
"http://host:invalid",
|
|
||||||
"http://bad host/",
|
|
||||||
"ftp://localhost",
|
|
||||||
"http:localhost",
|
|
||||||
] {
|
|
||||||
assert!(!is_latency_test_url(invalid), "{invalid}");
|
|
||||||
}
|
|
||||||
for valid in ["http://localhost/", " https://example.com/ ", "HTTP://localhost:8080/"] {
|
|
||||||
assert!(is_latency_test_url(valid), "{valid}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -32,7 +32,6 @@ define_menu! {
|
|||||||
outbound_modes => OUTBOUND_MODES, "tray_outbound_modes", "tray.outboundModes",
|
outbound_modes => OUTBOUND_MODES, "tray_outbound_modes", "tray.outboundModes",
|
||||||
profiles => PROFILES, "tray_profiles", "tray.profiles",
|
profiles => PROFILES, "tray_profiles", "tray.profiles",
|
||||||
proxies => PROXIES, "tray_proxies", "tray.proxies",
|
proxies => PROXIES, "tray_proxies", "tray.proxies",
|
||||||
test_latency => TEST_LATENCY, "tray_test_latency", "tray.testLatency",
|
|
||||||
system_proxy => SYSTEM_PROXY, "tray_system_proxy", "tray.systemProxy",
|
system_proxy => SYSTEM_PROXY, "tray_system_proxy", "tray.systemProxy",
|
||||||
tun_mode => TUN_MODE, "tray_tun_mode", "tray.tunMode",
|
tun_mode => TUN_MODE, "tray_tun_mode", "tray.tunMode",
|
||||||
close_all_connections => CLOSE_ALL_CONNECTIONS, "tray_close_all_connections", "tray.closeAllConnections",
|
close_all_connections => CLOSE_ALL_CONNECTIONS, "tray_close_all_connections", "tray.closeAllConnections",
|
||||||
|
|||||||
+120
-342
@@ -1,6 +1,5 @@
|
|||||||
use crate::config::{IProfilePreview, IVerge};
|
use crate::config::{IProfilePreview, IVerge};
|
||||||
use crate::core::lightweight;
|
use crate::core::lightweight;
|
||||||
use crate::core::proxy_view::{ProxyGroupView, ProxyMemberRef, ProxyNodeSource, ProxyViewProviderState, ProxyViewV1};
|
|
||||||
use crate::core::tray::menu_def::TrayAction;
|
use crate::core::tray::menu_def::TrayAction;
|
||||||
use crate::process::AsyncHandler;
|
use crate::process::AsyncHandler;
|
||||||
use crate::singleton;
|
use crate::singleton;
|
||||||
@@ -15,6 +14,7 @@ use crate::{
|
|||||||
use clash_verge_limiter::{Limiter, SystemClock, SystemLimiter};
|
use clash_verge_limiter::{Limiter, SystemClock, SystemLimiter};
|
||||||
use clash_verge_logging::logging_error;
|
use clash_verge_logging::logging_error;
|
||||||
use tauri::tray::{MouseButton, MouseButtonState, TrayIcon, TrayIconBuilder, TrayIconEvent};
|
use tauri::tray::{MouseButton, MouseButtonState, TrayIcon, TrayIconBuilder, TrayIconEvent};
|
||||||
|
use tauri_plugin_mihomo::models::Proxies;
|
||||||
use tokio::fs;
|
use tokio::fs;
|
||||||
|
|
||||||
use super::handle;
|
use super::handle;
|
||||||
@@ -28,7 +28,6 @@ use tauri::{
|
|||||||
menu::{CheckMenuItem, IsMenuItem, MenuEvent, MenuItem, PredefinedMenuItem, Submenu},
|
menu::{CheckMenuItem, IsMenuItem, MenuEvent, MenuItem, PredefinedMenuItem, Submenu},
|
||||||
};
|
};
|
||||||
|
|
||||||
mod latency;
|
|
||||||
mod menu_def;
|
mod menu_def;
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
mod speed_task;
|
mod speed_task;
|
||||||
@@ -56,25 +55,8 @@ enum IconKind {
|
|||||||
Tun,
|
Tun,
|
||||||
}
|
}
|
||||||
|
|
||||||
struct LatencyMenuItem {
|
|
||||||
item: MenuItem<Wry>,
|
|
||||||
running: bool,
|
|
||||||
proxies: Vec<ProxyLatencyItem>,
|
|
||||||
provider_state: ProxyViewProviderState,
|
|
||||||
}
|
|
||||||
|
|
||||||
struct ProxyLatencyItem {
|
|
||||||
item: CheckMenuItem<Wry>,
|
|
||||||
name: std::string::String,
|
|
||||||
provider_name: Option<std::string::String>,
|
|
||||||
text: std::string::String,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct Tray {
|
pub struct Tray {
|
||||||
limiter: SystemLimiter,
|
limiter: SystemLimiter,
|
||||||
proxy_hover_limiter: SystemLimiter,
|
|
||||||
menu_update: tokio::sync::Mutex<()>,
|
|
||||||
latency_items: parking_lot::Mutex<HashMap<std::string::String, LatencyMenuItem>>,
|
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
speed_controller: speed_task::TraySpeedController,
|
speed_controller: speed_task::TraySpeedController,
|
||||||
}
|
}
|
||||||
@@ -148,9 +130,6 @@ impl Default for Tray {
|
|||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self {
|
Self {
|
||||||
limiter: Limiter::new(Duration::from_millis(TRAY_CLICK_DEBOUNCE_MS), SystemClock),
|
limiter: Limiter::new(Duration::from_millis(TRAY_CLICK_DEBOUNCE_MS), SystemClock),
|
||||||
proxy_hover_limiter: Limiter::new(Duration::from_secs(1), SystemClock),
|
|
||||||
menu_update: tokio::sync::Mutex::new(()),
|
|
||||||
latency_items: parking_lot::Mutex::new(HashMap::new()),
|
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
speed_controller: speed_task::TraySpeedController::new(),
|
speed_controller: speed_task::TraySpeedController::new(),
|
||||||
}
|
}
|
||||||
@@ -216,7 +195,6 @@ impl Tray {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fn update_menu_internal(&self, app_handle: &AppHandle, include_proxy_groups: bool) -> Result<()> {
|
async fn update_menu_internal(&self, app_handle: &AppHandle, include_proxy_groups: bool) -> Result<()> {
|
||||||
let _update = self.menu_update.lock().await;
|
|
||||||
let Some(tray) = app_handle.tray_by_id(TRAY_ID) else {
|
let Some(tray) = app_handle.tray_by_id(TRAY_ID) else {
|
||||||
logging!(warn, Type::Tray, "Failed to update tray menu: tray not found");
|
logging!(warn, Type::Tray, "Failed to update tray menu: tray not found");
|
||||||
return Ok(());
|
return Ok(());
|
||||||
@@ -241,7 +219,10 @@ impl Tray {
|
|||||||
let profiles_preview = profiles_arc.profiles_preview().unwrap_or_default();
|
let profiles_preview = profiles_arc.profiles_preview().unwrap_or_default();
|
||||||
let is_lightweight_mode = is_in_lightweight_mode();
|
let is_lightweight_mode = is_in_lightweight_mode();
|
||||||
|
|
||||||
let (menu, latency_items) = create_tray_menu(
|
logging_error!(
|
||||||
|
Type::Tray,
|
||||||
|
tray.set_menu(Some(
|
||||||
|
create_tray_menu(
|
||||||
app_handle,
|
app_handle,
|
||||||
Some(mode.as_str()),
|
Some(mode.as_str()),
|
||||||
*system_proxy,
|
*system_proxy,
|
||||||
@@ -253,121 +234,14 @@ impl Tray {
|
|||||||
include_proxy_groups,
|
include_proxy_groups,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
.await?;
|
.await?,
|
||||||
tray.set_menu(Some(menu))?;
|
))
|
||||||
let groups: Vec<_> = latency_items.keys().cloned().collect();
|
);
|
||||||
*self.latency_items.lock() = latency_items;
|
|
||||||
for group in groups {
|
|
||||||
self.refresh_latency_item(&group);
|
|
||||||
}
|
|
||||||
|
|
||||||
logging!(debug, Type::Tray, "托盘菜单更新成功");
|
logging!(debug, Type::Tray, "托盘菜单更新成功");
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn refresh_proxy_items(&'static self) {
|
|
||||||
let Ok(update) = self.menu_update.try_lock() else {
|
|
||||||
return;
|
|
||||||
};
|
|
||||||
if self.latency_items.lock().is_empty() || handle::Handle::global().is_exiting() {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
let Ok(Ok(view)) = tokio::time::timeout(
|
|
||||||
Duration::from_secs(1),
|
|
||||||
cmd::proxy::proxy_view(Some(Duration::from_millis(750))),
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
else {
|
|
||||||
return;
|
|
||||||
};
|
|
||||||
if self
|
|
||||||
.latency_items
|
|
||||||
.lock()
|
|
||||||
.values()
|
|
||||||
.any(|entry| entry.provider_state != view.provider_state)
|
|
||||||
{
|
|
||||||
// Provider fallback changes member identities; rebuild through the existing queue.
|
|
||||||
drop(update);
|
|
||||||
logging_error!(Type::Tray, cmd::proxy::sync_tray_proxy_selection().await);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
let verge = Config::verge().await.latest_arc();
|
|
||||||
let profiles = Config::profiles().await.latest_arc();
|
|
||||||
logging_error!(
|
|
||||||
Type::Tray,
|
|
||||||
handle::Handle::app_handle().run_on_main_thread(move || {
|
|
||||||
// Keep rebuilding serialized until these handles have received their snapshot.
|
|
||||||
let _update = update;
|
|
||||||
let mut items = self.latency_items.lock();
|
|
||||||
for (group_name, entry) in items.iter_mut() {
|
|
||||||
let Some(group) = find_group(&view, group_name) else {
|
|
||||||
continue;
|
|
||||||
};
|
|
||||||
let url = latency::test_url(group, &verge, &profiles);
|
|
||||||
let mut members = HashMap::with_capacity(group.members.len());
|
|
||||||
for member in &group.members {
|
|
||||||
members
|
|
||||||
.entry((member_name(member), member_provider(&view, member)))
|
|
||||||
.or_insert(member);
|
|
||||||
}
|
|
||||||
for proxy in &mut entry.proxies {
|
|
||||||
let Some(member) = members.get(&(proxy.name.as_str(), proxy.provider_name.as_deref())) else {
|
|
||||||
continue;
|
|
||||||
};
|
|
||||||
let text = proxy_item_text(&view, member, &url, &verge);
|
|
||||||
let checked = group.now.as_ref() == Some(&proxy.name);
|
|
||||||
if text != proxy.text {
|
|
||||||
match proxy.item.set_text(&text) {
|
|
||||||
Ok(()) => proxy.text = text,
|
|
||||||
Err(err) => logging!(warn, Type::Tray, "Failed to refresh proxy latency: {err}"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
match proxy.item.is_checked() {
|
|
||||||
Ok(current) if current != checked => {
|
|
||||||
logging_error!(Type::Tray, proxy.item.set_checked(checked))
|
|
||||||
}
|
|
||||||
Err(err) => logging!(warn, Type::Tray, "Failed to read proxy selection: {err}"),
|
|
||||||
_ => {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn refresh_latency_item(&self, group_name: &str) {
|
|
||||||
let group_name = group_name.to_owned();
|
|
||||||
logging_error!(
|
|
||||||
Type::Tray,
|
|
||||||
handle::Handle::app_handle().run_on_main_thread(move || {
|
|
||||||
Self::global().refresh_latency_item_on_main_thread(&group_name);
|
|
||||||
})
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn refresh_latency_item_on_main_thread(&self, group_name: &str) {
|
|
||||||
let running = latency::is_running(group_name);
|
|
||||||
let item = {
|
|
||||||
let mut items = self.latency_items.lock();
|
|
||||||
items.get_mut(group_name).and_then(|entry| {
|
|
||||||
if entry.running == running {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
entry.running = running;
|
|
||||||
Some(entry.item.clone())
|
|
||||||
})
|
|
||||||
};
|
|
||||||
if let Some(item) = item {
|
|
||||||
let label = if running {
|
|
||||||
clash_verge_i18n::t!("tray.testingLatency")
|
|
||||||
} else {
|
|
||||||
clash_verge_i18n::t!("tray.testLatency")
|
|
||||||
};
|
|
||||||
logging_error!(Type::Tray, item.set_text(label));
|
|
||||||
logging_error!(Type::Tray, item.set_enabled(!running));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn update_icon(&self, verge: &IVerge) -> Result<()> {
|
pub async fn update_icon(&self, verge: &IVerge) -> Result<()> {
|
||||||
if handle::Handle::global().is_exiting() {
|
if handle::Handle::global().is_exiting() {
|
||||||
logging!(debug, Type::Tray, "应用正在退出,跳过托盘图标更新");
|
logging!(debug, Type::Tray, "应用正在退出,跳过托盘图标更新");
|
||||||
@@ -548,12 +422,11 @@ fn create_hotkeys(hotkeys: &Option<Vec<String>>) -> HashMap<&str, &str> {
|
|||||||
let mut parts = item.split(',');
|
let mut parts = item.split(',');
|
||||||
match (parts.next(), parts.next()) {
|
match (parts.next(), parts.next()) {
|
||||||
(Some(func), Some(key)) => {
|
(Some(func), Some(key)) => {
|
||||||
// 托盘菜单中的 `accelerator` 属性,在 Linux/Windows 中都不支持小键盘按键的解析
|
// 托盘菜单的 `accelerator` 在 Linux/Windows 下不支持小键盘按键,Windows 下也不支持 Win 键(前端上报为 `CMD`)
|
||||||
if key.to_uppercase().contains("NUMPAD") {
|
let uppercase_key = key.to_uppercase();
|
||||||
None
|
let unsupported =
|
||||||
} else {
|
uppercase_key.contains("NUMPAD") || (cfg!(windows) && uppercase_key.contains("CMD"));
|
||||||
Some((func, key))
|
if unsupported { None } else { Some((func, key)) }
|
||||||
}
|
|
||||||
}
|
}
|
||||||
_ => None,
|
_ => None,
|
||||||
}
|
}
|
||||||
@@ -583,175 +456,96 @@ fn create_profile_menu_item(
|
|||||||
.collect()
|
.collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
const UNTESTED_DELAY_TEXT: &str = "-ms";
|
|
||||||
const TIMEOUT_DELAY_TEXT: &str = "T/O";
|
|
||||||
const TRAY_GROUP_DEPTH_LIMIT: usize = 8;
|
|
||||||
|
|
||||||
const fn member_name(member: &ProxyMemberRef) -> &str {
|
|
||||||
match member {
|
|
||||||
ProxyMemberRef::Node { name, .. }
|
|
||||||
| ProxyMemberRef::Group { name }
|
|
||||||
| ProxyMemberRef::Unresolved { name, .. } => name.as_str(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn find_group<'a>(view: &'a ProxyViewV1, name: &str) -> Option<&'a ProxyGroupView> {
|
|
||||||
view.groups
|
|
||||||
.iter()
|
|
||||||
.chain(view.global.iter())
|
|
||||||
.find(|group| group.name.as_str() == name)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The delay recorded for `url`, falling back to the node's latest measurement under any URL, so a
|
|
||||||
/// node the core tested on its own still shows a value.
|
|
||||||
fn node_delay(view: &ProxyViewV1, record_id: &str, url: &str) -> Option<u16> {
|
|
||||||
view.records
|
|
||||||
.get(record_id)
|
|
||||||
.map(|node| node.extra.get(url).map_or(&node.history, |extra| &extra.history))
|
|
||||||
.and_then(|history| history.last())
|
|
||||||
.map(|history| history.delay)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A group row shows the delay of the node the group currently selects. The core never writes a
|
|
||||||
/// history for the group itself, so `now` is followed until the chain reaches a node.
|
|
||||||
fn selected_member_delay(view: &ProxyViewV1, group_name: &str, url: &str) -> Option<u16> {
|
|
||||||
let mut current = group_name;
|
|
||||||
for _ in 0..TRAY_GROUP_DEPTH_LIMIT {
|
|
||||||
let Some(group) = find_group(view, current) else { break };
|
|
||||||
let Some(now) = group.now.as_deref().filter(|now| !now.is_empty() && *now != current) else {
|
|
||||||
break;
|
|
||||||
};
|
|
||||||
let Some(member) = group.members.iter().find(|member| member_name(member) == now) else {
|
|
||||||
break;
|
|
||||||
};
|
|
||||||
match member {
|
|
||||||
ProxyMemberRef::Node { record_id, .. } => return node_delay(view, record_id, url),
|
|
||||||
ProxyMemberRef::Group { name } => current = name.as_str(),
|
|
||||||
ProxyMemberRef::Unresolved { .. } => break,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
find_group(view, group_name)
|
|
||||||
.map(|group| group.extra.get(url).map_or(&group.history, |extra| &extra.history))
|
|
||||||
.and_then(|history| history.last())
|
|
||||||
.map(|history| history.delay)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn member_provider<'a>(view: &'a ProxyViewV1, member: &ProxyMemberRef) -> Option<&'a str> {
|
|
||||||
let ProxyMemberRef::Node { record_id, .. } = member else {
|
|
||||||
return None;
|
|
||||||
};
|
|
||||||
match &view.records.get(record_id)?.source {
|
|
||||||
ProxyNodeSource::Provider { provider_name, .. } => Some(provider_name),
|
|
||||||
ProxyNodeSource::Core { .. } => None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn proxy_item_text(view: &ProxyViewV1, member: &ProxyMemberRef, url: &str, verge: &IVerge) -> std::string::String {
|
|
||||||
let timeout = verge
|
|
||||||
.default_latency_timeout
|
|
||||||
.filter(|timeout| *timeout > 0)
|
|
||||||
.unwrap_or(10000);
|
|
||||||
let delay = match member {
|
|
||||||
ProxyMemberRef::Node { record_id, .. } => node_delay(view, record_id, url),
|
|
||||||
ProxyMemberRef::Group { name } => selected_member_delay(view, name, url),
|
|
||||||
ProxyMemberRef::Unresolved { .. } => None,
|
|
||||||
};
|
|
||||||
let delay_text = delay.map_or_else(
|
|
||||||
|| UNTESTED_DELAY_TEXT.to_owned(),
|
|
||||||
|delay| {
|
|
||||||
if delay == 0 || u32::from(delay) >= timeout as u32 {
|
|
||||||
TIMEOUT_DELAY_TEXT.to_owned()
|
|
||||||
} else {
|
|
||||||
format!("{delay}ms")
|
|
||||||
}
|
|
||||||
},
|
|
||||||
);
|
|
||||||
format!("{} | {delay_text}", member_name(member))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn create_subcreate_proxy_menu_item(
|
fn create_subcreate_proxy_menu_item(
|
||||||
app_handle: &AppHandle,
|
app_handle: &AppHandle,
|
||||||
proxy_mode: &str,
|
proxy_mode: &str,
|
||||||
view: Option<ProxyViewV1>,
|
proxy_group_order_map: Option<HashMap<String, usize>>,
|
||||||
latency_items: &mut HashMap<std::string::String, LatencyMenuItem>,
|
proxy_nodes_data: Option<Proxies>,
|
||||||
texts: &MenuTexts,
|
|
||||||
verge: &IVerge,
|
|
||||||
profiles: &crate::config::IProfiles,
|
|
||||||
) -> Vec<Submenu<Wry>> {
|
) -> Vec<Submenu<Wry>> {
|
||||||
let Some(view) = view else { return Vec::new() };
|
let proxy_submenus: Vec<Submenu<Wry>> = {
|
||||||
view.groups
|
let mut submenus: Vec<(String, usize, Submenu<Wry>)> = Vec::new();
|
||||||
.iter()
|
|
||||||
.chain(view.global.iter())
|
// TODO: 应用启动时,内核还未启动完全,无法获取代理节点信息
|
||||||
.filter_map(|group| {
|
if let Some(proxy_nodes_data) = proxy_nodes_data {
|
||||||
if group.hidden.unwrap_or_default() || (proxy_mode == "global") != (group.name == "GLOBAL") {
|
for (group_name, group_data) in proxy_nodes_data.proxies.iter() {
|
||||||
return None;
|
let should_show = match proxy_mode {
|
||||||
|
"global" => group_name == "GLOBAL",
|
||||||
|
_ => group_name != "GLOBAL",
|
||||||
|
} && !group_data.hidden.unwrap_or_default();
|
||||||
|
|
||||||
|
if !should_show {
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
let url = latency::test_url(group, verge, profiles);
|
|
||||||
let proxies: Vec<ProxyLatencyItem> = group
|
let Some(all_proxies) = group_data.all.as_ref() else {
|
||||||
.members
|
continue;
|
||||||
|
};
|
||||||
|
|
||||||
|
let now_proxy = group_data.now.as_deref().unwrap_or_default();
|
||||||
|
|
||||||
|
let group_items: Vec<CheckMenuItem<Wry>> = all_proxies
|
||||||
.iter()
|
.iter()
|
||||||
.filter_map(|member| {
|
.filter_map(|proxy_str| {
|
||||||
let name = member_name(member);
|
let is_selected = *proxy_str == now_proxy;
|
||||||
let text = proxy_item_text(&view, member, &url, verge);
|
let item_id = format!("proxy_{}_{}", group_name, proxy_str);
|
||||||
let checked = group.now.as_deref() == Some(name);
|
|
||||||
CheckMenuItem::with_id(
|
let delay_text = proxy_nodes_data
|
||||||
app_handle,
|
.proxies
|
||||||
format!("proxy_{}_{}", group.name, name),
|
.get(proxy_str)
|
||||||
&text,
|
.and_then(|h| h.history.last())
|
||||||
true,
|
.map(|h| match h.delay {
|
||||||
checked,
|
0 => "-ms".into(),
|
||||||
None::<&str>,
|
delay if delay >= 10000 => "-ms".into(),
|
||||||
)
|
_ => format!("{}ms", h.delay),
|
||||||
.map(|item| ProxyLatencyItem {
|
|
||||||
item,
|
|
||||||
name: name.to_owned(),
|
|
||||||
provider_name: member_provider(&view, member).map(str::to_owned),
|
|
||||||
text,
|
|
||||||
})
|
})
|
||||||
.map_err(|e| logging!(warn, Type::Tray, "Failed to create proxy menu item: {e}"))
|
.unwrap_or_else(|| "-ms".into());
|
||||||
|
|
||||||
|
let display_text = format!("{} | {}", proxy_str, delay_text);
|
||||||
|
|
||||||
|
CheckMenuItem::with_id(app_handle, item_id, display_text, true, is_selected, None::<&str>)
|
||||||
|
.map_err(|e| logging!(warn, Type::Tray, "Failed to create proxy menu item: {}", e))
|
||||||
.ok()
|
.ok()
|
||||||
})
|
})
|
||||||
.collect();
|
.collect();
|
||||||
let group_items: Vec<_> = proxies.iter().map(|proxy| proxy.item.clone()).collect();
|
|
||||||
if group_items.is_empty() {
|
if group_items.is_empty() {
|
||||||
return None;
|
continue;
|
||||||
}
|
}
|
||||||
let running = latency::is_running(&group.name);
|
|
||||||
let test_item = MenuItem::with_id(
|
let group_display_name = group_name.to_string();
|
||||||
|
|
||||||
|
let group_items_refs: Vec<&dyn IsMenuItem<Wry>> =
|
||||||
|
group_items.iter().map(|item| item as &dyn IsMenuItem<Wry>).collect();
|
||||||
|
|
||||||
|
if let Ok(submenu) = Submenu::with_id_and_items(
|
||||||
app_handle,
|
app_handle,
|
||||||
format!("{}_{}", MenuIds::TEST_LATENCY, group.name),
|
format!("proxy_group_{}", group_name),
|
||||||
if running {
|
group_display_name,
|
||||||
clash_verge_i18n::t!("tray.testingLatency")
|
|
||||||
} else {
|
|
||||||
texts.test_latency.clone()
|
|
||||||
},
|
|
||||||
!running,
|
|
||||||
None::<&str>,
|
|
||||||
)
|
|
||||||
.ok()?;
|
|
||||||
latency_items.insert(
|
|
||||||
group.name.clone(),
|
|
||||||
LatencyMenuItem {
|
|
||||||
item: test_item.clone(),
|
|
||||||
running,
|
|
||||||
proxies,
|
|
||||||
provider_state: view.provider_state,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
let separator = PredefinedMenuItem::separator(app_handle).ok()?;
|
|
||||||
let mut items: Vec<&dyn IsMenuItem<Wry>> = vec![&test_item, &separator];
|
|
||||||
items.extend(group_items.iter().map(|item| item as &dyn IsMenuItem<Wry>));
|
|
||||||
Submenu::with_id_and_items(
|
|
||||||
app_handle,
|
|
||||||
format!("proxy_group_{}", group.name),
|
|
||||||
&group.name,
|
|
||||||
true,
|
true,
|
||||||
&items,
|
&group_items_refs,
|
||||||
)
|
) {
|
||||||
.map_err(|e| logging!(warn, Type::Tray, "Failed to create proxy group submenu: {e}"))
|
let insertion_index = submenus.len();
|
||||||
.ok()
|
submenus.push((group_name.into(), insertion_index, submenu));
|
||||||
})
|
} else {
|
||||||
.collect()
|
logging!(warn, Type::Tray, "Failed to create proxy group submenu: {}", group_name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(order_map) = proxy_group_order_map.as_ref() {
|
||||||
|
submenus.sort_by(|(name_a, original_index_a, _), (name_b, original_index_b, _)| {
|
||||||
|
match (order_map.get(name_a), order_map.get(name_b)) {
|
||||||
|
(Some(index_a), Some(index_b)) => index_a.cmp(index_b),
|
||||||
|
(Some(_), None) => std::cmp::Ordering::Less,
|
||||||
|
(None, Some(_)) => std::cmp::Ordering::Greater,
|
||||||
|
(None, None) => original_index_a.cmp(original_index_b),
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
submenus.into_iter().map(|(_, _, submenu)| submenu).collect()
|
||||||
|
};
|
||||||
|
proxy_submenus
|
||||||
}
|
}
|
||||||
|
|
||||||
fn create_proxy_menu_item(
|
fn create_proxy_menu_item(
|
||||||
@@ -798,38 +592,54 @@ async fn create_tray_menu(
|
|||||||
tun_mode_available: bool,
|
tun_mode_available: bool,
|
||||||
profiles_preview: Vec<IProfilePreview<'_>>,
|
profiles_preview: Vec<IProfilePreview<'_>>,
|
||||||
options: TrayMenuOptions,
|
options: TrayMenuOptions,
|
||||||
) -> Result<(tauri::menu::Menu<Wry>, HashMap<std::string::String, LatencyMenuItem>)> {
|
) -> Result<tauri::menu::Menu<Wry>> {
|
||||||
let current_proxy_mode = mode.unwrap_or("");
|
let current_proxy_mode = mode.unwrap_or("");
|
||||||
|
|
||||||
let mut verge_settings = Config::verge().await.latest_arc();
|
let mut verge_settings = Config::verge().await.latest_arc();
|
||||||
let fetch_proxy_groups =
|
let fetch_proxy_groups =
|
||||||
options.include_proxy_groups && verge_settings.tray_proxy_groups_display_mode.as_deref() != Some("disable");
|
options.include_proxy_groups && verge_settings.tray_proxy_groups_display_mode.as_deref() != Some("disable");
|
||||||
|
|
||||||
// Proxy data must remain optional so a stopped Core cannot roll back unrelated settings.
|
// TODO: should update tray menu again when it was timeout error
|
||||||
let proxy_view = if fetch_proxy_groups {
|
let (proxy_nodes_data, runtime_proxy_groups_order) = if fetch_proxy_groups {
|
||||||
tokio::time::timeout(
|
let proxy_nodes_data =
|
||||||
Duration::from_millis(1000),
|
tokio::time::timeout(Duration::from_millis(1000), handle::Handle::mihomo().get_proxies())
|
||||||
cmd::proxy::proxy_view(Some(Duration::from_millis(750))),
|
|
||||||
)
|
|
||||||
.await
|
.await
|
||||||
.ok()
|
.map_or(None, |res| res.ok());
|
||||||
.and_then(Result::ok)
|
|
||||||
|
let runtime = Config::runtime().await.latest_arc();
|
||||||
|
let runtime_proxy_groups_order = runtime.config.as_ref().map(|config| {
|
||||||
|
config
|
||||||
|
.get("proxy-groups")
|
||||||
|
.and_then(|groups| groups.as_sequence())
|
||||||
|
.map(|groups| {
|
||||||
|
groups
|
||||||
|
.iter()
|
||||||
|
.filter_map(|group| group.get("name"))
|
||||||
|
.filter_map(|name| name.as_str())
|
||||||
|
.enumerate()
|
||||||
|
.map(|(index, name)| (name.into(), index))
|
||||||
|
.collect::<HashMap<String, usize>>()
|
||||||
|
})
|
||||||
|
.unwrap_or_default()
|
||||||
|
});
|
||||||
|
|
||||||
|
(proxy_nodes_data, runtime_proxy_groups_order)
|
||||||
} else {
|
} else {
|
||||||
None
|
(None, None)
|
||||||
};
|
};
|
||||||
|
|
||||||
if fetch_proxy_groups {
|
if fetch_proxy_groups {
|
||||||
verge_settings = Config::verge().await.latest_arc();
|
verge_settings = Config::verge().await.latest_arc();
|
||||||
}
|
}
|
||||||
|
|
||||||
let profiles_config = Config::profiles().await.latest_arc();
|
|
||||||
|
|
||||||
let tray_proxy_groups_display_mode = verge_settings
|
let tray_proxy_groups_display_mode = verge_settings
|
||||||
.tray_proxy_groups_display_mode
|
.tray_proxy_groups_display_mode
|
||||||
.as_deref()
|
.as_deref()
|
||||||
.unwrap_or("default");
|
.unwrap_or("default");
|
||||||
let include_proxy_groups = options.include_proxy_groups && tray_proxy_groups_display_mode != "disable";
|
let include_proxy_groups = options.include_proxy_groups && tray_proxy_groups_display_mode != "disable";
|
||||||
|
|
||||||
|
let proxy_group_order_map = runtime_proxy_groups_order;
|
||||||
|
|
||||||
let show_outbound_modes_inline = verge_settings.tray_inline_outbound_modes.unwrap_or(false);
|
let show_outbound_modes_inline = verge_settings.tray_inline_outbound_modes.unwrap_or(false);
|
||||||
|
|
||||||
let version = env!("CARGO_PKG_VERSION");
|
let version = env!("CARGO_PKG_VERSION");
|
||||||
@@ -909,17 +719,9 @@ async fn create_tray_menu(
|
|||||||
&profile_menu_items_refs,
|
&profile_menu_items_refs,
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
let mut latency_items = HashMap::new();
|
|
||||||
let (proxies_menu, inline_proxy_items) = if include_proxy_groups {
|
let (proxies_menu, inline_proxy_items) = if include_proxy_groups {
|
||||||
let proxy_sub_menus = create_subcreate_proxy_menu_item(
|
let proxy_sub_menus =
|
||||||
app_handle,
|
create_subcreate_proxy_menu_item(app_handle, current_proxy_mode, proxy_group_order_map, proxy_nodes_data);
|
||||||
current_proxy_mode,
|
|
||||||
proxy_view,
|
|
||||||
&mut latency_items,
|
|
||||||
&texts,
|
|
||||||
&verge_settings,
|
|
||||||
&profiles_config,
|
|
||||||
);
|
|
||||||
|
|
||||||
match tray_proxy_groups_display_mode {
|
match tray_proxy_groups_display_mode {
|
||||||
"default" => create_proxy_menu_item(app_handle, false, proxy_sub_menus, &texts.proxies)?,
|
"default" => create_proxy_menu_item(app_handle, false, proxy_sub_menus, &texts.proxies)?,
|
||||||
@@ -1063,25 +865,10 @@ async fn create_tray_menu(
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
let menu = tauri::menu::MenuBuilder::new(app_handle).items(&menu_items).build()?;
|
let menu = tauri::menu::MenuBuilder::new(app_handle).items(&menu_items).build()?;
|
||||||
Ok((menu, latency_items))
|
Ok(menu)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn on_tray_icon_event(_tray_icon: &TrayIcon, tray_event: TrayIconEvent) {
|
fn on_tray_icon_event(_tray_icon: &TrayIcon, tray_event: TrayIconEvent) {
|
||||||
let refresh_proxies = match tray_event {
|
|
||||||
TrayIconEvent::Enter { .. } => Tray::global().proxy_hover_limiter.check(),
|
|
||||||
TrayIconEvent::Click {
|
|
||||||
button: MouseButton::Left | MouseButton::Right,
|
|
||||||
button_state: MouseButtonState::Down,
|
|
||||||
..
|
|
||||||
} => true,
|
|
||||||
_ => false,
|
|
||||||
};
|
|
||||||
if refresh_proxies {
|
|
||||||
AsyncHandler::spawn(|| async {
|
|
||||||
Tray::global().refresh_proxy_items().await;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if matches!(
|
if matches!(
|
||||||
tray_event,
|
tray_event,
|
||||||
TrayIconEvent::Move { .. } | TrayIconEvent::Leave { .. } | TrayIconEvent::Enter { .. }
|
TrayIconEvent::Move { .. } | TrayIconEvent::Leave { .. } | TrayIconEvent::Enter { .. }
|
||||||
@@ -1203,15 +990,6 @@ fn on_menu_event(_: &AppHandle, event: MenuEvent) {
|
|||||||
};
|
};
|
||||||
feat::toggle_proxy_profile(profile_index.into()).await;
|
feat::toggle_proxy_profile(profile_index.into()).await;
|
||||||
}
|
}
|
||||||
id if id.starts_with(MenuIds::TEST_LATENCY) => {
|
|
||||||
let group_name = id
|
|
||||||
.strip_prefix(MenuIds::TEST_LATENCY)
|
|
||||||
.and_then(|rest| rest.strip_prefix('_'));
|
|
||||||
if let Some(group_name) = group_name {
|
|
||||||
logging!(info, Type::Tray, "Tray menu: test group latency {}", group_name);
|
|
||||||
latency::test_proxy_group_delay(group_name).await;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
id if id.starts_with("proxy_") => {
|
id if id.starts_with("proxy_") => {
|
||||||
let rest = match id.strip_prefix("proxy_") {
|
let rest = match id.strip_prefix("proxy_") {
|
||||||
Some(r) => r,
|
Some(r) => r,
|
||||||
|
|||||||
@@ -130,7 +130,7 @@ pub async fn open_or_close_dashboard() {
|
|||||||
logging!(info, Type::Window, "Window toggle result: {result:?}");
|
logging!(info, Type::Window, "Window toggle result: {result:?}");
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn quit() -> clash_verge_signal::ShutdownOutcome {
|
pub async fn quit() {
|
||||||
logging!(debug, Type::System, "启动退出流程");
|
logging!(debug, Type::System, "启动退出流程");
|
||||||
// 设置退出标志
|
// 设置退出标志
|
||||||
handle::Handle::global().set_is_exiting();
|
handle::Handle::global().set_is_exiting();
|
||||||
@@ -165,13 +165,11 @@ pub async fn quit() -> clash_verge_signal::ShutdownOutcome {
|
|||||||
NoticeStatus::AppQuitCoreStopFailed,
|
NoticeStatus::AppQuitCoreStopFailed,
|
||||||
cleanup_result.stop_error.unwrap_or_default(),
|
cleanup_result.stop_error.unwrap_or_default(),
|
||||||
);
|
);
|
||||||
return clash_verge_signal::ShutdownOutcome::Canceled;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
utils::server::shutdown_embedded_server();
|
utils::server::shutdown_embedded_server();
|
||||||
let app_handle = handle::Handle::app_handle();
|
let app_handle = handle::Handle::app_handle();
|
||||||
app_handle.exit(if cleanup_result.all_success { 0 } else { 1 });
|
app_handle.exit(if cleanup_result.all_success { 0 } else { 1 });
|
||||||
clash_verge_signal::ShutdownOutcome::Committed
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn clean_async() -> CleanupResult {
|
pub async fn clean_async() -> CleanupResult {
|
||||||
|
|||||||
@@ -230,6 +230,7 @@ pub fn run() -> std::process::ExitCode {
|
|||||||
if let Err(panic) = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
|
if let Err(panic) = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
|
||||||
resolve::resolve_setup_async();
|
resolve::resolve_setup_async();
|
||||||
resolve::resolve_setup_sync();
|
resolve::resolve_setup_sync();
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
resolve::init_signal();
|
resolve::init_signal();
|
||||||
})) {
|
})) {
|
||||||
log_setup_panic("window-core", panic);
|
log_setup_panic("window-core", panic);
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ fn main() -> ExitCode {
|
|||||||
#[cfg(not(all(feature = "perf-harness", target_os = "macos")))]
|
#[cfg(not(all(feature = "perf-harness", target_os = "macos")))]
|
||||||
fn main() -> ExitCode {
|
fn main() -> ExitCode {
|
||||||
let default_parallelism = std::thread::available_parallelism().map(|n| n.get()).unwrap_or(1);
|
let default_parallelism = std::thread::available_parallelism().map(|n| n.get()).unwrap_or(1);
|
||||||
let worker_limit = std::cmp::min(default_parallelism, 8);
|
let worker_limit = std::cmp::min(default_parallelism, 4);
|
||||||
let blocking_limit = 2 * worker_limit;
|
let blocking_limit = 2 * worker_limit;
|
||||||
|
|
||||||
#[allow(clippy::unwrap_used)]
|
#[allow(clippy::unwrap_used)]
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ use crate::{
|
|||||||
utils::{init, server, window_manager::WindowManager},
|
utils::{init, server, window_manager::WindowManager},
|
||||||
};
|
};
|
||||||
use clash_verge_logging::{Type, logging, logging_error};
|
use clash_verge_logging::{Type, logging, logging_error};
|
||||||
use clash_verge_signal;
|
|
||||||
|
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
pub mod dns;
|
pub mod dns;
|
||||||
@@ -189,6 +188,8 @@ async fn init_silent_updater() {
|
|||||||
logging!(info, Type::Setup, "Silent updater initialized");
|
logging!(info, Type::Setup, "Silent updater initialized");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Upstream has no session-end signal support on Linux; see crates/clash-verge-signal.
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
pub(crate) fn init_signal() {
|
pub(crate) fn init_signal() {
|
||||||
logging!(debug, Type::Setup, "Initializing signal handlers...");
|
logging!(debug, Type::Setup, "Initializing signal handlers...");
|
||||||
clash_verge_signal::register(feat::quit);
|
clash_verge_signal::register(feat::quit);
|
||||||
|
|||||||
@@ -39,8 +39,6 @@ static INSTANCE_LOCK: OnceLock<std::fs::File> = OnceLock::new();
|
|||||||
const PAC_INITIAL_AVAILABLE: bool = false;
|
const PAC_INITIAL_AVAILABLE: bool = false;
|
||||||
static PAC_AVAILABLE: AtomicBool = AtomicBool::new(PAC_INITIAL_AVAILABLE);
|
static PAC_AVAILABLE: AtomicBool = AtomicBool::new(PAC_INITIAL_AVAILABLE);
|
||||||
static COMMANDS_READY: AtomicBool = AtomicBool::new(false);
|
static COMMANDS_READY: AtomicBool = AtomicBool::new(false);
|
||||||
#[cfg(feature = "verge-dev")]
|
|
||||||
static DEV_QUIT_REQUESTED: AtomicBool = AtomicBool::new(false);
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
pub enum SingletonDisposition {
|
pub enum SingletonDisposition {
|
||||||
@@ -164,55 +162,12 @@ fn instance_auth(token: String) -> impl warp::Filter<Extract = (), Error = warp:
|
|||||||
.untuple_one()
|
.untuple_one()
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(feature = "verge-dev")]
|
|
||||||
fn dev_quit_route<F>(
|
|
||||||
token: String,
|
|
||||||
commands_ready: &'static AtomicBool,
|
|
||||||
quit_requested: &'static AtomicBool,
|
|
||||||
trigger: F,
|
|
||||||
) -> impl warp::Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone
|
|
||||||
where
|
|
||||||
F: Fn() + Clone + Send + Sync + 'static,
|
|
||||||
{
|
|
||||||
instance_auth(token)
|
|
||||||
.and(warp::path!("commands" / "dev" / "quit"))
|
|
||||||
.and(warp::post())
|
|
||||||
.and_then(move || {
|
|
||||||
let trigger = trigger.clone();
|
|
||||||
async move {
|
|
||||||
if !commands_ready.load(Ordering::Acquire) {
|
|
||||||
return Ok::<_, warp::Rejection>(warp::reply::with_status(
|
|
||||||
String::from("starting"),
|
|
||||||
warp::http::StatusCode::SERVICE_UNAVAILABLE,
|
|
||||||
));
|
|
||||||
}
|
|
||||||
if quit_requested
|
|
||||||
.compare_exchange(false, true, Ordering::AcqRel, Ordering::Acquire)
|
|
||||||
.is_ok()
|
|
||||||
{
|
|
||||||
trigger();
|
|
||||||
}
|
|
||||||
Ok(warp::reply::with_status(
|
|
||||||
String::from("accepted"),
|
|
||||||
warp::http::StatusCode::ACCEPTED,
|
|
||||||
))
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(feature = "verge-dev")]
|
|
||||||
fn release_dev_quit_latch(quit_requested: &AtomicBool, outcome: clash_verge_signal::ShutdownOutcome) {
|
|
||||||
if matches!(outcome, clash_verge_signal::ShutdownOutcome::Canceled) {
|
|
||||||
quit_requested.store(false, Ordering::Release);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn start_embedded_server(listener: tokio::net::TcpListener, token: String) {
|
fn start_embedded_server(listener: tokio::net::TcpListener, token: String) {
|
||||||
let (shutdown_tx, shutdown_rx) = oneshot::channel();
|
let (shutdown_tx, shutdown_rx) = oneshot::channel();
|
||||||
let _ = SHUTDOWN_SENDER.set(Mutex::new(Some(shutdown_tx)));
|
let _ = SHUTDOWN_SENDER.set(Mutex::new(Some(shutdown_tx)));
|
||||||
|
|
||||||
#[cfg(feature = "verge-dev")]
|
#[cfg(feature = "verge-dev")]
|
||||||
let auth = instance_auth(token.clone());
|
let auth = instance_auth(token);
|
||||||
#[cfg(not(feature = "verge-dev"))]
|
#[cfg(not(feature = "verge-dev"))]
|
||||||
let auth = instance_auth(token);
|
let auth = instance_auth(token);
|
||||||
|
|
||||||
@@ -278,12 +233,6 @@ fn start_embedded_server(listener: tokio::net::TcpListener, token: String) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
let commands = auth.clone().and(visible).or(auth.and(scheme)).or(pac);
|
let commands = auth.clone().and(visible).or(auth.and(scheme)).or(pac);
|
||||||
#[cfg(feature = "verge-dev")]
|
|
||||||
let commands = commands.or(dev_quit_route(token, &COMMANDS_READY, &DEV_QUIT_REQUESTED, || {
|
|
||||||
AsyncHandler::spawn(|| async {
|
|
||||||
release_dev_quit_latch(&DEV_QUIT_REQUESTED, crate::feat::quit().await);
|
|
||||||
});
|
|
||||||
}));
|
|
||||||
AsyncHandler::spawn(move || async move {
|
AsyncHandler::spawn(move || async move {
|
||||||
warp::serve(commands)
|
warp::serve(commands)
|
||||||
.incoming(listener)
|
.incoming(listener)
|
||||||
|
|||||||
@@ -27,8 +27,12 @@ const TRAY_STATUS_ITEM_EXTRA_WIDTH: f64 = 30.0;
|
|||||||
const TRAY_STATUS_ITEM_MIN_LENGTH: f64 = 58.0;
|
const TRAY_STATUS_ITEM_MIN_LENGTH: f64 = 58.0;
|
||||||
const NS_VARIABLE_STATUS_ITEM_LENGTH: f64 = -1.0;
|
const NS_VARIABLE_STATUS_ITEM_LENGTH: f64 = -1.0;
|
||||||
|
|
||||||
|
/// (button_height, mono_advance, attributes).
|
||||||
|
type CachedAttrs = (f64, f64, Retained<NSDictionary<NSString, AnyObject>>);
|
||||||
|
|
||||||
thread_local! {
|
thread_local! {
|
||||||
static LAST_DISPLAY_STR: RefCell<String> = const { RefCell::new(String::new()) };
|
static LAST_DISPLAY_STR: RefCell<String> = const { RefCell::new(String::new()) };
|
||||||
|
static CACHED_ATTRS: RefCell<Option<CachedAttrs>> = const { RefCell::new(None) };
|
||||||
}
|
}
|
||||||
|
|
||||||
fn format_tray_speed(up: u64, down: u64) -> String {
|
fn format_tray_speed(up: u64, down: u64) -> String {
|
||||||
@@ -74,8 +78,26 @@ fn create_attributed_string(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn status_item_length_for_speed(attr_str: &NSAttributedString) -> f64 {
|
/// Attributes and per-glyph advance, rebuilt only when the button height changes.
|
||||||
(attr_str.size().width.ceil() + TRAY_STATUS_ITEM_EXTRA_WIDTH).max(TRAY_STATUS_ITEM_MIN_LENGTH)
|
fn cached_attributes(button_height: f64) -> (f64, Retained<NSDictionary<NSString, AnyObject>>) {
|
||||||
|
CACHED_ATTRS.with(|cache| {
|
||||||
|
if let Some((height, advance, attrs)) = cache.borrow().as_ref()
|
||||||
|
&& *height == button_height
|
||||||
|
{
|
||||||
|
return (*advance, attrs.clone());
|
||||||
|
}
|
||||||
|
let attrs = build_attributes(button_height);
|
||||||
|
let probe = NSString::from_str("0");
|
||||||
|
let advance = create_attributed_string(&probe, Some(&attrs)).size().width;
|
||||||
|
*cache.borrow_mut() = Some((button_height, advance, attrs.clone()));
|
||||||
|
(advance, attrs)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Longest line times the monospaced advance; matches `size().width` for the ASCII-only speed text.
|
||||||
|
fn arithmetic_width(text: &str, advance: f64) -> f64 {
|
||||||
|
let glyphs = text.split('\n').map(str::len).max().unwrap_or(0) as f64;
|
||||||
|
glyphs * advance
|
||||||
}
|
}
|
||||||
|
|
||||||
fn sync_click_target_frame(button: &NSStatusBarButton) {
|
fn sync_click_target_frame(button: &NSStatusBarButton) {
|
||||||
@@ -89,7 +111,7 @@ fn sync_click_target_frame(button: &NSStatusBarButton) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// `with_inner_tray_icon` should run this on the main thread; fail safely if it does not.
|
/// `with_inner_tray_icon` should run this on the main thread; fail safely if it does not.
|
||||||
fn apply_status_item_attributed_title(status_item: &NSStatusItem, text: &NSString, show_speed: bool) {
|
fn apply_status_item_attributed_title(status_item: &NSStatusItem, text: &str, show_speed: bool) {
|
||||||
let Some(mtm) = MainThreadMarker::new() else {
|
let Some(mtm) = MainThreadMarker::new() else {
|
||||||
logging!(warn, Type::Tray, "托盘速率富文本设置跳过:非主线程调用");
|
logging!(warn, Type::Tray, "托盘速率富文本设置跳过:非主线程调用");
|
||||||
return;
|
return;
|
||||||
@@ -97,17 +119,19 @@ fn apply_status_item_attributed_title(status_item: &NSStatusItem, text: &NSStrin
|
|||||||
let Some(button) = status_item.button(mtm) else {
|
let Some(button) = status_item.button(mtm) else {
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
|
let ns_string = NSString::from_str(text);
|
||||||
let attr_str = if show_speed {
|
let attr_str = if show_speed {
|
||||||
let attrs = build_attributes(button.bounds().size.height);
|
let (advance, attrs) = cached_attributes(button.bounds().size.height);
|
||||||
let attrs: &NSDictionary<NSString, AnyObject> = &attrs;
|
let attrs: &NSDictionary<NSString, AnyObject> = &attrs;
|
||||||
let attr_str = create_attributed_string(text, Some(attrs));
|
let attr_str = create_attributed_string(&ns_string, Some(attrs));
|
||||||
let length = status_item_length_for_speed(&attr_str);
|
let width = arithmetic_width(text, advance);
|
||||||
|
let length = (width.ceil() + TRAY_STATUS_ITEM_EXTRA_WIDTH).max(TRAY_STATUS_ITEM_MIN_LENGTH);
|
||||||
if status_item.length() != length {
|
if status_item.length() != length {
|
||||||
status_item.setLength(length);
|
status_item.setLength(length);
|
||||||
}
|
}
|
||||||
attr_str
|
attr_str
|
||||||
} else {
|
} else {
|
||||||
create_attributed_string(text, None)
|
create_attributed_string(&ns_string, None)
|
||||||
};
|
};
|
||||||
button.setAttributedTitle(&attr_str);
|
button.setAttributedTitle(&attr_str);
|
||||||
sync_click_target_frame(&button);
|
sync_click_target_frame(&button);
|
||||||
@@ -121,8 +145,7 @@ pub fn set_speed_attributed_title(status_item: &NSStatusItem, up: u64, down: u64
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
*last = speed_text;
|
*last = speed_text;
|
||||||
let ns_string = NSString::from_str(last.as_str());
|
apply_status_item_attributed_title(status_item, last.as_str(), true);
|
||||||
apply_status_item_attributed_title(status_item, &ns_string, true);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -130,7 +153,6 @@ pub fn clear_speed_attributed_title(status_item: &NSStatusItem) {
|
|||||||
LAST_DISPLAY_STR.with(|last| {
|
LAST_DISPLAY_STR.with(|last| {
|
||||||
last.borrow_mut().clear();
|
last.borrow_mut().clear();
|
||||||
});
|
});
|
||||||
let empty = NSString::from_str("");
|
|
||||||
status_item.setLength(NS_VARIABLE_STATUS_ITEM_LENGTH);
|
status_item.setLength(NS_VARIABLE_STATUS_ITEM_LENGTH);
|
||||||
apply_status_item_attributed_title(status_item, &empty, false);
|
apply_status_item_attributed_title(status_item, "", false);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,10 +47,7 @@ import {
|
|||||||
useCoreDataStatus,
|
useCoreDataStatus,
|
||||||
useProxiesData,
|
useProxiesData,
|
||||||
} from '@/providers/app-data-context'
|
} from '@/providers/app-data-context'
|
||||||
import { syncTrayProxySelection } from '@/services/cmds'
|
|
||||||
import delayManager from '@/services/delay'
|
import delayManager from '@/services/delay'
|
||||||
import { mutate } from '@/services/mutate'
|
|
||||||
import { profileTestUrls } from '@/services/proxy-test-url'
|
|
||||||
import {
|
import {
|
||||||
findCurrentGroupMember,
|
findCurrentGroupMember,
|
||||||
getRecord,
|
getRecord,
|
||||||
@@ -678,20 +675,6 @@ export const CurrentProxyCard = () => {
|
|||||||
[proxyView],
|
[proxyView],
|
||||||
)
|
)
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!selectedGroup) return
|
|
||||||
const customUrl = currentProfile
|
|
||||||
? profileTestUrls(currentProfile)[selectedGroup.name]
|
|
||||||
: undefined
|
|
||||||
delayManager.setUrl(
|
|
||||||
selectedGroup.name,
|
|
||||||
customUrl?.trim() ||
|
|
||||||
selectedGroup.testUrl?.trim() ||
|
|
||||||
verge?.default_latency_test?.trim() ||
|
|
||||||
'http://cp.cloudflare.com/generate_204',
|
|
||||||
)
|
|
||||||
}, [selectedGroup, currentProfile, verge?.default_latency_test])
|
|
||||||
|
|
||||||
const unsortedProxyOptions = useMemo(
|
const unsortedProxyOptions = useMemo(
|
||||||
() => optionsForGroup(selectedGroup),
|
() => optionsForGroup(selectedGroup),
|
||||||
[optionsForGroup, selectedGroup],
|
[optionsForGroup, selectedGroup],
|
||||||
@@ -924,12 +907,6 @@ export const CurrentProxyCard = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
refreshProxy()
|
refreshProxy()
|
||||||
mutate(() => syncTrayProxySelection(), {
|
|
||||||
id: 'sync-tray-selection',
|
|
||||||
errorNotice: false,
|
|
||||||
}).catch((error) => {
|
|
||||||
console.error('[CurrentProxyCard] Failed to sync tray latency:', error)
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
const proxyOptions = useMemo(
|
const proxyOptions = useMemo(
|
||||||
|
|||||||
@@ -75,6 +75,7 @@ interface ProxyChainProps {
|
|||||||
onMarkUnsavedChanges?: () => void
|
onMarkUnsavedChanges?: () => void
|
||||||
mode?: string
|
mode?: string
|
||||||
selectedGroup?: string | null
|
selectedGroup?: string | null
|
||||||
|
onExitChainMode: () => void
|
||||||
}
|
}
|
||||||
|
|
||||||
interface ProxyChainItemProps {
|
interface ProxyChainItemProps {
|
||||||
@@ -331,6 +332,7 @@ export const ProxyChain = ({
|
|||||||
onMarkUnsavedChanges,
|
onMarkUnsavedChanges,
|
||||||
mode,
|
mode,
|
||||||
selectedGroup,
|
selectedGroup,
|
||||||
|
onExitChainMode,
|
||||||
}: ProxyChainProps) => {
|
}: ProxyChainProps) => {
|
||||||
const theme = useTheme()
|
const theme = useTheme()
|
||||||
const { t } = useTranslation()
|
const { t } = useTranslation()
|
||||||
@@ -696,13 +698,18 @@ export const ProxyChain = ({
|
|||||||
<Box
|
<Box
|
||||||
sx={{
|
sx={{
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
|
flexDirection: 'column',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
justifyContent: 'center',
|
justifyContent: 'center',
|
||||||
|
gap: 2,
|
||||||
height: '100%',
|
height: '100%',
|
||||||
color: theme.palette.text.secondary,
|
color: theme.palette.text.secondary,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Typography>{t('proxies.page.chain.empty')}</Typography>
|
<Typography>{t('proxies.page.chain.empty')}</Typography>
|
||||||
|
<Button size="small" variant="outlined" onClick={onExitChainMode}>
|
||||||
|
{t('shared.actions.close')}
|
||||||
|
</Button>
|
||||||
</Box>
|
</Box>
|
||||||
) : (
|
) : (
|
||||||
<DragDropProvider
|
<DragDropProvider
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import VisibilityOffRounded from '@mui/icons-material/VisibilityOffRounded'
|
|||||||
import VisibilityRounded from '@mui/icons-material/VisibilityRounded'
|
import VisibilityRounded from '@mui/icons-material/VisibilityRounded'
|
||||||
import WifiTetheringOffRounded from '@mui/icons-material/WifiTetheringOffRounded'
|
import WifiTetheringOffRounded from '@mui/icons-material/WifiTetheringOffRounded'
|
||||||
import WifiTetheringRounded from '@mui/icons-material/WifiTetheringRounded'
|
import WifiTetheringRounded from '@mui/icons-material/WifiTetheringRounded'
|
||||||
import { Box, IconButton, type SxProps } from '@mui/material'
|
import { Box, IconButton, type SxProps, TextField } from '@mui/material'
|
||||||
import { useDebounceFn } from 'ahooks'
|
import { useDebounceFn } from 'ahooks'
|
||||||
import { memo, useEffect, useRef } from 'react'
|
import { memo, useEffect, useRef } from 'react'
|
||||||
import { flushSync } from 'react-dom'
|
import { flushSync } from 'react-dom'
|
||||||
@@ -18,11 +18,10 @@ import { useTranslation } from 'react-i18next'
|
|||||||
import { useVerge } from '@/hooks/use-verge'
|
import { useVerge } from '@/hooks/use-verge'
|
||||||
import delayManager from '@/services/delay'
|
import delayManager from '@/services/delay'
|
||||||
import { showNotice } from '@/services/notice-service'
|
import { showNotice } from '@/services/notice-service'
|
||||||
import { isValidLatencyTestUrl } from '@/utils/network'
|
import { isValidUrl } from '@/utils/network'
|
||||||
|
|
||||||
import { BaseSearchBox, type SearchState } from '../base'
|
import { BaseSearchBox, type SearchState } from '../base'
|
||||||
|
|
||||||
import { ProxyTestUrlInput } from './proxy-test-url-input'
|
|
||||||
import type { ProxySortType } from './use-filter-sort'
|
import type { ProxySortType } from './use-filter-sort'
|
||||||
import type { HeadState } from './use-head-state'
|
import type { HeadState } from './use-head-state'
|
||||||
|
|
||||||
@@ -70,10 +69,7 @@ export const ProxyGroupTools = memo(function ProxyGroupTools(props: Props) {
|
|||||||
const inputRef = useRef<HTMLInputElement>(null)
|
const inputRef = useRef<HTMLInputElement>(null)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
delayManager.setUrl(
|
delayManager.setUrl(groupName, testUrl?.trim() || url || defaultLatencyUrl)
|
||||||
groupName,
|
|
||||||
testUrl?.trim() || url?.trim() || defaultLatencyUrl,
|
|
||||||
)
|
|
||||||
}, [groupName, testUrl, defaultLatencyUrl, url])
|
}, [groupName, testUrl, defaultLatencyUrl, url])
|
||||||
|
|
||||||
// 过滤输入是高频操作,且每次都会触发整组代理的重新过滤/排序与虚拟列表重渲染,
|
// 过滤输入是高频操作,且每次都会触发整组代理的重新过滤/排序与虚拟列表重渲染,
|
||||||
@@ -116,8 +112,7 @@ export const ProxyGroupTools = memo(function ProxyGroupTools(props: Props) {
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{textState === 'url' && (
|
{textState === 'url' && (
|
||||||
<ProxyTestUrlInput
|
<TextField
|
||||||
name={groupName}
|
|
||||||
inputRef={inputRef}
|
inputRef={inputRef}
|
||||||
autoComplete="new-password"
|
autoComplete="new-password"
|
||||||
hiddenLabel
|
hiddenLabel
|
||||||
@@ -130,7 +125,7 @@ export const ProxyGroupTools = memo(function ProxyGroupTools(props: Props) {
|
|||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
e.stopPropagation()
|
e.stopPropagation()
|
||||||
}}
|
}}
|
||||||
onCommit={(testUrl) => onHeadState({ testUrl })}
|
onChange={(e) => onHeadState({ testUrl: e.target.value })}
|
||||||
sx={{ flex: '1 1 auto', input: { py: 0.65, px: 1 } }}
|
sx={{ flex: '1 1 auto', input: { py: 0.65, px: 1 } }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@@ -181,7 +176,7 @@ export const ProxyGroupTools = memo(function ProxyGroupTools(props: Props) {
|
|||||||
if (testUrl?.trim() && textState !== 'filter') {
|
if (testUrl?.trim() && textState !== 'filter') {
|
||||||
onHeadState({ textState: 'url' })
|
onHeadState({ textState: 'url' })
|
||||||
}
|
}
|
||||||
if (testUrl?.trim() && !isValidLatencyTestUrl(testUrl)) {
|
if (testUrl?.trim() && !isValidUrl(testUrl)) {
|
||||||
showNotice.warning('proxies.feedback.warnings.invalidTestUrl')
|
showNotice.warning('proxies.feedback.warnings.invalidTestUrl')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -77,6 +77,7 @@ interface GroupSelectMenuProps {
|
|||||||
interface ProxyGroupsChainProps {
|
interface ProxyGroupsChainProps {
|
||||||
mode: string
|
mode: string
|
||||||
chainConfigData?: string | null
|
chainConfigData?: string | null
|
||||||
|
onExitChainMode: () => void
|
||||||
availableGroups: any[]
|
availableGroups: any[]
|
||||||
activeSelectedGroup: string | null
|
activeSelectedGroup: string | null
|
||||||
showScrollTop: boolean
|
showScrollTop: boolean
|
||||||
@@ -305,6 +306,7 @@ export function ProxyGroupsChain(props: ProxyGroupsChainProps) {
|
|||||||
const {
|
const {
|
||||||
mode,
|
mode,
|
||||||
chainConfigData,
|
chainConfigData,
|
||||||
|
onExitChainMode,
|
||||||
availableGroups,
|
availableGroups,
|
||||||
activeSelectedGroup,
|
activeSelectedGroup,
|
||||||
showScrollTop,
|
showScrollTop,
|
||||||
@@ -521,6 +523,7 @@ export function ProxyGroupsChain(props: ProxyGroupsChainProps) {
|
|||||||
chainConfigData={chainConfigData}
|
chainConfigData={chainConfigData}
|
||||||
mode={mode}
|
mode={mode}
|
||||||
selectedGroup={activeSelectedGroup}
|
selectedGroup={activeSelectedGroup}
|
||||||
|
onExitChainMode={onExitChainMode}
|
||||||
/>
|
/>
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
@@ -23,9 +23,7 @@ import { useProfiles } from '@/hooks/use-profiles'
|
|||||||
import { useProxySelection } from '@/hooks/use-proxy-selection'
|
import { useProxySelection } from '@/hooks/use-proxy-selection'
|
||||||
import { useVerge } from '@/hooks/use-verge'
|
import { useVerge } from '@/hooks/use-verge'
|
||||||
import { useProxiesData, useSystemData } from '@/providers/app-data-context'
|
import { useProxiesData, useSystemData } from '@/providers/app-data-context'
|
||||||
import { syncTrayProxySelection } from '@/services/cmds'
|
|
||||||
import delayManager from '@/services/delay'
|
import delayManager from '@/services/delay'
|
||||||
import { mutate } from '@/services/mutate'
|
|
||||||
import {
|
import {
|
||||||
isInteractableMember,
|
isInteractableMember,
|
||||||
resolveMember,
|
resolveMember,
|
||||||
@@ -44,6 +42,7 @@ import {
|
|||||||
ProxyGroupNavigator,
|
ProxyGroupNavigator,
|
||||||
} from './proxy-group-navigator'
|
} from './proxy-group-navigator'
|
||||||
import { ProxyRender } from './proxy-render'
|
import { ProxyRender } from './proxy-render'
|
||||||
|
import type { HeadState } from './use-head-state'
|
||||||
import {
|
import {
|
||||||
PROXY_GROUP_HEADER_SENSORS,
|
PROXY_GROUP_HEADER_SENSORS,
|
||||||
useProxyGroupHeaderLayout,
|
useProxyGroupHeaderLayout,
|
||||||
@@ -70,6 +69,7 @@ interface Props {
|
|||||||
mode: string
|
mode: string
|
||||||
isChainMode?: boolean
|
isChainMode?: boolean
|
||||||
chainConfigData?: string | null
|
chainConfigData?: string | null
|
||||||
|
onExitChainMode: () => void
|
||||||
}
|
}
|
||||||
|
|
||||||
function useEmptyRenderList() {
|
function useEmptyRenderList() {
|
||||||
@@ -90,11 +90,11 @@ function useProxyRenderState(
|
|||||||
) {
|
) {
|
||||||
const { verge } = useVerge()
|
const { verge } = useVerge()
|
||||||
const { proxyView } = useProxiesData()
|
const { proxyView } = useProxiesData()
|
||||||
const { renderList, onProxies, onHeadState } = useRenderList(
|
const {
|
||||||
mode,
|
renderList,
|
||||||
isChainMode,
|
onProxies,
|
||||||
activeSelectedGroup,
|
onHeadState: setListHeadState,
|
||||||
)
|
} = useRenderList(mode, isChainMode, activeSelectedGroup)
|
||||||
const scrollPositionKey = useMemo(
|
const scrollPositionKey = useMemo(
|
||||||
() =>
|
() =>
|
||||||
isChainMode
|
isChainMode
|
||||||
@@ -103,6 +103,14 @@ function useProxyRenderState(
|
|||||||
[activeSelectedGroup, isChainMode, mode],
|
[activeSelectedGroup, isChainMode, mode],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const onHeadState = useCallback(
|
||||||
|
(groupName: string, patch: Partial<HeadState>) => {
|
||||||
|
if (patch.open) onProxies()
|
||||||
|
setListHeadState(groupName, patch)
|
||||||
|
},
|
||||||
|
[onProxies, setListHeadState],
|
||||||
|
)
|
||||||
|
|
||||||
const timeout = verge?.default_latency_timeout || 10000
|
const timeout = verge?.default_latency_timeout || 10000
|
||||||
|
|
||||||
const handleCheckAll = useStableCallback(
|
const handleCheckAll = useStableCallback(
|
||||||
@@ -135,12 +143,6 @@ function useProxyRenderState(
|
|||||||
console.error(`[ProxyGroups] 延迟测试出错,组: ${groupName}`, error)
|
console.error(`[ProxyGroups] 延迟测试出错,组: ${groupName}`, error)
|
||||||
} finally {
|
} finally {
|
||||||
onProxies()
|
onProxies()
|
||||||
mutate(() => syncTrayProxySelection(), {
|
|
||||||
id: 'sync-tray-selection',
|
|
||||||
errorNotice: false,
|
|
||||||
}).catch((error) => {
|
|
||||||
console.error('[ProxyGroups] Failed to sync tray latency:', error)
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
@@ -190,8 +192,9 @@ function useProxyRenderState(
|
|||||||
function ChainProxyGroups(props: {
|
function ChainProxyGroups(props: {
|
||||||
mode: string
|
mode: string
|
||||||
chainConfigData?: string | null
|
chainConfigData?: string | null
|
||||||
|
onExitChainMode: () => void
|
||||||
}) {
|
}) {
|
||||||
const { mode, chainConfigData } = props
|
const { mode, chainConfigData, onExitChainMode } = props
|
||||||
const { proxyView } = useProxiesData()
|
const { proxyView } = useProxiesData()
|
||||||
const [selectedGroup, setSelectedGroup] = useState<string | null>(null)
|
const [selectedGroup, setSelectedGroup] = useState<string | null>(null)
|
||||||
|
|
||||||
@@ -346,6 +349,7 @@ function ChainProxyGroups(props: {
|
|||||||
<ProxyGroupsChain
|
<ProxyGroupsChain
|
||||||
mode={mode}
|
mode={mode}
|
||||||
chainConfigData={chainConfigData}
|
chainConfigData={chainConfigData}
|
||||||
|
onExitChainMode={onExitChainMode}
|
||||||
availableGroups={availableGroups}
|
availableGroups={availableGroups}
|
||||||
activeSelectedGroup={activeSelectedGroup}
|
activeSelectedGroup={activeSelectedGroup}
|
||||||
showScrollTop={showScrollTop}
|
showScrollTop={showScrollTop}
|
||||||
@@ -617,7 +621,7 @@ function NormalProxyGroups(props: { mode: string }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const ProxyGroups = (props: Props) => {
|
export const ProxyGroups = (props: Props) => {
|
||||||
const { mode, isChainMode = false, chainConfigData } = props
|
const { mode, isChainMode = false, chainConfigData, onExitChainMode } = props
|
||||||
const { profiles, isLoading: isProfilesLoading } = useProfiles()
|
const { profiles, isLoading: isProfilesLoading } = useProfiles()
|
||||||
const { isProxyViewPending } = useProxiesData()
|
const { isProxyViewPending } = useProxiesData()
|
||||||
const { isRunningModePending } = useSystemData()
|
const { isRunningModePending } = useSystemData()
|
||||||
@@ -639,7 +643,11 @@ export const ProxyGroups = (props: Props) => {
|
|||||||
return <ProxyEmptyState reason={listState.reason} />
|
return <ProxyEmptyState reason={listState.reason} />
|
||||||
case 'render':
|
case 'render':
|
||||||
return isChainMode ? (
|
return isChainMode ? (
|
||||||
<ChainProxyGroups mode={mode} chainConfigData={chainConfigData} />
|
<ChainProxyGroups
|
||||||
|
mode={mode}
|
||||||
|
chainConfigData={chainConfigData}
|
||||||
|
onExitChainMode={onExitChainMode}
|
||||||
|
/>
|
||||||
) : (
|
) : (
|
||||||
<NormalProxyGroups mode={mode} />
|
<NormalProxyGroups mode={mode} />
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import {
|
|||||||
SortByAlphaRounded,
|
SortByAlphaRounded,
|
||||||
SortRounded,
|
SortRounded,
|
||||||
} from '@mui/icons-material'
|
} from '@mui/icons-material'
|
||||||
import { Box, IconButton, type SxProps } from '@mui/material'
|
import { Box, IconButton, TextField, type SxProps } from '@mui/material'
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
|
|
||||||
@@ -20,9 +20,8 @@ import { useVerge } from '@/hooks/use-verge'
|
|||||||
import delayManager from '@/services/delay'
|
import delayManager from '@/services/delay'
|
||||||
import { showNotice } from '@/services/notice-service'
|
import { showNotice } from '@/services/notice-service'
|
||||||
import { debugLog } from '@/utils/debug'
|
import { debugLog } from '@/utils/debug'
|
||||||
import { isValidLatencyTestUrl } from '@/utils/network'
|
import { isValidUrl } from '@/utils/network'
|
||||||
|
|
||||||
import { ProxyTestUrlInput } from './proxy-test-url-input'
|
|
||||||
import type { ProxySortType } from './use-filter-sort'
|
import type { ProxySortType } from './use-filter-sort'
|
||||||
import type { HeadState } from './use-head-state'
|
import type { HeadState } from './use-head-state'
|
||||||
|
|
||||||
@@ -73,10 +72,7 @@ export const ProxyHead = ({
|
|||||||
'http://cp.cloudflare.com/generate_204'
|
'http://cp.cloudflare.com/generate_204'
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
delayManager.setUrl(
|
delayManager.setUrl(groupName, testUrl?.trim() || url || defaultLatencyUrl)
|
||||||
groupName,
|
|
||||||
testUrl?.trim() || url?.trim() || defaultLatencyUrl,
|
|
||||||
)
|
|
||||||
}, [groupName, testUrl, defaultLatencyUrl, url])
|
}, [groupName, testUrl, defaultLatencyUrl, url])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -101,7 +97,7 @@ export const ProxyHead = ({
|
|||||||
debugLog(`[ProxyHead] 使用自定义测试URL: ${testUrl}`)
|
debugLog(`[ProxyHead] 使用自定义测试URL: ${testUrl}`)
|
||||||
onHeadState({ textState: 'url' })
|
onHeadState({ textState: 'url' })
|
||||||
}
|
}
|
||||||
if (testUrl?.trim() && !isValidLatencyTestUrl(testUrl)) {
|
if (testUrl?.trim() && !isValidUrl(testUrl)) {
|
||||||
showNotice.warning('proxies.feedback.warnings.invalidTestUrl')
|
showNotice.warning('proxies.feedback.warnings.invalidTestUrl')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -192,8 +188,7 @@ export const ProxyHead = ({
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{textState === 'url' && (
|
{textState === 'url' && (
|
||||||
<ProxyTestUrlInput
|
<TextField
|
||||||
name={groupName}
|
|
||||||
autoComplete="new-password"
|
autoComplete="new-password"
|
||||||
autoFocus={autoFocus}
|
autoFocus={autoFocus}
|
||||||
hiddenLabel
|
hiddenLabel
|
||||||
@@ -202,7 +197,7 @@ export const ProxyHead = ({
|
|||||||
size="small"
|
size="small"
|
||||||
variant="outlined"
|
variant="outlined"
|
||||||
placeholder={t('proxies.page.placeholders.delayCheckUrl')}
|
placeholder={t('proxies.page.placeholders.delayCheckUrl')}
|
||||||
onCommit={(testUrl) => onHeadState({ testUrl })}
|
onChange={(e) => onHeadState({ testUrl: e.target.value })}
|
||||||
sx={{ ml: 0.5, flex: '1 1 auto', input: { py: 0.65, px: 1 } }}
|
sx={{ ml: 0.5, flex: '1 1 auto', input: { py: 0.65, px: 1 } }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -1,55 +0,0 @@
|
|||||||
import { TextField, type TextFieldProps } from '@mui/material'
|
|
||||||
import { useEffect, useEffectEvent, useRef, useState } from 'react'
|
|
||||||
|
|
||||||
import { useProfiles } from '@/hooks/use-profiles'
|
|
||||||
|
|
||||||
type Props = Omit<TextFieldProps, 'value' | 'onChange'> & {
|
|
||||||
value: string
|
|
||||||
onCommit: (url: string) => void
|
|
||||||
}
|
|
||||||
|
|
||||||
export const ProxyTestUrlInput = ({ value, name, ...props }: Props) => {
|
|
||||||
const { profiles } = useProfiles()
|
|
||||||
return (
|
|
||||||
<DraftTestUrlInput
|
|
||||||
key={JSON.stringify([profiles?.current, name])}
|
|
||||||
name={name}
|
|
||||||
value={value}
|
|
||||||
{...props}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
const DraftTestUrlInput = ({ value, onCommit, ...props }: Props) => {
|
|
||||||
const [draft, setDraft] = useState<string | null>(null)
|
|
||||||
const pendingRef = useRef<string | null>(null)
|
|
||||||
const commitOnUnmount = useEffectEvent(() => {
|
|
||||||
if (pendingRef.current !== null && pendingRef.current !== value)
|
|
||||||
onCommit(pendingRef.current)
|
|
||||||
})
|
|
||||||
useEffect(() => () => commitOnUnmount(), [])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<TextField
|
|
||||||
{...props}
|
|
||||||
value={draft ?? value}
|
|
||||||
onChange={(event) => {
|
|
||||||
pendingRef.current = event.target.value
|
|
||||||
setDraft(event.target.value)
|
|
||||||
}}
|
|
||||||
onBlur={() => {
|
|
||||||
const next = pendingRef.current
|
|
||||||
pendingRef.current = null
|
|
||||||
setDraft(null)
|
|
||||||
if (next !== null && next !== value) onCommit(next)
|
|
||||||
}}
|
|
||||||
onKeyDown={(event) => {
|
|
||||||
if (event.key === 'Enter') {
|
|
||||||
event.preventDefault()
|
|
||||||
const input = event.target as HTMLInputElement
|
|
||||||
input.blur()
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -13,17 +13,11 @@ const node = (memberIndex: number, delay: number, name = `${memberIndex}`) =>
|
|||||||
kind: 'node',
|
kind: 'node',
|
||||||
ref: { kind: 'node', name, recordId: `${memberIndex}` },
|
ref: { kind: 'node', name, recordId: `${memberIndex}` },
|
||||||
node: {
|
node: {
|
||||||
recordId: `${memberIndex}`,
|
|
||||||
history: [{ delay }],
|
history: [{ delay }],
|
||||||
extra: {
|
|
||||||
'http://cp.cloudflare.com/generate_204': {
|
|
||||||
history: [{ time: new Date(0).toISOString(), delay }],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
source: { kind: 'provider', providerName: `${memberIndex}` },
|
source: { kind: 'provider', providerName: `${memberIndex}` },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}) as unknown as ResolvedMemberOccurrence
|
}) as ResolvedMemberOccurrence
|
||||||
|
|
||||||
afterEach(() => vi.restoreAllMocks())
|
afterEach(() => vi.restoreAllMocks())
|
||||||
|
|
||||||
@@ -42,9 +36,7 @@ test('matches the previous comparator for cached, fallback and sentinel delays',
|
|||||||
for (const cached of [false, true]) {
|
for (const cached of [false, true]) {
|
||||||
const group = `sort-${cached}`
|
const group = `sort-${cached}`
|
||||||
if (cached) {
|
if (cached) {
|
||||||
values.forEach((delay, i) =>
|
values.forEach((delay, i) => delayManager.setDelay(`${i}`, group, delay))
|
||||||
delayManager.setDelay(list[i].member, group, delay),
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
for (const timeout of [10000, 20, 0, NaN]) {
|
for (const timeout of [10000, 20, 0, NaN]) {
|
||||||
const expected = list
|
const expected = list
|
||||||
@@ -74,7 +66,7 @@ test('reads each occurrence once and observes cache updates and expiry on the ne
|
|||||||
node(3, 25),
|
node(3, 25),
|
||||||
]
|
]
|
||||||
const cachedOrder = [list[0], list[2], list[1], list[3]]
|
const cachedOrder = [list[0], list[2], list[1], list[3]]
|
||||||
delayManager.setDelay(list[0].member, 'expiry', 1)
|
delayManager.setDelay('0', 'expiry', 1)
|
||||||
const get = vi.spyOn(delayManager, 'getDelayFix')
|
const get = vi.spyOn(delayManager, 'getDelayFix')
|
||||||
expect(filterSort(list, 'expiry', '', 1)).toEqual(cachedOrder)
|
expect(filterSort(list, 'expiry', '', 1)).toEqual(cachedOrder)
|
||||||
expect(get).toHaveBeenCalledTimes(list.length)
|
expect(get).toHaveBeenCalledTimes(list.length)
|
||||||
@@ -88,7 +80,7 @@ test('reads each occurrence once and observes cache updates and expiry on the ne
|
|||||||
list[3],
|
list[3],
|
||||||
list[0],
|
list[0],
|
||||||
])
|
])
|
||||||
delayManager.setDelay(list[0].member, 'expiry', 2)
|
delayManager.setDelay('0', 'expiry', 2)
|
||||||
expect(filterSort(list, 'expiry', '', 1)).toEqual(cachedOrder)
|
expect(filterSort(list, 'expiry', '', 1)).toEqual(cachedOrder)
|
||||||
get.mockClear()
|
get.mockClear()
|
||||||
filterSort([], 'expiry', '', 1)
|
filterSort([], 'expiry', '', 1)
|
||||||
|
|||||||
@@ -1,10 +1,6 @@
|
|||||||
import { useCallback, useEffect, useReducer } from 'react'
|
import { useCallback, useEffect, useReducer } from 'react'
|
||||||
|
|
||||||
import { useProfiles } from '@/hooks/use-profiles'
|
import { useProfiles } from '@/hooks/use-profiles'
|
||||||
import {
|
|
||||||
profileTestUrls,
|
|
||||||
commitProfileTestUrl,
|
|
||||||
} from '@/services/proxy-test-url'
|
|
||||||
|
|
||||||
import { ProxySortType } from './use-filter-sort'
|
import { ProxySortType } from './use-filter-sort'
|
||||||
|
|
||||||
@@ -36,45 +32,22 @@ export const DEFAULT_STATE: HeadState = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type HeadStateAction =
|
type HeadStateAction =
|
||||||
| { type: 'reset'; profile: string }
|
| { type: 'reset' }
|
||||||
| { type: 'replace'; profile: string; payload: Record<string, HeadState> }
|
| { type: 'replace'; payload: Record<string, HeadState> }
|
||||||
| { type: 'update'; groupName: string; patch: Partial<HeadState> }
|
| { type: 'update'; groupName: string; patch: Partial<HeadState> }
|
||||||
| { type: 'urls'; urls: Record<string, string> }
|
|
||||||
|
|
||||||
interface LoadedHeadState {
|
|
||||||
profile: string | null
|
|
||||||
heads: Record<string, HeadState>
|
|
||||||
}
|
|
||||||
|
|
||||||
function headStateReducer(
|
function headStateReducer(
|
||||||
state: LoadedHeadState,
|
state: Record<string, HeadState>,
|
||||||
action: HeadStateAction,
|
action: HeadStateAction,
|
||||||
): LoadedHeadState {
|
): Record<string, HeadState> {
|
||||||
switch (action.type) {
|
switch (action.type) {
|
||||||
case 'reset':
|
case 'reset':
|
||||||
return { profile: action.profile, heads: {} }
|
return {}
|
||||||
case 'replace':
|
case 'replace':
|
||||||
return { profile: action.profile, heads: action.payload }
|
return action.payload
|
||||||
case 'urls': {
|
|
||||||
let heads = state.heads
|
|
||||||
for (const [name, testUrl] of Object.entries(action.urls)) {
|
|
||||||
if (heads[name]?.testUrl === testUrl) continue
|
|
||||||
heads = {
|
|
||||||
...heads,
|
|
||||||
[name]: { ...DEFAULT_STATE, ...heads[name], testUrl },
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return heads === state.heads ? state : { ...state, heads }
|
|
||||||
}
|
|
||||||
case 'update': {
|
case 'update': {
|
||||||
const prev = state.heads[action.groupName] || DEFAULT_STATE
|
const prev = state[action.groupName] || DEFAULT_STATE
|
||||||
return {
|
return { ...state, [action.groupName]: { ...prev, ...action.patch } }
|
||||||
...state,
|
|
||||||
heads: {
|
|
||||||
...state.heads,
|
|
||||||
[action.groupName]: { ...prev, ...action.patch },
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
return state
|
return state
|
||||||
@@ -82,42 +55,30 @@ function headStateReducer(
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function useHeadStateNew() {
|
export function useHeadStateNew() {
|
||||||
const { profiles, current: profile } = useProfiles()
|
const { profiles } = useProfiles()
|
||||||
const current = profiles?.current || ''
|
const current = profiles?.current || ''
|
||||||
|
|
||||||
const [{ profile: loadedProfile, heads: state }, dispatch] = useReducer(
|
const [state, dispatch] = useReducer(headStateReducer, {})
|
||||||
headStateReducer,
|
|
||||||
{ profile: null, heads: {} },
|
|
||||||
)
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const urls = profile ? profileTestUrls(profile) : {}
|
|
||||||
if (loadedProfile === current) {
|
|
||||||
dispatch({ type: 'urls', urls })
|
|
||||||
return
|
|
||||||
}
|
|
||||||
try {
|
try {
|
||||||
const data = JSON.parse(
|
const data = JSON.parse(
|
||||||
localStorage.getItem(HEAD_STATE_KEY) || '{}',
|
localStorage.getItem(HEAD_STATE_KEY)!,
|
||||||
) as HeadStateStorage
|
) as HeadStateStorage
|
||||||
|
|
||||||
const value = data?.[current] || {}
|
const value = data[current] || {}
|
||||||
for (const [name, testUrl] of Object.entries(urls)) {
|
|
||||||
value[name] = { ...DEFAULT_STATE, ...value[name], testUrl }
|
|
||||||
}
|
|
||||||
|
|
||||||
if (value && typeof value === 'object') {
|
if (value && typeof value === 'object') {
|
||||||
dispatch({ type: 'replace', profile: current, payload: value })
|
dispatch({ type: 'replace', payload: value })
|
||||||
} else {
|
} else {
|
||||||
dispatch({ type: 'reset', profile: current })
|
dispatch({ type: 'reset' })
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
dispatch({ type: 'reset', profile: current })
|
dispatch({ type: 'reset' })
|
||||||
}
|
}
|
||||||
}, [current, loadedProfile, profile])
|
}, [current])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (loadedProfile !== current) return
|
|
||||||
const timer = setTimeout(() => {
|
const timer = setTimeout(() => {
|
||||||
try {
|
try {
|
||||||
const item = localStorage.getItem(HEAD_STATE_KEY)
|
const item = localStorage.getItem(HEAD_STATE_KEY)
|
||||||
@@ -133,16 +94,13 @@ export function useHeadStateNew() {
|
|||||||
})
|
})
|
||||||
|
|
||||||
return () => clearTimeout(timer)
|
return () => clearTimeout(timer)
|
||||||
}, [state, current, loadedProfile])
|
}, [state, current])
|
||||||
|
|
||||||
const setHeadState = useCallback(
|
const setHeadState = useCallback(
|
||||||
(groupName: string, obj: Partial<HeadState>) => {
|
(groupName: string, obj: Partial<HeadState>) => {
|
||||||
dispatch({ type: 'update', groupName, patch: obj })
|
dispatch({ type: 'update', groupName, patch: obj })
|
||||||
if (current && obj.testUrl !== undefined) {
|
|
||||||
void commitProfileTestUrl(current, groupName, obj.testUrl)
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
[current],
|
[],
|
||||||
)
|
)
|
||||||
|
|
||||||
return [state, setHeadState] as const
|
return [state, setHeadState] as const
|
||||||
|
|||||||
@@ -116,7 +116,6 @@ const virtualGroup = (members: ProxyGroupView['members']): ProxyGroupView => ({
|
|||||||
mptcp: false,
|
mptcp: false,
|
||||||
smux: false,
|
smux: false,
|
||||||
history: [],
|
history: [],
|
||||||
extra: {},
|
|
||||||
members,
|
members,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +1,11 @@
|
|||||||
import Visibility from '@mui/icons-material/Visibility'
|
import { Button, Grid, Stack, TextField } from '@mui/material'
|
||||||
import VisibilityOff from '@mui/icons-material/VisibilityOff'
|
|
||||||
import {
|
|
||||||
TextField,
|
|
||||||
Button,
|
|
||||||
Grid,
|
|
||||||
Stack,
|
|
||||||
IconButton,
|
|
||||||
InputAdornment,
|
|
||||||
} from '@mui/material'
|
|
||||||
import { useLockFn } from 'ahooks'
|
import { useLockFn } from 'ahooks'
|
||||||
import { useState, useRef, memo, useEffect } from 'react'
|
import { memo, useEffect, useRef } from 'react'
|
||||||
import { useForm } from 'react-hook-form'
|
import { useForm } from 'react-hook-form'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
|
|
||||||
import { useVerge } from '@/hooks/use-verge'
|
import { useVerge } from '@/hooks/use-verge'
|
||||||
import { saveWebdavConfig, createWebdavBackup } from '@/services/cmds'
|
import { createWebdavBackup, saveWebdavConfig } from '@/services/cmds'
|
||||||
import { mutate } from '@/services/mutate'
|
import { mutate } from '@/services/mutate'
|
||||||
import { errorDetail, showNotice } from '@/services/notice-service'
|
import { errorDetail, showNotice } from '@/services/notice-service'
|
||||||
import {
|
import {
|
||||||
@@ -43,7 +34,6 @@ export const BackupConfigViewer = memo(
|
|||||||
const { t } = useTranslation()
|
const { t } = useTranslation()
|
||||||
const { verge, mutateVerge } = useVerge()
|
const { verge, mutateVerge } = useVerge()
|
||||||
const { webdav_url, webdav_username, webdav_password } = verge || {}
|
const { webdav_url, webdav_username, webdav_password } = verge || {}
|
||||||
const [showPassword, setShowPassword] = useState(false)
|
|
||||||
const usernameRef = useRef<HTMLInputElement>(null)
|
const usernameRef = useRef<HTMLInputElement>(null)
|
||||||
const passwordRef = useRef<HTMLInputElement>(null)
|
const passwordRef = useRef<HTMLInputElement>(null)
|
||||||
const urlRef = useRef<HTMLInputElement>(null)
|
const urlRef = useRef<HTMLInputElement>(null)
|
||||||
@@ -68,10 +58,6 @@ export const BackupConfigViewer = memo(
|
|||||||
const webdavStatus = getWebdavStatus(webdavSignature)
|
const webdavStatus = getWebdavStatus(webdavSignature)
|
||||||
const shouldAutoInit = webdavStatus !== 'failed'
|
const shouldAutoInit = webdavStatus !== 'failed'
|
||||||
|
|
||||||
const handleClickShowPassword = () => {
|
|
||||||
setShowPassword((prev) => !prev)
|
|
||||||
}
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!webdav_url || !webdav_username || !webdav_password) {
|
if (!webdav_url || !webdav_username || !webdav_password) {
|
||||||
return
|
return
|
||||||
@@ -215,7 +201,7 @@ export const BackupConfigViewer = memo(
|
|||||||
<Grid size={{ xs: 6 }}>
|
<Grid size={{ xs: 6 }}>
|
||||||
<TextField
|
<TextField
|
||||||
label={t('shared.labels.password')}
|
label={t('shared.labels.password')}
|
||||||
type={showPassword ? 'text' : 'password'}
|
type="password"
|
||||||
variant="outlined"
|
variant="outlined"
|
||||||
size="small"
|
size="small"
|
||||||
autoCorrect="off"
|
autoCorrect="off"
|
||||||
@@ -223,20 +209,6 @@ export const BackupConfigViewer = memo(
|
|||||||
spellCheck="false"
|
spellCheck="false"
|
||||||
inputRef={passwordRef}
|
inputRef={passwordRef}
|
||||||
{...register('password')}
|
{...register('password')}
|
||||||
slotProps={{
|
|
||||||
input: {
|
|
||||||
endAdornment: (
|
|
||||||
<InputAdornment position="end">
|
|
||||||
<IconButton
|
|
||||||
onClick={handleClickShowPassword}
|
|
||||||
edge="end"
|
|
||||||
>
|
|
||||||
{showPassword ? <VisibilityOff /> : <Visibility />}
|
|
||||||
</IconButton>
|
|
||||||
</InputAdornment>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
}}
|
|
||||||
/>
|
/>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
import { Button, ButtonGroup } from '@mui/material'
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
value?: string
|
||||||
|
onChange?: (value: string) => void
|
||||||
|
}
|
||||||
|
|
||||||
|
export const DnsModeSwitch = (props: Props) => {
|
||||||
|
const { value, onChange } = props
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ButtonGroup size="small" sx={{ my: '4px' }}>
|
||||||
|
<Button
|
||||||
|
variant={!value ? 'contained' : 'outlined'}
|
||||||
|
onClick={() => onChange?.('')}
|
||||||
|
sx={{ textTransform: 'capitalize' }}
|
||||||
|
>
|
||||||
|
Auto
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant={value === 'disabled' ? 'contained' : 'outlined'}
|
||||||
|
onClick={() => onChange?.('disabled')}
|
||||||
|
sx={{ textTransform: 'capitalize' }}
|
||||||
|
>
|
||||||
|
Disabled
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant={value === 'native' ? 'contained' : 'outlined'}
|
||||||
|
onClick={() => onChange?.('native')}
|
||||||
|
sx={{ textTransform: 'capitalize' }}
|
||||||
|
>
|
||||||
|
Native
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant={value === 'hijack' ? 'contained' : 'outlined'}
|
||||||
|
onClick={() => onChange?.('hijack')}
|
||||||
|
sx={{ textTransform: 'capitalize' }}
|
||||||
|
>
|
||||||
|
Hijack
|
||||||
|
</Button>
|
||||||
|
</ButtonGroup>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -26,6 +26,7 @@ import { showNotice } from '@/services/notice-service'
|
|||||||
import getSystem from '@/utils/get-system'
|
import getSystem from '@/utils/get-system'
|
||||||
import { areValidIpCidrs } from '@/utils/network'
|
import { areValidIpCidrs } from '@/utils/network'
|
||||||
|
|
||||||
|
import { DnsModeSwitch } from './dns-mode-switch'
|
||||||
import { StackModeSwitch } from './stack-mode-switch'
|
import { StackModeSwitch } from './stack-mode-switch'
|
||||||
|
|
||||||
const OS = getSystem()
|
const OS = getSystem()
|
||||||
@@ -52,6 +53,7 @@ export function TunViewer({ ref }: { ref?: Ref<DialogRef> }) {
|
|||||||
dnsHijack: ['any:53'],
|
dnsHijack: ['any:53'],
|
||||||
strictRoute: false,
|
strictRoute: false,
|
||||||
mtu: 1500,
|
mtu: 1500,
|
||||||
|
dnsMode: '',
|
||||||
})
|
})
|
||||||
|
|
||||||
const routeExcludeAddressItems = splitRouteExcludeAddress(
|
const routeExcludeAddressItems = splitRouteExcludeAddress(
|
||||||
@@ -84,6 +86,7 @@ export function TunViewer({ ref }: { ref?: Ref<DialogRef> }) {
|
|||||||
dnsHijack: clash?.tun['dns-hijack'] ?? ['any:53'],
|
dnsHijack: clash?.tun['dns-hijack'] ?? ['any:53'],
|
||||||
strictRoute: clash?.tun['strict-route'] ?? false,
|
strictRoute: clash?.tun['strict-route'] ?? false,
|
||||||
mtu: clash?.tun.mtu ?? 1500,
|
mtu: clash?.tun.mtu ?? 1500,
|
||||||
|
dnsMode: clash?.tun['dns-mode'] ?? '',
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
close: () => setOpen(false),
|
close: () => setOpen(false),
|
||||||
@@ -117,6 +120,7 @@ export function TunViewer({ ref }: { ref?: Ref<DialogRef> }) {
|
|||||||
: {}),
|
: {}),
|
||||||
'auto-detect-interface': values.autoDetectInterface,
|
'auto-detect-interface': values.autoDetectInterface,
|
||||||
'dns-hijack': values.dnsHijack[0] === '' ? [] : values.dnsHijack,
|
'dns-hijack': values.dnsHijack[0] === '' ? [] : values.dnsHijack,
|
||||||
|
'dns-mode': values.dnsMode,
|
||||||
'strict-route': values.strictRoute,
|
'strict-route': values.strictRoute,
|
||||||
mtu: values.mtu ?? 1500,
|
mtu: values.mtu ?? 1500,
|
||||||
}
|
}
|
||||||
@@ -163,6 +167,7 @@ export function TunViewer({ ref }: { ref?: Ref<DialogRef> }) {
|
|||||||
'auto-detect-interface': true,
|
'auto-detect-interface': true,
|
||||||
'dns-hijack': ['any:53'],
|
'dns-hijack': ['any:53'],
|
||||||
'route-exclude-address': [],
|
'route-exclude-address': [],
|
||||||
|
'dns-mode': '',
|
||||||
'strict-route': false,
|
'strict-route': false,
|
||||||
mtu: 1500,
|
mtu: 1500,
|
||||||
}
|
}
|
||||||
@@ -176,6 +181,7 @@ export function TunViewer({ ref }: { ref?: Ref<DialogRef> }) {
|
|||||||
dnsHijack: ['any:53'],
|
dnsHijack: ['any:53'],
|
||||||
strictRoute: false,
|
strictRoute: false,
|
||||||
mtu: 1500,
|
mtu: 1500,
|
||||||
|
dnsMode: '',
|
||||||
})
|
})
|
||||||
await patchClash({ tun })
|
await patchClash({ tun })
|
||||||
await mutateClash(
|
await mutateClash(
|
||||||
@@ -212,6 +218,25 @@ export function TunViewer({ ref }: { ref?: Ref<DialogRef> }) {
|
|||||||
/>
|
/>
|
||||||
</ListItem>
|
</ListItem>
|
||||||
|
|
||||||
|
<ListItem sx={{ padding: '5px 2px' }}>
|
||||||
|
<ListItemText
|
||||||
|
primary={t('settings.modals.tun.fields.dnsMode')}
|
||||||
|
sx={{ maxWidth: 'fit-content' }}
|
||||||
|
/>
|
||||||
|
<TooltipIcon
|
||||||
|
title={t('settings.modals.tun.tooltips.dnsMode')}
|
||||||
|
sx={{ opacity: 0.7 }}
|
||||||
|
/>
|
||||||
|
<Box sx={{ marginLeft: 'auto' }}>
|
||||||
|
<DnsModeSwitch
|
||||||
|
value={values.dnsMode}
|
||||||
|
onChange={(value) => {
|
||||||
|
setValues((v) => ({ ...v, dnsMode: value }))
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
</ListItem>
|
||||||
|
|
||||||
<ListItem sx={{ padding: '5px 2px' }}>
|
<ListItem sx={{ padding: '5px 2px' }}>
|
||||||
<ListItemText primary={t('settings.modals.tun.fields.device')} />
|
<ListItemText primary={t('settings.modals.tun.fields.device')} />
|
||||||
<TextField
|
<TextField
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
import { useCallback, useEffect, useRef } from 'react'
|
import { useCallback, useRef } from 'react'
|
||||||
|
|
||||||
import type { ProfilePatch, ProfileSelection } from '@/services/bindings'
|
import type { ProfilePatch, ProfileSelection } from '@/services/bindings'
|
||||||
import { getProfiles, patchProfile, patchProfilesConfig } from '@/services/cmds'
|
import { getProfiles, patchProfile, patchProfilesConfig } from '@/services/cmds'
|
||||||
import { mutate } from '@/services/mutate'
|
import { mutate } from '@/services/mutate'
|
||||||
import { migrateProfileTestUrls } from '@/services/proxy-test-url'
|
|
||||||
import { fetchCacheData, setCacheData, useQuery } from '@/services/query-client'
|
import { fetchCacheData, setCacheData, useQuery } from '@/services/query-client'
|
||||||
import { debugLog } from '@/utils/debug'
|
import { debugLog } from '@/utils/debug'
|
||||||
|
|
||||||
@@ -36,10 +35,6 @@ export const useProfiles = () => {
|
|||||||
refetchInterval: false,
|
refetchInterval: false,
|
||||||
})
|
})
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (profiles) migrateProfileTestUrls(profiles)
|
|
||||||
}, [profiles])
|
|
||||||
|
|
||||||
const refetchRef = useRef(refetch)
|
const refetchRef = useRef(refetch)
|
||||||
refetchRef.current = refetch
|
refetchRef.current = refetch
|
||||||
const mutateProfiles = useCallback(async () => {
|
const mutateProfiles = useCallback(async () => {
|
||||||
@@ -51,6 +46,7 @@ export const useProfiles = () => {
|
|||||||
try {
|
try {
|
||||||
const result = await mutate(() => patchProfilesConfig(value), {
|
const result = await mutate(() => patchProfilesConfig(value), {
|
||||||
id: 'patch-profiles-config',
|
id: 'patch-profiles-config',
|
||||||
|
errorNotice: false,
|
||||||
onFulfilled: (outcome) => {
|
onFulfilled: (outcome) => {
|
||||||
if (outcome.status === 'valid') {
|
if (outcome.status === 'valid') {
|
||||||
void setCacheData<IProfilesConfig>(profilesQueryKey, (current) =>
|
void setCacheData<IProfilesConfig>(profilesQueryKey, (current) =>
|
||||||
@@ -60,12 +56,8 @@ export const useProfiles = () => {
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
if (!result.ok) {
|
|
||||||
// Backend Busy keeps local state untouched, as before.
|
|
||||||
return result.value
|
|
||||||
}
|
|
||||||
const outcome = result.value
|
const outcome = result.value
|
||||||
if (outcome.status !== 'valid' && outcome.status !== 'busy') {
|
if (outcome.status !== 'valid') {
|
||||||
await mutateProfiles()
|
await mutateProfiles()
|
||||||
}
|
}
|
||||||
return outcome
|
return outcome
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ export function useProxyDelayState(
|
|||||||
groupName: string,
|
groupName: string,
|
||||||
): UseProxyDelayState {
|
): UseProxyDelayState {
|
||||||
const name = member.ref.name
|
const name = member.ref.name
|
||||||
|
const details = memberDetails(member)
|
||||||
const unresolved = member.kind === 'unresolved'
|
const unresolved = member.kind === 'unresolved'
|
||||||
const isPreset = unresolved || PRESET_PROXY_NAMES.includes(name)
|
const isPreset = unresolved || PRESET_PROXY_NAMES.includes(name)
|
||||||
const [delayState, setDelayState] = useReducer(identity, INITIAL_DELAY)
|
const [delayState, setDelayState] = useReducer(identity, INITIAL_DELAY)
|
||||||
@@ -42,18 +43,18 @@ export function useProxyDelayState(
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (isPreset) return
|
if (isPreset) return
|
||||||
delayManager.setListener(member, groupName, setDelayState)
|
delayManager.setListener(name, groupName, setDelayState)
|
||||||
return () => {
|
return () => {
|
||||||
delayManager.removeListener(member, groupName)
|
delayManager.removeListener(name, groupName)
|
||||||
}
|
}
|
||||||
}, [member, groupName, isPreset])
|
}, [name, groupName, isPreset])
|
||||||
|
|
||||||
const updateDelay = useCallback(() => {
|
const updateDelay = useCallback(() => {
|
||||||
if (unresolved) {
|
if (unresolved) {
|
||||||
setDelayState(INITIAL_DELAY)
|
setDelayState(INITIAL_DELAY)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const cachedUpdate = delayManager.getDelayUpdate(member, groupName)
|
const cachedUpdate = delayManager.getDelayUpdate(name, groupName)
|
||||||
if (cachedUpdate) {
|
if (cachedUpdate) {
|
||||||
setDelayState({ ...cachedUpdate })
|
setDelayState({ ...cachedUpdate })
|
||||||
return
|
return
|
||||||
@@ -66,9 +67,7 @@ export function useProxyDelayState(
|
|||||||
}
|
}
|
||||||
|
|
||||||
let updatedAt = 0
|
let updatedAt = 0
|
||||||
const history =
|
const history = details?.history
|
||||||
delayManager.getHistory(member, groupName) ??
|
|
||||||
memberDetails(member)?.history
|
|
||||||
if (history && history.length > 0) {
|
if (history && history.length > 0) {
|
||||||
const lastRecord = history[history.length - 1]
|
const lastRecord = history[history.length - 1]
|
||||||
const parsed = Date.parse(lastRecord.time)
|
const parsed = Date.parse(lastRecord.time)
|
||||||
@@ -78,18 +77,16 @@ export function useProxyDelayState(
|
|||||||
}
|
}
|
||||||
|
|
||||||
setDelayState({ delay: fallbackDelay, updatedAt })
|
setDelayState({ delay: fallbackDelay, updatedAt })
|
||||||
}, [groupName, member, unresolved])
|
}, [details?.history, groupName, member, name, unresolved])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
updateDelay()
|
updateDelay()
|
||||||
return delayManager.addGroupListener(groupName, updateDelay)
|
}, [updateDelay])
|
||||||
}, [groupName, updateDelay])
|
|
||||||
|
|
||||||
const onDelay = useLockFn(async () => {
|
const onDelay = useLockFn(async () => {
|
||||||
if (!isInteractableMember(member)) return
|
if (!isInteractableMember(member)) return
|
||||||
setDelayState({ delay: -2, updatedAt: Date.now() })
|
setDelayState({ delay: -2, updatedAt: Date.now() })
|
||||||
await delayManager.checkDelay(member, groupName, timeout)
|
setDelayState(await delayManager.checkDelay(member, groupName, timeout))
|
||||||
updateDelay()
|
|
||||||
})
|
})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -70,6 +70,8 @@
|
|||||||
"chain": {
|
"chain": {
|
||||||
"header": "Chain Proxy Config",
|
"header": "Chain Proxy Config",
|
||||||
"warning": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
"warning": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
||||||
|
"confirmEnable": "I understand, enable",
|
||||||
|
"keepDisabled": "Keep disabled",
|
||||||
"empty": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
"empty": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
||||||
"instruction": "Click nodes in order to add to proxy chain",
|
"instruction": "Click nodes in order to add to proxy chain",
|
||||||
"minimumNodes": "Chain proxy requires at least 2 nodes",
|
"minimumNodes": "Chain proxy requires at least 2 nodes",
|
||||||
|
|||||||
@@ -495,11 +495,13 @@
|
|||||||
"strictRoute": "توجيه صارم",
|
"strictRoute": "توجيه صارم",
|
||||||
"autoDetectInterface": "الكشف التلقائي عن الواجهة",
|
"autoDetectInterface": "الكشف التلقائي عن الواجهة",
|
||||||
"dnsHijack": "اختطاف DNS",
|
"dnsHijack": "اختطاف DNS",
|
||||||
|
"dnsMode": "وضع DNS",
|
||||||
"mtu": "وحدة الإرسال القصوى",
|
"mtu": "وحدة الإرسال القصوى",
|
||||||
"autoRedirect": "Auto Redirect"
|
"autoRedirect": "Auto Redirect"
|
||||||
},
|
},
|
||||||
"tooltips": {
|
"tooltips": {
|
||||||
"dnsHijack": "Please use , to separate multiple DNS servers",
|
"dnsHijack": "Please use , to separate multiple DNS servers",
|
||||||
|
"dnsMode": "يحافظ Auto على السلوك القديم؛ يتطلب hijack تفعيل توجيه صارم على Windows أو Auto Redirect على Linux",
|
||||||
"autoRedirect": "Automatically configures nftables/iptables TCP redirects"
|
"autoRedirect": "Automatically configures nftables/iptables TCP redirects"
|
||||||
},
|
},
|
||||||
"messages": {
|
"messages": {
|
||||||
|
|||||||
@@ -70,6 +70,8 @@
|
|||||||
"chain": {
|
"chain": {
|
||||||
"header": "Proxy-Kette konfigurieren",
|
"header": "Proxy-Kette konfigurieren",
|
||||||
"warning": "Eine Proxy-Kette verringert die Netzwerkgeschwindigkeit deutlich. Wenn Sie keinen klaren Bedarf haben oder diese Konfiguration nicht verstehen, lassen Sie sie deaktiviert.",
|
"warning": "Eine Proxy-Kette verringert die Netzwerkgeschwindigkeit deutlich. Wenn Sie keinen klaren Bedarf haben oder diese Konfiguration nicht verstehen, lassen Sie sie deaktiviert.",
|
||||||
|
"confirmEnable": "Verstanden, aktivieren",
|
||||||
|
"keepDisabled": "Deaktiviert lassen",
|
||||||
"empty": "Eine Proxy-Kette verringert die Netzwerkgeschwindigkeit deutlich. Wenn Sie keinen klaren Bedarf haben oder diese Konfiguration nicht verstehen, lassen Sie sie deaktiviert.",
|
"empty": "Eine Proxy-Kette verringert die Netzwerkgeschwindigkeit deutlich. Wenn Sie keinen klaren Bedarf haben oder diese Konfiguration nicht verstehen, lassen Sie sie deaktiviert.",
|
||||||
"instruction": "Klicken Sie die Knoten nacheinander an, um sie zur Proxy-Kette hinzuzufügen",
|
"instruction": "Klicken Sie die Knoten nacheinander an, um sie zur Proxy-Kette hinzuzufügen",
|
||||||
"minimumNodes": "Eine Proxy-Kette braucht mindestens 2 Knoten",
|
"minimumNodes": "Eine Proxy-Kette braucht mindestens 2 Knoten",
|
||||||
|
|||||||
@@ -495,11 +495,13 @@
|
|||||||
"strictRoute": "Strenges Routing",
|
"strictRoute": "Strenges Routing",
|
||||||
"autoDetectInterface": "Netzwerkschnittstelle automatisch auswählen",
|
"autoDetectInterface": "Netzwerkschnittstelle automatisch auswählen",
|
||||||
"dnsHijack": "DNS-Hijacking",
|
"dnsHijack": "DNS-Hijacking",
|
||||||
|
"dnsMode": "DNS-Modus",
|
||||||
"mtu": "Maximale Übertragungseinheit",
|
"mtu": "Maximale Übertragungseinheit",
|
||||||
"autoRedirect": "Automatische Umleitung"
|
"autoRedirect": "Automatische Umleitung"
|
||||||
},
|
},
|
||||||
"tooltips": {
|
"tooltips": {
|
||||||
"dnsHijack": "Mehrere DNS-Server durch Kommas trennen",
|
"dnsHijack": "Mehrere DNS-Server durch Kommas trennen",
|
||||||
|
"dnsMode": "Auto behält das alte Verhalten bei; hijack erfordert Strenges Routing unter Windows oder Automatische Umleitung unter Linux",
|
||||||
"autoRedirect": "Richtet TCP-Umleitungen per nftables/iptables automatisch ein"
|
"autoRedirect": "Richtet TCP-Umleitungen per nftables/iptables automatisch ein"
|
||||||
},
|
},
|
||||||
"messages": {
|
"messages": {
|
||||||
|
|||||||
@@ -70,6 +70,8 @@
|
|||||||
"chain": {
|
"chain": {
|
||||||
"header": "Chain Proxy Config",
|
"header": "Chain Proxy Config",
|
||||||
"warning": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
"warning": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
||||||
|
"confirmEnable": "I understand, enable",
|
||||||
|
"keepDisabled": "Keep disabled",
|
||||||
"empty": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
"empty": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
||||||
"instruction": "Click nodes in order to add to proxy chain",
|
"instruction": "Click nodes in order to add to proxy chain",
|
||||||
"minimumNodes": "Chain proxy requires at least 2 nodes",
|
"minimumNodes": "Chain proxy requires at least 2 nodes",
|
||||||
|
|||||||
@@ -495,11 +495,13 @@
|
|||||||
"strictRoute": "Strict Route",
|
"strictRoute": "Strict Route",
|
||||||
"autoDetectInterface": "Auto Detect Interface",
|
"autoDetectInterface": "Auto Detect Interface",
|
||||||
"dnsHijack": "DNS Hijack",
|
"dnsHijack": "DNS Hijack",
|
||||||
|
"dnsMode": "DNS Mode",
|
||||||
"mtu": "Max Transmission Unit",
|
"mtu": "Max Transmission Unit",
|
||||||
"autoRedirect": "Auto Redirect"
|
"autoRedirect": "Auto Redirect"
|
||||||
},
|
},
|
||||||
"tooltips": {
|
"tooltips": {
|
||||||
"dnsHijack": "Please use , to separate multiple DNS servers",
|
"dnsHijack": "Please use , to separate multiple DNS servers",
|
||||||
|
"dnsMode": "Auto keeps the legacy behavior; hijack requires Strict Route on Windows or Auto Redirect on Linux",
|
||||||
"autoRedirect": "Automatically configures nftables/iptables TCP redirects"
|
"autoRedirect": "Automatically configures nftables/iptables TCP redirects"
|
||||||
},
|
},
|
||||||
"messages": {
|
"messages": {
|
||||||
|
|||||||
@@ -70,6 +70,8 @@
|
|||||||
"chain": {
|
"chain": {
|
||||||
"header": "Chain Proxy Config",
|
"header": "Chain Proxy Config",
|
||||||
"warning": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
"warning": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
||||||
|
"confirmEnable": "I understand, enable",
|
||||||
|
"keepDisabled": "Keep disabled",
|
||||||
"empty": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
"empty": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
||||||
"instruction": "Click nodes in order to add to proxy chain",
|
"instruction": "Click nodes in order to add to proxy chain",
|
||||||
"minimumNodes": "Chain proxy requires at least 2 nodes",
|
"minimumNodes": "Chain proxy requires at least 2 nodes",
|
||||||
|
|||||||
@@ -495,11 +495,13 @@
|
|||||||
"strictRoute": "Enrutamiento estricto",
|
"strictRoute": "Enrutamiento estricto",
|
||||||
"autoDetectInterface": "Detectar automáticamente la interfaz de salida del tráfico",
|
"autoDetectInterface": "Detectar automáticamente la interfaz de salida del tráfico",
|
||||||
"dnsHijack": "Secuestro de DNS",
|
"dnsHijack": "Secuestro de DNS",
|
||||||
|
"dnsMode": "Modo DNS",
|
||||||
"mtu": "Unidad máxima de transmisión",
|
"mtu": "Unidad máxima de transmisión",
|
||||||
"autoRedirect": "Auto Redirect"
|
"autoRedirect": "Auto Redirect"
|
||||||
},
|
},
|
||||||
"tooltips": {
|
"tooltips": {
|
||||||
"dnsHijack": "Please use , to separate multiple DNS servers",
|
"dnsHijack": "Please use , to separate multiple DNS servers",
|
||||||
|
"dnsMode": "Auto mantiene el comportamiento anterior; hijack requiere Enrutamiento estricto en Windows o Auto Redirect en Linux",
|
||||||
"autoRedirect": "Automatically configures nftables/iptables TCP redirects"
|
"autoRedirect": "Automatically configures nftables/iptables TCP redirects"
|
||||||
},
|
},
|
||||||
"messages": {
|
"messages": {
|
||||||
|
|||||||
@@ -70,6 +70,8 @@
|
|||||||
"chain": {
|
"chain": {
|
||||||
"header": "Chain Proxy Config",
|
"header": "Chain Proxy Config",
|
||||||
"warning": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
"warning": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
||||||
|
"confirmEnable": "I understand, enable",
|
||||||
|
"keepDisabled": "Keep disabled",
|
||||||
"empty": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
"empty": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
||||||
"instruction": "Click nodes in order to add to proxy chain",
|
"instruction": "Click nodes in order to add to proxy chain",
|
||||||
"minimumNodes": "Chain proxy requires at least 2 nodes",
|
"minimumNodes": "Chain proxy requires at least 2 nodes",
|
||||||
|
|||||||
@@ -495,11 +495,13 @@
|
|||||||
"strictRoute": "مسیر دقیق",
|
"strictRoute": "مسیر دقیق",
|
||||||
"autoDetectInterface": "تشخیص خودکار رابط",
|
"autoDetectInterface": "تشخیص خودکار رابط",
|
||||||
"dnsHijack": "ربایش DNS",
|
"dnsHijack": "ربایش DNS",
|
||||||
|
"dnsMode": "حالت DNS",
|
||||||
"mtu": "واحد حداکثر انتقال",
|
"mtu": "واحد حداکثر انتقال",
|
||||||
"autoRedirect": "Auto Redirect"
|
"autoRedirect": "Auto Redirect"
|
||||||
},
|
},
|
||||||
"tooltips": {
|
"tooltips": {
|
||||||
"dnsHijack": "لطفا برای جدا کردن چندین سرور DNS از , استفاده کنید.",
|
"dnsHijack": "لطفا برای جدا کردن چندین سرور DNS از , استفاده کنید.",
|
||||||
|
"dnsMode": "Auto رفتار قدیمی را حفظ میکند؛ hijack در ویندوز نیاز به مسیر دقیق یا در لینوکس نیاز به Auto Redirect دارد",
|
||||||
"autoRedirect": "پیکربندی خودکار ریدایرکتهای TCP در nftables/iptables"
|
"autoRedirect": "پیکربندی خودکار ریدایرکتهای TCP در nftables/iptables"
|
||||||
},
|
},
|
||||||
"messages": {
|
"messages": {
|
||||||
|
|||||||
@@ -70,6 +70,8 @@
|
|||||||
"chain": {
|
"chain": {
|
||||||
"header": "Chain Proxy Config",
|
"header": "Chain Proxy Config",
|
||||||
"warning": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
"warning": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
||||||
|
"confirmEnable": "I understand, enable",
|
||||||
|
"keepDisabled": "Keep disabled",
|
||||||
"empty": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
"empty": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
||||||
"instruction": "Click nodes in order to add to proxy chain",
|
"instruction": "Click nodes in order to add to proxy chain",
|
||||||
"minimumNodes": "Chain proxy requires at least 2 nodes",
|
"minimumNodes": "Chain proxy requires at least 2 nodes",
|
||||||
|
|||||||
@@ -495,11 +495,13 @@
|
|||||||
"strictRoute": "Rute Ketat",
|
"strictRoute": "Rute Ketat",
|
||||||
"autoDetectInterface": "Deteksi Antarmuka Otomatis",
|
"autoDetectInterface": "Deteksi Antarmuka Otomatis",
|
||||||
"dnsHijack": "Pembajakan DNS",
|
"dnsHijack": "Pembajakan DNS",
|
||||||
|
"dnsMode": "Mode DNS",
|
||||||
"mtu": "Unit Transmisi Maksimum",
|
"mtu": "Unit Transmisi Maksimum",
|
||||||
"autoRedirect": "Auto Redirect"
|
"autoRedirect": "Auto Redirect"
|
||||||
},
|
},
|
||||||
"tooltips": {
|
"tooltips": {
|
||||||
"dnsHijack": "Please use , to separate multiple DNS servers",
|
"dnsHijack": "Please use , to separate multiple DNS servers",
|
||||||
|
"dnsMode": "Auto mempertahankan perilaku lama; hijack memerlukan Rute Ketat di Windows atau Auto Redirect di Linux",
|
||||||
"autoRedirect": "Automatically configures nftables/iptables TCP redirects"
|
"autoRedirect": "Automatically configures nftables/iptables TCP redirects"
|
||||||
},
|
},
|
||||||
"messages": {
|
"messages": {
|
||||||
|
|||||||
@@ -70,6 +70,8 @@
|
|||||||
"chain": {
|
"chain": {
|
||||||
"header": "Chain Proxy Config",
|
"header": "Chain Proxy Config",
|
||||||
"warning": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
"warning": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
||||||
|
"confirmEnable": "I understand, enable",
|
||||||
|
"keepDisabled": "Keep disabled",
|
||||||
"empty": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
"empty": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
||||||
"instruction": "Click nodes in order to add to proxy chain",
|
"instruction": "Click nodes in order to add to proxy chain",
|
||||||
"minimumNodes": "Chain proxy requires at least 2 nodes",
|
"minimumNodes": "Chain proxy requires at least 2 nodes",
|
||||||
|
|||||||
@@ -495,11 +495,13 @@
|
|||||||
"strictRoute": "厳格なルート",
|
"strictRoute": "厳格なルート",
|
||||||
"autoDetectInterface": "トラフィックの出口インターフェースを自動選択",
|
"autoDetectInterface": "トラフィックの出口インターフェースを自動選択",
|
||||||
"dnsHijack": "DNSハイジャック",
|
"dnsHijack": "DNSハイジャック",
|
||||||
|
"dnsMode": "DNSモード",
|
||||||
"mtu": "最大転送単位",
|
"mtu": "最大転送単位",
|
||||||
"autoRedirect": "Auto Redirect"
|
"autoRedirect": "Auto Redirect"
|
||||||
},
|
},
|
||||||
"tooltips": {
|
"tooltips": {
|
||||||
"dnsHijack": "Please use , to separate multiple DNS servers",
|
"dnsHijack": "Please use , to separate multiple DNS servers",
|
||||||
|
"dnsMode": "Auto は従来の動作を維持します。hijack には Windows で厳格なルートまたは Linux で Auto Redirect が必要です",
|
||||||
"autoRedirect": "Automatically configures nftables/iptables TCP redirects"
|
"autoRedirect": "Automatically configures nftables/iptables TCP redirects"
|
||||||
},
|
},
|
||||||
"messages": {
|
"messages": {
|
||||||
|
|||||||
@@ -70,6 +70,8 @@
|
|||||||
"chain": {
|
"chain": {
|
||||||
"header": "체인 프록시 구성",
|
"header": "체인 프록시 구성",
|
||||||
"warning": "체인 프록시는 네트워크 속도를 크게 저하시킬 수 있습니다. 명확한 업무상 필요가 없거나 이 구성을 이해하지 못한다면 비활성화 상태로 두세요.",
|
"warning": "체인 프록시는 네트워크 속도를 크게 저하시킬 수 있습니다. 명확한 업무상 필요가 없거나 이 구성을 이해하지 못한다면 비활성화 상태로 두세요.",
|
||||||
|
"confirmEnable": "이해했습니다, 활성화",
|
||||||
|
"keepDisabled": "비활성화 유지",
|
||||||
"empty": "체인 프록시는 네트워크 속도를 크게 저하시킬 수 있습니다. 명확한 업무상 필요가 없거나 이 구성을 이해하지 못한다면 비활성화 상태로 두세요.",
|
"empty": "체인 프록시는 네트워크 속도를 크게 저하시킬 수 있습니다. 명확한 업무상 필요가 없거나 이 구성을 이해하지 못한다면 비활성화 상태로 두세요.",
|
||||||
"instruction": "프록시 체인에 추가하려면 순서대로 노드를 클릭하세요",
|
"instruction": "프록시 체인에 추가하려면 순서대로 노드를 클릭하세요",
|
||||||
"minimumNodes": "체인 프록시는 최소 2개의 노드가 필요합니다",
|
"minimumNodes": "체인 프록시는 최소 2개의 노드가 필요합니다",
|
||||||
|
|||||||
@@ -495,11 +495,13 @@
|
|||||||
"strictRoute": "엄격 라우팅",
|
"strictRoute": "엄격 라우팅",
|
||||||
"autoDetectInterface": "인터페이스 자동 감지",
|
"autoDetectInterface": "인터페이스 자동 감지",
|
||||||
"dnsHijack": "DNS 하이재킹",
|
"dnsHijack": "DNS 하이재킹",
|
||||||
|
"dnsMode": "DNS 모드",
|
||||||
"mtu": "MTU",
|
"mtu": "MTU",
|
||||||
"autoRedirect": "Auto Redirect"
|
"autoRedirect": "Auto Redirect"
|
||||||
},
|
},
|
||||||
"tooltips": {
|
"tooltips": {
|
||||||
"dnsHijack": "여러 DNS 서버는 쉼표(,)로 구분하세요",
|
"dnsHijack": "여러 DNS 서버는 쉼표(,)로 구분하세요",
|
||||||
|
"dnsMode": "Auto는 기존 동작을 유지합니다. hijack은 Windows에서 엄격 라우팅 또는 Linux에서 Auto Redirect가 필요합니다",
|
||||||
"autoRedirect": "Automatically configures nftables/iptables TCP redirects"
|
"autoRedirect": "Automatically configures nftables/iptables TCP redirects"
|
||||||
},
|
},
|
||||||
"messages": {
|
"messages": {
|
||||||
|
|||||||
@@ -70,6 +70,8 @@
|
|||||||
"chain": {
|
"chain": {
|
||||||
"header": "Configuração do proxy em cadeia",
|
"header": "Configuração do proxy em cadeia",
|
||||||
"warning": "O proxy em cadeia reduz significativamente a velocidade da rede. Se você não tem uma necessidade clara ou não entende esta configuração, mantenha-o desativado.",
|
"warning": "O proxy em cadeia reduz significativamente a velocidade da rede. Se você não tem uma necessidade clara ou não entende esta configuração, mantenha-o desativado.",
|
||||||
|
"confirmEnable": "Entendi, ativar",
|
||||||
|
"keepDisabled": "Manter desativado",
|
||||||
"empty": "O proxy em cadeia reduz significativamente a velocidade da rede. Se você não tem uma necessidade clara ou não entende esta configuração, mantenha-o desativado.",
|
"empty": "O proxy em cadeia reduz significativamente a velocidade da rede. Se você não tem uma necessidade clara ou não entende esta configuração, mantenha-o desativado.",
|
||||||
"instruction": "Clique nos nós em ordem para adicioná-los à cadeia de proxy",
|
"instruction": "Clique nos nós em ordem para adicioná-los à cadeia de proxy",
|
||||||
"minimumNodes": "O proxy em cadeia requer pelo menos 2 nós",
|
"minimumNodes": "O proxy em cadeia requer pelo menos 2 nós",
|
||||||
|
|||||||
@@ -495,11 +495,13 @@
|
|||||||
"strictRoute": "Rota Estrita",
|
"strictRoute": "Rota Estrita",
|
||||||
"autoDetectInterface": "Detectar Interface Automaticamente",
|
"autoDetectInterface": "Detectar Interface Automaticamente",
|
||||||
"dnsHijack": "Sequestro de DNS",
|
"dnsHijack": "Sequestro de DNS",
|
||||||
|
"dnsMode": "Modo DNS",
|
||||||
"mtu": "Unidade Máxima de Transmissão",
|
"mtu": "Unidade Máxima de Transmissão",
|
||||||
"autoRedirect": "Redirecionamento Automático"
|
"autoRedirect": "Redirecionamento Automático"
|
||||||
},
|
},
|
||||||
"tooltips": {
|
"tooltips": {
|
||||||
"dnsHijack": "Use , para separar vários servidores DNS",
|
"dnsHijack": "Use , para separar vários servidores DNS",
|
||||||
|
"dnsMode": "Auto mantém o comportamento antigo; hijack requer Rota Estrita no Windows ou Redirecionamento Automático no Linux",
|
||||||
"autoRedirect": "Configura automaticamente os redirecionamentos TCP do nftables/iptables"
|
"autoRedirect": "Configura automaticamente os redirecionamentos TCP do nftables/iptables"
|
||||||
},
|
},
|
||||||
"messages": {
|
"messages": {
|
||||||
|
|||||||
@@ -70,6 +70,8 @@
|
|||||||
"chain": {
|
"chain": {
|
||||||
"header": "Цепочка прокси",
|
"header": "Цепочка прокси",
|
||||||
"warning": "Цепочка прокси может значительно снизить скорость сети. Если у вас нет явной рабочей необходимости или вы не понимаете эту настройку, оставьте ее отключенной.",
|
"warning": "Цепочка прокси может значительно снизить скорость сети. Если у вас нет явной рабочей необходимости или вы не понимаете эту настройку, оставьте ее отключенной.",
|
||||||
|
"confirmEnable": "Понятно, включить",
|
||||||
|
"keepDisabled": "Оставить выключенным",
|
||||||
"empty": "Цепочка прокси может значительно снизить скорость сети. Если у вас нет явной рабочей необходимости или вы не понимаете эту настройку, оставьте ее отключенной.",
|
"empty": "Цепочка прокси может значительно снизить скорость сети. Если у вас нет явной рабочей необходимости или вы не понимаете эту настройку, оставьте ее отключенной.",
|
||||||
"instruction": "Нажимайте на узлы по порядку, чтобы добавить их в цепочку",
|
"instruction": "Нажимайте на узлы по порядку, чтобы добавить их в цепочку",
|
||||||
"minimumNodes": "Для цепочки требуется минимум 2 узла",
|
"minimumNodes": "Для цепочки требуется минимум 2 узла",
|
||||||
|
|||||||
@@ -495,11 +495,13 @@
|
|||||||
"strictRoute": "Строгая маршрутизация",
|
"strictRoute": "Строгая маршрутизация",
|
||||||
"autoDetectInterface": "Автоопределение интерфейса",
|
"autoDetectInterface": "Автоопределение интерфейса",
|
||||||
"dnsHijack": "Перехват DNS",
|
"dnsHijack": "Перехват DNS",
|
||||||
|
"dnsMode": "Режим DNS",
|
||||||
"mtu": "MTU",
|
"mtu": "MTU",
|
||||||
"autoRedirect": "Автоматическое перенаправление"
|
"autoRedirect": "Автоматическое перенаправление"
|
||||||
},
|
},
|
||||||
"tooltips": {
|
"tooltips": {
|
||||||
"dnsHijack": "Используйте запятую для разделения нескольких DNS-серверов",
|
"dnsHijack": "Используйте запятую для разделения нескольких DNS-серверов",
|
||||||
|
"dnsMode": "Auto сохраняет прежнее поведение; для hijack нужна Строгая маршрутизация в Windows или Автоматическое перенаправление в Linux",
|
||||||
"autoRedirect": "Автоматически настраивает перенаправление TCP через nftables/iptables"
|
"autoRedirect": "Автоматически настраивает перенаправление TCP через nftables/iptables"
|
||||||
},
|
},
|
||||||
"messages": {
|
"messages": {
|
||||||
|
|||||||
@@ -70,6 +70,8 @@
|
|||||||
"chain": {
|
"chain": {
|
||||||
"header": "Zincir Vekil Yapılandırması",
|
"header": "Zincir Vekil Yapılandırması",
|
||||||
"warning": "Zincir vekil ağ hızını belirgin biçimde düşürür. Açık bir ihtiyacınız yoksa ya da bu yapılandırmayı bilmiyorsanız devre dışı bırakın.",
|
"warning": "Zincir vekil ağ hızını belirgin biçimde düşürür. Açık bir ihtiyacınız yoksa ya da bu yapılandırmayı bilmiyorsanız devre dışı bırakın.",
|
||||||
|
"confirmEnable": "Anladım, etkinleştir",
|
||||||
|
"keepDisabled": "Devre dışı kalsın",
|
||||||
"empty": "Zincir vekil ağ hızını belirgin biçimde düşürür. Açık bir ihtiyacınız yoksa ya da bu yapılandırmayı bilmiyorsanız devre dışı bırakın.",
|
"empty": "Zincir vekil ağ hızını belirgin biçimde düşürür. Açık bir ihtiyacınız yoksa ya da bu yapılandırmayı bilmiyorsanız devre dışı bırakın.",
|
||||||
"instruction": "Vekil zincirine eklemek için düğümlere sırayla tıklayın",
|
"instruction": "Vekil zincirine eklemek için düğümlere sırayla tıklayın",
|
||||||
"minimumNodes": "Zincir vekil en az 2 düğüm gerektirir",
|
"minimumNodes": "Zincir vekil en az 2 düğüm gerektirir",
|
||||||
|
|||||||
@@ -495,11 +495,13 @@
|
|||||||
"strictRoute": "Katı Yönlendirme",
|
"strictRoute": "Katı Yönlendirme",
|
||||||
"autoDetectInterface": "Arayüzü Otomatik Algıla",
|
"autoDetectInterface": "Arayüzü Otomatik Algıla",
|
||||||
"dnsHijack": "DNS Ele Geçirme",
|
"dnsHijack": "DNS Ele Geçirme",
|
||||||
|
"dnsMode": "DNS Modu",
|
||||||
"mtu": "Maksimum İletim Birimi",
|
"mtu": "Maksimum İletim Birimi",
|
||||||
"autoRedirect": "Otomatik Yönlendirme"
|
"autoRedirect": "Otomatik Yönlendirme"
|
||||||
},
|
},
|
||||||
"tooltips": {
|
"tooltips": {
|
||||||
"dnsHijack": "Birden fazla DNS sunucusunu ayırmak için lütfen , kullanın",
|
"dnsHijack": "Birden fazla DNS sunucusunu ayırmak için lütfen , kullanın",
|
||||||
|
"dnsMode": "Auto eski davranışı korur; hijack için Windows'ta Katı Yönlendirme veya Linux'ta Otomatik Yönlendirme gerekir",
|
||||||
"autoRedirect": "nftables/iptables TCP yönlendirmelerini otomatik olarak yapılandırır"
|
"autoRedirect": "nftables/iptables TCP yönlendirmelerini otomatik olarak yapılandırır"
|
||||||
},
|
},
|
||||||
"messages": {
|
"messages": {
|
||||||
|
|||||||
@@ -70,6 +70,8 @@
|
|||||||
"chain": {
|
"chain": {
|
||||||
"header": "Chain Proxy Config",
|
"header": "Chain Proxy Config",
|
||||||
"warning": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
"warning": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
||||||
|
"confirmEnable": "I understand, enable",
|
||||||
|
"keepDisabled": "Keep disabled",
|
||||||
"empty": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
"empty": "Chain proxy will significantly reduce network speed. If you do not have a clear business need, or do not understand this configuration, keep it disabled.",
|
||||||
"instruction": "Click nodes in order to add to proxy chain",
|
"instruction": "Click nodes in order to add to proxy chain",
|
||||||
"minimumNodes": "Chain proxy requires at least 2 nodes",
|
"minimumNodes": "Chain proxy requires at least 2 nodes",
|
||||||
|
|||||||
@@ -495,11 +495,13 @@
|
|||||||
"strictRoute": "Катгый маршрутлау",
|
"strictRoute": "Катгый маршрутлау",
|
||||||
"autoDetectInterface": "Интерфейсны автоматик ачыклау",
|
"autoDetectInterface": "Интерфейсны автоматик ачыклау",
|
||||||
"dnsHijack": "DNS'ны үзгәртеп тоту (hijack)",
|
"dnsHijack": "DNS'ны үзгәртеп тоту (hijack)",
|
||||||
|
"dnsMode": "DNS режиме",
|
||||||
"mtu": "MTU (макс. тапшыру берәмлеге)",
|
"mtu": "MTU (макс. тапшыру берәмлеге)",
|
||||||
"autoRedirect": "Auto Redirect"
|
"autoRedirect": "Auto Redirect"
|
||||||
},
|
},
|
||||||
"tooltips": {
|
"tooltips": {
|
||||||
"dnsHijack": "Please use , to separate multiple DNS servers",
|
"dnsHijack": "Please use , to separate multiple DNS servers",
|
||||||
|
"dnsMode": "Auto иске тәртипне саклый; hijack өчен Windows'ta Катгый маршрутлау яки Linux'ta Auto Redirect кирәк",
|
||||||
"autoRedirect": "Automatically configures nftables/iptables TCP redirects"
|
"autoRedirect": "Automatically configures nftables/iptables TCP redirects"
|
||||||
},
|
},
|
||||||
"messages": {
|
"messages": {
|
||||||
|
|||||||
@@ -70,6 +70,8 @@
|
|||||||
"chain": {
|
"chain": {
|
||||||
"header": "代理链配置",
|
"header": "代理链配置",
|
||||||
"warning": "链式代理会显著降低网速。如果您没有明确的业务需求,或不了解此项配置,请保持关闭",
|
"warning": "链式代理会显著降低网速。如果您没有明确的业务需求,或不了解此项配置,请保持关闭",
|
||||||
|
"confirmEnable": "我明白,开启",
|
||||||
|
"keepDisabled": "保持关闭",
|
||||||
"empty": "链式代理会显著降低网速。如果您没有明确的业务需求,或不了解此项配置,请保持关闭",
|
"empty": "链式代理会显著降低网速。如果您没有明确的业务需求,或不了解此项配置,请保持关闭",
|
||||||
"instruction": "顺序点击节点添加到代理链中",
|
"instruction": "顺序点击节点添加到代理链中",
|
||||||
"minimumNodes": "链式代理至少需要 2 个节点",
|
"minimumNodes": "链式代理至少需要 2 个节点",
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user