Initial server detection

Author: LGY07

src/core/config/project.rs

@@ -1,6 +1,7 @@
 use crate::core::backup::BackupCfg;
-use crate::core::mc_server::McType;
+use crate::core::mc_server::McChannel::Snapshot;
 use crate::core::mc_server::McType::Java;
+use crate::core::mc_server::McVersion;
 use crate::core::mc_server::base::McServer;
 use anyhow::Result;
 use erased_serde::Deserializer;
@@ -18,30 +19,33 @@ pub struct McServerConfig {
     /// 惰性更新，此处储存的值不保证最新
     /// 仅在读取时是最新的
     /// 导出配置时被最新的值替换（但不更新）
-    pub(crate) version: Value,
+    pub(crate) inner: Value,
     /// 备份配置
     pub backup: BackupCfg,
 }
 
 #[derive(Serialize, Deserialize, Clone)]
 pub struct ProjectCfg {
     /// 名称
-    name: String,
+    pub name: String,
     /// 描述
-    description: String,
+    pub description: String,
     /// 创建时间
-    creation_date: chrono::DateTime<chrono::Local>,
-    /// 服务端类型
-    mc_type: McType,
+    pub creation_date: chrono::DateTime<chrono::Local>,
+    /// 服务端版本
+    pub version: McVersion,
 }
 
 impl Default for ProjectCfg {
     fn default() -> Self {
         Self {
             name: "Example".to_string(),
-            description: "A PacMine project".to_string(),
+            description: "A ToyMine project".to_string(),
             creation_date: chrono::Local::now(),
-            mc_type: Java("vanilla".to_string()),
+            version: McVersion {
+                server_type: Java("vanilla".to_string()),
+                channel: Snapshot("Null".to_string()),
+            },
         }
     }
 }
