feat: improvements to jump calculator

README.md

@@ -1,29 +1,21 @@
-# Drop App
+# Drop Desktop Client
 
-Drop app is the companion app for [Drop](https://github.com/Drop-OSS/drop). It uses a Tauri base with Nuxt 3 + TailwindCSS on top of it, so we can re-use components from the web UI.
+The Drop Desktop Client is the companion app for [Drop](https://github.com/Drop-OSS/drop). It is the official & intended way to download and play games on your Drop server.
 
-## Running
+## Internals
-Before setting up the drop app, be sure that you have a server set up. 
-The instructions for this can be found on the [Drop Docs](https://docs.droposs.org/docs/guides/quickstart)
 
-## Current features
+It uses a Tauri base with Nuxt 3 + TailwindCSS on top of it, so we can re-use components from the web UI.
-Currently supported are the following features:
-- Signin (with custom server)
-- Database registering & recovery
-- Dynamic library fetching from server
-- Installing & uninstalling games
-- Download progress monitoring
-- Launching / playing games
 
 ## Development
+Before setting up a development environemnt, be sure that you have a server set up. The instructions for this can be found on the [Drop Docs](https://docs.droposs.org/docs/guides/quickstart).
 
-Install dependencies with `yarn`
+Then, install dependencies with `yarn`. This'll install the custom builder's dependencies. Then, check everything works properly with `yarn tauri build`. 
 
-Run the app in development with `yarn tauri dev`. NVIDIA users on Linux, use shell script `./nvidia-prop-dev.sh`
+Run the app in development with `yarn tauri dev`. NVIDIA users on Linux, use shell script `./nvidia-prop-dev.sh`
 
 To manually specify the logging level, add the environment variable `RUST_LOG=[debug, info, warn, error]` to `yarn tauri dev`:
 
 e.g. `RUST_LOG=debug yarn tauri dev`
 
 ## Contributing
-Check the original [Drop repo](https://github.com/Drop-OSS/drop/blob/main/CONTRIBUTING.md) for contributing guidelines. 
+Check out the contributing guide on our Developer Docs: [Drop Developer Docs - Contributing](https://developer.droposs.org/contributing).

main/app.vue

@@ -1,5 +1,5 @@
 <template>
-    <NuxtLoadingIndicator color="#2563eb" />
+  <NuxtLoadingIndicator color="#2563eb" />
   <NuxtLayout class="select-none w-screen h-screen">
     <NuxtPage />
     <ModalStack />
@@ -7,14 +7,7 @@
 </template>
 
 <script setup lang="ts">
-import "~/composables/downloads.js";
-
 import { invoke } from "@tauri-apps/api/core";
-import { useAppState } from "./composables/app-state.js";
-import {
-  initialNavigation,
-  setupHooks,
-} from "./composables/state-navigation.js";
 
 const router = useRouter();
 

main/components/Header.vue

@@ -2,9 +2,7 @@
   <div class="h-16 bg-zinc-950 flex flex-row justify-between">
     <div class="flex flex-row grow items-center pl-5 pr-2 py-3">
       <div class="inline-flex items-center gap-x-10">
-        <NuxtLink to="/store">
+        <Wordmark class="h-8 mb-0.5" />
-          <Wordmark class="h-8 mb-0.5" />
-        </NuxtLink>
         <nav class="inline-flex items-center mt-0.5">
           <ol class="inline-flex items-center gap-x-6">
             <NuxtLink
@@ -42,7 +40,7 @@
         </ol>
       </div>
     </div>
-    <WindowControl  />
+    <WindowControl />
   </div>
 </template>
 

main/components/HeaderUserWidget.vue

@@ -76,7 +76,6 @@ import { Menu, MenuButton, MenuItem, MenuItems } from "@headlessui/vue";
 import { ChevronDownIcon } from "@heroicons/vue/16/solid";
 import type { NavigationItem } from "../types";
 import HeaderWidget from "./HeaderWidget.vue";
-import { useAppState } from "~/composables/app-state";
 import { invoke } from "@tauri-apps/api/core";
 
 const open = ref(false);

main/components/LibrarySearch.vue

@@ -73,7 +73,7 @@
                   alt=""
                 />
               </div>
-              <div class="inline-flex items-center gap-x-2">
+              <div class="flex flex-col gap-x-2">
                 <p
                   class="text-sm whitespace-nowrap font-display font-semibold"
                 >

main/components/PageWidget.vue

@@ -1,7 +0,0 @@
-<template>
-  <NuxtLink
-    class="inline-flex items-center gap-x-2 px-1 py-0.5 rounded bg-blue-900 text-zinc-100 hover:bg-blue-800"
-  >
-    <slot />
-  </NuxtLink>
-</template>

main/nuxt.config.ts

@@ -9,13 +9,17 @@ export default defineNuxtConfig({
     },
   },
 
-  css: ["~/assets/main.scss"],
-
   ssr: false,
 
-  extends: [["../libs/drop-base"]],
+  extends: ["../shared", "../libs/drop-base"],
 
   app: {
     baseURL: "/main",
-  }
+  },
+
+  devtools: {
+    enabled: false,
+  },
+
+  
 });

main/tailwind.config.js

@@ -7,6 +7,7 @@ export default {
     "./plugins/**/*.{js,ts}",
     "./app.vue",
     "./error.vue",
+    "../shared/components/**/*.vue"
   ],
   theme: {
     extend: {

shared/app.vue

@@ -0,0 +1,50 @@
+<template>
+  <NuxtLoadingIndicator color="#2563eb" />
+  <NuxtLayout class="select-none w-screen h-screen">
+    <NuxtPage />
+    <ModalStack />
+  </NuxtLayout>
+</template>
+
+<script setup lang="ts">
+import "~/composables/downloads.js";
+
+import { invoke } from "@tauri-apps/api/core";
+import { useAppState } from "./composables/app-state.js";
+import {
+  initialNavigation,
+  setupHooks,
+} from "./composables/state-navigation.js";
+
+const router = useRouter();
+
+const state = useAppState();
+
+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 () => {
+  await fetchState();
+});
+
+setupHooks();
+initialNavigation(state);
+
+useHead({
+  title: "Drop",
+});
+</script>

shared/assets/main.scss

@@ -0,0 +1,84 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+html,
+body {
+  -ms-overflow-style: none; /* IE and Edge /
+scrollbar-width: none; / Firefox */
+}
+
+/* Hide scrollbar for Chrome, Safari and Opera */
+html::-webkit-scrollbar {
+  display: none;
+}
+
+$motiva: (
+  ("MotivaSansThin.ttf", "ttf", 100, normal),
+  ("MotivaSansLight.woff.ttf", "woff", 300, normal),
+  ("MotivaSansRegular.woff.ttf", "woff", 400, normal),
+  ("MotivaSansMedium.woff.ttf", "woff", 500, normal),
+  ("MotivaSansBold.woff.ttf", "woff", 600, normal),
+  ("MotivaSansExtraBold.ttf", "woff", 700, normal),
+  ("MotivaSansBlack.woff.ttf", "woff", 900, normal)
+);
+
+$helvetica: (
+  ("Helvetica.woff", "woff", 400, normal),
+  ("Helvetica-Oblique.woff", "woff", 400, italic),
+  ("Helvetica-Bold.woff", "woff", 600, normal),
+  ("Helvetica-BoldOblique.woff", "woff", 600, italic),
+  ("helvetica-light-587ebe5a59211.woff2", "woff2", 300, normal)
+);
+
+@each $file, $format, $weight, $style in $motiva {
+  @font-face {
+    font-family: "Motiva Sans";
+    src: url("/fonts/motiva/#{$file}") format($format);
+    font-weight: $weight;
+    font-style: $style;
+  }
+}
+
+@each $file, $format, $weight, $style in $helvetica {
+  @font-face {
+    font-family: "Helvetica";
+    src: url("/fonts/helvetica/#{$file}") format($format);
+    font-weight: $weight;
+    font-style: $style;
+  }
+}
+
+@font-face {
+  font-family: "Inter";
+  src: url("/fonts/inter/InterVariable.ttf");
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "Inter";
+  src: url("/fonts/inter/InterVariable-Italic.ttf");
+  font-style: italic;
+}
+
+/* ===== Scrollbar CSS ===== */
+/* Firefox */
+* {
+  scrollbar-width: 4px;
+  scrollbar-color: #52525b #00000000;
+}
+
+/* Chrome, Edge, and Safari */
+*::-webkit-scrollbar {
+  width: 4px;
+}
+
+*::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+*::-webkit-scrollbar-thumb {
+  background-color: #52525b;
+  border-radius: 10px;
+  border: 3px solid #52525b;
+}

shared/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");
 };

shared/error.vue

@@ -0,0 +1,91 @@
+<template>
+  <NuxtLayout name="default">
+    <div
+      class="grid min-h-full grid-cols-1 grid-rows-[1fr,auto,1fr] lg:grid-cols-[max(50%,36rem),1fr]"
+    >
+      <header
+        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"
+      >
+        <div class="max-w-lg">
+          <p class="text-base font-semibold leading-8 text-blue-600">
+            {{ error?.statusCode }}
+          </p>
+          <h1
+            class="mt-4 text-3xl font-bold font-display tracking-tight text-zinc-100 sm:text-5xl"
+          >
+            Oh no!
+          </h1>
+          <p
+            v-if="message"
+            class="mt-3 font-bold text-base leading-7 text-red-500"
+          >
+            {{ message }}
+          </p>
+          <p class="mt-6 text-base leading-7 text-zinc-400">
+            An error occurred while responding to your request. If you believe
+            this to be a bug, please report it. Try signing in and see if it
+            resolves the issue.
+          </p>
+          <div class="mt-10">
+            <!-- full app reload to fix errors -->
+            <a
+              href="/store"
+              class="text-sm font-semibold leading-7 text-blue-600"
+              ><span aria-hidden="true">&larr;</span> Back to store</a
+            >
+          </div>
+        </div>
+      </main>
+      <footer class="self-end lg:col-span-2 lg:col-start-1 lg:row-start-3">
+        <div class="border-t border-zinc-700 bg-zinc-900 py-10">
+          <nav
+            class="mx-auto flex w-full max-w-7xl items-center gap-x-4 px-6 text-sm leading-7 text-zinc-400 lg:px-8"
+          >
+            <NuxtLink href="/docs">Documentation</NuxtLink>
+            <svg
+              viewBox="0 0 2 2"
+              aria-hidden="true"
+              class="h-0.5 w-0.5 fill-zinc-600"
+            >
+              <circle cx="1" cy="1" r="1" />
+            </svg>
+            <a href="https://discord.gg/NHx46XKJWA" target="_blank"
+              >Support Discord</a
+            >
+          </nav>
+        </div>
+      </footer>
+      <div
+        class="hidden lg:relative lg:col-start-2 lg:row-start-1 lg:row-end-4 lg:block"
+      >
+        <img
+          src="@/assets/wallpaper.jpg"
+          alt=""
+          class="absolute inset-0 h-full w-full object-cover"
+        />
+      </div>
+    </div>
+  </NuxtLayout>
+</template>
+
+<script setup lang="ts">
+import type { NuxtError } from "#app";
+
+const props = defineProps({
+  error: Object as () => NuxtError,
+});
+
+const statusCode = props.error?.statusCode;
+const message =
+  props.error?.statusMessage ||
+  props.error?.message ||
+  "An unknown error occurred.";
+
+console.error(props.error);
+</script>

shared/nuxt.config.ts

@@ -0,0 +1,25 @@
+// https://nuxt.com/docs/api/configuration/nuxt-config
+export default defineNuxtConfig({
+  compatibilityDate: "2024-04-03",
+
+  postcss: {
+    plugins: {
+      tailwindcss: {},
+      autoprefixer: {},
+    },
+  },
+
+  css: ["~/assets/main.scss"],
+
+  ssr: false,
+
+  extends: [["../libs/drop-base"]],
+
+  app: {
+    baseURL: "/main",
+  },
+
+  devtools: {
+    enabled: false,
+  },
+});

shared/package.json

@@ -0,0 +1,37 @@
+{
+  "name": "view",
+  "private": true,
+  "version": "0.3.3",
+  "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"
+}

shared/tailwind.config.js

@@ -0,0 +1,20 @@
+/** @type {import('tailwindcss').Config} */
+export default {
+  content: [
+    "./components/**/*.{js,vue,ts}",
+    "./layouts/**/*.vue",
+    "./pages/**/*.vue",
+    "./plugins/**/*.{js,ts}",
+    "./app.vue",
+    "./error.vue",
+  ],
+  theme: {
+    extend: {
+      fontFamily: {
+        sans: ["Inter"],
+        display: ["Motiva Sans"],
+      },
+    },
+  },
+  plugins: [require("@tailwindcss/forms"), require('@tailwindcss/typography')],
+};

shared/tsconfig.json

@@ -0,0 +1,5 @@
+{
+  // https://nuxt.com/docs/guide/concepts/typescript
+  "extends": "./.nuxt/tsconfig.json",
+  "exclude": ["src-tauri/**/*"]
+}

shared/types.ts

@@ -0,0 +1,96 @@
+import type { Component } from "vue";
+
+export type NavigationItem = {
+  prefix: string;
+  route: string;
+  label: string;
+};
+
+export type QuickActionNav = {
+  icon: Component;
+  notifications?: number;
+  action: () => Promise<void>;
+};
+
+export type User = {
+  id: string;
+  username: string;
+  admin: boolean;
+  displayName: string;
+  profilePictureObjectId: string;
+};
+
+export type AppState = {
+  status: AppStatus;
+  user?: User;
+};
+
+export type Game = {
+  id: string;
+  mName: string;
+  mShortDescription: string;
+  mDescription: string;
+  mIconObjectId: string;
+  mBannerObjectId: string;
+  mCoverObjectId: string;
+  mImageLibraryObjectIds: string[];
+  mImageCarouselObjectIds: string[];
+};
+
+export type Collection = {
+  id: string;
+  name: string;
+  isDefault: boolean;
+  entries: Array<{ gameId: string; game: Game }>;
+};
+
+export type GameVersion = {
+  launchCommandTemplate: string;
+};
+
+export enum AppStatus {
+  NotConfigured = "NotConfigured",
+  Offline = "Offline",
+  SignedOut = "SignedOut",
+  SignedIn = "SignedIn",
+  SignedInNeedsReauth = "SignedInNeedsReauth",
+  ServerUnavailable = "ServerUnavailable",
+}
+
+export enum GameStatusEnum {
+  Remote = "Remote",
+  Queued = "Queued",
+  Downloading = "Downloading",
+  Validating = "Validating",
+  Installed = "Installed",
+  Updating = "Updating",
+  Uninstalling = "Uninstalling",
+  SetupRequired = "SetupRequired",
+  Running = "Running",
+  PartiallyInstalled = "PartiallyInstalled",
+}
+
+export type GameStatus = {
+  type: GameStatusEnum;
+  version_name?: string;
+  install_dir?: string;
+};
+
+export enum DownloadableType {
+  Game = "Game",
+  Tool = "Tool",
+  DLC = "DLC",
+  Mod = "Mod",
+}
+
+export type DownloadableMetadata = {
+  id: string;
+  version: string;
+  downloadType: DownloadableType;
+};
+
+export type Settings = {
+  autostart: boolean;
+  maxDownloadThreads: number;
+  forceOffline: boolean;
+};

src-tauri/Cargo.toml

@@ -1,101 +1,129 @@
 [package]
 name = "drop-app"
 version = "0.3.3"
-# authors = ["Drop OSS"]
-edition = "2024"
 description = "The client application for the open-source, self-hosted game distribution platform Drop"
-
+authors = ["Drop OSS"]
-[workspace]
+edition = "2024"
-resolver = "3"
-members = ["drop-consts",
-  "drop-database",
-  "drop-downloads",
-  "drop-errors", "drop-library",
-  "drop-native-library",
-  "drop-process",
-  "drop-remote",
-]
 
 # 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"] }
+
 [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"
-# rustflags = ["-C", "target-feature=+aes,+sse2"]
+crate-type = ["staticlib", "cdylib", "rlib"]
+rustflags = ["-C", "target-feature=+aes,+sse2"]
+
+
+[build-dependencies]
+tauri-build = { version = "2.0.0", features = [] }
 
 [dependencies]
-boxcar = "0.2.7"
-dirs = "6.0.0"
-drop-database = { path = "./drop-database" }
-drop-downloads = { path = "./drop-downloads" }
-drop-errors = { path = "./drop-errors" }
-drop-native-library = { path = "./drop-native-library" }
-drop-process = { path = "./drop-process" }
-drop-remote = { path = "./drop-remote" }
-futures-lite = "2.6.0"
-hex = "0.4.3"
-http = "1.1.0"
-known-folders = "1.2.0"
-log = "0.4.22"
-md5 = "0.7.0"
-rayon = "1.10.0"
-regex = "1.11.1"
-reqwest-websocket = "0.5.0"
-serde_json = "1"
-tar = "0.4.44"
-tauri = { version = "2.7.0", features = ["protocol-asset", "tray-icon"] }
-tauri-plugin-autostart = "2.0.0"
-tauri-plugin-deep-link = "2"
-tauri-plugin-dialog = "2"
-tauri-plugin-opener = "2.4.0"
-tauri-plugin-os = "2"
 tauri-plugin-shell = "2.2.1"
-tempfile = "3.19.1"
+serde_json = "1"
-url = "2.5.2"
+rayon = "1.10.0"
 webbrowser = "1.0.2"
-whoami = "1.6.0"
+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"
+cacache = "13.1.0"
+http-serde = "2.1.1"
+reqwest-middleware = "0.4.0"
+reqwest-middleware-cache = "0.1.1"
+deranged = "=0.4.0"
+droplet-rs = "0.7.3"
+gethostname = "1.0.1"
 zstd = "0.13.3"
+tar = "0.4.44"
+rand = "0.9.1"
+regex = "1.11.1"
+tempfile = "3.19.1"
+schemars = "0.8.22"
+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"
+sysinfo = "0.36.1"
+humansize = "2.1.3"
+tokio-util = { version = "0.7.16", features = ["io"] }
+futures-core = "0.3.31"
+bytes = "1.10.1"
+# tailscale = { path = "./tailscale" }
+
+[dependencies.dynfmt]
+version = "0.1.5"
+features = ["curly"]
+
+[dependencies.tauri]
+version = "2.7.0"
+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
 features = [
-  "blocking",
+    "json",
-  "http2",
+    "http2",
-  "json",
+    "blocking",
-  "native-tls-alpn",
+    "rustls-tls",
-  "rustls-tls",
+    "native-tls-alpn",
-  "rustls-tls-native-roots",
+    "rustls-tls-native-roots",
-  "stream",
+    "stream",
 ]
 
-[dependencies.rustix]
-version = "0.38.37"
-features = ["fs"]
-
 [dependencies.serde]
 version = "1"
 features = ["derive", "rc"]
 
-[dependencies.uuid]
-version = "1.10.0"
-features = ["fast-rng", "macro-diagnostics", "v4"]
-
-[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"] }
-
 [profile.release]
 lto = true
-panic = "abort"
 codegen-units = 1
-
+panic = 'abort'

src-tauri/drop-consts/Cargo.toml

@@ -1,7 +0,0 @@
-[package]
-name = "drop-consts"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-dirs = "6.0.0"

src-tauri/drop-consts/src/lib.rs

@@ -1,15 +0,0 @@
-use std::{
-    path::PathBuf,
-    sync::{Arc, LazyLock},
-};
-
-#[cfg(not(debug_assertions))]
-static DATA_ROOT_PREFIX: &'static str = "drop";
-#[cfg(debug_assertions)]
-static DATA_ROOT_PREFIX: &str = "drop-debug";
-
-pub static DATA_ROOT_DIR: LazyLock<&'static PathBuf> =
-    LazyLock::new(|| Box::leak(Box::new(dirs::data_dir().unwrap().join(DATA_ROOT_PREFIX))));
-
-pub static CACHE_DIR: LazyLock<&'static PathBuf> =
-    LazyLock::new(|| Box::leak(Box::new(DATA_ROOT_DIR.join("cache"))));

src-tauri/drop-database/Cargo.toml

@@ -1,21 +0,0 @@
-[package]
-name = "drop-database"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-bitcode = "0.6.7"
-chrono = "0.4.42"
-drop-consts = { path = "../drop-consts" }
-drop-library = { path = "../drop-library" }
-drop-native-library = { path = "../drop-native-library" }
-log = "0.4.28"
-native_model = { git = "https://github.com/Drop-OSS/native_model.git", version = "0.6.4", features = [
-  "rmp_serde_1_3",
-] }
-rustbreak = "2.0.0"
-serde = { version = "1.0.219", features = ["derive"] }
-serde_with = "3.14.0"
-url = "2.5.7"
-whoami = "1.6.1"
-

src-tauri/drop-database/src/lib.rs

@@ -1,34 +0,0 @@
-use std::{mem::ManuallyDrop, sync::LazyLock};
-
-use log::error;
-
-use crate::db::{DBRead, DBWrite, DatabaseImpls, DatabaseInterface};
-
-pub mod db;
-pub mod debug;
-pub mod models;
-pub mod process;
-pub mod runtime_models;
-pub mod drop_data;
-
-pub static DB: LazyLock<DatabaseInterface> = LazyLock::new(DatabaseInterface::set_up_database);
-
-pub fn borrow_db_checked<'a>() -> DBRead<'a> {
-    match DB.borrow_data() {
-        Ok(data) => DBRead(data),
-        Err(e) => {
-            error!("database borrow failed with error {e}");
-            panic!("database borrow failed with error {e}");
-        }
-    }
-}
-
-pub fn borrow_db_mut_checked<'a>() -> DBWrite<'a> {
-    match DB.borrow_data_mut() {
-        Ok(data) => DBWrite(ManuallyDrop::new(data)),
-        Err(e) => {
-            error!("database borrow mut failed with error {e}");
-            panic!("database borrow mut failed with error {e}");
-        }
-    }
-}

src-tauri/drop-database/src/process.rs

@@ -1,46 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Eq, Hash, PartialEq, Serialize, Deserialize, Clone, Copy, Debug)]
-pub enum Platform {
-    Windows,
-    Linux,
-    MacOs,
-}
-
-impl Platform {
-    #[cfg(target_os = "windows")]
-    pub const HOST: Platform = Self::Windows;
-    #[cfg(target_os = "macos")]
-    pub const HOST: Platform = Self::MacOs;
-    #[cfg(target_os = "linux")]
-    pub const HOST: Platform = Self::Linux;
-
-    pub fn is_case_sensitive(&self) -> bool {
-        match self {
-            Self::Windows | Self::MacOs => false,
-            Self::Linux => true,
-        }
-    }
-}
-
-impl From<&str> for Platform {
-    fn from(value: &str) -> Self {
-        match value.to_lowercase().trim() {
-            "windows" => Self::Windows,
-            "linux" => Self::Linux,
-            "mac" | "macos" => Self::MacOs,
-            _ => unimplemented!(),
-        }
-    }
-}
-
-impl From<whoami::Platform> for Platform {
-    fn from(value: whoami::Platform) -> Self {
-        match value {
-            whoami::Platform::Windows => Platform::Windows,
-            whoami::Platform::Linux => Platform::Linux,
-            whoami::Platform::MacOS => Platform::MacOs,
-            _ => unimplemented!(),
-        }
-    }
-}

src-tauri/drop-database/src/runtime_models.rs

@@ -1,28 +0,0 @@
-use bitcode::{Decode, Encode};
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Clone, Debug, Default, Encode, Decode)]
-#[serde(rename_all = "camelCase")]
-pub struct Game {
-    pub id: String,
-    m_name: String,
-    m_short_description: String,
-    m_description: String,
-    // mDevelopers
-    // mPublishers
-    m_icon_object_id: String,
-    m_banner_object_id: String,
-    m_cover_object_id: String,
-    m_image_library_object_ids: Vec<String>,
-    m_image_carousel_object_ids: Vec<String>,
-}
-
-#[derive(Clone, Serialize, Deserialize, Encode, Decode)]
-#[serde(rename_all = "camelCase")]
-pub struct User {
-    id: String,
-    username: String,
-    admin: bool,
-    display_name: String,
-    profile_picture_object_id: String,
-}

src-tauri/drop-downloads/Cargo.toml

@@ -1,16 +0,0 @@
-[package]
-name = "drop-downloads"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-atomic-instant-full = "0.1.0"
-drop-database = { path = "../drop-database" }
-drop-errors = { path = "../drop-errors" }
-# can't depend, cycle
-# drop-native-library = { path = "../drop-native-library" }
-log = "0.4.22"
-parking_lot = "0.12.4"
-serde = "1.0.219"
-tauri = { version = "2.7.0" }
-throttle_my_fn = "0.2.6"

src-tauri/drop-downloads/src/events.rs

@@ -1,24 +0,0 @@
-use drop_database::models::data::DownloadableMetadata;
-use serde::Serialize;
-
-use crate::download_manager_frontend::DownloadStatus;
-
-#[derive(Serialize, Clone)]
-pub struct QueueUpdateEventQueueData {
-    pub meta: DownloadableMetadata,
-    pub status: DownloadStatus,
-    pub progress: f64,
-    pub current: usize,
-    pub max: usize,
-}
-
-#[derive(Serialize, Clone)]
-pub struct QueueUpdateEvent {
-    pub queue: Vec<QueueUpdateEventQueueData>,
-}
-
-#[derive(Serialize, Clone)]
-pub struct StatsUpdateEvent {
-    pub speed: usize,
-    pub time: usize,
-}

src-tauri/drop-downloads/src/lib.rs

@@ -1,7 +0,0 @@
-#![feature(duration_millis_float)]
-
-pub mod download_manager_builder;
-pub mod download_manager_frontend;
-pub mod downloadable;
-pub mod events;
-pub mod util;

src-tauri/drop-errors/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "drop-errors"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-http = "1.3.1"
-humansize = "2.1.3"
-reqwest = "0.12.23"
-reqwest-websocket = "0.5.1"
-serde = { version = "1.0.219", features = ["derive"] }
-serde_with = "3.14.0"
-tauri-plugin-opener = "2.5.0"
-url = "2.5.7"

src-tauri/drop-library/Cargo.toml

@@ -1,11 +0,0 @@
-[package]
-name = "drop-library"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-drop-errors = { path = "../drop-errors" }
-http = "*"
-reqwest = { version = "*", default-features = false }
-serde = { version = "*", default-features = false, features = ["derive"] }
-tauri = "*"

src-tauri/drop-library/src/errors.rs

@@ -1,11 +0,0 @@
-pub enum DropLibraryError {
-    NetworkError(reqwest::Error),
-    ServerError(drop_errors::drop_server_error::ServerError),
-    Unconfigured,
-}
-
-impl From<reqwest::Error> for DropLibraryError {
-    fn from(value: reqwest::Error) -> Self {
-        DropLibraryError::NetworkError(value)
-    }
-}

src-tauri/drop-library/src/game.rs

@@ -1,30 +0,0 @@
-use crate::libraries::LibraryProviderIdentifier;
-
-pub struct LibraryGamePreview {
-    pub library: LibraryProviderIdentifier,
-    pub internal_id: String,
-    pub name: String,
-    pub short_description: String,
-    pub icon: String,
-}
-
-pub struct LibraryGame {
-    pub library: LibraryProviderIdentifier,
-    pub internal_id: String,
-    pub name: String,
-    pub short_description: String,
-    pub md_description: String,
-    pub icon: String,
-}
-
-impl From<LibraryGame> for LibraryGamePreview {
-    fn from(value: LibraryGame) -> Self {
-        LibraryGamePreview {
-            library: value.library,
-            internal_id: value.internal_id,
-            name: value.name,
-            short_description: value.short_description,
-            icon: value.icon,
-        }
-    }
-}

src-tauri/drop-library/src/lib.rs

@@ -1,3 +0,0 @@
-pub mod libraries;
-pub mod game;
-pub mod errors;

src-tauri/drop-library/src/libraries.rs

@@ -1,76 +0,0 @@
-use std::{
-    fmt::Display,
-    hash::{DefaultHasher, Hash, Hasher},
-};
-
-use http::Request;
-use serde::{Deserialize, Serialize, de::DeserializeOwned};
-use tauri::UriSchemeResponder;
-
-use crate::{
-    errors::DropLibraryError,
-    game::{LibraryGame, LibraryGamePreview},
-};
-
-#[derive(Clone, Serialize, Deserialize)]
-pub struct LibraryProviderIdentifier {
-    internal_id: usize,
-    name: String,
-}
-
-impl PartialEq for LibraryProviderIdentifier {
-    fn eq(&self, other: &Self) -> bool {
-        self.internal_id == other.internal_id
-    }
-}
-
-impl Eq for LibraryProviderIdentifier {}
-
-impl Hash for LibraryProviderIdentifier {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.internal_id.hash(state);
-    }
-}
-
-impl Display for LibraryProviderIdentifier {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str(&self.name)
-    }
-}
-
-impl LibraryProviderIdentifier {
-    pub fn str_hash(&self) -> String {
-        let mut hasher = DefaultHasher::new();
-        self.hash(&mut hasher);
-        hasher.finish().to_string()
-    }
-}
-
-pub struct LibraryFetchConfig {
-    pub hard_refresh: bool,
-}
-
-pub trait DropLibraryProvider: Serialize + DeserializeOwned + Sized {
-    fn build(identifier: LibraryProviderIdentifier) -> Self;
-    fn id(&self) -> &LibraryProviderIdentifier;
-    fn load_object(
-        &self,
-        request: Request<Vec<u8>>,
-        responder: UriSchemeResponder,
-    ) -> impl Future<Output = Result<(), DropLibraryError>> + Send;
-
-    fn fetch_library(
-        &self,
-        config: &LibraryFetchConfig,
-    ) -> impl Future<Output = Result<Vec<LibraryGamePreview>, DropLibraryError>> + Send;
-    fn fetch_game(
-        &self,
-        config: &LibraryFetchConfig,
-    ) -> impl Future<Output = Result<LibraryGame, DropLibraryError>> + Send;
-
-    
-
-    fn owns_game(&self, id: &LibraryProviderIdentifier) -> bool {
-        self.id().internal_id == id.internal_id
-    }
-}

