Files
clash-verge-rev/src/components/setting/mods/backup-webdav-dialog.tsx
T
wonfen 22947632c0 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.
2026-08-14 23:52:37 +08:00

95 lines
2.6 KiB
TypeScript

import { Box } from '@mui/material'
import { useCallback, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { BaseDialog, BaseLoadingOverlay } from '@/components/base'
import { useVerge } from '@/hooks/use-verge'
import { listWebDavBackup } from '@/services/cmds'
import { errorDetail, showNotice } from '@/services/notice-service'
import { buildWebdavSignature, setWebdavStatus } from '@/services/webdav-status'
import { BackupConfigViewer } from './backup-config-viewer'
interface BackupWebdavDialogProps {
open: boolean
onClose: () => void
onBackupSuccess?: () => void
setBusy?: (loading: boolean) => void
}
export const BackupWebdavDialog = ({
open,
onClose,
onBackupSuccess,
setBusy,
}: BackupWebdavDialogProps) => {
const { t } = useTranslation()
const { verge } = useVerge()
const [loading, setLoading] = useState(false)
const webdavSignature = buildWebdavSignature(verge)
const handleLoading = useCallback(
(value: boolean) => {
setLoading(value)
setBusy?.(value)
},
[setBusy],
)
const refreshWebdav = useCallback(
async (options?: { silent?: boolean; signature?: string }) => {
const signature = options?.signature ?? webdavSignature
handleLoading(true)
try {
await listWebDavBackup()
setWebdavStatus(signature, 'ready')
if (!options?.silent) {
showNotice.success(
'settings.modals.backup.messages.webdavRefreshSuccess',
)
}
} catch (error) {
setWebdavStatus(signature, 'failed')
showNotice.error(
'settings.modals.backup.messages.webdavRefreshFailed',
{ error: errorDetail(error) },
)
} finally {
handleLoading(false)
}
},
[handleLoading, webdavSignature],
)
const refreshSilently = useCallback(
(signature?: string) => refreshWebdav({ silent: true, signature }),
[refreshWebdav],
)
return (
<BaseDialog
open={open}
title={t('settings.modals.backup.webdav.title')}
contentSx={{ width: { xs: 360, sm: 520 } }}
disableOk
cancelBtn={t('shared.actions.close')}
onCancel={onClose}
onClose={onClose}
>
<Box sx={{ position: 'relative' }}>
<BaseLoadingOverlay isLoading={loading} />
<BackupConfigViewer
setLoading={handleLoading}
onBackupSuccess={async () => {
await refreshSilently()
onBackupSuccess?.()
}}
onSaveSuccess={refreshSilently}
onRefresh={refreshWebdav}
onInit={refreshSilently}
/>
</Box>
</BaseDialog>
)
}