diff --git a/src-tauri/src/data/prfitem.rs b/src-tauri/src/data/prfitem.rs
index 7f94f133c950e03718b38a8030162c19c0372bd1..2a01b1d3f5047cdfb02aa979955c35f7a4d11168 100644
--- a/src-tauri/src/data/prfitem.rs
+++ b/src-tauri/src/data/prfitem.rs
@@ -69,9 +69,15 @@ pub struct PrfOption {
pub user_agent: Option<String>,
/// for `remote` profile
+ /// use system proxy
#[serde(skip_serializing_if = "Option::is_none")]
pub with_proxy: Option<bool>,
+ /// for `remote` profile
+ /// use self proxy
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub self_proxy: Option<bool>,
+
#[serde(skip_serializing_if = "Option::is_none")]
pub update_interval: Option<u64>,
}
@@ -80,9 +86,10 @@ impl PrfOption {
pub fn merge(one: Option<Self>, other: Option<Self>) -> Option<Self> {
match (one, other) {
(Some(mut a), Some(b)) => {
- a.user_agent = a.user_agent.or(b.user_agent);
- a.with_proxy = a.with_proxy.or(b.with_proxy);
- a.update_interval = a.update_interval.or(b.update_interval);
+ a.user_agent = b.user_agent.or(a.user_agent);
+ a.with_proxy = b.with_proxy.or(a.with_proxy);
+ a.self_proxy = b.self_proxy.or(a.self_proxy);
+ a.update_interval = b.update_interval.or(a.update_interval);
Some(a)
}
t @ _ => t.0.or(t.1),
@@ -174,19 +181,31 @@ impl PrfItem {
desc: Option<String>,
option: Option<PrfOption>,
) -> Result<PrfItem> {
- let with_proxy = match option.as_ref() {
- Some(opt) => opt.with_proxy.unwrap_or(false),
- None => false,
- };
- let user_agent = match option.as_ref() {
- Some(opt) => opt.user_agent.clone(),
- None => None,
- };
+ let opt_ref = option.as_ref();
+ let with_proxy = opt_ref.map_or(false, |o| o.with_proxy.unwrap_or(false));
+ let self_proxy = opt_ref.map_or(false, |o| o.self_proxy.unwrap_or(false));
+ let user_agent = opt_ref.map_or(None, |o| o.user_agent.clone());
let mut builder = reqwest::ClientBuilder::new();
- if !with_proxy {
+ if !with_proxy && !self_proxy {
builder = builder.no_proxy();
+ } else if self_proxy {
+ // 使用软件自己的代ç†
+ let data = super::Data::global();
+ let port = data.clash.lock().info.port.clone();
+ let port = port.ok_or(anyhow::anyhow!("failed to get clash info port"))?;
+ let proxy_scheme = format!("http://127.0.0.1:{port}");
+
+ if let Ok(proxy) = reqwest::Proxy::http(&proxy_scheme) {
+ builder = builder.proxy(proxy);
+ }
+ if let Ok(proxy) = reqwest::Proxy::https(&proxy_scheme) {
+ builder = builder.proxy(proxy);
+ }
+ if let Ok(proxy) = reqwest::Proxy::all(&proxy_scheme) {
+ builder = builder.proxy(proxy);
+ }
}
let version = unsafe { dirs::APP_VERSION };
diff --git a/src/components/profile/info-editor.tsx b/src/components/profile/info-editor.tsx
index 2f9a107b8b845d4f80ee03ceea3503e70e939905..941dc6253b2861038f96c990db69ac2d216e35ca 100644
--- a/src/components/profile/info-editor.tsx
+++ b/src/components/profile/info-editor.tsx
@@ -8,7 +8,9 @@ import {
DialogActions,
DialogContent,
DialogTitle,
+ FormControlLabel,
IconButton,
+ Switch,
TextField,
} from "@mui/material";
import { Settings } from "@mui/icons-material";
@@ -34,11 +36,15 @@ const InfoEditor = (props: Props) => {
useEffect(() => {
if (itemData) {
+ const { option } = itemData;
setForm({ ...itemData });
- setOption(itemData.option ?? {});
+ setOption(option ?? {});
setShowOpt(
itemData.type === "remote" &&
- (!!itemData.option?.user_agent || !!itemData.option?.update_interval)
+ (!!option?.user_agent ||
+ !!option?.update_interval ||
+ !!option?.self_proxy ||
+ !!option?.with_proxy)
);
}
}, [itemData]);
@@ -138,6 +144,46 @@ const InfoEditor = (props: Props) => {
onKeyDown={(e) => e.key === "Enter" && onUpdate()}
/>
)}
+
+ {form.type === "remote" && showOpt && (
+ <FormControlLabel
+ label={t("Use System Proxy")}
+ labelPlacement="start"
+ sx={{ ml: 0, my: 1 }}
+ control={
+ <Switch
+ color="primary"
+ checked={option.with_proxy ?? false}
+ onChange={(_e, c) =>
+ setOption((o) => ({
+ self_proxy: c ? false : o.self_proxy ?? false,
+ with_proxy: c,
+ }))
+ }
+ />
+ }
+ />
+ )}
+
+ {form.type === "remote" && showOpt && (
+ <FormControlLabel
+ label={t("Use Clash Proxy")}
+ labelPlacement="start"
+ sx={{ ml: 0, my: 1 }}
+ control={
+ <Switch
+ color="primary"
+ checked={option.self_proxy ?? false}
+ onChange={(_e, c) =>
+ setOption((o) => ({
+ with_proxy: c ? false : o.with_proxy ?? false,
+ self_proxy: c,
+ }))
+ }
+ />
+ }
+ />
+ )}
</DialogContent>
<DialogActions sx={{ px: 2, pb: 2, position: "relative" }}>
diff --git a/src/components/profile/profile-item.tsx b/src/components/profile/profile-item.tsx
index 2de20cd5cbf95e0c6fe7f977f4d5a8df657356ca..9ad6bfa26a0298d8c4184fbb068f432294b40c1a 100644
--- a/src/components/profile/profile-item.tsx
+++ b/src/components/profile/profile-item.tsx
@@ -110,12 +110,32 @@ const ProfileItem = (props: Props) => {
}
});
- const onUpdate = useLockFn(async (withProxy: boolean) => {
+ /// 0 ä¸ä½¿ç”¨ä»»ä½•ä»£ç†
+ /// 1 使用é…置好的代ç†
+ /// 2 至少使用一个代ç†ï¼Œæ ¹æ®é…置，如果没é…置，默认使用系统代ç†
+ const onUpdate = useLockFn(async (type: 0 | 1 | 2) => {
setAnchorEl(null);
setLoadingCache((cache) => ({ ...cache, [itemData.uid]: true }));
+ const option: Partial<CmdType.ProfileOption> = {};
+
+ if (type === 0) {
+ option.with_proxy = false;
+ option.self_proxy = false;
+ } else if (type === 1) {
+ // nothing
+ } else if (type === 2) {
+ if (itemData.option?.self_proxy) {
+ option.with_proxy = false;
+ option.self_proxy = true;
+ } else {
+ option.with_proxy = true;
+ option.self_proxy = false;
+ }
+ }
+
try {
- await updateProfile(itemData.uid, { with_proxy: withProxy });
+ await updateProfile(itemData.uid, option);
mutate("getProfiles");
} catch (err: any) {
const errmsg = err?.message || err.toString();
@@ -142,8 +162,8 @@ const ProfileItem = (props: Props) => {
{ label: "Edit Info", handler: onEditInfo },
{ label: "Edit File", handler: onEditFile },
{ label: "Open File", handler: onOpenFile },
- { label: "Update", handler: () => onUpdate(false) },
- { label: "Update(Proxy)", handler: () => onUpdate(true) },
+ { label: "Update", handler: () => onUpdate(0) },
+ { label: "Update(Proxy)", handler: () => onUpdate(2) },
{ label: "Delete", handler: onDelete },
];
const fileModeMenu = [
@@ -199,7 +219,7 @@ const ProfileItem = (props: Props) => {
disabled={loading}
onClick={(e) => {
e.stopPropagation();
- onUpdate(false);
+ onUpdate(1);
}}
>
<RefreshRounded color="inherit" />
diff --git a/src/components/profile/profile-new.tsx b/src/components/profile/profile-new.tsx
index dfe24bba535f5b355f72105ac110cbb8a963d88e..74543161ef65793c6f4b33a06623999934d45942 100644
--- a/src/components/profile/profile-new.tsx
+++ b/src/components/profile/profile-new.tsx
@@ -9,10 +9,12 @@ import {
DialogContent,
DialogTitle,
FormControl,
+ FormControlLabel,
IconButton,
InputLabel,
MenuItem,
Select,
+ Switch,
TextField,
} from "@mui/material";
import { Settings } from "@mui/icons-material";
@@ -40,7 +42,11 @@ const ProfileNew = (props: Props) => {
const [showOpt, setShowOpt] = useState(false);
// can add more option
- const [option, setOption] = useSetState({ user_agent: "" });
+ const [option, setOption] = useSetState({
+ user_agent: "",
+ with_proxy: false,
+ self_proxy: false,
+ });
// file input
const fileDataRef = useRef<string | null>(null);
@@ -141,6 +147,46 @@ const ProfileNew = (props: Props) => {
onChange={(e) => setOption({ user_agent: e.target.value })}
/>
)}
+
+ {form.type === "remote" && showOpt && (
+ <FormControlLabel
+ label={t("Use System Proxy")}
+ labelPlacement="start"
+ sx={{ ml: 0, my: 1 }}
+ control={
+ <Switch
+ color="primary"
+ checked={option.with_proxy}
+ onChange={(_e, c) =>
+ setOption((o) => ({
+ self_proxy: c ? false : o.self_proxy,
+ with_proxy: c,
+ }))
+ }
+ />
+ }
+ />
+ )}
+
+ {form.type === "remote" && showOpt && (
+ <FormControlLabel
+ label={t("Use Clash Proxy")}
+ labelPlacement="start"
+ sx={{ ml: 0, my: 1 }}
+ control={
+ <Switch
+ color="primary"
+ checked={option.self_proxy}
+ onChange={(_e, c) =>
+ setOption((o) => ({
+ with_proxy: c ? false : o.with_proxy,
+ self_proxy: c,
+ }))
+ }
+ />
+ }
+ />
+ )}
</DialogContent>
<DialogActions sx={{ px: 2, pb: 2, position: "relative" }}>
diff --git a/src/services/types.d.ts b/src/services/types.d.ts
index 7f8d868f66e85d2577ac155aab324002514799ce..e537af4fda5c063cd17f511c8cec2efe9a210b69 100644
--- a/src/services/types.d.ts
+++ b/src/services/types.d.ts
@@ -124,6 +124,7 @@ declare namespace CmdType {
interface ProfileOption {
user_agent?: string;
with_proxy?: boolean;
+ self_proxy?: boolean;
update_interval?: number;
}