@@ -64,7 +68,7 @@ impl McServerConfig {
     pub fn new() -> Self {
         Self {
             project: Default::default(),
-            version: Value::String("".to_string()),
+            inner: Value::String("".to_string()),
             backup: Default::default(),
         }
     }
@@ -74,18 +78,18 @@ impl McServerConfig {
         file.read_to_string(&mut string).await?;
         Ok(toml::from_str(string.as_str())?)
     }
-    pub fn to_string(&self, version: &dyn McServer) -> Result<String> {
+    pub fn to_string(&self, inner: &dyn McServer) -> Result<String> {
         Ok(toml::to_string(&Self {
             project: self.project.clone(),
-            version: Value::try_from(version.to_config()?)?,
+            inner: Value::try_from(inner.to_config()?)?,
             backup: self.backup.clone(),
         })?)
     }
-    pub fn load_from_str(config: &str, version: &mut dyn McServer) -> Result<Self> {
+    pub fn load_from_str(config: &str, inner: &mut dyn McServer) -> Result<Self> {
         let cfg = toml::from_str::<Self>(config)?;
-        let version_cfg = toml::to_string(&cfg.version)?;
+        let version_cfg = toml::to_string(&cfg.inner)?;
         let de = toml::Deserializer::parse(version_cfg.as_str())?;
-        version.load_config(&mut <dyn Deserializer>::erase(de))?;
+        inner.load_config(&mut <dyn Deserializer>::erase(de))?;
         Ok(cfg)
     }
 }

src/core/mc_server/base.rs

@@ -1,27 +1,31 @@
-pub(crate) use crate::core::mc_server::McVersion;
+pub use crate::core::mc_server::McVersion;
 use anyhow::Result;
-use async_trait::async_trait;
-use erased_serde::{Deserializer, Serialize};
+use serde::{Deserialize, Serialize};
 use std::any::Any;
 
 /// MC 服务端最少实现的 trait
-#[async_trait]
 pub trait McServer: Any {
-    /// 严格检查是否符合当前类型的服务端
-    fn check(path: &std::path::Path) -> bool
+    /// 从版本号创建空实例
+    fn new() -> Box<dyn McServer>
     where
         Self: Sized;
-    /// 获取版本信息
-    fn version(&self) -> Result<McVersion>;
     /// 打印当前平台的运行脚本
+    /// 若实现了 McServerRuntime Trait ，此函数无效
     fn script(&self) -> Result<String>;
-    /// 需要持久化的内部配置文件
-    fn to_config(&self) -> Result<Box<dyn Serialize + '_>>;
-    /// 加载配置文件
-    /// ```
-    /// let cfg = erased_serde::deserialize::<YourConfig>(de)?;
-    /// ```
-    fn load_config(&mut self, de: &mut dyn Deserializer) -> Result<()>;
     /// 启动实例
     fn start(&self) -> Result<tokio::process::Command>;
+
+    /// 需要持久化的内部配置信息
+    fn to_config(&self) -> Result<Box<dyn erased_serde::Serialize + '_>> {
+        #[derive(Serialize)]
+        struct NoConfig;
+        Ok(Box::new(NoConfig))
+    }
+    /// 加载配置信息
+    fn load_config(&mut self, de: &mut dyn erased_serde::Deserializer) -> Result<()> {
+        #[derive(Deserialize)]
+        struct NoConfig;
+        let _cfg = erased_serde::deserialize::<NoConfig>(de)?;
+        Ok(())
+    }
 }

src/core/mc_server/mod.rs

@@ -11,26 +11,12 @@ use std::cmp::Ordering;
 use std::cmp::Ordering::{Equal, Greater, Less};
 use std::fmt::{Display, Formatter};
 
-use crate::core::mc_server::base::McServer;
-
-pub struct VersionLoader {
-    pub versions: Vec<Box<dyn McServer>>,
-}
-
-impl VersionLoader {
-    pub fn new() -> Self {
-        VersionLoader { versions: vec![] }
-    }
-    pub fn register(&mut self, version: Box<dyn McServer>) {
-        self.versions.push(version);
-    }
-}
-
 /// 更新渠道
 #[derive(PartialEq, Clone)]
 pub enum McChannel {
     Release(u8, u8, u8),
     Snapshot(String),
+    Unknown,
 }
 
 /// 服务端类型
@@ -119,6 +105,9 @@ impl Display for McVersion {
             McChannel::Snapshot(version) => {
                 writeln!(f, "Snapshot {}", version)
             }
+            McChannel::Unknown => {
+                writeln!(f, "Unknown")
+            }
         }?;
         Ok(())
     }
@@ -134,6 +123,7 @@ impl Serialize for McChannel {
                 serializer.serialize_str(format!("{}.{}.{}", major, minor, patch).as_str())
             }
             McChannel::Snapshot(s) => serializer.serialize_str(s),
+            McChannel::Unknown => serializer.serialize_str("Unknown"),
         }
     }
 }
@@ -158,7 +148,13 @@ impl<'de> Deserialize<'de> for McChannel {
                     Ok(Self::Snapshot(s))
                 }
             }
-            Err(_) => Ok(Self::Snapshot(s)),
+            Err(_) => {
+                if s.trim() == "Unknown" {
+                    Ok(McChannel::Unknown)
+                } else {
+                    Ok(Self::Snapshot(s))
+                }
+            }
         }
     }
 }

src/core/mc_server/plugin.rs

@@ -1,6 +1,140 @@
 use crate::core::mc_server::base::McServer;
+use anyhow::{Result, anyhow};
+use async_trait::async_trait;
 
