feat: redist import

* improve igdb metadata fetching

    * Make sure to get images with reasonable resolution.
      By default the url igdb returns is in "t_thumb" size,
      an image of size 90x90, which is good only for the icon,
      but bad for pretty much else. This commit will make sure
      covers will be of size "t_cover_big", artworks of 1080p
      height (i.e. "t_1080p") and logos will have their original
      size ("t_original"). Maybe "t_logo_med" is more appropriate?

    * Fetch screenshots as well.

    * Use a separate image for icon and for cover.
      icon needs to be a square, and can be of low
      resolution, so the "t_thmb" size is more appropriate
      for him.

    * If there is a storyline for a game use it as a short
      description.

* IDGB -> IGDB

* use the longer text between storyline and description for description

---------

Co-authored-by: udifogiel <udifogiel@proton.me>

app/components/CarouselPagination.vue

@@ -4,9 +4,10 @@
       v-for="(_, i) in amount"
       :key="i"
       :class="[
-        carousel.currentSlide == i ? 'bg-blue-600 w-6' : 'bg-zinc-700 w-3',
+        carousel.currentSlide === i ? 'bg-blue-600 w-6' : 'bg-zinc-700 w-3',
         'transition-all cursor-pointer h-2 rounded-full',
       ]"
+      @click="slideTo(i)"
     />
   </div>
 </template>
@@ -18,8 +19,8 @@ const carousel = inject(injectCarousel)!;
 
 const amount = carousel.maxSlide - carousel.minSlide + 1;
 
-// function slideTo(index: number) {
-//   const offsetIndex = index + carousel.minSlide;
-//   carousel.nav.slideTo(offsetIndex);
-// }
+function slideTo(index: number) {
+  const offsetIndex = index + carousel.minSlide;
+  carousel.nav.slideTo(offsetIndex);
+}
 </script>

app/components/LanguageSelectorListbox.vue

@@ -92,7 +92,7 @@ import type { Locale } from "vue-i18n";
 
 const { showText = true } = defineProps<{ showText?: boolean }>();
 
-const { availableLocales, locale: currLocale, setLocale } = useI18n();
+const { locale: currLocale, setLocale, locales } = useI18n();
 
 function changeLocale(locale: Locale) {
   setLocale(locale);
@@ -102,7 +102,7 @@ function changeLocale(locale: Locale) {
   useHead({
     htmlAttrs: {
       lang: locale,
-      // dir: availableLocales.find((l) => l === locale)?.dir || "ltr",
+      dir: locales.value.find((l) => l.code === locale)?.dir || "ltr",
     },
   });
 }
@@ -150,6 +150,6 @@ const wiredLocale = computed({
   },
 });
 const currentLocaleInformation = computed(() =>
-  availableLocales.find((e) => e == wiredLocale.value),
+  locales.value.find((e) => e.code == wiredLocale.value),
 );
 </script>

app/components/PreloadSelector.vue

@@ -106,7 +106,7 @@ const emit = defineEmits<{
 }>();
 
 const props = defineProps<{
-  value?: string;
+  value?: string | undefined;
   guesses?: Array<{ platform: PlatformRenderable; filename: string }>;
 }>();
 

app/components/Setup/Library.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script setup lang="ts">
-import AdminSourcesPage from "~~/pages/admin/library/sources/index.vue";
+import AdminSourcesPage from "~/pages/admin/library/sources/index.vue";
 
 const complete = defineModel<boolean>({ required: true });
 // Only runs on component load, so it's fine

app/components/StoreView.vue

@@ -1,3 +1,12 @@
+<i18n>
+{
+  "en": {
+    "↓": "↓",
+    "↑": "↑"
+  }
+}
+</i18n>
+
 <template>
   <div>
     <div>
@@ -176,9 +185,12 @@
                           active ? 'bg-zinc-900 outline-hidden' : '',
                           'w-full text-left block px-4 py-2 text-sm',
                         ]"
-                        @click="() => (currentSort = option.param)"
+                        @click.prevent="handleSortClick(option, $event)"
                       >
                         {{ option.name }}
+                        <span v-if="currentSort === option.param">
+                          {{ sortOrder === "asc" ? $t("↑") : $t("↓") }}
+                        </span>
                       </button>
                     </MenuItem>
                   </div>
@@ -298,7 +310,7 @@
             <div
               v-if="games?.length ?? 0 > 0"
               ref="product-grid"
-              class="relative lg:col-span-4 grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-4 xl:grid-cols-6 2xl:grid-cols-7 gap-4"
+              class="relative lg:col-span-4 grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-4 xl:grid-cols-5 2xl:grid-cols-6 gap-4"
             >
               <!-- Your content -->
               <GamePanel
@@ -397,8 +409,13 @@ const sorts: Array<StoreSortOption> = [
     name: "Recently Added",
     param: "recent",
   },
+  {
+    name: "Name",
+    param: "name",
+  },
 ];
 const currentSort = ref(sorts[0].param);
