You've already forked AstralRinth
forked from didirus/AstralRinth
7d92e4ec7f
* feat: base content card component * fix: tooltips + colors * feat: fix orgs * feat: base content tab internals rewrite * feat: fix invalidmodal * feat: add ContentModpackCard * fix: extract types * draft: layout * feat: unlink modal * feat: impl content tab * fix: lint * fix: toggling * temp: disable updating stuff * feat: selection v-model * feat: bulk selection * feat: mods tab rough draft * feat: use fuse.js * feat: add project combobox * clean up project combobox * feat: start install to play modal * fix: events * feat: use v-on * feat: bulk actions + fix floating action bar width * feat: figma alignments * feat: migrate toggle to tailwind * fix: row borders * feat: disabled state * feat: virtual list impl for card table based on window scroll * fix: lint * feat: virtualization + smaller contentcard items * feat: use ContentCardTable + ContentCardItems * feat: fix gap + border issues on last elm * feat: cleanup + use proper searching * fix: use TeleportOverflowMenu * fix: fallback to svg if src is invalid on avatar component * fix: storybook * feat: start on updater modal * feat: finish content updater modal * feat: i18n pass * feat: impl modal * feat(app): backend changes for content tab refactor (#5237) * feat: include_changelog=false for updater modal * fix: hash overrides * feat: update checking for modpack * feat: qa * feat: modpack content modal * fix: padding in table to match modals + tightness * fix: lint * feat: delete modal * feat: fix toggle bugs * fix: prepr * fix: duplicate messages * qa: full width search * qa: use bg-surface-1.5 * qa: animation for filter pills * qa: standardize hover colors * fix: border-[1px] is border * qa: mass de-select actually mass selecting * qa: match figma designs for floating action bar * qa: modal fixes * q: modal fixes x2 * fix: table border * qa: confirm modals * qa: modal alignment * qa: re-add stuck heading + dedupe logic * qa: dedupe virtual scrolling + remove dead components * qa: responsiveness for content table + link fixes * qa: version column link, tooltips + lint fixes * qa: instance busy protections * fix: installation freeze bug * chore: remove old mods page * refactor: deduplicate layout * chore: delete old content page(s) * qa * qa * qa * feat: sort btn - to iterate * fix: ml * feat: date added * fix: lint * fix: formatting.ts removal * feat: get_dependencies_as_content_items * qa: final QA changes * refactor: deduplicate + polish content.rs * feat: hook up content.vue with v1 * feat: hide v1 content api behind frontend feature flag * fix: query keys + copy on empty state * chore: i18n pass * feat: reimpl unlink + upload endpoint * feat: use bulk endpoints v1 * fix: lint * fix: flags * fix: responsiveness via container queries * fix: lint * qa: 1 * qa: fixes * qa: fix ssr issues with browse content * qa: header page divider * qa: modals * fix: prepr * fix: issues * fix: lint * fix: toggle v1 ff * qa: 5 * qa: delete modal copy * feat: creation flow modals (#5383) * refactor: delete content v0 usages + impl * feat: qa + fixes * feat: installing banner using state event * feat: fix modpack card bugs + filtering issues * refactor: delete backups v0 api module * feat: v1 servers GET endpoint * fix: backups * feat: swap to kyros upload v1 addon * fix: use tanstack for loader.vue * feat: finish install from discovery modal * qa: bug fixes * feat: set up installation settings * fix: lint * fix: typos * fix: bugs * fix: disable inline content * feat: content tab improvements — upload UX, installation settings, and client-only indicators Upload cancellation and navigation guard: - Add ConfirmLeaveModal that prompts when navigating away during upload - Cancel in-flight XHR uploads when user confirms leaving the page - Add beforeunload handler to warn on browser/tab close during upload - Track uploadedBytes/totalBytes in UploadState for progress display - Replace Collapsible with Transition for upload progress admonition - Show byte progress and percentage in upload banner - Clamp upload progress to prevent exceeding 100% Installation settings (server.properties): - Add KnownPropertiesFields and PropertiesFields types to Archon types - Add buildProperties() to creation flow context to collect gamemode, difficulty, seed, world type, structures, and generator settings - Pass properties through installContent on onboarding, discovery, and ServerSetupModal flows Server setup and discovery flow improvements: - Migrate ServerSetupModal from servers_v0.reinstall to content_v1.installContent - Replace loaderApiNames lookup with toApiLoader() helper - Remove eraseDataOnInstall toggle — always use soft_override: false - Simplify modpack install on discovery page to use first available version and route through creation flow modal for both onboarding and non-onboarding - Differentiate post-install navigation: content page for onboarding, loader options for existing servers Modpack update flow: - Replace updateModpack() call with installContent() using soft_override: true to support version selection in the content updater modal Client-only mod indicators: - Add environment field to AddonVersion (reuses Labrinth.Projects.v3.Environment) - Add environment to ContentItem and isClientOnly to ContentCardTableItem - Show orange TriangleAlertIcon with tooltip on client-only mods in content table - Add "Client-only" filter pill to content filtering (controlled via showClientOnlyFilter on ContentManagerContext) - Apply client-only indicators in both ContentPageLayout and ModpackContentModal Misc: - Add CLAUDE.md note about using prepr commands for lint checks - Export ConfirmLeaveModal from instances barrel * fix: piping * fix: switch content disable for linked server instances * feat: client only filter * fix: prepr * feat: hasUpdate shape update * feat: bulk update endpoint impl for content in panel * feat: websocket state impl again with new phases * fix: ws * fix: use timeout fn for sync admon + fix content card layout scroll for browsers with overflow anchor bug * fix: qa bugs * fix: lint, a11y and i18n * refactor: set up layouts folder properly * fix: linked data cache stuff + lint * feat: move installationsettings to shared layout * fix: lint * fix: issues * feat: temp fuck staging up * fix: lockfile * fix: data sync issues on loader.vue * fix: lint * Hide shader configuration files from content list (#5499) * feat: workaround search problem + split out reset * fix: qa * fix: changelog not showing on first open * fix: qa + optimistic updating improvements * fix: prepr+lint * fix: qa * feat: qa * fix: lint * fix: lint * fix: build * fix: build * fix: type errors * fix: fade and JAVA_HOME passthrough * feat: qa * feat: impl diff shit * fix: qa * fix: app qa * feat: update diff modal * fix: endpoint * fix: qa * fix: qa * fix: use bulk in modpack modal * feat: abort signal impl + fix issues * fix: diff modal trunc * feat: qa * fix: qa * feat: tooltip content tab * fix: prepr * fix: dismiss on settings btn * feat: qa * feat: dont clear handlers on disconnect * fix: lint * fix: wrangler + introduce staging-archon env file --------- Signed-off-by: Calum H. <calum@modrinth.com> Co-authored-by: tdgao <mr.trumgao@gmail.com> Co-authored-by: Artyom Ezri <61311568+Artezon@users.noreply.github.com>
152 lines
4.1 KiB
TypeScript
152 lines
4.1 KiB
TypeScript
import { AbstractFeature, type FeatureConfig } from '../core/abstract-feature'
|
|
import { ModrinthApiError } from '../core/errors'
|
|
import type { RequestContext } from '../types/request'
|
|
|
|
/**
|
|
* Node authentication credentials
|
|
*/
|
|
export interface NodeAuth {
|
|
/** Node instance URL (e.g., "node-xyz.modrinth.com/modrinth/v0/fs") */
|
|
url: string
|
|
/** Base URL without path suffix (e.g., "node-xyz.modrinth.com") — used when available */
|
|
baseUrl?: string
|
|
/** JWT token */
|
|
token: string
|
|
}
|
|
|
|
export interface NodeAuthConfig extends FeatureConfig {
|
|
/**
|
|
* Get current node auth. Returns null if not authenticated.
|
|
*/
|
|
getAuth: () => NodeAuth | null
|
|
|
|
/**
|
|
* Refresh the node authentication token.
|
|
*/
|
|
refreshAuth: () => Promise<void>
|
|
}
|
|
|
|
/**
|
|
* Handles authentication for Kyros node fs requests:
|
|
* - Automatically injects Authorization header
|
|
* - Builds the correct URL from node instance
|
|
* - Handles 401 errors by refreshing and retrying (max 3 times)
|
|
*
|
|
* Only applies to requests with `useNodeAuth: true` in options.
|
|
*
|
|
* @example
|
|
* ```typescript
|
|
* const nodeAuth = new NodeAuthFeature({
|
|
* getAuth: () => nodeAuthState.getAuth?.() ?? null,
|
|
* refreshAuth: async () => {
|
|
* if (nodeAuthState.refreshAuth) {
|
|
* await nodeAuthState.refreshAuth()
|
|
* }
|
|
* },
|
|
* })
|
|
* client.addFeature(nodeAuth)
|
|
* ```
|
|
*/
|
|
export class NodeAuthFeature extends AbstractFeature {
|
|
declare protected config: NodeAuthConfig
|
|
private refreshPromise: Promise<void> | null = null
|
|
|
|
shouldApply(context: RequestContext): boolean {
|
|
return context.options.useNodeAuth === true && this.config.enabled !== false
|
|
}
|
|
|
|
private async refreshAuthWithLock(): Promise<void> {
|
|
if (this.refreshPromise) {
|
|
return this.refreshPromise
|
|
}
|
|
this.refreshPromise = this.config.refreshAuth().finally(() => {
|
|
this.refreshPromise = null
|
|
})
|
|
return this.refreshPromise
|
|
}
|
|
|
|
async execute<T>(next: () => Promise<T>, context: RequestContext): Promise<T> {
|
|
const maxRetries = 3
|
|
let retryCount = 0
|
|
|
|
let auth = this.config.getAuth()
|
|
if (!auth || this.isTokenExpired(auth.token)) {
|
|
await this.refreshAuthWithLock()
|
|
auth = this.config.getAuth()
|
|
}
|
|
if (!auth) {
|
|
throw new Error('Failed to obtain node authentication')
|
|
}
|
|
|
|
this.applyAuth(context, auth)
|
|
|
|
while (true) {
|
|
try {
|
|
return await next()
|
|
} catch (error) {
|
|
if (error instanceof ModrinthApiError && error.statusCode === 401) {
|
|
retryCount++
|
|
if (retryCount >= maxRetries) {
|
|
throw new Error(
|
|
`Node authentication failed after ${maxRetries} retries. Please re-authenticate.`,
|
|
)
|
|
}
|
|
|
|
await this.refreshAuthWithLock()
|
|
auth = this.config.getAuth()
|
|
if (!auth) {
|
|
throw new Error('Failed to refresh node authentication')
|
|
}
|
|
|
|
this.applyAuth(context, auth)
|
|
continue
|
|
}
|
|
throw error
|
|
}
|
|
}
|
|
}
|
|
|
|
private applyAuth(context: RequestContext, auth: NodeAuth): void {
|
|
const baseUrl = `https://${auth.url.replace(/\/modrinth\/v\d+\/fs\/?$/, '')}`
|
|
context.url = this.buildUrl(context.path, baseUrl, context.options.version)
|
|
|
|
context.options.headers = {
|
|
...context.options.headers,
|
|
Authorization: `Bearer ${auth.token}`,
|
|
}
|
|
|
|
context.options.skipAuth = true
|
|
}
|
|
|
|
private buildUrl(path: string, baseUrl: string, version: number | 'internal' | string): string {
|
|
const base = baseUrl.replace(/\/$/, '')
|
|
let versionPath = ''
|
|
if (version === 'internal') {
|
|
versionPath = '/_internal'
|
|
} else if (typeof version === 'number') {
|
|
versionPath = `/v${version}`
|
|
} else if (typeof version === 'string') {
|
|
versionPath = `/${version}`
|
|
}
|
|
const cleanPath = path.startsWith('/') ? path : `/${path}`
|
|
return `${base}${versionPath}${cleanPath}`
|
|
}
|
|
|
|
/**
|
|
* Check if a JWT token is expired or about to expire
|
|
* Refreshes proactively if expiring within next 10 seconds
|
|
*/
|
|
private isTokenExpired(token: string): boolean {
|
|
try {
|
|
const payload = JSON.parse(atob(token.split('.')[1]))
|
|
if (!payload.exp) return false
|
|
// refresh if expiring within 10 seconds
|
|
const expiresAt = payload.exp * 1000
|
|
return Date.now() >= expiresAt - 10000
|
|
} catch {
|
|
// cant decode, assume valid and let server decide
|
|
return false
|
|
}
|
|
}
|
|
}
|