refactor: 统一配置键名格式

- 将 Rust snake_case 字段自动序列化为 PascalCase

- 读取时忽略大小写和下划线以兼容旧配置

- 将 ConfigVersion 与 Enable 纳入统一命名规则

- 删除可由 Rust 字段名自动推导的冗余 key 声明

Author: clansty

packages/applechu-schema/src/lib.rs

@@ -11,12 +11,38 @@ pub const DEFAULT_CONFIG_HEADER: &str = r#"## 这是 AppleChu 的 TOML 配置文
 ##
 ## - 井号 # 开头的行为注释，被注释掉的内容不会生效
 ## - 被注释的配置内容使用一个井号 #，说明文字使用两个井号 ##
-## - 功能开关统一使用 enable = true/false
+## - 功能开关统一使用 Enable = true/false
 ## - 未填写的配置使用程序默认值
 
-config_version = 1
+ConfigVersion = 1
 "#;
 
+pub fn canonical_key(key: &str) -> String {
+    let mut output = String::with_capacity(key.len());
+    let mut capitalize = true;
+    for character in key.chars() {
+        if character == '_' {
+            capitalize = true;
+        } else if capitalize {
+            output.extend(character.to_uppercase());
+            capitalize = false;
+        } else {
+            output.push(character);
+        }
+    }
+    output
+}
+
+pub fn keys_equal(left: &str, right: &str) -> bool {
+    left.bytes()
+        .filter(|byte| *byte != b'_')
+        .map(|byte| byte.to_ascii_lowercase())
+        .eq(right
+            .bytes()
+            .filter(|byte| *byte != b'_')
+            .map(|byte| byte.to_ascii_lowercase()))
+}
+
 #[derive(Clone, Debug)]
 pub struct OptionSpec {
     pub value: toml::Value,
@@ -190,11 +216,12 @@ impl Schema {
                 .and_then(toml::Value::as_bool)
                 .unwrap_or(false);
             let mut entries = parse_entries(table, id)?;
+            for entry in &mut entries {
+                entry.key = canonical_key(&entry.key);
+            }
             if !hidden
                 && !always_enabled
-                && !entries
-                    .iter()
-                    .any(|entry| entry.key.eq_ignore_ascii_case("enable"))
+                && !entries.iter().any(|entry| keys_equal(&entry.key, "enable"))
             {
                 entries.insert(0, enable_entry(default_on));
             }
@@ -213,6 +240,7 @@ impl Schema {
         validate_sections(&sections)?;
         validate_groups(root, &sections)?;
         inject_enable_entries(&mut document, &sections)?;
+        canonicalize_document_keys(&mut document)?;
         Ok(Self {
             source,
             document,
@@ -231,15 +259,15 @@ impl Schema {
     pub fn section(&self, id: &str) -> Option<&SectionSpec> {
         self.sections
             .iter()
-            .find(|section| section.id.eq_ignore_ascii_case(id))
+            .find(|section| keys_equal(&section.id, id))
     }
 
     pub fn entry(&self, section: &str, key: &str) -> Option<&EntrySpec> {
         self.section(section).and_then(|section| {
             section
                 .entries
                 .iter()
-                .find(|entry| entry.key.eq_ignore_ascii_case(key))
+                .find(|entry| keys_equal(&entry.key, key))
         })
     }
 
@@ -268,7 +296,7 @@ impl Schema {
                 if !entry.emit_default {
                     output.push('#');
                 }
-                output.push_str(&entry.key);
+                output.push_str(&canonical_key(&entry.key));
                 output.push_str(" = ");
                 if let Some(value) = &entry.default {
                     output.push_str(&inline_toml(value));
@@ -456,7 +484,7 @@ fn validate_sections(sections: &[SectionSpec]) -> Result<(), SchemaError> {
     for (index, section) in sections.iter().enumerate() {
         if sections[..index]
             .iter()
-            .any(|other| other.id.eq_ignore_ascii_case(&section.id))
+            .any(|other| keys_equal(&other.id, &section.id))
         {
             return Err(SchemaError::Invalid(format!(
                 "重复配置 section: {}",
@@ -465,10 +493,7 @@ fn validate_sections(sections: &[SectionSpec]) -> Result<(), SchemaError> {
         }
         let mut keys = Vec::new();
         for entry in &section.entries {
-            if !keys
-                .iter()
-                .all(|key: &String| !key.eq_ignore_ascii_case(&entry.key))
-            {
+            if !keys.iter().all(|key: &String| !keys_equal(key, &entry.key)) {
                 return Err(SchemaError::Invalid(format!(
                     "重复配置项 {}.{}",
                     section.id, entry.key
@@ -480,7 +505,7 @@ fn validate_sections(sections: &[SectionSpec]) -> Result<(), SchemaError> {
         let enable = section
             .entries
             .iter()
-            .find(|entry| entry.key.eq_ignore_ascii_case("enable"));
+            .find(|entry| keys_equal(&entry.key, "enable"));
         if section.hidden || section.always_enabled {
             if enable.is_some() {
                 return Err(SchemaError::Invalid(format!(
@@ -536,7 +561,7 @@ fn inject_enable_entries(
         let Some(enable) = section
             .entries
             .iter()
-            .find(|entry| entry.key.eq_ignore_ascii_case("enable"))
+            .find(|entry| keys_equal(&entry.key, "enable"))
         else {
             continue;
         };
@@ -555,7 +580,7 @@ fn inject_enable_entries(
                 .as_table()
                 .and_then(|entry| entry.get("key"))
                 .and_then(toml::Value::as_str)
-                .is_some_and(|key| key.eq_ignore_ascii_case("enable"))
+                .is_some_and(|key| keys_equal(key, "enable"))
         }) {
             continue;
         }
@@ -580,6 +605,35 @@ fn inject_enable_entries(
     Ok(())
 }
 
+fn canonicalize_document_keys(document: &mut toml::Value) -> Result<(), SchemaError> {
+    let sections = document
+        .as_table_mut()
+        .and_then(|root| root.get_mut("config"))
+        .and_then(toml::Value::as_table_mut)
+        .and_then(|config| config.get_mut("sections"))
+        .and_then(toml::Value::as_array_mut)
+        .ok_or_else(|| SchemaError::Invalid("schema 缺少 config.sections".to_owned()))?;
+    for section in sections {
+        let Some(entries) = section
+            .as_table_mut()
+            .and_then(|section| section.get_mut("entries"))
+            .and_then(toml::Value::as_array_mut)
+        else {
+            continue;
+        };
+        for entry in entries {
+            let Some(key) = entry.as_table_mut().and_then(|entry| entry.get_mut("key")) else {
+                continue;
+            };
+            let raw = key
+                .as_str()
+                .ok_or_else(|| SchemaError::Invalid("配置项 key 必须是字符串".to_owned()))?;
+            *key = toml::Value::String(canonical_key(raw));
+        }
+    }
+    Ok(())
+}
+
 fn validate_entry(section: &SectionSpec, entry: &EntrySpec) -> Result<(), SchemaError> {
     let valid_type = matches!(
         entry.value_type.as_str(),
@@ -792,10 +846,7 @@ fn validate_groups(root: &toml::Table, sections: &[SectionSpec]) -> Result<(), S
             .get("id")
             .and_then(toml::Value::as_str)
             .ok_or_else(|| SchemaError::Invalid(format!("ui.groups[{index}] 缺少 id")))?;
-        if ids
-            .iter()
-            .any(|other: &&str| other.eq_ignore_ascii_case(id))
-        {
+        if ids.iter().any(|other: &&str| keys_equal(other, id)) {
             return Err(SchemaError::Invalid(format!("重复 UI group: {id}")));
         }
         ids.push(id);
@@ -809,7 +860,7 @@ fn validate_groups(root: &toml::Table, sections: &[SectionSpec]) -> Result<(), S
             })?;
             if !sections
                 .iter()
-                .any(|section| section.id.eq_ignore_ascii_case(member))
+                .any(|section| keys_equal(&section.id, member))
             {
                 return Err(SchemaError::Invalid(format!(
                     "UI group {id} 引用了未知 section: {member}"
@@ -913,14 +964,14 @@ mod tests {
             .expect("AM Daemon section body must exist");
 
         assert!(config.starts_with("## 这是 AppleChu 的 TOML 配置文件"));
-        assert!(config.contains("config_version = 1"));
-        assert!(amdaemon.contains("enable = true"));
+        assert!(config.contains("ConfigVersion = 1"));
+        assert!(amdaemon.contains("Enable = true"));
         assert!(amdaemon.contains("AutoStart = false"));
         assert!(amdaemon.contains("AppendConfigArgs = false"));
         assert!(amdaemon.contains("#ConfigFiles = [\"config_*.json\"]"));
         assert!(document["DisableEncryption"].as_table().is_some());
         assert!(document["DisableTLS"].as_table().is_some());
-        assert!(config.contains("#gameId = \"SDHD\""));
+        assert!(config.contains("#GameId = \"SDHD\""));
         assert_eq!(
             super::SCHEMA
                 .entry("SliderDevice", "enable")

packages/applechu/src/aime/mod.rs

@@ -53,36 +53,28 @@ crate::config_section! {
         fields: {
             // 两种机台默认使用 COM4，同时保留分模式覆盖项
             pub cvt_port: u32 = 4,
-            key: "cvtPort",
             comment: "CVT 模式串口号";
             pub sp_port: u32 = 4,
-            key: "spPort",
             comment: "SP 模式串口号";
             pub high_baudrate: bool = true,
             key: "highBaud",
             comment: "使用 115200 高波特率（Chunithm 默认需要）";
             pub aime_path: String = String::from("DEVICE\\aime.txt"),
-            key: "aimePath",
             comment: "Aime 卡号文件";
             pub felica_path: String = String::from("DEVICE\\felica.txt"),
-            key: "felicaPath",
             comment: "FeliCa 卡号文件";
             pub authdata_path: String = String::from("DEVICE\\authdata.bin"),
-            key: "authdataPath",
             comment: "认证数据文件";
             pub aime_gen: bool = true,
-            key: "aimeGen",
             comment: "缺少 Aime 卡号时自动生成";
             pub felica_gen: bool = false,
-            key: "felicaGen",
             comment: "缺少 FeliCa 卡号时自动生成";
             pub scan: i32 = 0x0D,
             comment: "读卡按键的虚拟键码";
             // 0 表示按机台模式选择：CVT=Gen2，SP=Gen3
             pub gen: u8 = 0,
             comment: "读卡器代数";
             pub proxy_flag: u8 = 2,
-            key: "proxyFlag",
             comment: "读卡代理标志";
             pub iodll: String = String::new(),
             comment: "外部 Aime IO DLL 路径";

packages/applechu/src/amdaemon.rs

@@ -111,24 +111,18 @@ crate::config_section! {
         comment: "AM Daemon x64 winmm 劫持配置",
         fields: {
             pub auto_start: bool = false,
-            key: "AutoStart",
             emit_default: true,
             comment: "由游戏侧启动 AM Daemon";
             pub executable: String = String::from("amdaemon.exe"),
-            key: "Executable",
             comment: "AM Daemon 可执行文件名";
             pub hide_window: bool = false,
-            key: "HideWindow",
             comment: "手动启动 AM Daemon 时隐藏控制台窗口";
             pub terminate_on_exit: bool = true,
-            key: "TerminateOnExit",
             comment: "AppleChu 退出时终止 AM Daemon";
             pub append_config_args: bool = false,
-            key: "AppendConfigArgs",
             emit_default: true,
             comment: "无完整 -c 参数时补充 JSON 配置";
             pub config_files: Vec<String> = vec![CONFIG_FILE_PATTERN.to_owned()],
-            key: "ConfigFiles",
             comment: "AM Daemon JSON 配置文件列表";
         }
     }
@@ -180,16 +174,12 @@ crate::config_section! {
             pub title: String = String::new(),
             comment: "标题/其他服务器";
             pub replace_host: bool = false,
-            key: "replaceHost",
             comment: "替换 HTTP Host";
             pub startup_port: u16 = 0,
-            key: "startupPort",
             comment: "启动认证服务器端口";
             pub billing_port: u16 = 0,
-            key: "billingPort",
             comment: "计费服务器端口";
             pub aimedb_port: u16 = 0,
-            key: "aimedbPort",
             comment: "AimeDB 服务器端口";
         }
     }
@@ -208,26 +198,20 @@ crate::config_section! {
             key: "id",
             comment: "Keychip ID";
             pub game_id: String = String::from("SDHD"),
-            key: "gameId",
             comment: "游戏 ID，默认 SDHD";
             pub platform_id: String = String::new(),
-            key: "platformId",
             comment: "平台 ID；留空时使用当前平台默认值";
             pub region: u32 = 1,
             comment: "区域编号";
             pub billing_type: u32 = 1,
-            key: "billingType",
             comment: "计费类型";
             pub system_flag: u32 = 0x64,
-            key: "systemFlag",
             comment: "系统标志";
             pub subnet: String = String::from("192.168.139.0"),
             comment: "店内网络子网";
             pub billing_ca: String = String::from("DEVICE\\ca.crt"),
-            key: "billingCa",
             comment: "计费 CA 证书";
             pub billing_pub: String = String::from("DEVICE\\billing.pub"),
-            key: "billingPub",
             comment: "计费公钥";
         }
     }
@@ -243,13 +227,10 @@ crate::config_section! {
         comment: "店内网络适配器模拟",
         fields: {
             pub addr_suffix: u32 = 11,
-            key: "addrSuffix",
             comment: "机台 IP 的末尾地址";
             pub router_suffix: u32 = 254,
-            key: "routerSuffix",
             comment: "店内路由 IP 的末尾地址";
             pub mac_addr: String = String::from("01:02:03:04:05:06"),
-            key: "macAddr",
             comment: "虚拟网卡 MAC 地址";
             pub broadcast: String = String::from("255.255.255.255"),
             comment: "UDP 广播目标地址";
@@ -282,7 +263,6 @@ crate::config_section! {
         comment: "AM Daemon OpenSSL 兼容",
         fields: {
             pub force_legacy_sha: bool = false,
-            key: "forceLegacySha",
             comment: "强制禁用 OpenSSL SHA 扩展路径";
         }
     }

packages/applechu/src/chuniio/led_output.rs

@@ -51,10 +51,8 @@ crate::config_section! {
             key: "controllerLedOutputOpeNITHM",
             comment: "使用 OpeNITHM 控制器灯光格式";
             pub serial_port: String = String::from("COM5"),
-            key: "serialPort",
             comment: "灯光输出串口";
             pub serial_baud: u32 = 921_600,
-            key: "serialBaud",
             comment: "灯光输出串口波特率";
         }
     }

packages/applechu/src/config/document.rs

@@ -92,7 +92,7 @@ impl Config {
             output.push('[');
             output.push_str(descriptor.name);
             output.push_str("]\n");
-            output.push_str("enable = ");
+            output.push_str("Enable = ");
             output.push_str(if loaded.enabled { "true\n" } else { "false\n" });
 
             (descriptor.serialize_fields)(loaded, &mut output);
@@ -158,7 +158,7 @@ impl Config {
                     && value.is_table()
                     && !descriptors
                         .iter()
-                        .any(|descriptor| descriptor.name.eq_ignore_ascii_case(name))
+                        .any(|descriptor| applechu_schema::keys_equal(descriptor.name, name))
             })
             .filter_map(|(name, value)| value.as_table().map(|table| (name.clone(), table.clone())))
             .collect();