src-tauri/drop-native-library/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "drop-native-library"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-bitcode = "*"
-drop-errors = { path = "../drop-errors" }
-drop-library = { path = "../drop-library" }
-drop-remote = { path = "../drop-remote" }
-log = "*"
-serde = { version = "*", features = ["derive"] }
-tauri = "*"
-url = "*"

src-tauri/drop-native-library/src/events.rs

@@ -1,11 +0,0 @@
-use drop_database::models::data::{ApplicationTransientStatus, GameDownloadStatus, GameVersion};
-
-#[derive(serde::Serialize, Clone)]
-pub struct GameUpdateEvent {
-    pub game_id: String,
-    pub status: (
-        Option<GameDownloadStatus>,
-        Option<ApplicationTransientStatus>,
-    ),
-    pub version: Option<GameVersion>,
-}

src-tauri/drop-native-library/src/impls.rs

@@ -1,50 +0,0 @@
-use drop_library::{
-    errors::DropLibraryError, game::{LibraryGame, LibraryGamePreview}, libraries::{DropLibraryProvider, LibraryFetchConfig, LibraryProviderIdentifier}
-};
-use drop_remote::{fetch_object::fetch_object, DropRemoteContext};
-use serde::{Deserialize, Serialize};
-use url::Url;
-
-#[derive(Serialize, Deserialize, Clone)]
-pub struct DropNativeLibraryProvider {
-    identifier: LibraryProviderIdentifier,
-    context: Option<DropRemoteContext>,
-}
-
-impl DropNativeLibraryProvider {
-    pub fn configure(&mut self, base_url: Url) {
-        self.context = Some(DropRemoteContext::new(base_url));
-    }
-}
-
-impl DropLibraryProvider for DropNativeLibraryProvider {
-    fn build(identifier: LibraryProviderIdentifier) -> Self {
-        Self {
-            identifier,
-            context: None,
-        }
-    }
-
-    fn id(&self) -> &LibraryProviderIdentifier {
-        &self.identifier
-    }
-    
-    async fn load_object(&self, request: tauri::http::Request<Vec<u8>>, responder: tauri::UriSchemeResponder) -> Result<(), DropLibraryError> {
-        let context = self.context.as_ref().ok_or(DropLibraryError::Unconfigured)?;
-        fetch_object(context, request, responder).await;
-        Ok(())
-    }
-    
-    async fn fetch_library(
-        &self,
-        config: &LibraryFetchConfig
-    ) -> Result<Vec<LibraryGamePreview>, DropLibraryError> {
-        todo!()
-    }
-    
-    async fn fetch_game(&self, config: &LibraryFetchConfig) -> Result<LibraryGame, DropLibraryError> {
-        todo!()
-    }
-
-    
-}