-// 计划的插件功能
-trait McServerPlugin: McServer {
-    // fn plugin()->();
+/// 插件管理器
+#[async_trait]
+pub trait McServerPlugin: McServer {
+    fn get_repo(&self) -> &'static [&'static dyn ServerPluginRepo];
+}
+
+pub struct ServerPlugin {
+    id: usize,
+    name: String,
+    version: String,
+    description: String,
+}
+
+/// 插件仓库
+#[async_trait]
+pub trait ServerPluginRepo: Sync {
+    /// 仓库名称，此字符串同时用于标识仓库
+    fn name(&self) -> &'static str;
+    /// 列出本地插件
+    async fn list(&self) -> Vec<ServerPlugin>;
+    /// 查询插件
+    async fn search(&self, keyword: &str) -> Vec<ServerPlugin>;
+    /// 安装插件
+    async fn install(&self, plugin: ServerPlugin) -> Result<()>;
+    /// 查询最新版本
+    async fn latest(&self, plugin: ServerPlugin) -> Result<ServerPlugin>;
+}
+
+#[async_trait]
+pub trait TryMcServerPlugin: McServer {
+    fn impl_plugin(&self) -> bool;
+    /// 列出本地插件
+    async fn list(&self) -> Result<Vec<(&'static str, ServerPlugin)>>;
+    /// 查询插件
+    async fn search(&self, keyword: &str) -> Result<Vec<(&'static str, ServerPlugin)>>;
+    /// 安装插件
+    async fn install(&self, repo: &str, plugin: ServerPlugin) -> Result<()>;
+    /// 查询最新版本
+    async fn latest(&self, repo: &str, plugin: ServerPlugin) -> Result<ServerPlugin>;
+}
+
+#[async_trait]
+impl<T> TryMcServerPlugin for T
+where
+    T: McServer + Sync,
+{
+    default fn impl_plugin(&self) -> bool {
+        false
+    }
+
+    default async fn list(&self) -> Result<Vec<(&'static str, ServerPlugin)>> {
+        Err(anyhow!(
+            "The plugin manager has not been implemented for this server."
+        ))
+    }
+
+    default async fn search(&self, _: &str) -> Result<Vec<(&'static str, ServerPlugin)>> {
+        Err(anyhow!(
+            "The plugin manager has not been implemented for this server."
+        ))
+    }
+
+    default async fn install(&self, _: &str, _: ServerPlugin) -> Result<()> {
+        Err(anyhow!(
+            "The plugin manager has not been implemented for this server."
+        ))
+    }
+
+    default async fn latest(&self, _: &str, _: ServerPlugin) -> Result<ServerPlugin> {
+        Err(anyhow!(
+            "The plugin manager has not been implemented for this server."
+        ))
+    }
+}
+
+#[async_trait]
+impl<T> TryMcServerPlugin for T
+where
+    T: McServerPlugin + Sync,
+{
+    default fn impl_plugin(&self) -> bool {
+        false
+    }
+
+    default async fn list(&self) -> Result<Vec<(&'static str, ServerPlugin)>> {
+        let mut list = Vec::new();
+        for repo in self.get_repo() {
+            list.extend(
+                repo.list()
+                    .await
+                    .into_iter()
+                    .map(|plugin| (repo.name(), plugin)),
+            )
+        }
+        Ok(list)
+    }
+
+    default async fn search(&self, keyword: &str) -> Result<Vec<(&'static str, ServerPlugin)>> {
+        let mut list = Vec::new();
+        for repo in self.get_repo() {
+            list.extend(
+                repo.search(keyword)
+                    .await
+                    .into_iter()
+                    .map(|plugin| (repo.name(), plugin)),
+            )
+        }
+        Ok(list)
+    }
+
+    default async fn install(&self, repo_name: &str, plugin: ServerPlugin) -> Result<()> {
+        if let Some(repo) = self
+            .get_repo()
+            .iter()
+            .find(|&&repo| repo.name() == repo_name)
+        {
+            repo.install(plugin).await
+        } else {
+            // 静态插件仓库不应该找不到
+            unreachable!("No such plugin repository: {}", repo_name)
+        }
+    }
+
+    default async fn latest(&self, repo_name: &str, plugin: ServerPlugin) -> Result<ServerPlugin> {
+        if let Some(repo) = self
+            .get_repo()
+            .iter()
+            .find(|&&repo| repo.name() == repo_name)
+        {
+            repo.latest(plugin).await
+        } else {
+            // 静态插件仓库不应该找不到
+            unreachable!("No such plugin repository: {}", repo_name)
+        }
+    }
 }