diff --git a/src-tauri/src/cmds.rs b/src-tauri/src/cmds.rs
index 4026c22082de501d53b4bd6884bd3c5fbc25dc54..1e24371b4302f2e0e5276df1b3edd481e41d6271 100644
--- a/src-tauri/src/cmds.rs
+++ b/src-tauri/src/cmds.rs
@@ -32,7 +32,7 @@ pub async fn import_profile(
with_proxy: bool,
profiles_state: State<'_, ProfilesState>,
) -> Result<(), String> {
- let item = wrap_err!(PrfItem::from_url(&url, with_proxy).await)?;
+ let item = wrap_err!(PrfItem::from_url(&url, None, None, with_proxy).await)?;
let mut profiles = profiles_state.0.lock().unwrap();
wrap_err!(profiles.append_item(item))
@@ -42,12 +42,11 @@ pub async fn import_profile(
/// append a temp profile item file to the `profiles` dir
/// view the temp profile file by using vscode or other editor
#[tauri::command]
-pub async fn new_profile(
- name: String,
- desc: String,
+pub async fn create_profile(
+ item: PrfItem, // partial
profiles_state: State<'_, ProfilesState>,
) -> Result<(), String> {
- let item = wrap_err!(PrfItem::from_local(name, desc))?;
+ let item = wrap_err!(PrfItem::from(item).await)?;
let mut profiles = profiles_state.0.lock().unwrap();
wrap_err!(profiles.append_item(item))
@@ -73,7 +72,7 @@ pub async fn update_profile(
item.url.clone().unwrap()
};
- let item = wrap_err!(PrfItem::from_url(&url, with_proxy).await)?;
+ let item = wrap_err!(PrfItem::from_url(&url, None, None, with_proxy).await)?;
let mut profiles = profiles_state.0.lock().unwrap();
wrap_err!(profiles.update_item(index.clone(), item))?;
diff --git a/src-tauri/src/core/profiles.rs b/src-tauri/src/core/profiles.rs
index b12b01f9ea3597a56d95829176b4715c04d62826..a80d9acfc97f864c11992154dc67350623611cf4 100644
--- a/src-tauri/src/core/profiles.rs
+++ b/src-tauri/src/core/profiles.rs
@@ -75,6 +75,42 @@ impl Default for PrfItem {
}
impl PrfItem {
+ /// From partial item
+ /// must contain `itype`
+ pub async fn from(item: PrfItem) -> Result<PrfItem> {
+ if item.itype.is_none() {
+ bail!("type should not be null");
+ }
+
+ match item.itype.unwrap().as_str() {
+ "remote" => {
+ if item.url.is_none() {
+ bail!("url should not be null");
+ }
+ let url = item.url.as_ref().unwrap().as_str();
+ let name = item.name;
+ let desc = item.desc;
+ PrfItem::from_url(url, name, desc, false).await
+ }
+ "local" => {
+ let name = item.name.unwrap_or("Local File".into());
+ let desc = item.desc.unwrap_or("".into());
+ PrfItem::from_local(name, desc)
+ }
+ "merge" => {
+ let name = item.name.unwrap_or("Merge".into());
+ let desc = item.desc.unwrap_or("".into());
+ PrfItem::from_merge(name, desc)
+ }
+ "script" => {
+ let name = item.name.unwrap_or("Script".into());
+ let desc = item.desc.unwrap_or("".into());
+ PrfItem::from_script(name, desc)
+ }
+ typ @ _ => bail!("invalid type \"{typ}\""),
+ }
+ }
+
/// ## Local type
/// create a new item from name/desc
pub fn from_local(name: String, desc: String) -> Result<PrfItem> {
@@ -91,13 +127,18 @@ impl PrfItem {
selected: None,
extra: None,
updated: Some(help::get_now()),
- file_data: Some(tmpl::ITEM_CONFIG.into()),
+ file_data: Some(tmpl::ITEM_LOCAL.into()),
})
}
/// ## Remote type
/// create a new item from url
- pub async fn from_url(url: &str, with_proxy: bool) -> Result<PrfItem> {
+ pub async fn from_url(
+ url: &str,
+ name: Option<String>,
+ desc: Option<String>,
+ with_proxy: bool,
+ ) -> Result<PrfItem> {
let mut builder = reqwest::ClientBuilder::new();
if !with_proxy {
@@ -124,14 +165,14 @@ impl PrfItem {
let uid = help::get_uid("r");
let file = format!("{uid}.yaml");
- let name = uid.clone();
+ let name = name.unwrap_or(uid.clone());
let data = resp.text_with_charset("utf-8").await?;
Ok(PrfItem {
uid: Some(uid),
itype: Some("remote".into()),
name: Some(name),
- desc: None,
+ desc,
file: Some(file),
url: Some(url.into()),
selected: None,
@@ -140,6 +181,46 @@ impl PrfItem {
file_data: Some(data),
})
}
+
+ /// ## Merge type (enhance)
+ /// create the enhanced item by using `merge` rule
+ pub fn from_merge(name: String, desc: String) -> Result<PrfItem> {
+ let uid = help::get_uid("m");
+ let file = format!("{uid}.yaml");
+
+ Ok(PrfItem {
+ uid: Some(uid),
+ itype: Some("merge".into()),
+ name: Some(name),
+ desc: Some(desc),
+ file: Some(file),
+ url: None,
+ selected: None,
+ extra: None,
+ updated: Some(help::get_now()),
+ file_data: Some(tmpl::ITEM_MERGE.into()),
+ })
+ }
+
+ /// ## Script type (enhance)
+ /// create the enhanced item by using javascript(browserjs)
+ pub fn from_script(name: String, desc: String) -> Result<PrfItem> {
+ let uid = help::get_uid("s");
+ let file = format!("{uid}.js"); // js ext
+
+ Ok(PrfItem {
+ uid: Some(uid),
+ itype: Some("script".into()),
+ name: Some(name),
+ desc: Some(desc),
+ file: Some(file),
+ url: None,
+ selected: None,
+ extra: None,
+ updated: Some(help::get_now()),
+ file_data: Some(tmpl::ITEM_SCRIPT.into()),
+ })
+ }
}
///
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 944c24a7e8ed32084d926f5ca4c5a75e27e85bcd..d06b944705f40894e9304400fdd2a0e8d916c6f1 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -85,9 +85,9 @@ fn main() -> std::io::Result<()> {
cmds::get_verge_config,
cmds::patch_verge_config,
// profile
- cmds::new_profile,
cmds::view_profile,
cmds::patch_profile,
+ cmds::create_profile,
cmds::import_profile,
cmds::update_profile,
cmds::delete_profile,
diff --git a/src-tauri/src/utils/tmpl.rs b/src-tauri/src/utils/tmpl.rs
index 2462c2d53c7a82a3d77769f0c5e7edbc5088001b..979ff86e6f99addc9e108a05509981daa66edde9 100644
--- a/src-tauri/src/utils/tmpl.rs
+++ b/src-tauri/src/utils/tmpl.rs
@@ -32,11 +32,38 @@ system_proxy_bypass: localhost;127.*;10.*;192.168.*;<local>
";
/// template for new a profile item
-pub const ITEM_CONFIG: &str = "# Profile Template for clash verge\n\n
-# proxies defination (optional, the same as clash)
-proxies:\n
-# proxy-groups (optional, the same as clash)
-proxy-groups:\n
-# rules (optional, the same as clash)
-rules:\n\n
+pub const ITEM_LOCAL: &str = "# Profile Template for clash verge
+
+proxies:
+
+proxy-groups:
+
+rules:
+";
+
+/// enhanced profile
+pub const ITEM_MERGE: &str = "# Merge Template for clash verge
+# The `Merge` format used to enhance profile
+
+prepend-rules:
+
+prepend-proxies:
+
+prepend-proxy-groups:
+
+append-rules:
+
+append-proxies:
+
+append-proxy-groups:
+";
+
+/// enhanced profile
+pub const ITEM_SCRIPT: &str = "// Should define the `main` function
+// The argument to this function is the clash config
+// or the result of the previous handler
+// so you should return the config after processing
+function main(params) {
+ return params;
+}
";
diff --git a/src/components/profile/profile-edit.tsx b/src/components/profile/profile-edit.tsx
index 0b191ad0ce7ffe168f2b608089969eaafb5ab5ab..cda39d286e65a846d9ca3dbb0b3090765489c3ad 100644
--- a/src/components/profile/profile-edit.tsx
+++ b/src/components/profile/profile-edit.tsx
@@ -1,6 +1,6 @@
-import { useEffect, useState } from "react";
-import { useLockFn } from "ahooks";
import { mutate } from "swr";
+import { useEffect } from "react";
+import { useLockFn, useSetState } from "ahooks";
import {
Button,
Dialog,
@@ -22,66 +22,80 @@ interface Props {
// edit the profile item
const ProfileEdit = (props: Props) => {
const { open, itemData, onClose } = props;
-
- // todo: more type
- const [name, setName] = useState(itemData.name);
- const [desc, setDesc] = useState(itemData.desc);
- const [url, setUrl] = useState(itemData.url);
+ const [form, setForm] = useSetState({ ...itemData });
useEffect(() => {
if (itemData) {
- setName(itemData.name);
- setDesc(itemData.desc);
- setUrl(itemData.url);
+ setForm({ ...itemData });
}
}, [itemData]);
const onUpdate = useLockFn(async () => {
try {
const { uid } = itemData;
+ const { name, desc, url } = form;
await patchProfile(uid, { uid, name, desc, url });
mutate("getProfiles");
onClose();
} catch (err: any) {
- Notice.error(err?.message || err?.toString());
+ Notice.error(err?.message || err.toString());
}
});
+ const textFieldProps = {
+ fullWidth: true,
+ size: "small",
+ margin: "normal",
+ variant: "outlined",
+ } as const;
+
+ const type =
+ form.type ?? form.url
+ ? "remote"
+ : form.file?.endsWith("js")
+ ? "script"
+ : "local";
+
return (
<Dialog open={open} onClose={onClose}>
- <DialogTitle>Edit Profile</DialogTitle>
- <DialogContent sx={{ width: 360, pb: 0.5 }}>
+ <DialogTitle sx={{ pb: 0.5 }}>Edit Profile</DialogTitle>
+
+ <DialogContent sx={{ width: 336, pb: 1 }}>
<TextField
+ {...textFieldProps}
+ disabled
+ label="Type"
+ value={type}
+ sx={{ input: { textTransform: "capitalize" } }}
+ />
+
+ <TextField
+ {...textFieldProps}
autoFocus
- fullWidth
label="Name"
- margin="dense"
- variant="outlined"
- value={name}
- onChange={(e) => setName(e.target.value)}
+ value={form.name}
+ onChange={(e) => setForm({ name: e.target.value })}
/>
<TextField
- fullWidth
+ {...textFieldProps}
label="Descriptions"
- margin="normal"
- variant="outlined"
- value={desc}
- onChange={(e) => setDesc(e.target.value)}
+ value={form.desc}
+ onChange={(e) => setForm({ desc: e.target.value })}
/>
- <TextField
- fullWidth
- label="Remote URL"
- margin="normal"
- variant="outlined"
- value={url}
- onChange={(e) => setUrl(e.target.value)}
- />
+ {type === "remote" && (
+ <TextField
+ {...textFieldProps}
+ label="Subscription Url"
+ value={form.url}
+ onChange={(e) => setForm({ url: e.target.value })}
+ />
+ )}
</DialogContent>
+
<DialogActions sx={{ px: 2, pb: 2 }}>
<Button onClick={onClose}>Cancel</Button>
-
<Button onClick={onUpdate} variant="contained">
Update
</Button>
diff --git a/src/components/profile/profile-item.tsx b/src/components/profile/profile-item.tsx
index 0484b465174f941a7c342c82c8a0bbc126fc05ce..238974d9b8855c98686d58c9bd52d1cecfc2a348 100644
--- a/src/components/profile/profile-item.tsx
+++ b/src/components/profile/profile-item.tsx
@@ -1,5 +1,7 @@
-import React, { useEffect, useState } from "react";
import dayjs from "dayjs";
+import { useLockFn } from "ahooks";
+import { useSWRConfig } from "swr";
+import { useEffect, useState, MouseEvent } from "react";
import {
alpha,
Box,
@@ -11,8 +13,6 @@ import {
MenuItem,
Menu,
} from "@mui/material";
-import { useLockFn } from "ahooks";
-import { useSWRConfig } from "swr";
import { RefreshRounded } from "@mui/icons-material";
import { CmdType } from "../../services/types";
import { updateProfile, deleteProfile, viewProfile } from "../../services/cmds";
@@ -48,7 +48,7 @@ interface Props {
onSelect: (force: boolean) => void;
}
-const ProfileItem: React.FC<Props> = (props) => {
+const ProfileItem = (props: Props) => {
const { selected, itemData, onSelect } = props;
const { mutate } = useSWRConfig();
@@ -118,9 +118,7 @@ const ProfileItem: React.FC<Props> = (props) => {
}
});
- const handleContextMenu = (
- event: React.MouseEvent<HTMLDivElement, MouseEvent>
- ) => {
+ const handleContextMenu = (event: MouseEvent<HTMLDivElement, MouseEvent>) => {
const { clientX, clientY } = event;
setPosition({ top: clientY, left: clientX });
setAnchorEl(event.currentTarget);
@@ -180,7 +178,7 @@ const ProfileItem: React.FC<Props> = (props) => {
return { bgcolor, color, "& h2": { color: h2color } };
}}
onClick={() => onSelect(false)}
- onContextMenu={handleContextMenu}
+ onContextMenu={handleContextMenu as any}
>
<Box display="flex" justifyContent="space-between">
<Typography
diff --git a/src/components/profile/profile-new.tsx b/src/components/profile/profile-new.tsx
index 336432b58e94a73709d678f1d93aec11c59ddd53..439f121f4c5972a043a677830118aa8d5481c1e3 100644
--- a/src/components/profile/profile-new.tsx
+++ b/src/components/profile/profile-new.tsx
@@ -1,63 +1,105 @@
-import { useEffect, useState } from "react";
+import { useSWRConfig } from "swr";
+import { useLockFn, useSetState } from "ahooks";
import {
Button,
Dialog,
DialogActions,
DialogContent,
DialogTitle,
+ FormControl,
+ InputLabel,
+ MenuItem,
+ Select,
TextField,
} from "@mui/material";
+import { createProfile } from "../../services/cmds";
import Notice from "../base/base-notice";
interface Props {
open: boolean;
onClose: () => void;
- onSubmit: (name: string, desc: string) => void;
}
+// create a new profile
+// remote / local file / merge / script
const ProfileNew = (props: Props) => {
- const { open, onClose, onSubmit } = props;
- const [name, setName] = useState("");
- const [desc, setDesc] = useState("");
+ const { open, onClose } = props;
- const onCreate = () => {
- if (!name.trim()) {
- Notice.error("`Name` should not be null");
+ const { mutate } = useSWRConfig();
+ const [form, setForm] = useSetState({
+ name: "",
+ desc: "",
+ type: "remote",
+ url: "",
+ });
+
+ const onCreate = useLockFn(async () => {
+ if (!form.type) {
+ Notice.error("`Type` should not be null");
return;
}
- onSubmit(name, desc);
- };
- useEffect(() => {
- if (!open) {
- setName("");
- setDesc("");
+ try {
+ await createProfile({ ...form });
+ setForm({ name: "", desc: "", type: "remote", url: "" });
+ mutate("getProfiles");
+ onClose();
+ } catch (err: any) {
+ Notice.error(err.message || err.toString());
}
- }, [open]);
+ });
+
+ const textFieldProps = {
+ fullWidth: true,
+ size: "small",
+ margin: "normal",
+ variant: "outlined",
+ } as const;
return (
<Dialog open={open} onClose={onClose}>
- <DialogTitle>Create Profile</DialogTitle>
- <DialogContent sx={{ width: 320, pb: 0.5 }}>
+ <DialogTitle sx={{ pb: 0.5 }}>Create Profile</DialogTitle>
+
+ <DialogContent sx={{ width: 336, pb: 1 }}>
<TextField
+ {...textFieldProps}
autoFocus
- fullWidth
label="Name"
- margin="dense"
- variant="outlined"
- value={name}
- onChange={(e) => setName(e.target.value)}
+ value={form.name}
+ onChange={(e) => setForm({ name: e.target.value })}
/>
+ <FormControl size="small" fullWidth sx={{ mt: 2, mb: 1 }}>
+ <InputLabel>Type</InputLabel>
+ <Select
+ label="Type"
+ value={form.type}
+ onChange={(e) => setForm({ type: e.target.value })}
+ >
+ <MenuItem value="remote">Remote</MenuItem>
+ <MenuItem value="local">Local</MenuItem>
+ <MenuItem value="script">Script</MenuItem>
+ <MenuItem value="merge">Merge</MenuItem>
+ </Select>
+ </FormControl>
+
<TextField
- fullWidth
+ {...textFieldProps}
label="Descriptions"
- margin="normal"
- variant="outlined"
- value={desc}
- onChange={(e) => setDesc(e.target.value)}
+ value={form.desc}
+ onChange={(e) => setForm({ desc: e.target.value })}
/>
+
+ {form.type === "remote" && (
+ <TextField
+ {...textFieldProps}
+ label="Subscription Url"
+ value={form.url}
+ onChange={(e) => setForm({ url: e.target.value })}
+ />
+ )}
</DialogContent>
+
<DialogActions sx={{ px: 2, pb: 2 }}>
<Button onClick={onClose}>Cancel</Button>
<Button onClick={onCreate} variant="contained">
diff --git a/src/pages/profiles.tsx b/src/pages/profiles.tsx
index b6491abd857f621cdd857431065766977836ca52..b7ee9f91096bcc2304719679758e3c64755f7aef 100644
--- a/src/pages/profiles.tsx
+++ b/src/pages/profiles.tsx
@@ -1,19 +1,18 @@
import useSWR, { useSWRConfig } from "swr";
import { useEffect, useState } from "react";
import { useLockFn } from "ahooks";
-import { Box, Button, Grid, TextField } from "@mui/material";
+import { Box, Button, Grid, TextField, Typography } from "@mui/material";
import {
getProfiles,
selectProfile,
patchProfile,
importProfile,
- newProfile,
} from "../services/cmds";
import { getProxies, updateProxy } from "../services/api";
import Notice from "../components/base/base-notice";
import BasePage from "../components/base/base-page";
-import ProfileItem from "../components/profile/profile-item";
import ProfileNew from "../components/profile/profile-new";
+import ProfileItem from "../components/profile/profile-item";
const ProfilePage = () => {
const [url, setUrl] = useState("");
@@ -21,6 +20,7 @@ const ProfilePage = () => {
const { mutate } = useSWRConfig();
const { data: profiles = {} } = useSWR("getProfiles", getProfiles);
+ const [dialogOpen, setDialogOpen] = useState(false);
useEffect(() => {
if (profiles.current == null) return;
@@ -96,18 +96,7 @@ const ProfilePage = () => {
await selectProfile(current);
mutate("getProfiles", { ...profiles, current: current }, true);
} catch (err: any) {
- err && Notice.error(err.toString());
- }
- });
-
- const [dialogOpen, setDialogOpen] = useState(false);
- const onNew = useLockFn(async (name: string, desc: string) => {
- try {
- await newProfile(name, desc);
- setDialogOpen(false);
- mutate("getProfiles");
- } catch (err: any) {
- err && Notice.error(err.toString());
+ err && Notice.error(err.message || err.toString());
}
});
@@ -149,11 +138,13 @@ const ProfilePage = () => {
))}
</Grid>
- <ProfileNew
- open={dialogOpen}
- onClose={() => setDialogOpen(false)}
- onSubmit={onNew}
- />
+ <ProfileNew open={dialogOpen} onClose={() => setDialogOpen(false)} />
+
+ <header data-windrag style={{ marginTop: 20, userSelect: "none" }}>
+ <Typography variant="h5" component="h2" data-windrag>
+ Enhanced
+ </Typography>
+ </header>
</BasePage>
);
};
diff --git a/src/services/cmds.ts b/src/services/cmds.ts
index 595a4dbf31bab512fb8559236ded36fe73f51479..1c4db457933303286c3cce50383dd4baf161ec09 100644
--- a/src/services/cmds.ts
+++ b/src/services/cmds.ts
@@ -9,8 +9,8 @@ export async function syncProfiles() {
return invoke<void>("sync_profiles");
}
-export async function newProfile(name: string, desc: string) {
- return invoke<void>("new_profile", { name, desc });
+export async function createProfile(item: Partial<CmdType.ProfileItem>) {
+ return invoke<void>("create_profile", { item });
}
export async function viewProfile(index: string) {
diff --git a/src/services/types.ts b/src/services/types.ts
index d7d86d7cda32661648e07cb9f868121dbdb4220a..e15f76dff665c97415dac931a947f93459464810 100644
--- a/src/services/types.ts
+++ b/src/services/types.ts
@@ -78,6 +78,8 @@ export namespace ApiType {
* Some interface for command
*/
export namespace CmdType {
+ export type ProfileType = "local" | "remote" | "merge" | "script";
+
export interface ClashInfo {
status: string;
port?: string;
@@ -87,7 +89,7 @@ export namespace CmdType {
export interface ProfileItem {
uid: string;
- type?: string;
+ type?: ProfileType | string;
name?: string;
desc?: string;
file?: string;