feat(launcher): implement a better instances handler

Author: notwindstone

src/components/home/instance/CurrentInstance.vue

@@ -1,18 +1,33 @@
 <script setup lang="ts">
+import { computed, inject } from "vue";
+
 import Image from "@/components/general/base/Image.vue";
 import MaterialRipple from "@/components/general/base/MaterialRipple.vue";
+import { InstanceStatesContextKey } from "@/constants/application.ts";
+import Instances from "@/lib/instances";
+import type {
+  InstanceStatesType,
+  InstanceStateType,
+} from "@/types/application/instance-states.type.ts";
+
+const instanceStates = inject<InstanceStatesType>(InstanceStatesContextKey);
+
+const currentInstance = computed((): InstanceStateType | undefined => (
+  Instances.findCurrent(instanceStates)
+));
 </script>
 
 <template>
   <button
+    v-if="currentInstance"
     id="__home-page__current-instance-button"
     class="relative flex flex-nowrap items-center gap-2 rounded-md p-2"
   >
     <Image
       id="__home-page__current-instance-logo"
       class-names="rounded-md size-12 p-1"
-      src="https://media.forgecdn.net/avatars/thumbnails/286/772/64/64/637305737753885398.png"
-      alt="Fabulously optimized"
+      :src="currentInstance.icon"
+      :alt="`${currentInstance.name}'s icon`"
     />
     <span
       id="__home-page__current-instance-information-wrapper"
@@ -22,13 +37,13 @@ import MaterialRipple from "@/components/general/base/MaterialRipple.vue";
         id="__home-page__current-instance-information-title"
         class="block font-medium"
       >
-        Fabulously Optimized
+        {{ currentInstance.name }}
       </span>
       <span
         id="__home-page__current-instance-information-version"
         class="block text-neutral-400"
       >
-        1.21.10
+        {{ currentInstance.version }}
       </span>
     </span>
     <MaterialRipple />

src/components/home/instance/Launch.vue

@@ -4,6 +4,7 @@ import { computed, inject, ref } from "vue";
 import MaterialRipple from "@/components/general/base/MaterialRipple.vue";
 import { InstanceStatesContextKey } from "@/constants/application.ts";
 import { LaunchStatus } from "@/constants/launcher.ts";
+import Instances from "@/lib/instances";
 import Launcher from "@/lib/launcher";
 import { log } from "@/lib/logging/scopes/log.ts";
 import type {
@@ -14,15 +15,9 @@ import type { LaunchStatusType } from "@/types/launcher/launch-status.type.ts";
 
 const instanceStates = inject<InstanceStatesType>(InstanceStatesContextKey);
 
-const currentInstance = computed((): InstanceStateType | undefined => {
-  const keys = Object.keys(instanceStates ?? {});
-
-  if (keys.length === 0) {
-    return undefined;
-  }
-
-  return instanceStates?.[keys?.[0]];
-});
+const currentInstance = computed((): InstanceStateType | undefined => (
+  Instances.findCurrent(instanceStates)
+));
 
 const status = ref<LaunchStatusType>(LaunchStatus.General.Starting);
 

src/lib/instances/index.ts

@@ -1,4 +1,5 @@
 import { ApplicationNamespace } from "@/constants/application.ts";
+import { findCurrent } from "@/lib/instances/scopes/find-current.ts";
 import { getConfigInstancesStates } from "@/lib/instances/scopes/get-config-instances-states.ts";
 import { readStoredInstances } from "@/lib/instances/scopes/read-stored-instances.ts";
 import type { InstanceStatesType } from "@/types/application/instance-states.type.ts";
@@ -11,4 +12,5 @@ export default {
   ): void => window[ApplicationNamespace].__internals.changeInstanceStates(key, value),
   "getFromConfig": getConfigInstancesStates,
   "readStored"   : readStoredInstances,
+  findCurrent,
 } as const;

src/lib/instances/scopes/find-current.ts

@@ -0,0 +1,16 @@
+import type {
+  InstanceStatesType,
+  InstanceStateType,
+} from "@/types/application/instance-states.type.ts";
+
+export function findCurrent(
+  instances: InstanceStatesType | undefined,
+): InstanceStateType | undefined {
+  const keys = Object.keys(instances ?? {});
+
+  if (keys.length === 0) {
+    return undefined;
+  }
+
+  return instances?.[keys?.[0]];
+}

src/lib/instances/scopes/read-stored-instances.ts

@@ -45,6 +45,7 @@ export async function readStoredInstances(baseDirectory: string): Promise<Instan
 
   for (const [currentId, currentMetadata] of Object.entries(parsed)) {
     const isValid: boolean = Schemas.InstanceMetadataValidator.Check(currentMetadata);
+    console.log(isValid);
 
     if (!isValid) {
       log.info(`The '${currentId}' instances is not valid`);

src/lib/schemas/scopes/instances/instance-metadata.schema.ts

@@ -2,7 +2,7 @@ import { Type } from "typebox";
 
 import { MinecraftSchema } from "@/lib/schemas/scopes/config/minecraft.schema.ts";
 
-export const InstanceMetadataSchema = Type.Union([
+export const InstanceMetadataSchema = Type.Intersect([
   MinecraftSchema,
   Type.Object({
     "id"      : Type.String(),