feat: instances v2 (#6431)

* feat: base of instances v2

* feat: use old profiles with compat layer

* prototype: instances v2

* fix: install_from using profile

* fix: skins migration fix

* fix: frontend still using profile path

* fix: add update proj multiselect guard

* fix: cargo fmt

* fix: content missing fields

* feat: break up app-lib/api/instance.rs

* fix: check_content_updates mismatch

* fix: updater modal cleanup w/new structure

* feat: better update all handling

* fix: remove preview_update_all

* fix: feedback on bulk update + lint

* fix: rem transitions

* fix: change to jsonb

* feat: app db backup after update

* fix: lint

* fix: sqlx prepare + use sqlx macros

* fix: lint

* fix: bugs

* feat: defuck the installing process up

* fix: bug of hell

* fix: shear

* fix: fmt

* fix: install progress spacing + change mc/content/overrides to bytes

* fix: lint

* fix: prepr

* fix: navtabs anim not working in app

* fix: worlds.vue improvements + browse page fixes

* feat: optimise queries + adapter fns

* fix: lint

* fix: lint

* feat: shared modrinth-content-management crate (#6469)

* feat: disable warnings setting

* feat: add instances shortcuts (#6329)

* Add modrinth://launch deep link to start a profile

Support external profile launching via modrinth://launch/{profile_path} for integrations such as Stream Deck.

* Change route to /launch/profile/{id} for future extensibility

* fix: ensure profile path is url decoded

* fix: URL-decode profile path from deep link

* fix: use urlencoding crate for URL decoding

* feat: implement app instance shortcuts

* feat: change windows shortcut creation to use windows api instead

* feat: implement creating a shortcut launching world/server

* format

* fmt

* fix multiline inline tables

* pnpm prepr

* feat: move create shortcut to last item

* refactor: split up shortcuts.rs for individual platforms

* refactor: turn profile launch url into url type

* use string literal and add safety comment

* pt2

* refactor: rename anything that's profile into instance

* update mac shortcut

---------

Co-authored-by: DJCheesusReal <134006619+DJCheesusReal@users.noreply.github.com>

---------

Co-authored-by: Truman Gao <106889354+tdgao@users.noreply.github.com>
Co-authored-by: DJCheesusReal <134006619+DJCheesusReal@users.noreply.github.com>

apps/app-frontend/src/helpers/auth.js

@@ -1,6 +1,6 @@
 /**
  * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'

apps/app-frontend/src/helpers/events.js

@@ -31,8 +31,8 @@ import { listen } from '@tauri-apps/api/event'
           pack_name: name of the pack
           pack_id, optional, the id of the modpack
           pack_version, optional, the version of the modpack
-          profile_name: name of the profile
-          profile_uuid: unique identification of the profile
+          instance_name: name of the instance
+          instance_id: unique identification of the instance
 
         }
         loader_uuid: unique identification of the loading bar
@@ -57,18 +57,32 @@ export async function process_listener(callback) {
 	return await listen('process', (event) => callback(event.payload))
 }
 
-/// Payload for the 'profile' event
+/// Payload for the 'instance' event
 /*
-    ProfilePayload {
-        uuid: unique identification of the process in the state (currently identified by path, but that will change)
-        name: name of the profile
-        profile_path: relative path toprofile_listener profile (used for path identification)
-        path: path to profile (used for opening the profile in the OS file explorer)
+    InstancePayload {
+        instance_id: unique identification of the instance
         event: event type ("Created", "Added", "Edited", "Removed")
     }
 */
-export async function profile_listener(callback) {
-	return await listen('profile', (event) => callback(event.payload))
+export async function instance_listener(callback) {
+	return await listen('instance', (event) => callback(event.payload))
+}
+
+/// Payload for the 'instance_bulk_update_progress' event
+/*
+    InstanceBulkUpdateProgress {
+        instanceId: string
+        stage: "resolving_versions" | "downloading" | "finishing"
+        current: number
+        total: number
+    }
+*/
+export async function instance_bulk_update_progress_listener(callback) {
+	return await listen('instance_bulk_update_progress', (event) => callback(event.payload))
+}
+
+export async function install_job_listener(callback) {
+	return await listen('install_job', (event) => callback(event.payload))
 }
 
 /// Payload for the 'command' event
@@ -105,7 +119,7 @@ export async function notification_listener(callback) {
 /// Payload for the 'log' event
 /*
     LogPayload {
-        profile_path_id: string,
+        instance_id: string,
         type: "log4j" | "legacy",
         // log4j fields (when type === "log4j"):
         timestamp_millis?: number,

apps/app-frontend/src/helpers/friends.ts

@@ -8,7 +8,7 @@ import type { ModrinthCredentials } from '@/helpers/mr_auth'
 
 export type UserStatus = {
 	user_id: string
-	profile_name: string | null
+	instance_name: string | null
 	last_update: string
 }
 

apps/app-frontend/src/helpers/import.js

@@ -1,11 +1,11 @@
 /**
  * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'
 
-import { create } from './profile'
+import { install_import_instance } from './install'
 
 /*
   API for importing instances from other launchers
@@ -32,19 +32,8 @@ export async function get_importable_instances(launcherType, basePath) {
 }
 
 /// Import an instance from a launcher type and base path
-/// eg: import_instance("profile-name-to-go-to", "MultiMC", "C:/MultiMC", "Instance 1")
 export async function import_instance(launcherType, basePath, instanceFolder) {
-	// create a basic, empty instance (most properties will be filled in by the import process)
-	// We do NOT watch the fs for changes to avoid duplicate events during installation
-	// fs watching will be enabled once the instance is imported
-	const profilePath = await create(instanceFolder, '1.19.4', 'vanilla', 'latest', null, true)
-
-	return await invoke('plugin:import|import_instance', {
-		profilePath,
-		launcherType,
-		basePath,
-		instanceFolder,
-	})
+	return await install_import_instance(launcherType, basePath, instanceFolder)
 }
 
 /// Checks if this instance is valid for importing, given a certain launcher type

apps/app-frontend/src/helpers/install.ts

@@ -0,0 +1,266 @@
+import { invoke } from '@tauri-apps/api/core'
+
+import { install_job_listener } from './events'
+import type { InstanceLink, InstanceLoader } from './types'
+
+export interface PackLocationVersionId {
+	type: 'fromVersionId'
+	project_id: string
+	version_id: string
+	title: string
+	icon_url?: string | null
+}
+
+export interface PackLocationFile {
+	type: 'fromFile'
+	path: string
+}
+
+export type CreatePackLocation = PackLocationVersionId | PackLocationFile
+
+export interface InstallModpackPreview {
+	name: string
+	gameVersion: string
+	modloader: InstanceLoader
+	loaderVersion: string | null
+	icon?: string | null
+	iconUrl?: string | null
+	link?: InstanceLink | null
+	unknownFile: boolean
+}
+
+export interface InstallCreateInstanceRequest {
+	name: string
+	gameVersion: string
+	loader: InstanceLoader
+	loaderVersion: string | null
+	iconPath: string | null
+	link?: InstanceLink | null
+}
+
+export interface InstallPostInstallEdit {
+	name?: string | null
+	iconPath?: string | null
+	link?: InstanceLink | null
+}
+
+export type InstallJobStatus =
+	| 'queued'
+	| 'running'
+	| 'succeeded'
+	| 'failed'
+	| 'interrupted'
+	| 'canceled'
+
+export type InstallPhaseId =
+	| 'preparing_instance'
+	| 'resolving_pack'
+	| 'downloading_pack_file'
+	| 'reading_pack_manifest'
+	| 'downloading_content'
+	| 'extracting_overrides'
+	| 'resolving_minecraft'
+	| 'resolving_loader'
+	| 'preparing_java'
+	| 'downloading_minecraft'
+	| 'running_loader_processors'
+	| 'finalizing'
+	| 'rolling_back'
+
+export interface InstallProgress {
+	current: number
+	total: number
+	secondary?: InstallProgressSecondary | null
+}
+
+export interface InstallProgressSecondary {
+	current: number
+	total: number
+}
+
+export type InstallJavaStep =
+	| 'resolving'
+	| 'fetching_metadata'
+	| 'downloading'
+	| 'extracting'
+	| 'validating'
+
+export interface InstallJobSnapshot {
+	job_id: string
+	instance_id?: string | null
+	kind:
+		| 'create_instance'
+		| 'create_modpack_instance'
+		| 'import_instance'
+		| 'duplicate_instance'
+		| 'install_existing_instance'
+		| 'install_pack_to_existing_instance'
+	status: InstallJobStatus
+	target:
+		| { type: 'new_instance'; instance_id?: string | null }
+		| { type: 'existing_instance'; instance_id: string }
+	phase: InstallPhaseId
+	progress?: InstallProgress | null
+	details:
+		| { type: 'empty' }
+		| { type: 'instance'; name: string }
+		| { type: 'minecraft'; game_version: string; loader: InstanceLoader }
+		| { type: 'java'; major_version: number; step: InstallJavaStep }
+		| {
+				type: 'modpack'
+				project_id?: string | null
+				version_id?: string | null
+				title?: string | null
+		  }
+		| { type: 'import'; launcher_type: string; instance_folder: string }
+	display?: { title: string; icon?: string | null } | null
+	error?: { code: string; message: string } | null
+	created: string
+	modified: string
+	finished?: string | null
+}
+
+export async function install_get_modpack_preview(location: CreatePackLocation) {
+	return await invoke<InstallModpackPreview>('plugin:install|install_get_modpack_preview', {
+		location,
+	})
+}
+
+export async function install_create_instance(request: InstallCreateInstanceRequest) {
+	return await invoke<InstallJobSnapshot>('plugin:install|install_create_instance', { request })
+}
+
+export async function install_create_modpack_instance(
+	location: CreatePackLocation,
+	postInstallEdit?: InstallPostInstallEdit | null,
+) {
+	return await invoke<InstallJobSnapshot>('plugin:install|install_create_modpack_instance', {
+		location,
+		postInstallEdit,
+	})
+}
+
+export async function install_import_instance(
+	launcherType: string,
+	basePath: string,
+	instanceFolder: string,
+) {
+	return await invoke<InstallJobSnapshot>('plugin:install|install_import_instance', {
+		launcherType,
+		basePath,
+		instanceFolder,
+	})
+}
+
+export async function install_duplicate_instance(sourceInstanceId: string) {
+	return await invoke<InstallJobSnapshot>('plugin:install|install_duplicate_instance', {
+		sourceInstanceId,
+	})
+}
+
+export async function install_existing_instance(instanceId: string, force: boolean) {
+	return await invoke<InstallJobSnapshot>('plugin:install|install_existing_instance', {
+		instanceId,
+		force,
+	})
+}
+
+export async function install_pack_to_existing_instance(
+	instanceId: string,
+	location: CreatePackLocation,
+	postInstallEdit?: InstallPostInstallEdit | null,
+) {
+	return await invoke<InstallJobSnapshot>('plugin:install|install_pack_to_existing_instance', {
+		instanceId,
+		location,
+		postInstallEdit,
+	})
+}
+
+export async function install_job_list(includeFinished: boolean) {
+	return await invoke<InstallJobSnapshot[]>('plugin:install|install_job_list', { includeFinished })
+}
+
+export async function install_job_get(jobId: string) {
+	return await invoke<InstallJobSnapshot>('plugin:install|install_job_get', { jobId })
+}
+
+export async function install_job_retry(jobId: string) {
+	return await invoke<InstallJobSnapshot>('plugin:install|install_job_retry', { jobId })
+}
+
+export async function install_job_cancel(jobId: string) {
+	return await invoke<InstallJobSnapshot>('plugin:install|install_job_cancel', { jobId })
+}
+
+export async function install_job_dismiss(jobId: string) {
+	return await invoke<void>('plugin:install|install_job_dismiss', { jobId })
+}
+
+export function installJobInstanceId(job: InstallJobSnapshot): string | null {
+	return job.instance_id ?? job.target.instance_id ?? null
+}
+
+export function isInstallJobFinished(status: InstallJobStatus) {
+	return (
+		status === 'succeeded' ||
+		status === 'failed' ||
+		status === 'interrupted' ||
+		status === 'canceled'
+	)
+}
+
+function settleInstallJob(job: InstallJobSnapshot) {
+	if (job.status === 'succeeded') return job
+
+	throw new Error(job.error?.message ?? `Install job ${job.job_id} ${job.status}`)
+}
+
+export async function wait_for_install_job(jobId: string) {
+	const current = await install_job_get(jobId)
+	if (isInstallJobFinished(current.status)) return settleInstallJob(current)
+
+	return await new Promise<InstallJobSnapshot>((resolve, reject) => {
+		let finished = false
+		let unlisten: (() => void) | null = null
+
+		const cleanup = () => {
+			if (unlisten) {
+				unlisten()
+				unlisten = null
+			}
+		}
+
+		const resolveJob = (job: InstallJobSnapshot) => {
+			if (finished || job.job_id !== jobId || !isInstallJobFinished(job.status)) return
+
+			finished = true
+			cleanup()
+
+			try {
+				resolve(settleInstallJob(job))
+			} catch (err) {
+				reject(err)
+			}
+		}
+
+		const rejectWait = (err: unknown) => {
+			if (finished) return
+			finished = true
+			cleanup()
+			reject(err)
+		}
+
+		install_job_listener(resolveJob)
+			.then((listener) => {
+				if (finished) {
+					listener()
+					return
+				}
+
+				unlisten = listener
+				install_job_get(jobId).then(resolveJob).catch(rejectWait)
+			})
+			.catch(rejectWait)
+	})
+}

apps/app-frontend/src/helpers/instance-content.ts

@@ -10,7 +10,7 @@ import {
 	get_content_items,
 	get_linked_modpack_info,
 	type LinkedModpackInfo,
-} from '@/helpers/profile'
+} from '@/helpers/instance'
 import { get_categories } from '@/helpers/tags.js'
 import type { CacheBehaviour } from '@/helpers/types'
 

apps/app-frontend/src/helpers/instance.ts

@@ -0,0 +1,333 @@
+/**
+ * All theseus API calls return serialized values (both return values and errors);
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
+ *  and deserialized into a usable JS object.
+ */
+import type { Labrinth } from '@modrinth/api-client'
+import type { ContentItem, ContentOwner } from '@modrinth/ui'
+import { invoke } from '@tauri-apps/api/core'
+
+import type { InstallJobSnapshot } from './install'
+import type {
+	CacheBehaviour,
+	ContentFile,
+	ContentFileProjectType,
+	GameInstance,
+	InstanceLoader,
+} from './types'
+
+export async function remove(instanceId: string): Promise<void> {
+	return await invoke('plugin:instance|instance_remove', { instanceId })
+}
+
+export async function get(instanceId: string): Promise<GameInstance | null> {
+	return await invoke('plugin:instance|instance_get', { instanceId })
+}
+
+export async function get_many(instanceIds: string[]): Promise<GameInstance[]> {
+	return await invoke('plugin:instance|instance_get_many', { instanceIds })
+}
+
+export async function get_projects(
+	instanceId: string,
+	cacheBehaviour?: CacheBehaviour,
+): Promise<Record<string, ContentFile>> {
+	return await invoke('plugin:instance|instance_get_projects', { instanceId, cacheBehaviour })
+}
+
+export async function get_installed_project_ids(instanceId: string): Promise<string[]> {
+	return await invoke('plugin:instance|instance_get_installed_project_ids', { instanceId })
+}
+
+export type InstanceInstallTarget = {
+	game_version: string
+	loader: string
+}
+
+export type InstanceInstallCandidate = {
+	id: string
+	name: string
+	icon_path?: string | null
+	game_version: string
+	loader: InstanceLoader
+	installed: boolean
+	compatible: boolean
+}
+
+export async function get_install_candidates(
+	projectId: string,
+	projectType: string,
+	targets: InstanceInstallTarget[],
+): Promise<InstanceInstallCandidate[]> {
+	return await invoke('plugin:instance|instance_get_install_candidates', {
+		projectId,
+		projectType,
+		targets,
+	})
+}
+
+// Get content items with rich metadata for an instance
+// Returns content items filtered to exclude modpack files (if linked),
+// sorted alphabetically by project name
+export async function get_content_items(
+	instanceId: string,
+	cacheBehaviour?: CacheBehaviour,
+): Promise<ContentItem[]> {
+	return await invoke('plugin:instance|instance_get_content_items', { instanceId, cacheBehaviour })
+}
+
+// Linked modpack info returned from backend
+export interface LinkedModpackInfo {
+	project: Labrinth.Projects.v2.Project
+	version: Labrinth.Versions.v2.Version
+	owner: ContentOwner | null
+	has_update: boolean
+	update_version_id: string | null
+	update_version: Labrinth.Versions.v2.Version | null
+}
+
+// Get linked modpack info for an instance
+// Returns project, version, and owner information for the linked modpack,
+// or null if the instance is not linked to a modpack
+export async function get_linked_modpack_info(
+	instanceId: string,
+	cacheBehaviour?: CacheBehaviour,
+): Promise<LinkedModpackInfo | null> {
+	return await invoke('plugin:instance|instance_get_linked_modpack_info', {
+		instanceId,
+		cacheBehaviour,
+	})
+}
+
+// Get content items that are part of the linked modpack
+// Returns the modpack's dependencies as ContentItem list
+// Returns empty array if the instance is not linked to a modpack
+export async function get_linked_modpack_content(
+	instanceId: string,
+	cacheBehaviour?: CacheBehaviour,
+): Promise<ContentItem[]> {
+	return await invoke('plugin:instance|instance_get_linked_modpack_content', {
+		instanceId,
+		cacheBehaviour,
+	})
+}
+
+// Convert a list of dependencies into ContentItems with rich metadata
+export async function get_dependencies_as_content_items(
+	dependencies: Labrinth.Versions.v3.Dependency[],
+	cacheBehaviour?: CacheBehaviour,
+): Promise<ContentItem[]> {
+	return await invoke('plugin:instance|instance_get_dependencies_as_content_items', {
+		dependencies,
+		cacheBehaviour,
+	})
+}
+
+export async function get_full_path(instanceId: string): Promise<string> {
+	return await invoke('plugin:instance|instance_get_full_path', { instanceId })
+}
+
+export async function get_mod_full_path(instanceId: string, projectPath: string): Promise<string> {
+	return await invoke('plugin:instance|instance_get_mod_full_path', { instanceId, projectPath })
+}
+
+export interface JavaVersion {
+	parsed_version: number
+	version: string
+	architecture: string
+	path: string
+}
+
+export async function get_optimal_jre_key(instanceId: string): Promise<JavaVersion | null> {
+	return await invoke('plugin:instance|instance_get_optimal_jre_key', { instanceId })
+}
+
+export async function list(): Promise<GameInstance[]> {
+	return await invoke('plugin:instance|instance_list')
+}
+
+export async function check_installed(instanceId: string, projectId: string): Promise<boolean> {
+	return await invoke('plugin:instance|instance_check_installed', { instanceId, projectId })
+}
+
+export async function update_all(instanceId: string): Promise<Record<string, string>> {
+	return await invoke('plugin:instance|instance_update_all', { instanceId })
+}
+
+// Updates a specified project
+export async function update_project(instanceId: string, projectPath: string): Promise<string> {
+	return await invoke('plugin:instance|instance_update_project', { instanceId, projectPath })
+}
+
+// Add a project to an instance from a version
+// Returns a path to the new project file
+export type DownloadReason = 'standalone' | 'dependency' | 'modpack' | 'update'
+
+export interface ResolutionPreferences {
+	game_versions?: string[]
+	loaders?: string[]
+}
+
+export interface ResolveContentRequest {
+	project_id: string
+	version_id?: string | null
+	content_type: Labrinth.Content.v3.ContentType
+	selected?: ResolutionPreferences
+}
+
+export interface ResolvedContent {
+	project_id: string
+	version_id: string
+	dependent_on_version_id?: string | null
+}
+
+export interface ResolveContentPlan {
+	primary: ResolvedContent
+	dependencies: ResolvedContent[]
+	skipped: Array<{
+		project_id: string
+		version_id?: string | null
+		dependent_on_version_id?: string | null
+		reason: string
+	}>
+}
+
+export async function add_project_from_version(
+	instanceId: string,
+	versionId: string,
+	reason: DownloadReason,
+	dependentOnVersionId?: string,
+): Promise<string> {
+	return await invoke('plugin:instance|instance_add_project_from_version', {
+		instanceId,
+		versionId,
+		reason,
+		dependentOnVersionId,
+	})
+}
+
+export async function install_project_with_dependencies(
+	instanceId: string,
+	request: ResolveContentRequest,
+): Promise<ResolveContentPlan> {
+	return await invoke('plugin:instance|instance_install_project_with_dependencies', {
+		instanceId,
+		request,
+	})
+}
+
+export async function switch_project_version_with_dependencies(
+	instanceId: string,
+	projectPath: string,
+	versionId: string,
+): Promise<string> {
+	return await invoke('plugin:instance|instance_switch_project_version_with_dependencies', {
+		instanceId,
+		projectPath,
+		versionId,
+	})
+}
+
+// Add a project to an instance from a path + project_type
+// Returns a path to the new project file
+export async function add_project_from_path(
+	instanceId: string,
+	projectPath: string,
+	projectType?: ContentFileProjectType,
+): Promise<string> {
+	return await invoke('plugin:instance|instance_add_project_from_path', {
+		instanceId,
+		projectPath,
+		projectType,
+	})
+}
+
+// Toggle disabling a project
+export async function toggle_disable_project(
+	instanceId: string,
+	projectPath: string,
+	desiredEnabled?: boolean,
+): Promise<string> {
+	return await invoke('plugin:instance|instance_toggle_disable_project', {
+		instanceId,
+		projectPath,
+		desiredEnabled,
+	})
+}
+
+// Remove a project
+export async function remove_project(instanceId: string, projectPath: string): Promise<void> {
+	return await invoke('plugin:instance|instance_remove_project', { instanceId, projectPath })
+}
+
+// Update a managed Modrinth instance to a specific version
+export async function update_managed_modrinth_version(
+	instanceId: string,
+	versionId: string,
+): Promise<InstallJobSnapshot> {
+	return await invoke('plugin:instance|instance_update_managed_modrinth_version', {
+		instanceId,
+		versionId,
+	})
+}
+
+// Repair a managed Modrinth instance
+export async function update_repair_modrinth(instanceId: string): Promise<InstallJobSnapshot> {
+	return await invoke('plugin:instance|instance_repair_managed_modrinth', { instanceId })
+}
+
+// Export an instance to .mrpack
+// included_overrides is an array of paths to override folders to include (ie: 'mods', 'resource_packs')
+// Version id is optional (ie: 1.1.5)
+export async function export_instance_mrpack(
+	instanceId: string,
+	exportLocation: string,
+	includedOverrides: string[],
+	versionId?: string,
+	description?: string,
+	name?: string,
+): Promise<void> {
+	return await invoke('plugin:instance|instance_export_mrpack', {
+		instanceId,
+		exportLocation,
+		includedOverrides,
+		versionId,
+		description,
+		name,
+	})
+}
+
+// Given a folder path, populate an array of all the subfolders
+// Intended to be used for finding potential override folders
+// profile
+// -- mods
+// -- resourcepacks
+// -- file1
+// => [mods, resourcepacks]
+// allows selection for 'included_overrides' in export_instance_mrpack
+export async function get_pack_export_candidates(instanceId: string): Promise<string[]> {
+	return await invoke('plugin:instance|instance_get_pack_export_candidates', { instanceId })
+}
+
+// Run Minecraft using an instance
+// Returns PID of child
+export async function run(
+	instanceId: string,
+	serverAddress: string | null = null,
+): Promise<unknown> {
+	return await invoke('plugin:instance|instance_run', { instanceId, serverAddress })
+}
+
+export async function kill(instanceId: string): Promise<void> {
+	return await invoke('plugin:instance|instance_kill', { instanceId })
+}
+
+// Edits an instance
+export async function edit(instanceId: string, editInstance: Partial<GameInstance>): Promise<void> {
+	return await invoke('plugin:instance|instance_edit', { instanceId, editInstance })
+}
+
+// Edits an instance's icon
+export async function edit_icon(instanceId: string, iconPath: string | null): Promise<void> {
+	return await invoke('plugin:instance|instance_edit_icon', { instanceId, iconPath })
+}

apps/app-frontend/src/helpers/jre.js

@@ -1,6 +1,6 @@
 /**
  * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'

apps/app-frontend/src/helpers/logs.js

@@ -1,6 +1,6 @@
 /**
  * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'
@@ -14,41 +14,41 @@ pub struct Logs {
 }
 */
 
-/// Get all logs that exist for a given profile
+/// Get all logs that exist for a given instance
 /// This is returned as an array of Log objects, sorted by filename (the folder name, when the log was created)
-export async function get_logs(profilePath, clearContents) {
-	return await invoke('plugin:logs|logs_get_logs', { profilePath, clearContents })
+export async function get_logs(instanceId, clearContents) {
+	return await invoke('plugin:logs|logs_get_logs', { instanceId, clearContents })
 }
 
-/// Get a profile's log by filename
-export async function get_logs_by_filename(profilePath, logType, filename) {
-	return await invoke('plugin:logs|logs_get_logs_by_filename', { profilePath, logType, filename })
+/// Get an instance's log by filename
+export async function get_logs_by_filename(instanceId, logType, filename) {
+	return await invoke('plugin:logs|logs_get_logs_by_filename', { instanceId, logType, filename })
 }
 
-/// Get a profile's log text only by filename
-export async function get_output_by_filename(profilePath, logType, filename) {
+/// Get an instance's log text only by filename
+export async function get_output_by_filename(instanceId, logType, filename) {
 	return await invoke('plugin:logs|logs_get_output_by_filename', {
-		profilePath,
+		instanceId,
 		logType,
 		filename,
 	})
 }
 
-/// Delete a profile's log by filename
-export async function delete_logs_by_filename(profilePath, logType, filename) {
+/// Delete an instance's log by filename
+export async function delete_logs_by_filename(instanceId, logType, filename) {
 	return await invoke('plugin:logs|logs_delete_logs_by_filename', {
-		profilePath,
+		instanceId,
 		logType,
 		filename,
 	})
 }
 
-/// Delete all logs for a given profile
-export async function delete_logs(profilePath) {
-	return await invoke('plugin:logs|logs_delete_logs', { profilePath })
+/// Delete all logs for a given instance
+export async function delete_logs(instanceId) {
+	return await invoke('plugin:logs|logs_delete_logs', { instanceId })
 }
 
-/// Get the latest log for a given profile and cursor (startpoint to read withi nthe file)
+/// Get the latest log for a given instance and cursor (startpoint to read within the file)
 /// Returns:
 /*
   {
@@ -59,16 +59,16 @@ export async function delete_logs(profilePath) {
 */
 
 // From latest.log directly
-export async function get_latest_log_cursor(profilePath, cursor) {
-	return await invoke('plugin:logs|logs_get_latest_log_cursor', { profilePath, cursor })
+export async function get_latest_log_cursor(instanceId, cursor) {
+	return await invoke('plugin:logs|logs_get_latest_log_cursor', { instanceId, cursor })
 }
 
-/// Get all buffered live log lines for a profile from the Rust ring buffer
-export async function get_live_log_buffer(profilePath) {
-	return await invoke('plugin:logs|logs_get_live_log_buffer', { profilePath })
+/// Get all buffered live log lines for an instance from the Rust ring buffer
+export async function get_live_log_buffer(instanceId) {
+	return await invoke('plugin:logs|logs_get_live_log_buffer', { instanceId })
 }
 
-/// Clear the live log buffer for a profile on the Rust side
-export async function clear_log_buffer(profilePath) {
-	return await invoke('plugin:logs|logs_clear_live_log_buffer', { profilePath })
+/// Clear the live log buffer for an instance on the Rust side
+export async function clear_log_buffer(instanceId) {
+	return await invoke('plugin:logs|logs_clear_live_log_buffer', { instanceId })
 }

apps/app-frontend/src/helpers/mr_auth.ts

@@ -1,6 +1,6 @@
 /**
  * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'

apps/app-frontend/src/helpers/pack.ts

@@ -1,105 +0,0 @@
-import { invoke } from '@tauri-apps/api/core'
-
-import { create } from './profile'
-import type { InstanceLoader } from './types'
-
-interface PackProfileCreator {
-	name: string
-	gameVersion: string
-	modloader: InstanceLoader
-	loaderVersion: string | null
-	unknownFile: boolean
-}
-
-interface PackLocationVersionId {
-	type: 'fromVersionId'
-	project_id: string
-	version_id: string
-	title: string
-	icon_url?: string
-}
-
-interface PackLocationFile {
-	type: 'fromFile'
-	path: string
-}
-
-export async function create_profile_and_install(
-	projectId: string,
-	versionId: string,
-	packTitle: string,
-	iconUrl?: string,
-	createInstanceCallback: (profile: string) => void = () => {},
-): Promise<void> {
-	const location: PackLocationVersionId = {
-		type: 'fromVersionId',
-		project_id: projectId,
-		version_id: versionId,
-		title: packTitle,
-		icon_url: iconUrl,
-	}
-	const profile_creator = await invoke<PackProfileCreator>(
-		'plugin:pack|pack_get_profile_from_pack',
-		{ location },
-	)
-	const profile = await create(
-		profile_creator.name,
-		profile_creator.gameVersion,
-		profile_creator.modloader,
-		profile_creator.loaderVersion,
-		null,
-		true,
-	)
-	createInstanceCallback(profile)
-
-	return await invoke('plugin:pack|pack_install', { location, profile })
-}
-
-export async function install_to_existing_profile(
-	projectId: string,
-	versionId: string,
-	title: string,
-	profilePath: string,
-): Promise<void> {
-	const location: PackLocationVersionId = {
-		type: 'fromVersionId',
-		project_id: projectId,
-		version_id: versionId,
-		title,
-	}
-	return await invoke('plugin:pack|pack_install', { location, profile: profilePath })
-}
-
-export async function create_profile_and_install_from_file(
-	path: string,
-	showUnknownPackWarningModal?: (createProfile: () => Promise<void>, fileName: string) => void,
-): Promise<void> {
-	const location: PackLocationFile = {
-		type: 'fromFile',
-		path,
-	}
-	const profile_creator = await invoke<PackProfileCreator>(
-		'plugin:pack|pack_get_profile_from_pack',
-		{ location },
-	)
-
-	const createProfile = async () => {
-		const profile = await create(
-			profile_creator.name,
-			profile_creator.gameVersion,
-			profile_creator.modloader,
-			profile_creator.loaderVersion,
-			null,
-			true,
-		)
-		await invoke('plugin:pack|pack_install', { location, profile })
-	}
-
-	if (profile_creator.unknownFile && showUnknownPackWarningModal) {
-		const splitPath = path.split(/[\\/]/)
-		const fileName = splitPath ? splitPath[splitPath.length - 1] : path
-		showUnknownPackWarningModal(createProfile, fileName)
-	} else {
-		await createProfile()
-	}
-}

apps/app-frontend/src/helpers/process.js

@@ -1,17 +1,17 @@
 /**
  * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'
 
-/// Gets all running process IDs with a given profile path
+/// Gets all running process IDs with a given instance ID
 /// Returns [u32]
-export async function get_by_profile_path(path) {
-	return await invoke('plugin:process|process_get_by_profile_path', { path })
+export async function get_by_instance_id(instanceId) {
+	return await invoke('plugin:process|process_get_by_instance_id', { instanceId })
 }
 
-/// Gets all running process IDs with a given profile path
+/// Gets all running process IDs
 /// Returns [u32]
 export async function get_all() {
 	return await invoke('plugin:process|process_get_all')

apps/app-frontend/src/helpers/profile.ts

@@ -1,317 +0,0 @@
-/**
- * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
- *  and deserialized into a usable JS object.
- */
-import type { Labrinth } from '@modrinth/api-client'
-import type { ContentItem, ContentOwner } from '@modrinth/ui'
-import { invoke } from '@tauri-apps/api/core'
-
-import { install_to_existing_profile } from '@/helpers/pack'
-
-import type {
-	CacheBehaviour,
-	ContentFile,
-	ContentFileProjectType,
-	GameInstance,
-	InstanceLoader,
-} from './types'
-
-// Add instance
-/*
-    name: String,           // the name of the profile, and relative path to create
-    game_version: String,   // the game version of the profile
-    modloader: ModLoader,   // the modloader to use
-    - ModLoader is an enum, with the following variants: Vanilla, Forge, Fabric, Quilt
-    loader_version: String, // the modloader version to use, set to "latest", "stable", or the ID of your chosen loader
-    icon: Path,  // the icon for the profile
-    - icon is a path to an image file, which will be copied into the profile directory
-*/
-
-export async function create(
-	name: string,
-	gameVersion: string,
-	modloader: InstanceLoader,
-	loaderVersion: string | null,
-	icon: string | null,
-	skipInstall: boolean,
-	linkedData?: { project_id: string; version_id: string; locked: boolean } | null,
-): Promise<string> {
-	// Trim string name to avoid "Unable to find directory"
-	name = name.trim()
-	return await invoke('plugin:profile-create|profile_create', {
-		name,
-		gameVersion,
-		modloader,
-		loaderVersion,
-		icon,
-		skipInstall,
-		linkedData,
-	})
-}
-
-// duplicate a profile
-export async function duplicate(path: string): Promise<string> {
-	return await invoke('plugin:profile-create|profile_duplicate', { path })
-}
-
-// Remove a profile
-export async function remove(path: string): Promise<void> {
-	return await invoke('plugin:profile|profile_remove', { path })
-}
-
-// Get a profile by path
-// Returns a Profile
-export async function get(path: string): Promise<GameInstance | null> {
-	return await invoke('plugin:profile|profile_get', { path })
-}
-
-export async function get_many(paths: string[]): Promise<GameInstance[]> {
-	return await invoke('plugin:profile|profile_get_many', { paths })
-}
-
-// Get a profile's projects
-// Returns a map of a path to profile file
-export async function get_projects(
-	path: string,
-	cacheBehaviour?: CacheBehaviour,
-): Promise<Record<string, ContentFile>> {
-	return await invoke('plugin:profile|profile_get_projects', { path, cacheBehaviour })
-}
-
-// Get just the installed project IDs for a profile (lightweight, skips update checks)
-export async function get_installed_project_ids(path: string): Promise<string[]> {
-	return await invoke('plugin:profile|profile_get_installed_project_ids', { path })
-}
-
-// Get content items with rich metadata for a profile
-// Returns content items filtered to exclude modpack files (if linked),
-// sorted alphabetically by project name
-export async function get_content_items(
-	path: string,
-	cacheBehaviour?: CacheBehaviour,
-): Promise<ContentItem[]> {
-	return await invoke('plugin:profile|profile_get_content_items', { path, cacheBehaviour })
-}
-
-// Linked modpack info returned from backend
-export interface LinkedModpackInfo {
-	project: Labrinth.Projects.v2.Project
-	version: Labrinth.Versions.v2.Version
-	owner: ContentOwner | null
-	has_update: boolean
-	update_version_id: string | null
-	update_version: Labrinth.Versions.v2.Version | null
-}
-
-// Get linked modpack info for a profile
-// Returns project, version, and owner information for the linked modpack,
-// or null if the profile is not linked to a modpack
-export async function get_linked_modpack_info(
-	path: string,
-	cacheBehaviour?: CacheBehaviour,
-): Promise<LinkedModpackInfo | null> {
-	return await invoke('plugin:profile|profile_get_linked_modpack_info', { path, cacheBehaviour })
-}
-
-// Get content items that are part of the linked modpack
-// Returns the modpack's dependencies as ContentItem list
-// Returns empty array if the profile is not linked to a modpack
-export async function get_linked_modpack_content(
-	path: string,
-	cacheBehaviour?: CacheBehaviour,
-): Promise<ContentItem[]> {
-	return await invoke('plugin:profile|profile_get_linked_modpack_content', { path, cacheBehaviour })
-}
-
-// Convert a list of dependencies into ContentItems with rich metadata
-export async function get_dependencies_as_content_items(
-	dependencies: Labrinth.Versions.v3.Dependency[],
-	cacheBehaviour?: CacheBehaviour,
-): Promise<ContentItem[]> {
-	return await invoke('plugin:profile|profile_get_dependencies_as_content_items', {
-		dependencies,
-		cacheBehaviour,
-	})
-}
-
-// Get a profile's full fs path
-// Returns a path
-export async function get_full_path(path: string): Promise<string> {
-	return await invoke('plugin:profile|profile_get_full_path', { path })
-}
-
-// Get's a mod's full fs path
-// Returns a path
-export async function get_mod_full_path(path: string, projectPath: string): Promise<string> {
-	return await invoke('plugin:profile|profile_get_mod_full_path', { path, projectPath })
-}
-
-export interface JavaVersion {
-	parsed_version: number
-	version: string
-	architecture: string
-	path: string
-}
-
-// Get optimal java version from profile
-// Returns a java version
-export async function get_optimal_jre_key(path: string): Promise<JavaVersion | null> {
-	return await invoke('plugin:profile|profile_get_optimal_jre_key', { path })
-}
-
-// Get a copy of the profile set
-// Returns hashmap of path -> Profile
-export async function list(): Promise<GameInstance[]> {
-	return await invoke('plugin:profile|profile_list')
-}
-
-export async function check_installed(path: string, projectId: string): Promise<boolean> {
-	return await invoke('plugin:profile|profile_check_installed', { path, projectId })
-}
-
-export async function check_installed_batch(projectId: string): Promise<Record<string, boolean>> {
-	return await invoke('plugin:profile|profile_check_installed_batch', { projectId })
-}
-
-// Installs/Repairs a profile
-export async function install(path: string, force: boolean): Promise<void> {
-	return await invoke('plugin:profile|profile_install', { path, force })
-}
-
-// Updates all of a profile's projects
-export async function update_all(path: string): Promise<Record<string, string>> {
-	return await invoke('plugin:profile|profile_update_all', { path })
-}
-
-// Updates a specified project
-export async function update_project(path: string, projectPath: string): Promise<string> {
-	return await invoke('plugin:profile|profile_update_project', { path, projectPath })
-}
-
-// Add a project to a profile from a version
-// Returns a path to the new project file
-export type DownloadReason = 'standalone' | 'dependency' | 'modpack' | 'update'
-
-export async function add_project_from_version(
-	path: string,
-	versionId: string,
-	reason: DownloadReason,
-	dependentOnVersionId?: string,
-): Promise<string> {
-	return await invoke('plugin:profile|profile_add_project_from_version', {
-		path,
-		versionId,
-		reason,
-		dependentOnVersionId,
-	})
-}
-
-// Add a project to a profile from a path + project_type
-// Returns a path to the new project file
-export async function add_project_from_path(
-	path: string,
-	projectPath: string,
-	projectType?: ContentFileProjectType,
-): Promise<string> {
-	return await invoke('plugin:profile|profile_add_project_from_path', {
-		path,
-		projectPath,
-		projectType,
-	})
-}
-
-// Toggle disabling a project
-export async function toggle_disable_project(path: string, projectPath: string): Promise<string> {
-	return await invoke('plugin:profile|profile_toggle_disable_project', { path, projectPath })
-}
-
-// Remove a project
-export async function remove_project(path: string, projectPath: string): Promise<void> {
-	return await invoke('plugin:profile|profile_remove_project', { path, projectPath })
-}
-
-// Update a managed Modrinth profile to a specific version
-export async function update_managed_modrinth_version(
-	path: string,
-	versionId: string,
-): Promise<void> {
-	return await invoke('plugin:profile|profile_update_managed_modrinth_version', {
-		path,
-		versionId,
-	})
-}
-
-// Repair a managed Modrinth profile
-export async function update_repair_modrinth(path: string): Promise<void> {
-	return await invoke('plugin:profile|profile_repair_managed_modrinth', { path })
-}
-
-// Export a profile to .mrpack
-// included_overrides is an array of paths to override folders to include (ie: 'mods', 'resource_packs')
-// Version id is optional (ie: 1.1.5)
-export async function export_profile_mrpack(
-	path: string,
-	exportLocation: string,
-	includedOverrides: string[],
-	versionId?: string,
-	description?: string,
-	name?: string,
-): Promise<void> {
-	return await invoke('plugin:profile|profile_export_mrpack', {
-		path,
-		exportLocation,
-		includedOverrides,
-		versionId,
-		description,
-		name,
-	})
-}
-
-// Given a folder path, populate an array of all the subfolders
-// Intended to be used for finding potential override folders
-// profile
-// -- mods
-// -- resourcepacks
-// -- file1
-// => [mods, resourcepacks]
-// allows selection for 'included_overrides' in export_profile_mrpack
-export async function get_pack_export_candidates(profilePath: string): Promise<string[]> {
-	return await invoke('plugin:profile|profile_get_pack_export_candidates', { profilePath })
-}
-
-// Run Minecraft using a pathed profile
-// Returns PID of child
-export async function run(path: string, serverAddress: string | null = null): Promise<unknown> {
-	return await invoke('plugin:profile|profile_run', { path, serverAddress })
-}
-
-export async function kill(path: string): Promise<void> {
-	return await invoke('plugin:profile|profile_kill', { path })
-}
-
-// Edits a profile
-export async function edit(path: string, editProfile: Partial<GameInstance>): Promise<void> {
-	return await invoke('plugin:profile|profile_edit', { path, editProfile })
-}
-
-// Edits a profile's icon
-export async function edit_icon(path: string, iconPath: string | null): Promise<void> {
-	return await invoke('plugin:profile|profile_edit_icon', { path, iconPath })
-}
-
-export async function finish_install(instance: GameInstance): Promise<void> {
-	if (instance.install_stage !== 'pack_installed') {
-		const linkedData = instance.linked_data
-		if (linkedData) {
-			await install_to_existing_profile(
-				linkedData.project_id,
-				linkedData.version_id,
-				instance.name,
-				instance.path,
-			)
-		}
-	} else {
-		await install(instance.path, false)
-	}
-}

apps/app-frontend/src/helpers/settings.ts

@@ -1,6 +1,6 @@
 /**
  * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'

apps/app-frontend/src/helpers/state.ts

@@ -1,6 +1,6 @@
 /**
  * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'
@@ -8,7 +8,8 @@ import { invoke } from '@tauri-apps/api/core'
 export interface LoadingBarType {
 	type?: string
 	version?: string
-	profile_path?: string
+	instance_id?: string
+	instance_name?: string
 	pack_name?: string
 	icon?: string | null
 }

apps/app-frontend/src/helpers/tags.js

@@ -1,6 +1,6 @@
 /**
  * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
 import { invoke } from '@tauri-apps/api/core'

apps/app-frontend/src/helpers/types.d.ts

@@ -1,20 +1,23 @@
 import type { ModrinthId } from '@modrinth/utils'
 
 export type GameInstance = {
+	id: string
 	path: string
 	install_stage: InstallStage
+	launcher_feature_version: string
 
 	name: string
 	icon_path?: string
 
 	game_version: string
+	protocol_version?: number
 	loader: InstanceLoader
 	loader_version?: string
 
 	groups: string[]
 
-	linked_data?: LinkedData
-	preferred_update_channel: ReleaseChannel
+	link?: InstanceLink | null
+	update_channel: ReleaseChannel
 
 	created: Date
 	modified: Date
@@ -40,13 +43,55 @@ type InstallStage =
 	| 'pack_installing'
 	| 'not_installed'
 
-type LinkedData = {
-	project_id: ModrinthId
-	version_id: ModrinthId
-
-	locked: boolean
+type InstanceLinkIdentity = {
+	project_id?: ModrinthId | null
+	version_id?: ModrinthId | null
+	server_project_id?: ModrinthId | null
+	content_project_id?: ModrinthId | null
+	content_version_id?: ModrinthId | null
 }
 
+export type InstanceLink = InstanceLinkIdentity &
+	(
+		| {
+				type: 'modrinth_modpack'
+				project_id: ModrinthId
+				version_id: ModrinthId
+		  }
+		| {
+				type: 'server_project'
+				project_id: ModrinthId
+		  }
+		| {
+				type: 'server_project_modpack'
+				server_project_id: ModrinthId
+				content_project_id?: ModrinthId | null
+				content_version_id: ModrinthId
+				project_id?: ModrinthId
+				version_id?: ModrinthId
+		  }
+		| {
+				type: 'imported_modpack'
+				project_id?: ModrinthId | null
+				version_id?: ModrinthId | null
+				name?: string | null
+				version_number?: string | null
+				filename?: string | null
+		  }
+		| {
+				type: 'modrinth_hosting'
+				server_id: string
+				instance_ids: string[]
+				active_instance_id?: string | null
+		  }
+		| {
+				type: 'shared_instance'
+				shared_instance_id: string
+		  }
+	)
+
+export type Instance = GameInstance
+
 type ReleaseChannel = 'release' | 'beta' | 'alpha'
 
 export type InstanceLoader = 'vanilla' | 'forge' | 'fabric' | 'quilt' | 'neoforge'

apps/app-frontend/src/helpers/utils.js

@@ -1,6 +1,7 @@
 import { invoke } from '@tauri-apps/api/core'
+import { save } from '@tauri-apps/plugin-dialog'
 
-import { get_full_path, get_mod_full_path } from '@/helpers/profile'
+import { get_full_path, get_mod_full_path } from '@/helpers/instance'
 
 export async function isDev() {
 	return await invoke('is_dev')
@@ -47,14 +48,34 @@ export async function showLauncherLogsFolder() {
 	return await invoke('plugin:utils|show_launcher_logs_folder', {})
 }
 
-// Opens a profile's folder in the OS file explorer
-export async function showProfileInFolder(path) {
-	const fullPath = await get_full_path(path)
+export async function createInstanceShortcut(instanceName, instanceId, options = {}) {
+	const outputPath = await save({
+		defaultPath: `Modrinth - ${instanceName}`,
+	})
+
+	if (!outputPath) return null
+
+	return await invoke('plugin:shortcuts|create_instance_shortcut', {
+		instanceName,
+		instanceId,
+		outputPath,
+		server: options.server,
+		singleplayerWorld: options.singleplayerWorld,
+	})
+}
+
+export async function showAppDbBackupsFolder() {
+	return await invoke('plugin:utils|show_app_db_backups_folder', {})
+}
+
+// Opens an instance's folder in the OS file explorer
+export async function showInstanceInFolder(instanceId) {
+	const fullPath = await get_full_path(instanceId)
 	return await openPath(fullPath)
 }
 
-export async function highlightModInProfile(profilePath, projectPath) {
-	const fullPath = await get_mod_full_path(profilePath, projectPath)
+export async function highlightModInInstance(instanceId, projectPath) {
+	const fullPath = await get_mod_full_path(instanceId, projectPath)
 	return await highlightInFolder(fullPath)
 }
 

apps/app-frontend/src/helpers/worlds.ts

@@ -3,7 +3,7 @@ import { autoToHTML } from '@sfirew/minecraft-motd-parser'
 import { invoke } from '@tauri-apps/api/core'
 import dayjs from 'dayjs'
 
-import { get_full_path } from '@/helpers/profile'
+import { get_full_path } from '@/helpers/instance'
 import { openPath } from '@/helpers/utils'
 
 type BaseWorld = {
@@ -36,8 +36,8 @@ export type ServerWorld = BaseWorld & {
 
 export type World = SingleplayerWorld | ServerWorld
 
-export type WorldWithProfile = {
-	profile: string
+export type WorldWithInstance = {
+	instance_id: string
 } & World
 
 export type SingleplayerGameMode = 'survival' | 'creative' | 'adventure' | 'spectator'
@@ -88,12 +88,12 @@ export type ProtocolVersion = {
 export async function get_recent_worlds(
 	limit: number,
 	displayStatuses?: DisplayStatus[],
-): Promise<WorldWithProfile[]> {
+): Promise<WorldWithInstance[]> {
 	return await invoke('plugin:worlds|get_recent_worlds', { limit, displayStatuses })
 }
 
-export async function get_profile_worlds(path: string): Promise<World[]> {
-	return await invoke('plugin:worlds|get_profile_worlds', { path })
+export async function get_instance_worlds(instanceId: string): Promise<World[]> {
+	return await invoke('plugin:worlds|get_instance_worlds', { instanceId })
 }
 
 export async function get_singleplayer_world(
@@ -137,16 +137,16 @@ export async function delete_world(instance: string, world: string): Promise<voi
 	return await invoke('plugin:worlds|delete_world', { instance, world })
 }
 
-export async function add_server_to_profile(
-	path: string,
+export async function add_server_to_instance(
+	instanceId: string,
 	name: string,
 	address: string,
 	packStatus: ServerPackStatus,
 	projectId?: string,
 	contentKind?: string,
 ): Promise<number> {
-	return await invoke('plugin:worlds|add_server_to_profile', {
-		path,
+	return await invoke('plugin:worlds|add_server_to_instance', {
+		instanceId,
 		name,
 		address,
 		packStatus,
@@ -155,15 +155,15 @@ export async function add_server_to_profile(
 	})
 }
 
-export async function edit_server_in_profile(
-	path: string,
+export async function edit_server_in_instance(
+	instanceId: string,
 	index: number,
 	name: string,
 	address: string,
 	packStatus: ServerPackStatus,
 ): Promise<void> {
-	return await invoke('plugin:worlds|edit_server_in_profile', {
-		path,
+	return await invoke('plugin:worlds|edit_server_in_instance', {
+		instanceId,
 		index,
 		name,
 		address,
@@ -171,12 +171,17 @@ export async function edit_server_in_profile(
 	})
 }
 
-export async function remove_server_from_profile(path: string, index: number): Promise<void> {
-	return await invoke('plugin:worlds|remove_server_from_profile', { path, index })
+export async function remove_server_from_instance(
+	instanceId: string,
+	index: number,
+): Promise<void> {
+	return await invoke('plugin:worlds|remove_server_from_instance', { instanceId, index })
 }
 
-export async function get_profile_protocol_version(path: string): Promise<ProtocolVersion | null> {
-	return await invoke('plugin:worlds|get_profile_protocol_version', { path })
+export async function get_instance_protocol_version(
+	instanceId: string,
+): Promise<ProtocolVersion | null> {
+	return await invoke('plugin:worlds|get_instance_protocol_version', { instanceId })
 }
 
 export async function get_server_status(
@@ -186,16 +191,19 @@ export async function get_server_status(
 	return await invoke('plugin:worlds|get_server_status', { address, protocolVersion })
 }
 
-export async function start_join_singleplayer_world(path: string, world: string): Promise<unknown> {
-	return await invoke('plugin:worlds|start_join_singleplayer_world', { path, world })
+export async function start_join_singleplayer_world(
+	instanceId: string,
+	world: string,
+): Promise<unknown> {
+	return await invoke('plugin:worlds|start_join_singleplayer_world', { instanceId, world })
 }
 
-export async function start_join_server(path: string, address: string): Promise<unknown> {
-	return await invoke('plugin:worlds|start_join_server', { path, address })
+export async function start_join_server(instanceId: string, address: string): Promise<unknown> {
+	return await invoke('plugin:worlds|start_join_server', { instanceId, address })
 }
 
-export async function showWorldInFolder(instancePath: string, worldPath: string) {
-	const fullPath = await get_full_path(instancePath)
+export async function showWorldInFolder(instanceId: string, worldPath: string) {
+	const fullPath = await get_full_path(instanceId)
 	return await openPath(fullPath + '/saves/' + worldPath)
 }
 
@@ -348,6 +356,28 @@ export function resolveManagedServerWorld(
 	)
 }
 
+export function getServerAddress(javaServer?: { address?: string | null } | null) {
+	if (!javaServer) return null
+	return javaServer.address ?? null
+}
+
+export async function ensureManagedServerWorldExists(
+	instanceId: string,
+	serverName: string,
+	serverAddress: string | null,
+) {
+	if (!instanceId || !serverAddress) return
+	try {
+		const worlds = await get_instance_worlds(instanceId)
+		const managedWorld = resolveManagedServerWorld(worlds, serverName, serverAddress)
+		if (!managedWorld) {
+			await add_server_to_instance(instanceId, serverName, serverAddress, 'prompt')
+		}
+	} catch (err) {
+		console.error('Failed to ensure managed server world exists:', err)
+	}
+}
+
 export async function getServerLatency(
 	address: string,
 	protocolVersion: ProtocolVersion | null = null,
@@ -420,9 +450,9 @@ export function refreshServers(
 	)
 }
 
-export async function refreshWorld(worlds: World[], instancePath: string, worldPath: string) {
+export async function refreshWorld(worlds: World[], instanceId: string, worldPath: string) {
 	const index = worlds.findIndex((w) => w.type === 'singleplayer' && w.path === worldPath)
-	const newWorld = await get_singleplayer_world(instancePath, worldPath)
+	const newWorld = await get_singleplayer_world(instanceId, worldPath)
 	if (index !== -1) {
 		worlds[index] = newWorld
 	} else {
@@ -432,13 +462,13 @@ export async function refreshWorld(worlds: World[], instancePath: string, worldP
 	sortWorlds(worlds)
 }
 
-export async function handleDefaultProfileUpdateEvent(
+export async function handleDefaultInstanceUpdateEvent(
 	worlds: World[],
-	instancePath: string,
-	e: ProfileEvent,
+	instanceId: string,
+	e: InstanceEvent,
 ) {
 	if (e.event === 'world_updated') {
-		await refreshWorld(worlds, instancePath, e.world)
+		await refreshWorld(worlds, instanceId, e.world)
 	}
 
 	if (e.event === 'server_joined') {
@@ -456,9 +486,9 @@ export async function handleDefaultProfileUpdateEvent(
 	}
 }
 
-export async function refreshWorlds(instancePath: string): Promise<World[]> {
-	const worlds = await get_profile_worlds(instancePath).catch((err) => {
-		console.error(`Error refreshing worlds for instance: ${instancePath}`, err)
+export async function refreshWorlds(instanceId: string): Promise<World[]> {
+	const worlds = await get_instance_worlds(instanceId).catch((err) => {
+		console.error(`Error refreshing worlds for instance: ${instanceId}`, err)
 	})
 	if (worlds) {
 		sortWorlds(worlds)
@@ -489,7 +519,7 @@ export function hasWorldQuickPlaySupport(gameVersions: GameVersion[], currentVer
 	return versionIndex !== -1 && targetIndex !== -1 && versionIndex <= targetIndex
 }
 
-export type ProfileEvent = { profile_path_id: string } & (
+export type InstanceEvent = { instance_id: string } & (
 	| {
 			event: 'servers_updated'
 	  }