-
+
+
+
+
+
+
+
+
+
+ {{ serverContextServerData.name }}
+
+ {{ serverContextServerData.loader }} {{ serverContextServerData.mc_version }}
+
+
+ {{ serverBrowseHeading }}
+ +{{ @@ -911,7 +998,7 @@ previousFilterState.value = JSON.stringify({ be lost when you update the server instance content.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ (null)
const user = ref(null)
+ const isReady = computed(() => credentials.value !== undefined)
const authProvider: AuthProvider = {
session_token: sessionToken,
user,
+ isReady,
requestSignIn,
}
diff --git a/apps/app-frontend/src/providers/setup/server-install-content.ts b/apps/app-frontend/src/providers/setup/server-install-content.ts
new file mode 100644
index 0000000000..35919d9d73
--- /dev/null
+++ b/apps/app-frontend/src/providers/setup/server-install-content.ts
@@ -0,0 +1,393 @@
+import type { Archon, Labrinth } from '@modrinth/api-client'
+import {
+ createContext,
+ type CreationFlowContextValue,
+ injectModrinthClient,
+ injectNotificationManager,
+} from '@modrinth/ui'
+import { computed, type ComputedRef, nextTick, type Ref, ref, watch } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+
+type ServerFlowFrom = 'onboarding' | 'reset-server'
+type ServerInstallableType = 'modpack' | 'mod' | 'plugin' | 'datapack'
+
+type InstallableSearchResult = Labrinth.Search.v3.ResultSearchProject & {
+ installing?: boolean
+ installed?: boolean
+}
+
+interface ServerModpackSelectionRequest {
+ projectId: string
+ versionId: string
+ name: string
+ iconUrl?: string
+}
+
+interface ServerSetupModalHandle {
+ show: () => void | Promise
+ hide: () => void
+ ctx?: CreationFlowContextValue | null
+}
+
+export interface ServerInstallContentContext {
+ serverIdQuery: ComputedRef
+ worldIdQuery: ComputedRef
+ browseFrom: ComputedRef
+ serverFlowFrom: ComputedRef
+ isFromWorlds: ComputedRef
+ isServerContext: ComputedRef
+ isSetupServerContext: ComputedRef
+ effectiveServerWorldId: ComputedRef
+ serverContextServerData: Ref
+ serverContentProjectIds: Ref>
+ serverBackUrl: ComputedRef
+ serverBackLabel: ComputedRef
+ serverBrowseHeading: ComputedRef
+ initServerContext: () => Promise
+ watchServerContextChanges: () => void
+ searchServerModpacks: (
+ query: string,
+ limit?: number,
+ ) => Promise
+ getServerProjectVersions: (projectId: string) => Promise<{ id: string }[]>
+ enforceSetupModpackRoute: (currentProjectType: string | undefined) => void
+ installProjectToServer: (project: InstallableSearchResult) => Promise
+ onServerFlowBack: () => void
+ handleServerModpackFlowCreate: (config: CreationFlowContextValue) => Promise
+ markServerProjectInstalled: (id: string) => void
+}
+
+export const [injectServerInstallContent, provideServerInstallContent] =
+ createContext('Browse', 'serverInstallContent')
+
+function readQueryString(value: unknown): string | null {
+ if (Array.isArray(value)) return value[0] ?? null
+ return typeof value === 'string' && value.length > 0 ? value : null
+}
+
+export function createServerInstallContent(opts: {
+ serverSetupModalRef: Ref
+}) {
+ const { serverSetupModalRef } = opts
+ const route = useRoute()
+ const router = useRouter()
+ const client = injectModrinthClient()
+ const { handleError } = injectNotificationManager()
+
+ const serverIdQuery = computed(() => readQueryString(route.query.sid))
+ const worldIdQuery = computed(() => readQueryString(route.query.wid))
+ const browseFrom = computed(() => readQueryString(route.query.from))
+ const serverFlowFrom = computed(() =>
+ browseFrom.value === 'onboarding' || browseFrom.value === 'reset-server'
+ ? browseFrom.value
+ : null,
+ )
+
+ const isFromWorlds = computed(() => browseFrom.value === 'worlds')
+ const isServerContext = computed(() => !!serverIdQuery.value)
+ const isSetupServerContext = computed(() => !!serverIdQuery.value && !!serverFlowFrom.value)
+
+ const serverContextWorldId = ref(worldIdQuery.value)
+ const serverContextServerData = ref(null)
+ const serverContentProjectIds = ref>(new Set())
+ const effectiveServerWorldId = computed(() => worldIdQuery.value ?? serverContextWorldId.value)
+
+ const serverBackUrl = computed(() => {
+ const sid = serverIdQuery.value
+ if (!sid) return '/hosting/manage'
+ if (serverFlowFrom.value === 'onboarding') {
+ return `/hosting/manage/${sid}?resumeModal=setup-type`
+ }
+ if (serverFlowFrom.value === 'reset-server') {
+ return `/hosting/manage/${sid}?openSettings=installation`
+ }
+ return `/hosting/manage/${sid}/content`
+ })
+ const serverBackLabel = computed(() => {
+ if (serverFlowFrom.value === 'onboarding') return 'Back to setup'
+ if (serverFlowFrom.value === 'reset-server') return 'Cancel reset'
+ return 'Back to server'
+ })
+ const serverBrowseHeading = computed(() => {
+ if (serverFlowFrom.value === 'reset-server') {
+ return 'Select modpack to install after reset'
+ }
+ return 'Install content to server'
+ })
+
+ async function resolveServerContextWorldId(serverId: string) {
+ try {
+ const server = await client.archon.servers_v1.get(serverId)
+ const activeWorld = server.worlds.find((world) => world.is_active)
+ return activeWorld?.id ?? server.worlds[0]?.id ?? null
+ } catch (err) {
+ handleError(err as Error)
+ return null
+ }
+ }
+
+ async function refreshServerInstalledContent(serverId: string, worldId: string) {
+ try {
+ const content = await client.archon.content_v1.getAddons(serverId, worldId)
+ const ids = new Set(
+ (content.addons ?? [])
+ .map((addon) => addon.project_id)
+ .filter((projectId): projectId is string => !!projectId),
+ )
+ serverContentProjectIds.value = ids
+ } catch (err) {
+ handleError(err as Error)
+ }
+ }
+
+ async function initServerContext() {
+ const sid = serverIdQuery.value
+ if (!sid) return
+
+ try {
+ serverContextServerData.value = await client.archon.servers_v0.get(sid)
+ } catch (err) {
+ handleError(err as Error)
+ }
+
+ let resolvedWorldId = effectiveServerWorldId.value
+ if (!resolvedWorldId) {
+ resolvedWorldId = await resolveServerContextWorldId(sid)
+ if (resolvedWorldId) {
+ serverContextWorldId.value = resolvedWorldId
+ }
+ }
+
+ if (resolvedWorldId) {
+ await refreshServerInstalledContent(sid, resolvedWorldId)
+ }
+ }
+
+ function watchServerContextChanges() {
+ watch([serverIdQuery, effectiveServerWorldId], async ([sid, wid], [prevSid, prevWid]) => {
+ if (!sid) {
+ serverContextServerData.value = null
+ serverContentProjectIds.value = new Set()
+ return
+ }
+
+ if (sid !== prevSid) {
+ serverContentProjectIds.value = new Set()
+ try {
+ serverContextServerData.value = await client.archon.servers_v0.get(sid)
+ } catch (err) {
+ handleError(err as Error)
+ }
+ }
+
+ if (wid && (sid !== prevSid || wid !== prevWid)) {
+ await refreshServerInstalledContent(sid, wid)
+ }
+ })
+ }
+
+ function normalizeLoader(loader: string) {
+ return loader.toLowerCase().replaceAll('_', '').replaceAll('-', '').replaceAll(' ', '')
+ }
+
+ function getCompatibleLoaders(loader: string) {
+ const normalized = normalizeLoader(loader)
+ if (!normalized) return new Set()
+ if (normalized === 'paper' || normalized === 'purpur' || normalized === 'spigot') {
+ return new Set(['paper', 'purpur', 'spigot', 'bukkit'])
+ }
+ if (normalized === 'neoforge' || normalized === 'neo') {
+ return new Set(['neoforge', 'neo'])
+ }
+ return new Set([normalized])
+ }
+
+ function enforceSetupModpackRoute(currentProjectType: string | undefined) {
+ if (!isSetupServerContext.value || currentProjectType === 'modpack') return
+ router.replace({
+ path: '/browse/modpack',
+ query: route.query,
+ })
+ }
+
+ async function searchServerModpacks(query: string, limit: number = 10) {
+ return client.labrinth.projects_v2.search({
+ query: query || undefined,
+ new_filters:
+ 'project_types = "modpack" AND (client_side = "optional" OR client_side = "required") AND server_side = "required"',
+ limit,
+ })
+ }
+
+ async function getServerProjectVersions(projectId: string) {
+ const versions = await client.labrinth.versions_v3.getProjectVersions(projectId)
+ return versions.map((version) => ({ id: version.id }))
+ }
+
+ async function openServerModpackInstallFlow(request: ServerModpackSelectionRequest) {
+ if (!serverIdQuery.value || !effectiveServerWorldId.value) {
+ throw new Error('Missing server context')
+ }
+
+ const modalInstance = serverSetupModalRef.value
+ if (!modalInstance) return
+
+ modalInstance.show()
+ await nextTick()
+
+ const ctx = modalInstance.ctx
+ if (!ctx) return
+
+ ctx.setupType.value = 'modpack'
+ ctx.modpackSelection.value = {
+ projectId: request.projectId,
+ versionId: request.versionId,
+ name: request.name,
+ iconUrl: request.iconUrl,
+ }
+ ctx.modal.value?.setStage('final-config')
+ }
+
+ function getCurrentServerInstallType(): ServerInstallableType {
+ const raw = Array.isArray(route.params.projectType)
+ ? route.params.projectType[0]
+ : route.params.projectType
+ if (raw === 'modpack' || raw === 'mod' || raw === 'plugin' || raw === 'datapack') {
+ return raw
+ }
+ throw new Error('This content type cannot be installed to a server from browse.')
+ }
+
+ async function installProjectToServer(project: InstallableSearchResult) {
+ const contentType = getCurrentServerInstallType()
+ const sid = serverIdQuery.value
+ const wid = effectiveServerWorldId.value
+ if (!sid || !wid) {
+ throw new Error('No server world is available for install.')
+ }
+
+ if (contentType === 'modpack') {
+ const versions = await client.labrinth.versions_v2.getProjectVersions(project.project_id, {
+ include_changelog: false,
+ })
+ const versionId = versions[0]?.id ?? project.version_id
+ if (!versionId) {
+ throw new Error('No version found for this modpack')
+ }
+
+ await openServerModpackInstallFlow({
+ projectId: project.project_id,
+ versionId,
+ name: project.name,
+ iconUrl: project.icon_url ?? undefined,
+ })
+ return false
+ }
+
+ const versions = await client.labrinth.versions_v2.getProjectVersions(project.project_id, {
+ include_changelog: false,
+ })
+ const serverLoader = (serverContextServerData.value?.loader ?? '').toLowerCase()
+ const serverGameVersion = (serverContextServerData.value?.mc_version ?? '').trim()
+ const compatibleLoaders = getCompatibleLoaders(serverLoader)
+
+ const hasGameVersionMatch = (version: Labrinth.Versions.v2.Version) =>
+ !serverGameVersion || version.game_versions.includes(serverGameVersion)
+ const hasLoaderMatch = (version: Labrinth.Versions.v2.Version) => {
+ if (contentType === 'datapack') return true
+ if (compatibleLoaders.size === 0) return true
+ return version.loaders.some((loader) => compatibleLoaders.has(normalizeLoader(loader)))
+ }
+
+ let matchingVersion = versions.find(
+ (version) => hasGameVersionMatch(version) && hasLoaderMatch(version),
+ )
+ if (!matchingVersion) {
+ matchingVersion = versions.find((version) => hasLoaderMatch(version))
+ }
+ if (!matchingVersion) {
+ matchingVersion = versions.find((version) => hasGameVersionMatch(version))
+ }
+ if (!matchingVersion) {
+ matchingVersion = versions[0]
+ }
+ if (!matchingVersion) {
+ throw new Error('No installable version was found for this project.')
+ }
+
+ await client.archon.content_v1.addAddon(sid, wid, {
+ project_id: matchingVersion.project_id,
+ version_id: matchingVersion.id,
+ })
+
+ serverContentProjectIds.value = new Set([...serverContentProjectIds.value, project.project_id])
+ return true
+ }
+
+ function onServerFlowBack() {
+ serverSetupModalRef.value?.hide()
+ }
+
+ async function handleServerModpackFlowCreate(config: CreationFlowContextValue) {
+ const sid = serverIdQuery.value
+ const wid = effectiveServerWorldId.value
+ if (!sid || !wid || !config.modpackSelection.value) {
+ config.loading.value = false
+ return
+ }
+
+ try {
+ await client.archon.content_v1.installContent(sid, wid, {
+ content_variant: 'modpack',
+ spec: {
+ platform: 'modrinth',
+ project_id: config.modpackSelection.value.projectId,
+ version_id: config.modpackSelection.value.versionId,
+ },
+ soft_override: false,
+ properties: config.buildProperties(),
+ } satisfies Archon.Content.v1.InstallWorldContent)
+ serverSetupModalRef.value?.hide()
+
+ if (serverFlowFrom.value === 'onboarding') {
+ await client.archon.servers_v1.endIntro(sid)
+ await router.push(`/hosting/manage/${sid}/content`)
+ return
+ }
+
+ await router.push(`/hosting/manage/${sid}?openSettings=installation`)
+ } catch (err) {
+ handleError(err as Error)
+ config.loading.value = false
+ }
+ }
+
+ function markServerProjectInstalled(id: string) {
+ serverContentProjectIds.value = new Set([...serverContentProjectIds.value, id])
+ }
+
+ return {
+ serverIdQuery,
+ worldIdQuery,
+ browseFrom,
+ serverFlowFrom,
+ isFromWorlds,
+ isServerContext,
+ isSetupServerContext,
+ effectiveServerWorldId,
+ serverContextServerData,
+ serverContentProjectIds,
+ serverBackUrl,
+ serverBackLabel,
+ serverBrowseHeading,
+ initServerContext,
+ watchServerContextChanges,
+ searchServerModpacks,
+ getServerProjectVersions,
+ enforceSetupModpackRoute,
+ installProjectToServer,
+ onServerFlowBack,
+ handleServerModpackFlowCreate,
+ markServerProjectInstalled,
+ }
+}
diff --git a/apps/app-frontend/src/routes.js b/apps/app-frontend/src/routes.js
index 2748853d58..841d4a97fc 100644
--- a/apps/app-frontend/src/routes.js
+++ b/apps/app-frontend/src/routes.js
@@ -43,11 +43,8 @@ export default new createRouter({
children: [
{
path: '',
- redirect: (to) => {
- const rawId = Array.isArray(to.params.id) ? to.params.id[0] : to.params.id
- if (!rawId) return '/hosting/manage'
- return `/hosting/manage/${encodeURIComponent(rawId)}/content`
- },
+ name: 'ServerManageOverview',
+ component: Hosting.Overview,
},
{
path: 'content',
diff --git a/apps/app-frontend/tsconfig.app.json b/apps/app-frontend/tsconfig.app.json
index f723e2026f..504558d95f 100644
--- a/apps/app-frontend/tsconfig.app.json
+++ b/apps/app-frontend/tsconfig.app.json
@@ -3,7 +3,7 @@
"target": "ES2020",
"useDefineForClassFields": true,
"module": "ESNext",
- "lib": ["ES2020", "DOM", "DOM.Iterable"],
+ "lib": ["ES2021", "DOM", "DOM.Iterable"],
"skipLibCheck": true,
"moduleResolution": "bundler",
diff --git a/apps/app/capabilities/plugins.json b/apps/app/capabilities/plugins.json
index f1a45bf27d..4813b88730 100644
--- a/apps/app/capabilities/plugins.json
+++ b/apps/app/capabilities/plugins.json
@@ -22,7 +22,11 @@
{
"identifier": "http:default",
- "allow": [{ "url": "https://modrinth.com/*" }, { "url": "https://*.modrinth.com/*" }]
+ "allow": [
+ { "url": "https://modrinth.com/*" },
+ { "url": "https://*.modrinth.com/*" },
+ { "url": "https://*.nodes.modrinth.com/*" }
+ ]
},
"dialog:allow-save",
diff --git a/apps/app/tauri.conf.json b/apps/app/tauri.conf.json
index bc06fa6405..e5c46f4f3b 100644
--- a/apps/app/tauri.conf.json
+++ b/apps/app/tauri.conf.json
@@ -87,7 +87,7 @@
"capabilities": ["ads", "core", "plugins"],
"csp": {
"default-src": "'self' customprotocol: asset:",
- "connect-src": "ipc: http://ipc.localhost https://modrinth.com https://*.modrinth.com https://*.posthog.com https://posthog.modrinth.com https://*.sentry.io https://api.mclo.gs http://textures.minecraft.net https://textures.minecraft.net https://js.stripe.com https://*.stripe.com wss://*.stripe.com wss://*.nodes.modrinth.com 'self' data: blob:",
+ "connect-src": "ipc: http://ipc.localhost https://modrinth.com https://*.modrinth.com https://*.nodes.modrinth.com https://*.posthog.com https://posthog.modrinth.com https://*.sentry.io https://api.mclo.gs http://textures.minecraft.net https://textures.minecraft.net https://js.stripe.com https://*.stripe.com wss://*.stripe.com wss://*.nodes.modrinth.com 'self' data: blob:",
"font-src": ["https://cdn-raw.modrinth.com/fonts/"],
"img-src": "https: 'unsafe-inline' 'self' asset: http://asset.localhost http://textures.minecraft.net blob: data:",
"style-src": "'unsafe-inline' 'self'",
diff --git a/apps/frontend/src/components/ui/servers/ModrinthServersIcon.vue b/apps/frontend/src/components/brand/ModrinthServersIcon.vue
similarity index 100%
rename from apps/frontend/src/components/ui/servers/ModrinthServersIcon.vue
rename to apps/frontend/src/components/brand/ModrinthServersIcon.vue
diff --git a/apps/frontend/src/components/ui/servers/notice/AssignNoticeModal.vue b/apps/frontend/src/components/ui/admin/AssignNoticeModal.vue
similarity index 100%
rename from apps/frontend/src/components/ui/servers/notice/AssignNoticeModal.vue
rename to apps/frontend/src/components/ui/admin/AssignNoticeModal.vue
diff --git a/apps/frontend/src/components/ui/servers/LoaderSelector.vue b/apps/frontend/src/components/ui/servers/LoaderSelector.vue
deleted file mode 100644
index 0998a9ced1..0000000000
--- a/apps/frontend/src/components/ui/servers/LoaderSelector.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue b/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
deleted file mode 100644
index f4ca68f7c0..0000000000
--- a/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
+++ /dev/null
@@ -1,538 +0,0 @@
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/SaveBanner.vue b/apps/frontend/src/components/ui/servers/SaveBanner.vue
deleted file mode 100644
index a43e4dd1f1..0000000000
--- a/apps/frontend/src/components/ui/servers/SaveBanner.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- >) {
const authProvider: AuthProvider = {
session_token: sessionToken,
user,
+ isReady: ref(true),
requestSignIn: async (redirectPath: string) => {
await router.push({
path: '/auth/sign-in',
diff --git a/apps/frontend/src/store/console.ts b/apps/frontend/src/store/console.ts
index 5e9d0169ad..fb72b37c86 100644
--- a/apps/frontend/src/store/console.ts
+++ b/apps/frontend/src/store/console.ts
@@ -1,164 +1 @@
-import { createGlobalState } from '@vueuse/core'
-import { type Ref, shallowRef } from 'vue'
-
-/**
- * Maximum number of console output lines to store
- * @type {number}
- */
-const maxLines = 10000
-const batchTimeout = 300 // ms
-const initialBatchSize = 256
-
-/**
- * Provides a global console output state management system
- * Allows adding, storing, and clearing console output with a maximum line limit
- *
- * @returns {Object} Console state management methods and reactive state
- * @property {Ref} consoleOutput - Reactive array of console output lines
- * @property {function(string): void} addConsoleOutput - Method to add a new console output line
- * @property {function(): void} clear - Method to clear all console output
- */
-export const useModrinthServersConsole = createGlobalState(() => {
- /**
- * Reactive array storing console output lines
- * @type {Ref}
- */
- const output: Ref = shallowRef([])
- const searchQuery: Ref = shallowRef('')
- const filteredOutput: Ref = shallowRef([])
- let searchRegex: RegExp | null = null
-
- let lineBuffer: string[] = []
- let batchTimer: NodeJS.Timeout | null = null
- let isProcessingInitialBatch = false
-
- let refilterTimer: NodeJS.Timeout | null = null
- const refilterTimeout = 100 // ms
-
- const updateFilter = () => {
- if (!searchQuery.value) {
- filteredOutput.value = []
- return
- }
-
- if (!searchRegex) {
- searchRegex = new RegExp(searchQuery.value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'i')
- }
-
- filteredOutput.value = output.value.filter((line) => searchRegex?.test(line) ?? false)
- }
-
- const scheduleRefilter = () => {
- if (refilterTimer) clearTimeout(refilterTimer)
- refilterTimer = setTimeout(updateFilter, refilterTimeout)
- }
-
- const flushBuffer = () => {
- if (lineBuffer.length === 0) return
-
- const processedLines = lineBuffer.flatMap((line) => line.split('\n').filter(Boolean))
-
- if (isProcessingInitialBatch && processedLines.length >= initialBatchSize) {
- isProcessingInitialBatch = false
- output.value = processedLines.slice(-maxLines)
- } else {
- const newOutput = [...output.value, ...processedLines]
- output.value = newOutput.slice(-maxLines)
- }
-
- lineBuffer = []
- batchTimer = null
-
- if (searchQuery.value) {
- scheduleRefilter()
- }
- }
-
- /**
- * Adds a new output line to the console output
- * Automatically removes the oldest line if max output is exceeded
- *
- * @param {string} line - The console output line to add
- */
- const addLine = (line: string): void => {
- lineBuffer.push(line)
-
- if (!batchTimer) {
- batchTimer = setTimeout(flushBuffer, batchTimeout)
- }
- }
-
- /**
- * Adds multiple output lines to the console output
- * Automatically removes the oldest lines if max output is exceeded
- *
- * @param {string[]} lines - The console output lines to add
- * @returns {void}
- */
- const addLines = (lines: string[]): void => {
- if (output.value.length === 0 && lines.length >= initialBatchSize) {
- isProcessingInitialBatch = true
- lineBuffer = lines
- flushBuffer()
- return
- }
-
- lineBuffer.push(...lines)
-
- if (!batchTimer) {
- batchTimer = setTimeout(flushBuffer, batchTimeout)
- }
- }
-
- /**
- * Sets the search query and filters the output based on the query
- *
- * @param {string} query - The search query
- */
- const setSearchQuery = (query: string): void => {
- searchQuery.value = query
- searchRegex = null
- updateFilter()
- }
-
- /**
- * Clears all console output lines
- */
- const clear = (): void => {
- output.value = []
- filteredOutput.value = []
- searchQuery.value = ''
- lineBuffer = []
- isProcessingInitialBatch = false
- if (batchTimer) {
- clearTimeout(batchTimer)
- batchTimer = null
- }
- if (refilterTimer) {
- clearTimeout(refilterTimer)
- refilterTimer = null
- }
- searchRegex = null
- }
-
- /**
- * Finds the index of a line in the main output
- *
- * @param {string} line - The line to find
- * @returns {number} The index of the line, or -1 if not found
- */
- const findLineIndex = (line: string): number => {
- return output.value.findIndex((l) => l === line)
- }
-
- return {
- output,
- searchQuery,
- filteredOutput,
- addLine,
- addLines,
- setSearchQuery,
- clear,
- findLineIndex,
- }
-})
+export { useModrinthServersConsole } from '@modrinth/ui'
diff --git a/packages/api-client/src/modules/kyros/files/v0.ts b/packages/api-client/src/modules/kyros/files/v0.ts
index 4712c08379..fb8f4d19b7 100644
--- a/packages/api-client/src/modules/kyros/files/v0.ts
+++ b/packages/api-client/src/modules/kyros/files/v0.ts
@@ -1,12 +1,19 @@
import { AbstractModule } from '../../../core/abstract-module'
import type { UploadHandle, UploadProgress } from '../../../types/upload'
+import type { Archon } from '../../archon/types'
import type { Kyros } from '../types'
+type NodeFsAuth = Pick
+
export class KyrosFilesV0Module extends AbstractModule {
public getModuleID(): string {
return 'kyros_files_v0'
}
+ private getNodeBaseUrl(auth: NodeFsAuth): string {
+ return `https://${auth.url.replace(/\/modrinth\/v\d+\/fs\/?$/, '')}`
+ }
+
/**
* List directory contents with pagination
*
@@ -62,6 +69,24 @@ export class KyrosFilesV0Module extends AbstractModule {
})
}
+ /**
+ * Download a file using explicit filesystem auth credentials.
+ *
+ * @param auth - Filesystem auth (url + token) from Archon
+ * @param path - File path (e.g., "/server-icon.png")
+ * @returns Promise resolving to file Blob
+ */
+ public async downloadFileWithAuth(auth: NodeFsAuth, path: string): Promise {
+ return this.client.request('/fs/download', {
+ api: this.getNodeBaseUrl(auth),
+ version: 'modrinth/v0',
+ method: 'GET',
+ params: { path },
+ headers: { Authorization: `Bearer ${auth.token}` },
+ skipAuth: true,
+ })
+ }
+
/**
* Upload a file to a server's filesystem with progress tracking
*
@@ -89,6 +114,36 @@ export class KyrosFilesV0Module extends AbstractModule {
})
}
+ /**
+ * Upload a file using explicit filesystem auth credentials.
+ *
+ * @param auth - Filesystem auth (url + token) from Archon
+ * @param path - Destination path (e.g., "/server-icon.png")
+ * @param file - File to upload
+ * @param options - Optional progress callback and feature overrides
+ * @returns UploadHandle with promise, onProgress, and cancel
+ */
+ public uploadFileWithAuth(
+ auth: NodeFsAuth,
+ path: string,
+ file: File | Blob,
+ options?: {
+ onProgress?: (progress: UploadProgress) => void
+ retry?: boolean | number
+ },
+ ): UploadHandle {
+ return this.client.upload('/fs/create', {
+ api: this.getNodeBaseUrl(auth),
+ version: 'modrinth/v0',
+ file,
+ params: { path, type: 'file' },
+ headers: { Authorization: `Bearer ${auth.token}` },
+ onProgress: options?.onProgress,
+ retry: options?.retry,
+ skipAuth: true,
+ })
+ }
+
/**
* Update file contents
*
@@ -152,6 +207,28 @@ export class KyrosFilesV0Module extends AbstractModule {
})
}
+ /**
+ * Delete a file or folder using explicit filesystem auth credentials.
+ *
+ * @param auth - Filesystem auth (url + token) from Archon
+ * @param path - Path to delete
+ * @param recursive - If true, delete directory contents recursively
+ */
+ public async deleteFileOrFolderWithAuth(
+ auth: NodeFsAuth,
+ path: string,
+ recursive: boolean,
+ ): Promise {
+ return this.client.request('/fs/delete', {
+ api: this.getNodeBaseUrl(auth),
+ version: 'modrinth/v0',
+ method: 'DELETE',
+ params: { path, recursive },
+ headers: { Authorization: `Bearer ${auth.token}` },
+ skipAuth: true,
+ })
+ }
+
/**
* Extract an archive file (zip, tar, etc.)
*
diff --git a/packages/api-client/src/platform/tauri.ts b/packages/api-client/src/platform/tauri.ts
index 7e57fc2a53..6b3c2ed616 100644
--- a/packages/api-client/src/platform/tauri.ts
+++ b/packages/api-client/src/platform/tauri.ts
@@ -103,11 +103,38 @@ export class TauriModrinthClient extends XHRUploadClient {
throw error
}
+ // Handle binary downloads (e.g. kyros fs files) before JSON parsing.
+ const contentType = response.headers.get('content-type')?.toLowerCase() ?? ''
+ if (fullUrl.includes('/fs/download')) {
+ return (await response.blob()) as T
+ }
+ if (
+ contentType.startsWith('image/') ||
+ contentType.startsWith('audio/') ||
+ contentType.startsWith('video/') ||
+ contentType.includes('application/octet-stream')
+ ) {
+ return (await response.blob()) as T
+ }
+
+ if (response.status === 204 || response.status === 205) {
+ return undefined as T
+ }
+
+ if (contentType.includes('application/json') || contentType.includes('+json')) {
+ return (await response.json()) as T
+ }
+
const text = await response.text()
if (!text) {
return undefined as T
}
- return JSON.parse(text) as T
+
+ try {
+ return JSON.parse(text) as T
+ } catch {
+ return text as T
+ }
} catch (error) {
throw this.normalizeError(error)
}
diff --git a/packages/assets/generated-icons.ts b/packages/assets/generated-icons.ts
index ff66853f3d..c63ce31a8f 100644
--- a/packages/assets/generated-icons.ts
+++ b/packages/assets/generated-icons.ts
@@ -3,8 +3,6 @@
import type { FunctionalComponent, SVGAttributes } from 'vue'
-export type IconComponent = FunctionalComponent
-
import _AffiliateIcon from './icons/affiliate.svg?component'
import _AlignLeftIcon from './icons/align-left.svg?component'
import _ArchiveIcon from './icons/archive.svg?component'
@@ -386,12 +384,15 @@ import _VersionIcon from './icons/version.svg?component'
import _WikiIcon from './icons/wiki.svg?component'
import _WindowIcon from './icons/window.svg?component'
import _WorldIcon from './icons/world.svg?component'
+import _WrapTextIcon from './icons/wrap-text.svg?component'
import _WrenchIcon from './icons/wrench.svg?component'
import _XIcon from './icons/x.svg?component'
import _XCircleIcon from './icons/x-circle.svg?component'
import _ZoomInIcon from './icons/zoom-in.svg?component'
import _ZoomOutIcon from './icons/zoom-out.svg?component'
+export type IconComponent = FunctionalComponent
+
export const AffiliateIcon = _AffiliateIcon
export const AlignLeftIcon = _AlignLeftIcon
export const ArchiveIcon = _ArchiveIcon
@@ -773,6 +774,7 @@ export const VersionIcon = _VersionIcon
export const WikiIcon = _WikiIcon
export const WindowIcon = _WindowIcon
export const WorldIcon = _WorldIcon
+export const WrapTextIcon = _WrapTextIcon
export const WrenchIcon = _WrenchIcon
export const XIcon = _XIcon
export const XCircleIcon = _XCircleIcon
diff --git a/packages/assets/icons/wrap-text.svg b/packages/assets/icons/wrap-text.svg
new file mode 100644
index 0000000000..ed9eb6b325
--- /dev/null
+++ b/packages/assets/icons/wrap-text.svg
@@ -0,0 +1,7 @@
+
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 2132684af4..974aaafc2c 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -54,6 +54,7 @@
"@codemirror/language": "^6.9.3",
"@codemirror/state": "^6.3.2",
"@codemirror/view": "^6.22.1",
+ "@intercom/messenger-js-sdk": "^0.0.14",
"@modrinth/api-client": "workspace:*",
"@modrinth/assets": "workspace:*",
"@modrinth/blog": "workspace:*",
@@ -62,6 +63,7 @@
"@tresjs/cientos": "^4.3.0",
"@tresjs/core": "^4.3.4",
"@tresjs/post-processing": "^2.4.0",
+ "@types/dompurify": "^3.0.5",
"@types/markdown-it": "^14.1.1",
"@types/three": "^0.172.0",
"@vintl/how-ago": "^3.0.1",
@@ -72,6 +74,7 @@
"ace-builds": "^1.43.5",
"apexcharts": "^4.0.0",
"dayjs": "^1.11.10",
+ "dompurify": "^3.1.7",
"es-toolkit": "^1.44.0",
"floating-vue": "^5.2.2",
"fuse.js": "^6.6.2",
diff --git a/packages/ui/src/components/base/BaseTerminal.vue b/packages/ui/src/components/base/BaseTerminal.vue
index 2f30e0c8ef..88ac95d520 100644
--- a/packages/ui/src/components/base/BaseTerminal.vue
+++ b/packages/ui/src/components/base/BaseTerminal.vue
@@ -1,12 +1,31 @@
-
- Failed to load server.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Linked to
-
- {{ serverProject.title }}
-
-
-
-
-
-
-
-
+
diff --git a/apps/app-frontend/src/pages/hosting/manage/Overview.vue b/apps/app-frontend/src/pages/hosting/manage/Overview.vue
new file mode 100644
index 0000000000..7b29977bb4
--- /dev/null
+++ b/apps/app-frontend/src/pages/hosting/manage/Overview.vue
@@ -0,0 +1,7 @@
+
+
+
+
+
+
-
-
-
+
+
-
-
-
-
- {{
- item.prefix
- }}
- {{ item.text }}
-
-
+
-
-
diff --git a/apps/app-frontend/src/providers/setup/auth.ts b/apps/app-frontend/src/providers/setup/auth.ts
index bf522c59a3..2de8c0acfa 100644
--- a/apps/app-frontend/src/providers/setup/auth.ts
+++ b/apps/app-frontend/src/providers/setup/auth.ts
@@ -1,6 +1,6 @@
import type { Labrinth } from '@modrinth/api-client'
import { type AuthProvider, provideAuth } from '@modrinth/ui'
-import { type Ref, ref, watchEffect } from 'vue'
+import { computed, type Ref, ref, watchEffect } from 'vue'
type AppCredentials = {
session?: string | null
@@ -13,10 +13,12 @@ export function setupAuthProvider(
) {
const sessionToken = ref
-
-
-
-
-
-
-
- Mod loaders
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/LoaderSelectorCard.vue b/apps/frontend/src/components/ui/servers/LoaderSelectorCard.vue
deleted file mode 100644
index 0017f1076e..0000000000
--- a/apps/frontend/src/components/ui/servers/LoaderSelectorCard.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-
- Plugin loaders
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/LogLine.vue b/apps/frontend/src/components/ui/servers/LogLine.vue
deleted file mode 100644
index 07df871a33..0000000000
--- a/apps/frontend/src/components/ui/servers/LogLine.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- - {{ loader.displayName }} -
- -{{ loaderVersion }}
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue b/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue
deleted file mode 100644
index 3022a7b06a..0000000000
--- a/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue
+++ /dev/null
@@ -1,276 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/PanelServerStatus.vue b/apps/frontend/src/components/ui/servers/PanelServerStatus.vue
deleted file mode 100644
index f5b42fa0e1..0000000000
--- a/apps/frontend/src/components/ui/servers/PanelServerStatus.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
- - Are you sure you want to - {{ pendingAction }} the server? -
-
-
-
-
-
-
-
-
-
-
- {{ server }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/PanelSpinner.vue b/apps/frontend/src/components/ui/servers/PanelSpinner.vue
deleted file mode 100644
index c2c7f55eab..0000000000
--- a/apps/frontend/src/components/ui/servers/PanelSpinner.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/PanelTerminal.vue b/apps/frontend/src/components/ui/servers/PanelTerminal.vue
deleted file mode 100644
index 950a2dc9ea..0000000000
--- a/apps/frontend/src/components/ui/servers/PanelTerminal.vue
+++ /dev/null
@@ -1,1414 +0,0 @@
-
-
-
-
-
-
-
- {{ getStatusText(state) }}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue b/apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue
deleted file mode 100644
index e7b0c74ed7..0000000000
--- a/apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
-
-
-
-
-
- {{ pyroConsole.filteredOutput.value.length }}
- {{ pyroConsole.filteredOutput.value.length === 1 ? 'result' : 'results' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Detected Links
--
-
- - - {{ link }} - - -
-
-
-
-
- - Select the version of {{ props.project?.title || 'the modpack' }} you want to install on - your server. -
-- Currently installed: {{ props.currentVersion.version_number }} -
-
-
-
-
-
-
-
-
-
- If enabled, existing mods, worlds, and configurations, will be deleted before installing
- the new modpack version.
-
-
-
-
-
-
-
-
-
-
-
- - {{ - 'This will reinstall your server and erase all data. Are you sure you want to continue?' - }} -
-
-
-
-
-
-
-
-
-
-
-
-
- Minecraft version
-
-
-
-
-
-
-
-
-
-
- {{ selectedLoader }} version
-
-
-
-
-
-
-
-
- No versions available for Minecraft {{ selectedMCVersion }}.
-
-
-
-
-
-
-
-
- Removes all data on your server, including your worlds, mods, and configuration files,
- then reinstalls it with the selected version.
-
- This does not affect your backups, which are stored off-site.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/ServerStats.vue b/apps/frontend/src/components/ui/servers/ServerStats.vue
deleted file mode 100644
index a16aa63226..0000000000
--- a/apps/frontend/src/components/ui/servers/ServerStats.vue
+++ /dev/null
@@ -1,256 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/TeleportOverflowMenu.vue b/apps/frontend/src/components/ui/servers/TeleportOverflowMenu.vue
deleted file mode 100644
index 4a8f774134..0000000000
--- a/apps/frontend/src/components/ui/servers/TeleportOverflowMenu.vue
+++ /dev/null
@@ -1,438 +0,0 @@
-
-
-
-
-
-
-
-
- {{ metric.title }}
-
-
-
-
-
- - {{ metric.value }} -
-/ {{ metric.max }}
-
- {{ metric.title }}
-
-
-
-
-
-
-
- - {{ loading ? '0 B' : formatBytes(stats.storage_usage_bytes) }} -
-Storage usage
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/icons/ChevronDownIcon.vue b/apps/frontend/src/components/ui/servers/icons/ChevronDownIcon.vue
deleted file mode 100644
index 783d18a402..0000000000
--- a/apps/frontend/src/components/ui/servers/icons/ChevronDownIcon.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/icons/ChevronUpIcon.vue b/apps/frontend/src/components/ui/servers/icons/ChevronUpIcon.vue
deleted file mode 100644
index da6cf408ab..0000000000
--- a/apps/frontend/src/components/ui/servers/icons/ChevronUpIcon.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/icons/CodeFileIcon.vue b/apps/frontend/src/components/ui/servers/icons/CodeFileIcon.vue
deleted file mode 100644
index 42022a33ce..0000000000
--- a/apps/frontend/src/components/ui/servers/icons/CodeFileIcon.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/icons/CogFolderIcon.vue b/apps/frontend/src/components/ui/servers/icons/CogFolderIcon.vue
deleted file mode 100644
index cc8fc1bc66..0000000000
--- a/apps/frontend/src/components/ui/servers/icons/CogFolderIcon.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/icons/EarthIcon.vue b/apps/frontend/src/components/ui/servers/icons/EarthIcon.vue
deleted file mode 100644
index e96f944bcc..0000000000
--- a/apps/frontend/src/components/ui/servers/icons/EarthIcon.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/icons/FullscreenIcon.vue b/apps/frontend/src/components/ui/servers/icons/FullscreenIcon.vue
deleted file mode 100644
index 383912d2b8..0000000000
--- a/apps/frontend/src/components/ui/servers/icons/FullscreenIcon.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/icons/ImageFileIcon.vue b/apps/frontend/src/components/ui/servers/icons/ImageFileIcon.vue
deleted file mode 100644
index 6aa81c2779..0000000000
--- a/apps/frontend/src/components/ui/servers/icons/ImageFileIcon.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/icons/LoaderIcon.vue b/apps/frontend/src/components/ui/servers/icons/LoaderIcon.vue
deleted file mode 100644
index 090bb945bd..0000000000
--- a/apps/frontend/src/components/ui/servers/icons/LoaderIcon.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
- {{ option.id }}
-
-
- {{ option.id }}
-
-
- {{ option.id }}
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/thread/ThreadView.vue b/apps/frontend/src/components/ui/thread/ThreadView.vue
index 608f0f1f10..dc9bcaa6c4 100644
--- a/apps/frontend/src/components/ui/thread/ThreadView.vue
+++ b/apps/frontend/src/components/ui/thread/ThreadView.vue
@@ -74,7 +74,7 @@
-
-
diff --git a/apps/frontend/src/pages/hosting/manage/[id]/index.vue b/apps/frontend/src/pages/hosting/manage/[id]/index.vue
index 46e19ea119..9b4ae555cc 100644
--- a/apps/frontend/src/pages/hosting/manage/[id]/index.vue
+++ b/apps/frontend/src/pages/hosting/manage/[id]/index.vue
@@ -1,728 +1,13 @@
-
-
-
-
-
-
-
- {{ formatDateTimeShortMonth(notice.announce_at) }} ({{
- formatRelativeTime(notice.announce_at)
- }})
-
- Never begins
-
-
-
- {{ formatRelativeTime(notice.expires) }}
-
- Never expires
-
-
-
- {{
- NOTICE_LEVELS[notice.level]
- ? formatMessage(NOTICE_LEVELS[notice.level].name)
- : notice.level
- }}
-
-
-
-
- {{ formatMessage(getDismissableMetadata(notice.dismissable).name) }}
-
-
-
-
-
-
-
-
- Not assigned to any servers
-
- Assigned to
- {{ notice.assigned.filter((n) => n.kind === 'node').length }} nodes
-
-
- Assigned to
- {{ notice.assigned.filter((n) => n.kind === 'server').length }} servers
-
-
- Assigned to
- {{ notice.assigned.filter((n) => n.kind === 'server').length }} servers and
- {{ notice.assigned.filter((n) => n.kind === 'node').length }} nodes
-
- •
-
-
-
-
- Your server is still accessible during this time.
-
-
-
-
-
-
-
-
+
+
+ - We automatically analyzed the logs and found the following: -
-
-
-
-
-
- The server stopped because it ran out of memory. There may be a memory leak caused by a
- mod or plugin, or you may need to upgrade your Modrinth Server.
-
-
- Your server exited with code {{ props.powerStateDetails.exit_code }}.
-
- There may be a mod or plugin causing the issue, or an issue with your server
- configuration.
-
-
- We could not determine the specific cause of the crash.
-
-
- {{ problem.message }}
--
-
- - {{ solution.message }} - -
You can try restarting the server.
- - - We could not find any specific problems, but you can try restarting the server. - -
-
-
-
-
-
-
-
-
-
-
-
- Console
-
-
- -
-
- - {{ suggestion }} - -
-
- {{
- ' '.repeat(commandInput.length - 1)
- }}
- {{ bestSuggestion }}
-
-
-
-
-
-
-
-
-
- Could not connect to the server.
-- An error occurred while attempting to connect to your server. Please try refreshing the - page. (WebSocket Authentication Failed) -
-
-
-
-
diff --git a/apps/frontend/src/pages/hosting/manage/[id]/options/advanced.vue b/apps/frontend/src/pages/hosting/manage/[id]/options/advanced.vue
deleted file mode 100644
index b730006fff..0000000000
--- a/apps/frontend/src/pages/hosting/manage/[id]/options/advanced.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
+
+
+
-
+
+
diff --git a/packages/ui/src/components/base/index.ts b/packages/ui/src/components/base/index.ts
index 4b72a2f5e7..0f9b4820a9 100644
--- a/packages/ui/src/components/base/index.ts
+++ b/packages/ui/src/components/base/index.ts
@@ -29,6 +29,8 @@ export { default as ErrorInformationCard } from './ErrorInformationCard.vue'
export { default as FileInput } from './FileInput.vue'
export type { FilterBarOption } from './FilterBar.vue'
export { default as FilterBar } from './FilterBar.vue'
+export type { FilterPillOption } from './FilterPills.vue'
+export { default as FilterPills } from './FilterPills.vue'
export { default as FloatingActionBar } from './FloatingActionBar.vue'
export { default as FloatingPanel } from './FloatingPanel.vue'
export { default as FormattedTag } from './FormattedTag.vue'
diff --git a/packages/ui/src/components/billing/ServersPurchase1Region.vue b/packages/ui/src/components/billing/ServersPurchase1Region.vue
index 3e72a22d40..009a39b8b2 100644
--- a/packages/ui/src/components/billing/ServersPurchase1Region.vue
+++ b/packages/ui/src/components/billing/ServersPurchase1Region.vue
@@ -214,7 +214,7 @@ async function updateStock() {
onMounted(() => {
// auto select region with lowest ping
loading.value = true
- bestPing.value = props.pings.sort((a, b) => {
+ bestPing.value = [...props.pings].sort((a, b) => {
if (a.ping <= 0) return 1
if (b.ping <= 0) return -1
return a.ping - b.ping
diff --git a/packages/ui/src/components/modal/ConfirmModal.vue b/packages/ui/src/components/modal/ConfirmModal.vue
index 2bbcc913a0..87a091324e 100644
--- a/packages/ui/src/components/modal/ConfirmModal.vue
+++ b/packages/ui/src/components/modal/ConfirmModal.vue
@@ -1,5 +1,5 @@
-
+
{{ title }}
@@ -30,19 +30,19 @@
placeholder="Type here..."
wrapper-class="max-w-[20rem]"
/>
-
diff --git a/packages/ui/src/components/modal/TabbedModal.vue b/packages/ui/src/components/modal/TabbedModal.vue
index eb2b63f038..fc727ce7ba 100644
--- a/packages/ui/src/components/modal/TabbedModal.vue
+++ b/packages/ui/src/components/modal/TabbedModal.vue
@@ -121,7 +121,7 @@ defineExpose({ show, hide, selectedTab, setTab })
diff --git a/packages/ui/src/components/nav/NotificationPanel.vue b/packages/ui/src/components/nav/NotificationPanel.vue
index f5a8e318c5..5c5de11a8a 100644
--- a/packages/ui/src/components/nav/NotificationPanel.vue
+++ b/packages/ui/src/components/nav/NotificationPanel.vue
@@ -5,7 +5,7 @@
'intercom-present': isIntercomPresent,
'location-left': notificationLocation === 'left',
'location-right': notificationLocation === 'right',
- 'has-sidebar': hasSidebar,
+ 'has-sidebar': hasSidebar && !hasModalActive,
}"
>
@@ -92,6 +92,8 @@ import {
} from '@modrinth/assets'
import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
+import { useModalStack } from '#ui/composables/modal-stack.ts'
+
import { injectNotificationManager, type WebNotification } from '../../providers'
import ButtonStyled from '../base/ButtonStyled.vue'
@@ -151,6 +153,8 @@ onMounted(() => {
})
})
+const { hasModal: hasModalActive } = useModalStack()
+
withDefaults(
defineProps<{
hasSidebar?: boolean
@@ -167,9 +171,11 @@ withDefaults(
bottom: 1.5rem;
z-index: 200;
width: 450px;
+ transition: bottom 0.25s ease-in-out;
&.location-right {
right: 1.5rem;
+ transition: right 0.25s ease-in-out;
&.has-sidebar {
right: 325px;
@@ -242,4 +248,8 @@ withDefaults(
transform: translateX(-100%) scale(0.8);
}
}
+
+body.floating-action-bar-shown .vue-notification-group {
+ bottom: calc(90px);
+}
diff --git a/packages/ui/src/components/servers/SaveBanner.vue b/packages/ui/src/components/servers/SaveBanner.vue
index 9145ac56d5..afc753fe51 100644
--- a/packages/ui/src/components/servers/SaveBanner.vue
+++ b/packages/ui/src/components/servers/SaveBanner.vue
@@ -1,46 +1,41 @@
-
-
@@ -396,7 +396,7 @@ type ServerListingProps = {
const props = defineProps()
-const { kyros, labrinth } = injectModrinthClient()
+const { archon, kyros, labrinth } = injectModrinthClient()
const isConfiguring = computed(() => props.flows?.intro)
const isUpgrading = computed(
@@ -514,11 +514,30 @@ const { data: image } = useQuery({
if (!props.server_id || props.status !== 'available') return null
try {
+ const fsAuth = await archon.servers_v0.getFilesystemAuth(props.server_id)
+
try {
- const blob = await kyros.files_v0.downloadFile('/server-icon-original.png')
+ const blob = await kyros.files_v0.downloadFileWithAuth(fsAuth, '/server-icon.png')
+ return await processImageBlob(blob, 64)
+ } catch (error) {
+ const statusCode = (error as { statusCode?: number })?.statusCode
+ if (statusCode != null && statusCode !== 404) {
+ throw error
+ }
+
+ try {
+ const originalBlob = await kyros.files_v0.downloadFileWithAuth(
+ fsAuth,
+ '/server-icon-original.png',
+ )
+ return await processImageBlob(originalBlob, 64)
+ } catch (originalError) {
+ const originalStatusCode = (originalError as { statusCode?: number })?.statusCode
+ if (originalStatusCode != null && originalStatusCode !== 404) {
+ throw originalError
+ }
+ }
- return await processImageBlob(blob, 512)
- } catch {
const projectIcon = iconUrl.value
if (projectIcon) {
const response = await fetch(projectIcon)
@@ -528,22 +547,23 @@ const { data: image } = useQuery({
const scaledBlob = await dataURLToBlob(scaledDataUrl)
const scaledFile = new File([scaledBlob], 'server-icon.png', { type: 'image/png' })
- kyros.files_v0.uploadFile('/server-icon.png', scaledFile)
+ await kyros.files_v0.uploadFileWithAuth(fsAuth, '/server-icon.png', scaledFile).promise
const originalFile = new File([blob], 'server-icon-original.png', {
type: 'image/png',
})
- kyros.files_v0.uploadFile('/server-icon-original.png', originalFile)
+ await kyros.files_v0.uploadFileWithAuth(fsAuth, '/server-icon-original.png', originalFile)
+ .promise
return scaledDataUrl
}
}
+
+ return null
} catch (error) {
console.debug('Icon processing failed:', error)
return null
}
-
- return null
},
enabled: computed(() => !!props.server_id && props.status === 'available'),
})
@@ -563,4 +583,8 @@ async function copyToClipboard(text: string) {
.server-listing-notice {
@apply relative flex w-full rounded-b-2xl border-[1px] border-solid p-4 flex-col gap-4 border-surface-5 bg-bg-raised text-primary;
}
+
+.hoverable:hover:not(:has([data-subdomain-label]:hover)) {
+ filter: brightness(1.25);
+}
diff --git a/apps/app-frontend/src/components/ui/modal/ServerSettingsModal.vue b/packages/ui/src/components/servers/ServerSettingsModal.vue
similarity index 55%
rename from apps/app-frontend/src/components/ui/modal/ServerSettingsModal.vue
rename to packages/ui/src/components/servers/ServerSettingsModal.vue
index b20277476f..5e4a8c76c9 100644
--- a/apps/app-frontend/src/components/ui/modal/ServerSettingsModal.vue
+++ b/packages/ui/src/components/servers/ServerSettingsModal.vue
@@ -1,41 +1,41 @@
diff --git a/packages/ui/src/components/servers/icons/ServerIcon.vue b/packages/ui/src/components/servers/icons/ServerIcon.vue
index ec0fe3cf1f..1cbaae5ead 100644
--- a/packages/ui/src/components/servers/icons/ServerIcon.vue
+++ b/packages/ui/src/components/servers/icons/ServerIcon.vue
@@ -1,6 +1,6 @@
![]()
-
+
+
@@ -14,6 +33,7 @@
+
+
+
+
-
-
-
-
+
+
-
-
diff --git a/packages/ui/src/components/servers/ServerListing.vue b/packages/ui/src/components/servers/ServerListing.vue
index c52e8af693..e17a898af4 100644
--- a/packages/ui/src/components/servers/ServerListing.vue
+++ b/packages/ui/src/components/servers/ServerListing.vue
@@ -7,7 +7,7 @@
'!rounded-b-none border-b-0': hasNotice,
'bg-surface-2': isDisabled,
'active:scale-95': !isDisabled && !hasNotice,
- 'hover:brightness-125': !isDisabled,
+ hoverable: !isDisabled,
}"
data-pyro-server-listing
:data-pyro-server-listing-id="server_id"
@@ -74,7 +74,7 @@
:show-player-count="showPlayerCount"
:class="{ 'opacity-50': isDisabled }"
:linked="false"
- class="pointer-events-none flex w-full flex-row flex-wrap items-center gap-2 text-primary *:hidden sm:flex-row sm:*:flex"
+ class="flex w-full flex-row flex-wrap items-center gap-2 text-primary *:hidden sm:flex-row sm:*:flex"
/>
You have unsaved changes.
+
+
+
+
+
+
+
+
+
+
-
+
+
-
{{ game[0].toUpperCase() + game.slice(1) }}
@@ -19,7 +15,11 @@
+
{{ game[0].toUpperCase() + game.slice(1) }}
{{ mcVersion }}
@@ -29,7 +29,9 @@
diff --git a/packages/ui/src/components/servers/labels/ServerLoaderLabel.vue b/packages/ui/src/components/servers/labels/ServerLoaderLabel.vue
index e4d45d633f..be78c34d39 100644
--- a/packages/ui/src/components/servers/labels/ServerLoaderLabel.vue
+++ b/packages/ui/src/components/servers/labels/ServerLoaderLabel.vue
@@ -1,14 +1,15 @@
-
+
{{ loader }}
@@ -19,7 +20,7 @@
-
+
{{ loader }}
{{ loaderVersion }}
@@ -34,7 +35,9 @@
diff --git a/packages/ui/src/components/servers/labels/ServerSubdomainLabel.vue b/packages/ui/src/components/servers/labels/ServerSubdomainLabel.vue
index 5105cf855a..eda6182063 100644
--- a/packages/ui/src/components/servers/labels/ServerSubdomainLabel.vue
+++ b/packages/ui/src/components/servers/labels/ServerSubdomainLabel.vue
@@ -2,7 +2,9 @@
+ confirmModalRef?: Ref
+}) {
+ const { formatMessage } = useVIntl()
+ const client = injectModrinthClient()
+ const { serverId, server, powerState, busyReasons } = injectModrinthServerContext()
+ const { addNotification } = injectNotificationManager()
+ const pendingAction = ref(null)
+ const dontAskAgain = ref(false)
+
+ const userPreferences = useStorage(`pyro-server-${serverId}-preferences`, {
+ powerDontAskAgain: false,
+ })
+
+ const isInstalling = computed(() => server.value.status === 'installing')
+ const isRunning = computed(() => powerState.value === 'running')
+ const isStopping = computed(() => powerState.value === 'stopping')
+ const isTransitioning = computed(
+ () => powerState.value === 'starting' || powerState.value === 'stopping',
+ )
+ const showStopButton = computed(() => isRunning.value || isStopping.value)
+
+ const busyTooltip = computed(() =>
+ busyReasons.value.length > 0 ? formatMessage(busyReasons.value[0].reason) : undefined,
+ )
+
+ const canTakeAction = computed(
+ () => !isTransitioning.value && !options?.disabled?.value && busyReasons.value.length === 0,
+ )
+
+ const primaryActionText = computed(() => {
+ switch (powerState.value) {
+ case 'starting':
+ return 'Starting...'
+ case 'stopping':
+ return 'Stopping...'
+ case 'running':
+ return 'Restart'
+ default:
+ return 'Start'
+ }
+ })
+
+ async function sendPowerAction(action: PowerAction) {
+ try {
+ await client.archon.servers_v0.power(serverId, action)
+ } catch (error) {
+ console.error(`Error performing ${action} on server:`, error)
+ addNotification({
+ type: 'error',
+ title: `Failed to ${action.toLowerCase()} server`,
+ text: 'An error occurred while performing this action.',
+ })
+ }
+ }
+
+ function initiateAction(action: PowerAction) {
+ if (!canTakeAction.value) return
+
+ if (action === 'Start') {
+ void sendPowerAction(action)
+ return
+ }
+
+ pendingAction.value = action
+
+ if (userPreferences.value.powerDontAskAgain) {
+ executePendingAction()
+ } else {
+ options?.confirmModalRef?.value?.show()
+ }
+ }
+
+ function handlePrimaryAction() {
+ initiateAction(isRunning.value ? 'Restart' : 'Start')
+ }
+
+ function executePendingAction() {
+ if (!pendingAction.value) return
+
+ if (!canTakeAction.value) {
+ resetPendingAction()
+ return
+ }
+
+ void sendPowerAction(pendingAction.value)
+
+ if (dontAskAgain.value) {
+ userPreferences.value.powerDontAskAgain = true
+ }
+
+ resetPendingAction()
+ }
+
+ function resetPendingAction() {
+ options?.confirmModalRef?.value?.hide()
+ pendingAction.value = null
+ dontAskAgain.value = false
+ }
+
+ return {
+ isInstalling,
+ isRunning,
+ isStopping,
+ isTransitioning,
+ showStopButton,
+ busyTooltip,
+ canTakeAction,
+ primaryActionText,
+ pendingAction,
+ dontAskAgain,
+ sendPowerAction,
+ initiateAction,
+ handlePrimaryAction,
+ executePendingAction,
+ resetPendingAction,
+ }
+}
diff --git a/packages/ui/src/components/servers/server-list-empty/ServerListEmpty.vue b/packages/ui/src/components/servers/server-list-empty/ServerListEmpty.vue
index 51dd4825c6..bf4114d432 100644
--- a/packages/ui/src/components/servers/server-list-empty/ServerListEmpty.vue
+++ b/packages/ui/src/components/servers/server-list-empty/ServerListEmpty.vue
@@ -1,7 +1,7 @@
-
+
+
+
+
diff --git a/packages/ui/src/components/servers/server-header/PanelServerOverflowMenu.vue b/packages/ui/src/components/servers/server-header/PanelServerOverflowMenu.vue
new file mode 100644
index 0000000000..e8a4f8d1ee
--- /dev/null
+++ b/packages/ui/src/components/servers/server-header/PanelServerOverflowMenu.vue
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/ui/src/components/servers/server-header/ServerManageHeader.vue b/packages/ui/src/components/servers/server-header/ServerManageHeader.vue
new file mode 100644
index 0000000000..40dbea6081
--- /dev/null
+++ b/packages/ui/src/components/servers/server-header/ServerManageHeader.vue
@@ -0,0 +1,162 @@
+
+
+
+ {{ server }}
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/ui/src/components/servers/server-header/index.ts b/packages/ui/src/components/servers/server-header/index.ts
new file mode 100644
index 0000000000..97bcdcc7f2
--- /dev/null
+++ b/packages/ui/src/components/servers/server-header/index.ts
@@ -0,0 +1,3 @@
+export { default as PanelServerActionButton } from './PanelServerActionButton.vue'
+export { default as PanelServerOverflowMenu } from './PanelServerOverflowMenu.vue'
+export { default as ServerManageHeader } from './ServerManageHeader.vue'
diff --git a/packages/ui/src/components/servers/server-header/use-server-power-action.ts b/packages/ui/src/components/servers/server-header/use-server-power-action.ts
new file mode 100644
index 0000000000..f66e5da61d
--- /dev/null
+++ b/packages/ui/src/components/servers/server-header/use-server-power-action.ts
@@ -0,0 +1,136 @@
+import { useStorage } from '@vueuse/core'
+import { computed, type Ref, ref } from 'vue'
+
+import { useVIntl } from '#ui/composables/i18n'
+import {
+ injectModrinthClient,
+ injectModrinthServerContext,
+ injectNotificationManager,
+} from '#ui/providers'
+
+export type PowerAction = 'Start' | 'Stop' | 'Restart' | 'Kill'
+
+export type PanelActionConfirmModalController = {
+ show: () => void
+ hide: () => void
+}
+
+export function useServerPowerAction(options?: {
+ disabled?: Ref
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Linked to
+
+ {{ props.serverProject?.title }}
+
+
+
+
-
+
-
{{ formatMessage(messages.modrinthHostingLabel) }}
@@ -65,7 +65,7 @@
+
@@ -148,7 +117,7 @@
diff --git a/packages/ui/src/layouts/shared/server-settings/pages/installation.vue b/packages/ui/src/layouts/shared/server-settings/pages/installation.vue
index ea8ac8b096..ef45e09fe4 100644
--- a/packages/ui/src/layouts/shared/server-settings/pages/installation.vue
+++ b/packages/ui/src/layouts/shared/server-settings/pages/installation.vue
@@ -29,11 +29,15 @@
-
+
@@ -167,7 +171,7 @@ const messages = defineMessages({
})
const emit = defineEmits<{
- reinstall: [any?]
+ reinstall: [unknown?]
'reinstall-failed': []
}>()
@@ -766,9 +770,10 @@ watch(
},
)
-function onReinstall(event?: any) {
+function onReinstall(event?: unknown) {
installationSettingsLayout.value?.cancelEditing()
emit('reinstall', event)
+ serverSettings.closeModal?.()
}
function onBrowseModpacks() {
@@ -796,6 +801,7 @@ async function confirmResetToOnboarding() {
title: formatMessage(messages.resetToOnboardingSuccessTitle),
text: formatMessage(messages.resetToOnboardingSuccessDescription),
})
+ serverSettings.closeModal?.()
} catch (err) {
addNotification({
type: 'error',
diff --git a/packages/ui/src/layouts/shared/server-settings/pages/properties.vue b/packages/ui/src/layouts/shared/server-settings/pages/properties.vue
index 1e77179214..e56e2f880e 100644
--- a/packages/ui/src/layouts/shared/server-settings/pages/properties.vue
+++ b/packages/ui/src/layouts/shared/server-settings/pages/properties.vue
@@ -1,5 +1,5 @@
-
-
+
+
+
@@ -346,6 +350,7 @@ function flattenProperties(data: Archon.Content.v1.PropertiesFields): Record>({})
const originalProperties = ref>({})
+let previousSpawnProtection = '16'
function syncFormFromData() {
if (!propsData.value) return
@@ -380,8 +385,6 @@ watch(powerState, () => {
queryClient.invalidateQueries({ queryKey: queryKey.value })
})
-let previousSpawnProtection = '16'
-
const combinedGamemode = computed({
get() {
if (liveProperties.value.hardcore === 'true') return 'hardcore'
@@ -453,7 +456,7 @@ function buildPatch(): Archon.Content.v1.PatchPropertiesFields {
return patch
}
-const { mutate: saveProperties, isPending: isUpdating } = useMutation({
+const { mutateAsync: saveProperties, isPending: isUpdating } = useMutation({
mutationFn: () =>
client.archon.properties_v1.patchProperties(serverId, worldId.value!, buildPatch()),
onSuccess: async () => {
diff --git a/packages/ui/src/layouts/shared/server-settings/providers/server-settings.ts b/packages/ui/src/layouts/shared/server-settings/providers/server-settings.ts
index e5bb553ada..8aa29fb8bc 100644
--- a/packages/ui/src/layouts/shared/server-settings/providers/server-settings.ts
+++ b/packages/ui/src/layouts/shared/server-settings/providers/server-settings.ts
@@ -13,6 +13,7 @@ export interface ServerSettingsContext {
currentUserId: Ref
currentUserRole: Ref
browseModpacks: (args: ServerSettingsBrowseModpacksArgs) => void | Promise
+ closeModal?: () => void
}
export const [injectServerSettings, provideServerSettings] = createContext(
diff --git a/packages/ui/src/layouts/shared/server-settings/tabs.ts b/packages/ui/src/layouts/shared/server-settings/tabs.ts
index 82427d4288..7dcb580245 100644
--- a/packages/ui/src/layouts/shared/server-settings/tabs.ts
+++ b/packages/ui/src/layouts/shared/server-settings/tabs.ts
@@ -31,7 +31,7 @@ export interface ServerSettingsTabDefinition {
id: ServerSettingsTabId
label: string
icon: Component
- href: (ctx: ServerSettingsTabContext) => string
+ href?: (ctx: ServerSettingsTabContext) => string
external?: boolean
shown?: (ctx: ServerSettingsTabContext) => boolean
}
@@ -41,32 +41,27 @@ export const serverSettingsTabDefinitions: ServerSettingsTabDefinition[] = [
id: 'general',
label: 'General',
icon: SettingsIcon,
- href: ({ serverId }) => `/hosting/manage/${serverId}/options`,
},
{
id: 'installation',
label: 'Installation',
icon: WrenchIcon,
- href: ({ serverId }) => `/hosting/manage/${serverId}/options/loader`,
},
{
id: 'network',
label: 'Network',
icon: VersionIcon,
- href: ({ serverId }) => `/hosting/manage/${serverId}/options/network`,
},
{
id: 'properties',
label: 'Properties',
icon: ListIcon,
- href: ({ serverId }) => `/hosting/manage/${serverId}/options/properties`,
shown: ({ serverStatus }) => serverStatus !== 'installing',
},
{
id: 'advanced',
label: 'Advanced',
icon: TextQuoteIcon,
- href: ({ serverId }) => `/hosting/manage/${serverId}/options/advanced`,
},
{
id: 'billing',
@@ -85,14 +80,3 @@ export const serverSettingsTabDefinitions: ServerSettingsTabDefinition[] = [
shown: ({ isAdmin }) => isAdmin,
},
]
-
-export function getServerSettingsNavLinks(ctx: ServerSettingsTabContext) {
- return serverSettingsTabDefinitions.map((tab) => ({
- id: tab.id,
- icon: tab.icon,
- label: tab.label,
- href: tab.href(ctx),
- external: tab.external,
- shown: tab.shown ? tab.shown(ctx) : true,
- }))
-}
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/onboarding.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/onboarding.vue
index 1845d070b6..d797fbd119 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/onboarding.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/onboarding.vue
@@ -95,6 +95,19 @@ const route = useRoute()
const router = useRouter()
const queryClient = useQueryClient()
+const props = withDefaults(
+ defineProps<{
+ browseModpacks?: (args: {
+ serverId: string
+ worldId: string | null
+ from: 'onboarding'
+ }) => void | Promise
+ }>(),
+ {
+ browseModpacks: undefined,
+ },
+)
+
const modalRef = ref | null>(null)
const uploading = ref(false)
@@ -109,6 +122,15 @@ const openModal = () => modalRef.value?.show()
onBeforeUnmount(() => modalRef.value?.hide())
function onBrowseModpacks() {
+ if (props.browseModpacks) {
+ props.browseModpacks({
+ serverId,
+ worldId: worldId.value,
+ from: 'onboarding',
+ })
+ return
+ }
+
router.push({
path: '/discover/modpacks',
query: { sid: serverId, from: 'onboarding', wid: worldId.value },
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/components/ServerManageStats.vue b/packages/ui/src/layouts/wrapped/hosting/manage/components/ServerManageStats.vue
new file mode 100644
index 0000000000..e5f544f02d
--- /dev/null
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/components/ServerManageStats.vue
@@ -0,0 +1,287 @@
+
+
-
@@ -71,9 +69,9 @@
- {{ formatMessage(messages.contactSupportButton) }}
+ {{
+ formatMessage(messages.contactSupportButton)
+ }}
@@ -82,7 +80,11 @@
+
+
+
+
+
+
+
+
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/content.vue b/packages/ui/src/layouts/wrapped/hosting/manage/content.vue
index 30776a944a..47e9fd9198 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/content.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/content.vue
@@ -11,6 +11,7 @@ import {
injectModrinthClient,
injectModrinthServerContext,
injectNotificationManager,
+ injectServerSettingsModal,
} from '#ui/providers'
import { commonMessages } from '#ui/utils/common-messages'
@@ -95,6 +96,7 @@ const leaveMessages = defineMessages({
const client = injectModrinthClient()
const { server, worldId, busyReasons, isSyncingContent } = injectModrinthServerContext()
const { addNotification } = injectNotificationManager()
+const { openServerSettings, browseServerContent } = injectServerSettingsModal()
const route = useRoute()
const router = useRouter()
const queryClient = useQueryClient()
@@ -409,6 +411,16 @@ const currentGameVersion = computed(() => contentQuery.data.value?.game_version
const currentLoader = computed(() => contentQuery.data.value?.modloader ?? '')
function handleBrowseContent() {
+ const contentType = type.value
+ if (browseServerContent && ['mod', 'plugin', 'datapack'].includes(contentType)) {
+ browseServerContent({
+ serverId,
+ worldId: worldId.value,
+ type: contentType as 'mod' | 'plugin' | 'datapack',
+ })
+ return
+ }
+
router.push({
path: `/discover/${type.value}s`,
query: { sid: serverId, wid: worldId.value },
@@ -894,7 +906,7 @@ provideContentManager({
updateModpack: handleModpackUpdate,
viewModpackContent: handleViewModpackContent,
unlinkModpack: handleModpackUnlink,
- openSettings: () => router.push(`/hosting/manage/${serverId}/options/loader`),
+ openSettings: () => openServerSettings({ tabId: 'installation' }),
switchVersion: handleSwitchVersion,
getOverflowOptions,
mapToTableItem: (item) => {
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/index.vue b/packages/ui/src/layouts/wrapped/hosting/manage/index.vue
index 0752d7df29..9f4def1ff4 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/index.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/index.vue
@@ -51,9 +51,7 @@
+
+
+
+
+ {{ metric.title }}
+
+
+ {{ metric.value }}
+
+
+
+
+
+
{{ formatMessage(messages.loadingServers) }}
@@ -116,7 +118,9 @@
-
@@ -233,6 +239,7 @@ const route = useRoute()
const auth = injectAuth()
const client = injectModrinthClient()
const loggedIn = computed(() => !!auth.user.value)
+const authReady = computed(() => auth.isReady?.value ?? true)
const { formatMessage } = useVIntl()
const messages = defineMessages({
@@ -542,9 +549,16 @@ const fuse = computed(() => {
})
})
-function introToTop(array: Archon.Servers.v0.Server[]): Archon.Servers.v0.Server[] {
+function sortServers(array: Archon.Servers.v0.Server[]): Archon.Servers.v0.Server[] {
return array.slice().sort((a, b) => {
- return Number(b.flows?.intro) - Number(a.flows?.intro)
+ const aSuspended = a.status === 'suspended' ? 1 : 0
+ const bSuspended = b.status === 'suspended' ? 1 : 0
+ if (aSuspended !== bSuspended) return aSuspended - bSuspended
+
+ const introDiff = Number(b.flows?.intro) - Number(a.flows?.intro)
+ if (introDiff !== 0) return introDiff
+
+ return (a.name || '').localeCompare(b.name || '')
})
}
@@ -560,9 +574,9 @@ function filesExpired(server: Archon.Servers.v0.Server): boolean {
const filteredData = computed(() => {
const base = !searchInput.value.trim()
- ? introToTop(serverList.value)
+ ? sortServers(serverList.value)
: fuse.value
- ? introToTop(fuse.value.search(searchInput.value).map((result) => result.item))
+ ? sortServers(fuse.value.search(searchInput.value).map((result) => result.item))
: []
return base.filter((server) => !filesExpired(server))
})
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/overview.vue b/packages/ui/src/layouts/wrapped/hosting/manage/overview.vue
new file mode 100644
index 0000000000..03cef00de0
--- /dev/null
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/overview.vue
@@ -0,0 +1,219 @@
+
+
+
+
+
+
+
+
diff --git a/packages/ui/src/layouts/wrapped/index.ts b/packages/ui/src/layouts/wrapped/index.ts
index 96eb189947..d91f53ee78 100644
--- a/packages/ui/src/layouts/wrapped/index.ts
+++ b/packages/ui/src/layouts/wrapped/index.ts
@@ -3,3 +3,5 @@ export { default as ServersManageBackupsPage } from './hosting/manage/backups.vu
export { default as ServersManageContentPage } from './hosting/manage/content.vue'
export { default as ServersManageFilesPage } from './hosting/manage/files.vue'
export { default as ServersManagePageIndex } from './hosting/manage/index.vue'
+export { default as ServersManageOverviewPage } from './hosting/manage/overview.vue'
+export { default as ServersManageRootLayout } from './hosting/manage/root.vue'
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index 7294c933e8..a916030387 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -32,6 +32,9 @@
"affiliate.viewAnalytics": {
"defaultMessage": "View analytics"
},
+ "app.server-settings.failed-to-load-server": {
+ "defaultMessage": "Failed to load server settings"
+ },
"badge.beta": {
"defaultMessage": "Beta"
},
@@ -2693,6 +2696,18 @@
"servers.backups.item.restore": {
"defaultMessage": "Restore"
},
+ "servers.busy.backup-creating": {
+ "defaultMessage": "Backup creation in progress"
+ },
+ "servers.busy.backup-restoring": {
+ "defaultMessage": "Backup restore in progress"
+ },
+ "servers.busy.installing": {
+ "defaultMessage": "Server is installing"
+ },
+ "servers.busy.syncing-content": {
+ "defaultMessage": "Content sync in progress"
+ },
"servers.list-empty.already-have-server-label": {
"defaultMessage": "Already have a server?"
},
@@ -2831,6 +2846,9 @@
"servers.manage.loading-servers": {
"defaultMessage": "Loading your servers..."
},
+ "servers.manage.loading.serverPanel": {
+ "defaultMessage": "Loading your server panel..."
+ },
"servers.manage.new-server-button": {
"defaultMessage": "New server"
},
diff --git a/packages/ui/src/providers/auth.ts b/packages/ui/src/providers/auth.ts
index b5f68437ab..4baac3c7fd 100644
--- a/packages/ui/src/providers/auth.ts
+++ b/packages/ui/src/providers/auth.ts
@@ -6,6 +6,8 @@ import { createContext } from './create-context'
export interface AuthProvider {
session_token: Ref
user: Ref
+ /** True once the initial auth check has completed (regardless of result). */
+ isReady?: Ref
requestSignIn: (redirectPath: string) => void | Promise
}
diff --git a/packages/ui/src/providers/index.ts b/packages/ui/src/providers/index.ts
index e6d7c9726e..9c5fcf8740 100644
--- a/packages/ui/src/providers/index.ts
+++ b/packages/ui/src/providers/index.ts
@@ -13,5 +13,6 @@ export * from './popup-notifications'
export * from './project-page'
export * from './project-page-new'
export * from './server-context'
+export * from './server-settings-modal'
export * from './tags'
export * from './web-notifications'
diff --git a/packages/ui/src/providers/server-context.ts b/packages/ui/src/providers/server-context.ts
index a98b0075b0..b9e8d7ff0c 100644
--- a/packages/ui/src/providers/server-context.ts
+++ b/packages/ui/src/providers/server-context.ts
@@ -1,4 +1,5 @@
import type { Archon } from '@modrinth/api-client'
+import type { Stats } from '@modrinth/utils'
import type { ComputedRef, Reactive, Ref } from 'vue'
import type { MessageDescriptor } from '#ui/composables/i18n'
@@ -34,8 +35,12 @@ export interface ModrinthServerContext {
// Websocket state
readonly isConnected: Ref
+ readonly isWsAuthIncorrect: Ref
readonly powerState: Ref
+ readonly powerStateDetails: Ref<{ oom_killed?: boolean; exit_code?: number } | undefined>
readonly isServerRunning: ComputedRef
+ readonly stats: Ref
+ readonly uptimeSeconds: Ref
readonly backupsState: Reactive
markBackupCancelled: (backupId: string) => void
diff --git a/packages/ui/src/providers/server-settings-modal.ts b/packages/ui/src/providers/server-settings-modal.ts
new file mode 100644
index 0000000000..71eeac14f5
--- /dev/null
+++ b/packages/ui/src/providers/server-settings-modal.ts
@@ -0,0 +1,17 @@
+import type { ServerSettingsTabId } from '#ui/layouts/shared/server-settings'
+
+import { createContext } from './create-context'
+
+export interface BrowseServerContentArgs {
+ serverId: string
+ worldId: string | null
+ type: 'mod' | 'plugin' | 'datapack'
+}
+
+export interface ServerSettingsModalContext {
+ openServerSettings: (options?: { tabId?: ServerSettingsTabId }) => void
+ browseServerContent?: (args: BrowseServerContentArgs) => void | Promise
+}
+
+export const [injectServerSettingsModal, provideServerSettingsModal] =
+ createContext('root.vue', 'serverSettingsModalContext')
diff --git a/packages/ui/src/stories/servers/ServerListing.stories.ts b/packages/ui/src/stories/servers/ServerListing.stories.ts
index 45a1c5ba5e..d1fff61904 100644
--- a/packages/ui/src/stories/servers/ServerListing.stories.ts
+++ b/packages/ui/src/stories/servers/ServerListing.stories.ts
@@ -89,7 +89,7 @@ export const Provisioning: Story = {
args: {
...baseServer,
name: 'My New Server',
- status: 'installing',
+ isProvisioning: true,
},
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index acb12e2cc8..5f8fa49059 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -164,7 +164,7 @@ importers:
devDependencies:
'@eslint/compat':
specifier: ^1.1.1
- version: 1.4.1(eslint@9.39.2(jiti@2.6.1))
+ version: 1.4.1(eslint@9.39.2(jiti@1.21.7))
'@formatjs/cli':
specifier: ^6.2.12
version: 6.12.2(@vue/compiler-core@3.5.27)(vue@3.5.27(typescript@5.9.3))
@@ -173,22 +173,22 @@ importers:
version: link:../../packages/tooling-config
'@nuxt/eslint-config':
specifier: ^0.5.6
- version: 0.5.7(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+ version: 0.5.7(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
'@taijased/vue-render-tracker':
specifier: ^1.0.7
version: 1.0.7(vue@3.5.27(typescript@5.9.3))
'@vitejs/plugin-vue':
specifier: ^6.0.3
- version: 6.0.4(vite@8.0.3(@types/node@20.19.31)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2))(vue@3.5.27(typescript@5.9.3))
+ version: 6.0.4(vite@8.0.3(@types/node@20.19.31)(esbuild@0.27.3)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2))(vue@3.5.27(typescript@5.9.3))
autoprefixer:
specifier: ^10.4.19
version: 10.4.24(postcss@8.5.6)
eslint:
specifier: ^9.9.1
- version: 9.39.2(jiti@2.6.1)
+ version: 9.39.2(jiti@1.21.7)
eslint-plugin-turbo:
specifier: ^2.5.4
- version: 2.8.2(eslint@9.39.2(jiti@2.6.1))(turbo@2.8.2)
+ version: 2.8.2(eslint@9.39.2(jiti@1.21.7))(turbo@2.8.2)
postcss:
specifier: ^8.4.39
version: 8.5.6
@@ -206,7 +206,7 @@ importers:
version: 5.9.3
vite:
specifier: ^8.0.0
- version: 8.0.3(@types/node@20.19.31)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2)
+ version: 8.0.3(@types/node@20.19.31)(esbuild@0.27.3)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2)
vue-component-type-helpers:
specifier: ^3.1.8
version: 3.2.4
@@ -610,6 +610,9 @@ importers:
'@codemirror/view':
specifier: ^6.22.1
version: 6.39.12
+ '@intercom/messenger-js-sdk':
+ specifier: ^0.0.14
+ version: 0.0.14
'@modrinth/api-client':
specifier: workspace:*
version: link:../api-client
@@ -634,6 +637,9 @@ importers:
'@tresjs/post-processing':
specifier: ^2.4.0
version: 2.4.0(@tresjs/core@4.3.6(three@0.172.0)(typescript@5.9.3)(vue@3.5.27(typescript@5.9.3)))(three@0.172.0)(typescript@5.9.3)(vue@3.5.27(typescript@5.9.3))
+ '@types/dompurify':
+ specifier: ^3.0.5
+ version: 3.2.0
'@types/markdown-it':
specifier: ^14.1.1
version: 14.1.2
@@ -664,6 +670,9 @@ importers:
dayjs:
specifier: ^1.11.10
version: 1.11.19
+ dompurify:
+ specifier: ^3.1.7
+ version: 3.3.1
es-toolkit:
specifier: ^1.44.0
version: 1.44.0
@@ -745,7 +754,7 @@ importers:
version: 5.2.4(vite@5.4.21(@types/node@20.19.31)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0))(vue@3.5.27(typescript@5.9.3))
eslint-plugin-storybook:
specifier: ^10.1.10
- version: 10.2.4(eslint@9.39.2(jiti@1.21.7))(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3)
+ version: 10.2.4(eslint@9.39.2(jiti@2.6.1))(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3)
storybook:
specifier: ^10.1.10
version: 10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
@@ -10974,11 +10983,11 @@ snapshots:
'@eslint-community/regexpp@4.12.2': {}
- '@eslint/compat@1.4.1(eslint@9.39.2(jiti@2.6.1))':
+ '@eslint/compat@1.4.1(eslint@9.39.2(jiti@1.21.7))':
dependencies:
'@eslint/core': 0.17.0
optionalDependencies:
- eslint: 9.39.2(jiti@2.6.1)
+ eslint: 9.39.2(jiti@1.21.7)
'@eslint/config-array@0.21.1':
dependencies:
@@ -11599,36 +11608,36 @@ snapshots:
- utf-8-validate
- vue
- '@nuxt/eslint-config@0.5.7(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
+ '@nuxt/eslint-config@0.5.7(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
dependencies:
'@eslint/js': 9.39.2
- '@nuxt/eslint-plugin': 0.5.7(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
- '@stylistic/eslint-plugin': 2.13.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
- '@typescript-eslint/eslint-plugin': 8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
- '@typescript-eslint/parser': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
- eslint: 9.39.2(jiti@2.6.1)
- eslint-config-flat-gitignore: 0.3.0(eslint@9.39.2(jiti@2.6.1))
+ '@nuxt/eslint-plugin': 0.5.7(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+ '@stylistic/eslint-plugin': 2.13.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+ '@typescript-eslint/eslint-plugin': 8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+ '@typescript-eslint/parser': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+ eslint: 9.39.2(jiti@1.21.7)
+ eslint-config-flat-gitignore: 0.3.0(eslint@9.39.2(jiti@1.21.7))
eslint-flat-config-utils: 0.4.0
- eslint-plugin-import-x: 4.16.1(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))
- eslint-plugin-jsdoc: 50.8.0(eslint@9.39.2(jiti@2.6.1))
- eslint-plugin-regexp: 2.10.0(eslint@9.39.2(jiti@2.6.1))
- eslint-plugin-unicorn: 55.0.0(eslint@9.39.2(jiti@2.6.1))
- eslint-plugin-vue: 9.33.0(eslint@9.39.2(jiti@2.6.1))
+ eslint-plugin-import-x: 4.16.1(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))
+ eslint-plugin-jsdoc: 50.8.0(eslint@9.39.2(jiti@1.21.7))
+ eslint-plugin-regexp: 2.10.0(eslint@9.39.2(jiti@1.21.7))
+ eslint-plugin-unicorn: 55.0.0(eslint@9.39.2(jiti@1.21.7))
+ eslint-plugin-vue: 9.33.0(eslint@9.39.2(jiti@1.21.7))
globals: 15.15.0
local-pkg: 0.5.1
pathe: 1.1.2
- vue-eslint-parser: 9.4.3(eslint@9.39.2(jiti@2.6.1))
+ vue-eslint-parser: 9.4.3(eslint@9.39.2(jiti@1.21.7))
transitivePeerDependencies:
- '@typescript-eslint/utils'
- eslint-import-resolver-node
- supports-color
- typescript
- '@nuxt/eslint-plugin@0.5.7(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
+ '@nuxt/eslint-plugin@0.5.7(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
dependencies:
'@typescript-eslint/types': 8.54.0
- '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
- eslint: 9.39.2(jiti@2.6.1)
+ '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+ eslint: 9.39.2(jiti@1.21.7)
transitivePeerDependencies:
- supports-color
- typescript
@@ -13105,6 +13114,18 @@ snapshots:
'@stripe/stripe-js@7.9.0': {}
+ '@stylistic/eslint-plugin@2.13.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+ dependencies:
+ '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+ eslint: 9.39.2(jiti@1.21.7)
+ eslint-visitor-keys: 4.2.1
+ espree: 10.4.0
+ estraverse: 5.3.0
+ picomatch: 4.0.3
+ transitivePeerDependencies:
+ - supports-color
+ - typescript
+
'@stylistic/eslint-plugin@2.13.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
dependencies:
'@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
@@ -13116,6 +13137,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
- typescript
+ optional: true
'@svgdotjs/svg.draggable.js@3.0.6(@svgdotjs/svg.js@3.2.5)':
dependencies:
@@ -13517,6 +13539,22 @@ snapshots:
dependencies:
'@types/node': 20.19.31
+ '@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+ dependencies:
+ '@eslint-community/regexpp': 4.12.2
+ '@typescript-eslint/parser': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+ '@typescript-eslint/scope-manager': 8.54.0
+ '@typescript-eslint/type-utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+ '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+ '@typescript-eslint/visitor-keys': 8.54.0
+ eslint: 9.39.2(jiti@1.21.7)
+ ignore: 7.0.5
+ natural-compare: 1.4.0
+ ts-api-utils: 2.4.0(typescript@5.9.3)
+ typescript: 5.9.3
+ transitivePeerDependencies:
+ - supports-color
+
'@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
dependencies:
'@eslint-community/regexpp': 4.12.2
@@ -13533,6 +13571,18 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ '@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+ dependencies:
+ '@typescript-eslint/scope-manager': 8.54.0
+ '@typescript-eslint/types': 8.54.0
+ '@typescript-eslint/typescript-estree': 8.54.0(typescript@5.9.3)
+ '@typescript-eslint/visitor-keys': 8.54.0
+ debug: 4.4.3
+ eslint: 9.39.2(jiti@1.21.7)
+ typescript: 5.9.3
+ transitivePeerDependencies:
+ - supports-color
+
'@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
dependencies:
'@typescript-eslint/scope-manager': 8.54.0
@@ -13563,6 +13613,18 @@ snapshots:
dependencies:
typescript: 5.9.3
+ '@typescript-eslint/type-utils@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+ dependencies:
+ '@typescript-eslint/types': 8.54.0
+ '@typescript-eslint/typescript-estree': 8.54.0(typescript@5.9.3)
+ '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+ debug: 4.4.3
+ eslint: 9.39.2(jiti@1.21.7)
+ ts-api-utils: 2.4.0(typescript@5.9.3)
+ typescript: 5.9.3
+ transitivePeerDependencies:
+ - supports-color
+
'@typescript-eslint/type-utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
dependencies:
'@typescript-eslint/types': 8.54.0
@@ -13733,10 +13795,10 @@ snapshots:
vite: 7.3.1(@types/node@20.19.31)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2)
vue: 3.5.27(typescript@5.9.3)
- '@vitejs/plugin-vue@6.0.4(vite@8.0.3(@types/node@20.19.31)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2))(vue@3.5.27(typescript@5.9.3))':
+ '@vitejs/plugin-vue@6.0.4(vite@8.0.3(@types/node@20.19.31)(esbuild@0.27.3)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2))(vue@3.5.27(typescript@5.9.3))':
dependencies:
'@rolldown/pluginutils': 1.0.0-rc.2
- vite: 8.0.3(@types/node@20.19.31)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2)
+ vite: 8.0.3(@types/node@20.19.31)(esbuild@0.27.3)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2)
vue: 3.5.27(typescript@5.9.3)
'@vitest/expect@3.2.4':
@@ -15262,10 +15324,10 @@ snapshots:
escape-string-regexp@5.0.0: {}
- eslint-config-flat-gitignore@0.3.0(eslint@9.39.2(jiti@2.6.1)):
+ eslint-config-flat-gitignore@0.3.0(eslint@9.39.2(jiti@1.21.7)):
dependencies:
- '@eslint/compat': 1.4.1(eslint@9.39.2(jiti@2.6.1))
- eslint: 9.39.2(jiti@2.6.1)
+ '@eslint/compat': 1.4.1(eslint@9.39.2(jiti@1.21.7))
+ eslint: 9.39.2(jiti@1.21.7)
find-up-simple: 1.0.1
eslint-config-prettier@10.1.8(eslint@9.39.2(jiti@2.6.1)):
@@ -15283,12 +15345,12 @@ snapshots:
optionalDependencies:
unrs-resolver: 1.11.1
- eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1)):
+ eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7)):
dependencies:
'@typescript-eslint/types': 8.54.0
comment-parser: 1.4.5
debug: 4.4.3
- eslint: 9.39.2(jiti@2.6.1)
+ eslint: 9.39.2(jiti@1.21.7)
eslint-import-context: 0.1.9(unrs-resolver@1.11.1)
is-glob: 4.0.3
minimatch: 10.1.2
@@ -15296,18 +15358,18 @@ snapshots:
stable-hash-x: 0.2.0
unrs-resolver: 1.11.1
optionalDependencies:
- '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+ '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
transitivePeerDependencies:
- supports-color
- eslint-plugin-jsdoc@50.8.0(eslint@9.39.2(jiti@2.6.1)):
+ eslint-plugin-jsdoc@50.8.0(eslint@9.39.2(jiti@1.21.7)):
dependencies:
'@es-joy/jsdoccomment': 0.50.2
are-docs-informative: 0.0.2
comment-parser: 1.4.1
debug: 4.4.3
escape-string-regexp: 4.0.0
- eslint: 9.39.2(jiti@2.6.1)
+ eslint: 9.39.2(jiti@1.21.7)
espree: 10.4.0
esquery: 1.7.0
parse-imports-exports: 0.2.4
@@ -15325,12 +15387,12 @@ snapshots:
optionalDependencies:
eslint-config-prettier: 10.1.8(eslint@9.39.2(jiti@2.6.1))
- eslint-plugin-regexp@2.10.0(eslint@9.39.2(jiti@2.6.1)):
+ eslint-plugin-regexp@2.10.0(eslint@9.39.2(jiti@1.21.7)):
dependencies:
- '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@2.6.1))
+ '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
'@eslint-community/regexpp': 4.12.2
comment-parser: 1.4.5
- eslint: 9.39.2(jiti@2.6.1)
+ eslint: 9.39.2(jiti@1.21.7)
jsdoc-type-pratt-parser: 4.8.0
refa: 0.12.1
regexp-ast-analysis: 0.7.1
@@ -15340,29 +15402,29 @@ snapshots:
dependencies:
eslint: 9.39.2(jiti@2.6.1)
- eslint-plugin-storybook@10.2.4(eslint@9.39.2(jiti@1.21.7))(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3):
+ eslint-plugin-storybook@10.2.4(eslint@9.39.2(jiti@2.6.1))(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3):
dependencies:
- '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
- eslint: 9.39.2(jiti@1.21.7)
+ '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+ eslint: 9.39.2(jiti@2.6.1)
storybook: 10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
transitivePeerDependencies:
- supports-color
- typescript
- eslint-plugin-turbo@2.8.2(eslint@9.39.2(jiti@2.6.1))(turbo@2.8.2):
+ eslint-plugin-turbo@2.8.2(eslint@9.39.2(jiti@1.21.7))(turbo@2.8.2):
dependencies:
dotenv: 16.0.3
- eslint: 9.39.2(jiti@2.6.1)
+ eslint: 9.39.2(jiti@1.21.7)
turbo: 2.8.2
- eslint-plugin-unicorn@55.0.0(eslint@9.39.2(jiti@2.6.1)):
+ eslint-plugin-unicorn@55.0.0(eslint@9.39.2(jiti@1.21.7)):
dependencies:
'@babel/helper-validator-identifier': 7.28.5
- '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@2.6.1))
+ '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
ci-info: 4.4.0
clean-regexp: 1.0.0
core-js-compat: 3.48.0
- eslint: 9.39.2(jiti@2.6.1)
+ eslint: 9.39.2(jiti@1.21.7)
esquery: 1.7.0
globals: 15.15.0
indent-string: 4.0.0
@@ -15389,16 +15451,16 @@ snapshots:
'@stylistic/eslint-plugin': 2.13.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
'@typescript-eslint/parser': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
- eslint-plugin-vue@9.33.0(eslint@9.39.2(jiti@2.6.1)):
+ eslint-plugin-vue@9.33.0(eslint@9.39.2(jiti@1.21.7)):
dependencies:
- '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@2.6.1))
- eslint: 9.39.2(jiti@2.6.1)
+ '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
+ eslint: 9.39.2(jiti@1.21.7)
globals: 13.24.0
natural-compare: 1.4.0
nth-check: 2.1.1
postcss-selector-parser: 6.1.2
semver: 7.7.3
- vue-eslint-parser: 9.4.3(eslint@9.39.2(jiti@2.6.1))
+ vue-eslint-parser: 9.4.3(eslint@9.39.2(jiti@1.21.7))
xml-name-validator: 4.0.0
transitivePeerDependencies:
- supports-color
@@ -19782,7 +19844,7 @@ snapshots:
terser: 5.46.0
yaml: 2.8.2
- vite@8.0.3(@types/node@20.19.31)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2):
+ vite@8.0.3(@types/node@20.19.31)(esbuild@0.27.3)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2):
dependencies:
lightningcss: 1.32.0
picomatch: 4.0.4
@@ -19793,7 +19855,7 @@ snapshots:
'@types/node': 20.19.31
esbuild: 0.27.3
fsevents: 2.3.3
- jiti: 2.6.1
+ jiti: 1.21.7
sass: 1.97.3
terser: 5.46.0
yaml: 2.8.2
@@ -19958,10 +20020,10 @@ snapshots:
transitivePeerDependencies:
- supports-color
- vue-eslint-parser@9.4.3(eslint@9.39.2(jiti@2.6.1)):
+ vue-eslint-parser@9.4.3(eslint@9.39.2(jiti@1.21.7)):
dependencies:
debug: 4.4.3
- eslint: 9.39.2(jiti@2.6.1)
+ eslint: 9.39.2(jiti@1.21.7)
eslint-scope: 7.2.2
eslint-visitor-keys: 3.4.3
espree: 9.6.1
{{ formatMessage(messages.serversTitle) }}
++ {{ formatMessage(messages.serversTitle) }} +
+
+ Your server is still accessible during this time.
+
+
+
+
+
+
+
+
+
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/root.vue b/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
new file mode 100644
index 0000000000..da736c5d46
--- /dev/null
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
@@ -0,0 +1,1415 @@
+
+ + We automatically analyzed the logs and found the following: +
+
+
+
+
+
+ The server stopped because it ran out of memory. There may be a memory leak caused by a
+ mod or plugin, or you may need to upgrade your Modrinth Server.
+
+
+ Your server exited with code {{ powerStateDetails.exit_code }}.
+
+ There may be a mod or plugin causing the issue, or an issue with your server
+ configuration.
+
+
+ We could not determine the specific cause of the crash.
+
+
+ {{ problem.message }}
+-
+
- + {{ solution.message }} + +
You can try restarting the server.
+ + + We could not find any specific problems, but you can try restarting the server. + +
+
+
+
+ Console
+
+
+
+
+ Could not connect to the server.
++ An error occurred while attempting to connect to your server. Please try refreshing the + page. (WebSocket Authentication Failed) +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Your server's node, where your Modrinth Server is physically hosted, is not accessible + at the moment. We are working to resolve the issue as quickly as possible. +
++ Your data is safe and will not be lost, and your server will be back online as soon as + the issue is resolved. +
++ If reloading does not work initially, please contact Modrinth Support via the chat + bubble in the bottom right corner and we'll be happy to help. +
+
+
+
+
+
+
+ Server data
+{{
+ safeStringify(serverData)
+ }}
+