Compare commits

..
Author SHA1 Message Date
renovate[bot] 48c280c06d chore(deps): update tauri 2026-11-18 01:54:42 +00:00
Tunglies 7d8fec7314 chore(lint): inherit workspace lints in draft and logging crates
clash-verge-draft and clash-verge-logging did not inherit
[workspace.lints], so cargo's missing_lints_inheritance warned and the
strict clippy set never applied to them. Inheriting the lints surfaced
six errors, now fixed:

- draft: drop the data lock before cloning the snapshot and before
  returning in with_data_modify (significant_drop_tightening)
- draft: require T: Send + Sync on acquire_data_modify_permit so its
  future is Send (future_not_send)
- draft bench: scope an allow for the runtime-init panic
- logging: make Logger::new const (missing_const_for_fn)
- logging: return the builder directly from generate_file_log_writer,
  which never failed (unnecessary_wraps)

The three unused-dependency warnings that remain under
--all-features are cfg artifacts, not dead deps: tauri-build is only
called when the clippy feature is off, tauri-plugin-devtools is
compiled out when tokio-trace is enabled alongside tauri-dev, and
clash-verge-logging in clash-verge-signal is only referenced by the
Linux-only body of that crate.
2026-11-18 09:45:36 +08:00
Tunglies 16667137a7 perf(backend): cache chain items and guard runtime yaml re-serialization (#8676)
* perf(enhance): cache chain items by file identity

Every config generation re-read and re-parsed all seven chain files.
Cache the parsed ChainItem keyed by (path, mtime, length) and clone on
hit: measured 486us -> 20us per generation (-95.9%) on a seven-file
chain set (merge/script/rules fixtures). Profile saves go through
tmp+rename so mtime always changes.

* perf(config): guard runtime yaml re-serialization

runtime_config_yaml re-serialized the multi-megabyte runtime Mapping on
every call even when unchanged. Hash the Mapping tree (Value: Hash) and
return the cached Arc<String> handle on hit: 4.10ms -> ~0.39ms (hash
290us, ~-90%) for a 3000-node config on the unchanged path, and the
handle keeps both hit and miss at a refcount clone instead of copying
the yaml body. The 64-bit SipHash key is sound here: a birthday
collision needs ~2^32 distinct config states at a volume of a few
hundred generations per day, and a colliding pair only serves one stale
yaml until the next config change re-hashes.

* build(deps): bump tauri-plugin-mihomo to 0.7.1

Pins the revision that derives Clone on ProxyType and DelayHistory,
which the upcoming proxy-view cache needs to return cached views
without changing the IPC contract.

* refactor(backend): right-size the new caches' storage

The chain cache never shares its stored ChainItem -- every hit
deep-clones it -- so its Arc wrapper only added indirection; store it
directly and const-shape it behind a LazyLock static instead of a
OnceLock accessor. The yaml cache keeps Arc<String> because callers
receive the stored handle, making hit and miss clones O(1).

* style(config): hoist the runtime yaml cache to module scope

Match the module-level placement of the chain cache and the other
named statics; the closure-local declaration shadowed nothing but read
worse and forced rustfmt to split the line.
2026-11-18 09:45:36 +08:00
TonyWu fa3007d3a4 fix(proxy): keep subscription order in chain proxy mode (#8391)
Since #7542 the global chain list follows the proxy view's standalone
records, which are name-sorted, and the runtime config's proxies array is
only used as a membership filter. Walk that array in order instead so the
list matches the subscription order again.

Fixes #8381
2026-11-17 10:37:27 +00:00
Tunglies 3e3084cd34 refactor: replace smartstring with tristr for backend strings (#8673)
* refactor(config): adopt tristr for config strings

Wire the tristr git dependency (pinned rev) and switch the config and
enhance modules from smartstring::alias::String to tristr::alias::String.
Drop the smartstring-era per-field specta overrides except the three
webdav fields required by serialize_with and the ipc::JsonValue bridge:
tristr maps to Primitive::str natively and the generated bindings stay
byte-identical (gen-contract --check passes).

Call sites in not-yet-migrated modules (cmd/core/feat/utils) are bridged
with explicit tristr::alias::String paths and as_str().into() conversions;
each bridge is absorbed when its module migrates.

* refactor(cmd): adopt tristr for command strings

Switch the cmd module from smartstring::alias::String to
tristr::alias::String and drop its smartstring-era per-field specta
overrides (ProfileSelection/ProfileCreate/ProfilePatch, RuntimeLogs);
bindings stay byte-identical. Calls into not-yet-migrated feat/core
functions keep smartstring-typed locals via full paths until those
modules migrate.

* refactor(core): adopt tristr for core strings

Switch the core module (validate, timer, sysopt, backup, hotkey, tray,
manager, notify) from smartstring::alias::String to tristr::alias::String
and drop the smartstring-era specta overrides on ValidationOutcome and
the notify payload structs; bindings stay byte-identical. WebDAV calls
from the not-yet-migrated feat module are bridged with as_str().into().

* refactor(feat): adopt tristr for feature strings

Switch the feat module (backup, icon, dns, profile, clash) from
smartstring::alias::String to tristr::alias::String, drop its
smartstring-era specta overrides (IconInfo, backup listings,
DnsOverrideOutcome), and absorb the temporary smartstring-typed bridge
locals the cmd module used to call into feat.

* refactor(utils): adopt tristr for utility strings

Switch utils/network.rs and utils/resolve/scheme.rs from
smartstring::alias::String to tristr::alias::String and absorb the
temporary user_agent and profile-name bridge conversions.

* refactor(deps): drop smartstring in favor of tristr

Remove the smartstring workspace and member dependencies and its
Cargo.lock entry; tristr is the only string representation left.

* build(deps): bump tristr to fuzz-harness fix rev

Pin 3738d8c renames the stale vstr path dependency in the upstream
fuzz manifest so its seven targets build again; library code is
unchanged from 3756ed1a.
2026-11-17 08:36:22 +00:00
Tunglies dc71c11ef2 perf(tray): batch menu rebuild into a single dispatch (#8370)
Every menu API call runs on the main thread; invoked from a worker,
each call pays a blocking round-trip there and back (channel, event
loop hop, recv). Rebuilding the tray menu with proxy groups enabled
issued one round-trip per menu item — 200+ for a typical subscription —
and the per-call wait grows whenever the event loop is busy with
webview work.

Gather the async inputs (verge/clash/profiles snapshots, proxies and
runtime group order) on the caller's task, then build the menu and
attach it in a single run_on_main_thread closure where every item
constructs inline. Measured on a standalone tauri bench (5 groups x
40 nodes): a rebuild drops from ~6.2ms to ~1.6ms on an idle event
loop and from ~11.4ms to ~1.6ms with the loop busy (8ms of work per
16ms frame), with ~450 fewer allocations (~155KB) per rebuild.
2026-11-17 02:55:29 +00:00
Tunglies 1b212f9a28 perf(proxies): reduce remaining projection and menu churn (#8622) 2026-11-17 02:55:21 +00:00
Tunglies 9f7b390cd4 perf(proxies): reduce delay-driven list and card churn (#8621)
* perf(proxies): reduce delay-driven list and card churn

* remove test

* no need changelog
2026-11-17 02:26:00 +00:00
Tunglies 0c2de711bc perf(connections): reduce snapshot and table allocation churn (#8613)
* perf(connections): reduce snapshot and table allocation churn

Reuse unchanged connection lists, sort traffic columns without display snapshots, and suspend the relative-time clock while hidden. Keep rule rows indexed and release resize listeners on unmount.

* test(connections): limit coverage to changed behavior

Keep snapshot sharing, speed decay, bounded history, numeric sorting, and visibility regression guards. Remove unrelated clear-history and pending-delivery assertions.

* test(connections): focus clock regression on timer cost

Replace behavioral clock assertions with one resource-count check for shared, hidden, and released intervals.

* test(connections): retain only allocation and formatting guards

Reduce snapshot and table tests to reference reuse, notification suppression, and visible-row formatting cost.

* remove useless test

* no need changelog
2026-11-17 02:24:27 +00:00
Tunglies 6a202e8d00 perf(backend): cut redundant copies and rebuilds in enhance, config and tray paths (#8666)
* fix: mechanical string conversions

- &String parameters become &str (event payload fields borrow &str; wire format unchanged)
- Cow/std-string double conversions collapse to a single Into
- sha256 digests format through a shared hex lookup table instead of one
  format! allocation per byte
- i18n placeholder replacement only allocates when the placeholder exists

* perf(enhance): marshal scripts by value and diff fields by fingerprint

- scripts cross into boa via JsValue::from_json/to_json instead of the
  JSON text round-trip (config clone + json string + UTF-16 JsString +
  stringify + re-parse all disappear); size guards use an allocation-free
  approximate walk
- merge documents and tun/dns patches move values instead of deep-cloning
  whole sub-trees per pass
- authoritative-field snapshots hash dns/hosts/tun values instead of
  cloning them around every chain item (9 snapshots per enhance)
- proxy-name cleanup sets build from &str in one conversion

* perf(config): write yaml headers in place and record selections without copying

- save_yaml_str takes an optional header prefix written as separate chunks,
  so the MB-scale serialized payload is never duplicated by format! just
  to prepend a comment (profiles/verge/clash/runtime yaml all benefit;
  file bytes unchanged)
- the runtime yaml string no longer round-trips through a prefixed copy;
  write_runtime_file adds the header when persisting
- record/forget selected nodes mutate the stored selection list in place
  instead of cloning it per click

* perf(tray): drop the redundant full rebuild in update_part

update_part rebuilt the menu twice back to back: once without proxy groups,
then a spawned full update_menu. Keep the partial rebuild only.
2026-11-17 02:17:42 +00:00
Tunglies d7ac6b5bca chore(docs): centralize issue guidance and trim PR descriptions 2026-11-16 23:43:58 +08:00
❤是纱雾酱哟~ 65042b8887 chore(deps): updates agentic workflows to v1.3.0 (#8665)
* chore(deps): update gh-aw extension version to v1.3.0

- Also bump the `with.version` value

Signed-off-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>

* chore(deps): updates agentic workflows to v1.3.0

- Recompiles the workflow lockfiles and updates pinned action and container image digests to align with the latest
  agentic workflow tooling and firewall releases.
- Adopts automatic model routing, improved API quota and credit guardrail handling, and cleaner prompt initialization
  to make automated PR reviews more cost-effective and resilient.

Signed-off-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>

---------

Signed-off-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>
2026-11-16 14:55:41 +00:00
renovate[bot]andrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com> d1649fcc8d chore(deps): update rust crate zip to 9.6.0 (#8664)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-11-16 14:54:34 +00:00
renovate[bot]andrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 368e41f48a chore(deps): update github/gh-aw-actions action to v1.3.0 (#8661)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-11-16 14:06:32 +00:00
ZakkandTunglies 11340794e1 fix(service): detect the service on OpenRC (#8187)
* fix(service): detect the service on OpenRC

* chore(deps): bump Service IPC and bundle to 2.8.1

* docs(changelog): note OpenRC service fixes

* docs(changelog): shorten OpenRC fix entry

---------

Co-authored-by: Tunglies <77394545+Tunglies@users.noreply.github.com>
2026-11-16 08:18:25 +00:00
Tunglies 578986fd24 chore(deps): integrate Service 2.8.0 and sysproxy 0.7.2 (#8655)
* chore(dev): reject mismatched Service and SDK versions

* chore(deps): consume Service 2.8.0 and merged sysproxy 0.7.2

* chore: omit changelog entry from Service integration
2026-11-16 03:23:42 +00:00
Tunglies b2689b4220 fix(ci): recognize diff as a system binary 2026-11-15 11:57:01 +08:00
github-actions[bot]andgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> 5321eb44b8 chore: sync Mihomo changelog to v1.19.34 (#8651)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2026-11-15 01:52:23 +00:00
renovate[bot]andrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com> f0dd12dfb8 chore(deps): update rust crate warp to 0.4.4 (#8650)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-11-15 01:51:07 +00:00
Tunglies 423b51e780 ci: restore automated Mihomo changelog sync 2026-11-15 09:51:18 +08:00
Tunglies d59986182c docs(changelog): omit redundant problem suffixes 2026-11-15 02:12:31 +08:00
41ad2d6d02 fix(tun): apply the displayed default MTU (#8292)
* fix(tun): apply the displayed default MTU

Co-authored-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>
Signed-off-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>

* fix(tun): apply default MTU 1500 during config enhancement

Move the default `tun.mtu` fallback out of `IClashTemp::new` into `enhance::ensure_tun_default_mtu` so profile and
Merge/Script overrides are not overridden by `AuthoritativeFields` unless the user explicitly saved `tun.mtu` in
settings. Ignore `null` TUN values when collecting GUI keys, prevent clearing the MTU input in `TunViewer` from sending
`NaN`/`null`, and update `Changelog.md` to match template rules.

Assisted-by: Gemini 4 Hydrogen (Medium)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>

---------

Signed-off-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>
Co-authored-by: susu-Sugar <214122492+susu-Sugar@users.noreply.github.com>
Co-authored-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-11-14 17:38:07 +00:00
bab4cd14cb fix(connections): keep table header on one line when sorted (#8268)
* fix(connections): prevent table header from wrapping when sorted

The sort indicator was rendered inline with the header label without
`white-space: nowrap`, so on narrow columns (e.g. "下载速度 ▲" needs ~66px
but the default 76px column only leaves 60px after padding) the arrow
wrapped onto a second line and made the header row taller.

- keep the header label and sort indicator on one line, truncating the
  label with an ellipsis and never shrinking the indicator
- widen the default width of the traffic/speed columns from 76 to 96 so
  labels plus the indicator fit by default in both zh and en

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* fix(connections): keep right-aligned header labels anchored when sorted

For right-aligned columns the sort indicator appeared after the label,
so toggling sorting pushed the label left. Reserve the indicator's
space with a hidden placeholder on right-aligned columns so the label
stays put when sorting changes.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* docs(changelog): update changelog

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: AirboZH <i@airbozh.cn>
Signed-off-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>

* fix(changelog): move summary to correct section

Signed-off-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>

---------

Signed-off-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>
2026-11-14 14:30:51 +00:00
VioletSukiand❤是纱雾酱哟~ ca1e55d64e fix(proxy): preserve chain selection on disconnect (#8316)
Signed-off-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>
Co-authored-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>
2026-11-14 11:48:52 +00:00
Tunglies a0ce1cdadf chore(perf): extract replay tooling into a standalone harness (#8645)
* chore(perf): use the external measurement harness

Keep real Traffic, Logs and Connections scenes and the isolated native
entry beside product APIs. Invoke the standalone runner with an explicit
project path and remove bundled measurement orchestration.

Support the optional owned virtual display and read-only isolation
snapshots without changing ordinary product startup or networking.

* docs: scope agent guidance to the active task

Keep behavior and ownership guidance with the relevant task routes,
including the external performance adapter workflow. Preserve focused
self-review for routine changes and independent review where required.

* docs(perf): link the standalone harness repository

Link the harness repository and operating guide, and document first-time
checkout setup while preserving explicit paths for routine invocation.

* fix(perf): account for external harness dependencies in Knip

* chore(perf): keep tool dependencies and guidance outside the product

* docs(perf): keep product guidance focused on the adapter
2026-11-14 06:11:35 +00:00
Tunglies d2e294ccce perf(connections): adopt Mihomo 0.7 and skip unchanged count updates (#8643) 2026-11-14 00:28:42 +00:00
renovate[bot]andrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 3c2ef1af00 chore(deps): update tauri (#8627)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-11-13 23:33:24 +00:00
❤是纱雾酱哟~andrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com> c012a6cdf2 chore(deps): update dependency rust to v1.100.0 (#8642)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-11-13 17:51:51 +00:00
renovate[bot]andrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com> b3da333b56 chore(deps): update github/gh-aw-actions action to v1.2.3 (#8637)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-11-13 07:42:09 +00:00
Tunglies 8ca401a742 chore(rust): upgrade to 1.100 and consolidate Clippy rules (#8636) 2026-11-13 05:29:47 +00:00
Tunglies 3cfef4a990 perf(logs): skip unnecessary filtering work 2026-11-13 09:55:00 +08:00
Tunglies bbb0a0267f perf(traffic): avoid dynamic tooltip style rules 2026-11-13 09:55:00 +08:00
renovate[bot]andrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 119ee86082 chore(deps): update dependency knip to v6.45.1 (#8634)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-11-12 16:55:56 +00:00
c2e36ab733 fix(home): keep the delay chip inside the current node card for long node names (#8633)
The node row is a space-between flex row, but the name column had the
default min-width: auto and the name was not truncated. A long name with
no break opportunity (for example xxx@host:443) widened the column to the
full text, pushed the delay chip past the card edge and made the main
content area scroll horizontally on narrow windows.

Let the name column shrink, truncate the name with an ellipsis (the full
name is in the title tooltip), and keep the chip from shrinking.

Fixes #8589

Co-authored-by: toBerlinWay <toBerlinWay@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-12 16:45:05 +00:00
03d5c3715f fix(macos): sync titlebar backgrounds with theme changes
The window and webview backgrounds retain their startup colors when
the resolved theme changes. With Tauri's full-size content view,
these colors affect the native titlebar even after setTheme succeeds.

Synchronize both backgrounds through WebviewWindow.setBackgroundColor
on macOS, reuse the startup palette, and allow both background commands.

Wry commit 1d1b870 implemented macOS background colors through
WKWebView.underPageBackgroundColor. CVR adopted that behavior in
7d29c0c6 (#6318), making the fixed startup colors from 683667f8 (#5637)
effective on macOS.

Closes #8205
Closes #7968
Closes #8272
Closes #8625
Upstream: https://github.com/tauri-apps/wry/commit/1d1b8707665b4638e040dde7a88cd33d77ba2ebc

Co-authored-by: qzda <qinzhidaoa@gmail.com>
Co-authored-by: Vickers Zhu <vickerszhu@163.com>
2026-11-12 10:47:22 +08:00
renovate[bot]andrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com> b89d09e24e chore(deps): update cargo dependencies (#8630)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-11-12 10:46:45 +08:00
renovate[bot]andrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com> abd89a1457 chore(deps): update node.js to v26.13.1 (#8629)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-11-12 10:46:45 +08:00
Tunglies 2c60f55f45 feat(connections): add network protocol filter (#8611)
* feat(connections): add network protocol filter

Filter connections by metadata.network (All/TCP/UDP) in both table and
list layouts, combined with search, and kept across page switches like
the existing search state.

Refs #6140

* fix(connections): keep network filter labels in English

Remove the All Networks translation and use All alongside TCP and UDP.\n\nRefs #6140

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

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