You've already forked AstralRinth
693a371d61
* 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>
437 lines
12 KiB
TypeScript
437 lines
12 KiB
TypeScript
import type { InferredClientModules } from '../modules'
|
|
import { buildModuleStructure } from '../modules'
|
|
import type { ClientConfig } from '../types/client'
|
|
import type { RequestContext, RequestOptions } from '../types/request'
|
|
import type { UploadMetadata, UploadProgress, UploadRequestOptions } from '../types/upload'
|
|
import type { AbstractFeature } from './abstract-feature'
|
|
import type { AbstractModule } from './abstract-module'
|
|
import { AbstractUploadClient } from './abstract-upload-client'
|
|
import type { AbstractWebSocketClient } from './abstract-websocket'
|
|
import { ModrinthApiError, ModrinthServerError } from './errors'
|
|
|
|
/**
|
|
* Abstract base client for Modrinth APIs
|
|
*/
|
|
export abstract class AbstractModrinthClient extends AbstractUploadClient {
|
|
protected config: ClientConfig
|
|
protected features: AbstractFeature[]
|
|
|
|
/**
|
|
* Maps full module ID (e.g., 'labrinth_projects_v2') to instantiated module
|
|
*/
|
|
private _moduleInstances: Map<string, AbstractModule> = new Map()
|
|
|
|
/**
|
|
* Maps API name (e.g., 'labrinth') to namespace object
|
|
*/
|
|
private _moduleNamespaces: Map<string, Record<string, AbstractModule>> = new Map()
|
|
|
|
public readonly labrinth!: InferredClientModules['labrinth']
|
|
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()
|
|
this.config = {
|
|
timeout: 10000,
|
|
labrinthBaseUrl: 'https://api.modrinth.com',
|
|
archonBaseUrl: 'https://archon.modrinth.com',
|
|
...config,
|
|
}
|
|
this.features = config.features ?? []
|
|
this.initializeModules()
|
|
}
|
|
|
|
/**
|
|
* This creates the nested API structure (e.g., client.labrinth.projects_v2)
|
|
* but doesn't instantiate modules until first access
|
|
*
|
|
* Module IDs in the registry are validated at runtime to ensure they match
|
|
* what the module declares via getModuleID().
|
|
*/
|
|
private initializeModules(): void {
|
|
const structure = buildModuleStructure()
|
|
|
|
for (const [api, modules] of Object.entries(structure)) {
|
|
const namespaceObj: Record<string, AbstractModule> = {}
|
|
|
|
// Define lazy getters for each module
|
|
for (const [moduleName, ModuleConstructor] of Object.entries(modules)) {
|
|
const fullModuleId = `${api}_${moduleName}`
|
|
|
|
Object.defineProperty(namespaceObj, moduleName, {
|
|
get: () => {
|
|
// Lazy instantiation
|
|
if (!this._moduleInstances.has(fullModuleId)) {
|
|
const instance = new ModuleConstructor(this)
|
|
|
|
// Validate the module ID matches what we expect
|
|
const declaredId = instance.getModuleID()
|
|
if (declaredId !== fullModuleId) {
|
|
throw new Error(
|
|
`Module ID mismatch: registry expects "${fullModuleId}" but module declares "${declaredId}"`,
|
|
)
|
|
}
|
|
|
|
this._moduleInstances.set(fullModuleId, instance)
|
|
}
|
|
return this._moduleInstances.get(fullModuleId)!
|
|
},
|
|
enumerable: true,
|
|
configurable: false,
|
|
})
|
|
}
|
|
|
|
// Assign namespace to client (e.g., this.labrinth = namespaceObj)
|
|
// defineProperty bypasses readonly restriction
|
|
Object.defineProperty(this, api, {
|
|
value: namespaceObj,
|
|
writable: false,
|
|
enumerable: true,
|
|
configurable: false,
|
|
})
|
|
|
|
this._moduleNamespaces.set(api, namespaceObj)
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Make a request to the API
|
|
*
|
|
* @param path - API path (e.g., '/project/sodium')
|
|
* @param options - Request options
|
|
* @returns Promise resolving to the response data
|
|
* @throws {ModrinthApiError} When the request fails or features throw errors
|
|
*/
|
|
async request<T>(path: string, options: RequestOptions): Promise<T> {
|
|
let baseUrl: string
|
|
if (options.api === 'labrinth') {
|
|
baseUrl = this.config.labrinthBaseUrl!
|
|
} else if (options.api === 'archon') {
|
|
baseUrl = this.config.archonBaseUrl!
|
|
} else {
|
|
baseUrl = options.api
|
|
}
|
|
|
|
const url = this.buildUrl(path, baseUrl, options.version)
|
|
|
|
// Merge options with defaults
|
|
const mergedOptions: RequestOptions = {
|
|
method: 'GET',
|
|
timeout: this.config.timeout,
|
|
...options,
|
|
headers: {
|
|
...this.buildDefaultHeaders(),
|
|
...options.headers,
|
|
},
|
|
}
|
|
this.attachArchonSentryCaptureHeader(mergedOptions)
|
|
|
|
const headers = mergedOptions.headers
|
|
if (headers && 'Content-Type' in headers && headers['Content-Type'] === '') {
|
|
delete headers['Content-Type']
|
|
}
|
|
|
|
const context = this.buildContext(url, path, mergedOptions)
|
|
|
|
try {
|
|
const result = await this.executeFeatureChain<T>(context)
|
|
|
|
await this.config.hooks?.onResponse?.(result, context)
|
|
|
|
return result
|
|
} catch (error) {
|
|
const apiError = this.normalizeError(error, context)
|
|
await this.config.hooks?.onError?.(apiError, context)
|
|
|
|
throw apiError
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Execute the feature chain and the actual request
|
|
*
|
|
* Features are executed in order, with each feature calling next() to continue.
|
|
* The last "feature" in the chain is the actual request execution.
|
|
*/
|
|
protected async executeFeatureChain<T>(context: RequestContext): Promise<T> {
|
|
// Filter to only features that should apply
|
|
const applicableFeatures = this.features.filter((feature) => feature.shouldApply(context))
|
|
|
|
// Build the feature chain
|
|
// We work backwards from the actual request, wrapping each feature around the previous
|
|
let index = applicableFeatures.length
|
|
|
|
const next = async (): Promise<T> => {
|
|
index--
|
|
|
|
if (index >= 0) {
|
|
// Execute the next feature in the chain
|
|
const feature = applicableFeatures[index]
|
|
return feature.execute(next, context)
|
|
} else {
|
|
// We've reached the end of the chain, execute the actual request
|
|
await this.config.hooks?.onRequest?.(context)
|
|
return this.executeRequest<T>(context.url, context.options)
|
|
}
|
|
}
|
|
|
|
return next()
|
|
}
|
|
|
|
/**
|
|
* Execute the feature chain for an upload
|
|
*
|
|
* Similar to executeFeatureChain but calls executeXHRUpload at the end.
|
|
* This allows features (auth, retry, etc.) to wrap the upload execution.
|
|
*/
|
|
protected async executeUploadFeatureChain<T>(
|
|
context: RequestContext,
|
|
progressCallbacks: Array<(p: UploadProgress) => void>,
|
|
abortController: AbortController,
|
|
): Promise<T> {
|
|
const applicableFeatures = this.features.filter((feature) => feature.shouldApply(context))
|
|
|
|
let index = applicableFeatures.length
|
|
|
|
const next = async (): Promise<T> => {
|
|
index--
|
|
|
|
if (index >= 0) {
|
|
return applicableFeatures[index].execute(next, context)
|
|
} else {
|
|
await this.config.hooks?.onRequest?.(context)
|
|
return this.executeXHRUpload<T>(context, progressCallbacks, abortController)
|
|
}
|
|
}
|
|
|
|
return next()
|
|
}
|
|
|
|
/**
|
|
* Build the full URL for a request
|
|
*/
|
|
protected buildUrl(path: string, baseUrl: string, version: number | 'internal' | string): string {
|
|
// Remove trailing slash from base URL
|
|
const base = baseUrl.replace(/\/$/, '')
|
|
|
|
// Build version path
|
|
let versionPath = ''
|
|
if (version === 'internal') {
|
|
versionPath = '/_internal'
|
|
} else if (typeof version === 'number') {
|
|
versionPath = `/v${version}`
|
|
} else if (typeof version === 'string') {
|
|
// Custom version string (e.g., 'v0', 'modrinth/v0')
|
|
versionPath = `/${version}`
|
|
}
|
|
|
|
const cleanPath = path.startsWith('/') ? path : `/${path}`
|
|
|
|
return `${base}${versionPath}${cleanPath}`
|
|
}
|
|
|
|
/**
|
|
* Build the request context
|
|
*/
|
|
protected buildContext(url: string, path: string, options: RequestOptions): RequestContext {
|
|
return {
|
|
url,
|
|
path,
|
|
options,
|
|
attempt: 1,
|
|
startTime: Date.now(),
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Build context for an upload request
|
|
*
|
|
* Sets metadata.isUpload = true so features can detect uploads.
|
|
* Supports both single file uploads and FormData uploads.
|
|
*/
|
|
protected buildUploadContext(
|
|
url: string,
|
|
path: string,
|
|
options: UploadRequestOptions,
|
|
): RequestContext {
|
|
let metadata: UploadMetadata
|
|
let body: File | Blob | FormData
|
|
|
|
if ('formData' in options && options.formData) {
|
|
metadata = {
|
|
isUpload: true,
|
|
formData: options.formData,
|
|
onProgress: options.onProgress,
|
|
}
|
|
body = options.formData
|
|
} else if ('file' in options && options.file) {
|
|
metadata = {
|
|
isUpload: true,
|
|
file: options.file,
|
|
onProgress: options.onProgress,
|
|
}
|
|
body = options.file
|
|
} else {
|
|
throw new Error('Upload options must include either file or formData')
|
|
}
|
|
|
|
return {
|
|
url,
|
|
path,
|
|
options: {
|
|
...options,
|
|
method: 'POST',
|
|
body,
|
|
},
|
|
attempt: 1,
|
|
startTime: Date.now(),
|
|
metadata,
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Build default headers for all requests
|
|
*
|
|
* Subclasses can override this to add platform-specific headers
|
|
* (e.g., Nuxt rate limit key)
|
|
*/
|
|
protected buildDefaultHeaders(): Record<string, string> {
|
|
const headers: Record<string, string> = {
|
|
'Content-Type': 'application/json',
|
|
...this.config.headers,
|
|
}
|
|
|
|
if (this.config.userAgent) {
|
|
headers['User-Agent'] = this.config.userAgent
|
|
}
|
|
|
|
return headers
|
|
}
|
|
|
|
protected attachArchonSentryCaptureHeader(options: RequestOptions): void {
|
|
if (options.api !== 'archon' || !options.headers || !this.shouldCaptureArchonRequests()) {
|
|
return
|
|
}
|
|
|
|
options.headers['modrinth-sentry-capture'] = '1'
|
|
}
|
|
|
|
private shouldCaptureArchonRequests(): boolean {
|
|
const archonSentryCapture = this.config.archonSentryCapture
|
|
return typeof archonSentryCapture === 'function'
|
|
? archonSentryCapture()
|
|
: archonSentryCapture === true
|
|
}
|
|
|
|
/**
|
|
* Execute the actual HTTP request
|
|
*
|
|
* This must be implemented by platform-specific clients.
|
|
*
|
|
* @param url - Full URL to request
|
|
* @param options - Request options
|
|
* @returns Promise resolving to the response data
|
|
* @throws {Error} Platform-specific errors that will be normalized by normalizeError()
|
|
*/
|
|
protected abstract executeRequest<T>(url: string, options: RequestOptions): Promise<T>
|
|
|
|
/**
|
|
* Execute the actual XHR upload
|
|
*
|
|
* This must be implemented by platform clients that support uploads.
|
|
* Called at the end of the upload feature chain.
|
|
*
|
|
* @param context - Request context with upload metadata
|
|
* @param progressCallbacks - Callbacks to invoke on progress events
|
|
* @param abortController - Controller for cancellation
|
|
* @returns Promise resolving to the response data
|
|
*/
|
|
protected abstract executeXHRUpload<T>(
|
|
context: RequestContext,
|
|
progressCallbacks: Array<(p: UploadProgress) => void>,
|
|
abortController: AbortController,
|
|
): Promise<T>
|
|
|
|
/**
|
|
* Normalize an error into a ModrinthApiError
|
|
*
|
|
* Platform implementations should override this to handle platform-specific errors
|
|
* (e.g., FetchError from ofetch, Tauri HTTP errors)
|
|
*/
|
|
protected normalizeError(error: unknown, context?: RequestContext): ModrinthApiError {
|
|
if (error instanceof ModrinthApiError) {
|
|
return error
|
|
}
|
|
|
|
return ModrinthApiError.fromUnknown(error, context?.path)
|
|
}
|
|
|
|
/**
|
|
* Helper to create a normalized error from extracted status code and response data
|
|
*/
|
|
protected createNormalizedError(
|
|
error: Error,
|
|
statusCode: number | undefined,
|
|
responseData: unknown,
|
|
): ModrinthApiError {
|
|
if (statusCode && responseData) {
|
|
return ModrinthServerError.fromResponse(statusCode, responseData)
|
|
}
|
|
|
|
return new ModrinthApiError(error.message, {
|
|
statusCode,
|
|
originalError: error,
|
|
responseData,
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Add a feature to this client
|
|
*
|
|
* Features are executed in the order they are added.
|
|
*
|
|
* @example
|
|
* ```typescript
|
|
* const client = new GenericModrinthClient()
|
|
* client.addFeature(new AuthFeature({ token: 'mrp_...' }))
|
|
* client.addFeature(new RetryFeature({ maxAttempts: 3 }))
|
|
* ```
|
|
*/
|
|
addFeature(feature: AbstractFeature): this {
|
|
this.features.push(feature)
|
|
return this
|
|
}
|
|
|
|
/**
|
|
* Remove a feature from this client
|
|
*
|
|
* @example
|
|
* ```typescript
|
|
* const retryFeature = new RetryFeature({ maxAttempts: 3 })
|
|
* client.addFeature(retryFeature)
|
|
* // Later, remove it
|
|
* client.removeFeature(retryFeature)
|
|
* ```
|
|
*/
|
|
removeFeature(feature: AbstractFeature): this {
|
|
const index = this.features.indexOf(feature)
|
|
if (index !== -1) {
|
|
this.features.splice(index, 1)
|
|
}
|
|
return this
|
|
}
|
|
|
|
/**
|
|
* Get all features on this client
|
|
*/
|
|
getFeatures(): AbstractFeature[] {
|
|
return [...this.features]
|
|
}
|
|
}
|