feat: server management in app (#5628)

* start new server settings tabs * update properties tab to match design * better stying in general tab * feat: add suffix input for hostname field * implement tables for allocations and DNS records * add tags for dns record type * small gap adjustment * polish advanced page * adjust properties page hierarchy * fix searching properties, empty state and projection radius appearing * pnpm prepr * update copy to match designs * fix suffix input component * style fixes and match heading size * small fix * fix search allocations placeholder * adjust table styles * move all installation settings helper text to below input * update icon to use overflow menu buttons * fix modal to be consistent * open advanced properties when search * remove other and custom properties, and update styles * remove hide/show all java versions * handle mc 26 * refactor: move server settings pages into /ui and add app ServerSettingsModal * hook up server pages for app * add server page header to app * hook up server settings modal * use large size * fix card box shadow style * fix hostname input for app * fix app/website card containers * implement external tabs for billing and admin billing * fix save banner fixed to parent instead of page body * remove unused prop to FriendsList causing warning in app * fix client-only not available for app * fix bottom cut off * wire node auth * implement full copy buttons * dedup copy button tailwind styles * fix hover class not working in @apply * fix spacing * fix error validation styles * apply consistent styles and spacing * feat: update hosting server card (#5609) * fix type errors * fix some stylesheets not imported for storybook * add server listing stories * add fix for frontend stylesheet imports * remove props. * convert copy code to use tailwind * update server listing component styles * update server info label styles * start status/player count info label, more style updates and fixes * add new server card buttons * hook up server cards and implement updated styles * hook up on download button * fix tauri throwing error when api returns 204 No Content * hook up purchase server modal in app * fix upgrading state loading icon * pnpm prepr * filter out servers past 30 days after cancellation * do not apply opacity on lock or spiner icons * fix disabled server icon background * update pending change stage * handle known suspension states * refactor: reduce code duplication for server listing * update disabled state text color * fix loading icon color * clean up copy * fix disabled opacity for server card * update server listing files kept to be countdown * implement resubscribe modal * implement proper provisioning state for resubscribe * fix duplicate attribute and pnpm prepr * feat: add shared UI package auth DI * feat: update purchase server flow (#5714) * implement server list empty state component * fix stories and adjust spacing * implement select plan design refresh * implement auth for empty server list * use refs instead of reactive * pnpm prepr * fix auth usage for empty servers list * move app auth provider setup to src/providers/setup * pnpm prepr * fix max height * style fix * fix getCreds no auth is blocking api client * implement servers guest plan modal and signin which redirects back to modal's next step * refactor guest plan select logic into provider * implement sign in or create account popup * remove force empty serverList * add download button for suspended mod and generic * add handling for when user logs out * QA pass style fixes * more consistent page styles * fix duplicate export * refactor: remove all fallback stuff from resubscribe modal * implement shared download latest backup util * i18n pass * pnpm prepr * fix region being selected if ping failed * pnpm prepr * feat: servers in app finalization (#5744) * feat: start on shared console implementation into logs and overview pages * fix: terminal gap issues * feat: swap word wrap for full screen * fix: stats cards alignment * fix: stats * feat: fix console clear + remove copy * fix: lint * fix: use reset not clear * feat: shared server header & overview page for app and website (#5736) * feat: implement shared server header for app and website * feat: implement wrapped overview page with shared composable and hook it up * pnpm prepr * fix: bugs * qa: cleanup * feat: root.vue shared layout * feat: delete old options pages + fix discovery frontend * fix: discovery * fix: misc style/layout issues * fix page padding * fix: modal height jankiness * feat: implement server install content in app and server setup modal with DI * fix: spacing * remove servers in app feature flag * Revert "remove servers in app feature flag" This reverts commit 86e284c4bdd6fa42c3c8fbaf1efbec41f4d1c6d2. * fix: qa * feat: remove legacy components from apps/frontend/src/components/ui/servers --------- Co-authored-by: Calum H. (IMB11) <contact@cal.engineer> * qa pass (#5738) * fix: qa * feat: qa * fix: server icon fetch fails due to global node auth race condition overriding each other * fix: lint * fix: server icon upload/sync and centralize logic * fix: server settings modal not closing for server reset * fix: better server sorting * feat: copy address in server listing card * fix: notification panel in modal and when overlapping with action bar * fix: empty server list empty state flashing when refresh, fixed by adding isReady auth flag * feat: use floating action bar for save banner * fix: saving state in save bar * fix: edit server icon styling * fix: confirm modal to have consistent buttons * feat: loading animation for server panel + caching improvements for app * pnpm prepr * feat: search page deduplication (#5754) * fix: action bar behind modal * fix: remove warning modal for stopping * fix: server cards states * we hate webkit we hate webkit * fix: update allocation creation to not use modal * fix: properties tab spacing and styles * feat: add files tab copy * fix: advanced properties icon * fix: remove back to all servers link * feat: add files tab link in copy * fix: server header styles to be consistent with instance * fix: add header icons back * feat: update instance settings icon to be consistent * fix: icon container * feat: upload state persistence across tabs * fix: server labels text wrapping * fix: use surface-5 border * fix: loading spinner showing with onboarding below * feat: new server button shows purchase modal in website * fix: billing page not showing quarterly interval * fix: server downgrade not showing updated subscription notification * fix: server settings invalidate saved state and remove server context provider since its already provided in the page * pnpm prepr * add stripe publishable key to app build * feat: console highlighting * fix: rename servers title to modrinth hosting * feat: search fix * fix: qa/styles * fix: ip click active and remove power dont ask again * fix: qa * feat: highlighting fix console * fix: disable conflicts action * fix: error dismiss bug * feat: modal clarification * fix: files perms issue * fix: lint * feat: modal fix * enable show uptime * fix: add loading state to edit server icon * fix: notification panel take in has sidebar from settings * fix: consistency pass on app settings * fix: consistency pass on instance settings * pnpm prepr * fix: nagivate to billing button in app to go to website * fix: stripe return url in app causing app to open modrinth.com in tauri * refactor: better show polling UI code * fix: new server polling comparison to use server ids instead of length * fix: buttonstyled story * fix: button styling * fix: content.vue regression * feat: project url redirects * fix: breadcrumbs * fix: purchase with newly added card * fix: console ordering problems * fix: app-frontend missing env config and staging environment * fix: log syncing for instances and server panel accidentally * fix: QA issues * fix: server page loading state * fix: stats card logic * fix: lint * fix: qa * fix: console height padding * fix: terminal padding + loading indicator * feat: update medal server listing styling * fix: no upgrade button for medal server listing in app * fix: go to overview instead of content tab after onboarding * fix: qa * fix: teleport modals to body * fix: logs tab + qa * fix: local storage for user preferences * fix: qa loading indic * feat: considitonal debug and trace * fix: jump to top on install bug * feat: swap out server hard drive icon to server stack icon * feat: servers in app feature flag default true * fix: highlight row ufll * fix: webkit thing onto a tag * fix: input field * fix: clear fix * fix: lint * fix: fmt * feat: improve share modal and bring it back for sharing log * pnpm prepr * fix: menu overflowing * feat: remove servers in app feature flag * fix: server stat charts no longer showing color * fix: library nav no primary state * fix: better modal height and width * fix: highlighting bugs * fix: empty states * fix: delay import to fix overview page slow load on MacOS * fix: medal server listing too bright on light mode * fix: admon analysis + fix logs * fix: bug * fix: clear purchase intent from sign-in after closing modal * performance: improve server manage stats loading by splitting reactivity * fix: deploy + admon + disable highlighting * fix: clippy --------- Co-authored-by: tdgao <mr.trumgao@gmail.com> Co-authored-by: Truman Gao <106889354+tdgao@users.noreply.github.com> * feat: temp wrangler * fix: lint * fix: logs upload * fix: console empty state and admon regressions * fix: fields * feat: log deleting + prefetch for Logs.vue * feat: move delete before share * feat: clear endpoint * feat: we ball! --------- Co-authored-by: Calum H. <calum@modrinth.com> Co-authored-by: Calum H. (IMB11) <contact@cal.engineer>
2026-04-12 15:38:08 -06:00
parent a2a97d1313
commit 693a371d61
278 changed files with 15974 additions and 12608 deletions
--- a/packages/api-client/CLAUDE.md
+++ b/packages/api-client/CLAUDE.md
@@ -47,6 +47,22 @@ client.iso3166.data

 This structure is derived at runtime from the flat `MODULE_REGISTRY` in `modules/index.ts` via `buildModuleStructure()`, and the TypeScript types are inferred automatically via `InferredClientModules`.

+## Critical: Always use `this.client.request()`
+
+API modules **must** use `this.client.request()` (or `.upload`) for all HTTP calls — never `$fetch`, `fetch`, or any other HTTP library directly. The request method routes through the platform-specific implementation (Nuxt `$fetch`, Tauri HTTP plugin, etc.) and the feature middleware chain (auth, retry, circuit breaker). Using `$fetch` directly bypasses the platform layer and will fail in Tauri (CORS/sandboxing). The only exception is the `ISO3166Module` which is explicitly node-only.
+
+For external APIs (non-Modrinth), pass the full base URL as the `api` field and set `skipAuth: true`:
+
+```ts
+this.client.request<MyType>('/endpoint', {
+	api: 'https://external-api.com',
+	version: 1,
+	method: 'POST',
+	body: { data },
+	skipAuth: true,
+})
+```
+
 ## Usage

 The client is provided to the component tree via DI (see the `dependency-injection` skill). Each app creates a platform-specific client and provides it at the root:
--- a/packages/api-client/src/core/abstract-client.ts
+++ b/packages/api-client/src/core/abstract-client.ts
@@ -30,6 +30,10 @@ export abstract class AbstractModrinthClient extends AbstractUploadClient {
 	public readonly archon!: InferredClientModules['archon'] & { sockets: AbstractWebSocketClient }
 	public readonly kyros!: InferredClientModules['kyros']
 	public readonly iso3166!: InferredClientModules['iso3166']
+	public readonly mclogs!: InferredClientModules['mclogs']
+	public readonly launchermeta!: InferredClientModules['launchermeta']
+	public readonly paper!: InferredClientModules['paper']
+	public readonly purpur!: InferredClientModules['purpur']

 	constructor(config: ClientConfig) {
 		super()
--- a/packages/api-client/src/features/panel-version.ts
+++ b/packages/api-client/src/features/panel-version.ts
@@ -12,7 +12,7 @@ export class PanelVersionFeature extends AbstractFeature {
 		return next()
 	}

-	shouldApply(_: RequestContext): boolean {
-		return true
+	shouldApply(context: RequestContext): boolean {
+		return context.options.api === 'labrinth' || context.options.api === 'archon'
 	}
 }
--- a/packages/api-client/src/modules/archon/types.ts
+++ b/packages/api-client/src/modules/archon/types.ts
@@ -499,6 +499,16 @@ export namespace Archon {
 				message: string
 			}

+			export type WSLog4jEvent = {
+				event: 'log4j'
+				logger_name?: string
+				level?: string
+				thread_name?: string
+				timestamp_millis?: number
+				message?: string
+				throwable?: string
+			}
+
 			export type WSStatsEvent = {
 				event: 'stats'
 				cpu_percent: number
@@ -644,6 +654,7 @@ export namespace Archon {
 			export type WSEvent =
 				| WSBackupProgressEvent
 				| WSLogEvent
+				| WSLog4jEvent
 				| WSStatsEvent
 				| WSPowerStateEvent
 				| WSStateEvent
--- a/packages/api-client/src/modules/index.ts
+++ b/packages/api-client/src/modules/index.ts
@@ -9,6 +9,7 @@ import { ArchonServersV1Module } from './archon/servers/v1'
 import { ISO3166Module } from './iso3166'
 import { KyrosContentV1Module } from './kyros/content/v1'
 import { KyrosFilesV0Module } from './kyros/files/v0'
+import { KyrosLogsV1Module } from './kyros/logs/v1'
 import { LabrinthVersionsV2Module, LabrinthVersionsV3Module } from './labrinth'
 import { LabrinthAffiliateInternalModule } from './labrinth/affiliate/internal'
 import { LabrinthAuthInternalModule } from './labrinth/auth/internal'
@@ -36,6 +37,8 @@ import { LabrinthTechReviewInternalModule } from './labrinth/tech-review/interna
 import { LabrinthThreadsV3Module } from './labrinth/threads/v3'
 import { LabrinthUsersV2Module } from './labrinth/users/v2'
 import { LauncherMetaManifestV0Module } from './launcher-meta/v0'
+import { MclogsInsightsV1Module } from './mclogs/insights/v1'
+import { MclogsLogsV1Module } from './mclogs/logs/v1'
 import { PaperVersionsV3Module } from './paper/v3'
 import { PurpurVersionsV2Module } from './purpur/v2'

@@ -58,9 +61,12 @@ export const MODULE_REGISTRY = {
 	archon_servers_v0: ArchonServersV0Module,
 	archon_servers_v1: ArchonServersV1Module,
 	iso3166_data: ISO3166Module,
+	mclogs_insights_v1: MclogsInsightsV1Module,
+	mclogs_logs_v1: MclogsLogsV1Module,
 	launchermeta_manifest_v0: LauncherMetaManifestV0Module,
 	kyros_content_v1: KyrosContentV1Module,
 	kyros_files_v0: KyrosFilesV0Module,
+	kyros_logs_v1: KyrosLogsV1Module,
 	labrinth_affiliate_internal: LabrinthAffiliateInternalModule,
 	labrinth_auth_internal: LabrinthAuthInternalModule,
 	labrinth_auth_v2: LabrinthAuthV2Module,
--- 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<Archon.Servers.v0.JWTAuth, 'url' | 'token'>
+
 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<Blob> {
+		return this.client.request<Blob>('/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<void> {
+		return this.client.upload<void>('/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<void> {
+		return this.client.request<void>('/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.)
 	 *
--- a/packages/api-client/src/modules/kyros/logs/v1.ts
+++ b/packages/api-client/src/modules/kyros/logs/v1.ts
@@ -0,0 +1,17 @@
+import { AbstractModule } from '../../../core/abstract-module'
+
+export class KyrosLogsV1Module extends AbstractModule {
+	public getModuleID(): string {
+		return 'kyros_logs_v1'
+	}
+
+	/** POST /v1/logs/clear — clear the live logs buffer for the current server */
+	public async clear(): Promise<void> {
+		return this.client.request<void>('/logs/clear', {
+			api: '',
+			version: 'v1',
+			method: 'POST',
+			useNodeAuth: true,
+		})
+	}
+}
--- a/packages/api-client/src/modules/mclogs/insights/v1.ts
+++ b/packages/api-client/src/modules/mclogs/insights/v1.ts
@@ -0,0 +1,19 @@
+import { AbstractModule } from '../../../core/abstract-module'
+import type { Mclogs } from '../types'
+
+export class MclogsInsightsV1Module extends AbstractModule {
+	public getModuleID(): string {
+		return 'mclogs_insights_v1'
+	}
+
+	public async analyse(content: string): Promise<Mclogs.Insights.v1.InsightsResponse> {
+		return this.client.request<Mclogs.Insights.v1.InsightsResponse>('/analyse', {
+			api: 'https://api.mclo.gs',
+			version: '1',
+			method: 'POST',
+			body: new URLSearchParams({ content }),
+			headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+			skipAuth: true,
+		})
+	}
+}
--- a/packages/api-client/src/modules/mclogs/logs/v1.ts
+++ b/packages/api-client/src/modules/mclogs/logs/v1.ts
@@ -0,0 +1,19 @@
+import { AbstractModule } from '../../../core/abstract-module'
+import type { Mclogs } from '../types'
+
+export class MclogsLogsV1Module extends AbstractModule {
+	public getModuleID(): string {
+		return 'mclogs_logs_v1'
+	}
+
+	public async create(content: string): Promise<Mclogs.Logs.v1.CreateResponse> {
+		return this.client.request<Mclogs.Logs.v1.CreateResponse>('/log', {
+			api: 'https://api.mclo.gs',
+			version: '1',
+			method: 'POST',
+			body: new URLSearchParams({ content }),
+			headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+			skipAuth: true,
+		})
+	}
+}
--- a/packages/api-client/src/modules/mclogs/types.ts
+++ b/packages/api-client/src/modules/mclogs/types.ts
@@ -0,0 +1,63 @@
+export namespace Mclogs {
+	export namespace Insights {
+		export namespace v1 {
+			export type LogEntry = {
+				level: number
+				time: string | null
+				prefix: string
+				lines: Array<{ number: number; content: string }>
+			}
+
+			export type Solution = {
+				message: string
+			}
+
+			export type Problem = {
+				message: string
+				counter: number
+				entry: LogEntry
+				solutions: Solution[]
+			}
+
+			export type Information = {
+				message: string
+				counter: number
+				label: string
+				value: string
+				entry: LogEntry
+			}
+
+			export type Analysis = {
+				problems: Problem[]
+				information: Information[]
+			}
+
+			export type InsightsResponse = {
+				id: string
+				name: string
+				type: string
+				version: string
+				title: string
+				analysis: Analysis
+			}
+		}
+	}
+
+	export namespace Logs {
+		export namespace v1 {
+			export type CreateResponse = {
+				success: boolean
+				id: string
+				source: string | null
+				created: number
+				expires: number
+				size: number
+				lines: number
+				errors: number
+				url: string
+				raw: string
+				token: string
+			}
+		}
+	}
+}
--- a/packages/api-client/src/modules/types.ts
+++ b/packages/api-client/src/modules/types.ts
@@ -3,5 +3,6 @@ export * from './iso3166/types'
 export * from './kyros/types'
 export * from './labrinth/types'
 export * from './launcher-meta/types'
+export * from './mclogs/types'
 export * from './paper/types'
 export * from './purpur/types'
--- a/packages/api-client/src/platform/tauri.ts
+++ b/packages/api-client/src/platform/tauri.ts
@@ -103,8 +103,38 @@ export class TauriModrinthClient extends XHRUploadClient {
 				throw error
 			}

-			const data = await response.json()
-			return data as T
+			// 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
+			}
+
+			try {
+				return JSON.parse(text) as T
+			} catch {
+				return text as T
+			}
 		} catch (error) {
 			throw this.normalizeError(error)
 		}