feat(launcher): improve instance management

notwindstone · notwindstone · commit 3c826cbd4a81 · 2025-11-30T16:45:59.000+03:00
diff --git a/src/components/home/instance/CurrentInstance.vue b/src/components/home/instance/CurrentInstance.vue
@@ -1,33 +1,67 @@
 <script setup lang="ts">
-import { computed, inject } from "vue";
+import { computed, inject, ref } 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 { GlobalStatesContextKey, InstanceStatesContextKey } from "@/constants/application.ts";
+import Errors from "@/lib/errors";
 import Instances from "@/lib/instances";
-import type {
-  InstanceStatesType,
-  InstanceStateType,
-} from "@/types/application/instance-states.type.ts";
+import { log } from "@/lib/logging/scopes/log.ts";
+import type { ContextGlobalStatesType } from "@/types/application/global-states.type.ts";
+import type { InstanceStatesType } from "@/types/application/instance-states.type.ts";
+import type { CurrentInstanceType } from "@/types/launcher/current-instance.type.ts";
 
+const globalStates = inject<ContextGlobalStatesType>(GlobalStatesContextKey);
 const instanceStates = inject<InstanceStatesType>(InstanceStatesContextKey);
 
-const currentInstance = computed((): InstanceStateType | undefined => (
-  Instances.findCurrent(instanceStates)
+const currentInstance = computed((): CurrentInstanceType => (
+  Instances.findCurrent(globalStates?.layout?.currentInstance, instanceStates)
 ));
+
+const disabled = ref<boolean>(false);
+
+async function __changeName(): Promise<void> {
+  if (!currentInstance.value) {
+    return;
+  }
+
+  disabled.value = true;
+
+  try {
+    const id = currentInstance.value.id;
+    const instance = currentInstance.value.instance;
+
+    Instances.change(id, {
+      ...instance,
+      "name": `Vanilla 1.${Math.floor(Math.random() * 21)}`,
+    });
+
+    if (!instanceStates) {
+      return;
+    }
+
+    await Instances.syncMetadata(instanceStates);
+  } catch (error: unknown) {
+    log.error("Could not change the current instance name:", Errors.prettify(error));
+  }
+
+  disabled.value = false;
+}
 </script>
 
 <template>
   <button
     v-if="currentInstance"
+    @click="__changeName"
+    :disabled="disabled"
     id="__home-page__current-instance-button"
-    class="relative flex flex-nowrap items-center gap-2 rounded-md p-2"
+    class="relative flex flex-nowrap items-center gap-2 rounded-md p-2 transition-[opacity] disabled:cursor-default disabled:opacity-50"
   >
     <Image
       id="__home-page__current-instance-logo"
       class-names="rounded-md size-12 p-1"
-      :src="currentInstance.icon"
-      :alt="`${currentInstance.name}'s icon`"
+      :src="currentInstance.instance.icon"
+      :alt="`${currentInstance.instance.name}'s icon`"
     />
     <span
       id="__home-page__current-instance-information-wrapper"
@@ -37,13 +71,13 @@ const currentInstance = computed((): InstanceStateType | undefined => (
         id="__home-page__current-instance-information-title"
         class="block font-medium"
       >
-        {{ currentInstance.name }}
+        {{ currentInstance.instance.name }}
       </span>
       <span
         id="__home-page__current-instance-information-version"
         class="block text-neutral-400"
       >
-        {{ currentInstance.version }}
+        {{ currentInstance.instance.version }}
       </span>
     </span>
     <MaterialRipple />
diff --git a/src/components/home/instance/Launch.vue b/src/components/home/instance/Launch.vue
@@ -2,21 +2,21 @@
 import { computed, inject, ref } from "vue";
 
 import MaterialRipple from "@/components/general/base/MaterialRipple.vue";
-import { InstanceStatesContextKey } from "@/constants/application.ts";
+import { GlobalStatesContextKey, 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 {
-  InstanceStatesType,
-  InstanceStateType,
-} from "@/types/application/instance-states.type.ts";
+import type { ContextGlobalStatesType } from "@/types/application/global-states.type.ts";
+import type { InstanceStatesType } from "@/types/application/instance-states.type.ts";
+import type { CurrentInstanceType } from "@/types/launcher/current-instance.type.ts";
 import type { LaunchStatusType } from "@/types/launcher/launch-status.type.ts";
 
+const globalStates = inject<ContextGlobalStatesType>(GlobalStatesContextKey);
 const instanceStates = inject<InstanceStatesType>(InstanceStatesContextKey);
 
-const currentInstance = computed((): InstanceStateType | undefined => (
-  Instances.findCurrent(instanceStates)
+const currentInstance = computed((): CurrentInstanceType => (
+  Instances.findCurrent(globalStates?.layout?.currentInstance, instanceStates)
 ));
 
 const status = ref<LaunchStatusType>(LaunchStatus.General.Starting);
diff --git a/src/lib/__delete/helpers/parse-rules.ts b/src/lib/__delete/helpers/parse-rules.ts
@@ -1,7 +1,7 @@
 import { arch, version } from "@tauri-apps/plugin-os";
 
 import { transformPlatform } from "@/lib/__delete/helpers/transform-platform.ts";
-import type { LibraryRuleType } from "@/types/minecraft/minecraft.type.ts";
+import type { LibraryRuleType } from "@/types/__delete-minecraft/minecraft.type.ts";
 
 export async function evaluateRules(rules: LibraryRuleType[]): Promise<boolean> {
   const platform = transformPlatform();
diff --git a/src/lib/__delete/launcher/core/download.ts b/src/lib/__delete/launcher/core/download.ts
@@ -24,7 +24,7 @@ import type {
   LoggingConfigType,
   VersionManifestType,
   VersionMetaModernType,
-} from "@/types/minecraft/minecraft.type.ts";
+} from "@/types/__delete-minecraft/minecraft.type.ts";
 
 export async function fetchVersionManifest(): Promise<VersionManifestType> {
   const raw = await fetch("https://piston-meta.mojang.com/mc/game/version_manifest.json");
diff --git a/src/lib/configs/scopes/get-config-file.test.ts b/src/lib/configs/scopes/get-config-file.test.ts
@@ -9,6 +9,7 @@ const defaultConfig: ConfigType = {
     "allowUnrestrictedUntrusted": true,
   },
   "layout": {
+    "currentInstance"        : null,
     "enableMaterialYouRipple": true,
     "custom"                 : false,
     "background"             : {
diff --git a/src/lib/configs/scopes/get-default-config.test.ts b/src/lib/configs/scopes/get-default-config.test.ts
@@ -14,6 +14,7 @@ test(testName, async () => {
       "allowUnrestrictedUntrusted": true,
     },
     "layout": {
+      "currentInstance"        : null,
       "enableMaterialYouRipple": true,
       "custom"                 : false,
       "background"             : {
diff --git a/src/lib/configs/scopes/get-default-config.ts b/src/lib/configs/scopes/get-default-config.ts
@@ -25,6 +25,7 @@ export async function getDefaultConfig(): Promise<ConfigType> {
       "allowUnrestrictedUntrusted": true,
     },
     "layout": {
+      "currentInstance"        : null,
       "enableMaterialYouRipple": true,
       "custom"                 : false,
       "background"             : {
diff --git a/src/lib/global-state-helpers/scopes/get-default-global-states.ts b/src/lib/global-state-helpers/scopes/get-default-global-states.ts
@@ -10,6 +10,7 @@ export function getDefaultGlobalStates(): GlobalStatesType {
   return {
     "translations": EnglishTranslations,
     "layout"      : {
+      "currentInstance"        : null,
       "enableMaterialYouRipple": true,
       "custom"                 : false,
       "background"             : {
diff --git a/src/lib/instances/index.ts b/src/lib/instances/index.ts
@@ -2,6 +2,7 @@ import { ApplicationNamespace } from "@/constants/application.ts";
 import { findCurrent } from "@/lib/instances/scopes/find-current.ts";
 import { getConfigInstanceStates } from "@/lib/instances/scopes/get-config-instance-states.ts";
 import { readStoredInstances } from "@/lib/instances/scopes/read-stored-instances.ts";
+import { saveInstanceStatesToFile } from "@/lib/instances/scopes/save-instance-states-to-file.ts";
 import type { InstanceStatesType } from "@/types/application/instance-states.type.ts";
 
 export default {
@@ -12,5 +13,6 @@ export default {
   ): void => window[ApplicationNamespace].__internals.changeInstanceStates(key, value),
   "getFromConfig": getConfigInstanceStates,
   "readStored"   : readStoredInstances,
+  "syncMetadata" : saveInstanceStatesToFile,
   findCurrent,
 } as const;
diff --git a/src/lib/instances/scopes/find-current.ts b/src/lib/instances/scopes/find-current.ts
@@ -2,15 +2,21 @@ import type {
   InstanceStatesType,
   InstanceStateType,
 } from "@/types/application/instance-states.type.ts";
+import type { CurrentInstanceType } from "@/types/launcher/current-instance.type.ts";
 
 export function findCurrent(
+  id: string | null | undefined,
   instances: InstanceStatesType | undefined,
-): InstanceStateType | undefined {
-  const keys = Object.keys(instances ?? {});
+): CurrentInstanceType {
+  if (!id) {
+    return;
+  }
+
+  const instance: InstanceStateType | undefined = instances?.[id];
 
-  if (keys.length === 0) {
+  if (!instance) {
     return undefined;
   }
 
-  return instances?.[keys?.[0]];
+  return { instance, id };
 }
diff --git a/src/lib/instances/scopes/read-stored-instances.ts b/src/lib/instances/scopes/read-stored-instances.ts
@@ -45,15 +45,16 @@ 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`);
+      log.warn(`The '${currentId}' instance is not valid`);
       allValid = false;
 
       continue;
     }
 
+    log.debug(`The '${currentId}' instance is valid`);
+
     validInstances[currentId] = currentMetadata;
   }
 
diff --git a/src/lib/instances/scopes/save-instance-states-to-file.ts b/src/lib/instances/scopes/save-instance-states-to-file.ts
@@ -0,0 +1,30 @@
+import { writeTextFile } from "@tauri-apps/plugin-fs";
+
+import { FileStructure } from "@/constants/file-structure.ts";
+import General from "@/lib/general";
+import { log } from "@/lib/logging/scopes/log.ts";
+import type { InstanceStatesType } from "@/types/application/instance-states.type.ts";
+
+export async function saveInstanceStatesToFile(instances: InstanceStatesType): Promise<void> {
+  log.debug("Starting the instance metadata sync");
+  const timeStart = performance.now();
+  const metadataPath = General.cachedJoin(
+    General.getCachedBaseDirectory(),
+    FileStructure.Files.Metadata,
+  );
+
+  await writeTextFile(metadataPath, JSON.stringify(
+    instances,
+    null,
+    2,
+  ));
+
+  const timeEnd = performance.now();
+  const timeDifference = (timeEnd - timeStart).toFixed(1);
+
+  log.info(
+    "Instance metadata file successfully synced in:",
+    timeDifference,
+    "ms",
+  );
+}
diff --git a/src/lib/launcher/scopes/get-version-metadata.ts b/src/lib/launcher/scopes/get-version-metadata.ts
@@ -1,8 +1,8 @@
 import { fetch } from "@tauri-apps/plugin-http";
 
+import { LaunchStatus } from "@/constants/launcher.ts";
 import type { LaunchStatusType } from "@/types/launcher/launch-status.type.ts";
 import type { VersionMetadataType } from "@/types/launcher/version-metadata.type.ts";
-import { LaunchStatus } from "@/constants/launcher.ts";
 
 export async function getVersionMetadata({
   changeStatus,
diff --git a/src/lib/launcher/scopes/launch-with-checks.ts b/src/lib/launcher/scopes/launch-with-checks.ts
@@ -50,7 +50,7 @@ export async function launchWithChecks({
     cacheManifestV2({ updateCache, manifest, cachedManifestV2Path }),
   ]);
 
-  // const assetIndex = versionMetadata.assetIndex;
+  // | const assetIndex = versionMetadata.assetIndex;
 
   return;
 }
diff --git a/src/lib/launcher/scopes/launch.ts b/src/lib/launcher/scopes/launch.ts
@@ -3,7 +3,5 @@ export async function launch({
 }: {
   "instanceId": string;
 }): Promise<boolean> {
-  console.log(instanceId);
-
-  return true;
+  return instanceId === "";
 }
diff --git a/src/lib/schemas/scopes/config/layout.schema.ts b/src/lib/schemas/scopes/config/layout.schema.ts
@@ -1,6 +1,10 @@
 import { Type } from "typebox";
 
 export const LayoutSchema = Type.Object({
+  "currentInstance": Type.Union([
+    Type.String(),
+    Type.Null(),
+  ]),
   "enableMaterialYouRipple": Type.Boolean(),
   "custom"                 : Type.Union([
     Type.Boolean(),
diff --git a/src/lib/schemas/scopes/instances/instance-metadata.schema.ts b/src/lib/schemas/scopes/instances/instance-metadata.schema.ts
@@ -5,7 +5,6 @@ import { MinecraftSchema } from "@/lib/schemas/scopes/config/minecraft.schema.ts
 export const InstanceMetadataSchema = Type.Intersect([
   MinecraftSchema,
   Type.Object({
-    "id"      : Type.String(),
     "name"    : Type.String(),
     "version" : Type.String(),
     "launched": Type.Boolean(),
diff --git a/src/types/__delete-minecraft/minecraft.type.ts b/src/types/__delete-minecraft/minecraft.type.ts
diff --git a/src/types/application/global-states.type.ts b/src/types/application/global-states.type.ts
@@ -4,6 +4,7 @@ import type { RouteType } from "@/types/application/route.type.ts";
 import type { TranslationsType } from "@/types/translations/translations.type.ts";
 
 export type GlobalStatesLayoutType = {
+  "currentInstance"        : string | null;
   "enableMaterialYouRipple": boolean;
   "custom"                 : boolean | Array<"sidebar" | "contextMenu">;
   "background"             : {
diff --git a/src/types/application/instance-states.type.ts b/src/types/application/instance-states.type.ts
@@ -3,7 +3,6 @@ import type { ShallowReactive } from "vue";
 import type { GlobalStatesType } from "@/types/application/global-states.type.ts";
 
 export type InstanceStateType = GlobalStatesType["minecraft"] & {
-  "id"      : string;
   "name"    : string;
   "version" : string;
   "launched": boolean;
diff --git a/src/types/launcher/current-instance.type.ts b/src/types/launcher/current-instance.type.ts
@@ -0,0 +1,6 @@
+import type { InstanceStateType } from "@/types/application/instance-states.type.ts";
+
+export type CurrentInstanceType = {
+  "instance": InstanceStateType;
+  "id"      : string;
+} | undefined;
