refactor: Rewrite and improve sysproxy logic (#7744)

* fix(cmd): preserve anyhow context in coded errors

Use alternate error formatting so coded failures retain the full anyhow context chain without changing their wire format.

* fix(macos): skip redundant proxy disable writes

When both proxy modes are off, read macOS state first and skip networksetup if the OS is already clean. Update the guard target only after a successful write.

* feat(proxy): classify system proxy failures

Attach stable, actionable proxy failure codes to anyhow chains while preserving the original diagnostic causes.

* feat(cmd): return structured command failures

Replace encoded error strings with serializable code and detail fields, and update frontend notice consumers to handle the structured shape.

* fix(scripts): use the js-yaml namespace import

Import js-yaml through its ESM namespace so the i18n cleanup script can access load and dump.

* feat(proxy): localize classified proxy failures

Map privilege and direct-fallback codes to localized explanations, and let mapped causes outrank generic operation keys in notices.

* fix(ui): bound notice text and render failure details

Limit resolved notice text without truncating clipboard content, and normalize structured failures embedded in translation parameters.

* feat(proxy): persist unseen proxy failures

Store unresolved classified failures by code, notify the frontend when the table changes, and show each failure sequence once when a visible window can receive it.

* feat(proxy): report tray and hotkey toggle failures

Record classified failures from tray and hotkey proxy toggles so they appear when a visible window is available.

* fix(ui): restore the proxy switch after failed toggles

Refresh frontend proxy state after a failed toggle so the switch reflects the rolled-back configuration.

* feat(proxy): stop the guard after repeated failures

Report guard outcomes, stop after the failure threshold, and persist the classified failure for the frontend.

* fix(macos): preserve proxy during service handoff

Stop a sidecar being handed to the service without clearing proxy state that the new owner must inherit.

* feat(macos): classify misplaced sidecar state

Distinguish a refused sidecar proxy write from a machine that still needs the privileged service installed.

* feat(ui): recover misplaced sidecar notices

Offer a restart action for macOS proxy failures caused by a ready service while the core still runs as a sidecar.

* feat(ui): install the service from proxy notices

Let privilege notices install the macOS service, restart the core, and report the runtime mode that was actually reached.

* feat(cmd): attach requested proxy operations

Carry the requested proxy direction with structured command failures when the originating command knows it.

* feat(sysproxy): drain guards before OS access

Wait for the local proxy guard to stop before OS reads, service handoff, or final writes, and refuse transitions when it does not drain.

* feat(sysproxy): recover partial proxy writes

Use write progress to choose whether to restore the old guard or compensate with a disabled proxy state, while preserving actionable errors.

* feat(sysproxy): skip already-applied proxy writes

Compare macOS proxy snapshots with global, PAC, and disabled targets so matching state avoids redundant privileged writes.

* feat(proxy): report background proxy failures

Persist and surface classified proxy failures from lifecycle paths that have no direct caller awaiting the result.

* feat(ui): move proxy recovery into a dialog

Guide users through installing or switching to the service after a refused proxy write, and suppress duplicate toast reports.

* fix(ui): close proxy dialog after service recovery

Dismiss the recovery dialog once the core reaches service mode, even when the original proxy request remains pending.

* feat(ui): retry proxy request after service recovery

Replay the requested proxy direction after the core reaches service mode, while leaving incidental restores unchanged.

* fix(proxy): refresh state after successful apply

Publish the proxy refresh from the shared apply path after releasing the lifecycle lock, and remove the tray-specific duplicate.

* feat(ui): show proxy recovery progress

Display installation, restart, and proxy-apply stages while keeping the primary action spinner visible during recovery.

* feat(ui): route unavailable TUN through service recovery

Let the TUN switch request service recovery and restore its requested state after the core restarts in service mode.

* fix(ui): avoid duplicate TUN recovery errors

Roll back deferred TUN toggles without reporting an error, and publish configuration refreshes from the transaction commit path.

* chore: update changelog & pinlock

* fix(core): resolve platform-specific clippy warnings

* fix(core): detect Windows wildcard TCP conflicts

Windows permits a specific exclusive bind beside an existing non-exclusive wildcard listener. Consult the system TCP listener table so the probe reports that overlap as a conflict.
This commit is contained in:
wonfen
2026-08-14 23:52:37 +08:00
committed by GitHub
parent 0844ed30a8
commit 22947632c0
93 changed files with 5208 additions and 337 deletions
+18
View File
@@ -138,6 +138,16 @@ export const translationKeys = [
'layout.components.serviceMigration.errors.restartFailed',
'layout.components.serviceMigration.errors.revalidationFailed',
'layout.components.serviceMigration.errors.sidecarFailed',
'layout.components.sysproxyPrivilege.title',
'layout.components.sysproxyPrivilege.message',
'layout.components.sysproxyPrivilege.serviceReadyMessage',
'layout.components.sysproxyPrivilege.alternative',
'layout.components.sysproxyPrivilege.later',
'layout.components.sysproxyPrivilege.installing',
'layout.components.sysproxyPrivilege.restarting',
'layout.components.sysproxyPrivilege.applying',
'layout.components.sysproxyPrivilege.tunTitle',
'layout.components.sysproxyPrivilege.tunMessage',
'layout.feedback.errors.restartCoreStopFailed',
'layout.feedback.errors.quitCoreStopFailed',
'logs.page.title',
@@ -397,8 +407,12 @@ export const translationKeys = [
'settings.sections.proxyControl.tooltips.tunUnavailable',
'settings.sections.proxyControl.actions.installService',
'settings.sections.proxyControl.actions.uninstallService',
'settings.sections.proxyControl.actions.switchToServiceMode',
'settings.sections.proxyControl.fields.systemProxy',
'settings.sections.proxyControl.fields.tunMode',
'settings.sections.proxyControl.messages.installedCheckProxy',
'settings.sections.proxyControl.messages.installedCoreNotOnService',
'settings.sections.proxyControl.messages.installedProxyRestored',
'settings.sections.externalController.title',
'settings.sections.externalController.fields.enable',
'settings.sections.externalController.fields.address',
@@ -760,6 +774,10 @@ export const translationKeys = [
'settings.feedback.errors.clashService.reinstallFailed',
'settings.feedback.errors.clashService.repairFailed',
'settings.feedback.errors.clashService.sidecarFailed',
'settings.feedback.errors.sysproxy.privilegeRequired',
'settings.feedback.errors.sysproxy.directFallback',
'settings.feedback.errors.sysproxy.guardStopped',
'settings.feedback.errors.sysproxy.sidecarWhileServiceReady',
'settings.feedback.notifications.clash.restartSuccess',
'settings.feedback.notifications.clash.versionUpdated',
'settings.feedback.notifications.clash.alreadyLatestVersion',
+24
View File
@@ -231,6 +231,18 @@ export interface TranslationResources {
title: string
unavailableMessage: string
}
sysproxyPrivilege: {
alternative: string
applying: string
installing: string
later: string
message: string
restarting: string
serviceReadyMessage: string
title: string
tunMessage: string
tunTitle: string
}
}
feedback: {
errors: {
@@ -796,6 +808,12 @@ export interface TranslationResources {
sidecarFailed: string
uninstallFailed: string
}
sysproxy: {
directFallback: string
guardStopped: string
privilegeRequired: string
sidecarWhileServiceReady: string
}
}
notifications: {
clash: {
@@ -1297,12 +1315,18 @@ export interface TranslationResources {
proxyControl: {
actions: {
installService: string
switchToServiceMode: string
uninstallService: string
}
fields: {
systemProxy: string
tunMode: string
}
messages: {
installedCheckProxy: string
installedCoreNotOnService: string
installedProxyRestored: string
}
tooltips: {
systemProxy: string
tunMode: string