From 6fd9a6a082c8a3fbf052b40f0b429baec926dcd2 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Sat, 20 Dec 2025 01:08:15 +1100
Subject: [PATCH 01/19] feat: depot api downloads

---
 src-tauri/Cargo.lock                          | 1077 +++++++++--------
 src-tauri/Cargo.toml                          |  184 ++-
 src-tauri/client/Cargo.toml                   |   12 +-
 src-tauri/database/src/models.rs              |    5 +-
 src-tauri/download_manager/Cargo.toml         |    6 +-
 .../src/download_manager_builder.rs           |   92 +-
 .../src/download_manager_frontend.rs          |   43 +-
 .../download_manager/src/downloadable.rs      |    6 +-
 .../src/util/progress_object.rs               |   26 +-
 src-tauri/games/Cargo.toml                    |   12 +-
 .../games/src/downloads/download_agent.rs     |  430 ++-----
 .../games/src/downloads/download_logic.rs     |  305 ++---
 src-tauri/games/src/downloads/manifest.rs     |   11 -
 src-tauri/games/src/downloads/mod.rs          |    3 +-
 src-tauri/games/src/downloads/validate.rs     |  104 --
 src-tauri/games/src/lib.rs                    |    1 +
 src-tauri/games/src/library.rs                |    8 +-
 src-tauri/process/Cargo.toml                  |    4 +-
 src-tauri/remote/Cargo.toml                   |    2 +-
 src-tauri/remote/src/lib.rs                   |    3 +
 src-tauri/remote/src/requests.rs              |   12 +-
 src-tauri/remote/src/server_proto.rs          |   92 +-
 src-tauri/remote/src/utils.rs                 |    5 +
 src-tauri/src/client.rs                       |   19 +-
 src-tauri/src/download_manager.rs             |   16 +-
 src-tauri/src/downloads.rs                    |    6 +-
 src-tauri/src/games.rs                        |    8 +-
 src-tauri/src/lib.rs                          |   29 +-
 src-tauri/utils/src/download_manager_send.rs  |    2 +-
 29 files changed, 1069 insertions(+), 1454 deletions(-)
 delete mode 100644 src-tauri/games/src/downloads/validate.rs

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 62c6bcca..c252ef2c 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -8,11 +8,22 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 dependencies = [
  "memchr",
 ]
@@ -120,7 +131,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
  "synstructure",
 ]
 
@@ -132,7 +143,7 @@ checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
  "synstructure",
 ]
 
@@ -144,7 +155,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -266,7 +277,18 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
+]
+
+[[package]]
+name = "async-scoped"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4042078ea593edffc452eef14e99fdb2b120caa4ad9618bcdeabc4a023b98740"
+dependencies = [
+ "futures",
+ "pin-project",
+ "tokio",
 ]
 
 [[package]]
@@ -328,7 +350,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -450,7 +472,7 @@ checksum = "ffebfc2d28a12b262c303cb3860ee77b91bd83b1f20f0bd2a9693008e2f55a9e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -461,11 +483,11 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.4"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -486,7 +508,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "generic-array 0.14.9",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
@@ -495,7 +517,7 @@ version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
- "generic-array 0.14.9",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
@@ -507,22 +529,13 @@ dependencies = [
  "byte-tools",
 ]
 
-[[package]]
-name = "block2"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
-dependencies = [
- "objc2 0.5.2",
-]
-
 [[package]]
 name = "block2"
 version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
 dependencies = [
- "objc2 0.6.3",
+ "objc2",
 ]
 
 [[package]]
@@ -591,9 +604,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
 dependencies = [
  "serde",
 ]
@@ -653,7 +666,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "cairo-sys-rs",
  "glib",
  "libc",
@@ -716,9 +729,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.41"
+version = "1.2.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
+checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -779,6 +792,16 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
 [[package]]
 name = "client"
 version = "0.1.0"
@@ -897,7 +920,7 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "core-foundation 0.10.1",
  "core-graphics-types",
  "foreign-types 0.5.0",
@@ -910,7 +933,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "core-foundation 0.10.1",
  "libc",
 ]
@@ -975,11 +998,11 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
 [[package]]
 name = "crypto-common"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 dependencies = [
- "generic-array 0.14.9",
+ "generic-array 0.14.7",
  "typenum",
 ]
 
@@ -1007,7 +1030,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -1017,7 +1040,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
 dependencies = [
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
+]
+
+[[package]]
+name = "ctr"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
+dependencies = [
+ "cipher",
 ]
 
 [[package]]
@@ -1041,7 +1073,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -1052,7 +1084,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -1112,9 +1144,9 @@ checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
 
 [[package]]
 name = "deranged"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071"
+checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
 dependencies = [
  "powerfmt",
  "serde_core",
@@ -1130,27 +1162,28 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "derive_more"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+checksum = "10b768e943bed7bf2cab53df09f4bc34bfd217cdb57d971e769874c9a6710618"
 dependencies = [
  "derive_more-impl",
 ]
 
 [[package]]
 name = "derive_more-impl"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
+checksum = "6d286bfdaf75e988b4a78e013ecd79c581e06399ab53fbacd2d916c2f904f30b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "rustc_version",
+ "syn 2.0.111",
  "unicode-xid",
 ]
 
@@ -1175,7 +1208,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "generic-array 0.14.9",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
@@ -1241,10 +1274,10 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
 dependencies = [
- "bitflags 2.9.4",
- "block2 0.6.2",
+ "bitflags 2.10.0",
+ "block2",
  "libc",
- "objc2 0.6.3",
+ "objc2",
 ]
 
 [[package]]
@@ -1255,7 +1288,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -1269,9 +1302,9 @@ dependencies = [
 
 [[package]]
 name = "dlopen2"
-version = "0.8.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b54f373ccf864bf587a89e880fb7610f8d73f3045f13580948ccbcaff26febff"
+checksum = "5e2c5bd4158e66d1e215c49b837e11d62f3267b30c92f1d171c4d3105e3dc4d4"
 dependencies = [
  "dlopen2_derive",
  "libc",
@@ -1281,13 +1314,13 @@ dependencies = [
 
 [[package]]
 name = "dlopen2_derive"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "788160fb30de9cdd857af31c6a2675904b16ece8fc2737b2c7127ba368c9d0f4"
+checksum = "0fbbb781877580993a8707ec48672673ec7b81eeba04cfd2310bd28c08e47c8f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -1301,9 +1334,9 @@ dependencies = [
 
 [[package]]
 name = "doc-comment"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
+checksum = "780955b8b195a21ab8e4ac6b60dd1dbdcec1dc6c51c0617964b08c81785e12c9"
 
 [[package]]
 name = "downcast-rs"
@@ -1315,6 +1348,7 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 name = "download_manager"
 version = "0.1.0"
 dependencies = [
+ "async-trait",
  "atomic-instant-full",
  "database",
  "humansize",
@@ -1325,6 +1359,7 @@ dependencies = [
  "serde_with",
  "tauri",
  "throttle_my_fn",
+ "tokio",
  "utils",
 ]
 
@@ -1352,7 +1387,7 @@ dependencies = [
  "deranged 0.4.0",
  "dirs 6.0.0",
  "download_manager",
- "droplet-rs",
+ "droplet-rs 0.7.3",
  "dynfmt",
  "filetime",
  "futures-core",
@@ -1360,7 +1395,7 @@ dependencies = [
  "games",
  "gethostname",
  "hex 0.4.3",
- "http 1.3.1",
+ "http 1.4.0",
  "http-serde 2.1.1",
  "humansize",
  "known-folders",
@@ -1375,7 +1410,7 @@ dependencies = [
  "rayon",
  "regex",
  "remote",
- "reqwest 0.12.24",
+ "reqwest 0.12.25",
  "reqwest-middleware 0.4.2",
  "reqwest-middleware-cache",
  "reqwest-websocket",
@@ -1403,6 +1438,7 @@ dependencies = [
  "throttle_my_fn",
  "tokio",
  "tokio-util",
+ "tracing",
  "umu-wrapper-lib",
  "url",
  "urlencoding",
@@ -1411,6 +1447,7 @@ dependencies = [
  "walkdir",
  "webbrowser",
  "whoami",
+ "wry",
  "zstd",
 ]
 
@@ -1429,6 +1466,29 @@ dependencies = [
  "x509-parser 0.17.0",
 ]
 
+[[package]]
+name = "droplet-rs"
+version = "0.12.3"
+source = "git+https://github.com/Drop-OSS/droplet-rs#fe2b569c06d6dd478ffbc2a72a0ba4cf52adf346"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "dyn-clone",
+ "futures",
+ "getrandom 0.3.4",
+ "hex 0.4.3",
+ "humansize",
+ "rcgen",
+ "ring",
+ "serde",
+ "serde_json",
+ "sha2 0.10.9",
+ "time",
+ "tokio",
+ "uuid",
+ "x509-parser 0.17.0",
+]
+
 [[package]]
 name = "dtoa"
 version = "1.0.10"
@@ -1507,9 +1567,9 @@ dependencies = [
 
 [[package]]
 name = "endi"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
+checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099"
 
 [[package]]
 name = "enumflags2"
@@ -1529,7 +1589,7 @@ checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -1549,9 +1609,9 @@ dependencies = [
 
 [[package]]
 name = "erased-serde"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "259d404d09818dec19332e31d94558aeb442fea04c817006456c24b5460bbd4b"
+checksum = "89e8918065695684b2b0702da20382d5ae6065cf3327bc2d6436bd49a71ce9f3"
 dependencies = [
  "serde",
  "serde_core",
@@ -1640,15 +1700,15 @@ dependencies = [
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
 
 [[package]]
 name = "flate2"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9"
+checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1687,7 +1747,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -1790,7 +1850,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -1836,25 +1896,33 @@ dependencies = [
 name = "games"
 version = "0.1.0"
 dependencies = [
+ "aes",
+ "async-scoped",
+ "async-trait",
  "atomic-instant-full",
  "bitcode",
  "boxcar",
+ "ctr",
  "database",
  "download_manager",
+ "droplet-rs 0.12.3",
+ "futures-util",
  "hex 0.4.3",
  "log",
- "md5 0.8.0",
  "native_model",
  "rayon",
  "remote",
- "reqwest 0.12.24",
+ "reqwest 0.12.25",
  "rustix 1.1.2",
  "serde",
  "serde_json",
  "serde_with",
+ "sha2 0.10.9",
  "sysinfo 0.37.2",
  "tauri",
  "throttle_my_fn",
+ "tokio",
+ "tokio-util",
  "utils",
 ]
 
@@ -1968,9 +2036,9 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.9"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
  "version_check",
@@ -2058,9 +2126,9 @@ dependencies = [
 
 [[package]]
 name = "glam"
-version = "0.30.8"
+version = "0.30.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e12d847aeb25f41be4c0ec9587d624e9cd631bc007a8fd7ce3f5851e064c6460"
+checksum = "bd47b05dddf0005d850e5644cae7f2b14ac3df487979dbfff3b56f20b1a6ae46"
 
 [[package]]
 name = "glib"
@@ -2068,7 +2136,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "futures-channel",
  "futures-core",
  "futures-executor",
@@ -2096,7 +2164,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -2187,7 +2255,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -2202,7 +2270,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.11.4",
+ "indexmap 2.12.1",
  "slab",
  "tokio",
  "tokio-util",
@@ -2220,8 +2288,8 @@ dependencies = [
  "fnv",
  "futures-core",
  "futures-sink",
- "http 1.3.1",
- "indexmap 2.11.4",
+ "http 1.4.0",
+ "indexmap 2.12.1",
  "slab",
  "tokio",
  "tokio-util",
@@ -2242,9 +2310,9 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
 name = "hashbrown"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 
 [[package]]
 name = "heck"
@@ -2301,12 +2369,11 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
 dependencies = [
  "bytes",
- "fnv",
  "itoa",
 ]
 
@@ -2328,7 +2395,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "http 1.3.1",
+ "http 1.4.0",
 ]
 
 [[package]]
@@ -2339,7 +2406,7 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
  "bytes",
  "futures-core",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "pin-project-lite",
 ]
@@ -2379,7 +2446,7 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f056c8559e3757392c8d091e796416e4649d8e49e88b8d76df6c002f05027fd"
 dependencies = [
- "http 1.3.1",
+ "http 1.4.0",
  "serde",
 ]
 
@@ -2436,16 +2503,16 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
+checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11"
 dependencies = [
  "atomic-waker",
  "bytes",
  "futures-channel",
  "futures-core",
  "h2 0.4.12",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "httparse",
  "itoa",
@@ -2462,8 +2529,8 @@ version = "0.27.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
 dependencies = [
- "http 1.3.1",
- "hyper 1.7.0",
+ "http 1.4.0",
+ "hyper 1.8.1",
  "hyper-util",
  "rustls",
  "rustls-native-certs",
@@ -2482,7 +2549,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.7.0",
+ "hyper 1.8.1",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -2492,18 +2559,18 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.17"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
+checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f"
 dependencies = [
  "base64 0.22.1",
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
- "hyper 1.7.0",
+ "hyper 1.8.1",
  "ipnet",
  "libc",
  "percent-encoding",
@@ -2513,7 +2580,7 @@ dependencies = [
  "tokio",
  "tower-service",
  "tracing",
- "windows-registry",
+ "windows-registry 0.6.1",
 ]
 
 [[package]]
@@ -2552,9 +2619,9 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
 dependencies = [
  "displaydoc",
  "potential_utf",
@@ -2565,9 +2632,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locale_core"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -2578,11 +2645,10 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_normalizer_data",
  "icu_properties",
@@ -2593,42 +2659,38 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
 
 [[package]]
 name = "icu_properties"
-version = "2.0.1"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "potential_utf",
  "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "2.0.1"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
 
 [[package]]
 name = "icu_provider"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
- "stable_deref_trait",
- "tinystr",
  "writeable",
  "yoke",
  "zerofrom",
@@ -2676,12 +2738,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.11.4"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
+checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
 dependencies = [
  "equivalent",
- "hashbrown 0.16.0",
+ "hashbrown 0.16.1",
  "serde",
  "serde_core",
 ]
@@ -2695,6 +2757,15 @@ dependencies = [
  "cfb",
 ]
 
+[[package]]
+name = "inout"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+dependencies = [
+ "generic-array 0.14.7",
+]
+
 [[package]]
 name = "instant"
 version = "0.1.13"
@@ -2712,9 +2783,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "iri-string"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397"
 dependencies = [
  "memchr",
  "serde",
@@ -2802,9 +2873,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.81"
+version = "0.3.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
+checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -2838,7 +2909,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "serde",
  "unicode-segmentation",
 ]
@@ -2860,7 +2931,7 @@ checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2"
 dependencies = [
  "cssparser",
  "html5ever",
- "indexmap 2.11.4",
+ "indexmap 2.12.1",
  "selectors",
 ]
 
@@ -2905,9 +2976,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.177"
+version = "0.2.178"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
 
 [[package]]
 name = "libloading"
@@ -2941,7 +3012,7 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "libc",
  "redox_syscall 0.5.18",
 ]
@@ -2960,9 +3031,9 @@ checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
 
 [[package]]
 name = "litemap"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
 
 [[package]]
 name = "lock_api"
@@ -2975,11 +3046,11 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.28"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 dependencies = [
- "serde",
+ "serde_core",
  "value-bag",
 ]
 
@@ -2998,7 +3069,7 @@ dependencies = [
  "anyhow",
  "arc-swap",
  "chrono",
- "derive_more 2.0.1",
+ "derive_more 2.1.0",
  "fnv",
  "humantime",
  "libc",
@@ -3061,7 +3132,7 @@ checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -3136,7 +3207,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -3173,13 +3244,13 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.0.4"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
 dependencies = [
  "libc",
  "wasi 0.11.1+wasi-snapshot-preview1",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -3198,10 +3269,10 @@ dependencies = [
  "dpi",
  "gtk",
  "keyboard-types",
- "objc2 0.6.3",
+ "objc2",
  "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.2",
+ "objc2-foundation",
  "once_cell",
  "png",
  "serde",
@@ -3250,7 +3321,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -3259,7 +3330,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "jni-sys",
  "log",
  "ndk-sys",
@@ -3295,7 +3366,7 @@ version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -3363,9 +3434,9 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a"
+checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c"
 dependencies = [
  "num_enum_derive",
  "rustversion",
@@ -3373,30 +3444,14 @@ dependencies = [
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d"
+checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7"
 dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "objc-sys"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
-
-[[package]]
-name = "objc2"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
-dependencies = [
- "objc-sys",
- "objc2-encode",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -3415,10 +3470,10 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
- "bitflags 2.9.4",
- "block2 0.6.2",
+ "bitflags 2.10.0",
+ "block2",
  "libc",
- "objc2 0.6.3",
+ "objc2",
  "objc2-cloud-kit",
  "objc2-core-data",
  "objc2-core-foundation",
@@ -3426,8 +3481,8 @@ dependencies = [
  "objc2-core-image",
  "objc2-core-text",
  "objc2-core-video",
- "objc2-foundation 0.3.2",
- "objc2-quartz-core 0.3.2",
+ "objc2-foundation",
+ "objc2-quartz-core",
 ]
 
 [[package]]
@@ -3436,9 +3491,9 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
 dependencies = [
- "bitflags 2.9.4",
- "objc2 0.6.3",
- "objc2-foundation 0.3.2",
+ "bitflags 2.10.0",
+ "objc2",
+ "objc2-foundation",
 ]
 
 [[package]]
@@ -3447,9 +3502,9 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
 dependencies = [
- "bitflags 2.9.4",
- "objc2 0.6.3",
- "objc2-foundation 0.3.2",
+ "bitflags 2.10.0",
+ "objc2",
+ "objc2-foundation",
 ]
 
 [[package]]
@@ -3458,9 +3513,9 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "dispatch2",
- "objc2 0.6.3",
+ "objc2",
 ]
 
 [[package]]
@@ -3469,9 +3524,9 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "dispatch2",
- "objc2 0.6.3",
+ "objc2",
  "objc2-core-foundation",
  "objc2-io-surface",
 ]
@@ -3482,8 +3537,18 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
 dependencies = [
- "objc2 0.6.3",
- "objc2-foundation 0.3.2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-location"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
 ]
 
 [[package]]
@@ -3492,8 +3557,8 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
 dependencies = [
- "bitflags 2.9.4",
- "objc2 0.6.3",
+ "bitflags 2.10.0",
+ "objc2",
  "objc2-core-foundation",
  "objc2-core-graphics",
 ]
@@ -3504,8 +3569,8 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6"
 dependencies = [
- "bitflags 2.9.4",
- "objc2 0.6.3",
+ "bitflags 2.10.0",
+ "objc2",
  "objc2-core-foundation",
  "objc2-core-graphics",
  "objc2-io-surface",
@@ -3526,28 +3591,16 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "objc2-foundation"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
-dependencies = [
- "bitflags 2.9.4",
- "block2 0.5.1",
- "libc",
- "objc2 0.5.2",
-]
-
 [[package]]
 name = "objc2-foundation"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
- "bitflags 2.9.4",
- "block2 0.6.2",
+ "bitflags 2.10.0",
+ "block2",
  "libc",
- "objc2 0.6.3",
+ "objc2",
  "objc2-core-foundation",
 ]
 
@@ -3567,8 +3620,8 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
 dependencies = [
- "bitflags 2.9.4",
- "objc2 0.6.3",
+ "bitflags 2.10.0",
+ "objc2",
  "objc2-core-foundation",
 ]
 
@@ -3578,44 +3631,20 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a1e6550c4caed348956ce3370c9ffeca70bb1dbed4fa96112e7c6170e074586"
 dependencies = [
- "objc2 0.6.3",
+ "objc2",
  "objc2-core-foundation",
 ]
 
-[[package]]
-name = "objc2-metal"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
-dependencies = [
- "bitflags 2.9.4",
- "block2 0.5.1",
- "objc2 0.5.2",
- "objc2-foundation 0.2.2",
-]
-
-[[package]]
-name = "objc2-quartz-core"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
-dependencies = [
- "bitflags 2.9.4",
- "block2 0.5.1",
- "objc2 0.5.2",
- "objc2-foundation 0.2.2",
- "objc2-metal",
-]
-
 [[package]]
 name = "objc2-quartz-core"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
 dependencies = [
- "bitflags 2.9.4",
- "objc2 0.6.3",
- "objc2-foundation 0.3.2",
+ "bitflags 2.10.0",
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-foundation",
 ]
 
 [[package]]
@@ -3624,8 +3653,8 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "709fe137109bd1e8b5a99390f77a7d8b2961dafc1a1c5db8f2e60329ad6d895a"
 dependencies = [
- "bitflags 2.9.4",
- "objc2 0.6.3",
+ "bitflags 2.10.0",
+ "objc2",
  "objc2-core-foundation",
 ]
 
@@ -3635,10 +3664,29 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
 dependencies = [
- "bitflags 2.9.4",
- "objc2 0.6.3",
+ "bitflags 2.10.0",
+ "block2",
+ "objc2",
+ "objc2-cloud-kit",
+ "objc2-core-data",
  "objc2-core-foundation",
- "objc2-foundation 0.3.2",
+ "objc2-core-graphics",
+ "objc2-core-image",
+ "objc2-core-location",
+ "objc2-core-text",
+ "objc2-foundation",
+ "objc2-quartz-core",
+ "objc2-user-notifications",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
 ]
 
 [[package]]
@@ -3647,12 +3695,12 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f"
 dependencies = [
- "bitflags 2.9.4",
- "block2 0.6.2",
- "objc2 0.6.3",
+ "bitflags 2.10.0",
+ "block2",
+ "objc2",
  "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.2",
+ "objc2-foundation",
  "objc2-javascript-core",
  "objc2-security",
 ]
@@ -3695,9 +3743,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "open"
-version = "5.3.2"
+version = "5.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2483562e62ea94312f3576a7aca397306df7990b8d89033e18766744377ef95"
+checksum = "43bb73a7fa3799b198970490a51174027ba0d4ec504b03cd08caf513d40024bc"
 dependencies = [
  "dunce",
  "is-wsl",
@@ -3707,11 +3755,11 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.74"
+version = "0.10.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ad14dd45412269e1a30f52ad8f0664f0f4f4a89ee8fe28c3b3527021ebb654"
+checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "cfg-if",
  "foreign-types 0.3.2",
  "libc",
@@ -3728,7 +3776,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -3739,9 +3787,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.110"
+version = "0.9.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a9f0075ba3c21b09f8e8b2026584b1d18d49388648f2fbbf3c97ea8deced8e2"
+checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321"
 dependencies = [
  "cc",
  "libc",
@@ -3786,14 +3834,18 @@ dependencies = [
 
 [[package]]
 name = "os_info"
-version = "3.12.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0e1ac5fde8d43c34139135df8ea9ee9465394b2d8d20f032d38998f64afffc3"
+checksum = "7c39b5918402d564846d5aba164c09a66cc88d232179dfd3e3c619a25a268392"
 dependencies = [
+ "android_system_properties",
  "log",
- "plist",
+ "nix",
+ "objc2",
+ "objc2-foundation",
+ "objc2-ui-kit",
  "serde",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4027,7 +4079,7 @@ dependencies = [
  "phf_shared 0.11.3",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -4057,6 +4109,26 @@ dependencies = [
  "siphasher 1.0.1",
 ]
 
+[[package]]
+name = "pin-project"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.111",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.16"
@@ -4093,8 +4165,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07"
 dependencies = [
  "base64 0.22.1",
- "indexmap 2.11.4",
- "quick-xml 0.38.3",
+ "indexmap 2.12.1",
+ "quick-xml 0.38.4",
  "serde",
  "time",
 ]
@@ -4128,9 +4200,9 @@ dependencies = [
 
 [[package]]
 name = "potential_utf"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
+checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
 dependencies = [
  "zerovec",
 ]
@@ -4182,7 +4254,7 @@ version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
 dependencies = [
- "toml_edit 0.23.7",
+ "toml_edit 0.23.9",
 ]
 
 [[package]]
@@ -4217,9 +4289,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.101"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
@@ -4254,9 +4326,9 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.38.3"
+version = "0.38.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42a232e7487fc2ef313d96dde7948e7a3c05101870d8985e4fd8d26aedd27b89"
+checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
 dependencies = [
  "memchr",
 ]
@@ -4318,9 +4390,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
 dependencies = [
  "proc-macro2",
 ]
@@ -4496,7 +4568,7 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
@@ -4538,7 +4610,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -4590,13 +4662,13 @@ dependencies = [
  "chrono",
  "client",
  "database",
- "droplet-rs",
+ "droplet-rs 0.7.3",
  "gethostname",
  "hex 0.4.3",
- "http 1.3.1",
+ "http 1.4.0",
  "log",
  "md5 0.8.0",
- "reqwest 0.12.24",
+ "reqwest 0.12.25",
  "reqwest-websocket",
  "serde",
  "serde_with",
@@ -4644,9 +4716,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.24"
+version = "0.12.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f"
+checksum = "b6eff9328d40131d43bd911d42d79eb6a47312002a4daefc9e37f17e74a7701a"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -4655,10 +4727,10 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2 0.4.12",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.7.0",
+ "hyper 1.8.1",
  "hyper-rustls",
  "hyper-tls",
  "hyper-util",
@@ -4715,8 +4787,8 @@ checksum = "57f17d28a6e6acfe1733fe24bcd30774d13bffa4b8a22535b4c8c98423088d4e"
 dependencies = [
  "anyhow",
  "async-trait",
- "http 1.3.1",
- "reqwest 0.12.24",
+ "http 1.4.0",
+ "reqwest 0.12.25",
  "serde",
  "thiserror 1.0.69",
  "tower-service",
@@ -4751,7 +4823,7 @@ dependencies = [
  "async-tungstenite",
  "bytes",
  "futures-util",
- "reqwest 0.12.24",
+ "reqwest 0.12.25",
  "thiserror 2.0.17",
  "tokio",
  "tokio-util",
@@ -4767,17 +4839,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef2bee61e6cffa4635c72d7d81a84294e28f0930db0ddcb0f66d10244674ebed"
 dependencies = [
  "ashpd",
- "block2 0.6.2",
+ "block2",
  "dispatch2",
  "glib-sys",
  "gobject-sys",
  "gtk-sys",
  "js-sys",
  "log",
- "objc2 0.6.3",
+ "objc2",
  "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.2",
+ "objc2-foundation",
  "raw-window-handle",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -4873,7 +4945,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -4886,7 +4958,7 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "errno",
  "libc",
  "linux-raw-sys 0.11.0",
@@ -4895,9 +4967,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.32"
+version = "0.23.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3c25631629d034ce7cd9940adc9d45762d46de2b0f57193c4443b92c6d4d40"
+checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f"
 dependencies = [
  "once_cell",
  "ring",
@@ -4921,9 +4993,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.12.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+checksum = "708c0f9d5f54ba0272468c1d306a52c495b31fa155e91bc25371e6df7996908c"
 dependencies = [
  "web-time",
  "zeroize",
@@ -4931,9 +5003,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.7"
+version = "0.103.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf"
+checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -4999,9 +5071,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "1.0.4"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
+checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289"
 dependencies = [
  "dyn-clone",
  "ref-cast",
@@ -5018,7 +5090,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -5039,7 +5111,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "core-foundation 0.9.4",
  "core-foundation-sys",
  "libc",
@@ -5052,7 +5124,7 @@ version = "3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
@@ -5113,7 +5185,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9faf48a4a2d2693be24c6289dbe26552776eb7737074e6722891fadbe6c5058"
 dependencies = [
- "erased-serde 0.4.8",
+ "erased-serde 0.4.9",
  "serde",
  "serde_core",
  "typeid",
@@ -5146,7 +5218,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -5157,7 +5229,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -5181,7 +5253,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -5216,17 +5288,17 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.15.0"
+version = "3.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6093cd8c01b25262b84927e0f7151692158fab02d961e04c979d3903eba7ecc5"
+checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex 0.4.3",
  "indexmap 1.9.3",
- "indexmap 2.11.4",
+ "indexmap 2.12.1",
  "schemars 0.9.0",
- "schemars 1.0.4",
+ "schemars 1.1.0",
  "serde_core",
  "serde_json",
  "serde_with_macros",
@@ -5235,14 +5307,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.15.0"
+version = "3.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7e6c180db0816026a61afa1cff5344fb7ebded7e4d3062772179f2501481c27"
+checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -5251,7 +5323,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.12.1",
  "itoa",
  "ryu",
  "serde",
@@ -5277,7 +5349,7 @@ checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -5413,18 +5485,18 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.6"
+version = "1.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "simd-adler32"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
 
 [[package]]
 name = "siphasher"
@@ -5483,24 +5555,24 @@ dependencies = [
 
 [[package]]
 name = "softbuffer"
-version = "0.4.6"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18051cdd562e792cad055119e0cdb2cfc137e44e3987532e0f9659a77931bb08"
+checksum = "aac18da81ebbf05109ab275b157c22a653bb3c12cf884450179942f81bcbf6c3"
 dependencies = [
  "bytemuck",
- "cfg_aliases",
- "core-graphics",
- "foreign-types 0.5.0",
  "js-sys",
- "log",
- "objc2 0.5.2",
- "objc2-foundation 0.2.2",
- "objc2-quartz-core 0.2.2",
+ "ndk",
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-foundation",
+ "objc2-quartz-core",
  "raw-window-handle",
  "redox_syscall 0.5.18",
+ "tracing",
  "wasm-bindgen",
  "web-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -5634,9 +5706,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.106"
+version = "2.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5666,7 +5738,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -5723,7 +5795,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "core-foundation 0.9.4",
  "system-configuration-sys 0.6.0",
 ]
@@ -5767,8 +5839,8 @@ version = "0.34.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3a753bdc39c07b192151523a3f77cd0394aa75413802c883a0f6f6a0e5ee2e7"
 dependencies = [
- "bitflags 2.9.4",
- "block2 0.6.2",
+ "bitflags 2.10.0",
+ "block2",
  "core-foundation 0.10.1",
  "core-graphics",
  "crossbeam-channel",
@@ -5785,9 +5857,9 @@ dependencies = [
  "ndk",
  "ndk-context",
  "ndk-sys",
- "objc2 0.6.3",
+ "objc2",
  "objc2-app-kit",
- "objc2-foundation 0.3.2",
+ "objc2-foundation",
  "once_cell",
  "parking_lot 0.12.5",
  "raw-window-handle",
@@ -5809,7 +5881,7 @@ checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -5840,9 +5912,9 @@ dependencies = [
 
 [[package]]
 name = "tauri"
-version = "2.9.3"
+version = "2.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e492485dd390b35f7497401f67694f46161a2a00ffd800938d5dd3c898fb9d8"
+checksum = "8a3868da5508446a7cd08956d523ac3edf0a8bc20bf7e4038f9a95c2800d2033"
 dependencies = [
  "anyhow",
  "bytes",
@@ -5854,22 +5926,22 @@ dependencies = [
  "glob",
  "gtk",
  "heck 0.5.0",
- "http 1.3.1",
+ "http 1.4.0",
  "http-range",
  "jni",
  "libc",
  "log",
  "mime",
  "muda",
- "objc2 0.6.3",
+ "objc2",
  "objc2-app-kit",
- "objc2-foundation 0.3.2",
+ "objc2-foundation",
  "objc2-ui-kit",
  "objc2-web-kit",
  "percent-encoding",
  "plist",
  "raw-window-handle",
- "reqwest 0.12.24",
+ "reqwest 0.12.25",
  "serde",
  "serde_json",
  "serde_repr",
@@ -5892,9 +5964,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-build"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87d6f8cafe6a75514ce5333f115b7b1866e8e68d9672bf4ca89fc0f35697ea9d"
+checksum = "17fcb8819fd16463512a12f531d44826ce566f486d7ccd211c9c8cebdaec4e08"
 dependencies = [
  "anyhow",
  "cargo_toml",
@@ -5914,9 +5986,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-codegen"
-version = "2.5.1"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7ef707148f0755110ca54377560ab891d722de4d53297595380a748026f139f"
+checksum = "9fa9844cefcf99554a16e0a278156ae73b0d8680bbc0e2ad1e4287aadd8489cf"
 dependencies = [
  "base64 0.22.1",
  "brotli",
@@ -5930,7 +6002,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.9",
- "syn 2.0.106",
+ "syn 2.0.111",
  "tauri-utils",
  "thiserror 2.0.17",
  "time",
@@ -5941,23 +6013,23 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "2.5.1"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71664fd715ee6e382c05345ad258d6d1d50f90cf1b58c0aa726638b33c2a075d"
+checksum = "3764a12f886d8245e66b7ee9b43ccc47883399be2019a61d80cf0f4117446fde"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
  "tauri-codegen",
  "tauri-utils",
 ]
 
 [[package]]
 name = "tauri-plugin"
-version = "2.4.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9946a3cede302eac0c6eb6c6070ac47b1768e326092d32efbb91f21ed58d978f"
+checksum = "0e1d0a4860b7ff570c891e1d2a586bf1ede205ff858fbc305e0b5ae5d14c1377"
 dependencies = [
  "anyhow",
  "glob",
@@ -5972,9 +6044,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-autostart"
-version = "2.5.0"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "062cdcd483d5e3148c9a64dabf8c574e239e2aa1193cf208d95cf89a676f87a5"
+checksum = "459383cebc193cdd03d1ba4acc40f2c408a7abce419d64bdcd2d745bc2886f70"
 dependencies = [
  "auto-launch",
  "serde",
@@ -5986,9 +6058,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-deep-link"
-version = "2.4.3"
+version = "2.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd67112fb1131834c2a7398ffcba520dbbf62c17de3b10329acd1a3554b1a9bb"
+checksum = "6e82759f7c7d51de3cbde51c04b3f2332de52436ed84541182cd8944b04e9e73"
 dependencies = [
  "dunce",
  "plist",
@@ -6001,15 +6073,15 @@ dependencies = [
  "thiserror 2.0.17",
  "tracing",
  "url",
- "windows-registry",
+ "windows-registry 0.5.3",
  "windows-result 0.3.4",
 ]
 
 [[package]]
 name = "tauri-plugin-dialog"
-version = "2.4.0"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0beee42a4002bc695550599b011728d9dfabf82f767f134754ed6655e434824e"
+checksum = "313f8138692ddc4a2127c4c9607d616a46f5c042e77b3722450866da0aad2f19"
 dependencies = [
  "log",
  "raw-window-handle",
@@ -6025,9 +6097,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-fs"
-version = "2.4.2"
+version = "2.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "315784ec4be45e90a987687bae7235e6be3d6e9e350d2b75c16b8a4bf22c1db7"
+checksum = "47df422695255ecbe7bac7012440eddaeefd026656171eac9559f5243d3230d9"
 dependencies = [
  "anyhow",
  "dunce",
@@ -6047,14 +6119,14 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-opener"
-version = "2.5.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "786156aa8e89e03d271fbd3fe642207da8e65f3c961baa9e2930f332bf80a1f5"
+checksum = "c26b72571d25dee25667940027114e60f569fc3974f8cefbe50c2cbc5fd65e3b"
 dependencies = [
  "dunce",
  "glob",
  "objc2-app-kit",
- "objc2-foundation 0.3.2",
+ "objc2-foundation",
  "open",
  "schemars 0.8.22",
  "serde",
@@ -6069,9 +6141,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-os"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a1c77ebf6f20417ab2a74e8c310820ba52151406d0c80fbcea7df232e3f6ba"
+checksum = "d8f08346c8deb39e96f86973da0e2d76cbb933d7ac9b750f6dc4daf955a6f997"
 dependencies = [
  "gethostname",
  "log",
@@ -6087,9 +6159,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-shell"
-version = "2.3.1"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54777d0c0d8add34eea3ced84378619ef5b97996bd967d3038c668feefd21071"
+checksum = "c374b6db45f2a8a304f0273a15080d98c70cde86178855fc24653ba657a1144c"
 dependencies = [
  "encoding_rs",
  "log",
@@ -6108,9 +6180,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-single-instance"
-version = "2.3.4"
+version = "2.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb9cac815bf11c4a80fb498666bcdad66d65b89e3ae24669e47806febb76389c"
+checksum = "dd707f8c86b4e3004e2c141fa24351f1909ba40ce1b8437e30d5ed5277dd3710"
 dependencies = [
  "serde",
  "serde_json",
@@ -6124,16 +6196,16 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "2.9.1"
+version = "2.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9368f09358496f2229313fccb37682ad116b7f46fa76981efe116994a0628926"
+checksum = "87f766fe9f3d1efc4b59b17e7a891ad5ed195fa8d23582abb02e6c9a01137892"
 dependencies = [
  "cookie",
  "dpi",
  "gtk",
- "http 1.3.1",
+ "http 1.4.0",
  "jni",
- "objc2 0.6.3",
+ "objc2",
  "objc2-ui-kit",
  "objc2-web-kit",
  "raw-window-handle",
@@ -6149,17 +6221,17 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "2.9.1"
+version = "2.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "929f5df216f5c02a9e894554401bcdab6eec3e39ec6a4a7731c7067fc8688a93"
+checksum = "187a3f26f681bdf028f796ccf57cf478c1ee422c50128e5a0a6ebeb3f5910065"
 dependencies = [
  "gtk",
- "http 1.3.1",
+ "http 1.4.0",
  "jni",
  "log",
- "objc2 0.6.3",
+ "objc2",
  "objc2-app-kit",
- "objc2-foundation 0.3.2",
+ "objc2-foundation",
  "once_cell",
  "percent-encoding",
  "raw-window-handle",
@@ -6176,9 +6248,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "2.8.0"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6b8bbe426abdbf52d050e52ed693130dbd68375b9ad82a3fb17efb4c8d85673"
+checksum = "76a423c51176eb3616ee9b516a9fa67fed5f0e78baaba680e44eb5dd2cc37490"
 dependencies = [
  "anyhow",
  "brotli",
@@ -6187,7 +6259,7 @@ dependencies = [
  "dunce",
  "glob",
  "html5ever",
- "http 1.3.1",
+ "http 1.4.0",
  "infer",
  "json-patch",
  "kuchikiki",
@@ -6214,10 +6286,11 @@ dependencies = [
 
 [[package]]
 name = "tauri-winres"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd21509dd1fa9bd355dc29894a6ff10635880732396aa38c0066c1e6c1ab8074"
+checksum = "1087b111fe2b005e42dbdc1990fc18593234238d47453b0c99b7de1c9ab2c1e0"
 dependencies = [
+ "dunce",
  "embed-resource",
  "toml 0.9.8",
 ]
@@ -6272,7 +6345,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -6283,7 +6356,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -6314,7 +6387,7 @@ version = "0.3.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
 dependencies = [
- "deranged 0.5.4",
+ "deranged 0.5.5",
  "itoa",
  "num-conv",
  "powerfmt",
@@ -6350,9 +6423,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -6398,7 +6471,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -6423,9 +6496,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.16"
+version = "0.7.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5"
+checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594"
 dependencies = [
  "bytes",
  "futures-core",
@@ -6453,13 +6526,13 @@ version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.12.1",
  "serde_core",
  "serde_spanned 1.0.3",
  "toml_datetime 0.7.3",
  "toml_parser",
  "toml_writer",
- "winnow 0.7.13",
+ "winnow 0.7.14",
 ]
 
 [[package]]
@@ -6486,7 +6559,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.12.1",
  "toml_datetime 0.6.3",
  "winnow 0.5.40",
 ]
@@ -6497,7 +6570,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.12.1",
  "serde",
  "serde_spanned 0.6.9",
  "toml_datetime 0.6.3",
@@ -6506,14 +6579,14 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.23.7"
+version = "0.23.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
+checksum = "5d7cbc3b4b49633d57a0509303158ca50de80ae32c265093b24c414705807832"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.12.1",
  "toml_datetime 0.7.3",
  "toml_parser",
- "winnow 0.7.13",
+ "winnow 0.7.14",
 ]
 
 [[package]]
@@ -6522,7 +6595,7 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
 dependencies = [
- "winnow 0.7.13",
+ "winnow 0.7.14",
 ]
 
 [[package]]
@@ -6548,14 +6621,14 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.6.6"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
+checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "bytes",
  "futures-util",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "iri-string",
  "pin-project-lite",
@@ -6578,10 +6651,11 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.41"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647"
 dependencies = [
+ "log",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -6589,44 +6663,44 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.30"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.34"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c"
 dependencies = [
  "once_cell",
 ]
 
 [[package]]
 name = "tray-icon"
-version = "0.21.1"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0d92153331e7d02ec09137538996a7786fe679c629c279e82a6be762b7e6fe2"
+checksum = "e3d5572781bee8e3f994d7467084e1b1fd7a93ce66bd480f8156ba89dee55a2b"
 dependencies = [
  "crossbeam-channel",
  "dirs 6.0.0",
  "libappindicator",
  "muda",
- "objc2 0.6.3",
+ "objc2",
  "objc2-app-kit",
  "objc2-core-foundation",
  "objc2-core-graphics",
- "objc2-foundation 0.3.2",
+ "objc2-foundation",
  "once_cell",
  "png",
  "serde",
  "thiserror 2.0.17",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -6643,7 +6717,7 @@ checksum = "eadc29d668c91fcc564941132e17b28a7ceb2f3ebf0b9dae3e03fd7a6748eb0d"
 dependencies = [
  "bytes",
  "data-encoding",
- "http 1.3.1",
+ "http 1.4.0",
  "httparse",
  "log",
  "rand 0.9.2",
@@ -6739,9 +6813,9 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.19"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unicode-segmentation"
@@ -6834,34 +6908,34 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.18.1"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
+checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a"
 dependencies = [
  "getrandom 0.3.4",
  "js-sys",
  "rand 0.9.2",
- "serde",
+ "serde_core",
  "uuid-macro-internal",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "uuid-macro-internal"
-version = "1.18.1"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9384a660318abfbd7f8932c34d67e4d1ec511095f95972ddc01e19d7ba8413f"
+checksum = "39d11901c36b3650df7acb0f9ebe624f35b5ac4e1922ecd3c57f444648429594"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
 name = "value-bag"
-version = "1.11.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
+checksum = "7ba6f5989077681266825251a52748b8c1d8a4ad098cc37e440103d0ea717fc0"
 
 [[package]]
 name = "vcpkg"
@@ -6871,9 +6945,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "version-compare"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
+checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e"
 
 [[package]]
 name = "version_check"
@@ -6949,9 +7023,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.104"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
+checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -6960,25 +7034,11 @@ dependencies = [
  "wasm-bindgen-shared",
 ]
 
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
- "wasm-bindgen-shared",
-]
-
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.54"
+version = "0.4.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c"
+checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -6989,9 +7049,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.104"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
+checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6999,22 +7059,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.104"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
+checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
- "wasm-bindgen-backend",
+ "syn 2.0.111",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.104"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
+checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4"
 dependencies = [
  "unicode-ident",
 ]
@@ -7052,7 +7112,7 @@ version = "0.31.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "rustix 1.1.2",
  "wayland-backend",
  "wayland-scanner",
@@ -7064,7 +7124,7 @@ version = "0.32.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -7094,9 +7154,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.81"
+version = "0.3.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120"
+checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -7122,8 +7182,8 @@ dependencies = [
  "jni",
  "log",
  "ndk-context",
- "objc2 0.6.3",
- "objc2-foundation 0.3.2",
+ "objc2",
+ "objc2-foundation",
  "url",
  "web-sys",
 ]
@@ -7184,9 +7244,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b130c0d2d49f8b6889abc456e795e82525204f27c42cf767cf0d7734e089b8"
+checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -7213,7 +7273,7 @@ checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -7275,10 +7335,10 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c"
 dependencies = [
- "objc2 0.6.3",
+ "objc2",
  "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.2",
+ "objc2-foundation",
  "raw-window-handle",
  "windows-sys 0.59.0",
  "windows-version",
@@ -7383,7 +7443,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -7394,7 +7454,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -7440,6 +7500,17 @@ dependencies = [
  "windows-strings 0.4.2",
 ]
 
+[[package]]
+name = "windows-registry"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
+dependencies = [
+ "windows-link 0.2.1",
+ "windows-result 0.4.1",
+ "windows-strings 0.5.1",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.3.4"
@@ -7811,9 +7882,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.7.13"
+version = "0.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
 dependencies = [
  "memchr",
 ]
@@ -7855,18 +7926,18 @@ checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 
 [[package]]
 name = "writeable"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 
 [[package]]
 name = "wry"
-version = "0.53.4"
+version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d78ec082b80fa088569a970d043bb3050abaabf4454101d44514ee8d9a8c9f6"
+checksum = "728b7d4c8ec8d81cab295e0b5b8a4c263c0d41a785fb8f8c4df284e5411140a2"
 dependencies = [
  "base64 0.22.1",
- "block2 0.6.2",
+ "block2",
  "cookie",
  "crossbeam-channel",
  "dirs 6.0.0",
@@ -7875,16 +7946,16 @@ dependencies = [
  "gdkx11",
  "gtk",
  "html5ever",
- "http 1.3.1",
+ "http 1.4.0",
  "javascriptcore-rs",
  "jni",
  "kuchikiki",
  "libc",
  "ndk",
- "objc2 0.6.3",
+ "objc2",
  "objc2-app-kit",
  "objc2-core-foundation",
- "objc2-foundation 0.3.2",
+ "objc2-foundation",
  "objc2-ui-kit",
  "objc2-web-kit",
  "once_cell",
@@ -7894,6 +7965,7 @@ dependencies = [
  "soup3",
  "tao-macros",
  "thiserror 2.0.17",
+ "tracing",
  "url",
  "webkit2gtk",
  "webkit2gtk-sys",
@@ -7988,11 +8060,10 @@ dependencies = [
 
 [[package]]
 name = "yoke"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
 dependencies = [
- "serde",
  "stable_deref_trait",
  "yoke-derive",
  "zerofrom",
@@ -8000,13 +8071,13 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
  "synstructure",
 ]
 
@@ -8039,7 +8110,7 @@ dependencies = [
  "uds_windows",
  "uuid",
  "windows-sys 0.61.2",
- "winnow 0.7.13",
+ "winnow 0.7.14",
  "zbus_macros",
  "zbus_names",
  "zvariant",
@@ -8054,7 +8125,7 @@ dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
  "zbus_names",
  "zvariant",
  "zvariant_utils",
@@ -8068,28 +8139,28 @@ checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97"
 dependencies = [
  "serde",
  "static_assertions",
- "winnow 0.7.13",
+ "winnow 0.7.14",
  "zvariant",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.8.27"
+version = "0.8.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.27"
+version = "0.8.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -8109,7 +8180,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
  "synstructure",
 ]
 
@@ -8121,9 +8192,9 @@ checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
 
 [[package]]
 name = "zerotrie"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
 dependencies = [
  "displaydoc",
  "yoke",
@@ -8132,9 +8203,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.4"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
+checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -8143,13 +8214,13 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
 ]
 
 [[package]]
@@ -8190,7 +8261,7 @@ dependencies = [
  "enumflags2",
  "serde",
  "url",
- "winnow 0.7.13",
+ "winnow 0.7.14",
  "zvariant_derive",
  "zvariant_utils",
 ]
@@ -8204,7 +8275,7 @@ dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.111",
  "zvariant_utils",
 ]
 
@@ -8217,6 +8288,6 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.106",
- "winnow 0.7.13",
+ "syn 2.0.111",
+ "winnow 0.7.14",
 ]
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index c165bee7..50c422b8 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -5,10 +5,19 @@ description = "The client application for the open-source, self-hosted game dist
 authors = ["Drop OSS"]
 edition = "2024"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[workspace]
+members = [
+    "client",
+    "cloud_saves",
+    "database",
+    "download_manager",
+    "games",
+    "process",
+    "remote",
+    "utils",
+]
 
-[target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\"))".dependencies]
-tauri-plugin-single-instance = { version = "2.0.0", features = ["deep-link"] }
+resolver = "3"
 
 [lib]
 # The `_lib` suffix may seem redundant but it is necessary
@@ -18,104 +27,85 @@ name = "drop_app_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]
 rustflags = ["-C", "target-feature=+aes,+sse2"]
 
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[build-dependencies]
-tauri-build = { version = "2.0.0", features = [] }
+[target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\"))".dependencies]
+tauri-plugin-single-instance = { version = "2.0.0", features = ["deep-link"] }
 
 [dependencies]
-tauri-plugin-shell = "2.2.1"
-serde_json = "1"
-rayon = "1.10.0"
-webbrowser = "1.0.2"
-url = "2.5.2"
-tauri-plugin-deep-link = "2"
-log = "0.4.22"
-hex = "0.4.3"
-tauri-plugin-dialog = "2"
-http = "1.1.0"
-urlencoding = "2.1.3"
-md5 = "0.7.0"
-chrono = "0.4.38"
-tauri-plugin-os = "2"
-boxcar = "0.2.7"
-umu-wrapper-lib = "0.1.0"
-tauri-plugin-autostart = "2.0.0"
-shared_child = "1.0.1"
-serde_with = "3.12.0"
-slice-deque = "0.3.0"
-throttle_my_fn = "0.2.6"
-parking_lot = "0.12.3"
 atomic-instant-full = "0.1.0"
+bitcode = "0.6.6"
+boxcar = "0.2.7"
+bytes = "1.10.1"
 cacache = "13.1.0"
-http-serde = "2.1.1"
-reqwest-middleware = "0.4.0"
-reqwest-middleware-cache = "0.1.1"
+chrono = "0.4.38"
+client = { version = "0.1.0", path = "./client" } #client
+database = { path = "./database" } #database
 deranged = "=0.4.0"
+dirs = "6.0.0"
+download_manager = { version = "0.1.0", path = "./download_manager" } #download manager
 droplet-rs = "0.7.3"
+filetime = "0.2.25"
+futures-core = "0.3.31"
+futures-lite = "2.6.0"
+games = { version = "0.1.0", path = "./games" } #games
 gethostname = "1.0.1"
-zstd = "0.13.3"
-tar = "0.4.44"
+hex = "0.4.3"
+http = "1.1.0"
+http-serde = "2.1.1"
+humansize = "2.1.3"
+known-folders = "1.2.0"
+log = "0.4.22"
+md5 = "0.7.0"
+native_model = { version = "0.6.4", features = [
+    "rmp_serde_1_3",
+], git = "https://github.com/Drop-OSS/native_model.git" }
+page_size = "0.6.0"
+parking_lot = "0.12.3"
+process = { path = "./process" } #process
 rand = "0.9.1"
+rayon = "1.10.0"
 regex = "1.11.1"
-tempfile = "3.19.1"
+remote = { version = "0.1.0", path = "./remote" } #remote
+reqwest-middleware = "0.4.0"
+reqwest-middleware-cache = "0.1.1"
+reqwest-websocket = "0.5.0"
 schemars = "0.8.22"
+serde_json = "1"
+serde_with = "3.12.0"
 sha1 = "0.10.6"
-dirs = "6.0.0"
-whoami = "1.6.0"
-filetime = "0.2.25"
-walkdir = "2.5.0"
-known-folders = "1.2.0"
-native_model = { version = "0.6.4", features = ["rmp_serde_1_3"], git = "https://github.com/Drop-OSS/native_model.git"}
-tauri-plugin-opener = "2.4.0"
-bitcode = "0.6.6"
-reqwest-websocket = "0.5.0"
-futures-lite = "2.6.0"
-page_size = "0.6.0"
+shared_child = "1.0.1"
+slice-deque = "0.3.0"
 sysinfo = "0.36.1"
-humansize = "2.1.3"
+tar = "0.4.44"
+tauri-plugin-autostart = "*"
+tauri-plugin-deep-link = "*"
+tauri-plugin-dialog = "*"
+tauri-plugin-opener = "*"
+tauri-plugin-os = "*"
+tauri-plugin-shell = "*"
+tempfile = "3.19.1"
+throttle_my_fn = "0.2.6"
 tokio-util = { version = "0.7.16", features = ["io"] }
-futures-core = "0.3.31"
-bytes = "1.10.1"
-# tailscale = { path = "./tailscale" }
-
-
-# Workspaces
-client = { version = "0.1.0", path = "./client" }
-database = { path = "./database" }
-process = { path = "./process" }
-remote = { version = "0.1.0", path = "./remote" }
-utils = { path = "./utils" }
-games = { version = "0.1.0", path = "./games" }
-download_manager = { version = "0.1.0", path = "./download_manager" }
+umu-wrapper-lib = "0.1.0"
+url = "2.5.2"
+urlencoding = "2.1.3"
+utils = { path = "./utils" } #utils
+walkdir = "2.5.0"
+webbrowser = "1.0.2"
+whoami = "1.6.0"
+zstd = "0.13.3"
+wry = { version = "*", features = ["tracing"] }
+tracing = { version = "0.1.43", features = ["log"] }
 
 [dependencies.dynfmt]
 version = "0.1.5"
 features = ["curly"]
 
-[dependencies.tauri]
-version = "2.9.3"
-features = ["protocol-asset", "tray-icon"]
-
-[dependencies.tokio]
-version = "1.40.0"
-features = ["rt", "tokio-macros", "signal"]
-
 [dependencies.log4rs]
 version = "1.3.0"
 features = ["console_appender", "file_appender"]
 
-[dependencies.rustix]
-version = "0.38.37"
-features = ["fs"]
-
-[dependencies.uuid]
-version = "1.10.0"
-features = ["v4", "fast-rng", "macro-diagnostics"]
-
-[dependencies.rustbreak]
-version = "2"
-features = ["other_errors"] # You can also use "yaml_enc" or "bin_enc"
-
 [dependencies.reqwest]
 version = "0.12.22"
 default-features = false
@@ -129,26 +119,34 @@ features = [
     "stream",
 ]
 
+[dependencies.rustbreak]
+version = "2"
+features = ["other_errors"] # You can also use "yaml_enc" or "bin_enc"
+
+[dependencies.rustix]
+version = "0.38.37"
+features = ["fs"]
+
 [dependencies.serde]
 version = "1"
 features = ["derive", "rc"]
 
+[dependencies.tauri]
+version = "2.9.5"
+features = ["protocol-asset", "tray-icon", "unstable"]
+
+[dependencies.tokio]
+version = "1.40.0"
+features = ["rt", "tokio-macros", "signal"]
+
+[dependencies.uuid]
+version = "1.10.0"
+features = ["v4", "fast-rng", "macro-diagnostics"]
+
+[build-dependencies]
+tauri-build = { version = "*", features = [] }
+
 [profile.release]
 lto = true
 codegen-units = 1
 panic = 'abort'
-
-
-[workspace]
-members = [
-    "client",
-    "database",
-    "process",
-    "remote",
-    "utils",
-    "cloud_saves",
-    "download_manager",
-    "games",
-]
-
-resolver = "3"
\ No newline at end of file
diff --git a/src-tauri/client/Cargo.toml b/src-tauri/client/Cargo.toml
index 6e325231..03dd6c3b 100644
--- a/src-tauri/client/Cargo.toml
+++ b/src-tauri/client/Cargo.toml
@@ -4,9 +4,9 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-bitcode = "0.6.7"
-database = { version = "0.1.0", path = "../database" }
-log = "0.4.28"
-serde = { version = "1.0.228", features = ["derive"] }
-tauri = "2.8.5"
-tauri-plugin-autostart = "2.5.0"
+bitcode = "*"
+database = { version = "*", path = "../database" }
+log = "*"
+serde = { version = "*", features = ["derive"] }
+tauri = "*"
+tauri-plugin-autostart = "*"
diff --git a/src-tauri/database/src/models.rs b/src-tauri/database/src/models.rs
index 78778862..8d6bb4fc 100644
--- a/src-tauri/database/src/models.rs
+++ b/src-tauri/database/src/models.rs
@@ -53,7 +53,10 @@ pub mod data {
         #[native_model(id = 2, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
         pub struct GameVersion {
             pub game_id: String,
-            pub version_name: String,
+            pub version_id: String,
+
+            pub display_name: Option<String>,
+            pub version_path: String,
 
             pub platform: Platform,
 
diff --git a/src-tauri/download_manager/Cargo.toml b/src-tauri/download_manager/Cargo.toml
index 56a9e938..f8e6363d 100644
--- a/src-tauri/download_manager/Cargo.toml
+++ b/src-tauri/download_manager/Cargo.toml
@@ -4,7 +4,8 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-atomic-instant-full = "0.1.0"
+async-trait = "0.1.89"
+atomic-instant-full = "0.1"
 database = { version = "0.1.0", path = "../database" }
 humansize = "2.1.3"
 log = "0.4.28"
@@ -12,6 +13,7 @@ parking_lot = "0.12.5"
 remote = { version = "0.1.0", path = "../remote" }
 serde = "1.0.228"
 serde_with = "3.15.0"
-tauri = "2.8.5"
+tauri = "*"
 throttle_my_fn = "0.2.6"
+tokio = { version = "1.48.0", features = ["sync"] }
 utils = { version = "0.1.0", path = "../utils" }
diff --git a/src-tauri/download_manager/src/download_manager_builder.rs b/src-tauri/download_manager/src/download_manager_builder.rs
index 35047731..c413ccff 100644
--- a/src-tauri/download_manager/src/download_manager_builder.rs
+++ b/src-tauri/download_manager/src/download_manager_builder.rs
@@ -1,15 +1,13 @@
 use std::{
     collections::HashMap,
-    sync::{
-        Arc, Mutex,
-        mpsc::{Receiver, Sender, channel},
-    },
-    thread::{JoinHandle, spawn},
+    sync::{Arc, Mutex},
 };
 
 use database::DownloadableMetadata;
 use log::{debug, error, info, warn};
-use tauri::AppHandle;
+use tauri::{AppHandle, async_runtime::JoinHandle};
+use tokio::sync::mpsc;
+use tokio::sync::mpsc::{Receiver, Sender};
 use utils::{app_emit, lock, send};
 
 use crate::{
@@ -83,7 +81,7 @@ pub struct DownloadManagerBuilder {
 impl DownloadManagerBuilder {
     pub fn build(app_handle: AppHandle) -> DownloadManager {
         let queue = Queue::new();
-        let (command_sender, command_receiver) = channel();
+        let (command_sender, command_receiver) = mpsc::channel(4);
         let active_progress = Arc::new(Mutex::new(None));
         let status = Arc::new(Mutex::new(DownloadManagerStatus::Empty));
 
@@ -100,7 +98,10 @@ impl DownloadManagerBuilder {
             active_control_flag: None,
         };
 
-        let terminator = spawn(|| manager.manage_queue());
+        let terminator = tauri::async_runtime::spawn(async move {
+            let result = manager.manage_queue().await;
+            info!("download manager exited with result: {:?}", result);
+        });
 
         DownloadManager::new(terminator, queue, active_progress, command_sender)
     }
@@ -109,48 +110,51 @@ impl DownloadManagerBuilder {
         *lock!(self.status) = status;
     }
 
-    fn remove_and_cleanup_front_download(&mut self, meta: &DownloadableMetadata) -> DownloadAgent {
+    async 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();
+        self.cleanup_current_download().await;
         download_agent
     }
 
     // CAREFUL WITH THIS FUNCTION
     // Make sure the download thread is terminated
-    fn cleanup_current_download(&mut self) {
+    async fn cleanup_current_download(&mut self) {
         self.active_control_flag = None;
         *lock!(self.progress) = None;
 
-        let mut download_thread_lock = lock!(self.current_download_thread);
-
-        if let Some(unfinished_thread) = download_thread_lock.take()
-            && !unfinished_thread.is_finished()
-        {
-            unfinished_thread.join().unwrap();
+        if let Some(unfinished_thread) = {
+            let mut download_thread_lock = lock!(self.current_download_thread);
+            download_thread_lock.take()
+        } {
+            let _ = unfinished_thread.await;
         }
-        drop(download_thread_lock);
     }
 
-    fn stop_and_wait_current_download(&self) -> bool {
+    async fn stop_and_wait_current_download(&self) -> bool {
         self.set_status(DownloadManagerStatus::Paused);
         if let Some(current_flag) = &self.active_control_flag {
             current_flag.set(DownloadThreadControlFlag::Stop);
         }
 
-        let mut download_thread_lock = lock!(self.current_download_thread);
-        if let Some(current_download_thread) = download_thread_lock.take() {
-            return current_download_thread.join().is_ok();
+        if let Some(current_download_thread) = {
+            let mut download_thread_lock = lock!(self.current_download_thread);
+            download_thread_lock.take()
+        } {
+            return current_download_thread.await.is_ok();
         };
 
         true
     }
 
-    fn manage_queue(mut self) -> Result<(), ()> {
+    async fn manage_queue(mut self) -> Result<(), ()> {
         loop {
-            let signal = match self.command_receiver.recv() {
-                Ok(signal) => signal,
-                Err(_) => return Err(()),
+            let signal = match self.command_receiver.recv().await {
+                Some(signal) => signal,
+                None => return Err(()),
             };
 
             match signal {
@@ -161,13 +165,13 @@ impl DownloadManagerBuilder {
                     self.manage_stop_signal();
                 }
                 DownloadManagerSignal::Completed(meta) => {
-                    self.manage_completed_signal(meta);
+                    self.manage_completed_signal(meta).await;
                 }
                 DownloadManagerSignal::Queue(download_agent) => {
-                    self.manage_queue_signal(download_agent);
+                    self.manage_queue_signal(download_agent).await;
                 }
                 DownloadManagerSignal::Error(e) => {
-                    self.manage_error_signal(e);
+                    self.manage_error_signal(e).await;
                 }
                 DownloadManagerSignal::UpdateUIQueue => {
                     self.push_ui_queue_update();
@@ -176,16 +180,16 @@ impl DownloadManagerBuilder {
                     self.push_ui_stats_update(kbs, time);
                 }
                 DownloadManagerSignal::Finish => {
-                    self.stop_and_wait_current_download();
+                    self.stop_and_wait_current_download().await;
                     return Ok(());
                 }
                 DownloadManagerSignal::Cancel(meta) => {
-                    self.manage_cancel_signal(&meta);
+                    self.manage_cancel_signal(&meta).await;
                 }
             }
         }
     }
-    fn manage_queue_signal(&mut self, download_agent: DownloadAgent) {
+    async fn manage_queue_signal(&mut self, download_agent: DownloadAgent) {
         debug!("got signal Queue");
         let meta = download_agent.metadata();
 
@@ -249,9 +253,9 @@ impl DownloadManagerBuilder {
         let mut download_thread_lock = lock!(self.current_download_thread);
         let app_handle = self.app_handle.clone();
 
-        *download_thread_lock = Some(spawn(move || {
+        *download_thread_lock = Some(tauri::async_runtime::spawn(async move {
             loop {
-                let download_result = match download_agent.download(&app_handle) {
+                let download_result = match download_agent.download(&app_handle).await {
                     // Ok(true) is for completed and exited properly
                     Ok(v) => v,
                     Err(e) => {
@@ -291,7 +295,7 @@ impl DownloadManagerBuilder {
                 }
 
                 if validate_result {
-                    download_agent.on_complete(&app_handle);
+                    download_agent.on_complete(&app_handle).await;
                     send!(
                         sender,
                         DownloadManagerSignal::Completed(download_agent.metadata())
@@ -314,31 +318,31 @@ impl DownloadManagerBuilder {
             active_control_flag.set(DownloadThreadControlFlag::Stop);
         }
     }
-    fn manage_completed_signal(&mut self, meta: DownloadableMetadata) {
+    async fn manage_completed_signal(&mut self, meta: DownloadableMetadata) {
         debug!("got signal Completed");
         if let Some(interface) = self.download_queue.read().front()
             && interface == &meta
         {
-            self.remove_and_cleanup_front_download(&meta);
+            self.remove_and_cleanup_front_download(&meta).await;
         }
 
         self.push_ui_queue_update();
         send!(self.sender, DownloadManagerSignal::Go);
     }
-    fn manage_error_signal(&mut self, error: ApplicationDownloadError) {
+    async fn manage_error_signal(&mut self, error: ApplicationDownloadError) {
         debug!("got signal Error");
         if let Some(metadata) = self.download_queue.read().front()
             && let Some(current_agent) = self.download_agent_registry.get(metadata)
         {
             current_agent.on_error(&self.app_handle, &error);
 
-            self.stop_and_wait_current_download();
-            self.remove_and_cleanup_front_download(metadata);
+            self.stop_and_wait_current_download().await;
+            self.remove_and_cleanup_front_download(metadata).await;
         }
         self.push_ui_queue_update();
         self.set_status(DownloadManagerStatus::Error);
     }
-    fn manage_cancel_signal(&mut self, meta: &DownloadableMetadata) {
+    async fn manage_cancel_signal(&mut self, meta: &DownloadableMetadata) {
         debug!("got signal Cancel");
 
         // If the current download is the one we're tryna cancel
@@ -348,11 +352,11 @@ impl DownloadManagerBuilder {
         {
             self.set_status(DownloadManagerStatus::Paused);
             current_download.on_cancelled(&self.app_handle);
-            self.stop_and_wait_current_download();
+            self.stop_and_wait_current_download().await;
 
             self.download_queue.pop_front();
 
-            self.cleanup_current_download();
+            self.cleanup_current_download().await;
             self.download_agent_registry.remove(meta);
             debug!("current download queue: {:?}", self.download_queue.read());
         }
@@ -370,7 +374,7 @@ impl DownloadManagerBuilder {
                 );
             }
         }
-        self.sender.send(DownloadManagerSignal::Go).unwrap();
+        self.sender.send(DownloadManagerSignal::Go).await.unwrap();
         self.push_ui_queue_update();
     }
     fn push_ui_stats_update(&self, kbs: usize, time: usize) {
diff --git a/src-tauri/download_manager/src/download_manager_frontend.rs b/src-tauri/download_manager/src/download_manager_frontend.rs
index fe50c55f..33471d93 100644
--- a/src-tauri/download_manager/src/download_manager_frontend.rs
+++ b/src-tauri/download_manager/src/download_manager_frontend.rs
@@ -2,16 +2,15 @@ use std::{
     any::Any,
     collections::VecDeque,
     fmt::Debug,
-    sync::{
-        Mutex, MutexGuard,
-        mpsc::{SendError, Sender},
-    },
-    thread::JoinHandle,
+    sync::{Mutex, MutexGuard},
 };
 
 use database::DownloadableMetadata;
 use log::{debug, info};
 use serde::Serialize;
+use tauri::async_runtime::JoinHandle;
+use tokio::sync::mpsc::Sender;
+use tokio::sync::mpsc::{self, error::SendError};
 use utils::{lock, send};
 
 use crate::error::ApplicationDownloadError;
@@ -81,7 +80,7 @@ pub enum DownloadStatus {
 /// THIS EDITING IS BLOCKING!!!
 #[derive(Debug)]
 pub struct DownloadManager {
-    terminator: Mutex<Option<JoinHandle<Result<(), ()>>>>,
+    terminator: Mutex<Option<JoinHandle<()>>>,
     download_queue: Queue,
     progress: CurrentProgressObject,
     command_sender: Sender<DownloadManagerSignal>,
@@ -90,7 +89,7 @@ pub struct DownloadManager {
 #[allow(dead_code)]
 impl DownloadManager {
     pub fn new(
-        terminator: JoinHandle<Result<(), ()>>,
+        terminator: JoinHandle<()>,
         download_queue: Queue,
         progress: CurrentProgressObject,
         command_sender: Sender<DownloadManagerSignal>,
@@ -103,14 +102,15 @@ impl DownloadManager {
         }
     }
 
-    pub fn queue_download(
+    pub async fn queue_download(
         &self,
         download: DownloadAgent,
     ) -> Result<(), SendError<DownloadManagerSignal>> {
         info!("creating download with meta {:?}", download.metadata());
         self.command_sender
-            .send(DownloadManagerSignal::Queue(download))?;
-        self.command_sender.send(DownloadManagerSignal::Go)
+            .send(DownloadManagerSignal::Queue(download))
+            .await?;
+        self.command_sender.send(DownloadManagerSignal::Go).await
     }
     pub fn edit(&self) -> MutexGuard<'_, VecDeque<DownloadableMetadata>> {
         self.download_queue.edit()
@@ -122,7 +122,7 @@ impl DownloadManager {
         let progress_object = (*lock!(self.progress)).clone()?;
         Some(progress_object.get_progress())
     }
-    pub fn rearrange_string(&self, meta: &DownloadableMetadata, new_index: usize) {
+    pub async fn rearrange_string(&self, meta: &DownloadableMetadata, new_index: usize) {
         let mut queue = self.edit();
         let current_index =
             get_index_from_id(&mut queue, meta).expect("Failed to get meta index from id");
@@ -132,10 +132,10 @@ impl DownloadManager {
         queue.insert(new_index, to_move);
         send!(self.command_sender, DownloadManagerSignal::UpdateUIQueue);
     }
-    pub fn cancel(&self, meta: DownloadableMetadata) {
+    pub async fn cancel(&self, meta: DownloadableMetadata) {
         send!(self.command_sender, DownloadManagerSignal::Cancel(meta));
     }
-    pub fn rearrange(&self, current_index: usize, new_index: usize) {
+    pub async fn rearrange(&self, current_index: usize, new_index: usize) {
         if current_index == new_index {
             return;
         }
@@ -147,10 +147,11 @@ impl DownloadManager {
 
         debug!("moving download at index {current_index} to index {new_index}");
 
-        let mut queue = self.edit();
-        let to_move = queue.remove(current_index).expect("Failed to get");
-        queue.insert(new_index, to_move);
-        drop(queue);
+        {
+            let mut queue = self.edit();
+            let to_move = queue.remove(current_index).expect("Failed to get");
+            queue.insert(new_index, to_move);
+        }
 
         if needs_pause {
             send!(self.command_sender, DownloadManagerSignal::Go);
@@ -158,16 +159,16 @@ impl DownloadManager {
         send!(self.command_sender, DownloadManagerSignal::UpdateUIQueue);
         send!(self.command_sender, DownloadManagerSignal::Go);
     }
-    pub fn pause_downloads(&self) {
+    pub async fn pause_downloads(&self) {
         send!(self.command_sender, DownloadManagerSignal::Stop);
     }
-    pub fn resume_downloads(&self) {
+    pub async fn resume_downloads(&self) {
         send!(self.command_sender, DownloadManagerSignal::Go);
     }
-    pub fn ensure_terminated(&self) -> Result<Result<(), ()>, Box<dyn Any + Send>> {
+    pub async fn ensure_terminated(&self) -> Result<(), tauri::Error> {
         send!(self.command_sender, DownloadManagerSignal::Finish);
         let terminator = lock!(self.terminator).take();
-        terminator.unwrap().join()
+        terminator.unwrap().await
     }
     pub fn get_sender(&self) -> Sender<DownloadManagerSignal> {
         self.command_sender.clone()
diff --git a/src-tauri/download_manager/src/downloadable.rs b/src-tauri/download_manager/src/downloadable.rs
index 0740ff3c..de5104bd 100644
--- a/src-tauri/download_manager/src/downloadable.rs
+++ b/src-tauri/download_manager/src/downloadable.rs
@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+use async_trait::async_trait;
 use database::DownloadableMetadata;
 use tauri::AppHandle;
 
@@ -16,8 +17,9 @@ use super::{
  *
  * But the download manager manages the queue state
  */
+#[async_trait]
 pub trait Downloadable: Send + Sync {
-    fn download(&self, app_handle: &AppHandle) -> Result<bool, ApplicationDownloadError>;
+    async fn download(&self, app_handle: &AppHandle) -> Result<bool, ApplicationDownloadError>;
     fn validate(&self, app_handle: &AppHandle) -> Result<bool, ApplicationDownloadError>;
 
     fn progress(&self) -> Arc<ProgressObject>;
@@ -26,6 +28,6 @@ pub trait Downloadable: Send + Sync {
     fn metadata(&self) -> DownloadableMetadata;
     fn on_queued(&self, app_handle: &AppHandle);
     fn on_error(&self, app_handle: &AppHandle, error: &ApplicationDownloadError);
-    fn on_complete(&self, app_handle: &AppHandle);
+    async fn on_complete(&self, app_handle: &AppHandle);
     fn on_cancelled(&self, app_handle: &AppHandle);
 }
diff --git a/src-tauri/download_manager/src/util/progress_object.rs b/src-tauri/download_manager/src/util/progress_object.rs
index 9f61c5d3..fae7dca7 100644
--- a/src-tauri/download_manager/src/util/progress_object.rs
+++ b/src-tauri/download_manager/src/util/progress_object.rs
@@ -2,7 +2,6 @@ use std::{
     sync::{
         Arc, Mutex,
         atomic::{AtomicUsize, Ordering},
-        mpsc::Sender,
     },
     time::{Duration, Instant},
 };
@@ -10,6 +9,7 @@ use std::{
 use atomic_instant_full::AtomicInstant;
 use throttle_my_fn::throttle;
 use utils::{lock, send};
+use tokio::sync::mpsc::Sender;
 
 use crate::download_manager_frontend::DownloadManagerSignal;
 
@@ -46,7 +46,7 @@ impl ProgressHandle {
     pub fn add(&self, amount: usize) {
         self.progress
             .fetch_add(amount, std::sync::atomic::Ordering::AcqRel);
-        calculate_update(&self.progress_object);
+        tauri::async_runtime::spawn(calculate_update(self.progress_object.clone()));
     }
     pub fn skip(&self, amount: usize) {
         self.progress
@@ -112,14 +112,17 @@ impl ProgressObject {
     }
 }
 
-#[throttle(1, Duration::from_millis(20))]
-pub fn calculate_update(progress: &ProgressObject) {
+pub async fn calculate_update(progress: Arc<ProgressObject>) {
     let last_update_time = progress
         .last_update_time
-        .swap(Instant::now(), Ordering::SeqCst);
+        .load(Ordering::SeqCst);
     let time_since_last_update = Instant::now()
         .duration_since(last_update_time)
         .as_millis_f64();
+    if time_since_last_update < 250.0 {
+        return;
+    }
+    progress.last_update_time.swap(Instant::now(), Ordering::SeqCst);
 
     let current_bytes_downloaded = progress.sum();
     let max = progress.get_max();
@@ -135,25 +138,24 @@ pub fn calculate_update(progress: &ProgressObject) {
     let bytes_remaining = max.saturating_sub(current_bytes_downloaded); // bytes
 
     progress.update_window(kilobytes_per_second as usize);
-    push_update(progress, bytes_remaining);
+    push_update(&progress, bytes_remaining).await;
 }
 
-#[throttle(1, Duration::from_millis(250))]
-pub fn push_update(progress: &ProgressObject, bytes_remaining: usize) {
+pub async 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);
+    update_ui(progress, average_speed, time_remaining).await;
+    update_queue(progress).await;
 }
 
-fn update_ui(progress_object: &ProgressObject, kilobytes_per_second: usize, time_remaining: usize) {
+async fn update_ui(progress_object: &ProgressObject, kilobytes_per_second: usize, time_remaining: usize) {
     send!(
         progress_object.sender,
         DownloadManagerSignal::UpdateUIStats(kilobytes_per_second, time_remaining)
     );
 }
 
-fn update_queue(progress: &ProgressObject) {
+async fn update_queue(progress: &ProgressObject) {
     send!(progress.sender, DownloadManagerSignal::UpdateUIQueue)
 }
diff --git a/src-tauri/games/Cargo.toml b/src-tauri/games/Cargo.toml
index c50507b9..51d737a8 100644
--- a/src-tauri/games/Cargo.toml
+++ b/src-tauri/games/Cargo.toml
@@ -11,7 +11,6 @@ database = { version = "0.1.0", path = "../database" }
 download_manager = { version = "0.1.0", path = "../download_manager" }
 hex = "0.4.3"
 log = "0.4.28"
-md5 = "0.8.0"
 rayon = "1.11.0"
 remote = { version = "0.1.0", path = "../remote" }
 reqwest = "0.12.23"
@@ -19,8 +18,17 @@ rustix = "1.1.2"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_with = "3.15.0"
 sysinfo = "0.37.2"
-tauri = "2.8.5"
+tauri = "*"
 throttle_my_fn = "0.2.6"
 utils = { version = "0.1.0", path = "../utils" }
 native_model = { version = "0.6.4", features = ["rmp_serde_1_3"], git = "https://github.com/Drop-OSS/native_model.git"}
 serde_json = "1.0.145"
+droplet-rs = { git="https://github.com/Drop-OSS/droplet-rs" }
+async-scoped = { version = "0.9.0", features = ["use-tokio"] }
+tokio = { version = "*", features = ["rt", "sync"] }
+tokio-util = { version = "*", features = ["io"] }
+futures-util = "*"
+sha2 = "0.10.9"
+ctr = "0.9.2"
+aes = "0.8.4"
+async-trait = "0.1.89"
diff --git a/src-tauri/games/src/downloads/download_agent.rs b/src-tauri/games/src/downloads/download_agent.rs
index 1d54ca0e..ea3f3b8b 100644
--- a/src-tauri/games/src/downloads/download_agent.rs
+++ b/src-tauri/games/src/downloads/download_agent.rs
@@ -1,3 +1,4 @@
+use async_trait::async_trait;
 use database::{
     ApplicationTransientStatus, DownloadType, DownloadableMetadata, borrow_db_checked,
     borrow_db_mut_checked,
@@ -9,34 +10,29 @@ use download_manager::util::download_thread_control_flag::{
     DownloadThreadControl, DownloadThreadControlFlag,
 };
 use download_manager::util::progress_object::{ProgressHandle, ProgressObject};
+use droplet_rs::manifest::Manifest;
+use futures_util::StreamExt;
+use futures_util::stream::FuturesUnordered;
 use log::{debug, error, info, warn};
-use rayon::ThreadPoolBuilder;
 use remote::auth::generate_authorization_header;
 use remote::error::RemoteAccessError;
 use remote::requests::generate_url;
-use remote::utils::{DROP_CLIENT_ASYNC, DROP_CLIENT_SYNC};
-use std::collections::{HashMap, HashSet};
-use std::fs::{OpenOptions, create_dir_all};
-use std::io;
+use remote::utils::DROP_CLIENT_ASYNC;
+use std::collections::HashMap;
 use std::path::{Path, PathBuf};
-use std::sync::mpsc::Sender;
 use std::sync::{Arc, Mutex};
 use std::time::Instant;
+use std::{io, mem};
 use tauri::AppHandle;
+use tokio::sync::Semaphore;
+use tokio::sync::mpsc::Sender;
 use utils::{app_emit, lock, send};
 
-#[cfg(target_os = "linux")]
-use rustix::fs::{FallocateFlags, fallocate};
-
-use crate::downloads::manifest::{
-    DownloadBucket, DownloadContext, DownloadDrop, DropManifest, DropValidateContext, ManifestBody,
-};
 use crate::downloads::utils::get_disk_available;
-use crate::downloads::validate::validate_game_chunk;
 use crate::library::{on_game_complete, push_game_update, set_partially_installed};
 use crate::state::GameStatusManager;
 
-use super::download_logic::download_game_bucket;
+use super::download_logic::download_game_chunk;
 use super::drop_data::DropData;
 
 static RETRY_COUNT: usize = 3;
@@ -48,9 +44,8 @@ pub struct GameDownloadAgent {
     pub id: String,
     pub version: String,
     pub control_flag: DownloadThreadControl,
-    buckets: Mutex<Vec<DownloadBucket>>,
     context_map: Mutex<HashMap<String, bool>>,
-    pub manifest: Mutex<Option<DropManifest>>,
+    pub manifest: Mutex<Option<Manifest>>,
     pub progress: Arc<ProgressObject>,
     sender: Sender<DownloadManagerSignal>,
     pub dropdata: DropData,
@@ -87,14 +82,11 @@ impl GameDownloadAgent {
         let stored_manifest =
             DropData::generate(id.clone(), version.clone(), data_base_dir_path.clone());
 
-        let context_lock = stored_manifest.contexts.lock().unwrap().clone();
-
         let result = Self {
             id,
             version,
             control_flag,
             manifest: Mutex::new(None),
-            buckets: Mutex::new(Vec::new()),
             context_map: Mutex::new(HashMap::new()),
             progress: Arc::new(ProgressObject::new(0, 0, sender.clone())),
             sender,
@@ -104,19 +96,7 @@ impl GameDownloadAgent {
 
         result.ensure_manifest_exists().await?;
 
-        let required_space = lock!(result.manifest)
-            .as_ref()
-            .unwrap()
-            .values()
-            .map(|e| {
-                e.lengths
-                    .iter()
-                    .enumerate()
-                    .filter(|(i, _)| *context_lock.get(&e.checksums[*i]).unwrap_or(&false))
-                    .map(|(_, v)| v)
-                    .sum::<usize>()
-            })
-            .sum::<usize>() as u64;
+        let required_space = lock!(result.manifest).as_ref().unwrap().size;
 
         let available_space = get_disk_available(data_base_dir_path)? as u64;
 
@@ -147,21 +127,22 @@ impl GameDownloadAgent {
             return Err(ApplicationDownloadError::NotInitialized);
         }
 
-        self.ensure_buckets()?;
-
         self.control_flag.set(DownloadThreadControlFlag::Go);
 
         Ok(())
     }
 
     // Blocking
-    pub fn download(&self, app_handle: &AppHandle) -> Result<bool, ApplicationDownloadError> {
+    pub async fn download(&self, app_handle: &AppHandle) -> Result<bool, ApplicationDownloadError> {
         self.setup_download(app_handle)?;
         let timer = Instant::now();
 
         info!("beginning download for {}...", self.metadata().id);
 
-        let res = self.run().map_err(ApplicationDownloadError::Communication);
+        let res = self
+            .run()
+            .await
+            .map_err(ApplicationDownloadError::Communication);
 
         debug!(
             "{} took {}ms to download",
@@ -207,7 +188,7 @@ impl GameDownloadAgent {
             ));
         }
 
-        let manifest_download: DropManifest = response
+        let manifest_download: Manifest = response
             .json()
             .await
             .map_err(|e| ApplicationDownloadError::Communication(e.into()))?;
@@ -222,321 +203,119 @@ impl GameDownloadAgent {
 
     // Sets it up for both download and validate
     fn setup_progress(&self) {
-        let buckets = lock!(self.buckets);
-
-        let chunk_count = buckets.iter().map(|e| e.drops.len()).sum();
-
-        let total_length = buckets
-            .iter()
-            .map(|bucket| bucket.drops.iter().map(|e| e.length).sum::<usize>())
-            .sum();
+        let manifest = lock!(self.manifest);
+        let manifest = manifest.as_ref().unwrap();
 
-        self.progress.set_max(total_length);
-        self.progress.set_size(chunk_count);
+        self.progress.set_max(manifest.size.try_into().unwrap());
+        self.progress.set_size(manifest.chunks.len());
         self.progress.reset();
     }
 
-    pub fn ensure_buckets(&self) -> Result<(), ApplicationDownloadError> {
-        if lock!(self.buckets).is_empty() {
-            self.generate_buckets()?;
-        }
-
-        *lock!(self.context_map) = self.dropdata.get_contexts();
-
-        Ok(())
-    }
-
-    pub fn generate_buckets(&self) -> Result<(), ApplicationDownloadError> {
-        let manifest = lock!(self.manifest)
-            .clone()
-            .ok_or(ApplicationDownloadError::NotInitialized)?;
-        let game_id = self.id.clone();
-
-        let base_path = Path::new(&self.dropdata.base_path);
-        create_dir_all(base_path)?;
-
-        let mut buckets = Vec::new();
-
-        let mut current_buckets = HashMap::<String, DownloadBucket>::new();
-        let mut current_bucket_sizes = HashMap::<String, usize>::new();
-
-        for (raw_path, chunk) in manifest {
-            let path = base_path.join(Path::new(&raw_path));
-
-            let container = path
-                .parent()
-                .ok_or(ApplicationDownloadError::IoError(Arc::new(io::Error::new(
-                    io::ErrorKind::NotFound,
-                    "no parent directory",
-                ))))?;
-            create_dir_all(container)?;
-
-            let already_exists = path.exists();
-            let file = OpenOptions::new()
-                .read(true)
-                .write(true)
-                .create(true)
-                .truncate(false)
-                .open(&path)?;
-            let mut file_running_offset = 0;
-
-            for (index, length) in chunk.lengths.iter().enumerate() {
-                let drop = DownloadDrop {
-                    filename: raw_path.to_string(),
-                    start: file_running_offset,
-                    length: *length,
-                    checksum: chunk.checksums[index].clone(),
-                    permissions: chunk.permissions,
-                    path: path.clone(),
-                    index,
-                };
-                file_running_offset += *length;
-
-                if *length >= TARGET_BUCKET_SIZE {
-                    // They get their own bucket
-
-                    buckets.push(DownloadBucket {
-                        game_id: game_id.clone(),
-                        version: chunk.version_name.clone(),
-                        drops: vec![drop],
-                    });
-
-                    continue;
-                }
-
-                let current_bucket_size = current_bucket_sizes
-                    .entry(chunk.version_name.clone())
-                    .or_insert_with(|| 0);
-                let c_version_name = chunk.version_name.clone();
-                let c_game_id = game_id.clone();
-                let current_bucket = current_buckets
-                    .entry(chunk.version_name.clone())
-                    .or_insert_with(|| DownloadBucket {
-                        game_id: c_game_id,
-                        version: c_version_name,
-                        drops: vec![],
-                    });
-
-                if (*current_bucket_size + length >= TARGET_BUCKET_SIZE
-                    || current_bucket.drops.len() >= MAX_FILES_PER_BUCKET)
-                    && !current_bucket.drops.is_empty()
-                {
-                    // Move current bucket into list and make a new one
-                    buckets.push(current_bucket.clone());
-                    *current_bucket = DownloadBucket {
-                        game_id: game_id.clone(),
-                        version: chunk.version_name.clone(),
-                        drops: vec![],
-                    };
-                    *current_bucket_size = 0;
-                }
-
-                current_bucket.drops.push(drop);
-                *current_bucket_size += *length;
-            }
-
-            #[cfg(target_os = "linux")]
-            if file_running_offset > 0 && !already_exists {
-                let _ = fallocate(file, FallocateFlags::empty(), 0, file_running_offset as u64);
-            }
-        }
-
-        for (_, bucket) in current_buckets.into_iter() {
-            if !bucket.drops.is_empty() {
-                buckets.push(bucket);
-            }
-        }
-
-        info!("buckets: {}", buckets.len());
-
-        let existing_contexts = self.dropdata.get_contexts();
-        self.dropdata.set_contexts(
-            &buckets
-                .iter()
-                .flat_map(|x| x.drops.iter().map(|v| v.checksum.clone()))
-                .map(|x| {
-                    let contains = existing_contexts.get(&x).unwrap_or(&false);
-                    (x, *contains)
-                })
-                .collect::<Vec<(String, bool)>>(),
-        );
-
-        *lock!(self.buckets) = buckets;
-
-        Ok(())
-    }
-
-    fn run(&self) -> Result<bool, RemoteAccessError> {
+    async fn run(&self) -> Result<bool, RemoteAccessError> {
         self.setup_progress();
+        let (chunks, key) = {
+            let manifest = lock!(self.manifest);
+            let manifest = manifest.as_ref().unwrap();
+            (manifest.chunks.clone(), manifest.key)
+        };
+        let chunk_len = chunks.len();
+        let mut completed_chunks = {
+            let completed_chunks = lock!(self.context_map);
+            completed_chunks.clone()
+        };
         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_or_else(|_| {
-                panic!("failed to build thread pool with {max_download_threads} threads")
-            });
-
-        let buckets = lock!(self.buckets);
+        let metrics = tauri::async_runtime::handle().inner().metrics();
+        info!("using {} workers", metrics.num_workers());
 
-        let mut download_contexts = HashMap::<String, DownloadContext>::new();
+        let futures_unordered = FuturesUnordered::new();
 
-        let versions = buckets
-            .iter()
-            .map(|e| &e.version)
-            .collect::<HashSet<_>>()
-            .into_iter()
-            .cloned()
-            .collect::<Vec<String>>();
-
-        info!("downloading across these versions: {versions:?}");
-
-        let completed_contexts = Arc::new(boxcar::Vec::new());
-        let completed_indexes_loop_arc = completed_contexts.clone();
-
-        for version in versions {
-            let download_context = DROP_CLIENT_SYNC
-                .post(generate_url(&["/api/v2/client/context"], &[])?)
-                .json(&ManifestBody {
-                    game: self.id.clone(),
-                    version: version.clone(),
-                })
-                .header("Authorization", generate_authorization_header())
-                .send()?;
-
-            if download_context.status() != 200 {
-                return Err(RemoteAccessError::InvalidResponse(download_context.json()?));
-            }
+        for (index, (chunk_id, chunk_data)) in chunks.into_iter().enumerate() {
+            let progress = self.progress.get(index);
+            let progress_handle = ProgressHandle::new(progress, self.progress.clone());
 
-            let download_context = download_context.json::<DownloadContext>()?;
-            info!(
-                "download context: ({}) {}",
-                &version, download_context.context
-            );
-            download_contexts.insert(version, download_context);
-        }
+            let chunk_length = chunk_data.files.iter().map(|v| v.length).sum();
 
-        let download_contexts = &download_contexts;
+            if *completed_chunks.get(&chunk_id).unwrap_or(&false) {
+                progress_handle.skip(chunk_length);
+                continue;
+            }
 
-        pool.scope(|scope| {
-            let context_map = lock!(self.context_map);
-            for (index, bucket) in buckets.iter().enumerate() {
-                let mut bucket = (*bucket).clone();
-                let completed_contexts = 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
-                // Note to future DecDuck, DropData gets loaded into context_map
-                let todo_drops = bucket
-                    .drops
-                    .into_iter()
-                    .filter(|e| {
-                        let todo = !*context_map.get(&e.checksum).unwrap_or(&false);
-                        if !todo {
-                            progress_handle.skip(e.length);
+            let sender = self.sender.clone();
+
+            futures_unordered.push(async move { async move {
+                for i in 0..RETRY_COUNT {
+                    let loop_progress_handle = progress_handle.clone();
+                    let base_path = self.dropdata.base_path.clone();
+                    info!("starting chunk {}", chunk_id);
+                    match download_game_chunk(
+                        &self.id,
+                        &self.version,
+                        &chunk_id,
+                        &key,
+                        &chunk_data,
+                        base_path,
+                        &self.control_flag,
+                        loop_progress_handle,
+                    )
+                    .await
+                    {
+                        Ok(true) => {
+                            return Some(chunk_id.clone());
                         }
-                        todo
-                    })
-                    .collect::<Vec<DownloadDrop>>();
-
-                if todo_drops.is_empty() {
-                    continue;
-                };
-
-                bucket.drops = todo_drops;
-
-                let sender = self.sender.clone();
-
-                let download_context =
-                    download_contexts.get(&bucket.version).unwrap_or_else(|| {
-                        panic!(
-                            "Could not get bucket version {}. Corrupted state.",
-                            bucket.version
-                        )
-                    });
-
-                scope.spawn(move |_| {
-                    // 3 attempts
-                    for i in 0..RETRY_COUNT {
-                        let loop_progress_handle = progress_handle.clone();
-                        match download_game_bucket(
-                            &bucket,
-                            download_context,
-                            &self.control_flag,
-                            loop_progress_handle,
-                        ) {
-                            Ok(true) => {
-                                for drop in bucket.drops {
-                                    completed_contexts.push(drop.checksum);
-                                }
-                                return;
-                            }
-                            Ok(false) => return,
-                            Err(e) => {
-                                warn!("game download agent error: {e}");
-
-                                let retry = matches!(
-                                    &e,
-                                    ApplicationDownloadError::Communication(_)
-                                        | ApplicationDownloadError::Checksum
-                                        | ApplicationDownloadError::Lock
-                                        | ApplicationDownloadError::IoError(_)
-                                );
-
-                                if i == RETRY_COUNT - 1 || !retry {
-                                    warn!("retry logic failed, not re-attempting.");
-                                    send!(sender, DownloadManagerSignal::Error(e));
-                                    return;
-                                }
+                        Ok(false) => return None,
+                        Err(e) => {
+                            warn!("game download agent error: {e:?}");
+
+                            let retry = matches!(
+                                &e,
+                                ApplicationDownloadError::Communication(_)
+                                    | ApplicationDownloadError::Checksum
+                                    | ApplicationDownloadError::Lock
+                                    | ApplicationDownloadError::IoError(_)
+                            );
+
+                            if i == RETRY_COUNT - 1 || !retry {
+                                warn!("retry logic failed, not re-attempting.");
+                                send!(sender, DownloadManagerSignal::Error(e));
+                                return None;
                             }
                         }
                     }
-                });
-            }
-        });
+                }
+                return None;
+            } });
+        }
 
-        let newly_completed = completed_contexts.clone();
+        let outputs = futures_unordered.buffer_unordered(max_download_threads).collect::<Vec<Option<String>>>().await;
 
-        let completed_lock_len = {
-            let mut context_map_lock = lock!(self.context_map);
-            for (_, item) in newly_completed.iter() {
-                context_map_lock.insert(item.clone(), true);
+        for completed_chunk in outputs {
+            if let Some(completed_chunk) = completed_chunk {
+                completed_chunks.insert(completed_chunk, true);
             }
+        }
 
-            context_map_lock.values().filter(|x| **x).count()
-        };
-
-        let context_map_lock = lock!(self.context_map);
-        let contexts = buckets
+        let drop_data_chunks = completed_chunks
             .iter()
-            .flat_map(|x| x.drops.iter().map(|e| e.checksum.clone()))
-            .map(|x| {
-                let completed = context_map_lock.get(&x).unwrap_or(&false);
-                (x, *completed)
-            })
+            .map(|v| (v.0.to_string(), *v.1))
             .collect::<Vec<(String, bool)>>();
-        drop(context_map_lock);
 
-        self.dropdata.set_contexts(&contexts);
+        self.dropdata.set_contexts(&drop_data_chunks);
         self.dropdata.write();
 
         // If there are any contexts left which are false
-        if !contexts.iter().all(|x| x.1) {
+        if !completed_chunks.iter().all(|x| *x.1) {
             info!(
-                "download agent for {} exited without completing ({}/{}) ({} buckets)",
+                "download agent for {} exited without completing ({}/{})",
                 self.id.clone(),
-                completed_lock_len,
-                contexts.len(),
-                buckets.len()
+                completed_chunks.iter().filter(|v| *v.1).count(),
+                chunk_len,
             );
+            self.context_map.replace(completed_chunks).unwrap();
+
             return Ok(false);
         }
+        self.context_map.replace(completed_chunks).unwrap();
 
         Ok(true)
     }
@@ -559,6 +338,7 @@ impl GameDownloadAgent {
     }
 
     pub fn validate(&self, app_handle: &AppHandle) -> Result<bool, ApplicationDownloadError> {
+        /*
         self.setup_validate(app_handle);
 
         let buckets = lock!(self.buckets);
@@ -612,6 +392,7 @@ impl GameDownloadAgent {
 
             return Ok(false);
         }
+         */
 
         Ok(true)
     }
@@ -628,10 +409,11 @@ impl GameDownloadAgent {
     }
 }
 
+#[async_trait]
 impl Downloadable for GameDownloadAgent {
-    fn download(&self, app_handle: &AppHandle) -> Result<bool, ApplicationDownloadError> {
+    async fn download(&self, app_handle: &AppHandle) -> Result<bool, ApplicationDownloadError> {
         *lock!(self.status) = DownloadStatus::Downloading;
-        self.download(app_handle)
+        self.download(app_handle).await
     }
 
     fn validate(&self, app_handle: &AppHandle) -> Result<bool, ApplicationDownloadError> {
@@ -688,7 +470,7 @@ impl Downloadable for GameDownloadAgent {
         );
     }
 
-    fn on_complete(&self, app_handle: &tauri::AppHandle) {
+    async fn on_complete(&self, app_handle: &tauri::AppHandle) {
         match on_game_complete(
             &self.metadata(),
             self.dropdata.base_path.to_string_lossy().to_string(),
diff --git a/src-tauri/games/src/downloads/download_logic.rs b/src-tauri/games/src/downloads/download_logic.rs
index d5d650b5..40f54db8 100644
--- a/src-tauri/games/src/downloads/download_logic.rs
+++ b/src-tauri/games/src/downloads/download_logic.rs
@@ -1,175 +1,43 @@
 use std::fs::{Permissions, set_permissions};
-use std::io::Read;
+use std::io::{Read, SeekFrom};
 #[cfg(unix)]
 use std::os::unix::fs::PermissionsExt;
+use std::path::PathBuf;
 use std::sync::Arc;
 use std::time::Instant;
-use std::{
-    fs::{File, OpenOptions},
-    io::{self, BufWriter, Seek, SeekFrom, Write},
-    path::PathBuf,
-};
 
+use aes::cipher::{KeyIvInit, StreamCipher};
 use download_manager::error::ApplicationDownloadError;
 use download_manager::util::download_thread_control_flag::{
     DownloadThreadControl, DownloadThreadControlFlag,
 };
 use download_manager::util::progress_object::ProgressHandle;
+use droplet_rs::manifest::ChunkData;
+use futures_util::StreamExt as _;
 use log::{debug, info, warn};
-use md5::{Context, Digest};
 use remote::auth::generate_authorization_header;
 use remote::error::{DropServerError, RemoteAccessError};
 use remote::requests::generate_url;
-use remote::utils::DROP_CLIENT_SYNC;
-use reqwest::blocking::Response;
-
-use crate::downloads::manifest::{ChunkBody, DownloadBucket, DownloadContext, DownloadDrop};
+use remote::utils::DROP_CLIENT_ASYNC;
+use sha2::Digest;
+use tokio::fs::OpenOptions;
+use tokio::io::{AsyncReadExt, AsyncSeekExt, AsyncWriteExt};
+use tokio_util::io::StreamReader;
 
 static MAX_PACKET_LENGTH: usize = 4096 * 4;
 static BUMP_SIZE: usize = 4096 * 16;
 
-pub struct DropWriter<W: Write> {
-    hasher: Context,
-    destination: BufWriter<W>,
-    progress: ProgressHandle,
-}
-impl DropWriter<File> {
-    fn new(path: PathBuf, progress: ProgressHandle) -> Result<Self, io::Error> {
-        let destination = OpenOptions::new()
-            .write(true)
-            .create(true)
-            .truncate(false)
-            .open(&path)
-            .inspect_err(|_v| warn!("failed to open {}", path.display()))?;
-        Ok(Self {
-            destination: BufWriter::with_capacity(1024 * 1024, destination),
-            hasher: Context::new(),
-            progress,
-        })
-    }
-
-    fn finish(mut self) -> io::Result<Digest> {
-        self.flush()?;
-        Ok(self.hasher.finalize())
-    }
-}
-// Write automatically pushes to file and hasher
-impl Write for DropWriter<File> {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.hasher
-            .write_all(buf)
-            .map_err(|e| io::Error::other(format!("Unable to write to hasher: {e}")))?;
-        let bytes_written = self.destination.write(buf)?;
-        self.progress.add(bytes_written);
-
-        Ok(bytes_written)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        self.hasher.flush()?;
-        self.destination.flush()
-    }
-}
-// Seek moves around destination output
-impl Seek for DropWriter<File> {
-    fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
-        self.destination.seek(pos)
-    }
-}
-
-pub struct DropDownloadPipeline<'a, R: Read, W: Write> {
-    pub source: R,
-    pub drops: Vec<DownloadDrop>,
-    pub destination: Vec<DropWriter<W>>,
-    pub control_flag: &'a DownloadThreadControl,
-    #[allow(dead_code)]
-    progress: ProgressHandle,
-}
-
-impl<'a> DropDownloadPipeline<'a, Response, File> {
-    fn new(
-        source: Response,
-        drops: Vec<DownloadDrop>,
-        control_flag: &'a DownloadThreadControl,
-        progress: ProgressHandle,
-    ) -> Result<Self, io::Error> {
-        Ok(Self {
-            source,
-            destination: drops
-                .iter()
-                .map(|drop| DropWriter::new(drop.path.clone(), progress.clone()))
-                .try_collect()?,
-            drops,
-            control_flag,
-            progress,
-        })
-    }
-
-    fn copy(&mut self) -> Result<bool, io::Error> {
-        let mut copy_buffer = [0u8; MAX_PACKET_LENGTH];
-        for (index, drop) in self.drops.iter().enumerate() {
-            let destination = self
-                .destination
-                .get_mut(index)
-                .ok_or(io::Error::other("no destination"))?;
-            let mut remaining = drop.length;
-            if drop.start != 0 {
-                destination.seek(SeekFrom::Start(drop.start as u64))?;
-            }
-            let mut last_bump = 0;
-            loop {
-                let size = MAX_PACKET_LENGTH.min(remaining);
-                let size = self
-                    .source
-                    .read(&mut copy_buffer[0..size])
-                    .inspect_err(|_| {
-                        warn!("got error from {}", drop.filename);
-                    })?;
-                remaining -= size;
-                last_bump += size;
+const READ_BUF_LEN: usize = 1 * 1024 * 1024;
 
-                destination.write_all(&copy_buffer[0..size])?;
+type Aes128Ctr64LE = ctr::Ctr64LE<aes::Aes128>;
 
-                if last_bump > BUMP_SIZE {
-                    last_bump -= BUMP_SIZE;
-                    if self.control_flag.get() == DownloadThreadControlFlag::Stop {
-                        return Ok(false);
-                    }
-                }
-
-                if remaining == 0 {
-                    break;
-                };
-            }
-
-            if self.control_flag.get() == DownloadThreadControlFlag::Stop {
-                return Ok(false);
-            }
-        }
-
-        Ok(true)
-    }
-
-    #[allow(dead_code)]
-    fn debug_skip_checksum(self) {
-        self.destination
-            .into_iter()
-            .for_each(|mut e| e.flush().unwrap());
-    }
-
-    fn finish(self) -> Result<Vec<Digest>, io::Error> {
-        let checksums = self
-            .destination
-            .into_iter()
-            .map(|e| e.finish())
-            .try_collect()?;
-        Ok(checksums)
-    }
-}
-
-pub fn download_game_bucket(
-    bucket: &DownloadBucket,
-    ctx: &DownloadContext,
+pub async fn download_game_chunk(
+    game_id: &str,
+    version_id: &str,
+    chunk_id: &str,
+    key: &[u8; 16],
+    chunk_data: &ChunkData,
+    base_path: PathBuf,
     control_flag: &DownloadThreadControl,
     progress: ProgressHandle,
 ) -> Result<bool, ApplicationDownloadError> {
@@ -183,21 +51,22 @@ pub fn download_game_bucket(
 
     let header = generate_authorization_header();
 
-    let url = generate_url(&["/api/v2/client/chunk"], &[])
-        .map_err(ApplicationDownloadError::Communication)?;
-
-    let body = ChunkBody::create(ctx, &bucket.drops);
+    let url = generate_url(
+        &["/api/v1/depot/content", game_id, version_id, chunk_id],
+        &[],
+    )
+    .map_err(ApplicationDownloadError::Communication)?;
 
-    let response = DROP_CLIENT_SYNC
-        .post(url)
-        .json(&body)
+    let response = DROP_CLIENT_ASYNC
+        .get(url)
         .header("Authorization", header)
         .send()
+        .await
         .map_err(|e| ApplicationDownloadError::Communication(e.into()))?;
 
     if response.status() != 200 {
         info!("chunk request got status code: {}", response.status());
-        let raw_res = response.text().map_err(|e| {
+        let raw_res = response.text().await.map_err(|e| {
             ApplicationDownloadError::Communication(RemoteAccessError::FetchError(e.into()))
         })?;
         info!("{raw_res}");
@@ -211,92 +80,62 @@ pub fn download_game_bucket(
         ));
     }
 
-    let lengths = response
-        .headers()
-        .get("Content-Lengths")
-        .ok_or(ApplicationDownloadError::Communication(
-            RemoteAccessError::UnparseableResponse("missing Content-Lengths header".to_owned()),
-        ))?
-        .to_str()
-        .map_err(|e| {
-            ApplicationDownloadError::Communication(RemoteAccessError::UnparseableResponse(
-                e.to_string(),
-            ))
-        })?;
-
-    for (i, raw_length) in lengths.split(",").enumerate() {
-        let length = raw_length.parse::<usize>().unwrap_or(0);
-        let Some(drop) = bucket.drops.get(i) else {
-            warn!("invalid number of Content-Lengths recieved: {i}, {lengths}");
-            return Err(ApplicationDownloadError::DownloadError(
-                RemoteAccessError::InvalidResponse(DropServerError {
-                    status_code: 400,
-                    status_message: "Server Error".to_owned(),
-                    message: format!(
-                        "invalid number of Content-Lengths recieved: {i}, {lengths}"
-                    ),
-                }),
-            ));
-        };
-        if drop.length != length {
-            warn!(
-                "for {}, expected {}, got {} ({})",
-                drop.filename, drop.length, raw_length, length
-            );
-            return Err(ApplicationDownloadError::DownloadError(
-                RemoteAccessError::InvalidResponse(DropServerError {
-                    status_code: 400,
-                    status_message: "Server Error".to_owned(),
-                    message: format!(
-                        "for {}, expected {}, got {} ({})",
-                        drop.filename, drop.length, raw_length, length
-                    ),
-                }),
-            ));
-        }
-    }
-
     let timestep = start.elapsed().as_millis();
 
     debug!("took {}ms to start downloading", timestep);
 
-    let mut pipeline =
-        DropDownloadPipeline::new(response, bucket.drops.clone(), control_flag, progress)
-            .map_err(|e| ApplicationDownloadError::IoError(Arc::new(e)))?;
-
-    let completed = pipeline
-        .copy()
-        .map_err(|e| ApplicationDownloadError::IoError(Arc::new(e)))?;
-    if !completed {
-        return Ok(false);
-    }
+    let stream = response
+        .bytes_stream()
+        .map(|v| v.map_err(|err| std::io::Error::other(err)));
+    let mut stream_reader = StreamReader::new(stream);
+
+    let mut hasher = sha2::Sha256::new();
+    let mut cipher = Aes128Ctr64LE::new(key.into(), &chunk_data.iv.into());
+    let mut read_buf = vec![0u8; READ_BUF_LEN];
+    for file in &chunk_data.files {
+        let path = base_path.join(file.filename.clone());
+        if let Some(parent) = path.parent() {
+            tokio::fs::create_dir_all(parent).await?;
+        }
+        let mut file_handle = OpenOptions::new()
+            .truncate(false)
+            .write(true)
+            .append(false)
+            .create(true)
+            .open(&path)
+            .await?;
+        file_handle
+            .seek(SeekFrom::Start(file.start.try_into().unwrap()))
+            .await?;
+
+        let mut remaining = file.length;
+        while remaining > 0 {
+            let amount = stream_reader.read(&mut read_buf[0..remaining.min(READ_BUF_LEN)]).await?;
+            progress.add(amount);
+            remaining -= amount;
+
+            cipher.apply_keystream(&mut read_buf[0..amount]);
+            hasher.update(&read_buf[0..amount]);
+            file_handle.write_all(&read_buf[0..amount]).await?;
+        }
 
-    // If we complete the file, set the permissions (if on Linux)
-    #[cfg(unix)]
-    {
-        for drop in bucket.drops.iter() {
-            let permission = if drop.permissions == 0 {
+        #[cfg(unix)]
+        {
+            drop(file_handle);
+            let permissions = if file.permissions == 0 {
                 0o744
             } else {
-                drop.permissions
+                file.permissions
             };
-            let permissions = Permissions::from_mode(permission);
-            set_permissions(drop.path.clone(), permissions)
+            let permissions = Permissions::from_mode(permissions);
+            set_permissions(path, permissions)
                 .map_err(|e| ApplicationDownloadError::IoError(Arc::new(e)))?;
         }
     }
 
-    let checksums = pipeline
-        .finish()
-        .map_err(|e| ApplicationDownloadError::IoError(Arc::new(e)))?;
-
-    for (index, drop) in bucket.drops.iter().enumerate() {
-        let res = hex::encode(**checksums.get(index).unwrap());
-        if res != drop.checksum {
-            warn!("context didn't match... doing nothing because we will validate later.");
-            // return Ok(false);
-            // return Err(ApplicationDownloadError::Checksum);
-        }
+    let digest = hex::encode(hasher.finalize());
+    if digest != chunk_data.checksum {
+        return Err(ApplicationDownloadError::Checksum);
     }
 
     Ok(true)
diff --git a/src-tauri/games/src/downloads/manifest.rs b/src-tauri/games/src/downloads/manifest.rs
index b1b4baaf..bba8a9ef 100644
--- a/src-tauri/games/src/downloads/manifest.rs
+++ b/src-tauri/games/src/downloads/manifest.rs
@@ -61,17 +61,6 @@ impl ChunkBody {
     }
 }
 
-pub type DropManifest = HashMap<String, DropChunk>;
-#[derive(Serialize, Deserialize, Debug, Clone, Ord, PartialOrd, Eq, PartialEq)]
-#[serde(rename_all = "camelCase")]
-pub struct DropChunk {
-    pub permissions: u32,
-    pub ids: Vec<String>,
-    pub checksums: Vec<String>,
-    pub lengths: Vec<usize>,
-    pub version_name: String,
-}
-
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct DropValidateContext {
     pub index: usize,
diff --git a/src-tauri/games/src/downloads/mod.rs b/src-tauri/games/src/downloads/mod.rs
index 7cd01d0c..afc9d367 100644
--- a/src-tauri/games/src/downloads/mod.rs
+++ b/src-tauri/games/src/downloads/mod.rs
@@ -3,5 +3,4 @@ mod download_logic;
 pub mod drop_data;
 pub mod error;
 mod manifest;
-pub mod utils;
-pub mod validate;
+pub mod utils;
\ No newline at end of file
diff --git a/src-tauri/games/src/downloads/validate.rs b/src-tauri/games/src/downloads/validate.rs
deleted file mode 100644
index 0c709f7a..00000000
--- a/src-tauri/games/src/downloads/validate.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-use std::{
-    fs::File,
-    io::{self, BufWriter, Read, Seek, SeekFrom, Write},
-};
-
-use download_manager::{
-    error::ApplicationDownloadError,
-    util::{
-        download_thread_control_flag::{DownloadThreadControl, DownloadThreadControlFlag},
-        progress_object::ProgressHandle,
-    },
-};
-use log::debug;
-use md5::Context;
-
-use crate::downloads::manifest::DropValidateContext;
-
-pub fn validate_game_chunk(
-    ctx: &DropValidateContext,
-    control_flag: &DownloadThreadControl,
-    progress: ProgressHandle,
-) -> Result<bool, ApplicationDownloadError> {
-    debug!(
-        "Starting chunk validation {}, {}, {} #{}",
-        ctx.path.display(),
-        ctx.index,
-        ctx.offset,
-        ctx.checksum
-    );
-    // If we're paused
-    if control_flag.get() == DownloadThreadControlFlag::Stop {
-        progress.set(0);
-        return Ok(false);
-    }
-
-    let Ok(mut source) = File::open(&ctx.path) else {
-        return Ok(false);
-    };
-
-    if ctx.offset != 0 {
-        source
-            .seek(SeekFrom::Start(ctx.offset as u64))
-            .expect("Failed to seek to file offset");
-    }
-
-    let mut hasher = md5::Context::new();
-
-    let completed = validate_copy(&mut source, &mut hasher, ctx.length, control_flag, progress)?;
-    if !completed {
-        return Ok(false);
-    }
-
-    let res = hex::encode(hasher.finalize().0);
-    if res != ctx.checksum {
-        return Ok(false);
-    }
-
-    debug!(
-        "Successfully finished verification #{}, copied {} bytes",
-        ctx.checksum, ctx.length
-    );
-
-    Ok(true)
-}
-
-fn validate_copy(
-    source: &mut File,
-    dest: &mut Context,
-    size: usize,
-    control_flag: &DownloadThreadControl,
-    progress: ProgressHandle,
-) -> Result<bool, io::Error> {
-    let copy_buf_size = 512;
-    let mut copy_buf = vec![0; copy_buf_size];
-    let mut buf_writer = BufWriter::with_capacity(1024 * 1024, dest);
-    let mut total_bytes = 0;
-
-    loop {
-        if control_flag.get() == DownloadThreadControlFlag::Stop {
-            buf_writer.flush()?;
-            return Ok(false);
-        }
-
-        let mut bytes_read = source.read(&mut copy_buf)?;
-        total_bytes += bytes_read;
-
-        // If we read over (likely), truncate our read to
-        // the right size
-        if total_bytes > size {
-            let over = total_bytes - size;
-            bytes_read -= over;
-            total_bytes = size;
-        }
-
-        buf_writer.write_all(&copy_buf[0..bytes_read])?;
-        progress.add(bytes_read);
-
-        if total_bytes >= size {
-            break;
-        }
-    }
-    buf_writer.flush()?;
-    Ok(true)
-}
diff --git a/src-tauri/games/src/lib.rs b/src-tauri/games/src/lib.rs
index 7cd794a7..e4e413a7 100644
--- a/src-tauri/games/src/lib.rs
+++ b/src-tauri/games/src/lib.rs
@@ -1,4 +1,5 @@
 #![feature(iterator_try_collect)]
+#![feature(lock_value_accessors)]
 
 pub mod collections;
 pub mod downloads;
diff --git a/src-tauri/games/src/library.rs b/src-tauri/games/src/library.rs
index c58d3c04..0b7f67c2 100644
--- a/src-tauri/games/src/library.rs
+++ b/src-tauri/games/src/library.rs
@@ -205,11 +205,13 @@ pub fn on_game_complete(
 
     let client = DROP_CLIENT_SYNC.clone();
     let response = generate_url(
-        &["/api/v1/client/game/version"],
         &[
-            ("id", &meta.id),
-            ("version", meta.version.as_ref().unwrap()),
+            "/api/v1/client/game",
+            &meta.id,
+            "version",
+            meta.version.as_ref().unwrap(),
         ],
+        &[],
     )?;
     let response = client
         .get(response)
diff --git a/src-tauri/process/Cargo.toml b/src-tauri/process/Cargo.toml
index d3d67a1e..e91bacf3 100644
--- a/src-tauri/process/Cargo.toml
+++ b/src-tauri/process/Cargo.toml
@@ -14,6 +14,6 @@ page_size = "0.6.0"
 serde = "1.0.228"
 serde_with = "3.15.0"
 shared_child = "1.1.1"
-tauri = "2.8.5"
-tauri-plugin-opener = "2.5.0"
+tauri = "*"
+tauri-plugin-opener = "*"
 utils = { version = "0.1.0", path = "../utils" }
diff --git a/src-tauri/remote/Cargo.toml b/src-tauri/remote/Cargo.toml
index f3523593..2cc86e9f 100644
--- a/src-tauri/remote/Cargo.toml
+++ b/src-tauri/remote/Cargo.toml
@@ -18,6 +18,6 @@ reqwest = "0.12.23"
 reqwest-websocket = "0.5.1"
 serde = "1.0.228"
 serde_with = "3.15.0"
-tauri = "2.8.5"
+tauri = "*"
 url = "2.5.7"
 utils = { version = "0.1.0", path = "../utils" }
diff --git a/src-tauri/remote/src/lib.rs b/src-tauri/remote/src/lib.rs
index 3bc0ff65..17f6a04e 100644
--- a/src-tauri/remote/src/lib.rs
+++ b/src-tauri/remote/src/lib.rs
@@ -1,3 +1,6 @@
+#![feature(slice_as_array)]
+#![feature(slice_concat_trait)]
+
 pub mod auth;
 #[macro_use]
 pub mod cache;
diff --git a/src-tauri/remote/src/requests.rs b/src-tauri/remote/src/requests.rs
index df742692..00fde99e 100644
--- a/src-tauri/remote/src/requests.rs
+++ b/src-tauri/remote/src/requests.rs
@@ -5,14 +5,12 @@ use crate::{
     auth::generate_authorization_header, error::RemoteAccessError, utils::DROP_CLIENT_ASYNC,
 };
 
-pub fn generate_url<T: AsRef<str>>(
-    path_components: &[T],
-    query: &[(T, T)],
+pub fn generate_url(
+    path_components: &[&str],
+    query: &[(&str, &str)],
 ) -> Result<Url, RemoteAccessError> {
-    let mut base_url = DB.fetch_base_url();
-    for endpoint in path_components {
-        base_url = base_url.join(endpoint.as_ref())?;
-    }
+    let path_appended = path_components.join("/");
+    let mut base_url = DB.fetch_base_url().join(&path_appended)?;
     {
         let mut queries = base_url.query_pairs_mut();
         for (param, val) in query {
diff --git a/src-tauri/remote/src/server_proto.rs b/src-tauri/remote/src/server_proto.rs
index 54334df0..23c1f5bb 100644
--- a/src-tauri/remote/src/server_proto.rs
+++ b/src-tauri/remote/src/server_proto.rs
@@ -1,12 +1,14 @@
 use std::str::FromStr;
 
 use database::borrow_db_checked;
-use http::{Request, Response, StatusCode, Uri, uri::PathAndQuery};
-use log::{error, warn};
+use http::{
+    HeaderMap, HeaderName, HeaderValue, Request, Response, StatusCode, Uri, header::USER_AGENT,
+    uri::PathAndQuery,
+};
+use log::{error, info, warn};
 use tauri::UriSchemeResponder;
-use utils::webbrowser_open::webbrowser_open;
 
-use crate::utils::DROP_CLIENT_SYNC;
+use crate::utils::{DROP_CLIENT_ASYNC, DROP_CLIENT_SYNC};
 
 pub async fn handle_server_proto_offline_wrapper(
     request: Request<Vec<u8>>,
@@ -27,8 +29,8 @@ pub async fn handle_server_proto_offline(
         .expect("Failed to build error response for proto offline"))
 }
 
-pub async fn handle_server_proto_wrapper(request: Request<Vec<u8>>, responder: UriSchemeResponder) {
-    match handle_server_proto(request).await {
+pub fn handle_server_proto_wrapper(request: Request<Vec<u8>>, responder: UriSchemeResponder) {
+    match handle_server_proto(request) {
         Ok(r) => responder.respond(r),
         Err(e) => {
             warn!("Cache error: {e}");
@@ -36,54 +38,63 @@ pub async fn handle_server_proto_wrapper(request: Request<Vec<u8>>, responder: U
                 Response::builder()
                     .status(e)
                     .body(Vec::new())
+                    .inspect_err(|v| warn!("{:?}", v))
                     .expect("Failed to build error response"),
             );
         }
     }
 }
 
-async fn handle_server_proto(request: Request<Vec<u8>>) -> Result<Response<Vec<u8>>, StatusCode> {
-    let db_handle = borrow_db_checked();
-    let auth = match db_handle.auth.as_ref() {
-        Some(auth) => auth,
-        None => {
-            error!("Could not find auth in database");
-            return Err(StatusCode::UNAUTHORIZED);
-        }
-    };
-    let web_token = match &auth.web_token {
-        Some(token) => token,
-        None => return Err(StatusCode::UNAUTHORIZED),
+fn handle_server_proto(request: Request<Vec<u8>>) -> Result<Response<Vec<u8>>, StatusCode> {
+    let (remote_uri, web_token) = {
+        let db_handle = borrow_db_checked();
+        let auth = match db_handle.auth.as_ref() {
+            Some(auth) => auth,
+            None => {
+                error!("Could not find auth in database");
+                return Err(StatusCode::UNAUTHORIZED);
+            }
+        };
+        let web_token = match &auth.web_token {
+            Some(token) => token.clone(),
+            None => return Err(StatusCode::UNAUTHORIZED),
+        };
+        let remote_uri = db_handle
+            .base_url
+            .parse::<Uri>()
+            .inspect_err(|v| warn!("{:?}", v))
+            .expect("Failed to parse base url");
+        (remote_uri, web_token)
     };
-    let remote_uri = db_handle
-        .base_url
-        .parse::<Uri>()
-        .expect("Failed to parse base url");
 
     let path = request.uri().path();
 
     let mut new_uri = request.uri().clone().into_parts();
     new_uri.path_and_query = Some(
-        PathAndQuery::from_str(&format!("{path}?noWrapper=true"))
+        PathAndQuery::from_str(path)
+            .inspect_err(|v| warn!("{:?}", v))
             .expect("Failed to parse request path in proto"),
     );
     new_uri.authority = remote_uri.authority().cloned();
     new_uri.scheme = remote_uri.scheme().cloned();
     let err_msg = &format!("Failed to build new uri from parts {new_uri:?}");
-    let new_uri = Uri::from_parts(new_uri).expect(err_msg);
-
-    let whitelist_prefix = ["/store", "/api", "/_", "/fonts"];
+    let new_uri = Uri::from_parts(new_uri)
+        .inspect_err(|v| warn!("{:?}", v))
+        .expect(err_msg);
 
-    if whitelist_prefix.iter().all(|f| !path.starts_with(f)) {
-        webbrowser_open(new_uri.to_string());
-        return Ok(Response::new(Vec::new()));
-    }
+    let mut headers = HeaderMap::new();
+    request.headers().clone_into(&mut headers);
+    headers.remove(USER_AGENT);
+    headers.append(USER_AGENT, HeaderValue::from_static("Drop Desktop Client"));
+    headers.append(
+        "Authorization",
+        HeaderValue::from_str(&format!("Bearer {web_token}")).unwrap(),
+    );
 
     let client = DROP_CLIENT_SYNC.clone();
     let response = match client
         .request(request.method().clone(), new_uri.to_string())
-        .header("Authorization", format!("Bearer {web_token}"))
-        .headers(request.headers().clone())
+        .headers(headers)
         .send()
     {
         Ok(response) => response,
@@ -94,15 +105,26 @@ async fn handle_server_proto(request: Request<Vec<u8>>) -> Result<Response<Vec<u
     };
 
     let response_status = response.status();
+    let mut client_http_response = Response::builder()
+        .status(response_status)
+        .header("Access-Control-Allow-Origin", "*");
+
+    {
+        let client_response_headers = client_http_response.headers_mut().unwrap();
+        for (header, header_value) in response.headers() {
+            client_response_headers.insert(header, header_value.clone());
+        }
+    };
+
     let response_body = match response.bytes() {
         Ok(bytes) => bytes,
         Err(e) => return Err(e.status().unwrap_or(StatusCode::INTERNAL_SERVER_ERROR)),
     };
 
-    let http_response = Response::builder()
-        .status(response_status)
+    let client_http_response = client_http_response
         .body(response_body.to_vec())
+        .inspect_err(|v| warn!("{:?}", v))
         .expect("Failed to build server proto response");
 
-    Ok(http_response)
+    Ok(client_http_response)
 }
diff --git a/src-tauri/remote/src/utils.rs b/src-tauri/remote/src/utils.rs
index 6ca4e0b2..283cba0a 100644
--- a/src-tauri/remote/src/utils.rs
+++ b/src-tauri/remote/src/utils.rs
@@ -2,6 +2,7 @@ use std::{
     fs::{self, File},
     io::Read,
     sync::LazyLock,
+    time::Duration,
 };
 
 use database::db::DATA_ROOT_DIR;
@@ -91,6 +92,8 @@ pub fn get_client_sync() -> reqwest::blocking::Client {
     }
     client
         .use_rustls_tls()
+        .user_agent("Drop Desktop Client")
+        .connect_timeout(Duration::from_millis(1500))
         .build()
         .expect("Failed to build synchronous client")
 }
@@ -102,6 +105,7 @@ pub fn get_client_async() -> reqwest::Client {
     }
     client
         .use_rustls_tls()
+        .user_agent("Drop Desktop Client")
         .build()
         .expect("Failed to build asynchronous client")
 }
@@ -113,6 +117,7 @@ pub fn get_client_ws() -> reqwest::Client {
     }
     client
         .use_rustls_tls()
+        .user_agent("Drop Desktop Client")
         .http1_only()
         .build()
         .expect("Failed to build websocket client")
diff --git a/src-tauri/src/client.rs b/src-tauri/src/client.rs
index 919421d3..d93d8d69 100644
--- a/src-tauri/src/client.rs
+++ b/src-tauri/src/client.rs
@@ -18,18 +18,15 @@ pub fn fetch_state(state: tauri::State<'_, Mutex<AppState>>) -> Result<String, S
 }
 
 #[tauri::command]
-pub fn quit(app: tauri::AppHandle) {
-    cleanup_and_exit(&app);
+pub async fn quit(app: tauri::AppHandle) {
+    cleanup_and_exit(&app).await;
 }
 
-pub fn cleanup_and_exit(app: &AppHandle) {
+pub async fn cleanup_and_exit(app: &AppHandle) {
     debug!("cleaning up and exiting application");
-    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:?}"),
+    match DOWNLOAD_MANAGER.ensure_terminated().await {
+        Ok(()) => debug!("download manager terminated correctly"),
+        Err(_) => error!("download manager failed to terminate correctly"),
     }
 
     app.exit(0);
@@ -76,7 +73,5 @@ pub fn get_autostart_enabled(app: AppHandle) -> Result<bool, tauri_plugin_autost
 
 #[tauri::command]
 pub fn open_fs(path: String, app_handle: AppHandle) -> Result<(), tauri_plugin_opener::Error> {
-    app_handle
-        .opener()
-        .open_path(path, None::<&str>)
+    app_handle.opener().open_path(path, None::<&str>)
 }
diff --git a/src-tauri/src/download_manager.rs b/src-tauri/src/download_manager.rs
index cfc49c64..00ba02e0 100644
--- a/src-tauri/src/download_manager.rs
+++ b/src-tauri/src/download_manager.rs
@@ -2,21 +2,21 @@ use database::DownloadableMetadata;
 use download_manager::DOWNLOAD_MANAGER;
 
 #[tauri::command]
-pub fn pause_downloads() {
-    DOWNLOAD_MANAGER.pause_downloads();
+pub async fn pause_downloads() {
+    DOWNLOAD_MANAGER.pause_downloads().await;
 }
 
 #[tauri::command]
-pub fn resume_downloads() {
-    DOWNLOAD_MANAGER.resume_downloads();
+pub async fn resume_downloads() {
+    DOWNLOAD_MANAGER.resume_downloads().await;
 }
 
 #[tauri::command]
-pub fn move_download_in_queue(old_index: usize, new_index: usize) {
-    DOWNLOAD_MANAGER.rearrange(old_index, new_index);
+pub async fn move_download_in_queue(old_index: usize, new_index: usize) {
+    DOWNLOAD_MANAGER.rearrange(old_index, new_index).await;
 }
 
 #[tauri::command]
-pub fn cancel_game(meta: DownloadableMetadata) {
-    DOWNLOAD_MANAGER.cancel(meta);
+pub async fn cancel_game(meta: DownloadableMetadata) {
+    DOWNLOAD_MANAGER.cancel(meta).await;
 }
diff --git a/src-tauri/src/downloads.rs b/src-tauri/src/downloads.rs
index 7625a676..5886d9af 100644
--- a/src-tauri/src/downloads.rs
+++ b/src-tauri/src/downloads.rs
@@ -9,14 +9,14 @@ use games::downloads::download_agent::GameDownloadAgent;
 #[tauri::command]
 pub async fn download_game(
     game_id: String,
-    game_version: String,
+    version_id: String,
     install_dir: usize,
 ) -> Result<(), ApplicationDownloadError> {
     let sender = { DOWNLOAD_MANAGER.get_sender().clone() };
 
     let game_download_agent = GameDownloadAgent::new_from_index(
         game_id.clone(),
-        game_version.clone(),
+        version_id.clone(),
         install_dir,
         sender,
     )
@@ -27,6 +27,7 @@ pub async fn download_game(
 
     DOWNLOAD_MANAGER
         .queue_download(game_download_agent.clone())
+        .await
         .unwrap();
 
     Ok(())
@@ -71,6 +72,7 @@ pub async fn resume_download(game_id: String) -> Result<(), ApplicationDownloadE
 
     DOWNLOAD_MANAGER
         .queue_download(game_download_agent)
+        .await
         .unwrap();
     Ok(())
 }
diff --git a/src-tauri/src/games.rs b/src-tauri/src/games.rs
index ba4f2796..e66d96cc 100644
--- a/src-tauri/src/games.rs
+++ b/src-tauri/src/games.rs
@@ -160,7 +160,8 @@ pub async fn fetch_game_logic(
     };
 
     let client = DROP_CLIENT_ASYNC.clone();
-    let response = generate_url(&["/api/v1/client/game/", &id], &[])?;
+    let response = generate_url(&["/api/v1/client/game", &id], &[])?;
+    info!("requesting {}", response);
     let response = client
         .get(response)
         .header("Authorization", generate_authorization_header())
@@ -224,11 +225,6 @@ pub async fn fetch_game_version_options_logic(
         return Err(RemoteAccessError::InvalidResponse(err));
     }
 
-    let raw = response.text().await?;
-    info!("{}", raw);
-
-    return Err(RemoteAccessError::CorruptedState);
-
     let data: Vec<GameVersion> = response.json().await?;
 
     let state_lock = state.lock();
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 3230973f..8ebd7d30 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -38,12 +38,14 @@ use log4rs::{
 };
 use serde::Serialize;
 use tauri::{
-    AppHandle, Manager, RunEvent, WindowEvent,
+    AppHandle, LogicalPosition, LogicalSize, Manager, RunEvent, WebviewBuilder, WebviewUrl,
+    WindowBuilder, WindowEvent,
     menu::{Menu, MenuItem, PredefinedMenuItem},
     tray::TrayIconBuilder,
 };
 use tauri_plugin_deep_link::DeepLinkExt;
 use tauri_plugin_dialog::DialogExt;
+use tracing::{Level, span};
 use url::Url;
 use utils::app_emit;
 
@@ -204,6 +206,8 @@ pub fn custom_panic_handler(e: &PanicHookInfo) -> Option<()> {
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
+    // let global_span = span!(Level::TRACE, "global_span");
+    // let _enter = global_span.enter();
     std::panic::set_hook(Box::new(|e| {
         let _ = custom_panic_handler(e);
         println!("{e}");
@@ -296,6 +300,9 @@ pub fn run() {
 
                 let handle = app.handle().clone();
 
+                let width = 1536.0;
+                let height = 864.0;
+
                 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
@@ -303,7 +310,7 @@ pub fn run() {
                 )
                 .title("Drop Desktop App")
                 .min_inner_size(1000.0, 500.0)
-                .inner_size(1536.0, 864.0)
+                .inner_size(width, height)
                 .decorations(false)
                 .shadow(false)
                 .data_directory(DATA_ROOT_DIR.join(".webview"))
@@ -368,7 +375,7 @@ pub fn run() {
                                     .expect("Failed to show window");
                             }
                             "quit" => {
-                                cleanup_and_exit(app);
+                                app.exit(0);
                             }
 
                             _ => {
@@ -409,20 +416,8 @@ pub fn run() {
             });
         })
         .register_asynchronous_uri_scheme_protocol("server", |ctx, request, responder| {
-            tauri::async_runtime::block_on(async move {
-                let state = ctx
-                    .app_handle()
-                    .state::<tauri::State<'_, Mutex<AppState>>>();
-
-                offline!(
-                    state,
-                    handle_server_proto_wrapper,
-                    handle_server_proto_offline_wrapper,
-                    request,
-                    responder
-                )
-                .await;
-            });
+            let scope_holder = ctx.app_handle();
+            handle_server_proto_wrapper(request, responder);
         })
         .on_window_event(|window, event| {
             if let WindowEvent::CloseRequested { api, .. } = event {
diff --git a/src-tauri/utils/src/download_manager_send.rs b/src-tauri/utils/src/download_manager_send.rs
index dc98429b..8cd7e666 100644
--- a/src-tauri/utils/src/download_manager_send.rs
+++ b/src-tauri/utils/src/download_manager_send.rs
@@ -1,7 +1,7 @@
 #[macro_export]
 macro_rules! send {
     ($download_manager:expr, $signal:expr) => {
-        $download_manager.send($signal).unwrap_or_else(|_| {
+        $download_manager.send($signal).await.unwrap_or_else(|_| {
             panic!(
                 "Failed to send signal {} to the download manager",
                 stringify!(signal)

From b537f89f82b021d93f4d5ef730cec5931a3f77a5 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Sat, 20 Dec 2025 01:10:04 +1100
Subject: [PATCH 02/19] feat: frontend fixes and experimental webview store

---
 main/package.json                 |  2 +-
 main/pages/library/[id]/index.vue | 17 +++++++++++++----
 main/pages/store/index.vue        | 31 +++----------------------------
 main/pnpm-lock.yaml               | 14 +++++++-------
 4 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/main/package.json b/main/package.json
index 15be40f3..b5780dc0 100644
--- a/main/package.json
+++ b/main/package.json
@@ -13,7 +13,7 @@
     "@headlessui/vue": "^1.7.23",
     "@heroicons/vue": "^2.1.5",
     "@nuxtjs/tailwindcss": "^6.12.2",
-    "@tauri-apps/api": "^2.7.0",
+    "@tauri-apps/api": "^2.9.1",
     "@tauri-apps/plugin-os": "^2.3.2",
     "@tauri-apps/plugin-shell": "^2.3.3",
     "koa": "^2.16.1",
diff --git a/main/pages/library/[id]/index.vue b/main/pages/library/[id]/index.vue
index 5fc30fc2..40fa360f 100644
--- a/main/pages/library/[id]/index.vue
+++ b/main/pages/library/[id]/index.vue
@@ -181,7 +181,10 @@
                 class="relative w-full cursor-default rounded-md bg-zinc-800 py-1.5 pl-3 pr-10 text-left text-zinc-100 shadow-sm ring-1 ring-inset ring-zinc-700 focus:outline-none focus:ring-2 focus:ring-blue-600 sm:text-sm/6"
               >
                 <span class="block truncate"
-                  >{{ versionOptions[installVersionIndex].versionName }}
+                  >{{
+                    versionOptions[installVersionIndex].displayName ||
+                    versionOptions[installVersionIndex].versionPath
+                  }}
                   on
                   {{ versionOptions[installVersionIndex].platform }}</span
                 >
@@ -223,7 +226,7 @@
                             : 'font-normal',
                           'block truncate',
                         ]"
-                        >{{ version.versionName }} on
+                        >{{ version.displayName || version.versionPath }} on
                         {{ version.platform }}</span
                       >
 
@@ -521,7 +524,13 @@ const htmlDescription = micromark(game.value.mDescription);
 
 const installFlowOpen = ref(false);
 const versionOptions = ref<
-  undefined | Array<{ versionName: string; platform: string }>
+  | undefined
+  | Array<{
+      versionId: string;
+      displayName?: string;
+      versionPath: string;
+      platform: string;
+    }>
 >();
 const installDirs = ref<undefined | Array<string>>();
 const currentImageIndex = ref(0);
@@ -554,7 +563,7 @@ async function install() {
     installLoading.value = true;
     await invoke("download_game", {
       gameId: game.value.id,
-      gameVersion: versionOptions.value[installVersionIndex.value].versionName,
+      versionId: versionOptions.value[installVersionIndex.value].versionId,
       installDir: installDir.value,
     });
     installFlowOpen.value = false;
diff --git a/main/pages/store/index.vue b/main/pages/store/index.vue
index 51b3d210..5e26efec 100644
--- a/main/pages/store/index.vue
+++ b/main/pages/store/index.vue
@@ -1,37 +1,12 @@
 <template>
-  <div class="grow w-full h-full flex items-center justify-center">
-    <div class="flex flex-col items-center">
-      <BuildingStorefrontIcon
-        class="h-12 w-12 text-blue-600"
-        aria-hidden="true"
-      />
-      <div class="mt-3 text-center sm:mt-5">
-        <h1 class="text-3xl font-semibold font-display leading-6 text-zinc-100">
-          Store not supported in client
-        </h1>
-        <div class="mt-4">
-          <p class="text-sm text-zinc-400 max-w-lg">
-            Currently, Drop requires you to view the store in your browser.
-            Please click the button below to open it in your default browser.
-          </p>
-          <NuxtLink
-            :href="storeUrl"
-            target="_blank"
-            class="mt-6 transition text-sm/6 font-semibold text-zinc-400 hover:text-zinc-100 inline-flex gap-x-2 items-center duration-200 hover:scale-105"
-          >
-            Open Store <ArrowTopRightOnSquareIcon class="size-4" />
-          </NuxtLink>
-        </div>
-      </div>
-    </div>
-  </div>
+  <iframe :src="convertedStoreUrl" class="grow w-full h-full" />
 </template>
 <script setup lang="ts">
 import {
   ArrowTopRightOnSquareIcon,
   BuildingStorefrontIcon,
 } from "@heroicons/vue/20/solid";
-import { invoke } from "@tauri-apps/api/core";
+import { convertFileSrc, invoke } from "@tauri-apps/api/core";
 
-const storeUrl = await invoke<string>("gen_drop_url", { path: "/store" });
+const convertedStoreUrl = convertFileSrc("store", "server");
 </script>
diff --git a/main/pnpm-lock.yaml b/main/pnpm-lock.yaml
index 202cc2b9..939fb7cc 100644
--- a/main/pnpm-lock.yaml
+++ b/main/pnpm-lock.yaml
@@ -18,8 +18,8 @@ importers:
         specifier: ^6.12.2
         version: 6.14.0(magicast@0.5.1)(yaml@2.8.1)
       '@tauri-apps/api':
-        specifier: ^2.7.0
-        version: 2.9.0
+        specifier: ^2.9.1
+        version: 2.9.1
       '@tauri-apps/plugin-os':
         specifier: ^2.3.2
         version: 2.3.2
@@ -1115,8 +1115,8 @@ packages:
     peerDependencies:
       vue: ^2.7.0 || ^3.0.0
 
-  '@tauri-apps/api@2.9.0':
-    resolution: {integrity: sha512-qD5tMjh7utwBk9/5PrTA/aGr3i5QaJ/Mlt7p8NilQ45WgbifUNPyKWsA63iQ8YfQq6R8ajMapU+/Q8nMcPRLNw==}
+  '@tauri-apps/api@2.9.1':
+    resolution: {integrity: sha512-IGlhP6EivjXHepbBic618GOmiWe4URJiIeZFlB7x3czM0yDHHYviH1Xvoiv4FefdkQtn6v7TuwWCRfOGdnVUGw==}
 
   '@tauri-apps/plugin-os@2.3.2':
     resolution: {integrity: sha512-n+nXWeuSeF9wcEsSPmRnBEGrRgOy6jjkSU+UVCOV8YUGKb2erhDOxis7IqRXiRVHhY8XMKks00BJ0OAdkpf6+A==}
@@ -5049,15 +5049,15 @@ snapshots:
       '@tanstack/virtual-core': 3.13.12
       vue: 3.5.24(typescript@5.9.3)
 
-  '@tauri-apps/api@2.9.0': {}
+  '@tauri-apps/api@2.9.1': {}
 
   '@tauri-apps/plugin-os@2.3.2':
     dependencies:
-      '@tauri-apps/api': 2.9.0
+      '@tauri-apps/api': 2.9.1
 
   '@tauri-apps/plugin-shell@2.3.3':
     dependencies:
-      '@tauri-apps/api': 2.9.0
+      '@tauri-apps/api': 2.9.1
 
   '@tybys/wasm-util@0.10.1':
     dependencies:

From c1e34fa614e866a9c251dc72318da091af9aa89a Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Sat, 20 Dec 2025 11:39:38 +1100
Subject: [PATCH 03/19] feat: sync downloader

---
 src-tauri/Cargo.lock                          |   1 +
 src-tauri/games/Cargo.toml                    |   1 +
 .../games/src/downloads/download_agent.rs     | 135 ++++++++++--------
 .../games/src/downloads/download_logic.rs     |  31 ++--
 4 files changed, 91 insertions(+), 77 deletions(-)

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index c252ef2c..82cb2f03 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -1902,6 +1902,7 @@ dependencies = [
  "atomic-instant-full",
  "bitcode",
  "boxcar",
+ "crossbeam-channel",
  "ctr",
  "database",
  "download_manager",
diff --git a/src-tauri/games/Cargo.toml b/src-tauri/games/Cargo.toml
index 51d737a8..37439159 100644
--- a/src-tauri/games/Cargo.toml
+++ b/src-tauri/games/Cargo.toml
@@ -32,3 +32,4 @@ sha2 = "0.10.9"
 ctr = "0.9.2"
 aes = "0.8.4"
 async-trait = "0.1.89"
+crossbeam-channel = "0.5.15"
diff --git a/src-tauri/games/src/downloads/download_agent.rs b/src-tauri/games/src/downloads/download_agent.rs
index ea3f3b8b..c87b4338 100644
--- a/src-tauri/games/src/downloads/download_agent.rs
+++ b/src-tauri/games/src/downloads/download_agent.rs
@@ -225,74 +225,89 @@ impl GameDownloadAgent {
         };
         let max_download_threads = borrow_db_checked().settings.max_download_threads;
 
-        let metrics = tauri::async_runtime::handle().inner().metrics();
-        info!("using {} workers", metrics.num_workers());
-
-        let futures_unordered = FuturesUnordered::new();
-
-        for (index, (chunk_id, chunk_data)) in chunks.into_iter().enumerate() {
-            let progress = self.progress.get(index);
-            let progress_handle = ProgressHandle::new(progress, self.progress.clone());
-
-            let chunk_length = chunk_data.files.iter().map(|v| v.length).sum();
-
-            if *completed_chunks.get(&chunk_id).unwrap_or(&false) {
-                progress_handle.skip(chunk_length);
-                continue;
-            }
+        let (sender, recv) = crossbeam_channel::bounded(16);
+
+        let unsafe_self: &'static GameDownloadAgent = unsafe { mem::transmute(self) };
+        let local_completed_chunks = completed_chunks.clone();
+
+        let download_join_handle = tauri::async_runtime::spawn_blocking(move || {
+            let thread_pool = rayon::ThreadPoolBuilder::new()
+                .num_threads(max_download_threads)
+                .build()
+                .unwrap();
+            thread_pool.scope(move |s| {
+                for (index, (chunk_id, chunk_data)) in chunks.into_iter().enumerate() {
+                    let local_sender = sender.clone();
+                    let progress = unsafe_self.progress.get(index);
+                    let progress_handle =
+                        ProgressHandle::new(progress, unsafe_self.progress.clone());
+
+                    let chunk_length = chunk_data.files.iter().map(|v| v.length).sum();
+
+                    if *local_completed_chunks.get(&chunk_id).unwrap_or(&false) {
+                        progress_handle.skip(chunk_length);
+                        continue;
+                    }
 
-            let sender = self.sender.clone();
-
-            futures_unordered.push(async move { async move {
-                for i in 0..RETRY_COUNT {
-                    let loop_progress_handle = progress_handle.clone();
-                    let base_path = self.dropdata.base_path.clone();
-                    info!("starting chunk {}", chunk_id);
-                    match download_game_chunk(
-                        &self.id,
-                        &self.version,
-                        &chunk_id,
-                        &key,
-                        &chunk_data,
-                        base_path,
-                        &self.control_flag,
-                        loop_progress_handle,
-                    )
-                    .await
-                    {
-                        Ok(true) => {
-                            return Some(chunk_id.clone());
-                        }
-                        Ok(false) => return None,
-                        Err(e) => {
-                            warn!("game download agent error: {e:?}");
-
-                            let retry = matches!(
-                                &e,
-                                ApplicationDownloadError::Communication(_)
-                                    | ApplicationDownloadError::Checksum
-                                    | ApplicationDownloadError::Lock
-                                    | ApplicationDownloadError::IoError(_)
-                            );
-
-                            if i == RETRY_COUNT - 1 || !retry {
-                                warn!("retry logic failed, not re-attempting.");
-                                send!(sender, DownloadManagerSignal::Error(e));
-                                return None;
+                    let sender = unsafe_self.sender.clone();
+
+                    s.spawn(move |_| {
+                        for i in 0..RETRY_COUNT {
+                            let loop_progress_handle = progress_handle.clone();
+                            let base_path = unsafe_self.dropdata.base_path.clone();
+                            info!("starting chunk {}", chunk_id);
+                            match download_game_chunk(
+                                &unsafe_self.id,
+                                &unsafe_self.version,
+                                &chunk_id,
+                                &key,
+                                &chunk_data,
+                                base_path,
+                                &unsafe_self.control_flag,
+                                loop_progress_handle,
+                            ) {
+                                Ok(true) => {
+                                    local_sender.send(chunk_id.clone()).unwrap();
+                                    return;
+                                }
+                                Ok(false) => return,
+                                Err(e) => {
+                                    warn!("got error for chunk id {}: {e:?}", chunk_id);
+
+                                    let retry = matches!(
+                                        &e,
+                                        ApplicationDownloadError::Communication(_)
+                                            | ApplicationDownloadError::Checksum
+                                            | ApplicationDownloadError::Lock
+                                            | ApplicationDownloadError::IoError(_)
+                                    );
+
+                                    if i == RETRY_COUNT - 1 || !retry {
+                                        warn!("retry logic failed, not re-attempting.");
+                                        tauri::async_runtime::spawn(async move {
+                                            send!(sender, DownloadManagerSignal::Error(e));
+                                        });
+                                        return;
+                                    }
+                                }
                             }
                         }
-                    }
+                    });
                 }
-                return None;
-            } });
+            });
+        });
+
+        let mut outputs = Vec::new();
+        while let Ok(chunk_id) = recv.recv() {
+            outputs.push(chunk_id);
         }
 
-        let outputs = futures_unordered.buffer_unordered(max_download_threads).collect::<Vec<Option<String>>>().await;
+        download_join_handle
+            .await
+            .expect("failed to complete download");
 
         for completed_chunk in outputs {
-            if let Some(completed_chunk) = completed_chunk {
-                completed_chunks.insert(completed_chunk, true);
-            }
+            completed_chunks.insert(completed_chunk, true);
         }
 
         let drop_data_chunks = completed_chunks
diff --git a/src-tauri/games/src/downloads/download_logic.rs b/src-tauri/games/src/downloads/download_logic.rs
index 40f54db8..05a46740 100644
--- a/src-tauri/games/src/downloads/download_logic.rs
+++ b/src-tauri/games/src/downloads/download_logic.rs
@@ -1,5 +1,5 @@
 use std::fs::{Permissions, set_permissions};
-use std::io::{Read, SeekFrom};
+use std::io::{Read, Seek as _, SeekFrom, Write as _};
 #[cfg(unix)]
 use std::os::unix::fs::PermissionsExt;
 use std::path::PathBuf;
@@ -18,7 +18,7 @@ use log::{debug, info, warn};
 use remote::auth::generate_authorization_header;
 use remote::error::{DropServerError, RemoteAccessError};
 use remote::requests::generate_url;
-use remote::utils::DROP_CLIENT_ASYNC;
+use remote::utils::{DROP_CLIENT_ASYNC, DROP_CLIENT_SYNC};
 use sha2::Digest;
 use tokio::fs::OpenOptions;
 use tokio::io::{AsyncReadExt, AsyncSeekExt, AsyncWriteExt};
@@ -31,7 +31,7 @@ const READ_BUF_LEN: usize = 1 * 1024 * 1024;
 
 type Aes128Ctr64LE = ctr::Ctr64LE<aes::Aes128>;
 
-pub async fn download_game_chunk(
+pub fn download_game_chunk(
     game_id: &str,
     version_id: &str,
     chunk_id: &str,
@@ -57,16 +57,15 @@ pub async fn download_game_chunk(
     )
     .map_err(ApplicationDownloadError::Communication)?;
 
-    let response = DROP_CLIENT_ASYNC
+    let response = DROP_CLIENT_SYNC
         .get(url)
         .header("Authorization", header)
         .send()
-        .await
         .map_err(|e| ApplicationDownloadError::Communication(e.into()))?;
 
     if response.status() != 200 {
         info!("chunk request got status code: {}", response.status());
-        let raw_res = response.text().await.map_err(|e| {
+        let raw_res = response.text().map_err(|e| {
             ApplicationDownloadError::Communication(RemoteAccessError::FetchError(e.into()))
         })?;
         info!("{raw_res}");
@@ -84,10 +83,11 @@ pub async fn download_game_chunk(
 
     debug!("took {}ms to start downloading", timestep);
 
-    let stream = response
+    /*let stream = response
         .bytes_stream()
         .map(|v| v.map_err(|err| std::io::Error::other(err)));
-    let mut stream_reader = StreamReader::new(stream);
+    let mut stream_reader = StreamReader::new(stream);*/
+    let mut stream_reader = response;
 
     let mut hasher = sha2::Sha256::new();
     let mut cipher = Aes128Ctr64LE::new(key.into(), &chunk_data.iv.into());
@@ -95,28 +95,25 @@ pub async fn download_game_chunk(
     for file in &chunk_data.files {
         let path = base_path.join(file.filename.clone());
         if let Some(parent) = path.parent() {
-            tokio::fs::create_dir_all(parent).await?;
+            std::fs::create_dir_all(parent)?;
         }
-        let mut file_handle = OpenOptions::new()
+        let mut file_handle = std::fs::OpenOptions::new()
             .truncate(false)
             .write(true)
             .append(false)
             .create(true)
-            .open(&path)
-            .await?;
-        file_handle
-            .seek(SeekFrom::Start(file.start.try_into().unwrap()))
-            .await?;
+            .open(&path)?;
+        file_handle.seek(SeekFrom::Start(file.start.try_into().unwrap()))?;
 
         let mut remaining = file.length;
         while remaining > 0 {
-            let amount = stream_reader.read(&mut read_buf[0..remaining.min(READ_BUF_LEN)]).await?;
+            let amount = stream_reader.read(&mut read_buf[0..remaining.min(READ_BUF_LEN)])?;
             progress.add(amount);
             remaining -= amount;
 
             cipher.apply_keystream(&mut read_buf[0..amount]);
             hasher.update(&read_buf[0..amount]);
-            file_handle.write_all(&read_buf[0..amount]).await?;
+            file_handle.write_all(&read_buf[0..amount])?;
         }
 
         #[cfg(unix)]

From 24b94df94a098dd5eb179bcf7d81f6135d69e020 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Sat, 20 Dec 2025 22:52:36 +1100
Subject: [PATCH 04/19] feat: cleanup and fixes

---
 main/pages/library/[id]/index.vue             |   4 +-
 src-tauri/Cargo.lock                          | 336 +++++++++++++++++-
 src-tauri/Cargo.toml                          |   3 +-
 src-tauri/database/Cargo.toml                 |   4 +
 src-tauri/database/src/db.rs                  |  41 ++-
 src-tauri/database/src/models.rs              | 246 ++++---------
 src-tauri/database/src/platform.rs            |   2 +-
 .../src/download_manager_builder.rs           |   2 +-
 .../src/download_manager_frontend.rs          |   3 +-
 src-tauri/download_manager/src/error.rs       |   2 +
 .../src/util/progress_object.rs               |   3 +-
 .../games/src/downloads/download_agent.rs     |  69 ++--
 .../games/src/downloads/download_logic.rs     |  21 +-
 src-tauri/games/src/downloads/drop_data.rs    |  10 +-
 src-tauri/games/src/downloads/manifest.rs     |  41 ---
 src-tauri/games/src/library.rs                |  18 +-
 src-tauri/games/src/scan.rs                   |   3 +-
 src-tauri/games/src/state.rs                  |  12 +-
 src-tauri/process/src/process_handlers.rs     |  12 +-
 src-tauri/process/src/process_manager.rs      |  76 ++--
 src-tauri/remote/src/server_proto.rs          |   6 +-
 src-tauri/src/downloads.rs                    |  74 ++--
 src-tauri/src/games.rs                        |  40 ++-
 src-tauri/src/lib.rs                          |  13 +-
 24 files changed, 630 insertions(+), 411 deletions(-)

diff --git a/main/pages/library/[id]/index.vue b/main/pages/library/[id]/index.vue
index 40fa360f..58feab5a 100644
--- a/main/pages/library/[id]/index.vue
+++ b/main/pages/library/[id]/index.vue
@@ -561,10 +561,12 @@ async function install() {
   try {
     if (!versionOptions.value) throw new Error("Versions have not been loaded");
     installLoading.value = true;
+    const versionOption = versionOptions.value[installVersionIndex.value];
     await invoke("download_game", {
       gameId: game.value.id,
-      versionId: versionOptions.value[installVersionIndex.value].versionId,
+      versionId: versionOption.versionId,
       installDir: installDir.value,
+      targetPlatform: versionOption.platform,
     });
     installFlowOpen.value = false;
   } catch (error) {
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 82cb2f03..5e02812e 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -88,7 +88,7 @@ dependencies = [
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
- "zbus",
+ "zbus 5.12.0",
 ]
 
 [[package]]
@@ -496,7 +496,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
 dependencies = [
- "block-padding",
+ "block-padding 0.1.5",
  "byte-tools",
  "byteorder",
  "generic-array 0.12.4",
@@ -529,6 +529,15 @@ dependencies = [
  "byte-tools",
 ]
 
+[[package]]
+name = "block-padding"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
+dependencies = [
+ "generic-array 0.14.7",
+]
+
 [[package]]
 name = "block2"
 version = "0.6.2"
@@ -727,6 +736,15 @@ dependencies = [
  "toml 0.9.8",
 ]
 
+[[package]]
+name = "cbc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
+
 [[package]]
 name = "cc"
 version = "1.2.49"
@@ -1097,10 +1115,14 @@ checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
 name = "database"
 version = "0.1.0"
 dependencies = [
+ "aes",
  "chrono",
+ "ctr",
  "dirs 6.0.0",
+ "keyring",
  "log",
  "native_model",
+ "rand 0.9.2",
  "rustbreak",
  "serde",
  "serde_with",
@@ -1108,6 +1130,35 @@ dependencies = [
  "whoami",
 ]
 
+[[package]]
+name = "dbus"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21b3aa68d7e7abee336255bd7248ea965cc393f3e70411135a6f6a4b651345d4"
+dependencies = [
+ "libc",
+ "libdbus-sys",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "dbus-secret-service"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "708b509edf7889e53d7efb0ffadd994cc6c2345ccb62f55cfd6b0682165e4fa6"
+dependencies = [
+ "aes",
+ "block-padding 0.3.3",
+ "cbc",
+ "dbus",
+ "fastrand",
+ "hkdf",
+ "num",
+ "once_cell",
+ "sha2 0.10.9",
+ "zeroize",
+]
+
 [[package]]
 name = "der-parser"
 version = "9.0.0"
@@ -1219,6 +1270,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer 0.10.4",
  "crypto-common",
+ "subtle",
 ]
 
 [[package]]
@@ -1438,7 +1490,6 @@ dependencies = [
  "throttle_my_fn",
  "tokio",
  "tokio-util",
- "tracing",
  "umu-wrapper-lib",
  "url",
  "urlencoding",
@@ -2345,6 +2396,24 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.7",
+]
+
 [[package]]
 name = "html5ever"
 version = "0.29.1"
@@ -2764,6 +2833,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
 dependencies = [
+ "block-padding 0.3.3",
  "generic-array 0.14.7",
 ]
 
@@ -2915,6 +2985,23 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "keyring"
+version = "3.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eebcc3aff044e5944a8fbaf69eb277d11986064cba30c468730e8b9909fb551c"
+dependencies = [
+ "byteorder",
+ "dbus-secret-service",
+ "linux-keyutils",
+ "log",
+ "secret-service",
+ "security-framework 2.11.1",
+ "security-framework 3.5.1",
+ "windows-sys 0.60.2",
+ "zeroize",
+]
+
 [[package]]
 name = "known-folders"
 version = "1.4.0"
@@ -2981,6 +3068,15 @@ version = "0.2.178"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
 
+[[package]]
+name = "libdbus-sys"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "328c4789d42200f1eeec05bd86c9c13c7f091d2ba9a6ea35acdf51f31bc0f043"
+dependencies = [
+ "pkg-config",
+]
+
 [[package]]
 name = "libloading"
 version = "0.7.4"
@@ -3018,6 +3114,16 @@ dependencies = [
  "redox_syscall 0.5.18",
 ]
 
+[[package]]
+name = "linux-keyutils"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "761e49ec5fd8a5a463f9b84e877c373d888935b71c6be78f3767fe2ae6bed18e"
+dependencies = [
+ "bitflags 2.10.0",
+ "libc",
+]
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.15"
@@ -3361,6 +3467,19 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.10.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+ "memoffset",
+]
+
 [[package]]
 name = "nix"
 version = "0.30.1"
@@ -3399,6 +3518,20 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "num"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.4.6"
@@ -3409,6 +3542,15 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-complex"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "num-conv"
 version = "0.1.0"
@@ -3424,6 +3566,28 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-iter"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -3841,7 +4005,7 @@ checksum = "7c39b5918402d564846d5aba164c09a66cc88d232179dfd3e3c619a25a268392"
 dependencies = [
  "android_system_properties",
  "log",
- "nix",
+ "nix 0.30.1",
  "objc2",
  "objc2-foundation",
  "objc2-ui-kit",
@@ -5106,6 +5270,25 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "secret-service"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4d35ad99a181be0a60ffcbe85d680d98f87bdc4d7644ade319b87076b9dbfd4"
+dependencies = [
+ "aes",
+ "cbc",
+ "futures-util",
+ "generic-array 0.14.7",
+ "hkdf",
+ "num",
+ "once_cell",
+ "rand 0.8.5",
+ "serde",
+ "sha2 0.10.9",
+ "zbus 4.4.0",
+]
+
 [[package]]
 name = "security-framework"
 version = "2.11.1"
@@ -6137,7 +6320,7 @@ dependencies = [
  "thiserror 2.0.17",
  "url",
  "windows 0.61.3",
- "zbus",
+ "zbus 5.12.0",
 ]
 
 [[package]]
@@ -6192,7 +6375,7 @@ dependencies = [
  "thiserror 2.0.17",
  "tracing",
  "windows-sys 0.60.2",
- "zbus",
+ "zbus 5.12.0",
 ]
 
 [[package]]
@@ -6656,7 +6839,6 @@ version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647"
 dependencies = [
- "log",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -7966,7 +8148,6 @@ dependencies = [
  "soup3",
  "tao-macros",
  "thiserror 2.0.17",
- "tracing",
  "url",
  "webkit2gtk",
  "webkit2gtk-sys",
@@ -8044,6 +8225,16 @@ dependencies = [
  "rustix 1.1.2",
 ]
 
+[[package]]
+name = "xdg-home"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "xxhash-rust"
 version = "0.8.15"
@@ -8082,6 +8273,38 @@ dependencies = [
  "synstructure",
 ]
 
+[[package]]
+name = "zbus"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
+dependencies = [
+ "async-broadcast",
+ "async-process",
+ "async-recursion",
+ "async-trait",
+ "enumflags2",
+ "event-listener 5.4.1",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "hex 0.4.3",
+ "nix 0.29.0",
+ "ordered-stream",
+ "rand 0.8.5",
+ "serde",
+ "serde_repr",
+ "sha1",
+ "static_assertions",
+ "tracing",
+ "uds_windows",
+ "windows-sys 0.52.0",
+ "xdg-home",
+ "zbus_macros 4.4.0",
+ "zbus_names 3.0.0",
+ "zvariant 4.2.0",
+]
+
 [[package]]
 name = "zbus"
 version = "5.12.0"
@@ -8102,7 +8325,7 @@ dependencies = [
  "futures-core",
  "futures-lite",
  "hex 0.4.3",
- "nix",
+ "nix 0.30.1",
  "ordered-stream",
  "serde",
  "serde_repr",
@@ -8112,9 +8335,22 @@ dependencies = [
  "uuid",
  "windows-sys 0.61.2",
  "winnow 0.7.14",
- "zbus_macros",
- "zbus_names",
- "zvariant",
+ "zbus_macros 5.12.0",
+ "zbus_names 4.2.0",
+ "zvariant 5.8.0",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
+dependencies = [
+ "proc-macro-crate 3.4.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.111",
+ "zvariant_utils 2.1.0",
 ]
 
 [[package]]
@@ -8127,9 +8363,20 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.111",
- "zbus_names",
- "zvariant",
- "zvariant_utils",
+ "zbus_names 4.2.0",
+ "zvariant 5.8.0",
+ "zvariant_utils 3.2.1",
+]
+
+[[package]]
+name = "zbus_names"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
+dependencies = [
+ "serde",
+ "static_assertions",
+ "zvariant 4.2.0",
 ]
 
 [[package]]
@@ -8141,7 +8388,7 @@ dependencies = [
  "serde",
  "static_assertions",
  "winnow 0.7.14",
- "zvariant",
+ "zvariant 5.8.0",
 ]
 
 [[package]]
@@ -8190,6 +8437,20 @@ name = "zeroize"
 version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.111",
+]
 
 [[package]]
 name = "zerotrie"
@@ -8252,6 +8513,19 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "zvariant"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
+dependencies = [
+ "endi",
+ "enumflags2",
+ "serde",
+ "static_assertions",
+ "zvariant_derive 4.2.0",
+]
+
 [[package]]
 name = "zvariant"
 version = "5.8.0"
@@ -8263,8 +8537,21 @@ dependencies = [
  "serde",
  "url",
  "winnow 0.7.14",
- "zvariant_derive",
- "zvariant_utils",
+ "zvariant_derive 5.8.0",
+ "zvariant_utils 3.2.1",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
+dependencies = [
+ "proc-macro-crate 3.4.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.111",
+ "zvariant_utils 2.1.0",
 ]
 
 [[package]]
@@ -8277,7 +8564,18 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.111",
- "zvariant_utils",
+ "zvariant_utils 3.2.1",
+]
+
+[[package]]
+name = "zvariant_utils"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.111",
 ]
 
 [[package]]
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 50c422b8..f43af39f 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -95,8 +95,7 @@ walkdir = "2.5.0"
 webbrowser = "1.0.2"
 whoami = "1.6.0"
 zstd = "0.13.3"
-wry = { version = "*", features = ["tracing"] }
-tracing = { version = "0.1.43", features = ["log"] }
+wry = { version = "*", features = [] }
 
 [dependencies.dynfmt]
 version = "0.1.5"
diff --git a/src-tauri/database/Cargo.toml b/src-tauri/database/Cargo.toml
index 9fbb4994..95e81368 100644
--- a/src-tauri/database/Cargo.toml
+++ b/src-tauri/database/Cargo.toml
@@ -4,10 +4,14 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
+aes = "0.8.4"
 chrono = "0.4.42"
+ctr = "0.9.2"
 dirs = "6.0.0"
+keyring = {version = "3.6.3", features = ["apple-native", "crypto-rust", "linux-native-sync-persistent", "windows-native"]}
 log = "0.4.28"
 native_model = { version = "0.6.4", features = ["rmp_serde_1_3"], git = "https://github.com/Drop-OSS/native_model.git"}
+rand = "0.9.2"
 rustbreak = "2.0.0"
 serde = "1.0.228"
 serde_with = "3.15.0"
diff --git a/src-tauri/database/src/db.rs b/src-tauri/database/src/db.rs
index 313eb800..afbb35ac 100644
--- a/src-tauri/database/src/db.rs
+++ b/src-tauri/database/src/db.rs
@@ -3,6 +3,9 @@ use std::{
     sync::{Arc, LazyLock},
 };
 
+use aes::cipher::{KeyIvInit as _, StreamCipher};
+use keyring::Entry;
+use log::info;
 use rustbreak::{DeSerError, DeSerializer};
 use serde::{Serialize, de::DeserializeOwned};
 
@@ -15,6 +18,8 @@ static DATA_ROOT_PREFIX: &str = "drop";
 #[cfg(debug_assertions)]
 static DATA_ROOT_PREFIX: &str = "drop-debug";
 
+type Aes128Ctr64LE = ctr::Ctr64LE<aes::Aes128>;
+
 pub static DATA_ROOT_DIR: LazyLock<Arc<PathBuf>> = LazyLock::new(|| {
     Arc::new(
         dirs::data_dir()
@@ -23,6 +28,30 @@ pub static DATA_ROOT_DIR: LazyLock<Arc<PathBuf>> = LazyLock::new(|| {
     )
 });
 
+static KEY: LazyLock<[u8; 16]> = LazyLock::new(|| {
+    let entry = Entry::new("drop", "key").expect("failed to open keyring");
+    let key = entry.get_secret().unwrap_or_else(|_| {
+        let mut buffer = [0u8; 16];
+        rand::fill(&mut buffer);
+        entry.set_secret(&buffer).expect("failed to save key");
+        info!("created new database key");
+        buffer.to_vec()
+    });
+    key.try_into().expect("failed to extract appropriate key")
+});
+
+static IV: LazyLock<[u8; 16]> = LazyLock::new(|| {
+    let entry = Entry::new("drop", "iv").expect("failed to open keyring");
+    let iv = entry.get_secret().unwrap_or_else(|_| {
+        let mut buffer = [0u8; 16];
+        rand::fill(&mut buffer);
+        entry.set_secret(&buffer).expect("failed to save iv");
+        info!("created new database iv");
+        buffer.to_vec()
+    });
+    iv.try_into().expect("failed to extract appropriate iv")
+});
+
 // Custom JSON serializer to support everything we need
 #[derive(Debug, Default, Clone)]
 pub struct DropDatabaseSerializer;
@@ -31,13 +60,23 @@ impl<T: native_model::Model + Serialize + DeserializeOwned> DeSerializer<T>
     for DropDatabaseSerializer
 {
     fn serialize(&self, val: &T) -> rustbreak::error::DeSerResult<Vec<u8>> {
-        native_model::encode(val).map_err(|e| DeSerError::Internal(e.to_string()))
+        let mut data =
+            native_model::encode(val).map_err(|e| DeSerError::Internal(e.to_string()))?;
+        let key: [u8; 16] = *KEY;
+        let iv: [u8; 16] = *IV;
+        let mut cipher = Aes128Ctr64LE::new(&key.into(), &iv.into());
+        cipher.apply_keystream(&mut data);
+        Ok(data)
     }
 
     fn deserialize<R: std::io::Read>(&self, mut s: R) -> rustbreak::error::DeSerResult<T> {
         let mut buf = Vec::new();
         s.read_to_end(&mut buf)
             .map_err(|e| rustbreak::error::DeSerError::Other(e.into()))?;
+        let key: [u8; 16] = *KEY;
+        let iv: [u8; 16] = *IV;
+        let mut cipher = Aes128Ctr64LE::new(&key.into(), &iv.into());
+        cipher.apply_keystream(&mut buf);
         let (val, _version) =
             native_model::decode(buf).map_err(|e| DeSerError::Internal(e.to_string()))?;
         Ok(val)
diff --git a/src-tauri/database/src/models.rs b/src-tauri/database/src/models.rs
index 8d6bb4fc..5aa727d3 100644
--- a/src-tauri/database/src/models.rs
+++ b/src-tauri/database/src/models.rs
@@ -8,19 +8,18 @@ pub mod data {
     // Declare it using the actual version that it is from, i.e. v1::Settings rather than just Settings from here
 
     pub type GameVersion = v1::GameVersion;
-    pub type Database = v3::Database;
+    pub type Database = v1::Database;
     pub type Settings = v1::Settings;
     pub type DatabaseAuth = v1::DatabaseAuth;
 
-    pub type GameDownloadStatus = v2::GameDownloadStatus;
+    pub type GameDownloadStatus = v1::GameDownloadStatus;
     pub type ApplicationTransientStatus = v1::ApplicationTransientStatus;
     /**
      * Need to be universally accessible by the ID, and the version is just a couple sprinkles on top
      */
     pub type DownloadableMetadata = v1::DownloadableMetadata;
     pub type DownloadType = v1::DownloadType;
-    pub type DatabaseApplications = v2::DatabaseApplications;
-    // pub type DatabaseCompatInfo = v2::DatabaseCompatInfo;
+    pub type DatabaseApplications = v1::DatabaseApplications;
 
     use std::collections::HashMap;
 
@@ -58,39 +57,54 @@ pub mod data {
             pub display_name: Option<String>,
             pub version_path: String,
 
-            pub platform: Platform,
+            pub only_setup: bool,
 
-            pub launch_command: String,
-            pub launch_args: Vec<String>,
-            #[serde(default = "default_template")]
-            pub launch_command_template: String,
+            pub version_index: usize,
+            pub delta: bool,
 
-            pub setup_command: String,
-            pub setup_args: Vec<String>,
             #[serde(default = "default_template")]
-            pub setup_command_template: String,
+            pub launch_template: String,
 
-            pub only_setup: bool,
+            pub launches: Vec<LaunchConfiguration>,
+            pub setups: Vec<SetupConfiguration>,
+        }
 
-            pub version_index: usize,
-            pub delta: bool,
+        #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
+        #[serde(rename_all = "camelCase")]
+        #[native_model(id = 10, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
+        pub struct LaunchConfiguration {
+            pub launch_id: String,
 
+            pub name: String,
+            pub command: String,
+            pub args: Vec<String>,
+            pub platform: Platform,
             pub umu_id_override: Option<String>,
+
+            pub executor: Option<LaunchConfigurationExecutor>,
         }
 
-        #[serde_as]
-        #[derive(Serialize, Clone, Deserialize, Default)]
+        #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
         #[serde(rename_all = "camelCase")]
-        #[native_model(id = 3, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
-        pub struct DatabaseApplications {
-            pub install_dirs: Vec<PathBuf>,
-            // Guaranteed to exist if the game also exists in the app state map
-            pub game_statuses: HashMap<String, GameDownloadStatus>,
-            pub game_versions: HashMap<String, HashMap<String, GameVersion>>,
-            pub installed_game_version: HashMap<String, DownloadableMetadata>,
+        #[native_model(id = 11, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
+        /**
+         * This is intended to be used to look up the actual launch configuration that we store elsewhere
+         */
 
-            #[serde(skip)]
-            pub transient_statuses: HashMap<DownloadableMetadata, ApplicationTransientStatus>,
+        pub struct LaunchConfigurationExecutor {
+            pub launch_id: String,
+
+            pub game_id: String,
+            pub version_id: String,
+        }
+
+        #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
+        #[serde(rename_all = "camelCase")]
+        #[native_model(id = 12, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
+        pub struct SetupConfiguration {
+            pub command: String,
+            pub args: Vec<String>,
+            pub platform: Platform,
         }
 
         #[derive(Serialize, Deserialize, Clone, Debug)]
@@ -111,10 +125,9 @@ pub mod data {
             }
         }
 
-        // Strings are version names for a particular game
-        #[derive(Serialize, Clone, Deserialize)]
+        #[derive(Serialize, Clone, Deserialize, Debug)]
         #[serde(tag = "type")]
-        #[native_model(id = 5, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
+        #[native_model(id = 5, version = 2, with = native_model::rmp_serde_1_3::RmpSerde)]
         pub enum GameDownloadStatus {
             Remote {},
             SetupRequired {
@@ -125,16 +138,19 @@ pub mod data {
                 version_name: String,
                 install_dir: String,
             },
+            PartiallyInstalled {
+                version_name: String,
+                install_dir: String,
+            },
         }
-
         // Stuff that shouldn't be synced to disk
         #[derive(Clone, Serialize, Deserialize, Debug)]
         pub enum ApplicationTransientStatus {
-            Queued { version_name: String },
-            Downloading { version_name: String },
+            Queued { version_id: String },
+            Downloading { version_id: String },
             Uninstalling {},
-            Updating { version_name: String },
-            Validating { version_name: String },
+            Updating { version_id: String },
+            Validating { version_id: String },
             Running {},
         }
 
@@ -163,175 +179,61 @@ pub mod data {
         #[serde(rename_all = "camelCase")]
         pub struct DownloadableMetadata {
             pub id: String,
-            pub version: Option<String>,
+            pub version: String,
+            pub target_platform: Platform,
             pub download_type: DownloadType,
         }
         impl DownloadableMetadata {
-            pub fn new(id: String, version: Option<String>, download_type: DownloadType) -> Self {
+            pub fn new(
+                id: String,
+                version: String,
+                target_platform: Platform,
+                download_type: DownloadType,
+            ) -> Self {
                 Self {
                     id,
                     version,
+                    target_platform,
                     download_type,
                 }
             }
         }
 
-        #[native_model(id = 1, version = 1)]
-        #[derive(Serialize, Deserialize, Clone, Default)]
-        pub struct Database {
-            #[serde(default)]
-            pub settings: Settings,
-            pub auth: Option<DatabaseAuth>,
-            pub base_url: String,
-            pub applications: DatabaseApplications,
-            pub prev_database: Option<PathBuf>,
-            pub cache_dir: PathBuf,
-        }
-    }
-
-    mod v2 {
-        use std::{collections::HashMap, path::PathBuf};
-
-        use serde_with::serde_as;
-
-        use super::{Deserialize, Serialize, native_model, v1};
-
-        #[native_model(id = 1, version = 2, with = native_model::rmp_serde_1_3::RmpSerde, from = v1::Database)]
-        #[derive(Serialize, Deserialize, Clone, Default)]
-        pub struct Database {
-            #[serde(default)]
-            pub settings: v1::Settings,
-            pub auth: Option<v1::DatabaseAuth>,
-            pub base_url: String,
-            pub applications: v1::DatabaseApplications,
-            #[serde(skip)]
-            pub prev_database: Option<PathBuf>,
-            pub cache_dir: PathBuf,
-            pub compat_info: Option<DatabaseCompatInfo>,
-        }
-
-        #[native_model(id = 9, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
-        #[derive(Serialize, Deserialize, Clone, Default)]
-
-        pub struct DatabaseCompatInfo {
-            pub umu_installed: bool,
-        }
-
-        impl From<v1::Database> for Database {
-            fn from(value: v1::Database) -> Self {
-                Self {
-                    settings: value.settings,
-                    auth: value.auth,
-                    base_url: value.base_url,
-                    applications: value.applications,
-                    prev_database: value.prev_database,
-                    cache_dir: value.cache_dir,
-                    compat_info: None,
-                }
-            }
-        }
-        // Strings are version names for a particular game
-        #[derive(Serialize, Clone, Deserialize, Debug)]
-        #[serde(tag = "type")]
-        #[native_model(id = 5, version = 2, with = native_model::rmp_serde_1_3::RmpSerde, from = v1::GameDownloadStatus)]
-        pub enum GameDownloadStatus {
-            Remote {},
-            SetupRequired {
-                version_name: String,
-                install_dir: String,
-            },
-            Installed {
-                version_name: String,
-                install_dir: String,
-            },
-            PartiallyInstalled {
-                version_name: String,
-                install_dir: String,
-            },
-        }
-        impl From<v1::GameDownloadStatus> for GameDownloadStatus {
-            fn from(value: v1::GameDownloadStatus) -> Self {
-                match value {
-                    v1::GameDownloadStatus::Remote {} => Self::Remote {},
-                    v1::GameDownloadStatus::SetupRequired {
-                        version_name,
-                        install_dir,
-                    } => Self::SetupRequired {
-                        version_name,
-                        install_dir,
-                    },
-                    v1::GameDownloadStatus::Installed {
-                        version_name,
-                        install_dir,
-                    } => Self::Installed {
-                        version_name,
-                        install_dir,
-                    },
-                }
-            }
-        }
         #[serde_as]
         #[derive(Serialize, Clone, Deserialize, Default)]
         #[serde(rename_all = "camelCase")]
-        #[native_model(id = 3, version = 2, with = native_model::rmp_serde_1_3::RmpSerde, from=v1::DatabaseApplications)]
+        #[native_model(id = 3, version = 2, with = native_model::rmp_serde_1_3::RmpSerde)]
         pub struct DatabaseApplications {
             pub install_dirs: Vec<PathBuf>,
             // Guaranteed to exist if the game also exists in the app state map
             pub game_statuses: HashMap<String, GameDownloadStatus>,
 
-            pub game_versions: HashMap<String, HashMap<String, v1::GameVersion>>,
-            pub installed_game_version: HashMap<String, v1::DownloadableMetadata>,
+            pub game_versions: HashMap<String, HashMap<String, GameVersion>>,
+            pub installed_game_version: HashMap<String, DownloadableMetadata>,
 
             #[serde(skip)]
-            pub transient_statuses:
-                HashMap<v1::DownloadableMetadata, v1::ApplicationTransientStatus>,
+            pub transient_statuses: HashMap<DownloadableMetadata, ApplicationTransientStatus>,
         }
-        impl From<v1::DatabaseApplications> for DatabaseApplications {
-            fn from(value: v1::DatabaseApplications) -> Self {
-                Self {
-                    game_statuses: value
-                        .game_statuses
-                        .into_iter()
-                        .map(|x| (x.0, x.1.into()))
-                        .collect::<HashMap<String, GameDownloadStatus>>(),
-                    install_dirs: value.install_dirs,
-                    game_versions: value.game_versions,
-                    installed_game_version: value.installed_game_version,
-                    transient_statuses: value.transient_statuses,
-                }
-            }
+
+        #[native_model(id = 9, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
+        #[derive(Serialize, Deserialize, Clone, Default)]
+
+        pub struct DatabaseCompatInfo {
+            pub umu_installed: bool,
         }
-    }
-    mod v3 {
-        use std::path::PathBuf;
 
-        use super::{Deserialize, Serialize, native_model, v1, v2};
-        #[native_model(id = 1, version = 3, with = native_model::rmp_serde_1_3::RmpSerde, from = v2::Database)]
+        #[native_model(id = 1, version = 1)]
         #[derive(Serialize, Deserialize, Clone, Default)]
         pub struct Database {
             #[serde(default)]
-            pub settings: v1::Settings,
-            pub auth: Option<v1::DatabaseAuth>,
+            pub settings: Settings,
+            pub auth: Option<DatabaseAuth>,
             pub base_url: String,
-            pub applications: v2::DatabaseApplications,
+            pub applications: DatabaseApplications,
             #[serde(skip)]
             pub prev_database: Option<PathBuf>,
             pub cache_dir: PathBuf,
-            pub compat_info: Option<v2::DatabaseCompatInfo>,
-        }
-
-        impl From<v2::Database> for Database {
-            fn from(value: v2::Database) -> Self {
-                Self {
-                    settings: value.settings,
-                    auth: value.auth,
-                    base_url: value.base_url,
-                    applications: value.applications.into(),
-                    prev_database: value.prev_database,
-                    cache_dir: value.cache_dir,
-                    compat_info: None,
-                }
-            }
+            pub compat_info: Option<DatabaseCompatInfo>,
         }
     }
 
diff --git a/src-tauri/database/src/platform.rs b/src-tauri/database/src/platform.rs
index bd3721d3..3b263024 100644
--- a/src-tauri/database/src/platform.rs
+++ b/src-tauri/database/src/platform.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-#[derive(Eq, Hash, PartialEq, Serialize, Deserialize, Clone, Copy, Debug)]
+#[derive(Eq, Hash, PartialEq, Serialize, Deserialize, Clone, Copy, Debug, PartialOrd, Ord)]
 pub enum Platform {
     Windows,
     Linux,
diff --git a/src-tauri/download_manager/src/download_manager_builder.rs b/src-tauri/download_manager/src/download_manager_builder.rs
index c413ccff..cb6cf3aa 100644
--- a/src-tauri/download_manager/src/download_manager_builder.rs
+++ b/src-tauri/download_manager/src/download_manager_builder.rs
@@ -330,7 +330,7 @@ impl DownloadManagerBuilder {
         send!(self.sender, DownloadManagerSignal::Go);
     }
     async fn manage_error_signal(&mut self, error: ApplicationDownloadError) {
-        debug!("got signal Error");
+        info!("got signal Error");
         if let Some(metadata) = self.download_queue.read().front()
             && let Some(current_agent) = self.download_agent_registry.get(metadata)
         {
diff --git a/src-tauri/download_manager/src/download_manager_frontend.rs b/src-tauri/download_manager/src/download_manager_frontend.rs
index 33471d93..846d2adc 100644
--- a/src-tauri/download_manager/src/download_manager_frontend.rs
+++ b/src-tauri/download_manager/src/download_manager_frontend.rs
@@ -1,5 +1,4 @@
 use std::{
-    any::Any,
     collections::VecDeque,
     fmt::Debug,
     sync::{Mutex, MutexGuard},
@@ -10,7 +9,7 @@ use log::{debug, info};
 use serde::Serialize;
 use tauri::async_runtime::JoinHandle;
 use tokio::sync::mpsc::Sender;
-use tokio::sync::mpsc::{self, error::SendError};
+use tokio::sync::mpsc::error::SendError;
 use utils::{lock, send};
 
 use crate::error::ApplicationDownloadError;
diff --git a/src-tauri/download_manager/src/error.rs b/src-tauri/download_manager/src/error.rs
index 21201e80..a8ae34e6 100644
--- a/src-tauri/download_manager/src/error.rs
+++ b/src-tauri/download_manager/src/error.rs
@@ -43,6 +43,7 @@ pub enum ApplicationDownloadError {
     Lock,
     IoError(Arc<io::Error>),
     DownloadError(RemoteAccessError),
+    InvalidCommand,
 }
 
 impl Display for ApplicationDownloadError {
@@ -69,6 +70,7 @@ impl Display for ApplicationDownloadError {
             ApplicationDownloadError::DownloadError(error) => {
                 write!(f, "Download failed with error {error:?}")
             }
+            ApplicationDownloadError::InvalidCommand => write!(f, "Invalid command state"),
         }
     }
 }
diff --git a/src-tauri/download_manager/src/util/progress_object.rs b/src-tauri/download_manager/src/util/progress_object.rs
index fae7dca7..eae4761f 100644
--- a/src-tauri/download_manager/src/util/progress_object.rs
+++ b/src-tauri/download_manager/src/util/progress_object.rs
@@ -3,11 +3,10 @@ use std::{
         Arc, Mutex,
         atomic::{AtomicUsize, Ordering},
     },
-    time::{Duration, Instant},
+    time::Instant,
 };
 
 use atomic_instant_full::AtomicInstant;
-use throttle_my_fn::throttle;
 use utils::{lock, send};
 use tokio::sync::mpsc::Sender;
 
diff --git a/src-tauri/games/src/downloads/download_agent.rs b/src-tauri/games/src/downloads/download_agent.rs
index c87b4338..69441d67 100644
--- a/src-tauri/games/src/downloads/download_agent.rs
+++ b/src-tauri/games/src/downloads/download_agent.rs
@@ -11,8 +11,6 @@ use download_manager::util::download_thread_control_flag::{
 };
 use download_manager::util::progress_object::{ProgressHandle, ProgressObject};
 use droplet_rs::manifest::Manifest;
-use futures_util::StreamExt;
-use futures_util::stream::FuturesUnordered;
 use log::{debug, error, info, warn};
 use remote::auth::generate_authorization_header;
 use remote::error::RemoteAccessError;
@@ -22,9 +20,8 @@ use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex};
 use std::time::Instant;
-use std::{io, mem};
+use std::mem;
 use tauri::AppHandle;
-use tokio::sync::Semaphore;
 use tokio::sync::mpsc::Sender;
 use utils::{app_emit, lock, send};
 
@@ -37,12 +34,8 @@ use super::drop_data::DropData;
 
 static RETRY_COUNT: usize = 3;
 
-const TARGET_BUCKET_SIZE: usize = 63 * 1000 * 1000;
-const MAX_FILES_PER_BUCKET: usize = (1024 / 4) - 1;
-
 pub struct GameDownloadAgent {
-    pub id: String,
-    pub version: String,
+    pub metadata: DownloadableMetadata,
     pub control_flag: DownloadThreadControl,
     context_map: Mutex<HashMap<String, bool>>,
     pub manifest: Mutex<Option<Manifest>>,
@@ -54,8 +47,7 @@ pub struct GameDownloadAgent {
 
 impl GameDownloadAgent {
     pub async fn new_from_index(
-        id: String,
-        version: String,
+        metadata: DownloadableMetadata,
         target_download_dir: usize,
         sender: Sender<DownloadManagerSignal>,
     ) -> Result<Self, ApplicationDownloadError> {
@@ -65,11 +57,10 @@ impl GameDownloadAgent {
             db_lock.applications.install_dirs[target_download_dir].clone()
         };
 
-        Self::new(id, version, base_dir, sender).await
+        Self::new(metadata, base_dir, sender).await
     }
     pub async fn new(
-        id: String,
-        version: String,
+        metadata: DownloadableMetadata,
         base_dir: PathBuf,
         sender: Sender<DownloadManagerSignal>,
     ) -> Result<Self, ApplicationDownloadError> {
@@ -77,14 +68,13 @@ impl GameDownloadAgent {
         let control_flag = DownloadThreadControl::new(DownloadThreadControlFlag::Stop);
 
         let base_dir_path = Path::new(&base_dir);
-        let data_base_dir_path = base_dir_path.join(id.clone());
+        let data_base_dir_path = base_dir_path.join(metadata.id.clone());
 
         let stored_manifest =
-            DropData::generate(id.clone(), version.clone(), data_base_dir_path.clone());
+            DropData::generate(metadata.id.clone(), metadata.version.clone(), metadata.target_platform.clone(), data_base_dir_path.clone());
 
         let result = Self {
-            id,
-            version,
+            metadata,
             control_flag,
             manifest: Mutex::new(None),
             context_map: Mutex::new(HashMap::new()),
@@ -114,7 +104,7 @@ impl GameDownloadAgent {
     pub fn setup_download(&self, app_handle: &AppHandle) -> Result<(), ApplicationDownloadError> {
         let mut db_lock = borrow_db_mut_checked();
         let status = ApplicationTransientStatus::Downloading {
-            version_name: self.version.clone(),
+            version_id: self.metadata.version.clone(),
         };
         db_lock
             .applications
@@ -146,7 +136,7 @@ impl GameDownloadAgent {
 
         debug!(
             "{} took {}ms to download",
-            self.id,
+            self.metadata.id,
             timer.elapsed().as_millis()
         );
         res
@@ -168,7 +158,7 @@ impl GameDownloadAgent {
         let client = DROP_CLIENT_ASYNC.clone();
         let url = generate_url(
             &["/api/v1/client/game/manifest"],
-            &[("id", &self.id), ("version", &self.version)],
+            &[("id", &self.metadata.id), ("version", &self.metadata.version)],
         )
         .map_err(ApplicationDownloadError::Communication)?;
 
@@ -257,8 +247,8 @@ impl GameDownloadAgent {
                             let base_path = unsafe_self.dropdata.base_path.clone();
                             info!("starting chunk {}", chunk_id);
                             match download_game_chunk(
-                                &unsafe_self.id,
-                                &unsafe_self.version,
+                                &unsafe_self.metadata.id,
+                                &unsafe_self.metadata.version,
                                 &chunk_id,
                                 &key,
                                 &chunk_data,
@@ -274,13 +264,13 @@ impl GameDownloadAgent {
                                 Err(e) => {
                                     warn!("got error for chunk id {}: {e:?}", chunk_id);
 
-                                    let retry = matches!(
+                                    let retry = true; /*matches!(
                                         &e,
                                         ApplicationDownloadError::Communication(_)
                                             | ApplicationDownloadError::Checksum
                                             | ApplicationDownloadError::Lock
                                             | ApplicationDownloadError::IoError(_)
-                                    );
+                                    );*/
 
                                     if i == RETRY_COUNT - 1 || !retry {
                                         warn!("retry logic failed, not re-attempting.");
@@ -294,6 +284,7 @@ impl GameDownloadAgent {
                         }
                     });
                 }
+                drop(sender);
             });
         });
 
@@ -319,19 +310,15 @@ impl GameDownloadAgent {
         self.dropdata.write();
 
         // If there are any contexts left which are false
-        if !completed_chunks.iter().all(|x| *x.1) {
+        if completed_chunks.len() != chunk_len {
             info!(
                 "download agent for {} exited without completing ({}/{})",
-                self.id.clone(),
-                completed_chunks.iter().filter(|v| *v.1).count(),
+                self.metadata.id.clone(),
+                completed_chunks.len(),
                 chunk_len,
             );
-            self.context_map.replace(completed_chunks).unwrap();
-
             return Ok(false);
         }
-        self.context_map.replace(completed_chunks).unwrap();
-
         Ok(true)
     }
 
@@ -341,7 +328,7 @@ impl GameDownloadAgent {
         self.control_flag.set(DownloadThreadControlFlag::Go);
 
         let status = ApplicationTransientStatus::Validating {
-            version_name: self.version.clone(),
+            version_id: self.metadata.version.clone(),
         };
 
         let mut db_lock = borrow_db_mut_checked();
@@ -445,24 +432,20 @@ impl Downloadable for GameDownloadAgent {
     }
 
     fn metadata(&self) -> DownloadableMetadata {
-        DownloadableMetadata {
-            id: self.id.clone(),
-            version: Some(self.version.clone()),
-            download_type: DownloadType::Game,
-        }
+        self.metadata.clone()
     }
 
     fn on_queued(&self, app_handle: &tauri::AppHandle) {
         *self.status.lock().unwrap() = DownloadStatus::Queued;
         let mut db_lock = borrow_db_mut_checked();
         let status = ApplicationTransientStatus::Queued {
-            version_name: self.version.clone(),
+            version_id: self.metadata.version.clone(),
         };
         db_lock
             .applications
             .transient_statuses
             .insert(self.metadata(), status.clone());
-        push_game_update(app_handle, &self.id, None, (None, Some(status)));
+        push_game_update(app_handle, &self.metadata.id, None, (None, Some(status)));
     }
 
     fn on_error(&self, app_handle: &tauri::AppHandle, error: &ApplicationDownloadError) {
@@ -479,9 +462,9 @@ impl Downloadable for GameDownloadAgent {
 
         push_game_update(
             app_handle,
-            &self.id,
+            &self.metadata.id,
             None,
-            GameStatusManager::fetch_state(&self.id, &handle),
+            GameStatusManager::fetch_state(&self.metadata.id, &handle),
         );
     }
 
@@ -503,7 +486,7 @@ impl Downloadable for GameDownloadAgent {
     }
 
     fn on_cancelled(&self, app_handle: &tauri::AppHandle) {
-        info!("cancelled {}", self.id);
+        info!("cancelled {}", self.metadata.id);
         self.cancel(app_handle);
     }
 
diff --git a/src-tauri/games/src/downloads/download_logic.rs b/src-tauri/games/src/downloads/download_logic.rs
index 05a46740..2f40c726 100644
--- a/src-tauri/games/src/downloads/download_logic.rs
+++ b/src-tauri/games/src/downloads/download_logic.rs
@@ -13,19 +13,12 @@ use download_manager::util::download_thread_control_flag::{
 };
 use download_manager::util::progress_object::ProgressHandle;
 use droplet_rs::manifest::ChunkData;
-use futures_util::StreamExt as _;
-use log::{debug, info, warn};
+use log::{debug, info};
 use remote::auth::generate_authorization_header;
 use remote::error::{DropServerError, RemoteAccessError};
 use remote::requests::generate_url;
-use remote::utils::{DROP_CLIENT_ASYNC, DROP_CLIENT_SYNC};
+use remote::utils::DROP_CLIENT_SYNC;
 use sha2::Digest;
-use tokio::fs::OpenOptions;
-use tokio::io::{AsyncReadExt, AsyncSeekExt, AsyncWriteExt};
-use tokio_util::io::StreamReader;
-
-static MAX_PACKET_LENGTH: usize = 4096 * 4;
-static BUMP_SIZE: usize = 4096 * 16;
 
 const READ_BUF_LEN: usize = 1 * 1024 * 1024;
 
@@ -79,6 +72,11 @@ pub fn download_game_chunk(
         ));
     }
 
+    if control_flag.get() == DownloadThreadControlFlag::Stop {
+        progress.set(0);
+        return Ok(false);
+    }
+
     let timestep = start.elapsed().as_millis();
 
     debug!("took {}ms to start downloading", timestep);
@@ -128,6 +126,11 @@ pub fn download_game_chunk(
             set_permissions(path, permissions)
                 .map_err(|e| ApplicationDownloadError::IoError(Arc::new(e)))?;
         }
+
+        if control_flag.get() == DownloadThreadControlFlag::Stop {
+            progress.set(0);
+            return Ok(false);
+        }
     }
 
     let digest = hex::encode(hasher.finalize());
diff --git a/src-tauri/games/src/downloads/drop_data.rs b/src-tauri/games/src/downloads/drop_data.rs
index 0c952cf8..eb59b0b2 100644
--- a/src-tauri/games/src/downloads/drop_data.rs
+++ b/src-tauri/games/src/downloads/drop_data.rs
@@ -5,6 +5,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
+use database::platform::Platform;
 use log::error;
 use native_model::{Decode, Encode};
 use utils::lock;
@@ -16,6 +17,7 @@ pub static DROP_DATA_PATH: &str = ".dropdata";
 pub mod v1 {
     use std::{collections::HashMap, path::PathBuf, sync::Mutex};
 
+    use database::platform::Platform;
     use native_model::native_model;
     use serde::{Deserialize, Serialize};
 
@@ -24,16 +26,18 @@ pub mod v1 {
     pub struct DropData {
         pub game_id: String,
         pub game_version: String,
+        pub target_platform: Platform,
         pub contexts: Mutex<HashMap<String, bool>>,
         pub base_path: PathBuf,
     }
 
     impl DropData {
-        pub fn new(game_id: String, game_version: String, base_path: PathBuf) -> Self {
+        pub fn new(game_id: String, game_version: String, target_platform: Platform, base_path: PathBuf) -> Self {
             Self {
                 base_path,
                 game_id,
                 game_version,
+                target_platform,
                 contexts: Mutex::new(HashMap::new()),
             }
         }
@@ -41,10 +45,10 @@ pub mod v1 {
 }
 
 impl DropData {
-    pub fn generate(game_id: String, game_version: String, base_path: PathBuf) -> Self {
+    pub fn generate(game_id: String, game_version: String, target_platform: Platform, base_path: PathBuf) -> Self {
         match DropData::read(&base_path) {
             Ok(v) => v,
-            Err(_) => DropData::new(game_id, game_version, base_path),
+            Err(_) => DropData::new(game_id, game_version, target_platform, base_path),
         }
     }
     pub fn read(base_path: &Path) -> Result<Self, io::Error> {
diff --git a/src-tauri/games/src/downloads/manifest.rs b/src-tauri/games/src/downloads/manifest.rs
index bba8a9ef..ea0c0dc5 100644
--- a/src-tauri/games/src/downloads/manifest.rs
+++ b/src-tauri/games/src/downloads/manifest.rs
@@ -1,5 +1,4 @@
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
 use std::path::PathBuf;
 
 #[derive(Debug, Clone, Serialize)]
@@ -21,46 +20,6 @@ pub struct DownloadBucket {
     pub drops: Vec<DownloadDrop>,
 }
 
-#[derive(Deserialize)]
-pub struct DownloadContext {
-    pub context: String,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ChunkBodyFile {
-    filename: String,
-    chunk_index: usize,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ChunkBody {
-    pub context: String,
-    pub files: Vec<ChunkBodyFile>,
-}
-
-#[derive(Serialize)]
-pub struct ManifestBody {
-    pub game: String,
-    pub version: String,
-}
-
-impl ChunkBody {
-    pub fn create(context: &DownloadContext, drops: &[DownloadDrop]) -> ChunkBody {
-        Self {
-            context: context.context.clone(),
-            files: drops
-                .iter()
-                .map(|e| ChunkBodyFile {
-                    filename: e.filename.clone(),
-                    chunk_index: e.index,
-                })
-                .collect(),
-        }
-    }
-}
-
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct DropValidateContext {
     pub index: usize,
diff --git a/src-tauri/games/src/library.rs b/src-tauri/games/src/library.rs
index 0b7f67c2..bd4ae073 100644
--- a/src-tauri/games/src/library.rs
+++ b/src-tauri/games/src/library.rs
@@ -87,7 +87,7 @@ pub fn set_partially_installed_db(
     db_lock.applications.game_statuses.insert(
         meta.id.clone(),
         GameDownloadStatus::PartiallyInstalled {
-            version_name: meta.version.as_ref().unwrap().clone(),
+            version_name: meta.version.clone(),
             install_dir,
         },
     );
@@ -199,17 +199,13 @@ pub fn on_game_complete(
     app_handle: &AppHandle,
 ) -> Result<(), RemoteAccessError> {
     // Fetch game version information from remote
-    if meta.version.is_none() {
-        return Err(RemoteAccessError::GameNotFound(meta.id.clone()));
-    }
-
     let client = DROP_CLIENT_SYNC.clone();
     let response = generate_url(
         &[
             "/api/v1/client/game",
             &meta.id,
             "version",
-            meta.version.as_ref().unwrap(),
+            &meta.version,
         ],
         &[],
     )?;
@@ -226,7 +222,7 @@ pub fn on_game_complete(
         .game_versions
         .entry(meta.id.clone())
         .or_default()
-        .insert(meta.version.clone().unwrap(), game_version.clone());
+        .insert(meta.version.clone(), game_version.clone());
     handle
         .applications
         .installed_game_version
@@ -234,14 +230,16 @@ pub fn on_game_complete(
 
     drop(handle);
 
-    let status = if game_version.setup_command.is_empty() {
+    let setup_configuration = game_version.setups.iter().find(|v| v.platform == meta.target_platform);
+
+    let status = if setup_configuration.is_none() {
         GameDownloadStatus::Installed {
-            version_name: meta.version.clone().unwrap(),
+            version_name: meta.version.clone(),
             install_dir,
         }
     } else {
         GameDownloadStatus::SetupRequired {
-            version_name: meta.version.clone().unwrap(),
+            version_name: meta.version.clone(),
             install_dir,
         }
     };
diff --git a/src-tauri/games/src/scan.rs b/src-tauri/games/src/scan.rs
index 4a711fcf..163c3fcc 100644
--- a/src-tauri/games/src/scan.rs
+++ b/src-tauri/games/src/scan.rs
@@ -33,7 +33,8 @@ pub fn scan_install_dirs() {
 
             let metadata = DownloadableMetadata::new(
                 drop_data.game_id,
-                Some(drop_data.game_version),
+                drop_data.game_version,
+                drop_data.target_platform,
                 DownloadType::Game,
             );
             set_partially_installed_db(
diff --git a/src-tauri/games/src/state.rs b/src-tauri/games/src/state.rs
index 08ed2286..128653cc 100644
--- a/src-tauri/games/src/state.rs
+++ b/src-tauri/games/src/state.rs
@@ -1,5 +1,5 @@
 use database::models::data::{
-    ApplicationTransientStatus, Database, DownloadType, DownloadableMetadata, GameDownloadStatus,
+    ApplicationTransientStatus, Database, DownloadType, GameDownloadStatus,
 };
 
 pub type GameStatusWithTransient = (
@@ -13,12 +13,10 @@ impl GameStatusManager {
         let online_state = database
             .applications
             .transient_statuses
-            .get(&DownloadableMetadata {
-                id: game_id.to_string(),
-                download_type: DownloadType::Game,
-                version: None,
-            })
-            .cloned();
+            .iter()
+            .find(|v| v.0.id == *game_id && v.0.download_type == DownloadType::Game)
+            .map(|v| v.1.clone())
+            .clone();
 
         let offline_state = database.applications.game_statuses.get(game_id).cloned();
 
diff --git a/src-tauri/process/src/process_handlers.rs b/src-tauri/process/src/process_handlers.rs
index 76b1ab2e..54c2740c 100644
--- a/src-tauri/process/src/process_handlers.rs
+++ b/src-tauri/process/src/process_handlers.rs
@@ -1,6 +1,5 @@
 use client::compat::{COMPAT_INFO, UMU_LAUNCHER_EXECUTABLE};
 use database::{Database, DownloadableMetadata, GameVersion, platform::Platform};
-use log::debug;
 
 use crate::{error::ProcessError, process_manager::ProcessHandler};
 
@@ -26,14 +25,19 @@ pub struct UMULauncher;
 impl ProcessHandler for UMULauncher {
     fn create_launch_process(
         &self,
-        _meta: &DownloadableMetadata,
+        meta: &DownloadableMetadata,
         launch_command: String,
         args: Vec<String>,
         game_version: &GameVersion,
         _current_dir: &str,
     ) -> Result<String, ProcessError> {
-        debug!("Game override: \"{:?}\"", &game_version.umu_id_override);
-        let game_id = match &game_version.umu_id_override {
+        let launch_config = game_version
+            .launches
+            .iter()
+            .find(|v| v.platform == meta.target_platform)
+            .ok_or(ProcessError::NotInstalled)?;
+
+        let game_id = match &launch_config.umu_id_override {
             Some(game_override) => {
                 if game_override.is_empty() {
                     game_version.game_id.clone()
diff --git a/src-tauri/process/src/process_manager.rs b/src-tauri/process/src/process_manager.rs
index ec3062b0..9ad2d431 100644
--- a/src-tauri/process/src/process_manager.rs
+++ b/src-tauri/process/src/process_manager.rs
@@ -169,7 +169,7 @@ impl ProcessManager<'_> {
 
         let version_data = match db_handle.applications.game_versions.get(&game_id) {
             // This unwrap here should be resolved by just making the hashmap accept an option rather than just a String
-            Some(res) => res.get(&meta.version.unwrap()).expect("Failed to get game version from installed game versions. Is the database corrupted?"),
+            Some(res) => res.get(&meta.version).expect("Failed to get game version from installed game versions. Is the database corrupted?"),
             None => todo!(),
         };
 
@@ -214,23 +214,14 @@ impl ProcessManager<'_> {
             return Err(ProcessError::AlreadyRunning);
         }
 
-        let version = match borrow_db_checked()
+        let mut db_lock = borrow_db_mut_checked();
+
+        let meta = db_lock
             .applications
-            .game_statuses
+            .installed_game_version
             .get(&game_id)
             .cloned()
-        {
-            Some(GameDownloadStatus::Installed { version_name, .. }) => version_name,
-            Some(GameDownloadStatus::SetupRequired { version_name, .. }) => version_name,
-            _ => 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();
+            .ok_or(ProcessError::NotInstalled)?;
 
         let game_status = db_lock
             .applications
@@ -274,7 +265,11 @@ impl ProcessManager<'_> {
             .truncate(true)
             .read(true)
             .create(true)
-            .open(game_log_folder.join(format!("{}-{}.log", &version, current_time.timestamp())))
+            .open(game_log_folder.join(format!(
+                "{}-{}.log",
+                &meta.version,
+                current_time.timestamp()
+            )))
             .map_err(ProcessError::IOError)?;
 
         let error_file = OpenOptions::new()
@@ -284,35 +279,47 @@ impl ProcessManager<'_> {
             .create(true)
             .open(game_log_folder.join(format!(
                 "{}-{}-error.log",
-                &version,
+                &meta.version,
                 current_time.timestamp()
             )))
             .map_err(ProcessError::IOError)?;
 
-        let target_platform = game_version.platform;
+        let target_platform = meta.target_platform;
 
         let process_handler = self.fetch_process_handler(&db_lock, &target_platform)?;
 
-        let (launch, args) = match game_status {
+        let (launch, args, executor) = match game_status {
             GameDownloadStatus::Installed {
                 version_name: _,
                 install_dir: _,
-            } => (&game_version.launch_command, &game_version.launch_args),
+            } => {
+                let launch_config = game_version
+                    .launches
+                    .iter()
+                    .find(|v| v.platform == target_platform)
+                    .ok_or(ProcessError::NotInstalled)?;
+
+                (
+                    launch_config.command.clone(),
+                    launch_config.args.clone(),
+                    launch_config.executor.as_ref(),
+                )
+            }
             GameDownloadStatus::SetupRequired {
                 version_name: _,
                 install_dir: _,
-            } => (&game_version.setup_command, &game_version.setup_args),
-            GameDownloadStatus::PartiallyInstalled {
-                version_name: _,
-                install_dir: _,
-            } => unreachable!("Game registered as 'Partially Installed'"),
-            GameDownloadStatus::Remote {} => unreachable!("Game registered as 'Remote'"),
+            } => {
+                let setup_config = game_version
+                    .setups
+                    .iter()
+                    .find(|v| v.platform == target_platform)
+                    .ok_or(ProcessError::NotInstalled)?;
+
+                (setup_config.command.clone(), setup_config.args.clone(), None)
+            }
+            _ => unreachable!("Game registered as 'Partially Installed'"),
         };
 
-        #[allow(clippy::unwrap_used)]
-        let launch = PathBuf::from_str(install_dir).unwrap().join(launch);
-        let launch = launch.display().to_string();
-
         let launch_string = process_handler.create_launch_process(
             &meta,
             launch.to_string(),
@@ -324,12 +331,15 @@ impl ProcessManager<'_> {
         let format_args = DropFormatArgs::new(
             launch_string,
             install_dir,
-            &game_version.launch_command,
-            launch.to_string(),
+            &launch.clone(),
+            PathBuf::from(install_dir)
+                .join(launch)
+                .display()
+                .to_string(),
         );
 
         let launch_string = SimpleCurlyFormat
-            .format(&game_version.launch_command_template, format_args)
+            .format(&game_version.launch_template, format_args)
             .map_err(|e| ProcessError::FormatError(e.to_string()))?
             .to_string();
 
diff --git a/src-tauri/remote/src/server_proto.rs b/src-tauri/remote/src/server_proto.rs
index 23c1f5bb..47406d2a 100644
--- a/src-tauri/remote/src/server_proto.rs
+++ b/src-tauri/remote/src/server_proto.rs
@@ -2,13 +2,13 @@ use std::str::FromStr;
 
 use database::borrow_db_checked;
 use http::{
-    HeaderMap, HeaderName, HeaderValue, Request, Response, StatusCode, Uri, header::USER_AGENT,
+    HeaderMap, HeaderValue, Request, Response, StatusCode, Uri, header::USER_AGENT,
     uri::PathAndQuery,
 };
-use log::{error, info, warn};
+use log::{error, warn};
 use tauri::UriSchemeResponder;
 
-use crate::utils::{DROP_CLIENT_ASYNC, DROP_CLIENT_SYNC};
+use crate::utils::DROP_CLIENT_SYNC;
 
 pub async fn handle_server_proto_offline_wrapper(
     request: Request<Vec<u8>>,
diff --git a/src-tauri/src/downloads.rs b/src-tauri/src/downloads.rs
index 5886d9af..2ca34681 100644
--- a/src-tauri/src/downloads.rs
+++ b/src-tauri/src/downloads.rs
@@ -1,6 +1,8 @@
-use std::{path::PathBuf, sync::Arc};
+use std::sync::Arc;
 
-use database::{GameDownloadStatus, borrow_db_checked};
+use database::{
+    DownloadType, DownloadableMetadata, GameDownloadStatus, borrow_db_checked, platform::Platform,
+};
 use download_manager::{
     DOWNLOAD_MANAGER, downloadable::Downloadable, error::ApplicationDownloadError,
 };
@@ -10,17 +12,19 @@ use games::downloads::download_agent::GameDownloadAgent;
 pub async fn download_game(
     game_id: String,
     version_id: String,
+    target_platform: Platform,
     install_dir: usize,
 ) -> Result<(), ApplicationDownloadError> {
     let sender = { DOWNLOAD_MANAGER.get_sender().clone() };
 
-    let game_download_agent = GameDownloadAgent::new_from_index(
-        game_id.clone(),
-        version_id.clone(),
-        install_dir,
-        sender,
-    )
-    .await?;
+    let meta = DownloadableMetadata {
+        id: game_id,
+        version: version_id,
+        target_platform,
+        download_type: DownloadType::Game,
+    };
+
+    let game_download_agent = GameDownloadAgent::new_from_index(meta, install_dir, sender).await?;
 
     let game_download_agent =
         Arc::new(Box::new(game_download_agent) as Box<dyn Downloadable + Send + Sync>);
@@ -35,39 +39,37 @@ pub async fn download_game(
 
 #[tauri::command]
 pub async fn resume_download(game_id: String) -> Result<(), ApplicationDownloadError> {
-    let s = borrow_db_checked()
-        .applications
-        .game_statuses
-        .get(&game_id)
-        .unwrap()
-        .clone();
+    let (meta, install_dir) = {
+        let db_lock = borrow_db_checked();
+        let status = db_lock
+            .applications
+            .game_statuses
+            .get(&game_id)
+            .ok_or(ApplicationDownloadError::InvalidCommand)?
+            .clone();
+
+        let meta = db_lock
+            .applications
+            .installed_game_version
+            .get(&game_id)
+            .ok_or(ApplicationDownloadError::InvalidCommand)?
+            .clone();
 
-    let (version_name, install_dir) = match s {
-        GameDownloadStatus::Remote {} => unreachable!(),
-        GameDownloadStatus::SetupRequired { .. } => unreachable!(),
-        GameDownloadStatus::Installed { .. } => unreachable!(),
-        GameDownloadStatus::PartiallyInstalled {
-            version_name,
-            install_dir,
-        } => (version_name, install_dir),
+        let install_dir = match status {
+            GameDownloadStatus::Remote {} => Err(ApplicationDownloadError::InvalidCommand),
+            GameDownloadStatus::SetupRequired { .. } => {
+                Err(ApplicationDownloadError::InvalidCommand)
+            }
+            GameDownloadStatus::Installed { .. } => Err(ApplicationDownloadError::InvalidCommand),
+            GameDownloadStatus::PartiallyInstalled { install_dir, .. } => Ok(install_dir),
+        }?;
+        (meta, install_dir)
     };
 
     let sender = DOWNLOAD_MANAGER.get_sender();
-    let parent_dir: PathBuf = install_dir.into();
 
     let game_download_agent = Arc::new(Box::new(
-        GameDownloadAgent::new(
-            game_id,
-            version_name.clone(),
-            parent_dir
-                .parent()
-                .unwrap_or_else(|| {
-                    panic!("Failed to get parent directry of {}", parent_dir.display())
-                })
-                .to_path_buf(),
-            sender,
-        )
-        .await?,
+        GameDownloadAgent::new(meta, install_dir.into(), sender).await?,
     ) as Box<dyn Downloadable + Send + Sync>);
 
     DOWNLOAD_MANAGER
diff --git a/src-tauri/src/games.rs b/src-tauri/src/games.rs
index e66d96cc..d5a490a7 100644
--- a/src-tauri/src/games.rs
+++ b/src-tauri/src/games.rs
@@ -1,6 +1,8 @@
 use std::sync::nonpoison::Mutex;
 
-use database::{GameDownloadStatus, GameVersion, borrow_db_checked, borrow_db_mut_checked};
+use database::{
+    GameDownloadStatus, GameVersion, borrow_db_checked, borrow_db_mut_checked, platform::Platform,
+};
 use games::{
     downloads::error::LibraryError,
     library::{FetchGameStruct, FrontendGameOptions, Game, get_current_meta, uninstall_game_logic},
@@ -16,6 +18,7 @@ use remote::{
     requests::generate_url,
     utils::DROP_CLIENT_ASYNC,
 };
+use serde::Serialize;
 use tauri::AppHandle;
 
 use crate::AppState;
@@ -141,7 +144,7 @@ pub async fn fetch_game_logic(
                 .applications
                 .game_versions
                 .get(&metadata.id)
-                .map(|v| v.get(metadata.version.as_ref().unwrap()).unwrap())
+                .map(|v| v.get(&metadata.version).unwrap())
                 .cloned(),
         };
 
@@ -206,10 +209,19 @@ pub async fn fetch_game_logic(
     Ok(data)
 }
 
+#[derive(Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct VersionDownloadOption {
+    version_id: String,
+    display_name: Option<String>,
+    version_path: String,
+    platform: Platform,
+}
+
 pub async fn fetch_game_version_options_logic(
     game_id: String,
     state: tauri::State<'_, Mutex<AppState>>,
-) -> Result<Vec<GameVersion>, RemoteAccessError> {
+) -> Result<Vec<VersionDownloadOption>, RemoteAccessError> {
     let client = DROP_CLIENT_ASYNC.clone();
 
     let response = generate_url(&["/api/v1/client/game/versions"], &[("id", &game_id)])?;
@@ -229,8 +241,17 @@ pub async fn fetch_game_version_options_logic(
 
     let state_lock = state.lock();
     let process_manager_lock = PROCESS_MANAGER.lock();
-    let data: Vec<GameVersion> = data
+    let data = data
         .into_iter()
+        .map(|v| {
+            v.launches.into_iter().map(move |l| VersionDownloadOption {
+                version_id: v.version_id.clone(),
+                display_name: v.display_name.clone(),
+                version_path: v.version_path.clone(),
+                platform: l.platform,
+            })
+        })
+        .flatten()
         .filter(|v| process_manager_lock.valid_platform(&v.platform))
         .collect();
     drop(process_manager_lock);
@@ -251,7 +272,7 @@ pub async fn fetch_game_logic_offline(
             .applications
             .game_versions
             .get(&metadata.id)
-            .map(|v| v.get(metadata.version.as_ref().unwrap()).unwrap())
+            .map(|v| v.get(&metadata.version).unwrap())
             .cloned(),
     };
 
@@ -299,7 +320,7 @@ pub fn uninstall_game(game_id: String, app_handle: AppHandle) -> Result<(), Libr
 pub async fn fetch_game_version_options(
     game_id: String,
     state: tauri::State<'_, Mutex<AppState>>,
-) -> Result<Vec<GameVersion>, RemoteAccessError> {
+) -> Result<Vec<VersionDownloadOption>, RemoteAccessError> {
     fetch_game_version_options_logic(game_id, state).await
 }
 
@@ -316,10 +337,7 @@ pub fn update_game_configuration(
         .ok_or(LibraryError::MetaNotFound(game_id))?;
 
     let id = installed_version.id.clone();
-    let version = installed_version
-        .version
-        .clone()
-        .ok_or(LibraryError::VersionNotFound(id.clone()))?;
+    let version = installed_version.version.clone();
 
     let mut existing_configuration = handle
         .applications
@@ -331,7 +349,7 @@ pub fn update_game_configuration(
         .clone();
 
     // Add more options in here
-    existing_configuration.launch_command_template = options.launch_string().clone();
+    existing_configuration.launch_template = options.launch_string().clone();
 
     // Add no more options past here
 
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 8ebd7d30..849c3fd9 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -21,8 +21,7 @@ use ::remote::{
     cache::clear_cached_object,
     error::RemoteAccessError,
     fetch_object::fetch_object_wrapper,
-    offline,
-    server_proto::{handle_server_proto_offline_wrapper, handle_server_proto_wrapper},
+    server_proto::handle_server_proto_wrapper,
     utils::DROP_CLIENT_ASYNC,
 };
 use database::{
@@ -38,19 +37,16 @@ use log4rs::{
 };
 use serde::Serialize;
 use tauri::{
-    AppHandle, LogicalPosition, LogicalSize, Manager, RunEvent, WebviewBuilder, WebviewUrl,
-    WindowBuilder, WindowEvent,
+    AppHandle, Manager, RunEvent,
+    WindowEvent,
     menu::{Menu, MenuItem, PredefinedMenuItem},
     tray::TrayIconBuilder,
 };
 use tauri_plugin_deep_link::DeepLinkExt;
 use tauri_plugin_dialog::DialogExt;
-use tracing::{Level, span};
 use url::Url;
 use utils::app_emit;
 
-use crate::client::cleanup_and_exit;
-
 mod client;
 mod collections;
 mod download_manager;
@@ -415,8 +411,7 @@ pub fn run() {
                 fetch_object_wrapper(request, responder).await;
             });
         })
-        .register_asynchronous_uri_scheme_protocol("server", |ctx, request, responder| {
-            let scope_holder = ctx.app_handle();
+        .register_asynchronous_uri_scheme_protocol("server", |_ctx, request, responder| {
             handle_server_proto_wrapper(request, responder);
         })
         .on_window_event(|window, event| {

From 58c6f3e6a5daf360563f9ec1c2e0c9aa30acc069 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Sun, 21 Dec 2025 12:38:46 +1100
Subject: [PATCH 05/19] feat: encrypted database and fixed resuming

---
 src-tauri/Cargo.lock                          |  20 +++-
 src-tauri/Cargo.toml                          |   2 +-
 src-tauri/database/Cargo.toml                 |   6 +-
 src-tauri/database/src/db.rs                  |  61 ++--------
 src-tauri/database/src/interface.rs           | 107 ++++++++++++++----
 src-tauri/database/src/models.rs              |  58 ++++++----
 .../games/src/downloads/download_agent.rs     |   3 +-
 src-tauri/process/src/process_handlers.rs     |  16 ++-
 src-tauri/process/src/process_manager.rs      |  13 ++-
 src-tauri/remote/src/fetch_object.rs          |   2 +-
 src-tauri/remote/src/requests.rs              |   2 +-
 src-tauri/src/lib.rs                          |  35 +++---
 src-tauri/tauri.conf.json                     |   4 +-
 13 files changed, 193 insertions(+), 136 deletions(-)

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 5e02812e..26651525 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -1116,14 +1116,14 @@ name = "database"
 version = "0.1.0"
 dependencies = [
  "aes",
+ "anyhow",
  "chrono",
  "ctr",
  "dirs 6.0.0",
  "keyring",
  "log",
- "native_model",
  "rand 0.9.2",
- "rustbreak",
+ "ron",
  "serde",
  "serde_with",
  "url",
@@ -1426,7 +1426,7 @@ dependencies = [
 
 [[package]]
 name = "drop-app"
-version = "0.3.4"
+version = "0.4.0"
 dependencies = [
  "atomic-instant-full",
  "bitcode",
@@ -5058,6 +5058,20 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "ron"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd490c5b18261893f14449cbd28cb9c0b637aebf161cd77900bfdedaff21ec32"
+dependencies = [
+ "bitflags 2.10.0",
+ "once_cell",
+ "serde",
+ "serde_derive",
+ "typeid",
+ "unicode-ident",
+]
+
 [[package]]
 name = "rust-ini"
 version = "0.21.3"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index f43af39f..731a44c8 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "drop-app"
-version = "0.3.4"
+version = "0.4.0"
 description = "The client application for the open-source, self-hosted game distribution platform Drop"
 authors = ["Drop OSS"]
 edition = "2024"
diff --git a/src-tauri/database/Cargo.toml b/src-tauri/database/Cargo.toml
index 95e81368..94e0309b 100644
--- a/src-tauri/database/Cargo.toml
+++ b/src-tauri/database/Cargo.toml
@@ -5,14 +5,14 @@ edition = "2024"
 
 [dependencies]
 aes = "0.8.4"
+anyhow = "*"
 chrono = "0.4.42"
 ctr = "0.9.2"
 dirs = "6.0.0"
-keyring = {version = "3.6.3", features = ["apple-native", "crypto-rust", "linux-native-sync-persistent", "windows-native"]}
+keyring = { version = "3.6.3", features = ["apple-native", "crypto-rust", "linux-native-sync-persistent", "windows-native"] }
 log = "0.4.28"
-native_model = { version = "0.6.4", features = ["rmp_serde_1_3"], git = "https://github.com/Drop-OSS/native_model.git"}
 rand = "0.9.2"
-rustbreak = "2.0.0"
+ron = "0.12.0"
 serde = "1.0.228"
 serde_with = "3.15.0"
 url = "2.5.7"
diff --git a/src-tauri/database/src/db.rs b/src-tauri/database/src/db.rs
index afbb35ac..fce1ecbb 100644
--- a/src-tauri/database/src/db.rs
+++ b/src-tauri/database/src/db.rs
@@ -6,10 +6,9 @@ use std::{
 use aes::cipher::{KeyIvInit as _, StreamCipher};
 use keyring::Entry;
 use log::info;
-use rustbreak::{DeSerError, DeSerializer};
 use serde::{Serialize, de::DeserializeOwned};
 
-use crate::interface::{DatabaseImpls, DatabaseInterface};
+use crate::interface::{DatabaseInterface};
 
 pub static DB: LazyLock<DatabaseInterface> = LazyLock::new(DatabaseInterface::set_up_database);
 
@@ -18,8 +17,6 @@ static DATA_ROOT_PREFIX: &str = "drop";
 #[cfg(debug_assertions)]
 static DATA_ROOT_PREFIX: &str = "drop-debug";
 
-type Aes128Ctr64LE = ctr::Ctr64LE<aes::Aes128>;
-
 pub static DATA_ROOT_DIR: LazyLock<Arc<PathBuf>> = LazyLock::new(|| {
     Arc::new(
         dirs::data_dir()
@@ -28,57 +25,15 @@ pub static DATA_ROOT_DIR: LazyLock<Arc<PathBuf>> = LazyLock::new(|| {
     )
 });
 
-static KEY: LazyLock<[u8; 16]> = LazyLock::new(|| {
-    let entry = Entry::new("drop", "key").expect("failed to open keyring");
-    let key = entry.get_secret().unwrap_or_else(|_| {
-        let mut buffer = [0u8; 16];
+pub(crate) static KEY_IV: LazyLock<([u8; 16], [u8; 16])> = LazyLock::new(|| {
+    let entry = Entry::new("drop", "database_key").expect("failed to open keyring");
+    let mut key = entry.get_secret().unwrap_or_else(|_| {
+        let mut buffer = [0u8; 32];
         rand::fill(&mut buffer);
         entry.set_secret(&buffer).expect("failed to save key");
         info!("created new database key");
         buffer.to_vec()
     });
-    key.try_into().expect("failed to extract appropriate key")
-});
-
-static IV: LazyLock<[u8; 16]> = LazyLock::new(|| {
-    let entry = Entry::new("drop", "iv").expect("failed to open keyring");
-    let iv = entry.get_secret().unwrap_or_else(|_| {
-        let mut buffer = [0u8; 16];
-        rand::fill(&mut buffer);
-        entry.set_secret(&buffer).expect("failed to save iv");
-        info!("created new database iv");
-        buffer.to_vec()
-    });
-    iv.try_into().expect("failed to extract appropriate iv")
-});
-
-// Custom JSON serializer to support everything we need
-#[derive(Debug, Default, Clone)]
-pub struct DropDatabaseSerializer;
-
-impl<T: native_model::Model + Serialize + DeserializeOwned> DeSerializer<T>
-    for DropDatabaseSerializer
-{
-    fn serialize(&self, val: &T) -> rustbreak::error::DeSerResult<Vec<u8>> {
-        let mut data =
-            native_model::encode(val).map_err(|e| DeSerError::Internal(e.to_string()))?;
-        let key: [u8; 16] = *KEY;
-        let iv: [u8; 16] = *IV;
-        let mut cipher = Aes128Ctr64LE::new(&key.into(), &iv.into());
-        cipher.apply_keystream(&mut data);
-        Ok(data)
-    }
-
-    fn deserialize<R: std::io::Read>(&self, mut s: R) -> rustbreak::error::DeSerResult<T> {
-        let mut buf = Vec::new();
-        s.read_to_end(&mut buf)
-            .map_err(|e| rustbreak::error::DeSerError::Other(e.into()))?;
-        let key: [u8; 16] = *KEY;
-        let iv: [u8; 16] = *IV;
-        let mut cipher = Aes128Ctr64LE::new(&key.into(), &iv.into());
-        cipher.apply_keystream(&mut buf);
-        let (val, _version) =
-            native_model::decode(buf).map_err(|e| DeSerError::Internal(e.to_string()))?;
-        Ok(val)
-    }
-}
+    let new = key.split_off(16);
+    (new.try_into().expect("failed to extract key"), key.try_into().expect("failed to extract iv"))
+});
\ No newline at end of file
diff --git a/src-tauri/database/src/interface.rs b/src-tauri/database/src/interface.rs
index 969c93d8..6919da21 100644
--- a/src-tauri/database/src/interface.rs
+++ b/src-tauri/database/src/interface.rs
@@ -2,30 +2,32 @@ use std::{
     fs::{self, create_dir_all},
     mem::ManuallyDrop,
     ops::{Deref, DerefMut},
-    path::PathBuf,
-    sync::{RwLockReadGuard, RwLockWriteGuard},
+    path::{Path, PathBuf},
+    sync::{PoisonError, RwLock, RwLockReadGuard, RwLockWriteGuard},
 };
 
+use aes::cipher::{KeyIvInit as _, StreamCipher as _};
+use anyhow::Error;
 use chrono::Utc;
 use log::{debug, error, info, warn};
-use rustbreak::{PathDatabase, RustbreakError};
 use url::Url;
 
 use crate::{
-    db::{DATA_ROOT_DIR, DB, DropDatabaseSerializer},
-    models::data::Database,
+    db::{DATA_ROOT_DIR, DB, KEY_IV},
+    models::{
+        self,
+        data::{Database, DatabaseVersionSerializable},
+    },
 };
 
-pub type DatabaseInterface =
-    rustbreak::Database<Database, rustbreak::backend::PathBackend, DropDatabaseSerializer>;
+type Aes128Ctr64LE = ctr::Ctr64LE<aes::Aes128>;
 
-pub trait DatabaseImpls {
-    fn set_up_database() -> DatabaseInterface;
-    fn database_is_set_up(&self) -> bool;
-    fn fetch_base_url(&self) -> Url;
+pub struct DatabaseInterface {
+    data: RwLock<models::data::Database>,
+    path: PathBuf,
 }
-impl DatabaseImpls for DatabaseInterface {
-    fn set_up_database() -> DatabaseInterface {
+impl DatabaseInterface {
+    pub fn set_up_database() -> Self {
         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");
@@ -78,36 +80,95 @@ impl DatabaseImpls for DatabaseInterface {
         });
 
         if exists {
-            match PathDatabase::load_from_path(db_path.clone()) {
-                Ok(db) => db,
-                Err(e) => handle_invalid_database(e, db_path, games_base_dir, cache_dir),
+            match DatabaseInterface::open_at_path(&db_path) {
+                Ok(db) => db.unwrap(),
+                Err(e) => handle_invalid_database(e, db_path, games_base_dir, cache_dir)
+                    .expect("failed to recover from failed database"),
             }
         } else {
             let default = Database::new(games_base_dir, None, cache_dir);
             debug!("Creating database at path {}", db_path.display());
-            PathDatabase::create_at_path(db_path, default).expect("Database could not be created")
+            DatabaseInterface::create_at_path(&db_path, default)
+                .expect("Database could not be created")
         }
     }
 
-    fn database_is_set_up(&self) -> bool {
+    pub fn open_at_path(db_path: &Path) -> Result<Option<DatabaseInterface>, Error> {
+        if !db_path.exists() {
+            return Ok(None);
+        };
+        let mut database_data = std::fs::read(db_path)?;
+        let (key, iv) = *KEY_IV;
+        let mut cipher = Aes128Ctr64LE::new(&key.into(), &iv.into());
+        cipher.apply_keystream(&mut database_data);
+
+        let database_data = String::from_utf8(database_data)?;
+
+        let database_data: DatabaseVersionSerializable = ron::from_str(&database_data)?;
+        Ok(Some(DatabaseInterface {
+            data: RwLock::new(database_data.0),
+            path: db_path.to_path_buf(),
+        }))
+    }
+
+    pub fn create_at_path(db_path: &Path, database: Database) -> Result<DatabaseInterface, Error> {
+        let database = DatabaseVersionSerializable(database);
+        let mut database_data = ron::to_string(&database)?.into_bytes();
+
+        let (key, iv) = *KEY_IV;
+        let mut cipher = Aes128Ctr64LE::new(&key.into(), &iv.into());
+        cipher.apply_keystream(&mut database_data);
+
+        std::fs::write(db_path, database_data)?;
+        Ok(DatabaseInterface {
+            data: RwLock::new(database.0),
+            path: db_path.to_path_buf(),
+        })
+    }
+
+    pub fn database_is_set_up(&self) -> bool {
         !borrow_db_checked().base_url.is_empty()
     }
 
-    fn fetch_base_url(&self) -> Url {
+    pub fn fetch_base_url(&self) -> Url {
         let handle = borrow_db_checked();
         Url::parse(&handle.base_url)
             .unwrap_or_else(|_| panic!("Failed to parse base url {}", handle.base_url))
     }
+
+    fn save(&self) -> Result<(), Error> {
+        let lock = self.data.read().expect("failed to lock database to save");
+        DatabaseInterface::create_at_path(&self.path, lock.clone())?;
+        Ok(())
+    }
+
+    fn borrow_data(
+        &self,
+    ) -> Result<
+        std::sync::RwLockReadGuard<'_, Database>,
+        PoisonError<std::sync::RwLockReadGuard<'_, Database>>,
+    > {
+        self.data.read()
+    }
+
+    fn borrow_data_mut(
+        &self,
+    ) -> Result<
+        std::sync::RwLockWriteGuard<'_, Database>,
+        PoisonError<std::sync::RwLockWriteGuard<'_, Database>>,
+    > {
+        self.data.write()
+    }
 }
 
 // TODO: Make the error relelvant rather than just assume that it's a Deserialize error
 fn handle_invalid_database(
-    _e: RustbreakError,
+    error: Error,
     db_path: PathBuf,
     games_base_dir: PathBuf,
     cache_dir: PathBuf,
-) -> rustbreak::Database<Database, rustbreak::backend::PathBackend, DropDatabaseSerializer> {
-    warn!("{_e}");
+) -> Result<DatabaseInterface, Error> {
+    warn!("{error:?}");
     let new_path = {
         let time = Utc::now().timestamp();
         let mut base = db_path.clone();
@@ -126,7 +187,7 @@ fn handle_invalid_database(
 
     let db = Database::new(games_base_dir, Some(new_path), cache_dir);
 
-    PathDatabase::create_at_path(db_path, db).expect("Database could not be created")
+    Ok(DatabaseInterface::create_at_path(&db_path, db).expect("Database could not be created"))
 }
 
 // To automatically save the database upon drop
diff --git a/src-tauri/database/src/models.rs b/src-tauri/database/src/models.rs
index 5aa727d3..fc81e2a2 100644
--- a/src-tauri/database/src/models.rs
+++ b/src-tauri/database/src/models.rs
@@ -1,14 +1,13 @@
 pub mod data {
     use std::{hash::Hash, path::PathBuf};
 
-    use native_model::native_model;
     use serde::{Deserialize, Serialize};
 
     // NOTE: Within each version, you should NEVER use these types.
     // Declare it using the actual version that it is from, i.e. v1::Settings rather than just Settings from here
 
-    pub type GameVersion = v1::GameVersion;
     pub type Database = v1::Database;
+    pub type GameVersion = v1::GameVersion;
     pub type Settings = v1::Settings;
     pub type DatabaseAuth = v1::DatabaseAuth;
 
@@ -35,13 +34,44 @@ pub mod data {
         }
     }
 
+    #[derive(Serialize, Deserialize)]
+    enum DatabaseVersionEnum {
+        V1 { database: v1::Database },
+    }
+
+    pub struct DatabaseVersionSerializable(pub(crate) Database);
+
+    impl Serialize for DatabaseVersionSerializable {
+        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where
+            S: serde::Serializer,
+        {
+            // Always serialize to latest version
+            DatabaseVersionEnum::V1 {
+                database: self.0.clone(),
+            }
+            .serialize(serializer)
+        }
+    }
+
+    impl<'de> Deserialize<'de> for DatabaseVersionSerializable {
+        fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+        where
+            D: serde::Deserializer<'de>,
+        {
+            Ok(match DatabaseVersionEnum::deserialize(deserializer)? {
+                DatabaseVersionEnum::V1 { database } => DatabaseVersionSerializable(database),
+            })
+        }
+    }
+
     mod v1 {
         use serde_with::serde_as;
         use std::{collections::HashMap, path::PathBuf};
 
         use crate::platform::Platform;
 
-        use super::{Deserialize, Serialize, native_model};
+        use super::{Deserialize, Serialize};
 
         fn default_template() -> String {
             "{}".to_owned()
@@ -49,7 +79,6 @@ pub mod data {
 
         #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
         #[serde(rename_all = "camelCase")]
-        #[native_model(id = 2, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
         pub struct GameVersion {
             pub game_id: String,
             pub version_id: String,
@@ -71,7 +100,6 @@ pub mod data {
 
         #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
         #[serde(rename_all = "camelCase")]
-        #[native_model(id = 10, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
         pub struct LaunchConfiguration {
             pub launch_id: String,
 
@@ -86,7 +114,6 @@ pub mod data {
 
         #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
         #[serde(rename_all = "camelCase")]
-        #[native_model(id = 11, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
         /**
          * This is intended to be used to look up the actual launch configuration that we store elsewhere
          */
@@ -100,7 +127,6 @@ pub mod data {
 
         #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
         #[serde(rename_all = "camelCase")]
-        #[native_model(id = 12, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
         pub struct SetupConfiguration {
             pub command: String,
             pub args: Vec<String>,
@@ -109,7 +135,6 @@ pub mod data {
 
         #[derive(Serialize, Deserialize, Clone, Debug)]
         #[serde(rename_all = "camelCase")]
-        #[native_model(id = 4, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
         pub struct Settings {
             pub autostart: bool,
             pub max_download_threads: usize,
@@ -127,7 +152,6 @@ pub mod data {
 
         #[derive(Serialize, Clone, Deserialize, Debug)]
         #[serde(tag = "type")]
-        #[native_model(id = 5, version = 2, with = native_model::rmp_serde_1_3::RmpSerde)]
         pub enum GameDownloadStatus {
             Remote {},
             SetupRequired {
@@ -155,7 +179,6 @@ pub mod data {
         }
 
         #[derive(serde::Serialize, Clone, Deserialize)]
-        #[native_model(id = 6, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
         pub struct DatabaseAuth {
             pub private: String,
             pub cert: String,
@@ -163,7 +186,6 @@ pub mod data {
             pub web_token: Option<String>,
         }
 
-        #[native_model(id = 8, version = 1)]
         #[derive(
             Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, Clone, Copy,
         )]
@@ -174,7 +196,6 @@ pub mod data {
             Mod,
         }
 
-        #[native_model(id = 7, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
         #[derive(Debug, Eq, PartialOrd, Ord, Serialize, Deserialize, Clone)]
         #[serde(rename_all = "camelCase")]
         pub struct DownloadableMetadata {
@@ -202,7 +223,6 @@ pub mod data {
         #[serde_as]
         #[derive(Serialize, Clone, Deserialize, Default)]
         #[serde(rename_all = "camelCase")]
-        #[native_model(id = 3, version = 2, with = native_model::rmp_serde_1_3::RmpSerde)]
         pub struct DatabaseApplications {
             pub install_dirs: Vec<PathBuf>,
             // Guaranteed to exist if the game also exists in the app state map
@@ -215,14 +235,6 @@ pub mod data {
             pub transient_statuses: HashMap<DownloadableMetadata, ApplicationTransientStatus>,
         }
 
-        #[native_model(id = 9, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
-        #[derive(Serialize, Deserialize, Clone, Default)]
-
-        pub struct DatabaseCompatInfo {
-            pub umu_installed: bool,
-        }
-
-        #[native_model(id = 1, version = 1)]
         #[derive(Serialize, Deserialize, Clone, Default)]
         pub struct Database {
             #[serde(default)]
@@ -233,10 +245,9 @@ pub mod data {
             #[serde(skip)]
             pub prev_database: Option<PathBuf>,
             pub cache_dir: PathBuf,
-            pub compat_info: Option<DatabaseCompatInfo>,
         }
     }
-
+    
     impl Database {
         pub fn new<T: Into<PathBuf>>(
             games_base_dir: T,
@@ -256,7 +267,6 @@ pub mod data {
                 auth: None,
                 settings: Settings::default(),
                 cache_dir,
-                compat_info: None,
             }
         }
     }
diff --git a/src-tauri/games/src/downloads/download_agent.rs b/src-tauri/games/src/downloads/download_agent.rs
index 69441d67..7008e3a6 100644
--- a/src-tauri/games/src/downloads/download_agent.rs
+++ b/src-tauri/games/src/downloads/download_agent.rs
@@ -77,7 +77,7 @@ impl GameDownloadAgent {
             metadata,
             control_flag,
             manifest: Mutex::new(None),
-            context_map: Mutex::new(HashMap::new()),
+            context_map: Mutex::new(stored_manifest.get_contexts()),
             progress: Arc::new(ProgressObject::new(0, 0, sender.clone())),
             sender,
             dropdata: stored_manifest,
@@ -245,7 +245,6 @@ impl GameDownloadAgent {
                         for i in 0..RETRY_COUNT {
                             let loop_progress_handle = progress_handle.clone();
                             let base_path = unsafe_self.dropdata.base_path.clone();
-                            info!("starting chunk {}", chunk_id);
                             match download_game_chunk(
                                 &unsafe_self.metadata.id,
                                 &unsafe_self.metadata.version,
diff --git a/src-tauri/process/src/process_handlers.rs b/src-tauri/process/src/process_handlers.rs
index 54c2740c..b5298e95 100644
--- a/src-tauri/process/src/process_handlers.rs
+++ b/src-tauri/process/src/process_handlers.rs
@@ -1,5 +1,9 @@
+use std::fs::create_dir_all;
+
 use client::compat::{COMPAT_INFO, UMU_LAUNCHER_EXECUTABLE};
-use database::{Database, DownloadableMetadata, GameVersion, platform::Platform};
+use database::{
+    Database, DownloadableMetadata, GameVersion, db::DATA_ROOT_DIR, platform::Platform,
+};
 
 use crate::{error::ProcessError, process_manager::ProcessHandler};
 
@@ -47,8 +51,16 @@ impl ProcessHandler for UMULauncher {
             }
             None => game_version.game_id.clone(),
         };
+        let pfx_dir = DATA_ROOT_DIR.join("pfx");
+        let pfx_dir = pfx_dir.join(meta.id.clone());
+        create_dir_all(&pfx_dir).map_err(|v| ProcessError::IOError(v))?;
         Ok(format!(
-            "GAMEID={game_id} {umu:?} \"{launch}\" {args}",
+            "GAMEID={game_id} WINEPREFIX={} {} {umu:?} \"{launch}\" {args}",
+            pfx_dir.to_string_lossy(),
+            match meta.target_platform {
+                Platform::Linux => "UMU_NO_PROTON=1",
+                _ => "",
+            },
             umu = UMU_LAUNCHER_EXECUTABLE
                 .as_ref()
                 .expect("Failed to get UMU_LAUNCHER_EXECUTABLE as ref"),
diff --git a/src-tauri/process/src/process_manager.rs b/src-tauri/process/src/process_manager.rs
index 9ad2d431..b3593f92 100644
--- a/src-tauri/process/src/process_manager.rs
+++ b/src-tauri/process/src/process_manager.rs
@@ -19,7 +19,7 @@ use dynfmt::SimpleCurlyFormat;
 use games::{library::push_game_update, state::GameStatusManager};
 use log::{debug, info, warn};
 use shared_child::SharedChild;
-use tauri::AppHandle;
+use tauri::{AppHandle, Emitter as _};
 
 use crate::{
     PROCESS_MANAGER,
@@ -69,7 +69,7 @@ impl ProcessManager<'_> {
                 ),
                 (
                     (Platform::Linux, Platform::Linux),
-                    &NativeGameLauncher {} as &(dyn ProcessHandler + Sync + Send + 'static),
+                    &UMULauncher {} as &(dyn ProcessHandler + Sync + Send + 'static),
                 ),
                 (
                     (Platform::macOS, Platform::macOS),
@@ -163,8 +163,7 @@ impl ProcessManager<'_> {
             && (elapsed.as_secs() <= 2 || result.map_or(true, |r| !r.success()))
         {
             warn!("drop detected that the game {game_id} may have failed to launch properly");
-            return Err(ProcessError::FailedLaunch(game_id));
-            // let _ = self.app_handle.emit("launch_external_error", &game_id);
+            let _ = self.app_handle.emit("launch_external_error", &game_id);
         }
 
         let version_data = match db_handle.applications.game_versions.get(&game_id) {
@@ -315,7 +314,11 @@ impl ProcessManager<'_> {
                     .find(|v| v.platform == target_platform)
                     .ok_or(ProcessError::NotInstalled)?;
 
-                (setup_config.command.clone(), setup_config.args.clone(), None)
+                (
+                    setup_config.command.clone(),
+                    setup_config.args.clone(),
+                    None,
+                )
             }
             _ => unreachable!("Game registered as 'Partially Installed'"),
         };
diff --git a/src-tauri/remote/src/fetch_object.rs b/src-tauri/remote/src/fetch_object.rs
index e80a0437..33c8f85a 100644
--- a/src-tauri/remote/src/fetch_object.rs
+++ b/src-tauri/remote/src/fetch_object.rs
@@ -1,4 +1,4 @@
-use database::{DB, interface::DatabaseImpls};
+use database::{DB};
 use http::{Response, header::CONTENT_TYPE, response::Builder as ResponseBuilder};
 use log::{debug, warn};
 use tauri::UriSchemeResponder;
diff --git a/src-tauri/remote/src/requests.rs b/src-tauri/remote/src/requests.rs
index 00fde99e..68232a5e 100644
--- a/src-tauri/remote/src/requests.rs
+++ b/src-tauri/remote/src/requests.rs
@@ -1,4 +1,4 @@
-use database::{DB, interface::DatabaseImpls};
+use database::{DB};
 use url::Url;
 
 use crate::{
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 849c3fd9..48d8c4a8 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -26,7 +26,6 @@ use ::remote::{
 };
 use database::{
     DB, GameDownloadStatus, borrow_db_checked, borrow_db_mut_checked, db::DATA_ROOT_DIR,
-    interface::DatabaseImpls,
 };
 use log::{LevelFilter, debug, info, warn};
 use log4rs::{
@@ -37,8 +36,8 @@ use log4rs::{
 };
 use serde::Serialize;
 use tauri::{
-    AppHandle, Manager, RunEvent,
-    WindowEvent,
+    AppHandle, LogicalPosition, LogicalSize, Manager, RunEvent, WebviewBuilder, WebviewUrl,
+    WindowBuilder, WindowEvent,
     menu::{Menu, MenuItem, PredefinedMenuItem},
     tray::TrayIconBuilder,
 };
@@ -299,19 +298,23 @@ pub fn run() {
                 let width = 1536.0;
                 let height = 864.0;
 
-                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("main".into()),
-                )
-                .title("Drop Desktop App")
-                .min_inner_size(1000.0, 500.0)
-                .inner_size(width, height)
-                .decorations(false)
-                .shadow(false)
-                .data_directory(DATA_ROOT_DIR.join(".webview"))
-                .build()
-                .expect("Failed to build main window");
+                let main_window = WindowBuilder::new(&handle, "main")
+                    .title("Drop Desktop App")
+                    .min_inner_size(1000.0, 500.0)
+                    .inner_size(width, height)
+                    .decorations(false)
+                    .shadow(false)
+                    .build()
+                    .expect("failed to build main window");
+
+                main_window
+                    .add_child(
+                        WebviewBuilder::new("frontned", WebviewUrl::App("main".into()))
+                            .auto_resize(),
+                        LogicalPosition::new(0., 0.),
+                        LogicalSize::new(width, height),
+                    )
+                    .expect("failed to create frontend webview");
 
                 app.deep_link().on_open_url(move |event| {
                     debug!("handling drop:// url");
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index dcbc9d04..4a0ee9e4 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,8 +1,8 @@
 {
   "$schema": "https://schema.tauri.app/config/2.0.0",
   "productName": "Drop Desktop Client",
-  "version": "0.3.4",
-  "identifier": "dev.drop.client",
+  "version": "0.4.0",
+  "identifier": "org.droposs.client",
   "build": {
     "beforeDevCommand": "pnpm run -C main dev --port 1432",
     "devUrl": "http://localhost:1432/",

From d7f128012d62a8f359f1b7b17f2a557ef498f9fd Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Sun, 21 Dec 2025 13:13:52 +1100
Subject: [PATCH 06/19] feat: launch option selector

---
 main/pages/library/[id]/index.vue        | 67 +++++++++++++++++++++++-
 src-tauri/process/src/process_manager.rs | 50 ++++++++++++++++--
 src-tauri/src/lib.rs                     |  3 +-
 src-tauri/src/process.rs                 | 14 +++--
 4 files changed, 125 insertions(+), 9 deletions(-)

diff --git a/main/pages/library/[id]/index.vue b/main/pages/library/[id]/index.vue
index 58feab5a..0cda51e7 100644
--- a/main/pages/library/[id]/index.vue
+++ b/main/pages/library/[id]/index.vue
@@ -395,6 +395,45 @@
     </template>
   </ModalTemplate>
 
+  <ModalTemplate :model-value="launchOptionsOpen">
+    <template #default>
+      <div class="sm:flex sm:items-start">
+        <div class="mt-3 text-center sm:mt-0 sm:text-left">
+          <h3 class="text-base font-semibold text-zinc-100">
+            Launch {{ game.mName }}
+          </h3>
+          <div class="mt-2">
+            <p class="text-sm text-zinc-400">
+              The instance admin has configured multiple ways to start this
+              game. Select an option to start.
+            </p>
+          </div>
+        </div>
+      </div>
+
+      <ol class="space-y-2">
+        <li v-for="(launchData, launchIdx) in launchOptions!">
+          <button class="transition w-full rounded-sm bg-zinc-800 inline-flex items-center text-sm py-2 px-3 gap-x-2 text-zinc-100 hover:text-zinc-300 hover:bg-zinc-700" @click="() => launchIndex(launchIdx)">
+            <PlayIcon class="size-4" />
+            <span>
+              {{ launchData.name }}
+            </span>
+          </button>
+        </li>
+      </ol>
+    </template>
+    <template #buttons>
+      <button
+        type="button"
+        class="mt-3 inline-flex w-full justify-center rounded-md bg-zinc-800 px-3 py-2 text-sm font-semibold text-zinc-100 shadow-sm ring-1 ring-inset ring-zinc-700 hover:bg-zinc-900 sm:mt-0 sm:w-auto"
+        @click="launchOptions = undefined"
+        ref="cancelButtonRef"
+      >
+        Cancel
+      </button>
+    </template>
+  </ModalTemplate>
+
   <!-- 
   Dear future DecDuck,
   This v-if is necessary for Vue rendering reasons
@@ -492,6 +531,7 @@ import {
   XMarkIcon,
   ArrowsPointingOutIcon,
   PhotoIcon,
+  PlayIcon,
 } from "@heroicons/vue/20/solid";
 import { BuildingStorefrontIcon } from "@heroicons/vue/24/outline";
 import { XCircleIcon } from "@heroicons/vue/24/solid";
@@ -584,9 +624,34 @@ async function resumeDownload() {
   }
 }
 
+const launchOptions = ref<Array<{ name: string }> | undefined>(undefined);
+const launchOptionsOpen = computed(() => launchOptions.value !== undefined);
+
 async function launch() {
   try {
-    await invoke("launch_game", { id: game.value.id });
+    const fetchedLaunchOptions = await invoke<Array<{ name: string }>>(
+      "get_launch_options",
+      { id: game.value.id }
+    );
+    launchOptions.value = fetchedLaunchOptions;
+  } catch (e) {
+    createModal(
+      ModalType.Notification,
+      {
+        title: `Couldn't run "${game.value.mName}"`,
+        description: `Drop failed to launch "${game.value.mName}": ${e}`,
+        buttonText: "Close",
+      },
+      (e, c) => c()
+    );
+    console.error(e);
+  }
+}
+
+async function launchIndex(index: number) {
+  launchOptions.value = undefined;
+  try {
+    await invoke("launch_game", { id: game.value.id, index });
   } catch (e) {
     createModal(
       ModalType.Notification,
diff --git a/src-tauri/process/src/process_manager.rs b/src-tauri/process/src/process_manager.rs
index b3593f92..056b1edf 100644
--- a/src-tauri/process/src/process_manager.rs
+++ b/src-tauri/process/src/process_manager.rs
@@ -2,6 +2,7 @@ use std::{
     collections::HashMap,
     fs::{OpenOptions, create_dir_all},
     io,
+    ops::Index,
     path::PathBuf,
     process::{Command, ExitStatus},
     str::FromStr,
@@ -18,6 +19,7 @@ use dynfmt::Format;
 use dynfmt::SimpleCurlyFormat;
 use games::{library::push_game_update, state::GameStatusManager};
 use log::{debug, info, warn};
+use serde::Serialize;
 use shared_child::SharedChild;
 use tauri::{AppHandle, Emitter as _};
 
@@ -45,6 +47,11 @@ pub struct ProcessManager<'a> {
     app_handle: AppHandle,
 }
 
+#[derive(Serialize)]
+pub struct LaunchOption {
+    name: String,
+}
+
 impl ProcessManager<'_> {
     pub fn new(app_handle: AppHandle) -> Self {
         let log_output_dir = DATA_ROOT_DIR.join("logs");
@@ -207,8 +214,42 @@ impl ProcessManager<'_> {
         process_handler.is_ok()
     }
 
+    pub fn get_launch_options(game_id: String) -> Result<Vec<LaunchOption>, ProcessError> {
+        let db_lock = borrow_db_checked();
+
+        let meta = db_lock
+            .applications
+            .installed_game_version
+            .get(&game_id)
+            .cloned()
+            .ok_or(ProcessError::NotInstalled)?;
+
+        let game_version = db_lock
+            .applications
+            .game_versions
+            .get(&game_id)
+            .ok_or(ProcessError::InvalidID)?
+            .get(&meta.version)
+            .ok_or(ProcessError::InvalidVersion)?;
+
+        let launch_options = game_version
+            .launches
+            .iter()
+            .filter(|v| v.platform == meta.target_platform)
+            .map(|v| LaunchOption {
+                name: v.name.clone(),
+            })
+            .collect::<Vec<LaunchOption>>();
+
+        Ok(launch_options)
+    }
+
     /// Must be called through spawn as it is currently blocking
-    pub fn launch_process(&mut self, game_id: String) -> Result<(), ProcessError> {
+    pub fn launch_process(
+        &mut self,
+        game_id: String,
+        launch_process_index: usize,
+    ) -> Result<(), ProcessError> {
         if self.processes.contains_key(&game_id) {
             return Err(ProcessError::AlreadyRunning);
         }
@@ -292,12 +333,13 @@ impl ProcessManager<'_> {
                 version_name: _,
                 install_dir: _,
             } => {
-                let launch_config = game_version
+                let (_, launch_config) = game_version
                     .launches
                     .iter()
-                    .find(|v| v.platform == target_platform)
+                    .filter(|v| v.platform == target_platform)
+                    .enumerate()
+                    .find(|(i, _)| *i == launch_process_index)
                     .ok_or(ProcessError::NotInstalled)?;
-
                 (
                     launch_config.command.clone(),
                     launch_config.args.clone(),
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 48d8c4a8..37bdc855 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -271,7 +271,8 @@ pub fn run() {
             kill_game,
             toggle_autostart,
             get_autostart_enabled,
-            open_process_logs
+            open_process_logs,
+            get_launch_options
         ])
         .plugin(tauri_plugin_shell::init())
         .plugin(tauri_plugin_dialog::init())
diff --git a/src-tauri/src/process.rs b/src-tauri/src/process.rs
index fb5f153c..c7521629 100644
--- a/src-tauri/src/process.rs
+++ b/src-tauri/src/process.rs
@@ -1,14 +1,22 @@
 use std::sync::nonpoison::Mutex;
 
-use process::{PROCESS_MANAGER, error::ProcessError};
-use tauri::AppHandle;
+use process::{PROCESS_MANAGER, error::ProcessError, process_manager::{LaunchOption, ProcessManager}};
+use tauri::{AppHandle, Error};
 use tauri_plugin_opener::OpenerExt;
 
 use crate::AppState;
 
+#[tauri::command]
+pub fn get_launch_options(id: String) -> Result<Vec<LaunchOption>, ProcessError> {
+    let launch_options = ProcessManager::get_launch_options(id)?;
+
+    Ok(launch_options)
+}
+
 #[tauri::command]
 pub fn launch_game(
     id: String,
+    index: usize,
     state: tauri::State<'_, Mutex<AppState>>,
 ) -> Result<(), ProcessError> {
     let state_lock = state.lock();
@@ -19,7 +27,7 @@ pub fn launch_game(
     //    download_type: DownloadType::Game,
     //};
 
-    match process_manager_lock.launch_process(id) {
+    match process_manager_lock.launch_process(id, index) {
         Ok(()) => {}
         Err(e) => return Err(e),
     }

From 58da185d7281d7a86a03ec83678d76c8daa9e686 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Sun, 21 Dec 2025 13:24:27 +1100
Subject: [PATCH 07/19] fix: autostart when no options

---
 libs/drop-base                    | 2 +-
 main/pages/library/[id]/index.vue | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/libs/drop-base b/libs/drop-base
index 04125e89..14f4e3e2 160000
--- a/libs/drop-base
+++ b/libs/drop-base
@@ -1 +1 @@
-Subproject commit 04125e89bef517411e103cdabcfa64a1bb563423
+Subproject commit 14f4e3e20b9abe41d9561d580060cf3578149640
diff --git a/main/pages/library/[id]/index.vue b/main/pages/library/[id]/index.vue
index 0cda51e7..39a6253e 100644
--- a/main/pages/library/[id]/index.vue
+++ b/main/pages/library/[id]/index.vue
@@ -628,11 +628,19 @@ const launchOptions = ref<Array<{ name: string }> | undefined>(undefined);
 const launchOptionsOpen = computed(() => launchOptions.value !== undefined);
 
 async function launch() {
+  if(status.value.type == GameStatusEnum.SetupRequired) {
+    await launchIndex(0);
+    return;
+  }
   try {
     const fetchedLaunchOptions = await invoke<Array<{ name: string }>>(
       "get_launch_options",
       { id: game.value.id }
     );
+    if(fetchedLaunchOptions.length == 1) {
+      await launchIndex(0);
+      return;
+    }
     launchOptions.value = fetchedLaunchOptions;
   } catch (e) {
     createModal(

From 06a548eb4645adc6900f446d51cfb949c7a349b3 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Sun, 21 Dec 2025 13:28:05 +1100
Subject: [PATCH 08/19] fix: clippy

---
 src-tauri/Cargo.toml     | 79 +++++++++++++++++++---------------------
 src-tauri/src/games.rs   |  3 +-
 src-tauri/src/process.rs |  2 +-
 3 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 731a44c8..8200d3c6 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -6,32 +6,28 @@ authors = ["Drop OSS"]
 edition = "2024"
 
 [workspace]
+resolver = "3"
 members = [
-    "client",
-    "cloud_saves",
-    "database",
-    "download_manager",
-    "games",
-    "process",
-    "remote",
-    "utils",
+  "client",
+  "cloud_saves",
+  "database",
+  "download_manager",
+  "games",
+  "process",
+  "remote",
+  "utils",
 ]
 
-resolver = "3"
-
 [lib]
+crate-type = ["cdylib", "rlib", "staticlib"]
 # The `_lib` suffix may seem redundant but it is necessary
 # to make the lib name unique and wouldn't conflict with the bin name.
 # This seems to be only an issue on Windows, see https://github.com/rust-lang/cargo/issues/8519
 name = "drop_app_lib"
-crate-type = ["staticlib", "cdylib", "rlib"]
 rustflags = ["-C", "target-feature=+aes,+sse2"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\"))".dependencies]
-tauri-plugin-single-instance = { version = "2.0.0", features = ["deep-link"] }
-
 [dependencies]
 atomic-instant-full = "0.1.0"
 bitcode = "0.6.6"
@@ -39,16 +35,16 @@ boxcar = "0.2.7"
 bytes = "1.10.1"
 cacache = "13.1.0"
 chrono = "0.4.38"
-client = { version = "0.1.0", path = "./client" } #client
-database = { path = "./database" } #database
+client = { path = "./client", version = "0.1.0" }  # client
+database = { path = "./database" }  # database
 deranged = "=0.4.0"
 dirs = "6.0.0"
-download_manager = { version = "0.1.0", path = "./download_manager" } #download manager
+download_manager = { path = "./download_manager", version = "0.1.0" }  # download manager
 droplet-rs = "0.7.3"
 filetime = "0.2.25"
 futures-core = "0.3.31"
 futures-lite = "2.6.0"
-games = { version = "0.1.0", path = "./games" } #games
+games = { path = "./games", version = "0.1.0" }  # games
 gethostname = "1.0.1"
 hex = "0.4.3"
 http = "1.1.0"
@@ -57,16 +53,25 @@ humansize = "2.1.3"
 known-folders = "1.2.0"
 log = "0.4.22"
 md5 = "0.7.0"
-native_model = { version = "0.6.4", features = [
-    "rmp_serde_1_3",
-], git = "https://github.com/Drop-OSS/native_model.git" }
+native_model = { git = "https://github.com/Drop-OSS/native_model.git", version = "0.6.4", features = [
+  "rmp_serde_1_3",
+] }
 page_size = "0.6.0"
 parking_lot = "0.12.3"
-process = { path = "./process" } #process
+process = { path = "./process" }  # process
 rand = "0.9.1"
 rayon = "1.10.0"
 regex = "1.11.1"
-remote = { version = "0.1.0", path = "./remote" } #remote
+remote = { path = "./remote", version = "0.1.0" }  # remote
+reqwest = { version = "0.12.22", default-features = false, features = [
+  "blocking",
+  "http2",
+  "json",
+  "native-tls-alpn",
+  "rustls-tls",
+  "rustls-tls-native-roots",
+  "stream",
+] }
 reqwest-middleware = "0.4.0"
 reqwest-middleware-cache = "0.1.1"
 reqwest-websocket = "0.5.0"
@@ -90,12 +95,12 @@ tokio-util = { version = "0.7.16", features = ["io"] }
 umu-wrapper-lib = "0.1.0"
 url = "2.5.2"
 urlencoding = "2.1.3"
-utils = { path = "./utils" } #utils
+utils = { path = "./utils" }  # utils
 walkdir = "2.5.0"
 webbrowser = "1.0.2"
 whoami = "1.6.0"
-zstd = "0.13.3"
 wry = { version = "*", features = [] }
+zstd = "0.13.3"
 
 [dependencies.dynfmt]
 version = "0.1.5"
@@ -105,22 +110,9 @@ features = ["curly"]
 version = "1.3.0"
 features = ["console_appender", "file_appender"]
 
-[dependencies.reqwest]
-version = "0.12.22"
-default-features = false
-features = [
-    "json",
-    "http2",
-    "blocking",
-    "rustls-tls",
-    "native-tls-alpn",
-    "rustls-tls-native-roots",
-    "stream",
-]
-
 [dependencies.rustbreak]
 version = "2"
-features = ["other_errors"] # You can also use "yaml_enc" or "bin_enc"
+features = ["other_errors"]  # You can also use "yaml_enc" or "bin_enc"
 
 [dependencies.rustix]
 version = "0.38.37"
@@ -136,16 +128,19 @@ features = ["protocol-asset", "tray-icon", "unstable"]
 
 [dependencies.tokio]
 version = "1.40.0"
-features = ["rt", "tokio-macros", "signal"]
+features = ["rt", "signal", "tokio-macros"]
 
 [dependencies.uuid]
 version = "1.10.0"
-features = ["v4", "fast-rng", "macro-diagnostics"]
+features = ["fast-rng", "macro-diagnostics", "v4"]
 
 [build-dependencies]
 tauri-build = { version = "*", features = [] }
 
+[target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\"))".dependencies]
+tauri-plugin-single-instance = { version = "2.0.0", features = ["deep-link"] }
+
 [profile.release]
 lto = true
+panic = "abort"
 codegen-units = 1
-panic = 'abort'
diff --git a/src-tauri/src/games.rs b/src-tauri/src/games.rs
index d5a490a7..f7f7518c 100644
--- a/src-tauri/src/games.rs
+++ b/src-tauri/src/games.rs
@@ -243,7 +243,7 @@ pub async fn fetch_game_version_options_logic(
     let process_manager_lock = PROCESS_MANAGER.lock();
     let data = data
         .into_iter()
-        .map(|v| {
+        .flat_map(|v| {
             v.launches.into_iter().map(move |l| VersionDownloadOption {
                 version_id: v.version_id.clone(),
                 display_name: v.display_name.clone(),
@@ -251,7 +251,6 @@ pub async fn fetch_game_version_options_logic(
                 platform: l.platform,
             })
         })
-        .flatten()
         .filter(|v| process_manager_lock.valid_platform(&v.platform))
         .collect();
     drop(process_manager_lock);
diff --git a/src-tauri/src/process.rs b/src-tauri/src/process.rs
index c7521629..1e4e04ef 100644
--- a/src-tauri/src/process.rs
+++ b/src-tauri/src/process.rs
@@ -1,7 +1,7 @@
 use std::sync::nonpoison::Mutex;
 
 use process::{PROCESS_MANAGER, error::ProcessError, process_manager::{LaunchOption, ProcessManager}};
-use tauri::{AppHandle, Error};
+use tauri::AppHandle;
 use tauri_plugin_opener::OpenerExt;
 
 use crate::AppState;

From c3e63dccf3f624891b2bdeef9cdfedc88c261a7c Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Sun, 21 Dec 2025 13:31:39 +1100
Subject: [PATCH 09/19] fix: clippy x2

---
 src-tauri/Cargo.lock                          |  1 -
 src-tauri/Cargo.toml                          |  4 ---
 src-tauri/database/src/db.rs                  |  2 --
 src-tauri/database/src/models.rs              |  3 +-
 src-tauri/games/Cargo.toml                    | 30 ++++++++++---------
 .../games/src/downloads/download_agent.rs     |  4 +--
 .../games/src/downloads/download_logic.rs     |  2 +-
 src-tauri/process/Cargo.toml                  | 10 +++----
 src-tauri/process/src/process_handlers.rs     |  2 +-
 src-tauri/process/src/process_manager.rs      |  4 +--
 src-tauri/remote/Cargo.toml                   | 10 ++++++-
 11 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 26651525..c1ba74da 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -1440,7 +1440,6 @@ dependencies = [
  "dirs 6.0.0",
  "download_manager",
  "droplet-rs 0.7.3",
- "dynfmt",
  "filetime",
  "futures-core",
  "futures-lite",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 8200d3c6..24dece56 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -102,10 +102,6 @@ whoami = "1.6.0"
 wry = { version = "*", features = [] }
 zstd = "0.13.3"
 
-[dependencies.dynfmt]
-version = "0.1.5"
-features = ["curly"]
-
 [dependencies.log4rs]
 version = "1.3.0"
 features = ["console_appender", "file_appender"]
diff --git a/src-tauri/database/src/db.rs b/src-tauri/database/src/db.rs
index fce1ecbb..a1dc3606 100644
--- a/src-tauri/database/src/db.rs
+++ b/src-tauri/database/src/db.rs
@@ -3,10 +3,8 @@ use std::{
     sync::{Arc, LazyLock},
 };
 
-use aes::cipher::{KeyIvInit as _, StreamCipher};
 use keyring::Entry;
 use log::info;
-use serde::{Serialize, de::DeserializeOwned};
 
 use crate::interface::{DatabaseInterface};
 
diff --git a/src-tauri/database/src/models.rs b/src-tauri/database/src/models.rs
index fc81e2a2..d05a0143 100644
--- a/src-tauri/database/src/models.rs
+++ b/src-tauri/database/src/models.rs
@@ -117,7 +117,6 @@ pub mod data {
         /**
          * This is intended to be used to look up the actual launch configuration that we store elsewhere
          */
-
         pub struct LaunchConfigurationExecutor {
             pub launch_id: String,
 
@@ -247,7 +246,7 @@ pub mod data {
             pub cache_dir: PathBuf,
         }
     }
-    
+
     impl Database {
         pub fn new<T: Into<PathBuf>>(
             games_base_dir: T,
diff --git a/src-tauri/games/Cargo.toml b/src-tauri/games/Cargo.toml
index 37439159..01a26434 100644
--- a/src-tauri/games/Cargo.toml
+++ b/src-tauri/games/Cargo.toml
@@ -4,32 +4,34 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
+aes = "0.8.4"
+async-scoped = { version = "0.9.0", features = ["use-tokio"] }
+async-trait = "0.1.89"
 atomic-instant-full = "0.1.0"
 bitcode = "0.6.7"
 boxcar = "0.2.14"
-database = { version = "0.1.0", path = "../database" }
-download_manager = { version = "0.1.0", path = "../download_manager" }
+crossbeam-channel = "0.5.15"
+ctr = "0.9.2"
+database = { path = "../database", version = "0.1.0" }
+download_manager = { path = "../download_manager", version = "0.1.0" }
+droplet-rs = { git = "https://github.com/Drop-OSS/droplet-rs" }
+futures-util = "*"
 hex = "0.4.3"
 log = "0.4.28"
+native_model = { git = "https://github.com/Drop-OSS/native_model.git", version = "0.6.4", features = [
+  "rmp_serde_1_3"
+] }
 rayon = "1.11.0"
-remote = { version = "0.1.0", path = "../remote" }
+remote = { path = "../remote", version = "0.1.0" }
 reqwest = "0.12.23"
 rustix = "1.1.2"
 serde = { version = "1.0.228", features = ["derive"] }
+serde_json = "1.0.145"
 serde_with = "3.15.0"
+sha2 = "0.10.9"
 sysinfo = "0.37.2"
 tauri = "*"
 throttle_my_fn = "0.2.6"
-utils = { version = "0.1.0", path = "../utils" }
-native_model = { version = "0.6.4", features = ["rmp_serde_1_3"], git = "https://github.com/Drop-OSS/native_model.git"}
-serde_json = "1.0.145"
-droplet-rs = { git="https://github.com/Drop-OSS/droplet-rs" }
-async-scoped = { version = "0.9.0", features = ["use-tokio"] }
 tokio = { version = "*", features = ["rt", "sync"] }
 tokio-util = { version = "*", features = ["io"] }
-futures-util = "*"
-sha2 = "0.10.9"
-ctr = "0.9.2"
-aes = "0.8.4"
-async-trait = "0.1.89"
-crossbeam-channel = "0.5.15"
+utils = { path = "../utils", version = "0.1.0" }
diff --git a/src-tauri/games/src/downloads/download_agent.rs b/src-tauri/games/src/downloads/download_agent.rs
index 7008e3a6..6f1fbed2 100644
--- a/src-tauri/games/src/downloads/download_agent.rs
+++ b/src-tauri/games/src/downloads/download_agent.rs
@@ -1,6 +1,6 @@
 use async_trait::async_trait;
 use database::{
-    ApplicationTransientStatus, DownloadType, DownloadableMetadata, borrow_db_checked,
+    ApplicationTransientStatus, DownloadableMetadata, borrow_db_checked,
     borrow_db_mut_checked,
 };
 use download_manager::download_manager_frontend::{DownloadManagerSignal, DownloadStatus};
@@ -71,7 +71,7 @@ impl GameDownloadAgent {
         let data_base_dir_path = base_dir_path.join(metadata.id.clone());
 
         let stored_manifest =
-            DropData::generate(metadata.id.clone(), metadata.version.clone(), metadata.target_platform.clone(), data_base_dir_path.clone());
+            DropData::generate(metadata.id.clone(), metadata.version.clone(), metadata.target_platform, data_base_dir_path.clone());
 
         let result = Self {
             metadata,
diff --git a/src-tauri/games/src/downloads/download_logic.rs b/src-tauri/games/src/downloads/download_logic.rs
index 2f40c726..c2810dd5 100644
--- a/src-tauri/games/src/downloads/download_logic.rs
+++ b/src-tauri/games/src/downloads/download_logic.rs
@@ -20,7 +20,7 @@ use remote::requests::generate_url;
 use remote::utils::DROP_CLIENT_SYNC;
 use sha2::Digest;
 
-const READ_BUF_LEN: usize = 1 * 1024 * 1024;
+const READ_BUF_LEN: usize = 1024 * 1024;
 
 type Aes128Ctr64LE = ctr::Ctr64LE<aes::Aes128>;
 
diff --git a/src-tauri/process/Cargo.toml b/src-tauri/process/Cargo.toml
index e91bacf3..56637bf0 100644
--- a/src-tauri/process/Cargo.toml
+++ b/src-tauri/process/Cargo.toml
@@ -5,10 +5,10 @@ edition = "2024"
 
 [dependencies]
 chrono = "0.4.42"
-client = { version = "0.1.0", path = "../client" }
-database = { version = "0.1.0", path = "../database" }
-dynfmt = "0.1.5"
-games = { version = "0.1.0", path = "../games" }
+client = { path = "../client", version = "0.1.0" }
+database = { path = "../database", version = "0.1.0" }
+dynfmt = { version = "0.1.5", features = ["curly"] }
+games = { path = "../games", version = "0.1.0" }
 log = "0.4.28"
 page_size = "0.6.0"
 serde = "1.0.228"
@@ -16,4 +16,4 @@ serde_with = "3.15.0"
 shared_child = "1.1.1"
 tauri = "*"
 tauri-plugin-opener = "*"
-utils = { version = "0.1.0", path = "../utils" }
+utils = { path = "../utils", version = "0.1.0" }
diff --git a/src-tauri/process/src/process_handlers.rs b/src-tauri/process/src/process_handlers.rs
index b5298e95..c3ff16a6 100644
--- a/src-tauri/process/src/process_handlers.rs
+++ b/src-tauri/process/src/process_handlers.rs
@@ -53,7 +53,7 @@ impl ProcessHandler for UMULauncher {
         };
         let pfx_dir = DATA_ROOT_DIR.join("pfx");
         let pfx_dir = pfx_dir.join(meta.id.clone());
-        create_dir_all(&pfx_dir).map_err(|v| ProcessError::IOError(v))?;
+        create_dir_all(&pfx_dir).map_err(ProcessError::IOError)?;
         Ok(format!(
             "GAMEID={game_id} WINEPREFIX={} {} {umu:?} \"{launch}\" {args}",
             pfx_dir.to_string_lossy(),
diff --git a/src-tauri/process/src/process_manager.rs b/src-tauri/process/src/process_manager.rs
index 056b1edf..6df41806 100644
--- a/src-tauri/process/src/process_manager.rs
+++ b/src-tauri/process/src/process_manager.rs
@@ -2,17 +2,15 @@ use std::{
     collections::HashMap,
     fs::{OpenOptions, create_dir_all},
     io,
-    ops::Index,
     path::PathBuf,
     process::{Command, ExitStatus},
-    str::FromStr,
     sync::Arc,
     thread::spawn,
     time::{Duration, SystemTime},
 };
 
 use database::{
-    ApplicationTransientStatus, Database, DownloadType, DownloadableMetadata, GameDownloadStatus,
+    ApplicationTransientStatus, Database, DownloadableMetadata, GameDownloadStatus,
     GameVersion, borrow_db_checked, borrow_db_mut_checked, db::DATA_ROOT_DIR, platform::Platform,
 };
 use dynfmt::Format;
diff --git a/src-tauri/remote/Cargo.toml b/src-tauri/remote/Cargo.toml
index 2cc86e9f..30b04f8c 100644
--- a/src-tauri/remote/Cargo.toml
+++ b/src-tauri/remote/Cargo.toml
@@ -14,7 +14,15 @@ hex = "0.4.3"
 http = "1.3.1"
 log = "0.4.28"
 md5 = "0.8.0"
-reqwest = "0.12.23"
+reqwest = { version = "0.12.22", default-features = false, features = [
+  "blocking",
+  "http2",
+  "json",
+  "native-tls-alpn",
+  "rustls-tls",
+  "rustls-tls-native-roots",
+  "stream",
+] }
 reqwest-websocket = "0.5.1"
 serde = "1.0.228"
 serde_with = "3.15.0"

From 7d4c4e01a1aac19a47ccdbbc97d07d22c4369e1e Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Sun, 11 Jan 2026 13:06:18 +1100
Subject: [PATCH 10/19] feat: executor launch

---
 main/pages/queue.vue                     |  5 ++-
 src-tauri/process/src/format.rs          |  5 +++
 src-tauri/process/src/process_manager.rs | 55 ++++++++++++++++++++----
 src-tauri/src/games.rs                   |  1 -
 4 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/main/pages/queue.vue b/main/pages/queue.vue
index 30eb886f..eb934963 100644
--- a/main/pages/queue.vue
+++ b/main/pages/queue.vue
@@ -7,7 +7,7 @@
         class="bg-zinc-900 z-10 w-32 flex flex-col gap-x-2 font-display items-left justify-center pl-2"
       >
         <span class="font-bold text-zinc-100">{{ formatKilobytes(stats.speed) }}B/s</span>
-        <span v-if="stats.time > 0" class="text-xs text-zinc-400"
+        <span class="text-xs text-zinc-400"
           >{{ formatTime(stats.time) }} left</span
         >
       </div>
@@ -199,6 +199,9 @@ function formatKilobytes(bytes: number): string {
 }
 
 function formatTime(seconds: number): string {
+  if (seconds == 0) {
+    return `0s`;
+  }
   if (seconds < 60) {
     return `${Math.round(seconds)}s`;
   }
diff --git a/src-tauri/process/src/format.rs b/src-tauri/process/src/format.rs
index bc19ea31..1c53e71e 100644
--- a/src-tauri/process/src/format.rs
+++ b/src-tauri/process/src/format.rs
@@ -13,6 +13,7 @@ impl DropFormatArgs {
         working_dir: &String,
         executable_name: &String,
         absolute_executable_name: String,
+        original: Option<String>,
     ) -> Self {
         let mut positional = Vec::new();
         let mut map: HashMap<&'static str, String> = HashMap::new();
@@ -22,6 +23,10 @@ impl DropFormatArgs {
         map.insert("dir", working_dir.to_string());
         map.insert("exe", executable_name.to_string());
         map.insert("abs_exe", absolute_executable_name);
+        
+        if let Some(original) = original {
+            map.insert("executor", original);
+        }
 
         Self { positional, map }
     }
diff --git a/src-tauri/process/src/process_manager.rs b/src-tauri/process/src/process_manager.rs
index 6df41806..13bb568b 100644
--- a/src-tauri/process/src/process_manager.rs
+++ b/src-tauri/process/src/process_manager.rs
@@ -10,8 +10,8 @@ use std::{
 };
 
 use database::{
-    ApplicationTransientStatus, Database, DownloadableMetadata, GameDownloadStatus,
-    GameVersion, borrow_db_checked, borrow_db_mut_checked, db::DATA_ROOT_DIR, platform::Platform,
+    ApplicationTransientStatus, Database, DownloadableMetadata, GameDownloadStatus, GameVersion,
+    borrow_db_checked, borrow_db_mut_checked, db::DATA_ROOT_DIR, platform::Platform,
 };
 use dynfmt::Format;
 use dynfmt::SimpleCurlyFormat;
@@ -363,13 +363,49 @@ impl ProcessManager<'_> {
             _ => unreachable!("Game registered as 'Partially Installed'"),
         };
 
-        let launch_string = process_handler.create_launch_process(
-            &meta,
-            launch.to_string(),
-            args.clone(),
-            game_version,
-            install_dir,
-        )?;
+        let (launch_string, launch, original_exe) = if let Some(executor) = executor {
+            let executor_metadata = db_lock
+                .applications
+                .installed_game_version
+                .get(&executor.game_id)
+                .ok_or(ProcessError::NotInstalled)?;
+
+            let executor_game_version = db_lock
+                .applications
+                .game_versions
+                .get(&executor.game_id)
+                .ok_or(ProcessError::NotInstalled)?
+                .get(&executor.version_id)
+                .ok_or(ProcessError::NotInstalled)?;
+
+            let executor_launch_config = executor_game_version
+                .launches
+                .iter()
+                .find(|v| v.launch_id == executor.launch_id)
+                .ok_or(ProcessError::NotInstalled)?;
+
+            let executor_launch_string = process_handler.create_launch_process(
+                executor_metadata,
+                executor_launch_config.command.clone(),
+                executor_launch_config.args.clone(),
+                executor_game_version,
+                install_dir,
+            )?;
+
+            (executor_launch_string, executor_launch_config.command.clone(), Some(launch))
+        } else {
+            (
+                process_handler.create_launch_process(
+                    &meta,
+                    launch.to_string(),
+                    args.clone(),
+                    game_version,
+                    install_dir,
+                )?,
+                launch,
+                None,
+            )
+        };
 
         let format_args = DropFormatArgs::new(
             launch_string,
@@ -379,6 +415,7 @@ impl ProcessManager<'_> {
                 .join(launch)
                 .display()
                 .to_string(),
+            original_exe,
         );
 
         let launch_string = SimpleCurlyFormat
diff --git a/src-tauri/src/games.rs b/src-tauri/src/games.rs
index f7f7518c..d90fcc6e 100644
--- a/src-tauri/src/games.rs
+++ b/src-tauri/src/games.rs
@@ -164,7 +164,6 @@ pub async fn fetch_game_logic(
 
     let client = DROP_CLIENT_ASYNC.clone();
     let response = generate_url(&["/api/v1/client/game", &id], &[])?;
-    info!("requesting {}", response);
     let response = client
         .get(response)
         .header("Authorization", generate_authorization_header())

From c1cbdd12393320857ccc166f243975e288a0be89 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Sun, 11 Jan 2026 17:49:48 +1100
Subject: [PATCH 11/19] feat: executor launch

---
 src-tauri/Cargo.lock                      |   7 ++
 src-tauri/database/src/models.rs          |   2 -
 src-tauri/process/Cargo.toml              |   1 +
 src-tauri/process/src/lib.rs              |   2 +
 src-tauri/process/src/parser.rs           |  50 ++++++++++
 src-tauri/process/src/process_handlers.rs |   9 +-
 src-tauri/process/src/process_manager.rs  | 116 ++++++++++++++--------
 7 files changed, 134 insertions(+), 53 deletions(-)
 create mode 100644 src-tauri/process/src/parser.rs

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index c1ba74da..c09b7036 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -4474,6 +4474,7 @@ dependencies = [
  "serde",
  "serde_with",
  "shared_child",
+ "shell-words",
  "tauri",
  "tauri-plugin-opener",
  "utils",
@@ -5653,6 +5654,12 @@ dependencies = [
  "windows-sys 0.60.2",
 ]
 
+[[package]]
+name = "shell-words"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc6fe69c597f9c37bfeeeeeb33da3530379845f10be461a66d16d03eca2ded77"
+
 [[package]]
 name = "shlex"
 version = "1.3.0"
diff --git a/src-tauri/database/src/models.rs b/src-tauri/database/src/models.rs
index d05a0143..68c60f2c 100644
--- a/src-tauri/database/src/models.rs
+++ b/src-tauri/database/src/models.rs
@@ -105,7 +105,6 @@ pub mod data {
 
             pub name: String,
             pub command: String,
-            pub args: Vec<String>,
             pub platform: Platform,
             pub umu_id_override: Option<String>,
 
@@ -128,7 +127,6 @@ pub mod data {
         #[serde(rename_all = "camelCase")]
         pub struct SetupConfiguration {
             pub command: String,
-            pub args: Vec<String>,
             pub platform: Platform,
         }
 
diff --git a/src-tauri/process/Cargo.toml b/src-tauri/process/Cargo.toml
index 56637bf0..8a3379e5 100644
--- a/src-tauri/process/Cargo.toml
+++ b/src-tauri/process/Cargo.toml
@@ -14,6 +14,7 @@ page_size = "0.6.0"
 serde = "1.0.228"
 serde_with = "3.15.0"
 shared_child = "1.1.1"
+shell-words = "1.1.1"
 tauri = "*"
 tauri-plugin-opener = "*"
 utils = { path = "../utils", version = "0.1.0" }
diff --git a/src-tauri/process/src/lib.rs b/src-tauri/process/src/lib.rs
index ec3c19e4..9999a9c9 100644
--- a/src-tauri/process/src/lib.rs
+++ b/src-tauri/process/src/lib.rs
@@ -1,5 +1,6 @@
 #![feature(nonpoison_mutex)]
 #![feature(sync_nonpoison)]
+#![feature(extend_one)]
 
 use std::{
     ops::Deref,
@@ -16,6 +17,7 @@ pub mod error;
 pub mod format;
 pub mod process_handlers;
 pub mod process_manager;
+mod parser;
 
 pub struct ProcessManagerWrapper(OnceLock<Mutex<ProcessManager<'static>>>);
 impl ProcessManagerWrapper {
diff --git a/src-tauri/process/src/parser.rs b/src-tauri/process/src/parser.rs
new file mode 100644
index 00000000..e318ce3d
--- /dev/null
+++ b/src-tauri/process/src/parser.rs
@@ -0,0 +1,50 @@
+use std::path::PathBuf;
+
+use crate::error::ProcessError;
+
+#[derive(Debug)]
+pub struct ParsedCommand {
+    pub env: Vec<String>,
+    pub command: String,
+    pub args: Vec<String>,
+}
+
+impl ParsedCommand {
+    pub fn parse(raw: String) -> Result<Self, ProcessError> {
+        let parts =
+            shell_words::split(&raw).map_err(|e| ProcessError::InvalidArguments(e.to_string()))?;
+        let args =
+            parts
+                .iter()
+                .position(|v| !v.contains("="))
+                .ok_or(ProcessError::InvalidArguments(
+                    "Cannot parse launch".to_owned(),
+                ))?;
+        let env = &parts[0..args];
+        let command = parts[args].clone();
+        let args = &parts[(args + 1)..];
+
+        Ok(Self {
+            args: args.to_vec(),
+            command,
+            env: env.to_vec(),
+        })
+    }
+
+    pub fn make_absolute(&mut self, base: PathBuf) {
+        self.command = base
+            .join(self.command.clone())
+            .to_string_lossy()
+            .to_string();
+    }
+
+    pub fn reconstruct(self) -> String {
+        let mut v = vec![];
+        v.extend(self.env);
+        v.extend_one(self.command);
+        v.extend(self.args);
+        v.join(" ")
+    }
+}
+
+pub struct LaunchParameters(pub String, pub PathBuf);
diff --git a/src-tauri/process/src/process_handlers.rs b/src-tauri/process/src/process_handlers.rs
index c3ff16a6..6030d46e 100644
--- a/src-tauri/process/src/process_handlers.rs
+++ b/src-tauri/process/src/process_handlers.rs
@@ -13,11 +13,10 @@ impl ProcessHandler for NativeGameLauncher {
         &self,
         _meta: &DownloadableMetadata,
         launch_command: String,
-        args: Vec<String>,
         _game_version: &GameVersion,
         _current_dir: &str,
     ) -> Result<String, ProcessError> {
-        Ok(format!("\"{}\" {}", launch_command, args.join(" ")))
+        Ok(format!("\"{}\"", launch_command))
     }
 
     fn valid_for_platform(&self, _db: &Database, _target: &Platform) -> bool {
@@ -31,7 +30,6 @@ impl ProcessHandler for UMULauncher {
         &self,
         meta: &DownloadableMetadata,
         launch_command: String,
-        args: Vec<String>,
         game_version: &GameVersion,
         _current_dir: &str,
     ) -> Result<String, ProcessError> {
@@ -55,7 +53,7 @@ impl ProcessHandler for UMULauncher {
         let pfx_dir = pfx_dir.join(meta.id.clone());
         create_dir_all(&pfx_dir).map_err(ProcessError::IOError)?;
         Ok(format!(
-            "GAMEID={game_id} WINEPREFIX={} {} {umu:?} \"{launch}\" {args}",
+            "GAMEID={game_id} WINEPREFIX={} {} {umu:?} {launch}",
             pfx_dir.to_string_lossy(),
             match meta.target_platform {
                 Platform::Linux => "UMU_NO_PROTON=1",
@@ -65,7 +63,6 @@ impl ProcessHandler for UMULauncher {
                 .as_ref()
                 .expect("Failed to get UMU_LAUNCHER_EXECUTABLE as ref"),
             launch = launch_command,
-            args = args.join(" ")
         ))
     }
 
@@ -83,7 +80,6 @@ impl ProcessHandler for AsahiMuvmLauncher {
         &self,
         meta: &DownloadableMetadata,
         launch_command: String,
-        args: Vec<String>,
         game_version: &GameVersion,
         current_dir: &str,
     ) -> Result<String, ProcessError> {
@@ -91,7 +87,6 @@ impl ProcessHandler for AsahiMuvmLauncher {
         let umu_string = umu_launcher.create_launch_process(
             meta,
             launch_command,
-            args,
             game_version,
             current_dir,
         )?;
diff --git a/src-tauri/process/src/process_manager.rs b/src-tauri/process/src/process_manager.rs
index 13bb568b..e5826273 100644
--- a/src-tauri/process/src/process_manager.rs
+++ b/src-tauri/process/src/process_manager.rs
@@ -25,6 +25,7 @@ use crate::{
     PROCESS_MANAGER,
     error::ProcessError,
     format::DropFormatArgs,
+    parser::{LaunchParameters, ParsedCommand},
     process_handlers::{AsahiMuvmLauncher, NativeGameLauncher, UMULauncher},
 };
 
@@ -242,7 +243,6 @@ impl ProcessManager<'_> {
         Ok(launch_options)
     }
 
-    /// Must be called through spawn as it is currently blocking
     pub fn launch_process(
         &mut self,
         game_id: String,
@@ -326,7 +326,7 @@ impl ProcessManager<'_> {
 
         let process_handler = self.fetch_process_handler(&db_lock, &target_platform)?;
 
-        let (launch, args, executor) = match game_status {
+        let (target_command, executor) = match game_status {
             GameDownloadStatus::Installed {
                 version_name: _,
                 install_dir: _,
@@ -340,7 +340,6 @@ impl ProcessManager<'_> {
                     .ok_or(ProcessError::NotInstalled)?;
                 (
                     launch_config.command.clone(),
-                    launch_config.args.clone(),
                     launch_config.executor.as_ref(),
                 )
             }
@@ -354,22 +353,38 @@ impl ProcessManager<'_> {
                     .find(|v| v.platform == target_platform)
                     .ok_or(ProcessError::NotInstalled)?;
 
-                (
-                    setup_config.command.clone(),
-                    setup_config.args.clone(),
-                    None,
-                )
+                (setup_config.command.clone(), None)
             }
             _ => unreachable!("Game registered as 'Partially Installed'"),
         };
 
-        let (launch_string, launch, original_exe) = if let Some(executor) = executor {
+        let target_command = ParsedCommand::parse(target_command)?;
+
+        let launch_parameters = if let Some(executor) = executor {
             let executor_metadata = db_lock
                 .applications
                 .installed_game_version
                 .get(&executor.game_id)
                 .ok_or(ProcessError::NotInstalled)?;
 
+            let executor_game_status = db_lock
+                .applications
+                .game_statuses
+                .get(&executor.game_id)
+                .ok_or(ProcessError::NotInstalled)?;
+
+            let executor_install_dir = match executor_game_status {
+                GameDownloadStatus::Installed {
+                    version_name: _,
+                    install_dir,
+                } => Ok(install_dir),
+                GameDownloadStatus::SetupRequired {
+                    version_name: _,
+                    install_dir: _,
+                } => todo!(),
+                _ => Err(ProcessError::NotInstalled),
+            }?;
+
             let executor_game_version = db_lock
                 .applications
                 .game_versions
@@ -384,44 +399,56 @@ impl ProcessManager<'_> {
                 .find(|v| v.launch_id == executor.launch_id)
                 .ok_or(ProcessError::NotInstalled)?;
 
+            println!("{}", executor_launch_config.command);
+            let mut exe_command = ParsedCommand::parse(executor_launch_config.command.clone())?;
+            println!("{:?}", exe_command);
+            exe_command.env.extend(target_command.env);
+            exe_command.make_absolute(executor_install_dir.into());
+
+            exe_command.args.iter_mut().for_each(|v| {
+                *v = v.replace("{executor}", &target_command.command);
+            });
+
             let executor_launch_string = process_handler.create_launch_process(
                 executor_metadata,
-                executor_launch_config.command.clone(),
-                executor_launch_config.args.clone(),
+                exe_command.reconstruct(),
                 executor_game_version,
-                install_dir,
+                &install_dir,
             )?;
 
-            (executor_launch_string, executor_launch_config.command.clone(), Some(launch))
+            LaunchParameters(executor_launch_string, install_dir.into())
         } else {
-            (
-                process_handler.create_launch_process(
-                    &meta,
-                    launch.to_string(),
-                    args.clone(),
-                    game_version,
-                    install_dir,
-                )?,
-                launch,
+            let target_launch_string = process_handler.create_launch_process(
+                &meta,
+                target_command.reconstruct(),
+                game_version,
+                install_dir,
+            )?;
+
+            let mut parsed_launch = ParsedCommand::parse(target_launch_string.clone())?;
+            let executable_name = parsed_launch.command.clone();
+            parsed_launch.make_absolute(install_dir.into());
+
+            let format_args = DropFormatArgs::new(
+                target_launch_string,
+                install_dir,
+                &executable_name,
+                parsed_launch.command,
                 None,
-            )
-        };
+            );
 
-        let format_args = DropFormatArgs::new(
-            launch_string,
-            install_dir,
-            &launch.clone(),
-            PathBuf::from(install_dir)
-                .join(launch)
-                .display()
-                .to_string(),
-            original_exe,
-        );
+            let target_launch_string = SimpleCurlyFormat
+                .format(&game_version.launch_template, &format_args)
+                .map_err(|e| ProcessError::FormatError(e.to_string()))?
+                .to_string();
+
+            let target_launch_string = SimpleCurlyFormat
+                .format(&target_launch_string, format_args)
+                .map_err(|e| ProcessError::FormatError(e.to_string()))?
+                .to_string();
 
-        let launch_string = SimpleCurlyFormat
-            .format(&game_version.launch_template, format_args)
-            .map_err(|e| ProcessError::FormatError(e.to_string()))?
-            .to_string();
+            LaunchParameters(target_launch_string, install_dir.into())
+        };
 
         #[cfg(target_os = "windows")]
         use std::os::windows::process::CommandExt;
@@ -430,20 +457,22 @@ impl ProcessManager<'_> {
         #[cfg(target_os = "windows")]
         command.raw_arg(format!("/C \"{}\"", &launch_string));
 
-        info!("launching (in {install_dir}): {launch_string}",);
+        info!(
+            "launching (in {}): {}",
+            launch_parameters.1.to_string_lossy(),
+            launch_parameters.0
+        );
 
         #[cfg(unix)]
         let mut command: Command = Command::new("sh");
         #[cfg(unix)]
-        command.args(vec!["-c", &launch_string]);
-
-        debug!("final launch string:\n\n{launch_string}\n");
+        command.args(vec!["-c", &launch_parameters.0]);
 
         command
             .stderr(error_file)
             .stdout(log_file)
             .env_remove("RUST_LOG")
-            .current_dir(install_dir);
+            .current_dir(launch_parameters.1);
 
         let child = command.spawn().map_err(ProcessError::IOError)?;
 
@@ -489,7 +518,6 @@ pub trait ProcessHandler: Send + 'static {
         &self,
         meta: &DownloadableMetadata,
         launch_command: String,
-        args: Vec<String>,
         game_version: &GameVersion,
         current_dir: &str,
     ) -> Result<String, ProcessError>;

From 51432fccb77223f9e6d1ae67e22c3a9b7b4e698c Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Wed, 14 Jan 2026 14:54:46 +1100
Subject: [PATCH 12/19] feat: not installed error handling

---
 src-tauri/process/src/error.rs            | 19 +++++++++++----
 src-tauri/process/src/process_handlers.rs |  2 +-
 src-tauri/process/src/process_manager.rs  | 29 +++++++++++++----------
 src-tauri/src/process.rs                  |  9 ++++---
 4 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/src-tauri/process/src/error.rs b/src-tauri/process/src/error.rs
index c196284f..2b24b148 100644
--- a/src-tauri/process/src/error.rs
+++ b/src-tauri/process/src/error.rs
@@ -1,17 +1,18 @@
-use std::{fmt::Display, io::Error};
+use std::{fmt::Display, io::{self, Error}, sync::Arc};
 
 use serde_with::SerializeDisplay;
 
-#[derive(SerializeDisplay)]
+#[derive(SerializeDisplay, Clone)]
 pub enum ProcessError {
     NotInstalled,
     AlreadyRunning,
     InvalidID,
     InvalidVersion,
-    IOError(Error),
+    RequiredDependency(String, String),
+    IOError(Arc<Error>),
     FormatError(String), // String errors supremacy
     InvalidPlatform,
-    OpenerError(tauri_plugin_opener::Error),
+    OpenerError(Arc<tauri_plugin_opener::Error>),
     InvalidArguments(String),
     FailedLaunch(String),
 }
@@ -33,7 +34,17 @@ impl Display for ProcessError {
             ProcessError::FailedLaunch(game_id) => {
                 &format!("Drop detected that the game {game_id} may have failed to launch properly")
             }
+            ProcessError::RequiredDependency(game_id, version_id) => &format!(
+                "Missing a required dependency to launch this game: {} {}",
+                game_id, version_id
+            ),
         };
         write!(f, "{s}")
     }
 }
+
+impl From<io::Error> for ProcessError {
+    fn from(value: io::Error) -> Self {
+        ProcessError::IOError(Arc::new(value))
+    }
+}
\ No newline at end of file
diff --git a/src-tauri/process/src/process_handlers.rs b/src-tauri/process/src/process_handlers.rs
index 6030d46e..5a9b8667 100644
--- a/src-tauri/process/src/process_handlers.rs
+++ b/src-tauri/process/src/process_handlers.rs
@@ -51,7 +51,7 @@ impl ProcessHandler for UMULauncher {
         };
         let pfx_dir = DATA_ROOT_DIR.join("pfx");
         let pfx_dir = pfx_dir.join(meta.id.clone());
-        create_dir_all(&pfx_dir).map_err(ProcessError::IOError)?;
+        create_dir_all(&pfx_dir)?;
         Ok(format!(
             "GAMEID={game_id} WINEPREFIX={} {} {umu:?} {launch}",
             pfx_dir.to_string_lossy(),
diff --git a/src-tauri/process/src/process_manager.rs b/src-tauri/process/src/process_manager.rs
index e5826273..ee30837a 100644
--- a/src-tauri/process/src/process_manager.rs
+++ b/src-tauri/process/src/process_manager.rs
@@ -295,7 +295,7 @@ impl ProcessManager<'_> {
 
         // TODO: refactor this path with open_process_logs
         let game_log_folder = &self.get_log_dir(game_id);
-        create_dir_all(game_log_folder).map_err(ProcessError::IOError)?;
+        create_dir_all(game_log_folder)?;
 
         let current_time = chrono::offset::Local::now();
         let log_file = OpenOptions::new()
@@ -307,8 +307,7 @@ impl ProcessManager<'_> {
                 "{}-{}.log",
                 &meta.version,
                 current_time.timestamp()
-            )))
-            .map_err(ProcessError::IOError)?;
+            )))?;
 
         let error_file = OpenOptions::new()
             .write(true)
@@ -319,8 +318,7 @@ impl ProcessManager<'_> {
                 "{}-{}-error.log",
                 &meta.version,
                 current_time.timestamp()
-            )))
-            .map_err(ProcessError::IOError)?;
+            )))?;
 
         let target_platform = meta.target_platform;
 
@@ -361,17 +359,22 @@ impl ProcessManager<'_> {
         let target_command = ParsedCommand::parse(target_command)?;
 
         let launch_parameters = if let Some(executor) = executor {
+            let err = ProcessError::RequiredDependency(
+                executor.game_id.clone(),
+                executor.version_id.clone(),
+            );
+
             let executor_metadata = db_lock
                 .applications
                 .installed_game_version
                 .get(&executor.game_id)
-                .ok_or(ProcessError::NotInstalled)?;
+                .ok_or(err.clone())?;
 
             let executor_game_status = db_lock
                 .applications
                 .game_statuses
                 .get(&executor.game_id)
-                .ok_or(ProcessError::NotInstalled)?;
+                .ok_or(err.clone())?;
 
             let executor_install_dir = match executor_game_status {
                 GameDownloadStatus::Installed {
@@ -382,22 +385,22 @@ impl ProcessManager<'_> {
                     version_name: _,
                     install_dir: _,
                 } => todo!(),
-                _ => Err(ProcessError::NotInstalled),
+                _ => Err(err.clone()),
             }?;
 
             let executor_game_version = db_lock
                 .applications
                 .game_versions
                 .get(&executor.game_id)
-                .ok_or(ProcessError::NotInstalled)?
+                .ok_or(err.clone())?
                 .get(&executor.version_id)
-                .ok_or(ProcessError::NotInstalled)?;
+                .ok_or(err.clone())?;
 
             let executor_launch_config = executor_game_version
                 .launches
                 .iter()
                 .find(|v| v.launch_id == executor.launch_id)
-                .ok_or(ProcessError::NotInstalled)?;
+                .ok_or(err)?;
 
             println!("{}", executor_launch_config.command);
             let mut exe_command = ParsedCommand::parse(executor_launch_config.command.clone())?;
@@ -474,10 +477,10 @@ impl ProcessManager<'_> {
             .env_remove("RUST_LOG")
             .current_dir(launch_parameters.1);
 
-        let child = command.spawn().map_err(ProcessError::IOError)?;
+        let child = command.spawn()?;
 
         let launch_process_handle =
-            Arc::new(SharedChild::new(child).map_err(ProcessError::IOError)?);
+            Arc::new(SharedChild::new(child)?);
 
         db_lock
             .applications
diff --git a/src-tauri/src/process.rs b/src-tauri/src/process.rs
index 1e4e04ef..273974f8 100644
--- a/src-tauri/src/process.rs
+++ b/src-tauri/src/process.rs
@@ -1,4 +1,4 @@
-use std::sync::nonpoison::Mutex;
+use std::sync::{Arc, nonpoison::Mutex};
 
 use process::{PROCESS_MANAGER, error::ProcessError, process_manager::{LaunchOption, ProcessManager}};
 use tauri::AppHandle;
@@ -40,10 +40,9 @@ pub fn launch_game(
 
 #[tauri::command]
 pub fn kill_game(game_id: String) -> Result<(), ProcessError> {
-    PROCESS_MANAGER
+    Ok(PROCESS_MANAGER
         .lock()
-        .kill_game(game_id)
-        .map_err(ProcessError::IOError)
+        .kill_game(game_id)?)
 }
 
 #[tauri::command]
@@ -54,5 +53,5 @@ pub fn open_process_logs(game_id: String, app_handle: AppHandle) -> Result<(), P
     app_handle
         .opener()
         .open_path(dir.display().to_string(), None::<&str>)
-        .map_err(ProcessError::OpenerError)
+        .map_err(|v| ProcessError::OpenerError(Arc::new(v)))
 }

From cfc12f8d578cec95f9c4bf1799695d38e5fef4a8 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Wed, 14 Jan 2026 17:03:21 +1100
Subject: [PATCH 13/19] feat: better offline handling

---
 main/app.vue                                  |   9 +-
 main/components/LibrarySearch.vue             |  20 +-
 main/components/OfflineHeaderWidget.vue       |  10 +-
 src-tauri/Cargo.lock                          | 733 ++++++++----------
 src-tauri/Cargo.toml                          |   2 +-
 src-tauri/client/src/app_state.rs             |  10 +
 src-tauri/client/src/lib.rs                   |   1 +
 src-tauri/games/src/collections/collection.rs |   4 +-
 .../games/src/downloads/download_agent.rs     |   2 +-
 .../games/src/downloads/download_logic.rs     |   2 +-
 src-tauri/games/src/library.rs                |  28 +-
 src-tauri/remote/Cargo.toml                   |  10 +-
 src-tauri/remote/src/error.rs                 |  19 +-
 src-tauri/remote/src/lib.rs                   |   2 +
 src-tauri/remote/src/requests.rs              |   3 +-
 src-tauri/remote/src/utils.rs                 |  72 +-
 src-tauri/src/client.rs                       |  11 +-
 src-tauri/src/collections.rs                  |  41 +
 src-tauri/src/games.rs                        |  20 -
 src-tauri/src/lib.rs                          |  28 +-
 20 files changed, 531 insertions(+), 496 deletions(-)

diff --git a/main/app.vue b/main/app.vue
index 1594dd66..5ae90e17 100644
--- a/main/app.vue
+++ b/main/app.vue
@@ -1,5 +1,5 @@
 <template>
-    <NuxtLoadingIndicator color="#2563eb" />
+  <NuxtLoadingIndicator color="#2563eb" />
   <NuxtLayout class="select-none w-screen h-screen">
     <NuxtPage />
     <ModalStack />
@@ -15,6 +15,8 @@ import {
   initialNavigation,
   setupHooks,
 } from "./composables/state-navigation.js";
+import { listen } from "@tauri-apps/api/event";
+import type { AppState } from "./types.js";
 
 const router = useRouter();
 
@@ -36,9 +38,8 @@ async function fetchState() {
 }
 await fetchState();
 
-// This is inefficient but apparently we do it lol
-router.beforeEach(async () => {
-  await fetchState();
+listen("update_state", (event) => {
+  state.value = event.payload as AppState;
 });
 
 setupHooks();
diff --git a/main/components/LibrarySearch.vue b/main/components/LibrarySearch.vue
index d4beffaf..3dac1e6f 100644
--- a/main/components/LibrarySearch.vue
+++ b/main/components/LibrarySearch.vue
@@ -74,9 +74,7 @@
                 />
               </div>
               <div class="truncate inline-flex items-center gap-x-2">
-                <p
-                  class="text-sm whitespace-nowrap font-display font-semibold"
-                >
+                <p class="text-sm whitespace-nowrap font-display font-semibold">
                   {{ item.label }}
                 </p>
                 <p
@@ -177,6 +175,22 @@ const icons: { [key: string]: string } = {};
 const collections: Ref<Collection[]> = ref([]);
 
 async function calculateGames(clearAll = false, forceRefresh = false) {
+  try {
+    await calculateGamesLogic(clearAll, forceRefresh);
+  } catch (e) {
+    createModal(
+      ModalType.Notification,
+      {
+        title: "Failed to fetch library",
+        description: `Drop encountered an error while fetching your library: ${e}`,
+      },
+      (_, c) => c()
+    );
+  }
+  loading.value = false;
+}
+
+async function calculateGamesLogic(clearAll = false, forceRefresh = false) {
   if (clearAll) {
     collections.value = [];
     loading.value = true;
diff --git a/main/components/OfflineHeaderWidget.vue b/main/components/OfflineHeaderWidget.vue
index a17ec5dc..a22320ed 100644
--- a/main/components/OfflineHeaderWidget.vue
+++ b/main/components/OfflineHeaderWidget.vue
@@ -1,9 +1,15 @@
 <script setup lang="ts">
 import { ArrowDownTrayIcon, CloudIcon } from "@heroicons/vue/20/solid";
+import { invoke } from "@tauri-apps/api/core";
+
+async function checkOffline() {
+  const isOffline = await invoke("check_online");
+}
 </script>
 
 <template>
-  <div
+  <button
+    @click="checkOffline"
     class="transition inline-flex items-center rounded-sm px-4 py-1.5 bg-zinc-900 text-sm text-zinc-400 gap-x-2"
   >
     <div class="relative">
@@ -13,5 +19,5 @@ import { ArrowDownTrayIcon, CloudIcon } from "@heroicons/vue/20/solid";
       />
     </div>
     Offline
-  </div>
+  </button>
 </template>
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index c09b7036..187b2f35 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -60,9 +60,12 @@ checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
 [[package]]
 name = "arc-swap"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+checksum = "51d03449bb8ca2cc2ef70869af31463d1ae5ccc8fa3e334b307203fbf815207e"
+dependencies = [
+ "rustversion",
+]
 
 [[package]]
 name = "arrayvec"
@@ -70,27 +73,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
-[[package]]
-name = "ashpd"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cbdf310d77fd3aaee6ea2093db7011dc2d35d2eb3481e5607f1f8d942ed99df"
-dependencies = [
- "enumflags2",
- "futures-channel",
- "futures-util",
- "rand 0.9.2",
- "raw-window-handle",
- "serde",
- "serde_repr",
- "tokio",
- "url",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols",
- "zbus 5.12.0",
-]
-
 [[package]]
 name = "asn1-rs"
 version = "0.6.2"
@@ -131,7 +113,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
  "synstructure",
 ]
 
@@ -143,7 +125,7 @@ checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
  "synstructure",
 ]
 
@@ -155,7 +137,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -235,16 +217,16 @@ dependencies = [
  "futures-lite",
  "parking",
  "polling",
- "rustix 1.1.2",
+ "rustix 1.1.3",
  "slab",
  "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "async-lock"
-version = "3.4.1"
+version = "3.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
+checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311"
 dependencies = [
  "event-listener 5.4.1",
  "event-listener-strategy",
@@ -266,7 +248,7 @@ dependencies = [
  "cfg-if",
  "event-listener 5.4.1",
  "futures-lite",
- "rustix 1.1.2",
+ "rustix 1.1.3",
 ]
 
 [[package]]
@@ -277,7 +259,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -303,7 +285,7 @@ dependencies = [
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 1.1.2",
+ "rustix 1.1.3",
  "signal-hook-registry",
  "slab",
  "windows-sys 0.61.2",
@@ -350,7 +332,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -453,9 +435,9 @@ dependencies = [
 
 [[package]]
 name = "bitcode"
-version = "0.6.7"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "648bd963d2e5d465377acecfb4b827f9f553b6bc97a8f61715779e9ed9e52b74"
+checksum = "0a6ed1b54d8dc333e7be604d00fa9262f4635485ffea923647b6521a5fff045d"
 dependencies = [
  "arrayvec",
  "bitcode_derive",
@@ -466,13 +448,13 @@ dependencies = [
 
 [[package]]
 name = "bitcode_derive"
-version = "0.6.7"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffebfc2d28a12b262c303cb3860ee77b91bd83b1f20f0bd2a9693008e2f55a9e"
+checksum = "238b90427dfad9da4a9abd60f3ec1cdee6b80454bde49ed37f1781dd8e9dc7f9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -589,9 +571,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.19.0"
+version = "3.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
 
 [[package]]
 name = "byte-tools"
@@ -696,9 +678,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"
+checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48"
 dependencies = [
  "serde_core",
 ]
@@ -733,7 +715,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77"
 dependencies = [
  "serde",
- "toml 0.9.8",
+ "toml 0.9.11+spec-1.1.0",
 ]
 
 [[package]]
@@ -747,9 +729,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.49"
+version = "1.2.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215"
+checksum = "cd4932aefd12402b36c60956a4fe0035421f544799057659ff86f923657aada3"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -840,7 +822,7 @@ dependencies = [
  "dirs 6.0.0",
  "log",
  "regex",
- "rustix 1.1.2",
+ "rustix 1.1.3",
  "serde",
  "serde_json",
  "serde_with",
@@ -885,7 +867,7 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "once_cell",
  "tiny-keccak",
 ]
@@ -1048,7 +1030,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1058,7 +1040,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
 dependencies = [
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1091,7 +1073,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1102,14 +1084,14 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
+checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
 
 [[package]]
 name = "database"
@@ -1213,28 +1195,28 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "derive_more"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10b768e943bed7bf2cab53df09f4bc34bfd217cdb57d971e769874c9a6710618"
+checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134"
 dependencies = [
  "derive_more-impl",
 ]
 
 [[package]]
 name = "derive_more-impl"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d286bfdaf75e988b4a78e013ecd79c581e06399ab53fbacd2d916c2f904f30b"
+checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb"
 dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.111",
+ "syn 2.0.114",
  "unicode-xid",
 ]
 
@@ -1340,16 +1322,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
-]
-
-[[package]]
-name = "dlib"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
-dependencies = [
- "libloading 0.8.9",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1372,7 +1345,7 @@ checksum = "0fbbb781877580993a8707ec48672673ec7b81eeba04cfd2310bd28c08e47c8f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1390,12 +1363,6 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "780955b8b195a21ab8e4ac6b60dd1dbdcec1dc6c51c0617964b08c81785e12c9"
 
-[[package]]
-name = "downcast-rs"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
-
 [[package]]
 name = "download_manager"
 version = "0.1.0"
@@ -1461,7 +1428,7 @@ dependencies = [
  "rayon",
  "regex",
  "remote",
- "reqwest 0.12.25",
+ "reqwest 0.12.28",
  "reqwest-middleware 0.4.2",
  "reqwest-middleware-cache",
  "reqwest-websocket",
@@ -1518,8 +1485,8 @@ dependencies = [
 
 [[package]]
 name = "droplet-rs"
-version = "0.12.3"
-source = "git+https://github.com/Drop-OSS/droplet-rs#fe2b569c06d6dd478ffbc2a72a0ba4cf52adf346"
+version = "0.14.1"
+source = "git+https://github.com/Drop-OSS/droplet-rs#f17a585b563d874ef9a09c27be5169b7e728d148"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1541,9 +1508,9 @@ dependencies = [
 
 [[package]]
 name = "dtoa"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04"
+checksum = "4c3cf4824e2d5f025c7b531afcb2325364084a16806f6d47fbc1f5fbd9960590"
 
 [[package]]
 name = "dtoa-short"
@@ -1595,7 +1562,7 @@ dependencies = [
  "cc",
  "memchr",
  "rustc_version",
- "toml 0.9.8",
+ "toml 0.9.11+spec-1.1.0",
  "vswhom",
  "winreg 0.55.0",
 ]
@@ -1639,7 +1606,7 @@ checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1750,15 +1717,15 @@ dependencies = [
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.5"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
+checksum = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41"
 
 [[package]]
 name = "flate2"
-version = "1.1.5"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
+checksum = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1797,7 +1764,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1900,7 +1867,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1956,15 +1923,15 @@ dependencies = [
  "ctr",
  "database",
  "download_manager",
- "droplet-rs 0.12.3",
+ "droplet-rs 0.14.1",
  "futures-util",
  "hex 0.4.3",
  "log",
  "native_model",
  "rayon",
  "remote",
- "reqwest 0.12.25",
- "rustix 1.1.2",
+ "reqwest 0.12.28",
+ "rustix 1.1.3",
  "serde",
  "serde_json",
  "serde_with",
@@ -2101,7 +2068,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
 dependencies = [
- "rustix 1.1.2",
+ "rustix 1.1.3",
  "windows-link 0.2.1",
 ]
 
@@ -2118,9 +2085,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2177,9 +2144,9 @@ dependencies = [
 
 [[package]]
 name = "glam"
-version = "0.30.9"
+version = "0.30.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd47b05dddf0005d850e5644cae7f2b14ac3df487979dbfff3b56f20b1a6ae46"
+checksum = "19fc433e8437a212d1b6f1e68c7824af3aed907da60afa994e7f542d18d12aa9"
 
 [[package]]
 name = "glib"
@@ -2215,7 +2182,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2306,7 +2273,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2321,7 +2288,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2330,9 +2297,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
+checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -2340,7 +2307,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http 1.4.0",
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2580,7 +2547,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
- "h2 0.4.12",
+ "h2 0.4.13",
  "http 1.4.0",
  "http-body 1.0.1",
  "httparse",
@@ -2807,9 +2774,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.12.1"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
+checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
 dependencies = [
  "equivalent",
  "hashbrown 0.16.1",
@@ -2853,9 +2820,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "iri-string"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397"
+checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a"
 dependencies = [
  "memchr",
  "serde",
@@ -2882,9 +2849,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.15"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
 
 [[package]]
 name = "javascriptcore-rs"
@@ -3018,7 +2985,7 @@ checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2"
 dependencies = [
  "cssparser",
  "html5ever",
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "selectors",
 ]
 
@@ -3057,15 +3024,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf"
 dependencies = [
  "gtk-sys",
- "libloading 0.7.4",
+ "libloading",
  "once_cell",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.178"
+version = "0.2.180"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
+checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
 
 [[package]]
 name = "libdbus-sys"
@@ -3086,16 +3053,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "libloading"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
-dependencies = [
- "cfg-if",
- "windows-link 0.2.1",
-]
-
 [[package]]
 name = "libm"
 version = "0.2.15"
@@ -3104,13 +3061,13 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
 
 [[package]]
 name = "libredox"
-version = "0.1.10"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
+checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
 dependencies = [
  "bitflags 2.10.0",
  "libc",
- "redox_syscall 0.5.18",
+ "redox_syscall 0.7.0",
 ]
 
 [[package]]
@@ -3175,7 +3132,7 @@ dependencies = [
  "anyhow",
  "arc-swap",
  "chrono",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "fnv",
  "humantime",
  "libc",
@@ -3238,7 +3195,7 @@ checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -3313,7 +3270,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -3395,7 +3352,7 @@ dependencies = [
  "libc",
  "log",
  "openssl",
- "openssl-probe",
+ "openssl-probe 0.1.6",
  "openssl-sys",
  "schannel",
  "security-framework 2.11.1",
@@ -3427,7 +3384,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -3489,7 +3446,6 @@ dependencies = [
  "cfg-if",
  "cfg_aliases",
  "libc",
- "memoffset",
 ]
 
 [[package]]
@@ -3510,9 +3466,9 @@ dependencies = [
 
 [[package]]
 name = "ntapi"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
+checksum = "c70f219e21142367c70c0b30c6a9e3a14d55b4d12a204d897fbec83a0363f081"
 dependencies = [
  "winapi",
 ]
@@ -3615,7 +3571,7 @@ dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -3940,7 +3896,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -3949,6 +3905,12 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
+[[package]]
+name = "openssl-probe"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f50d9b3dabb09ecd771ad0aa242ca6894994c130308ca3d7684634df8037391"
+
 [[package]]
 name = "openssl-sys"
 version = "0.9.111"
@@ -3998,9 +3960,9 @@ dependencies = [
 
 [[package]]
 name = "os_info"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c39b5918402d564846d5aba164c09a66cc88d232179dfd3e3c619a25a268392"
+checksum = "e4022a17595a00d6a369236fdae483f0de7f0a339960a53118b818238e132224"
 dependencies = [
  "android_system_properties",
  "log",
@@ -4111,12 +4073,6 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
 [[package]]
 name = "pathdiff"
 version = "0.2.3"
@@ -4243,7 +4199,7 @@ dependencies = [
  "phf_shared 0.11.3",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -4290,7 +4246,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -4329,8 +4285,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07"
 dependencies = [
  "base64 0.22.1",
- "indexmap 2.12.1",
- "quick-xml 0.38.4",
+ "indexmap 2.13.0",
+ "quick-xml",
  "serde",
  "time",
 ]
@@ -4358,7 +4314,7 @@ dependencies = [
  "concurrent-queue",
  "hermit-abi",
  "pin-project-lite",
- "rustix 1.1.2",
+ "rustix 1.1.3",
  "windows-sys 0.61.2",
 ]
 
@@ -4418,7 +4374,7 @@ version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
 dependencies = [
- "toml_edit 0.23.9",
+ "toml_edit 0.23.10+spec-1.0.0",
 ]
 
 [[package]]
@@ -4453,9 +4409,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.103"
+version = "1.0.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
+checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7"
 dependencies = [
  "unicode-ident",
 ]
@@ -4480,15 +4436,6 @@ dependencies = [
  "utils",
 ]
 
-[[package]]
-name = "quick-xml"
-version = "0.37.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "quick-xml"
 version = "0.38.4"
@@ -4555,9 +4502,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.42"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
+checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a"
 dependencies = [
  "proc-macro2",
 ]
@@ -4600,7 +4547,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
  "rand_chacha 0.9.0",
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
 ]
 
 [[package]]
@@ -4630,7 +4577,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
 ]
 
 [[package]]
@@ -4648,14 +4595,14 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.9.3"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
 dependencies = [
  "getrandom 0.3.4",
 ]
@@ -4736,13 +4683,22 @@ dependencies = [
  "bitflags 2.10.0",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27"
+dependencies = [
+ "bitflags 2.10.0",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "libredox",
  "thiserror 1.0.69",
 ]
@@ -4753,7 +4709,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "libredox",
  "thiserror 2.0.17",
 ]
@@ -4775,7 +4731,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -4786,7 +4742,7 @@ checksum = "23bbed272e39c47a095a5242218a67412a220006842558b03fe2935e8f3d7b92"
 dependencies = [
  "cfg-if",
  "libc",
- "rustix 1.1.2",
+ "rustix 1.1.3",
  "windows 0.62.2",
 ]
 
@@ -4823,6 +4779,7 @@ checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 name = "remote"
 version = "0.1.0"
 dependencies = [
+ "async-trait",
  "bitcode",
  "chrono",
  "client",
@@ -4833,7 +4790,8 @@ dependencies = [
  "http 1.4.0",
  "log",
  "md5 0.8.0",
- "reqwest 0.12.25",
+ "reqwest 0.12.28",
+ "reqwest-middleware 0.4.2",
  "reqwest-websocket",
  "serde",
  "serde_with",
@@ -4881,9 +4839,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.25"
+version = "0.12.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6eff9328d40131d43bd911d42d79eb6a47312002a4daefc9e37f17e74a7701a"
+checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -4891,7 +4849,7 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.4.12",
+ "h2 0.4.13",
  "http 1.4.0",
  "http-body 1.0.1",
  "http-body-util",
@@ -4953,7 +4911,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "http 1.4.0",
- "reqwest 0.12.25",
+ "reqwest 0.12.28",
  "serde",
  "thiserror 1.0.69",
  "tower-service",
@@ -4988,7 +4946,7 @@ dependencies = [
  "async-tungstenite",
  "bytes",
  "futures-util",
- "reqwest 0.12.25",
+ "reqwest 0.12.28",
  "thiserror 2.0.17",
  "tokio",
  "tokio-util",
@@ -4999,11 +4957,10 @@ dependencies = [
 
 [[package]]
 name = "rfd"
-version = "0.15.4"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2bee61e6cffa4635c72d7d81a84294e28f0930db0ddcb0f66d10244674ebed"
+checksum = "a15ad77d9e70a92437d8f74c35d99b4e4691128df018833e99f90bcd36152672"
 dependencies = [
- "ashpd",
  "block2",
  "dispatch2",
  "glib-sys",
@@ -5019,7 +4976,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -5030,7 +4987,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "libc",
  "untrusted",
  "windows-sys 0.52.0",
@@ -5038,22 +4995,19 @@ dependencies = [
 
 [[package]]
 name = "rmp"
-version = "0.8.14"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
+checksum = "4ba8be72d372b2c9b35542551678538b562e7cf86c3315773cae48dfbfe7790c"
 dependencies = [
- "byteorder",
  "num-traits",
- "paste",
 ]
 
 [[package]]
 name = "rmp-serde"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
+checksum = "72f81bee8c8ef9b577d1681a70ebbc962c232461e397b22c208c43c04b67a155"
 dependencies = [
- "byteorder",
  "rmp",
  "serde",
 ]
@@ -5133,9 +5087,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
 dependencies = [
  "bitflags 2.10.0",
  "errno",
@@ -5146,9 +5100,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.35"
+version = "0.23.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f"
+checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b"
 dependencies = [
  "once_cell",
  "ring",
@@ -5160,11 +5114,11 @@ dependencies = [
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9980d917ebb0c0536119ba501e90834767bffc3d60641457fd84a1f3fd337923"
+checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
 dependencies = [
- "openssl-probe",
+ "openssl-probe 0.2.0",
  "rustls-pki-types",
  "schannel",
  "security-framework 3.5.1",
@@ -5172,9 +5126,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "708c0f9d5f54ba0272468c1d306a52c495b31fa155e91bc25371e6df7996908c"
+checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282"
 dependencies = [
  "web-time",
  "zeroize",
@@ -5199,9 +5153,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "ryu"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984"
 
 [[package]]
 name = "same-file"
@@ -5250,9 +5204,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289"
+checksum = "54e910108742c57a770f492731f99be216a52fadd361b06c8fb59d74ccc267d2"
 dependencies = [
  "dyn-clone",
  "ref-cast",
@@ -5269,15 +5223,9 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -5416,7 +5364,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -5427,20 +5375,20 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.145"
+version = "1.0.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
 dependencies = [
  "itoa",
  "memchr",
- "ryu",
  "serde",
  "serde_core",
+ "zmij",
 ]
 
 [[package]]
@@ -5451,7 +5399,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -5465,9 +5413,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392"
+checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"
 dependencies = [
  "serde_core",
 ]
@@ -5494,9 +5442,9 @@ dependencies = [
  "chrono",
  "hex 0.4.3",
  "indexmap 1.9.3",
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "schemars 0.9.0",
- "schemars 1.1.0",
+ "schemars 1.2.0",
  "serde_core",
  "serde_json",
  "serde_with_macros",
@@ -5512,7 +5460,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -5521,7 +5469,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "itoa",
  "ryu",
  "serde",
@@ -5547,7 +5495,7 @@ checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -5689,10 +5637,11 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.7"
+version = "1.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad"
+checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
 dependencies = [
+ "errno",
  "libc",
 ]
 
@@ -5910,9 +5859,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.111"
+version = "2.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
+checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5942,7 +5891,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -6085,7 +6034,7 @@ checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -6145,7 +6094,7 @@ dependencies = [
  "percent-encoding",
  "plist",
  "raw-window-handle",
- "reqwest 0.12.25",
+ "reqwest 0.12.28",
  "serde",
  "serde_json",
  "serde_repr",
@@ -6184,7 +6133,7 @@ dependencies = [
  "serde_json",
  "tauri-utils",
  "tauri-winres",
- "toml 0.9.8",
+ "toml 0.9.11+spec-1.1.0",
  "walkdir",
 ]
 
@@ -6206,7 +6155,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.9",
- "syn 2.0.111",
+ "syn 2.0.114",
  "tauri-utils",
  "thiserror 2.0.17",
  "time",
@@ -6224,7 +6173,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
  "tauri-codegen",
  "tauri-utils",
 ]
@@ -6242,7 +6191,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tauri-utils",
- "toml 0.9.8",
+ "toml 0.9.11+spec-1.1.0",
  "walkdir",
 ]
 
@@ -6262,9 +6211,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-deep-link"
-version = "2.4.5"
+version = "2.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e82759f7c7d51de3cbde51c04b3f2332de52436ed84541182cd8944b04e9e73"
+checksum = "444b091f24f2f6bdb4a305b54d3961f629c11861c685aceeea9a1972f89e43d5"
 dependencies = [
  "dunce",
  "plist",
@@ -6283,9 +6232,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-dialog"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "313f8138692ddc4a2127c4c9607d616a46f5c042e77b3722450866da0aad2f19"
+checksum = "05416b57601eca8666b5ec4186f5b1dc826ed35263b4797ad6641e58da6bc6c3"
 dependencies = [
  "log",
  "raw-window-handle",
@@ -6301,9 +6250,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-fs"
-version = "2.4.4"
+version = "2.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47df422695255ecbe7bac7012440eddaeefd026656171eac9559f5243d3230d9"
+checksum = "ed390cc669f937afeb8b28032ce837bac8ea023d975a2e207375ec05afaf1804"
 dependencies = [
  "anyhow",
  "dunce",
@@ -6317,15 +6266,15 @@ dependencies = [
  "tauri-plugin",
  "tauri-utils",
  "thiserror 2.0.17",
- "toml 0.9.8",
+ "toml 0.9.11+spec-1.1.0",
  "url",
 ]
 
 [[package]]
 name = "tauri-plugin-opener"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c26b72571d25dee25667940027114e60f569fc3974f8cefbe50c2cbc5fd65e3b"
+checksum = "fc624469b06f59f5a29f874bbc61a2ed737c0f9c23ef09855a292c389c42e83f"
 dependencies = [
  "dunce",
  "glob",
@@ -6340,7 +6289,7 @@ dependencies = [
  "thiserror 2.0.17",
  "url",
  "windows 0.61.3",
- "zbus 5.12.0",
+ "zbus 5.13.1",
 ]
 
 [[package]]
@@ -6363,9 +6312,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-shell"
-version = "2.3.3"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c374b6db45f2a8a304f0273a15080d98c70cde86178855fc24653ba657a1144c"
+checksum = "39b76f884a3937e04b631ffdc3be506088fa979369d25147361352f2f352e5ed"
 dependencies = [
  "encoding_rs",
  "log",
@@ -6384,9 +6333,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-single-instance"
-version = "2.3.6"
+version = "2.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd707f8c86b4e3004e2c141fa24351f1909ba40ce1b8437e30d5ed5277dd3710"
+checksum = "acba6b5ca527a96cdfcc96ae09b09ccb91ddff5e33978ca6873b96ea16bb404c"
 dependencies = [
  "serde",
  "serde_json",
@@ -6395,7 +6344,7 @@ dependencies = [
  "thiserror 2.0.17",
  "tracing",
  "windows-sys 0.60.2",
- "zbus 5.12.0",
+ "zbus 5.13.1",
 ]
 
 [[package]]
@@ -6481,7 +6430,7 @@ dependencies = [
  "serde_with",
  "swift-rs",
  "thiserror 2.0.17",
- "toml 0.9.8",
+ "toml 0.9.11+spec-1.1.0",
  "url",
  "urlpattern",
  "uuid",
@@ -6496,19 +6445,19 @@ checksum = "1087b111fe2b005e42dbdc1990fc18593234238d47453b0c99b7de1c9ab2c1e0"
 dependencies = [
  "dunce",
  "embed-resource",
- "toml 0.9.8",
+ "toml 0.9.11+spec-1.1.0",
 ]
 
 [[package]]
 name = "tempfile"
-version = "3.23.0"
+version = "3.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
+checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c"
 dependencies = [
  "fastrand",
  "getrandom 0.3.4",
  "once_cell",
- "rustix 1.1.2",
+ "rustix 1.1.3",
  "windows-sys 0.61.2",
 ]
 
@@ -6549,7 +6498,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -6560,17 +6509,17 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "thread-id"
-version = "5.0.0"
+version = "5.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99043e46c5a15af379c06add30d9c93a6c0e8849de00d244c4a2c417da128d80"
+checksum = "2010d27add3f3240c1fef7959f46c814487b216baee662af53be645ba7831c07"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -6587,30 +6536,30 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.44"
+version = "0.3.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
+checksum = "f9e442fc33d7fdb45aa9bfeb312c095964abdf596f7567261062b2a7107aaabd"
 dependencies = [
  "deranged 0.5.5",
  "itoa",
  "num-conv",
  "powerfmt",
- "serde",
+ "serde_core",
  "time-core",
  "time-macros",
 ]
 
 [[package]]
 name = "time-core"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
+checksum = "8b36ee98fd31ec7426d599183e8fe26932a8dc1fb76ddb6214d05493377d34ca"
 
 [[package]]
 name = "time-macros"
-version = "0.2.24"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
+checksum = "71e552d1249bf61ac2a52db88179fd0673def1e1ad8243a00d9ec9ed71fee3dd"
 dependencies = [
  "num-conv",
  "time-core",
@@ -6652,9 +6601,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.48.0"
+version = "1.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
+checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
 dependencies = [
  "bytes",
  "libc",
@@ -6663,7 +6612,6 @@ dependencies = [
  "signal-hook-registry",
  "socket2 0.6.1",
  "tokio-macros",
- "tracing",
  "windows-sys 0.61.2",
 ]
 
@@ -6675,7 +6623,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -6700,9 +6648,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.17"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594"
+checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098"
 dependencies = [
  "bytes",
  "futures-core",
@@ -6726,14 +6674,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.9.8"
+version = "0.9.11+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8"
+checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46"
 dependencies = [
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "serde_core",
- "serde_spanned 1.0.3",
- "toml_datetime 0.7.3",
+ "serde_spanned 1.0.4",
+ "toml_datetime 0.7.5+spec-1.1.0",
  "toml_parser",
  "toml_writer",
  "winnow 0.7.14",
@@ -6750,9 +6698,9 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.7.3"
+version = "0.7.5+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
+checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
 dependencies = [
  "serde_core",
 ]
@@ -6763,7 +6711,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "toml_datetime 0.6.3",
  "winnow 0.5.40",
 ]
@@ -6774,7 +6722,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
 dependencies = [
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "serde",
  "serde_spanned 0.6.9",
  "toml_datetime 0.6.3",
@@ -6783,36 +6731,36 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.23.9"
+version = "0.23.10+spec-1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d7cbc3b4b49633d57a0509303158ca50de80ae32c265093b24c414705807832"
+checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
 dependencies = [
- "indexmap 2.12.1",
- "toml_datetime 0.7.3",
+ "indexmap 2.13.0",
+ "toml_datetime 0.7.5+spec-1.1.0",
  "toml_parser",
  "winnow 0.7.14",
 ]
 
 [[package]]
 name = "toml_parser"
-version = "1.0.4"
+version = "1.0.6+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
+checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
 dependencies = [
  "winnow 0.7.14",
 ]
 
 [[package]]
 name = "toml_writer"
-version = "1.0.4"
+version = "1.0.6+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
+checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607"
 
 [[package]]
 name = "tower"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
 dependencies = [
  "futures-core",
  "futures-util",
@@ -6855,9 +6803,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
 dependencies = [
  "pin-project-lite",
  "tracing-attributes",
@@ -6872,23 +6820,23 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.35"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
 dependencies = [
  "once_cell",
 ]
 
 [[package]]
 name = "tray-icon"
-version = "0.21.2"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d5572781bee8e3f994d7467084e1b1fd7a93ce66bd480f8156ba89dee55a2b"
+checksum = "a5e85aa143ceb072062fc4d6356c1b520a51d636e7bc8e77ec94be3608e5e80c"
 dependencies = [
  "crossbeam-channel",
  "dirs 6.0.0",
@@ -7010,9 +6958,9 @@ dependencies = [
 
 [[package]]
 name = "unicase"
-version = "2.8.1"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
 
 [[package]]
 name = "unicode-ident"
@@ -7061,14 +7009,15 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.7"
+version = "2.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
  "serde",
+ "serde_derive",
 ]
 
 [[package]]
@@ -7131,7 +7080,7 @@ checksum = "39d11901c36b3650df7acb0f9ebe624f35b5ac4e1922ecd3c57f444648429594"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -7269,7 +7218,7 @@ dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
  "wasm-bindgen-shared",
 ]
 
@@ -7295,66 +7244,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "wayland-backend"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35"
-dependencies = [
- "cc",
- "downcast-rs",
- "rustix 1.1.2",
- "scoped-tls",
- "smallvec",
- "wayland-sys",
-]
-
-[[package]]
-name = "wayland-client"
-version = "0.31.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d"
-dependencies = [
- "bitflags 2.10.0",
- "rustix 1.1.2",
- "wayland-backend",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-protocols"
-version = "0.32.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901"
-dependencies = [
- "bitflags 2.10.0",
- "wayland-backend",
- "wayland-client",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-scanner"
-version = "0.31.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3"
-dependencies = [
- "proc-macro2",
- "quick-xml 0.37.5",
- "quote",
-]
-
-[[package]]
-name = "wayland-sys"
-version = "0.31.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142"
-dependencies = [
- "dlib",
- "log",
- "pkg-config",
-]
-
 [[package]]
 name = "web-sys"
 version = "0.3.83"
@@ -7447,18 +7336,18 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e"
+checksum = "12bed680863276c63889429bfd6cab3b99943659923822de1c8a39c49e4d722c"
 dependencies = [
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "webview2-com"
-version = "0.38.0"
+version = "0.38.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4ba622a989277ef3886dd5afb3e280e3dd6d974b766118950a08f8f678ad6a4"
+checksum = "7130243a7a5b33c54a444e54842e6a9e133de08b5ad7b5861cd8ed9a6a5bc96a"
 dependencies = [
  "webview2-com-macros",
  "webview2-com-sys",
@@ -7470,20 +7359,20 @@ dependencies = [
 
 [[package]]
 name = "webview2-com-macros"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431"
+checksum = "67a921c1b6914c367b2b823cd4cde6f96beec77d30a939c8199bb377cf9b9b54"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "webview2-com-sys"
-version = "0.38.0"
+version = "0.38.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36695906a1b53a3bf5c4289621efedac12b73eeb0b89e7e1a89b517302d5d75c"
+checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c"
 dependencies = [
  "thiserror 2.0.17",
  "windows 0.61.3",
@@ -7646,7 +7535,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -7657,7 +7546,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -8242,7 +8131,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156"
 dependencies = [
  "libc",
- "rustix 1.1.2",
+ "rustix 1.1.3",
 ]
 
 [[package]]
@@ -8289,7 +8178,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
  "synstructure",
 ]
 
@@ -8327,9 +8216,9 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "5.12.0"
+version = "5.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b622b18155f7a93d1cd2dc8c01d2d6a44e08fb9ebb7b3f9e6ed101488bad6c91"
+checksum = "17f79257df967b6779afa536788657777a0001f5b42524fcaf5038d4344df40b"
 dependencies = [
  "async-broadcast",
  "async-executor",
@@ -8345,19 +8234,19 @@ dependencies = [
  "futures-core",
  "futures-lite",
  "hex 0.4.3",
- "nix 0.30.1",
+ "libc",
  "ordered-stream",
+ "rustix 1.1.3",
  "serde",
  "serde_repr",
- "tokio",
  "tracing",
  "uds_windows",
  "uuid",
  "windows-sys 0.61.2",
  "winnow 0.7.14",
- "zbus_macros 5.12.0",
- "zbus_names 4.2.0",
- "zvariant 5.8.0",
+ "zbus_macros 5.13.1",
+ "zbus_names 4.3.1",
+ "zvariant 5.9.1",
 ]
 
 [[package]]
@@ -8369,23 +8258,23 @@ dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
  "zvariant_utils 2.1.0",
 ]
 
 [[package]]
 name = "zbus_macros"
-version = "5.12.0"
+version = "5.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cdb94821ca8a87ca9c298b5d1cbd80e2a8b67115d99f6e4551ac49e42b6a314"
+checksum = "aad23e2d2f91cae771c7af7a630a49e755f1eb74f8a46e9f6d5f7a146edf5a37"
 dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
- "zbus_names 4.2.0",
- "zvariant 5.8.0",
- "zvariant_utils 3.2.1",
+ "syn 2.0.114",
+ "zbus_names 4.3.1",
+ "zvariant 5.9.1",
+ "zvariant_utils 3.3.0",
 ]
 
 [[package]]
@@ -8401,34 +8290,33 @@ dependencies = [
 
 [[package]]
 name = "zbus_names"
-version = "4.2.0"
+version = "4.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97"
+checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f"
 dependencies = [
  "serde",
- "static_assertions",
  "winnow 0.7.14",
- "zvariant 5.8.0",
+ "zvariant 5.9.1",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.8.31"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3"
+checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.31"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a"
+checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -8448,7 +8336,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
  "synstructure",
 ]
 
@@ -8463,13 +8351,13 @@ dependencies = [
 
 [[package]]
 name = "zeroize_derive"
-version = "1.4.2"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -8502,9 +8390,15 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
+[[package]]
+name = "zmij"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd8f3f50b848df28f887acb68e41201b5aea6bc8a8dacc00fb40635ff9a72fea"
+
 [[package]]
 name = "zstd"
 version = "0.13.3"
@@ -8548,17 +8442,16 @@ dependencies = [
 
 [[package]]
 name = "zvariant"
-version = "5.8.0"
+version = "5.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2be61892e4f2b1772727be11630a62664a1826b62efa43a6fe7449521cb8744c"
+checksum = "326aaed414f04fe839777b4c443d4e94c74e7b3621093bd9c5e649ac8aa96543"
 dependencies = [
  "endi",
  "enumflags2",
  "serde",
- "url",
  "winnow 0.7.14",
- "zvariant_derive 5.8.0",
- "zvariant_utils 3.2.1",
+ "zvariant_derive 5.9.1",
+ "zvariant_utils 3.3.0",
 ]
 
 [[package]]
@@ -8570,21 +8463,21 @@ dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
  "zvariant_utils 2.1.0",
 ]
 
 [[package]]
 name = "zvariant_derive"
-version = "5.8.0"
+version = "5.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da58575a1b2b20766513b1ec59d8e2e68db2745379f961f86650655e862d2006"
+checksum = "ba44e1f8f4da9e6e2d25d2a60b116ef8b9d0be174a7685e55bb12a99866279a7"
 dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
- "zvariant_utils 3.2.1",
+ "syn 2.0.114",
+ "zvariant_utils 3.3.0",
 ]
 
 [[package]]
@@ -8595,18 +8488,18 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "zvariant_utils"
-version = "3.2.1"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6949d142f89f6916deca2232cf26a8afacf2b9fdc35ce766105e104478be599"
+checksum = "f75c23a64ef8f40f13a6989991e643554d9bef1d682a281160cf0c1bc389c5e9"
 dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.111",
+ "syn 2.0.114",
  "winnow 0.7.14",
 ]
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 24dece56..8648f911 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -63,7 +63,7 @@ rand = "0.9.1"
 rayon = "1.10.0"
 regex = "1.11.1"
 remote = { path = "./remote", version = "0.1.0" }  # remote
-reqwest = { version = "0.12.22", default-features = false, features = [
+reqwest = { version = "0.12.28", default-features = false, features = [
   "blocking",
   "http2",
   "json",
diff --git a/src-tauri/client/src/app_state.rs b/src-tauri/client/src/app_state.rs
index e69de29b..f29e3817 100644
--- a/src-tauri/client/src/app_state.rs
+++ b/src-tauri/client/src/app_state.rs
@@ -0,0 +1,10 @@
+use serde::Serialize;
+
+use crate::{app_status::AppStatus, user::User};
+
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AppState {
+    pub status: AppStatus,
+    pub user: Option<User>
+}
\ No newline at end of file
diff --git a/src-tauri/client/src/lib.rs b/src-tauri/client/src/lib.rs
index cb5afe9a..d7a9ff88 100644
--- a/src-tauri/client/src/lib.rs
+++ b/src-tauri/client/src/lib.rs
@@ -2,3 +2,4 @@ pub mod app_status;
 pub mod autostart;
 pub mod compat;
 pub mod user;
+pub mod app_state;
diff --git a/src-tauri/games/src/collections/collection.rs b/src-tauri/games/src/collections/collection.rs
index 2eef9b2b..b9521d25 100644
--- a/src-tauri/games/src/collections/collection.rs
+++ b/src-tauri/games/src/collections/collection.rs
@@ -12,13 +12,13 @@ pub struct Collection {
     name: String,
     is_default: bool,
     user_id: String,
-    entries: Vec<CollectionObject>,
+    pub entries: Vec<CollectionObject>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Default, Encode, Decode)]
 #[serde(rename_all = "camelCase")]
 pub struct CollectionObject {
     collection_id: String,
-    game_id: String,
+    pub game_id: String,
     game: Game,
 }
diff --git a/src-tauri/games/src/downloads/download_agent.rs b/src-tauri/games/src/downloads/download_agent.rs
index 6f1fbed2..58b8cea2 100644
--- a/src-tauri/games/src/downloads/download_agent.rs
+++ b/src-tauri/games/src/downloads/download_agent.rs
@@ -472,7 +472,7 @@ impl Downloadable for GameDownloadAgent {
             &self.metadata(),
             self.dropdata.base_path.to_string_lossy().to_string(),
             app_handle,
-        ) {
+        ).await {
             Ok(_) => {}
             Err(e) => {
                 error!("could not mark game as complete: {e}");
diff --git a/src-tauri/games/src/downloads/download_logic.rs b/src-tauri/games/src/downloads/download_logic.rs
index c2810dd5..24038881 100644
--- a/src-tauri/games/src/downloads/download_logic.rs
+++ b/src-tauri/games/src/downloads/download_logic.rs
@@ -59,7 +59,7 @@ pub fn download_game_chunk(
     if response.status() != 200 {
         info!("chunk request got status code: {}", response.status());
         let raw_res = response.text().map_err(|e| {
-            ApplicationDownloadError::Communication(RemoteAccessError::FetchError(e.into()))
+            ApplicationDownloadError::Communication(RemoteAccessError::FetchErrorLegacy(e.into()))
         })?;
         info!("{raw_res}");
         if let Ok(err) = serde_json::from_str::<DropServerError>(&raw_res) {
diff --git a/src-tauri/games/src/library.rs b/src-tauri/games/src/library.rs
index bd4ae073..2c99f7ef 100644
--- a/src-tauri/games/src/library.rs
+++ b/src-tauri/games/src/library.rs
@@ -5,8 +5,10 @@ use database::{
 };
 use log::{debug, error, warn};
 use remote::{
-    auth::generate_authorization_header, error::RemoteAccessError, requests::generate_url,
-    utils::DROP_CLIENT_SYNC,
+    auth::generate_authorization_header,
+    error::RemoteAccessError,
+    requests::generate_url,
+    utils::{DROP_CLIENT_ASYNC, DROP_CLIENT_SYNC},
 };
 use serde::{Deserialize, Serialize};
 use std::fs::remove_dir_all;
@@ -193,28 +195,23 @@ pub fn get_current_meta(game_id: &String) -> Option<DownloadableMetadata> {
         .cloned()
 }
 
-pub fn on_game_complete(
+pub async fn on_game_complete(
     meta: &DownloadableMetadata,
     install_dir: String,
     app_handle: &AppHandle,
 ) -> Result<(), RemoteAccessError> {
     // Fetch game version information from remote
-    let client = DROP_CLIENT_SYNC.clone();
     let response = generate_url(
-        &[
-            "/api/v1/client/game",
-            &meta.id,
-            "version",
-            &meta.version,
-        ],
+        &["/api/v1/client/game", &meta.id, "version", &meta.version],
         &[],
     )?;
-    let response = client
+    let response = DROP_CLIENT_ASYNC
         .get(response)
         .header("Authorization", generate_authorization_header())
-        .send()?;
+        .send()
+        .await?;
 
-    let game_version: GameVersion = response.json()?;
+    let game_version: GameVersion = response.json().await?;
 
     let mut handle = borrow_db_mut_checked();
     handle
@@ -230,7 +227,10 @@ pub fn on_game_complete(
 
     drop(handle);
 
-    let setup_configuration = game_version.setups.iter().find(|v| v.platform == meta.target_platform);
+    let setup_configuration = game_version
+        .setups
+        .iter()
+        .find(|v| v.platform == meta.target_platform);
 
     let status = if setup_configuration.is_none() {
         GameDownloadStatus::Installed {
diff --git a/src-tauri/remote/Cargo.toml b/src-tauri/remote/Cargo.toml
index 30b04f8c..3c45f10b 100644
--- a/src-tauri/remote/Cargo.toml
+++ b/src-tauri/remote/Cargo.toml
@@ -4,17 +4,18 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
+async-trait = "0.1.89"
 bitcode = "0.6.7"
 chrono = "0.4.42"
-client = { version = "0.1.0", path = "../client" }
-database = { version = "0.1.0", path = "../database" }
+client = { path = "../client", version = "0.1.0" }
+database = { path = "../database", version = "0.1.0" }
 droplet-rs = "0.7.3"
 gethostname = "1.0.2"
 hex = "0.4.3"
 http = "1.3.1"
 log = "0.4.28"
 md5 = "0.8.0"
-reqwest = { version = "0.12.22", default-features = false, features = [
+reqwest = { version = "0.12.28", default-features = false, features = [
   "blocking",
   "http2",
   "json",
@@ -23,9 +24,10 @@ reqwest = { version = "0.12.22", default-features = false, features = [
   "rustls-tls-native-roots",
   "stream",
 ] }
+reqwest-middleware = { version = "0.4.2", features = ["json"] }
 reqwest-websocket = "0.5.1"
 serde = "1.0.228"
 serde_with = "3.15.0"
 tauri = "*"
 url = "2.5.7"
-utils = { version = "0.1.0", path = "../utils" }
+utils = { path = "../utils", version = "0.1.0" }
diff --git a/src-tauri/remote/src/error.rs b/src-tauri/remote/src/error.rs
index be42b360..8e520355 100644
--- a/src-tauri/remote/src/error.rs
+++ b/src-tauri/remote/src/error.rs
@@ -21,7 +21,8 @@ pub struct DropServerError {
 
 #[derive(Debug, SerializeDisplay)]
 pub enum RemoteAccessError {
-    FetchError(Arc<reqwest::Error>),
+    FetchErrorLegacy(Arc<reqwest::Error>),
+    FetchError(Arc<reqwest_middleware::Error>),
     FetchErrorWS(Arc<reqwest_websocket::Error>),
     ParsingError(ParseError),
     InvalidEndpoint,
@@ -56,6 +57,15 @@ impl Display for RemoteAccessError {
                         .unwrap_or("Unknown error".to_string())
                 )
             }
+            RemoteAccessError::FetchErrorLegacy(error) => write!(
+                f,
+                "{}: {}",
+                error,
+                error
+                    .source()
+                    .map(|v| v.to_string())
+                    .unwrap_or("Unknown error".to_string())
+            ),
             RemoteAccessError::FetchErrorWS(error) => write!(
                 f,
                 "{}: {}",
@@ -99,7 +109,12 @@ impl Display for RemoteAccessError {
 
 impl From<reqwest::Error> for RemoteAccessError {
     fn from(err: reqwest::Error) -> Self {
-        RemoteAccessError::FetchError(Arc::new(err))
+        RemoteAccessError::FetchErrorLegacy(Arc::new(err))
+    }
+}
+impl From<reqwest_middleware::Error> for RemoteAccessError {
+    fn from(value: reqwest_middleware::Error) -> Self {
+        RemoteAccessError::FetchError(Arc::new(value))
     }
 }
 impl From<reqwest_websocket::Error> for RemoteAccessError {
diff --git a/src-tauri/remote/src/lib.rs b/src-tauri/remote/src/lib.rs
index 17f6a04e..45dcc73b 100644
--- a/src-tauri/remote/src/lib.rs
+++ b/src-tauri/remote/src/lib.rs
@@ -1,5 +1,7 @@
 #![feature(slice_as_array)]
 #![feature(slice_concat_trait)]
+#![feature(sync_nonpoison)]
+#![feature(nonpoison_mutex)]
 
 pub mod auth;
 #[macro_use]
diff --git a/src-tauri/remote/src/requests.rs b/src-tauri/remote/src/requests.rs
index 68232a5e..d2fbdf9a 100644
--- a/src-tauri/remote/src/requests.rs
+++ b/src-tauri/remote/src/requests.rs
@@ -1,4 +1,5 @@
 use database::{DB};
+use reqwest_middleware::Error;
 use url::Url;
 
 use crate::{
@@ -20,7 +21,7 @@ pub fn generate_url(
     Ok(base_url)
 }
 
-pub async fn make_authenticated_get(url: Url) -> Result<reqwest::Response, reqwest::Error> {
+pub async fn make_authenticated_get(url: Url) -> Result<reqwest::Response, Error> {
     DROP_CLIENT_ASYNC
         .get(url)
         .header("Authorization", generate_authorization_header())
diff --git a/src-tauri/remote/src/utils.rs b/src-tauri/remote/src/utils.rs
index 283cba0a..625406c2 100644
--- a/src-tauri/remote/src/utils.rs
+++ b/src-tauri/remote/src/utils.rs
@@ -5,10 +5,17 @@ use std::{
     time::Duration,
 };
 
+use client::{app_state::AppState, app_status::AppStatus};
 use database::db::DATA_ROOT_DIR;
+use http::Extensions;
 use log::{debug, info, warn};
 use reqwest::Certificate;
+use reqwest_middleware::{
+    ClientBuilder, ClientWithMiddleware, Error, Middleware, Next, Result,
+    reqwest::{Request, Response},
+};
 use serde::Deserialize;
+use tauri::{AppHandle, Emitter, Manager, async_runtime::Mutex};
 
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -22,9 +29,61 @@ impl DropHealthcheck {
 }
 static DROP_CERT_BUNDLE: LazyLock<Vec<Certificate>> = LazyLock::new(fetch_certificates);
 pub static DROP_CLIENT_SYNC: LazyLock<reqwest::blocking::Client> = LazyLock::new(get_client_sync);
-pub static DROP_CLIENT_ASYNC: LazyLock<reqwest::Client> = LazyLock::new(get_client_async);
+pub static DROP_CLIENT_ASYNC: LazyLock<ClientWithMiddleware> = LazyLock::new(get_client_async);
 pub static DROP_CLIENT_WS_CLIENT: LazyLock<reqwest::Client> = LazyLock::new(get_client_ws);
 
+pub static DROP_APP_HANDLE: LazyLock<Mutex<Option<AppHandle>>> = LazyLock::new(|| Mutex::new(None));
+
+struct AutoOfflineMiddleware;
+
+#[async_trait::async_trait]
+impl Middleware for AutoOfflineMiddleware {
+    async fn handle(
+        &self,
+        req: Request,
+        extensions: &mut Extensions,
+        next: Next<'_>,
+    ) -> Result<Response> {
+        let res = next.run(req, extensions).await;
+        match res {
+            Ok(res) => {
+                tauri::async_runtime::spawn(async move {
+                    let lock = DROP_APP_HANDLE.lock().await;
+                    if let Some(app_handle) = &*lock {
+                        let state = app_handle.state::<std::sync::nonpoison::Mutex<AppState>>();
+                        let mut state_lock = state.lock();
+                        if state_lock.status == AppStatus::Offline {
+                            state_lock.status = AppStatus::SignedIn;
+                            app_handle.emit("update_state", &*state_lock).expect("failed to emit state update");
+                        }
+                    };
+                });
+
+                Ok(res)
+            }
+            Err(err) => match err {
+                Error::Middleware(error) => Err(Error::Middleware(error)),
+                Error::Reqwest(error) => {
+                    if error.is_connect() {
+                        // Spawn to defer this action - the state will most likely be locked
+                        tauri::async_runtime::spawn(async move {
+                            let lock = DROP_APP_HANDLE.lock().await;
+                            if let Some(app_handle) = &*lock {
+                                let state =
+                                    app_handle.state::<std::sync::nonpoison::Mutex<AppState>>();
+                                let mut state_lock = state.lock();
+                                state_lock.status = AppStatus::Offline;
+                                app_handle.emit("update_state", &*state_lock).expect("failed to emit state update");
+                            };
+                        });
+                    };
+                    Err(Error::Reqwest(error))
+                }
+            },
+        }
+    }
+}
+
 fn fetch_certificates() -> Vec<Certificate> {
     let certificate_dir = DATA_ROOT_DIR.join("certificates");
 
@@ -97,17 +156,22 @@ pub fn get_client_sync() -> reqwest::blocking::Client {
         .build()
         .expect("Failed to build synchronous client")
 }
-pub fn get_client_async() -> reqwest::Client {
+pub fn get_client_async() -> ClientWithMiddleware {
     let mut client = reqwest::ClientBuilder::new();
 
     for cert in DROP_CERT_BUNDLE.iter() {
         client = client.add_root_certificate(cert.clone());
     }
-    client
+    let normal_client = client
         .use_rustls_tls()
         .user_agent("Drop Desktop Client")
         .build()
-        .expect("Failed to build asynchronous client")
+        .expect("Failed to build asynchronous client");
+
+    let client = ClientBuilder::new(normal_client)
+        .with(AutoOfflineMiddleware)
+        .build();
+    client
 }
 pub fn get_client_ws() -> reqwest::Client {
     let mut client = reqwest::ClientBuilder::new();
diff --git a/src-tauri/src/client.rs b/src-tauri/src/client.rs
index d93d8d69..4f872559 100644
--- a/src-tauri/src/client.rs
+++ b/src-tauri/src/client.rs
@@ -1,11 +1,13 @@
-use std::sync::nonpoison::Mutex;
+use std::{str::FromStr, sync::nonpoison::Mutex};
 
 use database::{borrow_db_checked, borrow_db_mut_checked};
 use download_manager::DOWNLOAD_MANAGER;
 use log::{debug, error};
+use remote::requests::{generate_url, make_authenticated_get};
 use tauri::AppHandle;
 use tauri_plugin_autostart::ManagerExt;
 use tauri_plugin_opener::OpenerExt;
+use url::Url;
 
 use crate::AppState;
 
@@ -75,3 +77,10 @@ pub fn get_autostart_enabled(app: AppHandle) -> Result<bool, tauri_plugin_autost
 pub fn open_fs(path: String, app_handle: AppHandle) -> Result<(), tauri_plugin_opener::Error> {
     app_handle.opener().open_path(path, None::<&str>)
 }
+
+
+#[tauri::command]
+pub async fn check_online() -> Result<bool, ()> {
+    let online = make_authenticated_get(generate_url(&["/api/v1/"], &[]).unwrap()).await.is_ok();
+    Ok(online)
+}
\ No newline at end of file
diff --git a/src-tauri/src/collections.rs b/src-tauri/src/collections.rs
index 2a1bc2c5..8c31fcff 100644
--- a/src-tauri/src/collections.rs
+++ b/src-tauri/src/collections.rs
@@ -1,8 +1,13 @@
+use std::sync::nonpoison::Mutex;
+
+use client::app_state::AppState;
+use database::{GameDownloadStatus, borrow_db_checked};
 use games::collections::collection::{Collection, Collections};
 use remote::{
     auth::generate_authorization_header,
     cache::{cache_object, get_cached_object},
     error::RemoteAccessError,
+    offline,
     requests::{generate_url, make_authenticated_get},
     utils::DROP_CLIENT_ASYNC,
 };
@@ -10,6 +15,19 @@ use serde_json::json;
 
 #[tauri::command]
 pub async fn fetch_collections(
+    state: tauri::State<'_, Mutex<AppState>>,
+    hard_refresh: Option<bool>,
+) -> Result<Collections, RemoteAccessError> {
+    offline!(
+        state,
+        fetch_collections_online,
+        fetch_collections_offline,
+        hard_refresh
+    )
+    .await
+}
+
+pub async fn fetch_collections_online(
     hard_refresh: Option<bool>,
 ) -> Result<Collections, RemoteAccessError> {
     let do_hard_refresh = hard_refresh.unwrap_or(false);
@@ -28,6 +46,29 @@ pub async fn fetch_collections(
     Ok(collections)
 }
 
+pub async fn fetch_collections_offline(
+    _hard_refresh: Option<bool>,
+) -> Result<Collections, RemoteAccessError> {
+    let mut cached = get_cached_object::<Collections>("collections")?;
+
+    let db_handle = borrow_db_checked();
+
+    for collection in cached.iter_mut() {
+        collection.entries.retain(|v| {
+            matches!(
+                &db_handle
+                    .applications
+                    .game_statuses
+                    .get(&v.game_id)
+                    .unwrap_or(&GameDownloadStatus::Remote {}),
+                GameDownloadStatus::Installed { .. } | GameDownloadStatus::SetupRequired { .. }
+            )
+        });
+    }
+
+    Ok(cached)
+}
+
 #[tauri::command]
 pub async fn fetch_collection(collection_id: String) -> Result<Collection, RemoteAccessError> {
     let response = make_authenticated_get(generate_url(
diff --git a/src-tauri/src/games.rs b/src-tauri/src/games.rs
index d90fcc6e..32cfeadb 100644
--- a/src-tauri/src/games.rs
+++ b/src-tauri/src/games.rs
@@ -67,12 +67,9 @@ pub async fn fetch_library_logic(
 
     let mut games: Vec<Game> = response.json().await?;
 
-    let mut handle = state.lock();
-
     let mut db_handle = borrow_db_mut_checked();
 
     for game in &games {
-        handle.games.insert(game.id().clone(), game.clone());
         if !db_handle.applications.game_statuses.contains_key(game.id()) {
             db_handle
                 .applications
@@ -101,7 +98,6 @@ pub async fn fetch_library_logic(
         games.push(game);
     }
 
-    drop(handle);
     drop(db_handle);
     cache_object("library", &games)?;
 
@@ -133,8 +129,6 @@ pub async fn fetch_game_logic(
     state: tauri::State<'_, Mutex<AppState>>,
 ) -> Result<FetchGameStruct, RemoteAccessError> {
     let version = {
-        let state_handle = state.lock();
-
         let db_lock = borrow_db_checked();
 
         let metadata_option = db_lock.applications.installed_game_version.get(&id);
@@ -148,17 +142,6 @@ pub async fn fetch_game_logic(
                 .cloned(),
         };
 
-        let game = state_handle.games.get(&id);
-        if let Some(game) = game {
-            let status = GameStatusManager::fetch_state(&id, &db_lock);
-
-            let data = FetchGameStruct::new(game.clone(), status, version);
-
-            cache_object_db(&id, game, &db_lock)?;
-
-            return Ok(data);
-        }
-
         version
     };
 
@@ -186,9 +169,6 @@ pub async fn fetch_game_logic(
 
     let game: Game = response.json().await?;
 
-    let mut state_handle = state.lock();
-    state_handle.games.insert(id.clone(), game.clone());
-
     let mut db_handle = borrow_db_mut_checked();
 
     db_handle
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 37bdc855..1586b184 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -12,7 +12,9 @@ use std::{
     sync::nonpoison::Mutex, time::SystemTime,
 };
 
-use ::client::{app_status::AppStatus, autostart::sync_autostart_on_startup, user::User};
+use ::client::{
+    app_state::AppState, app_status::AppStatus, autostart::sync_autostart_on_startup, user::User,
+};
 use ::download_manager::DownloadManagerWrapper;
 use ::games::{library::Game, scan::scan_install_dirs};
 use ::process::ProcessManagerWrapper;
@@ -22,7 +24,7 @@ use ::remote::{
     error::RemoteAccessError,
     fetch_object::fetch_object_wrapper,
     server_proto::handle_server_proto_wrapper,
-    utils::DROP_CLIENT_ASYNC,
+    utils::{DROP_APP_HANDLE, DROP_CLIENT_ASYNC},
 };
 use database::{
     DB, GameDownloadStatus, borrow_db_checked, borrow_db_mut_checked, db::DATA_ROOT_DIR,
@@ -34,7 +36,6 @@ use log4rs::{
     config::{Appender, Root},
     encode::pattern::PatternEncoder,
 };
-use serde::Serialize;
 use tauri::{
     AppHandle, LogicalPosition, LogicalSize, Manager, RunEvent, WebviewBuilder, WebviewUrl,
     WindowBuilder, WindowEvent,
@@ -64,14 +65,6 @@ use process::*;
 use remote::*;
 use settings::*;
 
-#[derive(Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct AppState {
-    status: AppStatus,
-    user: Option<User>,
-    games: HashMap<String, Game>,
-}
-
 async fn setup(handle: AppHandle) -> AppState {
     let logfile = FileAppender::builder()
         .encoder(Box::new(PatternEncoder::new(
@@ -103,8 +96,6 @@ async fn setup(handle: AppHandle) -> AppState {
 
     log4rs::init_config(config).expect("Failed to initialise log4rs");
 
-    let games = HashMap::new();
-
     ProcessManagerWrapper::init(handle.clone());
     DownloadManagerWrapper::init(handle.clone());
 
@@ -117,7 +108,6 @@ async fn setup(handle: AppHandle) -> AppState {
         return AppState {
             status: AppStatus::NotConfigured,
             user: None,
-            games,
         };
     }
 
@@ -179,7 +169,6 @@ async fn setup(handle: AppHandle) -> AppState {
     AppState {
         status: app_status,
         user,
-        games,
     }
 }
 
@@ -242,6 +231,7 @@ pub fn run() {
             use_remote,
             gen_drop_url,
             fetch_drop_object,
+            check_online,
             // Library
             fetch_library,
             fetch_game,
@@ -284,10 +274,16 @@ pub fn run() {
             let handle = app.handle().clone();
 
             tauri::async_runtime::block_on(async move {
-                let state = setup(handle).await;
+                let state = setup(handle.clone()).await;
                 info!("initialized drop client");
                 app.manage(Mutex::new(state));
 
+                let global_app_handle = handle;
+                {
+                    let mut app_handle_lock = DROP_APP_HANDLE.lock().await;
+                    app_handle_lock.replace(global_app_handle);
+                };
+
                 {
                     use tauri_plugin_deep_link::DeepLinkExt;
                     let _ = app.deep_link().register_all();

From a669af5836b8b9552cc6fe1411382ebfebfd2778 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Wed, 14 Jan 2026 22:14:39 +1100
Subject: [PATCH 14/19] feat: dependency popup

---
 main/components/DependencyRequiredModal.vue  | 106 +++++++++++++++++
 main/components/InstallDirectorySelector.vue |  87 ++++++++++++++
 main/components/LibrarySearch.vue            |   2 +-
 main/composables/game.ts                     |  18 ++-
 main/composables/use-object.ts               |   2 +-
 main/pages/library/[id]/index.vue            | 118 +++++--------------
 src-tauri/Cargo.toml                         |   8 ++
 src-tauri/process/src/process_manager.rs     |   3 +-
 src-tauri/src/process.rs                     |  56 +++++----
 9 files changed, 282 insertions(+), 118 deletions(-)
 create mode 100644 main/components/DependencyRequiredModal.vue
 create mode 100644 main/components/InstallDirectorySelector.vue

diff --git a/main/components/DependencyRequiredModal.vue b/main/components/DependencyRequiredModal.vue
new file mode 100644
index 00000000..ab805b65
--- /dev/null
+++ b/main/components/DependencyRequiredModal.vue
@@ -0,0 +1,106 @@
+<template>
+  <ModalTemplate :model-value="true">
+    <template #default
+      ><div class="flex items-start gap-x-3">
+        <img :src="useObject(game.mIconObjectId)" class="size-12" />
+        <div class="mt-3 text-center sm:mt-0 sm:text-left">
+          <h3 class="text-base font-semibold text-zinc-100">
+            Missing required dependency "{{ game.mName }}"
+          </h3>
+          <div class="mt-2">
+            <p class="text-sm text-zinc-400">
+              To launch this game, you need to have "{{ game.mName }}" ({{
+                version.displayName ?? version.versionPath
+              }}) installed.
+            </p>
+          </div>
+        </div>
+      </div>
+      <InstallDirectorySelector
+        :install-dirs="installDirs"
+        v-model="installDir"
+      />
+
+      <div v-if="installError" class="mt-1 rounded-md bg-red-600/10 p-4">
+        <div class="flex">
+          <div class="flex-shrink-0">
+            <XCircleIcon class="h-5 w-5 text-red-600" aria-hidden="true" />
+          </div>
+          <div class="ml-3">
+            <h3 class="text-sm font-medium text-red-600">
+              {{ installError }}
+            </h3>
+          </div>
+        </div>
+      </div>
+    </template>
+    <template #buttons>
+      <LoadingButton
+        @click="() => install()"
+        :loading="installLoading"
+        :disabled="installLoading"
+        type="submit"
+        class="ml-2 w-full sm:w-fit"
+      >
+        Install
+      </LoadingButton>
+      <button
+        type="button"
+        class="mt-3 inline-flex w-full justify-center rounded-md bg-zinc-800 px-3 py-2 text-sm font-semibold text-zinc-100 shadow-sm ring-1 ring-inset ring-zinc-700 hover:bg-zinc-900 sm:mt-0 sm:w-auto"
+        @click="cancel"
+        ref="cancelButtonRef"
+      >
+        Cancel
+      </button>
+    </template>
+  </ModalTemplate>
+</template>
+
+<script setup lang="ts">
+import { invoke } from "@tauri-apps/api/core";
+import { XCircleIcon } from "@heroicons/vue/24/solid";
+
+const model = defineModel<{ gameId: string; versionId: string }>({
+  required: true,
+});
+
+const { game, status } = await useGame(model.value.gameId);
+
+const versionOptions = await invoke<Array<VersionOption>>(
+  "fetch_game_version_options",
+  {
+    gameId: game.id,
+  }
+);
+const version = versionOptions.find(
+  (v) => v.versionId === model.value.versionId
+)!;
+
+const installDirs = await invoke<string[]>("fetch_download_dir_stats");
+const installDir = ref(0);
+
+function cancel() {
+  // @ts-expect-error
+  model.value = undefined;
+}
+
+const installError = ref<string | undefined>();
+const installLoading = ref(false);
+
+async function install() {
+  try {
+    installLoading.value = true;
+    await invoke("download_game", {
+      gameId: game.id,
+      versionId: model.value.versionId,
+      installDir: installDir.value,
+      targetPlatform: version.platform,
+    });
+    cancel();
+  } catch (error) {
+    installError.value = (error as string).toString();
+  }
+
+  installLoading.value = false;
+}
+</script>
diff --git a/main/components/InstallDirectorySelector.vue b/main/components/InstallDirectorySelector.vue
new file mode 100644
index 00000000..9fd8f0e7
--- /dev/null
+++ b/main/components/InstallDirectorySelector.vue
@@ -0,0 +1,87 @@
+<template>
+  <Listbox as="div" v-model="installDir">
+    <ListboxLabel class="block text-sm/6 font-medium text-zinc-100"
+      >Install to</ListboxLabel
+    >
+    <div class="relative mt-2">
+      <ListboxButton
+        class="relative w-full cursor-default rounded-md bg-zinc-800 py-1.5 pl-3 pr-10 text-left text-zinc-100 shadow-sm ring-1 ring-inset ring-zinc-700 focus:outline-none focus:ring-2 focus:ring-blue-600 sm:text-sm/6"
+      >
+        <span class="block truncate">{{ installDirs[installDir] }}</span>
+        <span
+          class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2"
+        >
+          <ChevronUpDownIcon class="h-5 w-5 text-gray-400" aria-hidden="true" />
+        </span>
+      </ListboxButton>
+
+      <transition
+        leave-active-class="transition ease-in duration-100"
+        leave-from-class="opacity-100"
+        leave-to-class="opacity-0"
+      >
+        <ListboxOptions
+          class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-md bg-zinc-900 py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm"
+        >
+          <ListboxOption
+            as="template"
+            v-for="(dir, dirIdx) in installDirs"
+            :key="dir"
+            :value="dirIdx"
+            v-slot="{ active, selected }"
+          >
+            <li
+              :class="[
+                active ? 'bg-blue-600 text-white' : 'text-zinc-300',
+                'relative cursor-default select-none py-2 pl-3 pr-9',
+              ]"
+            >
+              <span
+                :class="[
+                  selected ? 'font-semibold text-zinc-100' : 'font-normal',
+                  'block truncate',
+                ]"
+                >{{ dir }}</span
+              >
+
+              <span
+                v-if="selected"
+                :class="[
+                  active ? 'text-white' : 'text-blue-600',
+                  'absolute inset-y-0 right-0 flex items-center pr-4',
+                ]"
+              >
+                <CheckIcon class="h-5 w-5" aria-hidden="true" />
+              </span>
+            </li>
+          </ListboxOption>
+        </ListboxOptions>
+      </transition>
+    </div>
+    <div class="text-zinc-400 text-sm mt-2">
+      Add more install directories in
+      <PageWidget to="/settings/downloads">
+        <WrenchIcon class="size-3" />
+        Settings
+      </PageWidget>
+    </div>
+  </Listbox>
+</template>
+
+<script setup lang="ts">
+import {
+  Listbox,
+  ListboxButton,
+  ListboxLabel,
+  ListboxOption,
+  ListboxOptions,
+} from "@headlessui/vue";
+import {
+  CheckIcon,
+  ChevronUpDownIcon,
+  WrenchIcon,
+} from "@heroicons/vue/20/solid";
+
+const installDir = defineModel<number>({ required: true });
+const { installDirs } = defineProps<{ installDirs: string[] }>();
+</script>
diff --git a/main/components/LibrarySearch.vue b/main/components/LibrarySearch.vue
index 3dac1e6f..fdc1f236 100644
--- a/main/components/LibrarySearch.vue
+++ b/main/components/LibrarySearch.vue
@@ -141,7 +141,7 @@ const gameStatusTextStyle: { [key in GameStatusEnum]: string } = {
   [GameStatusEnum.Installed]: "text-green-500",
   [GameStatusEnum.Downloading]: "text-zinc-400",
   [GameStatusEnum.Validating]: "text-blue-300",
-  [GameStatusEnum.Running]: "text-green-500",
+  [GameStatusEnum.Running]: "text-blue-500",
   [GameStatusEnum.Remote]: "text-zinc-700",
   [GameStatusEnum.Queued]: "text-zinc-400",
   [GameStatusEnum.Updating]: "text-zinc-400",
diff --git a/main/composables/game.ts b/main/composables/game.ts
index 71319bdf..d413f69a 100644
--- a/main/composables/game.ts
+++ b/main/composables/game.ts
@@ -43,19 +43,18 @@ export const useGame = async (gameId: string) => {
       gameStatusRegistry[gameId] = ref(parseStatus(data.status));
 
       listen(`update_game/${gameId}`, (event) => {
-        console.log(event);
         const payload: {
           status: SerializedGameStatus;
           version?: GameVersion;
         } = event.payload as any;
         gameStatusRegistry[gameId].value = parseStatus(payload.status);
-        
+
         /**
          * I am not super happy about this.
-         * 
+         *
          * This will mean that we will still have a version assigned if we have a game installed then uninstall it.
          * It is necessary because a flag to check if we should overwrite seems excessive, and this function gets called
-         * on transient state updates. 
+         * on transient state updates.
          */
         if (payload.version) {
           gameRegistry[gameId].version = payload.version;
@@ -72,3 +71,14 @@ export const useGame = async (gameId: string) => {
 export type FrontendGameConfiguration = {
   launchString: string;
 };
+
+export type LaunchResult =
+  | { result: "Success" }
+  | { result: "InstallRequired"; data: [string, string] };
+
+export type VersionOption = {
+  versionId: string;
+  displayName?: string;
+  versionPath: string;
+  platform: string;
+};
diff --git a/main/composables/use-object.ts b/main/composables/use-object.ts
index c9c15a08..642fd664 100644
--- a/main/composables/use-object.ts
+++ b/main/composables/use-object.ts
@@ -1,5 +1,5 @@
 import { convertFileSrc } from "@tauri-apps/api/core";
 
-export const useObject = async (id: string) => {
+export const useObject = (id: string) => {
   return convertFileSrc(id, "object");
 };
diff --git a/main/pages/library/[id]/index.vue b/main/pages/library/[id]/index.vue
index 39a6253e..301fc910 100644
--- a/main/pages/library/[id]/index.vue
+++ b/main/pages/library/[id]/index.vue
@@ -284,80 +284,10 @@
           </div>
         </div>
         <div v-if="installDirs">
-          <Listbox as="div" v-model="installDir">
-            <ListboxLabel class="block text-sm/6 font-medium text-zinc-100"
-              >Install to</ListboxLabel
-            >
-            <div class="relative mt-2">
-              <ListboxButton
-                class="relative w-full cursor-default rounded-md bg-zinc-800 py-1.5 pl-3 pr-10 text-left text-zinc-100 shadow-sm ring-1 ring-inset ring-zinc-700 focus:outline-none focus:ring-2 focus:ring-blue-600 sm:text-sm/6"
-              >
-                <span class="block truncate">{{
-                  installDirs[installDir]
-                }}</span>
-                <span
-                  class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2"
-                >
-                  <ChevronUpDownIcon
-                    class="h-5 w-5 text-gray-400"
-                    aria-hidden="true"
-                  />
-                </span>
-              </ListboxButton>
-
-              <transition
-                leave-active-class="transition ease-in duration-100"
-                leave-from-class="opacity-100"
-                leave-to-class="opacity-0"
-              >
-                <ListboxOptions
-                  class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-md bg-zinc-900 py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm"
-                >
-                  <ListboxOption
-                    as="template"
-                    v-for="(dir, dirIdx) in installDirs"
-                    :key="dir"
-                    :value="dirIdx"
-                    v-slot="{ active, selected }"
-                  >
-                    <li
-                      :class="[
-                        active ? 'bg-blue-600 text-white' : 'text-zinc-300',
-                        'relative cursor-default select-none py-2 pl-3 pr-9',
-                      ]"
-                    >
-                      <span
-                        :class="[
-                          selected
-                            ? 'font-semibold text-zinc-100'
-                            : 'font-normal',
-                          'block truncate',
-                        ]"
-                        >{{ dir }}</span
-                      >
-
-                      <span
-                        v-if="selected"
-                        :class="[
-                          active ? 'text-white' : 'text-blue-600',
-                          'absolute inset-y-0 right-0 flex items-center pr-4',
-                        ]"
-                      >
-                        <CheckIcon class="h-5 w-5" aria-hidden="true" />
-                      </span>
-                    </li>
-                  </ListboxOption>
-                </ListboxOptions>
-              </transition>
-            </div>
-            <div class="text-zinc-400 text-sm mt-2">
-              Add more install directories in
-              <PageWidget to="/settings/downloads">
-                <WrenchIcon class="size-3" />
-                Settings
-              </PageWidget>
-            </div>
-          </Listbox>
+          <InstallDirectorySelector
+            :install-dirs="installDirs"
+            v-model="installDir"
+          />
         </div>
       </form>
 
@@ -413,7 +343,10 @@
 
       <ol class="space-y-2">
         <li v-for="(launchData, launchIdx) in launchOptions!">
-          <button class="transition w-full rounded-sm bg-zinc-800 inline-flex items-center text-sm py-2 px-3 gap-x-2 text-zinc-100 hover:text-zinc-300 hover:bg-zinc-700" @click="() => launchIndex(launchIdx)">
+          <button
+            class="transition w-full rounded-sm bg-zinc-800 inline-flex items-center text-sm py-2 px-3 gap-x-2 text-zinc-100 hover:text-zinc-300 hover:bg-zinc-700"
+            @click="() => launchIndex(launchIdx)"
+          >
             <PlayIcon class="size-4" />
             <span>
               {{ launchData.name }}
@@ -512,6 +445,11 @@
       </div>
     </div>
   </Transition>
+
+  <DependencyRequiredModal
+    v-if="dependencyRequiredModal"
+    v-model="dependencyRequiredModal"
+  />
 </template>
 
 <script setup lang="ts">
@@ -563,15 +501,7 @@ const mediaUrls = await Promise.all(
 const htmlDescription = micromark(game.value.mDescription);
 
 const installFlowOpen = ref(false);
-const versionOptions = ref<
-  | undefined
-  | Array<{
-      versionId: string;
-      displayName?: string;
-      versionPath: string;
-      platform: string;
-    }>
->();
+const versionOptions = ref<undefined | Array<VersionOption>>();
 const installDirs = ref<undefined | Array<string>>();
 const currentImageIndex = ref(0);
 
@@ -628,7 +558,7 @@ const launchOptions = ref<Array<{ name: string }> | undefined>(undefined);
 const launchOptionsOpen = computed(() => launchOptions.value !== undefined);
 
 async function launch() {
-  if(status.value.type == GameStatusEnum.SetupRequired) {
+  if (status.value.type == GameStatusEnum.SetupRequired) {
     await launchIndex(0);
     return;
   }
@@ -637,7 +567,7 @@ async function launch() {
       "get_launch_options",
       { id: game.value.id }
     );
-    if(fetchedLaunchOptions.length == 1) {
+    if (fetchedLaunchOptions.length == 1) {
       await launchIndex(0);
       return;
     }
@@ -656,10 +586,23 @@ async function launch() {
   }
 }
 
+const dependencyRequiredModal = ref<
+  { gameId: string; versionId: string } | undefined
+>(undefined);
+
 async function launchIndex(index: number) {
   launchOptions.value = undefined;
   try {
-    await invoke("launch_game", { id: game.value.id, index });
+    const result = await invoke<LaunchResult>("launch_game", {
+      id: game.value.id,
+      index,
+    });
+    if (result.result == "InstallRequired") {
+      dependencyRequiredModal.value = {
+        gameId: result.data[0],
+        versionId: result.data[1],
+      };
+    }
   } catch (e) {
     createModal(
       ModalType.Notification,
@@ -670,7 +613,6 @@ async function launchIndex(index: number) {
       },
       (e, c) => c()
     );
-    console.error(e);
   }
 }
 
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 8648f911..acb4ac66 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -140,3 +140,11 @@ tauri-plugin-single-instance = { version = "2.0.0", features = ["deep-link"] }
 lto = true
 panic = "abort"
 codegen-units = 1
+
+[profile.dev.package."*"]
+# Set the default for dependencies in Development mode.
+opt-level = 3
+
+[profile.dev]
+# Turn on a small amount of optimisation in Development mode.
+opt-level = 1
\ No newline at end of file
diff --git a/src-tauri/process/src/process_manager.rs b/src-tauri/process/src/process_manager.rs
index ee30837a..6345d756 100644
--- a/src-tauri/process/src/process_manager.rs
+++ b/src-tauri/process/src/process_manager.rs
@@ -99,7 +99,8 @@ impl ProcessManager<'_> {
             Some(process) => {
                 process.manually_killed = true;
                 process.handle.kill()?;
-                process.handle.wait()?;
+                let exit_status = process.handle.wait()?;
+                info!("exit status: {:?}", exit_status);
                 Ok(())
             }
             None => Err(io::Error::new(
diff --git a/src-tauri/src/process.rs b/src-tauri/src/process.rs
index 273974f8..160b1509 100644
--- a/src-tauri/src/process.rs
+++ b/src-tauri/src/process.rs
@@ -1,6 +1,11 @@
 use std::sync::{Arc, nonpoison::Mutex};
 
-use process::{PROCESS_MANAGER, error::ProcessError, process_manager::{LaunchOption, ProcessManager}};
+use process::{
+    PROCESS_MANAGER,
+    error::ProcessError,
+    process_manager::{LaunchOption, ProcessManager},
+};
+use serde::Serialize;
 use tauri::AppHandle;
 use tauri_plugin_opener::OpenerExt;
 
@@ -13,36 +18,41 @@ pub fn get_launch_options(id: String) -> Result<Vec<LaunchOption>, ProcessError>
     Ok(launch_options)
 }
 
+#[derive(Serialize)]
+#[serde(tag = "result", content = "data")]
+pub enum LaunchResult {
+    Success,
+    InstallRequired(String, String),
+}
+
 #[tauri::command]
-pub fn launch_game(
-    id: String,
-    index: usize,
-    state: tauri::State<'_, Mutex<AppState>>,
-) -> Result<(), ProcessError> {
-    let state_lock = state.lock();
-    let mut process_manager_lock = PROCESS_MANAGER.lock();
-    //let meta = DownloadableMetadata {
-    //    id,
-    //    version: Some(version),
-    //    download_type: DownloadType::Game,
-    //};
-
-    match process_manager_lock.launch_process(id, index) {
-        Ok(()) => {}
-        Err(e) => return Err(e),
+pub fn launch_game(id: String, index: usize) -> Result<LaunchResult, ProcessError> {
+    let result = {
+        let mut process_manager_lock = PROCESS_MANAGER.lock();
+
+        process_manager_lock.launch_process(id, index)
+    };
+
+    if let Err(err) = &result {
+        match err {
+            ProcessError::RequiredDependency(game_id, version_id) => {
+                return Ok(LaunchResult::InstallRequired(
+                    game_id.to_string(),
+                    version_id.to_string(),
+                ));
+            }
+            _ => (),
+        };
     }
 
-    drop(process_manager_lock);
-    drop(state_lock);
+    result?;
 
-    Ok(())
+    Ok(LaunchResult::Success)
 }
 
 #[tauri::command]
 pub fn kill_game(game_id: String) -> Result<(), ProcessError> {
-    Ok(PROCESS_MANAGER
-        .lock()
-        .kill_game(game_id)?)
+    Ok(PROCESS_MANAGER.lock().kill_game(game_id)?)
 }
 
 #[tauri::command]

From f3d3fde52a49cc72843b29e4240f14e1332365ca Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Wed, 14 Jan 2026 23:24:04 +1100
Subject: [PATCH 15/19] fix: cancelation and resuming issues

---
 .../src/download_manager_builder.rs           | 25 ++++++++++++-------
 .../src/download_manager_frontend.rs          |  1 +
 .../download_manager/src/downloadable.rs      |  4 +--
 .../games/src/downloads/download_agent.rs     | 18 ++++++++++---
 src-tauri/games/src/downloads/drop_data.rs    |  6 ++---
 src-tauri/games/src/scan.rs                   |  4 +--
 src-tauri/src/client.rs                       |  3 +--
 src-tauri/src/downloads.rs                    |  7 ++++--
 src-tauri/src/games.rs                        | 12 ++++-----
 src-tauri/src/lib.rs                          |  6 ++---
 src-tauri/src/process.rs                      | 21 ++++++----------
 11 files changed, 61 insertions(+), 46 deletions(-)

diff --git a/src-tauri/download_manager/src/download_manager_builder.rs b/src-tauri/download_manager/src/download_manager_builder.rs
index cb6cf3aa..835b71d7 100644
--- a/src-tauri/download_manager/src/download_manager_builder.rs
+++ b/src-tauri/download_manager/src/download_manager_builder.rs
@@ -1,5 +1,6 @@
 use std::{
     collections::HashMap,
+    fmt::Debug,
     sync::{Arc, Mutex},
 };
 
@@ -138,14 +139,15 @@ impl DownloadManagerBuilder {
         self.set_status(DownloadManagerStatus::Paused);
         if let Some(current_flag) = &self.active_control_flag {
             current_flag.set(DownloadThreadControlFlag::Stop);
-        }
 
-        if let Some(current_download_thread) = {
-            let mut download_thread_lock = lock!(self.current_download_thread);
-            download_thread_lock.take()
-        } {
-            return current_download_thread.await.is_ok();
-        };
+            if let Some(current_download_thread) = {
+                let mut download_thread_lock = lock!(self.current_download_thread);
+                download_thread_lock.take()
+            } {
+                
+                return current_download_thread.await.is_ok();
+            };
+        }
 
         true
     }
@@ -265,11 +267,15 @@ impl DownloadManagerBuilder {
                         return;
                     }
                 };
-
+                
                 // If the download gets canceled
                 // immediately return, on_cancelled gets called for us earlier
                 if !download_result {
-                    return;
+                    /*
+                     * This seems to cause a really weird bug, where sometimes if you cancel the download
+                     * mid-download it never actually exists or something? Like the JoinHandle doesn't join?
+                     */
+                    //return;
                 }
 
                 if download_agent.control_flag().get() == DownloadThreadControlFlag::Stop {
@@ -353,6 +359,7 @@ impl DownloadManagerBuilder {
             self.set_status(DownloadManagerStatus::Paused);
             current_download.on_cancelled(&self.app_handle);
             self.stop_and_wait_current_download().await;
+            self.set_status(DownloadManagerStatus::Empty);
 
             self.download_queue.pop_front();
 
diff --git a/src-tauri/download_manager/src/download_manager_frontend.rs b/src-tauri/download_manager/src/download_manager_frontend.rs
index 846d2adc..6c30415e 100644
--- a/src-tauri/download_manager/src/download_manager_frontend.rs
+++ b/src-tauri/download_manager/src/download_manager_frontend.rs
@@ -19,6 +19,7 @@ use super::{
     util::queue::Queue,
 };
 
+#[derive(Debug)]
 pub enum DownloadManagerSignal {
     /// Resumes (or starts) the `DownloadManager`
     Go,
diff --git a/src-tauri/download_manager/src/downloadable.rs b/src-tauri/download_manager/src/downloadable.rs
index de5104bd..908399f8 100644
--- a/src-tauri/download_manager/src/downloadable.rs
+++ b/src-tauri/download_manager/src/downloadable.rs
@@ -1,4 +1,4 @@
-use std::sync::Arc;
+use std::{fmt::Debug, sync::Arc};
 
 use async_trait::async_trait;
 use database::DownloadableMetadata;
@@ -18,7 +18,7 @@ use super::{
  * But the download manager manages the queue state
  */
 #[async_trait]
-pub trait Downloadable: Send + Sync {
+pub trait Downloadable: Send + Sync + Debug {
     async fn download(&self, app_handle: &AppHandle) -> Result<bool, ApplicationDownloadError>;
     fn validate(&self, app_handle: &AppHandle) -> Result<bool, ApplicationDownloadError>;
 
diff --git a/src-tauri/games/src/downloads/download_agent.rs b/src-tauri/games/src/downloads/download_agent.rs
index 58b8cea2..b6897d99 100644
--- a/src-tauri/games/src/downloads/download_agent.rs
+++ b/src-tauri/games/src/downloads/download_agent.rs
@@ -17,6 +17,7 @@ use remote::error::RemoteAccessError;
 use remote::requests::generate_url;
 use remote::utils::DROP_CLIENT_ASYNC;
 use std::collections::HashMap;
+use std::fmt::Debug;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex};
 use std::time::Instant;
@@ -37,7 +38,6 @@ static RETRY_COUNT: usize = 3;
 pub struct GameDownloadAgent {
     pub metadata: DownloadableMetadata,
     pub control_flag: DownloadThreadControl,
-    context_map: Mutex<HashMap<String, bool>>,
     pub manifest: Mutex<Option<Manifest>>,
     pub progress: Arc<ProgressObject>,
     sender: Sender<DownloadManagerSignal>,
@@ -45,6 +45,12 @@ pub struct GameDownloadAgent {
     status: Mutex<DownloadStatus>,
 }
 
+impl Debug for GameDownloadAgent {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("GameDownloadAgent").finish()
+    }
+}
+
 impl GameDownloadAgent {
     pub async fn new_from_index(
         metadata: DownloadableMetadata,
@@ -68,16 +74,19 @@ impl GameDownloadAgent {
         let control_flag = DownloadThreadControl::new(DownloadThreadControlFlag::Stop);
 
         let base_dir_path = Path::new(&base_dir);
+        info!("base dir {}", base_dir_path.display() );
         let data_base_dir_path = base_dir_path.join(metadata.id.clone());
+        info!("data dir path {}", data_base_dir_path.display());
 
         let stored_manifest =
             DropData::generate(metadata.id.clone(), metadata.version.clone(), metadata.target_platform, data_base_dir_path.clone());
 
+            info!("starting download with {} completed", stored_manifest.get_contexts().len());
+
         let result = Self {
             metadata,
             control_flag,
             manifest: Mutex::new(None),
-            context_map: Mutex::new(stored_manifest.get_contexts()),
             progress: Arc::new(ProgressObject::new(0, 0, sender.clone())),
             sender,
             dropdata: stored_manifest,
@@ -210,7 +219,7 @@ impl GameDownloadAgent {
         };
         let chunk_len = chunks.len();
         let mut completed_chunks = {
-            let completed_chunks = lock!(self.context_map);
+            let completed_chunks = lock!(self.dropdata.contexts);
             completed_chunks.clone()
         };
         let max_download_threads = borrow_db_checked().settings.max_download_threads;
@@ -308,6 +317,8 @@ impl GameDownloadAgent {
         self.dropdata.set_contexts(&drop_data_chunks);
         self.dropdata.write();
 
+        info!("completed {} chunks", drop_data_chunks.len());
+
         // If there are any contexts left which are false
         if completed_chunks.len() != chunk_len {
             info!(
@@ -485,7 +496,6 @@ impl Downloadable for GameDownloadAgent {
     }
 
     fn on_cancelled(&self, app_handle: &tauri::AppHandle) {
-        info!("cancelled {}", self.metadata.id);
         self.cancel(app_handle);
     }
 
diff --git a/src-tauri/games/src/downloads/drop_data.rs b/src-tauri/games/src/downloads/drop_data.rs
index eb59b0b2..9d7208a9 100644
--- a/src-tauri/games/src/downloads/drop_data.rs
+++ b/src-tauri/games/src/downloads/drop_data.rs
@@ -12,7 +12,7 @@ use utils::lock;
 
 pub type DropData = v1::DropData;
 
-pub static DROP_DATA_PATH: &str = ".dropdata";
+pub static DROPDATA_PATH: &str = ".dropdata";
 
 pub mod v1 {
     use std::{collections::HashMap, path::PathBuf, sync::Mutex};
@@ -52,7 +52,7 @@ impl DropData {
         }
     }
     pub fn read(base_path: &Path) -> Result<Self, io::Error> {
-        let mut file = File::open(base_path.join(DROP_DATA_PATH))?;
+        let mut file = File::open(base_path.join(DROPDATA_PATH))?;
 
         let mut s = Vec::new();
         file.read_to_end(&mut s)?;
@@ -70,7 +70,7 @@ impl DropData {
             Err(_) => return,
         };
 
-        let mut file = match File::create(self.base_path.join(DROP_DATA_PATH)) {
+        let mut file = match File::create(self.base_path.join(DROPDATA_PATH)) {
             Ok(file) => file,
             Err(e) => {
                 error!("{e}");
diff --git a/src-tauri/games/src/scan.rs b/src-tauri/games/src/scan.rs
index 163c3fcc..b34e87a6 100644
--- a/src-tauri/games/src/scan.rs
+++ b/src-tauri/games/src/scan.rs
@@ -4,7 +4,7 @@ use database::{DownloadType, DownloadableMetadata, borrow_db_mut_checked};
 use log::warn;
 
 use crate::{
-    downloads::drop_data::{DROP_DATA_PATH, DropData},
+    downloads::drop_data::{DROPDATA_PATH, DropData},
     library::set_partially_installed_db,
 };
 
@@ -15,7 +15,7 @@ pub fn scan_install_dirs() {
             continue;
         };
         for game in files.into_iter().flatten() {
-            let drop_data_file = game.path().join(DROP_DATA_PATH);
+            let drop_data_file = game.path().join(DROPDATA_PATH);
             if !drop_data_file.exists() {
                 continue;
             }
diff --git a/src-tauri/src/client.rs b/src-tauri/src/client.rs
index 4f872559..8e14a3c4 100644
--- a/src-tauri/src/client.rs
+++ b/src-tauri/src/client.rs
@@ -1,4 +1,4 @@
-use std::{str::FromStr, sync::nonpoison::Mutex};
+use std::sync::nonpoison::Mutex;
 
 use database::{borrow_db_checked, borrow_db_mut_checked};
 use download_manager::DOWNLOAD_MANAGER;
@@ -7,7 +7,6 @@ use remote::requests::{generate_url, make_authenticated_get};
 use tauri::AppHandle;
 use tauri_plugin_autostart::ManagerExt;
 use tauri_plugin_opener::OpenerExt;
-use url::Url;
 
 use crate::AppState;
 
diff --git a/src-tauri/src/downloads.rs b/src-tauri/src/downloads.rs
index 2ca34681..2c4bcfaa 100644
--- a/src-tauri/src/downloads.rs
+++ b/src-tauri/src/downloads.rs
@@ -1,4 +1,4 @@
-use std::sync::Arc;
+use std::{path::PathBuf, sync::Arc};
 
 use database::{
     DownloadType, DownloadableMetadata, GameDownloadStatus, borrow_db_checked, platform::Platform,
@@ -68,8 +68,11 @@ pub async fn resume_download(game_id: String) -> Result<(), ApplicationDownloadE
 
     let sender = DOWNLOAD_MANAGER.get_sender();
 
+    let install_dir = PathBuf::from(install_dir);
+    let install_dir = install_dir.parent().expect("game somehow installed at root");
+
     let game_download_agent = Arc::new(Box::new(
-        GameDownloadAgent::new(meta, install_dir.into(), sender).await?,
+        GameDownloadAgent::new(meta, install_dir.to_path_buf(), sender).await?,
     ) as Box<dyn Downloadable + Send + Sync>);
 
     DOWNLOAD_MANAGER
diff --git a/src-tauri/src/games.rs b/src-tauri/src/games.rs
index 32cfeadb..42bec93f 100644
--- a/src-tauri/src/games.rs
+++ b/src-tauri/src/games.rs
@@ -8,11 +8,11 @@ use games::{
     library::{FetchGameStruct, FrontendGameOptions, Game, get_current_meta, uninstall_game_logic},
     state::{GameStatusManager, GameStatusWithTransient},
 };
-use log::{info, warn};
+use log::warn;
 use process::PROCESS_MANAGER;
 use remote::{
     auth::generate_authorization_header,
-    cache::{cache_object, cache_object_db, get_cached_object, get_cached_object_db},
+    cache::{cache_object, get_cached_object, get_cached_object_db},
     error::{DropServerError, RemoteAccessError},
     offline,
     requests::generate_url,
@@ -132,7 +132,9 @@ pub async fn fetch_game_logic(
         let db_lock = borrow_db_checked();
 
         let metadata_option = db_lock.applications.installed_game_version.get(&id);
-        let version = match metadata_option {
+        
+
+        match metadata_option {
             None => None,
             Some(metadata) => db_lock
                 .applications
@@ -140,9 +142,7 @@ pub async fn fetch_game_logic(
                 .get(&metadata.id)
                 .map(|v| v.get(&metadata.version).unwrap())
                 .cloned(),
-        };
-
-        version
+        }
     };
 
     let client = DROP_CLIENT_ASYNC.clone();
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 1586b184..3892b1f8 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -8,15 +8,15 @@
 #![deny(clippy::all)]
 
 use std::{
-    collections::HashMap, env, fs::File, io::Write, panic::PanicHookInfo, path::Path, str::FromStr,
+    env, fs::File, io::Write, panic::PanicHookInfo, path::Path, str::FromStr,
     sync::nonpoison::Mutex, time::SystemTime,
 };
 
 use ::client::{
-    app_state::AppState, app_status::AppStatus, autostart::sync_autostart_on_startup, user::User,
+    app_state::AppState, app_status::AppStatus, autostart::sync_autostart_on_startup,
 };
 use ::download_manager::DownloadManagerWrapper;
-use ::games::{library::Game, scan::scan_install_dirs};
+use ::games::scan::scan_install_dirs;
 use ::process::ProcessManagerWrapper;
 use ::remote::{
     auth::{self, HandshakeRequestBody, HandshakeResponse, generate_authorization_header},
diff --git a/src-tauri/src/process.rs b/src-tauri/src/process.rs
index 160b1509..6875990b 100644
--- a/src-tauri/src/process.rs
+++ b/src-tauri/src/process.rs
@@ -1,4 +1,4 @@
-use std::sync::{Arc, nonpoison::Mutex};
+use std::sync::Arc;
 
 use process::{
     PROCESS_MANAGER,
@@ -9,8 +9,6 @@ use serde::Serialize;
 use tauri::AppHandle;
 use tauri_plugin_opener::OpenerExt;
 
-use crate::AppState;
-
 #[tauri::command]
 pub fn get_launch_options(id: String) -> Result<Vec<LaunchOption>, ProcessError> {
     let launch_options = ProcessManager::get_launch_options(id)?;
@@ -33,16 +31,13 @@ pub fn launch_game(id: String, index: usize) -> Result<LaunchResult, ProcessErro
         process_manager_lock.launch_process(id, index)
     };
 
-    if let Err(err) = &result {
-        match err {
-            ProcessError::RequiredDependency(game_id, version_id) => {
-                return Ok(LaunchResult::InstallRequired(
-                    game_id.to_string(),
-                    version_id.to_string(),
-                ));
-            }
-            _ => (),
-        };
+    if let Err(err) = &result
+        && let ProcessError::RequiredDependency(game_id, version_id) = err
+    {
+        return Ok(LaunchResult::InstallRequired(
+            game_id.to_string(),
+            version_id.to_string(),
+        ));
     }
 
     result?;

From 4955b4f0c12cacd700e7464de8e1a03a2ffc2de6 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Wed, 14 Jan 2026 23:35:56 +1100
Subject: [PATCH 16/19] feat: dedup by platform

---
 src-tauri/src/games.rs | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src-tauri/src/games.rs b/src-tauri/src/games.rs
index 42bec93f..4aebbb1d 100644
--- a/src-tauri/src/games.rs
+++ b/src-tauri/src/games.rs
@@ -8,11 +8,11 @@ use games::{
     library::{FetchGameStruct, FrontendGameOptions, Game, get_current_meta, uninstall_game_logic},
     state::{GameStatusManager, GameStatusWithTransient},
 };
-use log::warn;
+use log::{info, warn};
 use process::PROCESS_MANAGER;
 use remote::{
     auth::generate_authorization_header,
-    cache::{cache_object, get_cached_object, get_cached_object_db},
+    cache::{cache_object, cache_object_db, get_cached_object, get_cached_object_db},
     error::{DropServerError, RemoteAccessError},
     offline,
     requests::generate_url,
@@ -132,9 +132,7 @@ pub async fn fetch_game_logic(
         let db_lock = borrow_db_checked();
 
         let metadata_option = db_lock.applications.installed_game_version.get(&id);
-        
-
-        match metadata_option {
+        let version = match metadata_option {
             None => None,
             Some(metadata) => db_lock
                 .applications
@@ -142,7 +140,9 @@ pub async fn fetch_game_logic(
                 .get(&metadata.id)
                 .map(|v| v.get(&metadata.version).unwrap())
                 .cloned(),
-        }
+        };
+
+        version
     };
 
     let client = DROP_CLIENT_ASYNC.clone();
@@ -194,7 +194,7 @@ pub struct VersionDownloadOption {
     version_id: String,
     display_name: Option<String>,
     version_path: String,
-    platform: Platform,
+    pub platform: Platform,
 }
 
 pub async fn fetch_game_version_options_logic(
@@ -220,18 +220,23 @@ pub async fn fetch_game_version_options_logic(
 
     let state_lock = state.lock();
     let process_manager_lock = PROCESS_MANAGER.lock();
-    let data = data
+    let data: Vec<VersionDownloadOption> = data
         .into_iter()
         .flat_map(|v| {
-            v.launches.into_iter().map(move |l| VersionDownloadOption {
-                version_id: v.version_id.clone(),
-                display_name: v.display_name.clone(),
-                version_path: v.version_path.clone(),
-                platform: l.platform,
-            })
+            let mut launches_tmp = v.launches;
+            launches_tmp.dedup_by_key(|v| v.platform);
+            launches_tmp
+                .into_iter()
+                .map(move |l| VersionDownloadOption {
+                    version_id: v.version_id.clone(),
+                    display_name: v.display_name.clone(),
+                    version_path: v.version_path.clone(),
+                    platform: l.platform,
+                })
         })
         .filter(|v| process_manager_lock.valid_platform(&v.platform))
         .collect();
+    //data.dedup_by_key(|v| v.platform);
     drop(process_manager_lock);
     drop(state_lock);
 

From b6183b095cafee5011bc9ec9c64a175d35cb6296 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Thu, 15 Jan 2026 13:51:34 +1100
Subject: [PATCH 17/19] feat: new ui for additional components and fix dl
 manager clog

---
 main/composables/downloads.ts                 | 16 ++++-
 main/composables/game.ts                      |  6 ++
 main/pages/library/[id]/index.vue             | 65 ++++++++++++++++++-
 main/pages/queue.vue                          | 14 ----
 .../src/download_manager_builder.rs           | 32 +++++----
 src-tauri/src/games.rs                        | 32 +++++----
 6 files changed, 115 insertions(+), 50 deletions(-)

diff --git a/main/composables/downloads.ts b/main/composables/downloads.ts
index f9ab1cd8..741b1f14 100644
--- a/main/composables/downloads.ts
+++ b/main/composables/downloads.ts
@@ -33,4 +33,18 @@ listen("update_stats", (event) => {
   stats.value = event.payload as StatsState;
 });
 
-export const useDownloadHistory = () => useState<Array<number>>('history', () => []);
\ No newline at end of file
+export const useDownloadHistory = () => useState<Array<number>>('history', () => []);
+
+export function formatKilobytes(bytes: number): string {
+  const units = ["K", "M", "G", "T", "P"];
+  let value = bytes;
+  let unitIndex = 0;
+  const scalar = 1000;
+
+  while (value >= scalar && unitIndex < units.length - 1) {
+    value /= scalar;
+    unitIndex++;
+  }
+
+  return `${value.toFixed(1)} ${units[unitIndex]}`;
+}
\ No newline at end of file
diff --git a/main/composables/game.ts b/main/composables/game.ts
index d413f69a..e3e2bbee 100644
--- a/main/composables/game.ts
+++ b/main/composables/game.ts
@@ -81,4 +81,10 @@ export type VersionOption = {
   displayName?: string;
   versionPath: string;
   platform: string;
+  requiredContent: Array<{
+    name: string;
+    iconObjectId: string;
+    shortDescription: string;
+    size: number;
+  }>;
 };
diff --git a/main/pages/library/[id]/index.vue b/main/pages/library/[id]/index.vue
index 301fc910..bebb1f4e 100644
--- a/main/pages/library/[id]/index.vue
+++ b/main/pages/library/[id]/index.vue
@@ -289,6 +289,68 @@
             v-model="installDir"
           />
         </div>
+        <div
+          v-if="
+            versionOptions?.[installVersionIndex]?.requiredContent &&
+            versionOptions[installVersionIndex].requiredContent.length > 0
+          "
+        >
+          <div class="flex items-center justify-between gap-x-8">
+            <span class="flex grow flex-col">
+              <label
+                id="install-extra-label"
+                class="text-sm/6 font-medium text-zinc-100"
+                >Install required components?</label
+              >
+              <span id="install-extra-description" class="text-sm text-zinc-400"
+                >Additional content is required to run this game. Queue for
+                download automatically?</span
+              >
+            </span>
+            <div
+              :class="[
+                'group relative inline-flex w-11 shrink-0 rounded-full p-0.5 inset-ring inset-ring-zinc-100/5 outline-offset-2 outline-blue-600 transition-colors duration-200 ease-in-out has-focus-visible:outline-2',
+                installExtra ? 'bg-blue-600' : 'bg-zinc-800',
+              ]"
+            >
+              <span
+                :class="[
+                  installExtra ? 'translate-x-5' : '',
+                  'size-5 rounded-full bg-white shadow-xs ring-1 ring-zinc-100/5 transition-transform duration-200 ease-in-out',
+                ]"
+              />
+              <input
+                id="install-extra"
+                v-model="installExtra"
+                type="checkbox"
+                class="w-auto h-auto opacity-0 absolute inset-0 focus:outline-hidden"
+                name="install-extra"
+                aria-labelledby="install-extra-label"
+                aria-describedby="install-extra-description"
+              />
+            </div>
+          </div>
+          <ul class="grid grid-cols-2 mt-2 gap-2">
+            <li
+              v-for="content in versionOptions[installVersionIndex]
+                .requiredContent"
+              :key="content.name"
+              class="inline-flex items-start gap-2 bg-zinc-950/50 rounded-md p-2"
+            >
+              <img :src="useObject(content.iconObjectId)" class="size-8" />
+              <div class="flex flex-col">
+                <h1 class="text-zinc-100 font-bold">{{ content.name }}</h1>
+                <p class="text-zinc-400 text-xs">
+                  {{ content.shortDescription }}
+                </p>
+                <span class="text-zinc-400 text-xs inline-flex gap-x-1">
+                  {{ formatKilobytes(content.size / 1024) }}B
+                  <ServerIcon class="size-3" />
+                </span>
+              </div>
+            </li>
+          </ul>
+        </div>
       </form>
 
       <div v-if="installError" class="mt-1 rounded-md bg-red-600/10 p-4">
@@ -472,7 +534,7 @@ import {
   PlayIcon,
 } from "@heroicons/vue/20/solid";
 import { BuildingStorefrontIcon } from "@heroicons/vue/24/outline";
-import { XCircleIcon } from "@heroicons/vue/24/solid";
+import { ServerIcon, XCircleIcon } from "@heroicons/vue/24/solid";
 import { invoke } from "@tauri-apps/api/core";
 import { micromark } from "micromark";
 import { GameStatusEnum } from "~/types";
@@ -527,6 +589,7 @@ const installLoading = ref(false);
 const installError = ref<string | undefined>();
 const installVersionIndex = ref(0);
 const installDir = ref(0);
+const installExtra = ref(true);
 async function install() {
   try {
     if (!versionOptions.value) throw new Error("Versions have not been loaded");
diff --git a/main/pages/queue.vue b/main/pages/queue.vue
index eb934963..005662ec 100644
--- a/main/pages/queue.vue
+++ b/main/pages/queue.vue
@@ -184,20 +184,6 @@ async function cancelGame(meta: DownloadableMetadata) {
   await invoke("cancel_game", { meta });
 }
 
-function formatKilobytes(bytes: number): string {
-  const units = ["K", "M", "G", "T", "P"];
-  let value = bytes;
-  let unitIndex = 0;
-  const scalar = 1000;
-
-  while (value >= scalar && unitIndex < units.length - 1) {
-    value /= scalar;
-    unitIndex++;
-  }
-
-  return `${value.toFixed(1)} ${units[unitIndex]}`;
-}
-
 function formatTime(seconds: number): string {
   if (seconds == 0) {
     return `0s`;
diff --git a/src-tauri/download_manager/src/download_manager_builder.rs b/src-tauri/download_manager/src/download_manager_builder.rs
index 835b71d7..6944a92d 100644
--- a/src-tauri/download_manager/src/download_manager_builder.rs
+++ b/src-tauri/download_manager/src/download_manager_builder.rs
@@ -1,14 +1,16 @@
+use core::panic;
 use std::{
     collections::HashMap,
     fmt::Debug,
     sync::{Arc, Mutex},
+    time::Duration,
 };
 
 use database::DownloadableMetadata;
 use log::{debug, error, info, warn};
 use tauri::{AppHandle, async_runtime::JoinHandle};
-use tokio::sync::mpsc;
 use tokio::sync::mpsc::{Receiver, Sender};
+use tokio::{join, sync::mpsc, time::timeout};
 use utils::{app_emit, lock, send};
 
 use crate::{
@@ -82,7 +84,7 @@ pub struct DownloadManagerBuilder {
 impl DownloadManagerBuilder {
     pub fn build(app_handle: AppHandle) -> DownloadManager {
         let queue = Queue::new();
-        let (command_sender, command_receiver) = mpsc::channel(4);
+        let (command_sender, command_receiver) = mpsc::channel(1500);
         let active_progress = Arc::new(Mutex::new(None));
         let status = Arc::new(Mutex::new(DownloadManagerStatus::Empty));
 
@@ -144,8 +146,14 @@ impl DownloadManagerBuilder {
                 let mut download_thread_lock = lock!(self.current_download_thread);
                 download_thread_lock.take()
             } {
-                
-                return current_download_thread.await.is_ok();
+                let result = timeout(Duration::from_secs(4), async {
+                    current_download_thread.await.is_ok()
+                })
+                .await;
+                if let Ok(result) = result {
+                    return result;
+                };
+                panic!("failed to cleanup download: timeout after 4 seconds");
             };
         }
 
@@ -267,15 +275,11 @@ impl DownloadManagerBuilder {
                         return;
                     }
                 };
-                
+
                 // If the download gets canceled
                 // immediately return, on_cancelled gets called for us earlier
                 if !download_result {
-                    /*
-                     * This seems to cause a really weird bug, where sometimes if you cancel the download
-                     * mid-download it never actually exists or something? Like the JoinHandle doesn't join?
-                     */
-                    //return;
+                    return;
                 }
 
                 if download_agent.control_flag().get() == DownloadThreadControlFlag::Stop {
@@ -317,15 +321,12 @@ impl DownloadManagerBuilder {
         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);
         }
     }
     async fn manage_completed_signal(&mut self, meta: DownloadableMetadata) {
-        debug!("got signal Completed");
         if let Some(interface) = self.download_queue.read().front()
             && interface == &meta
         {
@@ -349,8 +350,6 @@ impl DownloadManagerBuilder {
         self.set_status(DownloadManagerStatus::Error);
     }
     async fn manage_cancel_signal(&mut self, meta: &DownloadableMetadata) {
-        debug!("got signal Cancel");
-
         // If the current download is the one we're tryna cancel
         if let Some(current_metadata) = self.download_queue.read().front()
             && current_metadata == meta
@@ -365,7 +364,6 @@ impl DownloadManagerBuilder {
 
             self.cleanup_current_download().await;
             self.download_agent_registry.remove(meta);
-            debug!("current download queue: {:?}", self.download_queue.read());
         }
         // else just cancel it
         else if let Some(download_agent) = self.download_agent_registry.get(meta) {
@@ -381,8 +379,8 @@ impl DownloadManagerBuilder {
                 );
             }
         }
-        self.sender.send(DownloadManagerSignal::Go).await.unwrap();
         self.push_ui_queue_update();
+        send!(self.sender, DownloadManagerSignal::Go);
     }
     fn push_ui_stats_update(&self, kbs: usize, time: usize) {
         let event_data = StatsUpdateEvent { speed: kbs, time };
diff --git a/src-tauri/src/games.rs b/src-tauri/src/games.rs
index 4aebbb1d..15147a03 100644
--- a/src-tauri/src/games.rs
+++ b/src-tauri/src/games.rs
@@ -18,7 +18,7 @@ use remote::{
     requests::generate_url,
     utils::DROP_CLIENT_ASYNC,
 };
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use tauri::AppHandle;
 
 use crate::AppState;
@@ -188,13 +188,23 @@ pub async fn fetch_game_logic(
     Ok(data)
 }
 
-#[derive(Serialize)]
+#[derive(Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct VersionDownloadOptionRequiredContent {
+    name: String,
+    icon_object_id: String,
+    short_description: String,
+    size: usize,
+}
+
+#[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct VersionDownloadOption {
     version_id: String,
     display_name: Option<String>,
     version_path: String,
-    pub platform: Platform,
+    platform: Platform,
+    required_content: Vec<VersionDownloadOptionRequiredContent>,
 }
 
 pub async fn fetch_game_version_options_logic(
@@ -216,24 +226,12 @@ pub async fn fetch_game_version_options_logic(
         return Err(RemoteAccessError::InvalidResponse(err));
     }
 
-    let data: Vec<GameVersion> = response.json().await?;
+    let data: Vec<VersionDownloadOption> = response.json().await?;
 
     let state_lock = state.lock();
     let process_manager_lock = PROCESS_MANAGER.lock();
-    let data: Vec<VersionDownloadOption> = data
+    let data = data
         .into_iter()
-        .flat_map(|v| {
-            let mut launches_tmp = v.launches;
-            launches_tmp.dedup_by_key(|v| v.platform);
-            launches_tmp
-                .into_iter()
-                .map(move |l| VersionDownloadOption {
-                    version_id: v.version_id.clone(),
-                    display_name: v.display_name.clone(),
-                    version_path: v.version_path.clone(),
-                    platform: l.platform,
-                })
-        })
         .filter(|v| process_manager_lock.valid_platform(&v.platform))
         .collect();
     //data.dedup_by_key(|v| v.platform);

From 3921b8ad5d672a7961ef4df87431f4c751a990a0 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Thu, 15 Jan 2026 15:01:15 +1100
Subject: [PATCH 18/19] feat: auto-queue dependencies

---
 main/composables/game.ts          |   3 +
 main/pages/library/[id]/index.vue | 165 ++++++++++++++++++------------
 src-tauri/src/downloads.rs        |  19 +++-
 src-tauri/src/games.rs            |   3 +
 4 files changed, 122 insertions(+), 68 deletions(-)

diff --git a/main/composables/game.ts b/main/composables/game.ts
index e3e2bbee..9de4f335 100644
--- a/main/composables/game.ts
+++ b/main/composables/game.ts
@@ -81,7 +81,10 @@ export type VersionOption = {
   displayName?: string;
   versionPath: string;
   platform: string;
+  size: number;
   requiredContent: Array<{
+    gameId: string;
+    versionId: string;
     name: string;
     iconObjectId: string;
     shortDescription: string;
diff --git a/main/pages/library/[id]/index.vue b/main/pages/library/[id]/index.vue
index bebb1f4e..e5a40f85 100644
--- a/main/pages/library/[id]/index.vue
+++ b/main/pages/library/[id]/index.vue
@@ -170,8 +170,8 @@
         </div>
       </div>
 
-      <form class="space-y-6">
-        <div v-if="versionOptions && versionOptions.length > 0">
+      <div class="space-y-6">
+        <div v-if="versionOptions && versionOptions.length > 0 && currentVersionOption">
           <Listbox as="div" v-model="installVersionIndex">
             <ListboxLabel class="block text-sm/6 font-medium text-zinc-100"
               >Version</ListboxLabel
@@ -182,11 +182,15 @@
               >
                 <span class="block truncate"
                   >{{
-                    versionOptions[installVersionIndex].displayName ||
-                    versionOptions[installVersionIndex].versionPath
+                    currentVersionOption.displayName ||
+                    currentVersionOption.versionPath
                   }}
                   on
-                  {{ versionOptions[installVersionIndex].platform }}</span
+                  {{ currentVersionOption.platform }} ({{
+                    formatKilobytes(
+                      currentVersionOption.size / 1024
+                    )
+                  }}B)</span
                 >
                 <span
                   class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2"
@@ -209,7 +213,7 @@
                   <ListboxOption
                     as="template"
                     v-for="(version, versionIdx) in versionOptions"
-                    :key="version.versionName"
+                    :key="version.versionId"
                     :value="versionIdx"
                     v-slot="{ active, selected }"
                   >
@@ -227,7 +231,11 @@
                           'block truncate',
                         ]"
                         >{{ version.displayName || version.versionPath }} on
-                        {{ version.platform }}</span
+                        {{ version.platform }} ({{
+                          formatKilobytes(
+                            versionOptions[installVersionIndex].size / 1024
+                          )
+                        }}B)</span
                       >
 
                       <span
@@ -291,67 +299,79 @@
         </div>
         <div
           v-if="
-            versionOptions?.[installVersionIndex]?.requiredContent &&
-            versionOptions[installVersionIndex].requiredContent.length > 0
+            currentVersionOption?.requiredContent &&
+            currentVersionOption.requiredContent.length > 0
           "
         >
-          <div class="flex items-center justify-between gap-x-8">
-            <span class="flex grow flex-col">
-              <label
-                id="install-extra-label"
-                class="text-sm/6 font-medium text-zinc-100"
-                >Install required components?</label
-              >
-              <span id="install-extra-description" class="text-sm text-zinc-400"
-                >Additional content is required to run this game. Queue for
-                download automatically?</span
-              >
-            </span>
-            <div
-              :class="[
-                'group relative inline-flex w-11 shrink-0 rounded-full p-0.5 inset-ring inset-ring-zinc-100/5 outline-offset-2 outline-blue-600 transition-colors duration-200 ease-in-out has-focus-visible:outline-2',
-                installExtra ? 'bg-blue-600' : 'bg-zinc-800',
-              ]"
-            >
-              <span
-                :class="[
-                  installExtra ? 'translate-x-5' : '',
-                  'size-5 rounded-full bg-white shadow-xs ring-1 ring-zinc-100/5 transition-transform duration-200 ease-in-out',
-                ]"
-              />
-              <input
-                id="install-extra"
-                v-model="installExtra"
-                type="checkbox"
-                class="w-auto h-auto opacity-0 absolute inset-0 focus:outline-hidden"
-                name="install-extra"
-                aria-labelledby="install-extra-label"
-                aria-describedby="install-extra-description"
-              />
-            </div>
+          <div class="border-b border-white/10 py-2">
+            <h3 class="text-sm font-semibold text-white">
+              Install additional dependencies?
+            </h3>
+            <p class="mt-1 text-xs text-gray-400">
+              This game requires additional content to run. Click the components
+              to automatically queue for download.
+            </p>
           </div>
-          <ul class="grid grid-cols-2 mt-2 gap-2">
+          <ul role="list" class="mt-2 divide-y divide-white/5">
             <li
-              v-for="content in versionOptions[installVersionIndex]
+              v-for="content in currentVersionOption
                 .requiredContent"
-              :key="content.name"
-              class="inline-flex items-start gap-2 bg-zinc-950/50 rounded-md p-2"
+              :key="content.versionId"
+              :class="[
+                !installDepsDisabled[content.versionId]
+                  ? 'bg-zinc-950 ring-2 ring-zinc-800'
+                  : '',
+                'rounded-lg relative flex justify-between px-2 py-3',
+              ]"
             >
-              <img :src="useObject(content.iconObjectId)" class="size-8" />
-              <div class="flex flex-col">
-                <h1 class="text-zinc-100 font-bold">{{ content.name }}</h1>
-                <p class="text-zinc-400 text-xs">
-                  {{ content.shortDescription }}
-                </p>
-                <span class="text-zinc-400 text-xs inline-flex gap-x-1">
-                  {{ formatKilobytes(content.size / 1024) }}B
-                  <ServerIcon class="size-3" />
-                </span>
+              <div class="flex min-w-0 gap-x-2">
+                <img
+                  class="size-12 flex-none"
+                  :src="useObject(content.iconObjectId)"
+                  alt=""
+                />
+                <div class="min-w-0 flex-auto">
+                  <p class="text-sm/6 font-semibold text-white">
+                    <button
+                      @click="
+                        () =>
+                          (installDepsDisabled[content.versionId] =
+                            !installDepsDisabled[content.versionId])
+                      "
+                    >
+                      <span class="absolute inset-x-0 -top-px bottom-0"></span>
+                      {{ content.name }}
+                    </button>
+                  </p>
+                  <p class="mt-1 flex text-xs/5 text-gray-400">
+                    {{ content.shortDescription }}
+                  </p>
+                </div>
+              </div>
+              <div class="flex shrink-0 items-center gap-x-2">
+                <div class="hidden sm:flex sm:flex-col sm:items-end">
+                  <p
+                    class="inline-flex items-center gap-x-1 text-xs/5 text-gray-400"
+                  >
+                    {{ formatKilobytes(content.size / 1024) }}B
+                    <ServerIcon class="size-3" />
+                  </p>
+                </div>
+                <CheckIcon
+                  v-if="!installDepsDisabled[content.versionId]"
+                  class="size-5 flex-none text-green-500"
+                  aria-hidden="true"
+                />
+                <MinusIcon
+                  v-else
+                  class="size-5 flex-none text-gray-500"
+                  aria-hidden="true"
+                />
               </div>
             </li>
           </ul>
         </div>
-      </form>
+      </div>
 
       <div v-if="installError" class="mt-1 rounded-md bg-red-600/10 p-4">
         <div class="flex">
@@ -534,7 +554,7 @@ import {
   PlayIcon,
 } from "@heroicons/vue/20/solid";
 import { BuildingStorefrontIcon } from "@heroicons/vue/24/outline";
-import { ServerIcon, XCircleIcon } from "@heroicons/vue/24/solid";
+import { MinusIcon, ServerIcon, XCircleIcon } from "@heroicons/vue/24/solid";
 import { invoke } from "@tauri-apps/api/core";
 import { micromark } from "micromark";
 import { GameStatusEnum } from "~/types";
@@ -589,18 +609,31 @@ const installLoading = ref(false);
 const installError = ref<string | undefined>();
 const installVersionIndex = ref(0);
 const installDir = ref(0);
-const installExtra = ref(true);
+const installDepsDisabled = ref<{ [key: string]: boolean }>({});
+
+const currentVersionOption = computed(() => versionOptions.value?.[installVersionIndex.value]);
 async function install() {
   try {
     if (!versionOptions.value) throw new Error("Versions have not been loaded");
     installLoading.value = true;
     const versionOption = versionOptions.value[installVersionIndex.value];
-    await invoke("download_game", {
-      gameId: game.value.id,
-      versionId: versionOption.versionId,
-      installDir: installDir.value,
-      targetPlatform: versionOption.platform,
-    });
+
+    const games = [
+      { gameId: game.value.id, versionId: versionOption.versionId },
+      ...versionOption.requiredContent
+        .filter((v) => !installDepsDisabled.value[v.versionId])
+        .map((v) => ({ gameId: v.gameId, versionId: v.versionId })),
+    ];
+
+    for (const game of games) {
+      await invoke("download_game", {
+        gameId: game.gameId,
+        versionId: game.versionId,
+        installDir: installDir.value,
+        targetPlatform: versionOption.platform,
+      });
+    }
+
     installFlowOpen.value = false;
   } catch (error) {
     installError.value = (error as string).toString();
diff --git a/src-tauri/src/downloads.rs b/src-tauri/src/downloads.rs
index 2c4bcfaa..0cc5ce20 100644
--- a/src-tauri/src/downloads.rs
+++ b/src-tauri/src/downloads.rs
@@ -1,4 +1,4 @@
-use std::{path::PathBuf, sync::Arc};
+use std::{collections::HashMap, path::PathBuf, sync::Arc};
 
 use database::{
     DownloadType, DownloadableMetadata, GameDownloadStatus, borrow_db_checked, platform::Platform,
@@ -15,6 +15,19 @@ pub async fn download_game(
     target_platform: Platform,
     install_dir: usize,
 ) -> Result<(), ApplicationDownloadError> {
+    {
+        let db = borrow_db_checked();
+        let status = db
+            .applications
+            .game_statuses
+            .get(&game_id)
+            .unwrap_or(&GameDownloadStatus::Remote {});
+
+        if matches!(status, GameDownloadStatus::Installed { .. }) {
+            return Ok(());
+        }
+    };
+
     let sender = { DOWNLOAD_MANAGER.get_sender().clone() };
 
     let meta = DownloadableMetadata {
@@ -69,7 +82,9 @@ pub async fn resume_download(game_id: String) -> Result<(), ApplicationDownloadE
     let sender = DOWNLOAD_MANAGER.get_sender();
 
     let install_dir = PathBuf::from(install_dir);
-    let install_dir = install_dir.parent().expect("game somehow installed at root");
+    let install_dir = install_dir
+        .parent()
+        .expect("game somehow installed at root");
 
     let game_download_agent = Arc::new(Box::new(
         GameDownloadAgent::new(meta, install_dir.to_path_buf(), sender).await?,
diff --git a/src-tauri/src/games.rs b/src-tauri/src/games.rs
index 15147a03..18b0ba9a 100644
--- a/src-tauri/src/games.rs
+++ b/src-tauri/src/games.rs
@@ -191,6 +191,8 @@ pub async fn fetch_game_logic(
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct VersionDownloadOptionRequiredContent {
+    game_id: String,
+    version_id: String,
     name: String,
     icon_object_id: String,
     short_description: String,
@@ -204,6 +206,7 @@ pub struct VersionDownloadOption {
     display_name: Option<String>,
     version_path: String,
     platform: Platform,
+    size: usize,
     required_content: Vec<VersionDownloadOptionRequiredContent>,
 }
 

From b0a93b2da6c644d6fbfeed4613a3b72c12c93983 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Thu, 15 Jan 2026 17:14:47 +1100
Subject: [PATCH 19/19] feat: depot scanning and ranking

---
 src-tauri/Cargo.lock                          |   1 +
 src-tauri/Cargo.toml                          |   2 +-
 src-tauri/download_manager/Cargo.toml         |   1 +
 .../download_manager/src/depot_manager.rs     | 146 ++++++++++++++++++
 .../src/download_manager_builder.rs           |  33 ++--
 .../src/download_manager_frontend.rs          |  17 +-
 .../download_manager/src/downloadable.rs      |   2 +-
 src-tauri/download_manager/src/lib.rs         |   3 +-
 src-tauri/download_manager/src/util/mod.rs    |   1 +
 .../download_manager/src/util/semaphore.rs    |  28 ++++
 .../games/src/downloads/download_agent.rs     |  60 +++++--
 .../games/src/downloads/download_logic.rs     |  14 +-
 src-tauri/remote/src/error.rs                 |   4 +-
 src-tauri/src/downloads.rs                    |  16 +-
 14 files changed, 284 insertions(+), 44 deletions(-)
 create mode 100644 src-tauri/download_manager/src/depot_manager.rs
 create mode 100644 src-tauri/download_manager/src/util/semaphore.rs

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 187b2f35..960c4974 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -1370,6 +1370,7 @@ dependencies = [
  "async-trait",
  "atomic-instant-full",
  "database",
+ "futures-util",
  "humansize",
  "log",
  "parking_lot 0.12.5",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index acb4ac66..5ffe3289 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -147,4 +147,4 @@ opt-level = 3
 
 [profile.dev]
 # Turn on a small amount of optimisation in Development mode.
-opt-level = 1
\ No newline at end of file
+opt-level = 1
diff --git a/src-tauri/download_manager/Cargo.toml b/src-tauri/download_manager/Cargo.toml
index f8e6363d..5a1578c2 100644
--- a/src-tauri/download_manager/Cargo.toml
+++ b/src-tauri/download_manager/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2024"
 async-trait = "0.1.89"
 atomic-instant-full = "0.1"
 database = { version = "0.1.0", path = "../database" }
+futures-util = "0.3.31"
 humansize = "2.1.3"
 log = "0.4.28"
 parking_lot = "0.12.5"
diff --git a/src-tauri/download_manager/src/depot_manager.rs b/src-tauri/download_manager/src/depot_manager.rs
new file mode 100644
index 00000000..66ffc061
--- /dev/null
+++ b/src-tauri/download_manager/src/depot_manager.rs
@@ -0,0 +1,146 @@
+use std::{
+    collections::HashMap,
+    mem,
+    sync::{Arc, RwLock, atomic::AtomicUsize},
+    time::{Duration, Instant},
+};
+
+use futures_util::StreamExt;
+use log::info;
+use remote::{
+    error::RemoteAccessError,
+    requests::{generate_url, make_authenticated_get},
+    utils::DROP_CLIENT_ASYNC,
+};
+use serde::Deserialize;
+use tauri::Url;
+
+use crate::util::semaphore::{SyncSemaphore, SyncSemaphorePermit};
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct DepotManifestContent {
+    version_id: String,
+    compression: String,
+}
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct DepotManifest {
+    content: HashMap<String, Vec<DepotManifestContent>>,
+}
+
+struct Depot {
+    endpoint: String,
+    manifest: Option<DepotManifest>,
+    latest_speed: Option<usize>, // bytes per second
+    current_downloads: SyncSemaphore,
+}
+
+pub struct DepotManager {
+    depots: RwLock<Vec<Depot>>,
+}
+
+#[derive(Deserialize)]
+struct ServersideDepot {
+    endpoint: String,
+}
+
+const SPEEDTEST_TIMEOUT: Duration = Duration::from_secs(4);
+
+impl DepotManager {
+    pub fn new() -> Self {
+        Self {
+            depots: RwLock::new(Vec::new()),
+        }
+    }
+
+    pub async fn sync_depots(&self) -> Result<(), RemoteAccessError> {
+        let depots = make_authenticated_get(generate_url(&["/api/v1/client/depots"], &[])?).await?;
+        let depots: Vec<ServersideDepot> = depots.json().await?;
+
+        let mut new_depots = depots
+            .into_iter()
+            .map(|depot| Depot {
+                endpoint: if depot.endpoint.ends_with("/") {
+                    depot.endpoint
+                } else {
+                    format!("{}/", depot.endpoint)
+                },
+                manifest: None,
+                latest_speed: None,
+                current_downloads: SyncSemaphore::new(),
+            })
+            .collect::<Vec<Depot>>();
+
+        for depot in &mut new_depots {
+            let manifest_url = Url::parse(&depot.endpoint)?.join("manifest.json")?;
+            let manifest = DROP_CLIENT_ASYNC.get(manifest_url).send().await?;
+            let manifest: DepotManifest = manifest.json().await?;
+            depot.manifest.replace(manifest);
+
+            let speedtest_url = Url::parse(&depot.endpoint)?.join("speedtest")?;
+            let speedtest = DROP_CLIENT_ASYNC.get(speedtest_url).send().await?;
+
+            let mut stream = speedtest.bytes_stream();
+            let start = Instant::now();
+            let mut total_length = 0;
+
+            while let Some(chunk) = stream.next().await {
+                let length = chunk?.len();
+                total_length += length;
+                if SPEEDTEST_TIMEOUT <= start.elapsed() {
+                    break;
+                }
+            }
+
+            let elapsed = start.elapsed().as_millis() as usize;
+            let speed = if elapsed == 0 { usize::MAX } else { (total_length / elapsed) * 1000 };
+            depot.latest_speed.replace(speed);
+        }
+
+        let mut depot_lock = self.depots.write().unwrap();
+        *depot_lock = new_depots;
+
+        Ok(())
+    }
+
+    pub fn next_depot(
+        &self,
+        game_id: &str,
+        version_id: &str,
+    ) -> Result<(String, SyncSemaphorePermit), RemoteAccessError> {
+        let lock = self.depots.read().unwrap();
+        let best_depot = lock
+            .iter()
+            .filter(|v| {
+                let manifest = match &v.manifest {
+                    Some(v) => v,
+                    None => return false,
+                };
+
+                let versions = match manifest.content.get(game_id) {
+                    Some(v) => v,
+                    None => return false,
+                };
+
+                let _version = match versions.iter().find(|v| v.version_id == version_id) {
+                    Some(v) => v,
+                    None => return false,
+                };
+
+                return true;
+            })
+            .max_by(|x, y| {
+                let x_speed = x.latest_speed.unwrap_or(0) / x.current_downloads.permits();
+                let y_speed = y.latest_speed.unwrap_or(0) / y.current_downloads.permits();
+                x_speed.cmp(&y_speed)
+            })
+            .ok_or(RemoteAccessError::NoDepots)?;
+
+        Ok((
+            best_depot.endpoint.clone(),
+            best_depot.current_downloads.acquire(),
+        ))
+    }
+}
diff --git a/src-tauri/download_manager/src/download_manager_builder.rs b/src-tauri/download_manager/src/download_manager_builder.rs
index 6944a92d..048daa25 100644
--- a/src-tauri/download_manager/src/download_manager_builder.rs
+++ b/src-tauri/download_manager/src/download_manager_builder.rs
@@ -8,12 +8,14 @@ use std::{
 
 use database::DownloadableMetadata;
 use log::{debug, error, info, warn};
+use remote::error::RemoteAccessError;
 use tauri::{AppHandle, async_runtime::JoinHandle};
 use tokio::sync::mpsc::{Receiver, Sender};
 use tokio::{join, sync::mpsc, time::timeout};
 use utils::{app_emit, lock, send};
 
 use crate::{
+    depot_manager::DepotManager,
     download_manager_frontend::DownloadStatus,
     error::ApplicationDownloadError,
     frontend_updates::{QueueUpdateEvent, QueueUpdateEventQueueData, StatsUpdateEvent},
@@ -77,6 +79,7 @@ pub struct DownloadManagerBuilder {
     progress: CurrentProgressObject,
     status: Arc<Mutex<DownloadManagerStatus>>,
     app_handle: AppHandle,
+    depot_manager: Arc<DepotManager>,
 
     current_download_thread: Mutex<Option<JoinHandle<()>>>,
     active_control_flag: Option<DownloadThreadControl>,
@@ -88,6 +91,8 @@ impl DownloadManagerBuilder {
         let active_progress = Arc::new(Mutex::new(None));
         let status = Arc::new(Mutex::new(DownloadManagerStatus::Empty));
 
+        let depot_manager = Arc::new(DepotManager::new());
+        let dpm = depot_manager.clone();
         let manager = Self {
             download_agent_registry: HashMap::new(),
             download_queue: queue.clone(),
@@ -96,6 +101,7 @@ impl DownloadManagerBuilder {
             sender: command_sender.clone(),
             progress: active_progress.clone(),
             app_handle,
+            depot_manager,
 
             current_download_thread: Mutex::new(None),
             active_control_flag: None,
@@ -106,7 +112,7 @@ impl DownloadManagerBuilder {
             info!("download manager exited with result: {:?}", result);
         });
 
-        DownloadManager::new(terminator, queue, active_progress, command_sender)
+        DownloadManager::new(terminator, queue, active_progress, command_sender, dpm)
     }
 
     fn set_status(&self, status: DownloadManagerStatus) {
@@ -169,7 +175,7 @@ impl DownloadManagerBuilder {
 
             match signal {
                 DownloadManagerSignal::Go => {
-                    self.manage_go_signal();
+                    self.manage_go_signal().await;
                 }
                 DownloadManagerSignal::Stop => {
                     self.manage_stop_signal();
@@ -217,7 +223,7 @@ impl DownloadManagerBuilder {
         send!(self.sender, DownloadManagerSignal::UpdateUIQueue);
     }
 
-    fn manage_go_signal(&mut self) {
+    async fn manage_go_signal(&mut self) {
         debug!("got signal Go");
         if self.download_agent_registry.is_empty() {
             debug!(
@@ -265,16 +271,17 @@ impl DownloadManagerBuilder {
 
         *download_thread_lock = Some(tauri::async_runtime::spawn(async move {
             loop {
-                let download_result = match download_agent.download(&app_handle).await {
-                    // Ok(true) is for completed and exited properly
-                    Ok(v) => v,
-                    Err(e) => {
-                        error!("download {:?} has error {}", download_agent.metadata(), &e);
-                        download_agent.on_error(&app_handle, &e);
-                        send!(sender, DownloadManagerSignal::Error(e));
-                        return;
-                    }
-                };
+                let download_result =
+                    match download_agent.download(&app_handle).await {
+                        // Ok(true) is for completed and exited properly
+                        Ok(v) => v,
+                        Err(e) => {
+                            error!("download {:?} has error {}", download_agent.metadata(), &e);
+                            download_agent.on_error(&app_handle, &e);
+                            send!(sender, DownloadManagerSignal::Error(e));
+                            return;
+                        }
+                    };
 
                 // If the download gets canceled
                 // immediately return, on_cancelled gets called for us earlier
diff --git a/src-tauri/download_manager/src/download_manager_frontend.rs b/src-tauri/download_manager/src/download_manager_frontend.rs
index 6c30415e..5a47aa48 100644
--- a/src-tauri/download_manager/src/download_manager_frontend.rs
+++ b/src-tauri/download_manager/src/download_manager_frontend.rs
@@ -1,7 +1,7 @@
 use std::{
     collections::VecDeque,
     fmt::Debug,
-    sync::{Mutex, MutexGuard},
+    sync::{Arc, Mutex, MutexGuard},
 };
 
 use database::DownloadableMetadata;
@@ -12,7 +12,7 @@ use tokio::sync::mpsc::Sender;
 use tokio::sync::mpsc::error::SendError;
 use utils::{lock, send};
 
-use crate::error::ApplicationDownloadError;
+use crate::{depot_manager::DepotManager, error::ApplicationDownloadError};
 
 use super::{
     download_manager_builder::{CurrentProgressObject, DownloadAgent},
@@ -78,12 +78,18 @@ pub enum DownloadStatus {
 /// The actual download queue may be accessed through the .`edit()` function,
 /// which provides raw access to the underlying queue.
 /// THIS EDITING IS BLOCKING!!!
-#[derive(Debug)]
 pub struct DownloadManager {
     terminator: Mutex<Option<JoinHandle<()>>>,
     download_queue: Queue,
     progress: CurrentProgressObject,
     command_sender: Sender<DownloadManagerSignal>,
+    depot_manager: Arc<DepotManager>,
+}
+
+impl Debug for DownloadManager {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("DownloadManager").finish()
+    }
 }
 
 #[allow(dead_code)]
@@ -93,12 +99,14 @@ impl DownloadManager {
         download_queue: Queue,
         progress: CurrentProgressObject,
         command_sender: Sender<DownloadManagerSignal>,
+        depot_manager: Arc<DepotManager>,
     ) -> Self {
         Self {
             terminator: Mutex::new(Some(terminator)),
             download_queue,
             progress,
             command_sender,
+            depot_manager
         }
     }
 
@@ -173,6 +181,9 @@ impl DownloadManager {
     pub fn get_sender(&self) -> Sender<DownloadManagerSignal> {
         self.command_sender.clone()
     }
+    pub fn clone_depot_manager(&self) -> Arc<DepotManager> {
+        self.depot_manager.clone()
+    }
 }
 
 /// Takes in the locked value from .`edit()` and attempts to
diff --git a/src-tauri/download_manager/src/downloadable.rs b/src-tauri/download_manager/src/downloadable.rs
index 908399f8..72976d2e 100644
--- a/src-tauri/download_manager/src/downloadable.rs
+++ b/src-tauri/download_manager/src/downloadable.rs
@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use database::DownloadableMetadata;
 use tauri::AppHandle;
 
-use crate::error::ApplicationDownloadError;
+use crate::{depot_manager::DepotManager, error::ApplicationDownloadError};
 
 use super::{
     download_manager_frontend::DownloadStatus,
diff --git a/src-tauri/download_manager/src/lib.rs b/src-tauri/download_manager/src/lib.rs
index e4e9599c..624d8190 100644
--- a/src-tauri/download_manager/src/lib.rs
+++ b/src-tauri/download_manager/src/lib.rs
@@ -16,6 +16,7 @@ pub mod downloadable;
 pub mod error;
 pub mod frontend_updates;
 pub mod util;
+pub mod depot_manager;
 
 pub static DOWNLOAD_MANAGER: DownloadManagerWrapper = DownloadManagerWrapper::new();
 
@@ -28,7 +29,7 @@ impl DownloadManagerWrapper {
         DOWNLOAD_MANAGER
             .0
             .set(DownloadManagerBuilder::build(app_handle))
-            .expect("Failed to initialise download manager");
+            .expect("failed to initialise download manager");
     }
 }
 
diff --git a/src-tauri/download_manager/src/util/mod.rs b/src-tauri/download_manager/src/util/mod.rs
index 5476d225..d2bc6cb7 100644
--- a/src-tauri/download_manager/src/util/mod.rs
+++ b/src-tauri/download_manager/src/util/mod.rs
@@ -2,3 +2,4 @@ pub mod download_thread_control_flag;
 pub mod progress_object;
 pub mod queue;
 pub mod rolling_progress_updates;
+pub mod semaphore;
\ No newline at end of file
diff --git a/src-tauri/download_manager/src/util/semaphore.rs b/src-tauri/download_manager/src/util/semaphore.rs
new file mode 100644
index 00000000..74a07b69
--- /dev/null
+++ b/src-tauri/download_manager/src/util/semaphore.rs
@@ -0,0 +1,28 @@
+use std::sync::{Arc, atomic::{AtomicUsize, Ordering}};
+
+pub struct SyncSemaphore {
+    inner: Arc<AtomicUsize>
+}
+
+impl SyncSemaphore {
+    pub fn new() -> Self {
+        Self { inner: Arc::new(AtomicUsize::new(0)) }
+    }
+
+    pub fn acquire(&self) -> SyncSemaphorePermit  {
+        self.inner.fetch_add(1, Ordering::Relaxed);
+        SyncSemaphorePermit(self.inner.clone())
+    }
+
+    pub fn permits(&self) -> usize {
+        self.inner.fetch_add(0, Ordering::Relaxed)
+    }
+}
+
+pub struct SyncSemaphorePermit(Arc<AtomicUsize>);
+
+impl Drop for SyncSemaphorePermit {
+    fn drop(&mut self) {
+        self.0.fetch_sub(1, Ordering::Relaxed);
+    }
+}
\ No newline at end of file
diff --git a/src-tauri/games/src/downloads/download_agent.rs b/src-tauri/games/src/downloads/download_agent.rs
index b6897d99..a6e4b3c5 100644
--- a/src-tauri/games/src/downloads/download_agent.rs
+++ b/src-tauri/games/src/downloads/download_agent.rs
@@ -1,8 +1,8 @@
 use async_trait::async_trait;
 use database::{
-    ApplicationTransientStatus, DownloadableMetadata, borrow_db_checked,
-    borrow_db_mut_checked,
+    ApplicationTransientStatus, DownloadableMetadata, borrow_db_checked, borrow_db_mut_checked,
 };
+use download_manager::depot_manager::DepotManager;
 use download_manager::download_manager_frontend::{DownloadManagerSignal, DownloadStatus};
 use download_manager::downloadable::Downloadable;
 use download_manager::error::ApplicationDownloadError;
@@ -18,10 +18,10 @@ use remote::requests::generate_url;
 use remote::utils::DROP_CLIENT_ASYNC;
 use std::collections::HashMap;
 use std::fmt::Debug;
+use std::mem;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex};
 use std::time::Instant;
-use std::mem;
 use tauri::AppHandle;
 use tokio::sync::mpsc::Sender;
 use utils::{app_emit, lock, send};
@@ -40,6 +40,7 @@ pub struct GameDownloadAgent {
     pub control_flag: DownloadThreadControl,
     pub manifest: Mutex<Option<Manifest>>,
     pub progress: Arc<ProgressObject>,
+    depot_manager: Arc<DepotManager>,
     sender: Sender<DownloadManagerSignal>,
     pub dropdata: DropData,
     status: Mutex<DownloadStatus>,
@@ -56,6 +57,7 @@ impl GameDownloadAgent {
         metadata: DownloadableMetadata,
         target_download_dir: usize,
         sender: Sender<DownloadManagerSignal>,
+        depot_manager: Arc<DepotManager>,
     ) -> Result<Self, ApplicationDownloadError> {
         let base_dir = {
             let db_lock = borrow_db_checked();
@@ -63,26 +65,29 @@ impl GameDownloadAgent {
             db_lock.applications.install_dirs[target_download_dir].clone()
         };
 
-        Self::new(metadata, base_dir, sender).await
+        Self::new(metadata, base_dir, sender, depot_manager).await
     }
     pub async fn new(
         metadata: DownloadableMetadata,
         base_dir: PathBuf,
         sender: Sender<DownloadManagerSignal>,
+        depot_manager: Arc<DepotManager>,
     ) -> Result<Self, ApplicationDownloadError> {
         // Don't run by default
         let control_flag = DownloadThreadControl::new(DownloadThreadControlFlag::Stop);
 
         let base_dir_path = Path::new(&base_dir);
-        info!("base dir {}", base_dir_path.display() );
+        info!("base dir {}", base_dir_path.display());
         let data_base_dir_path = base_dir_path.join(metadata.id.clone());
         info!("data dir path {}", data_base_dir_path.display());
 
-        let stored_manifest =
-            DropData::generate(metadata.id.clone(), metadata.version.clone(), metadata.target_platform, data_base_dir_path.clone());
-
-            info!("starting download with {} completed", stored_manifest.get_contexts().len());
-
+        let stored_manifest = DropData::generate(
+            metadata.id.clone(),
+            metadata.version.clone(),
+            metadata.target_platform,
+            data_base_dir_path.clone(),
+        );
+        
         let result = Self {
             metadata,
             control_flag,
@@ -91,6 +96,7 @@ impl GameDownloadAgent {
             sender,
             dropdata: stored_manifest,
             status: Mutex::new(DownloadStatus::Queued),
+            depot_manager,
         };
 
         result.ensure_manifest_exists().await?;
@@ -167,7 +173,10 @@ impl GameDownloadAgent {
         let client = DROP_CLIENT_ASYNC.clone();
         let url = generate_url(
             &["/api/v1/client/game/manifest"],
-            &[("id", &self.metadata.id), ("version", &self.metadata.version)],
+            &[
+                ("id", &self.metadata.id),
+                ("version", &self.metadata.version),
+            ],
         )
         .map_err(ApplicationDownloadError::Communication)?;
 
@@ -211,6 +220,7 @@ impl GameDownloadAgent {
     }
 
     async fn run(&self) -> Result<bool, RemoteAccessError> {
+        self.depot_manager.sync_depots().await?;
         self.setup_progress();
         let (chunks, key) = {
             let manifest = lock!(self.manifest);
@@ -249,6 +259,18 @@ impl GameDownloadAgent {
                     }
 
                     let sender = unsafe_self.sender.clone();
+                    let (depot, permit) = match unsafe_self
+                        .depot_manager
+                        .next_depot(&unsafe_self.metadata.id, &unsafe_self.metadata.version)
+                    {
+                        Ok(v) => v,
+                        Err(err) => {
+                            tauri::async_runtime::spawn(async move {
+                                send!(sender, DownloadManagerSignal::Error(ApplicationDownloadError::Communication(err)));
+                            });
+                            return;
+                        }
+                    };
 
                     s.spawn(move |_| {
                         for i in 0..RETRY_COUNT {
@@ -258,6 +280,7 @@ impl GameDownloadAgent {
                                 &unsafe_self.metadata.id,
                                 &unsafe_self.metadata.version,
                                 &chunk_id,
+                                &depot,
                                 &key,
                                 &chunk_data,
                                 base_path,
@@ -266,6 +289,7 @@ impl GameDownloadAgent {
                             ) {
                                 Ok(true) => {
                                     local_sender.send(chunk_id.clone()).unwrap();
+                                    drop(permit); // Take ownership
                                     return;
                                 }
                                 Ok(false) => return,
@@ -273,11 +297,11 @@ impl GameDownloadAgent {
                                     warn!("got error for chunk id {}: {e:?}", chunk_id);
 
                                     let retry = true; /*matches!(
-                                        &e,
-                                        ApplicationDownloadError::Communication(_)
-                                            | ApplicationDownloadError::Checksum
-                                            | ApplicationDownloadError::Lock
-                                            | ApplicationDownloadError::IoError(_)
+                                    &e,
+                                    ApplicationDownloadError::Communication(_)
+                                    | ApplicationDownloadError::Checksum
+                                    | ApplicationDownloadError::Lock
+                                    | ApplicationDownloadError::IoError(_)
                                     );*/
 
                                     if i == RETRY_COUNT - 1 || !retry {
@@ -483,7 +507,9 @@ impl Downloadable for GameDownloadAgent {
             &self.metadata(),
             self.dropdata.base_path.to_string_lossy().to_string(),
             app_handle,
-        ).await {
+        )
+        .await
+        {
             Ok(_) => {}
             Err(e) => {
                 error!("could not mark game as complete: {e}");
diff --git a/src-tauri/games/src/downloads/download_logic.rs b/src-tauri/games/src/downloads/download_logic.rs
index 24038881..d7054e65 100644
--- a/src-tauri/games/src/downloads/download_logic.rs
+++ b/src-tauri/games/src/downloads/download_logic.rs
@@ -19,6 +19,7 @@ use remote::error::{DropServerError, RemoteAccessError};
 use remote::requests::generate_url;
 use remote::utils::DROP_CLIENT_SYNC;
 use sha2::Digest;
+use tauri::Url;
 
 const READ_BUF_LEN: usize = 1024 * 1024;
 
@@ -28,6 +29,7 @@ pub fn download_game_chunk(
     game_id: &str,
     version_id: &str,
     chunk_id: &str,
+    depot: &str,
     key: &[u8; 16],
     chunk_data: &ChunkData,
     base_path: PathBuf,
@@ -44,11 +46,13 @@ pub fn download_game_chunk(
 
     let header = generate_authorization_header();
 
-    let url = generate_url(
-        &["/api/v1/depot/content", game_id, version_id, chunk_id],
-        &[],
-    )
-    .map_err(ApplicationDownloadError::Communication)?;
+    let url = Url::parse(depot)
+        .map_err(|v| ApplicationDownloadError::DownloadError(v.into()))?
+        .join(&format!(
+            "content/{}/{}/{}",
+            game_id, version_id, chunk_id
+        ))
+        .map_err(|v| ApplicationDownloadError::DownloadError(v.into()))?;
 
     let response = DROP_CLIENT_SYNC
         .get(url)
diff --git a/src-tauri/remote/src/error.rs b/src-tauri/remote/src/error.rs
index 8e520355..7247d5fe 100644
--- a/src-tauri/remote/src/error.rs
+++ b/src-tauri/remote/src/error.rs
@@ -34,6 +34,7 @@ pub enum RemoteAccessError {
     OutOfSync,
     Cache(std::io::Error),
     CorruptedState,
+    NoDepots,
 }
 
 impl Display for RemoteAccessError {
@@ -103,7 +104,8 @@ impl Display for RemoteAccessError {
                 f,
                 "Drop encountered a corrupted internal state. Please report this to the developers, with details of reproduction."
             ),
-        }
+            RemoteAccessError::NoDepots => write!(f, "There are no download depots configured on the server. Contact your server admin."),
+                    }
     }
 }
 
diff --git a/src-tauri/src/downloads.rs b/src-tauri/src/downloads.rs
index 0cc5ce20..9e917a78 100644
--- a/src-tauri/src/downloads.rs
+++ b/src-tauri/src/downloads.rs
@@ -37,7 +37,13 @@ pub async fn download_game(
         download_type: DownloadType::Game,
     };
 
-    let game_download_agent = GameDownloadAgent::new_from_index(meta, install_dir, sender).await?;
+    let game_download_agent = GameDownloadAgent::new_from_index(
+        meta,
+        install_dir,
+        sender,
+        DOWNLOAD_MANAGER.clone_depot_manager(),
+    )
+    .await?;
 
     let game_download_agent =
         Arc::new(Box::new(game_download_agent) as Box<dyn Downloadable + Send + Sync>);
@@ -87,7 +93,13 @@ pub async fn resume_download(game_id: String) -> Result<(), ApplicationDownloadE
         .expect("game somehow installed at root");
 
     let game_download_agent = Arc::new(Box::new(
-        GameDownloadAgent::new(meta, install_dir.to_path_buf(), sender).await?,
+        GameDownloadAgent::new(
+            meta,
+            install_dir.to_path_buf(),
+            sender,
+            DOWNLOAD_MANAGER.clone_depot_manager(),
+        )
+        .await?,
     ) as Box<dyn Downloadable + Send + Sync>);
 
     DOWNLOAD_MANAGER