refactor: convert to workspace

Cargo.lock

@@ -526,9 +526,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.34"
+version = "4.5.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e958897981290da2a852763fe9cdb89cd36977a5d729023127095fa94d95e2ff"
+checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -536,9 +536,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.34"
+version = "4.5.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83b0f35019843db2160b5bb19ae09b4e6411ac33fc6a712003c33e03090e2489"
+checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
 dependencies = [
  "anstream",
  "anstyle",
@@ -945,9 +945,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.7"
+version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697"
+checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1605,9 +1605,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1615,6 +1615,7 @@ dependencies = [
  "http 1.3.1",
  "http-body 1.0.1",
  "hyper 1.6.0",
+ "libc",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -1624,9 +1625,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.62"
+version = "0.1.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2fd658b06e56721792c5df4475705b6cda790e9298d19d2f8af083457bcd127"
+checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1634,7 +1635,7 @@ dependencies = [
  "js-sys",
  "log",
  "wasm-bindgen",
- "windows-core",
+ "windows-core 0.61.0",
 ]
 
 [[package]]
@@ -2089,6 +2090,13 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "lnvps_nostr"
+version = "0.1.0"
+dependencies = [
+ "lnvps_db",
+]
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -2409,9 +2417,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.1"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "opaque-debug"
@@ -2871,9 +2879,9 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.37.3"
+version = "0.37.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf763ab1c7a3aa408be466efc86efe35ed1bd3dd74173ed39d6b0d0a6f0ba148"
+checksum = "a4ce8c88de324ff838700f36fb6ab86c96df0e3c4ab6ef3a9b2044465cce1369"
 dependencies = [
  "memchr",
  "serde",
@@ -3273,9 +3281,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustix"
-version = "1.0.3"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96"
+checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
 dependencies = [
  "bitflags 2.9.0",
  "errno",
@@ -3642,9 +3650,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.8"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -4890,7 +4898,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
 dependencies = [
- "windows-core",
+ "windows-core 0.52.0",
  "windows-targets 0.52.6",
 ]
 
@@ -4903,6 +4911,41 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.61.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings 0.4.0",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.100",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.100",
+]
+
 [[package]]
 name = "windows-link"
 version = "0.1.1"
@@ -4916,7 +4959,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
 dependencies = [
  "windows-result",
- "windows-strings",
+ "windows-strings 0.3.1",
  "windows-targets 0.53.0",
 ]
 
@@ -4938,6 +4981,15 @@ dependencies = [
  "windows-link",
 ]
 
+[[package]]
+name = "windows-strings"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"

Cargo.toml

@@ -1,79 +1,13 @@
-[package]
-name = "lnvps"
-version = "0.1.0"
-edition = "2021"
-
-[[bin]]
-name = "api"
-
-[features]
-default = [
-    "mikrotik",
-    "nostr-dm",
-    "nostr-dvm",
-    "proxmox",
-    "lnd",
-    "cloudflare",
-    "revolut",
-    "bitvora"
+[workspace]
+resolver = "3"
+members = [
+    "lnvps_db",
+    "lnvps_api",
+    "lnvps_nostr"
 ]
-mikrotik = ["dep:reqwest"]
-nostr-dm = ["dep:nostr-sdk"]
-nostr-dvm = ["dep:nostr-sdk"]
-proxmox = ["dep:reqwest", "dep:ssh2", "dep:tokio-tungstenite"]
-libvirt = ["dep:virt", "dep:uuid", "dep:quick-xml"]
-lnd = ["dep:fedimint-tonic-lnd"]
-bitvora = ["dep:reqwest", "dep:tokio-stream"]
-cloudflare = ["dep:reqwest"]
-revolut = ["dep:reqwest", "dep:sha2", "dep:hmac"]
 
-[dependencies]
-lnvps_db = { path = "lnvps_db" }
+[workspace.dependencies]
 tokio = { version = "1.37.0", features = ["rt", "rt-multi-thread", "macros", "sync", "io-util"] }
 anyhow = "1.0.83"
-config = { version = "0.15.8", features = ["yaml"] }
 log = "0.4.21"
-env_logger = "0.11.7"
-serde = { version = "1.0.213", features = ["derive"] }
-serde_json = "1.0.132"
-rocket = { version = "0.5.1", features = ["json"] }
-rocket_okapi = { version = "0.9.0", features = ["swagger"] }
-schemars = { version = "0.8.22", features = ["chrono"] }
-chrono = { version = "0.4.38", features = ["serde"] }
-base64 = { version = "0.22.1", features = ["alloc"] }
-urlencoding = "2.1.3"
-ipnetwork = { git = "https://git.v0l.io/Kieran/ipnetwork.git", rev = "35977adc8103cfc232bc95fbc32f4e34f2b6a6d7" }
-rand = "0.9.0"
-clap = { version = "4.5.21", features = ["derive"] }
-ssh-key = "0.6.7"
-lettre = { version = "0.11.10", features = ["tokio1-native-tls"] }
-ws = { package = "rocket_ws", version = "0.1.1" }
-native-tls = "0.2.12"
-hex = "0.4.3"
-futures = "0.3.31"
-isocountry = "0.3.2"
-
-#nostr-dm
-nostr = { version = "0.40.0", default-features = false, features = ["std"] }
-nostr-sdk = { version = "0.40.0", optional = true, default-features = false, features = ["nip44", "nip59"] }
-
-#proxmox
-tokio-tungstenite = { version = "^0.21", features = ["native-tls"], optional = true }
-ssh2 = { version = "0.9.4", optional = true }
-reqwest = { version = "0.12.8", optional = true }
-
-#libvirt
-virt = { git = "https://gitlab.com/libvirt/libvirt-rust.git", optional = true }
-#virtxml = {git = "https://gitlab.com/libvirt/libvirt-rust-xml.git", optional = true}
-uuid = { version = "1.16.0", features = ["v4", "serde"], optional = true }
-quick-xml = { version = "0.37.3", features = ["serde", "serialize"], optional = true }
-
-#lnd
-fedimint-tonic-lnd = { version = "0.2.0", default-features = false, features = ["invoicesrpc"], optional = true }
-
-#bitvora
-tokio-stream = { version = "0.1.17", features = ["sync"], optional = true }
-
-#revolut
-sha2 = { version = "0.10.8", optional = true }
-hmac = { version = "0.12.1", optional = true }
+env_logger = "0.11.7"

Dockerfile

@@ -4,7 +4,7 @@ FROM $IMAGE AS build
 WORKDIR /app/src
 COPY . .
 RUN apt update && apt -y install protobuf-compiler libvirt-dev
-RUN cargo test && cargo install --path . --root /app/build
+RUN cargo test && cargo install --path lnvps_api --root /app/build
 
 FROM $IMAGE AS runner
 WORKDIR /app

lnvps_api/Cargo.toml

@@ -0,0 +1,80 @@
+[package]
+name = "lnvps"
+version = "0.1.0"
+edition = "2021"
+
+[[bin]]
+name = "api"
+
+[features]
+default = [
+    "mikrotik",
+    "nostr-dm",
+    "nostr-dvm",
+    "proxmox",
+    "lnd",
+    "cloudflare",
+    "revolut",
+    "bitvora"
+]
+mikrotik = ["dep:reqwest"]
+nostr-dm = ["dep:nostr-sdk"]
+nostr-dvm = ["dep:nostr-sdk"]
+proxmox = ["dep:reqwest", "dep:ssh2", "dep:tokio-tungstenite"]
+libvirt = ["dep:virt", "dep:uuid", "dep:quick-xml"]
+lnd = ["dep:fedimint-tonic-lnd"]
+bitvora = ["dep:reqwest", "dep:tokio-stream"]
+cloudflare = ["dep:reqwest"]
+revolut = ["dep:reqwest", "dep:sha2", "dep:hmac"]
+
+[dependencies]
+lnvps_db = { path = "../lnvps_db" }
+anyhow.workspace = true
+log.workspace = true
+env_logger.workspace = true
+
+tokio = { version = "1.37.0", features = ["rt", "rt-multi-thread", "macros", "sync", "io-util"] }
+config = { version = "0.15.8", features = ["yaml"] }
+serde = { version = "1.0.213", features = ["derive"] }
+serde_json = "1.0.132"
+rocket = { version = "0.5.1", features = ["json"] }
+rocket_okapi = { version = "0.9.0", features = ["swagger"] }
+schemars = { version = "0.8.22", features = ["chrono"] }
+chrono = { version = "0.4.38", features = ["serde"] }
+base64 = { version = "0.22.1", features = ["alloc"] }
+urlencoding = "2.1.3"
+ipnetwork = { git = "https://git.v0l.io/Kieran/ipnetwork.git", rev = "35977adc8103cfc232bc95fbc32f4e34f2b6a6d7" }
+rand = "0.9.0"
+clap = { version = "4.5.21", features = ["derive"] }
+ssh-key = "0.6.7"
+lettre = { version = "0.11.10", features = ["tokio1-native-tls"] }
+ws = { package = "rocket_ws", version = "0.1.1" }
+native-tls = "0.2.12"
+hex = "0.4.3"
+futures = "0.3.31"
+isocountry = "0.3.2"
+
+#nostr-dm
+nostr = { version = "0.40.0", default-features = false, features = ["std"] }
+nostr-sdk = { version = "0.40.0", optional = true, default-features = false, features = ["nip44", "nip59"] }
+
+#proxmox
+tokio-tungstenite = { version = "^0.21", features = ["native-tls"], optional = true }
+ssh2 = { version = "0.9.4", optional = true }
+reqwest = { version = "0.12.8", optional = true }
+
+#libvirt
+virt = { git = "https://gitlab.com/libvirt/libvirt-rust.git", optional = true }
+#virtxml = {git = "https://gitlab.com/libvirt/libvirt-rust-xml.git", optional = true}
+uuid = { version = "1.16.0", features = ["v4", "serde"], optional = true }
+quick-xml = { version = "0.37.3", features = ["serde", "serialize"], optional = true }
+
+#lnd
+fedimint-tonic-lnd = { version = "0.2.0", default-features = false, features = ["invoicesrpc"], optional = true }
+
+#bitvora
+tokio-stream = { version = "0.1.17", features = ["sync"], optional = true }
+
+#revolut
+sha2 = { version = "0.10.8", optional = true }
+hmac = { version = "0.12.1", optional = true }

lnvps_db/Cargo.toml

@@ -8,7 +8,7 @@ default = ["mysql"]
 mysql = ["sqlx/mysql"]
 
 [dependencies]
-anyhow = "1.0.83"
+anyhow.workspace = true
 sqlx = { version = "0.8.2", features = ["chrono", "migrate", "runtime-tokio"] }
 chrono = { version = "0.4.38", features = ["serde"] }
 async-trait = "0.1.83"

lnvps_nostr/Cargo.lock

@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "lnvps_nostr"
+version = "0.1.0"

lnvps_nostr/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "lnvps_nostr"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+lnvps_db = { path = "../lnvps_db" }

lnvps_nostr/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}