diff --git a/.github/workflows/theseus-release.yml b/.github/workflows/theseus-release.yml index f2963896..2d76ff24 100644 --- a/.github/workflows/theseus-release.yml +++ b/.github/workflows/theseus-release.yml @@ -7,9 +7,11 @@ on: - 'build*' - 'v*' paths: - - .github/workflows/app-release.yml + - .github/workflows/theseus-release.yml - 'apps/app/**' - 'apps/app-frontend/**' + - 'apps/labrinth/src/common/**' + - 'apps/labrinth/Cargo.toml' - 'packages/app-lib/**' - 'packages/app-macros/**' - 'packages/assets/**' diff --git a/.idea/code.iml b/.idea/code.iml index 70105a51..a4489bea 100644 --- a/.idea/code.iml +++ b/.idea/code.iml @@ -10,9 +10,11 @@ + + - + \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 8b5a64a0..425e3b5e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -265,9 +265,9 @@ dependencies = [ [[package]] name = "actix-web-prom" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76743e67d4e7efa9fc2ac7123de0dd7b2ca592668e19334f1d81a3b077afc6ac" +checksum = "56a34f1825c3ae06567a9d632466809bbf34963c86002e8921b64f32d48d289d" dependencies = [ "actix-web", "futures-core", @@ -420,6 +420,21 @@ dependencies = [ "password-hash 0.5.0", ] +[[package]] +name = "ariadne" +version = "0.1.0" +dependencies = [ + "chrono", + "either", + "rand 0.8.5", + "serde", + "serde_bytes", + "serde_cbor", + "serde_json", + "thiserror 1.0.64", + "uuid 1.12.0", +] + [[package]] name = "arrayvec" version = "0.7.6" @@ -1216,7 +1231,11 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" dependencies = [ "byteorder", "fnv", +<<<<<<< HEAD "uuid 1.13.1", +======= + "uuid 1.12.0", +>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c ] [[package]] @@ -1303,7 +1322,11 @@ dependencies = [ "time", "tokio 1.43.0", "url", +<<<<<<< HEAD "uuid 1.13.1", +======= + "uuid 1.12.0", +>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c ] [[package]] @@ -2007,7 +2030,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ "serde", +<<<<<<< HEAD "uuid 1.13.1", +======= + "uuid 1.12.0", +>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c ] [[package]] @@ -2537,7 +2564,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0" dependencies = [ "bit_field", +<<<<<<< HEAD "half", +======= + "flume", + "half 2.4.1", +>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c "lebe", "miniz_oxide", "rayon-core", @@ -3286,6 +3318,12 @@ dependencies = [ "tracing", ] +[[package]] +name = "half" +version = "1.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + [[package]] name = "half" version = "2.4.1" @@ -4297,6 +4335,7 @@ dependencies = [ "actix-web-prom", "actix-ws", "argon2", + "ariadne", "async-stripe", "async-trait", "base64 0.21.7", @@ -4310,6 +4349,7 @@ dependencies = [ "deadpool-redis", "derive-new", "dotenvy", + "either", "env_logger", "flate2", "futures 0.3.31", @@ -4342,6 +4382,8 @@ dependencies = [ "sentry", "sentry-actix", "serde", + "serde_bytes", + "serde_cbor", "serde_json", "serde_with", "sha1 0.6.1", @@ -4355,7 +4397,11 @@ dependencies = [ "totp-rs", "url", "urlencoding", +<<<<<<< HEAD "uuid 1.13.1", +======= + "uuid 1.12.0", +>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c "validator", "webp", "woothee", @@ -4732,7 +4778,11 @@ dependencies = [ "serde_json", "thiserror 1.0.69", "time", +<<<<<<< HEAD "uuid 1.13.1", +======= + "uuid 1.12.0", +>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c "wasm-bindgen-futures", "web-sys", "yaup", @@ -6862,7 +6912,11 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", +<<<<<<< HEAD "uuid 1.13.1", +======= + "uuid 1.12.0", +>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c ] [[package]] @@ -7234,7 +7288,11 @@ dependencies = [ "serde", "serde_json", "url", +<<<<<<< HEAD "uuid 1.13.1", +======= + "uuid 1.12.0", +>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c ] [[package]] @@ -7500,7 +7558,11 @@ dependencies = [ "thiserror 1.0.69", "time", "url", +<<<<<<< HEAD "uuid 1.13.1", +======= + "uuid 1.12.0", +>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c ] [[package]] @@ -7535,6 +7597,25 @@ dependencies = [ "xml-rs", ] +[[package]] +name = "serde_bytes" +version = "0.11.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half 1.8.3", + "serde", +] + [[package]] name = "serde_derive" version = "1.0.217" @@ -8650,7 +8731,11 @@ dependencies = [ "thiserror 2.0.11", "time", "url", +<<<<<<< HEAD "uuid 1.13.1", +======= + "uuid 1.12.0", +>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c "walkdir", ] @@ -8743,7 +8828,11 @@ dependencies = [ "thiserror 2.0.11", "toml 0.8.20", "url", +<<<<<<< HEAD "uuid 1.13.1", +======= + "uuid 1.12.0", +>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c ] [[package]] @@ -8925,7 +9014,11 @@ dependencies = [ "toml 0.8.20", "url", "urlpattern", +<<<<<<< HEAD "uuid 1.13.1", +======= + "uuid 1.12.0", +>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c "walkdir", ] @@ -8988,6 +9081,7 @@ dependencies = [ name = "theseus" version = "0.9.3" dependencies = [ + "ariadne", "async-recursion", "async-tungstenite", "async_zip", @@ -9000,6 +9094,7 @@ dependencies = [ "dirs 5.0.1", "discord-rich-presence", "dunce", + "either", "flate2", "futures 0.3.31", "indicatif", @@ -9029,7 +9124,11 @@ dependencies = [ "tracing-subscriber", "url", "urlencoding", +<<<<<<< HEAD "uuid 1.13.1", +======= + "uuid 1.12.0", +>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c "whoami", "winreg 0.52.0", "zip 0.6.6", @@ -9071,7 +9170,11 @@ dependencies = [ "tracing", "tracing-error", "url", +<<<<<<< HEAD "uuid 1.13.1", +======= + "uuid 1.12.0", +>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c "window-shadows", ] @@ -9090,7 +9193,11 @@ dependencies = [ "tracing-error", "tracing-subscriber", "url", +<<<<<<< HEAD "uuid 1.13.1", +======= + "uuid 1.12.0", +>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c "webbrowser", ] @@ -9952,9 +10059,15 @@ dependencies = [ [[package]] name = "uuid" +<<<<<<< HEAD version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0" +======= +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4" +>>>>>>> d51a1c47c70d44bfcc1af6fe58f244170513470c dependencies = [ "getrandom 0.3.1", "js-sys", diff --git a/Cargo.toml b/Cargo.toml index c55a6fc2..97d69a24 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,6 +7,7 @@ members = [ './apps/labrinth', './apps/daedalus_client', './packages/daedalus', + './packages/ariadne', ] # Optimize for speed and reduce size on release builds @@ -21,4 +22,4 @@ strip = true # Remove debug symbols opt-level = 3 [patch.crates-io] -wry = { git = "https://github.com/modrinth/wry", rev = "51907c6" } \ No newline at end of file +wry = { git = "https://github.com/modrinth/wry", rev = "51907c6" } diff --git a/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue b/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue index 567e1e4f..867e333b 100644 --- a/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue +++ b/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue @@ -39,10 +39,10 @@ defineExpose({ }) function onModalHide() { - // if (props.showAdOnClose) { - // show_ads_window() - // } - props.onHide() +// if (props.showAdOnClose) { +// show_ads_window() +// } + props.onHide?.() } diff --git a/apps/app-playground/.cargo/config.toml b/apps/app-playground/.cargo/config.toml new file mode 100644 index 00000000..19f0a3a5 --- /dev/null +++ b/apps/app-playground/.cargo/config.toml @@ -0,0 +1,2 @@ +[env] +SQLX_OFFLINE = "true" diff --git a/apps/app-playground/src/main.rs b/apps/app-playground/src/main.rs index a50002dc..f8d94393 100644 --- a/apps/app-playground/src/main.rs +++ b/apps/app-playground/src/main.rs @@ -3,9 +3,9 @@ windows_subsystem = "windows" )] +use std::time::Duration; use theseus::prelude::*; - -use theseus::profile::create::profile_create; +use tokio::signal::ctrl_c; // A simple Rust implementation of the authentication run // 1) call the authenticate_begin_flow() function to get the URL to open (like you would in the frontend) @@ -41,54 +41,21 @@ async fn main() -> theseus::Result<()> { // Initialize state State::init().await?; - if minecraft_auth::users().await?.is_empty() { - println!("No users found, authenticating."); - authenticate_run().await?; // could take credentials from here direct, but also deposited in state users - } - // - // st.settings - // .write() - // .await - // .java_globals - // .insert(JAVA_8_KEY.to_string(), check_jre(path).await?.unwrap()); - // Clear profiles - println!("Clearing profiles."); - { - let h = profile::list().await?; - for profile in h.into_iter() { - profile::remove(&profile.path).await?; + loop { + if State::get().await?.friends_socket.is_connected().await { + break; } + tokio::time::sleep(Duration::from_millis(500)).await; } - println!("Creating/adding profile."); + tracing::info!("Starting host"); - let name = "Example".to_string(); - let game_version = "1.16.1".to_string(); - let modloader = ModLoader::Forge; - let loader_version = "stable".to_string(); + let socket = State::get().await?.friends_socket.open_port(25565).await?; + tracing::info!("Running host on socket {}", socket.socket_id()); - let profile_path = profile_create( - name, - game_version, - modloader, - Some(loader_version), - None, - None, - None, - ) - .await?; - - println!("running"); - // Run a profile, running minecraft and store the RwLock to the process - let process = profile::run(&profile_path).await?; - - println!("Minecraft UUID: {}", process.uuid); - - println!("All running process UUID {:?}", process::get_all().await?); - - // hold the lock to the process until it ends - println!("Waiting for process to end..."); - process::wait_for(process.uuid).await?; + ctrl_c().await?; + tracing::info!("Stopping host"); + socket.shutdown().await?; Ok(()) } diff --git a/apps/app/.cargo/config.toml b/apps/app/.cargo/config.toml new file mode 100644 index 00000000..19f0a3a5 --- /dev/null +++ b/apps/app/.cargo/config.toml @@ -0,0 +1,2 @@ +[env] +SQLX_OFFLINE = "true" diff --git a/apps/docs/package.json b/apps/docs/package.json index 5b226627..8ce3806e 100644 --- a/apps/docs/package.json +++ b/apps/docs/package.json @@ -10,12 +10,12 @@ "astro": "astro" }, "dependencies": { - "@astrojs/check": "^0.9.3", - "@astrojs/starlight": "^0.26.3", + "@astrojs/check": "^0.9.4", + "@astrojs/starlight": "^0.32.2", "@modrinth/assets": "workspace:*", - "astro": "^4.10.2", - "sharp": "^0.32.5", - "starlight-openapi": "^0.7.0", - "typescript": "^5.5.4" + "astro": "^5.4.1", + "sharp": "^0.33.5", + "starlight-openapi": "^0.14.0", + "typescript": "^5.8.2" } -} +} \ No newline at end of file diff --git a/apps/docs/src/content.config.ts b/apps/docs/src/content.config.ts new file mode 100644 index 00000000..6a7b7a02 --- /dev/null +++ b/apps/docs/src/content.config.ts @@ -0,0 +1,7 @@ +import { defineCollection } from 'astro:content'; +import { docsLoader } from '@astrojs/starlight/loaders'; +import { docsSchema } from '@astrojs/starlight/schema'; + +export const collections = { + docs: defineCollection({ loader: docsLoader(), schema: docsSchema() }), +}; diff --git a/apps/docs/src/content/config.ts b/apps/docs/src/content/config.ts deleted file mode 100644 index 90ad769e..00000000 --- a/apps/docs/src/content/config.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { defineCollection } from 'astro:content' -import { docsSchema } from '@astrojs/starlight/schema' - -export const collections = { - docs: defineCollection({ schema: docsSchema() }), -} diff --git a/apps/frontend/src/assets/styles/layout.scss b/apps/frontend/src/assets/styles/layout.scss index 15106666..41be6710 100644 --- a/apps/frontend/src/assets/styles/layout.scss +++ b/apps/frontend/src/assets/styles/layout.scss @@ -140,6 +140,8 @@ right: 1rem; z-index: 100; max-width: calc(100% - 2rem); + max-height: calc(100vh - 2rem); + overflow-y: auto; > div { box-shadow: 0 0 15px rgba(0, 0, 0, 0.3); diff --git a/apps/frontend/src/components/ui/report/ReportInfo.vue b/apps/frontend/src/components/ui/report/ReportInfo.vue index b9ec7079..313b1c12 100644 --- a/apps/frontend/src/components/ui/report/ReportInfo.vue +++ b/apps/frontend/src/components/ui/report/ReportInfo.vue @@ -19,13 +19,21 @@
- +
{{ report.user.username }} User
+
+
+ Reported user not found: +
- Unknown report type + Unknown report type: {{ report.item_type }}
diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue index 733ffc45..8a70ab6b 100644 --- a/apps/frontend/src/layouts/default.vue +++ b/apps/frontend/src/layouts/default.vue @@ -5,6 +5,27 @@
+
+
+
+
+
+
+ ? +
+
+
+