From e4855d0143f99a8014081d9d1503214f4c1d7255 Mon Sep 17 00:00:00 2001
From: MystiPanda <mystipanda@proton.me>
Date: Thu, 4 Jul 2024 11:03:51 +0800
Subject: [PATCH] fix: rules editor get groups error

---
 .../profile/rules-editor-viewer.tsx           | 46 +++++++++----------
 src/services/types.d.ts                       | 29 ++++++++++--
 2 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/src/components/profile/rules-editor-viewer.tsx b/src/components/profile/rules-editor-viewer.tsx
index e0832ae7..9c9b2e70 100644
--- a/src/components/profile/rules-editor-viewer.tsx
+++ b/src/components/profile/rules-editor-viewer.tsx
@@ -43,7 +43,6 @@ interface Props {
   groupsUid: string;
   mergeUid: string;
   profileUid: string;
-  title?: string | ReactNode;
   property: string;
   open: boolean;
   onClose: () => void;
@@ -232,16 +231,8 @@ const rules: {
 const builtinProxyPolicies = ["DIRECT", "REJECT", "REJECT-DROP", "PASS"];
 
 export const RulesEditorViewer = (props: Props) => {
-  const {
-    title,
-    groupsUid,
-    mergeUid,
-    profileUid,
-    property,
-    open,
-    onClose,
-    onSave,
-  } = props;
+  const { groupsUid, mergeUid, profileUid, property, open, onClose, onSave } =
+    props;
   const { t } = useTranslation();
   const themeMode = useThemeMode();
 
@@ -302,7 +293,7 @@ export const RulesEditorViewer = (props: Props) => {
   };
   const fetchContent = async () => {
     let data = await readProfileFile(property);
-    let obj = yaml.load(data) as { prepend: []; append: []; delete: [] } | null;
+    let obj = yaml.load(data) as ISeqProfileConfig | null;
 
     setPrependSeq(obj?.prepend || []);
     setAppendSeq(obj?.append || []);
@@ -316,11 +307,7 @@ export const RulesEditorViewer = (props: Props) => {
     if (currData === "") return;
     if (visible !== true) return;
 
-    let obj = yaml.load(currData) as {
-      prepend: [];
-      append: [];
-      delete: [];
-    } | null;
+    let obj = yaml.load(currData) as ISeqProfileConfig | null;
     setPrependSeq(obj?.prepend || []);
     setAppendSeq(obj?.append || []);
     setDeleteSeq(obj?.delete || []);
@@ -334,18 +321,29 @@ export const RulesEditorViewer = (props: Props) => {
   }, [prependSeq, appendSeq, deleteSeq]);
 
   const fetchProfile = async () => {
-    let data = await readProfileFile(profileUid);
-    let groupsData = await readProfileFile(groupsUid);
-    let mergeData = await readProfileFile(mergeUid);
-    let globalMergeData = await readProfileFile("Merge");
+    let data = await readProfileFile(profileUid); // 原配置文件
+    let groupsData = await readProfileFile(groupsUid); // groups配置文件
+    let mergeData = await readProfileFile(mergeUid); // merge配置文件
+    let globalMergeData = await readProfileFile("Merge"); // global merge配置文件
 
     let rulesObj = yaml.load(data) as { rules: [] } | null;
 
     let originGroupsObj = yaml.load(data) as { "proxy-groups": [] } | null;
     let originGroups = originGroupsObj?.["proxy-groups"] || [];
-    let moreGroupsObj = yaml.load(groupsData) as { "proxy-groups": [] } | null;
-    let moreGroups = moreGroupsObj?.["proxy-groups"] || [];
-    let groups = originGroups.concat(moreGroups);
+    let moreGroupsObj = yaml.load(groupsData) as ISeqProfileConfig | null;
+    let morePrependGroups = moreGroupsObj?.["prepend"] || [];
+    let moreAppendGroups = moreGroupsObj?.["append"] || [];
+    let moreDeleteGroups =
+      moreGroupsObj?.["delete"] || ([] as string[] | { name: string }[]);
+    let groups = originGroups
+      .filter((group: any) => {
+        if (group.name) {
+          return !moreDeleteGroups.includes(group.name);
+        } else {
+          return !moreDeleteGroups.includes(group);
+        }
+      })
+      .concat(morePrependGroups, moreAppendGroups);
 
     let originRuleSetObj = yaml.load(data) as { "rule-providers": {} } | null;
     let originRuleSet = originRuleSetObj?.["rule-providers"] || {};
diff --git a/src/services/types.d.ts b/src/services/types.d.ts
index 35a3f3c5..70d50498 100644
--- a/src/services/types.d.ts
+++ b/src/services/types.d.ts
@@ -199,9 +199,32 @@ interface IVergeTestItem {
 }
 
 interface ISeqProfileConfig {
-  prepend: string[];
-  append: string[];
-  delete: string[];
+  prepend: [];
+  append: [];
+  delete: [];
+}
+
+interface IProxyGroupConfig {
+  name: string;
+  type: "select" | "url-test" | "fallback" | "load-balance" | "relay";
+  proxies?: string[];
+  use?: string[];
+  url?: string;
+  interval?: number;
+  lazy?: boolean;
+  timeout?: number;
+  "disable-udp"?: boolean;
+  "interface-name": string;
+  "routing-mark"?: number;
+  "include-all"?: boolean;
+  "include-all-proxies"?: boolean;
+  "include-all-providers"?: boolean;
+  filter?: string;
+  "exclude-filter"?: string;
+  "exclude-type"?: string;
+  "expected-status"?: number;
+  hidden?: boolean;
+  icon?: string;
 }
 
 interface IVergeConfig {