chore: move dirpath and password to extensions.rs

examples/config.json

@@ -9,6 +9,8 @@
         "port": 19194,
         "workers": 2
     },
-    "dir_path": ".",
-    "password": "$Xme-Ef9r[@EsqF"
+    "extensions": {
+        "dir_path": ".",
+        "password": "$Xme-Ef9r[@EsqF"
+    }
 }

generated/.spacepls.schema.json

@@ -1,6 +1,22 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "definitions": {
+        "Extensions": {
+            "description": "Used to store crucial information like password and dir path",
+            "properties": {
+                "dir_path": {
+                    "default": null,
+                    "description": "The directory path to store files.",
+                    "type": ["string", "null"]
+                },
+                "password": {
+                    "default": null,
+                    "description": "Password",
+                    "type": ["string", "null"]
+                }
+            },
+            "type": "object"
+        },
         "Proxy": {
             "properties": {
                 "url": {
@@ -113,15 +129,13 @@
         }
     },
     "properties": {
-        "dir_path": {
-            "default": null,
-            "description": "The directory path to store files.",
-            "type": ["string", "null"]
-        },
-        "password": {
-            "default": null,
-            "description": "Password",
-            "type": ["string", "null"]
+        "extensions": {
+            "allOf": [
+                {
+                    "$ref": "#/definitions/Extensions"
+                }
+            ],
+            "description": "Used to store crucial information like password and dir path"
         },
         "server": {
             "allOf": [
@@ -142,6 +156,7 @@
             "description": "Dictates how SpacePls should handle upstream requests/responses. Tuning upstream can improve performance and reliability for connections."
         }
     },
+    "required": ["extensions"],
     "title": "Config",
     "type": "object"
 }

src/blueprint/blueprint.rs

@@ -17,11 +17,11 @@ impl TryFrom<&Config> for Blueprint {
     fn try_from(config: &Config) -> Result<Self, Self::Error> {
         let server = Server::try_from(config)?;
         let upstream = Upstream::try_from(config)?;
-        let dir_path = config
-            .dir_path
-            .clone()
-            .context("No dir path found in config, use config reader to read config instead.")?;
-        let password = config.password.clone().context(
+        let dir_path =
+            config.extensions.dir_path.clone().context(
+                "No dir path found in config, use config reader to read config instead.",
+            )?;
+        let password = config.extensions.password.clone().context(
             "No password for the files provided. Use config reader to read config instead.",
         )?;
         Ok(Self {

src/config/config.rs

@@ -1,3 +1,4 @@
+use crate::config::extensions::Extensions;
 use crate::config::server::Server;
 use crate::config::Upstream;
 use derive_setters::Setters;
@@ -19,27 +20,22 @@ pub struct Config {
     #[serde(default)]
     pub upstream: Upstream,
 
-    /// The directory path to store files.
-    #[serde(default)]
-    pub dir_path: Option<String>,
-    /// Password
-    #[serde(default)]
-    pub password: Option<String>,
+    /// Used to store crucial information like
+    /// password and dir path
+    pub extensions: Extensions,
 }
 
 impl Config {
     /// Merge configs, preferring the right side.
     pub fn merge_right(self, other: &Self) -> Self {
         let server = self.server.merge_right(other.server.clone());
         let upstream = self.upstream.merge_right(other.upstream.clone());
-        let dir_path = other.clone().dir_path.or(self.dir_path);
-        let password = other.clone().password.or(self.password);
+        let extensions = self.extensions.merge_right(other.extensions.clone());
 
         Self {
             server,
             upstream,
-            dir_path,
-            password,
+            extensions,
         }
     }
 

src/config/extensions.rs

@@ -0,0 +1,24 @@
+use derive_setters::Setters;
+use serde::{Deserialize, Serialize};
+
+#[derive(
+    Serialize, Deserialize, Clone, Debug, Default, Setters, PartialEq, Eq, schemars::JsonSchema,
+)]
+/// Used to store crucial information like
+/// password and dir path
+pub struct Extensions {
+    /// The directory path to store files.
+    #[serde(default)]
+    pub dir_path: Option<String>,
+    /// Password
+    #[serde(default)]
+    pub password: Option<String>,
+}
+
+impl Extensions {
+    pub(crate) fn merge_right(self, other: Extensions) -> Extensions {
+        let dir_path = other.clone().dir_path.or(self.dir_path);
+        let password = other.clone().password.or(self.password);
+        Self { dir_path, password }
+    }
+}

src/config/mod.rs

@@ -2,6 +2,7 @@ pub use config::*;
 pub use server::*;
 pub use upstream::*;
 mod config;
+mod extensions;
 pub mod reader;
 mod server;
 mod upstream;

src/config/reader.rs

@@ -55,10 +55,10 @@ impl ConfigReader {
         })
     }
     async fn resolve(mut config: Config, parent_dir: Option<&Path>) -> Config {
-        let dir = config.dir_path.unwrap_or("spacepls".to_string());
+        let dir = config.extensions.dir_path.unwrap_or("spacepls".to_string());
         let dir = Self::resolve_path(&dir, parent_dir);
-        config.dir_path = Some(dir);
-        config.password = Some("$Xme-Ef9r[@EsqF".to_string()); // randomly generated password
+        config.extensions.dir_path = Some(dir);
+        config.extensions.password = Some("$Xme-Ef9r[@EsqF".to_string()); // randomly generated password
 
         config
     }