this aint workin

Cargo.toml

@@ -38,7 +38,7 @@ base64 = "0.22.1"
 ferinth = "2.11.0"
 furse = "1.5.15"
 tempfile = "3.10.1"
-specta = "2.0.0-rc.12"
+specta = "2.0.0-rc.13"
 futures = { version = "0.3.30", features = ["executor"] }
 axum = { version = "0.7.5", features = ["macros", "ws"] }
 mime_guess = "2.0.4"
@@ -74,24 +74,14 @@ envcrypt = "0.5.0"
 strum = "0.26.2"
 strum_macros = "0.26.2"
 serde_either = "0.2.1"
-indicatif = { version = "0.17.8", features = ["rayon"] }
-rayon = "1.10.0"
-serial_test = "3.1.1"
 quick-xml = { version = "0.31.0", features = ["serialize", "serde-types"] }
-proguard = "5.4.1"
 which = "6.0.1"
 sysinfo = "0.30.12"
-crossbeam = "0.8.4"
-parking_lot = "0.12.2"
 libc = "0.2.155"
-windows-sys = { version = "0.52.0", features = ["Win32", "Win32_System", "Win32_System_Threading", "Win32_Foundation"] }
 thiserror = "1.0.61"
 murmur2 = "0.1.0"
 serde_repr = "0.1.19"
-crossbeam-channel = "0.5.13"
-rspc = { path = "./external/rspc" }
-rspc-axum = { path = "./external/rspc/crates/axum", features = ["ws"] }
-rspc-tauri = { path = "./external/rspc/crates/tauri" }
+rspc = { path = "./external/rspc", features = ["tauri", "axum"] }
 tungstenite = { features = ["rustls"], git = "https://github.com/snapview/tungstenite-rs", version = "0.20.1", rev = "fc17f73" }
 prisma-client-rust = { git = "https://github.com/Brendonovich/prisma-client-rust", rev = "4f9ef9d", features = ["rspc", "specta", "sqlite"] }
 prisma-client-rust-cli = { git = "https://github.com/Brendonovich/prisma-client-rust", rev = "4f9ef9d", features = ["rspc", "specta", "sqlite"] }
@@ -121,9 +111,6 @@ bindings = { path = "./apps/bindings" }
 commands = { path = "./crates/commands" }
 plugins = { path = "./crates/plugins" }
 
-[patch.crates-io]
-rspc = { path = "./external/rspc" }
-
 [patch."https://github.com/Brendonovich/prisma-client-rust"]
 rspc = { path = "./external/rspc" }
 
@@ -157,7 +144,4 @@ members = [
     "crates/pack",
     "tools/prisma",
     "external/rspc",
-    "external/rspc/crates/axum",
-    "external/rspc/crates/httpz",
-    "external/rspc/crates/tauri",
 ]

apps/gui/Cargo.toml

@@ -44,7 +44,6 @@ mcmeta.workspace = true
 commands.workspace = true
 plugins.workspace = true
 rspc.workspace = true
-rspc-tauri.workspace = true
 
 [features]
 default = ["custom-protocol"]

apps/webui/Cargo.toml

@@ -37,5 +37,4 @@ tokio-util.workspace = true
 tokio-stream.workspace = true
 axumite.workspace = true
 rspc.workspace = true
-rspc-axum.workspace = true
 commands.workspace = true

crates/api/Cargo.toml

@@ -20,7 +20,6 @@ async-trait.workspace = true
 serde.workspace = true
 specta.workspace = true
 data.workspace = true
-tauri.workspace = true
 const_format.workspace = true
 serde_json.workspace = true
 mcmeta.workspace = true
@@ -29,12 +28,6 @@ tokio.workspace = true
 java.workspace = true
 tracing.workspace = true
 install.workspace = true
-tempfile.workspace = true
 reqwest.workspace = true
-tokio-util.workspace = true
 tokio-stream.workspace = true
-crossbeam-channel.workspace = true
 rspc.workspace = true
-
-[dev-dependencies]
-indicatif.workspace = true

crates/api/src/lib.rs

@@ -22,7 +22,6 @@ extern crate async_trait;
 pub extern crate whcore;
 
 pub mod install;
-pub mod macros;
 pub mod plugin;
 pub mod register;
 pub mod res;

crates/commands/src/lib.rs

@@ -15,9 +15,5 @@ pub extern crate whcore;
 pub mod base;
 pub mod instance;
 pub mod loader;
-pub mod macros;
 pub mod mods;
-pub mod mutation;
-pub mod query;
 pub mod router;
-pub mod subscriptions;

crates/commands/src/router.rs

@@ -2,27 +2,21 @@
 
 use std::sync::Arc;
 
-use data::prisma::PrismaClient;
-use midlog::midlog_log;
+use data::prisma::{r#mod, PrismaClient};
 use rspc::Router;
 
-use crate::apply;
-
 /// Create a router.
 pub fn build_router() -> Router<Arc<PrismaClient>> {
-    let router = Router::new()
-        .middleware(|mw| {
-            mw.middleware(|mw| async move {
-                midlog_log!(mw.req.kind.to_str(), mw.req.path.as_str(), 200, 0);
-                Ok(mw)
+    Router::<Arc<PrismaClient>>::new()
+        .query("version", |t| t(|_, _: ()| env!("CARGO_PKG_VERSION")))
+        .query("mods", |t| {
+            t(|db, instance: i32| async move {
+                db.r#mod()
+                    .find_many(vec![r#mod::instance_id::equals(instance)])
+                    .exec()
+                    .await
+                    .unwrap_or_default()
             })
         })
-        .query("version", |t| t(|_, _: ()| env!("CARGO_PKG_VERSION")));
-
-    apply!(
-        router:
-            crate::query::mods
-    );
-
-    router.build()
+        .build()
 }

crates/mcmeta/Cargo.toml

@@ -20,16 +20,10 @@ base64.workspace = true
 lazy_static.workspace = true
 quick-xml.workspace = true
 zip.workspace = true
-proguard.workspace = true
 whcore.workspace = true
 java.workspace = true
 msa.workspace = true
-rayon.workspace = true
 futures.workspace = true
 specta.workspace = true
 data.workspace = true
 tracing.workspace = true
-
-[dev-dependencies]
-indicatif.workspace = true
-serial_test.workspace = true

crates/mcmeta/src/lib.rs

@@ -20,7 +20,6 @@ pub mod jar_mf;
 pub mod launchwrapper;
 pub mod macros;
 pub mod manager;
-pub mod mappings;
 pub mod maven;
 pub mod neoforge;
 pub mod piston;