diff --git a/apps/frontend/src/pages/discover/[type]/index.vue b/apps/frontend/src/pages/discover/[type]/index.vue
index 09213818fdb..40b9b750383 100644
--- a/apps/frontend/src/pages/discover/[type]/index.vue
+++ b/apps/frontend/src/pages/discover/[type]/index.vue
@@ -19,8 +19,11 @@ import {
CreationFlowModal,
defineMessages,
formatProjectTypeSentence,
+ getProjectVersionFilterQuery,
injectModrinthClient,
injectUserPreferences,
+ isServerContentEnvironmentProjectType,
+ NavTabs,
PROJECT_DEP_MARKER_QUERY,
provideBrowseManager,
SelectedProjectsFloatingBar,
@@ -40,6 +43,7 @@ import LogoAnimated from '~/components/brand/LogoAnimated.vue'
import AdPlaceholder from '~/components/ui/AdPlaceholder.vue'
import { projectQueryOptions, warmProjectCheckCaches } from '~/composables/queries/project'
import { versionQueryOptions } from '~/composables/queries/version'
+import { useDiscoverProjectTypeLinks } from '~/composables/use-discover-project-type-links'
import type {
ServerInstallModalHandle,
ServerInstallSearchResult,
@@ -58,6 +62,7 @@ const { updatePreferences } = injectUserPreferences()
const queryClient = useQueryClient()
const filtersMenuOpen = ref(false)
+const { projectTypeLinks, isServerContext } = useDiscoverProjectTypeLinks()
const route = useRoute()
const cosmetics = useCosmetics()
@@ -177,12 +182,13 @@ const onboardingModalRef = ref(null)
const {
currentServerId,
fromContext,
+ isSetupServerContext,
serverData,
serverContentData,
serverFilters,
serverHideInstalled,
- serverContentServerOnly,
- showServerOnlyToggle,
+ serverEnvironment,
+ showServerEnvironment,
serverEnvironmentOverride,
hideSelectedServerInstalls,
installingProjectIds,
@@ -204,6 +210,23 @@ const {
debug,
})
+watch(
+ [serverEnvironment, currentType, showServerEnvironment],
+ ([environment, type, show]) => {
+ if (!show) return
+ const allowed = type !== 'modpack' && isServerContentEnvironmentProjectType(environment, type)
+ if (allowed && (route.query.env ?? null) === environment) return
+ navigateTo(
+ {
+ path: allowed ? route.path : '/discover/mods',
+ query: { ...route.query, env: environment ?? undefined },
+ },
+ { replace: true },
+ )
+ },
+ { immediate: true },
+)
+
function getServerModpackContent(project: Labrinth.Search.v3.ResultSearchProject) {
const content = project.minecraft_java_server?.content
if (content?.kind === 'modpack') {
@@ -351,27 +374,31 @@ function getCardActions(
}
if (serverData.value) {
- const isQueued = queuedServerInstallProjectIds.value.has(result.project_id)
- const isQueuedRoot = queuedServerInstallRootProjectIds.value.has(result.project_id)
+ const isQueued =
+ !isSetupServerContext.value && queuedServerInstallProjectIds.value.has(result.project_id)
+ const isQueuedRoot =
+ !isSetupServerContext.value && queuedServerInstallRootProjectIds.value.has(result.project_id)
const isInstalled =
- projectResult.installed ||
- optimisticallyInstalledProjectIds.value.has(result.project_id) ||
- (serverContentData.value &&
- (serverContentData.value.addons ?? []).find((x) => x.project_id === result.project_id)) ||
- serverData.value.upstream?.project_id === result.project_id
+ !isSetupServerContext.value &&
+ (projectResult.installed ||
+ optimisticallyInstalledProjectIds.value.has(result.project_id) ||
+ (serverContentData.value &&
+ (serverContentData.value.addons ?? []).find((x) => x.project_id === result.project_id)) ||
+ serverData.value.upstream?.project_id === result.project_id)
const isInstalling = installingProjectIds.value.has(result.project_id)
const isInstallingSelection = isInstallingQueuedServerInstalls.value
+ const showAsInstalling = isInstalling || (isInstallingSelection && isQueuedRoot)
const validatingInstall =
isInstalling && currentProjectType !== 'modpack' && !isInstallingSelection
const installLabel = isInstalled
? formatMessage(commonMessages.installedLabel)
: isQueued
- ? isInstalling || isInstallingSelection
+ ? showAsInstalling
? validatingInstall
? formatMessage(commonMessages.validatingLabel)
: formatMessage(commonMessages.installingLabel)
: formatMessage(commonMessages.selectedLabel)
- : isInstalling || isInstallingSelection
+ : showAsInstalling
? validatingInstall
? formatMessage(commonMessages.validatingLabel)
: formatMessage(commonMessages.installingLabel)
@@ -381,16 +408,11 @@ function getCardActions(
{
key: 'install',
label: installLabel,
- icon:
- isInstalling || isInstallingSelection
- ? SpinnerIcon
- : isQueued || isInstalled
- ? CheckIcon
- : DownloadIcon,
- iconClass: isInstalling || isInstallingSelection ? 'animate-spin' : undefined,
+ icon: showAsInstalling ? SpinnerIcon : isQueued || isInstalled ? CheckIcon : DownloadIcon,
+ iconClass: showAsInstalling ? 'animate-spin' : undefined,
disabled:
!!isInstalled || isInstalling || isInstallingSelection || (isQueued && !isQueuedRoot),
- color: isQueued && !isInstalling && !isInstallingSelection ? 'green' : 'brand',
+ color: isQueued && !showAsInstalling ? 'green' : 'brand',
type: 'outlined',
onClick: () => serverInstall(projectResult),
},
@@ -464,10 +486,10 @@ const searchState = useBrowseSearch({
providedFilters: serverFilters,
environmentOverride: serverEnvironmentOverride,
search,
- persistentQueryParams: ['sid', 'wid', 'shi', 'so', 'from'],
+ persistentQueryParams: ['sid', 'wid', 'shi', 'env', 'from'],
getExtraQueryParams: () => ({
shi: serverHideInstalled.value ? 'true' : undefined,
- so: showServerOnlyToggle.value && serverContentServerOnly.value ? 'true' : undefined,
+ env: (showServerEnvironment.value && serverEnvironment.value) || undefined,
}),
maxResultsOptions: currentMaxResultsOptions,
displayMode: resultsDisplayMode,
@@ -543,10 +565,18 @@ provideBrowseManager({
tags,
projectType: projectTypeId,
...searchState,
- getProjectLink: (result: Labrinth.Search.v3.ResultSearchProject) =>
- withHostingContext(
- `/${projectType.value?.id ?? 'project'}/${result.slug ? result.slug : result.project_id}`,
- ),
+ getProjectLink: (result: Labrinth.Search.v3.ResultSearchProject) => ({
+ path: `/${projectType.value?.id ?? 'project'}/${result.slug ? result.slug : result.project_id}`,
+ query: {
+ ...hostingContextQuery.value,
+ ...getProjectVersionFilterQuery({
+ contentType: projectTypeId.value,
+ selectedFilters: searchState.currentFilters.value,
+ providedFilters: serverFilters.value,
+ overriddenProvidedFilterTypes: searchState.overriddenProvidedFilterTypes.value,
+ }),
+ },
+ }),
getServerProjectLink: (result: Labrinth.Search.v3.ResultSearchProject) =>
withHostingContext(`/server/${result.slug ?? result.project_id}`),
selectableProjectTypes: computed(() => []),
@@ -566,10 +596,9 @@ provideBrowseManager({
queuedServerInstallCount.value > 0,
),
hideSelectedLabel: computed(() => formatMessage(commonMessages.hideSelectedContentLabel)),
- serverOnly: serverContentServerOnly,
- showServerOnly: showServerOnlyToggle,
- serverOnlyLabel: computed(() => formatMessage(commonMessages.serverOnlyLabel)),
- hiddenFilterTypes: computed(() => (showServerOnlyToggle.value ? ['environment'] : [])),
+ serverEnvironment,
+ showServerEnvironment,
+ hiddenFilterTypes: computed(() => (showServerEnvironment.value ? ['environment'] : [])),
advancedFiltersCollapsed,
dismissedPhotosensitivityFilterWarning,
displayMode: resultsDisplayMode,
@@ -610,6 +639,8 @@ const { isStuck: isInstallHeaderStuck } = useStickyObserver(
+
+
+
-
+
diff --git a/apps/frontend/src/pages/hosting/manage/[id]/play.vue b/apps/frontend/src/pages/hosting/manage/[id]/play.vue
new file mode 100644
index 00000000000..27d16f48d62
--- /dev/null
+++ b/apps/frontend/src/pages/hosting/manage/[id]/play.vue
@@ -0,0 +1,39 @@
+
+
+
+
+
diff --git a/apps/frontend/src/pages/share/[inviteId].vue b/apps/frontend/src/pages/share/[inviteId].vue
index 2aed9231856..3f925b84952 100644
--- a/apps/frontend/src/pages/share/[inviteId].vue
+++ b/apps/frontend/src/pages/share/[inviteId].vue
@@ -245,16 +245,11 @@ const hiddenUserCount = computed(() =>
onServerPrefetch(() => suspense())
-const inviter = computed(
- () =>
- invite.value?.managers.find((manager) => manager.type === 'user') ?? invite.value?.managers[0],
+const inviterName = computed(
+ () => invite.value?.inviter?.name ?? formatMessage(messages.unknownInviter),
)
-const inviterName = computed(() => inviter.value?.name ?? formatMessage(messages.unknownInviter))
-const inviterAvatar = computed(() => {
- if (!inviter.value) return null
- return inviter.value.type === 'user' ? inviter.value.avatar : inviter.value.icon
-})
-const moderationUserId = computed(() => (inviter.value?.type === 'user' ? inviter.value.id : null))
+const inviterAvatar = computed(() => invite.value?.inviter?.avatar ?? null)
+const moderationUserId = computed(() => invite.value?.inviter?.id ?? null)
const isStaff = computed(() => {
const role = auth.value.user?.role
return role === 'admin' || role === 'moderator'
diff --git a/apps/labrinth/Cargo.toml b/apps/labrinth/Cargo.toml
index 7169b8c6007..184e047e99e 100644
--- a/apps/labrinth/Cargo.toml
+++ b/apps/labrinth/Cargo.toml
@@ -95,7 +95,13 @@ regex = { workspace = true }
reqwest = { workspace = true, features = ["http2", "json", "multipart", "rustls"] }
rust_decimal = { workspace = true, features = ["serde-with-float", "serde-with-str"] }
rust_iso3166 = { workspace = true }
-rustls.workspace = true
+rustls = { workspace = true, features = [
+ "aws_lc_rs",
+ "logging",
+ "prefer-post-quantum",
+ "std",
+ "tls12",
+] }
rustrict = { workspace = true }
rusty-money = { workspace = true }
scalar_api_reference = { workspace = true, features = ["actix-web"] }
diff --git a/apps/labrinth/src/routes/v3/content/mod.rs b/apps/labrinth/src/routes/v3/content/mod.rs
index 4c9d61dcb53..0a5b8a02779 100644
--- a/apps/labrinth/src/routes/v3/content/mod.rs
+++ b/apps/labrinth/src/routes/v3/content/mod.rs
@@ -8,7 +8,7 @@ use crate::database::models::version_item::VersionQueryResult;
use crate::database::models::{DBProject, DBVersion};
use crate::database::{PgPool, ReadOnlyPgPool};
use crate::models::pats::Scopes;
-use crate::models::projects::{DependencyType, Version};
+use crate::models::projects::{DependencyType, Version, VersionType};
use crate::models::users::User;
use crate::queue::session::AuthQueue;
use crate::util::error::ApiContext as _;
@@ -26,7 +26,7 @@ use xredis::RedisPool;
const CONTENT_RESOLVE_CACHE_NAMESPACE: &str = "content_resolve:v4";
const CONTENT_RESOLVE_CACHE_HEAT_NAMESPACE: &str = "content_resolve_heat:v4";
-const CONTENT_RESOLVE_CACHE_SCHEMA_VERSION: &str = "v3";
+const CONTENT_RESOLVE_CACHE_SCHEMA_VERSION: &str = "v4";
const CONTENT_RESOLVE_CACHE_HEAT_WINDOW_SECONDS: i64 = 60 * 60 * 24;
pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
@@ -119,6 +119,7 @@ struct VersionState<'a> {
id: &'a str,
project_id: &'a str,
date_published: String,
+ version_type: modrinth_content_management::VersionType,
dependencies: Vec,
game_versions: Vec<&'a str>,
loaders: Vec<&'a str>,
@@ -539,6 +540,7 @@ fn hash_version(version: &modrinth_content_management::Version) -> String {
id: &version.id,
project_id: &version.project_id,
date_published: version.date_published.to_rfc3339(),
+ version_type: version.version_type,
dependencies,
game_versions,
loaders,
@@ -595,6 +597,7 @@ fn version_to_resolver(
id: version.id.to_string(),
project_id: version.project_id.to_string(),
date_published: version.date_published,
+ version_type: version_type_to_resolver(version.version_type),
dependencies: version
.dependencies
.into_iter()
@@ -612,6 +615,18 @@ fn version_to_resolver(
}
}
+fn version_type_to_resolver(
+ version_type: VersionType,
+) -> modrinth_content_management::VersionType {
+ match version_type {
+ VersionType::Release => {
+ modrinth_content_management::VersionType::Release
+ }
+ VersionType::Beta => modrinth_content_management::VersionType::Beta,
+ VersionType::Alpha => modrinth_content_management::VersionType::Alpha,
+ }
+}
+
fn dependency_type_to_resolver(
dependency_type: DependencyType,
) -> modrinth_content_management::DependencyType {
diff --git a/packages/api-client/src/core/abstract-websocket.ts b/packages/api-client/src/core/abstract-websocket.ts
index 784bf50a40c..61d4e326592 100644
--- a/packages/api-client/src/core/abstract-websocket.ts
+++ b/packages/api-client/src/core/abstract-websocket.ts
@@ -48,6 +48,8 @@ export abstract class AbstractWebSocketClient {
abstract disconnect(serverId: string): void
+ abstract closeSocket(serverId: string): void
+
abstract disconnectAll(): void
abstract send(serverId: string, message: Archon.Websocket.v0.WSOutgoingMessage): void
diff --git a/packages/api-client/src/modules/archon/content/v1.ts b/packages/api-client/src/modules/archon/content/v1.ts
index fa0c951d6f2..45907051167 100644
--- a/packages/api-client/src/modules/archon/content/v1.ts
+++ b/packages/api-client/src/modules/archon/content/v1.ts
@@ -6,6 +6,66 @@ export class ArchonContentV1Module extends AbstractModule {
return 'archon_content_v1'
}
+ public async share(
+ serverId: string,
+ worldId: string,
+ configPaths: string[] = [],
+ options?: { timeout?: number; restart?: boolean },
+ ): Promise {
+ return this.client.request(
+ `/servers/${encodeURIComponent(serverId)}/worlds/${encodeURIComponent(worldId)}/content/share`,
+ {
+ api: 'archon',
+ version: 1,
+ method: 'POST',
+ timeout: options?.timeout ?? 600_000,
+ retry: false,
+ body: { config_paths: configPaths, restart: options?.restart },
+ },
+ )
+ }
+
+ public async getShareDiff(
+ serverId: string,
+ worldId: string,
+ ): Promise {
+ return this.client.request(
+ `/servers/${encodeURIComponent(serverId)}/worlds/${encodeURIComponent(worldId)}/content/share/diff`,
+ {
+ api: 'archon',
+ version: 1,
+ method: 'GET',
+ },
+ )
+ }
+
+ /** GET /v1/:server_id/worlds/:world_id/content/share/files */
+ public async getShareableFiles(
+ serverId: string,
+ worldId: string,
+ ): Promise {
+ return this.client.request(
+ `/servers/${encodeURIComponent(serverId)}/worlds/${encodeURIComponent(worldId)}/content/share/files`,
+ {
+ api: 'archon',
+ version: 1,
+ method: 'GET',
+ },
+ )
+ }
+
+ public async unshare(serverId: string, worldId: string): Promise {
+ return this.client.request(
+ `/servers/${encodeURIComponent(serverId)}/worlds/${encodeURIComponent(worldId)}/content/share`,
+ {
+ api: 'archon',
+ version: 1,
+ method: 'DELETE',
+ retry: false,
+ },
+ )
+ }
+
/** GET /v1/:server_id/worlds/:world_id/addons */
public async getAddons(
serverId: string,
@@ -13,6 +73,7 @@ export class ArchonContentV1Module extends AbstractModule {
options?: {
from_modpack?: boolean
disabled?: boolean
+ needs_side_type_review?: boolean
addons?: boolean
updates?: boolean
},
@@ -21,6 +82,8 @@ export class ArchonContentV1Module extends AbstractModule {
if (options?.from_modpack !== undefined)
params.set('from_modpack', String(options.from_modpack))
if (options?.disabled !== undefined) params.set('disabled', String(options.disabled))
+ if (options?.needs_side_type_review !== undefined)
+ params.set('needs_side_type_review', String(options.needs_side_type_review))
if (options?.addons !== undefined) params.set('addons', String(options.addons))
if (options?.updates !== undefined) params.set('updates', String(options.updates))
const query = params.toString()
@@ -105,6 +168,78 @@ export class ArchonContentV1Module extends AbstractModule {
})
}
+ /** POST /v1/:server_id/worlds/:world_id/addons/set-enabled-server */
+ public async setAddonEnabledServer(
+ serverId: string,
+ worldId: string,
+ request: Archon.Content.v1.SetAddonEnabledRequest,
+ ): Promise {
+ await this.client.request(
+ `/servers/${serverId}/worlds/${worldId}/addons/set-enabled-server`,
+ {
+ api: 'archon',
+ version: 1,
+ method: 'POST',
+ body: request,
+ },
+ )
+ }
+
+ /** POST /v1/:server_id/worlds/:world_id/addons/set-enabled-player */
+ public async setAddonEnabledPlayer(
+ serverId: string,
+ worldId: string,
+ request: Archon.Content.v1.SetAddonEnabledRequest,
+ ): Promise {
+ await this.client.request(
+ `/servers/${serverId}/worlds/${worldId}/addons/set-enabled-player`,
+ {
+ api: 'archon',
+ version: 1,
+ method: 'POST',
+ body: request,
+ },
+ )
+ }
+
+ /** POST /v1/:server_id/worlds/:world_id/addons/set-locked-side-toggle */
+ public async setAddonSideToggleLocked(
+ serverId: string,
+ worldId: string,
+ request: Archon.Content.v1.SetAddonSideToggleLockedRequest,
+ ): Promise {
+ await this.client.request(
+ `/servers/${serverId}/worlds/${worldId}/addons/set-locked-side-toggle`,
+ {
+ api: 'archon',
+ version: 1,
+ method: 'POST',
+ body: request,
+ },
+ )
+ }
+
+ /**
+ * POST /v1/:server_id/worlds/:world_id/addons/complete-side-type-review
+ *
+ * Clears the side review flag of the listed addons, or of every addon when none are listed.
+ */
+ public async completeSideTypeReview(
+ serverId: string,
+ worldId: string,
+ request: Archon.Content.v1.CompleteSideTypeReviewRequest = {},
+ ): Promise {
+ await this.client.request(
+ `/servers/${serverId}/worlds/${worldId}/addons/complete-side-type-review`,
+ {
+ api: 'archon',
+ version: 1,
+ method: 'POST',
+ body: request,
+ },
+ )
+ }
+
/** POST /v1/:server_id/worlds/:world_id/addons/delete-many */
public async deleteAddons(
serverId: string,
@@ -170,6 +305,21 @@ export class ArchonContentV1Module extends AbstractModule {
})
}
+ /** POST /v1/:server_id/worlds/:world_id/content/restore-client-files */
+ public async restoreClientFiles(
+ serverId: string,
+ worldId: string,
+ ): Promise {
+ return this.client.request(
+ `/servers/${serverId}/worlds/${worldId}/content/restore-client-files`,
+ {
+ api: 'archon',
+ version: 1,
+ method: 'POST',
+ },
+ )
+ }
+
/** POST /v1/:server_id/worlds/:world_id/content/unlink-modpack */
public async unlinkModpack(serverId: string, worldId: string): Promise {
await this.client.request(
diff --git a/packages/api-client/src/modules/archon/icons/v1.ts b/packages/api-client/src/modules/archon/icons/v1.ts
new file mode 100644
index 00000000000..3808db70b70
--- /dev/null
+++ b/packages/api-client/src/modules/archon/icons/v1.ts
@@ -0,0 +1,41 @@
+import { AbstractModule } from '../../../core/abstract-module'
+
+export class ArchonIconsV1Module extends AbstractModule {
+ public getModuleID(): string {
+ return 'archon_icons_v1'
+ }
+
+ /**
+ * Get a server's custom icon.
+ * GET /v1/servers/:id/icon?original=true
+ *
+ * Returns the 64x64 game icon, or the up to 512x512 display icon when `original` is set.
+ */
+ public async get(serverId: string, original = false): Promise {
+ return this.client.request(`/servers/${encodeURIComponent(serverId)}/icon`, {
+ api: 'archon',
+ version: 1,
+ method: 'GET',
+ responseType: 'blob',
+ params: original ? { original: 'true' } : undefined,
+ })
+ }
+
+ public async set(serverId: string, image: Blob): Promise {
+ return this.client.request(`/servers/${encodeURIComponent(serverId)}/icon`, {
+ api: 'archon',
+ version: 1,
+ method: 'PUT',
+ headers: { 'Content-Type': 'application/octet-stream' },
+ body: image,
+ })
+ }
+
+ public async delete(serverId: string): Promise {
+ return this.client.request(`/servers/${encodeURIComponent(serverId)}/icon`, {
+ api: 'archon',
+ version: 1,
+ method: 'DELETE',
+ })
+ }
+}
diff --git a/packages/api-client/src/modules/archon/servers/internal.ts b/packages/api-client/src/modules/archon/servers/internal.ts
index 44911c265a4..bd26309c537 100644
--- a/packages/api-client/src/modules/archon/servers/internal.ts
+++ b/packages/api-client/src/modules/archon/servers/internal.ts
@@ -75,4 +75,23 @@ export class ArchonServersInternalModule extends AbstractModule {
method: 'DELETE',
})
}
+
+ /**
+ * Set whether a server drops client mods on modpack installations.
+ * PUT /_internal/content/servers/:server_id/drop-client-mods
+ */
+ public async setDropClientMods(
+ serverId: string,
+ request: Archon.Servers.Internal.DropClientMods,
+ ): Promise {
+ return this.client.request(
+ `/content/servers/${serverId}/drop-client-mods`,
+ {
+ api: 'archon',
+ version: 'internal',
+ method: 'PUT',
+ body: request,
+ },
+ )
+ }
}
diff --git a/packages/api-client/src/modules/archon/servers/v1.ts b/packages/api-client/src/modules/archon/servers/v1.ts
index 108470f5222..eba35b8b566 100644
--- a/packages/api-client/src/modules/archon/servers/v1.ts
+++ b/packages/api-client/src/modules/archon/servers/v1.ts
@@ -118,6 +118,23 @@ export class ArchonServersV1Module extends AbstractModule {
})
}
+ /**
+ * Modify a world
+ * PATCH /v1/servers/:server_id/worlds/:world_id
+ */
+ public async patchWorld(
+ serverId: string,
+ worldId: string,
+ body: Archon.Servers.v1.PatchWorld,
+ ): Promise {
+ await this.client.request(`/servers/${serverId}/worlds/${worldId}`, {
+ api: 'archon',
+ version: 1,
+ method: 'PATCH',
+ body,
+ })
+ }
+
/**
* Roll SFTP credentials for a server
* POST /v1/servers/:server_id/sftp/roll
diff --git a/packages/api-client/src/modules/archon/types.ts b/packages/api-client/src/modules/archon/types.ts
index 7492705f50a..a356ad501cf 100644
--- a/packages/api-client/src/modules/archon/types.ts
+++ b/packages/api-client/src/modules/archon/types.ts
@@ -121,10 +121,14 @@ export namespace Archon {
| 'addon_enabled'
| 'addon_deleted'
| 'addon_updated'
+ | 'addon_server_enabled'
+ | 'addon_player_enabled'
+ | 'addon_side_toggle_locked'
| 'modpack_changed'
| 'modpack_unlinked'
| 'server_repaired'
| 'server_reset'
+ | 'world_data_reset'
| 'server_started'
| 'server_stopped'
| 'server_restarted'
@@ -285,6 +289,62 @@ export namespace Archon {
export namespace Content {
export namespace v1 {
+ export type ShareWorldContentResponse = {
+ shared_instance_id: string
+ version: number | null
+ restarted: boolean
+ }
+
+ export type RestoreClientFilesResponse = {
+ /** The backup made before restoring, which reports the restoration's progress as its own. */
+ backup_id: string | null
+ }
+
+ export type SharedContentChange =
+ | { kind: 'added'; after: T }
+ | { kind: 'removed'; before: T }
+ | { kind: 'updated'; before: T; after: T }
+
+ export type SharedContentDiffEntry =
+ | { type: 'project'; project_id: string; change: SharedContentChange }
+ | {
+ type: 'external_file'
+ file_type: string
+ file_name: string
+ kind: 'added' | 'removed' | 'updated'
+ }
+ | { type: 'modpack' | 'game_version'; change: SharedContentChange }
+ | { type: 'loader'; change: SharedContentChange<{ name: string; version: string | null }> }
+
+ export type SharedInstancePublishDiff = {
+ shared_instance_id: string
+ latest_version: number
+ local_updated_at: string
+ has_changes: boolean
+ requires_restart: boolean
+ diffs: SharedContentDiffEntry[]
+ projects: Record
+ versions: Record<
+ string,
+ {
+ project_id: string
+ name: string
+ version_number: string | null
+ }
+ >
+ }
+
+ export type ShareableFile = {
+ path: string
+ size: number
+ blocked: boolean
+ }
+
+ export type ShareableFilesResponse = {
+ files: ShareableFile[]
+ truncated: boolean
+ }
+
export type AddonKind = 'mod' | 'plugin' | 'datapack' | 'shader' | 'resourcepack'
export type ContentOwnerType = 'user' | 'organization'
@@ -302,6 +362,25 @@ export namespace Archon {
environment?: Labrinth.Projects.v3.Environment | null
}
+ export type AddonManifestEnvironment =
+ | 'client_and_server'
+ | 'client_only'
+ | 'dedicated_server_only'
+
+ export type AddonManifestWarnings = {
+ multiple_mod_entries: number | null
+ malformed: boolean
+ }
+
+ export type AddonManifest = {
+ platform: Modloader
+ name: string | null
+ version: string | null
+ environment: AddonManifestEnvironment | null
+ icon_embedded: boolean
+ warnings: AddonManifestWarnings
+ }
+
export type AddonStatus =
| 'pending'
| 'installed'
@@ -317,11 +396,17 @@ export namespace Archon {
filesize: number
btime?: string
disabled: boolean
+ disabled_server: boolean
+ disabled_player: boolean
+ side_toggle_unlocked: boolean
+ manifest: AddonManifest | null
kind: AddonKind
from_modpack: boolean
status: AddonStatus
pack_client_retained: boolean
pack_client_depends: boolean
+ /** Whether the sides were guessed when installing its modpack, and should be reviewed. */
+ needs_side_type_review: boolean
has_update: string | null
name: string | null
project_id: string | null
@@ -334,14 +419,28 @@ export namespace Archon {
modloader: string | null
modloader_version: string | null
game_version: string | null
+ /** The least stable channel addon updates are offered from. */
+ update_channel: Archon.Servers.v1.ReleaseChannel
modpack: ModpackFields | null
installing?: 'loader' | 'modpack'
error?: {
message: string
}
+ /** The number of addons whose sides should be reviewed, regardless of the addon filters. */
+ files_need_side_type_review: number
addons: Addon[] | null
}
+ export type ReviewedAddon = {
+ kind: AddonKind
+ filename: string
+ }
+
+ export type CompleteSideTypeReviewRequest = {
+ /** The addons whose side review is completed, or every addon when absent. */
+ addons?: ReviewedAddon[] | null
+ }
+
export type AddAddonRequest = {
project_id: string
version_id?: string
@@ -355,6 +454,14 @@ export namespace Archon {
filename: string
}
+ export type SetAddonEnabledRequest = RemoveAddonRequest & {
+ enabled: boolean
+ }
+
+ export type SetAddonSideToggleLockedRequest = RemoveAddonRequest & {
+ locked: boolean
+ }
+
export type UpdateAddonRequest = {
filename: string
version_id?: string | null
@@ -382,7 +489,28 @@ export namespace Archon {
description: string | null
}
- export type ModpackSpec = ModpackSpecModrinth | ModpackSpecLocalFile
+ export type CurseForgeModpackLink = {
+ project_id: number
+ file_id: number
+ slug: string
+ name: string
+ /** The display name of the client pack file, usually including the modpack version. */
+ version_name: string
+ summary?: string
+ icon_url?: string
+ author?: string
+ server_pack_file_id?: number
+ }
+
+ export type ModpackSpecCurseForge = {
+ platform: 'curseforge'
+ /** The client pack's filename. */
+ filename: string
+ /** Present when installed from a link rather than uploaded packs. */
+ link?: CurseForgeModpackLink
+ }
+
+ export type ModpackSpec = ModpackSpecModrinth | ModpackSpecLocalFile | ModpackSpecCurseForge
export type ModpackOwner = {
id: string
@@ -589,6 +717,10 @@ export namespace Archon {
export type LockServerRequest = {
reason: string
}
+
+ export type DropClientMods = {
+ drop_client_mods: boolean
+ }
}
export namespace v0 {
@@ -756,6 +888,11 @@ export namespace Archon {
sftp_username: string
sftp_password: string
tags: string[]
+ /**
+ * Whether the server uses the legacy content behavior: its modpack installations remove
+ * server-incompatible files, and its content is never disabled on the server.
+ */
+ drop_client_mods: boolean
location: ServerLocation
worlds: WorldFull[]
/** IDs of the server's backup repositories. Only returned to support agents. */
@@ -789,9 +926,19 @@ export namespace Archon {
status: 'unassigned'
}
+ export type ReleaseChannel = 'release' | 'beta' | 'alpha'
+
+ export type PatchWorld = {
+ name?: string
+ icon_data?: string
+ update_channel?: ReleaseChannel
+ }
+
export type WorldFull = {
id: string
name: string
+ /** The least stable channel addon updates and dependencies are selected from. */
+ update_channel: ReleaseChannel
created_at: string
is_active: boolean
download_method: WorldDownloadMethod
@@ -808,6 +955,9 @@ export namespace Archon {
}
export type WorldContentInfo = {
+ shared_instance_id: string | null
+ shared_instance_needs_update: boolean
+ requires_restart: boolean
modloader: string
modloader_version: string
game_version: string
@@ -1173,6 +1323,10 @@ export namespace Archon {
type: 'server.transfer.start' | 'server.transfer.done'
target_node: string
}
+ export type ServerIconPatchEvent = {
+ type: 'server.icon.patch'
+ server_icon_hash: string | null
+ }
export type UsersPatchEvent = { type: 'users.patch' }
@@ -1211,8 +1365,24 @@ export namespace Archon {
game_version: string
platform_version: string | null
}
+ export type WorldContentCurseForgeModpackLink = {
+ project_id: number
+ file_id: number
+ slug: string
+ name: string
+ version_name: string
+ summary: string | null
+ icon_url: string | null
+ author: string | null
+ server_pack_file_id: number | null
+ }
export type WorldContentModpackSource =
- | 'CurseForge'
+ | {
+ CurseForge: {
+ filename: string
+ link: WorldContentCurseForgeModpackLink | null
+ }
+ }
| {
Modrinth: {
version_id: string
@@ -1242,6 +1412,10 @@ export namespace Archon {
has_update: string | null
}
export type WorldContentItem = {
+ disabled_server?: boolean
+ disabled_player?: boolean
+ side_toggle_unlocked?: boolean
+ needs_side_type_review?: boolean
parent_directory: string
file_sha1: string | null
filename: string
@@ -1251,6 +1425,7 @@ export namespace Archon {
project_id: string | null
pack_client_retained: boolean
pack_client_depends: boolean
+ manifest?: Archon.Content.v1.AddonManifest | null
status: Archon.Content.v1.AddonStatus
filesize: number | null
name: string | null
@@ -1270,6 +1445,34 @@ export namespace Archon {
}
content: WorldContentItem[]
}
+ export type WorldContentFileSideEvent = {
+ type: 'world.content.file.side.server.updated' | 'world.content.file.side.client.updated'
+ world_id: string
+ parent_directory: 'mods' | 'plugins' | 'datapacks' | 'resourcepacks' | 'shaderpacks'
+ filename: string
+ enabled: boolean
+ }
+ export type WorldContentFileSideLockEvent = {
+ type: 'world.content.file.side.lock.updated'
+ world_id: string
+ parent_directory: 'mods' | 'plugins' | 'datapacks' | 'resourcepacks' | 'shaderpacks'
+ filename: string
+ locked: boolean
+ }
+
+ export type WorldSharedInstanceUpdateEvent = {
+ type: 'world.shared_instance.update'
+ world_id: string
+ shared_instance_id: string
+ needs_update: boolean
+ requires_restart: boolean
+ }
+
+ export type WorldSharedInstanceDeleteEvent = {
+ type: 'world.shared_instance.delete'
+ world_id: string
+ shared_instance_id: string
+ }
export type SyncEvent =
| ProtocolResetEvent
@@ -1284,12 +1487,17 @@ export namespace Archon {
| ServerNetworkPatchEvent
| ServerSftpPatchEvent
| ServerTransferEvent
+ | ServerIconPatchEvent
| UsersPatchEvent
| WorldPatchEvent
| WorldStartupPatchEvent
| WorldContentAddonPatchEvent
| WorldContentBaseUpdateEvent
| WorldContentUpdateEvent
+ | WorldContentFileSideEvent
+ | WorldContentFileSideLockEvent
+ | WorldSharedInstanceUpdateEvent
+ | WorldSharedInstanceDeleteEvent
}
}
@@ -1308,7 +1516,8 @@ export namespace Archon {
| 'cancelled'
| 'unchanged'
| 'damaged'
- export type BackupTask = 'file' | 'create' | 'restore'
+ /** `create-with-restore-files` is a backup followed by the client files restoration it triggers, each making up half of the progress. */
+ export type BackupTask = 'file' | 'create' | 'restore' | 'create-with-restore-files'
export type WSBackupProgressEvent = {
event: 'backup-progress'
@@ -1415,6 +1624,12 @@ export namespace Archon {
filename: string
}
+ export type InstallProgressCurseForgeModpackKey = {
+ type: 'curse_forge_modpack'
+ /** The client pack's filename. */
+ filename: string
+ }
+
export type InstallProgressPlatformKey = {
type: 'platform'
platform: 'forge' | 'neoforge' | 'fabric' | 'quilt' | 'paper' | 'purpur' | 'vanilla'
@@ -1426,6 +1641,7 @@ export namespace Archon {
| InstallProgressFileKey
| InstallProgressModrinthModpackKey
| InstallProgressLocalModpackKey
+ | InstallProgressCurseForgeModpackKey
| InstallProgressPlatformKey
export type InstallProgressItem = {
diff --git a/packages/api-client/src/modules/index.ts b/packages/api-client/src/modules/index.ts
index b0699c3280f..6c977760ec1 100644
--- a/packages/api-client/src/modules/index.ts
+++ b/packages/api-client/src/modules/index.ts
@@ -5,6 +5,7 @@ import { ArchonBackupRepositoriesInternalModule } from './archon/backup-reposito
import { ArchonBackupsV1Module } from './archon/backups/v1'
import { ArchonBackupsQueueV1Module } from './archon/backups-queue/v1'
import { ArchonContentV1Module } from './archon/content/v1'
+import { ArchonIconsV1Module } from './archon/icons/v1'
import { ArchonNodesInternalModule } from './archon/nodes/internal'
import { ArchonNoticesV0Module } from './archon/notices/v0'
import { ArchonOptionsV1Module } from './archon/options/v1'
@@ -19,6 +20,7 @@ import { KyrosBackupsV1Module } from './kyros/backups/v1'
import { KyrosContentV1Module } from './kyros/content/v1'
import { KyrosFilesV0Module } from './kyros/files/v0'
import { KyrosFilesV1Module } from './kyros/files/v1'
+import { KyrosFlameAnvilV1Module } from './kyros/flameanvil/v1'
import { KyrosLogsV1Module } from './kyros/logs/v1'
import { KyrosUploadSessionsV1Module } from './kyros/upload-sessions/v1'
import { LabrinthVersionsV2Module, LabrinthVersionsV3Module } from './labrinth'
@@ -86,6 +88,7 @@ export const MODULE_REGISTRY = {
archon_backups_queue_v1: ArchonBackupsQueueV1Module,
archon_backups_v1: ArchonBackupsV1Module,
archon_content_v1: ArchonContentV1Module,
+ archon_icons_v1: ArchonIconsV1Module,
archon_nodes_internal: ArchonNodesInternalModule,
archon_notices_v0: ArchonNoticesV0Module,
archon_options_v1: ArchonOptionsV1Module,
@@ -103,6 +106,7 @@ export const MODULE_REGISTRY = {
kyros_content_v1: KyrosContentV1Module,
kyros_files_v0: KyrosFilesV0Module,
kyros_files_v1: KyrosFilesV1Module,
+ kyros_flameanvil_v1: KyrosFlameAnvilV1Module,
kyros_logs_v1: KyrosLogsV1Module,
kyros_upload_sessions_v1: KyrosUploadSessionsV1Module,
labrinth_analytics_internal: LabrinthAnalyticsInternalModule,
diff --git a/packages/api-client/src/modules/kyros/content/v1.ts b/packages/api-client/src/modules/kyros/content/v1.ts
index 9f5f4f8b160..e32c83098d7 100644
--- a/packages/api-client/src/modules/kyros/content/v1.ts
+++ b/packages/api-client/src/modules/kyros/content/v1.ts
@@ -1,12 +1,33 @@
import { AbstractModule } from '../../../core/abstract-module'
import type { UploadHandle, UploadProgress } from '../../../types/upload'
+import { getNodeBaseUrl } from '../../../utils/node-url'
import type { Archon } from '../../archon/types'
+import type { Kyros } from '../types'
export class KyrosContentV1Module extends AbstractModule {
public getModuleID(): string {
return 'kyros_content_v1'
}
+ /** GET /v1/worlds/:world_id/content/embedded-icon */
+ public async getEmbeddedAddonIcon(
+ worldId: string,
+ parentDirectory: 'mods' | 'plugins',
+ filename: string,
+ ): Promise {
+ return this.client.request(`/worlds/${worldId}/content/embedded-icon`, {
+ api: '',
+ version: 'v1',
+ method: 'GET',
+ responseType: 'blob',
+ params: {
+ parent_directory: parentDirectory,
+ filename,
+ },
+ useNodeAuth: true,
+ })
+ }
+
/**
* Upload addon files to a world via multipart form data
*
@@ -37,30 +58,47 @@ export class KyrosContentV1Module extends AbstractModule {
})
}
- /** POST /v1/worlds/:world_id/content/upload-modpack-file */
+ /**
+ * POST /v1/worlds/:world_id/content/upload-modpack-file
+ *
+ * With `useExistingMrpack`, `file` must be `null`, and the mrpack left in the world by an
+ * earlier upload is installed instead.
+ */
public uploadModpackFile(
worldId: string,
- file: File | Blob,
+ file: File | Blob | null,
properties: Archon.Content.v1.PropertiesFields,
options?: {
softOverride?: boolean
+ restoreClientFiles?: boolean
+ noBackup?: boolean
+ useExistingMrpack?: boolean
onProgress?: (progress: UploadProgress) => void
+ auth?: Archon.Servers.v0.JWTAuth
},
- ): UploadHandle {
+ ): UploadHandle {
const formData = new FormData()
- formData.append('file', file, file instanceof File ? file.name : 'file')
+ if (file) formData.append('file', file, file instanceof File ? file.name : 'file')
formData.append('properties', JSON.stringify(properties))
- return this.client.upload(`/worlds/${worldId}/content/upload-modpack-file`, {
- api: '',
- version: 'v1',
- formData,
- params:
- options?.softOverride !== undefined
- ? { soft_override: String(options.softOverride) }
- : undefined,
- onProgress: options?.onProgress,
- useNodeAuth: true,
- })
+ const params: Record = {}
+ if (options?.softOverride !== undefined) params.soft_override = String(options.softOverride)
+ if (options?.restoreClientFiles) params.restore_client_files = 'true'
+ if (options?.noBackup) params.no_backup = 'true'
+ if (options?.useExistingMrpack) params.use_existing_mrpack = 'true'
+
+ return this.client.upload(
+ `/worlds/${worldId}/content/upload-modpack-file`,
+ {
+ api: options?.auth ? getNodeBaseUrl(options.auth.url) : '',
+ version: 'v1',
+ formData,
+ params: Object.keys(params).length ? params : undefined,
+ onProgress: options?.onProgress,
+ ...(options?.auth
+ ? { headers: { Authorization: `Bearer ${options.auth.token}` }, skipAuth: true }
+ : { useNodeAuth: true }),
+ },
+ )
}
}
diff --git a/packages/api-client/src/modules/kyros/files/v0.ts b/packages/api-client/src/modules/kyros/files/v0.ts
index f31ff5ec000..5866f4c92f7 100644
--- a/packages/api-client/src/modules/kyros/files/v0.ts
+++ b/packages/api-client/src/modules/kyros/files/v0.ts
@@ -1,4 +1,5 @@
import { AbstractModule } from '../../../core/abstract-module'
+import type { DownloadSink } from '../../../types/download'
import type { UploadHandle, UploadProgress } from '../../../types/upload'
import { getNodeBaseUrl } from '../../../utils/node-url'
import type { Archon } from '../../archon/types'
@@ -88,6 +89,21 @@ export class KyrosFilesV0Module extends AbstractModule {
})
}
+ public async downloadFileTo(auth: NodeFsAuth, path: string, sink: DownloadSink): Promise {
+ return this.client.download(
+ '/fs/download',
+ {
+ api: this.getNodeBaseUrl(auth),
+ version: 'modrinth/v0',
+ method: 'GET',
+ params: { path },
+ headers: { Authorization: `Bearer ${auth.token}` },
+ skipAuth: true,
+ },
+ sink,
+ )
+ }
+
/**
* Upload a file to a server's filesystem with progress tracking
*
diff --git a/packages/api-client/src/modules/kyros/flameanvil/v1.ts b/packages/api-client/src/modules/kyros/flameanvil/v1.ts
new file mode 100644
index 00000000000..74c4e733efb
--- /dev/null
+++ b/packages/api-client/src/modules/kyros/flameanvil/v1.ts
@@ -0,0 +1,195 @@
+import { AbstractModule } from '../../../core/abstract-module'
+import type { UploadFile, UploadHandle, UploadProgress } from '../../../types/upload'
+import { getNodeBaseUrl } from '../../../utils/node-url'
+import type { Archon } from '../../archon/types'
+import type { Kyros } from '../types'
+
+export type FlameAnvilAuthOptions = {
+ auth?: Archon.Servers.v0.JWTAuth
+}
+
+export type FlameAnvilUploadOptions = FlameAnvilAuthOptions & {
+ onProgress?: (progress: UploadProgress) => void
+}
+
+function getSessionPath(worldId: string) {
+ return `/worlds/${worldId}/content/flameanvil/session`
+}
+
+function nodeRequestOptions(auth?: Archon.Servers.v0.JWTAuth) {
+ return {
+ api: auth ? getNodeBaseUrl(auth.url) : '',
+ version: 'v1' as const,
+ ...(auth
+ ? { headers: { Authorization: `Bearer ${auth.token}` }, skipAuth: true }
+ : { useNodeAuth: true }),
+ }
+}
+
+/**
+ * Installs CurseForge modpacks, either from a CurseForge link or from uploaded client and server packs.
+ */
+export class KyrosFlameAnvilV1Module extends AbstractModule {
+ public getModuleID(): string {
+ return 'kyros_flameanvil_v1'
+ }
+
+ /**
+ * GET /v1/worlds/:world_id/content/flameanvil/detection
+ *
+ * Guesses whether the world's content came from a CurseForge modpack or an uploaded mrpack.
+ */
+ public async detect(
+ worldId: string,
+ options?: FlameAnvilAuthOptions,
+ ): Promise {
+ return this.client.request(
+ `/worlds/${worldId}/content/flameanvil/detection`,
+ {
+ ...nodeRequestOptions(options?.auth),
+ method: 'GET',
+ },
+ )
+ }
+
+ /** POST /v1/worlds/:world_id/content/flameanvil/link/query */
+ public async queryLink(
+ worldId: string,
+ data: Kyros.FlameAnvil.v1.LinkQueryRequest,
+ options?: FlameAnvilAuthOptions,
+ ): Promise {
+ return this.client.request(
+ `/worlds/${worldId}/content/flameanvil/link/query`,
+ {
+ ...nodeRequestOptions(options?.auth),
+ method: 'POST',
+ body: data,
+ },
+ )
+ }
+
+ /**
+ * GET /v1/worlds/:world_id/content/flameanvil/projects/:project_id/files
+ *
+ * Lists a page of the modpack's client pack files, most recent first.
+ */
+ public async listProjectFiles(
+ worldId: string,
+ projectId: number,
+ params?: Kyros.FlameAnvil.v1.ProjectFilesRequest,
+ options?: FlameAnvilAuthOptions,
+ ): Promise {
+ return this.client.request(
+ `/worlds/${worldId}/content/flameanvil/projects/${projectId}/files`,
+ {
+ ...nodeRequestOptions(options?.auth),
+ method: 'GET',
+ params,
+ },
+ )
+ }
+
+ /** GET /v1/worlds/:world_id/content/flameanvil/session */
+ public async getSession(
+ worldId: string,
+ options?: FlameAnvilAuthOptions,
+ ): Promise {
+ return this.client.request(getSessionPath(worldId), {
+ ...nodeRequestOptions(options?.auth),
+ method: 'GET',
+ })
+ }
+
+ /** POST /v1/worlds/:world_id/content/flameanvil/session */
+ public async createSession(
+ worldId: string,
+ options?: FlameAnvilAuthOptions,
+ ): Promise {
+ return this.client.request(getSessionPath(worldId), {
+ ...nodeRequestOptions(options?.auth),
+ method: 'POST',
+ })
+ }
+
+ /** DELETE /v1/worlds/:world_id/content/flameanvil/session/:upload_id */
+ public async cancelSession(
+ worldId: string,
+ uploadId: string,
+ options?: FlameAnvilAuthOptions,
+ ): Promise {
+ return this.client.request(
+ `${getSessionPath(worldId)}/${uploadId}`,
+ {
+ ...nodeRequestOptions(options?.auth),
+ method: 'DELETE',
+ },
+ )
+ }
+
+ /**
+ * POST /v1/worlds/:world_id/content/flameanvil/session/:upload_id/upload/player
+ *
+ * Uploads the client modpack. Uploading again replaces it.
+ */
+ public uploadPlayerPack(
+ worldId: string,
+ uploadId: string,
+ file: UploadFile,
+ options?: FlameAnvilUploadOptions,
+ ): UploadHandle {
+ return this.uploadPack(worldId, uploadId, 'player', file, options)
+ }
+
+ /**
+ * POST /v1/worlds/:world_id/content/flameanvil/session/:upload_id/upload/server
+ *
+ * Uploads the server pack. Uploading again replaces it.
+ */
+ public uploadServerPack(
+ worldId: string,
+ uploadId: string,
+ file: UploadFile,
+ options?: FlameAnvilUploadOptions,
+ ): UploadHandle {
+ return this.uploadPack(worldId, uploadId, 'server', file, options)
+ }
+
+ /**
+ * POST /v1/worlds/:world_id/content/flameanvil/session/:upload_id/execute
+ *
+ * Queues the installation, either from `data.link` or from the uploaded packs.
+ */
+ public async executeSession(
+ worldId: string,
+ uploadId: string,
+ data: Kyros.FlameAnvil.v1.ExecuteSessionRequest,
+ options?: FlameAnvilAuthOptions,
+ ): Promise {
+ return this.client.request(
+ `${getSessionPath(worldId)}/${uploadId}/execute`,
+ {
+ ...nodeRequestOptions(options?.auth),
+ method: 'POST',
+ body: data,
+ },
+ )
+ }
+
+ private uploadPack(
+ worldId: string,
+ uploadId: string,
+ side: 'player' | 'server',
+ file: UploadFile,
+ options?: FlameAnvilUploadOptions,
+ ): UploadHandle {
+ return this.client.upload(
+ `${getSessionPath(worldId)}/${uploadId}/upload/${side}`,
+ {
+ ...nodeRequestOptions(options?.auth),
+ file,
+ multipartField: 'file',
+ onProgress: options?.onProgress,
+ },
+ )
+ }
+}
diff --git a/packages/api-client/src/modules/kyros/types.ts b/packages/api-client/src/modules/kyros/types.ts
index 5cce0079906..ade851c6212 100644
--- a/packages/api-client/src/modules/kyros/types.ts
+++ b/packages/api-client/src/modules/kyros/types.ts
@@ -1,4 +1,140 @@
+import type { Archon } from '../archon/types'
+
export namespace Kyros {
+ export namespace FlameAnvil {
+ export namespace v1 {
+ export type SessionStatus = Kyros.UploadSessions.v1.UploadSessionStatus
+
+ export interface UploadedPack {
+ filename: string
+ size: number
+ }
+
+ export interface SessionResponse {
+ upload_id: string
+ status: SessionStatus
+ created_at: number
+ updated_at: number
+ expires_at: number
+ client_pack?: UploadedPack | null
+ server_pack?: UploadedPack | null
+ }
+
+ export interface GetSessionResponse {
+ session: SessionResponse | null
+ }
+
+ export interface LinkQueryRequest {
+ link: string
+ /** A file of the modpack to select instead of the file selected by the link. */
+ file_id?: number | null
+ }
+
+ export type Loader = 'forge' | 'neoforge' | 'fabric' | 'quilt'
+
+ export type ReleaseChannel = 'release' | 'beta' | 'alpha'
+
+ export interface LinkQueryFile {
+ id: number
+ display_name: string
+ file_name: string
+ file_date: string
+ file_length: number
+ /** Mixes Minecraft versions, loader names and other tags. */
+ game_versions: string[]
+ minecraft_versions: string[]
+ loaders: Loader[]
+ }
+
+ export interface ProjectFile extends LinkQueryFile {
+ /** `null` for a channel unknown to Kyros. */
+ release_channel: ReleaseChannel | null
+ /** Whether the file can be downloaded from CurseForge, and so installed from its link. */
+ available: boolean
+ /** Whether CurseForge lists a server pack for the file, its availability is unchecked. */
+ has_server_pack: boolean
+ ftb_installer_hint: boolean
+ }
+
+ export interface LinkQueryResponse {
+ project_id: number
+ slug: string
+ name: string
+ summary?: string | null
+ icon_url?: string | null
+ authors: string[]
+ file: LinkQueryFile
+ server_pack?: LinkQueryFile | null
+ server_pack_missing: boolean
+ /** Whether the file may be installed with FTB's server installer instead of a server pack. */
+ ftb_installer_hint: boolean
+ /**
+ * When the file has no server pack, the nearest file for the same Minecraft version and
+ * loader with an available server pack.
+ */
+ closest_server_pack_file?: ProjectFile | null
+ }
+
+ export type ProjectFilesRequest = {
+ game_version?: string
+ index?: number
+ /** Between 1 and 50, 50 by default. */
+ page_size?: number
+ }
+
+ export interface ProjectFilesResponse {
+ files: ProjectFile[]
+ index: number
+ page_size: number
+ total_count: number
+ }
+
+ export interface ExecuteSessionRequest {
+ /**
+ * Mutually exclusive with an uploaded client pack. An uploaded server pack replaces the
+ * linked file's server pack.
+ */
+ link?: string | null
+ /** A file of the linked modpack to install instead of the file selected by the link. */
+ file_id?: number | null
+ soft_override?: boolean
+ /**
+ * Restores the client files of a world installed from a CurseForge modpack, by updating
+ * it to the modpack after backing it up. Implies `soft_override`.
+ */
+ restore_client_files?: boolean
+ /** With `restore_client_files`, installs right away without backing up the world first. */
+ no_backup?: boolean
+ properties: Archon.Content.v1.PropertiesFields
+ }
+
+ export interface ExecuteSessionResponse {
+ /** The backup made before restoring client files, which reports the restoration's progress. */
+ backup_id: string | null
+ }
+
+ export interface DetectionResponse {
+ likely_curseforge: boolean
+ non_modrinth_mods: number
+ server_pack_creator_variables: boolean
+ /**
+ * Whether the world was installed from an uploaded mrpack that is still in its root folder,
+ * so its client files can be restored with `use_existing_mrpack`.
+ */
+ has_manually_uploaded_mrpack: boolean
+ }
+ }
+ }
+
+ export namespace Content {
+ export namespace v1 {
+ export interface UploadModpackFileResponse {
+ /** The backup made before restoring client files, which reports the restoration's progress. */
+ backup_id: string | null
+ }
+ }
+ }
+
export namespace UploadSessions {
export namespace v1 {
export type Scope = 'content' | 'files'
diff --git a/packages/api-client/src/modules/labrinth/types.ts b/packages/api-client/src/modules/labrinth/types.ts
index 90800c7448f..8b198fef77f 100644
--- a/packages/api-client/src/modules/labrinth/types.ts
+++ b/packages/api-client/src/modules/labrinth/types.ts
@@ -17,6 +17,8 @@ export namespace Labrinth {
loaders?: string[]
}
+ export type VersionType = 'release' | 'beta' | 'alpha'
+
export type ResolveContentRequest = {
project_id: string
version_id?: string | null
@@ -24,6 +26,8 @@ export namespace Labrinth {
selected?: ResolutionPreferences
target?: ResolutionPreferences
existing_project_ids?: string[]
+ /** Least stable version type to prefer. Omitted allows every version type. */
+ update_channel?: VersionType | null
}
export type ResolveContentPlan = {
diff --git a/packages/api-client/src/modules/shared-instances/instances/v1.ts b/packages/api-client/src/modules/shared-instances/instances/v1.ts
index 7b958104639..007aa4d1c5a 100644
--- a/packages/api-client/src/modules/shared-instances/instances/v1.ts
+++ b/packages/api-client/src/modules/shared-instances/instances/v1.ts
@@ -1,4 +1,5 @@
import { AbstractModule } from '../../../core/abstract-module'
+import type { DownloadSink } from '../../../types/download'
import type { SharedInstances } from '../types'
export class SharedInstancesInstancesV1Module extends AbstractModule {
@@ -6,13 +7,17 @@ export class SharedInstancesInstancesV1Module extends AbstractModule {
return 'sharedinstances_instances_v1'
}
- public async get(instanceId: string): Promise {
+ public async get(
+ instanceId: string,
+ params?: { query_linked_server?: boolean },
+ ): Promise {
return this.client.request(
`/instances/${encodeURIComponent(instanceId)}`,
{
api: 'sharedinstances',
version: 1,
method: 'GET',
+ params,
},
)
}
@@ -63,4 +68,48 @@ export class SharedInstancesInstancesV1Module extends AbstractModule {
},
)
}
+
+ public async inviteUsers(instanceId: string, userIds: string[]): Promise<{ failed: string[] }> {
+ return this.client.request(`/instances/${encodeURIComponent(instanceId)}/users`, {
+ api: 'sharedinstances',
+ version: 1,
+ method: 'POST',
+ body: { user_ids: userIds },
+ retry: false,
+ })
+ }
+
+ public async removeUsers(instanceId: string, userIds: string[]): Promise {
+ return this.client.request(`/instances/${encodeURIComponent(instanceId)}/users`, {
+ api: 'sharedinstances',
+ version: 1,
+ method: 'DELETE',
+ body: { user_ids: userIds },
+ })
+ }
+
+ public async downloadMrpack(instanceId: string, version: number): Promise {
+ return this.client.request(
+ `/instances/${encodeURIComponent(instanceId)}/versions/${version}/mrpack`,
+ {
+ api: 'sharedinstances',
+ version: 1,
+ method: 'GET',
+ responseType: 'blob',
+ timeout: 600_000,
+ },
+ )
+ }
+
+ public async downloadMrpackTo(
+ instanceId: string,
+ version: number,
+ sink: DownloadSink,
+ ): Promise {
+ return this.client.download(
+ `/instances/${encodeURIComponent(instanceId)}/versions/${version}/mrpack`,
+ { api: 'sharedinstances', version: 1, method: 'GET' },
+ sink,
+ )
+ }
}
diff --git a/packages/api-client/src/modules/shared-instances/invites/v1.ts b/packages/api-client/src/modules/shared-instances/invites/v1.ts
index 72536cd0a0e..93ce3c862a2 100644
--- a/packages/api-client/src/modules/shared-instances/invites/v1.ts
+++ b/packages/api-client/src/modules/shared-instances/invites/v1.ts
@@ -6,16 +6,52 @@ export class SharedInstancesInvitesV1Module extends AbstractModule {
return 'sharedinstances_invites_v1'
}
- public async get(inviteId: string): Promise {
+ public async get(
+ inviteId: string,
+ options?: { version?: boolean },
+ ): Promise {
return this.client.request(
`/invites/${encodeURIComponent(inviteId)}`,
{
api: 'sharedinstances',
version: 1,
method: 'GET',
+ params: options,
skipAuth: true,
retry: false,
},
)
}
+
+ public async list(instanceId: string): Promise {
+ return this.client.request(`/instances/${encodeURIComponent(instanceId)}/invites`, {
+ api: 'sharedinstances',
+ version: 1,
+ method: 'GET',
+ })
+ }
+
+ public async create(
+ instanceId: string,
+ options: { max_age?: number; max_uses: number },
+ ): Promise<{ id: string }> {
+ return this.client.request(`/instances/${encodeURIComponent(instanceId)}/invites`, {
+ api: 'sharedinstances',
+ version: 1,
+ method: 'POST',
+ body: options,
+ retry: false,
+ })
+ }
+
+ public async delete(instanceId: string, inviteId: string): Promise {
+ return this.client.request(
+ `/instances/${encodeURIComponent(instanceId)}/invites/${encodeURIComponent(inviteId)}`,
+ {
+ api: 'sharedinstances',
+ version: 1,
+ method: 'DELETE',
+ },
+ )
+ }
}
diff --git a/packages/api-client/src/modules/shared-instances/types.ts b/packages/api-client/src/modules/shared-instances/types.ts
index 4ad1e3afbf7..92fe89ff061 100644
--- a/packages/api-client/src/modules/shared-instances/types.ts
+++ b/packages/api-client/src/modules/shared-instances/types.ts
@@ -1,6 +1,12 @@
export namespace SharedInstances {
export namespace Invites {
export namespace v1 {
+ export type Inviter = {
+ id: string
+ name: string
+ avatar: string | null
+ }
+
export type UserManager = {
id: string
name: string
@@ -23,24 +29,37 @@ export namespace SharedInstances {
joined_at: string | null
}
+ export type InviteLink = {
+ id: string
+ expiration: string
+ max_uses: number
+ uses: number
+ }
+
export type Invite = {
instance_id: string
instance_name: string
instance_icon?: string | null
game_version: string
loader_version: string
+ inviter: Inviter | null
managers: Manager[]
instance_users?: InviteUser[]
+ version?: Instances.v1.InstanceVersion
}
}
}
export namespace Instances {
export namespace v1 {
+ export type OnlineStatus = 'unknown' | 'running' | 'stopped' | null
+
export type Instance = {
name: string
icon: string | null
quarantine: boolean
+ installed_once: boolean
+ linked_server: { domain: string; region: string; online_status: OnlineStatus } | null
}
export type JoinType = 'owner' | 'invite' | 'link'
@@ -54,7 +73,6 @@ export namespace SharedInstances {
export type InstanceUsers = {
users: InstanceUser[]
- tokens: number
}
export type FileMetadata = {
@@ -65,7 +83,7 @@ export namespace SharedInstances {
export type ExternalFile = {
file_name: string
file_type: string
- url: string
+ url: string | null
file_size?: number
metadata?: FileMetadata[]
}
@@ -76,6 +94,10 @@ export namespace SharedInstances {
ready: boolean
external_files: ExternalFile[]
modpack_id: string | null
+ removed_files: (
+ | { type: 'version'; version_id: string }
+ | { type: 'path'; parent: string; filename: string }
+ )[]
game_version: string
loader: string
loader_version: string
diff --git a/packages/api-client/src/platform/websocket-generic.ts b/packages/api-client/src/platform/websocket-generic.ts
index 16c7f4ef4af..2b3304b7b49 100644
--- a/packages/api-client/src/platform/websocket-generic.ts
+++ b/packages/api-client/src/platform/websocket-generic.ts
@@ -12,8 +12,17 @@ const NORMAL_CLOSURE = 1000
export class GenericWebSocketClient extends AbstractWebSocketClient {
protected emitter = mitt()
+ private authRefreshes = new Set()
- async connect(serverId: string, auth: Archon.Websocket.v0.WSAuth): Promise {
+ connect(serverId: string, auth: Archon.Websocket.v0.WSAuth): Promise {
+ return this.openConnection(serverId, auth, 0)
+ }
+
+ private openConnection(
+ serverId: string,
+ auth: Archon.Websocket.v0.WSAuth,
+ reconnectAttempts: number,
+ ): Promise {
if (this.connections.has(serverId)) {
this.closeConnection(serverId)
}
@@ -40,9 +49,9 @@ export class GenericWebSocketClient extends AbstractWebSocketClient {
serverId,
socket: ws,
authenticated: false,
- reconnectAttempts: 0,
+ reconnectAttempts,
reconnectTimer: undefined,
- isReconnecting: false,
+ isReconnecting: reconnectAttempts > 0,
}
this.connections.set(serverId, connection)
@@ -53,16 +62,17 @@ export class GenericWebSocketClient extends AbstractWebSocketClient {
ws.onopen = () => {
ws.send(JSON.stringify({ event: 'auth', jwt: auth.token }))
-
- connection.reconnectAttempts = 0
- connection.isReconnecting = false
}
ws.onmessage = (messageEvent) => {
+ if (this.connections.get(serverId) !== connection) return
try {
const data = JSON.parse(messageEvent.data) as Archon.Websocket.v0.WSEvent
if (data.event === 'auth-ok') {
+ if (connection.authenticated) return
connection.authenticated = true
+ connection.reconnectAttempts = 0
+ connection.isReconnecting = false
} else if (data.event === 'auth-incorrect') {
connection.authenticated = false
}
@@ -93,8 +103,8 @@ export class GenericWebSocketClient extends AbstractWebSocketClient {
`WebSocket closed before authentication for server ${serverId} (code: ${event.code})`,
),
)
- if (event.code !== NORMAL_CLOSURE) {
- this.scheduleReconnect(serverId, auth)
+ if (event.code !== NORMAL_CLOSURE && this.connections.get(serverId) === connection) {
+ this.scheduleReconnect(connection)
}
}
@@ -148,6 +158,10 @@ export class GenericWebSocketClient extends AbstractWebSocketClient {
this.connections.delete(serverId)
}
+ closeSocket(serverId: string): void {
+ this.closeConnection(serverId)
+ }
+
disconnectAll(): void {
for (const serverId of this.connections.keys()) {
this.disconnect(serverId)
@@ -163,9 +177,8 @@ export class GenericWebSocketClient extends AbstractWebSocketClient {
connection.socket.send(JSON.stringify(message))
}
- private scheduleReconnect(serverId: string, auth: Archon.Websocket.v0.WSAuth): void {
- const connection = this.connections.get(serverId)
- if (!connection) return
+ private scheduleReconnect(connection: WebSocketConnection): void {
+ const { serverId } = connection
if (connection.reconnectAttempts >= this.MAX_RECONNECT_ATTEMPTS) {
this.disconnect(serverId)
@@ -178,13 +191,26 @@ export class GenericWebSocketClient extends AbstractWebSocketClient {
const delay = this.getReconnectDelay(connection.reconnectAttempts)
connection.reconnectTimer = setTimeout(() => {
- this.connect(serverId, auth).catch((error) => {
- console.error(`[WebSocket] Reconnection failed for server ${serverId}:`, error)
- })
+ connection.reconnectTimer = undefined
+ void this.reconnect(connection)
}, delay)
}
+ private async reconnect(connection: WebSocketConnection): Promise {
+ const { serverId } = connection
+ try {
+ const auth = await this.client.archon.servers_v0.getWebSocketAuth(serverId)
+ if (this.connections.get(serverId) !== connection) return
+ await this.openConnection(serverId, auth, connection.reconnectAttempts)
+ } catch (error) {
+ console.error(`[WebSocket] Reconnection failed for server ${serverId}:`, error)
+ if (this.connections.get(serverId) === connection) this.scheduleReconnect(connection)
+ }
+ }
+
private async handleAuthExpiring(serverId: string): Promise {
+ if (this.authRefreshes.has(serverId)) return
+ this.authRefreshes.add(serverId)
try {
const newAuth = await this.client.archon.servers_v0.getWebSocketAuth(serverId)
@@ -195,6 +221,8 @@ export class GenericWebSocketClient extends AbstractWebSocketClient {
} catch (error) {
console.error(`[WebSocket] Failed to refresh auth for server ${serverId}:`, error)
this.disconnect(serverId)
+ } finally {
+ this.authRefreshes.delete(serverId)
}
}
}
diff --git a/packages/api-client/src/platform/xhr-upload-client.ts b/packages/api-client/src/platform/xhr-upload-client.ts
index 8cd5cdba8d8..05d0ae83645 100644
--- a/packages/api-client/src/platform/xhr-upload-client.ts
+++ b/packages/api-client/src/platform/xhr-upload-client.ts
@@ -2,6 +2,7 @@ import { AbstractModrinthClient } from '../core/abstract-client'
import { ModrinthApiError } from '../core/errors'
import type { RequestContext } from '../types/request'
import {
+ type FileUploadMetadata,
isLocalFile,
type LocalFile,
type UploadHandle,
@@ -56,7 +57,7 @@ export abstract class XHRUploadClient extends AbstractModrinthClient {
promise: (async () => {
const isFormData =
('formData' in options && options.formData instanceof FormData) ||
- !!options.multipartField
+ ('multipartField' in options && !!options.multipartField)
const baseHeaders = await this.buildDefaultHeaders()
if (isFormData) {
delete baseHeaders['Content-Type']
@@ -203,7 +204,7 @@ export abstract class XHRUploadClient extends AbstractModrinthClient {
url: appendRequestParams(context.url, context.options.params),
headers: context.options.headers ?? {},
file,
- multipartField: (context.metadata as UploadMetadata).multipartField,
+ multipartField: (context.metadata as FileUploadMetadata).multipartField,
signal: abortController.signal,
onProgress: (progress) => progressCallbacks.forEach((cb) => cb(progress)),
})
diff --git a/packages/app-lib/.env.prod-with-staging-archon b/packages/app-lib/.env.prod-with-staging-archon
index d27b5433835..04cf875ab11 100644
--- a/packages/app-lib/.env.prod-with-staging-archon
+++ b/packages/app-lib/.env.prod-with-staging-archon
@@ -1,6 +1,6 @@
MODRINTH_URL=https://modrinth.com/
MODRINTH_API_BASE_URL=https://api.modrinth.com/
-SHARED_INSTANCES_API_BASE_URL=https://shared-instances.modrinth.com/
+SHARED_INSTANCES_API_BASE_URL=https://staging-shared-instances.modrinth.com/
MODRINTH_ARCHON_BASE_URL=https://staging-archon.modrinth.com/
MODRINTH_API_URL=https://api.modrinth.com/v2/
MODRINTH_API_URL_V3=https://api.modrinth.com/v3/
diff --git a/packages/app-lib/.sqlx/query-6e0e46154aa79ddf77dbbd94528cb161dba6f0918353ce5065e3b6ae8d98b474.json b/packages/app-lib/.sqlx/query-26bd0ee48365cedead0f4c23490871a988f926b79344c2ab506b297467a6c143.json
similarity index 81%
rename from packages/app-lib/.sqlx/query-6e0e46154aa79ddf77dbbd94528cb161dba6f0918353ce5065e3b6ae8d98b474.json
rename to packages/app-lib/.sqlx/query-26bd0ee48365cedead0f4c23490871a988f926b79344c2ab506b297467a6c143.json
index 22c409145bc..798b2112604 100644
--- a/packages/app-lib/.sqlx/query-6e0e46154aa79ddf77dbbd94528cb161dba6f0918353ce5065e3b6ae8d98b474.json
+++ b/packages/app-lib/.sqlx/query-26bd0ee48365cedead0f4c23490871a988f926b79344c2ab506b297467a6c143.json
@@ -1,6 +1,6 @@
{
"db_name": "SQLite",
- "query": "\n SELECT\n i.id AS \"id!: String\",\n i.path AS \"path!: String\",\n i.applied_content_set_id AS \"applied_content_set_id?: String\",\n i.install_stage AS \"install_stage!: String\",\n i.launcher_feature_version AS \"launcher_feature_version!: String\",\n i.update_channel AS \"update_channel!: String\",\n i.name AS \"name!: String\",\n i.icon_path AS \"icon_path?: String\",\n config.background AS \"icon_config_background?: String\",\n config.symbol AS \"icon_config_symbol?: String\",\n i.created AS \"created!: i64\",\n i.modified AS \"modified!: i64\",\n i.last_played AS \"last_played?: i64\",\n i.submitted_time_played AS \"submitted_time_played!: i64\",\n i.recent_time_played AS \"recent_time_played!: i64\",\n cs.id AS \"content_set_id?: String\",\n cs.instance_id AS \"content_set_instance_id?: String\",\n cs.name AS \"content_set_name?: String\",\n cs.source_kind AS \"content_set_source_kind?: String\",\n cs.status AS \"content_set_status?: String\",\n cs.game_version AS \"content_set_game_version?: String\",\n cs.protocol_version AS \"content_set_protocol_version?: i64\",\n cs.loader AS \"content_set_loader?: String\",\n cs.loader_version AS \"content_set_loader_version?: String\",\n cs.created AS \"content_set_created?: i64\",\n cs.modified AS \"content_set_modified?: i64\",\n COALESCE(link.link_kind, 'unmanaged') AS \"link_kind!: String\",\n link.modrinth_project_id AS \"modrinth_project_id?: String\",\n link.modrinth_version_id AS \"modrinth_version_id?: String\",\n link.server_project_id AS \"server_project_id?: String\",\n link.content_project_id AS \"content_project_id?: String\",\n link.content_version_id AS \"content_version_id?: String\",\n link.hosting_server_id AS \"hosting_server_id?: String\",\n json(link.hosting_instance_ids) AS \"hosting_instance_ids?: String\",\n link.hosting_active_instance_id AS \"hosting_active_instance_id?: String\",\n link.shared_instance_id AS \"shared_instance_id?: String\",\n link.shared_instance_role AS \"shared_instance_role?: String\",\n link.shared_instance_manager_id AS \"shared_instance_manager_id?: String\",\n link.shared_instance_server_manager_name AS \"shared_instance_server_manager_name?: String\",\n link.shared_instance_server_manager_icon_url AS \"shared_instance_server_manager_icon_url?: String\",\n link.shared_instance_linked_user_id AS \"shared_instance_linked_user_id?: String\",\n sync.applied_update_id AS \"shared_sync_applied_update_id?: String\",\n sync.latest_available_update_id AS \"shared_sync_latest_available_update_id?: String\",\n sync.status AS \"shared_sync_status?: String\",\n link.imported_name AS \"imported_name?: String\",\n link.imported_version_number AS \"imported_version_number?: String\",\n link.imported_filename AS \"imported_filename?: String\",\n COALESCE((\n SELECT json_group_array(id)\n FROM (\n SELECT groups.id\n FROM instance_group_memberships memberships\n INNER JOIN instance_groups groups\n ON groups.id = memberships.group_id\n WHERE memberships.instance_id = i.id\n ORDER BY groups.name\n )\n ), '[]') AS \"group_ids!: String\",\n json(overrides.overrides) AS \"launch_overrides?: String\"\n FROM instances i\n LEFT JOIN instance_content_sets cs\n ON cs.id = i.applied_content_set_id\n AND cs.instance_id = i.id\n LEFT JOIN instance_links link\n ON link.instance_id = i.id\n LEFT JOIN instance_content_set_sync_state sync\n ON sync.content_set_id = cs.id\n AND sync.provider = 'shared_instance'\n LEFT JOIN instance_launch_overrides overrides\n ON overrides.instance_id = i.id\n LEFT JOIN instance_icon_configs config\n ON config.instance_id = i.id\n WHERE i.id = ?",
+ "query": "\n SELECT\n i.id AS \"id!: String\",\n i.path AS \"path!: String\",\n i.applied_content_set_id AS \"applied_content_set_id?: String\",\n i.install_stage AS \"install_stage!: String\",\n i.launcher_feature_version AS \"launcher_feature_version!: String\",\n i.update_channel AS \"update_channel!: String\",\n i.name AS \"name!: String\",\n i.icon_path AS \"icon_path?: String\",\n config.background AS \"icon_config_background?: String\",\n config.symbol AS \"icon_config_symbol?: String\",\n i.created AS \"created!: i64\",\n i.modified AS \"modified!: i64\",\n i.last_played AS \"last_played?: i64\",\n i.submitted_time_played AS \"submitted_time_played!: i64\",\n i.recent_time_played AS \"recent_time_played!: i64\",\n cs.id AS \"content_set_id?: String\",\n cs.instance_id AS \"content_set_instance_id?: String\",\n cs.name AS \"content_set_name?: String\",\n cs.source_kind AS \"content_set_source_kind?: String\",\n cs.status AS \"content_set_status?: String\",\n cs.game_version AS \"content_set_game_version?: String\",\n cs.protocol_version AS \"content_set_protocol_version?: i64\",\n cs.loader AS \"content_set_loader?: String\",\n cs.loader_version AS \"content_set_loader_version?: String\",\n cs.created AS \"content_set_created?: i64\",\n cs.modified AS \"content_set_modified?: i64\",\n COALESCE(link.link_kind, 'unmanaged') AS \"link_kind!: String\",\n link.modrinth_project_id AS \"modrinth_project_id?: String\",\n link.modrinth_version_id AS \"modrinth_version_id?: String\",\n link.server_project_id AS \"server_project_id?: String\",\n link.content_project_id AS \"content_project_id?: String\",\n link.content_version_id AS \"content_version_id?: String\",\n link.hosting_server_id AS \"hosting_server_id?: String\",\n json(link.hosting_instance_ids) AS \"hosting_instance_ids?: String\",\n link.hosting_active_instance_id AS \"hosting_active_instance_id?: String\",\n link.shared_instance_id AS \"shared_instance_id?: String\",\n link.shared_instance_role AS \"shared_instance_role?: String\",\n link.shared_instance_manager_id AS \"shared_instance_manager_id?: String\",\n link.shared_instance_server_manager_name AS \"shared_instance_server_manager_name?: String\",\n link.shared_instance_server_manager_icon_url AS \"shared_instance_server_manager_icon_url?: String\",\n link.shared_instance_linked_user_id AS \"shared_instance_linked_user_id?: String\",\n sync.applied_update_id AS \"shared_sync_applied_update_id?: String\",\n sync.applied_backtrack_version AS \"shared_sync_applied_backtrack_version?: String\",\n sync.latest_available_update_id AS \"shared_sync_latest_available_update_id?: String\",\n sync.status AS \"shared_sync_status?: String\",\n link.imported_name AS \"imported_name?: String\",\n link.imported_version_number AS \"imported_version_number?: String\",\n link.imported_filename AS \"imported_filename?: String\",\n COALESCE((\n SELECT json_group_array(id)\n FROM (\n SELECT groups.id\n FROM instance_group_memberships memberships\n INNER JOIN instance_groups groups\n ON groups.id = memberships.group_id\n WHERE memberships.instance_id = i.id\n ORDER BY groups.name\n )\n ), '[]') AS \"group_ids!: String\",\n json(overrides.overrides) AS \"launch_overrides?: String\"\n FROM instances i\n LEFT JOIN instance_content_sets cs\n ON cs.id = i.applied_content_set_id\n AND cs.instance_id = i.id\n LEFT JOIN instance_links link\n ON link.instance_id = i.id\n LEFT JOIN instance_content_set_sync_state sync\n ON sync.content_set_id = cs.id\n AND sync.provider = 'shared_instance'\n LEFT JOIN instance_launch_overrides overrides\n ON overrides.instance_id = i.id\n LEFT JOIN instance_icon_configs config\n ON config.instance_id = i.id\n WHERE i.id = ?",
"describe": {
"columns": [
{
@@ -214,38 +214,43 @@
"type_info": "Text"
},
{
- "name": "shared_sync_latest_available_update_id?: String",
+ "name": "shared_sync_applied_backtrack_version?: String",
"ordinal": 42,
"type_info": "Text"
},
{
- "name": "shared_sync_status?: String",
+ "name": "shared_sync_latest_available_update_id?: String",
"ordinal": 43,
"type_info": "Text"
},
{
- "name": "imported_name?: String",
+ "name": "shared_sync_status?: String",
"ordinal": 44,
"type_info": "Text"
},
{
- "name": "imported_version_number?: String",
+ "name": "imported_name?: String",
"ordinal": 45,
"type_info": "Text"
},
{
- "name": "imported_filename?: String",
+ "name": "imported_version_number?: String",
"ordinal": 46,
"type_info": "Text"
},
{
- "name": "group_ids!: String",
+ "name": "imported_filename?: String",
"ordinal": 47,
+ "type_info": "Text"
+ },
+ {
+ "name": "group_ids!: String",
+ "ordinal": 48,
"type_info": "Null"
},
{
"name": "launch_overrides?: String",
- "ordinal": 48,
+ "ordinal": 49,
"type_info": "Null"
}
],
@@ -296,6 +301,7 @@
true,
true,
true,
+ true,
false,
true,
true,
@@ -304,5 +310,5 @@
null
]
},
- "hash": "6e0e46154aa79ddf77dbbd94528cb161dba6f0918353ce5065e3b6ae8d98b474"
+ "hash": "26bd0ee48365cedead0f4c23490871a988f926b79344c2ab506b297467a6c143"
}
diff --git a/packages/app-lib/.sqlx/query-2399d3074def96c3dbc29eccca98432a5f4a6588f644b2fded4fdfc0b0d9d407.json b/packages/app-lib/.sqlx/query-614c1fe9a04303769517fbb509dd71bbf2e7dd02040f958a39811a5af960a772.json
similarity index 81%
rename from packages/app-lib/.sqlx/query-2399d3074def96c3dbc29eccca98432a5f4a6588f644b2fded4fdfc0b0d9d407.json
rename to packages/app-lib/.sqlx/query-614c1fe9a04303769517fbb509dd71bbf2e7dd02040f958a39811a5af960a772.json
index e6764f30109..ff915cff3c0 100644
--- a/packages/app-lib/.sqlx/query-2399d3074def96c3dbc29eccca98432a5f4a6588f644b2fded4fdfc0b0d9d407.json
+++ b/packages/app-lib/.sqlx/query-614c1fe9a04303769517fbb509dd71bbf2e7dd02040f958a39811a5af960a772.json
@@ -1,6 +1,6 @@
{
"db_name": "SQLite",
- "query": "\n SELECT\n i.id AS \"id!: String\",\n i.path AS \"path!: String\",\n i.applied_content_set_id AS \"applied_content_set_id?: String\",\n i.install_stage AS \"install_stage!: String\",\n i.launcher_feature_version AS \"launcher_feature_version!: String\",\n i.update_channel AS \"update_channel!: String\",\n i.name AS \"name!: String\",\n i.icon_path AS \"icon_path?: String\",\n config.background AS \"icon_config_background?: String\",\n config.symbol AS \"icon_config_symbol?: String\",\n i.created AS \"created!: i64\",\n i.modified AS \"modified!: i64\",\n i.last_played AS \"last_played?: i64\",\n i.submitted_time_played AS \"submitted_time_played!: i64\",\n i.recent_time_played AS \"recent_time_played!: i64\",\n cs.id AS \"content_set_id?: String\",\n cs.instance_id AS \"content_set_instance_id?: String\",\n cs.name AS \"content_set_name?: String\",\n cs.source_kind AS \"content_set_source_kind?: String\",\n cs.status AS \"content_set_status?: String\",\n cs.game_version AS \"content_set_game_version?: String\",\n cs.protocol_version AS \"content_set_protocol_version?: i64\",\n cs.loader AS \"content_set_loader?: String\",\n cs.loader_version AS \"content_set_loader_version?: String\",\n cs.created AS \"content_set_created?: i64\",\n cs.modified AS \"content_set_modified?: i64\",\n COALESCE(link.link_kind, 'unmanaged') AS \"link_kind!: String\",\n link.modrinth_project_id AS \"modrinth_project_id?: String\",\n link.modrinth_version_id AS \"modrinth_version_id?: String\",\n link.server_project_id AS \"server_project_id?: String\",\n link.content_project_id AS \"content_project_id?: String\",\n link.content_version_id AS \"content_version_id?: String\",\n link.hosting_server_id AS \"hosting_server_id?: String\",\n json(link.hosting_instance_ids) AS \"hosting_instance_ids?: String\",\n link.hosting_active_instance_id AS \"hosting_active_instance_id?: String\",\n link.shared_instance_id AS \"shared_instance_id?: String\",\n link.shared_instance_role AS \"shared_instance_role?: String\",\n link.shared_instance_manager_id AS \"shared_instance_manager_id?: String\",\n link.shared_instance_server_manager_name AS \"shared_instance_server_manager_name?: String\",\n link.shared_instance_server_manager_icon_url AS \"shared_instance_server_manager_icon_url?: String\",\n link.shared_instance_linked_user_id AS \"shared_instance_linked_user_id?: String\",\n sync.applied_update_id AS \"shared_sync_applied_update_id?: String\",\n sync.latest_available_update_id AS \"shared_sync_latest_available_update_id?: String\",\n sync.status AS \"shared_sync_status?: String\",\n link.imported_name AS \"imported_name?: String\",\n link.imported_version_number AS \"imported_version_number?: String\",\n link.imported_filename AS \"imported_filename?: String\",\n COALESCE((\n SELECT json_group_array(id)\n FROM (\n SELECT groups.id\n FROM instance_group_memberships memberships\n INNER JOIN instance_groups groups\n ON groups.id = memberships.group_id\n WHERE memberships.instance_id = i.id\n ORDER BY groups.name\n )\n ), '[]') AS \"group_ids!: String\",\n json(overrides.overrides) AS \"launch_overrides?: String\"\n FROM instances i\n LEFT JOIN instance_content_sets cs\n ON cs.id = i.applied_content_set_id\n AND cs.instance_id = i.id\n LEFT JOIN instance_links link\n ON link.instance_id = i.id\n LEFT JOIN instance_content_set_sync_state sync\n ON sync.content_set_id = cs.id\n AND sync.provider = 'shared_instance'\n LEFT JOIN instance_launch_overrides overrides\n ON overrides.instance_id = i.id\n LEFT JOIN instance_icon_configs config\n ON config.instance_id = i.id\n WHERE 1 = ?",
+ "query": "\n SELECT\n i.id AS \"id!: String\",\n i.path AS \"path!: String\",\n i.applied_content_set_id AS \"applied_content_set_id?: String\",\n i.install_stage AS \"install_stage!: String\",\n i.launcher_feature_version AS \"launcher_feature_version!: String\",\n i.update_channel AS \"update_channel!: String\",\n i.name AS \"name!: String\",\n i.icon_path AS \"icon_path?: String\",\n config.background AS \"icon_config_background?: String\",\n config.symbol AS \"icon_config_symbol?: String\",\n i.created AS \"created!: i64\",\n i.modified AS \"modified!: i64\",\n i.last_played AS \"last_played?: i64\",\n i.submitted_time_played AS \"submitted_time_played!: i64\",\n i.recent_time_played AS \"recent_time_played!: i64\",\n cs.id AS \"content_set_id?: String\",\n cs.instance_id AS \"content_set_instance_id?: String\",\n cs.name AS \"content_set_name?: String\",\n cs.source_kind AS \"content_set_source_kind?: String\",\n cs.status AS \"content_set_status?: String\",\n cs.game_version AS \"content_set_game_version?: String\",\n cs.protocol_version AS \"content_set_protocol_version?: i64\",\n cs.loader AS \"content_set_loader?: String\",\n cs.loader_version AS \"content_set_loader_version?: String\",\n cs.created AS \"content_set_created?: i64\",\n cs.modified AS \"content_set_modified?: i64\",\n COALESCE(link.link_kind, 'unmanaged') AS \"link_kind!: String\",\n link.modrinth_project_id AS \"modrinth_project_id?: String\",\n link.modrinth_version_id AS \"modrinth_version_id?: String\",\n link.server_project_id AS \"server_project_id?: String\",\n link.content_project_id AS \"content_project_id?: String\",\n link.content_version_id AS \"content_version_id?: String\",\n link.hosting_server_id AS \"hosting_server_id?: String\",\n json(link.hosting_instance_ids) AS \"hosting_instance_ids?: String\",\n link.hosting_active_instance_id AS \"hosting_active_instance_id?: String\",\n link.shared_instance_id AS \"shared_instance_id?: String\",\n link.shared_instance_role AS \"shared_instance_role?: String\",\n link.shared_instance_manager_id AS \"shared_instance_manager_id?: String\",\n link.shared_instance_server_manager_name AS \"shared_instance_server_manager_name?: String\",\n link.shared_instance_server_manager_icon_url AS \"shared_instance_server_manager_icon_url?: String\",\n link.shared_instance_linked_user_id AS \"shared_instance_linked_user_id?: String\",\n sync.applied_update_id AS \"shared_sync_applied_update_id?: String\",\n sync.applied_backtrack_version AS \"shared_sync_applied_backtrack_version?: String\",\n sync.latest_available_update_id AS \"shared_sync_latest_available_update_id?: String\",\n sync.status AS \"shared_sync_status?: String\",\n link.imported_name AS \"imported_name?: String\",\n link.imported_version_number AS \"imported_version_number?: String\",\n link.imported_filename AS \"imported_filename?: String\",\n COALESCE((\n SELECT json_group_array(id)\n FROM (\n SELECT groups.id\n FROM instance_group_memberships memberships\n INNER JOIN instance_groups groups\n ON groups.id = memberships.group_id\n WHERE memberships.instance_id = i.id\n ORDER BY groups.name\n )\n ), '[]') AS \"group_ids!: String\",\n json(overrides.overrides) AS \"launch_overrides?: String\"\n FROM instances i\n LEFT JOIN instance_content_sets cs\n ON cs.id = i.applied_content_set_id\n AND cs.instance_id = i.id\n LEFT JOIN instance_links link\n ON link.instance_id = i.id\n LEFT JOIN instance_content_set_sync_state sync\n ON sync.content_set_id = cs.id\n AND sync.provider = 'shared_instance'\n LEFT JOIN instance_launch_overrides overrides\n ON overrides.instance_id = i.id\n LEFT JOIN instance_icon_configs config\n ON config.instance_id = i.id\n WHERE 1 = ?",
"describe": {
"columns": [
{
@@ -214,38 +214,43 @@
"type_info": "Text"
},
{
- "name": "shared_sync_latest_available_update_id?: String",
+ "name": "shared_sync_applied_backtrack_version?: String",
"ordinal": 42,
"type_info": "Text"
},
{
- "name": "shared_sync_status?: String",
+ "name": "shared_sync_latest_available_update_id?: String",
"ordinal": 43,
"type_info": "Text"
},
{
- "name": "imported_name?: String",
+ "name": "shared_sync_status?: String",
"ordinal": 44,
"type_info": "Text"
},
{
- "name": "imported_version_number?: String",
+ "name": "imported_name?: String",
"ordinal": 45,
"type_info": "Text"
},
{
- "name": "imported_filename?: String",
+ "name": "imported_version_number?: String",
"ordinal": 46,
"type_info": "Text"
},
{
- "name": "group_ids!: String",
+ "name": "imported_filename?: String",
"ordinal": 47,
"type_info": "Text"
},
{
- "name": "launch_overrides?: String",
+ "name": "group_ids!: String",
"ordinal": 48,
+ "type_info": "Text"
+ },
+ {
+ "name": "launch_overrides?: String",
+ "ordinal": 49,
"type_info": "Null"
}
],
@@ -300,9 +305,10 @@
true,
true,
true,
+ true,
false,
null
]
},
- "hash": "2399d3074def96c3dbc29eccca98432a5f4a6588f644b2fded4fdfc0b0d9d407"
+ "hash": "614c1fe9a04303769517fbb509dd71bbf2e7dd02040f958a39811a5af960a772"
}
diff --git a/packages/app-lib/.sqlx/query-6231cfa8f3b21c0fd502e16f823881fd9c44bccaedb9b06585ff8f76146c6e57.json b/packages/app-lib/.sqlx/query-6231cfa8f3b21c0fd502e16f823881fd9c44bccaedb9b06585ff8f76146c6e57.json
deleted file mode 100644
index ad566bf3da1..00000000000
--- a/packages/app-lib/.sqlx/query-6231cfa8f3b21c0fd502e16f823881fd9c44bccaedb9b06585ff8f76146c6e57.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "db_name": "SQLite",
- "query": "\n\t\tINSERT INTO instance_content_set_sync_state (\n\t\t\tcontent_set_id,\n\t\t\tprovider,\n\t\t\tapplied_update_id,\n\t\t\tlatest_available_update_id,\n\t\t\tchecked_at,\n\t\t\tstatus\n\t\t)\n\t\tVALUES (?, ?, ?, ?, ?, ?)\n\t\tON CONFLICT (content_set_id) DO UPDATE SET\n\t\t\tprovider = excluded.provider,\n\t\t\tapplied_update_id = excluded.applied_update_id,\n\t\t\tlatest_available_update_id = excluded.latest_available_update_id,\n\t\t\tchecked_at = excluded.checked_at,\n\t\t\tstatus = excluded.status\n\t\t",
- "describe": {
- "columns": [],
- "parameters": {
- "Right": 6
- },
- "nullable": []
- },
- "hash": "6231cfa8f3b21c0fd502e16f823881fd9c44bccaedb9b06585ff8f76146c6e57"
-}
diff --git a/packages/app-lib/.sqlx/query-7143099dcf9257477a4bc399cf33d250db42b88bdc02129733a3741893b1a501.json b/packages/app-lib/.sqlx/query-7143099dcf9257477a4bc399cf33d250db42b88bdc02129733a3741893b1a501.json
index 316760541f8..4f480ccb02e 100644
--- a/packages/app-lib/.sqlx/query-7143099dcf9257477a4bc399cf33d250db42b88bdc02129733a3741893b1a501.json
+++ b/packages/app-lib/.sqlx/query-7143099dcf9257477a4bc399cf33d250db42b88bdc02129733a3741893b1a501.json
@@ -32,6 +32,11 @@
"name": "status",
"ordinal": 5,
"type_info": "Text"
+ },
+ {
+ "name": "applied_backtrack_version",
+ "ordinal": 6,
+ "type_info": "Text"
}
],
"parameters": {
@@ -43,7 +48,8 @@
true,
true,
true,
- false
+ false,
+ true
]
},
"hash": "7143099dcf9257477a4bc399cf33d250db42b88bdc02129733a3741893b1a501"
diff --git a/packages/app-lib/.sqlx/query-11dd50ff2700bf67a0da7cf67e12506fbbabc4465357aa6476b8e8fa0af84158.json b/packages/app-lib/.sqlx/query-88277aaaa336ddd0e839a552b6a8cda979338d4b06475e20e32f923ae277c0ac.json
similarity index 81%
rename from packages/app-lib/.sqlx/query-11dd50ff2700bf67a0da7cf67e12506fbbabc4465357aa6476b8e8fa0af84158.json
rename to packages/app-lib/.sqlx/query-88277aaaa336ddd0e839a552b6a8cda979338d4b06475e20e32f923ae277c0ac.json
index 5d39d7a55fa..dda164a5f00 100644
--- a/packages/app-lib/.sqlx/query-11dd50ff2700bf67a0da7cf67e12506fbbabc4465357aa6476b8e8fa0af84158.json
+++ b/packages/app-lib/.sqlx/query-88277aaaa336ddd0e839a552b6a8cda979338d4b06475e20e32f923ae277c0ac.json
@@ -1,6 +1,6 @@
{
"db_name": "SQLite",
- "query": "\n WITH requested AS (\n SELECT value AS id, key AS ord\n FROM json_each(?)\n )\n \n SELECT\n i.id AS \"id!: String\",\n i.path AS \"path!: String\",\n i.applied_content_set_id AS \"applied_content_set_id?: String\",\n i.install_stage AS \"install_stage!: String\",\n i.launcher_feature_version AS \"launcher_feature_version!: String\",\n i.update_channel AS \"update_channel!: String\",\n i.name AS \"name!: String\",\n i.icon_path AS \"icon_path?: String\",\n config.background AS \"icon_config_background?: String\",\n config.symbol AS \"icon_config_symbol?: String\",\n i.created AS \"created!: i64\",\n i.modified AS \"modified!: i64\",\n i.last_played AS \"last_played?: i64\",\n i.submitted_time_played AS \"submitted_time_played!: i64\",\n i.recent_time_played AS \"recent_time_played!: i64\",\n cs.id AS \"content_set_id?: String\",\n cs.instance_id AS \"content_set_instance_id?: String\",\n cs.name AS \"content_set_name?: String\",\n cs.source_kind AS \"content_set_source_kind?: String\",\n cs.status AS \"content_set_status?: String\",\n cs.game_version AS \"content_set_game_version?: String\",\n cs.protocol_version AS \"content_set_protocol_version?: i64\",\n cs.loader AS \"content_set_loader?: String\",\n cs.loader_version AS \"content_set_loader_version?: String\",\n cs.created AS \"content_set_created?: i64\",\n cs.modified AS \"content_set_modified?: i64\",\n COALESCE(link.link_kind, 'unmanaged') AS \"link_kind!: String\",\n link.modrinth_project_id AS \"modrinth_project_id?: String\",\n link.modrinth_version_id AS \"modrinth_version_id?: String\",\n link.server_project_id AS \"server_project_id?: String\",\n link.content_project_id AS \"content_project_id?: String\",\n link.content_version_id AS \"content_version_id?: String\",\n link.hosting_server_id AS \"hosting_server_id?: String\",\n json(link.hosting_instance_ids) AS \"hosting_instance_ids?: String\",\n link.hosting_active_instance_id AS \"hosting_active_instance_id?: String\",\n link.shared_instance_id AS \"shared_instance_id?: String\",\n link.shared_instance_role AS \"shared_instance_role?: String\",\n link.shared_instance_manager_id AS \"shared_instance_manager_id?: String\",\n link.shared_instance_server_manager_name AS \"shared_instance_server_manager_name?: String\",\n link.shared_instance_server_manager_icon_url AS \"shared_instance_server_manager_icon_url?: String\",\n link.shared_instance_linked_user_id AS \"shared_instance_linked_user_id?: String\",\n sync.applied_update_id AS \"shared_sync_applied_update_id?: String\",\n sync.latest_available_update_id AS \"shared_sync_latest_available_update_id?: String\",\n sync.status AS \"shared_sync_status?: String\",\n link.imported_name AS \"imported_name?: String\",\n link.imported_version_number AS \"imported_version_number?: String\",\n link.imported_filename AS \"imported_filename?: String\",\n COALESCE((\n SELECT json_group_array(id)\n FROM (\n SELECT groups.id\n FROM instance_group_memberships memberships\n INNER JOIN instance_groups groups\n ON groups.id = memberships.group_id\n WHERE memberships.instance_id = i.id\n ORDER BY groups.name\n )\n ), '[]') AS \"group_ids!: String\",\n json(overrides.overrides) AS \"launch_overrides?: String\"\n \n FROM requested\n INNER JOIN instances i\n ON i.id = requested.id\n \n LEFT JOIN instance_content_sets cs\n ON cs.id = i.applied_content_set_id\n AND cs.instance_id = i.id\n LEFT JOIN instance_links link\n ON link.instance_id = i.id\n LEFT JOIN instance_content_set_sync_state sync\n ON sync.content_set_id = cs.id\n AND sync.provider = 'shared_instance'\n LEFT JOIN instance_launch_overrides overrides\n ON overrides.instance_id = i.id\n LEFT JOIN instance_icon_configs config\n ON config.instance_id = i.id\n ORDER BY requested.ord",
+ "query": "\n WITH requested AS (\n SELECT value AS id, key AS ord\n FROM json_each(?)\n )\n \n SELECT\n i.id AS \"id!: String\",\n i.path AS \"path!: String\",\n i.applied_content_set_id AS \"applied_content_set_id?: String\",\n i.install_stage AS \"install_stage!: String\",\n i.launcher_feature_version AS \"launcher_feature_version!: String\",\n i.update_channel AS \"update_channel!: String\",\n i.name AS \"name!: String\",\n i.icon_path AS \"icon_path?: String\",\n config.background AS \"icon_config_background?: String\",\n config.symbol AS \"icon_config_symbol?: String\",\n i.created AS \"created!: i64\",\n i.modified AS \"modified!: i64\",\n i.last_played AS \"last_played?: i64\",\n i.submitted_time_played AS \"submitted_time_played!: i64\",\n i.recent_time_played AS \"recent_time_played!: i64\",\n cs.id AS \"content_set_id?: String\",\n cs.instance_id AS \"content_set_instance_id?: String\",\n cs.name AS \"content_set_name?: String\",\n cs.source_kind AS \"content_set_source_kind?: String\",\n cs.status AS \"content_set_status?: String\",\n cs.game_version AS \"content_set_game_version?: String\",\n cs.protocol_version AS \"content_set_protocol_version?: i64\",\n cs.loader AS \"content_set_loader?: String\",\n cs.loader_version AS \"content_set_loader_version?: String\",\n cs.created AS \"content_set_created?: i64\",\n cs.modified AS \"content_set_modified?: i64\",\n COALESCE(link.link_kind, 'unmanaged') AS \"link_kind!: String\",\n link.modrinth_project_id AS \"modrinth_project_id?: String\",\n link.modrinth_version_id AS \"modrinth_version_id?: String\",\n link.server_project_id AS \"server_project_id?: String\",\n link.content_project_id AS \"content_project_id?: String\",\n link.content_version_id AS \"content_version_id?: String\",\n link.hosting_server_id AS \"hosting_server_id?: String\",\n json(link.hosting_instance_ids) AS \"hosting_instance_ids?: String\",\n link.hosting_active_instance_id AS \"hosting_active_instance_id?: String\",\n link.shared_instance_id AS \"shared_instance_id?: String\",\n link.shared_instance_role AS \"shared_instance_role?: String\",\n link.shared_instance_manager_id AS \"shared_instance_manager_id?: String\",\n link.shared_instance_server_manager_name AS \"shared_instance_server_manager_name?: String\",\n link.shared_instance_server_manager_icon_url AS \"shared_instance_server_manager_icon_url?: String\",\n link.shared_instance_linked_user_id AS \"shared_instance_linked_user_id?: String\",\n sync.applied_update_id AS \"shared_sync_applied_update_id?: String\",\n sync.applied_backtrack_version AS \"shared_sync_applied_backtrack_version?: String\",\n sync.latest_available_update_id AS \"shared_sync_latest_available_update_id?: String\",\n sync.status AS \"shared_sync_status?: String\",\n link.imported_name AS \"imported_name?: String\",\n link.imported_version_number AS \"imported_version_number?: String\",\n link.imported_filename AS \"imported_filename?: String\",\n COALESCE((\n SELECT json_group_array(id)\n FROM (\n SELECT groups.id\n FROM instance_group_memberships memberships\n INNER JOIN instance_groups groups\n ON groups.id = memberships.group_id\n WHERE memberships.instance_id = i.id\n ORDER BY groups.name\n )\n ), '[]') AS \"group_ids!: String\",\n json(overrides.overrides) AS \"launch_overrides?: String\"\n \n FROM requested\n INNER JOIN instances i\n ON i.id = requested.id\n \n LEFT JOIN instance_content_sets cs\n ON cs.id = i.applied_content_set_id\n AND cs.instance_id = i.id\n LEFT JOIN instance_links link\n ON link.instance_id = i.id\n LEFT JOIN instance_content_set_sync_state sync\n ON sync.content_set_id = cs.id\n AND sync.provider = 'shared_instance'\n LEFT JOIN instance_launch_overrides overrides\n ON overrides.instance_id = i.id\n LEFT JOIN instance_icon_configs config\n ON config.instance_id = i.id\n ORDER BY requested.ord",
"describe": {
"columns": [
{
@@ -214,38 +214,43 @@
"type_info": "Text"
},
{
- "name": "shared_sync_latest_available_update_id?: String",
+ "name": "shared_sync_applied_backtrack_version?: String",
"ordinal": 42,
"type_info": "Text"
},
{
- "name": "shared_sync_status?: String",
+ "name": "shared_sync_latest_available_update_id?: String",
"ordinal": 43,
"type_info": "Text"
},
{
- "name": "imported_name?: String",
+ "name": "shared_sync_status?: String",
"ordinal": 44,
"type_info": "Text"
},
{
- "name": "imported_version_number?: String",
+ "name": "imported_name?: String",
"ordinal": 45,
"type_info": "Text"
},
{
- "name": "imported_filename?: String",
+ "name": "imported_version_number?: String",
"ordinal": 46,
"type_info": "Text"
},
{
- "name": "group_ids!: String",
+ "name": "imported_filename?: String",
"ordinal": 47,
+ "type_info": "Text"
+ },
+ {
+ "name": "group_ids!: String",
+ "ordinal": 48,
"type_info": "Null"
},
{
"name": "launch_overrides?: String",
- "ordinal": 48,
+ "ordinal": 49,
"type_info": "Null"
}
],
@@ -296,6 +301,7 @@
true,
true,
true,
+ true,
false,
true,
true,
@@ -304,5 +310,5 @@
null
]
},
- "hash": "11dd50ff2700bf67a0da7cf67e12506fbbabc4465357aa6476b8e8fa0af84158"
+ "hash": "88277aaaa336ddd0e839a552b6a8cda979338d4b06475e20e32f923ae277c0ac"
}
diff --git a/packages/app-lib/.sqlx/query-b6322a2cf8233d62f670aed9acecb52ab8ede236b3630491b6f0ecf822429404.json b/packages/app-lib/.sqlx/query-b6322a2cf8233d62f670aed9acecb52ab8ede236b3630491b6f0ecf822429404.json
new file mode 100644
index 00000000000..e87c4ea093d
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-b6322a2cf8233d62f670aed9acecb52ab8ede236b3630491b6f0ecf822429404.json
@@ -0,0 +1,12 @@
+{
+ "db_name": "SQLite",
+ "query": "\n\t\tINSERT INTO instance_content_set_sync_state (\n\t\t\tcontent_set_id,\n\t\t\tprovider,\n\t\t\tapplied_update_id,\n\t\t\tlatest_available_update_id,\n\t\t\tchecked_at,\n\t\t\tstatus,\n\t\t\tapplied_backtrack_version\n\t\t)\n\t\tVALUES (?, ?, ?, ?, ?, ?, ?)\n\t\tON CONFLICT (content_set_id) DO UPDATE SET\n\t\t\tprovider = excluded.provider,\n\t\t\tapplied_update_id = excluded.applied_update_id,\n\t\t\tlatest_available_update_id = excluded.latest_available_update_id,\n\t\t\tchecked_at = excluded.checked_at,\n\t\t\tstatus = excluded.status,\n\t\t\tapplied_backtrack_version = excluded.applied_backtrack_version\n\t\t",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Right": 7
+ },
+ "nullable": []
+ },
+ "hash": "b6322a2cf8233d62f670aed9acecb52ab8ede236b3630491b6f0ecf822429404"
+}
diff --git a/packages/app-lib/Cargo.toml b/packages/app-lib/Cargo.toml
index d510461d871..305f7854a0f 100644
--- a/packages/app-lib/Cargo.toml
+++ b/packages/app-lib/Cargo.toml
@@ -71,11 +71,12 @@ reqwest = { workspace = true, features = [
"http2",
"json",
"multipart",
- "rustls",
+ "rustls-no-provider",
"stream",
"system-proxy",
] }
rgb = { workspace = true }
+rustls = { workspace = true, features = ["logging", "ring", "std", "tls12"] }
same-file = { workspace = true }
serde = { workspace = true, features = ["derive", "rc"] }
serde-binhum = { workspace = true }
diff --git a/packages/app-lib/migrations/20261026120000_shared-instance-backtrack-version.sql b/packages/app-lib/migrations/20261026120000_shared-instance-backtrack-version.sql
new file mode 100644
index 00000000000..32fbc96d13b
--- /dev/null
+++ b/packages/app-lib/migrations/20261026120000_shared-instance-backtrack-version.sql
@@ -0,0 +1,2 @@
+ALTER TABLE instance_content_set_sync_state
+ ADD COLUMN applied_backtrack_version TEXT NULL;
diff --git a/packages/app-lib/src/api/handler.rs b/packages/app-lib/src/api/handler.rs
index 3bfd52440b5..a8522f1d735 100644
--- a/packages/app-lib/src/api/handler.rs
+++ b/packages/app-lib/src/api/handler.rs
@@ -32,6 +32,21 @@ pub async fn handle_url(sublink: &str) -> crate::Result {
Some(("server", id)) => {
CommandPayload::InstallServer { id: id.to_string() }
}
+ Some(("hosting", path)) => {
+ let (server_id, world_id) = path.split_once('/').ok_or(
+ ErrorKind::InputError("missing hosting world ID".to_string()),
+ )?;
+ let server_id = uuid::Uuid::parse_str(server_id).context(
+ ErrorKind::InputError("invalid hosting server ID".to_string()),
+ )?;
+ let world_id = uuid::Uuid::parse_str(world_id).context(
+ ErrorKind::InputError("invalid hosting world ID".to_string()),
+ )?;
+ CommandPayload::PlayHostingServer {
+ server_id: server_id.to_string(),
+ world_id: world_id.to_string(),
+ }
+ }
// /share/{invite_id}
Some(("share", raw)) => {
let (raw, _) = raw.split_once('?').unwrap_or((raw, ""));
diff --git a/packages/app-lib/src/api/instance.rs b/packages/app-lib/src/api/instance.rs
index c6378fb7519..755a1144657 100644
--- a/packages/app-lib/src/api/instance.rs
+++ b/packages/app-lib/src/api/instance.rs
@@ -41,8 +41,9 @@ pub use self::groups::{
set_group_memberships, set_group_order,
};
pub use self::icon::{
- cache_generated_icon, edit_generated_icon, edit_generated_icon_if_empty,
- edit_icon, get_recent_icon_configs,
+ cache_generated_icon, cache_icon_bytes, cache_remote_icon,
+ edit_generated_icon, edit_generated_icon_if_empty, edit_icon,
+ get_recent_icon_configs,
};
pub(crate) use self::icon::{
cache_icon, cache_icon_from_path, migrate_legacy_icons,
@@ -79,19 +80,22 @@ pub(crate) use self::shared::{
CONFIG_FILE_TYPE, CONFIG_SYNC_ENABLED, MAX_CONFIG_BUNDLE_ENTRIES,
MAX_SHARED_FILES_TOTAL_SIZE, is_shareable_file_path,
is_supported_config_file, read_bounded_config_bundle_entry,
+ shared_instance_update_data, shared_modpack_files,
};
pub use self::shared::{
SharedInstanceExternalFilePreview, SharedInstanceInstallPreview,
- SharedInstanceInvite, SharedInstanceInviteInstallPreview,
- SharedInstanceInviteLink, SharedInstanceJoinType,
- SharedInstancePublishFile, SharedInstancePublishPreview,
- SharedInstanceUpdateDiff, SharedInstanceUpdateDiffType,
- SharedInstanceUpdatePreview, SharedInstanceUser, SharedInstanceUsers,
+ SharedInstanceInvite, SharedInstanceInviteCreator,
+ SharedInstanceInviteInstallPreview, SharedInstanceInviteLink,
+ SharedInstanceJoinType, SharedInstancePublishFile,
+ SharedInstancePublishPreview, SharedInstanceUpdateDiff,
+ SharedInstanceUpdateDiffType, SharedInstanceUpdatePreview,
+ SharedInstanceUser, SharedInstanceUsers,
accept_pending_shared_instance_invite,
accept_shared_instance_invite_for_install,
- can_active_user_use_shared_instances, create_shared_instance_invite_link,
- decline_pending_shared_instance_invite,
- get_shared_instance_install_preview, get_shared_instance_invites,
+ cache_shared_instance_server_icon, can_active_user_use_shared_instances,
+ create_shared_instance_invite_link, decline_pending_shared_instance_invite,
+ get_shared_instance_install_preview,
+ get_shared_instance_invite_install_preview, get_shared_instance_invites,
get_shared_instance_publish_preview,
get_shared_instance_publish_support_details,
get_shared_instance_update_preview, get_shared_instance_users,
diff --git a/packages/app-lib/src/api/instance/export_mrpack.rs b/packages/app-lib/src/api/instance/export_mrpack.rs
index 6f9c11458a0..f367d791efe 100644
--- a/packages/app-lib/src/api/instance/export_mrpack.rs
+++ b/packages/app-lib/src/api/instance/export_mrpack.rs
@@ -52,6 +52,11 @@ const NEVER_EXPORTABLE_PATH_PREFIXES: &[&str] = &[
"essential",
".mixin.out",
".fabric",
+ ".quilt",
+ ".cache",
+ ".bobby",
+ ".voxy",
+ ".git",
"__MACOSX",
];
const NEVER_EXPORTABLE_PATH_SUFFIXES: &[&str] = &[".DS_Store"];
diff --git a/packages/app-lib/src/api/instance/icon.rs b/packages/app-lib/src/api/instance/icon.rs
index 97ba19c3999..987eb046439 100644
--- a/packages/app-lib/src/api/instance/icon.rs
+++ b/packages/app-lib/src/api/instance/icon.rs
@@ -5,6 +5,7 @@ use crate::state::instances::adapters::sqlite::instance_rows;
use crate::state::{
EditInstance, InstanceIconBackground, InstanceIconConfig, State,
};
+use crate::util::content_hash::temporary_file;
use crate::util::fetch::{sha1_async, write};
use crate::util::io;
use anyhow::{Context, bail};
@@ -14,6 +15,7 @@ use image::{DynamicImage, ImageFormat, ImageReader, Rgba, RgbaImage};
use std::fs::File as StdFile;
use std::io::{BufRead, BufReader, Cursor, Seek};
use std::path::{Path, PathBuf};
+use tokio::io::AsyncWriteExt;
const INSTANCE_ICON_MAX_BYTES: usize = 4 * 1024 * 1024;
const INSTANCE_ICON_MAX_DIMENSION: u32 = 512;
@@ -24,6 +26,12 @@ const MAX_ICON_CONFIG_ID_LENGTH: usize = 64;
const MAX_SYMBOL_BYTES: usize = 4 * 1024 * 1024;
const MAX_SYMBOL_DIMENSION: u32 = 4096;
+const REMOTE_ICON_MAX_BYTES: usize = 4 * 1024 * 1024;
+const REMOTE_ICON_MAX_AGE: std::time::Duration =
+ std::time::Duration::from_secs(24 * 60 * 60);
+static REMOTE_ICON_DOWNLOADS: tokio::sync::Semaphore =
+ tokio::sync::Semaphore::const_new(4);
+
enum LegacyIconAction {
Keep,
Normalize,
@@ -58,6 +66,95 @@ pub async fn edit_icon(
apply_instance_icon(instance_id, icon_path, None, &state).await
}
+pub async fn cache_icon_bytes(icon_bytes: Vec) -> crate::Result {
+ let state = State::get().await?;
+ let icon_path = cache_icon(Bytes::from(icon_bytes), &state).await?;
+ Ok(icon_path.to_string_lossy().to_string())
+}
+
+pub async fn cache_remote_icon(source: &str) -> crate::Result {
+ let state = State::get().await?;
+ let icons = state.directories.caches_dir().join("icons");
+ let source_hash =
+ sha1_async(Bytes::copy_from_slice(source.as_bytes())).await?;
+ let mapping = icons.join(format!("remote-{source_hash}.txt"));
+ let mut cached_path = None;
+ if let Ok(metadata) = tokio::fs::metadata(&mapping).await
+ && metadata.len() <= 44
+ && let Ok(filename) = tokio::fs::read_to_string(&mapping).await
+ && filename.len() == 44
+ && filename.ends_with(".png")
+ && filename.as_bytes()[..40].iter().all(u8::is_ascii_hexdigit)
+ {
+ let path = icons.join(filename);
+ if tokio::fs::try_exists(&path).await? {
+ let fresh = metadata
+ .modified()
+ .ok()
+ .and_then(|modified| modified.elapsed().ok())
+ .is_some_and(|age| age < REMOTE_ICON_MAX_AGE);
+ if fresh {
+ return Ok(io::canonicalize(path)?);
+ }
+ cached_path = Some(path);
+ }
+ }
+
+ let _permit = REMOTE_ICON_DOWNLOADS.acquire().await?;
+ let refreshed = async {
+ let bytes = download_remote_icon(source).await?;
+ let path = cache_icon(bytes, &state).await?;
+ let filename = path
+ .file_name()
+ .ok_or(ErrorKind::InputError(
+ "cached icon has no filename".to_string(),
+ ))?
+ .to_string_lossy();
+ write(&mapping, filename.as_bytes(), &state.io_semaphore).await?;
+ Ok::<_, crate::Error>(path)
+ }
+ .await;
+
+ match refreshed {
+ Ok(path) => Ok(path),
+ Err(error) => {
+ if let Some(path) = cached_path {
+ tracing::warn!(source, %error, "Could not refresh cached icon");
+ Ok(io::canonicalize(path)?)
+ } else {
+ Err(error)
+ }
+ }
+ }
+}
+
+async fn download_remote_icon(source: &str) -> crate::Result {
+ let mut response = crate::util::fetch::REQWEST_CLIENT
+ .get(source)
+ .timeout(std::time::Duration::from_secs(15))
+ .send()
+ .await?
+ .error_for_status()?;
+ if response
+ .content_length()
+ .is_some_and(|length| length > REMOTE_ICON_MAX_BYTES as u64)
+ {
+ bail!(ErrorKind::InputError(
+ "remote icons must be at most 4 MiB".to_string(),
+ ));
+ }
+ let mut bytes = Vec::new();
+ while let Some(chunk) = response.chunk().await? {
+ if bytes.len() + chunk.len() > REMOTE_ICON_MAX_BYTES {
+ bail!(ErrorKind::InputError(
+ "remote icons must be at most 4 MiB".to_string(),
+ ));
+ }
+ bytes.extend_from_slice(&chunk);
+ }
+ Ok(Bytes::from(bytes))
+}
+
pub async fn edit_generated_icon(
instance_id: &str,
config: InstanceIconConfig,
@@ -311,12 +408,21 @@ async fn write_cached_icon(
}
let hash = sha1_async(bytes.clone()).await?;
- let path = state
- .directories
- .caches_dir()
- .join("icons")
- .join(format!("{hash}.png"));
- write(&path, &bytes, &state.io_semaphore).await?;
+ let directory = state.directories.caches_dir().join("icons");
+ let path = directory.join(format!("{hash}.png"));
+ if let Ok(metadata) = tokio::fs::metadata(&path).await
+ && metadata.is_file()
+ && metadata.len() == bytes.len() as u64
+ {
+ return Ok(io::canonicalize(path)?);
+ }
+ let _permit = state.io_semaphore.0.acquire().await?;
+ tokio::fs::create_dir_all(&directory).await?;
+ let (mut file, temporary) = temporary_file(Some(&directory)).await?;
+ file.write_all(&bytes).await?;
+ file.flush().await?;
+ drop(file);
+ tokio::fs::rename(&temporary, &path).await?;
Ok(io::canonicalize(path)?)
}
diff --git a/packages/app-lib/src/api/instance/shared/client.rs b/packages/app-lib/src/api/instance/shared/client.rs
index e851f94fc9a..f6a39a1a2d5 100644
--- a/packages/app-lib/src/api/instance/shared/client.rs
+++ b/packages/app-lib/src/api/instance/shared/client.rs
@@ -36,6 +36,11 @@ pub(super) enum SharedInstanceRemoteResponse {
#[derive(Clone, Debug, Deserialize)]
pub(super) struct RemoteInstanceResponse {
+ pub(super) name: String,
+ pub(super) icon: Option,
+ #[serde(default)]
+ pub(super) linked_server:
+ Option,
#[serde(default)]
pub(super) quarantine: bool,
}
@@ -90,7 +95,11 @@ pub(super) struct InstanceInviteInfoResponse {
#[serde(default)]
pub(super) instance_icon: Option,
#[serde(default)]
+ pub(super) inviter: Option,
+ #[serde(default)]
pub(super) managers: Vec,
+ #[serde(default)]
+ pub(super) version: Option,
}
#[derive(Clone, Debug, Deserialize)]
@@ -101,25 +110,84 @@ pub(super) enum InstanceInviteManagerResponse {
}
#[derive(Clone, Debug, Deserialize)]
+#[serde(from = "RawInstanceVersionResponse")]
pub(super) struct InstanceVersionResponse {
pub(super) version: i32,
- #[serde(default)]
pub(super) modrinth_ids: Vec,
pub(super) ready: bool,
- #[serde(default)]
pub(super) external_files: Vec,
- #[serde(default)]
pub(super) modpack_id: Option,
+ pub(super) backtrack_version: Option,
+ pub(super) removed_files: Vec,
pub(super) game_version: String,
pub(super) loader: ModLoader,
pub(super) loader_version: String,
}
+#[derive(Deserialize)]
+struct RawInstanceVersionResponse {
+ version: i32,
+ #[serde(default)]
+ modrinth_ids: Vec,
+ ready: bool,
+ #[serde(default)]
+ external_files: Vec,
+ #[serde(default)]
+ modpack_id: Option,
+ #[serde(default)]
+ backtrack_version: Option,
+ #[serde(default)]
+ removed_files: Vec,
+ game_version: String,
+ loader: String,
+ loader_version: String,
+}
+
+impl From for InstanceVersionResponse {
+ /// Servers without a client loader (vanilla, Paper, Purpur) are installed
+ /// as Fabric so players can add client-side mods on top.
+ fn from(raw: RawInstanceVersionResponse) -> Self {
+ let (loader, loader_version) = match ModLoader::from_string(&raw.loader)
+ {
+ ModLoader::Vanilla => (ModLoader::Fabric, String::new()),
+ loader => (loader, raw.loader_version),
+ };
+ Self {
+ version: raw.version,
+ modrinth_ids: raw.modrinth_ids,
+ ready: raw.ready,
+ external_files: raw.external_files,
+ modpack_id: raw.modpack_id,
+ backtrack_version: raw.backtrack_version,
+ removed_files: raw.removed_files,
+ game_version: raw.game_version,
+ loader,
+ loader_version,
+ }
+ }
+}
+
+impl InstanceVersionResponse {
+ pub(super) fn validate_removed_files(&self) -> crate::Result<()> {
+ if self.modpack_id.as_deref().is_none_or(str::is_empty)
+ && !self.removed_files.is_empty()
+ {
+ bail!(ErrorKind::InputError(
+ "removed modpack files require a modpack id".to_string(),
+ ));
+ }
+ for removed in &self.removed_files {
+ removed.validate()?;
+ }
+ Ok(())
+ }
+}
+
#[derive(Clone, Debug, Deserialize)]
pub(super) struct ExternalFileResponse {
pub(super) file_name: String,
pub(super) file_type: String,
- pub(super) url: String,
+ pub(super) url: Option,
#[serde(default)]
pub(super) file_size: Option,
#[serde(default)]
@@ -241,7 +309,7 @@ pub(super) async fn update_remote_instance(
pub(super) async fn get_remote_instance_access(
shared_instance_id: &str,
state: &State,
-) -> crate::Result> {
+) -> crate::Result> {
let operation = "get_instance";
let method = Method::GET;
let path = format!("/instances/{shared_instance_id}");
@@ -277,7 +345,7 @@ pub(super) async fn get_remote_instance_access(
));
}
- Ok(SharedInstanceRemoteResponse::Available(()))
+ Ok(SharedInstanceRemoteResponse::Available(instance))
}
pub(super) async fn update_remote_instance_icon(
@@ -327,6 +395,32 @@ pub(super) async fn get_remote_users(
Ok(users.into_shared_users())
}
+pub(super) async fn get_remote_server_icon(
+ instance_id: &str,
+ etag: Option<&str>,
+ state: &State,
+) -> crate::Result {
+ let credentials =
+ ModrinthCredentials::get_and_refresh(&state.pool, &state.api_semaphore)
+ .await?
+ .ok_or(crate::ErrorKind::NotLoggedIn)?;
+ let _permit = state.api_semaphore.0.acquire().await?;
+ let base_url = service_base_url();
+ let path = format!("/instances/{instance_id}/server-icon");
+ let mut request = shared_instances_client(base_url)
+ .get(service_url(base_url, &path))
+ .bearer_auth(credentials.session)
+ .timeout(std::time::Duration::from_secs(15));
+ if let Some(etag) = etag {
+ request = request.header(reqwest::header::IF_NONE_MATCH, etag);
+ }
+ request
+ .send()
+ .await
+ .map_err(|error| error.without_url())
+ .context(ErrorKind::SharedInstancesApiError)
+}
+
pub(super) async fn get_latest_remote_version(
shared_instance_id: &str,
state: &State,
@@ -338,25 +432,6 @@ pub(super) async fn get_latest_remote_version(
.await?
{
SharedInstanceRemoteResponse::Available(version) => Ok(version),
- SharedInstanceRemoteResponse::Unavailable(
- reason @ SharedInstanceUnavailableReason::AccessRevoked,
- ) => {
- if !accept_pending_remote_invite(shared_instance_id, state).await? {
- return Err(shared_instance_unavailable_error(reason));
- }
-
- match get_latest_remote_version_optional_unavailable(
- shared_instance_id,
- state,
- )
- .await?
- {
- SharedInstanceRemoteResponse::Available(version) => Ok(version),
- SharedInstanceRemoteResponse::Unavailable(reason) => {
- Err(shared_instance_unavailable_error(reason))
- }
- }
- }
SharedInstanceRemoteResponse::Unavailable(reason) => {
Err(shared_instance_unavailable_error(reason))
}
@@ -554,7 +629,7 @@ pub(super) async fn get_shared_instance_invite_info(
) -> crate::Result {
let operation = "get_instance_invite";
let method = Method::GET;
- let path = format!("/invites/{invite_id}");
+ let path = format!("/invites/{invite_id}?version=true");
let log_path = "/invites/:invite_id";
let response = send_request_with_auth_and_log_path(
operation,
diff --git a/packages/app-lib/src/api/instance/shared/content.rs b/packages/app-lib/src/api/instance/shared/content.rs
index 1907cc3246b..1d2e15dea52 100644
--- a/packages/app-lib/src/api/instance/shared/content.rs
+++ b/packages/app-lib/src/api/instance/shared/content.rs
@@ -1,13 +1,22 @@
use super::client::{
ExternalFileResponse, InstanceVersionResponse, get_remote_version,
};
+use super::diff::shared_external_file_key;
+use super::publish::dedupe_strings;
use super::*;
+use crate::api::pack::install_from::{
+ EnvType, PackDependency, PackFileHash, PackFormat,
+};
+use crate::state::{DependencyType, SideType};
+use crate::util::fetch::{DownloadMeta, DownloadReason};
use std::collections::BTreeMap;
const CONFIG_VERSION_FETCH_CONCURRENCY: usize = 4;
/// Config files are published as deltas, so a member needs every config
/// uploaded after `applied_version`, keeping the newest upload of each path.
+/// Configs from before the latest `backtrack_version` change are skipped, as
+/// they may belong to content that is no longer installed.
pub(super) async fn remote_shared_config_files(
shared_instance_id: &str,
applied_version: Option,
@@ -16,22 +25,43 @@ pub(super) async fn remote_shared_config_files(
) -> crate::Result> {
use futures::{StreamExt, TryStreamExt};
- let first = applied_version.map_or(1, |version| version.saturating_add(1));
+ // The first published version is 0, after the backend's unready
+ // placeholder version -1.
+ let first = applied_version.map_or(0, |version| version.saturating_add(1));
let intermediate = futures::stream::iter(first..latest.version)
.map(|version| get_remote_version(shared_instance_id, version, state))
.buffered(CONFIG_VERSION_FETCH_CONCURRENCY)
.try_collect::>()
.await?;
+ let versions = intermediate
+ .iter()
+ .flatten()
+ .chain((first <= latest.version).then_some(latest))
+ .collect::>();
newest_config_files(
- intermediate
- .iter()
- .flatten()
- .chain((first <= latest.version).then_some(latest))
- .map(|version| version.external_files.as_slice()),
+ since_backtrack_version_change(
+ &versions,
+ latest.backtrack_version.as_deref(),
+ )
+ .iter()
+ .map(|version| version.external_files.as_slice()),
)
}
+fn since_backtrack_version_change<'a>(
+ versions: &'a [&'a InstanceVersionResponse],
+ backtrack_version: Option<&str>,
+) -> &'a [&'a InstanceVersionResponse] {
+ let start = versions
+ .iter()
+ .rposition(|version| {
+ version.backtrack_version.as_deref() != backtrack_version
+ })
+ .map_or(0, |index| index + 1);
+ &versions[start..]
+}
+
/// Takes each version's external files in ascending version order. A legacy
/// config bundle is a full snapshot, so it replaces every older config. The
/// bundle comes first so newer individual files are written over it.
@@ -87,6 +117,256 @@ fn ensure_config_limits(
Ok(())
}
+pub(crate) struct SharedModpackFile {
+ pub relative_path: String,
+ pub sha1: Option,
+ pub version_id: Option,
+ removed_path_alias: Option,
+}
+
+impl SharedModpackFile {
+ pub(crate) fn is_removed(
+ &self,
+ removed_files: &[SharedInstanceRemovedFile],
+ ) -> bool {
+ removed_files.iter().any(|removed| {
+ removed.matches(self.version_id.as_deref(), &self.relative_path)
+ || self
+ .removed_path_alias
+ .as_deref()
+ .is_some_and(|path| removed.matches(None, path))
+ })
+ }
+}
+
+/// Reads the client content from the cached pack archive, including unresolved overrides.
+#[tracing::instrument(skip(state))]
+pub(crate) async fn shared_modpack_files(
+ modpack_id: &str,
+ state: &State,
+) -> crate::Result> {
+ let version = CachedEntry::get_version(
+ modpack_id,
+ Some(CacheBehaviour::MustRevalidate),
+ &state.pool,
+ &state.api_semaphore,
+ )
+ .await?
+ .ok_or(crate::ErrorKind::InputError(
+ "shared instance modpack version was not found".to_string(),
+ ))?;
+ let file = version
+ .files
+ .iter()
+ .find(|file| file.primary)
+ .or_else(|| version.files.first())
+ .ok_or(crate::ErrorKind::InputError(
+ "shared instance modpack has no files".to_string(),
+ ))?;
+ let download_meta = DownloadMeta {
+ reason: DownloadReason::Modpack,
+ game_version: version
+ .game_versions
+ .first()
+ .cloned()
+ .unwrap_or_default(),
+ loader: version.loaders.first().cloned().unwrap_or_default(),
+ dependent_on: Some(modpack_id.to_string()),
+ };
+ let archive = crate::util::fetch::fetch_content_file(
+ state,
+ &[&file.url],
+ file.hashes.get("sha512").map(String::as_str),
+ Some(u64::from(file.size)),
+ Some(&download_meta),
+ None,
+ )
+ .await?;
+ let archive_path = archive.path().to_path_buf();
+ let (manifest, override_hashes) =
+ tokio::task::spawn_blocking(move || -> crate::Result<_> {
+ use std::io::Read;
+
+ let mut zip = zip::ZipArchive::new(std::io::BufReader::new(
+ std::fs::File::open(archive_path)?,
+ ))?;
+ let mut manifest_index = None;
+ let mut overrides = Vec::new();
+ for index in 0..zip.len() {
+ let entry = zip.by_index_raw(index)?;
+ let Ok(filename) = entry.name() else {
+ continue;
+ };
+ if filename == "modrinth.index.json" {
+ manifest_index.get_or_insert(index);
+ } else if let Some(path) = filename
+ .strip_prefix("overrides/")
+ .or_else(|| filename.strip_prefix("client-overrides/"))
+ && is_content_path(path)
+ {
+ overrides.push((index, path.to_string()));
+ }
+ }
+ let manifest_index =
+ manifest_index.ok_or(crate::ErrorKind::InputError(
+ "no modrinth.index.json found in shared modpack"
+ .to_string(),
+ ))?;
+ let mut manifest = String::new();
+ zip.by_index(manifest_index)?
+ .read_to_string(&mut manifest)?;
+ let mut buffer = vec![0_u8; 256 * 1024];
+ let mut override_hashes = Vec::with_capacity(overrides.len());
+ for (index, path) in overrides {
+ let mut reader = zip.by_index(index)?;
+ let mut hash = sha1_smol::Sha1::new();
+ loop {
+ let read = reader.read(&mut buffer)?;
+ if read == 0 {
+ break;
+ }
+ hash.update(&buffer[..read]);
+ }
+ override_hashes.push((path, hash.hexdigest()));
+ }
+ Ok((manifest, override_hashes))
+ })
+ .await??;
+ let pack: PackFormat = serde_json::from_str(&manifest)?;
+ let default_parent = if pack
+ .dependencies
+ .keys()
+ .any(|loader| *loader != PackDependency::Minecraft)
+ {
+ "mods"
+ } else {
+ "datapacks"
+ };
+ let unresolved_basenames = version
+ .dependencies
+ .iter()
+ .filter(|dependency| {
+ matches!(dependency.dependency_type, DependencyType::Embedded)
+ && dependency.version_id.is_none()
+ })
+ .filter_map(|dependency| dependency.file_name.as_deref())
+ .filter(|filename| !filename.contains('/'))
+ .collect::>();
+ let mut files = BTreeMap::new();
+ for file in pack.files {
+ if file.env.as_ref().is_some_and(|env| {
+ env.get(&EnvType::Client) == Some(&SideType::Unsupported)
+ }) {
+ continue;
+ }
+ let path = file.path.as_str();
+ if is_content_path(path) {
+ files.insert(
+ path.to_string(),
+ file.hashes.get(&PackFileHash::Sha1).cloned(),
+ );
+ }
+ }
+ for (path, hash) in override_hashes {
+ files.insert(path, Some(hash));
+ }
+ let hashes = files
+ .values()
+ .filter_map(|hash| hash.as_deref())
+ .collect::>();
+ let metadata = CachedEntry::get_file_many(
+ &hashes,
+ Some(CacheBehaviour::MustRevalidate),
+ &state.pool,
+ &state.api_semaphore,
+ )
+ .await?
+ .into_iter()
+ .map(|file| (file.hash.clone(), file))
+ .collect::>();
+ Ok(files
+ .into_iter()
+ .map(|(relative_path, hash)| {
+ let metadata = hash.as_ref().and_then(|hash| metadata.get(hash));
+ // Hosting uses the loader's default directory when Labrinth supplies only an unresolved basename.
+ let removed_path_alias =
+ relative_path.rsplit_once('/').and_then(|(_, filename)| {
+ unresolved_basenames
+ .contains(filename)
+ .then(|| format!("{default_parent}/{filename}"))
+ });
+ SharedModpackFile {
+ relative_path,
+ sha1: hash,
+ version_id: metadata.map(|file| file.version_id.clone()),
+ removed_path_alias,
+ }
+ })
+ .collect())
+}
+
+fn is_content_path(path: &str) -> bool {
+ crate::state::content_store::is_managed_content_path(path)
+ && !path.ends_with(".disabled")
+}
+
+pub(super) async fn remote_shared_content(
+ version: &InstanceVersionResponse,
+ state: &State,
+) -> crate::Result<(Vec, BTreeSet)> {
+ version.validate_removed_files()?;
+ let mut version_ids = version
+ .modrinth_ids
+ .iter()
+ .filter(|id| version.modpack_id.as_deref() != Some(id.as_str()))
+ .cloned()
+ .collect::>();
+ let mut external_files = version
+ .external_files
+ .iter()
+ .filter(|file| {
+ !matches!(
+ file.file_type.as_str(),
+ CONFIG_BUNDLE_FILE_TYPE | CONFIG_FILE_TYPE
+ )
+ })
+ .map(|file| shared_external_file_key(&file.file_type, &file.file_name))
+ .collect::>>()?;
+ let explicit_paths = version
+ .external_files
+ .iter()
+ .filter_map(|file| {
+ ProjectType::from_name(&file.file_type)
+ .map(|kind| format!("{}/{}", kind.get_folder(), file.file_name))
+ })
+ .collect::>();
+ if let Some(modpack_id) =
+ version.modpack_id.as_deref().filter(|id| !id.is_empty())
+ {
+ for file in shared_modpack_files(modpack_id, state).await? {
+ if file.is_removed(&version.removed_files)
+ || explicit_paths.contains(&file.relative_path)
+ {
+ continue;
+ }
+ if let Some(version_id) = file.version_id {
+ version_ids.push(version_id);
+ } else if let Some((parent, filename)) =
+ file.relative_path.split_once('/')
+ {
+ external_files.insert(ExternalFileKey {
+ content_type: ProjectType::from_name(parent)
+ .expect("pack content path was validated")
+ .into(),
+ path: filename.to_string(),
+ });
+ }
+ }
+ }
+ dedupe_strings(&mut version_ids);
+ Ok((version_ids, external_files))
+}
+
#[cfg(test)]
mod tests {
use super::*;
@@ -99,7 +379,7 @@ mod tests {
ExternalFileResponse {
file_name: file_name.to_string(),
file_type: file_type.to_string(),
- url: url.to_string(),
+ url: Some(url.to_string()),
file_size: Some(1),
sha1: None,
}
@@ -112,7 +392,7 @@ mod tests {
(
file.file_type.as_str(),
file.file_name.as_str(),
- file.url.as_str(),
+ file.url.as_deref().unwrap_or_default(),
)
})
.collect()
@@ -180,6 +460,73 @@ mod tests {
);
}
+ fn version(
+ version: i32,
+ backtrack_version: Option<&str>,
+ ) -> InstanceVersionResponse {
+ serde_json::from_value(serde_json::json!({
+ "version": version,
+ "ready": true,
+ "backtrack_version": backtrack_version,
+ "game_version": "1.20.1",
+ "loader": "forge",
+ "loader_version": "47.0.0",
+ }))
+ .unwrap()
+ }
+
+ fn version_numbers(versions: &[&InstanceVersionResponse]) -> Vec {
+ versions.iter().map(|version| version.version).collect()
+ }
+
+ #[test]
+ fn backtracking_stops_at_backtrack_version_change() {
+ let versions = [
+ version(1, None),
+ version(2, Some("123")),
+ version(3, Some("123")),
+ ];
+ let versions = versions.iter().collect::>();
+
+ assert_eq!(
+ version_numbers(since_backtrack_version_change(
+ &versions,
+ Some("123")
+ )),
+ [2, 3]
+ );
+ }
+
+ #[test]
+ fn backtracking_uses_latest_backtrack_version_change() {
+ let versions = [
+ version(1, Some("123")),
+ version(2, None),
+ version(3, Some("123")),
+ version(4, Some("123")),
+ ];
+ let versions = versions.iter().collect::>();
+
+ assert_eq!(
+ version_numbers(since_backtrack_version_change(
+ &versions,
+ Some("123")
+ )),
+ [3, 4]
+ );
+ }
+
+ #[test]
+ fn backtracking_is_unchanged_without_backtrack_versions() {
+ let versions = [version(1, None), version(2, None)];
+ let versions = versions.iter().collect::>();
+
+ assert_eq!(
+ version_numbers(since_backtrack_version_change(&versions, None)),
+ [1, 2]
+ );
+ }
+
#[test]
fn newest_bundle_wins() {
let v1 = [file(CONFIG_BUNDLE_FILE_TYPE, "configs.zip", "v1")];
diff --git a/packages/app-lib/src/api/instance/shared/diff.rs b/packages/app-lib/src/api/instance/shared/diff.rs
index d01f0c07084..132b095092e 100644
--- a/packages/app-lib/src/api/instance/shared/diff.rs
+++ b/packages/app-lib/src/api/instance/shared/diff.rs
@@ -1,9 +1,12 @@
use super::client::*;
+use super::content::remote_shared_content;
use super::publish::*;
use super::types::*;
use super::*;
use std::collections::BTreeMap;
+const CONFIG_HASH_CONCURRENCY: usize = 16;
+
struct SharedContentSnapshot {
version_ids: Vec,
external_files: BTreeSet,
@@ -18,16 +21,15 @@ pub(super) async fn shared_instance_update_diffs(
) -> crate::Result> {
let before_configuration = local_configuration(metadata);
let after_configuration = remote_configuration(version);
- let modpack_unlinked = before_configuration.modpack_version_id.is_some()
- && after_configuration.modpack_version_id.is_none();
let (version_ids, external_files) =
- current_shared_content(metadata, modpack_unlinked, state).await?;
+ current_shared_content(metadata, state).await?;
let before = SharedContentSnapshot {
version_ids,
external_files,
configuration: before_configuration,
};
- let (version_ids, external_files) = remote_shared_content(version)?;
+ let (version_ids, external_files) =
+ remote_shared_content(version, state).await?;
let after = SharedContentSnapshot {
version_ids,
external_files,
@@ -44,11 +46,10 @@ pub(super) async fn shared_instance_update_diffs(
state,
)
.await?;
- let config_file_count = config_files
- .iter()
- .filter(|file| file.file_type == CONFIG_FILE_TYPE)
- .count();
- if config_file_count > 0 {
+ let config_file_names =
+ changed_config_files(&metadata.instance.id, config_files, state)
+ .await?;
+ if !config_file_names.is_empty() {
diffs.push(SharedInstanceUpdateDiff {
type_: SharedInstanceUpdateDiffType::ConfigFilesUpdated,
project_id: None,
@@ -56,13 +57,68 @@ pub(super) async fn shared_instance_update_diffs(
file_name: None,
current_version_name: None,
new_version_name: None,
- config_file_count: Some(config_file_count),
+ config_file_count: Some(config_file_names.len()),
+ config_file_names,
disabled: false,
});
}
Ok(diffs)
}
+/// Shared config files that differ from the instance's copy on disk. Files the
+/// server sent without a hash, or that cannot be checked, count as changed.
+async fn changed_config_files(
+ instance_id: &str,
+ config_files: &[ExternalFileResponse],
+ state: &State,
+) -> crate::Result> {
+ use futures::StreamExt;
+
+ let config_files = config_files
+ .iter()
+ .filter(|file| file.file_type == CONFIG_FILE_TYPE)
+ .collect::>();
+ if config_files.is_empty() {
+ return Ok(Vec::new());
+ }
+ let writer =
+ crate::api::instance::InstanceFileWriter::new(state, instance_id)
+ .await?;
+ let checks = config_files
+ .into_iter()
+ .map(|file| changed_config_file_name(&writer, state, file))
+ .collect::>();
+ let mut changed = futures::stream::iter(checks)
+ .buffer_unordered(CONFIG_HASH_CONCURRENCY)
+ .filter_map(std::future::ready)
+ .collect::>()
+ .await;
+ changed.sort();
+ Ok(changed)
+}
+
+async fn changed_config_file_name(
+ writer: &crate::api::instance::InstanceFileWriter,
+ state: &State,
+ file: &ExternalFileResponse,
+) -> Option {
+ let Some(file_size) =
+ file.file_size.and_then(|size| u64::try_from(size).ok())
+ else {
+ return Some(file.file_name.clone());
+ };
+ let is_current = crate::install::instance_has_shared_file(
+ writer,
+ state,
+ &file.file_name,
+ file_size,
+ file.sha1.as_deref(),
+ )
+ .await
+ .unwrap_or(false);
+ (!is_current).then(|| file.file_name.clone())
+}
+
pub(super) async fn shared_instance_publish_diffs(
metadata: &crate::state::InstanceMetadata,
version: &InstanceVersionResponse,
@@ -71,10 +127,8 @@ pub(super) async fn shared_instance_publish_diffs(
) -> crate::Result> {
let before_configuration = remote_configuration(version);
let after_configuration = local_configuration(metadata);
- let modpack_unlinked = before_configuration.modpack_version_id.is_some()
- && after_configuration.modpack_version_id.is_none();
let (version_ids, external_files) =
- remote_publish_content(version, modpack_unlinked, state).await?;
+ remote_shared_content(version, state).await?;
let before = SharedContentSnapshot {
version_ids,
external_files,
@@ -82,7 +136,7 @@ pub(super) async fn shared_instance_publish_diffs(
};
let after = SharedContentSnapshot {
version_ids: snapshot
- .version_ids
+ .effective_version_ids
.iter()
.filter(|id| {
after_configuration.modpack_version_id.as_deref()
@@ -182,6 +236,7 @@ async fn shared_configuration_diffs(
.map(|details| details.version_name),
new_version_name: new.map(|details| details.version_name),
config_file_count: None,
+ config_file_names: Vec::new(),
disabled: false,
});
}
@@ -217,6 +272,7 @@ pub(super) fn configuration_diff(
current_version_name,
new_version_name,
config_file_count: None,
+ config_file_names: Vec::new(),
disabled: false,
}
}
@@ -403,6 +459,7 @@ async fn shared_content_diffs(
current_version_name: Some(id.clone()),
new_version_name: None,
config_file_count: None,
+ config_file_names: Vec::new(),
disabled: false,
})
.collect::>();
@@ -437,6 +494,7 @@ async fn shared_content_diffs(
project_id: Some(project_id),
file_name: None,
config_file_count: None,
+ config_file_names: Vec::new(),
disabled,
});
}
@@ -451,6 +509,7 @@ async fn shared_content_diffs(
current_version_name: None,
new_version_name: None,
config_file_count: None,
+ config_file_names: Vec::new(),
disabled,
});
}
@@ -490,25 +549,3 @@ pub(super) fn shared_external_file_key(
path: path.to_string(),
})
}
-
-fn remote_shared_content(
- version: &InstanceVersionResponse,
-) -> crate::Result<(Vec, BTreeSet)> {
- let mut version_ids = version.modrinth_ids.clone();
- if let Some(modpack_id) = version.modpack_id.as_deref() {
- version_ids.retain(|id| id != modpack_id);
- }
- dedupe_strings(&mut version_ids);
- let external_files = version
- .external_files
- .iter()
- .filter(|file| {
- !matches!(
- file.file_type.as_str(),
- CONFIG_BUNDLE_FILE_TYPE | CONFIG_FILE_TYPE
- )
- })
- .map(|file| shared_external_file_key(&file.file_type, &file.file_name))
- .collect::>()?;
- Ok((version_ids, external_files))
-}
diff --git a/packages/app-lib/src/api/instance/shared/icons.rs b/packages/app-lib/src/api/instance/shared/icons.rs
new file mode 100644
index 00000000000..e61f7037371
--- /dev/null
+++ b/packages/app-lib/src/api/instance/shared/icons.rs
@@ -0,0 +1,119 @@
+use super::client::{get_remote_server_icon, shared_instances_request_error};
+use super::*;
+use std::path::PathBuf;
+
+#[derive(Serialize, Deserialize)]
+struct CachedServerIcon {
+ filename: String,
+ etag: Option,
+}
+
+#[tracing::instrument]
+pub async fn cache_shared_instance_server_icon(
+ instance_id: &str,
+) -> crate::Result> {
+ let state = State::get().await?;
+ shared_instance_server_icon(instance_id, &state).await
+}
+
+#[tracing::instrument(skip(state))]
+pub(super) async fn shared_instance_server_icon(
+ instance_id: &str,
+ state: &State,
+) -> crate::Result> {
+ let credentials =
+ ModrinthCredentials::get_and_refresh(&state.pool, &state.api_semaphore)
+ .await?
+ .ok_or(crate::ErrorKind::NotLoggedIn)?;
+ let key = sha1_smol::Sha1::from(
+ format!("{}:{instance_id}", credentials.user_id).as_bytes(),
+ )
+ .hexdigest();
+ let icons = state.directories.caches_dir().join("icons");
+ let mapping = icons.join(format!("shared-server-{key}.json"));
+ let cached = if tokio::fs::metadata(&mapping)
+ .await
+ .is_ok_and(|metadata| metadata.len() <= 1024)
+ {
+ tokio::fs::read(&mapping).await.ok().and_then(|bytes| {
+ serde_json::from_slice::(&bytes).ok()
+ })
+ } else {
+ None
+ };
+ let cached = match cached {
+ Some(cached)
+ if cached.filename.len() == 44
+ && cached.filename.ends_with(".png")
+ && cached.filename.as_bytes()[..40]
+ .iter()
+ .all(u8::is_ascii_hexdigit)
+ && tokio::fs::try_exists(icons.join(&cached.filename))
+ .await? =>
+ {
+ Some(cached)
+ }
+ _ => None,
+ };
+ let mut response = get_remote_server_icon(
+ instance_id,
+ cached.as_ref().and_then(|cached| cached.etag.as_deref()),
+ state,
+ )
+ .await?;
+ if response.status() == StatusCode::NOT_FOUND {
+ if tokio::fs::try_exists(&mapping).await? {
+ tokio::fs::remove_file(&mapping).await?;
+ }
+ return Ok(None);
+ }
+ if response.status() == StatusCode::NOT_MODIFIED
+ && let Some(cached) = cached
+ {
+ return Ok(Some(
+ crate::util::io::canonicalize(icons.join(cached.filename))?
+ .to_string_lossy()
+ .to_string(),
+ ));
+ }
+ if !response.status().is_success() {
+ return shared_instances_request_error(
+ "get_instance_server_icon",
+ Method::GET,
+ &format!("/instances/{instance_id}/server-icon"),
+ response,
+ )
+ .await;
+ }
+ let etag = response
+ .headers()
+ .get(reqwest::header::ETAG)
+ .and_then(|value| value.to_str().ok())
+ .map(str::to_string);
+ let mut bytes = Vec::new();
+ while let Some(chunk) = response.chunk().await? {
+ if bytes.len() + chunk.len() > 4 * 1024 * 1024 {
+ bail!(crate::ErrorKind::InputError(
+ "server icons must be at most 4 MiB".to_string(),
+ ));
+ }
+ bytes.extend_from_slice(&chunk);
+ }
+ let path: PathBuf =
+ crate::api::instance::cache_icon(bytes::Bytes::from(bytes), state)
+ .await?;
+ let filename = path
+ .file_name()
+ .ok_or(crate::ErrorKind::InputError(
+ "cached server icon has no filename".to_string(),
+ ))?
+ .to_string_lossy()
+ .to_string();
+ crate::util::fetch::write(
+ &mapping,
+ &serde_json::to_vec(&CachedServerIcon { filename, etag })?,
+ &state.io_semaphore,
+ )
+ .await?;
+ Ok(Some(path.to_string_lossy().to_string()))
+}
diff --git a/packages/app-lib/src/api/instance/shared/install.rs b/packages/app-lib/src/api/instance/shared/install.rs
index 2c45dcd4c14..39965f73b7a 100644
--- a/packages/app-lib/src/api/instance/shared/install.rs
+++ b/packages/app-lib/src/api/instance/shared/install.rs
@@ -1,6 +1,7 @@
use super::client::*;
-use super::content::remote_shared_config_files;
+use super::content::{remote_shared_config_files, remote_shared_content};
use super::diff::*;
+use super::icons::shared_instance_server_icon;
use super::publish::*;
use super::types::*;
use super::*;
@@ -13,6 +14,27 @@ pub async fn install_shared_instance(
server_manager_name: Option,
server_manager_icon_url: Option,
instance_icon_url: Option,
+) -> crate::Result {
+ crate::util::fetch::wait_for_local_api_rate_limit(Box::pin(
+ install_shared_instance_inner(
+ shared_instance_id,
+ name,
+ manager_id,
+ server_manager_name,
+ server_manager_icon_url,
+ instance_icon_url,
+ ),
+ ))
+ .await
+}
+
+async fn install_shared_instance_inner(
+ shared_instance_id: &str,
+ name: String,
+ manager_id: Option,
+ server_manager_name: Option,
+ server_manager_icon_url: Option,
+ instance_icon_url: Option,
) -> crate::Result {
let state = State::get().await?;
let version = get_latest_remote_version(shared_instance_id, &state).await?;
@@ -48,6 +70,16 @@ pub(super) fn shared_instance_invite_install_name(
pub async fn get_shared_instance_install_preview(
shared_instance_id: &str,
name: String,
+) -> crate::Result {
+ crate::util::fetch::wait_for_local_api_rate_limit(
+ get_shared_instance_install_preview_inner(shared_instance_id, name),
+ )
+ .await
+}
+
+async fn get_shared_instance_install_preview_inner(
+ shared_instance_id: &str,
+ name: String,
) -> crate::Result {
let state = State::get().await?;
let version = get_latest_remote_version(shared_instance_id, &state).await?;
@@ -61,23 +93,23 @@ pub async fn get_shared_instance_install_preview(
}
#[tracing::instrument(skip(invite_id))]
-pub async fn accept_shared_instance_invite_for_install(
+pub async fn get_shared_instance_invite_install_preview(
invite_id: &str,
) -> crate::Result {
let state = State::get().await?;
let invite = get_shared_instance_invite_info(invite_id, &state).await?;
let shared_instance_id = invite.instance_id;
let instance_icon_url = invite.instance_icon;
+ let inviter = invite.inviter;
let (manager_id, server_manager_name, server_manager_icon_url) =
shared_instance_invite_manager(invite.managers);
let name = shared_instance_invite_install_name(
&shared_instance_id,
invite.instance_name,
);
- accept_shared_instance_invite(&shared_instance_id, invite_id, &state)
- .await?;
- let version =
- get_latest_remote_version(&shared_instance_id, &state).await?;
+ let version = invite.version.ok_or(crate::ErrorKind::InputError(
+ "invite preview has no ready version".to_string(),
+ ))?;
let mut preview = shared_instance_install_preview_from_version(
shared_instance_id.clone(),
name,
@@ -91,6 +123,7 @@ pub async fn accept_shared_instance_invite_for_install(
Ok(SharedInstanceInviteInstallPreview {
shared_instance_id,
+ inviter,
manager_id,
server_manager_name,
server_manager_icon_url,
@@ -99,6 +132,26 @@ pub async fn accept_shared_instance_invite_for_install(
})
}
+#[tracing::instrument(skip(invite_id))]
+pub async fn accept_shared_instance_invite_for_install(
+ shared_instance_id: &str,
+ invite_id: &str,
+) -> crate::Result<()> {
+ let state = State::get().await?;
+ match get_remote_instance_access(shared_instance_id, &state).await? {
+ SharedInstanceRemoteResponse::Available(_) => Ok(()),
+ SharedInstanceRemoteResponse::Unavailable(
+ SharedInstanceUnavailableReason::AccessRevoked,
+ ) => {
+ accept_shared_instance_invite(shared_instance_id, invite_id, &state)
+ .await
+ }
+ SharedInstanceRemoteResponse::Unavailable(reason) => {
+ Err(shared_instance_unavailable_error(reason))
+ }
+ }
+}
+
pub(super) fn shared_instance_invite_manager(
managers: Vec,
) -> (Option, Option, Option) {
@@ -123,36 +176,19 @@ pub(super) async fn shared_instance_install_preview_from_version(
"" => "Shared instance".to_string(),
name => name.to_string(),
};
- let mut content_version_ids = version.modrinth_ids.clone();
- let mut seen_content_version_ids = HashSet::new();
- content_version_ids
- .retain(|id| seen_content_version_ids.insert(id.clone()));
let modpack = shared_instance_install_modpack(&version, state).await?;
- let modpack_dependency_count = modpack
- .as_ref()
- .map(|modpack| modpack.dependency_count)
- .unwrap_or_default();
+ let (content_version_ids, effective_external_files) =
+ remote_shared_content(&version, state).await?;
let modpack_version_id =
modpack.as_ref().map(|modpack| modpack.version_id.clone());
- if let Some(modpack_version_id) = modpack_version_id.as_deref() {
- content_version_ids.retain(|id| id != modpack_version_id);
- }
let icon_url = modpack
.as_ref()
.and_then(|modpack| modpack.icon_url.clone());
-
- let external_files = version
- .external_files
- .iter()
- .filter(|file| {
- !matches!(
- file.file_type.as_str(),
- CONFIG_BUNDLE_FILE_TYPE | CONFIG_FILE_TYPE
- )
- })
+ let external_files = effective_external_files
+ .into_iter()
.map(|file| SharedInstanceExternalFilePreview {
- file_name: file.file_name.clone(),
- file_type: file.file_type.clone(),
+ file_name: file.path,
+ file_type: file.content_type.as_str().to_string(),
})
.collect::>();
let external_file_count = external_files.len();
@@ -164,19 +200,27 @@ pub(super) async fn shared_instance_install_preview_from_version(
icon_url,
game_version: version.game_version,
loader: version.loader,
- mod_count: modpack_dependency_count
- + content_version_ids.len()
- + external_file_count,
+ mod_count: content_version_ids.len() + external_file_count,
external_file_count,
modpack_version_id,
content_version_ids,
external_files,
+ removed_files: version.removed_files,
})
}
#[tracing::instrument]
pub async fn get_shared_instance_update_preview(
instance_id: &str,
+) -> crate::Result> {
+ crate::util::fetch::wait_for_local_api_rate_limit(
+ get_shared_instance_update_preview_inner(instance_id),
+ )
+ .await
+}
+
+async fn get_shared_instance_update_preview_inner(
+ instance_id: &str,
) -> crate::Result> {
let state = State::get().await?;
let metadata = crate::state::get_instance(instance_id, &state.pool)
@@ -214,6 +258,7 @@ pub async fn get_shared_instance_update_preview(
diffs: Vec::new(),
}));
}
+ version.validate_removed_files()?;
let update_available = attachment
.applied_version
@@ -221,7 +266,7 @@ pub async fn get_shared_instance_update_preview(
let diffs = if update_available {
let config_files = remote_shared_config_files(
&attachment.id,
- attachment.applied_version,
+ config_base_version(&attachment, &version),
&version,
&state,
)
@@ -266,15 +311,35 @@ pub(crate) async fn check_shared_instance_availability_before_launch(
}
};
- if let SharedInstanceRemoteResponse::Unavailable(reason) = availability {
- handle_unavailable_shared_instance_if_current_user(
+ let remote = match availability {
+ SharedInstanceRemoteResponse::Available(remote) => remote,
+ SharedInstanceRemoteResponse::Unavailable(reason) => {
+ handle_unavailable_shared_instance_if_current_user(
+ instance_id,
+ &attachment,
+ reason,
+ state,
+ )
+ .await?;
+ return Err(shared_instance_unavailable_error(reason));
+ }
+ };
+
+ if let Some(server) = remote.linked_server
+ && let Err(error) =
+ crate::api::worlds::ensure_managed_server_in_instance(
+ instance_id,
+ remote.name,
+ server.domain,
+ )
+ .await
+ {
+ tracing::warn!(
instance_id,
- &attachment,
- reason,
- state,
- )
- .await?;
- return Err(shared_instance_unavailable_error(reason));
+ shared_instance_id = %attachment.id,
+ error = %error,
+ "Could not update the linked server address before launch"
+ );
}
Ok(())
@@ -288,6 +353,13 @@ pub async fn update_shared_instance(
let metadata = crate::state::get_instance(instance_id, &state.pool)
.await?
.ok_or(crate::ErrorKind::InputError("unknown instance".to_string()))?;
+ member_attachment(&metadata)?;
+ crate::install::update_shared_instance(instance_id.to_string()).await
+}
+
+fn member_attachment(
+ metadata: &crate::state::InstanceMetadata,
+) -> crate::Result {
let attachment = metadata.shared_instance.clone().ok_or(
crate::ErrorKind::InputError(
"instance is not attached to a shared instance".to_string(),
@@ -299,11 +371,26 @@ pub async fn update_shared_instance(
.to_string(),
));
}
+ Ok(attachment)
+}
+
+/// Resolves the latest shared version into install data. Runs inside the update job,
+/// as it fetches every config delta and reads the pack archive.
+pub(crate) async fn shared_instance_update_data(
+ instance_id: &str,
+ state: &State,
+) -> crate::Result {
+ let metadata = crate::state::get_instance(instance_id, &state.pool)
+ .await?
+ .ok_or(crate::ErrorKind::InputError("unknown instance".to_string()))?;
+ let attachment = member_attachment(&metadata)?;
let version =
- get_latest_remote_member_version(instance_id, &attachment, &state)
+ get_latest_remote_member_version(instance_id, &attachment, state)
.await?;
- let data = shared_instance_install_data(
+ let fresh_start = backtrack_version_changed(&attachment, &version);
+ let applied_version = config_base_version(&attachment, &version);
+ let mut data = shared_instance_install_data(
&attachment.id,
attachment.manager_id.clone(),
attachment.server_manager_name.clone(),
@@ -311,11 +398,33 @@ pub async fn update_shared_instance(
None,
metadata.instance.name,
version,
- attachment.applied_version,
- &state,
+ applied_version,
+ state,
)
.await?;
- crate::install::update_shared_instance(instance_id.to_string(), data).await
+ data.fresh_start = fresh_start;
+ Ok(data)
+}
+
+/// Installing another modpack, or another version of it, makes the instance
+/// start over from the shared content published since then.
+fn backtrack_version_changed(
+ attachment: &SharedInstanceAttachment,
+ version: &InstanceVersionResponse,
+) -> bool {
+ attachment.applied_version.is_some()
+ && attachment.applied_backtrack_version != version.backtrack_version
+}
+
+fn config_base_version(
+ attachment: &SharedInstanceAttachment,
+ version: &InstanceVersionResponse,
+) -> Option {
+ if backtrack_version_changed(attachment, version) {
+ None
+ } else {
+ attachment.applied_version
+ }
}
pub(super) async fn ensure_ready_remote_version_for_invite(
@@ -447,6 +556,12 @@ pub(super) async fn handle_unavailable_shared_instance_if_current_user(
reason: SharedInstanceUnavailableReason,
state: &State,
) -> crate::Result<()> {
+ // A missing ID can belong to another API environment. Keep the attachment
+ // so opening a production instance in a staging build cannot unlink it.
+ if reason == SharedInstanceUnavailableReason::Deleted {
+ return Ok(());
+ }
+
if reason != SharedInstanceUnavailableReason::Quarantined
&& !shared_attachment_matches_current_user(attachment, state).await?
{
@@ -505,10 +620,16 @@ fn shared_instance_external_file_data(
)),
)?;
+ let url = file.url.filter(|url| !url.is_empty()).ok_or(
+ crate::ErrorKind::InputError(format!(
+ "shared instance external file {} is missing its download URL",
+ file.file_name
+ )),
+ )?;
Ok(SharedInstanceExternalFileData {
file_name: file.file_name,
file_type: file.file_type,
- url: file.url,
+ url,
file_size,
sha1: file.sha1,
})
@@ -525,6 +646,7 @@ pub(super) async fn shared_instance_install_data(
applied_version: Option,
state: &State,
) -> crate::Result {
+ version.validate_removed_files()?;
if !version.ready {
bail!(crate::ErrorKind::InputError(
"shared instance version is not ready to install".to_string(),
@@ -538,18 +660,62 @@ pub(super) async fn shared_instance_install_data(
)
.await?;
+ let remote =
+ match get_remote_instance_access(shared_instance_id, state).await? {
+ SharedInstanceRemoteResponse::Available(remote) => remote,
+ SharedInstanceRemoteResponse::Unavailable(reason) => {
+ return Err(shared_instance_unavailable_error(reason));
+ }
+ };
+ let (manager_id, server_manager_name, server_manager_icon_url) = if remote
+ .linked_server
+ .is_some()
+ {
+ let icon = match shared_instance_server_icon(shared_instance_id, state)
+ .await
+ {
+ Ok(icon) => icon,
+ Err(error) => {
+ tracing::warn!(%error, "Could not fetch shared instance server icon");
+ server_manager_icon_url
+ }
+ };
+ (None, Some(remote.name), icon)
+ } else {
+ (manager_id, server_manager_name, server_manager_icon_url)
+ };
+ let instance_icon_url = if remote.linked_server.is_some() {
+ server_manager_icon_url.clone()
+ } else if server_manager_name.is_some() {
+ instance_icon_url.or(remote.icon)
+ } else {
+ remote.icon.or(instance_icon_url)
+ };
+
let name = shared_instance_name(name);
let linked_user_id = linked_modrinth_user_id(state).await?;
let modpack = shared_instance_install_modpack(&version, state).await?;
let modpack_version_id =
modpack.as_ref().map(|modpack| modpack.version_id.as_str());
+ let inherited = if let Some(modpack_id) = modpack_version_id {
+ shared_modpack_files(modpack_id, state).await?
+ } else {
+ Vec::new()
+ };
let modrinth_ids = version
.modrinth_ids
.into_iter()
- .filter(|id| Some(id.as_str()) != modpack_version_id)
+ .filter(|id| {
+ Some(id.as_str()) != modpack_version_id
+ && !inherited.iter().any(|file| {
+ file.version_id.as_deref() == Some(id.as_str())
+ && !file.is_removed(&version.removed_files)
+ })
+ })
.collect();
Ok(SharedInstanceInstallData {
+ linked_server: remote.linked_server,
shared_instance_id: shared_instance_id.to_string(),
manager_id,
server_manager_name,
@@ -559,6 +725,7 @@ pub(super) async fn shared_instance_install_data(
name,
version: version.version,
modrinth_ids,
+ removed_files: version.removed_files,
external_files: version
.external_files
.into_iter()
@@ -575,6 +742,8 @@ pub(super) async fn shared_instance_install_data(
game_version: version.game_version,
loader: version.loader,
loader_version: shared_instance_loader_version(version.loader_version),
+ backtrack_version: version.backtrack_version,
+ fresh_start: false,
})
}
diff --git a/packages/app-lib/src/api/instance/shared/invites.rs b/packages/app-lib/src/api/instance/shared/invites.rs
index a984d5fb61e..4aaa50389d5 100644
--- a/packages/app-lib/src/api/instance/shared/invites.rs
+++ b/packages/app-lib/src/api/instance/shared/invites.rs
@@ -208,6 +208,16 @@ pub async fn accept_pending_shared_instance_invite(
) -> crate::Result<()> {
let state = State::get().await?;
+ match get_remote_instance_access(shared_instance_id, &state).await? {
+ SharedInstanceRemoteResponse::Available(_) => return Ok(()),
+ SharedInstanceRemoteResponse::Unavailable(
+ SharedInstanceUnavailableReason::AccessRevoked,
+ ) => {}
+ SharedInstanceRemoteResponse::Unavailable(reason) => {
+ return Err(shared_instance_unavailable_error(reason));
+ }
+ }
+
if accept_pending_remote_invite(shared_instance_id, &state).await? {
return Ok(());
}
diff --git a/packages/app-lib/src/api/instance/shared/mod.rs b/packages/app-lib/src/api/instance/shared/mod.rs
index 8e088825a0a..147c39b9f40 100644
--- a/packages/app-lib/src/api/instance/shared/mod.rs
+++ b/packages/app-lib/src/api/instance/shared/mod.rs
@@ -3,7 +3,7 @@ use crate::event::InstancePayloadType;
use crate::event::emit::emit_instance;
use crate::install::{
InstallJobSnapshot, SharedInstanceExternalFileData,
- SharedInstanceInstallData,
+ SharedInstanceInstallData, SharedInstanceRemovedFile,
};
use crate::state::instances::{InstanceLink, SharedInstanceAttachment};
use crate::state::{
@@ -125,8 +125,7 @@ pub(super) fn is_shareable_directory(path: &str) -> bool {
}
fn is_shareable_path(path: &str) -> bool {
- !path.split('/').any(|part| part.starts_with('.'))
- && super::export_mrpack::is_exportable_path(path)
+ super::export_mrpack::is_exportable_path(path)
}
fn is_content_folder(path: &str) -> bool {
@@ -177,19 +176,27 @@ pub(crate) fn read_bounded_config_bundle_entry(
mod client;
mod content;
mod diff;
+mod icons;
mod install;
mod invites;
mod publish;
mod report;
mod types;
-pub(crate) use self::install::check_shared_instance_availability_before_launch;
+pub(crate) use self::content::shared_modpack_files;
+pub use self::icons::cache_shared_instance_server_icon;
+pub(crate) use self::install::{
+ check_shared_instance_availability_before_launch,
+ shared_instance_update_data,
+};
pub(crate) use self::publish::sync_shared_instance_icon;
pub use self::install::{
accept_shared_instance_invite_for_install,
- get_shared_instance_install_preview, get_shared_instance_update_preview,
- install_shared_instance, update_shared_instance,
+ get_shared_instance_install_preview,
+ get_shared_instance_invite_install_preview,
+ get_shared_instance_update_preview, install_shared_instance,
+ update_shared_instance,
};
pub use self::invites::{
accept_pending_shared_instance_invite, create_shared_instance_invite_link,
@@ -204,11 +211,12 @@ pub use self::publish::{
pub use self::report::get_shared_instance_publish_support_details;
pub use self::types::{
SharedInstanceExternalFilePreview, SharedInstanceInstallPreview,
- SharedInstanceInvite, SharedInstanceInviteInstallPreview,
- SharedInstanceInviteLink, SharedInstanceJoinType,
- SharedInstancePublishFile, SharedInstancePublishPreview,
- SharedInstanceUpdateDiff, SharedInstanceUpdateDiffType,
- SharedInstanceUpdatePreview, SharedInstanceUser, SharedInstanceUsers,
+ SharedInstanceInvite, SharedInstanceInviteCreator,
+ SharedInstanceInviteInstallPreview, SharedInstanceInviteLink,
+ SharedInstanceJoinType, SharedInstancePublishFile,
+ SharedInstancePublishPreview, SharedInstanceUpdateDiff,
+ SharedInstanceUpdateDiffType, SharedInstanceUpdatePreview,
+ SharedInstanceUser, SharedInstanceUsers,
};
pub async fn can_active_user_use_shared_instances() -> crate::Result {
diff --git a/packages/app-lib/src/api/instance/shared/publish.rs b/packages/app-lib/src/api/instance/shared/publish.rs
index 230eb70678b..3c1ec1d71fb 100644
--- a/packages/app-lib/src/api/instance/shared/publish.rs
+++ b/packages/app-lib/src/api/instance/shared/publish.rs
@@ -176,94 +176,6 @@ pub async fn get_shared_instance_publish_preview(
}))
}
-pub(super) async fn remote_publish_content(
- version: &InstanceVersionResponse,
- include_modpack_dependencies: bool,
- state: &State,
-) -> crate::Result<(Vec, BTreeSet)> {
- let mut version_ids = version.modrinth_ids.clone();
- if let Some(modpack_id) =
- version.modpack_id.as_deref().filter(|id| !id.is_empty())
- {
- version_ids.retain(|id| id != modpack_id);
-
- if include_modpack_dependencies {
- extend_shared_modpack_dependencies(
- &mut version_ids,
- modpack_id,
- state,
- )
- .await?;
- }
- }
- dedupe_strings(&mut version_ids);
-
- Ok((
- version_ids,
- version
- .external_files
- .iter()
- .filter(|file| {
- !matches!(
- file.file_type.as_str(),
- CONFIG_BUNDLE_FILE_TYPE | CONFIG_FILE_TYPE
- )
- })
- .map(|file| {
- shared_external_file_key(&file.file_type, &file.file_name)
- })
- .collect::>()?,
- ))
-}
-
-pub(super) async fn modpack_dependency_version_ids(
- modpack_id: &str,
- state: &State,
-) -> crate::Result> {
- let modpack_version = CachedEntry::get_version(
- modpack_id,
- Some(CacheBehaviour::Bypass),
- &state.pool,
- &state.api_semaphore,
- )
- .await?
- .ok_or(crate::ErrorKind::InputError(
- "shared instance modpack version was not found".to_string(),
- ))?;
-
- Ok(modpack_version
- .dependencies
- .into_iter()
- .filter_map(|dependency| dependency.version_id)
- .collect())
-}
-
-/// Adds the modpack's dependencies to the list. If a project is already in the
-/// list, keep that version instead of the one bundled with the modpack.
-async fn extend_shared_modpack_dependencies(
- version_ids: &mut Vec,
- modpack_id: &str,
- state: &State,
-) -> crate::Result<()> {
- let dependency_ids =
- modpack_dependency_version_ids(modpack_id, state).await?;
- let (explicit, inherited) = tokio::try_join!(
- shared_versions_by_id(version_ids, false, state),
- shared_versions_by_id(&dependency_ids, false, state),
- )?;
- version_ids.extend(
- inherited
- .into_values()
- .filter(|version| {
- !explicit
- .values()
- .any(|installed| installed.project_id == version.project_id)
- })
- .map(|version| version.id),
- );
- Ok(())
-}
-
pub(super) async fn shared_instance_install_modpack(
version: &InstanceVersionResponse,
state: &State,
@@ -294,7 +206,6 @@ pub(super) async fn shared_instance_install_modpack(
Ok(Some(crate::install::SharedInstanceInstallModpack {
project_id: modpack_version.project_id,
version_id: modpack_version.id,
- dependency_count: modpack_version.dependencies.len(),
title: project
.as_ref()
.map(|project| project.title.clone())
@@ -311,63 +222,66 @@ pub(super) fn shared_instance_loader_version(
pub(super) async fn current_shared_content(
metadata: &crate::state::InstanceMetadata,
- include_linked_modpack_content: bool,
state: &State,
) -> crate::Result<(Vec, BTreeSet)> {
- let entries =
- crate::state::instances::adapters::sqlite::content_rows::get_content_entries(
- &metadata.applied_content_set.id,
- &state.pool,
- )
- .await?;
+ let entries = crate::state::instances::adapters::sqlite::content_rows::get_content_entries(
+ &metadata.applied_content_set.id, &state.pool,
+ ).await?;
let files = crate::state::instances::adapters::sqlite::content_rows::get_instance_files(
- &metadata.instance.id,
+ &metadata.instance.id, &state.pool,
+ ).await?.into_iter().map(|file| (file.id.clone(), file)).collect::>();
+ let unresolved_hashes = entries
+ .iter()
+ .filter(|entry| {
+ entry.source_kind == ContentSourceKind::ModrinthModpack
+ && entry.version_id.is_none()
+ })
+ .filter_map(|entry| entry.file_id.as_ref().and_then(|id| files.get(id)))
+ .filter(|file| file.enabled && !file.missing)
+ .map(|file| file.sha1.as_str())
+ .collect::>();
+ let resolved_files = CachedEntry::get_file_many(
+ &unresolved_hashes,
+ Some(CacheBehaviour::MustRevalidate),
&state.pool,
+ &state.api_semaphore,
)
.await?
.into_iter()
- .map(|file| (file.id.clone(), file))
+ .map(|file| (file.hash.clone(), file))
.collect::>();
let mut version_ids = Vec::new();
let mut external_files = BTreeSet::new();
-
for entry in entries {
- let include_entry = entry.source_kind
- == crate::state::ContentSourceKind::SharedInstance
- || (include_linked_modpack_content
- && entry.source_kind
- == crate::state::ContentSourceKind::ModrinthModpack);
- if !include_entry {
+ if !entry.source_kind.is_shared_instance_managed() || !entry.enabled {
continue;
}
-
- if let Some(version_id) = entry.version_id {
- version_ids.push(version_id);
- continue;
- }
-
- let Some(file_id) = entry.file_id else {
+ let Some(file) = entry.file_id.as_ref().and_then(|id| files.get(id))
+ else {
continue;
};
- if let Some(file) = files.get(&file_id) {
+ if !file.enabled || file.missing {
+ continue;
+ }
+ let version_id = entry.version_id.or_else(|| {
+ (entry.source_kind == ContentSourceKind::ModrinthModpack)
+ .then(|| {
+ resolved_files
+ .get(&file.sha1)
+ .map(|file| file.version_id.clone())
+ })
+ .flatten()
+ });
+ if let Some(version_id) = version_id {
+ version_ids.push(version_id);
+ } else {
external_files.insert(ExternalFileKey {
content_type: entry.project_type.into(),
- path: file.file_name.clone(),
+ path: enabled_file_name(&file.file_name),
});
}
}
- if include_linked_modpack_content
- && let Some(modpack_id) = shared_modpack_id(&metadata.link)
- {
- extend_shared_modpack_dependencies(
- &mut version_ids,
- &modpack_id,
- state,
- )
- .await?;
- }
dedupe_strings(&mut version_ids);
-
Ok((version_ids, external_files))
}
@@ -378,6 +292,8 @@ pub(super) struct CurrentPublishSnapshot {
pub(super) disabled_version_ids: Vec,
pub(super) disabled_external_files: BTreeSet,
pub(super) shared_files: Vec,
+ pub(super) removed_files: Vec,
+ pub(super) effective_version_ids: Vec,
}
/// Cached metadata can outlive a deleted or hidden version. Only publish version
@@ -412,6 +328,62 @@ pub(super) async fn collect_publish_snapshot(
Vec::new(),
)
};
+ let mut items = items;
+ let modpack_id = shared_modpack_id(&metadata.link);
+ let modpack_files = if let Some(modpack_id) = modpack_id.as_deref() {
+ let (managed, files) = tokio::try_join!(
+ crate::state::list_linked_modpack_content(
+ &metadata.instance.id,
+ None,
+ None,
+ state,
+ ),
+ shared_modpack_files(modpack_id, state),
+ )?;
+ items.extend(managed);
+ files
+ } else {
+ Vec::new()
+ };
+ let mut seen_paths = HashSet::new();
+ items.retain(|item| seen_paths.insert(item.file_path.clone()));
+ let enabled_versions = items
+ .iter()
+ .filter(|item| item.enabled)
+ .filter_map(|item| {
+ item.version.as_ref().map(|version| version.id.as_str())
+ })
+ .collect::>();
+ let enabled_paths = items
+ .iter()
+ .filter(|item| item.enabled)
+ .map(|item| item.file_path.trim_end_matches(".disabled"))
+ .collect::>();
+ let mut removed_files = Vec::new();
+ for file in &modpack_files {
+ if let Some(version_id) = &file.version_id {
+ if !enabled_versions.contains(version_id.as_str()) {
+ let removed = SharedInstanceRemovedFile::Version {
+ version_id: version_id.clone(),
+ };
+ if !removed_files.contains(&removed) {
+ removed_files.push(removed);
+ }
+ }
+ } else if !enabled_paths.contains(file.relative_path.as_str())
+ && let Some((parent, filename)) = file.relative_path.split_once('/')
+ {
+ removed_files.push(SharedInstanceRemovedFile::Path {
+ parent: parent.to_string(),
+ filename: filename.to_string(),
+ });
+ }
+ }
+ let inherited_versions = modpack_files
+ .iter()
+ .filter_map(|file| file.version_id.as_deref())
+ .collect::>();
+ let mut effective_version_ids = Vec::new();
let installed_version_ids = items
.iter()
.filter(|item| item.enabled)
@@ -429,7 +401,6 @@ pub(super) async fn collect_publish_snapshot(
.into_iter()
.map(|version| version.id)
.collect::>();
- let modpack_id = shared_modpack_id(&metadata.link);
let mut version_ids = Vec::new();
let mut seen_version_ids = HashSet::new();
let mut external_files = Vec::new();
@@ -445,7 +416,10 @@ pub(super) async fn collect_publish_snapshot(
&& available_version_ids.contains(&version.id)
{
if seen_version_ids.insert(version.id.clone()) {
- version_ids.push(version.id.clone());
+ effective_version_ids.push(version.id.clone());
+ if !inherited_versions.contains(version.id.as_str()) {
+ version_ids.push(version.id.clone());
+ }
}
continue;
}
@@ -503,6 +477,8 @@ pub(super) async fn collect_publish_snapshot(
disabled_version_ids,
disabled_external_files,
shared_files,
+ removed_files,
+ effective_version_ids,
})
}
@@ -798,6 +774,7 @@ pub(super) async fn publish_current_content(
"modrinth_ids": modrinth_ids,
"external_files": external_file_data,
"modpack_id": modpack_id,
+ "removed_files": snapshot.removed_files,
"game_version": metadata.applied_content_set.game_version.clone(),
"loader": metadata.applied_content_set.loader.as_str(),
"loader_version": metadata
@@ -1370,7 +1347,17 @@ async fn upload_external_file(
sha512: file_sha512,
..
} = file;
- let upload_url = url::Url::parse(&upload.url)
+ let upload_url_string = upload
+ .url
+ .as_deref()
+ .filter(|url| !url.is_empty())
+ .ok_or_else(|| {
+ crate::ErrorKind::InputError(format!(
+ "shared instance external file {} is missing its upload URL",
+ upload.file_name
+ ))
+ })?;
+ let upload_url = url::Url::parse(upload_url_string)
.context("invalid shared instance external file upload URL")?;
let reader = tokio::fs::File::open(content.path()).await?;
let body = reqwest::Body::wrap_stream(
@@ -1383,7 +1370,7 @@ async fn upload_external_file(
"upload_external_file",
Method::PUT,
upload_url.path(),
- &upload.url,
+ upload_url_string,
body,
Some(*size),
file_sha512_headers(Some(file_sha512))?,
@@ -1505,6 +1492,7 @@ pub(super) async fn shared_instance_for_invites(
linked_user_id,
status: ContentSetSyncStatus::Unknown,
applied_version: None,
+ applied_backtrack_version: None,
latest_version: None,
},
&state.pool,
diff --git a/packages/app-lib/src/api/instance/shared/types.rs b/packages/app-lib/src/api/instance/shared/types.rs
index da602d8f7b2..8573c17114d 100644
--- a/packages/app-lib/src/api/instance/shared/types.rs
+++ b/packages/app-lib/src/api/instance/shared/types.rs
@@ -80,6 +80,8 @@ pub struct SharedInstanceInstallPreview {
pub modpack_version_id: Option,
pub content_version_ids: Vec,
pub external_files: Vec,
+ #[serde(default)]
+ pub removed_files: Vec,
}
#[derive(Clone, Debug, Serialize, Deserialize)]
@@ -137,6 +139,7 @@ pub struct SharedInstanceInvite {
#[serde(rename_all = "camelCase")]
pub struct SharedInstanceInviteInstallPreview {
pub shared_instance_id: String,
+ pub inviter: Option,
pub manager_id: Option,
pub server_manager_name: Option,
pub server_manager_icon_url: Option,
@@ -144,6 +147,13 @@ pub struct SharedInstanceInviteInstallPreview {
pub preview: SharedInstanceInstallPreview,
}
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct SharedInstanceInviteCreator {
+ pub id: String,
+ pub name: String,
+ pub avatar: Option,
+}
+
#[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct SharedInstanceUpdateDiff {
@@ -156,6 +166,8 @@ pub struct SharedInstanceUpdateDiff {
pub new_version_name: Option,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub config_file_count: Option,
+ #[serde(default, skip_serializing_if = "Vec::is_empty")]
+ pub config_file_names: Vec,
#[serde(default, skip_serializing_if = "is_false")]
pub disabled: bool,
}
diff --git a/packages/app-lib/src/api/instance/synced_options/orchestration.rs b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
index 3423569dffa..77e89603ce1 100644
--- a/packages/app-lib/src/api/instance/synced_options/orchestration.rs
+++ b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
@@ -1135,9 +1135,10 @@ pub async fn reconcile_changed_file(
let state = State::get().await?;
let _guard = state.synced_options.lock().await;
apply_pending_changes(&state).await?;
- let metadata = crate::state::get_instance(instance_id, &state.pool)
- .await?
- .ok_or(ErrorKind::InputError("unknown instance".to_string()))?;
+ let metadata = crate::state::get_instance(instance_id, &state.pool).await?;
+ let Some(metadata) = metadata else {
+ return Ok(());
+ };
if sync_files_are_protected(&metadata) {
return Ok(());
}
diff --git a/packages/app-lib/src/api/instance/synced_servers/mod.rs b/packages/app-lib/src/api/instance/synced_servers/mod.rs
index bde48e11b14..9471438defe 100644
--- a/packages/app-lib/src/api/instance/synced_servers/mod.rs
+++ b/packages/app-lib/src/api/instance/synced_servers/mod.rs
@@ -7,6 +7,7 @@ mod types;
const SERVERS_FILE: &str = "servers.dat";
pub(crate) use self::codec::server_data;
+pub(crate) use self::modpack::discard_modpack_servers;
pub(crate) use self::modpack::{
MODPACK_SERVER_PATHS, capture_modpack_server_override,
};
diff --git a/packages/app-lib/src/api/instance/synced_servers/modpack.rs b/packages/app-lib/src/api/instance/synced_servers/modpack.rs
index 004b11ed1bc..11be3447d9f 100644
--- a/packages/app-lib/src/api/instance/synced_servers/modpack.rs
+++ b/packages/app-lib/src/api/instance/synced_servers/modpack.rs
@@ -1,6 +1,7 @@
use super::super::synced_options::{instance_dir, instance_is_running};
-use super::codec::{read_servers, servers_from_bytes};
-use super::operations::{compose_instance, participating};
+use super::SERVERS_FILE;
+use super::codec::{read_servers, servers_from_bytes, write_servers};
+use super::operations::{compose_instance, effective, participating};
use super::storage::{load_local, write_local_rows};
use super::types::{LocalServer, ServerSource};
use crate::state::{CachedEntry, InstanceLink, InstanceMetadata};
@@ -41,6 +42,49 @@ pub(crate) async fn capture_modpack_server_override(
Ok(())
}
+pub(crate) async fn discard_modpack_servers(
+ instance_id: &str,
+ state: &State,
+) -> crate::Result<()> {
+ let _guard = state.synced_options.lock().await;
+ let metadata = crate::state::get_instance(instance_id, &state.pool)
+ .await?
+ .ok_or(ErrorKind::InputError("unknown instance".to_string()))?;
+ discard_modpack_servers_for_instance(&metadata, state).await?;
+ if effective(&metadata, state).await? {
+ compose_instance(&metadata, state).await?;
+ }
+ Ok(())
+}
+
+async fn discard_modpack_servers_for_instance(
+ metadata: &InstanceMetadata,
+ state: &State,
+) -> crate::Result<()> {
+ let old_pack_servers = load_local(&metadata.instance.id, state)
+ .await?
+ .into_iter()
+ .filter(|server| server.source == ServerSource::Modpack)
+ .collect::>();
+ if !old_pack_servers.is_empty() {
+ let path = instance_dir(metadata, state).join(SERVERS_FILE);
+ let mut servers = read_servers(&path).await?;
+ let mut changed = false;
+ for old in old_pack_servers {
+ if let Some(index) =
+ servers.iter().position(|server| *server == old.data)
+ {
+ servers.remove(index);
+ changed = true;
+ }
+ }
+ if changed {
+ write_servers(&path, &servers).await?;
+ }
+ }
+ replace_modpack_servers(metadata, Vec::new(), state).await
+}
+
async fn replace_modpack_servers(
metadata: &InstanceMetadata,
servers: Vec,
@@ -124,6 +168,9 @@ pub(super) async fn reconstruct_modpack_servers(
metadata: &InstanceMetadata,
state: &State,
) -> crate::Result<()> {
+ if is_server_linked_shared_instance(metadata) {
+ return discard_modpack_servers_for_instance(metadata, state).await;
+ }
let version_id =
modpack_version_id(&metadata.link).ok_or(ErrorKind::InputError(
"this modpack does not have a recoverable Modrinth version"
@@ -192,6 +239,14 @@ pub(super) async fn reconstruct_modpack_servers(
replace_modpack_servers(metadata, servers, state).await
}
+fn is_server_linked_shared_instance(metadata: &InstanceMetadata) -> bool {
+ matches!(&metadata.link, InstanceLink::SharedInstance { .. })
+ && metadata
+ .shared_instance
+ .as_ref()
+ .is_some_and(|attachment| attachment.server_manager_name.is_some())
+}
+
pub(super) fn is_modpack_link(link: &InstanceLink) -> bool {
matches!(
link,
diff --git a/packages/app-lib/src/api/instance/synced_servers/operations.rs b/packages/app-lib/src/api/instance/synced_servers/operations.rs
index 0c3bac99cc0..56ff114ff5f 100644
--- a/packages/app-lib/src/api/instance/synced_servers/operations.rs
+++ b/packages/app-lib/src/api/instance/synced_servers/operations.rs
@@ -215,7 +215,25 @@ pub(in crate::api::instance) async fn reconcile_servers(
.as_ref()
.is_some_and(|value| value.source_revision == revision)
{
- return Ok(());
+ let projections =
+ load_projection_entries(&metadata.instance.id, state).await?;
+ let records = compose_records(metadata, state).await?;
+ if projections.len() == records.len()
+ && projections.iter().zip(&records).enumerate().all(
+ |(position, (projection, record))| {
+ let owner = match record.source {
+ ServerSource::UserSynced => ProjectionOwner::Synced,
+ _ => ProjectionOwner::Instance,
+ };
+ projection.id == record.id
+ && projection.owner == owner
+ && projection.data == record.data
+ && projection.position == position as i64
+ },
+ )
+ {
+ return Ok(());
+ }
}
return compose_instance(metadata, state).await;
}
@@ -429,6 +447,9 @@ async fn list_local_server_records(
}
/// Keeps an automatically added server local, even before server sync is enabled.
+///
+/// A previously managed server with a different address is treated as the same
+/// server, so an address change replaces it instead of adding a second entry.
pub(crate) async fn ensure_managed_server(
metadata: &InstanceMetadata,
data: NbtCompound,
@@ -437,10 +458,26 @@ pub(crate) async fn ensure_managed_server(
let _guard = state.synced_options.lock().await;
let path = instance_dir(metadata, state).join(SERVERS_FILE);
let syncing = participating(metadata, state).await?;
- let records = list_server_records_locked(metadata, state).await?;
+ let mut records = list_server_records_locked(metadata, state).await?;
+ let mut locals = load_local(&metadata.instance.id, state).await?;
let address = normalized_server_address(&data);
let name = server_identity_name(&data);
- let existing_index = records
+ let mut stale_local = locals.iter().position(|server| {
+ server.source == ServerSource::LinkedServerProject
+ && normalized_server_address(&server.data) != address
+ });
+ let stale_index = stale_local.and_then(|local_index| {
+ let stale = &locals[local_index];
+ let stale_address = normalized_server_address(&stale.data);
+ records.iter().position(|record| {
+ if syncing {
+ record.id == stale.id
+ } else {
+ normalized_server_address(&record.data) == stale_address
+ }
+ })
+ });
+ let mut existing_index = records
.iter()
.position(|record| {
normalized_server_address(&record.data) == address
@@ -451,6 +488,21 @@ pub(crate) async fn ensure_managed_server(
normalized_server_address(&record.data) == address
})
});
+ let mut stale_removed = false;
+ if let Some(index) = existing_index
+ && let Some(local_index) = stale_local.take()
+ {
+ locals.remove(local_index);
+ if let Some(stale) = stale_index {
+ records.remove(stale);
+ if stale < index {
+ existing_index = Some(index - 1);
+ }
+ }
+ stale_removed = true;
+ } else if existing_index.is_none() {
+ existing_index = stale_index;
+ }
let existing = existing_index.map(|index| &records[index]);
let position = existing_index.unwrap_or_else(|| {
records
@@ -468,20 +520,25 @@ pub(crate) async fn ensure_managed_server(
);
existing_data.insert("hidden", 0_i8);
}
+ if normalized_server_address(&existing_data) != address {
+ existing_data.insert("ip", server_address(&data));
+ }
existing_data
})
.unwrap_or(data);
let excluded_synced_server_id = existing
.filter(|record| record.source == ServerSource::UserSynced)
.map(|record| record.id.clone());
- let mut locals = load_local(&metadata.instance.id, state).await?;
- if let Some(local) = locals
- .iter_mut()
- .find(|server| normalized_server_address(&server.data) == address)
- {
+ let local_index = locals
+ .iter()
+ .position(|server| normalized_server_address(&server.data) == address)
+ .or(stale_local);
+ if let Some(local_index) = local_index {
+ let local = &mut locals[local_index];
let excluded_synced_server_id = excluded_synced_server_id
.or_else(|| local.excluded_synced_server_id.clone());
- if existing.is_some_and(|record| record.data == data)
+ if !stale_removed
+ && existing.is_some_and(|record| record.data == data)
&& local.data == data
&& local.position == position as i64
&& local.excluded_synced_server_id == excluded_synced_server_id
@@ -506,7 +563,8 @@ pub(crate) async fn ensure_managed_server(
if effective(metadata, state).await? {
compose_instance(metadata, state).await?;
}
- } else if existing.is_none_or(|record| record.data != data) {
+ } else if stale_removed || existing.is_none_or(|record| record.data != data)
+ {
let mut servers = records
.into_iter()
.map(|record| record.data)
diff --git a/packages/app-lib/src/api/pack/import/mod.rs b/packages/app-lib/src/api/pack/import/mod.rs
index 5e4b826cb67..a0abd326b4b 100644
--- a/packages/app-lib/src/api/pack/import/mod.rs
+++ b/packages/app-lib/src/api/pack/import/mod.rs
@@ -625,38 +625,34 @@ pub(crate) async fn finish_import(
Ok(())
}
-/// Recursively get a list of all subfiles in src
-/// uses async recursion
-
-#[async_recursion::async_recursion]
+/// Lists descendant files without following symlinks or recursing on the stack.
#[tracing::instrument]
pub async fn get_all_subfiles(
src: &Path,
include_empty_dirs: bool,
) -> crate::Result> {
- let metadata = tokio::fs::symlink_metadata(src).await?;
- if !metadata.is_dir() || metadata.file_type().is_symlink() {
- return Ok(vec![src.to_path_buf()]);
- }
-
let mut files = Vec::new();
- let mut dir = io::read_dir(&src).await?;
-
- let mut has_files = false;
- while let Some(child) = dir
- .next_entry()
- .await
- .map_err(|e| IOError::with_path(e, src))?
- {
- has_files = true;
- let src_child = child.path();
- files.append(
- &mut get_all_subfiles(&src_child, include_empty_dirs).await?,
- );
- }
+ let mut pending = vec![src.to_path_buf()];
+ while let Some(path) = pending.pop() {
+ let metadata = tokio::fs::symlink_metadata(&path).await?;
+ if !metadata.is_dir() || metadata.file_type().is_symlink() {
+ files.push(path);
+ continue;
+ }
- if !has_files && include_empty_dirs {
- files.push(src.to_path_buf());
+ let mut dir = io::read_dir(&path).await?;
+ let children_start = pending.len();
+ while let Some(child) = dir
+ .next_entry()
+ .await
+ .map_err(|error| IOError::with_path(error, &path))?
+ {
+ pending.push(child.path());
+ }
+ if pending.len() == children_start && include_empty_dirs {
+ files.push(path);
+ }
+ pending[children_start..].reverse();
}
Ok(files)
diff --git a/packages/app-lib/src/api/pack/install_from.rs b/packages/app-lib/src/api/pack/install_from.rs
index 5a443cf72db..385a72f70af 100644
--- a/packages/app-lib/src/api/pack/install_from.rs
+++ b/packages/app-lib/src/api/pack/install_from.rs
@@ -623,12 +623,17 @@ pub async fn set_instance_information(
&instance_id,
EditInstance {
install_stage: Some(InstanceInstallStage::PackInstalling),
- name: Some(
- description
- .override_title
- .clone()
- .unwrap_or_else(|| backup_name.to_string()),
- ),
+ name: if matches!(&link, Some(InstanceLink::SharedInstance { .. }))
+ {
+ None
+ } else {
+ Some(
+ description
+ .override_title
+ .clone()
+ .unwrap_or_else(|| backup_name.to_string()),
+ )
+ },
icon_path: description
.icon
.as_ref()
diff --git a/packages/app-lib/src/api/pack/install_mrpack.rs b/packages/app-lib/src/api/pack/install_mrpack.rs
index 94db174f111..ac8d2e2acc1 100644
--- a/packages/app-lib/src/api/pack/install_mrpack.rs
+++ b/packages/app-lib/src/api/pack/install_mrpack.rs
@@ -500,12 +500,16 @@ pub(crate) fn install_zipped_mrpack_files_with_reporter(
ignore_lock: bool,
reason: DownloadReason,
reporter: InstallProgressReporter,
+ ignore_modpack_servers: bool,
+ preserve_icon: bool,
) -> impl Future