Merge pull request ZR233#13 from ZR233/dev-web

Dev web

Author: ZR233

Cargo.lock

@@ -1,4 +1,24 @@
 [workspace]
-members = ["ostool", "uboot-shell", "jkconfig"]
 exclude = ["assets/*"]
+members = ["ostool", "uboot-shell", "jkconfig"]
 resolver = "3"
+
+[workspace.dependencies]
+# Cursive TUI framework
+cursive = {version = "0.21", features = ["crossterm-backend"]}
+
+# Data processing
+anyhow = "1"
+clap = {version = "4", features = ["derive"]}
+serde = {version = "1", features = ["derive"]}
+serde_json = "1"
+
+toml = "0.9"
+
+# Error handling
+thiserror = "2"
+
+# Logging
+log = "0.4"
+
+schemars = {version = "1.0.4", features = ["derive"]}

Cargo.toml

@@ -7,29 +7,43 @@ keywords = ["tui", "config", "json-schema", "terminal"]
 license = "MIT OR Apache-2.0"
 name = "jkconfig"
 repository = "https://github.com/ZR233/ostool"
-version = "0.1.1"
+version = "0.1.2"
+
+[[bin]]
+name = "jkconfig"
+path = "src/main.rs"
+required-features = ["web"]
 
 [dependencies]
 # Cursive TUI framework
-cursive = {version = "0.21", features = ["crossterm-backend"]}
+cursive = {workspace = true, features = ["crossterm-backend"]}
 
 # Data processing
-anyhow = "1.0"
-clap = {version = "4.0", features = ["derive"]}
-serde = {version = "1.0", features = ["derive"]}
-serde_json = "1.0"
+anyhow = {workspace = true}
+clap = {workspace = true, features = ["derive"]}
+serde = {workspace = true, features = ["derive"]}
+serde_json = {workspace = true}
 
-toml = "0.9"
+toml = {workspace = true}
 
 # Error handling
-thiserror = "2.0"
+thiserror = {workspace = true}
 
 # Logging
-log = "0.4"
+log = {workspace = true}
+
+# Web server dependencies (optional)
+axum = {version = "0.8", optional = true}
+chrono = {version = "0.4", optional = true}
+tokio = {version = "1.0", features = ["full"], optional = true}
+tower = {version = "0.5", optional = true}
+tower-http = {version = "0.5", features = ["fs", "cors"], optional = true}
+
+[features]
+default = ["web"]
+web = ["axum", "tokio", "tower", "tower-http", "chrono"]
 
 [dev-dependencies]
 env_logger = "0.11"
-schemars = {version = "1.0.4", features = ["derive"]}
-serde = {version = "1.0", features = ["derive"]}
+schemars = {workspace=true, features = ["derive"]}
 tokio-test = "0.4"
-toml = "0.9"

jkconfig/Cargo.toml

@@ -8,14 +8,15 @@ use anyhow::bail;
 
 use crate::data::{menu::MenuRoot, types::ElementType};
 
+#[derive(Clone)]
 pub struct AppData {
     pub root: MenuRoot,
     pub current_key: Vec<String>,
     pub needs_save: bool,
     pub config: PathBuf,
 }
 
