mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-10-30 10:42:09 +08:00
Revert "feat(cvd): add device-bound subscription protocol"
This reverts commit 2cb9c13ab6.
This commit is contained in:
@@ -133,8 +133,7 @@ export function ProfileViewer({ onChange, ref }: ProfileViewerProps) {
|
||||
await patchProfile(form.uid, item)
|
||||
}
|
||||
} else {
|
||||
// 远程配置:编辑用代理回退重试;新建的代理回退已下沉到后端,
|
||||
// 后端用同一个 uid(同一 CVD 设备密钥/槽位)跨代理重试,前端不再重试。
|
||||
// 远程配置使用回退机制
|
||||
try {
|
||||
// 尝试正常操作
|
||||
if (openType === 'new') {
|
||||
@@ -143,16 +142,13 @@ export function ProfileViewer({ onChange, ref }: ProfileViewerProps) {
|
||||
if (!form.uid) throw new Error('UID not found')
|
||||
await patchProfile(form.uid, item)
|
||||
}
|
||||
} catch (err) {
|
||||
// 新建:后端已跨代理重试并复用同一密钥,前端再次 createProfile 会注册新公钥、
|
||||
// 可能额外占用一个设备槽位,因此直接上抛由外层提示错误。
|
||||
if (openType === 'new') throw err
|
||||
|
||||
// 编辑:用自身代理重试 patch,再恢复原始代理设置
|
||||
if (!form.uid) throw new Error('UID not found', { cause: err })
|
||||
} catch {
|
||||
// 首次创建/更新失败,尝试使用自身代理
|
||||
showNotice.info(
|
||||
'profiles.modals.profileForm.feedback.notifications.creationRetry',
|
||||
)
|
||||
|
||||
// 使用自身代理的配置
|
||||
const retryItem = {
|
||||
...item,
|
||||
option: {
|
||||
@@ -161,9 +157,17 @@ export function ProfileViewer({ onChange, ref }: ProfileViewerProps) {
|
||||
self_proxy: true,
|
||||
},
|
||||
}
|
||||
await patchProfile(form.uid, retryItem)
|
||||
// 编辑模式下恢复原始代理设置
|
||||
await patchProfile(form.uid, { option: originalOptions })
|
||||
|
||||
// 使用自身代理再次尝试
|
||||
if (openType === 'new') {
|
||||
await createProfile(retryItem, fileDataRef.current)
|
||||
} else {
|
||||
if (!form.uid) throw new Error('UID not found')
|
||||
await patchProfile(form.uid, retryItem)
|
||||
|
||||
// 编辑模式下恢复原始代理设置
|
||||
await patchProfile(form.uid, { option: originalOptions })
|
||||
}
|
||||
|
||||
showNotice.success(
|
||||
'profiles.modals.profileForm.feedback.notifications.creationSuccess',
|
||||
|
||||
@@ -472,15 +472,6 @@ export const BackupHistoryViewer = ({
|
||||
{pendingConfirmation.filename}
|
||||
</Typography>
|
||||
)}
|
||||
{pendingConfirmation?.action === 'restore' && (
|
||||
<Typography
|
||||
variant="caption"
|
||||
color="warning.main"
|
||||
sx={{ display: 'block', mt: 1.5 }}
|
||||
>
|
||||
{t('settings.modals.backup.messages.restoreCvdWarning')}
|
||||
</Typography>
|
||||
)}
|
||||
</BaseDialog>
|
||||
</BaseDialog>
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user