feat: version hiding

* feat: revise library source names & update droplet

* feat: add internal name hint to library sources

* feat: update library source table with new name + icons

* fix: admin invitation localisation issue

* feat: #164

* feat: overhaul task UIs, #163

* fix: remove debug task

* fix: lint

components/DropLogo.vue

@@ -10,6 +10,16 @@
       d="M4 13.5C4 11.0008 5.38798 8.76189 7.00766 7C8.43926 5.44272 10.0519 4.25811 11.0471 3.5959C11.6287 3.20893 12.3713 3.20893 12.9529 3.5959C13.9481 4.25811 15.5607 5.44272 16.9923 7C18.612 8.76189 20 11.0008 20 13.5C20 17.9183 16.4183 21.5 12 21.5C7.58172 21.5 4 17.9183 4 13.5Z"
       stroke="currentColor"
       stroke-width="2"
+      stroke-dasharray="100"
+      :stroke-dashoffset="dashArray"
     />
   </svg>
 </template>
+
+<script setup lang="ts">
+const props = defineProps<{ progress?: number }>();
+
+const dashArray = computed(() =>
+  props.progress === undefined ? 0 : ((100 - props.progress) / 100) * 50 + 50,
+);
+</script>

components/GameEditor/Version.vue

@@ -22,21 +22,17 @@
                   <!-- import games button -->
 
                   <NuxtLink
-                    :href="
-                      unimportedVersions.length > 0
-                        ? `/admin/library/${game.id}/import`
-                        : ''
-                    "
+                    :href="canImport ? `/admin/library/${game.id}/import` : ''"
                     type="button"
                     :class="[
-                      unimportedVersions.length > 0
+                      canImport
                         ? 'bg-blue-600 hover:bg-blue-700'
                         : 'bg-blue-800/50',
                       'inline-flex w-fit items-center gap-x-2 rounded-md  px-3 py-1 text-sm font-semibold font-display text-white shadow-sm  focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-600',
                     ]"
                   >
                     {{
-                      unimportedVersions.length > 0
+                      canImport
                         ? $t("library.admin.import.version.import")
                         : $t("library.admin.import.version.noVersions")
                     }}
@@ -124,10 +120,16 @@ import { ExclamationCircleIcon } from "@heroicons/vue/24/outline";
 
 // TODO implement UI for this page
 
-defineProps<{ unimportedVersions: string[] }>();
+const props = defineProps<{ unimportedVersions: string[] }>();
 
 const { t } = useI18n();
 
+const hasDeleted = ref(false);
+
+const canImport = computed(
+  () => hasDeleted.value || props.unimportedVersions.length > 0,
+);
+
 type GameAndVersions = GameModel & { versions: GameVersionModel[] };
 const game = defineModel<SerializeObject<GameAndVersions>>() as Ref<
   SerializeObject<GameAndVersions>
@@ -176,6 +178,7 @@ async function deleteVersion(versionName: string) {
       game.value.versions.findIndex((e) => e.versionName === versionName),
       1,
     );
+    hasDeleted.value = true;
   } catch (e) {
     createModal(
       ModalType.Notification,

components/LanguageSelector.vue

@@ -18,8 +18,12 @@
       </i18n-t>
     </NuxtLink>
 
-    <DevOnly
-      ><h1 class="mt-3 text-sm text-gray-500">{{ $t("welcome") }}</h1>
+    <DevOnly>
+      <h1 class="mt-3 text-sm text-gray-500">{{ $t("welcome") }}</h1>
     </DevOnly>
   </div>
 </template>
+
+<script setup lang="ts">
+import { ArrowTopRightOnSquareIcon } from "@heroicons/vue/24/outline";
+</script>

components/LogLine.vue

@@ -0,0 +1,27 @@
+<template>
+  <span class="text-xs font-mono text-zinc-400 inline-flex items-top gap-x-2"
+    ><span v-if="!short" class="text-zinc-500">{{ log.timestamp }}</span>
+    <span
+      :class="[
+        colours[log.level] || 'text-green-400',
+        'uppercase font-display font-semibold',
+      ]"
+      >{{ log.level }}</span
+    >
+    <pre :class="[short ? 'line-clamp-1' : '', 'mt-[1px]']">{{
+      log.message
+    }}</pre>
+  </span>
+</template>
+
+<script setup lang="ts">
+import type { TaskLog } from "~/server/internal/tasks";
+
+defineProps<{ log: typeof TaskLog.infer; short?: boolean }>();
+
+const colours: { [key: string]: string } = {
+  info: "text-blue-400",
+  warn: "text-yellow-400",
+  error: "text-red-400",
+};
+</script>

components/TaskWidget.vue

@@ -0,0 +1,55 @@
+<template>
+  <div
+    v-if="task"
+    class="flex w-full items-center justify-between space-x-6 p-6"
+  >
+    <div class="flex-1 truncate">
+      <div class="flex items-center space-x-1">
+        <div>
+          <CheckCircleIcon v-if="task.success" class="size-5 text-green-600" />
+          <XMarkIcon v-else-if="task.error" class="size-5 text-red-600" />
+          <div
+            v-else
+            class="size-2 bg-blue-600 rounded-full animate-pulse m-1"
+          />
+        </div>
+        <h3 class="truncate text-sm font-medium text-zinc-100">
+          {{ task.name }}
+        </h3>
+      </div>
+      <div
+        v-if="active"
+        class="mt-2 w-full rounded-full overflow-hidden bg-zinc-900"
+      >
+        <div
+          :style="{ width: `${task.progress}%` }"
+          class="bg-blue-600 h-[3px] transition-all"
+        />
+      </div>
+      <div class="mt-2 bg-zinc-950 px-2 pb-1 rounded-sm">
+        <LogLine :short="true" :log="parseTaskLog(task.log.at(-1))" />
+      </div>
+      <NuxtLink
+        type="button"
+        :href="`/admin/task/${task.id}`"
+        class="mt-3 ml-1 rounded-md text-xs font-medium text-zinc-100 hover:text-zinc-300 focus:outline-none focus:ring-2 focus:ring-zinc-100 focus:ring-offset-2"
+      >
+        <i18n-t keypath="tasks.admin.viewTask" tag="span" scope="global">
+          <template #arrow>
+            <span aria-hidden="true">{{ $t("chars.arrow") }}</span>
+          </template>
+        </i18n-t>
+      </NuxtLink>
+    </div>
+  </div>
+  <div v-else>
+    <!-- renders server side when we don't want to access the current tasks -->
+  </div>
+</template>
+
+<script setup lang="ts">
+import { CheckCircleIcon, XMarkIcon } from "@heroicons/vue/24/solid";
+import type { TaskMessage } from "~/server/internal/tasks";
+
+defineProps<{ task: TaskMessage | undefined; active?: boolean }>();
+</script>

i18n/locales/en_pirate.json

@@ -19,7 +19,7 @@
       "title": "Messages from the Crows' Nest",
       "unread": "Unread Messages"
     },
-    "settings": "Settings, savvy?",
+    "settings": "Settings",
     "title": "Yer Own Coffer"
   },
   "actions": "Deeds",

i18n/locales/en_us.json

@@ -137,6 +137,10 @@
       "usernameTaken": "Username already taken."
     },
     "backHome": "{arrow} Back to home",
+    "externalUrl": {
+      "subtitle": "This message is only visible to admins.",
+      "title": "Accessing over different EXTERNAL_URL. Please check the docs."
+    },
     "game": {
       "banner": {
         "description": "Drop failed to update the banner image: {0}",
@@ -212,10 +216,6 @@
         "desc": "Drop encountered an error while updating the version: {error}",
         "title": "There an error while updating the version order"
       }
-    },
-    "externalUrl": {
-      "title": "Accessing over different EXTERNAL_URL. Please check the docs.",
-      "subtitle": "This message is only visible to admins."
     }
   },
   "footer": {
@@ -308,8 +308,10 @@
           "umuLauncherId": "UMU Launcher ID",
           "umuOverride": "Override UMU Launcher Game ID",
           "umuOverrideDesc": "By default, Drop uses a non-ID when launching with UMU Launcher. In order to get the right patches for some games, you may have to manually set this field.",
-          "updateMode": "Update mode",
+          "updateMode": "Update/delta mode",
           "updateModeDesc": "When enabled, these files will be installed on top of (overwriting) the previous version's. If multiple \"update modes\" are chained together, they are applied in order.",
+          "hide": "Hide version",
+          "hideDesc": "Hide version so clients cannot install it. Useful if you are using delta versions to save space, but don't want to allow users to install partial games.",
           "version": "Select version to import"
         },
         "withoutMetadata": "Import without metadata"