src-tauri/drop-native-library/src/lib.rs

@@ -1,5 +0,0 @@
-//pub mod collections;
-//pub mod library;
-//pub mod state;
-//pub mod events;
-pub mod impls;

src-tauri/drop-process/Cargo.toml

@@ -1,18 +0,0 @@
-[package]
-name = "drop-process"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-chrono = "0.4.42"
-drop-database = { path = "../drop-database" }
-drop-errors = { path = "../drop-errors" }
-drop-native-library = { path = "../drop-native-library" }
-dynfmt = { version = "0.1.5", features = ["curly"] }
-log = "0.4.28"
-page_size = "0.6.0"
-shared_child = "1.1.1"
-sysinfo = "0.37.0"
-tauri = "2.8.5"
-tauri-plugin-opener = "2.5.0"
-

src-tauri/drop-process/src/lib.rs

@@ -1,4 +0,0 @@
-mod format;
-mod process_handlers;
-pub mod process_manager;
-pub mod utils;

src-tauri/drop-remote/Cargo.toml

@@ -1,20 +0,0 @@
-[package]
-name = "drop-remote"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-bitcode = "0.6.7"
-chrono = "0.4.42"
-drop-consts = { path = "../drop-consts" }
-drop-errors = { path = "../drop-errors" }
-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 = "0.12.23"
-serde = { version = "1.0.220", features = ["derive"] }
-tauri = "2.8.5"
-url = "2.5.7"

