shkong/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev synced 2025-05-05 04:43:44 +08:00
Code Packages Projects Releases Activity

fix: user-agent version error

Browse Source
This commit is contained in:
MystiPanda 2023-12-15 15:18:01 +08:00
parent a719237556
commit d132357c20
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src-tauri/src/config/prfitem.rs
View File

@ -1,4 +1,4 @@
use crate::utils::{dirs, help, tmpl}; use crate::utils::{dirs, help, resolve::VERSION, tmpl};
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
use reqwest::StatusCode; use reqwest::StatusCode;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -231,7 +231,11 @@ impl PrfItem {
}; };
} }
let version = format!("clash-verge-rev"); let version = match VERSION.get() {
Some(v) => format!("clash-verge/v{}", v),
None => format!("clash-verge/unknown"),
};
builder = builder.user_agent(user_agent.unwrap_or(version)); builder = builder.user_agent(user_agent.unwrap_or(version));
let resp = builder.build()?.get(url).send().await?; let resp = builder.build()?.get(url).send().await?;

6
src-tauri/src/utils/resolve.rs
View File

@ -2,10 +2,13 @@ use crate::config::IVerge;
use crate::{config::Config, core::*, utils::init, utils::server}; use crate::{config::Config, core::*, utils::init, utils::server};
use crate::{log_err, trace_err}; use crate::{log_err, trace_err};
use anyhow::Result; use anyhow::Result;
use once_cell::sync::OnceCell;
use serde_yaml::Mapping; use serde_yaml::Mapping;
use std::net::TcpListener; use std::net::TcpListener;
use tauri::{App, AppHandle, Manager}; use tauri::{App, AppHandle, Manager};
pub static VERSION: OnceCell<String> = OnceCell::new();
pub fn find_unused_port() -> Result<u16> { pub fn find_unused_port() -> Result<u16> {
match TcpListener::bind("127.0.0.1:0") { match TcpListener::bind("127.0.0.1:0") {
Ok(listener) => { Ok(listener) => {
@ -27,8 +30,9 @@ pub fn find_unused_port() -> Result<u16> {
pub fn resolve_setup(app: &mut App) { pub fn resolve_setup(app: &mut App) {
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
app.set_activation_policy(tauri::ActivationPolicy::Accessory); app.set_activation_policy(tauri::ActivationPolicy::Accessory);
let version = app.package_info().version.to_string();
handle::Handle::global().init(app.app_handle()); handle::Handle::global().init(app.app_handle());
VERSION.get_or_init(|| version.clone());
log_err!(init::init_resources()); log_err!(init::init_resources());
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]

2
src/components/profile/profile-viewer.tsx
View File

@ -209,7 +209,7 @@ export const ProfileViewer = forwardRef<ProfileViewerRef, Props>(
<TextField <TextField
{...text} {...text}
{...field} {...field}
placeholder={`clash-verge-rev`} placeholder={`clash-verge/v${version}`}
label="User Agent" label="User Agent"
/> />
)} )}