aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src-tauri
diff options
context:
space:
mode:
Diffstat (limited to 'src-tauri')
-rw-r--r--src-tauri/Cargo.toml1
-rw-r--r--src-tauri/src/core/assistant.rs4
-rw-r--r--src-tauri/src/core/auth.rs6
-rw-r--r--src-tauri/src/core/config.rs3
-rw-r--r--src-tauri/src/core/downloader.rs7
-rw-r--r--src-tauri/src/core/fabric.rs9
-rw-r--r--src-tauri/src/core/forge.rs2
-rw-r--r--src-tauri/src/core/instance.rs3
-rw-r--r--src-tauri/src/core/java.rs4
-rw-r--r--src-tauri/src/core/manifest.rs3
-rw-r--r--src-tauri/src/main.rs6
11 files changed, 48 insertions, 0 deletions
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 08537ab..cf92627 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/HydroRoll-Team/DropOut"
publish = false
[dependencies]
+dropout-macros = { version = "0.1.0", path = "../crates/macros" }
serde = { version = "1.0", features = ["derive"] }
toml = "0.5"
log = "0.4"
diff --git a/src-tauri/src/core/assistant.rs b/src-tauri/src/core/assistant.rs
index 32d2925..6e656dc 100644
--- a/src-tauri/src/core/assistant.rs
+++ b/src-tauri/src/core/assistant.rs
@@ -7,6 +7,7 @@ use tauri::{Emitter, Window};
use ts_rs::TS;
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/assistant.ts"
@@ -57,6 +58,7 @@ pub struct OllamaTagsResponse {
// Simplified model info for frontend
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/assistant.ts"
@@ -112,6 +114,7 @@ pub struct OpenAIModelsResponse {
// Streaming response structures
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/assistant.ts"
@@ -126,6 +129,7 @@ pub struct GenerationStats {
}
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/assistant.ts"
diff --git a/src-tauri/src/core/auth.rs b/src-tauri/src/core/auth.rs
index 478d549..0e873e3 100644
--- a/src-tauri/src/core/auth.rs
+++ b/src-tauri/src/core/auth.rs
@@ -14,6 +14,7 @@ fn get_client() -> reqwest::Client {
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
#[serde(tag = "type")]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
tag = "type",
@@ -48,6 +49,7 @@ impl Account {
}
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/auth.ts")]
pub struct OfflineAccount {
pub username: String,
@@ -55,6 +57,7 @@ pub struct OfflineAccount {
}
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/auth.ts")]
pub struct MicrosoftAccount {
pub username: String,
@@ -85,6 +88,7 @@ const CLIENT_ID: &str = "fe165602-5410-4441-92f7-326e10a7cb82";
const SCOPE: &str = "XboxLive.SignIn XboxLive.offline_access";
#[derive(Debug, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/auth.ts")]
pub struct DeviceCodeResponse {
pub user_code: String,
@@ -96,6 +100,7 @@ pub struct DeviceCodeResponse {
}
#[derive(Debug, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/auth.ts")]
pub struct TokenResponse {
pub access_token: String,
@@ -219,6 +224,7 @@ pub struct MinecraftAuthResponse {
}
#[derive(Debug, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/auth.ts")]
pub struct MinecraftProfile {
pub id: String,
diff --git a/src-tauri/src/core/config.rs b/src-tauri/src/core/config.rs
index e22e56a..0d0e8ff 100644
--- a/src-tauri/src/core/config.rs
+++ b/src-tauri/src/core/config.rs
@@ -6,6 +6,7 @@ use tauri::{AppHandle, Manager};
use ts_rs::TS;
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/config.ts"
@@ -49,6 +50,7 @@ impl Default for AssistantConfig {
/// Feature-gated arguments configuration
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/config.ts"
@@ -80,6 +82,7 @@ impl Default for FeatureFlags {
}
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/config.ts"
diff --git a/src-tauri/src/core/downloader.rs b/src-tauri/src/core/downloader.rs
index 99a641c..d4fc782 100644
--- a/src-tauri/src/core/downloader.rs
+++ b/src-tauri/src/core/downloader.rs
@@ -10,6 +10,7 @@ use tokio::sync::Semaphore;
use ts_rs::TS;
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/downloader.ts"
@@ -25,6 +26,7 @@ pub struct DownloadTask {
/// Metadata for resumable downloads stored in .part.meta file
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/downloader.ts"
@@ -41,6 +43,7 @@ pub struct DownloadMetadata {
/// A download segment for multi-segment parallel downloading
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/downloader.ts"
@@ -54,6 +57,7 @@ pub struct DownloadSegment {
/// Progress event for Java download
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/downloader.ts"
@@ -70,6 +74,7 @@ pub struct JavaDownloadProgress {
/// Pending download task for queue persistence
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/downloader.ts"
@@ -87,6 +92,7 @@ pub struct PendingJavaDownload {
/// Download queue for persistence
#[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/downloader.ts"
@@ -445,6 +451,7 @@ fn create_new_metadata(
}
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui/src/types/generated/downloader.ts"
diff --git a/src-tauri/src/core/fabric.rs b/src-tauri/src/core/fabric.rs
index 4e63bce..7385850 100644
--- a/src-tauri/src/core/fabric.rs
+++ b/src-tauri/src/core/fabric.rs
@@ -14,6 +14,7 @@ const FABRIC_META_URL: &str = "https://meta.fabricmc.net/v2";
/// Represents a Fabric loader version from the Meta API.
#[derive(Debug, Deserialize, Serialize, Clone, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/fabric.ts"
@@ -28,6 +29,7 @@ pub struct FabricLoaderVersion {
/// Represents a Fabric intermediary mapping version.
#[derive(Debug, Deserialize, Serialize, Clone, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/fabric.ts"
@@ -40,6 +42,7 @@ pub struct FabricIntermediaryVersion {
/// Represents a combined loader + intermediary version entry.
#[derive(Debug, Deserialize, Serialize, Clone, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/fabric.ts"
@@ -53,6 +56,7 @@ pub struct FabricLoaderEntry {
/// Launcher metadata from Fabric Meta API.
#[derive(Debug, Deserialize, Serialize, Clone, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/fabric.ts"
@@ -66,6 +70,7 @@ pub struct FabricLauncherMeta {
/// Libraries required by Fabric loader.
#[derive(Debug, Deserialize, Serialize, Clone, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/fabric.ts"
@@ -78,6 +83,7 @@ pub struct FabricLibraries {
/// A single Fabric library dependency.
#[derive(Debug, Deserialize, Serialize, Clone, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/fabric.ts"
@@ -90,6 +96,7 @@ pub struct FabricLibrary {
/// Main class configuration for Fabric.
/// Can be either a struct with client/server fields or a simple string.
#[derive(Debug, Deserialize, Serialize, Clone, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/fabric.ts",
@@ -120,6 +127,7 @@ impl FabricMainClass {
/// Represents a Minecraft version supported by Fabric.
#[derive(Debug, Deserialize, Serialize, Clone, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/fabric.ts"
@@ -131,6 +139,7 @@ pub struct FabricGameVersion {
/// Information about an installed Fabric version.
#[derive(Debug, Serialize, Clone, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/fabric.ts"
diff --git a/src-tauri/src/core/forge.rs b/src-tauri/src/core/forge.rs
index 9f0215f..1d4ae1d 100644
--- a/src-tauri/src/core/forge.rs
+++ b/src-tauri/src/core/forge.rs
@@ -21,6 +21,7 @@ const FORGE_FILES_URL: &str = "https://files.minecraftforge.net/";
/// Represents a Forge version entry.
#[derive(Debug, Deserialize, Serialize, Clone, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/forge.ts"
@@ -42,6 +43,7 @@ struct ForgePromotions {
/// Information about an installed Forge version.
#[derive(Debug, Serialize, Clone, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/forge.ts"
diff --git a/src-tauri/src/core/instance.rs b/src-tauri/src/core/instance.rs
index 131d696..e7746b2 100644
--- a/src-tauri/src/core/instance.rs
+++ b/src-tauri/src/core/instance.rs
@@ -15,6 +15,7 @@ use ts_rs::TS;
/// Represents a game instance/profile
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/instance.ts"
@@ -37,6 +38,7 @@ pub struct Instance {
/// Memory settings override for an instance
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/instance.ts"
@@ -48,6 +50,7 @@ pub struct MemoryOverride {
/// Configuration for all instances
#[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/instance.ts"
diff --git a/src-tauri/src/core/java.rs b/src-tauri/src/core/java.rs
index ddcbdbd..12a6d56 100644
--- a/src-tauri/src/core/java.rs
+++ b/src-tauri/src/core/java.rs
@@ -27,6 +27,7 @@ fn strip_unc_prefix(path: PathBuf) -> PathBuf {
}
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/java.ts")]
pub struct JavaInstallation {
pub path: String,
@@ -64,6 +65,7 @@ impl std::fmt::Display for ImageType {
/// Java release information for UI display
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/java.ts")]
pub struct JavaReleaseInfo {
pub major_version: u32,
@@ -81,6 +83,7 @@ pub struct JavaReleaseInfo {
/// Java catalog containing all available versions
#[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/java.ts")]
pub struct JavaCatalog {
pub releases: Vec<JavaReleaseInfo>,
@@ -138,6 +141,7 @@ pub struct AvailableReleases {
/// Java download information from Adoptium
#[derive(Debug, Clone, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/java.ts")]
pub struct JavaDownloadInfo {
pub version: String,
diff --git a/src-tauri/src/core/manifest.rs b/src-tauri/src/core/manifest.rs
index ffa1c77..9e4cb4e 100644
--- a/src-tauri/src/core/manifest.rs
+++ b/src-tauri/src/core/manifest.rs
@@ -6,6 +6,7 @@ use crate::core::game_version::GameVersion;
use ts_rs::TS;
#[derive(Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/manifest.ts"
@@ -16,6 +17,7 @@ pub struct VersionManifest {
}
#[derive(Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/manifest.ts"
@@ -26,6 +28,7 @@ pub struct Latest {
}
#[derive(Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(
export,
export_to = "../../packages/ui-new/src/types/bindings/manifest.ts"
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index b7283ba..45fa77b 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -1751,6 +1751,7 @@ async fn get_version_java_version(
/// Version metadata for display in the UI
#[derive(serde::Serialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/core.ts")]
struct VersionMetadata {
id: String,
@@ -1902,6 +1903,7 @@ async fn get_version_metadata(
/// Installed version info
#[derive(serde::Serialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/core.ts")]
struct InstalledVersion {
id: String,
@@ -2132,6 +2134,7 @@ async fn install_forge(
}
#[derive(serde::Serialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/core.ts")]
struct GithubRelease {
tag_name: String,
@@ -2179,6 +2182,7 @@ async fn get_github_releases() -> Result<Vec<GithubRelease>, String> {
}
#[derive(Serialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/core.ts")]
struct PastebinResponse {
url: String,
@@ -2388,6 +2392,7 @@ async fn assistant_chat_stream(
/// Migrate instance caches to shared global caches
#[derive(Serialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/core.ts")]
struct MigrationResult {
moved_files: usize,
@@ -2438,6 +2443,7 @@ async fn migrate_shared_caches(
/// File information for instance file browser
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
#[ts(export, export_to = "../../packages/ui-new/src/types/bindings/core.ts")]
struct FileInfo {
name: String,