@@ -327,6 +329,7 @@
           "description": "Companies organize games by who they were developed or published by.",
           "editor": {
             "action": "Add Game {plus}",
+            "descriptionPlaceholder": "{'<'}description{'>'}",
             "developed": "Developed",
             "libraryDescription": "Add, remove, or customise what this company has developed and/or published.",
             "libraryTitle": "Game Library",
@@ -334,25 +337,23 @@
             "published": "Published",
             "uploadBanner": "Upload banner",
             "uploadIcon": "Upload icon",
-            "descriptionPlaceholder": "{'<'}description{'>'}",
             "websitePlaceholder": "{'<'}website{'>'}"
           },
           "modals": {
+            "createDescription": "Create a company to further organize your games.",
+            "createFieldDescription": "Company Description",
+            "createFieldDescriptionPlaceholder": "A small indie studio that...",
+            "createFieldName": "Company Name",
+            "createFieldNamePlaceholder": "My New Company...",
+            "createFieldWebsite": "Company Website",
+            "createFieldWebsitePlaceholder": "https://example.com/",
+            "createTitle": "Create a company",
             "nameDescription": "Edit the company's name. Used to match to new game imports.",
             "nameTitle": "Edit company name",
             "shortDeckDescription": "Edit the company's description. Doesn't affect long (markdown) description.",
             "shortDeckTitle": "Edit company description",
             "websiteDescription": "Edit the company's website. Note: this will be a link, and won't have redirect protection.",
-            "websiteTitle": "Edit company website",
-
-            "createTitle": "Create a company",
-            "createDescription": "Create a company to further organize your games.",
-            "createFieldName": "Company Name",
-            "createFieldNamePlaceholder": "My New Company...",
-            "createFieldDescription": "Company Description",
-            "createFieldDescriptionPlaceholder": "A small indie studio that...",
-            "createFieldWebsite": "Company Website",
-            "createFieldWebsitePlaceholder": "https://example.com/"
+            "websiteTitle": "Edit company website"
           },
           "noCompanies": "No companies",
           "noGames": "No games",
@@ -373,6 +374,8 @@
       },
       "metadataProvider": "Metadata provider",
       "noGames": "No games imported",
+      "libraryHint": "No libraries configured.",
+      "libraryHintDocsLink": "What does this mean? {arrow}",
       "offline": "Drop couldn't access this game.",
       "offlineTitle": "Game offline",
       "openEditor": "Open in Editor {arrow}",
@@ -382,12 +385,15 @@
         "create": "Create source",
         "createDesc": "Drop will use this source to access your game library, and make them available.",
         "desc": "Configure your library sources, where Drop will look for new games and versions to import.",
+        "documentationLink": "Documentation {arrow}",
         "edit": "Edit source",
         "fsDesc": "Imports games from a path on disk. Requires version-based folder structure, and supports archived games.",
         "fsFlatDesc": "Imports games from a path on disk, but without a separate version subfolder. Useful when migrating an existing library to Drop.",
+        "fsFlatTitle": "Compatibility",
         "fsPath": "Path",
         "fsPathDesc": "An absolute path to your game library.",
         "fsPathPlaceholder": "/mnt/games",
+        "fsTitle": "Drop-style",
         "link": "Sources {arrow}",
         "nameDesc": "The name of your source, for reference.",
         "namePlaceholder": "My New Source",
@@ -514,13 +520,13 @@
     "images": "Game Images",
     "lookAt": "Check it out",
     "noDevelopers": "No developers",
-    "noGame": "NO GAME",
     "noFeatured": "NO FEATURED GAMES",
-    "openFeatured": "Star games in Admin Library {arrow}",
+    "noGame": "NO GAME",
     "noImages": "No images",
     "noPublishers": "No publishers.",
     "noTags": "No tags",
     "openAdminDashboard": "Open in Admin Dashboard",
+    "openFeatured": "Star games in Admin Library {arrow}",
     "platform": "Platform | Platform | Platforms",
     "publishers": "Publishers | Publisher | Publishers",
     "rating": "Rating",
@@ -560,7 +566,9 @@
         "cleanupSessionsName": "Clean up sessions."
       },
       "viewTask": "View {arrow}",
-      "weeklyScheduledTitle": "Weekly scheduled tasks"
+      "weeklyScheduledTitle": "Weekly scheduled tasks",
+      "progress": "{0}%",
+      "execute": "{arrow} Execute"
     }
   },
   "title": "Drop",
@@ -585,7 +593,6 @@
     "admin": {
       "adminHeader": "Admin?",
       "adminUserLabel": "Admin user",
-      "authLink": "Authentication {arrow}",
       "authentication": {
         "configure": "Configure",
         "description": "Drop supports a variety of \"authentication mechanisms\". As you enable or disable them, they are shown on the sign in screen for users to select from. Click the dot menu to configure the authentication mechanism.",
@@ -597,6 +604,7 @@
         "srOpenOptions": "Open options",
         "title": "Authentication"
       },
+      "authLink": "Authentication {arrow}",
       "authoptionsHeader": "Auth Options",
       "delete": "Delete",
       "deleteUser": "Delete user {0}",
@@ -609,7 +617,7 @@
         "createInvitation": "Create invitation",
         "description": "Simple authentication uses a system of 'invitations' to create users. You can create an invitation, and optionally specify a username or email for the user, and then it will generate a magic URL that can be used to create an account.",
         "expires": "Expires: {expiry}",
-        "invitationTitle": "invitations",
+        "invitationTitle": "Invitations",
         "invite3Days": "3 days",
         "invite6Months": "6 months",
         "inviteAdminSwitchDescription": "Create this user as an administrator",

i18n/locales/fr.json

@@ -1,6 +1,8 @@
 {
   "account": {
     "devices": {
+      "capabilities": "Capacités",
+      "lastConnected": "Dernière Connexion",
       "noDevices": "Aucun appareil n'est connecté à vôtre compte.",
       "platform": "Plateforme",
       "revoke": "Révoquer",
@@ -12,13 +14,13 @@
       "desc": "Voir et gérer vos notifications.",
       "markAllAsRead": "Tout marqué comme lu",
       "markAsRead": "Marquer comme lu",
-      "none": "Pas de notifications",
+      "none": "Pas de notification",
       "notifications": "Notifications",
       "title": "Notifications",
-      "unread": "Notifications non lues"
+      "unread": "Notifications Non Lues"
     },
     "settings": "Paramètres",
-    "title": "Paramètres du compte"
+    "title": "Paramètres du Compte"
   },
   "actions": "Actions",
   "add": "Ajouter",
@@ -31,7 +33,7 @@
       "authorizedClient": "Drop a réussi a autoriser le client. Vous pouvez fermer cette fenêtre.",
       "issues": "Vous avez des problèmes ?",
       "learn": "En savoir plus {arrow}",
-      "paste": "Coller ce code dans le client pour continuer :",
+      "paste": "Collez ce code dans le client pour continuer :",
       "permWarning": "Accepter cette requête autorisera \"{name}\" sur \"{plateform} à :",
       "requestedAccess": "\"{name} a demandé accès à votre compte Drop.",
       "success": "Réussi !"
@@ -54,7 +56,7 @@
     "signin": {
       "externalProvider": "Connectez vous avec un fournisseur externe {arrow}",
       "forgot": "Mot de passe oublié ?",
-      "noAccount": "Pas de compte ? Demande à un administrateur d'en créer un pour toi.",
+      "noAccount": "Pas de compte ? Demandez à un administrateur d'en créer un pour vous.",
       "or": "OU",
       "pageTitle": "Se connecter à Drop",
       "rememberMe": "Se souvenir de moi",
@@ -109,6 +111,7 @@
     "italic": "Italique",
     "italicPlaceholder": "texte italique",
     "link": "Lien",
+    "linkPlaceholder": "texte du lien",
     "listItem": "Élement de liste",
     "listItemPlaceholder": "élément de liste"
   },
@@ -570,6 +573,7 @@
         "srOpenOptions": "Ouvrir les options",
         "title": "Authentification"
       },
+      "authoptionsHeader": "Options Auth",
       "delete": "Supprimer",
       "deleteUser": "Supprimer l'utilisateur {0}",
       "description": "Gérer les utilisateurs sur votre instance Drop, et configurer vos méthodes d'authentification.",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "drop",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "private": true,
   "type": "module",
   "license": "AGPL-3.0-or-later",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@discordapp/twemoji": "^16.0.1",
-    "@drop-oss/droplet": "1.6.0",
+    "@drop-oss/droplet": "2.3.1",
     "@headlessui/vue": "^1.7.23",
     "@heroicons/vue": "^2.1.5",
     "@lobomfz/prismark": "0.0.3",

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

@@ -398,6 +398,36 @@
           />
         </Switch>
       </SwitchGroup>
+            <!-- setup mode -->
+      <SwitchGroup as="div" class="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.hide") }}</SwitchLabel
+          >
+          <SwitchDescription as="span" class="text-sm text-zinc-400">{{
+            $t("library.admin.import.version.hideDesc")
+          }}</SwitchDescription>
+        </span>
+        <Switch
+          v-model="versionSettings.hide"
+          :class="[
+            versionSettings.hide ? '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.hide ? '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">
         <dt>
           <DisclosureButton
