partial: admin import annotations

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

@@ -1,19 +1,28 @@
+import { ArkErrors, type } from "arktype";
 import aclManager from "~/server/internal/acls";
 import prisma from "~/server/internal/db/database";
 import libraryManager from "~/server/internal/library";
 
-export default defineEventHandler(async (h3) => {
+const Query = type({
+  id: "string",
+});
+
+/**
+ *  Fetch all versions available for import for a game (`id` in query params).
+ */
+export default defineEventHandler<{ query: typeof Query.infer }>(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)
+  const query = Query(await getQuery(h3));
+  if (query instanceof ArkErrors)
     throw createError({
       statusCode: 400,
-      statusMessage: "Missing id in request params",
+      statusMessage: "Invalid query params: " + query.summary,
     });
 
+  const gameId = query.id;
+
   const game = await prisma.game.findUnique({
     where: { id: gameId },
     select: { libraryId: true, libraryPath: true },

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

@@ -19,71 +19,80 @@ const ImportVersion = type({
   umuId: "string = ''",
 }).configure(throwingArktype);
 
-export default defineEventHandler(async (h3) => {
-  const allowed = await aclManager.allowSystemACL(h3, ["import:version:new"]);
-  if (!allowed) throw createError({ statusCode: 403 });
+/**
+ * Import a version for a game.
+ */
+export default defineEventHandler<{ body: typeof ImportVersion.infer }>(
+  async (h3) => {
+    const allowed = await aclManager.allowSystemACL(h3, ["import:version:new"]);
+    if (!allowed) throw createError({ statusCode: 403 });
 
-  const {
-    id,
-    version,
-    platform,
-    launch,
-    launchArgs,
-    setup,
-    setupArgs,
-    onlySetup,
-    delta,
-    umuId,
-  } = await readDropValidatedBody(h3, ImportVersion);
+    const {
+      id,
+      version,
+      platform,
+      launch,
+      launchArgs,
+      setup,
+      setupArgs,
+      onlySetup,
+      delta,
+      umuId,
+    } = await readDropValidatedBody(h3, ImportVersion);
 
-  const platformParsed = parsePlatform(platform);
-  if (!platformParsed)
-    throw createError({ statusCode: 400, statusMessage: "Invalid platform." });
+    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 },
+    if (delta) {
+      const validOverlayVersions = await prisma.gameVersion.count({
+        where: { gameId: id, platform: platformParsed, delta: false },
+      });
+      if (validOverlayVersions == 0)
+        throw createError({
+          statusCode: 400,
+          statusMessage:
+            "Update mode requires a pre-existing version for this platform.",
+        });
+    }
+
+    if (onlySetup) {
+      if (!setup)
+        throw createError({
+          statusCode: 400,
+          statusMessage: 'Setup required in "setup mode".',
+        });
+    } else {
+      if (!delta && !launch)
+        throw createError({
+          statusCode: 400,
+          statusMessage:
+            "Launch executable is required for non-update versions",
+        });
+    }
+
+    // startup & delta require more complex checking logic
+    const taskId = await libraryManager.importVersion(id, version, {
+      platform,
+      onlySetup,
+
+      launch,
+      launchArgs,
+      setup,
+      setupArgs,
+
+      umuId,
+      delta,
     });
-    if (validOverlayVersions == 0)
+    if (!taskId)
       throw createError({
         statusCode: 400,
-        statusMessage:
-          "Update mode requires a pre-existing version for this platform.",
+        statusMessage: "Invalid options for import",
       });
-  }
 
-  if (onlySetup) {
-    if (!setup)
-      throw createError({
-        statusCode: 400,
-        statusMessage: 'Setup required in "setup mode".',
-      });
-  } else {
-    if (!delta && !launch)
-      throw createError({
-        statusCode: 400,
-        statusMessage: "Launch executable is required for non-update versions",
-      });
-  }
-
-  // startup & delta require more complex checking logic
-  const taskId = await libraryManager.importVersion(id, version, {
-    platform,
-    onlySetup,
-
-    launch,
-    launchArgs,
-    setup,
-    setupArgs,
-
-    umuId,
-    delta,
-  });
-  if (!taskId)
-    throw createError({
-      statusCode: 400,
-      statusMessage: "Invalid options for import",
-    });
-
-  return { taskId: taskId };
-});
+    return { taskId: taskId };
+  },
+);

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

@@ -1,18 +1,27 @@
+import { ArkErrors, type } from "arktype";
 import aclManager from "~/server/internal/acls";
 import libraryManager from "~/server/internal/library";
 
-export default defineEventHandler(async (h3) => {
+const Query = type({
+  id: "string",
+  version: "string",
+});
+
+/**
+ * Fetch recommendations for version import.
+ */
+export default defineEventHandler<{ query: typeof Query.infer }>(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)
+  const query = Query(await getQuery(h3));
+  if (query instanceof ArkErrors)
     throw createError({
       statusCode: 400,
-      statusMessage: "Missing id or version in request params",
+      statusMessage: "Invalid query: " + query.summary,
     });
+  const gameId = query.id;
+  const versionName = query.version;
 
   const preload = await libraryManager.fetchUnimportedVersionInformation(
     gameId,