src-tauri/drop-remote/src/auth.rs

@@ -1,156 +0,0 @@
-use std::{collections::HashMap, env, sync::Mutex};
-
-use chrono::Utc;
-use drop_errors::{drop_server_error::ServerError, remote_access_error::RemoteAccessError};
-use droplet_rs::ssl::sign_nonce;
-use gethostname::gethostname;
-use log::{debug, error, warn};
-use serde::{Deserialize, Serialize};
-use url::Url;
-
-use crate::{
-    requests::make_authenticated_get, utils::{DROP_CLIENT_ASYNC, DROP_CLIENT_SYNC}, DropRemoteAuth, DropRemoteContext
-};
-
-use super::requests::generate_url;
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-struct CapabilityConfiguration {}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-struct InitiateRequestBody {
-    name: String,
-    platform: String,
-    capabilities: HashMap<String, CapabilityConfiguration>,
-    mode: String,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-struct HandshakeRequestBody {
-    client_id: String,
-    token: String,
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct HandshakeResponse {
-    private: String,
-    certificate: String,
-    id: String,
-}
-
-pub fn generate_authorization_header(context: &DropRemoteContext) -> String {
-    let auth = if let Some(auth) = &context.auth {
-        auth
-    } else {
-        return "".to_owned();
-    };
-    let nonce = Utc::now().timestamp_millis().to_string();
-
-    let signature = sign_nonce(auth.private.clone(), nonce.clone()).unwrap();
-
-    format!("Nonce {} {} {}", auth.client_id, nonce, signature)
-}
-
-pub async fn fetch_user(context: &DropRemoteContext) -> Result<Vec<u8>, RemoteAccessError> {
-    let response =
-        make_authenticated_get(context, generate_url(context, &["/api/v1/client/user"], &[])?).await?;
-    if response.status() != 200 {
-        let err: ServerError = response.json().await?;
-        warn!("{err:?}");
-
-        if err.status_message == "Nonce expired" {
-            return Err(RemoteAccessError::OutOfSync);
-        }
-
-        return Err(RemoteAccessError::InvalidResponse(err));
-    }
-
-    response
-        .bytes()
-        .await
-        .map_err(std::convert::Into::into)
-        .map(|v| v.to_vec())
-}
-
-pub async fn recieve_handshake_logic(
-    context: &mut DropRemoteContext,
-    path: String,
-) -> Result<(), RemoteAccessError> {
-    let path_chunks: Vec<&str> = path.split('/').collect();
-    if path_chunks.len() != 3 {
-        //        app.emit("auth/failed", ()).unwrap();
-        return Err(RemoteAccessError::HandshakeFailed(
-            "failed to parse token".to_string(),
-        ));
-    }
-
-    let client_id = path_chunks.get(1).unwrap();
-    let token = path_chunks.get(2).unwrap();
-    let body = HandshakeRequestBody {
-        client_id: (*client_id).to_string(),
-        token: (*token).to_string(),
-    };
-
-    let endpoint = generate_url(context, &["/api/v1/client/auth/handshake"], &[])?;
-    let client = DROP_CLIENT_ASYNC.clone();
-    let response = client.post(endpoint).json(&body).send().await?;
-    debug!("handshake responsded with {}", response.status().as_u16());
-    if !response.status().is_success() {
-        return Err(RemoteAccessError::InvalidResponse(response.json().await?));
-    }
-    let response_struct: HandshakeResponse = response.json().await?;
-
-    let web_token = {
-        let header = generate_authorization_header(context);
-        let token = client
-            .post(generate_url(context, &["/api/v1/client/user/webtoken"], &[])?)
-            .header("Authorization", header)
-            .send()
-            .await
-            .unwrap();
-
-        token.text().await.unwrap()
-    };
-
-    context.auth = Some(DropRemoteAuth {
-        private: response_struct.private,
-        cert: response_struct.certificate,
-        client_id: response_struct.id,
-        web_token: web_token,
-    });
-
-    Ok(())
-}
-
-pub fn auth_initiate_logic(context: &DropRemoteContext, mode: String) -> Result<String, RemoteAccessError> {
-    let hostname = gethostname();
-
-    let endpoint = generate_url(context, &["/api/v1/client/auth/initiate"], &[])?;
-    let body = InitiateRequestBody {
-        name: format!("{} (Desktop)", hostname.into_string().unwrap()),
-        platform: env::consts::OS.to_string(),
-        capabilities: HashMap::from([
-            ("peerAPI".to_owned(), CapabilityConfiguration {}),
-            ("cloudSaves".to_owned(), CapabilityConfiguration {}),
-        ]),
-        mode,
-    };
-
-    let client = DROP_CLIENT_SYNC.clone();
-    let response = client.post(endpoint.to_string()).json(&body).send()?;
-
-    if response.status() != 200 {
-        let data: ServerError = response.json()?;
-        error!("could not start handshake: {}", data.status_message);
-
-        return Err(RemoteAccessError::HandshakeFailed(data.status_message));
-    }
-
-    let response = response.text()?;
-
-    Ok(response)
-}

src-tauri/drop-remote/src/lib.rs

@@ -1,29 +0,0 @@
-use serde::{Deserialize, Serialize};
-use url::Url;
-
-pub mod auth;
-pub mod cache;
-pub mod fetch_object;
-pub mod requests;
-pub mod utils;
-
-#[derive(Serialize, Deserialize, Clone)]
-struct DropRemoteAuth {
-    private: String,
-    cert: String,
-    client_id: String,
-    web_token: String,
-}
-
-#[derive(Serialize, Deserialize, Clone)]
-pub struct DropRemoteContext {
-    base_url: Url,
-    auth: Option<DropRemoteAuth>,
-}
-
-
-impl DropRemoteContext {
-    pub fn new(base_url: Url) -> Self {
-        DropRemoteContext { base_url, auth: None }
-    }
-}

src-tauri/src/auth.rs

@@ -1,59 +0,0 @@
-use std::sync::Mutex;
-
-use drop_database::{borrow_db_checked, runtime_models::User};
-use drop_errors::remote_access_error::RemoteAccessError;
-use drop_remote::{auth::{fetch_user, recieve_handshake_logic}, cache::{cache_object, clear_cached_object, get_cached_object}};
-use log::warn;
-use tauri::{AppHandle, Emitter as _, Manager as _};
-
-use crate::{AppState, AppStatus};
-
-pub async fn setup() -> (AppStatus, Option<User>) {
-    let auth = {
-        let data = borrow_db_checked();
-        data.auth.clone()
-    };
-
-    if auth.is_some() {
-        let user_result = match fetch_user().await {
-            Ok(data) => data,
-            Err(RemoteAccessError::FetchError(_)) => {
-                let user = get_cached_object::<User>("user").unwrap();
-                return (AppStatus::Offline, Some(user));
-            }
-            Err(_) => return (AppStatus::SignedInNeedsReauth, None),
-        };
-        cache_object("user", &user_result).unwrap();
-        return (AppStatus::SignedIn, Some(user_result));
-    }
-
-    (AppStatus::SignedOut, None)
-}
-
-pub async fn recieve_handshake(app: AppHandle, path: String) {
-    // Tell the app we're processing
-    app.emit("auth/processing", ()).unwrap();
-
-    let handshake_result = recieve_handshake_logic(path).await;
-    if let Err(e) = handshake_result {
-        warn!("error with authentication: {e}");
-        app.emit("auth/failed", e.to_string()).unwrap();
-        return;
-    }
-
-    let app_state = app.state::<Mutex<AppState>>();
-
-    let (app_status, user) = setup().await;
-
-    let mut state_lock = app_state.lock().unwrap();
-
-    state_lock.status = app_status;
-    state_lock.user = user;
-
-    let _ = clear_cached_object("collections");
-    let _ = clear_cached_object("library");
-
-    drop(state_lock);
-
-    app.emit("auth/finished", ()).unwrap();
-}

src-tauri/src/client/autostart.rs

@@ -1,4 +1,4 @@
-use drop_database::{borrow_db_checked, borrow_db_mut_checked};
+use crate::database::db::{borrow_db_checked, borrow_db_mut_checked};
 use log::debug;
 use tauri::AppHandle;
 use tauri_plugin_autostart::ManagerExt;

src-tauri/src/client/cleanup.rs

@@ -4,11 +4,11 @@ use tauri::AppHandle;
 use crate::AppState;
 
 #[tauri::command]
-pub fn quit(app: tauri::AppHandle, state: tauri::State<'_, std::sync::Mutex<AppState>>) {
+pub fn quit(app: tauri::AppHandle, state: tauri::State<'_, std::sync::Mutex<AppState<'_>>>) {
     cleanup_and_exit(&app, &state);
 }
 
-pub fn cleanup_and_exit(app: &AppHandle, state: &tauri::State<'_, std::sync::Mutex<AppState>>) {
+pub fn cleanup_and_exit(app: &AppHandle, state: &tauri::State<'_, std::sync::Mutex<AppState<'_>>>) {
     debug!("cleaning up and exiting application");
     let download_manager = state.lock().unwrap().download_manager.clone();
     match download_manager.ensure_terminated() {

src-tauri/src/client/commands.rs

@@ -2,7 +2,7 @@ use crate::AppState;
 
 #[tauri::command]
 pub fn fetch_state(
-    state: tauri::State<'_, std::sync::Mutex<AppState>>,
+    state: tauri::State<'_, std::sync::Mutex<AppState<'_>>>,
 ) -> Result<String, String> {
     let guard = state.lock().unwrap();
     let cloned_state = serde_json::to_string(&guard.clone()).map_err(|e| e.to_string())?;

src-tauri/src/database/commands.rs

@@ -4,12 +4,17 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use drop_database::{borrow_db_checked, borrow_db_mut_checked, db::DATA_ROOT_DIR, debug::SystemData, models::data::Settings};
-use drop_errors::download_manager_error::DownloadManagerError;
 use serde_json::Value;
 
-use crate::database::scan::scan_install_dirs;
+use crate::{
+    database::{db::borrow_db_mut_checked, scan::scan_install_dirs}, error::download_manager_error::DownloadManagerError,
+};
 
+use super::{
+    db::{borrow_db_checked, DATA_ROOT_DIR},
+    debug::SystemData,
+    models::data::Settings,
+};
 
 // Will, in future, return disk/remaining size
 // Just returns the directories that have been set up

src-tauri/src/database/db.rs

@@ -7,15 +7,23 @@ use std::{
 };
 
 use chrono::Utc;
-use drop_consts::DATA_ROOT_DIR;
 use log::{debug, error, info, warn};
 use rustbreak::{DeSerError, DeSerializer, PathDatabase, RustbreakError};
 use serde::{Serialize, de::DeserializeOwned};
+use url::Url;
 
 use crate::DB;
 
 use super::models::data::Database;
 
+#[cfg(not(debug_assertions))]
+static DATA_ROOT_PREFIX: &'static str = "drop";
+#[cfg(debug_assertions)]
+static DATA_ROOT_PREFIX: &str = "drop-debug";
+
+pub static DATA_ROOT_DIR: LazyLock<Arc<PathBuf>> =
+    LazyLock::new(|| Arc::new(dirs::data_dir().unwrap().join(DATA_ROOT_PREFIX)));
+
 // Custom JSON serializer to support everything we need
 #[derive(Debug, Default, Clone)]
 pub struct DropDatabaseSerializer;
@@ -24,15 +32,16 @@ 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()))
+        native_model::encode(val)
+            .map_err(|e| DeSerError::Internal(e.to_string()))
     }
 
     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::Internal(e.to_string()))?;
+            .map_err(|e| rustbreak::error::DeSerError::Other(e.into()))?;
-        let (val, _version) =
+        let (val, _version) = native_model::decode(buf)
-            native_model::decode(buf).map_err(|e| DeSerError::Internal(e.to_string()))?;
+            .map_err(|e| DeSerError::Internal(e.to_string()))?;
         Ok(val)
     }
 }
@@ -42,6 +51,8 @@ pub type DatabaseInterface =
 
 pub trait DatabaseImpls {
     fn set_up_database() -> DatabaseInterface;
+    fn database_is_set_up(&self) -> bool;
+    fn fetch_base_url(&self) -> Url;
 }
 impl DatabaseImpls for DatabaseInterface {
     fn set_up_database() -> DatabaseInterface {
@@ -66,7 +77,7 @@ impl DatabaseImpls for DatabaseInterface {
                 Err(e) => handle_invalid_database(e, db_path, games_base_dir, cache_dir),
             }
         } else {
-            let default = Database::new(games_base_dir, None);
+            let default = Database::new(games_base_dir, None, cache_dir);
             debug!(
                 "Creating database at path {}",
                 db_path.as_os_str().to_str().unwrap()
@@ -74,6 +85,15 @@ impl DatabaseImpls for DatabaseInterface {
             PathDatabase::create_at_path(db_path, default).expect("Database could not be created")
         }
     }
+
+    fn database_is_set_up(&self) -> bool {
+        !self.borrow_data().unwrap().base_url.is_empty()
+    }
+
+    fn fetch_base_url(&self) -> Url {
+        let handle = self.borrow_data().unwrap();
+        Url::parse(&handle.base_url).unwrap()
+    }
 }
 
 // TODO: Make the error relelvant rather than just assume that it's a Deserialize error
@@ -96,14 +116,15 @@ fn handle_invalid_database(
     let db = Database::new(
         games_base_dir.into_os_string().into_string().unwrap(),
         Some(new_path),
+        cache_dir,
     );
 
     PathDatabase::create_at_path(db_path, db).expect("Database could not be created")
 }
 
 // To automatically save the database upon drop
-pub struct DBRead<'a>(pub(crate) RwLockReadGuard<'a, Database>);
+pub struct DBRead<'a>(RwLockReadGuard<'a, Database>);
-pub struct DBWrite<'a>(pub(crate) ManuallyDrop<RwLockWriteGuard<'a, Database>>);
+pub struct DBWrite<'a>(ManuallyDrop<RwLockWriteGuard<'a, Database>>);
 impl<'a> Deref for DBWrite<'a> {
     type Target = Database;
 
@@ -138,3 +159,23 @@ impl Drop for DBWrite<'_> {
         }
     }
 }
