Removed lib structure

src/auth.rs

@@ -1,9 +1,11 @@
 use std::sync::Arc;
 
+use anyhow::Context;
 use serde::Deserialize;
 
-use crate::{ErrorContext, logger};
-use crate::{Server, utils::client::Client};
+use crate::logger;
+use crate::server::Server;
+use crate::utils::client::Client;
 
 logger!(LOGGER "Auth");
 

src/main.rs

@@ -0,0 +1,26 @@
+mod auth;
+mod macros;
+mod requests;
+mod server;
+mod types;
+mod utils;
+
+use std::path::PathBuf;
+
+use server::ServerConfig;
+use utils::vfs;
+
+pub use anyhow::Context as ErrorContext;
+pub use anyhow::Result;
+pub use once_cell;
+
+fn main() -> Result<()> {
+    let root = PathBuf::from("");
+    let config: ServerConfig = if let Ok(env_config) = std::env::var("VX_CONFIG") {
+        ServerConfig::from_str(&env_config)?
+    } else {
+        vfs::read_config(&root.join("config.json"))?
+    };
+    config.build(&root).run()?;
+    Ok(())
+}

src/requests/message.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use crate::{Server, types, utils::client::Client};
+use crate::{server::Server, types, utils::client::Client};
 
 crate::logger!(LOGGER "Message Manager");
 

src/requests/mod.rs

@@ -3,7 +3,7 @@ pub mod message;
 use std::sync::Arc;
 
 use crate::{
-    Server,
+    server::Server,
     types::message::{ClientMessage, WsMessage},
     utils::client::Client,
 };

src/server.rs

@@ -5,17 +5,10 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-pub mod auth;
-pub mod macros;
-pub mod requests;
-pub mod types;
-pub mod utils;
-
-pub use anyhow::Context as ErrorContext;
-pub use anyhow::Result;
-
-use crate::{utils::client::Client, utils::plugin::DynPlugin};
-pub use once_cell;
+use crate::{
+    logger, types,
+    utils::{self, client::Client, plugin::DynPlugin},
+};
 
 #[derive(serde::Serialize, serde::Deserialize)]
 pub struct ServerConfig {
@@ -28,10 +21,10 @@ pub struct ServerConfig {
 
 #[allow(dead_code)]
 pub struct Server {
-    root: PathBuf,
-    config: ServerConfig,
-    plugins: Mutex<Vec<DynPlugin>>,
-    clients: Mutex<HashSet<Client>>,
+    pub root: PathBuf,
+    pub config: ServerConfig,
+    pub plugins: Mutex<Vec<DynPlugin>>,
+    pub clients: Mutex<HashSet<Client>>,
     pub db: utils::database::Database,
 }
 
@@ -60,10 +53,6 @@ impl ServerConfig {
 impl Server {
     logger!(LOGGER "Server");
 
-    pub fn new(root: &Path) -> Arc<Self> {
-        Self::new_config(root, ServerConfig::default())
-    }
-
     pub fn new_config(root: &Path, config: ServerConfig) -> Arc<Self> {
         Arc::new(Self {
             db: utils::database::Database::new(&config).unwrap(),
@@ -74,7 +63,7 @@ impl Server {
         })
     }
 
-    pub fn run(self: &Arc<Self>) -> Result<()> {
+    pub fn run(self: &Arc<Self>) -> crate::Result<()> {
         // Load plugins
         #[cfg(feature = "loader")]
         utils::loader::load_plugins(
@@ -120,10 +109,6 @@ impl Server {
         Ok(())
     }
 
-    pub fn add_plugin(self: &Arc<Self>, plugin: DynPlugin) {
-        self.plugins.lock().unwrap().push(plugin);
-    }
-
     fn init_client(self: &Arc<Self>, stream: TcpStream) -> anyhow::Result<Client> {
         Self::LOGGER.info(format!("New connection: {}", stream.peer_addr()?));
         // Initialize client
@@ -146,7 +131,7 @@ impl Server {
                 last_message,
                 ..
             })) => {
-                let auth_res = auth::auth(self, &mut client, &auth_token);
+                let auth_res = crate::auth::auth(self, &mut client, &auth_token);
                 let uuid = self.wrap_err(&client, auth_res)?;
                 self.wrap_err(
                     &client,

src/utils/client.rs

@@ -1,7 +1,7 @@
 use std::{
     hash::{Hash, Hasher},
     io::{self, Read, Write},
-    net::{SocketAddr, TcpStream},
+    net::TcpStream,
 };
 
 use anyhow::anyhow;
@@ -346,11 +346,6 @@ impl Client {
     pub fn set_uuid(&mut self, uuid: &str) {
         self.1 = Some(uuid.to_string())
     }
-
-    #[deprecated]
-    pub fn addr(&self) -> crate::Result<SocketAddr> {
-        Ok(self.0.peer_addr().unwrap_or(self.0.local_addr()?))
-    }
 }
 
 impl Clone for Client {

src/utils/plugin.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use crate::{
-    Server,
+    server::Server,
     types::message::{ClientMessage, WsMessage},
     utils::client::Client,
 };