chore: update dependencies and refactor authentication to use dynamic keyring configuration for improved flexibility and maintainability

chore(rclone.rs): remove rclone.rs file as it is no longer needed in the project

feat(uploader): add R2Uploader for uploading files to S3-compatible storage with progress tracking

Author: franzwarning

Cargo.lock

@@ -18,10 +18,10 @@ path = "src/main.rs"
 [dependencies]
 # CLI Framework
 clap = { version = "4.5", features = ["derive", "env"] }
-clap_complete = "4.5"
 
 # Async Runtime
 tokio = { version = "1.40", features = ["full"] }
+futures = "0.3"
 
 # HTTP Client
 reqwest = { version = "0.12", features = ["json", "stream", "multipart"] }
@@ -37,31 +37,23 @@ thiserror = "1.0"
 
 # Progress & UI
 indicatif = "0.17"
-colored = "2.1"
 
 # Cross-platform paths
 directories = "5.0"
 
-# Logging
-tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+# Object storage uploads
+opendal = { version = "0.49", features = ["services-s3"] }
 
 # File operations
-sha2 = "0.10"
 walkdir = "2.5"
 tempfile = "3.10"
-flate2 = "1.0"
-tar = "0.4"
-zip = "2.1"
 
 # Authentication
 keyring = { version = "3.0", features = ["apple-native", "windows-native", "linux-native"] }
 tiny_http = "0.12"
 open = "5.0"
 url = "2.5"
 urlencoding = "2.1"
-strip-ansi-escapes = "0.2"
-portable-pty = "0.8"
 
 
 

Cargo.toml

@@ -1,19 +1,17 @@
 use anyhow::Result;
 use keyring::Entry;
 use std::net::TcpListener;
-use tiny_http::{Server, Response, Method, Header};
+use tiny_http::{Server, Response, Header};
 use crate::config;
 
-const SERVICE_NAME: &str = "wvdsh";
-const API_KEY_ACCOUNT: &str = "api-key";
-
 pub struct AuthManager {
     api_key_entry: Entry,
 }
 
 impl AuthManager {
     pub fn new() -> Result<Self> {
-        let api_key_entry = Entry::new(SERVICE_NAME, API_KEY_ACCOUNT)?;
+        let keyring = config::keyring_config()?;
+        let api_key_entry = Entry::new(&keyring.service, &keyring.account)?;
         Ok(Self { api_key_entry })
     }
 

src/auth.rs

@@ -3,7 +3,10 @@ use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 use crate::auth::AuthManager;
 use crate::config::{self, WavedashConfig};
-use crate::rclone::{RcloneManager, R2Config};
+#[path = "uploader.rs"]
+mod uploader;
+
+use uploader::{R2Config, R2Uploader};
 
 #[derive(Debug, Deserialize)]
 struct ApiErrorResponse {
@@ -172,7 +175,7 @@ pub async fn handle_build_push(
         &api_key
     ).await?;
 
-    // Create R2 config for rclone
+    // Create R2 config for uploader
     let r2_config = R2Config {
         access_key_id: creds.credentials.access_key_id,
         secret_access_key: creds.credentials.secret_access_key,
@@ -191,15 +194,11 @@ pub async fn handle_build_push(
         false
     };
 
-    // Initialize rclone and upload
-    let mut rclone = RcloneManager::new(verbose)?;
-    
-    // Upload the build directory (including wavedash.toml)
-    rclone.sync_to_r2(
-        upload_dir.to_str().unwrap(),
-        &creds.bucket_name,
+    // Initialize uploader and upload
+    let uploader = R2Uploader::new(&r2_config, &creds.bucket_name)?;
+    uploader.upload_directory(
+        upload_dir.as_path(),
         &creds.r2_key_prefix,
-        &r2_config,
         verbose,
     ).await?;
 

src/builds.rs

@@ -6,6 +6,10 @@ use std::path::PathBuf;
 struct Config {
     open_browser_website_host: String,
     api_host: String,
+    #[serde(default)]
+    keyring_service: Option<String>,
+    #[serde(default)]
+    keyring_account: Option<String>,
 }
 
 impl Config {
@@ -19,6 +23,8 @@ impl Config {
         Ok(Self {
             open_browser_website_host: "https://wavedash.gg".to_string(),
             api_host: "https://convex-http.wavedash.gg".to_string(),
+            keyring_service: None,
+            keyring_account: None,
         })
     }
 }
@@ -32,6 +38,26 @@ pub fn get(key: &str) -> Result<String> {
     }
 }
 
+#[derive(Debug)]
+pub struct KeyringConfig {
+    pub service: String,
+    pub account: String,
+}
+
+pub fn keyring_config() -> Result<KeyringConfig> {
+    let config = Config::load()?;
+    Ok(KeyringConfig {
+        service: config
+            .keyring_service
+            .clone()
+            .unwrap_or_else(|| "wvdsh".to_string()),
+        account: config
+            .keyring_account
+            .clone()
+            .unwrap_or_else(|| "api-key".to_string()),
+    })
+}
+
 #[derive(Debug, Deserialize)]
 pub struct GodotSection {
     pub version: String,

src/config.rs

@@ -1,7 +1,6 @@
 mod auth;
 mod builds;
 mod config;
-mod rclone;
 
 use anyhow::Result;
 use clap::{Parser, Subcommand};