+
+pub fn borrow_db_checked<'a>() -> DBRead<'a> {
+    match DB.borrow_data() {
+        Ok(data) => DBRead(data),
+        Err(e) => {
+            error!("database borrow failed with error {e}");
+            panic!("database borrow failed with error {e}");
+        }
+    }
+}
+
+pub fn borrow_db_mut_checked<'a>() -> DBWrite<'a> {
+    match DB.borrow_data_mut() {
+        Ok(data) => DBWrite(ManuallyDrop::new(data)),
+        Err(e) => {
+            error!("database borrow mut failed with error {e}");
+            panic!("database borrow mut failed with error {e}");
+        }
+    }
+}

src-tauri/src/database/mod.rs

@@ -1,2 +1,5 @@
 pub mod commands;
+pub mod db;
+pub mod debug;
+pub mod models;
 pub mod scan;

src-tauri/src/database/models.rs

@@ -4,11 +4,11 @@ pub mod data {
     use native_model::native_model;
     use serde::{Deserialize, Serialize};
 
-    // NOTE: Within each version, you should NEVER use these types.
+    // 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 = v4::Database;
+    pub type Database = v3::Database;
     pub type Settings = v1::Settings;
     pub type DatabaseAuth = v1::DatabaseAuth;
 
@@ -19,7 +19,7 @@ pub mod data {
      */
     pub type DownloadableMetadata = v1::DownloadableMetadata;
     pub type DownloadType = v1::DownloadType;
-    pub type DatabaseApplications = v4::DatabaseApplications;
+    pub type DatabaseApplications = v2::DatabaseApplications;
     // pub type DatabaseCompatInfo = v2::DatabaseCompatInfo;
 
     use std::collections::HashMap;
@@ -37,11 +37,10 @@ pub mod data {
     }
 
     mod v1 {
+        use crate::process::process_manager::Platform;
         use serde_with::serde_as;
         use std::{collections::HashMap, path::PathBuf};
 
-        use crate::process::Platform;
-
         use super::{Deserialize, Serialize, native_model};
 
         fn default_template() -> String {
@@ -191,9 +190,9 @@ pub mod data {
 
         use serde_with::serde_as;
 
-        use crate::runtime_models::Game;
+        use super::{
-
+            Deserialize, Serialize, native_model, v1,
-        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)]
@@ -275,13 +274,14 @@ pub mod data {
         #[native_model(id = 3, version = 2, with = native_model::rmp_serde_1_3::RmpSerde, from=v1::DatabaseApplications)]
         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>,
 
             #[serde(skip)]
-            pub transient_statuses:
+            pub transient_statuses: HashMap<v1::DownloadableMetadata, v1::ApplicationTransientStatus>,
-                HashMap<v1::DownloadableMetadata, v1::ApplicationTransientStatus>,
         }
         impl From<v1::DatabaseApplications> for DatabaseApplications {
             fn from(value: v1::DatabaseApplications) -> Self {
@@ -302,7 +302,10 @@ pub mod data {
     mod v3 {
         use std::path::PathBuf;
 
-        use super::{Deserialize, Serialize, native_model, v1, v2};
+        use super::{
+            Deserialize, Serialize,
+            native_model, v2, v1,
+        };
         #[native_model(id = 1, version = 3, with = native_model::rmp_serde_1_3::RmpSerde, from = v2::Database)]
         #[derive(Serialize, Deserialize, Clone, Default)]
         pub struct Database {
@@ -332,73 +335,28 @@ pub mod data {
         }
     }
 
-    mod v4 {
-        use std::{collections::HashMap, path::PathBuf};
-        use drop_library::libraries::LibraryProviderIdentifier;
-        use drop_native_library::impls::DropNativeLibraryProvider;
-        use serde_with::serde_as;
-        use crate::models::data::v3;
-        use super::{Deserialize, Serialize, native_model, v1, v2};
-
-        #[derive(Serialize, Deserialize, Clone)]
-        pub enum Library {
-            NativeLibrary(DropNativeLibraryProvider),
-        }
-
-        #[serde_as]
-        #[derive(Serialize, Deserialize, Default, Clone)]
-        #[serde(rename_all = "camelCase")]
-        #[native_model(id = 3, version = 4, with = native_model::rmp_serde_1_3::RmpSerde, from=v2::DatabaseApplications)]
-        pub struct DatabaseApplications {
-            pub install_dirs: Vec<PathBuf>,
-            pub libraries: HashMap<LibraryProviderIdentifier, Library>,
-
-            #[serde(skip)]
-            pub transient_statuses:
-                HashMap<v1::DownloadableMetadata, v1::ApplicationTransientStatus>,
-        }
-
-        impl From<v2::DatabaseApplications> for DatabaseApplications {
-            fn from(value: v2::DatabaseApplications) -> Self {
-                todo!()
-            }
-        }
-
-        #[native_model(id = 1, version = 4, with = native_model::rmp_serde_1_3::RmpSerde, from = v3::Database)]
-        #[derive(Serialize, Deserialize, Default, Clone)]
-        pub struct Database {
-            #[serde(default)]
-            pub settings: v1::Settings,
-            pub drop_applications: DatabaseApplications,
-            #[serde(skip)]
-            pub prev_database: Option<PathBuf>,
-        }
-
-        impl From<v3::Database> for Database {
-            fn from(value: v3::Database) -> Self {
-                Database {
-                    settings: value.settings,
-                    drop_applications: value.applications.into(),
-                    prev_database: value.prev_database,
-                }
-            }
-        }
-    }
-
     impl Database {
         pub fn new<T: Into<PathBuf>>(
             games_base_dir: T,
             prev_database: Option<PathBuf>,
+            cache_dir: PathBuf,
         ) -> Self {
             Self {
-                drop_applications: DatabaseApplications {
+                applications: DatabaseApplications {
                     install_dirs: vec![games_base_dir.into()],
-                    libraries: HashMap::new(),
+                    game_statuses: HashMap::new(),
+                    game_versions: HashMap::new(),
+                    installed_game_version: HashMap::new(),
                     transient_statuses: HashMap::new(),
                 },
                 prev_database,
+                base_url: String::new(),
+                auth: None,
                 settings: Settings::default(),
+                cache_dir,
+                compat_info: None,
             }
         }
+
     }
 }

src-tauri/src/database/scan.rs

@@ -1,9 +1,18 @@
 use std::fs;
 
-use drop_database::{borrow_db_mut_checked, drop_data::{DropData, DROP_DATA_PATH}, models::data::{DownloadType, DownloadableMetadata}};
-use drop_native_library::library::set_partially_installed_db;
 use log::warn;
 
+use crate::{
+    database::{
+        db::borrow_db_mut_checked,
+        models::data::{DownloadType, DownloadableMetadata},
+    },
+    games::{
+        downloads::drop_data::{DropData, DROP_DATA_PATH},
+        library::set_partially_installed_db,
+    },
+};
+
 pub fn scan_install_dirs() {
     let mut db_lock = borrow_db_mut_checked();
     for install_dir in db_lock.applications.install_dirs.clone() {

src-tauri/src/download_manager/commands.rs

@@ -1,8 +1,6 @@
 use std::sync::Mutex;
 
-use drop_database::models::data::DownloadableMetadata;
+use crate::{database::models::data::DownloadableMetadata, AppState};
-
-use crate::AppState;
 
 #[tauri::command]
 pub fn pause_downloads(state: tauri::State<'_, Mutex<AppState>>) {

src-tauri/src/download_manager/download_manager_builder.rs

@@ -7,13 +7,14 @@ use std::{
     thread::{JoinHandle, spawn},
 };
 
-use drop_database::models::data::DownloadableMetadata;
-use drop_errors::application_download_error::ApplicationDownloadError;
 use log::{debug, error, info, warn};
 use tauri::{AppHandle, Emitter};
 
 use crate::{
-    download_manager_frontend::DownloadStatus, events::{QueueUpdateEvent, QueueUpdateEventQueueData, StatsUpdateEvent}
+    database::models::data::DownloadableMetadata,
+    download_manager::download_manager_frontend::DownloadStatus,
+    error::application_download_error::ApplicationDownloadError,
+    games::library::{QueueUpdateEvent, QueueUpdateEventQueueData, StatsUpdateEvent},
 };
 
 use super::{
@@ -29,6 +30,43 @@ use super::{
 pub type DownloadAgent = Arc<Box<dyn Downloadable + Send + Sync>>;
 pub type CurrentProgressObject = Arc<Mutex<Option<Arc<ProgressObject>>>>;
 
+/*
+
+Welcome to the download manager, the most overengineered, glorious piece of bullshit.
+
+The download manager takes a queue of ids and their associated
+DownloadAgents, and then, one-by-one, executes them. It provides an interface
+to interact with the currently downloading agent, and manage the queue.
+
+When the DownloadManager is initialised, it is designed to provide a reference
+which can be used to provide some instructions (the DownloadManagerInterface),
+but other than that, it runs without any sort of interruptions.
+
+It does this by opening up two data structures. Primarily is the command_receiver,
+and mpsc (multi-channel-single-producer) which allows commands to be sent from
+the Interface, and queued up for the Manager to process.
+
+These have been mapped in the DownloadManagerSignal docs.
+
+The other way to interact with the DownloadManager is via the donwload_queue,
+which is just a collection of ids which may be rearranged to suit
+whichever download queue order is required.
+
++----------------------------------------------------------------------------+
+| DO NOT ATTEMPT TO ADD OR REMOVE FROM THE QUEUE WITHOUT USING SIGNALS!!     |
+| THIS WILL CAUSE A DESYNC BETWEEN THE DOWNLOAD AGENT REGISTRY AND THE QUEUE |
+| WHICH HAS NOT BEEN ACCOUNTED FOR                                           |
++----------------------------------------------------------------------------+
+
+This download queue does not actually own any of the DownloadAgents. It is
+simply an id-based reference system. The actual Agents are stored in the
+download_agent_registry HashMap, as ordering is no issue here. This is why
+appending or removing from the download_queue must be done via signals.
+
+Behold, my madness - quexeky
+
+*/
+
 pub struct DownloadManagerBuilder {
     download_agent_registry: HashMap<DownloadableMetadata, DownloadAgent>,
     download_queue: Queue,

src-tauri/src/download_manager/download_manager_frontend.rs

@@ -9,11 +9,14 @@ use std::{
     thread::JoinHandle,
 };
 
-use drop_database::models::data::DownloadableMetadata;
-use drop_errors::application_download_error::ApplicationDownloadError;
 use log::{debug, info};
 use serde::Serialize;
 
+use crate::{
+    database::models::data::DownloadableMetadata,
+    error::application_download_error::ApplicationDownloadError,
+};
+
 use super::{
     download_manager_builder::{CurrentProgressObject, DownloadAgent},
     util::queue::Queue,

src-tauri/src/download_manager/downloadable.rs

@@ -1,9 +1,12 @@
 use std::sync::Arc;
 
-use drop_database::models::data::DownloadableMetadata;
-use drop_errors::application_download_error::ApplicationDownloadError;
 use tauri::AppHandle;
 
+use crate::{
+    database::models::data::DownloadableMetadata,
+    error::application_download_error::ApplicationDownloadError,
+};
+
 use super::{
     download_manager_frontend::DownloadStatus,
     util::{download_thread_control_flag::DownloadThreadControl, progress_object::ProgressObject},

src-tauri/src/download_manager/mod.rs

@@ -1 +1,5 @@
 pub mod commands;
+pub mod download_manager_builder;
+pub mod download_manager_frontend;
+pub mod downloadable;
+pub mod util;

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

@@ -10,7 +10,7 @@ use std::{
 use atomic_instant_full::AtomicInstant;
 use throttle_my_fn::throttle;
 
-use crate::download_manager_frontend::DownloadManagerSignal;
+use crate::download_manager::download_manager_frontend::DownloadManagerSignal;
 
 use super::rolling_progress_updates::RollingProgressWindow;
 

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

@@ -3,7 +3,7 @@ use std::{
     sync::{Arc, Mutex, MutexGuard},
 };
 
-use drop_database::models::data::DownloadableMetadata;
+use crate::database::models::data::DownloadableMetadata;
 
 #[derive(Clone)]
 pub struct Queue {

src-tauri/src/error/drop_server_error.rs

@@ -2,7 +2,7 @@ use serde::Deserialize;
 
 #[derive(Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
-pub struct ServerError {
+pub struct DropServerError {
     pub status_code: usize,
     pub status_message: String,
     // pub message: String,

src-tauri/src/error/remote_access_error.rs

@@ -8,7 +8,7 @@ use http::StatusCode;
 use serde_with::SerializeDisplay;
 use url::ParseError;
 
-use super::drop_server_error::ServerError;
+use super::drop_server_error::DropServerError;
 
 #[derive(Debug, SerializeDisplay)]
 pub enum RemoteAccessError {
@@ -18,7 +18,7 @@ pub enum RemoteAccessError {
     InvalidEndpoint,
     HandshakeFailed(String),
     GameNotFound(String),
-    InvalidResponse(ServerError),
+    InvalidResponse(DropServerError),
     UnparseableResponse(String),
     ManifestDownloadFailed(StatusCode, String),
     OutOfSync,

src-tauri/src/games/collections/collection.rs

@@ -1,7 +1,8 @@
 use bitcode::{Decode, Encode};
-// use drop_database::runtime_models::Game;
 use serde::{Deserialize, Serialize};
 
+use crate::games::library::Game;
+
 pub type Collections = Vec<Collection>;
 
 #[derive(Serialize, Deserialize, Debug, Clone, Default, Encode, Decode)]