Move everything into workspace

unshell-server/Cargo.toml

@@ -4,27 +4,43 @@ name = "unshell-server"
 edition = "2024"
 
 [features]
-default=["log_debug"]
-log_debug = ["unshell-lib/log_debug", "unshell-manager/log_debug"]
+default = []
+log = ["unshell/log", "unshell-manager/log"]
+log_debug = ["log", "unshell/log_debug", "unshell-manager/log_debug"]
 
 [dependencies]
-unshell-lib = {path = "../unshell-lib", default-featues = false}
+unshell = {path = "../", default-featues = false}
 unshell-obfuscate = {path = "../unshell-obfuscate", default-featues = false}
 unshell-manager = {path = "../unshell-manager", default-featues = false}
 
+chrono = { workspace = true }
+toml = { workspace = true }
+static_init = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+
+sled = "0.34.7"
 
 clap = {version = "4.5.53", features = ["derive"]}
 axum = "0.8.7"
 axum-extra = {version="0.12.2", features = ["typed-header"]}
 tokio = {version="1.48.0", features = ["full"] }
 
-serde = {version = "1.0.228", features = ["derive"]}
-serde_json = "1.0.145"
-chrono = "0.4.42"
-static_init = "1.0.4"
-toml = "0.9.9"
-
 jsonwebtoken = {version = "10.2.0", features = ["aws_lc_rs"]}
 bcrypt = "0.17.1"
 
-sled = "0.34.7"
+# clap = {version = "4.5.53", features = ["derive"]}
+# axum = "0.8.7"
+# axum-extra = {version="0.12.2", features = ["typed-header"]}
+# tokio = {version="1.48.0", features = ["full"] }
+
+# serde = {version = "1.0.228", features = ["derive"]}
+# serde_json = "1.0.145"
+# chrono = "0.4.42"
+# static_init = "1.0.4"
+# toml = "0.9.9"
+
+# jsonwebtoken = {version = "10.2.0", features = ["aws_lc_rs"]}
+# bcrypt = "0.17.1"
+
+# sled = "0.34.7"

unshell-server/src/api.rs

@@ -5,7 +5,7 @@ use axum::{
     routing::{get, post},
 };
 use tokio::net::TcpListener;
-use unshell_lib::{debug, info};
+use unshell::{debug, info};
 
 // axum_extra::
 

unshell-server/src/auth/mod.rs

@@ -10,7 +10,7 @@ use bcrypt::{DEFAULT_COST, hash, verify};
 use chrono::Utc;
 use jsonwebtoken::{Header, TokenData, Validation, decode, encode};
 use serde_json::{Value, json};
-use unshell_lib::{debug, info};
+use unshell::{debug, info};
 
 use crate::{EXPIRE_DURATION, JWT_DECODING_KEY, JWT_ENCODING_KEY};
 

unshell-server/src/config/blob.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use unshell_lib::config::ConfigStructField;
+use unshell::config::ConfigStructField;
 
 // use crate::config::ConfigStructField;
 

unshell-server/src/config/mod.rs

@@ -6,7 +6,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use unshell_lib::{ModuleError, Result, debug, info};
+use unshell::{ModuleError, Result, debug, info};
 
 #[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
 struct ComponentMetadata {

unshell-server/src/logger.rs

@@ -4,7 +4,7 @@ use chrono::Local;
 use std::fs::{self, File, OpenOptions};
 use std::io::{BufRead, BufReader, Write};
 use std::path::PathBuf;
-use unshell_lib::debug;
+use unshell::debug;
 
 use crate::Server;
 use crate::auth::structs::CurrentUser;

unshell-server/src/main.rs

@@ -31,7 +31,7 @@ pub struct Args {
 async fn main() -> Result<(), Box<dyn Error>> {
     let args = Args::parse();
 
-    unshell_lib::logger::PrettyLogger::init_output(|message| {
+    unshell::logger::PrettyLogger::init_output(|message| {
         if let Ok(json) = serde_json::to_string(message) {
             unshell_server::logger::Logger::log(json);
         }

unshell-server/src/server/database.rs

@@ -6,7 +6,7 @@ use axum::{
 };
 use serde_json::Value;
 use sled::Tree;
-use unshell_lib::{debug, error};
+use unshell::{debug, error};
 
 use crate::{auth::structs::CurrentUser, server::Server};
 

unshell-server/src/server/mod.rs

@@ -3,7 +3,7 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-use unshell_lib::{
+use unshell::{
     ModuleError, Result,
     config::{ConfigStructField, Tree, TreeMessage, config_struct::Config},
 };

unshell-server/src/server/tree2.rs

@@ -4,7 +4,7 @@ use axum::{
 };
 
 use serde_json::Value;
-use unshell_lib::{
+use unshell::{
     ModuleError,
     config::{Tree, TreeMessage},
     debug,