+const sortOrder = ref<"asc" | "desc">("desc");
 
 const options: Array<StoreFilterOption> = [
   ...(tags.length > 0
@@ -474,7 +491,7 @@ async function updateGames(query: string, resetGames: boolean) {
     results: Array<SerializeObject<GameModel>>;
     count: number;
   }>(
-    `/api/v1/store?take=50&skip=${resetGames ? 0 : games.value?.length || 0}&sort=${currentSort.value}${query ? "&" + query : ""}`,
+    `/api/v1/store?take=50&skip=${resetGames ? 0 : games.value?.length || 0}&sort=${currentSort.value}&order=${sortOrder.value}${query ? "&" + query : ""}`,
   );
   if (resetGames) {
     games.value = newValues.results;
@@ -491,6 +508,19 @@ watch(filterQuery, (newUrl) => {
 watch(currentSort, (_) => {
   updateGames(filterQuery.value, true);
 });
+watch(sortOrder, (_) => {
+  updateGames(filterQuery.value, true);
+});
 
 await updateGames(filterQuery.value, true);
+
+function handleSortClick(option: StoreSortOption, event: MouseEvent) {
+  event.stopPropagation();
+  if (currentSort.value === option.param) {
+    sortOrder.value = sortOrder.value === "asc" ? "desc" : "asc";
+  } else {
+    currentSort.value = option.param;
+    sortOrder.value = option.param === "name" ? "asc" : "desc";
+  }
+}
 </script>

app/layouts/default.vue

@@ -1,10 +1,10 @@
 <template>
   <div v-if="!noWrapper" class="flex flex-col w-full min-h-screen bg-zinc-900">
-    <UserHeader class="z-50" hydrate-on-idle />
+    <LazyUserHeader class="z-50" hydrate-on-idle />
     <div class="grow flex">
       <NuxtPage />
     </div>
-    <UserFooter class="z-50" hydrate-on-interaction />
+    <LazyUserFooter class="z-50" hydrate-on-interaction />
   </div>
   <div v-else class="flex w-full min-h-screen bg-zinc-900">
     <NuxtPage />

app/pages/admin/library/g/[id]/import.vue

@@ -134,34 +134,41 @@
         </div>
       </div>
       <!-- setup mode -->
-      <SwitchGroup as="div" class="max-w-lg flex items-center justify-between">
-        <span class="flex flex-grow flex-col">
-          <SwitchLabel
-            as="span"
-            class="text-sm font-medium leading-6 text-zinc-100"
-            passive
-            >{{ $t("library.admin.import.version.setupMode") }}</SwitchLabel
+      <fieldset class="max-w-lg">
+        <legend class="text-sm/6 font-semibold text-white">
+          Select an import mode
+        </legend>
+        <div class="mt-2 grid grid-cols-1 gap-y-6 sm:grid-cols-2 sm:gap-x-4">
+          <label
+            v-for="mode in setupModes"
+            :key="mode.id"
+            :aria-label="mode.title"
+            :aria-description="mode.description"
+            class="cursor-pointer group relative flex rounded-lg border border-white/10 bg-zinc-800/50 p-4 has-checked:bg-blue-500/10 has-checked:outline-2 has-checked:-outline-offset-2 has-checked:outline-blue-500 has-focus-visible:outline-3 has-focus-visible:-outline-offset-1 has-disabled:bg-gray-800 has-disabled:opacity-25"
           >
-          <SwitchDescription as="span" class="text-sm text-zinc-400">{{
-            $t("library.admin.import.version.setupModeDesc")
-          }}</SwitchDescription>
-        </span>
-        <Switch
-          v-model="versionSettings.onlySetup"
-          :class="[
-            versionSettings.onlySetup ? 'bg-blue-600' : 'bg-zinc-800',
-            'relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-blue-600 focus:ring-offset-2',
-          ]"
-        >
-          <span
-            aria-hidden="true"
-            :class="[
-              versionSettings.onlySetup ? 'translate-x-5' : 'translate-x-0',
-              'pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out',
-            ]"
-          />
-        </Switch>
-      </SwitchGroup>
+            <input
+              type="radio"
+              name="mode"
+              :value="mode.id"
+              :checked="versionSettings.onlySetup === mode.value"
+              class="absolute inset-0 appearance-none opacity-0 focus:outline-none"
+              @click="versionSettings.onlySetup = mode.value"
+            />
+            <div class="flex-1">
+              <span class="block text-sm font-medium text-white">{{
+                mode.title
+              }}</span>
+              <span class="mt-1 block text-xs text-zinc-400">{{
+                mode.description
+              }}</span>
+            </div>
+            <CheckCircleIcon
+              class="invisible size-5 text-blue-500 group-has-checked:visible"
+              aria-hidden="true"
+            />
+          </label>
+        </div>
+      </fieldset>
       <!-- launch commands -->
       <div class="relative max-w-3xl">
         <label
@@ -252,7 +259,8 @@
           >Uninstall command</label
         >
         <p class="text-zinc-400 text-xs">
-          Executable to be run on uninstalling a game. Useful for installer-only games.
+          Executable to be run on uninstalling a game. Useful for installer-only
+          games.
         </p>
         <div class="mt-2">
           <div
@@ -301,7 +309,8 @@
           </SwitchDescription>
         </span>
         <Switch
-          v-model="versionSettings.delta"
+          :model-value="versionSettings.delta || false"
+          @update:model-value="(v) => (versionSettings.delta = v)"
           :class="[
             versionSettings.delta ? 'bg-blue-600' : 'bg-zinc-800',
             'relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-blue-600 focus:ring-offset-2',
@@ -460,10 +469,14 @@ import {
 } from "@headlessui/vue";
 import { XCircleIcon } from "@heroicons/vue/16/solid";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
-import { PlusIcon, TrashIcon } from "@heroicons/vue/24/outline";
+import {
+  CheckCircleIcon,
+  PlusIcon,
+  TrashIcon,
+} from "@heroicons/vue/24/outline";
 import { ChevronDownIcon, ChevronUpIcon } from "@heroicons/vue/24/solid";
 import type { SerializeObject } from "nitropack";
-import type { ImportVersion } from "~~/server/api/v1/admin/import/version/index.post";
+import type { ImportGameVersion } from "~~/server/api/v1/admin/import/version/index.post";
 
 definePageMeta({
   layout: "admin",
@@ -474,14 +487,15 @@ const { t } = useI18n();
 const route = useRoute();
 const gameId = route.params.id.toString();
 const versions = await $dropFetch(
-  `/api/v1/admin/import/version?id=${encodeURIComponent(gameId)}`,
+  `/api/v1/admin/import/version?id=${encodeURIComponent(gameId)}&mode=game`,
 );
 const userPlatforms = await useAdminPlatforms();
 const allPlatforms = renderPlatforms(userPlatforms);
 const currentlySelectedVersion = ref(-1);
-const versionSettings = ref<Partial<typeof ImportVersion.infer>>({
-  id: gameId,
+
+const versionSettings = ref<Partial<ImportGameVersion>>({
   launches: [],
+  onlySetup: false,
 });
 
 const versionGuesses =
@@ -489,7 +503,6 @@ const versionGuesses =
     Array<SerializeObject<{ platform: PlatformRenderable; filename: string }>>
   >();
 
-
 function updateLaunchCommand(idx: number, value: string) {
   versionSettings.value.launches![idx].launchCommand = value;
   autosetPlatform(value);
@@ -539,7 +552,7 @@ async function updateCurrentlySelectedVersion(value: number) {
   const options = await $dropFetch(
     `/api/v1/admin/import/version/preload?id=${encodeURIComponent(
       gameId,
-    )}&version=${encodeURIComponent(version)}`,
+    )}&version=${encodeURIComponent(version)}&mode=game`,
   );
   versionGuesses.value = options.map((e) => ({
     ...e,
@@ -555,6 +568,7 @@ async function startImport() {
     body: {
       id: gameId,
       version: versions[currentlySelectedVersion.value],
+      mode: "game",
       ...versionSettings.value,
     },
   });
@@ -571,4 +585,26 @@ function startImport_wrapper() {
       importLoading.value = false;
     });
 }
+
+const setupModes: Array<{
+  id: string;
+  value: boolean;
+  title: string;
+  description: string;
+}> = [
+  {
+    id: "portable",
+    value: false,
+    title: "Portable",
+    description:
+      "This mode is for games that are designed to be launched directly from the install directory. Drop works best with these.",
+  },
+  {
+    id: "setup",
+    value: true,
+    title: "Installer",
+    description:
+      "Also known as 'setup-only', this mode is for installers that modify the system directly, and install to directories like Program Files.",
+  },
+];
 </script>

app/pages/admin/library/index.vue

@@ -158,7 +158,7 @@
             </dl>
             <div class="mt-4 flex flex-col gap-y-1">
               <NuxtLink
-                :href="`/admin/library/g/${entry.id}`"
+                :href="`/admin/library/${entry.urlPrefix}/${entry.id}`"
                 class="w-fit rounded-md bg-zinc-800 px-2.5 py-1.5 text-sm font-semibold text-white shadow-sm hover:bg-zinc-700 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-600"
               >
                 <i18n-t
@@ -221,7 +221,7 @@
             </dl>
             <div class="mt-4 flex flex-col gap-y-1">
               <NuxtLink
-                :href="`/admin/library/r/${entry.id}`"
+                :href="`/admin/library/${entry.urlPrefix}/${entry.id}`"
                 class="w-fit rounded-md bg-zinc-800 px-2.5 py-1.5 text-sm font-semibold text-white shadow-sm hover:bg-zinc-700 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-600"
               >
                 <i18n-t
@@ -261,7 +261,7 @@
                 </p>
                 <p class="mt-3 text-sm md:ml-6 md:mt-0">
                   <NuxtLink
-                    :href="`/admin/library/g/${entry.id}/import`"
+                    :href="`/admin/library/${entry.urlPrefix}/${entry.id}/import`"
                     class="whitespace-nowrap font-medium text-blue-400 hover:text-blue-500"
                   >
                     <i18n-t
@@ -406,6 +406,7 @@ function clientSideTransformation<T, V extends keyof T, K extends string>(
       toImport?: boolean;
       offline?: boolean;
     };
+    urlPrefix: string,
   }
 > {
   return values.map((e) => {
@@ -418,6 +419,7 @@ function clientSideTransformation<T, V extends keyof T, K extends string>(
         notifications: {
           offline: true,
         },
+        urlPrefix: type[0],
       };
     }
 
@@ -433,6 +435,7 @@ function clientSideTransformation<T, V extends keyof T, K extends string>(
       },
       hasNotifications: noVersions || toImport,
       status: "online" as const,
+      urlPrefix: type[0],
     };
   });
 }

app/pages/admin/library/r/[id]/import.vue

@@ -0,0 +1,478 @@
+<template>
+  <div class="flex flex-col gap-y-4">
+    <Listbox
+      as="div"
+      :model-value="currentlySelectedVersion"
+      class="max-w-lg"
+      @update:model-value="(value) => updateCurrentlySelectedVersion(value)"
+    >
+      <ListboxLabel class="block text-sm font-medium leading-6 text-zinc-100">{{
+        $t("library.admin.import.version.version")
+      }}</ListboxLabel>
+      <div class="relative mt-2">
+        <ListboxButton
+          class="relative w-full cursor-default rounded-md bg-zinc-950 py-1.5 pl-3 pr-10 text-left text-zinc-100 shadow-sm ring-1 ring-inset ring-zinc-800 focus:outline-none focus:ring-2 focus:ring-blue-600 sm:text-sm sm:leading-6"
+        >
+          <span v-if="currentlySelectedVersion != -1" class="block truncate">{{
+            versions[currentlySelectedVersion]
+          }}</span>
+          <span v-else class="block truncate text-zinc-600">{{
+            $t("library.admin.import.selectDir")
+          }}</span>
+          <span
+            class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2"
+          >
+            <ChevronUpDownIcon
+              class="h-5 w-5 text-gray-400"
+              aria-hidden="true"
+            />
+          </span>
+        </ListboxButton>
+
+        <transition
+          leave-active-class="transition ease-in duration-100"
+          leave-from-class="opacity-100"
+          leave-to-class="opacity-0"
+        >
+          <ListboxOptions
+            class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-md bg-zinc-900 py-1 text-base shadow-lg ring-1 ring-zinc-800 focus:outline-none sm:text-sm"
+          >
+            <ListboxOption
+              v-for="(version, versionIdx) in versions"
+              :key="version"
+              v-slot="{ active, selected }"
+              as="template"
+              :value="versionIdx"
+            >
+              <li
+                :class="[
+                  active ? 'bg-blue-600 text-white' : 'text-zinc-100',
+                  'relative cursor-default select-none py-2 pl-3 pr-9',
+                ]"
+              >
+                <span
+                  :class="[
+                    selected ? 'font-semibold' : 'font-normal',
+                    'block truncate',
+                  ]"
+                  >{{ version }}</span
+                >
+
+                <span
+                  v-if="selected"
+                  :class="[
+                    active ? 'text-white' : 'text-blue-600',
+                    'absolute inset-y-0 right-0 flex items-center pr-4',
+                  ]"
+                >
+                  <CheckIcon class="h-5 w-5" aria-hidden="true" />
+                </span>
+              </li>
+            </ListboxOption>
+          </ListboxOptions>
+        </transition>
+      </div>
+    </Listbox>
+
+    <div v-if="versionGuesses" class="flex flex-col gap-4">
+      <!-- version name -->
+      <div class="max-w-lg">
+        <label
+          for="startup"
+          class="block text-sm font-medium leading-6 text-zinc-100"
+          >Version name</label
+        >
+        <p class="text-zinc-400 text-xs">
+          Shown to users when selecting what version to install.
+        </p>
+        <div class="mt-2">
+          <input
+            id="name"
+            v-model="versionSettings.name"
+            name="name"
+            type="text"
+            required
+            placeholder="my version name"
+            class="block w-full rounded-md border-0 py-1.5 px-3 bg-zinc-950 disabled:bg-zinc-900/80 text-zinc-100 disabled:text-zinc-400 shadow-sm ring-1 ring-inset ring-zinc-800 disabled:ring-zinc-800 placeholder:text-zinc-400 focus:ring-2 focus:ring-inset focus:ring-blue-600 sm:text-sm sm:leading-6"
+          />
+        </div>
+      </div>
+
+      <!-- install command -->
+      <div class="max-w-lg">
+        <label
+          for="startup"
+          class="block text-sm font-medium leading-6 text-zinc-100"
+          >{{ $t("library.admin.import.version.setupCmd") }}</label
+        >
+        <p class="text-zinc-400 text-xs">
+          {{ $t("library.admin.import.version.setupDesc") }}
+        </p>
+        <div class="mt-2">
+          <div
+            class="flex w-fit rounded-md shadow-sm bg-zinc-950 ring-1 ring-inset ring-zinc-800 focus-within:ring-2 focus-within:ring-inset focus-within:ring-blue-600"
+          >
+            <span
+              class="flex select-none items-center pl-3 text-zinc-500 sm:text-sm"
+            >
+              {{ $t("library.admin.import.version.installDir") }}
+            </span>
+            <PreloadSelector
+              :value="versionSettings.install"
+              :guesses="versionGuesses"
+              @update="(v) => updateInstallCommand(v)"
+            />
+            <input
+              id="startup"
+              v-model="versionSettings.installArgs"
+              type="text"
+              name="startup"
+              class="border-l border-zinc-700 block flex-1 border-0 py-1.5 pl-2 bg-transparent text-zinc-100 placeholder:text-zinc-400 focus:ring-0 sm:text-sm sm:leading-6"
+              placeholder="--setup"
+            />
+          </div>
+        </div>
+      </div>
+      <!-- launch commands -->
+      <div class="relative max-w-3xl">
+        <label
+          for="startup"
+          class="block text-sm font-medium leading-6 text-zinc-100"
+          >{{ $t("library.admin.import.version.launchCmd") }}</label
+        >
+        <p class="text-zinc-400 text-xs">
+          {{ $t("library.admin.import.version.launchDesc") }}
+        </p>
+        <div class="mt-2 ml-4 flex flex-col gap-y-2 items-start">
+          <div
+            v-for="(launch, launchIdx) in versionSettings.launches"
+            :key="launchIdx"
+            class="inline-flex items-center gap-x-2"
+          >
+            <input
+              id="launch-name"
+              v-model="launch.name"
+              type="text"
+              name="launch-name"
+              class="block w-full rounded-md border-0 py-1.5 px-3 bg-zinc-950 disabled:bg-zinc-900/80 text-zinc-100 disabled:text-zinc-400 shadow-sm ring-1 ring-inset ring-zinc-800 disabled:ring-zinc-800 placeholder:text-zinc-400 focus:ring-2 focus:ring-inset focus:ring-blue-600 sm:text-sm sm:leading-6"
+              placeholder="My Launch Command"
+            />
+
+            <div
+              class="flex w-full rounded-md shadow-sm bg-zinc-950 ring-1 ring-inset ring-zinc-800 focus-within:ring-2 focus-within:ring-inset focus-within:ring-blue-600"
+            >
+              <span
+                class="flex select-none items-center pl-3 text-zinc-500 sm:text-sm"
+                >{{ $t("library.admin.import.version.installDir") }}</span
+              >
+              <PreloadSelector
+                :value="launch.launchCommand"
+                :guesses="versionGuesses"
+                @update="(v) => updateLaunchCommand(launchIdx, v)"
+              />
+              <input
+                id="startup"
+                v-model="launch.launchArgs"
+                type="text"
+                name="startup"
+                class="border-l border-zinc-700 block flex-1 border-0 py-1.5 pl-2 bg-transparent text-zinc-100 placeholder:text-zinc-400 focus:ring-0 sm:text-sm sm:leading-6"
+                placeholder="--launch"
+              />
+            </div>
+            <button
+              class="transition bg-zinc-800 rounded-sm aspect-square p-1 text-zinc-600 hover:text-red-600 hover:bg-red-600/20"
+              @click="() => versionSettings.launches!.splice(launchIdx, 1)"
+            >
+              <TrashIcon class="size-5" />
+            </button>
+          </div>
+
+          <p
+            v-if="versionSettings.launches!.length == 0"
+            class="uppercase font-display font-bold text-zinc-500 text-xs"
+          >
+            No launch commands
+          </p>
+
+          <LoadingButton
+            :loading="false"
+            class="inline-flex items-center gap-x-4"
+            @click="
+              () =>
+                versionSettings.launches!.push({
+                  name: '',
+                  description: '',
+                  launchCommand: '',
+                  launchArgs: '',
+                })
+            "
+          >
+            Add new <PlusIcon class="size-5" />
+          </LoadingButton>
+        </div>
+      </div>
+      <!-- uninstall command -->
+      <div class="max-w-lg">
+        <label
+          for="startup"
+          class="block text-sm font-medium leading-6 text-zinc-100"
+          >Uninstall command</label
+        >
+        <p class="text-zinc-400 text-xs">
+          Executable to be run on uninstalling a game. Useful for installer-only
+          games.
+        </p>
+        <div class="mt-2">
+          <div
+            class="flex w-fit rounded-md shadow-sm bg-zinc-950 ring-1 ring-inset ring-zinc-800 focus-within:ring-2 focus-within:ring-inset focus-within:ring-blue-600"
+          >
+            <span
+              class="flex select-none items-center pl-3 text-zinc-500 sm:text-sm"
+            >
+              {{ $t("library.admin.import.version.installDir") }}
+            </span>
+            <PreloadSelector
+              :value="versionSettings.uninstall"
+              :guesses="versionGuesses"
+              @update="(v) => updateUninstallCommand(v)"
+            />
+            <input
+              id="startup"
+              v-model="versionSettings.uninstallArgs"
+              type="text"
+              name="startup"
+              class="border-l border-zinc-700 block flex-1 border-0 py-1.5 pl-2 bg-transparent text-zinc-100 placeholder:text-zinc-400 focus:ring-0 sm:text-sm sm:leading-6"
+              placeholder="--uninstall"
+            />
+          </div>
+        </div>
+      </div>
+
+      <PlatformSelector
+        v-model="versionSettings.platform"
+        class="max-w-lg"
+        :platforms="allPlatforms"
+      >
+        {{ $t("library.admin.import.version.platform") }}
+      </PlatformSelector>
+      <SwitchGroup as="div" class="flex items-center justify-between max-w-lg">
+        <span class="flex flex-grow flex-col">
+          <SwitchLabel
+            as="span"
+            class="text-sm font-medium leading-6 text-zinc-100"
+            passive
+          >
+            {{ $t("library.admin.import.version.updateMode") }}
+          </SwitchLabel>
+          <SwitchDescription as="span" class="text-sm text-zinc-400">
+            {{ $t("library.admin.import.version.updateModeDesc") }}
+          </SwitchDescription>
+        </span>
+        <Switch
+          :model-value="versionSettings.delta || false"
+          :class="[
+            versionSettings.delta ? 'bg-blue-600' : 'bg-zinc-800',
+            'relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-blue-600 focus:ring-offset-2',
+          ]"
+          @update:model-value="(v) => (versionSettings.delta = v)"
+        >
+          <span
+            aria-hidden="true"
+            :class="[
+              versionSettings.delta ? 'translate-x-5' : 'translate-x-0',
+              'pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out',
+            ]"
+          />
+        </Switch>
+      </SwitchGroup>
+      <Disclosure v-slot="{ open }" as="div" class="py-2 max-w-lg">
+        <dt>
+          <DisclosureButton
+            class="border-b border-zinc-600 pb-2 flex w-full items-start justify-between text-left text-zinc-100"
+          >
+            <span class="text-base/7 font-semibold">
+              {{ $t("library.admin.import.version.advancedOptions") }}
+            </span>
+            <span class="ml-6 flex h-7 items-center">
+              <ChevronUpIcon v-if="!open" class="size-6" aria-hidden="true" />
+              <ChevronDownIcon v-else class="size-6" aria-hidden="true" />
+            </span>
+          </DisclosureButton>
+        </dt>
+        <DisclosurePanel
+          as="dd"
+          class="bg-zinc-950/30 p-3 rounded-b-lg mt-2 flex flex-col gap-y-4"
+        >
+          <!-- UMU launcher configuration -->
+
+          <div class="text-zinc-400">
+            {{ $t("library.admin.import.version.noAdv") }}
+          </div>
+        </DisclosurePanel>
+      </Disclosure>
+
+      <LoadingButton
+        class="w-fit"
+        :loading="importLoading"
+        @click="startImport_wrapper"
+      >
+        {{ $t("library.admin.import.import") }}
+      </LoadingButton>
+      <div v-if="importError" class="mt-4 w-fit rounded-md bg-red-600/10 p-4">
+        <div class="flex">
+          <div class="flex-shrink-0">
+            <XCircleIcon class="h-5 w-5 text-red-600" aria-hidden="true" />
+          </div>
+          <div class="ml-3">
+            <h3 class="text-sm font-medium text-red-600">
+              {{ importError }}
+            </h3>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      v-else-if="currentlySelectedVersion != -1"
+      role="status"
+      class="inline-flex text-zinc-100 font-display font-semibold items-center gap-x-4"
+    >
+      {{ $t("library.admin.import.version.loadingVersion") }}
+      <svg
+        aria-hidden="true"
+        class="w-6 h-6 text-transparent animate-spin fill-white"
+        viewBox="0 0 100 101"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+          fill="currentColor"
+        />
+        <path
+          d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+          fill="currentFill"
+        />
+      </svg>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {
+  Listbox,
+  ListboxButton,
+  ListboxLabel,
+  ListboxOption,
+  ListboxOptions,
+  Switch,
+  SwitchDescription,
+  SwitchGroup,
+  SwitchLabel,
+  Disclosure,
+  DisclosureButton,
+  DisclosurePanel,
+} from "@headlessui/vue";
+import { XCircleIcon } from "@heroicons/vue/16/solid";
+import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
+import {
+  PlusIcon,
+  TrashIcon,
+} from "@heroicons/vue/24/outline";
+import { ChevronDownIcon, ChevronUpIcon } from "@heroicons/vue/24/solid";
+import type { SerializeObject } from "nitropack";
+import type { ImportRedistVersion } from "~~/server/api/v1/admin/import/version/index.post";
+
+definePageMeta({
+  layout: "admin",
+});
+
+const router = useRouter();
+const { t } = useI18n();
+const route = useRoute();
+const redistId = route.params.id.toString();
+const versions = await $dropFetch(
+  `/api/v1/admin/import/version?id=${encodeURIComponent(redistId)}&mode=redist`,
+);
+const userPlatforms = await useAdminPlatforms();
+const allPlatforms = renderPlatforms(userPlatforms);
+const currentlySelectedVersion = ref(-1);
+
+const versionSettings = ref<Partial<ImportRedistVersion>>({
+  launches: [],
+});
+
+const versionGuesses =
+  ref<
+    Array<SerializeObject<{ platform: PlatformRenderable; filename: string }>>
+  >();
+
+function updateLaunchCommand(idx: number, value: string) {
+  versionSettings.value.launches![idx].launchCommand = value;
+  autosetPlatform(value);
+}
+
+function updateInstallCommand(value: string) {
+  versionSettings.value.install = value;
+  autosetPlatform(value);
+}
+
+function updateUninstallCommand(value: string) {
+  versionSettings.value.uninstall = value;
+  autosetPlatform(value);
+}
+
+function autosetPlatform(value: string) {
+  if (!versionGuesses.value) return;
+  if (versionSettings.value.platform) return;
+  const guessIndex = versionGuesses.value.findIndex(
+    (e) => e.filename === value,
+  );
+  if (guessIndex == -1) return;
+  versionSettings.value.platform =
+    versionGuesses.value[guessIndex].platform.param;
+}
+
+const importLoading = ref(false);
+const importError = ref<string | undefined>();
+
+async function updateCurrentlySelectedVersion(value: number) {
+  if (currentlySelectedVersion.value == value) return;
+  currentlySelectedVersion.value = value;
+  const version = versions[currentlySelectedVersion.value];
+  const options = await $dropFetch(
+    `/api/v1/admin/import/version/preload?id=${encodeURIComponent(
+      redistId,
+    )}&version=${encodeURIComponent(version)}&mode=redist`,
+  );
+  versionGuesses.value = options.map((e) => ({
+    ...e,
+    platform: allPlatforms.find((v) => v.param === e.platform)!,
+  }));
+  versionSettings.value.name = version;
+}
+
+async function startImport() {
+  if (!versionSettings.value) return;
+  const taskId = await $dropFetch("/api/v1/admin/import/version", {
+    method: "POST",
+    body: {
+      id: redistId,
+      version: versions[currentlySelectedVersion.value],
+      mode: "redist",
+      ...versionSettings.value,
+    },
+  });
+  router.push(`/admin/task/${taskId.taskId}`);
+}
+
+function startImport_wrapper() {
+  importLoading.value = true;
+  startImport()
+    .catch((error) => {
+      importError.value = error.message ?? t("errors.unknown");
+    })
+    .finally(() => {
+      importLoading.value = false;
+    });
+}
+</script>

app/pages/admin/task/index.vue

@@ -163,9 +163,9 @@ const scheduledTasks: {
     name: "",
     description: "",
   },
-  debug: {
-    name: "Debug Task",
-    description: "Does debugging things.",
+  "import:version": {
+    name: "",
+    description: "",
   },
 };
 

app/pages/auth/signin.vue

@@ -44,7 +44,6 @@
 
 <script setup lang="ts">
 import type { AuthMec } from "~~/prisma/client/enums";
-import DropLogo from "~~/components/DropLogo.vue";
 
 const { t } = useI18n();
 const enabledAuths = await $dropFetch("/api/v1/auth");

app/pages/client/authorize/[id].vue

@@ -224,14 +224,14 @@ const scopes = [
     href: "/docs/access/status",
     icon: UserGroupIcon,
   },
-  clientData.capabilities["peerAPI"] && {
+  clientData.capabilities["PeerAPI"] && {
     name: "Access the Drop network",
     description:
       "The client will be able to establish P2P connections with other users to enable features like download aggregation, Remote LAN play and P2P multiplayer.",
     href: "/docs/access/network",
     icon: LockClosedIcon,
   },
-  clientData.capabilities["cloudSaves"] && {
+  clientData.capabilities["CloudSaves"] && {
     name: "Upload and sync cloud saves",
     description:
       "The client will be able to upload new cloud saves, and edit your existing ones.",

app/pages/client/code/index.vue

@@ -105,14 +105,14 @@ function input(index: number) {
 function select(index: number) {
   if (!codeElements.value) return;
   if (index >= codeElements.value.length) return;
-  codeElements.value[index].select();
+  codeElements.value[index]!.select();
 }
 
 function paste(index: number, event: ClipboardEvent) {
   const newCode = event.clipboardData!.getData("text/plain");
   for (let i = 0; i < newCode.length && i < codeLength; i++) {
-    code.value[i] = newCode[i];
-    codeElements.value![i].focus();
+    code.value[i] = newCode[i]!;
+    codeElements.value![i]!.focus();
   }
   event.preventDefault();
 }

app/pages/library/game/[id]/index.vue

@@ -72,7 +72,7 @@
                 {{ $t("store.images") }}
               </h2>
               <div class="relative">
-                <VueCarousel :items-to-show="1">
+                <VueCarousel :items-to-show="1" :wrap-around="true">
                   <VueSlide
                     v-for="image in game.mImageCarouselObjectIds"
                     :key="image"

app/pages/setup.vue

@@ -110,7 +110,7 @@
               >
                 <div>
                   <component
-                    :is="actions[currentAction].page"
+                    :is="actions[currentAction]!.page"
                     v-model="actionsComplete[currentAction]"
                     :token="bearerToken"
                   />

app/pages/store/[id]/index.vue

@@ -190,7 +190,7 @@
             {{ game.mShortDescription }}
           </p>
           <div class="mt-6 py-4 rounded">
-            <VueCarousel :items-to-show="1">
+            <VueCarousel :items-to-show="1" :wrap-around="true">
               <VueSlide
                 v-for="image in game.mImageCarouselObjectIds"
                 :key="image"
@@ -254,7 +254,13 @@ import { StarIcon } from "@heroicons/vue/24/solid";
 import { micromark } from "micromark";
 
 const route = useRoute();
-const gameId = route.params.id.toString();
+const gameId = route.params.id?.toString();
+if (!gameId)
+  throw createError({
+    statusCode: 404,
+    message: "Game not found",
+    fatal: true,
+  });
 
 const user = useUser();
 

eslint.config.mjs

@@ -19,6 +19,7 @@ export default withNuxt([
         },
       ],
       "@intlify/vue-i18n/no-missing-keys": "error",
+      "vue/multi-word-component-names": "off",
     },
     settings: {
       "vue-i18n": {

nuxt.config.ts

@@ -18,6 +18,7 @@ const twemojiJson = module.findPackageJSON(
 if (!twemojiJson) {
   throw new Error("Could not find @discordapp/twemoji package.");
 }
+const svgSrcDir = path.join(path.dirname(twemojiJson), "dist", "svg");
 
 // get drop version
 const dropVersion = getDropVersion();
@@ -74,14 +75,13 @@ export default defineNuxtConfig({
 
   vite: {
     plugins: [
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      tailwindcss() as any,
+      tailwindcss(),
       // only used in dev server, not build because nitro sucks
       // see build hook below
       viteStaticCopy({
         targets: [
           {
-            src: "node_modules/@discordapp/twemoji/dist/svg/*",
+            src: `${svgSrcDir}/*`,
             dest: "twemoji",
           },
         ],
@@ -96,7 +96,7 @@ export default defineNuxtConfig({
       // https://github.com/nuxt/nuxt/issues/18918#issuecomment-1925774964
       // copy emojis to .output/public/twemoji
       const targetDir = path.join(nitro.options.output.publicDir, "twemoji");
-      cpSync(path.join(path.dirname(twemojiJson), "dist", "svg"), targetDir, {
+      cpSync(svgSrcDir, targetDir, {
         recursive: true,
       });
     },
@@ -163,9 +163,11 @@ export default defineNuxtConfig({
 
     tsConfig: {
       compilerOptions: {
+        // Not having these options on is sloppy, but it's a task for later me
         verbatimModuleSyntax: false,
         strictNullChecks: true,
-        exactOptionalPropertyTypes: true,
+        exactOptionalPropertyTypes: false,
+        //erasableSyntaxOnly: true,
         noUncheckedIndexedAccess: false,
       },
     },
@@ -261,6 +263,7 @@ export default defineNuxtConfig({
           "https://www.giantbomb.com",
           "https://images.pcgamingwiki.com",
           "https://images.igdb.com",
+          "https://*.steamstatic.com",
         ],
       },
       strictTransportSecurity: false,

package.json

@@ -21,10 +21,9 @@
   },
   "dependencies": {
     "@discordapp/twemoji": "^16.0.1",
-    "@drop-oss/droplet": "3.0.1",
+    "@drop-oss/droplet": "3.2.0",
     "@headlessui/vue": "^1.7.23",
     "@heroicons/vue": "^2.1.5",
-    "@lobomfz/prismark": "0.0.3",
     "@nuxt/fonts": "^0.11.0",
     "@nuxt/image": "^1.10.0",
     "@nuxtjs/i18n": "^9.5.5",
@@ -33,14 +32,14 @@
     "@vueuse/nuxt": "13.6.0",
     "argon2": "^0.43.0",
     "arktype": "^2.1.10",
-    "axios": "^1.7.7",
+    "axios": "^1.12.0",
     "bcryptjs": "^3.0.2",
     "cheerio": "^1.0.0",
     "cookie-es": "^2.0.0",
     "fast-fuzzy": "^1.12.0",
     "file-type-mime": "^0.4.3",
     "jdenticon": "^3.3.0",
-    "jsdom": "^26.1.0",
+    "jsdom": "^27.0.0",
     "luxon": "^3.6.1",
     "micromark": "^4.0.1",
     "normalize-url": "^8.0.2",
@@ -48,7 +47,7 @@
     "nuxt-security": "2.2.0",
     "pino": "^9.7.0",
     "pino-pretty": "^13.0.0",
-    "prisma": "^6.14.0",
+    "prisma": "^6.11.1",
     "sanitize-filename": "^1.6.3",
     "semver": "^7.7.1",
     "stream-mime-type": "^2.0.0",
@@ -88,5 +87,8 @@
       "vue3-carousel": "^0.16.0"
     }
   },
+  "prisma": {
+    "schema": "./prisma"
+  },
   "packageManager": "pnpm@10.15.0+sha512.486ebc259d3e999a4e8691ce03b5cac4a71cbeca39372a9b762cb500cfdf0873e2cb16abe3d951b1ee2cf012503f027b98b6584e4df22524e0c7450d9ec7aa7b"
 }

pnpm-workspace.yaml

@@ -1,4 +1,8 @@
 onlyBuiltDependencies:
+  - '@prisma/client'
+  - '@prisma/engines'
+  - '@tailwindcss/oxide'
   - esbuild
+  - prisma
 
 shamefullyHoist: true

prisma.config.ts

@@ -1,6 +0,0 @@
-import { defineConfig } from "prisma/config";
-import path from "node:path";
-
-export default defineConfig({
-  schema: path.join("prisma", "schema.prisma"),
-});

prisma/migrations/20250918184144_add_steam_metadata/migration.sql

@@ -0,0 +1,8 @@
+-- AlterEnum
+ALTER TYPE "MetadataSource" ADD VALUE 'Steam';
+
+-- DropIndex
+DROP INDEX "GameTag_name_idx";
+
+-- CreateIndex
+CREATE INDEX "GameTag_name_idx" ON "GameTag" USING GIST ("name" gist_trgm_ops(siglen=32));

prisma/migrations/20250925223539_add_pre_and_post_install_for_redist_version/migration.sql

@@ -0,0 +1,41 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[installRId]` on the table `LaunchOption` will be added. If there are existing duplicate values, this will fail.
+  - A unique constraint covering the columns `[uninstallRId]` on the table `LaunchOption` will be added. If there are existing duplicate values, this will fail.
+  - A unique constraint covering the columns `[installId]` on the table `RedistVersion` will be added. If there are existing duplicate values, this will fail.
+  - A unique constraint covering the columns `[uninstallId]` on the table `RedistVersion` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- DropIndex
+DROP INDEX "public"."GameTag_name_idx";
+
+-- AlterTable
+ALTER TABLE "public"."LaunchOption" ADD COLUMN     "installRId" TEXT,
+ADD COLUMN     "uninstallRId" TEXT;
+
+-- AlterTable
+ALTER TABLE "public"."RedistVersion" ADD COLUMN     "installId" TEXT,
+ADD COLUMN     "onlySetup" BOOLEAN NOT NULL DEFAULT false,
+ADD COLUMN     "uninstallId" TEXT;
+
+-- CreateIndex
+CREATE INDEX "GameTag_name_idx" ON "public"."GameTag" USING GIST ("name" gist_trgm_ops(siglen=32));
+
+-- CreateIndex
+CREATE UNIQUE INDEX "LaunchOption_installRId_key" ON "public"."LaunchOption"("installRId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "LaunchOption_uninstallRId_key" ON "public"."LaunchOption"("uninstallRId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "RedistVersion_installId_key" ON "public"."RedistVersion"("installId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "RedistVersion_uninstallId_key" ON "public"."RedistVersion"("uninstallId");
+
+-- AddForeignKey
+ALTER TABLE "public"."RedistVersion" ADD CONSTRAINT "RedistVersion_installId_fkey" FOREIGN KEY ("installId") REFERENCES "public"."LaunchOption"("launchId") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "public"."RedistVersion" ADD CONSTRAINT "RedistVersion_uninstallId_fkey" FOREIGN KEY ("uninstallId") REFERENCES "public"."LaunchOption"("launchId") ON DELETE SET NULL ON UPDATE CASCADE;

prisma/migrations/20250925225034_add_delta_versioning_to_redist/migration.sql

@@ -0,0 +1,15 @@
+/*
+  Warnings:
+
+  - Added the required column `versionIndex` to the `RedistVersion` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- DropIndex
+DROP INDEX "public"."GameTag_name_idx";
+
+-- AlterTable
+ALTER TABLE "public"."RedistVersion" ADD COLUMN     "delta" BOOLEAN NOT NULL DEFAULT false,
+ADD COLUMN     "versionIndex" INTEGER NOT NULL;
+
+-- CreateIndex
+CREATE INDEX "GameTag_name_idx" ON "public"."GameTag" USING GIST ("name" gist_trgm_ops(siglen=32));

prisma/models/content.prisma

@@ -49,6 +49,11 @@ model LaunchOption {
     uninstallGId      String?      @unique
     uninstallGVersion GameVersion? @relation(name: "uninstall")
 
+    installRId        String?        @unique
+    installRVersion   RedistVersion? @relation(name: "install_redist")
+    uninstallRId      String?        @unique
+    uninstallRVersion RedistVersion? @relation(name: "uninstall_redist")
+
     name        String
     description String
 
@@ -125,8 +130,17 @@ model RedistVersion {
     versionId String  @id
     version   Version @relation(fields: [versionId], references: [versionId], onDelete: Cascade, onUpdate: Cascade)
 
+    installId   String?       @unique
+    install     LaunchOption? @relation(name: "install_redist", fields: [installId], references: [launchId])
+    uninstallId String?       @unique
+    uninstall   LaunchOption? @relation(name: "uninstall_redist", fields: [uninstallId], references: [launchId])
+    onlySetup   Boolean       @default(false)
+
     launches LaunchOption[]
 
+    versionIndex Int
+    delta        Boolean @default(false)
+
     gameDependees GameVersion[]
     dlcDependees  DLCVersion[]
 

prisma/models/metadata.prisma

@@ -5,6 +5,7 @@ enum MetadataSource {
   IGDB
   Metacritic
   OpenCritic
+  Steam
 }
 
 model Game {

prisma/schema.prisma

@@ -10,15 +10,6 @@ generator client {
   binaryTargets   = ["native", "debian-openssl-3.0.x"]
 }
 
-/**
- * generator arktype {
- * provider    = "yarn prismark"
- * output      = "./validate"
- * fileName    = "schema.ts"
- * nullish     = true
- * }
- */
-
 datasource db {
   provider = "postgresql"
   url      = env("DATABASE_URL")

server/api/v1/admin/game/image/index.delete.ts

@@ -42,10 +42,10 @@ export default defineEventHandler<{
   await objectHandler.deleteAsSystem(imageId);
 
   if (game.mBannerObjectId === imageId) {
-    game.mBannerObjectId = game.mImageLibraryObjectIds[0];
+    game.mBannerObjectId = game.mImageLibraryObjectIds[0] ?? "";
   }
   if (game.mCoverObjectId === imageId) {
-    game.mCoverObjectId = game.mImageLibraryObjectIds[0];
+    game.mCoverObjectId = game.mImageLibraryObjectIds[0] ?? "";
   }
 
   const result = await prisma.game.update({

server/api/v1/admin/import/version/index.get.ts

@@ -1,29 +1,33 @@
+import { ArkErrors, type } from "arktype";
 import aclManager from "~~/server/internal/acls";
 import prisma from "~~/server/internal/db/database";
-import libraryManager from "~~/server/internal/library";
+import libraryManager, { VersionImportModes } from "~~/server/internal/library";
+
+export const PreloadQuery = type({
+  id: "string",
+  mode: type.enumerated(...VersionImportModes),
+});
 
 export default defineEventHandler(async (h3) => {
   const allowed = await aclManager.allowSystemACL(h3, ["import:version:read"]);
   if (!allowed) throw createError({ statusCode: 403 });
 
-  const query = await getQuery(h3);
-  const gameId = query.id?.toString();
-  if (!gameId)
-    throw createError({
-      statusCode: 400,
-      message: "Missing id in request params",
-    });
+  const rawQuery = await getQuery(h3);
+  const query = PreloadQuery(rawQuery);
+  if (query instanceof ArkErrors)
+    throw createError({ statusCode: 400, message: query.summary });
 
-  const game = await prisma.game.findUnique({
-    where: { id: gameId },
-    select: { libraryId: true, libraryPath: true },
-  });
-  if (!game || !game.libraryId)
-    throw createError({ statusCode: 404, message: "Game not found" });
+  const value: { libraryId: string; libraryPath: string } | undefined =
+    await // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (prisma[query.mode] as any).findUnique({
+      where: { id: query.id },
+      select: { libraryId: true, libraryPath: true },
+    });
+  if (!value) throw createError({ statusCode: 404, message: "Not found" });
 
   const unimportedVersions = await libraryManager.fetchUnimportedGameVersions(
-    game.libraryId,
-    game.libraryPath,
+    value.libraryId,
+    value.libraryPath,
   );
   if (!unimportedVersions)
     throw createError({ statusCode: 400, message: "Invalid game ID" });

server/api/v1/admin/import/version/index.post.ts

@@ -1,9 +1,7 @@
 import { type } from "arktype";
 import { readDropValidatedBody, throwingArktype } from "~~/server/arktype";
 import aclManager from "~~/server/internal/acls";
-import prisma from "~~/server/internal/db/database";
 import libraryManager from "~~/server/internal/library";
-import { convertIDToLink } from "~~/server/internal/platform/link";
 
 export const LaunchCommands = type({
   name: "string > 0",
@@ -12,14 +10,18 @@ export const LaunchCommands = type({
   launchArgs: "string = ''",
 }).array();
 
-export const ImportVersion = type({
+const ImportVersionBase = type({
   id: "string",
   version: "string",
   name: "string?",
 
   platform: "string",
-  onlySetup: "boolean = false",
   delta: "boolean = false",
+});
+
+const ImportGameVersion = type({
+  mode: "'game'",
+  onlySetup: "boolean = false",
   umuId: "string = ''",
 
   install: "string?",
@@ -27,7 +29,26 @@ export const ImportVersion = type({
   launches: LaunchCommands,
   uninstall: "string?",
   uninstallArgs: "string?",
-}).configure(throwingArktype);
+});
+
+const ImportRedistVersion = type({
+  mode: "'redist'",
+  install: "string?",
+  installArgs: "string?",
+  launches: LaunchCommands,
+  uninstall: "string?",
+  uninstallArgs: "string?",
+});
+
+export const ImportVersion = ImportVersionBase.and(
+  ImportGameVersion.or(ImportRedistVersion),
+).configure(throwingArktype);
+
+export type ImportGameVersion = typeof ImportVersionBase.infer &
+  typeof ImportGameVersion.infer;
+
+export type ImportRedistVersion = typeof ImportVersionBase.infer &
+  typeof ImportRedistVersion.infer;
 
 export default defineEventHandler(async (h3) => {
   const allowed = await aclManager.allowSystemACL(h3, ["import:version:new"]);
@@ -35,43 +56,6 @@ export default defineEventHandler(async (h3) => {
 
   const body = await readDropValidatedBody(h3, ImportVersion);
 
-  const platform = await convertIDToLink(body.platform);
-  if (!platform)
-    throw createError({ statusCode: 400, message: "Invalid platform." });
-
-  if (body.delta) {
-    const validOverlayVersions = await prisma.gameVersion.count({
-      where: {
-        version: {
-          gameId: body.id,
-        },
-        delta: false,
-        platform,
-      },
-    });
-    if (validOverlayVersions == 0)
-      throw createError({
-        statusCode: 400,
-        message:
-          "Update mode requires a pre-existing version for this platform.",
-      });
-  }
-
-  if (body.onlySetup) {
-    if (!body.install)
-      throw createError({
-        statusCode: 400,
-        message: 'Install required in "setup mode".',
-      });
-  } else {
-    if (!body.delta && body.launches.length == 0)
-      throw createError({
-        statusCode: 400,
-        message:
-          "At least one launch command is required for non-delta versions",
-      });
-  }
-
   // startup & delta require more complex checking logic
   const taskId = await libraryManager.importVersion(
     body.id,

server/api/v1/admin/import/version/preload.get.ts

@@ -1,22 +1,26 @@
+import { ArkErrors, type } from "arktype";
 import aclManager from "~~/server/internal/acls";
-import libraryManager from "~~/server/internal/library";
+import libraryManager, { VersionImportModes } from "~~/server/internal/library";
+
+export const PreloadQuery = type({
+  id: "string",
+  version: "string",
+  mode: type.enumerated(...VersionImportModes),
+});
 
 export default defineEventHandler(async (h3) => {
   const allowed = await aclManager.allowSystemACL(h3, ["import:version:read"]);
   if (!allowed) throw createError({ statusCode: 403 });
 
-  const query = await getQuery(h3);
-  const gameId = query.id?.toString();
-  const versionName = query.version?.toString();
-  if (!gameId || !versionName)
-    throw createError({
-      statusCode: 400,
-      message: "Missing id or version in request params",
-    });
+  const rawQuery = await getQuery(h3);
+  const query = PreloadQuery(rawQuery);
+  if (query instanceof ArkErrors)
+    throw createError({ statusCode: 400, message: query.summary });
 
   const preload = await libraryManager.fetchUnimportedVersionInformation(
-    gameId,
-    versionName,
+    query.id,
+    query.mode,
+    query.version,
   );
   if (!preload)
     throw createError({

server/api/v1/admin/task/index.post.ts

@@ -2,11 +2,10 @@ import { type } from "arktype";
 import { readDropValidatedBody, throwingArktype } from "~~/server/arktype";
 import aclManager from "~~/server/internal/acls";
 import taskHandler from "~~/server/internal/tasks";
-import type { TaskGroup } from "~~/server/internal/tasks/group";
-import { taskGroups } from "~~/server/internal/tasks/group";
+import { TASK_GROUPS } from "~~/server/internal/tasks/group";
 
 const StartTask = type({
-  taskGroup: type("string"),
+  taskGroup: type.enumerated(...TASK_GROUPS),
 }).configure(throwingArktype);
 
 export default defineEventHandler(async (h3) => {
@@ -14,14 +13,8 @@ export default defineEventHandler(async (h3) => {
   if (!allowed) throw createError({ statusCode: 403 });
 
   const body = await readDropValidatedBody(h3, StartTask);
-  const taskGroup = body.taskGroup as TaskGroup;
-  if (!taskGroups[taskGroup])
-    throw createError({
-      statusCode: 400,
-      message: "Invalid task group.",
-    });
 
-  const task = await taskHandler.runTaskGroupByName(taskGroup);
+  const task = await taskHandler.runTaskGroupByName(body.taskGroup);
   if (!task)
     throw createError({
       statusCode: 500,

server/api/v1/client/auth/initiate.post.ts

@@ -1,20 +1,20 @@
 import { type } from "arktype";
+import type { ClientCapabilities } from "~~/prisma/client/enums";
 import { readDropValidatedBody, throwingArktype } from "~~/server/arktype";
 import type {
   CapabilityConfiguration,
-  InternalClientCapability,
 } from "~~/server/internal/clients/capabilities";
 import capabilityManager, {
   validCapabilities,
 } from "~~/server/internal/clients/capabilities";
-import clientHandler, { AuthMode } from "~~/server/internal/clients/handler";
+import clientHandler, { AuthModes } from "~~/server/internal/clients/handler";
 import { parsePlatform } from "~~/server/internal/utils/parseplatform";
 
 const ClientAuthInitiate = type({
   name: "string",
   platform: "string",
   capabilities: "object",
-  mode: type.valueOf(AuthMode).default(AuthMode.Callback),
+  mode: type.enumerated(...AuthModes).default("callback"),
 }).configure(throwingArktype);
 
 export default defineEventHandler(async (h3) => {
@@ -32,7 +32,7 @@ export default defineEventHandler(async (h3) => {
     });
 
   const capabilityIterable = Object.entries(capabilities) as Array<
-    [InternalClientCapability, object]
+    [ClientCapabilities, object]
   >;
   if (
     capabilityIterable.length > 0 &&

server/api/v1/client/capability/index.post.ts

@@ -1,39 +1,22 @@
-import type { InternalClientCapability } from "~~/server/internal/clients/capabilities";
-import capabilityManager, {
-  validCapabilities,
-} from "~~/server/internal/clients/capabilities";
+import { type } from "arktype";
+import { ClientCapabilities } from "~~/prisma/client/enums";
+import { readDropValidatedBody, throwingArktype } from "~~/server/arktype";
+import capabilityManager from "~~/server/internal/clients/capabilities";
 import { defineClientEventHandler } from "~~/server/internal/clients/event-handler";
 import notificationSystem from "~~/server/internal/notifications";
 
+const SetCapability = type({
+  capability: type.enumerated(...Object.values(ClientCapabilities)),
+  configuration: "object"
+}).configure(throwingArktype);
+
 export default defineClientEventHandler(
   async (h3, { clientId, fetchClient, fetchUser }) => {
-    const body = await readBody(h3);
-    const rawCapability = body.capability;
-    const configuration = body.configuration;
-
-    if (!rawCapability || typeof rawCapability !== "string")
-      throw createError({
-        statusCode: 400,
-        message: "capability must be a string",
-      });
-
-    if (!configuration || typeof configuration !== "object")
-      throw createError({
-        statusCode: 400,
-        message: "configuration must be an object",
-      });
-
-    const capability = rawCapability as InternalClientCapability;
-
-    if (!validCapabilities.includes(capability))
-      throw createError({
-        statusCode: 400,
-        message: "Invalid capability.",
-      });
+    const body = await readDropValidatedBody(h3, SetCapability);
 
     const isValid = await capabilityManager.validateCapabilityConfiguration(
-      capability,
-      configuration,
+      body.capability,
+      body.configuration,
     );
     if (!isValid)
       throw createError({
@@ -42,8 +25,8 @@ export default defineClientEventHandler(
       });
 
     await capabilityManager.upsertClientCapability(
-      capability,
-      configuration,
+      body.capability,
+      body.configuration,
       clientId,
     );
 
@@ -51,9 +34,9 @@ export default defineClientEventHandler(
     const user = await fetchUser();
 
     await notificationSystem.push(user.id, {
-      nonce: `capability-${clientId}-${capability}`,
-      title: `"${client.name}" can now access ${capability}`,
-      description: `A device called "${client.name}" now has access to your ${capability}.`,
+      nonce: `capability-${clientId}-${body.capability}`,
+      title: `"${client.name}" can now access ${body.capability}`,
+      description: `A device called "${client.name}" now has access to your ${body.capability}.`,
       actions: ["Review|/account/devices"],
       acls: ["user:clients:read"],
     });

server/api/v1/store/index.get.ts

@@ -17,7 +17,8 @@ const StoreRead = type({
   company: "string?",
   companyActions: "string = 'published,developed'",
 
-  sort: "'default' | 'newest' | 'recent' = 'default'",
+  sort: "'default' | 'newest' | 'recent' | 'name' = 'default'",
+  order: "'asc' | 'desc' = 'desc'",
 });
 
 export default defineEventHandler(async (h3) => {
@@ -101,10 +102,13 @@ export default defineEventHandler(async (h3) => {
   switch (options.sort) {
     case "default":
     case "newest":
-      sort.mReleased = "desc";
+      sort.mReleased = options.order;
       break;
     case "recent":
-      sort.created = "desc";
+      sort.created = options.order;
+      break;
+    case "name":
+      sort.mName = options.order;
       break;
   }
 

server/internal/clients/ca.ts

@@ -24,7 +24,7 @@ export class CertificateAuthority {
     let ca;
     if (root === undefined) {
       const [cert, priv] = droplet.generateRootCa();
-      const bundle: CertificateBundle = { priv, cert };
+      const bundle: CertificateBundle = { priv: priv!, cert: cert! };
       await store.store("ca", bundle);
       ca = new CertificateAuthority(store, bundle);
     } else {
@@ -50,8 +50,8 @@ export class CertificateAuthority {
       caCertificate.priv,
     );
     const certBundle: CertificateBundle = {
-      priv,
-      cert,
+      priv: priv!,
+      cert: cert!,
     };
     return certBundle;
   }

server/internal/clients/capabilities.ts

@@ -2,28 +2,18 @@ import type { EnumDictionary } from "../utils/types";
 import prisma from "../db/database";
 import { ClientCapabilities } from "~~/prisma/client/enums";
 
-// These values are technically mapped to the database,
-// but Typescript/Prisma doesn't let me link them
-// They are also what are required by clients in the API
-// BREAKING CHANGE
-export enum InternalClientCapability {
-  PeerAPI = "peerAPI",
-  UserStatus = "userStatus",
-  CloudSaves = "cloudSaves",
-  TrackPlaytime = "trackPlaytime",
-}
 
-export const validCapabilities = Object.values(InternalClientCapability);
+export const validCapabilities = Object.values(ClientCapabilities);
 
 export type CapabilityConfiguration = {
-  [InternalClientCapability.PeerAPI]: object;
-  [InternalClientCapability.UserStatus]: object;
-  [InternalClientCapability.CloudSaves]: object;
+  [ClientCapabilities.PeerAPI]: object;
+  [ClientCapabilities.UserStatus]: object;
+  [ClientCapabilities.CloudSaves]: object;
 };
 
 class CapabilityManager {
   private validationFunctions: EnumDictionary<
-    InternalClientCapability,
+    ClientCapabilities,
     (configuration: object) => Promise<boolean>
   > = {
     /*
@@ -77,14 +67,14 @@ class CapabilityManager {
       return valid;
     },
     */
-    [InternalClientCapability.PeerAPI]: async () => true,
-    [InternalClientCapability.UserStatus]: async () => true, // No requirements for user status
-    [InternalClientCapability.CloudSaves]: async () => true, // No requirements for cloud saves
-    [InternalClientCapability.TrackPlaytime]: async () => true,
+    [ClientCapabilities.PeerAPI]: async () => true,
+    [ClientCapabilities.UserStatus]: async () => true, // No requirements for user status
+    [ClientCapabilities.CloudSaves]: async () => true, // No requirements for cloud saves
+    [ClientCapabilities.TrackPlaytime]: async () => true,
   };
 
   async validateCapabilityConfiguration(
-    capability: InternalClientCapability,
+    capability: ClientCapabilities,
     configuration: object,
   ) {
     const validationFunction = this.validationFunctions[capability];
@@ -93,15 +83,15 @@ class CapabilityManager {
   }
 
   async upsertClientCapability(
-    capability: InternalClientCapability,
+    capability: ClientCapabilities,
     rawCapabilityConfiguration: object,
     clientId: string,
   ) {
     const upsertFunctions: EnumDictionary<
-      InternalClientCapability,
+      ClientCapabilities,
       () => Promise<void> | void
     > = {
-      [InternalClientCapability.PeerAPI]: async function () {
+      [ClientCapabilities.PeerAPI]: async function () {
         // const configuration =rawCapability as CapabilityConfiguration[InternalClientCapability.PeerAPI];
 
         const currentClient = await prisma.client.findUnique({
@@ -139,10 +129,10 @@ class CapabilityManager {
           },
         });
       },
-      [InternalClientCapability.UserStatus]: function (): Promise<void> | void {
+      [ClientCapabilities.UserStatus]: function (): Promise<void> | void {
         throw new Error("Function not implemented.");
       },
-      [InternalClientCapability.CloudSaves]: async function () {
+      [ClientCapabilities.CloudSaves]: async function () {
         const currentClient = await prisma.client.findUnique({
           where: { id: clientId },
           select: {
@@ -162,7 +152,7 @@ class CapabilityManager {
           },
         });
       },
-      [InternalClientCapability.TrackPlaytime]: async function () {
+      [ClientCapabilities.TrackPlaytime]: async function () {
         const currentClient = await prisma.client.findUnique({
           where: { id: clientId },
           select: {

server/internal/clients/handler.ts

@@ -1,18 +1,15 @@
 import { randomUUID } from "node:crypto";
 import prisma from "../db/database";
-import type { HardwarePlatform } from "~~/prisma/client/enums";
+import type { ClientCapabilities, HardwarePlatform } from "~~/prisma/client/enums";
 import { useCertificateAuthority } from "~~/server/plugins/ca";
 import type {
   CapabilityConfiguration,
-  InternalClientCapability,
 } from "./capabilities";
 import capabilityManager from "./capabilities";
 import type { PeerImpl } from "../tasks";
 
-export enum AuthMode {
-  Callback = "callback",
-  Code = "code",
-}
+export const AuthModes = ["callback", "code"] as const;
+export type AuthMode = (typeof AuthModes)[number];
 
 export interface ClientMetadata {
   name: string;
@@ -62,9 +59,9 @@ export class ClientHandler {
     });
 
     switch (metadata.mode) {
-      case AuthMode.Callback:
+      case "callback":
         return `/client/authorize/${clientId}`;
-      case AuthMode.Code: {
+      case "code": {
         const code = randomUUID()
           .replaceAll(/-/g, "")
           .slice(0, 7)
@@ -171,7 +168,7 @@ export class ClientHandler {
       metadata.data.capabilities,
     )) {
       await capabilityManager.upsertClientCapability(
-        capability as InternalClientCapability,
+        capability as ClientCapabilities,
         configuration,
         client.id,
       );

server/internal/library/index.ts

@@ -17,7 +17,19 @@ import type { ImportVersion } from "~~/server/api/v1/admin/import/version/index.
 import type {
   GameVersionCreateInput,
   LaunchOptionCreateManyInput,
+  VersionCreateArgs,
+  VersionWhereInput,
 } from "~~/prisma/client/models";
+import type { PlatformLink } from "~~/prisma/client/client";
+import { convertIDToLink } from "../platform/link";
+
+export const VersionImportModes = ["game", "redist"] as const;
+export type VersionImportMode = (typeof VersionImportModes)[number];
+
+const modeToLink: { [key in VersionImportMode]: string } = {
+  game: "g",
+  redist: "r",
+};
 
 export function createGameImportTaskId(libraryId: string, libraryPath: string) {
   return createHash("md5")
@@ -207,20 +219,155 @@ class LibraryManager {
     return await this.fetchLibraryObjectWithStatus(redists);
   }
 
+  private async fetchLibraryPath(
+    id: string,
+    mode: VersionImportMode,
+    platform?: PlatformLink,
+  ): Promise<
+    | [
+        { mName: string; libraryId: string; libraryPath: string } | null,
+        VersionWhereInput,
+      ]
+    | undefined
+  > {
+    switch (mode) {
+      case "game":
+        return [
+          await prisma.game.findUnique({
+            where: { id },
+            select: { mName: true, libraryId: true, libraryPath: true },
+          }),
+          { gameId: id, gameVersions: { some: { platform } } },
+        ];
+      case "redist":
+        return [
+          await prisma.redist.findUnique({
+            where: { id },
+            select: { mName: true, libraryId: true, libraryPath: true },
+          }),
+          { redistId: id },
+        ];
+    }
+    return undefined;
+  }
+
+  private createVersionOptions(
+    id: string,
+    currentIndex: number,
+    metadata: typeof ImportVersion.infer,
+  ): Partial<VersionCreateArgs["data"]> {
+    const installCreator = {
+      install: {
+        create: {
+          name: "",
+          description: "",
+          command: metadata.install!,
+          args: metadata.installArgs || "",
+        },
+      },
+    } satisfies Partial<GameVersionCreateInput>;
+
+    const uninstallCreator = {
+      uninstall: {
+        create: {
+          name: "",
+          description: "",
+          command: metadata.uninstall!,
+          args: metadata.uninstallArgs || "",
+        },
+      },
+    } satisfies Partial<GameVersionCreateInput>;
+
+    switch (metadata.mode) {
+      case "game": {
+        return {
+          gameId: id,
+          gameVersions: {
+            create: {
+              versionIndex: currentIndex,
+              delta: metadata.delta,
+              umuIdOverride: metadata.umuId,
+
+              onlySetup: metadata.onlySetup,
+
+              launches: {
+                createMany: {
+                  data: metadata.launches.map(
+                    (v) =>
+                      ({
+                        name: v.name,
+                        description: v.description,
+                        command: v.launchCommand,
+                        args: v.launchArgs,
+                      }) satisfies LaunchOptionCreateManyInput,
+                  ),
+                },
+              },
+
+              ...(metadata.install ? installCreator : undefined),
+              ...(metadata.uninstall ? uninstallCreator : undefined),
+
+              platform: {
+                connect: {
+                  id: metadata.platform,
+                },
+              },
+            },
+          },
+        };
+      }
+      case "redist":
+        return {
+          redistId: id,
+          redistVersions: {
+            create: {
+              versionIndex: currentIndex,
+              delta: metadata.delta,
+
+              launches: {
+                createMany: {
+                  data: metadata.launches.map(
+                    (v) =>
+                      ({
+                        name: v.name,
+                        description: v.description,
+                        command: v.launchCommand,
+                        args: v.launchArgs,
+                      }) satisfies LaunchOptionCreateManyInput,
+                  ),
+                },
+              },
+
+              ...(metadata.install ? installCreator : undefined),
+              ...(metadata.uninstall ? uninstallCreator : undefined),
+
+              platform: {
+                connect: {
+                  id: metadata.platform,
+                },
+              },
+            },
+          },
+        };
+    }
+  }
+
   /**
    * Fetches recommendations and extra data about the version. Doesn't actually check if it's been imported.
-   * @param gameId
-   * @param versionName
+   * @param id
+   * @param version
    * @returns
    */
-  async fetchUnimportedVersionInformation(gameId: string, versionName: string) {
-    const game = await prisma.game.findUnique({
-      where: { id: gameId },
-      select: { libraryPath: true, libraryId: true, mName: true },
-    });
-    if (!game || !game.libraryId) return undefined;
+  async fetchUnimportedVersionInformation(
+    id: string,
+    mode: VersionImportMode,
+    version: string,
+  ) {
+    const value = await this.fetchLibraryPath(id, mode);
+    if (!value?.[0] || !value[0].libraryId) return undefined;
+    const [libraryDetails] = value;
 
-    const library = this.libraries.get(game.libraryId);
+    const library = this.libraries.get(libraryDetails.libraryId);
     if (!library) return undefined;
 
     const userPlatforms = await prisma.userPlatform.findMany({});
@@ -253,7 +400,10 @@ class LibraryManager {
       match: number;
     }> = [];
 
-    const files = await library.versionReaddir(game.libraryPath, versionName);
+    const files = await library.versionReaddir(
+      libraryDetails.libraryPath,
+      version,
+    );
     for (const filename of files) {
       const basename = path.basename(filename);
       const dotLocation = filename.lastIndexOf(".");
@@ -262,7 +412,7 @@ class LibraryManager {
       for (const [platform, checkExts] of Object.entries(fileExts)) {
         for (const checkExt of checkExts) {
           if (checkExt != ext) continue;
-          const fuzzyValue = fuzzy(basename, game.mName);
+          const fuzzyValue = fuzzy(basename, libraryDetails.mName);
           options.push({
             filename,
             platform,
@@ -301,32 +451,70 @@ class LibraryManager {
   */
 
   async importVersion(
-    gameId: string,
-    versionPath: string,
+    id: string,
+    version: string,
     metadata: typeof ImportVersion.infer,
   ) {
-    const taskId = createVersionImportTaskId(gameId, versionPath);
+    const taskId = createVersionImportTaskId(id, version);
 
-    const game = await prisma.game.findUnique({
-      where: { id: gameId },
-      select: { mName: true, libraryId: true, libraryPath: true },
+    if (metadata.mode === "game") {
+      if (metadata.onlySetup) {
+        if (!metadata.install)
+          throw createError({
+            statusCode: 400,
+            message: "An install command is required in only-setup mode.",
+          });
+      } else {
+        if (!metadata.delta && metadata.launches.length == 0)
+          throw createError({
+            statusCode: 400,
+            message:
+              "At least one launch command is required in non-delta, non-setup mode.",
+          });
+      }
+    }
+
+    const platform = await convertIDToLink(metadata.platform);
+    if (!platform)
+      throw createError({ statusCode: 400, message: "Invalid platform." });
+
+    const value = await this.fetchLibraryPath(id, metadata.mode, platform);
+    if (!value || !value[0])
+      throw createError({
+        statusCode: 400,
+        message: `${metadata.mode} not found.`,
+      });
+    const [libraryDetails, idFilter] = value;
+
+    const library = this.libraries.get(libraryDetails.libraryId);
+    if (!library)
+      throw createError({
+        statusCode: 500,
+        message: "Library not found but exists in database?",
+      });
+
+    const currentIndex = await prisma.version.count({
+      where: { ...idFilter },
     });
-    if (!game || !game.libraryId) return undefined;
 
-    const library = this.libraries.get(game.libraryId);
-    if (!library) return undefined;
+    if (metadata.delta && currentIndex == 0)
+      throw createError({
+        statusCode: 400,
+        message:
+          "At least one pre-existing version of the same platform is required for delta mode.",
+      });
 
     taskHandler.create({
       id: taskId,
       taskGroup: "import:game",
-      name: `Importing version "${metadata.name}" (${versionPath}) for ${game.mName}`,
+      name: `Importing version "${metadata.name}" (${version}) for ${libraryDetails.mName}`,
       acls: ["system:import:version:read"],
       async run({ progress, logger }) {
         // First, create the manifest via droplet.
         // This takes up 90% of our progress, so we wrap it in a *0.9
         const manifest = await library.generateDropletManifest(
-          game.libraryPath,
-          versionPath,
+          libraryDetails.libraryPath,
+          version,
           (err, value) => {
             if (err) throw err;
             progress(value * 0.9);
@@ -339,82 +527,24 @@ class LibraryManager {
 
         logger.info("Created manifest successfully!");
 
-        const currentIndex = await prisma.gameVersion.count({
-          where: { version: { gameId: gameId } },
-        });
-
-        const installCreator = {
-          install: {
-            create: {
-              name: "",
-              description: "",
-              command: metadata.install!,
-              args: metadata.installArgs || "",
-            },
-          },
-        } satisfies Partial<GameVersionCreateInput>;
-
-        const uninstallCreator = {
-          uninstall: {
-            create: {
-              name: "",
-              description: "",
-              command: metadata.uninstall!,
-              args: metadata.uninstallArgs || "",
-            },
-          },
-        } satisfies Partial<GameVersionCreateInput>;
-
         // Then, create the database object
         await prisma.version.create({
           data: {
-            gameId,
-            versionPath: versionPath,
-            versionName: metadata.name ?? versionPath,
+            versionPath: version,
+            versionName: metadata.name ?? version,
             dropletManifest: manifest,
 
-            gameVersions: {
-              create: {
-                versionIndex: currentIndex,
-                delta: metadata.delta,
-                umuIdOverride: metadata.umuId,
-
-                onlySetup: metadata.onlySetup,
-
-                launches: {
-                  createMany: {
-                    data: metadata.launches.map(
-                      (v) =>
-                        ({
-                          name: v.name,
-                          description: v.description,
-                          command: v.launchCommand,
-                          args: v.launchArgs,
-                        }) satisfies LaunchOptionCreateManyInput,
-                    ),
-                  },
-                },
-
-                ...(metadata.install ? installCreator : undefined),
-                ...(metadata.uninstall ? uninstallCreator : undefined),
-
-                platform: {
-                  connect: {
-                    id: metadata.platform,
-                  },
-                },
-              },
-            },
+            ...libraryManager.createVersionOptions(id, currentIndex, metadata),
           },
         });
 
         logger.info("Successfully created version!");
 
         notificationSystem.systemPush({
-          nonce: `version-create-${gameId}-${versionPath}`,
-          title: `'${game.mName}' ('${versionPath}') finished importing.`,
-          description: `Drop finished importing version ${versionPath} for ${game.mName}.`,
-          actions: [`View|/admin/library/g/${gameId}`],
+          nonce: `version-create-${id}-${version}`,
+          title: `'${libraryDetails.mName}' ('${version}') finished importing.`,
+          description: `Drop finished importing version ${version} for ${libraryDetails.mName}.`,
+          actions: [`View|/admin/library/${modeToLink[metadata.mode]}/${id}`],
           acls: ["system:import:version:read"],
         });
 

server/internal/metadata/igdb.ts

@@ -72,7 +72,7 @@ interface IGDBCompanyWebsite extends IGDBItem {
 }
 
 interface IGDBCover extends IGDBItem {
-  url: string;
+  image_id: string;
 }
 
 interface IGDBSearchStub extends IGDBItem {
@@ -179,7 +179,7 @@ export class IGDBProvider implements MetadataProvider {
 
     if (response.status !== 200)
       throw new Error(
-        `Error in IDGB \nStatus Code: ${response.status}\n${response.data}`,
+        `Error in IGDB \nStatus Code: ${response.status}\n${response.data}`,
       );
 
     this.accessToken = response.data.access_token;
@@ -187,7 +187,7 @@ export class IGDBProvider implements MetadataProvider {
       seconds: response.data.expires_in,
     });
 
-    logger.info("IDGB done authorizing with twitch");
+    logger.info("IGDB done authorizing with twitch");
   }
 
   private async refreshCredentials() {
@@ -246,39 +246,47 @@ export class IGDBProvider implements MetadataProvider {
     return <T[]>response.data;
   }
 
-  private async _getMediaInternal(mediaID: IGDBID, type: string) {
+  private async _getMediaInternal(
+    mediaID: IGDBID,
+    type: string,
+    size: string = "t_thumb",
+  ) {
     if (mediaID === undefined)
       throw new Error(
         `IGDB mediaID when getting item of type ${type} was undefined`,
       );
 
-    const body = `where id = ${mediaID}; fields url;`;
+    const body = `where id = ${mediaID}; fields image_id;`;
     const response = await this.request<IGDBCover>(type, body);
 
-    let result = "";
+    if (!response.length || !response[0].image_id) {
+      throw new Error(`No image_id found for ${type} with id ${mediaID}`);
+    }
 
-    response.forEach((cover) => {
-      if (cover.url.startsWith("https:")) {
-        result = cover.url;
-      } else {
-        // twitch *sometimes* provides it in the format "//images.igdb.com"
-        result = `https:${cover.url}`;
-      }
-    });
+    const imageId = response[0].image_id;
+    const result = `https://images.igdb.com/igdb/image/upload/${size}/${imageId}.jpg`;
 
     return result;
   }
 
   private async getCoverURL(id: IGDBID) {
-    return await this._getMediaInternal(id, "covers");
+    return await this._getMediaInternal(id, "covers", "t_cover_big");
   }
 
   private async getArtworkURL(id: IGDBID) {
-    return await this._getMediaInternal(id, "artworks");
+    return await this._getMediaInternal(id, "artworks", "t_1080p");
+  }
+
+  private async getScreenshotURL(id: IGDBID) {
+    return await this._getMediaInternal(id, "screenshots", "t_1080p");
+  }
+
+  private async getIconURL(id: IGDBID) {
+    return await this._getMediaInternal(id, "covers", "t_thumb");
   }
 
   private async getCompanyLogoURl(id: IGDBID) {
-    return await this._getMediaInternal(id, "company_logos");
+    return await this._getMediaInternal(id, "company_logos", "t_original");
   }
 
   private trimMessage(msg: string, len: number) {
@@ -327,7 +335,7 @@ export class IGDBProvider implements MetadataProvider {
       let icon = "";
       const cover = response[i].cover;
       if (cover !== undefined) {
-        icon = await this.getCoverURL(cover);
+        icon = await this.getIconURL(cover);
       } else {
         icon = "";
       }
@@ -355,23 +363,26 @@ export class IGDBProvider implements MetadataProvider {
     const currentGame = (await this.request<IGDBGameFull>("games", body)).at(0);
     if (!currentGame) throw new Error("No game found on IGDB with that id");
 
-    context?.logger.info("Using IDGB provider.");
+    context?.logger.info("Using IGDB provider.");
 
-    let iconRaw;
+    let iconRaw, coverRaw;
     const cover = currentGame.cover;
 
     if (cover !== undefined) {
       context?.logger.info("Found cover URL, using...");
-      iconRaw = await this.getCoverURL(cover);
+      iconRaw = await this.getIconURL(cover);
+      coverRaw = await this.getCoverURL(cover);
     } else {
       context?.logger.info("Missing cover URL, using fallback...");
       iconRaw = jdenticon.toPng(id, 512);
+      coverRaw = iconRaw;
     }
 
     const icon = createObject(iconRaw);
+    const coverID = createObject(coverRaw);
     let banner;
 
-    const images = [icon];
+    const images = [coverID];
     for (const art of currentGame.artworks ?? []) {
       const objectId = createObject(await this.getArtworkURL(art));
       if (!banner) {
@@ -384,6 +395,11 @@ export class IGDBProvider implements MetadataProvider {
       banner = createObject(jdenticon.toPng(id, 512));
     }
 
+    for (const screenshot of currentGame.screenshots ?? []) {
+      const objectId = createObject(await this.getScreenshotURL(screenshot));
+      images.push(objectId);
+    }
+
     context?.progress(20);
 
     const publishers: CompanyModel[] = [];
@@ -452,13 +468,25 @@ export class IGDBProvider implements MetadataProvider {
 
     const genres = await this.getGenres(currentGame.genres);
 
-    const deck = this.trimMessage(currentGame.summary, 280);
+    let description = "";
+    let shortDescription = "";
+
+    if (currentGame.summary.length > (currentGame.storyline?.length ?? 0)) {
+      description = currentGame.summary;
+      shortDescription = this.trimMessage(
+        currentGame.storyline ?? currentGame.summary,
+        280,
+      );
+    } else {
+      description = currentGame.storyline ?? currentGame.summary;
+      shortDescription = this.trimMessage(currentGame.summary, 280);
+    }
 
     const metadata = {
       id: currentGame.id.toString(),
       name: currentGame.name,
-      shortDescription: deck,
-      description: currentGame.summary,
+      shortDescription,
+      description,
       released,
 
       genres,
@@ -471,7 +499,7 @@ export class IGDBProvider implements MetadataProvider {
 
       icon,
       bannerId: banner,
-      coverId: icon,
+      coverId: coverID,
       images,
     };
 

server/internal/metadata/pcgamingwiki.ts

@@ -200,7 +200,7 @@ export class PCGamingWikiProvider implements MetadataProvider {
             return url.pathname.replace("/games/", "").replace(/\/$/, "");
           }
           default: {
-            logger.warn("Pcgamingwiki, unknown host", url.hostname);
+            logger.warn("Pcgamingwiki, unknown host: %s", url.hostname);
             return undefined;
           }
         }
@@ -234,7 +234,7 @@ export class PCGamingWikiProvider implements MetadataProvider {
           });
           if (ratingObj instanceof type.errors) {
             logger.info(
-              "pcgamingwiki: failed to properly get review rating",
+              "pcgamingwiki: failed to properly get review rating: %s",
               ratingObj.summary,
             );
             return undefined;

server/internal/objects/fsBackend.ts

@@ -123,7 +123,7 @@ export class FsObjectBackend extends ObjectBackend {
     const metadataRaw = JSON.parse(fs.readFileSync(metadataPath, "utf-8"));
     const metadata = objectMetadata(metadataRaw);
     if (metadata instanceof type.errors) {
-      logger.error("FsObjectBackend#fetchMetadata", metadata.summary);
+      logger.error("FsObjectBackend#fetchMetadata: %s", metadata.summary);
       return undefined;
     }
     await this.metadataCache.set(id, metadata);
@@ -194,11 +194,13 @@ export class FsObjectBackend extends ObjectBackend {
       try {
         fs.rmSync(filePath);
         cleanupLogger.info(
-          `[FsObjectBackend#cleanupMetadata]: Removed ${file}`,
+          `[FsObjectBackend#cleanupMetadata]: Removed %s`,
+          file
         );
       } catch (error) {
         cleanupLogger.error(
-          `[FsObjectBackend#cleanupMetadata]: Failed to remove ${file}`,
+          `[FsObjectBackend#cleanupMetadata]: Failed to remove %s: %s`,
+          file,
           error,
         );
       }

server/internal/objects/objectHandler.ts

@@ -32,15 +32,12 @@ export const objectMetadata = type({
 });
 export type ObjectMetadata = typeof objectMetadata.infer;
 
-export enum ObjectPermission {
-  Read = "read",
-  Write = "write",
-  Delete = "delete",
-}
+export const ObjectPermissions = ["read", "write", "delete"] as const;
+export type ObjectPermission = (typeof ObjectPermissions)[number];
 export const ObjectPermissionPriority: Array<ObjectPermission> = [
-  ObjectPermission.Read,
-  ObjectPermission.Write,
-  ObjectPermission.Delete,
+  "read",
+  "write",
+  "delete",
 ];
 
 export type Object = { mime: string; data: Source };

server/internal/tasks/group.ts

@@ -1,22 +1,32 @@
-export const taskGroups = {
-  "cleanup:invitations": {
-    concurrency: false,
-  },
-  "cleanup:objects": {
-    concurrency: false,
-  },
-  "cleanup:sessions": {
-    concurrency: false,
-  },
-  "check:update": {
-    concurrency: false,
-  },
-  "import:game": {
-    concurrency: true,
-  },
-  debug: {
-    concurrency: true,
-  },
-} as const;
+export const TASK_GROUPS = [
+  "cleanup:invitations",
+  "cleanup:objects",
+  "cleanup:sessions",
+  "check:update",
+  "import:game",
+  "import:version",
+] as const;
 
-export type TaskGroup = keyof typeof taskGroups;
+export type TaskGroup = (typeof TASK_GROUPS)[number];
+
+export const TASK_GROUP_CONFIG: { [key in TaskGroup]: { concurrency: boolean } } =
+  {
+    "cleanup:invitations": {
+      concurrency: false
+    },
+    "cleanup:objects": {
+      concurrency: false
+    },
+    "cleanup:sessions": {
+      concurrency: false
+    },
+    "check:update": {
+      concurrency: false
+    },
+    "import:game": {
+      concurrency: true
+    },
+    "import:version": {
+      concurrency: true
+    }
+  };

server/internal/tasks/index.ts

@@ -7,7 +7,7 @@ import cleanupInvites from "./registry/invitations";
 import cleanupSessions from "./registry/sessions";
 import checkUpdate from "./registry/update";
 import cleanupObjects from "./registry/objects";
-import { taskGroups, type TaskGroup } from "./group";
+import { TASK_GROUP_CONFIG, type TaskGroup } from "./group";
 import prisma from "../db/database";
 import { type } from "arktype";
 import pino from "pino";
@@ -54,7 +54,6 @@ class TaskHandler {
     "cleanup:invitations",
     "cleanup:sessions",
     "check:update",
-    "debug",
   ];
   private weeklyScheduledTasks: TaskGroup[] = ["cleanup:objects"];
 
@@ -83,7 +82,7 @@ class TaskHandler {
     let logOffset: number = 0;
 
     // if taskgroup disallows concurrency
-    if (!taskGroups[task.taskGroup].concurrency) {
+    if (!TASK_GROUP_CONFIG[task.taskGroup].concurrency) {
       for (const existingTask of this.taskPool.values()) {
         // if a task is already running, we don't want to start another
         if (existingTask.taskGroup === task.taskGroup) {
@@ -150,7 +149,7 @@ class TaskHandler {
           }
         } catch (e) {
           // fallback: ignore or log error
-          logger.error("Failed to parse log chunk", {
+          logger.error("Failed to parse log chunk %s", {
             error: e,
             chunk: chunk,
           });
@@ -178,7 +177,7 @@ class TaskHandler {
 
     const progress = (progress: number) => {
       if (progress < 0 || progress > 100) {
-        logger.error("Progress must be between 0 and 100", { progress });
+        logger.error("Progress must be between 0 and 100, actually %d", progress);
         return;
       }
       const taskEntry = this.taskPool.get(task.id);

server/internal/tasks/registry/debug.ts

@@ -1,5 +1,6 @@
-import { defineDropTask } from "..";
+// import { defineDropTask } from "..";
 
+/*
 export default defineDropTask({
   buildId: () => `debug:${new Date().toISOString()}`,
   name: "Debug Task",
@@ -16,3 +17,4 @@ export default defineDropTask({
     }
   },
 });
+*/

server/internal/tasks/registry/update.ts

@@ -49,7 +49,7 @@ export default defineDropTask({
 
     // if response failed somehow
     if (!response.ok) {
-      logger.info("Failed to check for update ", {
+      logger.info("Failed to check for update: %s", {
         status: response.status,
         body: response.body,
       });

server/plugins/03.metadata-init.ts

@@ -5,11 +5,13 @@ import { GiantBombProvider } from "../internal/metadata/giantbomb";
 import { IGDBProvider } from "../internal/metadata/igdb";
 import { ManualMetadataProvider } from "../internal/metadata/manual";
 import { PCGamingWikiProvider } from "../internal/metadata/pcgamingwiki";
-import { logger } from "~~/server/internal/logging";
+import { logger } from "../internal/logging";
+import { SteamProvider } from "../internal/metadata/steam";
 
 export default defineNitroPlugin(async (_nitro) => {
   const metadataProviders = [
     GiantBombProvider,
+    SteamProvider,
     PCGamingWikiProvider,
     IGDBProvider,
   ];