-const DEFAULT_CONFIG_PATH: &str = ".project.toml";
+const DEFAULT_CONFIG_PATH: &str = ".config.toml";
 
 fn default_schema_by_init(config: &Path) -> PathBuf {
     let binding = config.file_name().unwrap().to_string_lossy();

jkconfig/src/data/app_data.rs

@@ -5,4 +5,8 @@ pub mod data;
 // UI模块暂时注释掉，使用主程序中的 MenuView
 pub mod ui;
 
+// Web服务器模块（需要web feature）
+#[cfg(feature = "web")]
+pub mod web;
+
 pub use serde_json::Value;

jkconfig/src/lib.rs

@@ -1,7 +1,8 @@
 extern crate log;
 
-use clap::{Arg, Command};
+use clap::{Parser, Subcommand};
 use cursive::{Cursive, CursiveExt, event::Key, views::Dialog};
+use std::path::PathBuf;
 
 use jkconfig::{
     data::AppData,
@@ -11,35 +12,69 @@ use jkconfig::{
 // mod menu_view;
 // use menu_view::MenuView;
 
+/// 命令行参数结构体
+#[derive(Parser)]
+#[command(name = "jkconfig")]
+#[command(author = "周睿 <[email protected]>")]
+#[command(about = "配置编辑器", long_about = None)]
+struct Cli {
+    /// config file path
+    #[arg(short = 'c', long = "config", default_value = ".config.toml")]
+    config: PathBuf,
+
+    /// schema file path, default is config file name with '-schema.json' suffix
+    #[arg(short = 's', long = "schema")]
+    schema: Option<PathBuf>,
+
+    /// 子命令
+    #[command(subcommand)]
+    command: Option<Commands>,
+}
+
+/// 子命令枚举
+#[derive(Subcommand)]
+enum Commands {
+    /// TUI (default)
+    Tui,
+    /// Web UI mode
+    Web {
+        /// server port
+        #[arg(short = 'p', long = "port", default_value = "3000")]
+        port: u16,
+    },
+}
+
 /// 主函数
 fn main() -> anyhow::Result<()> {
     // 解析命令行参数
-    let matches = Command::new("jkconfig")
-        .author("周睿 <[email protected]>")
-        .arg(
-            Arg::new("config")
-                .long("config")
-                .short('c')
-                .value_name("FILE")
-                .help("指定初始配置文件路径")
-                .default_value(".project.toml"),
-        )
-        .arg(
-            Arg::new("schema")
-                .long("schema")
-                .short('s')
-                .value_name("FILE")
-                .help("指定schema文件路径（默认基于配置文件名推导）"),
-        )
-        .get_matches();
+    let cli = Cli::parse();
 
     // 提取命令行参数
-    let config_file = matches.get_one::<String>("config").map(|s| s.as_str());
-    let schema_file = matches.get_one::<String>("schema").map(|s| s.as_str());
+    let config_path = cli.config.to_string_lossy().to_string();
+    let schema_path = cli.schema.as_ref().map(|p| p.to_string_lossy().to_string());
+
+    let config_file = Some(config_path.as_str());
+    let schema_file = schema_path.as_deref();
 
     // 初始化AppData
     let app_data = AppData::new(config_file, schema_file)?;
 
+    // 根据子命令决定运行模式
+    match cli.command {
+        Some(Commands::Web { port }) => {
+            tokio::runtime::Runtime::new()?.block_on(jkconfig::web::run_server(app_data, port))?;
+        }
+        Some(Commands::Tui) | None => {
+            // 运行TUI界面（默认行为）
+            run_tui(app_data)?;
+        }
+    }
+
+    Ok(())
+}
+
+/// 运行TUI界面
+fn run_tui(app_data: AppData) -> anyhow::Result<()> {
     let title = app_data.root.title.clone();
     let fields = app_data.root.menu().fields();
 

jkconfig/src/main.rs

@@ -0,0 +1,38 @@
+//! HTTP请求处理器
+//!
+//! 处理各种HTTP请求的函数
+
+use axum::{
+    extract::State,
+    response::{Html, Json},
+};
+use serde_json::json;
+
+use super::server::AppState;
+
+/// 根路径处理器 - 返回Hello World页面
+pub async fn root_handler() -> Html<&'static str> {
+    Html(include_str!("../../web/static/index.html"))
+}
+
+/// API处理器 - 返回配置信息
+pub async fn api_config_handler(State(state): State<AppState>) -> Json<serde_json::Value> {
+    Json(json!({
+        "title": state.app_data.root.title,
+        "message": "jkconfig Web API",
+        "version": "0.1.1"
+    }))
+}
+
+/// 健康检查处理器
+pub async fn health_check() -> Json<serde_json::Value> {
+    Json(json!({
+        "status": "ok",
+        "timestamp": chrono::Utc::now().to_rfc3339()
+    }))
+}
+
+/// 静态文件处理器
+pub async fn static_handler() -> Html<&'static str> {
+    Html(include_str!("../../web/static/index.html"))
+}

jkconfig/src/web/handlers.rs

@@ -0,0 +1,14 @@
+//! Web服务器模块
+//!
+//! 提供基于axum的Web服务器功能，用于替代TUI界面提供配置编辑功能
+
+#[cfg(feature = "web")]
+pub mod handlers;
+#[cfg(feature = "web")]
+pub mod routes;
+#[cfg(feature = "web")]
+pub mod server;
+
+// 重新导出server模块的run_server函数
+#[cfg(feature = "web")]
+pub use server::run_server;

jkconfig/src/web/mod.rs

@@ -0,0 +1,27 @@
+//! 路由配置
+//!
+//! 定义和配置所有HTTP路由
+
+use axum::{Router, routing::get};
+use tower_http::services::ServeDir;
+
+use super::{
+    handlers::{api_config_handler, health_check, root_handler, static_handler},
+    server::AppState,
+};
+
+/// 创建应用路由
+pub fn create_routes(state: AppState) -> Router {
+    Router::new()
+        // 主页面路由
+        .route("/", get(root_handler))
+        // API路由
+        .route("/api/config", get(api_config_handler))
+        .route("/api/health", get(health_check))
+        // 静态文件服务
+        .nest_service("/static", ServeDir::new("web/static"))
+        // 备用路由 - 处理SPA路由
+        .fallback(get(static_handler))
+        // 注入应用状态
+        .with_state(state)
+}

jkconfig/src/web/routes.rs

@@ -0,0 +1,36 @@
+//! Web服务器核心实现
+//!
+//! 负责启动和配置axum Web服务器
+
+use std::net::SocketAddr;
+
+use super::routes::create_routes;
+use crate::data::AppData;
+
+/// 运行Web服务器
+pub async fn run_server(app_data: AppData, port: u16) -> anyhow::Result<()> {
+    // 创建应用状态
+    let state = AppState { app_data };
+
+    // 创建路由
+    let app = create_routes(state);
+
+    // 绑定地址
+    let addr = SocketAddr::from(([0, 0, 0, 0], port));
+
+    println!("🚀 Web服务器启动成功！");
+    println!("📍 访问地址: http://localhost:{}", port);
+    println!("⏹️  按 Ctrl+C 停止服务器");
+
+    // 启动服务器
+    let listener = tokio::net::TcpListener::bind(addr).await?;
+    axum::serve(listener, app).await?;
+
+    Ok(())
+}
+
+/// 应用状态
+#[derive(Clone)]
+pub struct AppState {
+    pub app_data: AppData,
+}