@@ -548,6 +578,7 @@ import {
 import { XCircleIcon } from "@heroicons/vue/16/solid";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import { ChevronDownIcon, ChevronUpIcon } from "@heroicons/vue/24/solid";
+import type { ImportVersion } from "~/server/api/v1/admin/import/version/index.post";
 
 definePageMeta({
   layout: "admin",
@@ -561,18 +592,7 @@ const versions = await $dropFetch(
   `/api/v1/admin/import/version?id=${encodeURIComponent(gameId)}`,
 );
 const currentlySelectedVersion = ref(-1);
-const versionSettings = ref<{
-  platform: PlatformClient | undefined;
-
-  onlySetup: boolean;
-  launch: string;
-  launchArgs: string;
-  setup: string;
-  setupArgs: string;
-
-  delta: boolean;
-  umuId: string;
-}>({
+const versionSettings = ref<Partial<typeof ImportVersion.infer>>({
   platform: undefined,
   launch: "",
   launchArgs: "",
@@ -581,6 +601,7 @@ const versionSettings = ref<{
   delta: false,
   onlySetup: false,
   umuId: "",
+  hide: false,
 });
 
 const versionGuesses =

pages/admin/library/index.vue

@@ -242,11 +242,40 @@
         {{ $t("common.noResults") }}
       </p>
       <p
-        v-if="filteredLibraryGames.length == 0 && libraryGames.length == 0"
+        v-if="
+          filteredLibraryGames.length == 0 &&
+          libraryGames.length == 0 &&
+          libraryState.hasLibraries
+        "
         class="text-zinc-600 text-sm font-display font-bold uppercase text-center col-span-4"
       >
         {{ $t("library.admin.noGames") }}
       </p>
+      <p
+        v-else-if="!libraryState.hasLibraries"
+        class="flex flex-col gap-2 text-zinc-600 text-center col-span-4"
+      >
+        <span class="text-sm font-display font-bold uppercase">{{
+          $t("library.admin.libraryHint")
+        }}</span>
+
+        <NuxtLink
+          class="transition text-xs text-zinc-600 hover:underline hover:text-zinc-400"
+          href="https://docs.droposs.org/docs/library"
+          target="_blank"
+        >
+          <i18n-t
+            keypath="library.admin.libraryHintDocsLink"
+            tag="span"
+            scope="global"
+            class="inline-flex items-center gap-x-1"
+          >
+            <template #arrow>
+              <ArrowTopRightOnSquareIcon class="size-4" />
+            </template>
+          </i18n-t>
+        </NuxtLink>
+      </p>
     </ul>
   </div>
 </template>
@@ -256,7 +285,11 @@ import {
   ExclamationTriangleIcon,
   ExclamationCircleIcon,
 } from "@heroicons/vue/16/solid";
-import { InformationCircleIcon, StarIcon } from "@heroicons/vue/20/solid";
+import {
+  ArrowTopRightOnSquareIcon,
+  InformationCircleIcon,
+  StarIcon,
+} from "@heroicons/vue/20/solid";
 import { MagnifyingGlassIcon } from "@heroicons/vue/24/outline";
 
 const { t } = useI18n();

pages/admin/library/sources/index.vue

@@ -64,8 +64,14 @@
                 >
                   {{ source.name }}
                 </td>
-                <td class="whitespace-nowrap px-3 py-4 text-sm text-zinc-400">
-                  {{ source.backend }}
+                <td
+                  class="whitespace-nowrap px-3 py-4 text-sm text-zinc-400 inline-flex gap-x-1 items-center"
+                >
+                  <component
+                    :is="optionsMetadata[source.backend].icon"
+                    class="size-5 text-zinc-400"
+                  />
+                  {{ optionsMetadata[source.backend].title }}
                 </td>
                 <td class="whitespace-nowrap px-3 py-4 text-sm text-zinc-400">
                   <CheckIcon
@@ -189,11 +195,34 @@
                         <RadioGroupLabel
                           as="span"
                           class="font-semibold text-zinc-100"
-                          >{{ source }}</RadioGroupLabel
+                          >{{ metadata.title }}
+                          <span class="ml-2 font-mono text-zinc-500 text-xs">{{
+                            source
+                          }}</span></RadioGroupLabel
+                        >
+                        <RadioGroupDescription
+                          as="span"
+                          class="text-zinc-400 text-xs"
                         >
-                        <RadioGroupDescription as="span" class="text-zinc-400">
                           {{ metadata.description }}
                         </RadioGroupDescription>
+                        <NuxtLink
+                          :href="metadata.docsLink"
+                          :external="true"
+                          target="_blank"
+                          class="mt-2 block w-fit rounded-md bg-blue-600 px-2 py-1 text-center text-xs font-semibold text-white shadow-sm hover:bg-blue-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-600"
+                        >
+                          <i18n-t
+                            keypath="library.admin.sources.documentationLink"
+                            tag="span"
+                            scope="global"
+                            class="inline-flex items-center gap-x-1"
+                          >
+                            <template #arrow>
+                              <ArrowTopRightOnSquareIcon class="size-4" />
+                            </template>
+                          </i18n-t>
+                        </NuxtLink>
                       </span>
                     </span>
                     <span
@@ -269,6 +298,7 @@
  */
 
 import {
+  DropLogo,
   SourceOptionsFilesystem,
   SourceOptionsFlatFilesystem,
 } from "#components";
@@ -279,8 +309,11 @@ import {
   RadioGroupLabel,
   RadioGroupOption,
 } from "@headlessui/vue";
-import { XCircleIcon } from "@heroicons/vue/20/solid";
-import { CheckIcon, DocumentIcon, XMarkIcon } from "@heroicons/vue/24/outline";
+import {
+  XCircleIcon,
+  ArrowTopRightOnSquareIcon,
+} from "@heroicons/vue/20/solid";
+import { BackwardIcon, CheckIcon, XMarkIcon } from "@heroicons/vue/24/outline";
 import { FetchError } from "ofetch";
 import type { Component } from "vue";
 import type { LibraryBackend } from "~/prisma/client/enums";
@@ -324,17 +357,23 @@ const optionUIs: { [key in LibraryBackend]: Component } = {
 };
 const optionsMetadata: {
   [key in LibraryBackend]: {
+    title: string;
     description: string;
+    docsLink: string;
     icon: Component;
   };
 } = {
   Filesystem: {
+    title: t("library.admin.sources.fsTitle"),
     description: t("library.admin.sources.fsDesc"),
-    icon: DocumentIcon,
+    docsLink: "https://docs.droposs.org/docs/library#drop-style",
+    icon: DropLogo,
   },
   FlatFilesystem: {
+    title: t("library.admin.sources.fsFlatTitle"),
     description: t("library.admin.sources.fsFlatDesc"),
-    icon: DocumentIcon,
+    docsLink: "https://docs.droposs.org/docs/library#flat-style-or-compat",
+    icon: BackwardIcon,
   },
 };
 const optionsMetadataIter = Object.entries(optionsMetadata);

pages/admin/task/[id]/index.vue

@@ -44,19 +44,26 @@
         </div>
         {{ task.name }}
       </h1>
-      <div class="h-2 rounded-full bg-zinc-950 overflow-hidden">
+      <div
+        class="bg-zinc-950 p-2 rounded-md h-[80vh] flex flex-col flex-col-reverse overflow-y-scroll gap-y-1"
+      >
+        <LogLine
+          v-for="(_, idx) in task.log"
+          :key="idx"
+          :log="parseTaskLog(task.log.at(-(idx + 1)))"
+        />
+      </div>
+      <div class="relative h-5 rounded-xl bg-zinc-950 overflow-hidden">
         <div
           :style="{ width: `${task.progress}%` }"
           class="transition-all bg-blue-600 h-full"
         />
-      </div>
-
-      <div
-        class="relative bg-zinc-950/50 rounded-md p-2 text-zinc-100 h-[80vh] overflow-y-scroll"
-      >
-        <pre v-for="(line, idx) in task.log" :key="idx">{{
-          formatLine(line)
-        }}</pre>
+        <span
+          class="absolute inset-0 flex items-center justify-center text-blue-200 text-sm font-bold font-display"
+          >{{
+            $t("tasks.admin.progress", [Math.round(task.progress * 10) / 10])
+          }}</span
+        >
       </div>
     </div>
     <div v-else role="status" class="w-full flex items-center justify-center">
@@ -90,11 +97,6 @@ const taskId = route.params.id.toString();
 
 const task = useTask(taskId);
 
-function formatLine(line: string): string {
-  const res = parseTaskLog(line);
-  return `[${res.timestamp}] ${res.message}`;
-}
-
 definePageMeta({
   layout: "admin",
 });

pages/admin/task/index.vue

@@ -13,62 +13,7 @@
           :key="task.value?.id"
           class="col-span-1 divide-y divide-gray-200 rounded-lg bg-zinc-800 border border-zinc-700 shadow-sm"
         >
-          <div
-            v-if="task.value"
-            class="flex w-full items-center justify-between space-x-6 p-6"
-          >
-            <div class="flex-1 truncate">
-              <div class="flex items-center space-x-2">
-                <div>
-                  <CheckIcon
-                    v-if="task.value.success"
-                    class="size-4 text-green-600"
-                  />
-                  <XMarkIcon
-                    v-else-if="task.value.error"
-                    class="size-4 text-red-600"
-                  />
-                  <div
-                    v-else
-                    class="size-2 bg-blue-600 rounded-full animate-pulse"
-                  />
-                </div>
-                <h3 class="truncate text-sm font-medium text-zinc-100">
-                  {{ task.value.name }}
-                </h3>
-              </div>
-              <p class="text-xs text-zinc-600 mt-0.5 font-mono">
-                {{ task.value.id }}
-              </p>
-              <div class="mt-1 w-full rounded-full overflow-hidden bg-zinc-900">
-                <div
-                  :style="{ width: `${task.value.progress}%` }"
-                  class="bg-blue-600 h-1.5 transition-all"
-                />
-              </div>
-              <p class="mt-1 truncate text-sm text-zinc-400">
-                {{ parseTaskLog(task.value.log.at(-1) ?? "").message }}
-              </p>
-              <NuxtLink
-                type="button"
-                :href="`/admin/task/${task.value.id}`"
-                class="mt-3 rounded-md text-xs font-medium text-zinc-100 hover:text-zinc-300 focus:outline-none focus:ring-2 focus:ring-zinc-100 focus:ring-offset-2"
-              >
-                <i18n-t
-                  keypath="tasks.admin.viewTask"
-                  tag="span"
-                  scope="global"
-                >
-                  <template #arrow>
-                    <span aria-hidden="true">{{ $t("chars.arrow") }}</span>
-                  </template>
-                </i18n-t>
-              </NuxtLink>
-            </div>
-          </div>
-          <div v-else>
-            <!-- renders server side when we don't want to access the current tasks -->
-          </div>
+          <TaskWidget :task="task.value" :active="true" />
         </li>
       </ul>
       <div
@@ -89,51 +34,7 @@
             :key="task.id"
             class="col-span-1 divide-y divide-gray-200 rounded-lg bg-zinc-800 border border-zinc-700 shadow-sm"
           >
-            <div class="flex w-full items-center justify-between space-x-6 p-6">
-              <div class="flex-1 truncate">
-                <div class="flex items-center space-x-2">
-                  <div>
-                    <CheckIcon
-                      v-if="task.success"
-                      class="size-4 text-green-600"
-                    />
-                    <XMarkIcon
-                      v-else-if="task.error"
-                      class="size-4 text-red-600"
-                    />
-                    <div
-                      v-else
-                      class="size-2 bg-blue-600 rounded-full animate-pulse"
-                    />
-                  </div>
-                  <h3 class="truncate text-sm font-medium text-zinc-100">
-                    {{ task.name }}
-                  </h3>
-                  <RelativeTime class="text-zinc-500" :date="task.ended" />
-                </div>
-                <p class="text-xs text-zinc-600 mt-0.5 font-mono">
-                  {{ task.id }}
-                </p>
-                <p class="mt-1 truncate text-sm text-zinc-400">
-                  {{ parseTaskLog(task.log.at(-1) ?? "").message }}
-                </p>
-                <NuxtLink
-                  type="button"
-                  :href="`/admin/task/${task.id}`"
-                  class="mt-3 rounded-md text-xs font-medium text-zinc-100 hover:text-zinc-300 focus:outline-none focus:ring-2 focus:ring-zinc-100 focus:ring-offset-2"
-                >
-                  <i18n-t
-                    keypath="tasks.admin.viewTask"
-                    tag="span"
-                    scope="global"
-                  >
-                    <template #arrow>
-                      <span aria-hidden="true">{{ $t("chars.arrow") }}</span>
-                    </template>
-                  </i18n-t>
-                </NuxtLink>
-              </div>
-            </div>
+            <TaskWidget :task="task" />
           </li>
         </ul>
       </div>
@@ -157,6 +58,21 @@
                 <p class="mt-1 text-sm text-zinc-400">
                   {{ scheduledTasks[task].description }}
                 </p>
+                <button
+                  class="mt-3 rounded-md text-xs font-medium text-zinc-100 hover:text-zinc-300 focus:outline-none focus:ring-2 focus:ring-zinc-100 focus:ring-offset-2"
+                  @click="() => startTask(task)"
+                >
+                  <i18n-t
+                    keypath="tasks.admin.execute"
+                    tag="span"
+                    scope="global"
+                    class="inline-flex items-center gap-x-1"
+                  >
+                    <template #arrow>
+                      <PlayIcon class="size-4" aria-hidden="true" />
+                    </template>
+                  </i18n-t>
+                </button>
               </div>
             </div>
           </li>
@@ -180,6 +96,21 @@
                 <p class="mt-1 text-sm text-zinc-400">
                   {{ scheduledTasks[task].description }}
                 </p>
+                <button
+                  class="mt-3 rounded-md text-xs font-medium text-zinc-100 hover:text-zinc-300 focus:outline-none focus:ring-2 focus:ring-zinc-100 focus:ring-offset-2"
+                  @click="() => startTask(task)"
+                >
+                  <i18n-t
+                    keypath="tasks.admin.execute"
+                    tag="span"
+                    scope="global"
+                    class="inline-flex items-center gap-x-1"
+                  >
+                    <template #arrow>
+                      <PlayIcon class="size-4" aria-hidden="true" />
+                    </template>
+                  </i18n-t>
+                </button>
               </div>
             </div>
           </li>
@@ -189,7 +120,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { CheckIcon, XMarkIcon } from "@heroicons/vue/24/outline";
+import { PlayIcon } from "@heroicons/vue/24/outline";
 import type { TaskGroup } from "~/server/internal/tasks/group";
 
 useHead({
@@ -205,7 +136,9 @@ const { t } = useI18n();
 const { runningTasks, historicalTasks, dailyTasks, weeklyTasks } =
   await $dropFetch("/api/v1/admin/task");
 
-const liveRunningTasks = await Promise.all(runningTasks.map((e) => useTask(e)));
+const liveRunningTasks = ref(
+  await Promise.all(runningTasks.map((e) => useTask(e))),
+);
 
 const scheduledTasks: {
   [key in TaskGroup]: { name: string; description: string };
@@ -230,5 +163,19 @@ const scheduledTasks: {
     name: "",
     description: "",
   },
+  debug: {
+    name: "Debug Task",
+    description: "Does debugging things.",
+  },
 };
+
+async function startTask(taskGroup: string) {
+  const task = await $dropFetch("/api/v1/admin/task", {
+    method: "POST",
+    body: { taskGroup },
+    failTitle: "Failed to start task",
+  });
+  const taskRef = await useTask(task.id);
+  liveRunningTasks.value.push(taskRef);
+}
 </script>

prisma/migrations/20250815014713_use_task_id_started_composite_id/migration.sql

@@ -0,0 +1,15 @@
+/*
+  Warnings:
+
+  - The primary key for the `Task` table will be changed. If it partially fails, the table could be left without primary key constraint.
+
+*/
+-- DropIndex
+DROP INDEX "GameTag_name_idx";
+
+-- AlterTable
+ALTER TABLE "Task" DROP CONSTRAINT "Task_pkey",
+ADD CONSTRAINT "Task_pkey" PRIMARY KEY ("id", "started");
+
+-- CreateIndex
+CREATE INDEX "GameTag_name_idx" ON "GameTag" USING GIST ("name" gist_trgm_ops(siglen=32));

prisma/migrations/20250819062913_add_hidden_field_to_versions/migration.sql

@@ -0,0 +1,8 @@
+-- DropIndex
+DROP INDEX "GameTag_name_idx";
+
+-- AlterTable
+ALTER TABLE "GameVersion" ADD COLUMN     "hidden" BOOLEAN NOT NULL DEFAULT false;
+
+-- CreateIndex
+CREATE INDEX "GameTag_name_idx" ON "GameTag" USING GIST ("name" gist_trgm_ops(siglen=32));

prisma/models/content.prisma

@@ -56,12 +56,11 @@ model GameTag {
   id   String @id @default(uuid())
   name String @unique
 
-  games    Game[]
+  games Game[]
 
   @@index([name(ops: raw("gist_trgm_ops(siglen=32)"))], type: Gist)
 }
 
-
 model GameRating {
   id String @id @default(uuid())
 
@@ -95,6 +94,7 @@ model GameVersion {
   setupCommand  String   @default("") // Command to setup game (dependencies and such)
   setupArgs     String[]
   onlySetup     Boolean  @default(false)
+  hidden        Boolean  @default(false)
 
   umuIdOverride String?
 

prisma/models/task.prisma

@@ -1,5 +1,5 @@
 model Task {
-    id        String @id
+    id        String
     taskGroup String
     name      String
 
@@ -12,4 +12,6 @@ model Task {
     log      String[]
 
     acls String[]
+
+    @@id([id, started])
 }

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

@@ -1,20 +1,25 @@
 import { type } from "arktype";
+import { PlatformClient } from "~/composables/types";
 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 { parsePlatform } from "~/server/internal/utils/parseplatform";
 
-const ImportVersion = type({
+export const ImportVersion = type({
   id: "string",
   version: "string",
 
-  platform: "string",
+  platform: type.valueOf(PlatformClient),
+
   launch: "string = ''",
   launchArgs: "string = ''",
+
   setup: "string = ''",
   setupArgs: "string = ''",
+
   onlySetup: "boolean = false",
+  hide: "boolean = false",
+
   delta: "boolean = false",
   umuId: "string = ''",
 }).configure(throwingArktype);
@@ -34,15 +39,12 @@ export default defineEventHandler(async (h3) => {
     onlySetup,
     delta,
     umuId,
+    hide,
   } = await readDropValidatedBody(h3, ImportVersion);
 
-  const platformParsed = parsePlatform(platform);
-  if (!platformParsed)
-    throw createError({ statusCode: 400, statusMessage: "Invalid platform." });
-
   if (delta) {
     const validOverlayVersions = await prisma.gameVersion.count({
-      where: { gameId: id, platform: platformParsed, delta: false },
+      where: { gameId: id, platform, delta: false },
     });
     if (validOverlayVersions == 0)
       throw createError({
@@ -75,6 +77,7 @@ export default defineEventHandler(async (h3) => {
     launchArgs,
     setup,
     setupArgs,
+    hide,
 
     umuId,
     delta,

server/api/v1/admin/library/index.get.ts

@@ -7,8 +7,9 @@ export default defineEventHandler(async (h3) => {
 
   const unimportedGames = await libraryManager.fetchUnimportedGames();
   const games = await libraryManager.fetchGamesWithStatus();
+  const libraries = await libraryManager.fetchLibraries();
 
   // Fetch other library data here
 
-  return { unimportedGames, games };
+  return { unimportedGames, games, hasLibraries: libraries.length > 0 };
 });

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

@@ -1,5 +1,6 @@
 import aclManager from "~/server/internal/acls";
 import prisma from "~/server/internal/db/database";
+import type { TaskMessage } from "~/server/internal/tasks";
 import taskHandler from "~/server/internal/tasks";
 
 export default defineEventHandler(async (h3) => {
@@ -13,7 +14,7 @@ export default defineEventHandler(async (h3) => {
     });
 
   const runningTasks = (await taskHandler.runningTasks()).map((e) => e.id);
-  const historicalTasks = await prisma.task.findMany({
+  const historicalTasks = (await prisma.task.findMany({
     where: {
       OR: [
         {
@@ -28,7 +29,7 @@ export default defineEventHandler(async (h3) => {
       ended: "desc",
     },
     take: 10,
-  });
+  })) as Array<TaskMessage>;
   const dailyTasks = await taskHandler.dailyTasks();
   const weeklyTasks = await taskHandler.weeklyTasks();
 

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

@@ -0,0 +1,31 @@
+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";
+
+const StartTask = type({
+  taskGroup: type("string"),
+}).configure(throwingArktype);
+
+export default defineEventHandler(async (h3) => {
+  const allowed = await aclManager.allowSystemACL(h3, ["task:start"]);
+  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,
+      statusMessage: "Invalid task group.",
+    });
+
+  const task = await taskHandler.runTaskGroupByName(taskGroup);
+  if (!task)
+    throw createError({
+      statusCode: 500,
+      statusMessage: "Could not start task.",
+    });
+  return { id: task };
+});

server/api/v1/client/game/version.get.ts

@@ -17,6 +17,7 @@ export default defineClientEventHandler(async (h3) => {
         gameId: id,
         versionName: version,
       },
+      hidden: false,
     },
   });
 

server/api/v1/client/game/versions.get.ts

@@ -13,6 +13,7 @@ export default defineClientEventHandler(async (h3) => {
   const versions = await prisma.gameVersion.findMany({
     where: {
       gameId: id,
+      hidden: false,
     },
     orderBy: {
       versionIndex: "desc", // Latest one first

server/api/v2/client/chunk.post.ts

@@ -2,6 +2,7 @@ import { type } from "arktype";
 import { readDropValidatedBody, throwingArktype } from "~/server/arktype";
 import contextManager from "~/server/internal/downloads/coordinator";
 import libraryManager from "~/server/internal/library";
+import { logger } from "~/server/internal/logging";
 
 const GetChunk = type({
   context: "string",
@@ -58,13 +59,25 @@ export default defineEventHandler(async (h3) => {
         statusCode: 500,
         statusMessage: "Failed to create read stream",
       });
+    let length = 0;
     await gameReadStream.pipeTo(
       new WritableStream({
         write(chunk) {
           h3.node.res.write(chunk);
+          length += chunk.length;
         },
       }),
     );
+
+    if (length != file.end - file.start) {
+      logger.warn(
+        `failed to read enough from ${file.filename}. read ${length}, required: ${file.end - file.start}`,
+      );
+      throw createError({
+        statusCode: 500,
+        statusMessage: "Failed to read enough from stream.",
+      });
+    }
   }
 
   await h3.node.res.end();

server/internal/library/index.ts

@@ -14,13 +14,24 @@ import notificationSystem from "../notifications";
 import { GameNotFoundError, type LibraryProvider } from "./provider";
 import { logger } from "../logging";
 import type { GameModel } from "~/prisma/client/models";
+import { createHash } from "node:crypto";
+import type { ImportVersion } from "~/server/api/v1/admin/import/version/index.post";
+
+export function createGameImportTaskId(libraryId: string, libraryPath: string) {
+  return createHash("md5")
+    .update(`import:${libraryId}:${libraryPath}`)
+    .digest("hex");
+}
+
+export function createVersionImportTaskId(gameId: string, versionName: string) {
+  return createHash("md5")
+    .update(`import:${gameId}:${versionName}`)
+    .digest("hex");
+}
 
 class LibraryManager {
   private libraries: Map<string, LibraryProvider<unknown>> = new Map();
 
-  private gameImportLocks: Map<string, Array<string>> = new Map(); // Library ID to Library Path
-  private versionImportLocks: Map<string, Array<string>> = new Map(); // Game ID to Version Name
-
   addLibrary(library: LibraryProvider<unknown>) {
     this.libraries.set(library.id(), library);
   }
@@ -58,12 +69,10 @@ class LibraryManager {
 
     for (const [id, library] of this.libraries.entries()) {
       const providerGames = await library.listGames();
-      const locks = this.gameImportLocks.get(id) ?? [];
       const providerUnimportedGames = providerGames.filter(
         (libraryPath) =>
-          instanceGames[id] &&
-          !instanceGames[id][libraryPath] &&
-          !locks.includes(libraryPath),
+          !instanceGames[id]?.[libraryPath] &&
+          !taskHandler.hasTask(createGameImportTaskId(id, libraryPath)),
       );
       unimportedGames[id] = providerUnimportedGames;
     }
@@ -93,7 +102,7 @@ class LibraryManager {
       const unimportedVersions = versions.filter(
         (e) =>
           game.versions.findIndex((v) => v.versionName == e) == -1 &&
-          !(this.versionImportLocks.get(game.id) ?? []).includes(e),
+          !taskHandler.hasTask(createVersionImportTaskId(game.id, e)),
       );
       return unimportedVersions;
     } catch (e) {
@@ -108,7 +117,11 @@ class LibraryManager {
   async fetchGamesWithStatus() {
     const games = await prisma.game.findMany({
       include: {
-        versions: true,
+        versions: {
+          select: {
+            versionName: true,
+          },
+        },
         library: true,
       },
       orderBy: {
@@ -177,7 +190,8 @@ class LibraryManager {
     for (const filename of files) {
       const basename = path.basename(filename);
       const dotLocation = filename.lastIndexOf(".");
-      const ext = dotLocation == -1 ? "" : filename.slice(dotLocation);
+      const ext =
+        dotLocation == -1 ? "" : filename.slice(dotLocation).toLowerCase();
       for (const [platform, checkExts] of Object.entries(fileExts)) {
         for (const checkExt of checkExts) {
           if (checkExt != ext) continue;
@@ -215,87 +229,12 @@ class LibraryManager {
   }
   */
 
-  /**
-   * Locks the game so you can't be imported
-   * @param libraryId
-   * @param libraryPath
-   */
-  async lockGame(libraryId: string, libraryPath: string) {
-    let games = this.gameImportLocks.get(libraryId);
-    if (!games) this.gameImportLocks.set(libraryId, (games = []));
-
-    if (!games.includes(libraryPath)) games.push(libraryPath);
-
-    this.gameImportLocks.set(libraryId, games);
-  }
-
-  /**
-   * Unlocks the game, call once imported
-   * @param libraryId
-   * @param libraryPath
-   */
-  async unlockGame(libraryId: string, libraryPath: string) {
-    let games = this.gameImportLocks.get(libraryId);
-    if (!games) this.gameImportLocks.set(libraryId, (games = []));
-
-    if (games.includes(libraryPath))
-      games.splice(
-        games.findIndex((e) => e === libraryPath),
-        1,
-      );
-
-    this.gameImportLocks.set(libraryId, games);
-  }
-
-  /**
-   * Locks a version so it can't be imported
-   * @param gameId
-   * @param versionName
-   */
-  async lockVersion(gameId: string, versionName: string) {
-    let versions = this.versionImportLocks.get(gameId);
-    if (!versions) this.versionImportLocks.set(gameId, (versions = []));
-
-    if (!versions.includes(versionName)) versions.push(versionName);
-
-    this.versionImportLocks.set(gameId, versions);
-  }
-
-  /**
-   * Unlocks the version, call once imported
-   * @param libraryId
-   * @param libraryPath
-   */
-  async unlockVersion(gameId: string, versionName: string) {
-    let versions = this.versionImportLocks.get(gameId);
-    if (!versions) this.versionImportLocks.set(gameId, (versions = []));
-
-    if (versions.includes(gameId))
-      versions.splice(
-        versions.findIndex((e) => e === versionName),
-        1,
-      );
-
-    this.versionImportLocks.set(gameId, versions);
-  }
-
   async importVersion(
     gameId: string,
     versionName: string,
-    metadata: {
-      platform: string;
-      onlySetup: boolean;
-
-      setup: string;
-      setupArgs: string;
-      launch: string;
-      launchArgs: string;
-      delta: boolean;
-
-      umuId: string;
-    },
+    metadata: Omit<typeof ImportVersion.infer, "id" | "version">,
   ) {
-    const taskId = `import:${gameId}:${versionName}`;
+    const taskId = createVersionImportTaskId(gameId, versionName);
 
     const platform = parsePlatform(metadata.platform);
     if (!platform) return undefined;
@@ -309,8 +248,6 @@ class LibraryManager {
     const library = this.libraries.get(game.libraryId);
     if (!library) return undefined;
 
-    await this.lockVersion(gameId, versionName);
-
     taskHandler.create({
       id: taskId,
       taskGroup: "import:game",
@@ -339,41 +276,24 @@ class LibraryManager {
         });
 
         // Then, create the database object
-        if (metadata.onlySetup) {
-          await prisma.gameVersion.create({
-            data: {
-              gameId: gameId,
-              versionName: versionName,
-              dropletManifest: manifest,
-              versionIndex: currentIndex,
-              delta: metadata.delta,
-              umuIdOverride: metadata.umuId,
-              platform: platform,
+        await prisma.gameVersion.create({
+          data: {
+            gameId: gameId,
+            versionName: versionName,
+            dropletManifest: manifest,
+            versionIndex: currentIndex,
+            delta: metadata.delta,
+            umuIdOverride: metadata.umuId,
+            platform: platform,
 
-              onlySetup: true,
-              setupCommand: metadata.setup,
-              setupArgs: metadata.setupArgs.split(" "),
-            },
-          });
-        } else {
-          await prisma.gameVersion.create({
-            data: {
-              gameId: gameId,
-              versionName: versionName,
-              dropletManifest: manifest,
-              versionIndex: currentIndex,
-              delta: metadata.delta,
-              umuIdOverride: metadata.umuId,
-              platform: platform,
-
-              onlySetup: false,
-              setupCommand: metadata.setup,
-              setupArgs: metadata.setupArgs.split(" "),
-              launchCommand: metadata.launch,
-              launchArgs: metadata.launchArgs.split(" "),
-            },
-          });
-        }
+            hidden: metadata.hide,
+            onlySetup: metadata.onlySetup,
+            setupCommand: metadata.setup,
+            setupArgs: metadata.setupArgs.split(" "),
+            launchCommand: metadata.launch,
+            launchArgs: metadata.launchArgs.split(" "),
+          },
+        });
 
         logger.info("Successfully created version!");
 
@@ -387,9 +307,6 @@ class LibraryManager {
 
         progress(100);
       },
-      async finally() {
-        await libraryManager.unlockVersion(gameId, versionName);
-      },
     });
 
     return taskId;
@@ -403,7 +320,7 @@ class LibraryManager {
   ) {
     const library = this.libraries.get(libraryId);
     if (!library) return undefined;
-    return library.peekFile(game, version, filename);
+    return await library.peekFile(game, version, filename);
   }
 
   async readFile(
@@ -415,7 +332,7 @@ class LibraryManager {
   ) {
     const library = this.libraries.get(libraryId);
     if (!library) return undefined;
-    return library.readFile(game, version, filename, options);
+    return await library.readFile(game, version, filename, options);
   }
 }
 

server/internal/library/providers/filesystem.ts

@@ -7,12 +7,14 @@ import {
 import { LibraryBackend } from "~/prisma/client/enums";
 import fs from "fs";
 import path from "path";
-import droplet from "@drop-oss/droplet";
+import droplet, { DropletHandler } from "@drop-oss/droplet";
 
 export const FilesystemProviderConfig = type({
   baseDir: "string",
 });
 
+export const DROPLET_HANDLER = new DropletHandler();
+
 export class FilesystemProvider
   implements LibraryProvider<typeof FilesystemProviderConfig.infer>
 {
@@ -57,7 +59,7 @@ export class FilesystemProvider
     const versionDirs = fs.readdirSync(gameDir);
     const validVersionDirs = versionDirs.filter((e) => {
       const fullDir = path.join(this.config.baseDir, game, e);
-      return droplet.hasBackendForPath(fullDir);
+      return DROPLET_HANDLER.hasBackendForPath(fullDir);
     });
     return validVersionDirs;
   }
@@ -65,7 +67,7 @@ export class FilesystemProvider
   async versionReaddir(game: string, version: string): Promise<string[]> {
     const versionDir = path.join(this.config.baseDir, game, version);
     if (!fs.existsSync(versionDir)) throw new VersionNotFoundError();
-    return droplet.listFiles(versionDir);
+    return DROPLET_HANDLER.listFiles(versionDir);
   }
 
   async generateDropletManifest(
@@ -77,10 +79,16 @@ export class FilesystemProvider
     const versionDir = path.join(this.config.baseDir, game, version);
     if (!fs.existsSync(versionDir)) throw new VersionNotFoundError();
     const manifest = await new Promise<string>((r, j) =>
-      droplet.generateManifest(versionDir, progress, log, (err, result) => {
-        if (err) return j(err);
-        r(result);
-      }),
+      droplet.generateManifest(
+        DROPLET_HANDLER,
+        versionDir,
+        progress,
+        log,
+        (err, result) => {
+          if (err) return j(err);
+          r(result);
+        },
+      ),
     );
     return manifest;
   }
@@ -88,7 +96,7 @@ export class FilesystemProvider
   async peekFile(game: string, version: string, filename: string) {
     const filepath = path.join(this.config.baseDir, game, version);
     if (!fs.existsSync(filepath)) return undefined;
-    const stat = droplet.peekFile(filepath, filename);
+    const stat = DROPLET_HANDLER.peekFile(filepath, filename);
     return { size: Number(stat) };
   }
 
@@ -100,13 +108,17 @@ export class FilesystemProvider
   ) {
     const filepath = path.join(this.config.baseDir, game, version);
     if (!fs.existsSync(filepath)) return undefined;
-    const stream = droplet.readFile(
-      filepath,
-      filename,
-      options?.start ? BigInt(options.start) : undefined,
-      options?.end ? BigInt(options.end) : undefined,
-    );
-    if (!stream) return undefined;
+    let stream;
+    while (!(stream instanceof ReadableStream)) {
+      const v = DROPLET_HANDLER.readFile(
+        filepath,
+        filename,
+        options?.start ? BigInt(options.start) : undefined,
+        options?.end ? BigInt(options.end) : undefined,
+      );
+      if (!v) return undefined;
+      stream = v.getStream() as ReadableStream<unknown>;
+    }
 
     return stream;
   }

server/internal/library/providers/flat.ts

@@ -5,6 +5,7 @@ import { LibraryBackend } from "~/prisma/client/enums";
 import fs from "fs";
 import path from "path";
 import droplet from "@drop-oss/droplet";
+import { DROPLET_HANDLER } from "./filesystem";
 
 export const FlatFilesystemProviderConfig = type({
   baseDir: "string",
@@ -46,7 +47,7 @@ export class FlatFilesystemProvider
     const versionDirs = fs.readdirSync(this.config.baseDir);
     const validVersionDirs = versionDirs.filter((e) => {
       const fullDir = path.join(this.config.baseDir, e);
-      return droplet.hasBackendForPath(fullDir);
+      return DROPLET_HANDLER.hasBackendForPath(fullDir);
     });
     return validVersionDirs;
   }
@@ -63,7 +64,7 @@ export class FlatFilesystemProvider
   async versionReaddir(game: string, _version: string) {
     const versionDir = path.join(this.config.baseDir, game);
     if (!fs.existsSync(versionDir)) throw new VersionNotFoundError();
-    return droplet.listFiles(versionDir);
+    return DROPLET_HANDLER.listFiles(versionDir);
   }
 
   async generateDropletManifest(
@@ -75,17 +76,23 @@ export class FlatFilesystemProvider
     const versionDir = path.join(this.config.baseDir, game);
     if (!fs.existsSync(versionDir)) throw new VersionNotFoundError();
     const manifest = await new Promise<string>((r, j) =>
-      droplet.generateManifest(versionDir, progress, log, (err, result) => {
-        if (err) return j(err);
-        r(result);
-      }),
+      droplet.generateManifest(
+        DROPLET_HANDLER,
+        versionDir,
+        progress,
+        log,
+        (err, result) => {
+          if (err) return j(err);
+          r(result);
+        },
+      ),
     );
     return manifest;
   }
   async peekFile(game: string, _version: string, filename: string) {
     const filepath = path.join(this.config.baseDir, game);
     if (!fs.existsSync(filepath)) return undefined;
-    const stat = droplet.peekFile(filepath, filename);
+    const stat = DROPLET_HANDLER.peekFile(filepath, filename);
     return { size: Number(stat) };
   }
   async readFile(
@@ -96,7 +103,7 @@ export class FlatFilesystemProvider
   ) {
     const filepath = path.join(this.config.baseDir, game);
     if (!fs.existsSync(filepath)) return undefined;
-    const stream = droplet.readFile(
+    const stream = DROPLET_HANDLER.readFile(
       filepath,
       filename,
       options?.start ? BigInt(options.start) : undefined,
@@ -104,6 +111,6 @@ export class FlatFilesystemProvider
     );
     if (!stream) return undefined;
 
-    return stream;
+    return stream.getStream();
   }
 }

server/internal/metadata/index.ts

@@ -18,7 +18,7 @@ import taskHandler, { wrapTaskContext } from "../tasks";
 import { randomUUID } from "crypto";
 import { fuzzy } from "fast-fuzzy";
 import { logger } from "~/server/internal/logging";
-import libraryManager from "../library";
+import { createGameImportTaskId } from "../library";
 import type { GameTagModel } from "~/prisma/client/models";
 
 export class MissingMetadataProviderConfig extends Error {
@@ -185,11 +185,9 @@ export class MetadataHandler {
     });
     if (existing) return undefined;
 
-    await libraryManager.lockGame(libraryId, libraryPath);
-
     const gameId = randomUUID();
 
-    const taskId = `import:${gameId}`;
+    const taskId = createGameImportTaskId(libraryId, libraryPath);
     await taskHandler.create({
       name: `Import game "${result.name}" (${libraryPath})`,
       id: taskId,
@@ -280,9 +278,6 @@ export class MetadataHandler {
         logger.info(`Finished game import.`);
         progress(100);
       },
-      async finally() {
-        await libraryManager.unlockGame(libraryId, libraryPath);
-      },
     });
 
     return taskId;

server/internal/tasks/group.ts

@@ -14,6 +14,9 @@ export const taskGroups = {
   "import:game": {
     concurrency: true,
   },
+  debug: {
+    concurrency: true,
+  },
 } as const;
 
 export type TaskGroup = keyof typeof taskGroups;

server/internal/tasks/index.ts

@@ -53,6 +53,7 @@ class TaskHandler {
     "cleanup:invitations",
     "cleanup:sessions",
     "check:update",
+    "debug",
   ];
   private weeklyScheduledTasks: TaskGroup[] = ["cleanup:objects"];
 
@@ -62,6 +63,7 @@ class TaskHandler {
     this.saveScheduledTask(cleanupSessions);
     this.saveScheduledTask(checkUpdate);
     this.saveScheduledTask(cleanupObjects);
+    //this.saveScheduledTask(debug);
   }
 
   /**
@@ -73,6 +75,8 @@ class TaskHandler {
   }
 
   async create(task: Task) {
+    if (this.hasTask(task.id)) throw new Error("Task with ID already exists.");
+
     let updateCollectTimeout: NodeJS.Timeout | undefined;
     let updateCollectResolves: Array<(value: unknown) => void> = [];
     let logOffset: number = 0;
@@ -160,6 +164,13 @@ class TaskHandler {
         // You can configure timestamp, level, etc. here
         timestamp: pino.stdTimeFunctions.isoTime,
         base: null, // Remove pid/hostname if not needed
+        formatters: {
+          level(label) {
+            return {
+              level: label,
+            };
+          },
+        },
       },
       logStream,
     );
@@ -206,8 +217,6 @@ class TaskHandler {
         };
       }
 
-      if (task.finally) await task.finally();
-
       taskEntry.endTime = new Date().toISOString();
       await updateAllClients();
 
@@ -247,7 +256,10 @@ class TaskHandler {
   ) {
     const task =
       this.taskPool.get(taskId) ??
-      (await prisma.task.findUnique({ where: { id: taskId } }));
+      (await prisma.task.findFirst({
+        where: { id: taskId },
+        orderBy: { started: "desc" },
+      }));
     if (!task) {
       peer.send(
         `error/${taskId}/Unknown task/Drop couldn't find the task you're looking for.`,
@@ -324,6 +336,10 @@ class TaskHandler {
       .toArray();
   }
 
+  hasTask(id: string) {
+    return this.taskPool.has(id);
+  }
+
   dailyTasks() {
     return this.dailyScheduledTasks;
   }
@@ -332,13 +348,15 @@ class TaskHandler {
     return this.weeklyScheduledTasks;
   }
 
-  runTaskGroupByName(name: TaskGroup) {
-    const task = this.taskCreators.get(name);
-    if (!task) {
+  async runTaskGroupByName(name: TaskGroup) {
+    const taskConstructor = this.taskCreators.get(name);
+    if (!taskConstructor) {
       logger.warn(`No task found for group ${name}`);
       return;
     }
-    this.create(task());
+    const task = taskConstructor();
+    await this.create(task);
+    return task.id;
   }
 
   /**
@@ -429,7 +447,6 @@ export interface Task {
   taskGroup: TaskGroup;
   name: string;
   run: (context: TaskRunContext) => Promise<void>;
-  finally?: () => Promise<void> | void;
   acls: GlobalACL[];
 }
 
@@ -438,7 +455,7 @@ export type TaskMessage = {
   name: string;
   success: boolean;
   progress: number;
-  error: undefined | { title: string; description: string };
+  error: null | undefined | { title: string; description: string };
   log: string[];
   reset?: boolean;
 };
@@ -464,6 +481,7 @@ interface DropTask {
 export const TaskLog = type({
   timestamp: "string",
   message: "string",
+  level: "string",
 });
 
 // /**
@@ -493,8 +511,6 @@ export const TaskLog = type({
 // }
 
 export function defineDropTask(buildTask: BuildTask): DropTask {
-  // TODO: only let one task with the same taskGroup run at the same time if specified
-
   return {
     taskGroup: buildTask.taskGroup,
     build: () => ({

server/internal/tasks/registry/debug.ts

@@ -0,0 +1,18 @@
+import { defineDropTask } from "..";
+
+export default defineDropTask({
+  buildId: () => `debug:${new Date().toISOString()}`,
+  name: "Debug Task",
+  acls: ["system:maintenance:read"],
+  taskGroup: "debug",
+  async run({ progress, logger }) {
+    const amount = 1000;
+    for (let i = 0; i < amount; i++) {
+      progress((i / amount) * 100);
+      logger.info(`dajksdkajd ${i}`);
+      logger.warn("warning");
+      logger.error("error\nmultiline and stuff\nwoah more lines");
+      await new Promise((r) => setTimeout(r, 1500));
+    }
+  },
+});

utils/parseTaskLog.ts

@@ -1,10 +1,31 @@
 import type { TaskLog } from "~/server/internal/tasks";
 
-export function parseTaskLog(logStr: string): typeof TaskLog.infer {
+const labelNumberMap = {
+  100: "silent",
+  60: "fatal",
+  50: "error",
+  40: "warn",
+  30: "info",
+  20: "debug",
+  10: "trace",
+  0: "off",
+};
+
+export function parseTaskLog(
+  logStr?: string | undefined,
+): typeof TaskLog.infer {
+  if (!logStr) return { message: "", timestamp: "", level: "" };
   const log = JSON.parse(logStr);
 
+  if (typeof log.level === "number") {
+    log.level = labelNumberMap[
+      log.level as keyof typeof labelNumberMap
+    ] as string;
+  }
+
   return {
     message: log.msg,
     timestamp: log.time,
+    level: log.level,
   };
 }

yarn.lock

@@ -342,71 +342,71 @@
     jsonfile "^5.0.0"
     universalify "^0.1.2"
 
-"@drop-oss/droplet-darwin-arm64@1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-darwin-arm64/-/droplet-darwin-arm64-1.6.0.tgz#9697e38c46b02192e8e180b7deaaa20a389a9b0d"
-  integrity sha512-EqTx+Mk5SHP17n19r5coacUDd7lklT4opJ2keNQyGsQjrcf+9FeCX1O5Y+PGIjpQK6UkAVdnBqM+jR7NeFmkAQ==
+"@drop-oss/droplet-darwin-arm64@2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-darwin-arm64/-/droplet-darwin-arm64-2.3.1.tgz#ee1c32b4f180fd40bde57b4d428bdf51119cf6c8"
+  integrity sha512-s0qORIlGTyjnDL2W6Eljoz8yloBXVTpuyiEqnOCVTTtse3uLgqG+78wF2sVhiCKKCNuNwELv5icomJ2k4w2K5w==
 
-"@drop-oss/droplet-darwin-universal@1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-darwin-universal/-/droplet-darwin-universal-1.6.0.tgz#2f780416052ac7d1752b0a7828dc3ef9d1789c92"
-  integrity sha512-TxVpoVDI9aGuBCHA8HktbrIkS/C1gu5laM5+ZbIZkXnIUpTicJIbHRyneXJ4MLnW703gUbW8LTISgm7xKwZJsg==
+"@drop-oss/droplet-darwin-universal@2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-darwin-universal/-/droplet-darwin-universal-2.3.1.tgz#c6529184bd959d326c85ed97c7e8d2b07529abbb"
+  integrity sha512-L1fZjj2LQpLAesNtP3s0PzFPsJ77nVbyXbBeQGaoaq5kF0/npO4NYQ/7flkllGhIlJf/OQENWcARvfablM/G8g==
 
-"@drop-oss/droplet-darwin-x64@1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-darwin-x64/-/droplet-darwin-x64-1.6.0.tgz#5d6a3c596eca706e40b35cdf49ada65e59c51b8d"
-  integrity sha512-V/1xh4s16AmesDOEHiQ4vj9XQq6AWmXRY5RQf4RKBQqkxsHzmQoa37CTLK25Wf9OUoiJFGpnjViqKOFG4y5Q+g==
+"@drop-oss/droplet-darwin-x64@2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-darwin-x64/-/droplet-darwin-x64-2.3.1.tgz#711855d85821080ac11e80b81ec91df1eaa23405"
+  integrity sha512-4UvveQRCq10iEoVfArdCeBuQg51jbn5tkW68LXRoFWzicQz6MFhbowVmzz5RbjYcT5kYwI4c7jBZgeKBGOvc+g==
 
-"@drop-oss/droplet-linux-arm64-gnu@1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-arm64-gnu/-/droplet-linux-arm64-gnu-1.6.0.tgz#265d5e7854c4c61081b8fd74b3e8305ea2c7b5ac"
-  integrity sha512-WjaRl9VW0qE+YkOCaYuNIXzyBbps2lopbpeXELZ9/f/1jBfzfmIe4m6C2hMy4NWUcWnrBbiVTEjnq2cHj/TaBA==
+"@drop-oss/droplet-linux-arm64-gnu@2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-arm64-gnu/-/droplet-linux-arm64-gnu-2.3.1.tgz#f3a3a00239a9063bba1fbcb2209303b337cd862d"
+  integrity sha512-URlpIZZDG/u2pwxM+PaWK240+Phr4RETzwcUQyERAPv22vTjl4l/s4sYa4o4fHX/eosgNLncO+jYgO0f9FS3kg==
 
-"@drop-oss/droplet-linux-arm64-musl@1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-arm64-musl/-/droplet-linux-arm64-musl-1.6.0.tgz#7126e194e5ef9018d61ef7dd0cc3af80734e00e2"
-  integrity sha512-B8KoBYk0YVUZIL+etCcOc99NuoBcTm6KDOIQkN9SHWC4YLRu8um3w8DHzv4VV3arUnEGjyDHuraaOSONfP6NqA==
+"@drop-oss/droplet-linux-arm64-musl@2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-arm64-musl/-/droplet-linux-arm64-musl-2.3.1.tgz#8743132ad2fb050ef5f3cd5ddbe93b1b35ebda73"
+  integrity sha512-+m5IVmD4J979KggUSpyrE4PD4mjHAnvJ8EY2AOMSxmCu3JmONMIKHNmx1TA/k9PlesGKe6GjAs2WGlxwZRCZ2g==
 
-"@drop-oss/droplet-linux-riscv64-gnu@1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-riscv64-gnu/-/droplet-linux-riscv64-gnu-1.6.0.tgz#40d060eafaca08b47a468950d7dc5ec4f1fb2a5a"
-  integrity sha512-nbNr/38EX8Mjj20+paohlOD35apmaNKZan4OO97KOwvq5oZ/pXbkjOGC0zkpsizyxbwKx7Jl4Se7teRVPWWVWw==
+"@drop-oss/droplet-linux-riscv64-gnu@2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-riscv64-gnu/-/droplet-linux-riscv64-gnu-2.3.1.tgz#d7f03d78f107a04f952c8958a024c27df6ad9818"
+  integrity sha512-AkSbSjt8nvcuxJYBeEvGGh6HaQSPO+OeLYUjc4pBZDACUOULHLWnZ5LdD/GUN97JcZOfq+BYfP50mz/1BvWoSA==
 
-"@drop-oss/droplet-linux-x64-gnu@1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-x64-gnu/-/droplet-linux-x64-gnu-1.6.0.tgz#c3a8408644194e59ac2110229e9a99885b3bc533"
-  integrity sha512-n/zA1ftqGey5yQK/1HiCok3MaLA4stVTzQEuRUzyq8BQ1BC6TmKCgdFnI4Q3tuGm3/Mz2CCbfbHY4bYwND9qOQ==
+"@drop-oss/droplet-linux-x64-gnu@2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-x64-gnu/-/droplet-linux-x64-gnu-2.3.1.tgz#7deff7a3de0697de13685c81ec4e9c8e6186ed0a"
+  integrity sha512-jaswkLtTJ4U5GhyBn+86r7cEf8dnHQmcklxomEA8P/DWTHkab1g23XlgaSGHX/FaiRpKAxXGNLTPyY8lR6wePQ==
 
-"@drop-oss/droplet-linux-x64-musl@1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-x64-musl/-/droplet-linux-x64-musl-1.6.0.tgz#206b5c85b02b7fdf53bc5f0cdf68a9d9a7d501cd"
-  integrity sha512-egZWqKK1+vHoVKNuMle2Kn8WbbJ7Y9WJScUNXjF8hdUDNo9eHwJT/DfnA+BhvFQuJXkU58vwv6MqZ5VLdOsGiA==
+"@drop-oss/droplet-linux-x64-musl@2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-x64-musl/-/droplet-linux-x64-musl-2.3.1.tgz#31a2f5107817a59ff5a516cd1912261c85b2e0c7"
+  integrity sha512-xn+W31FOnPVvkoxks104QusnHS1/J0V4Lwzegu3hPjPpZnc0YqFEo74pcxb2VfltgjMTtBOmzyKaApt9Snhd8Q==
 
-"@drop-oss/droplet-win32-arm64-msvc@1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-win32-arm64-msvc/-/droplet-win32-arm64-msvc-1.6.0.tgz#fbb0387536f5b2a88f03877d730f7f863646ce08"
-  integrity sha512-AwGYHae8ZmQV2QGp+3B0DhsBdYynrZ4AS1xNc+U1tXt5CiMp9wLLM/4a+WySYHX7XrEo8pKmRRa0I8QdAdxk5A==
+"@drop-oss/droplet-win32-arm64-msvc@2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-win32-arm64-msvc/-/droplet-win32-arm64-msvc-2.3.1.tgz#4cf431b654b33c58df4cef256e84881b0556a046"
+  integrity sha512-MwDz/4SfFSCEYzGCsptVD38amB18c2MSheJM+mV7Y8qjVDfjzAGrdX9923e8BYIm8eY8ypnOQBTy4/qae8+3uw==
 
-"@drop-oss/droplet-win32-x64-msvc@1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-win32-x64-msvc/-/droplet-win32-x64-msvc-1.6.0.tgz#600058775641b4c5c051291e5a13135aa1ae28bb"
-  integrity sha512-Viz+J87rF7I++nLpPBvdhsjUQAHivA6wSHrBXa+4MwIymUvlQXcvNReFqzObRH4eiuiY4e3s3t9X7+paqd847Q==
+"@drop-oss/droplet-win32-x64-msvc@2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@drop-oss/droplet-win32-x64-msvc/-/droplet-win32-x64-msvc-2.3.1.tgz#01b33c5241cca9aa026605cbb18027d82f57cc6f"
+  integrity sha512-5FRfblFZBI9jpLNS0z+QSqYzxpDg3YSTP/2LvEqI2Z7ZYC02j4SKnW/+C4zzblNuR3e/igfaP0I9yBv4uIb6ew==
 
-"@drop-oss/droplet@1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@drop-oss/droplet/-/droplet-1.6.0.tgz#b6aa382dc5df494c4233a2bd8f19721878edad71"
-  integrity sha512-nTZvLo+GFLlpxgFlObP4zitVctz02bRD3ZSVDiMv7jXxYK0V/GktITJFcKK0J87ZRxneoFHYbLs1lH3MFYoSIw==
+"@drop-oss/droplet@2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@drop-oss/droplet/-/droplet-2.3.1.tgz#664e42bf0b205ffa06f5d5f48f0080012145d8c2"
+  integrity sha512-oar7wvwMC1Evau4lXYcGerFcK/HqTi2Fn/4mcBldIF7B33NhsXhg4RncSNGS5J0WfwG4rkbI249nbs4aDeIrFg==
   optionalDependencies:
-    "@drop-oss/droplet-darwin-arm64" "1.6.0"
-    "@drop-oss/droplet-darwin-universal" "1.6.0"
-    "@drop-oss/droplet-darwin-x64" "1.6.0"
-    "@drop-oss/droplet-linux-arm64-gnu" "1.6.0"
-    "@drop-oss/droplet-linux-arm64-musl" "1.6.0"
-    "@drop-oss/droplet-linux-riscv64-gnu" "1.6.0"
-    "@drop-oss/droplet-linux-x64-gnu" "1.6.0"
-    "@drop-oss/droplet-linux-x64-musl" "1.6.0"
-    "@drop-oss/droplet-win32-arm64-msvc" "1.6.0"
-    "@drop-oss/droplet-win32-x64-msvc" "1.6.0"
+    "@drop-oss/droplet-darwin-arm64" "2.3.1"
+    "@drop-oss/droplet-darwin-universal" "2.3.1"
+    "@drop-oss/droplet-darwin-x64" "2.3.1"
+    "@drop-oss/droplet-linux-arm64-gnu" "2.3.1"
+    "@drop-oss/droplet-linux-arm64-musl" "2.3.1"
+    "@drop-oss/droplet-linux-riscv64-gnu" "2.3.1"
+    "@drop-oss/droplet-linux-x64-gnu" "2.3.1"
+    "@drop-oss/droplet-linux-x64-musl" "2.3.1"
+    "@drop-oss/droplet-win32-arm64-msvc" "2.3.1"
+    "@drop-oss/droplet-win32-x64-msvc" "2.3.1"
 
 "@emnapi/core@^1.4.3":
   version "1.4.5"
@@ -8591,9 +8591,9 @@ tmp-promise@^3.0.2:
     tmp "^0.2.0"
 
 tmp@^0.2.0:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
-  integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.4.tgz#c6db987a2ccc97f812f17137b36af2b6521b0d13"
+  integrity sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==
 
 to-regex-range@^5.0.1:
   version "5.0.1"