@@ -25,9 +24,6 @@
diff --git a/pages/error/serverunavailable.vue b/pages/error/serverunavailable.vue
deleted file mode 100644
index cfbb178..0000000
--- a/pages/error/serverunavailable.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
-
-
- Server is unavailable
-
-
- We were unable to contact your Drop instance. See if you can open it
- in your web browser, or contact your server admin for help.
-
-
-
- Retry
-
- Connect to different instance →
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/index.vue b/pages/index.vue
index 52bc1df..cc340bc 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,7 +1 @@
-
-
-
+
diff --git a/pages/library.vue b/pages/library.vue
deleted file mode 100644
index ab5079a..0000000
--- a/pages/library.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-
-
-
-
- {{ nav.label }}
-
-
-
-
-
-
-
-
-
diff --git a/pages/library/[id]/index.vue b/pages/library/[id]/index.vue
deleted file mode 100644
index 539ec61..0000000
--- a/pages/library/[id]/index.vue
+++ /dev/null
@@ -1,379 +0,0 @@
-
-
-
-
-
-
- {{ game.mName }}
-
-
-
-
-
-
-
-
-
-
Install {{ game.mName }}?
-
-
-
- Drop will add {{ game.mName }} to the queue to be downloaded.
- While downloading, Drop may use up a large amount of resources,
- particularly network bandwidth and CPU utilisation.
-
-
-
-
-
-
-
-
-
- {{ installError }}
-
-
-
-
-
-
- Install
-
-
- Cancel
-
-
-
-
-
-
diff --git a/pages/library/index.vue b/pages/library/index.vue
deleted file mode 100644
index dd245b6..0000000
--- a/pages/library/index.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- Library Failed to update
-
-
-
\ No newline at end of file
diff --git a/pages/queue.vue b/pages/queue.vue
deleted file mode 100644
index 8d46bea..0000000
--- a/pages/queue.vue
+++ /dev/null
@@ -1,207 +0,0 @@
-
-
-
-
- {{ formatKilobytes(stats.speed) }}/s
- {{ formatTime(stats.time) }} left
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ games[element.meta.id].game.mShortDescription }}
-
-
-
-
-
- {{ element.status }}
-
-
-
{{
- formatKilobytes(element.current / 1000)
- }}
- /
- {{ formatKilobytes(element.max / 1000) }}
-
-
-
-
- Loading...
-
-
-
- No items in the queue
-
-
-
-
diff --git a/pages/quit.vue b/pages/quit.vue
deleted file mode 100644
index 808a5ec..0000000
--- a/pages/quit.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
diff --git a/pages/settings.vue b/pages/settings.vue
deleted file mode 100644
index 3c39c65..0000000
--- a/pages/settings.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
-
- Settings
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/settings/debug.vue b/pages/settings/debug.vue
deleted file mode 100644
index 7a549ca..0000000
--- a/pages/settings/debug.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-
- Debug Information
-
-
- Technical information about your Drop client installation, helpful for
- debugging.
-
-
-
-
-
-
- Client ID
-
-
-
- {{ clientId || "Not signed in" }}
-
-
-
-
-
-
- Platform
-
-
-
- {{ platformInfo }}
-
-
-
-
-
-
- Server URL
-
-
-
- {{ baseUrl || "Not connected" }}
-
-
-
-
-
-
- Data Directory
-
-
-
- {{ dataDir || "Unknown" }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/settings/downloads.vue b/pages/settings/downloads.vue
deleted file mode 100644
index c03fa78..0000000
--- a/pages/settings/downloads.vue
+++ /dev/null
@@ -1,333 +0,0 @@
-
-
-
-
-
-
- Install directories
-
-
- This is where Drop will download game files to, and store them
- indefinitely while you play. Drop and games may store other
- information elsewhere, like saves or mods.
-
-
-
-
- Add new directory
-
-
-
-
-
-
-
-
-
- Open options
-
-
-
-
-
-
- Download Settings
-
-
- Configure how Drop downloads games and other content.
-
-
-
-
- Maximum Download Threads
-
-
-
-
- The maximum number of concurrent download threads. Higher values may
- download faster but use more system resources. Default is 4.
-
-
-
-
-
- {{ saveState.success ? 'Saved' : 'Save Changes' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Select game directory
-
-
- {{
- currentDirectory ?? "Click to select a directory..."
- }}
-
-
-
- Select an empty directory to add.
-
-
-
-
-
- Add
-
-
- Cancel
-
-
-
-
-
-
-
-
- {{ error }}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/settings/index.vue b/pages/settings/index.vue
deleted file mode 100644
index 241c840..0000000
--- a/pages/settings/index.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
General
-
- Configure basic application settings
-
-
-
-
-
-
Start with system
-
- Drop will automatically start when you log into your computer
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/settings/interface.vue b/pages/settings/interface.vue
deleted file mode 100644
index 3df236b..0000000
--- a/pages/settings/interface.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/pages/setup/index.vue b/pages/setup/index.vue
index 1b7eacb..83ae5de 100644
--- a/pages/setup/index.vue
+++ b/pages/setup/index.vue
@@ -12,7 +12,8 @@
Let's get you set up
- You'll need to have set up a Drop instance and created an account on it. If you're connecting to another person's instance, you'll need the url and an account.
+ Anim aute id magna aliqua ad ad non deserunt sunt. Qui irure qui lorem
+ cupidatat commodo. Elit sunt amet fugiat veniam occaecat fugiat aliqua.
https://
@@ -60,7 +60,7 @@
-
+
Don't have one?
{{ " " }}
{
- const prefixes = ["http://", "https://"];
-
- const doesntHavePrefix = prefixes.findIndex((e) => url.value.startsWith(e.slice(0, url.value.length))) == -1;
-
- return doesntHavePrefix;
-})
async function connect() {
const newUrl = url.value.startsWith("http")
diff --git a/pages/store/index.vue b/pages/store/index.vue
deleted file mode 100644
index 64d8a3e..0000000
--- a/pages/store/index.vue
+++ /dev/null
@@ -1,2 +0,0 @@
- {
+ let client_private_key = EcKey::private_key_from_pem(private_key.as_bytes()).unwrap();
+ let pkey_private_key = PKey::from_ec_key(client_private_key).unwrap();
+
+ let mut signer = Signer::new(MessageDigest::sha256(), &pkey_private_key).unwrap();
+ signer.update(nonce.as_bytes()).unwrap();
+ let signature = signer.sign_to_vec().unwrap();
+
+ let hex_signature = hex::encode(signature);
+
+ return Ok(hex_signature);
+}
+
+pub fn generate_authorization_header() -> String {
+ let certs = {
+ let db = DB.borrow_data().unwrap();
+ db.auth.clone().unwrap()
+ };
+
+ let nonce = Uuid::new_v4().to_string();
+ let signature = sign_nonce(certs.private, nonce.clone()).unwrap();
+
+ return format!("Nonce {} {} {}", certs.clientId, nonce, signature);
+}
+
+pub fn fetch_user() -> Result {
+ let base_url = {
+ let handle = DB.borrow_data().unwrap();
+ Url::parse(&handle.base_url).unwrap()
+ };
+
+ let endpoint = base_url.join("/api/v1/client/user").unwrap();
+ let header = generate_authorization_header();
+
+ let client = reqwest::blocking::Client::new();
+ let response = client
+ .get(endpoint.to_string())
+ .header("Authorization", header)
+ .send()
+ .unwrap();
+
+ let user = response.json::().unwrap();
+
+ return Ok(user);
+}
+
+pub fn recieve_handshake(app: AppHandle, path: String) {
+ // Tell the app we're processing
+ app.emit("auth/processing", ()).unwrap();
+
+ let path_chunks: Vec<&str> = path.split("/").collect();
+ if path_chunks.len() != 3 {
+ app.emit("auth/failed", ()).unwrap();
+ return;
+ }
+
+ let base_url = {
+ let handle = DB.borrow_data().unwrap();
+ Url::parse(handle.base_url.as_str()).unwrap()
+ };
+
+ let client_id = path_chunks.get(1).unwrap();
+ let token = path_chunks.get(2).unwrap();
+ let body = HandshakeRequestBody {
+ clientId: client_id.to_string(),
+ token: token.to_string(),
+ };
+
+ let endpoint = unwrap_or_return!(base_url.join("/api/v1/client/auth/handshake"), app);
+ let client = reqwest::blocking::Client::new();
+ let response = unwrap_or_return!(client.post(endpoint).json(&body).send(), app);
+ info!("server responded with {}", response.status());
+ let response_struct = unwrap_or_return!(response.json::(), app);
+
+ {
+ let mut handle = DB.borrow_data_mut().unwrap();
+ handle.auth = Some(DatabaseAuth {
+ private: response_struct.private,
+ cert: response_struct.certificate,
+ clientId: response_struct.id,
+ });
+ drop(handle);
+ DB.save().unwrap();
+ }
+
+ {
+ let app_state = app.state::>();
+ let mut app_state_handle = app_state.lock().unwrap();
+ app_state_handle.status = AppStatus::SignedIn;
+ }
+
+ app.emit("auth/finished", ()).unwrap();
+
+ fetch_user().unwrap();
+}
+
+#[tauri::command]
+pub async fn auth_initiate<'a>() -> Result<(), String> {
+ let base_url = {
+ let db_lock = DB.borrow_data().unwrap();
+ Url::parse(&db_lock.base_url.clone()).unwrap()
+ };
+
+ let current_os_info = os_info::get();
+
+ let endpoint = base_url.join("/api/v1/client/auth/initiate").unwrap();
+ let body = InitiateRequestBody {
+ name: format!("Drop Desktop Client"),
+ platform: current_os_info.os_type().to_string(),
+ };
+
+ let client = reqwest::Client::new();
+ let response = client
+ .post(endpoint.to_string())
+ .json(&body)
+ .send()
+ .await
+ .unwrap();
+
+ let redir_url = response.text().await.unwrap();
+ let complete_redir_url = base_url.join(&redir_url).unwrap();
+
+ info!("opening web browser to continue authentication");
+ webbrowser::open(&complete_redir_url.to_string()).unwrap();
+
+ return Ok(());
+}
+
+pub fn setup() -> Result<(AppStatus, Option), Error> {
+ let data = DB.borrow_data().unwrap();
+
+ // If we have certs, exit for now
+ if data.auth.is_some() {
+ let user_result = fetch_user();
+ if user_result.is_err() {
+ return Ok((AppStatus::SignedInNeedsReauth, None));
+
+ }
+ return Ok((AppStatus::SignedIn, Some(user_result.unwrap())))
+ }
+
+ drop(data);
+
+ return Ok((AppStatus::SignedOut, None));
+}
diff --git a/src-tauri/src/autostart.rs b/src-tauri/src/autostart.rs
deleted file mode 100644
index dec9148..0000000
--- a/src-tauri/src/autostart.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use crate::database::db::{borrow_db_checked, borrow_db_mut_checked, save_db};
-use log::debug;
-use tauri::AppHandle;
-use tauri_plugin_autostart::ManagerExt;
-
-pub fn toggle_autostart_logic(app: AppHandle, enabled: bool) -> Result<(), String> {
- let manager = app.autolaunch();
- if enabled {
- manager.enable().map_err(|e| e.to_string())?;
- debug!("enabled autostart");
- } else {
- manager.disable().map_err(|e| e.to_string())?;
- debug!("eisabled autostart");
- }
-
- // Store the state in DB
- let mut db_handle = borrow_db_mut_checked();
- db_handle.settings.autostart = enabled;
- drop(db_handle);
- save_db();
-
- Ok(())
-}
-
-pub fn get_autostart_enabled_logic(app: AppHandle) -> Result {
- // First check DB state
- let db_handle = borrow_db_checked();
- let db_state = db_handle.settings.autostart;
- drop(db_handle);
-
- // Get actual system state
- let manager = app.autolaunch();
- let system_state = manager.is_enabled()?;
-
- // If they don't match, sync to DB state
- if db_state != system_state {
- if db_state {
- manager.enable()?;
- } else {
- manager.disable()?;
- }
- }
-
- Ok(db_state)
-}
-
-// New function to sync state on startup
-pub fn sync_autostart_on_startup(app: &AppHandle) -> Result<(), String> {
- let db_handle = borrow_db_checked();
- let should_be_enabled = db_handle.settings.autostart;
- drop(db_handle);
-
- let manager = app.autolaunch();
- let current_state = manager.is_enabled().map_err(|e| e.to_string())?;
-
- if current_state != should_be_enabled {
- if should_be_enabled {
- manager.enable().map_err(|e| e.to_string())?;
- debug!("synced autostart: enabled");
- } else {
- manager.disable().map_err(|e| e.to_string())?;
- debug!("synced autostart: disabled");
- }
- }
-
- Ok(())
-}
-#[tauri::command]
-pub fn toggle_autostart(app: AppHandle, enabled: bool) -> Result<(), String> {
- toggle_autostart_logic(app, enabled)
-}
-
-#[tauri::command]
-pub fn get_autostart_enabled(app: AppHandle) -> Result {
- get_autostart_enabled_logic(app)
-}
diff --git a/src-tauri/src/cleanup.rs b/src-tauri/src/cleanup.rs
deleted file mode 100644
index de0e4e6..0000000
--- a/src-tauri/src/cleanup.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use log::{debug, error};
-use tauri::AppHandle;
-
-use crate::AppState;
-
-#[tauri::command]
-pub fn quit(app: tauri::AppHandle, state: tauri::State<'_, std::sync::Mutex>>) {
- cleanup_and_exit(&app, &state);
-}
-
-pub fn cleanup_and_exit(app: &AppHandle, state: &tauri::State<'_, std::sync::Mutex>>) {
- debug!("cleaning up and exiting application");
- let download_manager = state.lock().unwrap().download_manager.clone();
- match download_manager.ensure_terminated() {
- Ok(res) => match res {
- Ok(_) => debug!("download manager terminated correctly"),
- Err(_) => error!("download manager failed to terminate correctly"),
- },
- Err(e) => panic!("{:?}", e),
- }
-
- app.exit(0);
-}
diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs
deleted file mode 100644
index b47a348..0000000
--- a/src-tauri/src/commands.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use crate::AppState;
-
-#[tauri::command]
-pub fn fetch_state(
- state: tauri::State<'_, std::sync::Mutex>>,
-) -> Result {
- let guard = state.lock().unwrap();
- let cloned_state = serde_json::to_string(&guard.clone()).map_err(|e| e.to_string())?;
- drop(guard);
- Ok(cloned_state)
-}
diff --git a/src-tauri/src/data.rs b/src-tauri/src/data.rs
new file mode 100644
index 0000000..2dd9ebd
--- /dev/null
+++ b/src-tauri/src/data.rs
@@ -0,0 +1,41 @@
+use std::fs;
+
+use directories::BaseDirs;
+use rustbreak::{deser::Bincode, PathDatabase};
+use serde::Deserialize;
+
+use crate::DB;
+
+#[derive(serde::Serialize, Clone, Deserialize)]
+pub struct DatabaseAuth {
+ pub private: String,
+ pub cert: String,
+ pub clientId: String,
+}
+
+#[derive(serde::Serialize, Clone, Deserialize)]
+pub struct Database {
+ pub auth: Option,
+ pub base_url: String,
+}
+
+pub type DatabaseInterface =
+ rustbreak::Database;
+
+pub fn setup() -> DatabaseInterface {
+ let db_path = BaseDirs::new().unwrap().data_dir().join("drop");
+ let default = Database {
+ auth: None,
+ base_url: "".to_string(),
+ };
+ let db = match fs::exists(db_path.clone()).unwrap() {
+ true => PathDatabase::load_from_path(db_path).expect("Database loading failed"),
+ false => PathDatabase::create_at_path(db_path, default).unwrap(),
+ };
+
+ return db;
+}
+
+pub fn is_set_up() -> bool {
+ return !DB.borrow_data().unwrap().base_url.is_empty();
+}
diff --git a/src-tauri/src/database/commands.rs b/src-tauri/src/database/commands.rs
deleted file mode 100644
index 18befb8..0000000
--- a/src-tauri/src/database/commands.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-use std::{
- fs::create_dir_all,
- io::{Error, ErrorKind},
- path::{Path, PathBuf},
-};
-
-use serde_json::Value;
-
-use crate::{
- database::{db::borrow_db_mut_checked, settings::Settings},
- download_manager::internal_error::InternalError,
-};
-
-use super::{
- db::{borrow_db_checked, save_db, DATA_ROOT_DIR},
- debug::SystemData,
-};
-
-// Will, in future, return disk/remaining size
-// Just returns the directories that have been set up
-#[tauri::command]
-pub fn fetch_download_dir_stats() -> Vec {
- let lock = borrow_db_checked();
- lock.applications.install_dirs.clone()
-}
-
-#[tauri::command]
-pub fn delete_download_dir(index: usize) {
- let mut lock = borrow_db_mut_checked();
- lock.applications.install_dirs.remove(index);
- drop(lock);
- save_db();
-}
-
-#[tauri::command]
-pub fn add_download_dir(new_dir: PathBuf) -> Result<(), InternalError<()>> {
- // Check the new directory is all good
- let new_dir_path = Path::new(&new_dir);
- if new_dir_path.exists() {
- let dir_contents = new_dir_path.read_dir()?;
- if dir_contents.count() != 0 {
- return Err(Error::new(
- ErrorKind::DirectoryNotEmpty,
- "Selected directory cannot contain any existing files",
- )
- .into());
- }
- } else {
- create_dir_all(new_dir_path)?;
- }
-
- // Add it to the dictionary
- let mut lock = borrow_db_mut_checked();
- if lock.applications.install_dirs.contains(&new_dir) {
- return Err(Error::new(
- ErrorKind::AlreadyExists,
- "Selected directory already exists in database",
- )
- .into());
- }
- lock.applications.install_dirs.push(new_dir);
- drop(lock);
- save_db();
-
- Ok(())
-}
-
-#[tauri::command]
-pub fn update_settings(new_settings: Value) {
- let mut db_lock = borrow_db_mut_checked();
- let mut current_settings = serde_json::to_value(db_lock.settings.clone()).unwrap();
- for (key, value) in new_settings.as_object().unwrap() {
- current_settings[key] = value.clone();
- }
- let new_settings: Settings = serde_json::from_value(current_settings).unwrap();
- db_lock.settings = new_settings;
- println!("new Settings: {:?}", db_lock.settings);
-}
-#[tauri::command]
-pub fn fetch_settings() -> Settings {
- borrow_db_checked().settings.clone()
-}
-#[tauri::command]
-pub fn fetch_system_data() -> SystemData {
- let db_handle = borrow_db_checked();
- SystemData::new(
- db_handle.auth.as_ref().unwrap().client_id.clone(),
- db_handle.base_url.clone(),
- DATA_ROOT_DIR.lock().unwrap().to_string_lossy().to_string(),
- std::env::var("RUST_LOG").unwrap_or_else(|_| "info".to_string()),
- )
-}
diff --git a/src-tauri/src/database/db.rs b/src-tauri/src/database/db.rs
deleted file mode 100644
index b92de3d..0000000
--- a/src-tauri/src/database/db.rs
+++ /dev/null
@@ -1,256 +0,0 @@
-use std::{
- collections::HashMap,
- fs::{self, create_dir_all},
- hash::Hash,
- path::{Path, PathBuf},
- sync::{LazyLock, Mutex, RwLockReadGuard, RwLockWriteGuard},
-};
-
-use chrono::Utc;
-use directories::BaseDirs;
-use log::{debug, error, info};
-use rustbreak::{DeSerError, DeSerializer, PathDatabase, RustbreakError};
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
-use serde_with::serde_as;
-use tauri::AppHandle;
-use url::Url;
-
-use crate::{
- database::settings::Settings,
- download_manager::downloadable_metadata::DownloadableMetadata,
- games::{library::push_game_update, state::GameStatusManager},
- process::process_manager::Platform,
- DB,
-};
-
-#[derive(serde::Serialize, Clone, Deserialize)]
-pub struct DatabaseAuth {
- pub private: String,
- pub cert: String,
- pub client_id: String,
-}
-
-// Strings are version names for a particular game
-#[derive(Serialize, Clone, Deserialize)]
-#[serde(tag = "type")]
-pub enum GameDownloadStatus {
- Remote {},
- SetupRequired {
- version_name: String,
- install_dir: String,
- },
- Installed {
- version_name: String,
- install_dir: String,
- },
-}
-
-// Stuff that shouldn't be synced to disk
-#[derive(Clone, Serialize)]
-pub enum ApplicationTransientStatus {
- Downloading { version_name: String },
- Uninstalling {},
- Updating { version_name: String },
- Running {},
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug)]
-#[serde(rename_all = "camelCase")]
-pub struct GameVersion {
- pub game_id: String,
- pub version_name: String,
-
- pub platform: Platform,
-
- pub launch_command: String,
- pub launch_args: Vec,
-
- pub setup_command: String,
- pub setup_args: Vec,
-
- pub only_setup: bool,
-
- pub version_index: usize,
- pub delta: bool,
-
- pub umu_id_override: Option,
-}
-
-#[serde_as]
-#[derive(Serialize, Clone, Deserialize, Default)]
-#[serde(rename_all = "camelCase")]
-pub struct DatabaseApplications {
- pub install_dirs: Vec,
- // Guaranteed to exist if the game also exists in the app state map
- pub game_statuses: HashMap,
- pub game_versions: HashMap>,
- pub installed_game_version: HashMap,
-
- #[serde(skip)]
- pub transient_statuses: HashMap,
-}
-
-#[derive(Serialize, Deserialize, Clone, Default)]
-pub struct Database {
- #[serde(default)]
- pub settings: Settings,
- pub auth: Option,
- pub base_url: String,
- pub applications: DatabaseApplications,
- pub prev_database: Option,
-}
-impl Database {
- fn new>(games_base_dir: T, prev_database: Option) -> Self {
- Self {
- applications: DatabaseApplications {
- install_dirs: vec![games_base_dir.into()],
- game_statuses: HashMap::new(),
- game_versions: HashMap::new(),
- installed_game_version: HashMap::new(),
- transient_statuses: HashMap::new(),
- },
- prev_database,
- base_url: "".to_owned(),
- auth: None,
- settings: Settings {
- autostart: false,
- max_download_threads: 4,
- },
- }
- }
-}
-pub static DATA_ROOT_DIR: LazyLock> =
- LazyLock::new(|| Mutex::new(BaseDirs::new().unwrap().data_dir().join("drop")));
-
-// Custom JSON serializer to support everything we need
-#[derive(Debug, Default, Clone)]
-pub struct DropDatabaseSerializer;
-
-impl DeSerializer for DropDatabaseSerializer {
- fn serialize(&self, val: &T) -> rustbreak::error::DeSerResult> {
- serde_json::to_vec(val).map_err(|e| DeSerError::Internal(e.to_string()))
- }
-
- fn deserialize(&self, s: R) -> rustbreak::error::DeSerResult {
- serde_json::from_reader(s).map_err(|e| DeSerError::Internal(e.to_string()))
- }
-}
-
-pub type DatabaseInterface =
- rustbreak::Database;
-
-pub trait DatabaseImpls {
- fn set_up_database() -> DatabaseInterface;
- fn database_is_set_up(&self) -> bool;
- fn fetch_base_url(&self) -> Url;
-}
-impl DatabaseImpls for DatabaseInterface {
- fn set_up_database() -> DatabaseInterface {
- let data_root_dir = DATA_ROOT_DIR.lock().unwrap();
- let db_path = data_root_dir.join("drop.db");
- let games_base_dir = data_root_dir.join("games");
- let logs_root_dir = data_root_dir.join("logs");
-
- debug!("creating data directory at {:?}", data_root_dir);
- create_dir_all(data_root_dir.clone()).unwrap();
- create_dir_all(games_base_dir.clone()).unwrap();
- create_dir_all(logs_root_dir.clone()).unwrap();
-
- let exists = fs::exists(db_path.clone()).unwrap();
-
- match exists {
- true => match PathDatabase::load_from_path(db_path.clone()) {
- Ok(db) => db,
- Err(e) => handle_invalid_database(e, db_path, games_base_dir),
- },
- false => {
- let default = Database::new(games_base_dir, None);
- debug!(
- "Creating database at path {}",
- db_path.as_os_str().to_str().unwrap()
- );
- PathDatabase::create_at_path(db_path, default)
- .expect("Database could not be created")
- }
- }
- }
-
- fn database_is_set_up(&self) -> bool {
- !self.borrow_data().unwrap().base_url.is_empty()
- }
-
- fn fetch_base_url(&self) -> Url {
- let handle = self.borrow_data().unwrap();
- Url::parse(&handle.base_url).unwrap()
- }
-}
-
-pub fn set_game_status, &DownloadableMetadata)>(
- app_handle: &AppHandle,
- meta: DownloadableMetadata,
- setter: F,
-) {
- let mut db_handle = borrow_db_mut_checked();
- setter(&mut db_handle, &meta);
- drop(db_handle);
- save_db();
-
- let status = GameStatusManager::fetch_state(&meta.id);
-
- push_game_update(app_handle, &meta.id, status);
-}
-// TODO: Make the error relelvant rather than just assume that it's a Deserialize error
-fn handle_invalid_database(
- _e: RustbreakError,
- db_path: PathBuf,
- games_base_dir: PathBuf,
-) -> rustbreak::Database {
- let new_path = {
- let time = Utc::now().timestamp();
- let mut base = db_path.clone();
- base.set_file_name(format!("drop.db.backup-{}", time));
- base
- };
- info!(
- "old database stored at: {}",
- new_path.to_string_lossy().to_string()
- );
- fs::rename(&db_path, &new_path).unwrap();
-
- let db = Database::new(
- games_base_dir.into_os_string().into_string().unwrap(),
- Some(new_path),
- );
-
- PathDatabase::create_at_path(db_path, db).expect("Database could not be created")
-}
-
-pub fn borrow_db_checked<'a>() -> RwLockReadGuard<'a, Database> {
- match DB.borrow_data() {
- Ok(data) => data,
- Err(e) => {
- error!("database borrow failed with error {}", e);
- panic!("database borrow failed with error {}", e);
- }
- }
-}
-
-pub fn borrow_db_mut_checked<'a>() -> RwLockWriteGuard<'a, Database> {
- match DB.borrow_data_mut() {
- Ok(data) => data,
- Err(e) => {
- error!("database borrow mut failed with error {}", e);
- panic!("database borrow mut failed with error {}", e);
- }
- }
-}
-
-pub fn save_db() {
- match DB.save() {
- Ok(_) => {}
- Err(e) => {
- error!("database failed to save with error {}", e);
- panic!("database failed to save with error {}", e)
- }
- }
-}
diff --git a/src-tauri/src/database/debug.rs b/src-tauri/src/database/debug.rs
deleted file mode 100644
index 45d2034..0000000
--- a/src-tauri/src/database/debug.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use serde::Serialize;
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SystemData {
- client_id: String,
- base_url: String,
- data_dir: String,
- log_level: String,
-}
-
-impl SystemData {
- pub fn new(client_id: String, base_url: String, data_dir: String, log_level: String) -> Self {
- Self {
- client_id,
- base_url,
- data_dir,
- log_level,
- }
- }
-}
diff --git a/src-tauri/src/database/mod.rs b/src-tauri/src/database/mod.rs
deleted file mode 100644
index 2a4255b..0000000
--- a/src-tauri/src/database/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod commands;
-pub mod db;
-pub mod debug;
-pub mod settings;
diff --git a/src-tauri/src/database/settings.rs b/src-tauri/src/database/settings.rs
deleted file mode 100644
index b8c1742..0000000
--- a/src-tauri/src/database/settings.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Clone, Debug)]
-#[serde(rename_all = "camelCase")]
-pub struct Settings {
- pub autostart: bool,
- pub max_download_threads: usize,
- // ... other settings ...
-}
-impl Default for Settings {
- fn default() -> Self {
- Self {
- autostart: false,
- max_download_threads: 4,
- }
- }
-}
-// Ideally use pointers instead of a macro to assign the settings
-// fn deserialize_into(v: serde_json::Value, t: &mut T) -> Result<(), serde_json::Error>
-// where T: for<'a> Deserialize<'a>
-// {
-// *t = serde_json::from_value(v)?;
-// Ok(())
-// }
diff --git a/src-tauri/src/download_manager/commands.rs b/src-tauri/src/download_manager/commands.rs
deleted file mode 100644
index 0a65c0d..0000000
--- a/src-tauri/src/download_manager/commands.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use std::sync::Mutex;
-
-use crate::{download_manager::downloadable_metadata::DownloadableMetadata, AppState};
-
-#[tauri::command]
-pub fn pause_downloads(state: tauri::State<'_, Mutex>) {
- state.lock().unwrap().download_manager.pause_downloads()
-}
-
-#[tauri::command]
-pub fn resume_downloads(state: tauri::State<'_, Mutex>) {
- state.lock().unwrap().download_manager.resume_downloads()
-}
-
-#[tauri::command]
-pub fn move_download_in_queue(
- state: tauri::State<'_, Mutex>,
- old_index: usize,
- new_index: usize,
-) {
- state
- .lock()
- .unwrap()
- .download_manager
- .rearrange(old_index, new_index)
-}
-
-#[tauri::command]
-pub fn cancel_game(state: tauri::State<'_, Mutex>, meta: DownloadableMetadata) {
- state.lock().unwrap().download_manager.cancel(meta)
-}
diff --git a/src-tauri/src/download_manager/download_manager.rs b/src-tauri/src/download_manager/download_manager.rs
deleted file mode 100644
index b3dee68..0000000
--- a/src-tauri/src/download_manager/download_manager.rs
+++ /dev/null
@@ -1,209 +0,0 @@
-use std::{
- any::Any,
- collections::VecDeque,
- fmt::Debug,
- sync::{
- mpsc::{SendError, Sender},
- Mutex, MutexGuard,
- },
- thread::JoinHandle,
-};
-
-use log::{debug, info};
-use serde::Serialize;
-
-use crate::error::application_download_error::ApplicationDownloadError;
-
-use super::{
- download_manager_builder::{CurrentProgressObject, DownloadAgent},
- downloadable_metadata::DownloadableMetadata,
- queue::Queue,
-};
-
-pub enum DownloadManagerSignal {
- /// Resumes (or starts) the DownloadManager
- Go,
- /// Pauses the DownloadManager
- Stop,
- /// Called when a DownloadAgent has fully completed a download.
- Completed(DownloadableMetadata),
- /// Generates and appends a DownloadAgent
- /// to the registry and queue
- Queue(DownloadAgent),
- /// Tells the Manager to stop the current
- /// download, sync everything to disk, and
- /// then exit
- Finish,
- /// Stops, removes, and tells a download to cleanup
- Cancel(DownloadableMetadata),
- /// Removes a given application
- Remove(DownloadableMetadata),
- /// Any error which occurs in the agent
- Error(ApplicationDownloadError),
- /// Pushes UI update
- UpdateUIQueue,
- UpdateUIStats(usize, usize), //kb/s and seconds
- /// Uninstall download
- /// Takes download ID
- Uninstall(DownloadableMetadata),
-}
-
-#[derive(Debug, Clone)]
-pub enum DownloadManagerStatus {
- Downloading,
- Paused,
- Empty,
- Error(ApplicationDownloadError),
- Finished,
-}
-
-impl Serialize for DownloadManagerStatus {
- fn serialize(&self, serializer: S) -> Result
- where
- S: serde::Serializer,
- {
- serializer.serialize_str(&format!["{:?}", self])
- }
-}
-
-#[derive(Serialize, Clone, Debug)]
-pub enum DownloadStatus {
- Queued,
- Downloading,
- Error,
-}
-
-/// Accessible front-end for the DownloadManager
-///
-/// The system works entirely through signals, both internally and externally,
-/// all of which are accessible through the DownloadManagerSignal type, but
-/// should not be used directly. Rather, signals are abstracted through this
-/// interface.
-///
-/// The actual download queue may be accessed through the .edit() function,
-/// which provides raw access to the underlying queue.
-/// THIS EDITING IS BLOCKING!!!
-pub struct DownloadManager {
- terminator: Mutex>>>,
- download_queue: Queue,
- progress: CurrentProgressObject,
- command_sender: Sender,
-}
-
-#[allow(dead_code)]
-impl DownloadManager {
- pub fn new(
- terminator: JoinHandle>,
- download_queue: Queue,
- progress: CurrentProgressObject,
- command_sender: Sender,
- ) -> Self {
- Self {
- terminator: Mutex::new(Some(terminator)),
- download_queue,
- progress,
- command_sender,
- }
- }
-
- pub fn queue_download(
- &self,
- download: DownloadAgent,
- ) -> Result<(), SendError> {
- info!("creating download with meta {:?}", download.metadata());
- self.command_sender
- .send(DownloadManagerSignal::Queue(download))?;
- self.command_sender.send(DownloadManagerSignal::Go)
- }
- pub fn edit(&self) -> MutexGuard<'_, VecDeque> {
- self.download_queue.edit()
- }
- pub fn read_queue(&self) -> VecDeque {
- self.download_queue.read()
- }
- pub fn get_current_download_progress(&self) -> Option {
- let progress_object = (*self.progress.lock().unwrap()).clone()?;
- Some(progress_object.get_progress())
- }
- pub fn rearrange_string(&self, meta: &DownloadableMetadata, new_index: usize) {
- let mut queue = self.edit();
- let current_index = get_index_from_id(&mut queue, meta).unwrap();
- let to_move = queue.remove(current_index).unwrap();
- queue.insert(new_index, to_move);
- self.command_sender
- .send(DownloadManagerSignal::UpdateUIQueue)
- .unwrap();
- }
- pub fn cancel(&self, meta: DownloadableMetadata) {
- self.command_sender
- .send(DownloadManagerSignal::Cancel(meta))
- .unwrap();
- }
- pub fn rearrange(&self, current_index: usize, new_index: usize) {
- if current_index == new_index {
- return;
- };
-
- let needs_pause = current_index == 0 || new_index == 0;
- if needs_pause {
- self.command_sender
- .send(DownloadManagerSignal::Stop)
- .unwrap();
- }
-
- debug!(
- "moving download at index {} to index {}",
- current_index, new_index
- );
-
- let mut queue = self.edit();
- let to_move = queue.remove(current_index).unwrap();
- queue.insert(new_index, to_move);
- drop(queue);
-
- if needs_pause {
- self.command_sender.send(DownloadManagerSignal::Go).unwrap();
- }
- self.command_sender
- .send(DownloadManagerSignal::UpdateUIQueue)
- .unwrap();
- self.command_sender
- .send(DownloadManagerSignal::Go)
- .unwrap();
-
- }
- pub fn pause_downloads(&self) {
- self.command_sender
- .send(DownloadManagerSignal::Stop)
- .unwrap();
- }
- pub fn resume_downloads(&self) {
- self.command_sender.send(DownloadManagerSignal::Go).unwrap();
- }
- pub fn ensure_terminated(&self) -> Result, Box> {
- self.command_sender
- .send(DownloadManagerSignal::Finish)
- .unwrap();
- let terminator = self.terminator.lock().unwrap().take();
- terminator.unwrap().join()
- }
- pub fn uninstall_application(&self, meta: DownloadableMetadata) {
- self.command_sender
- .send(DownloadManagerSignal::Uninstall(meta))
- .unwrap();
- }
- pub fn get_sender(&self) -> Sender {
- self.command_sender.clone()
- }
-}
-
-/// Takes in the locked value from .edit() and attempts to
-/// get the index of whatever id is passed in
-fn get_index_from_id(
- queue: &mut MutexGuard<'_, VecDeque>,
- meta: &DownloadableMetadata,
-) -> Option {
- queue
- .iter()
- .position(|download_agent| download_agent == meta)
-}
diff --git a/src-tauri/src/download_manager/download_manager_builder.rs b/src-tauri/src/download_manager/download_manager_builder.rs
deleted file mode 100644
index dd43dc2..0000000
--- a/src-tauri/src/download_manager/download_manager_builder.rs
+++ /dev/null
@@ -1,364 +0,0 @@
-use std::{
- collections::HashMap,
- sync::{
- mpsc::{channel, Receiver, Sender},
- Arc, Mutex,
- },
- thread::{spawn, JoinHandle},
-};
-
-use log::{debug, error, info, warn};
-use tauri::{AppHandle, Emitter};
-
-use crate::{
- error::application_download_error::ApplicationDownloadError,
- games::library::{QueueUpdateEvent, QueueUpdateEventQueueData, StatsUpdateEvent},
-};
-
-use super::{
- download_manager::{DownloadManager, DownloadManagerSignal, DownloadManagerStatus},
- download_thread_control_flag::{DownloadThreadControl, DownloadThreadControlFlag},
- downloadable::Downloadable,
- downloadable_metadata::DownloadableMetadata,
- progress_object::ProgressObject,
- queue::Queue,
-};
-
-pub type DownloadAgent = Arc>;
-pub type CurrentProgressObject = Arc>>>;
-
-/*
-
-Welcome to the download manager, the most overengineered, glorious piece of bullshit.
-
-The download manager takes a queue of ids and their associated
-DownloadAgents, and then, one-by-one, executes them. It provides an interface
-to interact with the currently downloading agent, and manage the queue.
-
-When the DownloadManager is initialised, it is designed to provide a reference
-which can be used to provide some instructions (the DownloadManagerInterface),
-but other than that, it runs without any sort of interruptions.
-
-It does this by opening up two data structures. Primarily is the command_receiver,
-and mpsc (multi-channel-single-producer) which allows commands to be sent from
-the Interface, and queued up for the Manager to process.
-
-These have been mapped in the DownloadManagerSignal docs.
-
-The other way to interact with the DownloadManager is via the donwload_queue,
-which is just a collection of ids which may be rearranged to suit
-whichever download queue order is required.
-
-+----------------------------------------------------------------------------+
-| DO NOT ATTEMPT TO ADD OR REMOVE FROM THE QUEUE WITHOUT USING SIGNALS!! |
-| THIS WILL CAUSE A DESYNC BETWEEN THE DOWNLOAD AGENT REGISTRY AND THE QUEUE |
-| WHICH HAS NOT BEEN ACCOUNTED FOR |
-+----------------------------------------------------------------------------+
-
-This download queue does not actually own any of the DownloadAgents. It is
-simply an id-based reference system. The actual Agents are stored in the
-download_agent_registry HashMap, as ordering is no issue here. This is why
-appending or removing from the download_queue must be done via signals.
-
-Behold, my madness - quexeky
-
-*/
-
-pub struct DownloadManagerBuilder {
- download_agent_registry: HashMap,
- download_queue: Queue,
- command_receiver: Receiver,
- sender: Sender,
- progress: CurrentProgressObject,
- status: Arc>,
- app_handle: AppHandle,
-
- current_download_agent: Option, // Should be the only download agent in the map with the "Go" flag
- current_download_thread: Mutex>>,
- active_control_flag: Option,
-}
-impl DownloadManagerBuilder {
- pub fn build(app_handle: AppHandle) -> DownloadManager {
- let queue = Queue::new();
- let (command_sender, command_receiver) = channel();
- let active_progress = Arc::new(Mutex::new(None));
- let status = Arc::new(Mutex::new(DownloadManagerStatus::Empty));
-
- let manager = Self {
- download_agent_registry: HashMap::new(),
- download_queue: queue.clone(),
- command_receiver,
- status: status.clone(),
- sender: command_sender.clone(),
- progress: active_progress.clone(),
- app_handle,
-
- current_download_agent: None,
- current_download_thread: Mutex::new(None),
- active_control_flag: None,
- };
-
- let terminator = spawn(|| manager.manage_queue());
-
- DownloadManager::new(terminator, queue, active_progress, command_sender)
- }
-
- fn set_status(&self, status: DownloadManagerStatus) {
- *self.status.lock().unwrap() = status;
- }
-
- fn remove_and_cleanup_front_download(&mut self, meta: &DownloadableMetadata) -> DownloadAgent {
- self.download_queue.pop_front();
- let download_agent = self.download_agent_registry.remove(meta).unwrap();
- self.cleanup_current_download();
- download_agent
- }
-
- // CAREFUL WITH THIS FUNCTION
- // Make sure the download thread is terminated
- fn cleanup_current_download(&mut self) {
- self.active_control_flag = None;
- *self.progress.lock().unwrap() = None;
- self.current_download_agent = None;
-
- let mut download_thread_lock = self.current_download_thread.lock().unwrap();
- *download_thread_lock = None;
- drop(download_thread_lock);
- }
-
- fn stop_and_wait_current_download(&self) {
- self.set_status(DownloadManagerStatus::Paused);
- if let Some(current_flag) = &self.active_control_flag {
- current_flag.set(DownloadThreadControlFlag::Stop);
- }
-
- let mut download_thread_lock = self.current_download_thread.lock().unwrap();
- if let Some(current_download_thread) = download_thread_lock.take() {
- current_download_thread.join().unwrap();
- }
- }
-
- fn manage_queue(mut self) -> Result<(), ()> {
- loop {
- let signal = match self.command_receiver.recv() {
- Ok(signal) => signal,
- Err(_) => return Err(()),
- };
-
- match signal {
- DownloadManagerSignal::Go => {
- self.manage_go_signal();
- }
- DownloadManagerSignal::Stop => {
- self.manage_stop_signal();
- }
- DownloadManagerSignal::Completed(meta) => {
- self.manage_completed_signal(meta);
- }
- DownloadManagerSignal::Queue(download_agent) => {
- self.manage_queue_signal(download_agent);
- }
- DownloadManagerSignal::Error(e) => {
- self.manage_error_signal(e);
- }
- DownloadManagerSignal::UpdateUIQueue => {
- self.push_ui_queue_update();
- }
- DownloadManagerSignal::UpdateUIStats(kbs, time) => {
- self.push_ui_stats_update(kbs, time);
- }
- DownloadManagerSignal::Finish => {
- self.stop_and_wait_current_download();
- return Ok(());
- }
- DownloadManagerSignal::Cancel(meta) => {
- self.manage_cancel_signal(&meta);
- }
- _ => {}
- };
- }
- }
- fn manage_queue_signal(&mut self, download_agent: DownloadAgent) {
- debug!("got signal Queue");
- let meta = download_agent.metadata();
-
- debug!("queue metadata: {:?}", meta);
-
- if self.download_queue.exists(meta.clone()) {
- warn!("download with same ID already exists");
- return;
- }
-
- download_agent.on_initialised(&self.app_handle);
- self.download_queue.append(meta.clone());
- self.download_agent_registry.insert(meta, download_agent);
-
- self.sender
- .send(DownloadManagerSignal::UpdateUIQueue)
- .unwrap();
- }
-
- fn manage_go_signal(&mut self) {
- debug!("got signal Go");
- if self.download_agent_registry.is_empty() {
- debug!(
- "Download agent registry: {:?}",
- self.download_agent_registry.len()
- );
- return;
- }
-
- if self.current_download_agent.is_some() {
- if self.download_queue.read().front().unwrap() == &self.current_download_agent.as_ref().unwrap().metadata() {
- debug!(
- "Current download agent: {:?}",
- self.current_download_agent.as_ref().unwrap().metadata()
- );
- return;
- }
- }
-
- debug!("current download queue: {:?}", self.download_queue.read());
-
- // Should always be Some if the above two statements keep going
- let agent_data = self.download_queue.read().front().unwrap().clone();
-
- info!("starting download for {:?}", agent_data);
-
- let download_agent = self
- .download_agent_registry
- .get(&agent_data)
- .unwrap()
- .clone();
-
- self.active_control_flag = Some(download_agent.control_flag());
- self.current_download_agent = Some(download_agent.clone());
-
- let sender = self.sender.clone();
-
- let mut download_thread_lock = self.current_download_thread.lock().unwrap();
- let app_handle = self.app_handle.clone();
-
- *download_thread_lock = Some(spawn(move || {
- match download_agent.download(&app_handle) {
- // Ok(true) is for completed and exited properly
- Ok(true) => {
- debug!("download {:?} has completed", download_agent.metadata());
- download_agent.on_complete(&app_handle);
- sender
- .send(DownloadManagerSignal::Completed(download_agent.metadata()))
- .unwrap();
- }
- // Ok(false) is for incomplete but exited properly
- Ok(false) => {
- download_agent.on_incomplete(&app_handle);
- }
- Err(e) => {
- error!("download {:?} has error {}", download_agent.metadata(), &e);
- download_agent.on_error(&app_handle, e.clone());
- sender.send(DownloadManagerSignal::Error(e)).unwrap();
- }
- }
- sender.send(DownloadManagerSignal::UpdateUIQueue).unwrap();
- }));
-
- self.set_status(DownloadManagerStatus::Downloading);
- let active_control_flag = self.active_control_flag.clone().unwrap();
- active_control_flag.set(DownloadThreadControlFlag::Go);
- }
- fn manage_stop_signal(&mut self) {
- debug!("got signal Stop");
-
- if let Some(active_control_flag) = self.active_control_flag.clone() {
- self.set_status(DownloadManagerStatus::Paused);
- active_control_flag.set(DownloadThreadControlFlag::Stop);
- }
- }
- fn manage_completed_signal(&mut self, meta: DownloadableMetadata) {
- debug!("got signal Completed");
- if let Some(interface) = &self.current_download_agent {
- if interface.metadata() == meta {
- self.remove_and_cleanup_front_download(&meta);
- }
- }
- self.push_ui_queue_update();
- self.sender.send(DownloadManagerSignal::Go).unwrap();
- }
- fn manage_error_signal(&mut self, error: ApplicationDownloadError) {
- debug!("got signal Error");
- if let Some(current_agent) = self.current_download_agent.clone() {
- current_agent.on_error(&self.app_handle, error.clone());
-
- self.stop_and_wait_current_download();
- self.remove_and_cleanup_front_download(¤t_agent.metadata());
- }
- self.set_status(DownloadManagerStatus::Error(error));
- }
- fn manage_cancel_signal(&mut self, meta: &DownloadableMetadata) {
- debug!("got signal Cancel");
-
- if let Some(current_download) = &self.current_download_agent {
- if ¤t_download.metadata() == meta {
- self.set_status(DownloadManagerStatus::Paused);
- current_download.on_cancelled(&self.app_handle);
- self.stop_and_wait_current_download();
-
- self.download_queue.pop_front();
-
- self.cleanup_current_download();
- debug!("current download queue: {:?}", self.download_queue.read());
- }
- // TODO: Collapse these two into a single if statement somehow
- else if let Some(download_agent) = self.download_agent_registry.get(meta) {
- let index = self.download_queue.get_by_meta(meta);
- if let Some(index) = index {
- download_agent.on_cancelled(&self.app_handle);
- let _ = self.download_queue.edit().remove(index).unwrap();
- let removed = self.download_agent_registry.remove(meta);
- debug!(
- "removed {:?} from queue {:?}",
- removed.map(|x| x.metadata()),
- self.download_queue.read()
- );
- }
- }
- } else if let Some(download_agent) = self.download_agent_registry.get(meta) {
- let index = self.download_queue.get_by_meta(meta);
- if let Some(index) = index {
- download_agent.on_cancelled(&self.app_handle);
- let _ = self.download_queue.edit().remove(index).unwrap();
- let removed = self.download_agent_registry.remove(meta);
- debug!(
- "removed {:?} from queue {:?}",
- removed.map(|x| x.metadata()),
- self.download_queue.read()
- );
- }
- }
- self.push_ui_queue_update();
- }
- fn push_ui_stats_update(&self, kbs: usize, time: usize) {
- let event_data = StatsUpdateEvent { speed: kbs, time };
-
- self.app_handle.emit("update_stats", event_data).unwrap();
- }
- fn push_ui_queue_update(&self) {
- let queue = &self.download_queue.read();
- let queue_objs = queue
- .iter()
- .map(|key| {
- let val = self.download_agent_registry.get(key).unwrap();
- QueueUpdateEventQueueData {
- meta: DownloadableMetadata::clone(key),
- status: val.status(),
- progress: val.progress().get_progress(),
- current: val.progress().sum(),
- max: val.progress().get_max(),
- }
- })
- .collect();
-
- let event_data = QueueUpdateEvent { queue: queue_objs };
- self.app_handle.emit("update_queue", event_data).unwrap();
- }
-}
diff --git a/src-tauri/src/download_manager/download_thread_control_flag.rs b/src-tauri/src/download_manager/download_thread_control_flag.rs
deleted file mode 100644
index 154fcfc..0000000
--- a/src-tauri/src/download_manager/download_thread_control_flag.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use std::sync::{
- atomic::{AtomicBool, Ordering},
- Arc,
-};
-
-#[derive(PartialEq, Eq, PartialOrd, Ord)]
-pub enum DownloadThreadControlFlag {
- Stop,
- Go,
-}
-/// Go => true
-/// Stop => false
-impl From for bool {
- fn from(value: DownloadThreadControlFlag) -> Self {
- match value {
- DownloadThreadControlFlag::Go => true,
- DownloadThreadControlFlag::Stop => false,
- }
- }
-}
-/// true => Go
-/// false => Stop
-impl From for DownloadThreadControlFlag {
- fn from(value: bool) -> Self {
- match value {
- true => DownloadThreadControlFlag::Go,
- false => DownloadThreadControlFlag::Stop,
- }
- }
-}
-
-#[derive(Clone)]
-pub struct DownloadThreadControl {
- inner: Arc,
-}
-
-impl DownloadThreadControl {
- pub fn new(flag: DownloadThreadControlFlag) -> Self {
- Self {
- inner: Arc::new(AtomicBool::new(flag.into())),
- }
- }
- pub fn get(&self) -> DownloadThreadControlFlag {
- self.inner.load(Ordering::Relaxed).into()
- }
- pub fn set(&self, flag: DownloadThreadControlFlag) {
- self.inner.store(flag.into(), Ordering::Relaxed);
- }
-}
diff --git a/src-tauri/src/download_manager/downloadable.rs b/src-tauri/src/download_manager/downloadable.rs
deleted file mode 100644
index 181b329..0000000
--- a/src-tauri/src/download_manager/downloadable.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use std::sync::Arc;
-
-use tauri::AppHandle;
-
-use crate::error::application_download_error::ApplicationDownloadError;
-
-use super::{
- download_manager::DownloadStatus, download_thread_control_flag::DownloadThreadControl,
- downloadable_metadata::DownloadableMetadata, progress_object::ProgressObject,
-};
-
-pub trait Downloadable: Send + Sync {
- fn download(&self, app_handle: &AppHandle) -> Result;
- fn progress(&self) -> Arc;
- fn control_flag(&self) -> DownloadThreadControl;
- fn status(&self) -> DownloadStatus;
- fn metadata(&self) -> DownloadableMetadata;
- fn on_initialised(&self, app_handle: &AppHandle);
- fn on_error(&self, app_handle: &AppHandle, error: ApplicationDownloadError);
- fn on_complete(&self, app_handle: &AppHandle);
- fn on_incomplete(&self, app_handle: &AppHandle);
- fn on_cancelled(&self, app_handle: &AppHandle);
-}
diff --git a/src-tauri/src/download_manager/downloadable_metadata.rs b/src-tauri/src/download_manager/downloadable_metadata.rs
deleted file mode 100644
index 790b669..0000000
--- a/src-tauri/src/download_manager/downloadable_metadata.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, Clone, Copy)]
-pub enum DownloadType {
- Game,
- Tool,
- DLC,
- Mod,
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct DownloadableMetadata {
- pub id: String,
- pub version: Option,
- pub download_type: DownloadType,
-}
-impl DownloadableMetadata {
- pub fn new(id: String, version: Option, download_type: DownloadType) -> Self {
- Self {
- id,
- version,
- download_type,
- }
- }
-}
diff --git a/src-tauri/src/download_manager/internal_error.rs b/src-tauri/src/download_manager/internal_error.rs
deleted file mode 100644
index 4864599..0000000
--- a/src-tauri/src/download_manager/internal_error.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use std::{fmt::Display, io, sync::mpsc::SendError};
-
-use serde_with::SerializeDisplay;
-
-#[derive(SerializeDisplay)]
-pub enum InternalError {
- IOError(io::Error),
- SignalError(SendError),
-}
-impl Display for InternalError {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- match self {
- InternalError::IOError(error) => write!(f, "{}", error),
- InternalError::SignalError(send_error) => write!(f, "{}", send_error),
- }
- }
-}
-impl From> for InternalError {
- fn from(value: SendError) -> Self {
- InternalError::SignalError(value)
- }
-}
-impl From for InternalError {
- fn from(value: io::Error) -> Self {
- InternalError::IOError(value)
- }
-}
diff --git a/src-tauri/src/download_manager/mod.rs b/src-tauri/src/download_manager/mod.rs
deleted file mode 100644
index 0bac198..0000000
--- a/src-tauri/src/download_manager/mod.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-pub mod commands;
-pub mod download_manager;
-pub mod download_manager_builder;
-pub mod download_thread_control_flag;
-pub mod downloadable;
-pub mod downloadable_metadata;
-pub mod internal_error;
-pub mod progress_object;
-pub mod queue;
-pub mod rolling_progress_updates;
diff --git a/src-tauri/src/download_manager/progress_object.rs b/src-tauri/src/download_manager/progress_object.rs
deleted file mode 100644
index fc0907b..0000000
--- a/src-tauri/src/download_manager/progress_object.rs
+++ /dev/null
@@ -1,155 +0,0 @@
-use std::{
- sync::{
- atomic::{AtomicUsize, Ordering},
- mpsc::Sender,
- Arc, Mutex,
- },
- time::{Duration, Instant},
-};
-
-use atomic_instant_full::AtomicInstant;
-use throttle_my_fn::throttle;
-
-use super::{
- download_manager::DownloadManagerSignal, rolling_progress_updates::RollingProgressWindow,
-};
-
-#[derive(Clone)]
-pub struct ProgressObject {
- max: Arc>,
- progress_instances: Arc>>>,
- start: Arc>,
- sender: Sender,
- //last_update: Arc>,
- last_update_time: Arc,
- bytes_last_update: Arc,
- rolling: RollingProgressWindow<250>,
-}
-
-pub struct ProgressHandle {
- progress: Arc,
- progress_object: Arc,
-}
-
-impl ProgressHandle {
- pub fn new(progress: Arc, progress_object: Arc) -> Self {
- Self {
- progress,
- progress_object,
- }
- }
- pub fn set(&self, amount: usize) {
- self.progress.store(amount, Ordering::Relaxed);
- }
- pub fn add(&self, amount: usize) {
- self.progress
- .fetch_add(amount, std::sync::atomic::Ordering::Relaxed);
- calculate_update(&self.progress_object);
- }
- pub fn skip(&self, amount: usize) {
- self.progress
- .fetch_add(amount, std::sync::atomic::Ordering::Relaxed);
- // Offset the bytes at last offset by this amount
- self.progress_object
- .bytes_last_update
- .fetch_add(amount, Ordering::Relaxed);
- // Dont' fire update
- }
-}
-
-impl ProgressObject {
- pub fn new(max: usize, length: usize, sender: Sender) -> Self {
- let arr = Mutex::new((0..length).map(|_| Arc::new(AtomicUsize::new(0))).collect());
- // TODO: consolidate this calculation with the set_max function below
- Self {
- max: Arc::new(Mutex::new(max)),
- progress_instances: Arc::new(arr),
- start: Arc::new(Mutex::new(Instant::now())),
- sender,
-
- last_update_time: Arc::new(AtomicInstant::now()),
- bytes_last_update: Arc::new(AtomicUsize::new(0)),
- rolling: RollingProgressWindow::new(),
- }
- }
-
- pub fn set_time_now(&self) {
- *self.start.lock().unwrap() = Instant::now();
- }
- pub fn sum(&self) -> usize {
- self.progress_instances
- .lock()
- .unwrap()
- .iter()
- .map(|instance| instance.load(Ordering::Relaxed))
- .sum()
- }
- pub fn get_max(&self) -> usize {
- *self.max.lock().unwrap()
- }
- pub fn set_max(&self, new_max: usize) {
- *self.max.lock().unwrap() = new_max;
- }
- pub fn set_size(&self, length: usize) {
- *self.progress_instances.lock().unwrap() =
- (0..length).map(|_| Arc::new(AtomicUsize::new(0))).collect();
- }
- pub fn get_progress(&self) -> f64 {
- self.sum() as f64 / self.get_max() as f64
- }
- pub fn get(&self, index: usize) -> Arc {
- self.progress_instances.lock().unwrap()[index].clone()
- }
- fn update_window(&self, kilobytes_per_second: usize) {
- self.rolling.update(kilobytes_per_second);
- }
-}
-
-#[throttle(1, Duration::from_millis(20))]
-pub fn calculate_update(progress: &ProgressObject) {
- let last_update_time = progress
- .last_update_time
- .swap(Instant::now(), Ordering::SeqCst);
- let time_since_last_update = Instant::now().duration_since(last_update_time).as_millis();
-
- let current_bytes_downloaded = progress.sum();
- let max = progress.get_max();
- let bytes_at_last_update = progress
- .bytes_last_update
- .swap(current_bytes_downloaded, Ordering::Relaxed);
-
- let bytes_since_last_update = current_bytes_downloaded - bytes_at_last_update;
-
- let kilobytes_per_second = bytes_since_last_update / (time_since_last_update as usize).max(1);
-
- let bytes_remaining = max - current_bytes_downloaded; // bytes
-
- progress.update_window(kilobytes_per_second);
- push_update(progress, bytes_remaining);
-}
-
-#[throttle(1, Duration::from_millis(500))]
-pub fn push_update(progress: &ProgressObject, bytes_remaining: usize) {
- let average_speed = progress.rolling.get_average();
- let time_remaining = (bytes_remaining / 1000) / average_speed.max(1);
-
- update_ui(progress, average_speed, time_remaining);
- update_queue(progress);
-}
-
-fn update_ui(progress_object: &ProgressObject, kilobytes_per_second: usize, time_remaining: usize) {
- progress_object
- .sender
- .send(DownloadManagerSignal::UpdateUIStats(
- kilobytes_per_second,
- time_remaining,
- ))
- .unwrap();
-}
-
-fn update_queue(progress: &ProgressObject) {
- progress
- .sender
- .send(DownloadManagerSignal::UpdateUIQueue)
- .unwrap();
-}
diff --git a/src-tauri/src/download_manager/queue.rs b/src-tauri/src/download_manager/queue.rs
deleted file mode 100644
index f3e9493..0000000
--- a/src-tauri/src/download_manager/queue.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use std::{
- collections::VecDeque,
- sync::{Arc, Mutex, MutexGuard},
-};
-
-use super::downloadable_metadata::DownloadableMetadata;
-
-#[derive(Clone)]
-pub struct Queue {
- inner: Arc>>,
-}
-
-#[allow(dead_code)]
-impl Default for Queue {
- fn default() -> Self {
- Self::new()
- }
-}
-
-impl Queue {
- pub fn new() -> Self {
- Self {
- inner: Arc::new(Mutex::new(VecDeque::new())),
- }
- }
- pub fn read(&self) -> VecDeque {
- self.inner.lock().unwrap().clone()
- }
- pub fn edit(&self) -> MutexGuard<'_, VecDeque> {
- self.inner.lock().unwrap()
- }
- pub fn pop_front(&self) -> Option {
- self.edit().pop_front()
- }
- pub fn is_empty(&self) -> bool {
- self.inner.lock().unwrap().len() == 0
- }
- pub fn exists(&self, meta: DownloadableMetadata) -> bool {
- self.read().contains(&meta)
- }
- /// Either inserts `interface` at the specified index, or appends to
- /// the back of the deque if index is greater than the length of the deque
- pub fn insert(&self, interface: DownloadableMetadata, index: usize) {
- if self.read().len() > index {
- self.append(interface);
- } else {
- self.edit().insert(index, interface);
- }
- }
- pub fn append(&self, interface: DownloadableMetadata) {
- self.edit().push_back(interface);
- }
- pub fn pop_front_if_equal(&self, meta: &DownloadableMetadata) -> Option {
- let mut queue = self.edit();
- let front = queue.front()?;
- if front == meta {
- return queue.pop_front();
- }
- None
- }
- pub fn get_by_meta(&self, meta: &DownloadableMetadata) -> Option {
- self.read().iter().position(|data| data == meta)
- }
- pub fn move_to_index_by_meta(
- &self,
- meta: &DownloadableMetadata,
- new_index: usize,
- ) -> Result<(), ()> {
- let index = match self.get_by_meta(meta) {
- Some(index) => index,
- None => return Err(()),
- };
- let existing = match self.edit().remove(index) {
- Some(existing) => existing,
- None => return Err(()),
- };
- self.edit().insert(new_index, existing);
- Ok(())
- }
-}
diff --git a/src-tauri/src/download_manager/rolling_progress_updates.rs b/src-tauri/src/download_manager/rolling_progress_updates.rs
deleted file mode 100644
index 2239b9a..0000000
--- a/src-tauri/src/download_manager/rolling_progress_updates.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use std::sync::{
- atomic::{AtomicUsize, Ordering},
- Arc,
-};
-
-#[derive(Clone)]
-pub struct RollingProgressWindow {
- window: Arc<[AtomicUsize; S]>,
- current: Arc,
-}
-impl RollingProgressWindow {
- pub fn new() -> Self {
- Self {
- window: Arc::new([(); S].map(|_| AtomicUsize::new(0))),
- current: Arc::new(AtomicUsize::new(0)),
- }
- }
- pub fn update(&self, kilobytes_per_second: usize) {
- let index = self.current.fetch_add(1, Ordering::SeqCst);
- let current = &self.window[index % S];
- current.store(kilobytes_per_second, Ordering::SeqCst);
- }
- pub fn get_average(&self) -> usize {
- let current = self.current.load(Ordering::SeqCst);
- self.window
- .iter()
- .enumerate()
- .filter(|(i, _)| i < ¤t)
- .map(|(_, x)| x.load(Ordering::Relaxed))
- .sum::()
- / S
- }
-}
diff --git a/src-tauri/src/error/application_download_error.rs b/src-tauri/src/error/application_download_error.rs
deleted file mode 100644
index d68bd71..0000000
--- a/src-tauri/src/error/application_download_error.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use std::{
- fmt::{Display, Formatter},
- io,
-};
-
-use serde_with::SerializeDisplay;
-
-use super::{remote_access_error::RemoteAccessError, setup_error::SetupError};
-
-// TODO: Rename / separate from downloads
-#[derive(Debug, Clone, SerializeDisplay)]
-pub enum ApplicationDownloadError {
- Communication(RemoteAccessError),
- Checksum,
- Setup(SetupError),
- Lock,
- IoError(io::ErrorKind),
- DownloadError,
-}
-
-impl Display for ApplicationDownloadError {
- fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
- match self {
- ApplicationDownloadError::Communication(error) => write!(f, "{}", error),
- ApplicationDownloadError::Setup(error) => write!(f, "an error occurred while setting up the download: {}", error),
- ApplicationDownloadError::Lock => write!(f, "failed to acquire lock. Something has gone very wrong internally. Please restart the application"),
- ApplicationDownloadError::Checksum => write!(f, "checksum failed to validate for download"),
- ApplicationDownloadError::IoError(error) => write!(f, "{}", error),
- ApplicationDownloadError::DownloadError => write!(f, "download failed. See Download Manager status for specific error"),
- }
- }
-}
diff --git a/src-tauri/src/error/drop_server_error.rs b/src-tauri/src/error/drop_server_error.rs
deleted file mode 100644
index ab42263..0000000
--- a/src-tauri/src/error/drop_server_error.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use serde::Deserialize;
-
-#[derive(Deserialize, Debug, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct DropServerError {
- pub status_code: usize,
- pub status_message: String,
- pub message: String,
- pub url: String,
-}
diff --git a/src-tauri/src/error/library_error.rs b/src-tauri/src/error/library_error.rs
deleted file mode 100644
index c13dd23..0000000
--- a/src-tauri/src/error/library_error.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use std::fmt::Display;
-
-use serde_with::SerializeDisplay;
-
-#[derive(SerializeDisplay)]
-pub enum LibraryError {
- MetaNotFound(String),
-}
-impl Display for LibraryError {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- match self {
- LibraryError::MetaNotFound(id) => write!(
- f,
- "Could not locate any installed version of game ID {} in the database",
- id
- ),
- }
- }
-}
diff --git a/src-tauri/src/error/mod.rs b/src-tauri/src/error/mod.rs
deleted file mode 100644
index 89b74ae..0000000
--- a/src-tauri/src/error/mod.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub mod application_download_error;
-pub mod drop_server_error;
-pub mod library_error;
-pub mod process_error;
-pub mod remote_access_error;
-pub mod setup_error;
diff --git a/src-tauri/src/error/process_error.rs b/src-tauri/src/error/process_error.rs
deleted file mode 100644
index 8afc9dc..0000000
--- a/src-tauri/src/error/process_error.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use std::{fmt::Display, io::Error};
-
-use serde_with::SerializeDisplay;
-
-#[derive(SerializeDisplay)]
-pub enum ProcessError {
- SetupRequired,
- NotInstalled,
- AlreadyRunning,
- NotDownloaded,
- InvalidID,
- InvalidVersion,
- IOError(Error),
- InvalidPlatform,
-}
-
-impl Display for ProcessError {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- let s = match self {
- ProcessError::SetupRequired => "Game not set up",
- ProcessError::NotInstalled => "Game not installed",
- ProcessError::AlreadyRunning => "Game already running",
- ProcessError::NotDownloaded => "Game not downloaded",
- ProcessError::InvalidID => "Invalid Game ID",
- ProcessError::InvalidVersion => "Invalid Game version",
- ProcessError::IOError(error) => &error.to_string(),
- ProcessError::InvalidPlatform => "This Game cannot be played on the current platform",
- };
- write!(f, "{}", s)
- }
-}
diff --git a/src-tauri/src/error/remote_access_error.rs b/src-tauri/src/error/remote_access_error.rs
deleted file mode 100644
index 32572b2..0000000
--- a/src-tauri/src/error/remote_access_error.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use std::{
- error::Error,
- fmt::{Display, Formatter},
- sync::Arc,
-};
-
-use http::StatusCode;
-use serde_with::SerializeDisplay;
-use url::ParseError;
-
-use super::drop_server_error::DropServerError;
-
-#[derive(Debug, Clone, SerializeDisplay)]
-pub enum RemoteAccessError {
- FetchError(Arc),
- ParsingError(ParseError),
- InvalidEndpoint,
- HandshakeFailed(String),
- GameNotFound,
- InvalidResponse(DropServerError),
- InvalidRedirect,
- ManifestDownloadFailed(StatusCode, String),
- OutOfSync,
- Generic(String),
-}
-
-impl Display for RemoteAccessError {
- fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
- match self {
- RemoteAccessError::FetchError(error) => write!(
- f,
- "{}: {}",
- error,
- error
- .source()
- .map(|e| e.to_string())
- .or_else(|| Some("Unknown error".to_string()))
- .unwrap()
- ),
- RemoteAccessError::ParsingError(parse_error) => {
- write!(f, "{}", parse_error)
- }
- RemoteAccessError::InvalidEndpoint => write!(f, "invalid drop endpoint"),
- RemoteAccessError::HandshakeFailed(message) => write!(f, "failed to complete handshake: {}", message),
- RemoteAccessError::GameNotFound => write!(f, "could not find game on server"),
- RemoteAccessError::InvalidResponse(error) => write!(f, "server returned an invalid response: {} {}", error.status_code, error.status_message),
- RemoteAccessError::InvalidRedirect => write!(f, "server redirect was invalid"),
- RemoteAccessError::ManifestDownloadFailed(status, response) => write!(
- f,
- "failed to download game manifest: {} {}",
- status, response
- ),
- RemoteAccessError::OutOfSync => write!(f, "server's and client's time are out of sync. Please ensure they are within at least 30 seconds of each other"),
- RemoteAccessError::Generic(message) => write!(f, "{}", message),
- }
- }
-}
-
-impl From for RemoteAccessError {
- fn from(err: reqwest::Error) -> Self {
- RemoteAccessError::FetchError(Arc::new(err))
- }
-}
-impl From for RemoteAccessError {
- fn from(err: ParseError) -> Self {
- RemoteAccessError::ParsingError(err)
- }
-}
-impl std::error::Error for RemoteAccessError {}
diff --git a/src-tauri/src/error/setup_error.rs b/src-tauri/src/error/setup_error.rs
deleted file mode 100644
index bd76ce5..0000000
--- a/src-tauri/src/error/setup_error.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use std::fmt::{Display, Formatter};
-
-#[derive(Debug, Clone)]
-pub enum SetupError {
- Context,
-}
-
-impl Display for SetupError {
- fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
- match self {
- SetupError::Context => write!(f, "failed to generate contexts for download"),
- }
- }
-}
diff --git a/src-tauri/src/games/commands.rs b/src-tauri/src/games/commands.rs
deleted file mode 100644
index 8f1d652..0000000
--- a/src-tauri/src/games/commands.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use std::sync::Mutex;
-
-use tauri::AppHandle;
-
-use crate::{
- database::db::GameVersion, error::{library_error::LibraryError, remote_access_error::RemoteAccessError}, games::library::{get_current_meta, uninstall_game_logic}, AppState
-};
-
-use super::{
- library::{
- fetch_game_logic, fetch_game_verion_options_logic, fetch_library_logic, FetchGameStruct,
- Game,
- },
- state::{GameStatusManager, GameStatusWithTransient},
-};
-
-#[tauri::command]
-pub fn fetch_library(app: AppHandle) -> Result, RemoteAccessError> {
- fetch_library_logic(app)
-}
-
-#[tauri::command]
-pub fn fetch_game(
- game_id: String,
- app: tauri::AppHandle,
-) -> Result {
- fetch_game_logic(game_id, app)
-}
-
-#[tauri::command]
-pub fn fetch_game_status(id: String) -> GameStatusWithTransient {
- GameStatusManager::fetch_state(&id)
-}
-
-#[tauri::command]
-pub fn uninstall_game(game_id: String, app_handle: AppHandle) -> Result<(), LibraryError> {
- let meta = match get_current_meta(&game_id) {
- Some(data) => data,
- None => return Err(LibraryError::MetaNotFound(game_id)),
- };
- println!("{:?}", meta);
- uninstall_game_logic(meta, &app_handle);
-
- Ok(())
-}
-
-#[tauri::command]
-pub fn fetch_game_verion_options(
- game_id: String,
- state: tauri::State<'_, Mutex>,
-) -> Result, RemoteAccessError> {
- fetch_game_verion_options_logic(game_id, state)
-}
diff --git a/src-tauri/src/games/downloads/commands.rs b/src-tauri/src/games/downloads/commands.rs
deleted file mode 100644
index 67b1359..0000000
--- a/src-tauri/src/games/downloads/commands.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use std::sync::{Arc, Mutex};
-
-use crate::{
- download_manager::{
- download_manager::DownloadManagerSignal, downloadable::Downloadable,
- internal_error::InternalError,
- },
- AppState,
-};
-
-use super::download_agent::GameDownloadAgent;
-
-#[tauri::command]
-pub fn download_game(
- game_id: String,
- game_version: String,
- install_dir: usize,
- state: tauri::State<'_, Mutex>,
-) -> Result<(), InternalError> {
- let sender = state.lock().unwrap().download_manager.get_sender();
- let game_download_agent = Arc::new(Box::new(GameDownloadAgent::new(
- game_id,
- game_version,
- install_dir,
- sender,
- )) as Box);
- Ok(state
- .lock()
- .unwrap()
- .download_manager
- .queue_download(game_download_agent)?)
-}
diff --git a/src-tauri/src/games/downloads/download_agent.rs b/src-tauri/src/games/downloads/download_agent.rs
deleted file mode 100644
index d4fb1cd..0000000
--- a/src-tauri/src/games/downloads/download_agent.rs
+++ /dev/null
@@ -1,407 +0,0 @@
-use crate::auth::generate_authorization_header;
-use crate::database::db::{
- borrow_db_checked, set_game_status, ApplicationTransientStatus, DatabaseImpls,
- GameDownloadStatus,
-};
-use crate::download_manager::download_manager::{DownloadManagerSignal, DownloadStatus};
-use crate::download_manager::download_thread_control_flag::{
- DownloadThreadControl, DownloadThreadControlFlag,
-};
-use crate::download_manager::downloadable::Downloadable;
-use crate::download_manager::downloadable_metadata::{DownloadType, DownloadableMetadata};
-use crate::download_manager::progress_object::{ProgressHandle, ProgressObject};
-use crate::error::application_download_error::ApplicationDownloadError;
-use crate::error::remote_access_error::RemoteAccessError;
-use crate::games::downloads::manifest::{DropDownloadContext, DropManifest};
-use crate::games::library::{on_game_complete, push_game_update, GameUpdateEvent};
-use crate::remote::requests::make_request;
-use crate::DB;
-use log::{debug, error, info};
-use rayon::ThreadPoolBuilder;
-use slice_deque::SliceDeque;
-use std::fs::{create_dir_all, File};
-use std::path::Path;
-use std::sync::mpsc::Sender;
-use std::sync::{Arc, Mutex};
-use std::time::Instant;
-use tauri::{AppHandle, Emitter};
-use urlencoding::encode;
-
-#[cfg(target_os = "linux")]
-use rustix::fs::{fallocate, FallocateFlags};
-
-use super::download_logic::download_game_chunk;
-use super::stored_manifest::StoredManifest;
-
-pub struct GameDownloadAgent {
- pub id: String,
- pub version: String,
- pub control_flag: DownloadThreadControl,
- contexts: Mutex>,
- completed_contexts: Mutex>,
- pub manifest: Mutex>,
- pub progress: Arc,
- sender: Sender,
- pub stored_manifest: StoredManifest,
- status: Mutex,
-}
-
-impl GameDownloadAgent {
- pub fn new(
- id: String,
- version: String,
- target_download_dir: usize,
- sender: Sender,
- ) -> Self {
- // Don't run by default
- let control_flag = DownloadThreadControl::new(DownloadThreadControlFlag::Stop);
-
- let db_lock = borrow_db_checked();
- let base_dir = db_lock.applications.install_dirs[target_download_dir].clone();
- drop(db_lock);
-
- let base_dir_path = Path::new(&base_dir);
- let data_base_dir_path = base_dir_path.join(id.clone());
-
- let stored_manifest =
- StoredManifest::generate(id.clone(), version.clone(), data_base_dir_path.clone());
-
- Self {
- id,
- version,
- control_flag,
- manifest: Mutex::new(None),
- contexts: Mutex::new(Vec::new()),
- completed_contexts: Mutex::new(SliceDeque::new()),
- progress: Arc::new(ProgressObject::new(0, 0, sender.clone())),
- sender,
- stored_manifest,
- status: Mutex::new(DownloadStatus::Queued),
- }
- }
-
- // Blocking
- pub fn setup_download(&self) -> Result<(), ApplicationDownloadError> {
- self.ensure_manifest_exists()?;
-
- self.ensure_contexts()?;
-
- self.control_flag.set(DownloadThreadControlFlag::Go);
-
- Ok(())
- }
-
- // Blocking
- pub fn download(&self, app_handle: &AppHandle) -> Result {
- self.setup_download()?;
- self.set_progress_object_params();
- let timer = Instant::now();
- push_game_update(
- app_handle,
- &self.metadata().id,
- (
- None,
- Some(ApplicationTransientStatus::Downloading {
- version_name: self.version.clone(),
- }),
- ),
- );
- let res = self
- .run()
- .map_err(|_| ApplicationDownloadError::DownloadError);
-
- debug!(
- "{} took {}ms to download",
- self.id,
- timer.elapsed().as_millis()
- );
- res
- }
-
- pub fn ensure_manifest_exists(&self) -> Result<(), ApplicationDownloadError> {
- if self.manifest.lock().unwrap().is_some() {
- return Ok(());
- }
-
- self.download_manifest()
- }
-
- fn download_manifest(&self) -> Result<(), ApplicationDownloadError> {
- let header = generate_authorization_header();
- let client = reqwest::blocking::Client::new();
- let response = make_request(
- &client,
- &["/api/v1/client/game/manifest"],
- &[("id", &self.id), ("version", &self.version)],
- |f| f.header("Authorization", header),
- )
- .map_err(|e| ApplicationDownloadError::Communication(e))?
- .send()
- .map_err(|e| ApplicationDownloadError::Communication(e.into()))?;
-
- if response.status() != 200 {
- return Err(ApplicationDownloadError::Communication(
- RemoteAccessError::ManifestDownloadFailed(
- response.status(),
- response.text().unwrap(),
- ),
- ));
- }
-
- let manifest_download: DropManifest = response.json().unwrap();
-
- if let Ok(mut manifest) = self.manifest.lock() {
- *manifest = Some(manifest_download);
- return Ok(());
- }
-
- Err(ApplicationDownloadError::Lock)
- }
-
- fn set_progress_object_params(&self) {
- // Avoid re-setting it
- if self.progress.get_max() != 0 {
- return;
- }
-
- let contexts = self.contexts.lock().unwrap();
-
- let length = contexts.len();
-
- let chunk_count = contexts.iter().map(|chunk| chunk.length).sum();
-
- self.progress.set_max(chunk_count);
- self.progress.set_size(length);
- self.progress.set_time_now();
- }
-
- pub fn ensure_contexts(&self) -> Result<(), ApplicationDownloadError> {
- if !self.contexts.lock().unwrap().is_empty() {
- return Ok(());
- }
-
- self.generate_contexts()?;
- Ok(())
- }
-
- pub fn generate_contexts(&self) -> Result<(), ApplicationDownloadError> {
- let manifest = self.manifest.lock().unwrap().clone().unwrap();
- let game_id = self.id.clone();
-
- let mut contexts = Vec::new();
- let base_path = Path::new(&self.stored_manifest.base_path);
- create_dir_all(base_path).unwrap();
-
- {
- let mut completed_contexts_lock = self.completed_contexts.lock().unwrap();
- completed_contexts_lock.clear();
- completed_contexts_lock
- .extend_from_slice(&self.stored_manifest.get_completed_contexts());
- }
-
- for (raw_path, chunk) in manifest {
- let path = base_path.join(Path::new(&raw_path));
-
- let container = path.parent().unwrap();
- create_dir_all(container).unwrap();
-
- let file = File::create(path.clone()).unwrap();
- let mut running_offset = 0;
-
- for (index, length) in chunk.lengths.iter().enumerate() {
- contexts.push(DropDownloadContext {
- file_name: raw_path.to_string(),
- version: chunk.version_name.to_string(),
- offset: running_offset,
- index,
- game_id: game_id.to_string(),
- path: path.clone(),
- checksum: chunk.checksums[index].clone(),
- length: *length,
- permissions: chunk.permissions,
- });
- running_offset += *length as u64;
- }
-
- #[cfg(target_os = "linux")]
- if running_offset > 0 {
- let _ = fallocate(file, FallocateFlags::empty(), 0, running_offset);
- }
- }
- *self.contexts.lock().unwrap() = contexts;
-
- Ok(())
- }
-
- // TODO: Change return value on Err
- pub fn run(&self) -> Result {
- let max_download_threads = borrow_db_checked().settings.max_download_threads;
-
- debug!(
- "downloading game: {} with {} threads",
- self.id, max_download_threads
- );
- let pool = ThreadPoolBuilder::new()
- .num_threads(max_download_threads)
- .build()
- .unwrap();
-
- let completed_indexes = Arc::new(boxcar::Vec::new());
- let completed_indexes_loop_arc = completed_indexes.clone();
-
- let contexts = self.contexts.lock().unwrap();
- pool.scope(|scope| {
- let client = &reqwest::blocking::Client::new();
- for (index, context) in contexts.iter().enumerate() {
- let client = client.clone();
- let completed_indexes = completed_indexes_loop_arc.clone();
-
- let progress = self.progress.get(index);
- let progress_handle = ProgressHandle::new(progress, self.progress.clone());
-
- // If we've done this one already, skip it
- if self.completed_contexts.lock().unwrap().contains(&index) {
- progress_handle.skip(context.length);
- continue;
- }
-
- let sender = self.sender.clone();
-
- let request = match make_request(
- &client,
- &["/api/v1/client/chunk"],
- &[
- ("id", &context.game_id),
- ("version", &context.version),
- ("name", &context.file_name),
- ("chunk", &context.index.to_string()),
- ],
- |r| r.header("Authorization", generate_authorization_header()),
- ) {
- Ok(request) => request,
- Err(e) => {
- sender.send(DownloadManagerSignal::Error(ApplicationDownloadError::Communication(e))).unwrap();
- continue;
- },
- };
-
- scope.spawn(move |_| {
- match download_game_chunk(context, &self.control_flag, progress_handle, request)
- {
- Ok(res) => {
- if res {
- completed_indexes.push(index);
- }
- }
- Err(e) => {
- error!("{}", e);
- sender.send(DownloadManagerSignal::Error(e)).unwrap();
- }
- }
- });
- }
- });
-
- let newly_completed = completed_indexes.to_owned();
-
- let completed_lock_len = {
- let mut completed_contexts_lock = self.completed_contexts.lock().unwrap();
- for (_, item) in newly_completed.iter() {
- completed_contexts_lock.push_front(*item);
- }
-
- completed_contexts_lock.len()
- };
-
- // If we're not out of contexts, we're not done, so we don't fire completed
- if completed_lock_len != contexts.len() {
- info!(
- "download agent for {} exited without completing ({}/{})",
- self.id.clone(),
- completed_lock_len,
- contexts.len(),
- );
- self.stored_manifest
- .set_completed_contexts(self.completed_contexts.lock().unwrap().as_slice());
- self.stored_manifest.write();
- return Ok(false);
- }
-
- // We've completed
- self.sender
- .send(DownloadManagerSignal::Completed(self.metadata()))
- .unwrap();
-
- Ok(true)
- }
-}
-
-impl Downloadable for GameDownloadAgent {
- fn download(&self, app_handle: &AppHandle) -> Result {
- *self.status.lock().unwrap() = DownloadStatus::Downloading;
- self.download(app_handle)
- }
-
- fn progress(&self) -> Arc {
- self.progress.clone()
- }
-
- fn control_flag(&self) -> DownloadThreadControl {
- self.control_flag.clone()
- }
-
- fn metadata(&self) -> DownloadableMetadata {
- DownloadableMetadata {
- id: self.id.clone(),
- version: Some(self.version.clone()),
- download_type: DownloadType::Game,
- }
- }
-
- fn on_initialised(&self, _app_handle: &tauri::AppHandle) {
- *self.status.lock().unwrap() = DownloadStatus::Queued;
- }
-
- fn on_error(&self, app_handle: &tauri::AppHandle, error: ApplicationDownloadError) {
- *self.status.lock().unwrap() = DownloadStatus::Error;
- app_handle
- .emit("download_error", error.to_string())
- .unwrap();
-
- error!("error while managing download: {}", error);
-
- set_game_status(app_handle, self.metadata(), |db_handle, meta| {
- db_handle.applications.transient_statuses.remove(meta);
- });
- }
-
- fn on_complete(&self, app_handle: &tauri::AppHandle) {
- on_game_complete(
- &self.metadata(),
- self.stored_manifest.base_path.to_string_lossy().to_string(),
- app_handle,
- )
- .unwrap();
- }
-
- // TODO: fix this function. It doesn't restart the download properly, nor does it reset the state properly
- fn on_incomplete(&self, app_handle: &tauri::AppHandle) {
- let meta = self.metadata();
- *self.status.lock().unwrap() = DownloadStatus::Queued;
- app_handle
- .emit(
- &format!("update_game/{}", meta.id),
- GameUpdateEvent {
- game_id: meta.id.clone(),
- status: (Some(GameDownloadStatus::Remote {}), None),
- },
- )
- .unwrap();
- }
-
- fn on_cancelled(&self, _app_handle: &tauri::AppHandle) {}
-
- fn status(&self) -> DownloadStatus {
- self.status.lock().unwrap().clone()
- }
-}
diff --git a/src-tauri/src/games/downloads/download_logic.rs b/src-tauri/src/games/downloads/download_logic.rs
deleted file mode 100644
index 70e5b7e..0000000
--- a/src-tauri/src/games/downloads/download_logic.rs
+++ /dev/null
@@ -1,189 +0,0 @@
-use crate::download_manager::download_thread_control_flag::{
- DownloadThreadControl, DownloadThreadControlFlag,
-};
-use crate::download_manager::progress_object::ProgressHandle;
-use crate::error::application_download_error::ApplicationDownloadError;
-use crate::error::remote_access_error::RemoteAccessError;
-use crate::games::downloads::manifest::DropDownloadContext;
-use log::warn;
-use md5::{Context, Digest};
-use reqwest::blocking::{RequestBuilder, Response};
-
-use std::fs::{set_permissions, Permissions};
-use std::io::{ErrorKind, Read};
-#[cfg(unix)]
-use std::os::unix::fs::PermissionsExt;
-use std::{
- fs::{File, OpenOptions},
- io::{self, BufWriter, Seek, SeekFrom, Write},
- path::PathBuf,
-};
-
-pub struct DropWriter {
- hasher: Context,
- destination: W,
-}
-impl DropWriter {
- fn new(path: PathBuf) -> Self {
- Self {
- destination: OpenOptions::new().write(true).open(path).unwrap(),
- hasher: Context::new(),
- }
- }
-
- fn finish(mut self) -> io::Result {
- self.flush().unwrap();
- Ok(self.hasher.compute())
- }
-}
-// Write automatically pushes to file and hasher
-impl Write for DropWriter {
- fn write(&mut self, buf: &[u8]) -> io::Result {
- self.hasher.write_all(buf).map_err(|e| {
- io::Error::new(
- ErrorKind::Other,
- format!("Unable to write to hasher: {}", e),
- )
- })?;
- self.destination.write(buf)
- }
-
- fn flush(&mut self) -> io::Result<()> {
- self.hasher.flush()?;
- self.destination.flush()
- }
-}
-// Seek moves around destination output
-impl Seek for DropWriter {
- fn seek(&mut self, pos: SeekFrom) -> io::Result {
- self.destination.seek(pos)
- }
-}
-
-pub struct DropDownloadPipeline<'a, R: Read, W: Write> {
- pub source: R,
- pub destination: DropWriter,
- pub control_flag: &'a DownloadThreadControl,
- pub progress: ProgressHandle,
- pub size: usize,
-}
-impl<'a> DropDownloadPipeline<'a, Response, File> {
- fn new(
- source: Response,
- destination: DropWriter,
- control_flag: &'a DownloadThreadControl,
- progress: ProgressHandle,
- size: usize,
- ) -> Self {
- Self {
- source,
- destination,
- control_flag,
- progress,
- size,
- }
- }
-
- fn copy(&mut self) -> Result {
- let copy_buf_size = 512;
- let mut copy_buf = vec![0; copy_buf_size];
- let mut buf_writer = BufWriter::with_capacity(1024 * 1024, &mut self.destination);
-
- let mut current_size = 0;
- loop {
- if self.control_flag.get() == DownloadThreadControlFlag::Stop {
- return Ok(false);
- }
-
- let bytes_read = self.source.read(&mut copy_buf)?;
- current_size += bytes_read;
-
- buf_writer.write_all(©_buf[0..bytes_read])?;
- self.progress.add(bytes_read);
-
- if current_size == self.size {
- break;
- }
- }
-
- Ok(true)
- }
-
- fn finish(self) -> Result {
- let checksum = self.destination.finish()?;
- Ok(checksum)
- }
-}
-
-pub fn download_game_chunk(
- ctx: &DropDownloadContext,
- control_flag: &DownloadThreadControl,
- progress: ProgressHandle,
- request: RequestBuilder,
-) -> Result {
- // If we're paused
- if control_flag.get() == DownloadThreadControlFlag::Stop {
- progress.set(0);
- return Ok(false);
- }
-
- let response = request
- .send()
- .map_err(|e| ApplicationDownloadError::Communication(e.into()))?;
-
- if response.status() != 200 {
- let err = response.json().unwrap();
- return Err(ApplicationDownloadError::Communication(
- RemoteAccessError::InvalidResponse(err),
- ));
- }
-
- let mut destination = DropWriter::new(ctx.path.clone());
-
- if ctx.offset != 0 {
- destination
- .seek(SeekFrom::Start(ctx.offset))
- .expect("Failed to seek to file offset");
- }
-
- let content_length = response.content_length();
- if content_length.is_none() {
- warn!("recieved 0 length content from server");
- return Err(ApplicationDownloadError::Communication(
- RemoteAccessError::InvalidResponse(response.json().unwrap()),
- ));
- }
-
- let mut pipeline = DropDownloadPipeline::new(
- response,
- destination,
- control_flag,
- progress,
- content_length.unwrap().try_into().unwrap(),
- );
-
- let completed = pipeline
- .copy()
- .map_err(|e| ApplicationDownloadError::IoError(e.kind()))?;
- if !completed {
- return Ok(false);
- };
-
- // If we complete the file, set the permissions (if on Linux)
- #[cfg(unix)]
- {
- let permissions = Permissions::from_mode(ctx.permissions);
- set_permissions(ctx.path.clone(), permissions).unwrap();
- }
-
- let checksum = pipeline
- .finish()
- .map_err(|e| ApplicationDownloadError::IoError(e.kind()))?;
-
- let res = hex::encode(checksum.0);
- if res != ctx.checksum {
- return Err(ApplicationDownloadError::Checksum);
- }
-
- Ok(true)
-}
diff --git a/src-tauri/src/games/downloads/manifest.rs b/src-tauri/src/games/downloads/manifest.rs
deleted file mode 100644
index 7c5b3a9..0000000
--- a/src-tauri/src/games/downloads/manifest.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::path::PathBuf;
-
-pub type DropManifest = HashMap;
-#[derive(Serialize, Deserialize, Debug, Clone, Ord, PartialOrd, Eq, PartialEq)]
-#[serde(rename_all = "camelCase")]
-pub struct DropChunk {
- pub permissions: u32,
- pub ids: Vec,
- pub checksums: Vec,
- pub lengths: Vec,
- pub version_name: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct DropDownloadContext {
- pub file_name: String,
- pub version: String,
- pub index: usize,
- pub offset: u64,
- pub game_id: String,
- pub path: PathBuf,
- pub checksum: String,
- pub length: usize,
- pub permissions: u32,
-}
diff --git a/src-tauri/src/games/downloads/mod.rs b/src-tauri/src/games/downloads/mod.rs
deleted file mode 100644
index c9b3cd4..0000000
--- a/src-tauri/src/games/downloads/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod commands;
-pub mod download_agent;
-mod download_logic;
-mod manifest;
-mod stored_manifest;
diff --git a/src-tauri/src/games/downloads/stored_manifest.rs b/src-tauri/src/games/downloads/stored_manifest.rs
deleted file mode 100644
index fdc232b..0000000
--- a/src-tauri/src/games/downloads/stored_manifest.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use std::{
- fs::File,
- io::{Read, Write},
- path::PathBuf,
- sync::Mutex,
-};
-
-use log::{error, warn};
-use serde::{Deserialize, Serialize};
-use serde_binary::binary_stream::Endian;
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct StoredManifest {
- game_id: String,
- game_version: String,
- pub completed_contexts: Mutex>,
- pub base_path: PathBuf,
-}
-
-static DROP_DATA_PATH: &str = ".dropdata";
-
-impl StoredManifest {
- pub fn new(game_id: String, game_version: String, base_path: PathBuf) -> Self {
- Self {
- base_path,
- game_id,
- game_version,
- completed_contexts: Mutex::new(Vec::new()),
- }
- }
- pub fn generate(game_id: String, game_version: String, base_path: PathBuf) -> Self {
- let mut file = match File::open(base_path.join(DROP_DATA_PATH)) {
- Ok(file) => file,
- Err(_) => return StoredManifest::new(game_id, game_version, base_path),
- };
-
- let mut s = Vec::new();
- match file.read_to_end(&mut s) {
- Ok(_) => {}
- Err(e) => {
- error!("{}", e);
- return StoredManifest::new(game_id, game_version, base_path);
- }
- };
-
- match serde_binary::from_vec::(s, Endian::Little) {
- Ok(manifest) => manifest,
- Err(e) => {
- warn!("{}", e);
- StoredManifest::new(game_id, game_version, base_path)
- }
- }
- }
- pub fn write(&self) {
- let manifest_raw = match serde_binary::to_vec(&self, Endian::Little) {
- Ok(json) => json,
- Err(_) => return,
- };
-
- let mut file = match File::create(self.base_path.join(DROP_DATA_PATH)) {
- Ok(file) => file,
- Err(e) => {
- error!("{}", e);
- return;
- }
- };
-
- match file.write_all(&manifest_raw) {
- Ok(_) => {}
- Err(e) => error!("{}", e),
- };
- }
- pub fn set_completed_contexts(&self, completed_contexts: &[usize]) {
- *self.completed_contexts.lock().unwrap() = completed_contexts.to_owned();
- }
- pub fn get_completed_contexts(&self) -> Vec {
- self.completed_contexts.lock().unwrap().clone()
- }
-}
diff --git a/src-tauri/src/games/library.rs b/src-tauri/src/games/library.rs
deleted file mode 100644
index b2f2fe2..0000000
--- a/src-tauri/src/games/library.rs
+++ /dev/null
@@ -1,353 +0,0 @@
-use std::fs::remove_dir_all;
-use std::sync::Mutex;
-use std::thread::spawn;
-
-use log::{debug, error, warn};
-use serde::{Deserialize, Serialize};
-use tauri::Emitter;
-use tauri::{AppHandle, Manager};
-
-use crate::database::db::{borrow_db_checked, borrow_db_mut_checked, save_db, GameVersion};
-use crate::database::db::{ApplicationTransientStatus, GameDownloadStatus};
-use crate::download_manager::download_manager::DownloadStatus;
-use crate::download_manager::downloadable_metadata::DownloadableMetadata;
-use crate::error::remote_access_error::RemoteAccessError;
-use crate::games::state::{GameStatusManager, GameStatusWithTransient};
-use crate::remote::auth::generate_authorization_header;
-use crate::remote::requests::make_request;
-use crate::AppState;
-
-#[derive(serde::Serialize)]
-pub struct FetchGameStruct {
- game: Game,
- status: GameStatusWithTransient,
-}
-
-#[derive(Serialize, Deserialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct Game {
- id: String,
- m_name: String,
- m_short_description: String,
- m_description: String,
- // mDevelopers
- // mPublishers
- m_icon_id: String,
- m_banner_id: String,
- m_cover_id: String,
- m_image_library: Vec,
-}
-#[derive(serde::Serialize, Clone)]
-pub struct GameUpdateEvent {
- pub game_id: String,
- pub status: (
- Option,
- Option,
- ),
-}
-
-#[derive(Serialize, Clone)]
-pub struct QueueUpdateEventQueueData {
- pub meta: DownloadableMetadata,
- pub status: DownloadStatus,
- pub progress: f64,
- pub current: usize,
- pub max: usize,
-}
-
-#[derive(serde::Serialize, Clone)]
-pub struct QueueUpdateEvent {
- pub queue: Vec,
-}
-
-#[derive(serde::Serialize, Clone)]
-pub struct StatsUpdateEvent {
- pub speed: usize,
- pub time: usize,
-}
-
-pub fn fetch_library_logic(app: AppHandle) -> Result, RemoteAccessError> {
- let header = generate_authorization_header();
-
- let client = reqwest::blocking::Client::new();
- let response = make_request(&client, &["/api/v1/client/user/library"], &[], |f| {
- f.header("Authorization", header)
- })?
- .send()?;
-
- if response.status() != 200 {
- let err = response.json().unwrap();
- warn!("{:?}", err);
- return Err(RemoteAccessError::InvalidResponse(err));
- }
-
- let games: Vec = response.json()?;
-
- let state = app.state::>();
- let mut handle = state.lock().unwrap();
-
- let mut db_handle = borrow_db_mut_checked();
-
- for game in games.iter() {
- handle.games.insert(game.id.clone(), game.clone());
- if !db_handle.applications.game_statuses.contains_key(&game.id) {
- db_handle
- .applications
- .game_statuses
- .insert(game.id.clone(), GameDownloadStatus::Remote {});
- }
- }
-
- drop(handle);
-
- Ok(games)
-}
-
-pub fn fetch_game_logic(
- id: String,
- app: tauri::AppHandle,
-) -> Result {
- let state = app.state::>();
- let mut state_handle = state.lock().unwrap();
-
- let game = state_handle.games.get(&id);
- if let Some(game) = game {
- let status = GameStatusManager::fetch_state(&id);
-
- let data = FetchGameStruct {
- game: game.clone(),
- status,
- };
-
- return Ok(data);
- }
- let client = reqwest::blocking::Client::new();
- let response = make_request(&client, &["/api/v1/game/", &id], &[], |r| {
- r.header("Authorization", generate_authorization_header())
- })?
- .send()?;
-
- if response.status() == 404 {
- return Err(RemoteAccessError::GameNotFound);
- }
- if response.status() != 200 {
- let err = response.json().unwrap();
- warn!("{:?}", err);
- return Err(RemoteAccessError::InvalidResponse(err));
- }
-
- let game: Game = response.json()?;
- state_handle.games.insert(id.clone(), game.clone());
-
- let mut db_handle = borrow_db_mut_checked();
-
- db_handle
- .applications
- .game_statuses
- .entry(id.clone())
- .or_insert(GameDownloadStatus::Remote {});
- drop(db_handle);
-
- let status = GameStatusManager::fetch_state(&id);
-
- let data = FetchGameStruct {
- game: game.clone(),
- status,
- };
-
- Ok(data)
-}
-
-pub fn fetch_game_verion_options_logic(
- game_id: String,
- state: tauri::State<'_, Mutex>,
-) -> Result, RemoteAccessError> {
- let client = reqwest::blocking::Client::new();
-
- let response = make_request(
- &client,
- &["/api/v1/client/game/versions"],
- &[("id", &game_id)],
- |r| r.header("Authorization", generate_authorization_header()),
- )?
- .send()?;
-
- if response.status() != 200 {
- let err = response.json().unwrap();
- warn!("{:?}", err);
- return Err(RemoteAccessError::InvalidResponse(err));
- }
-
- let data: Vec = response.json()?;
-
- let state_lock = state.lock().unwrap();
- let process_manager_lock = state_lock.process_manager.lock().unwrap();
- let data: Vec = data
- .into_iter()
- .filter(|v| process_manager_lock.valid_platform(&v.platform).unwrap())
- .collect();
- drop(process_manager_lock);
- drop(state_lock);
-
- Ok(data)
-}
-
-pub fn uninstall_game_logic(meta: DownloadableMetadata, app_handle: &AppHandle) {
- println!("triggered uninstall for agent");
- let mut db_handle = borrow_db_mut_checked();
- db_handle
- .applications
- .transient_statuses
- .entry(meta.clone())
- .and_modify(|v| *v = ApplicationTransientStatus::Uninstalling {});
-
- push_game_update(
- app_handle,
- &meta.id,
- (None, Some(ApplicationTransientStatus::Uninstalling {})),
- );
-
- let previous_state = db_handle.applications.game_statuses.get(&meta.id).cloned();
- if previous_state.is_none() {
- warn!("uninstall job doesn't have previous state, failing silently");
- return;
- }
- let previous_state = previous_state.unwrap();
- if let Some((_, install_dir)) = match previous_state {
- GameDownloadStatus::Installed {
- version_name,
- install_dir,
- } => Some((version_name, install_dir)),
- GameDownloadStatus::SetupRequired {
- version_name,
- install_dir,
- } => Some((version_name, install_dir)),
- _ => None,
- } {
- db_handle
- .applications
- .transient_statuses
- .entry(meta.clone())
- .and_modify(|v| *v = ApplicationTransientStatus::Uninstalling {});
- drop(db_handle);
-
- let app_handle = app_handle.clone();
- spawn(move || match remove_dir_all(install_dir) {
- Err(e) => {
- error!("{}", e);
- }
- Ok(_) => {
- let mut db_handle = borrow_db_mut_checked();
- db_handle.applications.transient_statuses.remove(&meta);
- db_handle
- .applications
- .game_statuses
- .entry(meta.id.clone())
- .and_modify(|e| *e = GameDownloadStatus::Remote {});
- drop(db_handle);
- save_db();
-
- debug!("uninstalled game id {}", &meta.id);
-
- push_game_update(
- &app_handle,
- &meta.id,
- (Some(GameDownloadStatus::Remote {}), None),
- );
- }
- });
- }
-}
-
-pub fn get_current_meta(game_id: &String) -> Option {
- borrow_db_checked()
- .applications
- .installed_game_version
- .get(game_id)
- .cloned()
-}
-
-pub fn on_game_complete(
- meta: &DownloadableMetadata,
- install_dir: String,
- app_handle: &AppHandle,
-) -> Result<(), RemoteAccessError> {
- // Fetch game version information from remote
- if meta.version.is_none() {
- return Err(RemoteAccessError::GameNotFound);
- }
-
- let header = generate_authorization_header();
-
- let client = reqwest::blocking::Client::new();
- let response = make_request(
- &client,
- &["/api/v1/client/metadata/version"],
- &[
- ("id", &meta.id),
- ("version", meta.version.as_ref().unwrap()),
- ],
- |f| f.header("Authorization", header),
- )?
- .send()?;
-
- let data: GameVersion = response.json()?;
-
- let mut handle = borrow_db_mut_checked();
- handle
- .applications
- .game_versions
- .entry(meta.id.clone())
- .or_default()
- .insert(meta.version.clone().unwrap(), data.clone());
- handle
- .applications
- .installed_game_version
- .insert(meta.id.clone(), meta.clone());
-
- drop(handle);
- save_db();
-
- let status = if data.setup_command.is_empty() {
- GameDownloadStatus::Installed {
- version_name: meta.version.clone().unwrap(),
- install_dir,
- }
- } else {
- GameDownloadStatus::SetupRequired {
- version_name: meta.version.clone().unwrap(),
- install_dir,
- }
- };
-
- let mut db_handle = borrow_db_mut_checked();
- db_handle
- .applications
- .game_statuses
- .insert(meta.id.clone(), status.clone());
- drop(db_handle);
- save_db();
- app_handle
- .emit(
- &format!("update_game/{}", meta.id),
- GameUpdateEvent {
- game_id: meta.id.clone(),
- status: (Some(status), None),
- },
- )
- .unwrap();
-
- Ok(())
-}
-
-pub fn push_game_update(app_handle: &AppHandle, game_id: &String, status: GameStatusWithTransient) {
- app_handle
- .emit(
- &format!("update_game/{}", game_id),
- GameUpdateEvent {
- game_id: game_id.clone(),
- status,
- },
- )
- .unwrap();
-}
diff --git a/src-tauri/src/games/mod.rs b/src-tauri/src/games/mod.rs
deleted file mode 100644
index 65c5c6b..0000000
--- a/src-tauri/src/games/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod commands;
-pub mod downloads;
-pub mod library;
-pub mod state;
diff --git a/src-tauri/src/games/state.rs b/src-tauri/src/games/state.rs
deleted file mode 100644
index 19b1769..0000000
--- a/src-tauri/src/games/state.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use crate::database::db::{borrow_db_checked, ApplicationTransientStatus, GameDownloadStatus};
-
-pub type GameStatusWithTransient = (
- Option,
- Option,
-);
-pub struct GameStatusManager {}
-
-impl GameStatusManager {
- pub fn fetch_state(game_id: &String) -> GameStatusWithTransient {
- let db_lock = borrow_db_checked();
- let online_state = match db_lock.applications.installed_game_version.get(game_id) {
- Some(meta) => db_lock.applications.transient_statuses.get(meta).cloned(),
- None => None,
- };
- let offline_state = db_lock.applications.game_statuses.get(game_id).cloned();
- drop(db_lock);
-
- if online_state.is_some() {
- return (None, online_state);
- }
-
- if offline_state.is_some() {
- return (offline_state, None);
- }
-
- (None, None)
- }
-}
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 1e374eb..fadfc0c 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -1,405 +1,112 @@
-mod database;
-mod games;
-
-mod autostart;
-mod cleanup;
-mod commands;
-mod download_manager;
-mod error;
-mod process;
+mod auth;
+mod data;
mod remote;
+mod unpacker;
-use crate::database::db::DatabaseImpls;
-use autostart::{get_autostart_enabled, toggle_autostart};
-use cleanup::{cleanup_and_exit, quit};
-use commands::fetch_state;
-use database::commands::{
- add_download_dir, delete_download_dir, fetch_download_dir_stats, fetch_settings,
- fetch_system_data, update_settings,
-};
-use database::db::{
- borrow_db_checked, borrow_db_mut_checked, DatabaseInterface, GameDownloadStatus, DATA_ROOT_DIR,
-};
-use download_manager::commands::{
- cancel_game, move_download_in_queue, pause_downloads, resume_downloads,
-};
-use download_manager::download_manager::DownloadManager;
-use download_manager::download_manager_builder::DownloadManagerBuilder;
-use games::commands::{
- fetch_game, fetch_game_status, fetch_game_verion_options, fetch_library, uninstall_game,
-};
-use games::downloads::commands::download_game;
-use games::library::Game;
-use http::Response;
-use http::{header::*, response::Builder as ResponseBuilder};
-use log::{debug, info, warn, LevelFilter};
-use log4rs::append::console::ConsoleAppender;
-use log4rs::append::file::FileAppender;
-use log4rs::config::{Appender, Root};
-use log4rs::encode::pattern::PatternEncoder;
-use log4rs::Config;
-use process::commands::{kill_game, launch_game};
-use process::process_manager::ProcessManager;
-use remote::auth::{self, generate_authorization_header, recieve_handshake};
-use remote::commands::{
- auth_initiate, gen_drop_url, manual_recieve_handshake, retry_connect, sign_out, use_remote,
-};
-use remote::requests::make_request;
-use serde::{Deserialize, Serialize};
-use std::env;
-use std::path::Path;
-use std::str::FromStr;
-use std::sync::Arc;
use std::{
- collections::HashMap,
+ io,
sync::{LazyLock, Mutex},
+ task, thread,
};
-use tauri::menu::{Menu, MenuItem, PredefinedMenuItem};
-use tauri::tray::TrayIconBuilder;
-use tauri::{AppHandle, Manager, RunEvent, WindowEvent};
+
+use auth::{auth_initiate, recieve_handshake};
+use data::DatabaseInterface;
+use log::info;
+use remote::use_remote;
+use serde::{Deserialize, Serialize};
+use structured_logger::{json::new_writer, Builder};
use tauri_plugin_deep_link::DeepLinkExt;
-use tauri_plugin_dialog::DialogExt;
#[derive(Clone, Copy, Serialize)]
pub enum AppStatus {
NotConfigured,
- ServerError,
SignedOut,
SignedIn,
SignedInNeedsReauth,
- ServerUnavailable,
}
+#[derive(Clone, Copy, Serialize, Deserialize)]
+pub struct User {}
-#[derive(Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct User {
- id: String,
- username: String,
- admin: bool,
- display_name: String,
- profile_picture: String,
-}
-
-#[derive(Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct AppState<'a> {
+#[derive(Clone, Copy, Serialize)]
+pub struct AppState {
status: AppStatus,
user: Option,
- games: HashMap,
-
- #[serde(skip_serializing)]
- download_manager: Arc,
- #[serde(skip_serializing)]
- process_manager: Arc>>,
}
-fn setup(handle: AppHandle) -> AppState<'static> {
- let logfile = FileAppender::builder()
- .encoder(Box::new(PatternEncoder::new(
- "{d} | {l} | {f}:{L} - {m}{n}",
- )))
- .append(false)
- .build(DATA_ROOT_DIR.lock().unwrap().join("./drop.log"))
- .unwrap();
+#[tauri::command]
+fn fetch_state<'a>(state: tauri::State<'_, Mutex>) -> Result {
+ let guard = state.lock().unwrap();
+ let cloned_state = guard.clone();
+ drop(guard);
+ Ok(cloned_state)
+}
- let console = ConsoleAppender::builder()
- .encoder(Box::new(PatternEncoder::new(
- "{d} | {l} | {f}:{L} - {m}{n}",
- )))
- .build();
+fn setup<'a>() -> AppState {
+ Builder::with_level("info")
+ .with_target_writer("*", new_writer(io::stdout()))
+ .init();
- let log_level = env::var("RUST_LOG").unwrap_or(String::from("Info"));
-
- let config = Config::builder()
- .appenders(vec![
- Appender::builder().build("logfile", Box::new(logfile)),
- Appender::builder().build("console", Box::new(console)),
- ])
- .build(
- Root::builder()
- .appenders(vec!["logfile", "console"])
- .build(LevelFilter::from_str(&log_level).expect("Invalid log level")),
- )
- .unwrap();
-
- log4rs::init_config(config).unwrap();
-
- let games = HashMap::new();
- let download_manager = Arc::new(DownloadManagerBuilder::build(handle.clone()));
- let process_manager = Arc::new(Mutex::new(ProcessManager::new(handle.clone())));
-
- debug!("checking if database is set up");
- let is_set_up = DB.database_is_set_up();
+ let is_set_up = data::is_set_up();
if !is_set_up {
return AppState {
status: AppStatus::NotConfigured,
user: None,
- games,
- download_manager,
- process_manager,
};
}
- debug!("database is set up");
-
- // TODO: Account for possible failure
- let (app_status, user) = auth::setup();
-
- let db_handle = borrow_db_checked();
- let mut missing_games = Vec::new();
- let statuses = db_handle.applications.game_statuses.clone();
- drop(db_handle);
- for (game_id, status) in statuses.into_iter() {
- match status {
- database::db::GameDownloadStatus::Remote {} => {}
- database::db::GameDownloadStatus::SetupRequired {
- version_name: _,
- install_dir,
- } => {
- let install_dir_path = Path::new(&install_dir);
- if !install_dir_path.exists() {
- missing_games.push(game_id);
- }
- }
- database::db::GameDownloadStatus::Installed {
- version_name: _,
- install_dir,
- } => {
- let install_dir_path = Path::new(&install_dir);
- if !install_dir_path.exists() {
- missing_games.push(game_id);
- }
- }
- }
- }
-
- info!("detected games missing: {:?}", missing_games);
-
- let mut db_handle = borrow_db_mut_checked();
- for game_id in missing_games {
- db_handle
- .applications
- .game_statuses
- .entry(game_id)
- .and_modify(|v| *v = GameDownloadStatus::Remote {});
- }
-
- drop(db_handle);
-
- debug!("finished setup!");
-
- // Sync autostart state
- if let Err(e) = autostart::sync_autostart_on_startup(&handle) {
- warn!("failed to sync autostart state: {}", e);
- }
-
- AppState {
- status: app_status,
- user,
- games,
- download_manager,
- process_manager,
- }
+ let auth_result = auth::setup().unwrap();
+ return AppState {
+ status: auth_result.0,
+ user: auth_result.1,
+ };
}
-pub static DB: LazyLock = LazyLock::new(DatabaseInterface::set_up_database);
+pub static DB: LazyLock = LazyLock::new(|| data::setup());
#[cfg_attr(mobile, tauri::mobile_entry_point)]
pub fn run() {
- let mut builder = tauri::Builder::default()
- .plugin(tauri_plugin_os::init())
- .plugin(tauri_plugin_dialog::init());
+ let state = setup();
+ info!("Initialized drop client");
+
+ let mut builder = tauri::Builder::default();
#[cfg(desktop)]
- #[allow(unused_variables)]
{
builder = builder.plugin(tauri_plugin_single_instance::init(|_app, argv, _cwd| {
// when defining deep link schemes at runtime, you must also check `argv` here
}));
}
- let app = builder
+ builder
.plugin(tauri_plugin_deep_link::init())
+ .manage(Mutex::new(state))
.invoke_handler(tauri::generate_handler![
- // Core utils
fetch_state,
- quit,
- fetch_system_data,
- // User utils
- update_settings,
- fetch_settings,
- // Auth
auth_initiate,
- retry_connect,
- manual_recieve_handshake,
- sign_out,
- // Remote
- use_remote,
- gen_drop_url,
- // Library
- fetch_library,
- fetch_game,
- add_download_dir,
- delete_download_dir,
- fetch_download_dir_stats,
- fetch_game_status,
- fetch_game_verion_options,
- // Downloads
- download_game,
- move_download_in_queue,
- pause_downloads,
- resume_downloads,
- cancel_game,
- uninstall_game,
- // Processes
- launch_game,
- kill_game,
- toggle_autostart,
- get_autostart_enabled,
+ use_remote
])
.plugin(tauri_plugin_shell::init())
- .plugin(tauri_plugin_dialog::init())
- .plugin(tauri_plugin_autostart::init(
- tauri_plugin_autostart::MacosLauncher::LaunchAgent,
- Some(vec!["--minimize"]),
- ))
.setup(|app| {
- let handle = app.handle().clone();
- let state = setup(handle);
- debug!("initialized drop client");
- app.manage(Mutex::new(state));
-
#[cfg(any(target_os = "linux", all(debug_assertions, windows)))]
{
use tauri_plugin_deep_link::DeepLinkExt;
app.deep_link().register_all()?;
- debug!("registered all pre-defined deep links");
+ info!("registered all pre-defined deep links");
}
let handle = app.handle().clone();
- let _main_window = tauri::WebviewWindowBuilder::new(
- &handle,
- "main", // BTW this is not the name of the window, just the label. Keep this 'main', there are permissions & configs that depend on it
- tauri::WebviewUrl::App("index.html".into()),
- )
- .title("Drop Desktop App")
- .min_inner_size(1000.0, 500.0)
- .inner_size(1536.0, 864.0)
- .decorations(false)
- .shadow(false)
- .data_directory(DATA_ROOT_DIR.lock().unwrap().join(".webview"))
- .build()
- .unwrap();
-
app.deep_link().on_open_url(move |event| {
- debug!("handling drop:// url");
+ info!("handling drop:// url");
let binding = event.urls();
- let url = binding.first().unwrap();
- if url.host_str().unwrap() == "handshake" {
- recieve_handshake(handle.clone(), url.path().to_string())
+ let url = binding.get(0).unwrap();
+ match url.host_str().unwrap() {
+ "handshake" => recieve_handshake(handle.clone(), url.path().to_string()),
+ _ => (),
}
});
-
- let menu = Menu::with_items(
- app,
- &[
- &MenuItem::with_id(app, "open", "Open", true, None::<&str>)?,
- &PredefinedMenuItem::separator(app)?,
- /*
- &MenuItem::with_id(app, "show_library", "Library", true, None::<&str>)?,
- &MenuItem::with_id(app, "show_settings", "Settings", true, None::<&str>)?,
- &PredefinedMenuItem::separator(app)?,
- */
- &MenuItem::with_id(app, "quit", "Quit", true, None::<&str>)?,
- ],
- )?;
-
- TrayIconBuilder::new()
- .icon(app.default_window_icon().unwrap().clone())
- .menu(&menu)
- .on_menu_event(|app, event| match event.id.as_ref() {
- "open" => {
- app.webview_windows().get("main").unwrap().show().unwrap();
- }
- "quit" => {
- cleanup_and_exit(app, &app.state());
- }
-
- _ => {
- println!("menu event not handled: {:?}", event.id);
- }
- })
- .build(app)
- .expect("error while setting up tray menu");
-
- {
- let mut db_handle = borrow_db_mut_checked();
- if let Some(original) = db_handle.prev_database.take() {
- warn!(
- "Database corrupted. Original file at {}",
- original
- .canonicalize()
- .unwrap()
- .to_string_lossy()
- .to_string()
- );
- app.dialog()
- .message(
- "Database corrupted. A copy has been saved at: ".to_string()
- + original.to_str().unwrap(),
- )
- .title("Database corrupted")
- .show(|_| {});
- }
- }
-
Ok(())
})
- .register_asynchronous_uri_scheme_protocol("object", move |_ctx, request, responder| {
- // Drop leading /
- let object_id = &request.uri().path()[1..];
-
- let header = generate_authorization_header();
- let client: reqwest::blocking::Client = reqwest::blocking::Client::new();
- let response = make_request(&client, &["/api/v1/client/object/", object_id], &[], |f| {
- f.header("Authorization", header)
- })
- .unwrap()
- .send();
- if response.is_err() {
- warn!(
- "failed to fetch object with error: {}",
- response.err().unwrap()
- );
- responder.respond(Response::builder().status(500).body(Vec::new()).unwrap());
- return;
- }
- let response = response.unwrap();
-
- let resp_builder = ResponseBuilder::new().header(
- CONTENT_TYPE,
- response.headers().get("Content-Type").unwrap(),
- );
- let data = Vec::from(response.bytes().unwrap());
- let resp = resp_builder.body(data).unwrap();
-
- responder.respond(resp);
- })
- .on_window_event(|window, event| {
- if let WindowEvent::CloseRequested { api, .. } = event {
- window.hide().unwrap();
- api.prevent_close();
- }
- })
- .build(tauri::generate_context!())
+ .run(tauri::generate_context!())
.expect("error while running tauri application");
-
- app.run(|_app_handle, event| {
- if let RunEvent::ExitRequested { code, api, .. } = event {
- if code.is_none() {
- api.prevent_exit();
- }
- }
- });
}
diff --git a/src-tauri/src/process/commands.rs b/src-tauri/src/process/commands.rs
deleted file mode 100644
index 8a213a4..0000000
--- a/src-tauri/src/process/commands.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use std::sync::Mutex;
-
-use crate::{error::process_error::ProcessError, AppState};
-
-#[tauri::command]
-pub fn launch_game(
- id: String,
- state: tauri::State<'_, Mutex>,
-) -> Result<(), ProcessError> {
- let state_lock = state.lock().unwrap();
- let mut process_manager_lock = state_lock.process_manager.lock().unwrap();
-
- //let meta = DownloadableMetadata {
- // id,
- // version: Some(version),
- // download_type: DownloadType::Game,
- //};
-
- match process_manager_lock.launch_process(id) {
- Ok(_) => {}
- Err(e) => return Err(e),
- };
-
- drop(process_manager_lock);
- drop(state_lock);
-
- Ok(())
-}
-
-#[tauri::command]
-pub fn kill_game(
- game_id: String,
- state: tauri::State<'_, Mutex>,
-) -> Result<(), ProcessError> {
- let state_lock = state.lock().unwrap();
- let mut process_manager_lock = state_lock.process_manager.lock().unwrap();
- process_manager_lock
- .kill_game(game_id)
- .map_err(ProcessError::IOError)
-}
diff --git a/src-tauri/src/process/compat.rs b/src-tauri/src/process/compat.rs
deleted file mode 100644
index 2b4f307..0000000
--- a/src-tauri/src/process/compat.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Since this code isn't being used, we can either:
-// 1. Delete the entire file if compatibility features are not planned
-// 2. Or add a TODO comment if planning to implement later
-
-// Option 1: Delete the file
-// Delete src-tauri/src/process/compat.rs
-
-// Option 2: Add TODO comment
-/*
-TODO: Compatibility layer for running Windows games on Linux
-This module is currently unused but reserved for future implementation
-of Windows game compatibility features on Linux.
-*/
diff --git a/src-tauri/src/process/mod.rs b/src-tauri/src/process/mod.rs
deleted file mode 100644
index 6a1aed5..0000000
--- a/src-tauri/src/process/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod commands;
-pub mod compat;
-pub mod process_manager;
diff --git a/src-tauri/src/process/process_manager.rs b/src-tauri/src/process/process_manager.rs
deleted file mode 100644
index 4d8ae12..0000000
--- a/src-tauri/src/process/process_manager.rs
+++ /dev/null
@@ -1,387 +0,0 @@
-use std::{
- collections::HashMap,
- fs::{File, OpenOptions},
- io::{self, Error},
- path::{Path, PathBuf},
- process::{Child, Command, ExitStatus},
- sync::{Arc, Mutex},
- thread::spawn,
-};
-
-use log::{debug, info, warn};
-use serde::{Deserialize, Serialize};
-use shared_child::SharedChild;
-use tauri::{AppHandle, Manager};
-use umu_wrapper_lib::command_builder::UmuCommandBuilder;
-
-use crate::{
- database::db::{
- borrow_db_mut_checked, ApplicationTransientStatus, GameDownloadStatus, GameVersion, DATA_ROOT_DIR
- },
- download_manager::downloadable_metadata::{DownloadType, DownloadableMetadata},
- error::process_error::ProcessError,
- games::{library::push_game_update, state::GameStatusManager},
- AppState, DB,
-};
-
-pub struct ProcessManager<'a> {
- current_platform: Platform,
- log_output_dir: PathBuf,
- processes: HashMap>,
- app_handle: AppHandle,
- game_launchers: HashMap<(Platform, Platform), &'a (dyn ProcessHandler + Sync + Send + 'static)>,
-}
-
-impl ProcessManager<'_> {
- pub fn new(app_handle: AppHandle) -> Self {
- let root_dir_lock = DATA_ROOT_DIR.lock().unwrap();
- let log_output_dir = root_dir_lock.join("logs");
- drop(root_dir_lock);
-
- ProcessManager {
- current_platform: if cfg!(windows) {
- Platform::Windows
- } else {
- Platform::Linux
- },
-
- app_handle,
- processes: HashMap::new(),
- log_output_dir,
- game_launchers: HashMap::from([
- // Current platform to target platform
- (
- (Platform::Windows, Platform::Windows),
- &NativeGameLauncher {} as &(dyn ProcessHandler + Sync + Send + 'static),
- ),
- (
- (Platform::Linux, Platform::Linux),
- &NativeGameLauncher {} as &(dyn ProcessHandler + Sync + Send + 'static),
- ),
- (
- (Platform::Linux, Platform::Windows),
- &UMULauncher {} as &(dyn ProcessHandler + Sync + Send + 'static),
- ),
- ]),
- }
- }
-
- fn process_command(&self, install_dir: &String, command: Vec) -> (PathBuf, Vec) {
- let root = &command[0];
-
- let install_dir = Path::new(install_dir);
- let absolute_exe = install_dir.join(root);
-
- /*
- let args = command_components[1..]
- .iter()
- .map(|v| v.to_string())
- .collect();
- */
- (absolute_exe, Vec::new())
- }
- pub fn kill_game(&mut self, game_id: String) -> Result<(), io::Error> {
- match self.processes.get(&game_id) {
- Some(child) => {
- child.kill()?;
- child.wait()?;
- Ok(())
- }
- None => Err(io::Error::new(
- io::ErrorKind::NotFound,
- "Game ID not running",
- )),
- }
- }
-
- fn on_process_finish(&mut self, game_id: String, result: Result) {
- if !self.processes.contains_key(&game_id) {
- warn!("process on_finish was called, but game_id is no longer valid. finished with result: {:?}", result);
- return;
- }
-
- debug!("process for {:?} exited with {:?}", &game_id, result);
-
- self.processes.remove(&game_id);
-
- let mut db_handle = borrow_db_mut_checked();
- let meta = db_handle
- .applications
- .installed_game_version
- .get(&game_id)
- .cloned()
- .unwrap();
- db_handle.applications.transient_statuses.remove(&meta);
-
- let current_state = db_handle.applications.game_statuses.get(&game_id).cloned();
- if let Some(saved_state) = current_state {
- if let GameDownloadStatus::SetupRequired {
- version_name,
- install_dir,
- } = saved_state
- {
- if let Ok(exit_code) = result {
- if exit_code.success() {
- db_handle.applications.game_statuses.insert(
- game_id.clone(),
- GameDownloadStatus::Installed {
- version_name: version_name.to_string(),
- install_dir: install_dir.to_string(),
- },
- );
- }
- }
- }
- }
- drop(db_handle);
-
- let status = GameStatusManager::fetch_state(&game_id);
-
- push_game_update(&self.app_handle, &game_id, status);
-
- // TODO better management
- }
-
- pub fn valid_platform(&self, platform: &Platform) -> Result {
- let current = &self.current_platform;
- Ok(self
- .game_launchers
- .contains_key(&(current.clone(), platform.clone())))
- }
-
- pub fn launch_process(&mut self, game_id: String) -> Result<(), ProcessError> {
- if self.processes.contains_key(&game_id) {
- return Err(ProcessError::AlreadyRunning);
- }
-
- let version = match DB
- .borrow_data()
- .unwrap()
- .applications
- .game_statuses
- .get(&game_id)
- .cloned()
- {
- Some(GameDownloadStatus::Installed { version_name, .. }) => version_name,
- Some(GameDownloadStatus::SetupRequired { .. }) => {
- return Err(ProcessError::SetupRequired)
- }
- _ => return Err(ProcessError::NotInstalled),
- };
- let meta = DownloadableMetadata {
- id: game_id.clone(),
- version: Some(version.clone()),
- download_type: DownloadType::Game,
- };
-
- let mut db_lock = borrow_db_mut_checked();
- debug!(
- "Launching process {:?} with games {:?}",
- &game_id, db_lock.applications.game_versions
- );
-
- let game_status = db_lock
- .applications
- .game_statuses
- .get(&game_id)
- .ok_or(ProcessError::NotInstalled)?;
-
- let (version_name, install_dir) = match game_status {
- GameDownloadStatus::Installed {
- version_name,
- install_dir,
- } => (version_name, install_dir),
- GameDownloadStatus::SetupRequired {
- version_name,
- install_dir,
- } => (version_name, install_dir),
- _ => return Err(ProcessError::NotDownloaded),
- };
-
-
- let game_version = db_lock
- .applications
- .game_versions
- .get(&game_id)
- .ok_or(ProcessError::InvalidID)?
- .get(version_name)
- .ok_or(ProcessError::InvalidVersion)?;
-
- let mut command: Vec = Vec::new();
-
- match game_status {
- GameDownloadStatus::Installed {
- version_name: _,
- install_dir: _,
- } => {
- command.extend([game_version.launch_command.clone()]);
- command.extend(game_version.launch_args.clone());
- },
- GameDownloadStatus::SetupRequired {
- version_name: _,
- install_dir: _,
- } => {
- command.extend([game_version.setup_command.clone()]);
- command.extend(game_version.setup_args.clone());
- },
- _ => panic!("unreachable code"),
- };
- info!("Command: {:?}", &command);
-
- let (command, args) = self.process_command(install_dir, command);
-
- let target_current_dir = command.parent().unwrap().to_str().unwrap();
-
- info!(
- "launching process {} in {}",
- command.to_str().unwrap(),
- target_current_dir
- );
-
- let current_time = chrono::offset::Local::now();
- let log_file = OpenOptions::new()
- .write(true)
- .truncate(true)
- .read(true)
- .create(true)
- .open(self.log_output_dir.join(format!(
- "{}-{}-{}.log",
- &game_id,
- &version,
- current_time.timestamp()
- )))
- .map_err(ProcessError::IOError)?;
-
- let error_file = OpenOptions::new()
- .write(true)
- .truncate(true)
- .read(true)
- .create(true)
- .open(self.log_output_dir.join(format!(
- "{}-{}-{}-error.log",
- &game_id,
- &version,
- current_time.timestamp()
- )))
- .map_err(ProcessError::IOError)?;
-
- let current_platform = self.current_platform.clone();
- let target_platform = game_version.platform.clone();
-
- let game_launcher = self
- .game_launchers
- .get(&(current_platform, target_platform))
- .ok_or(ProcessError::InvalidPlatform)?;
-
- let launch_process = game_launcher
- .launch_process(
- &meta,
- command.to_string_lossy().to_string(),
- game_version,
- target_current_dir,
- log_file,
- error_file,
- )
- .map_err(ProcessError::IOError)?;
-
- let launch_process_handle =
- Arc::new(SharedChild::new(launch_process).map_err(ProcessError::IOError)?);
-
- db_lock
- .applications
- .transient_statuses
- .insert(meta.clone(), ApplicationTransientStatus::Running {});
-
- push_game_update(
- &self.app_handle,
- &meta.id,
- (None, Some(ApplicationTransientStatus::Running {})),
- );
-
- let wait_thread_handle = launch_process_handle.clone();
- let wait_thread_apphandle = self.app_handle.clone();
- let wait_thread_game_id = meta.clone();
-
- spawn(move || {
- let result: Result = launch_process_handle.wait();
-
- let app_state = wait_thread_apphandle.state::>();
- let app_state_handle = app_state.lock().unwrap();
-
- let mut process_manager_handle = app_state_handle.process_manager.lock().unwrap();
- process_manager_handle.on_process_finish(wait_thread_game_id.id, result);
-
- // As everything goes out of scope, they should get dropped
- // But just to explicit about it
- drop(process_manager_handle);
- drop(app_state_handle);
- });
-
- self.processes.insert(meta.id, wait_thread_handle);
- Ok(())
- }
-}
-
-#[derive(Eq, Hash, PartialEq, Serialize, Deserialize, Clone, Debug)]
-pub enum Platform {
- Windows,
- Linux,
-}
-
-pub trait ProcessHandler: Send + 'static {
- fn launch_process(
- &self,
- meta: &DownloadableMetadata,
- launch_command: String,
- game_version: &GameVersion,
- current_dir: &str,
- log_file: File,
- error_file: File,
- ) -> Result;
-}
-
-struct NativeGameLauncher;
-impl ProcessHandler for NativeGameLauncher {
- fn launch_process(
- &self,
- _meta: &DownloadableMetadata,
- launch_command: String,
- game_version: &GameVersion,
- current_dir: &str,
- log_file: File,
- error_file: File,
- ) -> Result {
- Command::new(PathBuf::from(launch_command))
- .current_dir(current_dir)
- .stdout(log_file)
- .stderr(error_file)
- .args(game_version.launch_args.clone())
- .spawn()
- }
-}
-
-const UMU_LAUNCHER_EXECUTABLE: &str = "umu-run";
-struct UMULauncher;
-impl ProcessHandler for UMULauncher {
- fn launch_process(
- &self,
- _meta: &DownloadableMetadata,
- launch_command: String,
- game_version: &GameVersion,
- _current_dir: &str,
- _log_file: File,
- _error_file: File,
- ) -> Result {
- println!("Game override: .{:?}.", &game_version.umu_id_override);
- let game_id = match &game_version.umu_id_override {
- Some(game_override) => game_override.is_empty().then_some(game_version.game_id.clone()).unwrap_or(game_override.clone()) ,
- None => game_version.game_id.clone()
- };
- info!("Game ID: {}", game_id);
- UmuCommandBuilder::new(UMU_LAUNCHER_EXECUTABLE, launch_command)
- .game_id(game_id)
- .launch_args(game_version.launch_args.clone())
- .build()
- .spawn()
- }
-}
diff --git a/src-tauri/src/remote.rs b/src-tauri/src/remote.rs
new file mode 100644
index 0000000..d02770b
--- /dev/null
+++ b/src-tauri/src/remote.rs
@@ -0,0 +1,61 @@
+use std::{
+ borrow::{Borrow, BorrowMut},
+ sync::Mutex,
+};
+
+use log::{info, warn};
+use serde::Deserialize;
+use url::Url;
+
+use crate::{AppState, AppStatus, DB};
+
+macro_rules! unwrap_or_return {
+ ( $e:expr ) => {
+ match $e {
+ Ok(x) => x,
+ Err(e) => {
+ return Err(format!(
+ "Invalid URL or Drop is inaccessible ({})",
+ e.to_string()
+ ))
+ }
+ }
+ };
+}
+
+#[derive(Deserialize)]
+struct DropHealthcheck {
+ appName: String,
+}
+
+#[tauri::command]
+pub async fn use_remote<'a>(
+ url: String,
+ state: tauri::State<'_, Mutex>,
+) -> Result<(), String> {
+ info!("connecting to url {}", url);
+ let base_url = unwrap_or_return!(Url::parse(&url));
+
+ // Test Drop url
+ let test_endpoint = base_url.join("/api/v1").unwrap();
+ let response = unwrap_or_return!(reqwest::get(test_endpoint.to_string()).await);
+
+ let result = response.json::().await.unwrap();
+
+ if result.appName != "Drop" {
+ warn!("user entered drop endpoint that connected, but wasn't identified as Drop");
+ return Err("Not a valid Drop endpoint".to_string());
+ }
+
+ let mut app_state = state.lock().unwrap();
+ app_state.status = AppStatus::SignedOut;
+ drop(app_state);
+
+ let mut db_state = DB.borrow_data_mut().unwrap();
+ db_state.base_url = base_url.to_string();
+ drop(db_state);
+
+ DB.save().unwrap();
+
+ return Ok(());
+}
diff --git a/src-tauri/src/remote/auth.rs b/src-tauri/src/remote/auth.rs
deleted file mode 100644
index d2594de..0000000
--- a/src-tauri/src/remote/auth.rs
+++ /dev/null
@@ -1,201 +0,0 @@
-use std::{env, sync::Mutex};
-
-use chrono::Utc;
-use log::{debug, error, warn};
-use openssl::{ec::EcKey, hash::MessageDigest, pkey::PKey, sign::Signer};
-use serde::{Deserialize, Serialize};
-use tauri::{AppHandle, Emitter, Manager};
-use url::Url;
-
-use crate::{
- database::db::{
- borrow_db_checked, borrow_db_mut_checked, save_db, DatabaseAuth, DatabaseImpls,
- },
- error::{drop_server_error::DropServerError, remote_access_error::RemoteAccessError},
- AppState, AppStatus, User, DB,
-};
-
-use super::requests::make_request;
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-struct InitiateRequestBody {
- name: String,
- platform: String,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-struct HandshakeRequestBody {
- client_id: String,
- token: String,
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct HandshakeResponse {
- private: String,
- certificate: String,
- id: String,
-}
-
-// TODO: Change return value on Err
-pub fn sign_nonce(private_key: String, nonce: String) -> Result {
- let client_private_key = EcKey::private_key_from_pem(private_key.as_bytes()).unwrap();
- let pkey_private_key = PKey::from_ec_key(client_private_key).unwrap();
-
- let mut signer = Signer::new(MessageDigest::sha256(), &pkey_private_key).unwrap();
- signer.update(nonce.as_bytes()).unwrap();
- let signature = signer.sign_to_vec().unwrap();
-
- let hex_signature = hex::encode(signature);
-
- Ok(hex_signature)
-}
-
-pub fn generate_authorization_header() -> String {
- let certs = {
- let db = borrow_db_checked();
- db.auth.clone().unwrap()
- };
-
- let nonce = Utc::now().timestamp_millis().to_string();
-
- let signature = sign_nonce(certs.private, nonce.clone()).unwrap();
-
- format!("Nonce {} {} {}", certs.client_id, nonce, signature)
-}
-
-pub fn fetch_user() -> Result {
- let base_url = DB.fetch_base_url();
-
- let header = generate_authorization_header();
-
- let client = reqwest::blocking::Client::new();
- let response = make_request(&client, &["/api/v1/client/user"], &[], |f| {
- f.header("Authorization", header)
- })?
- .send()?;
- if response.status() != 200 {
- let err: DropServerError = response.json()?;
- warn!("{:?}", err);
-
- if err.status_message == "Nonce expired" {
- return Err(RemoteAccessError::OutOfSync);
- }
-
- return Err(RemoteAccessError::InvalidResponse(err));
- }
-
- response.json::().map_err(|e| e.into())
-}
-
-fn recieve_handshake_logic(app: &AppHandle, path: String) -> Result<(), RemoteAccessError> {
- let path_chunks: Vec<&str> = path.split("/").collect();
- if path_chunks.len() != 3 {
- app.emit("auth/failed", ()).unwrap();
- return Err(RemoteAccessError::HandshakeFailed(
- "failed to parse token".to_string(),
- ));
- }
-
- let base_url = {
- let handle = borrow_db_checked();
- Url::parse(handle.base_url.as_str())?
- };
-
- let client_id = path_chunks.get(1).unwrap();
- let token = path_chunks.get(2).unwrap();
- let body = HandshakeRequestBody {
- client_id: client_id.to_string(),
- token: token.to_string(),
- };
-
- let endpoint = base_url.join("/api/v1/client/auth/handshake")?;
- let client = reqwest::blocking::Client::new();
- let response = client.post(endpoint).json(&body).send()?;
- debug!("handshake responsded with {}", response.status().as_u16());
- let response_struct: HandshakeResponse = response.json()?;
-
- {
- let mut handle = borrow_db_mut_checked();
- handle.auth = Some(DatabaseAuth {
- private: response_struct.private,
- cert: response_struct.certificate,
- client_id: response_struct.id,
- });
- drop(handle);
- save_db();
- }
-
- {
- let app_state = app.state::>();
- let mut app_state_handle = app_state.lock().unwrap();
- app_state_handle.status = AppStatus::SignedIn;
- app_state_handle.user = Some(fetch_user()?);
- }
-
- Ok(())
-}
-
-pub fn recieve_handshake(app: AppHandle, path: String) {
- // Tell the app we're processing
- app.emit("auth/processing", ()).unwrap();
-
- let handshake_result = recieve_handshake_logic(&app, path);
- if let Err(e) = handshake_result {
- warn!("error with authentication: {}", e);
- app.emit("auth/failed", e.to_string()).unwrap();
- return;
- }
-
- app.emit("auth/finished", ()).unwrap();
-}
-
-pub fn auth_initiate_logic() -> Result<(), RemoteAccessError> {
- let base_url = {
- let db_lock = borrow_db_checked();
- Url::parse(&db_lock.base_url.clone())?
- };
-
- let endpoint = base_url.join("/api/v1/client/auth/initiate")?;
- let body = InitiateRequestBody {
- name: "Drop Desktop Client".to_string(),
- platform: env::consts::OS.to_string(),
- };
-
- let client = reqwest::blocking::Client::new();
- let response = client.post(endpoint.to_string()).json(&body).send()?;
-
- if response.status() != 200 {
- let data: DropServerError = response.json()?;
- error!("could not start handshake: {}", data.status_message);
-
- return Err(RemoteAccessError::HandshakeFailed(data.status_message));
- }
-
- let redir_url = response.text()?;
- let complete_redir_url = base_url.join(&redir_url)?;
-
- debug!("opening web browser to continue authentication");
- webbrowser::open(complete_redir_url.as_ref()).unwrap();
-
- Ok(())
-}
-
-pub fn setup() -> (AppStatus, Option) {
- let data = borrow_db_checked();
- let auth = data.auth.clone();
- drop(data);
-
- if auth.is_some() {
- let user_result = match fetch_user() {
- Ok(data) => data,
- Err(RemoteAccessError::FetchError(_)) => return (AppStatus::ServerUnavailable, None),
- Err(_) => return (AppStatus::SignedInNeedsReauth, None),
- };
- return (AppStatus::SignedIn, Some(user_result));
- }
-
- (AppStatus::SignedOut, None)
-}
diff --git a/src-tauri/src/remote/commands.rs b/src-tauri/src/remote/commands.rs
deleted file mode 100644
index 82781c8..0000000
--- a/src-tauri/src/remote/commands.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use std::sync::Mutex;
-
-use tauri::{AppHandle, Emitter, Manager};
-use url::Url;
-
-use crate::{
- database::db::{borrow_db_checked, borrow_db_mut_checked, save_db},
- error::remote_access_error::RemoteAccessError,
- AppState, AppStatus,
-};
-
-use super::{
- auth::{auth_initiate_logic, recieve_handshake, setup},
- remote::use_remote_logic,
-};
-
-#[tauri::command]
-pub fn use_remote(
- url: String,
- state: tauri::State<'_, Mutex>>,
-) -> Result<(), RemoteAccessError> {
- use_remote_logic(url, state)
-}
-
-#[tauri::command]
-pub fn gen_drop_url(path: String) -> Result {
- let base_url = {
- let handle = borrow_db_checked();
-
- Url::parse(&handle.base_url).map_err(RemoteAccessError::ParsingError)?
- };
-
- let url = base_url.join(&path).unwrap();
-
- Ok(url.to_string())
-}
-
-#[tauri::command]
-pub fn sign_out(app: AppHandle) {
- // Clear auth from database
- {
- let mut handle = borrow_db_mut_checked();
- handle.auth = None;
- drop(handle);
- save_db();
- }
-
- // Update app state
- {
- let app_state = app.state::>();
- let mut app_state_handle = app_state.lock().unwrap();
- app_state_handle.status = AppStatus::SignedOut;
- app_state_handle.user = None;
- }
-
- // Emit event for frontend
- app.emit("auth/signedout", ()).unwrap();
-}
-
-#[tauri::command]
-pub fn retry_connect(state: tauri::State<'_, Mutex>) {
- let (app_status, user) = setup();
-
- let mut guard = state.lock().unwrap();
- guard.status = app_status;
- guard.user = user;
- drop(guard);
-}
-
-#[tauri::command]
-pub fn auth_initiate() -> Result<(), RemoteAccessError> {
- auth_initiate_logic()
-}
-
-#[tauri::command]
-pub fn manual_recieve_handshake(app: AppHandle, token: String) {
- recieve_handshake(app, format!("handshake/{}", token));
-}
diff --git a/src-tauri/src/remote/mod.rs b/src-tauri/src/remote/mod.rs
deleted file mode 100644
index a2eb666..0000000
--- a/src-tauri/src/remote/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod auth;
-pub mod commands;
-pub mod remote;
-pub mod requests;
diff --git a/src-tauri/src/remote/remote.rs b/src-tauri/src/remote/remote.rs
deleted file mode 100644
index 01f2c2b..0000000
--- a/src-tauri/src/remote/remote.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use std::sync::Mutex;
-
-use log::{debug, warn};
-use serde::Deserialize;
-use url::Url;
-
-use crate::{
- database::db::{borrow_db_mut_checked, save_db},
- error::remote_access_error::RemoteAccessError,
- AppState, AppStatus,
-};
-
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct DropHealthcheck {
- app_name: String,
-}
-
-pub fn use_remote_logic(
- url: String,
- state: tauri::State<'_, Mutex>>,
-) -> Result<(), RemoteAccessError> {
- debug!("connecting to url {}", url);
- let base_url = Url::parse(&url)?;
-
- // Test Drop url
- let test_endpoint = base_url.join("/api/v1")?;
- let response = reqwest::blocking::get(test_endpoint.to_string())?;
-
- let result: DropHealthcheck = response.json()?;
-
- if result.app_name != "Drop" {
- warn!("user entered drop endpoint that connected, but wasn't identified as Drop");
- return Err(RemoteAccessError::InvalidEndpoint);
- }
-
- let mut app_state = state.lock().unwrap();
- app_state.status = AppStatus::SignedOut;
- drop(app_state);
-
- let mut db_state = borrow_db_mut_checked();
- db_state.base_url = base_url.to_string();
- drop(db_state);
-
- save_db();
-
- Ok(())
-}
diff --git a/src-tauri/src/remote/requests.rs b/src-tauri/src/remote/requests.rs
deleted file mode 100644
index 44cdc83..0000000
--- a/src-tauri/src/remote/requests.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use reqwest::blocking::{Client, RequestBuilder};
-
-use crate::{database::db::DatabaseImpls, error::remote_access_error::RemoteAccessError, DB};
-
-pub fn make_request, F: FnOnce(RequestBuilder) -> RequestBuilder>(
- client: &Client,
- path_components: &[T],
- query: &[(T, T)],
- f: F,
-) -> Result {
- let mut base_url = DB.fetch_base_url();
- for endpoint in path_components {
- base_url = base_url.join(endpoint.as_ref())?;
- }
- {
- let mut queries = base_url.query_pairs_mut();
- for (param, val) in query {
- queries.append_pair(param.as_ref(), val.as_ref());
- }
- }
- let response = client.get(base_url);
- Ok(f(response))
-}
diff --git a/src-tauri/src/unpacker.rs b/src-tauri/src/unpacker.rs
new file mode 100644
index 0000000..58676e1
--- /dev/null
+++ b/src-tauri/src/unpacker.rs
@@ -0,0 +1,68 @@
+use ciborium::from_reader;
+use rayon::iter::{IntoParallelIterator, ParallelIterator};
+use serde::Deserialize;
+use std::{
+ collections::HashMap,
+ fs::{create_dir_all, File},
+ io::{self, BufReader, Error, Seek, Write},
+ path::Path,
+};
+
+#[cfg(unix)]
+use std::os::unix::fs::PermissionsExt;
+
+#[derive(Deserialize)]
+struct ManifestChunk {
+ uuid: String,
+ index: i64,
+}
+
+#[derive(Deserialize)]
+struct ManifestRecord {
+ chunks: Vec,
+ permissions: u32,
+}
+
+#[derive(Deserialize)]
+struct Manifest {
+ record: HashMap,
+}
+
+pub async fn unpack() -> Result<(), Error> {
+ let chunk_size: u64 = 1024 * 1024 * 16;
+
+ let input = Path::new("/home/decduck/Dev/droplet-output");
+ let output = Path::new("/home/decduck/Dev/droplet-rebuilt");
+
+ let manifest_path = input.join("manifest.drop");
+ let manifest_file_handle = File::open(manifest_path).unwrap();
+
+ let manifest: Manifest = from_reader(manifest_file_handle).unwrap();
+ manifest.record.into_par_iter().for_each(|(key, value)| {
+ let file = output.join(key.clone());
+ create_dir_all(file.parent().unwrap()).unwrap();
+ let mut file_handle = File::create(file).unwrap();
+
+ #[cfg(unix)]
+ {
+ let mut file_permissions = file_handle.metadata().unwrap().permissions();
+ file_permissions.set_mode(value.permissions);
+ file_handle.set_permissions(file_permissions).unwrap();
+ }
+
+ for chunk in value.chunks {
+ let chunk_path = input.join(chunk.uuid + ".bin");
+ let chunk_handle = File::open(chunk_path).unwrap();
+
+ let mut chunk_reader = BufReader::new(chunk_handle);
+
+ let offset = u64::try_from(chunk.index).unwrap() * chunk_size;
+ file_handle.seek(io::SeekFrom::Start(offset)).unwrap();
+
+ io::copy(&mut chunk_reader, &mut file_handle).unwrap();
+ file_handle.flush().unwrap();
+ }
+ });
+
+ return Ok(());
+}
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 1dead92..c7c4954 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2.0.0",
- "productName": "Drop Desktop Client",
- "version": "0.2.0-beta",
+ "productName": "drop",
+ "version": "0.1.0",
"identifier": "dev.drop.app",
"build": {
"beforeDevCommand": "yarn dev --port 1432",
@@ -10,6 +10,16 @@
"frontendDist": "../.output/public"
},
"app": {
+ "windows": [
+ {
+ "title": "Drop",
+ "width": 1536,
+ "height": 864,
+ "minWidth": 820,
+ "minHeight": 600,
+ "decorations": false
+ }
+ ],
"security": {
"csp": null
}
@@ -23,7 +33,7 @@
},
"bundle": {
"active": true,
- "targets": ["nsis", "deb", "rpm", "dmg", "appimage"],
+ "targets": ["nsis", "deb", "rpm", "dmg"],
"windows": {
"nsis": {
"installMode": "both"
@@ -40,7 +50,6 @@
"icons/128x128@2x.png",
"icons/icon.icns",
"icons/icon.ico"
- ],
- "externalBin": []
+ ]
}
}
diff --git a/tailwind.config.js b/tailwind.config.js
index 91b4f2a..c74301f 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -16,5 +16,5 @@ export default {
},
},
},
- plugins: [require("@tailwindcss/forms"), require('@tailwindcss/typography')],
+ plugins: [require("@tailwindcss/forms")],
};
diff --git a/types.d.ts b/types.d.ts
new file mode 100644
index 0000000..32c2816
--- /dev/null
+++ b/types.d.ts
@@ -0,0 +1,6 @@
+export enum AppStatus {
+ NotConfigured = "NotConfigured",
+ SignedOut = "SignedOut",
+ SignedIn = "SignedIn",
+ SignedInNeedsReauth = "SignedInNeedsReauth",
+}
\ No newline at end of file
diff --git a/types.ts b/types.ts
deleted file mode 100644
index 60a5b23..0000000
--- a/types.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import type { Component } from "vue";
-
-export type NavigationItem = {
- prefix: string;
- route: string;
- label: string;
-};
-
-export type QuickActionNav = {
- icon: Component;
- notifications?: number;
- action: () => Promise;
-};
-
-export type User = {
- id: string;
- username: string;
- admin: boolean;
- displayName: string;
- profilePicture: string;
-};
-
-export type AppState = {
- status: AppStatus;
- user?: User;
-};
-
-export type Game = {
- id: string;
- mName: string;
- mShortDescription: string;
- mDescription: string;
- mIconId: string;
- mBannerId: string;
- mCoverId: string;
- mImageLibrary: string[];
-};
-
-export enum AppStatus {
- NotConfigured = "NotConfigured",
- SignedOut = "SignedOut",
- SignedIn = "SignedIn",
- SignedInNeedsReauth = "SignedInNeedsReauth",
- ServerUnavailable = "ServerUnavailable",
-}
-
-export enum GameStatusEnum {
- Remote = "Remote",
- Queued = "Queued",
- Downloading = "Downloading",
- Installed = "Installed",
- Updating = "Updating",
- Uninstalling = "Uninstalling",
- SetupRequired = "SetupRequired",
- Running = "Running"
-}
-
-export type GameStatus = {
- type: GameStatusEnum;
- version_name?: string;
-};
-
-export enum DownloadableType {
- Game = "Game",
- Tool = "Tool",
- DLC = "DLC",
- Mod = "Mod"
-}
-
-export type DownloadableMetadata = {
- id: string,
- version: string,
- downloadType: DownloadableType
-}
-
-export type Settings = {
- autostart: boolean,
- maxDownloadThreads: number,
-}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 2c770d1..b361d19 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -301,16 +301,6 @@
dependencies:
mime "^3.0.0"
-"@csstools/selector-resolve-nested@^3.0.0":
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/@csstools/selector-resolve-nested/-/selector-resolve-nested-3.0.0.tgz#704a9b637975680e025e069a4c58b3beb3e2752a"
- integrity sha512-ZoK24Yku6VJU1gS79a5PFmC8yn3wIapiKmPgun0hZgEI5AOqgH2kiPRsPz1qkGv4HL+wuDLH83yQyk6inMYrJQ==
-
-"@csstools/selector-specificity@^5.0.0":
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-5.0.0.tgz#037817b574262134cabd68fc4ec1a454f168407b"
- integrity sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==
-
"@esbuild/aix-ppc64@0.20.2":
version "0.20.2"
resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz#a70f4ac11c6a1dfc18b8bbb13284155d933b9537"
@@ -735,17 +725,6 @@
"@jridgewell/resolve-uri" "^3.1.0"
"@jridgewell/sourcemap-codec" "^1.4.14"
-"@koa/router@^12.0.1":
- version "12.0.2"
- resolved "https://registry.yarnpkg.com/@koa/router/-/router-12.0.2.tgz#286d51959ed611255faa944818a112e35567835a"
- integrity sha512-sYcHglGKTxGF+hQ6x67xDfkE9o+NhVlRHBqq6gLywaMc6CojK/5vFZByphdonKinYlMLkEkacm+HEse9HzwgTA==
- dependencies:
- debug "^4.3.4"
- http-errors "^2.0.0"
- koa-compose "^4.1.0"
- methods "^1.1.2"
- path-to-regexp "^6.3.0"
-
"@kwsites/file-exists@^1.1.1":
version "1.1.1"
resolved "https://registry.yarnpkg.com/@kwsites/file-exists/-/file-exists-1.1.1.tgz#ad1efcac13e1987d8dbaf235ef3be5b0d96faa99"
@@ -994,25 +973,6 @@
vite-plugin-checker "^0.8.0"
vue-bundle-renderer "^2.1.0"
-"@nuxtjs/tailwindcss@^6.12.2":
- version "6.12.2"
- resolved "https://registry.yarnpkg.com/@nuxtjs/tailwindcss/-/tailwindcss-6.12.2.tgz#3fa41b0b9361cd69ec14934f800e66225b3c9e1f"
- integrity sha512-qPJiFH67CkTj/2kBGBzqXihOD1rQXMsbVS4vdQvfBxOBLPfGhU1yw7AATdhPl2BBjO2krjJLuZj39t7dnDYOwg==
- dependencies:
- "@nuxt/kit" "^3.13.2"
- autoprefixer "^10.4.20"
- consola "^3.2.3"
- defu "^6.1.4"
- h3 "^1.13.0"
- klona "^2.0.6"
- pathe "^1.1.2"
- postcss "^8.4.47"
- postcss-nesting "^13.0.0"
- tailwind-config-viewer "^2.0.4"
- tailwindcss "~3.4.13"
- ufo "^1.5.4"
- unctx "^2.3.1"
-
"@parcel/watcher-android-arm64@2.4.1":
version "2.4.1"
resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz#c2c19a3c442313ff007d2d7a9c2c1dd3e1c9ca84"
@@ -1285,16 +1245,6 @@
dependencies:
mini-svg-data-uri "^1.2.3"
-"@tailwindcss/typography@^0.5.15":
- version "0.5.15"
- resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.15.tgz#007ab9870c86082a1c76e5b3feda9392c7c8d648"
- integrity sha512-AqhlCXl+8grUz8uqExv5OTtgpjuVIwFTSXTrh8y9/pw6q2ek7fJ+Y8ZEVw7EB2DCcuCOtEjf9w3+J3rzts01uA==
- dependencies:
- lodash.castarray "^4.4.0"
- lodash.isplainobject "^4.0.6"
- lodash.merge "^4.6.2"
- postcss-selector-parser "6.0.10"
-
"@tanstack/virtual-core@3.10.8":
version "3.10.8"
resolved "https://registry.yarnpkg.com/@tanstack/virtual-core/-/virtual-core-3.10.8.tgz#975446a667755222f62884c19e5c3c66d959b8b4"
@@ -1385,20 +1335,6 @@
dependencies:
"@tauri-apps/api" "^2.0.0"
-"@tauri-apps/plugin-dialog@^2.0.1":
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/@tauri-apps/plugin-dialog/-/plugin-dialog-2.0.1.tgz#cca38f2ef361c6d92495f5aa12154492cf3fa779"
- integrity sha512-fnUrNr6EfvTqdls/ufusU7h6UbNFzLKvHk/zTuOiBq01R3dTODqwctZlzakdbfSp/7pNwTKvgKTAgl/NAP/Z0Q==
- dependencies:
- "@tauri-apps/api" "^2.0.0"
-
-"@tauri-apps/plugin-os@~2":
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/@tauri-apps/plugin-os/-/plugin-os-2.2.0.tgz#ef5511269f59c0ccc580a9d09600034cfaa9743b"
- integrity sha512-HszbCdbisMlu5QhCNAN8YIWyz2v33abAWha6+uvV2CKX8P5VSct/y+kEe22JeyqrxCnWlQ3DRx7s49Byg7/0EA==
- dependencies:
- "@tauri-apps/api" "^2.0.0"
-
"@tauri-apps/plugin-shell@>=2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/plugin-shell/-/plugin-shell-2.0.0.tgz#b6fc88ab070fd5f620e46405715779aa44eb8428"
@@ -1423,24 +1359,6 @@
dependencies:
"@types/node" "*"
-"@types/linkify-it@^5":
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-5.0.0.tgz#21413001973106cda1c3a9b91eedd4ccd5469d76"
- integrity sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==
-
-"@types/markdown-it@^14.1.2":
- version "14.1.2"
- resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-14.1.2.tgz#57f2532a0800067d9b934f3521429a2e8bfb4c61"
- integrity sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==
- dependencies:
- "@types/linkify-it" "^5"
- "@types/mdurl" "^2"
-
-"@types/mdurl@^2":
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-2.0.0.tgz#d43878b5b20222682163ae6f897b20447233bdfd"
- integrity sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==
-
"@types/node@*":
version "22.7.4"
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.7.4.tgz#e35d6f48dca3255ce44256ddc05dee1c23353fcc"
@@ -1713,14 +1631,6 @@ abort-controller@^3.0.0:
dependencies:
event-target-shim "^5.0.0"
-accepts@^1.3.5:
- version "1.3.8"
- resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
- integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
- dependencies:
- mime-types "~2.1.34"
- negotiator "0.6.3"
-
acorn-import-attributes@^1.9.2:
version "1.9.5"
resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
@@ -1862,23 +1772,11 @@ async-sema@^3.1.1:
resolved "https://registry.yarnpkg.com/async-sema/-/async-sema-3.1.1.tgz#e527c08758a0f8f6f9f15f799a173ff3c40ea808"
integrity sha512-tLRNUXati5MFePdAk8dw7Qt7DpxPB60ofAgn8WRhW6a2rcimZnYBP9oxHiv0OHy+Wz7kPMG+t4LGdt31+4EmGg==
-async@^2.6.4:
- version "2.6.4"
- resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
- integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
- dependencies:
- lodash "^4.17.14"
-
async@^3.2.4:
version "3.2.6"
resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
-at-least-node@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
- integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
-
autoprefixer@^10.4.20:
version "10.4.20"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.20.tgz#5caec14d43976ef42e32dcb4bd62878e96be5b3b"
@@ -2018,14 +1916,6 @@ cac@^6.7.14:
resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz#804e1e6f506ee363cb0e3ccbb09cad5dd9870959"
integrity sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==
-cache-content-type@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/cache-content-type/-/cache-content-type-1.0.1.tgz#035cde2b08ee2129f4a8315ea8f00a00dba1453c"
- integrity sha512-IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==
- dependencies:
- mime-types "^2.1.18"
- ylru "^1.2.0"
-
camelcase-css@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
@@ -2055,7 +1945,7 @@ chalk@^2.4.2:
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
-chalk@^4.1.1, chalk@^4.1.2:
+chalk@^4.1.1:
version "4.1.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2128,11 +2018,6 @@ cluster-key-slot@^1.1.0:
resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz#88ddaa46906e303b5de30d3153b7d9fe0a0c19ac"
integrity sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==
-co@^4.6.0:
- version "4.6.0"
- resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
- integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
-
color-convert@^1.9.0:
version "1.9.3"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -2182,11 +2067,6 @@ commander@^4.0.0:
resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
-commander@^6.0.0:
- version "6.2.1"
- resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
- integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
-
commander@^7.2.0:
version "7.2.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
@@ -2238,18 +2118,6 @@ console-control-strings@^1.0.0, console-control-strings@^1.1.0:
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
-content-disposition@~0.5.2:
- version "0.5.4"
- resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
- integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
- dependencies:
- safe-buffer "5.2.1"
-
-content-type@^1.0.4:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
- integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
-
convert-source-map@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
@@ -2260,14 +2128,6 @@ cookie-es@^1.1.0, cookie-es@^1.2.2:
resolved "https://registry.yarnpkg.com/cookie-es/-/cookie-es-1.2.2.tgz#18ceef9eb513cac1cb6c14bcbf8bdb2679b34821"
integrity sha512-+W7VmiVINB+ywl1HGXJXmrqkOhpKrIiVZV6tQuV54ZyQC7MMuBt81Vc336GMLoHBq5hV/F9eXgt5Mnx0Rha5Fg==
-cookies@~0.9.0:
- version "0.9.1"
- resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.9.1.tgz#3ffed6f60bb4fb5f146feeedba50acc418af67e3"
- integrity sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==
- dependencies:
- depd "~2.0.0"
- keygrip "~1.1.0"
-
copy-anything@^3.0.2:
version "3.0.5"
resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-3.0.5.tgz#2d92dce8c498f790fa7ad16b01a1ae5a45b020a0"
@@ -2451,25 +2311,6 @@ debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4, debug@^4.3.5, d
dependencies:
ms "^2.1.3"
-debug@^3.1.0, debug@^3.2.7:
- version "3.2.7"
- resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
- integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
- dependencies:
- ms "^2.1.1"
-
-debug@^4.3.2:
- version "4.4.0"
- resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
- integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
- dependencies:
- ms "^2.1.3"
-
-deep-equal@~1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
- integrity sha512-bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw==
-
deepmerge@^4.2.2:
version "4.3.1"
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
@@ -2513,22 +2354,17 @@ denque@^2.1.0:
resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1"
integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==
-depd@2.0.0, depd@^2.0.0, depd@~2.0.0:
+depd@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
-depd@~1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
- integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
-
destr@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/destr/-/destr-2.0.3.tgz#7f9e97cb3d16dbdca7be52aca1644ce402cfe449"
integrity sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ==
-destroy@1.2.0, destroy@^1.0.4:
+destroy@1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
@@ -2635,7 +2471,7 @@ emoji-regex@^9.2.2:
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
-encodeurl@^1.0.2, encodeurl@~1.0.2:
+encodeurl@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
@@ -2653,7 +2489,7 @@ enhanced-resolve@^5.14.1:
graceful-fs "^4.2.4"
tapable "^2.2.0"
-entities@^4.2.0, entities@^4.4.0, entities@^4.5.0:
+entities@^4.2.0, entities@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
@@ -2761,7 +2597,7 @@ escalade@^3.1.1, escalade@^3.2.0:
resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
-escape-html@^1.0.3, escape-html@~1.0.3:
+escape-html@~1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
@@ -2906,7 +2742,7 @@ fraction.js@^4.3.7:
resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
-fresh@0.5.2, fresh@~0.5.2:
+fresh@0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
@@ -2920,16 +2756,6 @@ fs-extra@^11.1.0, fs-extra@^11.2.0:
jsonfile "^6.0.1"
universalify "^2.0.0"
-fs-extra@^9.0.1:
- version "9.1.0"
- resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
- integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
- dependencies:
- at-least-node "^1.0.0"
- graceful-fs "^4.2.0"
- jsonfile "^6.0.1"
- universalify "^2.0.0"
-
fs-minipass@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -3052,7 +2878,7 @@ glob@^10.0.0, glob@^10.3.10:
package-json-from-dist "^1.0.0"
path-scurry "^1.11.1"
-glob@^7.1.3, glob@^7.2.0:
+glob@^7.1.3:
version "7.2.3"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -3111,7 +2937,7 @@ gzip-size@^7.0.0:
dependencies:
duplexer "^0.1.2"
-h3@^1.12.0, h3@^1.13.0:
+h3@^1.12.0:
version "1.13.0"
resolved "https://registry.yarnpkg.com/h3/-/h3-1.13.0.tgz#b5347a8936529794b6754b440e26c0ab8a60dceb"
integrity sha512-vFEAu/yf8UMUcB4s43OaDaigcqpQd14yanmOsn+NcRX3/guSKncyE2rOYhq8RIchgJrPSs/QiIddnTTR1ddiAg==
@@ -3137,18 +2963,6 @@ has-flag@^4.0.0:
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-has-symbols@^1.0.3:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
- integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
-
-has-tostringtag@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
- integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
- dependencies:
- has-symbols "^1.0.3"
-
has-unicode@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -3176,15 +2990,7 @@ html-tags@^3.3.1:
resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce"
integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==
-http-assert@^1.3.0:
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f"
- integrity sha512-uPpH7OKX4H25hBmU6G1jWNaqJGpTXxey+YOUizJUAgu0AjLUeC8D73hTrhvDS5D+GJN1DN1+hhc/eF/wpxtp0w==
- dependencies:
- deep-equal "~1.0.1"
- http-errors "~1.8.0"
-
-http-errors@2.0.0, http-errors@^2.0.0:
+http-errors@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
@@ -3195,27 +3001,6 @@ http-errors@2.0.0, http-errors@^2.0.0:
statuses "2.0.1"
toidentifier "1.0.1"
-http-errors@^1.6.3, http-errors@^1.7.3, http-errors@~1.8.0:
- version "1.8.1"
- resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
- integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
- dependencies:
- depd "~1.1.2"
- inherits "2.0.4"
- setprototypeof "1.2.0"
- statuses ">= 1.5.0 < 2"
- toidentifier "1.0.1"
-
-http-errors@~1.6.2:
- version "1.6.3"
- resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
- integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
- dependencies:
- depd "~1.1.2"
- inherits "2.0.3"
- setprototypeof "1.1.0"
- statuses ">= 1.4.0 < 2"
-
http-shutdown@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/http-shutdown/-/http-shutdown-1.2.2.tgz#41bc78fc767637c4c95179bc492f312c0ae64c5f"
@@ -3288,11 +3073,6 @@ inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@~2.0.3:
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-inherits@2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
- integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
-
ini@4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.1.tgz#d95b3d843b1e906e56d6747d5447904ff50ce7a1"
@@ -3337,13 +3117,6 @@ is-core-module@^2.13.0:
dependencies:
hasown "^2.0.2"
-is-core-module@^2.16.0:
- version "2.16.1"
- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
- integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
- dependencies:
- hasown "^2.0.2"
-
is-docker@^2.0.0, is-docker@^2.1.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
@@ -3364,13 +3137,6 @@ is-fullwidth-code-point@^3.0.0:
resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-is-generator-function@^1.0.7:
- version "1.0.10"
- resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
- integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
- dependencies:
- has-tostringtag "^1.0.0"
-
is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
version "4.0.3"
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
@@ -3437,7 +3203,7 @@ is-what@^4.1.8:
resolved "https://registry.yarnpkg.com/is-what/-/is-what-4.1.16.tgz#1ad860a19da8b4895ad5495da3182ce2acdd7a6f"
integrity sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==
-is-wsl@^2.1.1, is-wsl@^2.2.0:
+is-wsl@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
@@ -3523,13 +3289,6 @@ jsonfile@^6.0.1:
optionalDependencies:
graceful-fs "^4.1.6"
-keygrip@~1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.1.0.tgz#871b1681d5e159c62a445b0c74b615e0917e7226"
- integrity sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==
- dependencies:
- tsscmp "1.0.6"
-
kleur@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
@@ -3545,65 +3304,6 @@ knitwork@^1.0.0, knitwork@^1.1.0:
resolved "https://registry.yarnpkg.com/knitwork/-/knitwork-1.1.0.tgz#d8c9feafadd7ee744ff64340b216a52c7199c417"
integrity sha512-oHnmiBUVHz1V+URE77PNot2lv3QiYU2zQf1JjOVkMt3YDKGbu8NAFr+c4mcNOhdsGrB/VpVbRwPwhiXrPhxQbw==
-koa-compose@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-4.1.0.tgz#507306b9371901db41121c812e923d0d67d3e877"
- integrity sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==
-
-koa-convert@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/koa-convert/-/koa-convert-2.0.0.tgz#86a0c44d81d40551bae22fee6709904573eea4f5"
- integrity sha512-asOvN6bFlSnxewce2e/DK3p4tltyfC4VM7ZwuTuepI7dEQVcvpyFuBcEARu1+Hxg8DIwytce2n7jrZtRlPrARA==
- dependencies:
- co "^4.6.0"
- koa-compose "^4.1.0"
-
-koa-send@^5.0.0:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/koa-send/-/koa-send-5.0.1.tgz#39dceebfafb395d0d60beaffba3a70b4f543fe79"
- integrity sha512-tmcyQ/wXXuxpDxyNXv5yNNkdAMdFRqwtegBXUaowiQzUKqJehttS0x2j0eOZDQAyloAth5w6wwBImnFzkUz3pQ==
- dependencies:
- debug "^4.1.1"
- http-errors "^1.7.3"
- resolve-path "^1.4.0"
-
-koa-static@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/koa-static/-/koa-static-5.0.0.tgz#5e92fc96b537ad5219f425319c95b64772776943"
- integrity sha512-UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ==
- dependencies:
- debug "^3.1.0"
- koa-send "^5.0.0"
-
-koa@^2.14.2:
- version "2.15.3"
- resolved "https://registry.yarnpkg.com/koa/-/koa-2.15.3.tgz#062809266ee75ce0c75f6510a005b0e38f8c519a"
- integrity sha512-j/8tY9j5t+GVMLeioLaxweJiKUayFhlGqNTzf2ZGwL0ZCQijd2RLHK0SLW5Tsko8YyyqCZC2cojIb0/s62qTAg==
- dependencies:
- accepts "^1.3.5"
- cache-content-type "^1.0.0"
- content-disposition "~0.5.2"
- content-type "^1.0.4"
- cookies "~0.9.0"
- debug "^4.3.2"
- delegates "^1.0.0"
- depd "^2.0.0"
- destroy "^1.0.4"
- encodeurl "^1.0.2"
- escape-html "^1.0.3"
- fresh "~0.5.2"
- http-assert "^1.3.0"
- http-errors "^1.6.3"
- is-generator-function "^1.0.7"
- koa-compose "^4.1.0"
- koa-convert "^2.0.0"
- on-finished "^2.3.0"
- only "~0.0.2"
- parseurl "^1.3.2"
- statuses "^1.5.0"
- type-is "^1.6.16"
- vary "^1.1.2"
-
kolorist@^1.8.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/kolorist/-/kolorist-1.8.0.tgz#edddbbbc7894bc13302cdf740af6374d4a04743c"
@@ -3634,23 +3334,11 @@ lilconfig@^3.0.0, lilconfig@^3.1.2:
resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.2.tgz#e4a7c3cb549e3a606c8dcc32e5ae1005e62c05cb"
integrity sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==
-lilconfig@^3.1.3:
- version "3.1.3"
- resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.3.tgz#a1bcfd6257f9585bf5ae14ceeebb7b559025e4c4"
- integrity sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==
-
lines-and-columns@^1.1.6:
version "1.2.4"
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
-linkify-it@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-5.0.0.tgz#9ef238bfa6dc70bd8e7f9572b52d369af569b421"
- integrity sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==
- dependencies:
- uc.micro "^2.0.0"
-
listhen@^1.7.2:
version "1.9.0"
resolved "https://registry.yarnpkg.com/listhen/-/listhen-1.9.0.tgz#59355f7e4fc1eefda6bc494ae7e9ed13aa7658ef"
@@ -3683,11 +3371,6 @@ local-pkg@^0.5.0:
mlly "^1.4.2"
pkg-types "^1.0.3"
-lodash.castarray@^4.4.0:
- version "4.4.0"
- resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115"
- integrity sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==
-
lodash.defaults@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
@@ -3698,27 +3381,17 @@ lodash.isarguments@^3.1.0:
resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
integrity sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==
-lodash.isplainobject@^4.0.6:
- version "4.0.6"
- resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
- integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==
-
lodash.memoize@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
-lodash.merge@^4.6.2:
- version "4.6.2"
- resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
- integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
-
lodash.uniq@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
-lodash@^4.17.14, lodash@^4.17.15:
+lodash@^4.17.15:
version "4.17.21"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -3765,18 +3438,6 @@ make-dir@^3.1.0:
dependencies:
semver "^6.0.0"
-markdown-it@^14.1.0:
- version "14.1.0"
- resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-14.1.0.tgz#3c3c5992883c633db4714ccb4d7b5935d98b7d45"
- integrity sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==
- dependencies:
- argparse "^2.0.1"
- entities "^4.4.0"
- linkify-it "^5.0.0"
- mdurl "^2.0.0"
- punycode.js "^2.3.1"
- uc.micro "^2.1.0"
-
mdn-data@2.0.28:
version "2.0.28"
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.28.tgz#5ec48e7bef120654539069e1ae4ddc81ca490eba"
@@ -3787,16 +3448,6 @@ mdn-data@2.0.30:
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
-mdurl@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-2.0.0.tgz#80676ec0433025dd3e17ee983d0fe8de5a2237e0"
- integrity sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==
-
-media-typer@0.3.0:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
- integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
-
merge-stream@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -3807,12 +3458,7 @@ merge2@^1.3.0:
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-methods@^1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
- integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
-
-micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5, micromatch@^4.0.8:
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
version "4.0.8"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
@@ -3820,18 +3466,6 @@ micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5, micromatch@^4.0.8:
braces "^3.0.3"
picomatch "^2.3.1"
-mime-db@1.52.0:
- version "1.52.0"
- resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
- integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-
-mime-types@^2.1.18, mime-types@~2.1.24, mime-types@~2.1.34:
- version "2.1.35"
- resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
- integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
- dependencies:
- mime-db "1.52.0"
-
mime@1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
@@ -3878,11 +3512,6 @@ minimatch@^9.0.4:
dependencies:
brace-expansion "^2.0.1"
-minimist@^1.2.6:
- version "1.2.8"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
- integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
-
minipass@^3.0.0:
version "3.3.6"
resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
@@ -3913,13 +3542,6 @@ mitt@^3.0.1:
resolved "https://registry.yarnpkg.com/mitt/-/mitt-3.0.1.tgz#ea36cf0cc30403601ae074c8f77b7092cdab36d1"
integrity sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==
-mkdirp@^0.5.6:
- version "0.5.6"
- resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
- integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
- dependencies:
- minimist "^1.2.6"
-
mkdirp@^1.0.3:
version "1.0.4"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
@@ -3950,7 +3572,7 @@ ms@2.0.0:
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
-ms@2.1.3, ms@^2.1.1, ms@^2.1.3:
+ms@2.1.3, ms@^2.1.3:
version "2.1.3"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -3984,11 +3606,6 @@ napi-wasm@^1.1.0:
resolved "https://registry.yarnpkg.com/napi-wasm/-/napi-wasm-1.1.3.tgz#7bb95c88e6561f84880bb67195437b1cfbe99224"
integrity sha512-h/4nMGsHjZDCYmQVNODIrYACVJ+I9KItbG+0si6W/jSjdA9JbWDoU4LLeMXVcEQGHjttI2tuXqDrbGF7qkUHHg==
-negotiator@0.6.3:
- version "0.6.3"
- resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
- integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
-
nitropack@^2.9.7:
version "2.9.7"
resolved "https://registry.yarnpkg.com/nitropack/-/nitropack-2.9.7.tgz#66da772d14d0e364dd17adbd439f0b1e44112a8d"
@@ -4257,7 +3874,7 @@ ometa@0.2.2:
resolved "https://registry.yarnpkg.com/ometa/-/ometa-0.2.2.tgz#f53c4735ba6d56af5a46b04dfb7c4334c596d44e"
integrity sha512-LZuoK/yjU3FvrxPjUXUlZ1bavCfBPqauA7fsNdwi+AVhRdyk2IzgP3JRnevvjzQ6fKHdUw8YISshf53FmpHrng==
-on-finished@2.4.1, on-finished@^2.3.0:
+on-finished@2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
@@ -4278,11 +3895,6 @@ onetime@^6.0.0:
dependencies:
mimic-fn "^4.0.0"
-only@~0.0.2:
- version "0.0.2"
- resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4"
- integrity sha512-Fvw+Jemq5fjjyWz6CpKx6w9s7xxqo3+JCyM0WXWeCSOboZ8ABkyvP8ID4CZuChA/wxSx+XSJmdOm8rGVyJ1hdQ==
-
open@^10.1.0:
version "10.1.0"
resolved "https://registry.yarnpkg.com/open/-/open-10.1.0.tgz#a7795e6e5d519abe4286d9937bb24b51122598e1"
@@ -4293,14 +3905,6 @@ open@^10.1.0:
is-inside-container "^1.0.0"
is-wsl "^3.1.0"
-open@^7.0.4:
- version "7.4.2"
- resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
- integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
- dependencies:
- is-docker "^2.0.0"
- is-wsl "^2.1.1"
-
open@^8.4.0:
version "8.4.2"
resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
@@ -4354,12 +3958,12 @@ parse-url@^8.1.0:
dependencies:
parse-path "^7.0.0"
-parseurl@^1.3.2, parseurl@~1.3.3:
+parseurl@~1.3.3:
version "1.3.3"
resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
-path-is-absolute@1.0.1, path-is-absolute@^1.0.0:
+path-is-absolute@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
@@ -4387,11 +3991,6 @@ path-scurry@^1.11.1:
lru-cache "^10.2.0"
minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-path-to-regexp@^6.3.0:
- version "6.3.0"
- resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.3.0.tgz#2b6a26a337737a8e1416f9272ed0766b1c0389f4"
- integrity sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==
-
path-type@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/path-type/-/path-type-5.0.0.tgz#14b01ed7aea7ddf9c7c3f46181d4d04f9c785bb8"
@@ -4412,11 +4011,6 @@ picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0:
resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59"
integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==
-picocolors@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
- integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
-
picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
@@ -4446,15 +4040,6 @@ pkg-types@^1.0.3, pkg-types@^1.1.1, pkg-types@^1.2.0:
mlly "^1.7.1"
pathe "^1.1.2"
-portfinder@^1.0.26:
- version "1.0.32"
- resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.32.tgz#2fe1b9e58389712429dc2bea5beb2146146c7f81"
- integrity sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==
- dependencies:
- async "^2.6.4"
- debug "^3.2.7"
- mkdirp "^0.5.6"
-
postcss-calc@^10.0.2:
version "10.0.2"
resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-10.0.2.tgz#15f01635a27b9d38913a98c4ef2877f5b715b439"
@@ -4519,7 +4104,7 @@ postcss-js@^4.0.1:
dependencies:
camelcase-css "^2.0.1"
-postcss-load-config@^4.0.1, postcss-load-config@^4.0.2:
+postcss-load-config@^4.0.1:
version "4.0.2"
resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.2.tgz#7159dcf626118d33e299f485d6afe4aff7c4a3e3"
integrity sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==
@@ -4578,22 +4163,13 @@ postcss-minify-selectors@^7.0.4:
cssesc "^3.0.0"
postcss-selector-parser "^6.1.2"
-postcss-nested@^6.0.1, postcss-nested@^6.2.0:
+postcss-nested@^6.0.1:
version "6.2.0"
resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.2.0.tgz#4c2d22ab5f20b9cb61e2c5c5915950784d068131"
integrity sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==
dependencies:
postcss-selector-parser "^6.1.1"
-postcss-nesting@^13.0.0:
- version "13.0.1"
- resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-13.0.1.tgz#c405796d7245a3e4c267a9956cacfe9670b5d43e"
- integrity sha512-VbqqHkOBOt4Uu3G8Dm8n6lU5+9cJFxiuty9+4rcoyRPO9zZS1JIs6td49VIoix3qYqELHlJIn46Oih9SAKo+yQ==
- dependencies:
- "@csstools/selector-resolve-nested" "^3.0.0"
- "@csstools/selector-specificity" "^5.0.0"
- postcss-selector-parser "^7.0.0"
-
postcss-normalize-charset@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-7.0.0.tgz#92244ae73c31bf8f8885d5f16ff69e857ac6c001"
@@ -4679,14 +4255,6 @@ postcss-reduce-transforms@^7.0.0:
dependencies:
postcss-value-parser "^4.2.0"
-postcss-selector-parser@6.0.10:
- version "6.0.10"
- resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
- integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
- dependencies:
- cssesc "^3.0.0"
- util-deprecate "^1.0.2"
-
postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.1.1, postcss-selector-parser@^6.1.2:
version "6.1.2"
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de"
@@ -4695,14 +4263,6 @@ postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.1.1, postcss-selecto
cssesc "^3.0.0"
util-deprecate "^1.0.2"
-postcss-selector-parser@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz#41bd8b56f177c093ca49435f65731befe25d6b9c"
- integrity sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==
- dependencies:
- cssesc "^3.0.0"
- util-deprecate "^1.0.2"
-
postcss-svgo@^7.0.1:
version "7.0.1"
resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-7.0.1.tgz#2b63571d8e9568384df334bac9917baff4d23f58"
@@ -4760,11 +4320,6 @@ protocols@^2.0.0, protocols@^2.0.1:
resolved "https://registry.yarnpkg.com/protocols/-/protocols-2.0.1.tgz#8f155da3fc0f32644e83c5782c8e8212ccf70a86"
integrity sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==
-punycode.js@^2.3.1:
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/punycode.js/-/punycode.js-2.3.1.tgz#6b53e56ad75588234e79f4affa90972c7dd8cdb7"
- integrity sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==
-
queue-microtask@^1.2.2:
version "1.2.3"
resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -4866,15 +4421,6 @@ redis-parser@^3.0.0:
dependencies:
redis-errors "^1.0.0"
-replace-in-file@^6.1.0:
- version "6.3.5"
- resolved "https://registry.yarnpkg.com/replace-in-file/-/replace-in-file-6.3.5.tgz#ff956b0ab5bc96613207d603d197cd209400a654"
- integrity sha512-arB9d3ENdKva2fxRnSjwBEXfK1npgyci7ZZuwysgAp7ORjHSyxz6oqIjTEv8R0Ydl4Ll7uOAZXL4vbkhGIizCg==
- dependencies:
- chalk "^4.1.2"
- glob "^7.2.0"
- yargs "^17.2.1"
-
require-directory@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -4885,14 +4431,6 @@ resolve-from@^5.0.0:
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
-resolve-path@^1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
- integrity sha512-i1xevIst/Qa+nA9olDxLWnLk8YZbi8R/7JPbCMcgyWaFR6bKWaexgJgEB5oc2PKMjYdrHynyz0NY+if+H98t1w==
- dependencies:
- http-errors "~1.6.2"
- path-is-absolute "1.0.1"
-
resolve@^1.1.7, resolve@^1.22.1, resolve@^1.22.2:
version "1.22.8"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
@@ -4902,15 +4440,6 @@ resolve@^1.1.7, resolve@^1.22.1, resolve@^1.22.2:
path-parse "^1.0.7"
supports-preserve-symlinks-flag "^1.0.0"
-resolve@^1.22.8:
- version "1.22.10"
- resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39"
- integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==
- dependencies:
- is-core-module "^2.16.0"
- path-parse "^1.0.7"
- supports-preserve-symlinks-flag "^1.0.0"
-
reusify@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
@@ -4982,7 +4511,7 @@ rxjs@^7.4.0:
dependencies:
tslib "^2.1.0"
-safe-buffer@5.2.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
+safe-buffer@^5.1.0, safe-buffer@~5.2.0:
version "5.2.1"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -5196,11 +4725,6 @@ set-blocking@^2.0.0:
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
-setprototypeof@1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
- integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
-
setprototypeof@1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
@@ -5266,11 +4790,6 @@ smob@^1.0.0:
resolved "https://registry.yarnpkg.com/smob/-/smob-1.5.0.tgz#85d79a1403abf128d24d3ebc1cdc5e1a9548d3ab"
integrity sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==
-sortablejs@1.14.0:
- version "1.14.0"
- resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.14.0.tgz#6d2e17ccbdb25f464734df621d4f35d4ab35b3d8"
- integrity sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==
-
source-map-js@^1.0.1, source-map-js@^1.2.0, source-map-js@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
@@ -5309,11 +4828,6 @@ statuses@2.0.1:
resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
-"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@^1.5.0:
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
- integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
-
std-env@^3.7.0:
version "3.7.0"
resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.7.0.tgz#c9f7386ced6ecf13360b6c6c55b8aaa4ef7481d2"
@@ -5412,7 +4926,7 @@ stylehacks@^7.0.4:
browserslist "^4.23.3"
postcss-selector-parser "^6.1.2"
-sucrase@^3.32.0, sucrase@^3.35.0:
+sucrase@^3.32.0:
version "3.35.0"
resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.0.tgz#57f17a3d7e19b36d8995f06679d121be914ae263"
integrity sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==
@@ -5486,20 +5000,6 @@ system-architecture@^0.1.0:
resolved "https://registry.yarnpkg.com/system-architecture/-/system-architecture-0.1.0.tgz#71012b3ac141427d97c67c56bc7921af6bff122d"
integrity sha512-ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA==
-tailwind-config-viewer@^2.0.4:
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/tailwind-config-viewer/-/tailwind-config-viewer-2.0.4.tgz#5f47ef0f0ba3719557f88628de8bf276cad7a4cb"
- integrity sha512-icvcmdMmt9dphvas8wL40qttrHwAnW3QEN4ExJ2zICjwRsPj7gowd1cOceaWG3IfTuM/cTNGQcx+bsjMtmV+cw==
- dependencies:
- "@koa/router" "^12.0.1"
- commander "^6.0.0"
- fs-extra "^9.0.1"
- koa "^2.14.2"
- koa-static "^5.0.0"
- open "^7.0.4"
- portfinder "^1.0.26"
- replace-in-file "^6.1.0"
-
tailwindcss@^3.4.13:
version "3.4.13"
resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.13.tgz#3d11e5510660f99df4f1bfb2d78434666cb8f831"
@@ -5528,34 +5028,6 @@ tailwindcss@^3.4.13:
resolve "^1.22.2"
sucrase "^3.32.0"
-tailwindcss@~3.4.13:
- version "3.4.17"
- resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.17.tgz#ae8406c0f96696a631c790768ff319d46d5e5a63"
- integrity sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==
- dependencies:
- "@alloc/quick-lru" "^5.2.0"
- arg "^5.0.2"
- chokidar "^3.6.0"
- didyoumean "^1.2.2"
- dlv "^1.1.3"
- fast-glob "^3.3.2"
- glob-parent "^6.0.2"
- is-glob "^4.0.3"
- jiti "^1.21.6"
- lilconfig "^3.1.3"
- micromatch "^4.0.8"
- normalize-path "^3.0.0"
- object-hash "^3.0.0"
- picocolors "^1.1.1"
- postcss "^8.4.47"
- postcss-import "^15.1.0"
- postcss-js "^4.0.1"
- postcss-load-config "^4.0.2"
- postcss-nested "^6.2.0"
- postcss-selector-parser "^6.1.2"
- resolve "^1.22.8"
- sucrase "^3.35.0"
-
tapable@^2.2.0:
version "2.2.1"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
@@ -5671,11 +5143,6 @@ tslib@^2.1.0:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==
-tsscmp@1.0.6:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
- integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==
-
type-fest@^0.21.3:
version "0.21.3"
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
@@ -5686,19 +5153,6 @@ type-fest@^3.8.0:
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-3.13.1.tgz#bb744c1f0678bea7543a2d1ec24e83e68e8c8706"
integrity sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==
-type-is@^1.6.16:
- version "1.6.18"
- resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
- integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
- dependencies:
- media-typer "0.3.0"
- mime-types "~2.1.24"
-
-uc.micro@^2.0.0, uc.micro@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-2.1.0.tgz#f8d3f7d0ec4c3dea35a7e3c8efa4cb8b45c9e7ee"
- integrity sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==
-
ufo@^1.1.2, ufo@^1.5.3, ufo@^1.5.4:
version "1.5.4"
resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.5.4.tgz#16d6949674ca0c9e0fbbae1fa20a71d7b1ded754"
@@ -5892,11 +5346,6 @@ varint@^6.0.0:
resolved "https://registry.yarnpkg.com/varint/-/varint-6.0.0.tgz#9881eb0ce8feaea6512439d19ddf84bf551661d0"
integrity sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==
-vary@^1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
- integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
-
vite-hot-client@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/vite-hot-client/-/vite-hot-client-0.2.3.tgz#db52aba46edbcfa7906dbca8255fd35b9a9270b2"
@@ -6047,13 +5496,6 @@ vue@^3.5.5, vue@latest:
"@vue/server-renderer" "3.5.11"
"@vue/shared" "3.5.11"
-vuedraggable@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/vuedraggable/-/vuedraggable-4.1.0.tgz#edece68adb8a4d9e06accff9dfc9040e66852270"
- integrity sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==
- dependencies:
- sortablejs "1.14.0"
-
webidl-conversions@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
@@ -6155,7 +5597,7 @@ yargs-parser@^21.1.1:
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
-yargs@^17.2.1, yargs@^17.5.1:
+yargs@^17.5.1:
version "17.7.2"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -6168,11 +5610,6 @@ yargs@^17.2.1, yargs@^17.5.1:
y18n "^5.0.5"
yargs-parser "^21.1.1"
-ylru@^1.2.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.4.0.tgz#0cf0aa57e9c24f8a2cbde0cc1ca2c9592ac4e0f6"
- integrity sha512-2OQsPNEmBCvXuFlIni/a+Rn+R2pHW9INm0BxXJ4hVDA8TirqMj+J/Rp9ItLatT/5pZqWwefVrTQcHpixsxnVlA==
-
zhead@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/zhead/-/zhead-2.2.4.tgz#87cd1e2c3d2f465fa9f43b8db23f9716dfe6bed7"
-