fix: clash config select issue, and close #1303

libnyanpasu · Aug 13, 2024 · eaa85ff · eaa85ff
1 parent 82e06f5
commit eaa85ff
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -6,6 +6,10 @@ end_of_line = lf
 indent_size = 2
 insert_final_newline = true
 
+[*.lua]
+charset = utf-8
+indent_size = 4
+
 [*.rs]
 charset = utf-8
 end_of_line = lf

diff --git a/backend/tauri/src/enhance/builtin/clash_rs_comp.lua b/backend/tauri/src/enhance/builtin/clash_rs_comp.lua
@@ -12,4 +12,4 @@ if config["allow_lan"] == true then
     config["bind_address"] = "0.0.0.0"
 end
 
-return config;
+return config
diff --git a/backend/tauri/src/enhance/builtin/config_fixer.lua b/backend/tauri/src/enhance/builtin/config_fixer.lua
@@ -0,0 +1,5 @@
+if type(config['log-level']) == 'boolean' then
+    config['log-level'] = 'debug'
+end
+
+return config
diff --git a/backend/tauri/src/enhance/chain.rs b/backend/tauri/src/enhance/chain.rs
@@ -2,7 +2,7 @@ use crate::{
     config::{nyanpasu::ClashCore, profile::item_type::ProfileItemType, ProfileItem},
     utils::{dirs, help},
 };
-use enumflags2::BitFlags;
+use enumflags2::{BitFlag, BitFlags};
 use serde::{Deserialize, Serialize};
 use serde_yaml::Mapping;
 use std::fs;
@@ -118,6 +118,12 @@ impl ChainItem {
             ChainTypeWrapper::new_js(include_str!("./builtin/meta_hy_alpn.js").to_string()),
         );
 
+        // 修复配置的一些问题
+        let config_fixer = ChainItem::to_script(
+            "config_fixer",
+            ChainTypeWrapper::new_lua(include_str!("./builtin/config_fixer.lua").to_string()),
+        );
+
         // 移除或转换 Clash Rs 不支持的字段
         let clash_rs_comp = ChainItem::to_script(
             "clash_rs_comp",
@@ -127,6 +133,7 @@ impl ChainItem {
         vec![
             (ClashCore::Mihomo | ClashCore::MihomoAlpha, hy_alpn),
             (ClashCore::Mihomo | ClashCore::MihomoAlpha, meta_guard),
+            (ClashCore::all(), config_fixer),
             (ClashCore::ClashRs.into(), clash_rs_comp),
         ]
     }

diff --git a/frontend/nyanpasu/src/components/setting/modules/create-props.ts b/frontend/nyanpasu/src/components/setting/modules/create-props.ts
@@ -73,7 +73,7 @@ export const clash = {
       selected: getConfigs.data?.[propName] || fallbackSelect,
       onSelected: (value: OptionValue) => {
         Promise.all([
-          setClashInfo({ [propName]: !getConfigs.data?.[propName] }),
+          setClashInfo({ [propName]: value }),
           setConfigs({ [propName]: value }),
         ]).finally(() => {
           mutate(