-
Modpack Name
+{{ formatMessage(messages.modpackNameLabel) }}
-
Version number
+{{ formatMessage(messages.versionNumberLabel) }}
-
Description
+{{ formatMessage(commonMessages.descriptionLabel) }}
- Select files and folders to include in pack
+ {{ formatMessage(messages.selectFilesLabel) }}
diff --git a/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
index 93cf9bc553..fa1055e514 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
@@ -1,22 +1,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
diff --git a/apps/app/build.rs b/apps/app/build.rs
index aacad57720..81aaeb5dd3 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -40,6 +40,7 @@ fn main() {
"get_search_results",
"get_search_results_many",
"purge_cache_types",
+ "get_project_versions",
])
.default_permission(
DefaultPermissionRule::AllowAllCommands,
@@ -160,6 +161,10 @@ fn main() {
"profile_get",
"profile_get_many",
"profile_get_projects",
+ "profile_get_content_items",
+ "profile_get_dependencies_as_content_items",
+ "profile_get_linked_modpack_info",
+ "profile_get_linked_modpack_content",
"profile_get_optimal_jre_key",
"profile_get_full_path",
"profile_get_mod_full_path",
diff --git a/apps/app/src/api/cache.rs b/apps/app/src/api/cache.rs
index d1e671813f..6197c59c2a 100644
--- a/apps/app/src/api/cache.rs
+++ b/apps/app/src/api/cache.rs
@@ -53,6 +53,7 @@ pub fn init
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ :is-app="true"
+ :is-modpack="updatingModpack"
+ :project-icon-url="
+ updatingModpack ? linkedModpackProject?.icon_url : updatingProject?.project?.icon_url
+ "
+ :project-name="
+ updatingModpack
+ ? (linkedModpackProject?.title ?? formatMessage(messages.modpackFallback))
+ : (updatingProject?.project?.title ?? updatingProject?.file_name)
+ "
+ :loading="loadingVersions"
+ :loading-changelog="loadingChangelog"
+ @update="handleModalUpdate"
+ @version-select="handleVersionSelect"
+ @version-hover="handleVersionHover"
+ />
-
-
-
-
- 
- You haven't added any content to this instance yet.
-
-
- You haven't added any content to this instance yet.
-
-
-
-
-
-
-
-
- {{ name }}
-
-
-
-
- {{ formattedSize }}
-
-
- {{ formattedCreationDate }}
-
-
- {{ formattedModifiedDate }}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FileVirtualList.vue b/apps/frontend/src/components/ui/servers/FileVirtualList.vue
deleted file mode 100644
index 800783aa0e..0000000000
--- a/apps/frontend/src/components/ui/servers/FileVirtualList.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-
- {{ title }}
-- {{ message }} -
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesBrowseNavbar.vue b/apps/frontend/src/components/ui/servers/FilesBrowseNavbar.vue
deleted file mode 100644
index 6c70ee9ae9..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesBrowseNavbar.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-
-
-
- -
-
-
-
-
-
- New file
- New folder
- Upload file
-
- Upload from .zip file
-
-
- Upload from .zip URL
-
-
- Install CurseForge pack
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesCreateItemModal.vue b/apps/frontend/src/components/ui/servers/FilesCreateItemModal.vue
deleted file mode 100644
index 4ac3e3044e..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesCreateItemModal.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
-
-
-
-
- Save
- Save as...
-
-
- Save & restart
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesImageViewer.vue b/apps/frontend/src/components/ui/servers/FilesImageViewer.vue
deleted file mode 100644
index e05024c8a5..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesImageViewer.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesLabelBar.vue b/apps/frontend/src/components/ui/servers/FilesLabelBar.vue
deleted file mode 100644
index 72bf21a295..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesLabelBar.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesMoveItemModal.vue b/apps/frontend/src/components/ui/servers/FilesMoveItemModal.vue
deleted file mode 100644
index 3798073117..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesMoveItemModal.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
- ![Viewed image]()
-
-
-
- {{ state.errorMessage || 'Invalid or empty image file.' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- - - Over 100 files will be overwritten if you proceed with extraction; here is just some of - them: - - - The following {{ files.length }} files already exist on your server, and will be - overwritten if you proceed with extraction: - -
--
-
-
-
{{ file }} -
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesUploadDropdown.vue b/apps/frontend/src/components/ui/servers/FilesUploadDropdown.vue
deleted file mode 100644
index 344e3d06c5..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesUploadDropdown.vue
+++ /dev/null
@@ -1,335 +0,0 @@
-
-
-
-
-
- - Drop {{ type ? type.toLocaleLowerCase() : 'file' }}s here to upload -
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesUploadZipUrlModal.vue b/apps/frontend/src/components/ui/servers/FilesUploadZipUrlModal.vue
deleted file mode 100644
index 98a7ae24ec..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesUploadZipUrlModal.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.file.name }}
- {{ item.size }}
-
-
-
- Done
-
-
- Failed - File already exists
-
-
- Failed - {{ item.error?.message || 'An unexpected error occured.' }}
-
-
- Failed - Incorrect file type
-
-
-
- {{ item.progress }}%
-
-
-
-
-
- Cancelled
-
-
- {{ item.progress }}%
-
-
-
-
-
-
-
-
-
-
@@ -563,7 +562,6 @@ const {
invalidate,
} = injectProjectPageContext()
-const cosmetics = useCosmetics()
const auth = await useAuth()
const allTeamMembers = ref([])
diff --git a/apps/frontend/src/pages/discover/[type]/index.vue b/apps/frontend/src/pages/discover/[type]/index.vue
index bf3b4b6704..09e9584fcb 100644
--- a/apps/frontend/src/pages/discover/[type]/index.vue
+++ b/apps/frontend/src/pages/discover/[type]/index.vue
@@ -35,8 +35,8 @@ import {
useSearch,
useVIntl,
} from '@modrinth/ui'
-import { capitalizeString, cycleValue, type Mod as InstallableMod } from '@modrinth/utils'
-import { useQueryClient } from '@tanstack/vue-query'
+import { capitalizeString, cycleValue } from '@modrinth/utils'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
import { useThrottleFn, useTimeoutFn } from '@vueuse/core'
import { computed, type Reactive, watch } from 'vue'
@@ -49,10 +49,13 @@ import type { DisplayLocation, DisplayMode } from '~/plugins/cosmetics.ts'
const { formatMessage } = useVIntl()
+const client = injectModrinthClient()
+const queryClient = useQueryClient()
+
const filtersMenuOpen = ref(false)
-const route = useNativeRoute()
-const router = useNativeRouter()
+const route = useRoute()
+const router = useRouter()
const cosmetics = useCosmetics()
const tags = useGeneratedState()
@@ -60,8 +63,6 @@ const flags = useFeatureFlags()
const auth = await useAuth()
const { handleError } = injectNotificationManager()
-const modrinthClient = injectModrinthClient()
-const queryClient = useQueryClient()
let prefetchTimeout: ReturnType | null = null
const HOVER_DURATION_TO_PREFETCH_MS = 500
@@ -69,7 +70,13 @@ const HOVER_DURATION_TO_PREFETCH_MS = 500
const handleProjectMouseEnter = (result: Labrinth.Search.v2.ResultSearchProject) => {
const slug = result.slug || result.project_id
prefetchTimeout = useTimeoutFn(
- () => queryClient.prefetchQuery(projectQueryOptions.v2(slug, modrinthClient)),
+ () => {
+ queryClient.prefetchQuery(projectQueryOptions.v2(slug, client))
+ queryClient.prefetchQuery(projectQueryOptions.v3(result.project_id, client))
+ queryClient.prefetchQuery(projectQueryOptions.members(result.project_id, client))
+ queryClient.prefetchQuery(projectQueryOptions.dependencies(result.project_id, client))
+ queryClient.prefetchQuery(projectQueryOptions.versionsV3(result.project_id, client))
+ },
HOVER_DURATION_TO_PREFETCH_MS,
{ immediate: false },
)
@@ -100,6 +107,48 @@ const server = ref>()
const serverHideInstalled = ref(false)
const eraseDataOnInstall = ref(false)
+const currentServerId = computed(() => queryAsString(route.query.sid) || null)
+
+// TanStack Query for server content list
+const contentQueryKey = computed(() => ['content', 'list', currentServerId.value ?? ''] as const)
+const { data: serverContentData, error: serverContentError } = useQuery({
+ queryKey: contentQueryKey,
+ queryFn: () => client.archon.content_v0.list(currentServerId.value!),
+ enabled: computed(() => !!currentServerId.value),
+})
+
+// Watch for errors and notify user
+watch(serverContentError, (error) => {
+ if (error) {
+ console.error('Failed to load server content:', error)
+ handleError(error)
+ }
+})
+
+// Install content mutation
+const installContentMutation = useMutation({
+ mutationFn: ({
+ serverId,
+ type,
+ projectId,
+ versionId,
+ }: {
+ serverId: string
+ type: 'mod' | 'plugin'
+ projectId: string
+ versionId: string
+ }) =>
+ client.archon.content_v0.install(serverId, {
+ rinth_ids: { project_id: projectId, version_id: versionId },
+ install_as: type,
+ }),
+ onSuccess: () => {
+ if (currentServerId.value) {
+ queryClient.invalidateQueries({ queryKey: ['content', 'list', currentServerId.value] })
+ }
+ },
+})
+
const PERSISTENT_QUERY_PARAMS = ['sid', 'shi']
async function updateServerContext() {
@@ -117,7 +166,7 @@ async function updateServerContext() {
}
if (!server.value || server.value.serverId !== serverId) {
- server.value = await useModrinthServers(serverId, ['general', 'content'])
+ server.value = await useModrinthServers(serverId, ['general'])
}
if (route.query.shi && projectType.value?.id !== 'modpack' && server.value) {
@@ -175,10 +224,10 @@ const serverFilters = computed(() => {
})
}
- if (serverHideInstalled.value) {
- const installedMods = server.value.content?.data
- .filter((x: InstallableMod) => x.project_id)
- .map((x: InstallableMod) => x.project_id)
+ if (serverHideInstalled.value && serverContentData.value) {
+ const installedMods = serverContentData.value
+ .filter((x) => x.project_id)
+ .map((x) => x.project_id)
.filter((id): id is string => id !== undefined)
installedMods
@@ -320,12 +369,20 @@ async function serverInstall(project: InstallableSearchResult) {
project.installed = true
navigateTo(`/hosting/manage/${server.value.serverId}/options/loader`)
} else if (projectType.value?.id === 'mod') {
- await server.value.content.install('mod', version.project_id, version.id)
- await server.value.refresh(['content'])
+ await installContentMutation.mutateAsync({
+ serverId: server.value.serverId,
+ type: 'mod',
+ projectId: version.project_id,
+ versionId: version.id,
+ })
project.installed = true
} else if (projectType.value?.id === 'plugin') {
- await server.value.content.install('plugin', version.project_id, version.id)
- await server.value.refresh(['content'])
+ await installContentMutation.mutateAsync({
+ serverId: server.value.serverId,
+ type: 'plugin',
+ projectId: version.project_id,
+ versionId: version.id,
+ })
project.installed = true
}
} catch (e) {
@@ -667,90 +724,88 @@ useSeoMeta({
resultsDisplayMode === 'grid' || resultsDisplayMode === 'gallery' ? 'grid' : 'list'
"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/apps/frontend/src/pages/hosting/manage/[id].vue b/apps/frontend/src/pages/hosting/manage/[id].vue
index 4044019363..ddd741da99 100644
--- a/apps/frontend/src/pages/hosting/manage/[id].vue
+++ b/apps/frontend/src/pages/hosting/manage/[id].vue
@@ -450,6 +450,17 @@ const { data: n_server } = useQuery({
queryFn: () => client.archon.servers_v0.get(serverId)!,
})
+const { data: serverFull } = useQuery({
+ queryKey: ['servers', 'v1', 'detail', serverId],
+ queryFn: () => client.archon.servers_v1.get(serverId),
+})
+
+const worldId = computed(() => {
+ if (!serverFull.value) return null
+ const activeWorld = serverFull.value.worlds.find((w) => w.is_active)
+ return activeWorld?.id ?? serverFull.value.worlds[0]?.id ?? null
+})
+
const server: Reactive = await useModrinthServers(serverId, ['general', 'ws'])
const loadModulesPromise = Promise.resolve().then(() => {
@@ -520,6 +531,7 @@ setNodeAuthState(() => fsAuth.value, refreshFsAuth)
provideModrinthServerContext({
serverId,
+ worldId,
server: n_server as Ref,
isConnected,
powerState: serverPowerState,
diff --git a/apps/frontend/src/pages/hosting/manage/[id]/content.vue b/apps/frontend/src/pages/hosting/manage/[id]/content.vue
index 5a0bb5d922..0055eb87d9 100644
--- a/apps/frontend/src/pages/hosting/manage/[id]/content.vue
+++ b/apps/frontend/src/pages/hosting/manage/[id]/content.vue
@@ -1,21 +1,14 @@
-
- {
+ return this.client.request(
+ `/servers/${serverId}/worlds/${worldId}/addons`,
+ {
+ api: 'archon',
+ version: 1,
+ method: 'GET',
+ },
+ )
+ }
+
+ /** POST /v1/:server_id/worlds/:world_id/addons */
+ public async addAddon(
+ serverId: string,
+ request: Archon.Content.v1.AddAddonRequest,
+ worldId: string = DEFAULT_WORLD_ID,
+ ): Promise {
+ await this.client.request(`/servers/${serverId}/worlds/${worldId}/addons`, {
+ api: 'archon',
+ version: 1,
+ method: 'POST',
+ body: request,
+ })
+ }
+
+ /** POST /v1/:server_id/worlds/:world_id/addons/delete */
+ public async deleteAddon(
+ serverId: string,
+ request: Archon.Content.v1.RemoveAddonRequest,
+ worldId: string = DEFAULT_WORLD_ID,
+ ): Promise {
+ await this.client.request(`/servers/${serverId}/worlds/${worldId}/addons/delete`, {
+ api: 'archon',
+ version: 1,
+ method: 'POST',
+ body: request,
+ })
+ }
+
+ /** POST /v1/:server_id/worlds/:world_id/addons/disable */
+ public async disableAddon(
+ serverId: string,
+ request: Archon.Content.v1.RemoveAddonRequest,
+ worldId: string = DEFAULT_WORLD_ID,
+ ): Promise {
+ await this.client.request(`/servers/${serverId}/worlds/${worldId}/addons/disable`, {
+ api: 'archon',
+ version: 1,
+ method: 'POST',
+ body: request,
+ })
+ }
+
+ /** POST /v1/:server_id/worlds/:world_id/addons/enable */
+ public async enableAddon(
+ serverId: string,
+ request: Archon.Content.v1.RemoveAddonRequest,
+ worldId: string = DEFAULT_WORLD_ID,
+ ): Promise {
+ await this.client.request(`/servers/${serverId}/worlds/${worldId}/addons/enable`, {
+ api: 'archon',
+ version: 1,
+ method: 'POST',
+ body: request,
+ })
+ }
+
+ /** POST /v1/:server_id/worlds/:world_id/addons/delete-many */
+ public async deleteAddons(
+ serverId: string,
+ items: Archon.Content.v1.RemoveAddonRequest[],
+ worldId: string = DEFAULT_WORLD_ID,
+ ): Promise {
+ await this.client.request(`/servers/${serverId}/worlds/${worldId}/addons/delete-many`, {
+ api: 'archon',
+ version: 1,
+ method: 'POST',
+ body: { items },
+ })
+ }
+
+ /** POST /v1/:server_id/worlds/:world_id/addons/disable-many */
+ public async disableAddons(
+ serverId: string,
+ items: Archon.Content.v1.RemoveAddonRequest[],
+ worldId: string = DEFAULT_WORLD_ID,
+ ): Promise {
+ await this.client.request(`/servers/${serverId}/worlds/${worldId}/addons/disable-many`, {
+ api: 'archon',
+ version: 1,
+ method: 'POST',
+ body: { items },
+ })
+ }
+
+ /** POST /v1/:server_id/worlds/:world_id/addons/enable-many */
+ public async enableAddons(
+ serverId: string,
+ items: Archon.Content.v1.RemoveAddonRequest[],
+ worldId: string = DEFAULT_WORLD_ID,
+ ): Promise {
+ await this.client.request(`/servers/${serverId}/worlds/${worldId}/addons/enable-many`, {
+ api: 'archon',
+ version: 1,
+ method: 'POST',
+ body: { items },
+ })
+ }
+
+ /** POST /v1/:server_id/worlds/:world_id/content */
+ public async installContent(
+ serverId: string,
+ request: Archon.Content.v1.InstallWorldContent,
+ worldId: string = DEFAULT_WORLD_ID,
+ ): Promise {
+ await this.client.request(`/servers/${serverId}/worlds/${worldId}/content`, {
+ api: 'archon',
+ version: 1,
+ method: 'POST',
+ body: request,
+ })
+ }
+
+ /** POST /v1/:server_id/worlds/:world_id/content/unlink-modpack */
+ public async unlinkModpack(serverId: string, worldId: string = DEFAULT_WORLD_ID): Promise {
+ await this.client.request(
+ `/servers/${serverId}/worlds/${worldId}/content/unlink-modpack`,
+ {
+ api: 'archon',
+ version: 1,
+ method: 'POST',
+ },
+ )
+ }
+}
diff --git a/packages/api-client/src/modules/archon/servers/v1.ts b/packages/api-client/src/modules/archon/servers/v1.ts
index 06edb14447..d5d0bc2378 100644
--- a/packages/api-client/src/modules/archon/servers/v1.ts
+++ b/packages/api-client/src/modules/archon/servers/v1.ts
@@ -6,6 +6,18 @@ export class ArchonServersV1Module extends AbstractModule {
return 'archon_servers_v1'
}
+ /**
+ * Get full server details including worlds, backups, and content
+ * GET /v1/servers/:server_id
+ */
+ public async get(serverId: string): Promise {
+ return this.client.request(`/servers/${serverId}`, {
+ api: 'archon',
+ version: 1,
+ method: 'GET',
+ })
+ }
+
/**
* Get available regions
* GET /v1/regions
diff --git a/packages/api-client/src/modules/archon/types.ts b/packages/api-client/src/modules/archon/types.ts
index 24c02b6c21..d0e2c1819b 100644
--- a/packages/api-client/src/modules/archon/types.ts
+++ b/packages/api-client/src/modules/archon/types.ts
@@ -1,5 +1,84 @@
export namespace Archon {
export namespace Content {
+ export namespace v1 {
+ export type AddonKind = 'mod' | 'plugin' | 'datapack' | 'shader' | 'resourcepack'
+
+ export type ContentOwnerType = 'user' | 'organization'
+
+ export type ContentOwner = {
+ id: string
+ name: string
+ type: ContentOwnerType
+ }
+
+ export type AddonVersion = {
+ id: string
+ name: string | null
+ }
+
+ export type Addon = {
+ id: string
+ filename: string
+ filesize: number
+ disabled: boolean
+ kind: AddonKind
+ has_update: boolean
+ name: string | null
+ project_id: string | null
+ version: AddonVersion | null
+ owner: ContentOwner | null
+ icon_url: string | null
+ }
+
+ export type Addons = {
+ modloader: string | null
+ modloader_version: string | null
+ game_version: string | null
+ modpack: ModpackSpec | null
+ addons: Addon[]
+ }
+
+ export type AddAddonRequest = {
+ project_id: string
+ version_id?: string
+ kind?: AddonKind
+ }
+
+ export type RemoveAddonRequest = {
+ kind: AddonKind
+ filename: string
+ }
+
+ export type Modloader =
+ | 'forge'
+ | 'neo_forge'
+ | 'fabric'
+ | 'quilt'
+ | 'paper'
+ | 'purpur'
+ | 'vanilla'
+
+ export type ModpackSpec = {
+ platform: 'modrinth'
+ project_id: string
+ version_id: string
+ }
+
+ export type InstallWorldContent =
+ | {
+ content_variant: 'modpack'
+ spec: ModpackSpec
+ soft_override: boolean
+ }
+ | {
+ content_variant: 'bare'
+ loader: Modloader
+ version: string
+ game_version?: string
+ soft_override: boolean
+ }
+ }
+
export namespace v0 {
export type ContentKind = 'mod' | 'plugin'
@@ -151,6 +230,61 @@ export namespace Archon {
}
export namespace v1 {
+ export type ServerFull = {
+ id: string
+ name: string
+ subdomain: string
+ specs: ServerResources
+ sftp_username: string
+ sftp_password: string
+ tags: string[]
+ location: ServerLocation
+ worlds: WorldFull[]
+ }
+
+ export type ServerResources = {
+ cpu: number
+ memory_mb: number
+ storage_mb: number
+ swap_mb: number
+ }
+
+ export type ServerLocation =
+ | {
+ status: 'assigned'
+ location_metadata: {
+ region: string
+ region_should_be_user_displayed: boolean
+ hostname: string
+ is_decommissioned_node: boolean
+ }
+ }
+ | {
+ status: 'unassigned'
+ }
+
+ export type WorldFull = {
+ id: string
+ name: string
+ created_at: string
+ is_active: boolean
+ backups: Archon.Backups.v1.Backup[]
+ content: WorldContentInfo | null
+ readiness: WorldReadiness
+ }
+
+ export type WorldReadiness = {
+ data_synchronized_fetched: boolean
+ }
+
+ export type WorldContentInfo = {
+ modloader: string
+ modloader_version: string
+ game_version: string
+ java_version: number
+ invocation: string
+ }
+
export type Region = {
shortcode: string
country_code: string
diff --git a/packages/api-client/src/modules/index.ts b/packages/api-client/src/modules/index.ts
index 82880a682d..d100acd536 100644
--- a/packages/api-client/src/modules/index.ts
+++ b/packages/api-client/src/modules/index.ts
@@ -3,11 +3,12 @@ import type { AbstractModule } from '../core/abstract-module'
import { ArchonBackupsV0Module } from './archon/backups/v0'
import { ArchonBackupsV1Module } from './archon/backups/v1'
import { ArchonContentV0Module } from './archon/content/v0'
+import { ArchonContentV1Module } from './archon/content/v1'
import { ArchonServersV0Module } from './archon/servers/v0'
import { ArchonServersV1Module } from './archon/servers/v1'
import { ISO3166Module } from './iso3166'
import { KyrosFilesV0Module } from './kyros/files/v0'
-import { LabrinthVersionsV3Module } from './labrinth'
+import { LabrinthVersionsV2Module, LabrinthVersionsV3Module } from './labrinth'
import { LabrinthBillingInternalModule } from './labrinth/billing/internal'
import { LabrinthCollectionsModule } from './labrinth/collections'
import { LabrinthProjectsV2Module } from './labrinth/projects/v2'
@@ -30,6 +31,7 @@ export const MODULE_REGISTRY = {
archon_backups_v0: ArchonBackupsV0Module,
archon_backups_v1: ArchonBackupsV1Module,
archon_content_v0: ArchonContentV0Module,
+ archon_content_v1: ArchonContentV1Module,
archon_servers_v0: ArchonServersV0Module,
archon_servers_v1: ArchonServersV1Module,
iso3166_data: ISO3166Module,
@@ -40,6 +42,7 @@ export const MODULE_REGISTRY = {
labrinth_projects_v3: LabrinthProjectsV3Module,
labrinth_state: LabrinthStateModule,
labrinth_tech_review_internal: LabrinthTechReviewInternalModule,
+ labrinth_versions_v2: LabrinthVersionsV2Module,
labrinth_versions_v3: LabrinthVersionsV3Module,
} as const satisfies Record
diff --git a/packages/api-client/src/modules/labrinth/index.ts b/packages/api-client/src/modules/labrinth/index.ts
index 38bc3f22b6..c11216dfe6 100644
--- a/packages/api-client/src/modules/labrinth/index.ts
+++ b/packages/api-client/src/modules/labrinth/index.ts
@@ -4,4 +4,5 @@ export * from './projects/v2'
export * from './projects/v3'
export * from './state'
export * from './tech-review/internal'
+export * from './versions/v2'
export * from './versions/v3'
diff --git a/packages/api-client/src/modules/labrinth/types.ts b/packages/api-client/src/modules/labrinth/types.ts
index 3f56ea7d4c..3405f36cf1 100644
--- a/packages/api-client/src/modules/labrinth/types.ts
+++ b/packages/api-client/src/modules/labrinth/types.ts
@@ -469,6 +469,12 @@ export namespace Labrinth {
game_versions: string[]
loaders: string[]
}
+
+ export interface GetProjectVersionsParams {
+ game_versions?: string[]
+ loaders?: string[]
+ include_changelog?: boolean
+ }
}
// TODO: consolidate duplicated types between v2 and v3 versions
@@ -484,7 +490,6 @@ export namespace Labrinth {
game_versions?: string[]
loaders?: string[]
include_changelog?: boolean
- apiVersion?: 2 | 3
}
export type VersionChannel = 'release' | 'beta' | 'alpha'
diff --git a/packages/api-client/src/modules/labrinth/versions/v2.ts b/packages/api-client/src/modules/labrinth/versions/v2.ts
new file mode 100644
index 0000000000..750d91d53d
--- /dev/null
+++ b/packages/api-client/src/modules/labrinth/versions/v2.ts
@@ -0,0 +1,135 @@
+import { AbstractModule } from '../../../core/abstract-module'
+import type { Labrinth } from '../types'
+
+export class LabrinthVersionsV2Module extends AbstractModule {
+ public getModuleID(): string {
+ return 'labrinth_versions_v2'
+ }
+
+ /**
+ * Get versions for a project (v2)
+ *
+ * @param id - Project ID or slug (e.g., 'sodium' or 'AANobbMI')
+ * @param options - Optional query parameters to filter versions
+ * @returns Promise resolving to an array of v2 versions
+ *
+ * @example
+ * ```typescript
+ * const versions = await client.labrinth.versions_v2.getProjectVersions('sodium')
+ * const filteredVersions = await client.labrinth.versions_v2.getProjectVersions('sodium', {
+ * game_versions: ['1.20.1'],
+ * loaders: ['fabric'],
+ * include_changelog: false
+ * })
+ * console.log(versions[0].version_number)
+ * ```
+ */
+ public async getProjectVersions(
+ id: string,
+ options?: Labrinth.Versions.v2.GetProjectVersionsParams,
+ ): Promise {
+ const params: Record = {}
+ if (options?.game_versions?.length) {
+ params.game_versions = JSON.stringify(options.game_versions)
+ }
+ if (options?.loaders?.length) {
+ params.loaders = JSON.stringify(options.loaders)
+ }
+ if (options?.include_changelog === false) {
+ params.include_changelog = 'false'
+ }
+
+ return this.client.request(`/project/${id}/version`, {
+ api: 'labrinth',
+ version: 2,
+ method: 'GET',
+ params: Object.keys(params).length > 0 ? params : undefined,
+ })
+ }
+
+ /**
+ * Get a specific version by ID (v2)
+ *
+ * @param id - Version ID
+ * @returns Promise resolving to the v2 version data
+ *
+ * @example
+ * ```typescript
+ * const version = await client.labrinth.versions_v2.getVersion('DXtmvS8i')
+ * console.log(version.version_number)
+ * ```
+ */
+ public async getVersion(id: string): Promise {
+ return this.client.request(`/version/${id}`, {
+ api: 'labrinth',
+ version: 2,
+ method: 'GET',
+ })
+ }
+
+ /**
+ * Get multiple versions by IDs (v2)
+ *
+ * @param ids - Array of version IDs
+ * @returns Promise resolving to an array of v2 versions
+ *
+ * @example
+ * ```typescript
+ * const versions = await client.labrinth.versions_v2.getVersions(['DXtmvS8i', 'abc123'])
+ * console.log(versions[0].version_number)
+ * ```
+ */
+ public async getVersions(ids: string[]): Promise {
+ return this.client.request(`/versions`, {
+ api: 'labrinth',
+ version: 2,
+ method: 'GET',
+ params: { ids: JSON.stringify(ids) },
+ })
+ }
+
+ /**
+ * Get a version from a project by version ID or number (v2)
+ *
+ * @param projectId - Project ID or slug
+ * @param versionId - Version ID or version number
+ * @returns Promise resolving to the v2 version data
+ *
+ * @example
+ * ```typescript
+ * const version = await client.labrinth.versions_v2.getVersionFromIdOrNumber('sodium', 'DXtmvS8i')
+ * const versionByNumber = await client.labrinth.versions_v2.getVersionFromIdOrNumber('sodium', '0.4.12')
+ * ```
+ */
+ public async getVersionFromIdOrNumber(
+ projectId: string,
+ versionId: string,
+ ): Promise {
+ return this.client.request(
+ `/project/${projectId}/version/${versionId}`,
+ {
+ api: 'labrinth',
+ version: 2,
+ method: 'GET',
+ },
+ )
+ }
+
+ /**
+ * Delete a version by ID (v2)
+ *
+ * @param versionId - Version ID
+ *
+ * @example
+ * ```typescript
+ * await client.labrinth.versions_v2.deleteVersion('DXtmvS8i')
+ * ```
+ */
+ public async deleteVersion(versionId: string): Promise {
+ return this.client.request(`/version/${versionId}`, {
+ api: 'labrinth',
+ version: 2,
+ method: 'DELETE',
+ })
+ }
+}
diff --git a/packages/api-client/src/modules/labrinth/versions/v3.ts b/packages/api-client/src/modules/labrinth/versions/v3.ts
index 1a3a023242..7de277f616 100644
--- a/packages/api-client/src/modules/labrinth/versions/v3.ts
+++ b/packages/api-client/src/modules/labrinth/versions/v3.ts
@@ -35,8 +35,8 @@ export class LabrinthVersionsV3Module extends AbstractModule {
if (options?.loaders?.length) {
params.loaders = JSON.stringify(options.loaders)
}
- if (options?.include_changelog !== undefined) {
- params.include_changelog = options.include_changelog
+ if (options?.include_changelog === false) {
+ params.include_changelog = 'false'
}
return this.client.request(`/project/${id}/version`, {
diff --git a/packages/api-client/src/platform/nuxt.ts b/packages/api-client/src/platform/nuxt.ts
index f3a9079ba6..566471ab61 100644
--- a/packages/api-client/src/platform/nuxt.ts
+++ b/packages/api-client/src/platform/nuxt.ts
@@ -13,27 +13,32 @@ import { XHRUploadClient } from './xhr-upload-client'
*
* This provides cross-request persistence in SSR while also working in client-side.
* State is shared between requests in the same Nuxt context.
+ *
+ * Note: useState must be called during initialization (in setup context) and cached,
+ * as it won't work during async operations when the Nuxt context may be lost.
*/
export class NuxtCircuitBreakerStorage implements CircuitBreakerStorage {
- private getState(): Map {
+ private state: Map
+
+ constructor() {
// @ts-expect-error - useState is provided by Nuxt runtime
- const state = useState>(
+ const stateRef = useState>(
'circuit-breaker-state',
() => new Map(),
)
- return state.value
+ this.state = stateRef.value
}
get(key: string): CircuitBreakerState | undefined {
- return this.getState().get(key)
+ return this.state.get(key)
}
set(key: string, state: CircuitBreakerState): void {
- this.getState().set(key, state)
+ this.state.set(key, state)
}
clear(key: string): void {
- this.getState().delete(key)
+ this.state.delete(key)
}
}
diff --git a/packages/app-lib/.sqlx/query-4d66e2bfedb7a31244d24858acf9b73a6289c1a90fb0988c4f5f5f64be01c4ec.json b/packages/app-lib/.sqlx/query-4d66e2bfedb7a31244d24858acf9b73a6289c1a90fb0988c4f5f5f64be01c4ec.json
new file mode 100644
index 0000000000..1d65ebe354
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-4d66e2bfedb7a31244d24858acf9b73a6289c1a90fb0988c4f5f5f64be01c4ec.json
@@ -0,0 +1,20 @@
+{
+ "db_name": "SQLite",
+ "query": "\n SELECT data as \"data?: sqlx::types::Json\"\n FROM cache\n WHERE data_type = $1 AND id = $2\n ",
+ "describe": {
+ "columns": [
+ {
+ "name": "data?: sqlx::types::Json",
+ "ordinal": 0,
+ "type_info": "Null"
+ }
+ ],
+ "parameters": {
+ "Right": 2
+ },
+ "nullable": [
+ true
+ ]
+ },
+ "hash": "4d66e2bfedb7a31244d24858acf9b73a6289c1a90fb0988c4f5f5f64be01c4ec"
+}
diff --git a/packages/app-lib/src/api/cache.rs b/packages/app-lib/src/api/cache.rs
index e1cdbd0339..7eda0cea1d 100644
--- a/packages/app-lib/src/api/cache.rs
+++ b/packages/app-lib/src/api/cache.rs
@@ -51,3 +51,20 @@ pub async fn purge_cache_types(
Ok(())
}
+
+/// Get versions for a project (without changelogs for fast loading).
+/// Uses the cache system with the ProjectVersions cache type.
+#[tracing::instrument]
+pub async fn get_project_versions(
+ project_id: &str,
+ cache_behaviour: Option,
+) -> crate::Result>> {
+ let state = crate::State::get().await?;
+ CachedEntry::get_project_versions(
+ project_id,
+ cache_behaviour,
+ &state.pool,
+ &state.api_semaphore,
+ )
+ .await
+}
diff --git a/packages/app-lib/src/api/mod.rs b/packages/app-lib/src/api/mod.rs
index 1243c244f3..6bcea96b04 100644
--- a/packages/app-lib/src/api/mod.rs
+++ b/packages/app-lib/src/api/mod.rs
@@ -18,11 +18,13 @@ pub mod worlds;
pub mod data {
pub use crate::state::{
- CacheBehaviour, CacheValueType, Credentials, Dependency, DirectoryInfo,
- Hooks, JavaVersion, LinkedData, MemorySettings, ModLoader,
- ModrinthCredentials, Organization, ProcessMetadata, ProfileFile,
- Project, ProjectType, SearchResult, SearchResults, Settings,
- TeamMember, Theme, User, UserFriend, Version, WindowSize,
+ CacheBehaviour, CacheValueType, ContentItem, ContentItemOwner,
+ ContentItemProject, ContentItemVersion, Credentials, Dependency,
+ DirectoryInfo, Hooks, JavaVersion, LinkedData, LinkedModpackInfo,
+ MemorySettings, ModLoader, ModrinthCredentials, Organization,
+ OwnerType, ProcessMetadata, ProfileFile, Project, ProjectType,
+ SearchResult, SearchResults, Settings, TeamMember, Theme, User,
+ UserFriend, Version, WindowSize,
};
pub use ariadne::users::UserStatus;
}
diff --git a/packages/app-lib/src/api/pack/install_mrpack.rs b/packages/app-lib/src/api/pack/install_mrpack.rs
index 0fdead311c..908a65b9ac 100644
--- a/packages/app-lib/src/api/pack/install_mrpack.rs
+++ b/packages/app-lib/src/api/pack/install_mrpack.rs
@@ -8,7 +8,7 @@ use crate::pack::install_from::{
use crate::state::{
CacheBehaviour, CachedEntry, ProfileInstallStage, SideType, cache_file_hash,
};
-use crate::util::fetch::{fetch_mirrors, write};
+use crate::util::fetch::{fetch_mirrors, sha1_async, write};
use crate::util::io;
use crate::{State, profile};
use async_zip::base::read::seek::ZipFileReader;
@@ -115,6 +115,44 @@ pub async fn install_zipped_mrpack_files(
.into());
}
+ // Cache the modpack file hashes for later filtering of user-added content
+ // Includes both manifest file hashes and computed hashes for override files
+ if let Some(ref version_id) = version_id {
+ let mut file_hashes: Vec = pack
+ .files
+ .iter()
+ .filter_map(|f| f.hashes.get(&PackFileHash::Sha1).cloned())
+ .collect();
+
+ // Also hash files from overrides folders (these aren't in modrinth.index.json)
+ let override_entries: Vec = zip_reader
+ .file()
+ .entries()
+ .iter()
+ .enumerate()
+ .filter_map(|(index, entry)| {
+ let filename = entry.filename().as_str().ok()?;
+ let is_override = (filename.starts_with("overrides/")
+ || filename.starts_with("client-overrides/")
+ || filename.starts_with("server-overrides/"))
+ && !filename.ends_with('/');
+ is_override.then_some(index)
+ })
+ .collect();
+
+ for index in override_entries {
+ let mut file_bytes = Vec::new();
+ let mut entry_reader = zip_reader.reader_with_entry(index).await?;
+ entry_reader.read_to_end_checked(&mut file_bytes).await?;
+
+ let hash = sha1_async(bytes::Bytes::from(file_bytes)).await?;
+ file_hashes.push(hash);
+ }
+
+ CachedEntry::cache_modpack_files(version_id, file_hashes, &state.pool)
+ .await?;
+ }
+
// Sets generated profile attributes to the pack ones (using profile::edit)
set_profile_information(
profile_path.clone(),
diff --git a/packages/app-lib/src/api/profile/mod.rs b/packages/app-lib/src/api/profile/mod.rs
index 935c837a2d..40283e776e 100644
--- a/packages/app-lib/src/api/profile/mod.rs
+++ b/packages/app-lib/src/api/profile/mod.rs
@@ -8,8 +8,9 @@ use crate::pack::install_from::{
EnvType, PackDependency, PackFile, PackFileHash, PackFormat,
};
use crate::state::{
- CacheBehaviour, CachedEntry, Credentials, JavaVersion, ProcessMetadata,
- ProfileFile, ProfileInstallStage, ProjectType, SideType,
+ CacheBehaviour, CachedEntry, ContentItem, Credentials, Dependency,
+ JavaVersion, LinkedModpackInfo, ProcessMetadata, ProfileFile,
+ ProfileInstallStage, ProjectType, SideType,
};
use crate::event::{ProfilePayloadType, emit::emit_profile};
@@ -91,6 +92,102 @@ pub async fn get_projects(
}
}
+/// Get content items with rich metadata for a profile
+///
+/// Returns content items filtered to exclude modpack files (if linked),
+/// sorted alphabetically by project name.
+#[tracing::instrument]
+pub async fn get_content_items(
+ path: &str,
+ cache_behaviour: Option,
+) -> crate::Result> {
+ let state = State::get().await?;
+
+ if let Some(profile) = get(path).await? {
+ let items = crate::state::get_content_items(
+ &profile,
+ cache_behaviour,
+ &state.pool,
+ &state.api_semaphore,
+ )
+ .await?;
+ Ok(items)
+ } else {
+ Err(crate::ErrorKind::UnmanagedProfileError(path.to_string())
+ .as_error())
+ }
+}
+
+/// Get content items that are part of the linked modpack
+///
+/// Returns the modpack's dependencies as ContentItem list.
+/// Returns empty vec if the profile is not linked to a modpack.
+#[tracing::instrument]
+pub async fn get_linked_modpack_content(
+ path: &str,
+ cache_behaviour: Option,
+) -> crate::Result> {
+ let state = State::get().await?;
+
+ if let Some(profile) = get(path).await? {
+ let items = crate::state::get_linked_modpack_content(
+ &profile,
+ cache_behaviour,
+ &state.pool,
+ &state.api_semaphore,
+ )
+ .await?;
+ Ok(items)
+ } else {
+ Err(crate::ErrorKind::UnmanagedProfileError(path.to_string())
+ .as_error())
+ }
+}
+
+/// Convert a list of dependencies into ContentItems with rich metadata
+#[tracing::instrument]
+pub async fn get_dependencies_as_content_items(
+ dependencies: Vec,
+ cache_behaviour: Option,
+) -> crate::Result> {
+ let state = State::get().await?;
+
+ let items = crate::state::dependencies_to_content_items(
+ &dependencies,
+ cache_behaviour,
+ &state.pool,
+ &state.api_semaphore,
+ )
+ .await?;
+ Ok(items)
+}
+
+/// Get linked modpack info for a profile
+///
+/// Returns project, version, and owner information for the linked modpack,
+/// or None if the profile is not linked to a modpack.
+#[tracing::instrument]
+pub async fn get_linked_modpack_info(
+ path: &str,
+ cache_behaviour: Option,
+) -> crate::Result> {
+ let state = State::get().await?;
+
+ if let Some(profile) = get(path).await? {
+ let info = crate::state::get_linked_modpack_info(
+ &profile,
+ cache_behaviour,
+ &state.pool,
+ &state.api_semaphore,
+ )
+ .await?;
+ Ok(info)
+ } else {
+ Err(crate::ErrorKind::UnmanagedProfileError(path.to_string())
+ .as_error())
+ }
+}
+
/// Get profile's full path in the filesystem
#[tracing::instrument]
pub async fn get_full_path(path: &str) -> crate::Result {
diff --git a/packages/app-lib/src/state/cache.rs b/packages/app-lib/src/state/cache.rs
index eee2fb108c..9229dc1bb8 100644
--- a/packages/app-lib/src/state/cache.rs
+++ b/packages/app-lib/src/state/cache.rs
@@ -34,6 +34,9 @@ pub enum CacheValueType {
FileHash,
FileUpdate,
SearchResults,
+ ModpackFiles,
+ /// Cached list of versions for a project (without changelogs for fast loading)
+ ProjectVersions,
}
impl CacheValueType {
@@ -55,6 +58,8 @@ impl CacheValueType {
CacheValueType::FileHash => "file_hash",
CacheValueType::FileUpdate => "file_update",
CacheValueType::SearchResults => "search_results",
+ CacheValueType::ModpackFiles => "modpack_files",
+ CacheValueType::ProjectVersions => "project_versions",
}
}
@@ -76,6 +81,8 @@ impl CacheValueType {
"file_hash" => CacheValueType::FileHash,
"file_update" => CacheValueType::FileUpdate,
"search_results" => CacheValueType::SearchResults,
+ "modpack_files" => CacheValueType::ModpackFiles,
+ "project_versions" => CacheValueType::ProjectVersions,
_ => CacheValueType::Project,
}
}
@@ -85,7 +92,10 @@ impl CacheValueType {
match self {
CacheValueType::File => 30 * 24 * 60 * 60, // 30 days
CacheValueType::FileHash => 30 * 24 * 60 * 60, // 30 days
- _ => 30 * 60, // 30 minutes
+ // ModpackFiles never expire - version_id is immutable so hashes never change
+ // TODO: There has to be a way to exclude this from the "Purge cache" stuff?
+ CacheValueType::ModpackFiles => 100 * 365 * 24 * 60 * 60, // 100 years (effectively never)
+ _ => 30 * 60, // 30 minutes
}
}
@@ -118,11 +128,27 @@ impl CacheValueType {
| CacheValueType::File
| CacheValueType::LoaderManifest
| CacheValueType::FileUpdate
- | CacheValueType::SearchResults => None,
+ | CacheValueType::SearchResults
+ | CacheValueType::ModpackFiles
+ | CacheValueType::ProjectVersions => None,
}
}
}
+/// Cached modpack file hashes for filtering content
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct CachedModpackFiles {
+ pub version_id: String,
+ pub file_hashes: Vec,
+}
+
+/// Cached list of versions for a project (without changelogs for fast loading)
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct CachedProjectVersions {
+ pub project_id: String,
+ pub versions: Vec,
+}
+
#[derive(Serialize, Deserialize, Clone, Debug)]
#[serde(untagged)]
#[allow(clippy::large_enum_variant)]
@@ -151,6 +177,8 @@ pub enum CacheValue {
FileHash(CachedFileHash),
FileUpdate(CachedFileUpdate),
SearchResults(SearchResults),
+ ModpackFiles(CachedModpackFiles),
+ ProjectVersions(CachedProjectVersions),
}
#[derive(Serialize, Deserialize, Clone, Debug)]
@@ -308,7 +336,8 @@ pub struct Version {
pub name: String,
pub version_number: String,
- pub changelog: String,
+ #[serde(default)]
+ pub changelog: Option,
pub changelog_url: Option,
pub date_published: DateTime,
@@ -456,6 +485,8 @@ impl CacheValue {
CacheValue::FileHash(_) => CacheValueType::FileHash,
CacheValue::FileUpdate(_) => CacheValueType::FileUpdate,
CacheValue::SearchResults(_) => CacheValueType::SearchResults,
+ CacheValue::ModpackFiles(_) => CacheValueType::ModpackFiles,
+ CacheValue::ProjectVersions(_) => CacheValueType::ProjectVersions,
}
}
@@ -496,6 +527,8 @@ impl CacheValue {
)
}
CacheValue::SearchResults(search) => search.search.clone(),
+ CacheValue::ModpackFiles(files) => files.version_id.clone(),
+ CacheValue::ProjectVersions(pv) => pv.project_id.clone(),
}
}
@@ -520,7 +553,9 @@ impl CacheValue {
| CacheValue::File { .. }
| CacheValue::LoaderManifest { .. }
| CacheValue::FileUpdate(_)
- | CacheValue::SearchResults(_) => None,
+ | CacheValue::SearchResults(_)
+ | CacheValue::ModpackFiles(_)
+ | CacheValue::ProjectVersions(_) => None,
}
}
}
@@ -1411,6 +1446,56 @@ impl CachedEntry {
})
.collect()
}
+ CacheValueType::ModpackFiles => {
+ // ModpackFiles are only stored locally during modpack installation,
+ // not fetched from an external API
+ vec![]
+ }
+ CacheValueType::ProjectVersions => {
+ let mut values = vec![];
+
+ for key in keys {
+ let project_id = key.to_string();
+ let url = format!(
+ "{}project/{}/version?include_changelog=false",
+ env!("MODRINTH_API_URL"),
+ project_id
+ );
+
+ match fetch_json::>(
+ Method::GET,
+ &url,
+ None,
+ None,
+ fetch_semaphore,
+ pool,
+ )
+ .await
+ {
+ Ok(versions) => {
+ values.push((
+ CacheValue::ProjectVersions(
+ CachedProjectVersions {
+ project_id,
+ versions,
+ },
+ )
+ .get_entry(),
+ true,
+ ));
+ }
+ Err(e) => {
+ tracing::warn!(
+ "Failed to fetch versions for project {}: {:?}",
+ project_id,
+ e
+ );
+ }
+ }
+ }
+
+ values
+ }
})
}
@@ -1463,6 +1548,86 @@ impl CachedEntry {
Ok(())
}
+
+ /// Store modpack file hashes in cache
+ pub async fn cache_modpack_files(
+ version_id: &str,
+ file_hashes: Vec,
+ pool: &SqlitePool,
+ ) -> crate::Result<()> {
+ let data = CachedModpackFiles {
+ version_id: version_id.to_string(),
+ file_hashes,
+ };
+
+ let entry = CachedEntry {
+ id: version_id.to_string(),
+ alias: None,
+ expires: Utc::now().timestamp()
+ + CacheValueType::ModpackFiles.expiry(),
+ type_: CacheValueType::ModpackFiles,
+ data: Some(CacheValue::ModpackFiles(data)),
+ };
+
+ Self::upsert_many(&[entry], pool).await
+ }
+
+ /// Get modpack file hashes from cache
+ pub async fn get_modpack_files(
+ version_id: &str,
+ pool: &SqlitePool,
+ ) -> crate::Result> {
+ let type_str = CacheValueType::ModpackFiles.as_str();
+
+ let result = sqlx::query!(
+ r#"
+ SELECT data as "data?: sqlx::types::Json"
+ FROM cache
+ WHERE data_type = $1 AND id = $2
+ "#,
+ type_str,
+ version_id
+ )
+ .fetch_optional(pool)
+ .await?;
+
+ if let Some(row) = result
+ && let Some(sqlx::types::Json(CacheValue::ModpackFiles(files))) =
+ row.data
+ {
+ return Ok(Some(files));
+ }
+
+ Ok(None)
+ }
+
+ /// Get versions for a project (without changelogs for fast loading)
+ #[tracing::instrument(skip(pool, fetch_semaphore))]
+ pub async fn get_project_versions(
+ project_id: &str,
+ cache_behaviour: Option,
+ pool: &SqlitePool,
+ fetch_semaphore: &FetchSemaphore,
+ ) -> crate::Result>> {
+ let entry = Self::get(
+ CacheValueType::ProjectVersions,
+ project_id,
+ cache_behaviour,
+ pool,
+ fetch_semaphore,
+ )
+ .await?;
+
+ if let Some(CachedEntry {
+ data: Some(CacheValue::ProjectVersions(pv)),
+ ..
+ }) = entry
+ {
+ return Ok(Some(pv.versions));
+ }
+
+ Ok(None)
+ }
}
pub async fn cache_file_hash(
diff --git a/packages/app-lib/src/state/instances/content.rs b/packages/app-lib/src/state/instances/content.rs
new file mode 100644
index 0000000000..fab9dfc417
--- /dev/null
+++ b/packages/app-lib/src/state/instances/content.rs
@@ -0,0 +1,827 @@
+//! # Content API
+//!
+//! ## Data Flow
+//!
+//! 1. Frontend calls `get_content_items(profile_path)`
+//! 2. Backend fetches all installed files via `Profile::get_projects()`
+//! 3. If profile is linked to a modpack:
+//! - Fetch modpack file hashes from cache (populated during installation)
+//! - Fallback: re-download .mrpack if cache miss (cleared/expired)
+//! - Filter out files that belong to the modpack
+//! 4. For remaining files, fetch project/version/owner metadata in parallel
+//! 5. Return sorted `ContentItem` list
+//!
+//! ## Caching
+//!
+//! Modpack file hashes are cached in `CacheValueType::ModpackFiles`
+//! during modpack installation. The cache never expires (version_id is
+//! immutable), so re-download is only needed if cache was cleared or
+//! profile predates this caching mechanism.
+
+use crate::pack::install_from::{PackFileHash, PackFormat};
+use crate::state::profiles::{Profile, ProfileFile, ProjectType};
+use crate::state::{CacheBehaviour, CachedEntry};
+use crate::util::fetch::{FetchSemaphore, fetch_mirrors, sha1_async};
+use async_zip::base::read::seek::ZipFileReader;
+use serde::{Deserialize, Serialize};
+use sqlx::SqlitePool;
+use std::collections::HashSet;
+use std::io::Cursor;
+
+/// Content item with rich metadata for frontend display
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct ContentItem {
+ /// Unique identifier (the file name)
+ pub file_name: String,
+ /// Relative path to the file within the profile
+ pub file_path: String,
+ /// SHA1 hash of the file
+ pub hash: String,
+ /// File size in bytes
+ pub size: u64,
+ /// Whether the file is enabled (not .disabled)
+ pub enabled: bool,
+ /// Type of project (mod, resourcepack, etc.)
+ pub project_type: ProjectType,
+ /// Modrinth project info if recognized
+ pub project: Option,
+ /// Version info if recognized
+ pub version: Option,
+ /// Owner info (organization or user)
+ pub owner: Option,
+ /// Whether an update is available
+ pub has_update: bool,
+ /// The recommended version ID to update to (if has_update is true)
+ pub update_version_id: Option,
+ /// When the file was added to the instance (file modification time)
+ pub date_added: Option,
+}
+
+/// Project information for content item display
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct ContentItemProject {
+ pub id: String,
+ pub slug: Option,
+ pub title: String,
+ pub icon_url: Option,
+}
+
+/// Version information for content item display
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct ContentItemVersion {
+ pub id: String,
+ pub version_number: String,
+ pub file_name: String,
+ pub date_published: Option,
+}
+
+/// Owner information for content item display
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct ContentItemOwner {
+ pub id: String,
+ pub name: String,
+ pub avatar_url: Option,
+ #[serde(rename = "type")]
+ pub owner_type: OwnerType,
+}
+
+/// Type of content owner
+#[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum OwnerType {
+ User,
+ Organization,
+}
+
+use crate::state::cache::{Dependency, Organization, TeamMember};
+use crate::state::{Project, Version};
+
+/// Full linked modpack information including owner and update status
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct LinkedModpackInfo {
+ pub project: Project,
+ pub version: Version,
+ pub owner: Option,
+ /// Whether an update is available for this modpack
+ pub has_update: bool,
+ /// The version ID to update to (if has_update is true)
+ pub update_version_id: Option,
+ /// The full version info for the update (if has_update is true)
+ pub update_version: Option,
+}
+
+/// Get linked modpack info including project, version, owner, and update status.
+/// Returns None if the profile is not linked to a modpack.
+pub async fn get_linked_modpack_info(
+ profile: &Profile,
+ cache_behaviour: Option,
+ pool: &SqlitePool,
+ fetch_semaphore: &FetchSemaphore,
+) -> crate::Result> {
+ let Some(linked_data) = &profile.linked_data else {
+ return Ok(None);
+ };
+
+ // Fetch project, version, and all project versions in parallel
+ let (project, version, all_versions) = tokio::try_join!(
+ CachedEntry::get_project(
+ &linked_data.project_id,
+ cache_behaviour,
+ pool,
+ fetch_semaphore,
+ ),
+ CachedEntry::get_version(
+ &linked_data.version_id,
+ cache_behaviour,
+ pool,
+ fetch_semaphore,
+ ),
+ CachedEntry::get_project_versions(
+ &linked_data.project_id,
+ cache_behaviour,
+ pool,
+ fetch_semaphore,
+ ),
+ )?;
+
+ let project = project.ok_or_else(|| {
+ crate::ErrorKind::InputError(format!(
+ "Linked modpack project {} not found",
+ linked_data.project_id
+ ))
+ })?;
+
+ let version = version.ok_or_else(|| {
+ crate::ErrorKind::InputError(format!(
+ "Linked modpack version {} not found",
+ linked_data.version_id
+ ))
+ })?;
+
+ // Resolve owner - prefer organization, fall back to team owner
+ let owner = if let Some(org_id) = &project.organization {
+ let org = CachedEntry::get_organization(
+ org_id,
+ cache_behaviour,
+ pool,
+ fetch_semaphore,
+ )
+ .await?;
+ org.map(|o| ContentItemOwner {
+ id: o.id,
+ name: o.name,
+ avatar_url: o.icon_url,
+ owner_type: OwnerType::Organization,
+ })
+ } else {
+ let team = CachedEntry::get_team(
+ &project.team,
+ cache_behaviour,
+ pool,
+ fetch_semaphore,
+ )
+ .await?;
+ team.and_then(|t| {
+ t.into_iter()
+ .find(|m| m.is_owner)
+ .map(|m| ContentItemOwner {
+ id: m.user.id,
+ name: m.user.username,
+ avatar_url: m.user.avatar_url,
+ owner_type: OwnerType::User,
+ })
+ })
+ };
+
+ // Check for updates
+ let (has_update, update_version_id, update_version) = check_modpack_update(
+ profile,
+ &linked_data.version_id,
+ &version,
+ all_versions,
+ );
+
+ Ok(Some(LinkedModpackInfo {
+ project,
+ version,
+ owner,
+ has_update,
+ update_version_id,
+ update_version,
+ }))
+}
+
+/// Check if a newer compatible version exists for the linked modpack.
+/// Returns (has_update, update_version_id, update_version).
+fn check_modpack_update(
+ profile: &Profile,
+ installed_version_id: &str,
+ installed_version: &Version,
+ all_versions: Option>,
+) -> (bool, Option, Option) {
+ let Some(versions) = all_versions else {
+ return (false, None, None);
+ };
+
+ // Get the loader as a string for comparison
+ let loader_str = profile.loader.as_str().to_lowercase();
+ let game_version = &profile.game_version;
+
+ // Filter to compatible versions
+ let mut compatible_versions: Vec<&Version> = versions
+ .iter()
+ .filter(|v| {
+ // Must support the profile's game version
+ let supports_game = v.game_versions.contains(game_version);
+
+ // Must support the profile's loader
+ // Modpacks list "mrpack" as a loader, but also list actual loaders
+ let supports_loader = v.loaders.iter().any(|l| {
+ let l_lower = l.to_lowercase();
+ l_lower == loader_str || l_lower == "mrpack"
+ });
+
+ supports_game && supports_loader
+ })
+ .collect();
+
+ // Sort by date_published descending (newest first)
+ compatible_versions.sort_by(|a, b| b.date_published.cmp(&a.date_published));
+
+ // Find the newest compatible version
+ if let Some(newest) = compatible_versions.first() {
+ // Check if the newest version is different and newer than installed
+ if newest.id != installed_version_id
+ && newest.date_published > installed_version.date_published
+ {
+ return (true, Some(newest.id.clone()), Some((*newest).clone()));
+ }
+ }
+
+ (false, None, None)
+}
+
+/// Get content items with rich metadata, filtered to exclude modpack content.
+/// Returns only user-added content (not part of the linked modpack).
+pub async fn get_content_items(
+ profile: &Profile,
+ cache_behaviour: Option,
+ pool: &SqlitePool,
+ fetch_semaphore: &FetchSemaphore,
+) -> crate::Result> {
+ let all_files = profile
+ .get_projects(cache_behaviour, pool, fetch_semaphore)
+ .await?;
+
+ let modpack_hashes: HashSet = if let Some(ref linked_data) =
+ profile.linked_data
+ {
+ match get_modpack_file_hashes(
+ &linked_data.version_id,
+ pool,
+ fetch_semaphore,
+ )
+ .await
+ {
+ Ok(hashes) => hashes,
+ Err(e) => {
+ tracing::warn!("Failed to fetch modpack file hashes: {}", e);
+ HashSet::new()
+ }
+ }
+ } else {
+ HashSet::new()
+ };
+
+ let user_files: Vec<(String, ProfileFile)> = all_files
+ .into_iter()
+ .filter(|(_, file)| !modpack_hashes.contains(&file.hash))
+ .collect();
+
+ profile_files_to_content_items(
+ &profile.path,
+ &user_files,
+ cache_behaviour,
+ pool,
+ fetch_semaphore,
+ )
+ .await
+}
+
+/// Pre-fetched metadata for projects, versions, teams, and organizations.
+struct ResolvedMetadata {
+ projects: Vec,
+ versions: Vec,
+ teams: Vec>,
+ organizations: Vec,
+}
+
+/// Fetch project, version, team, and organization metadata in parallel batches.
+async fn resolve_metadata(
+ project_ids: &HashSet,
+ version_ids: &HashSet,
+ cache_behaviour: Option,
+ pool: &SqlitePool,
+ fetch_semaphore: &FetchSemaphore,
+) -> crate::Result {
+ let project_ids_vec: Vec<&str> =
+ project_ids.iter().map(|s| s.as_str()).collect();
+ let version_ids_vec: Vec<&str> =
+ version_ids.iter().map(|s| s.as_str()).collect();
+
+ let (projects, versions) =
+ if !project_ids.is_empty() || !version_ids.is_empty() {
+ tokio::try_join!(
+ async {
+ if project_ids.is_empty() {
+ Ok(Vec::new())
+ } else {
+ CachedEntry::get_project_many(
+ &project_ids_vec,
+ cache_behaviour,
+ pool,
+ fetch_semaphore,
+ )
+ .await
+ }
+ },
+ async {
+ if version_ids.is_empty() {
+ Ok(Vec::new())
+ } else {
+ CachedEntry::get_version_many(
+ &version_ids_vec,
+ cache_behaviour,
+ pool,
+ fetch_semaphore,
+ )
+ .await
+ }
+ }
+ )?
+ } else {
+ (Vec::new(), Vec::new())
+ };
+
+ let team_ids: HashSet =
+ projects.iter().map(|p| p.team.clone()).collect();
+ let org_ids: HashSet = projects
+ .iter()
+ .filter_map(|p| p.organization.clone())
+ .collect();
+
+ let team_ids_vec: Vec<&str> = team_ids.iter().map(|s| s.as_str()).collect();
+ let org_ids_vec: Vec<&str> = org_ids.iter().map(|s| s.as_str()).collect();
+
+ let (teams, organizations) = if !team_ids.is_empty() || !org_ids.is_empty()
+ {
+ tokio::try_join!(
+ async {
+ if team_ids.is_empty() {
+ Ok(Vec::new())
+ } else {
+ CachedEntry::get_team_many(
+ &team_ids_vec,
+ cache_behaviour,
+ pool,
+ fetch_semaphore,
+ )
+ .await
+ }
+ },
+ async {
+ if org_ids.is_empty() {
+ Ok(Vec::new())
+ } else {
+ CachedEntry::get_organization_many(
+ &org_ids_vec,
+ cache_behaviour,
+ pool,
+ fetch_semaphore,
+ )
+ .await
+ }
+ }
+ )?
+ } else {
+ (Vec::new(), Vec::new())
+ };
+
+ Ok(ResolvedMetadata {
+ projects,
+ versions,
+ teams,
+ organizations,
+ })
+}
+
+/// Shared helper: convert profile files to ContentItems with rich metadata.
+/// Used by both `get_content_items` (user-added files) and
+/// `get_linked_modpack_content` (modpack-bundled files).
+async fn profile_files_to_content_items(
+ profile_path: &str,
+ files: &[(String, ProfileFile)],
+ cache_behaviour: Option,
+ pool: &SqlitePool,
+ fetch_semaphore: &FetchSemaphore,
+) -> crate::Result> {
+ let project_ids: HashSet = files
+ .iter()
+ .filter_map(|(_, f)| f.metadata.as_ref().map(|m| m.project_id.clone()))
+ .collect();
+
+ let version_ids: HashSet = files
+ .iter()
+ .filter_map(|(_, f)| f.metadata.as_ref().map(|m| m.version_id.clone()))
+ .collect();
+
+ let meta = resolve_metadata(
+ &project_ids,
+ &version_ids,
+ cache_behaviour,
+ pool,
+ fetch_semaphore,
+ )
+ .await?;
+
+ let profile_base_path =
+ crate::api::profile::get_full_path(profile_path).await?;
+
+ // Batch-read file modification times off the main async runtime
+ let paths: Vec = files
+ .iter()
+ .map(|(path, _)| profile_base_path.join(path))
+ .collect();
+
+ let modification_times: Vec> =
+ tokio::task::spawn_blocking(move || {
+ paths
+ .iter()
+ .map(|path| {
+ std::fs::metadata(path).and_then(|m| m.modified()).ok().map(
+ |t| {
+ chrono::DateTime::::from(t)
+ .to_rfc3339()
+ },
+ )
+ })
+ .collect()
+ })
+ .await?;
+
+ let mut items: Vec = files
+ .iter()
+ .enumerate()
+ .map(|(i, (path, file))| {
+ let project = file.metadata.as_ref().and_then(|m| {
+ meta.projects.iter().find(|p| p.id == m.project_id)
+ });
+
+ let version = file.metadata.as_ref().and_then(|m| {
+ meta.versions.iter().find(|v| v.id == m.version_id)
+ });
+
+ let owner = project.and_then(|p| {
+ resolve_owner(p, &meta.teams, &meta.organizations)
+ });
+
+ ContentItem {
+ file_name: file.file_name.clone(),
+ file_path: path.clone(),
+ hash: file.hash.clone(),
+ size: file.size,
+ enabled: !file.file_name.ends_with(".disabled"),
+ project_type: file.project_type,
+ project: project.map(|p| ContentItemProject {
+ id: p.id.clone(),
+ slug: p.slug.clone(),
+ title: p.title.clone(),
+ icon_url: p.icon_url.clone(),
+ }),
+ version: version.map(|v| ContentItemVersion {
+ id: v.id.clone(),
+ version_number: v.version_number.clone(),
+ file_name: file.file_name.clone(),
+ date_published: Some(v.date_published.to_rfc3339()),
+ }),
+ owner,
+ has_update: file.update_version_id.is_some(),
+ update_version_id: file.update_version_id.clone(),
+ date_added: modification_times[i].clone(),
+ }
+ })
+ .collect();
+
+ items.sort_by(|a, b| {
+ let name_a = a
+ .project
+ .as_ref()
+ .map(|p| p.title.as_str())
+ .unwrap_or(&a.file_name);
+ let name_b = b
+ .project
+ .as_ref()
+ .map(|p| p.title.as_str())
+ .unwrap_or(&b.file_name);
+ name_a.to_lowercase().cmp(&name_b.to_lowercase())
+ });
+
+ Ok(items)
+}
+
+/// Resolve the owner of a project from pre-fetched teams and organizations.
+fn resolve_owner(
+ project: &Project,
+ teams: &[Vec],
+ organizations: &[Organization],
+) -> Option {
+ if let Some(org_id) = &project.organization {
+ organizations.iter().find(|o| &o.id == org_id).map(|o| {
+ ContentItemOwner {
+ id: o.id.clone(),
+ name: o.name.clone(),
+ avatar_url: o.icon_url.clone(),
+ owner_type: OwnerType::Organization,
+ }
+ })
+ } else {
+ teams
+ .iter()
+ .find(|t| t.first().is_some_and(|m| m.team_id == project.team))
+ .and_then(|t| t.iter().find(|m| m.is_owner))
+ .map(|m| ContentItemOwner {
+ id: m.user.id.clone(),
+ name: m.user.username.clone(),
+ avatar_url: m.user.avatar_url.clone(),
+ owner_type: OwnerType::User,
+ })
+ }
+}
+
+/// Get content items that are part of the linked modpack (not user-added).
+/// Returns modpack-bundled files with full on-disk metadata (file_path, enabled, etc).
+/// Returns empty vec if the profile is not linked to a modpack.
+pub async fn get_linked_modpack_content(
+ profile: &Profile,
+ cache_behaviour: Option,
+ pool: &SqlitePool,
+ fetch_semaphore: &FetchSemaphore,
+) -> crate::Result> {
+ let Some(linked_data) = &profile.linked_data else {
+ return Ok(Vec::new());
+ };
+
+ let all_files = profile
+ .get_projects(cache_behaviour, pool, fetch_semaphore)
+ .await?;
+
+ let modpack_hashes: HashSet = match get_modpack_file_hashes(
+ &linked_data.version_id,
+ pool,
+ fetch_semaphore,
+ )
+ .await
+ {
+ Ok(hashes) => hashes,
+ Err(e) => {
+ tracing::warn!("Failed to fetch modpack file hashes: {}", e);
+ return Ok(Vec::new());
+ }
+ };
+
+ // Inverse of get_content_items: keep only modpack-bundled files
+ let modpack_files: Vec<(String, ProfileFile)> = all_files
+ .into_iter()
+ .filter(|(_, file)| modpack_hashes.contains(&file.hash))
+ .collect();
+
+ profile_files_to_content_items(
+ &profile.path,
+ &modpack_files,
+ cache_behaviour,
+ pool,
+ fetch_semaphore,
+ )
+ .await
+}
+
+/// Convert a list of dependencies into ContentItems with rich metadata.
+/// Fetches project, version, and owner info for each dependency.
+pub async fn dependencies_to_content_items(
+ dependencies: &[Dependency],
+ cache_behaviour: Option,
+ pool: &SqlitePool,
+ fetch_semaphore: &FetchSemaphore,
+) -> crate::Result> {
+ let project_ids: HashSet = dependencies
+ .iter()
+ .filter_map(|d| d.project_id.clone())
+ .collect();
+
+ if project_ids.is_empty() {
+ return Ok(Vec::new());
+ }
+
+ let version_ids: HashSet = dependencies
+ .iter()
+ .filter_map(|d| d.version_id.clone())
+ .collect();
+
+ let meta = resolve_metadata(
+ &project_ids,
+ &version_ids,
+ cache_behaviour,
+ pool,
+ fetch_semaphore,
+ )
+ .await?;
+
+ let mut items: Vec = dependencies
+ .iter()
+ .filter_map(|dep| {
+ let project_id = dep.project_id.as_ref()?;
+ let project = meta.projects.iter().find(|p| &p.id == project_id)?;
+
+ let version = dep
+ .version_id
+ .as_ref()
+ .and_then(|vid| meta.versions.iter().find(|v| &v.id == vid));
+
+ let owner =
+ resolve_owner(project, &meta.teams, &meta.organizations);
+
+ let project_type = match project.project_type.as_str() {
+ "mod" => ProjectType::Mod,
+ "resourcepack" => ProjectType::ResourcePack,
+ "shader" => ProjectType::ShaderPack,
+ "datapack" => ProjectType::DataPack,
+ _ => ProjectType::Mod,
+ };
+
+ Some(ContentItem {
+ file_name: version
+ .and_then(|v| v.files.first())
+ .map(|f| f.filename.clone())
+ .unwrap_or_else(|| {
+ format!(
+ "{}.jar",
+ project.slug.as_deref().unwrap_or(&project.id)
+ )
+ }),
+ file_path: String::new(),
+ hash: String::new(),
+ size: version
+ .and_then(|v| v.files.first())
+ .map(|f| f.size as u64)
+ .unwrap_or(0),
+ enabled: true,
+ project_type,
+ project: Some(ContentItemProject {
+ id: project.id.clone(),
+ slug: project.slug.clone(),
+ title: project.title.clone(),
+ icon_url: project.icon_url.clone(),
+ }),
+ version: version.map(|v| ContentItemVersion {
+ id: v.id.clone(),
+ version_number: v.version_number.clone(),
+ file_name: v
+ .files
+ .first()
+ .map(|f| f.filename.clone())
+ .unwrap_or_default(),
+ date_published: Some(v.date_published.to_rfc3339()),
+ }),
+ owner,
+ has_update: false,
+ update_version_id: None,
+ date_added: None,
+ })
+ })
+ .collect();
+
+ items.sort_by(|a, b| {
+ let name_a = a
+ .project
+ .as_ref()
+ .map(|p| p.title.as_str())
+ .unwrap_or(&a.file_name);
+ let name_b = b
+ .project
+ .as_ref()
+ .map(|p| p.title.as_str())
+ .unwrap_or(&b.file_name);
+ name_a.to_lowercase().cmp(&name_b.to_lowercase())
+ });
+
+ Ok(items)
+}
+
+/// Gets SHA1 hashes of all files in a modpack version.
+/// Checks cache first, falls back to downloading mrpack if not cached.
+async fn get_modpack_file_hashes(
+ version_id: &str,
+ pool: &SqlitePool,
+ fetch_semaphore: &FetchSemaphore,
+) -> crate::Result> {
+ if let Some(cached) =
+ CachedEntry::get_modpack_files(version_id, pool).await?
+ {
+ return Ok(cached.file_hashes.into_iter().collect());
+ }
+
+ tracing::debug!(
+ "Modpack files not cached, downloading mrpack for version {}",
+ version_id
+ );
+
+ let version =
+ CachedEntry::get_version(version_id, None, pool, fetch_semaphore)
+ .await?
+ .ok_or_else(|| {
+ crate::ErrorKind::InputError(format!(
+ "Modpack version {version_id} not found"
+ ))
+ })?;
+
+ let primary_file = version
+ .files
+ .iter()
+ .find(|f| f.primary)
+ .or_else(|| version.files.first())
+ .ok_or_else(|| {
+ crate::ErrorKind::InputError(format!(
+ "No files found for modpack version {version_id}"
+ ))
+ })?;
+
+ let mrpack_bytes = fetch_mirrors(
+ &[&primary_file.url],
+ primary_file.hashes.get("sha1").map(|s| s.as_str()),
+ fetch_semaphore,
+ pool,
+ )
+ .await?;
+
+ let reader = Cursor::new(&mrpack_bytes);
+ let mut zip_reader =
+ ZipFileReader::with_tokio(reader).await.map_err(|_| {
+ crate::ErrorKind::InputError(
+ "Failed to read modpack zip".to_string(),
+ )
+ })?;
+
+ let manifest_idx = zip_reader
+ .file()
+ .entries()
+ .iter()
+ .position(|f| {
+ matches!(f.filename().as_str(), Ok("modrinth.index.json"))
+ })
+ .ok_or_else(|| {
+ crate::ErrorKind::InputError(
+ "No modrinth.index.json found in mrpack".to_string(),
+ )
+ })?;
+
+ let mut manifest = String::new();
+ let mut entry_reader = zip_reader.reader_with_entry(manifest_idx).await?;
+ entry_reader.read_to_string_checked(&mut manifest).await?;
+
+ let pack: PackFormat = serde_json::from_str(&manifest)?;
+
+ let mut hashes: Vec = pack
+ .files
+ .iter()
+ .filter_map(|f| f.hashes.get(&PackFileHash::Sha1).cloned())
+ .collect();
+
+ // Also hash files from overrides folders (these aren't in modrinth.index.json)
+ let override_entries: Vec = zip_reader
+ .file()
+ .entries()
+ .iter()
+ .enumerate()
+ .filter_map(|(index, entry)| {
+ let filename = entry.filename().as_str().ok()?;
+ let is_override = (filename.starts_with("overrides/")
+ || filename.starts_with("client-overrides/")
+ || filename.starts_with("server-overrides/"))
+ && !filename.ends_with('/');
+ is_override.then_some(index)
+ })
+ .collect();
+
+ for index in override_entries {
+ let mut file_bytes = Vec::new();
+ let mut entry_reader = zip_reader.reader_with_entry(index).await?;
+ entry_reader.read_to_end_checked(&mut file_bytes).await?;
+
+ let hash = sha1_async(bytes::Bytes::from(file_bytes)).await?;
+ hashes.push(hash);
+ }
+
+ CachedEntry::cache_modpack_files(version_id, hashes.clone(), pool).await?;
+
+ Ok(hashes.into_iter().collect())
+}
diff --git a/packages/app-lib/src/state/instances/mod.rs b/packages/app-lib/src/state/instances/mod.rs
new file mode 100644
index 0000000000..931e32a6c1
--- /dev/null
+++ b/packages/app-lib/src/state/instances/mod.rs
@@ -0,0 +1,4 @@
+//! Instance-related modules for profile/instance management.
+
+mod content;
+pub use self::content::*;
diff --git a/packages/app-lib/src/state/legacy_converter.rs b/packages/app-lib/src/state/legacy_converter.rs
index df043de35c..a5b9fdd136 100644
--- a/packages/app-lib/src/state/legacy_converter.rs
+++ b/packages/app-lib/src/state/legacy_converter.rs
@@ -622,7 +622,7 @@ impl From for Version {
featured: value.featured,
name: value.name,
version_number: value.version_number,
- changelog: value.changelog,
+ changelog: Some(value.changelog),
changelog_url: value.changelog_url,
date_published: value.date_published,
downloads: value.downloads,
diff --git a/packages/app-lib/src/state/mod.rs b/packages/app-lib/src/state/mod.rs
index 6c3a69126b..b44306f92e 100644
--- a/packages/app-lib/src/state/mod.rs
+++ b/packages/app-lib/src/state/mod.rs
@@ -13,6 +13,9 @@ pub use self::dirs::*;
mod profiles;
pub use self::profiles::*;
+mod instances;
+pub use self::instances::*;
+
mod settings;
pub use self::settings::*;
diff --git a/packages/assets/generated-icons.ts b/packages/assets/generated-icons.ts
index 22569d9b31..2b41f3f18d 100644
--- a/packages/assets/generated-icons.ts
+++ b/packages/assets/generated-icons.ts
@@ -3,8 +3,6 @@
import type { FunctionalComponent, SVGAttributes } from 'vue'
-export type IconComponent = FunctionalComponent
-
import _AffiliateIcon from './icons/affiliate.svg?component'
import _AlignLeftIcon from './icons/align-left.svg?component'
import _ArchiveIcon from './icons/archive.svg?component'
@@ -15,6 +13,7 @@ import _ArrowDownLeftIcon from './icons/arrow-down-left.svg?component'
import _ArrowLeftIcon from './icons/arrow-left.svg?component'
import _ArrowLeftRightIcon from './icons/arrow-left-right.svg?component'
import _ArrowUpIcon from './icons/arrow-up.svg?component'
+import _ArrowUpDownIcon from './icons/arrow-up-down.svg?component'
import _ArrowUpRightIcon from './icons/arrow-up-right.svg?component'
import _AsteriskIcon from './icons/asterisk.svg?component'
import _BadgeCheckIcon from './icons/badge-check.svg?component'
@@ -47,6 +46,7 @@ import _ChevronDownIcon from './icons/chevron-down.svg?component'
import _ChevronLeftIcon from './icons/chevron-left.svg?component'
import _ChevronRightIcon from './icons/chevron-right.svg?component'
import _ChevronUpIcon from './icons/chevron-up.svg?component'
+import _CircleAlertIcon from './icons/circle-alert.svg?component'
import _CircleUserIcon from './icons/circle-user.svg?component'
import _ClearIcon from './icons/clear.svg?component'
import _ClientIcon from './icons/client.svg?component'
@@ -166,6 +166,8 @@ import _PickaxeIcon from './icons/pickaxe.svg?component'
import _PlayIcon from './icons/play.svg?component'
import _PlugIcon from './icons/plug.svg?component'
import _PlusIcon from './icons/plus.svg?component'
+import _PowerIcon from './icons/power.svg?component'
+import _PowerOffIcon from './icons/power-off.svg?component'
import _RadioButtonIcon from './icons/radio-button.svg?component'
import _RadioButtonCheckedIcon from './icons/radio-button-checked.svg?component'
import _ReceiptTextIcon from './icons/receipt-text.svg?component'
@@ -295,6 +297,7 @@ import _TagLoaderVelocityIcon from './icons/tags/loaders/velocity.svg?component'
import _TagLoaderWaterfallIcon from './icons/tags/loaders/waterfall.svg?component'
import _TerminalSquareIcon from './icons/terminal-square.svg?component'
import _TestIcon from './icons/test.svg?component'
+import _TextCursorInputIcon from './icons/text-cursor-input.svg?component'
import _TextQuoteIcon from './icons/text-quote.svg?component'
import _TimerIcon from './icons/timer.svg?component'
import _ToggleLeftIcon from './icons/toggle-left.svg?component'
@@ -327,6 +330,8 @@ import _XCircleIcon from './icons/x-circle.svg?component'
import _ZoomInIcon from './icons/zoom-in.svg?component'
import _ZoomOutIcon from './icons/zoom-out.svg?component'
+export type IconComponent = FunctionalComponent
+
export const AffiliateIcon = _AffiliateIcon
export const AlignLeftIcon = _AlignLeftIcon
export const ArchiveIcon = _ArchiveIcon
@@ -337,6 +342,7 @@ export const ArrowDownLeftIcon = _ArrowDownLeftIcon
export const ArrowLeftIcon = _ArrowLeftIcon
export const ArrowLeftRightIcon = _ArrowLeftRightIcon
export const ArrowUpIcon = _ArrowUpIcon
+export const ArrowUpDownIcon = _ArrowUpDownIcon
export const ArrowUpRightIcon = _ArrowUpRightIcon
export const AsteriskIcon = _AsteriskIcon
export const BadgeCheckIcon = _BadgeCheckIcon
@@ -369,6 +375,7 @@ export const ChevronDownIcon = _ChevronDownIcon
export const ChevronLeftIcon = _ChevronLeftIcon
export const ChevronRightIcon = _ChevronRightIcon
export const ChevronUpIcon = _ChevronUpIcon
+export const CircleAlertIcon = _CircleAlertIcon
export const CircleUserIcon = _CircleUserIcon
export const ClearIcon = _ClearIcon
export const ClientIcon = _ClientIcon
@@ -488,6 +495,8 @@ export const PickaxeIcon = _PickaxeIcon
export const PlayIcon = _PlayIcon
export const PlugIcon = _PlugIcon
export const PlusIcon = _PlusIcon
+export const PowerIcon = _PowerIcon
+export const PowerOffIcon = _PowerOffIcon
export const RadioButtonIcon = _RadioButtonIcon
export const RadioButtonCheckedIcon = _RadioButtonCheckedIcon
export const ReceiptTextIcon = _ReceiptTextIcon
@@ -617,6 +626,7 @@ export const TagLoaderVelocityIcon = _TagLoaderVelocityIcon
export const TagLoaderWaterfallIcon = _TagLoaderWaterfallIcon
export const TerminalSquareIcon = _TerminalSquareIcon
export const TestIcon = _TestIcon
+export const TextCursorInputIcon = _TextCursorInputIcon
export const TextQuoteIcon = _TextQuoteIcon
export const TimerIcon = _TimerIcon
export const ToggleLeftIcon = _ToggleLeftIcon
diff --git a/packages/assets/icons/arrow-up-down.svg b/packages/assets/icons/arrow-up-down.svg
new file mode 100644
index 0000000000..0607f68e0b
--- /dev/null
+++ b/packages/assets/icons/arrow-up-down.svg
@@ -0,0 +1 @@
+
diff --git a/packages/assets/icons/circle-alert.svg b/packages/assets/icons/circle-alert.svg
new file mode 100644
index 0000000000..5c87e85c4d
--- /dev/null
+++ b/packages/assets/icons/circle-alert.svg
@@ -0,0 +1,17 @@
+
+
diff --git a/packages/assets/icons/power-off.svg b/packages/assets/icons/power-off.svg
new file mode 100644
index 0000000000..b976bd39b2
--- /dev/null
+++ b/packages/assets/icons/power-off.svg
@@ -0,0 +1,18 @@
+
+
diff --git a/packages/assets/icons/power.svg b/packages/assets/icons/power.svg
new file mode 100644
index 0000000000..f15b1aeecb
--- /dev/null
+++ b/packages/assets/icons/power.svg
@@ -0,0 +1,16 @@
+
+
diff --git a/packages/assets/icons/text-cursor-input.svg b/packages/assets/icons/text-cursor-input.svg
new file mode 100644
index 0000000000..534a20a791
--- /dev/null
+++ b/packages/assets/icons/text-cursor-input.svg
@@ -0,0 +1,19 @@
+
+
diff --git a/packages/sqlx-tracing/tests/postgres.rs b/packages/sqlx-tracing/tests/postgres.rs
index 0b2d0c6f9f..1244db69ed 100644
--- a/packages/sqlx-tracing/tests/postgres.rs
+++ b/packages/sqlx-tracing/tests/postgres.rs
@@ -46,13 +46,21 @@ impl PostgresContainer {
#[tokio::test]
async fn execute() {
- let observability = opentelemetry_testing::ObservabilityContainer::create().await;
+ let observability =
+ opentelemetry_testing::ObservabilityContainer::create().await;
let provider = observability.install().await;
let container = PostgresContainer::create().await;
let pool = container.client().await;
- common::should_trace("trace_pool", "postgresql", &observability, &provider, &pool).await;
+ common::should_trace(
+ "trace_pool",
+ "postgresql",
+ &observability,
+ &provider,
+ &pool,
+ )
+ .await;
{
let mut conn = pool.acquire().await.unwrap();
@@ -67,7 +75,8 @@ async fn execute() {
}
{
- let mut tx: sqlx_tracing::Transaction<'_, Postgres> = pool.begin().await.unwrap();
+ let mut tx: sqlx_tracing::Transaction<'_, Postgres> =
+ pool.begin().await.unwrap();
common::should_trace(
"trace_tx",
"postgresql",
diff --git a/packages/sqlx-tracing/tests/sqlite.rs b/packages/sqlx-tracing/tests/sqlite.rs
index 921be0a698..0ee2a5feec 100644
--- a/packages/sqlx-tracing/tests/sqlite.rs
+++ b/packages/sqlx-tracing/tests/sqlite.rs
@@ -6,21 +6,37 @@ mod common;
#[tokio::test]
async fn execute() {
- let observability = opentelemetry_testing::ObservabilityContainer::create().await;
+ let observability =
+ opentelemetry_testing::ObservabilityContainer::create().await;
let provider = observability.install().await;
let pool = sqlx::SqlitePool::connect(":memory:").await.unwrap();
let pool = sqlx_tracing::Pool::from(pool);
- common::should_trace("trace_pool", "sqlite", &observability, &provider, &pool).await;
+ common::should_trace(
+ "trace_pool",
+ "sqlite",
+ &observability,
+ &provider,
+ &pool,
+ )
+ .await;
{
let mut conn = pool.acquire().await.unwrap();
- common::should_trace("trace_conn", "sqlite", &observability, &provider, &mut conn).await;
+ common::should_trace(
+ "trace_conn",
+ "sqlite",
+ &observability,
+ &provider,
+ &mut conn,
+ )
+ .await;
}
{
- let mut tx: sqlx_tracing::Transaction<'_, Sqlite> = pool.begin().await.unwrap();
+ let mut tx: sqlx_tracing::Transaction<'_, Sqlite> =
+ pool.begin().await.unwrap();
common::should_trace(
"trace_tx",
"sqlite",
diff --git a/packages/tooling-config/tailwind/tailwind-preset.ts b/packages/tooling-config/tailwind/tailwind-preset.ts
index 3ff6f79732..1d6abbe9a7 100644
--- a/packages/tooling-config/tailwind/tailwind-preset.ts
+++ b/packages/tooling-config/tailwind/tailwind-preset.ts
@@ -1,3 +1,4 @@
+import containerQueries from '@tailwindcss/container-queries'
import type { Config } from 'tailwindcss'
const config: Config = {
@@ -253,7 +254,7 @@ const config: Config = {
},
},
},
- plugins: [],
+ plugins: [containerQueries],
corePlugins: {
preflight: false,
},
diff --git a/packages/ui/src/components/base/FloatingActionBar.vue b/packages/ui/src/components/base/FloatingActionBar.vue
index 3585aa9395..d5ee25e078 100644
--- a/packages/ui/src/components/base/FloatingActionBar.vue
+++ b/packages/ui/src/components/base/FloatingActionBar.vue
@@ -6,9 +6,9 @@ defineProps<{
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- Failed to load content
-- We couldn't load your server's {{ type.toLowerCase() }}s. Here's what we know: - {{ - JSON.stringify(server.moduleErrors.content.error) - }} -
-
-
-
-
-
-
-
-
diff --git a/package.json b/package.json
index 1c19c0eb5d..79ce7250cd 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
},
"devDependencies": {
"@modrinth/tooling-config": "workspace:*",
+ "@tailwindcss/container-queries": "^0.1.1",
"@types/node": "^20.1.0",
"@vue/compiler-dom": "^3.5.26",
"@vue/compiler-sfc": "^3.5.26",
diff --git a/packages/api-client/src/modules/archon/content/v1.ts b/packages/api-client/src/modules/archon/content/v1.ts
new file mode 100644
index 0000000000..2c7683a805
--- /dev/null
+++ b/packages/api-client/src/modules/archon/content/v1.ts
@@ -0,0 +1,155 @@
+import { AbstractModule } from '../../../core/abstract-module'
+import type { Archon } from '../types'
+
+/**
+ * Default world ID - Uuid::nil() which the backend treats as "first/active world"
+ * See: apps/archon/src/routes/v1/servers/worlds/mod.rs - world_id_nullish()
+ * TODO:
+ * - Make sure world ID is being passed before we ship worlds.
+ */
+const DEFAULT_WORLD_ID: string = '00000000-0000-0000-0000-000000000000' as const
+
+export class ArchonContentV1Module extends AbstractModule {
+ public getModuleID(): string {
+ return 'archon_content_v1'
+ }
+
+ /** GET /v1/:server_id/worlds/:world_id/addons */
+ public async getAddons(
+ serverId: string,
+ worldId: string = DEFAULT_WORLD_ID,
+ ): Promise
-
-
-
-
-
-
-
-
-
-
-
- {{ filterMethodLabel }}
-
-
-
- All {{ type.toLocaleLowerCase() }}s
- Only enabled
- Only disabled
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ friendlyModName(mod) }}
-
-
-
-
- by {{ mod.owner }}
-
- {{ mod.version_number || `External ${type.toLocaleLowerCase()}` }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - No {{ type.toLocaleLowerCase() }}s found for your query! -
-Try another query, or show everything.
-
-
- No {{ type.toLocaleLowerCase() }}s found!
-- Add some {{ type.toLocaleLowerCase() }}s to your server to manage them here. -
-
-
-
-
-
-
-
-
-
-
-
- Your server is running Vanilla Minecraft
-- Add content to your server by installing a modpack or choosing a different platform that - supports {{ type }}s. -
-
-
-
-
-
-
-
-
-
-
- or
-