chore: Added libayatana-appindicator3.so.1 to appimage files

Signed-off-by: quexeky <git@quexeky.dev>

.github/workflows/release.yml

@@ -94,10 +94,11 @@ jobs:
           APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
           APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
           APPLE_SIGNING_IDENTITY: ${{ env.CERT_ID }}
+          NO_STRIP: true
         with:
           tagName: v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
           releaseName: 'Auto-release v__VERSION__'
           releaseBody: 'See the assets to download this version and install. This release was created automatically.'
           releaseDraft: false
           prerelease: true
-          args: ${{ matrix.args }}
+          args: ${{ matrix.args }}

.gitignore

@@ -26,4 +26,7 @@ dist-ssr
 .output
 
 src-tauri/flamegraph.svg
-src-tauri/perf*
+src-tauri/perf*
+
+/*.AppImage
+/squashfs-root

.gitmodules

@@ -1,9 +1,6 @@
-[submodule "drop-base"]
-	path = drop-base
-	url = https://github.com/drop-oss/drop-base
 [submodule "src-tauri/tailscale/libtailscale"]
 	path = src-tauri/tailscale/libtailscale
 	url = https://github.com/tailscale/libtailscale.git
-[submodule "src-tauri/umu/umu-launcher"]
-	path = src-tauri/umu/umu-launcher
-	url = https://github.com/Open-Wine-Components/umu-launcher.git
+[submodule "libs/drop-base"]
+	path = libs/drop-base
+	url = https://github.com/drop-oss/drop-base.git

build.mjs

@@ -0,0 +1,48 @@
+import fs from "fs";
+import process from "process";
+import childProcess from "child_process";
+import createLogger from "pino";
+
+const OUTPUT = "./.output";
+const logger = createLogger({ transport: { target: "pino-pretty" } });
+
+async function spawn(exec, opts) {
+  const output = childProcess.spawn(exec, { ...opts, shell: true });
+  output.stdout.on("data", (data) => {
+    process.stdout.write(data);
+  });
+  output.stderr.on("data", (data) => {
+    process.stderr.write(data);
+  });
+
+  return await new Promise((resolve, reject) => {
+    output.on("error", (err) => reject(err));
+    output.on("exit", () => resolve());
+  });
+}
+
+const views = fs.readdirSync(".").filter((view) => {
+  const expectedPath = `./${view}/package.json`;
+  return fs.existsSync(expectedPath);
+});
+
+fs.mkdirSync(OUTPUT, { recursive: true });
+
+for (const view of views) {
+  const loggerChild = logger.child({});
+  process.chdir(`./${view}`);
+
+  loggerChild.info(`Install deps for "${view}"`);
+  await spawn("yarn");
+
+  loggerChild.info(`Building "${view}"`);
+  await spawn("yarn build", {
+    env: { ...process.env, NUXT_APP_BASE_URL: `/${view}/` },
+  });
+
+  process.chdir("..");
+
+  fs.cpSync(`./${view}/.output/public`, `${OUTPUT}/${view}`, {
+    recursive: true,
+  });
+}

composables/app-state.ts

@@ -1,3 +0,0 @@
-import type { AppState } from "~/types";
-
-export const useAppState = () => useState<AppState>("state");

main/app.vue

@@ -10,8 +10,6 @@
 import "~/composables/downloads.js";
 
 import { invoke } from "@tauri-apps/api/core";
-import { AppStatus } from "~/types";
-import { listen } from "@tauri-apps/api/event";
 import { useAppState } from "./composables/app-state.js";
 import {
   initialNavigation,
@@ -21,19 +19,26 @@ import {
 const router = useRouter();
 
 const state = useAppState();
-try {
-  state.value = JSON.parse(await invoke("fetch_state"));
-} catch (e) {
-  console.error("failed to parse state", e);
+
+async function fetchState() {
+  try {
+    state.value = JSON.parse(await invoke("fetch_state"));
+    if (!state.value)
+      throw createError({
+        statusCode: 500,
+        statusMessage: `App state is: ${state.value}`,
+        fatal: true,
+      });
+  } catch (e) {
+    console.error("failed to parse state", e);
+    throw e;
+  }
 }
+await fetchState();
 
 // This is inefficient but apparently we do it lol
 router.beforeEach(async () => {
-  try {
-    state.value = JSON.parse(await invoke("fetch_state"));
-  } catch (e) {
-    console.error("failed to parse state", e);
-  }
+  await fetchState();
 });
 
 setupHooks();

main/components/Header.vue

@@ -37,7 +37,7 @@
               <component class="h-5" :is="item.icon" />
             </HeaderWidget>
           </li>
-          <OfflineHeaderWidget v-if="state.status === AppStatus.Offline" />
+          <OfflineHeaderWidget v-if="state?.status === AppStatus.Offline" />
           <HeaderUserWidget />
         </ol>
       </div>

main/components/HeaderUserWidget.vue

@@ -1,5 +1,5 @@
 <template>
-  <Menu v-if="state.user" as="div" class="relative inline-block">
+  <Menu v-if="state?.user" as="div" class="relative inline-block">
     <MenuButton>
       <HeaderWidget>
         <div class="inline-flex items-center text-zinc-300 hover:text-white">
@@ -87,7 +87,7 @@ router.afterEach(() => {
 
 const state = useAppState();
 const profilePictureUrl: string = await useObject(
-  state.value.user?.profilePictureObjectId ?? ""
+  state.value?.user?.profilePictureObjectId ?? ""
 );
 const adminUrl: string = await invoke("gen_drop_url", {
   path: "/admin",

main/composables/app-state.ts

@@ -0,0 +1,3 @@
+import type { AppState } from "~/types";
+
+export const useAppState = () => useState<AppState | undefined>("state");

main/composables/state-navigation.ts

@@ -65,7 +65,13 @@ export function setupHooks() {
   */
 }
 
