gitea-admin/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-11-04 22:52:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat(cvd): add device-bound subscription protocol"

Browse Source 
This reverts commit 2cb9c13ab6.
This commit is contained in:
Tunglies
2026-06-02 21:02:19 +08:00
parent 2cb9c13ab6
commit fa27d3eae5
44 changed files with 79 additions and 1976 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/utils/resolve/scheme.rs
+4 -19
View File
@@ -85,7 +85,7 @@ async fn import_subscription(url: &str, name: Option<&String>) {
profiles.latest_arc().current.is_some()
};
let Some((mut item, device_key)) = fetch_profile_item(url, name).await else {
let Some(mut item) = fetch_profile_item(url, name).await else {
return;
};
@@ -97,18 +97,6 @@ async fn import_subscription(url: &str, name: Option<&String>) {
return;
}
// Persist the device key only if CVD actually engaged (item cached a pubkey). A plaintext airport
// leaves cvd_pub None, so we skip the keychain write (and its macOS prompt).
if item.cvd_pub.is_some()
&& let Err(e) = device_key.persist()
{
logging!(
warn,
Type::Config,
"cvd: failed to persist device key after deep-link import: {e}"
);
}
Config::profiles().await.apply();
logging_error!(Type::Config, Config::profiles().await.data_arc().save_file().await);
handle::Handle::notice_message(
@@ -119,12 +107,9 @@ async fn import_subscription(url: &str, name: Option<&String>) {
post_import_updates(&uid, had_current_profile).await;
}
async fn fetch_profile_item(url: &str, name: Option<&String>) -> Option<(PrfItem, crate::cvd::DeviceKey)> {
// New remote profile: own the device key; the caller persists it after the profile is saved.
let uid = help::get_uid("R");
let key = crate::cvd::DeviceKey::generate(&uid);
match PrfItem::from_url(url, name, None, None, &uid, crate::cvd::CvdMode::New(&key)).await {
Ok(item) => Some((item, key)),
async fn fetch_profile_item(url: &str, name: Option<&String>) -> Option<PrfItem> {
match PrfItem::from_url(url, name, None, None).await {
Ok(item) => Some(item),
Err(e) => {
logging!(error, Type::Config, "failed to parse profile from url: {:?}", e);
handle::Handle::notice_message("import_sub_url::error", e.to_string());