-export function initialNavigation(state: Ref<AppState>) {
+export function initialNavigation(state: ReturnType<typeof useAppState>) {
+  if (!state.value)
+    throw createError({
+      statusCode: 500,
+      statusMessage: "App state not valid",
+      fatal: true,
+    });
   const router = useRouter();
 
   switch (state.value.status) {

main/error.vue

@@ -7,6 +7,7 @@
         class="mx-auto w-full max-w-7xl px-6 pt-6 sm:pt-10 lg:col-span-2 lg:col-start-1 lg:row-start-1 lg:px-8"
       >
         <Logo class="h-10 w-auto sm:h-12" />
+        
       </header>
       <main
         class="mx-auto w-full max-w-7xl px-6 py-24 sm:py-32 lg:col-span-2 lg:col-start-1 lg:row-start-2 lg:px-8"

main/nuxt.config.ts

@@ -13,5 +13,9 @@ export default defineNuxtConfig({
 
   ssr: false,
 
-  extends: [["./drop-base"]],
+  extends: [["../libs/drop-base"]],
+
+  app: {
+    baseURL: "/main",
+  }
 });

main/package.json

@@ -0,0 +1,37 @@
+{
+  "name": "view",
+  "private": true,
+  "version": "0.3.1",
+  "type": "module",
+  "scripts": {
+    "build": "nuxt generate",
+    "dev": "nuxt dev",
+    "postinstall": "nuxt prepare",
+    "tauri": "tauri"
+  },
+  "dependencies": {
+    "@headlessui/vue": "^1.7.23",
+    "@heroicons/vue": "^2.1.5",
+    "@nuxtjs/tailwindcss": "^6.12.2",
+    "@tauri-apps/api": "^2.7.0",
+    "koa": "^2.16.1",
+    "markdown-it": "^14.1.0",
+    "micromark": "^4.0.1",
+    "nuxt": "^3.16.0",
+    "scss": "^0.2.4",
+    "vue-router": "latest",
+    "vuedraggable": "^4.1.0"
+  },
+  "devDependencies": {
+    "@tailwindcss/forms": "^0.5.9",
+    "@tailwindcss/typography": "^0.5.15",
+    "@types/markdown-it": "^14.1.2",
+    "autoprefixer": "^10.4.20",
+    "postcss": "^8.4.47",
+    "sass-embedded": "^1.79.4",
+    "tailwindcss": "^3.4.13",
+    "typescript": "^5.8.3",
+    "vue-tsc": "^2.2.10"
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+}

optimize-appimage.sh

@@ -0,0 +1,22 @@
+## This script is largely useless, because there's not much we can do about AppImage size
+
+ARCH=$(uname -m)
+
+# build tauri apps
+# NO_STRIP=true yarn tauri build -- --verbose
+
+# unpack appimage
+APPIMAGE=$(ls ./src-tauri/target/release/bundle/appimage/*.AppImage)
+"$APPIMAGE" --appimage-extract
+
+# strip binary
+APPIMAGE_UNPACK="./squashfs-root"
+find $APPIMAGE_UNPACK -type f -exec strip -s {} \;
+
+APPIMAGETOOL=$(echo "obsolete-appimagetool-$ARCH.AppImage")
+wget -O $APPIMAGETOOL "https://github.com/AppImage/AppImageKit/releases/download/13/$APPIMAGETOOL"
+chmod +x $APPIMAGETOOL
+
+APPIMAGE_OUTPUT=$(./$APPIMAGETOOL $APPIMAGE_UNPACK | grep ".AppImage" | grep squashfs-root | awk '{ print $6 }')
+
+mv $APPIMAGE_OUTPUT "$APPIMAGE"

package.json

@@ -1,46 +1,22 @@
 {
   "name": "drop-app",
   "private": true,
-  "version": "0.3.1",
   "type": "module",
   "scripts": {
-    "build": "nuxt build",
-    "dev": "nuxt dev",
-    "generate": "nuxt generate",
-    "preview": "nuxt preview",
-    "postinstall": "nuxt prepare",
+    "build": "node ./build.mjs",
     "tauri": "tauri"
   },
   "dependencies": {
-    "@headlessui/vue": "^1.7.23",
-    "@heroicons/vue": "^2.1.5",
-    "@nuxtjs/tailwindcss": "^6.12.2",
-    "@tauri-apps/api": ">=2.0.0",
-    "@tauri-apps/plugin-deep-link": "~2",
-    "@tauri-apps/plugin-dialog": "^2.0.1",
+    "@tauri-apps/api": "^2.7.0",
+    "@tauri-apps/plugin-deep-link": "^2.4.1",
+    "@tauri-apps/plugin-dialog": "^2.3.2",
     "@tauri-apps/plugin-opener": "^2.4.0",
-    "@tauri-apps/plugin-os": "~2",
-    "@tauri-apps/plugin-shell": "^2.2.1",
-    "koa": "^2.16.1",
-    "markdown-it": "^14.1.0",
-    "micromark": "^4.0.1",
-    "nuxt": "^3.16.0",
-    "scss": "^0.2.4",
-    "vue": "latest",
-    "vue-router": "latest",
-    "vuedraggable": "^4.1.0"
+    "@tauri-apps/plugin-os": "^2.3.0",
+    "@tauri-apps/plugin-shell": "^2.3.0",
+    "pino": "^9.7.0",
+    "pino-pretty": "^13.1.1"
   },
   "devDependencies": {
-    "@tailwindcss/forms": "^0.5.9",
-    "@tailwindcss/typography": "^0.5.15",
-    "@tauri-apps/cli": ">=2.0.0",
-    "@types/markdown-it": "^14.1.2",
-    "autoprefixer": "^10.4.20",
-    "postcss": "^8.4.47",
-    "sass-embedded": "^1.79.4",
-    "tailwindcss": "^3.4.13",
-    "typescript": "^5.8.3",
-    "vue-tsc": "^2.2.10"
-  },
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+    "@tauri-apps/cli": "^2.7.1"
+  }
 }

src-tauri/Cargo.lock

@@ -898,7 +898,7 @@ dependencies = [
  "bitflags 2.9.1",
  "core-foundation 0.10.1",
  "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.5.0",
  "libc",
 ]
 
@@ -1301,6 +1301,7 @@ dependencies = [
  "hex 0.4.3",
  "http 1.3.1",
  "http-serde 2.1.1",
+ "humansize",
  "known-folders",
  "log",
  "log4rs",
@@ -1324,6 +1325,7 @@ dependencies = [
  "sha1",
  "shared_child",
  "slice-deque",
+ "sysinfo",
  "tar",
  "tauri",
  "tauri-build",
@@ -1586,6 +1588,15 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared 0.1.1",
+]
+
 [[package]]
 name = "foreign-types"
 version = "0.5.0"
@@ -1593,7 +1604,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
 dependencies = [
  "foreign-types-macros",
- "foreign-types-shared",
+ "foreign-types-shared 0.3.1",
 ]
 
 [[package]]
@@ -1607,6 +1618,12 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
 [[package]]
 name = "foreign-types-shared"
 version = "0.3.1"
@@ -2295,6 +2312,15 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
+[[package]]
+name = "humansize"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7"
+dependencies = [
+ "libm",
+]
+
 [[package]]
 name = "humantime"
 version = "2.2.0"
@@ -2362,6 +2388,22 @@ dependencies = [
  "webpki-roots",
 ]
 
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper 1.6.0",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-util"
 version = "0.1.13"
@@ -2774,9 +2816,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.172"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
 name = "libloading"
@@ -2788,6 +2830,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "libm"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+
 [[package]]
 name = "libredox"
 version = "0.1.3"
@@ -3050,6 +3098,23 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "native-tls"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
 [[package]]
 name = "native_model"
 version = "0.6.1"
@@ -3142,6 +3207,15 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "ntapi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.4.6"
@@ -3338,6 +3412,16 @@ dependencies = [
  "objc2-core-foundation",
 ]
 
+[[package]]
+name = "objc2-io-kit"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71c1c64d6120e51cd86033f67176b1cb66780c2efe34dec55176f77befd93c0a"
+dependencies = [
+ "libc",
+ "objc2-core-foundation",
+]
+
 [[package]]
 name = "objc2-io-surface"
 version = "0.3.1"
@@ -3468,6 +3552,50 @@ dependencies = [
  "pathdiff",
 ]
 
+[[package]]
+name = "openssl"
+version = "0.10.73"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
+dependencies = [
+ "bitflags 2.9.1",
+ "cfg-if",
+ "foreign-types 0.3.2",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -4306,11 +4434,13 @@ dependencies = [
  "http-body-util",
  "hyper 1.6.0",
  "hyper-rustls",
+ "hyper-tls",
  "hyper-util",
  "ipnet",
  "js-sys",
  "log",
  "mime",
+ "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
@@ -4322,6 +4452,7 @@ dependencies = [
  "serde_urlencoded",
  "sync_wrapper 1.0.2",
  "tokio",
+ "tokio-native-tls",
  "tokio-rustls",
  "tokio-util",
  "tower",
@@ -4600,6 +4731,15 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "schannel"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "schemars"
 version = "0.8.22"
@@ -4633,6 +4773,29 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags 2.9.1",
+ "core-foundation 0.9.4",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "selectors"
 version = "0.24.0"
@@ -5002,7 +5165,7 @@ dependencies = [
  "bytemuck",
  "cfg_aliases",
  "core-graphics",
- "foreign-types",
+ "foreign-types 0.5.0",
  "js-sys",
  "log",
  "objc2 0.5.2",
@@ -5190,6 +5353,20 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "sysinfo"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "252800745060e7b9ffb7b2badbd8b31cfa4aa2e61af879d0a3bf2a317c20217d"
+dependencies = [
+ "libc",
+ "memchr",
+ "ntapi",
+ "objc2-core-foundation",
+ "objc2-io-kit",
+ "windows",
+]
+
 [[package]]
 name = "system-configuration"
 version = "0.5.1"
@@ -5302,9 +5479,9 @@ dependencies = [
 
 [[package]]
 name = "tauri"
-version = "2.6.2"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "124e129c9c0faa6bec792c5948c89e86c90094133b0b9044df0ce5f0a8efaa0d"
+checksum = "352a4bc7bf6c25f5624227e3641adf475a6535707451b09bb83271df8b7a6ac7"
 dependencies = [
  "anyhow",
  "bytes",
@@ -5353,9 +5530,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-build"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f025c389d3adb83114bec704da973142e82fc6ec799c7c750c5e21cefaec83"
+checksum = "182d688496c06bf08ea896459bf483eb29cdff35c1c4c115fb14053514303064"
 dependencies = [
  "anyhow",
  "cargo_toml",
@@ -5375,9 +5552,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-codegen"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5df493a1075a241065bc865ed5ef8d0fbc1e76c7afdc0bf0eccfaa7d4f0e406"
+checksum = "b54a99a6cd8e01abcfa61508177e6096a4fe2681efecee9214e962f2f073ae4a"
 dependencies = [
  "base64 0.22.1",
  "brotli",
@@ -5402,9 +5579,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f237fbea5866fa5f2a60a21bea807a2d6e0379db070d89c3a10ac0f2d4649bbc"
+checksum = "7945b14dc45e23532f2ded6e120170bbdd4af5ceaa45784a6b33d250fbce3f9e"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -5584,9 +5761,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "2.7.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e7bb73d1bceac06c20b3f755b2c8a2cb13b20b50083084a8cf3700daf397ba4"
+checksum = "2b1cc885be806ea15ff7b0eb47098a7b16323d9228876afda329e34e2d6c4676"
 dependencies = [
  "cookie",
  "dpi",
@@ -5606,9 +5783,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "2.7.1"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "902b5aa9035e16f342eb64f8bf06ccdc2808e411a2525ed1d07672fa4e780bad"
+checksum = "fe653a2fbbef19fe898efc774bc52c8742576342a33d3d028c189b57eb1d2439"
 dependencies = [
  "gtk",
  "http 1.3.1",
@@ -5633,9 +5810,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41743bbbeb96c3a100d234e5a0b60a46d5aa068f266160862c7afdbf828ca02e"
+checksum = "9330c15cabfe1d9f213478c9e8ec2b0c76dab26bb6f314b8ad1c8a568c1d186e"
 dependencies = [
  "anyhow",
  "brotli",
@@ -5860,6 +6037,16 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-rustls"
 version = "0.26.2"
@@ -6271,6 +6458,12 @@ version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
 
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
 [[package]]
 name = "version-compare"
 version = "0.2.0"

src-tauri/Cargo.toml

@@ -71,6 +71,8 @@ bitcode = "0.6.6"
 reqwest-websocket = "0.5.0"
 futures-lite = "2.6.0"
 page_size = "0.6.0"
+sysinfo = "0.36.1"
+humansize = "2.1.3"
 # tailscale = { path = "./tailscale" }
 
 [dependencies.dynfmt]
@@ -78,7 +80,7 @@ version = "0.1.5"
 features = ["curly"]
 
 [dependencies.tauri]
-version = "2.1.1"
+version = "2.7.0"
 features = ["protocol-asset", "tray-icon"]
 
 [dependencies.tokio]
@@ -104,7 +106,7 @@ features = ["other_errors"] # You can also use "yaml_enc" or "bin_enc"
 [dependencies.reqwest]
 version = "0.12"
 default-features = false
-features = ["json", "http2", "blocking", "rustls-tls-webpki-roots"]
+features = ["json", "http2", "blocking", "rustls-tls", "native-tls-alpn", "rustls-tls-webpki-roots"]
 
 [dependencies.serde]
 version = "1"

src-tauri/src/download_manager/util/progress_object.rs

@@ -26,6 +26,7 @@ pub struct ProgressObject {
     rolling: RollingProgressWindow<250>,
 }
 
+#[derive(Clone)]
 pub struct ProgressHandle {
     progress: Arc<AtomicUsize>,
     progress_object: Arc<ProgressObject>,

src-tauri/src/error/application_download_error.rs

@@ -4,6 +4,7 @@ use std::{
 };
 
 use serde_with::SerializeDisplay;
+use humansize::{format_size, BINARY};
 
 use super::remote_access_error::RemoteAccessError;
 
@@ -11,6 +12,7 @@ use super::remote_access_error::RemoteAccessError;
 #[derive(Debug, SerializeDisplay)]
 pub enum ApplicationDownloadError {
     Communication(RemoteAccessError),
+    DiskFull(u64, u64),
     Checksum,
     Lock,
     IoError(io::ErrorKind),
@@ -20,11 +22,25 @@ pub enum ApplicationDownloadError {
 impl Display for ApplicationDownloadError {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
+            ApplicationDownloadError::DiskFull(required, available) => write!(
+                f,
+                "Game requires {}, {} remaining left on disk.",
+                format_size(*required, BINARY),
+                format_size(*available, BINARY),
+            ),
             ApplicationDownloadError::Communication(error) => write!(f, "{error}"),
-            ApplicationDownloadError::Lock => write!(f, "failed to acquire lock. Something has gone very wrong internally. Please restart the application"),
-            ApplicationDownloadError::Checksum => write!(f, "checksum failed to validate for download"),
+            ApplicationDownloadError::Lock => write!(
+                f,
+                "failed to acquire lock. Something has gone very wrong internally. Please restart the application"
+            ),
+            ApplicationDownloadError::Checksum => {
+                write!(f, "checksum failed to validate for download")
+            }
             ApplicationDownloadError::IoError(error) => write!(f, "io error: {error}"),
-            ApplicationDownloadError::DownloadError => write!(f, "download failed. See Download Manager status for specific error"),
+            ApplicationDownloadError::DownloadError => write!(
+                f,
+                "download failed. See Download Manager status for specific error"
+            ),
         }
     }
 }

src-tauri/src/games/downloads/commands.rs

@@ -5,10 +5,10 @@ use std::{
 
 use crate::{
     database::{db::borrow_db_checked, models::data::GameDownloadStatus},
-    download_manager::{
-        download_manager_frontend::DownloadManagerSignal, downloadable::Downloadable,
-    },
-    error::download_manager_error::DownloadManagerError,
+    download_manager::
+        downloadable::Downloadable
+    ,
+    error::application_download_error::ApplicationDownloadError,
     AppState,
 };
 
@@ -20,26 +20,28 @@ pub fn download_game(
     game_version: String,
     install_dir: usize,
     state: tauri::State<'_, Mutex<AppState>>,
-) -> Result<(), DownloadManagerError<DownloadManagerSignal>> {
+) -> Result<(), ApplicationDownloadError> {
     let sender = state.lock().unwrap().download_manager.get_sender();
-    let game_download_agent = Arc::new(Box::new(GameDownloadAgent::new_from_index(
+    let game_download_agent = GameDownloadAgent::new_from_index(
         game_id,
         game_version,
         install_dir,
         sender,
-    )) as Box<dyn Downloadable + Send + Sync>);
-    Ok(state
-        .lock()
-        .unwrap()
-        .download_manager
-        .queue_download(game_download_agent)?)
+    )?;
+    let game_download_agent = Arc::new(Box::new(game_download_agent) as Box<dyn Downloadable + Send + Sync>);
+    state
+    .lock()
+    .unwrap()
+    .download_manager
+    .queue_download(game_download_agent).unwrap();
+    Ok(())
 }
 
 #[tauri::command]
 pub fn resume_download(
     game_id: String,
     state: tauri::State<'_, Mutex<AppState>>,
-) -> Result<(), DownloadManagerError<DownloadManagerSignal>> {
+) -> Result<(), ApplicationDownloadError> {
     let s = borrow_db_checked()
         .applications
         .game_statuses
@@ -56,17 +58,21 @@ pub fn resume_download(
             install_dir,
         } => (version_name, install_dir),
     };
+
     let sender = state.lock().unwrap().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().to_path_buf(),
         sender,
-    )) as Box<dyn Downloadable + Send + Sync>);
-    Ok(state
-        .lock()
-        .unwrap()
-        .download_manager
-        .queue_download(game_download_agent)?)
+    )?) as Box<dyn Downloadable + Send + Sync>);
+
+    state
+    .lock()
+    .unwrap()
+    .download_manager
+    .queue_download(game_download_agent).unwrap();
+    Ok(())
 }

src-tauri/src/games/downloads/download_agent.rs

@@ -13,13 +13,12 @@ use crate::error::application_download_error::ApplicationDownloadError;
 use crate::error::remote_access_error::RemoteAccessError;
 use crate::games::downloads::manifest::{DropDownloadContext, DropManifest};
 use crate::games::downloads::validate::validate_game_chunk;
-use crate::games::library::{
-    on_game_complete, push_game_update, set_partially_installed,
-};
+use crate::games::library::{on_game_complete, push_game_update, set_partially_installed};
 use crate::games::state::GameStatusManager;
+use crate::process::utils::get_disk_available;
 use crate::remote::requests::make_request;
 use crate::remote::utils::DROP_CLIENT_SYNC;
-use log::{debug, error, info};
+use log::{debug, error, info, warn};
 use rayon::ThreadPoolBuilder;
 use std::collections::HashMap;
 use std::fs::{OpenOptions, create_dir_all};
@@ -35,6 +34,8 @@ use rustix::fs::{FallocateFlags, fallocate};
 use super::download_logic::download_game_chunk;
 use super::drop_data::DropData;
 
+static RETRY_COUNT: usize = 3;
+
 pub struct GameDownloadAgent {
     pub id: String,
     pub version: String,
@@ -54,7 +55,7 @@ impl GameDownloadAgent {
         version: String,
         target_download_dir: usize,
         sender: Sender<DownloadManagerSignal>,
-    ) -> Self {
+    ) -> Result<Self, ApplicationDownloadError> {
         let db_lock = borrow_db_checked();
         let base_dir = db_lock.applications.install_dirs[target_download_dir].clone();
         drop(db_lock);
@@ -66,7 +67,7 @@ impl GameDownloadAgent {
         version: String,
         base_dir: PathBuf,
         sender: Sender<DownloadManagerSignal>,
-    ) -> Self {
+    ) -> Result<Self, ApplicationDownloadError> {
         // Don't run by default
         let control_flag = DownloadThreadControl::new(DownloadThreadControlFlag::Stop);
 
@@ -76,7 +77,7 @@ impl GameDownloadAgent {
         let stored_manifest =
             DropData::generate(id.clone(), version.clone(), data_base_dir_path.clone());
 
-        Self {
+        let result = Self {
             id,
             version,
             control_flag,
@@ -87,7 +88,31 @@ impl GameDownloadAgent {
             sender,
             dropdata: stored_manifest,
             status: Mutex::new(DownloadStatus::Queued),
+        };
+
+        result.ensure_manifest_exists()?;
+
+        let required_space = result
+            .manifest
+            .lock()
+            .unwrap()
+            .as_ref()
+            .unwrap()
+            .values()
+            .map(|e| e.lengths.iter().sum::<usize>())
+            .sum::<usize>()
+            as u64;
+
+        let available_space = get_disk_available(data_base_dir_path)? as u64;
+
+        if required_space > available_space {
+            return Err(ApplicationDownloadError::DiskFull(
+                required_space,
+                available_space,
+            ));
         }
+
+        Ok(result)
     }
 
     // Blocking
@@ -315,15 +340,40 @@ impl GameDownloadAgent {
                 };
 
                 scope.spawn(move |_| {
-                    match download_game_chunk(context, &self.control_flag, progress_handle, request)
-                    {
-                        Ok(true) => {
-                            completed_indexes.push(context.checksum.clone());
-                        }
-                        Ok(false) => {}
-                        Err(e) => {
-                            error!("{e}");
-                            sender.send(DownloadManagerSignal::Error(e)).unwrap();
+                    // 3 attempts
+                    for i in 0..RETRY_COUNT {
+                        let loop_progress_handle = progress_handle.clone();
+                        match download_game_chunk(
+                            context,
+                            &self.control_flag,
+                            loop_progress_handle,
+                            request.try_clone().unwrap(),
+                        ) {
+                            Ok(true) => {
+                                completed_indexes.push(context.checksum.clone());
+                                return;
+                            }
+                            Ok(false) => return,
+                            Err(e) => {
+                                warn!("game download agent error: {e}");
+
+                                let retry = match &e {
+                                    ApplicationDownloadError::Communication(
+                                        _remote_access_error,
+                                    ) => true,
+                                    ApplicationDownloadError::Checksum => true,
+                                    ApplicationDownloadError::Lock => true,
+                                    ApplicationDownloadError::IoError(_error_kind) => false,
+                                    ApplicationDownloadError::DownloadError => false,
+                                    ApplicationDownloadError::DiskFull(_, _) => false,
+                                };
+
+                                if i == RETRY_COUNT - 1 || !retry {
+                                    warn!("retry logic failed, not re-attempting.");
+                                    sender.send(DownloadManagerSignal::Error(e)).unwrap();
+                                    return;
+                                }
+                            }
                         }
                     }
                 });
@@ -452,8 +502,6 @@ impl GameDownloadAgent {
         );
 
         self.dropdata.write();
-
-        
     }
 }
 

src-tauri/src/games/library.rs

@@ -116,7 +116,16 @@ pub fn fetch_library_logic(
         }
         // We should always have a cache of the object
         // Pass db_handle because otherwise we get a gridlock
-        let game = get_cached_object_db::<Game>(&meta.id.clone(), &db_handle)?;
+        let game = match get_cached_object_db::<Game>(&meta.id.clone(), &db_handle) {
+            Ok(game) => game,
+            Err(err) => {
+                warn!(
+                    "{} is installed, but encountered error fetching its error: {}.",
+                    meta.id, err
+                );
+                continue;
+            }
+        };
         games.push(game);
     }
 

src-tauri/src/lib.rs

@@ -363,7 +363,7 @@ pub fn run() {
             let _main_window = tauri::WebviewWindowBuilder::new(
                 &handle,
                 "main", // BTW this is not the name of the window, just the label. Keep this 'main', there are permissions & configs that depend on it
-                tauri::WebviewUrl::App("index.html".into()),
+                tauri::WebviewUrl::App("main".into()),
             )
             .title("Drop Desktop App")
             .min_inner_size(1000.0, 500.0)

src-tauri/src/process/compat.rs

@@ -1 +0,0 @@
-

src-tauri/src/process/mod.rs

@@ -1,6 +1,5 @@
 pub mod commands;
-#[cfg(target_os = "linux")]
-pub mod compat;
 pub mod process_manager;
 pub mod process_handlers;
-pub mod format;
+pub mod format;
+pub mod utils;

src-tauri/src/process/process_handlers.rs

@@ -88,6 +88,7 @@ impl ProcessHandler for AsahiMuvmLauncher {
     }
 
     #[allow(unreachable_code)]
+    #[allow(unused_variables)]
     fn valid_for_platform(&self, _db: &Database, state: &AppState, _target: &Platform) -> bool {
         #[cfg(not(target_os = "linux"))]
         return false;

src-tauri/src/process/process_manager.rs

@@ -336,9 +336,9 @@ impl ProcessManager<'_> {
         use std::os::windows::process::CommandExt;
 
         #[cfg(target_os = "windows")]
-        let mut command = Command::new("cmd");
+        let mut command = Command::new("start");
         #[cfg(target_os = "windows")]
-        command.raw_arg(format!("/C \"{}\"", &launch_string));
+        command.raw_arg(format!("/min cmd /C \"{}\"", &launch_string));
 
         info!("launching (in {install_dir}): {launch_string}",);
 

src-tauri/src/process/utils.rs

@@ -0,0 +1,27 @@
+use std::path::PathBuf;
+
+use futures_lite::io;
+use sysinfo::{Disk, DiskRefreshKind, Disks};
+
+use crate::error::application_download_error::ApplicationDownloadError;
+
+pub fn get_disk_available(mount_point: PathBuf) -> Result<u64, ApplicationDownloadError> {
+    let disks = Disks::new_with_refreshed_list_specifics(DiskRefreshKind::nothing().with_storage());
+
+    let mut disk_iter = disks.into_iter().collect::<Vec<&Disk>>();
+    disk_iter.sort_by(|a, b| {
+        b.mount_point()
+            .to_string_lossy()
+            .len()
+            .cmp(&a.mount_point().to_string_lossy().len())
+    });
+
+    for disk in disk_iter {
+        if mount_point.starts_with(disk.mount_point()) {
+            return Ok(disk.available_space());
+        }
+    }
+    Err(ApplicationDownloadError::IoError(io::Error::other(
+        "could not find disk of path",
+    ).kind()))
+}

src-tauri/src/remote/commands.rs

@@ -8,7 +8,11 @@ use tauri::{AppHandle, Emitter, Manager};
 use url::Url;
 
 use crate::{
-    database::db::{borrow_db_checked, borrow_db_mut_checked}, error::remote_access_error::RemoteAccessError, remote::{auth::generate_authorization_header, requests::make_request, utils::DROP_CLIENT_SYNC}, AppState, AppStatus
+    database::db::{borrow_db_checked, borrow_db_mut_checked}, error::remote_access_error::RemoteAccessError, remote::{
+        auth::generate_authorization_header,
+        requests::make_request,
+        utils::{DROP_CLIENT_SYNC, DROP_CLIENT_WS_CLIENT},
+    }, AppState, AppStatus
 };
 
 use super::{
@@ -18,11 +22,11 @@ use super::{
 };
 
 #[tauri::command]
-pub fn use_remote(
+pub async fn use_remote(
     url: String,
     state: tauri::State<'_, Mutex<AppState<'_>>>,
 ) -> Result<(), RemoteAccessError> {
-    use_remote_logic(url, state)
+    use_remote_logic(url, state).await
 }
 
 #[tauri::command]
@@ -120,10 +124,12 @@ pub fn auth_initiate_code(app: AppHandle) -> Result<String, RemoteAccessError> {
     let code = auth_initiate_logic("code".to_string())?;
     let header_code = code.clone();
 
+    println!("using code: {} to sign in", code);
+
     tauri::async_runtime::spawn(async move {
         let load = async || -> Result<(), RemoteAccessError> {
             let ws_url = base_url.join("/api/v1/client/auth/code/ws")?;
-            let response = reqwest::Client::default()
+            let response = DROP_CLIENT_WS_CLIENT
                 .get(ws_url)
                 .header("Authorization", header_code)
                 .upgrade()

src-tauri/src/remote/utils.rs

@@ -2,6 +2,7 @@ use std::{
     fs::{self, File},
     io::Read,
     sync::{LazyLock, Mutex},
+    time::Duration,
 };
 
 use log::{debug, info, warn};
@@ -21,8 +22,10 @@ struct DropHealthcheck {
     app_name: String,
 }
 
+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_WS_CLIENT: LazyLock<reqwest::Client> = LazyLock::new(get_client_ws);
 
 fn fetch_certificates() -> Vec<Certificate> {
     let certificate_dir = DATA_ROOT_DIR.join("certificates");
@@ -58,24 +61,30 @@ fn fetch_certificates() -> Vec<Certificate> {
 
 pub fn get_client_sync() -> reqwest::blocking::Client {
     let mut client = reqwest::blocking::ClientBuilder::new();
-    
-    let certs = fetch_certificates();
-    for cert in certs {
-        client = client.add_root_certificate(cert);
+
+    for cert in DROP_CERT_BUNDLE.iter() {
+        client = client.add_root_certificate(cert.clone());
     }
-    client.build().unwrap()
+    client.use_rustls_tls().build().unwrap()
 }
 pub fn get_client_async() -> reqwest::Client {
     let mut client = reqwest::ClientBuilder::new();
 
-    let certs = fetch_certificates();
-    for cert in certs {
-        client = client.add_root_certificate(cert);
+    for cert in DROP_CERT_BUNDLE.iter() {
+        client = client.add_root_certificate(cert.clone());
     }
-    client.build().unwrap()
+    client.use_rustls_tls().build().unwrap()
+}
+pub fn get_client_ws() -> reqwest::Client {
+    let mut client = reqwest::ClientBuilder::new();
+
+    for cert in DROP_CERT_BUNDLE.iter() {
+        client = client.add_root_certificate(cert.clone());
+    }
+    client.use_rustls_tls().http1_only().build().unwrap()
 }
 
-pub fn use_remote_logic(
+pub async fn use_remote_logic(
     url: String,
     state: tauri::State<'_, Mutex<AppState<'_>>>,
 ) -> Result<(), RemoteAccessError> {
@@ -84,10 +93,14 @@ pub fn use_remote_logic(
 
     // Test Drop url
     let test_endpoint = base_url.join("/api/v1")?;
-    let client = DROP_CLIENT_SYNC.clone();
-    let response = client.get(test_endpoint.to_string()).send()?;
+    let client = DROP_CLIENT_ASYNC.clone();
+    let response = client
+        .get(test_endpoint.to_string())
+        .timeout(Duration::from_secs(3))
+        .send()
+        .await?;
 
-    let result: DropHealthcheck = response.json()?;
+    let result: DropHealthcheck = response.json().await?;
 
     if result.app_name != "Drop" {
         warn!("user entered drop endpoint that connected, but wasn't identified as Drop");