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>
188 lines
5.6 KiB
TypeScript
188 lines
5.6 KiB
TypeScript
import { FetchError } from 'ofetch'
|
|
|
|
import { ModrinthApiError } from '../core/errors'
|
|
import type { CircuitBreakerState, CircuitBreakerStorage } from '../features/circuit-breaker'
|
|
import type { ClientConfig } from '../types/client'
|
|
import type { RequestOptions } from '../types/request'
|
|
import type { UploadHandle, UploadRequestOptions } from '../types/upload'
|
|
import { GenericWebSocketClient } from './websocket-generic'
|
|
import { XHRUploadClient } from './xhr-upload-client'
|
|
|
|
/**
|
|
* Circuit breaker storage using Nuxt's useState
|
|
*
|
|
* This provides cross-request persistence in SSR while also working in client-side.
|
|
* State is shared between requests in the same Nuxt context.
|
|
*
|
|
* Note: useState must be called during initialization (in setup context) and cached,
|
|
* as it won't work during async operations when the Nuxt context may be lost.
|
|
*/
|
|
export class NuxtCircuitBreakerStorage implements CircuitBreakerStorage {
|
|
private state: Map<string, CircuitBreakerState>
|
|
|
|
constructor() {
|
|
// @ts-expect-error - useState is provided by Nuxt runtime
|
|
const stateRef = useState<Map<string, CircuitBreakerState>>(
|
|
'circuit-breaker-state',
|
|
() => new Map(),
|
|
)
|
|
this.state = stateRef.value
|
|
}
|
|
|
|
get(key: string): CircuitBreakerState | undefined {
|
|
return this.state.get(key)
|
|
}
|
|
|
|
set(key: string, state: CircuitBreakerState): void {
|
|
this.state.set(key, state)
|
|
}
|
|
|
|
clear(key: string): void {
|
|
this.state.delete(key)
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Nuxt-specific configuration
|
|
*/
|
|
export interface NuxtClientConfig extends ClientConfig {
|
|
// TODO: do we want to provide this for tauri+base as well? its not used on app
|
|
/**
|
|
* Rate limit key for server-side requests.
|
|
* This is injected as x-ratelimit-key header on server-side.
|
|
* Can be a string (for env var) or async function (for CF Secrets Store).
|
|
*/
|
|
rateLimitKey?: string | (() => Promise<string | undefined>)
|
|
}
|
|
|
|
/**
|
|
* Nuxt platform client using Nuxt's $fetch
|
|
*
|
|
* This client is optimized for Nuxt applications and handles SSR/CSR automatically.
|
|
*
|
|
* Note: upload() is only available in browser context (CSR). It will throw during SSR.
|
|
*
|
|
* @example
|
|
* ```typescript
|
|
* // In a Nuxt composable
|
|
* const config = useRuntimeConfig()
|
|
* const auth = await useAuth()
|
|
*
|
|
* const client = new NuxtModrinthClient({
|
|
* userAgent: 'my-nuxt-app/1.0.0',
|
|
* rateLimitKey: import.meta.server ? config.rateLimitKey : undefined,
|
|
* features: [
|
|
* new AuthFeature({ token: () => auth.value.token })
|
|
* ]
|
|
* })
|
|
*
|
|
* const project = await client.request('/project/sodium', { api: 'labrinth', version: 2 })
|
|
* ```
|
|
*/
|
|
export class NuxtModrinthClient extends XHRUploadClient {
|
|
declare protected config: NuxtClientConfig
|
|
private rateLimitKeyResolved: string | undefined
|
|
private rateLimitKeyPromise: Promise<string | undefined> | undefined
|
|
|
|
constructor(config: NuxtClientConfig) {
|
|
super(config)
|
|
|
|
Object.defineProperty(this.archon, 'sockets', {
|
|
value: new GenericWebSocketClient(this),
|
|
writable: false,
|
|
enumerable: true,
|
|
configurable: false,
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Resolve the rate limit key, handling both string and async function values.
|
|
* Results are cached for subsequent calls.
|
|
*/
|
|
private async resolveRateLimitKey(): Promise<string | undefined> {
|
|
if (this.rateLimitKeyResolved !== undefined) {
|
|
return this.rateLimitKeyResolved
|
|
}
|
|
|
|
const key = this.config.rateLimitKey
|
|
if (typeof key === 'string') {
|
|
this.rateLimitKeyResolved = key
|
|
} else if (typeof key === 'function') {
|
|
if (!this.rateLimitKeyPromise) {
|
|
this.rateLimitKeyPromise = key()
|
|
}
|
|
this.rateLimitKeyResolved = await this.rateLimitKeyPromise
|
|
}
|
|
|
|
return this.rateLimitKeyResolved
|
|
}
|
|
|
|
/**
|
|
* Override request to resolve rate limit key before calling super.
|
|
* This allows async fetching of the key from CF Secrets Store.
|
|
*/
|
|
async request<T>(path: string, options: RequestOptions): Promise<T> {
|
|
// @ts-expect-error - import.meta is provided by Nuxt
|
|
if (import.meta.server) {
|
|
await this.resolveRateLimitKey()
|
|
}
|
|
return super.request(path, options)
|
|
}
|
|
|
|
/**
|
|
* Upload a file with progress tracking
|
|
*
|
|
* Note: This method is only available in browser context (CSR).
|
|
* Calling during SSR will throw an error.
|
|
*/
|
|
upload<T = void>(path: string, options: UploadRequestOptions): UploadHandle<T> {
|
|
// @ts-expect-error - import.meta is provided by Nuxt
|
|
if (import.meta.server) {
|
|
throw new ModrinthApiError('upload() is not supported during SSR')
|
|
}
|
|
return super.upload(path, options)
|
|
}
|
|
|
|
protected async executeRequest<T>(url: string, options: RequestOptions): Promise<T> {
|
|
try {
|
|
// @ts-expect-error - $fetch is provided by Nuxt
|
|
const response = await $fetch<T>(url, {
|
|
method: options.method ?? 'GET',
|
|
headers: options.headers,
|
|
body: options.body,
|
|
params: options.params,
|
|
timeout: options.timeout,
|
|
signal: options.signal,
|
|
// @ts-expect-error - import.meta is provided by Nuxt
|
|
cache: import.meta.server ? undefined : 'no-store',
|
|
})
|
|
|
|
return response
|
|
} catch (error) {
|
|
throw this.normalizeError(error)
|
|
}
|
|
}
|
|
|
|
protected normalizeError(error: unknown): ModrinthApiError {
|
|
if (error instanceof FetchError) {
|
|
return this.createNormalizedError(error, error.response?.status, error.data)
|
|
}
|
|
|
|
return super.normalizeError(error)
|
|
}
|
|
|
|
protected buildDefaultHeaders(): Record<string, string> {
|
|
const headers: Record<string, string> = {
|
|
...super.buildDefaultHeaders(),
|
|
}
|
|
|
|
// Use the resolved key (populated by resolveRateLimitKey in request())
|
|
// @ts-expect-error - import.meta is provided by Nuxt
|
|
if (import.meta.server && this.rateLimitKeyResolved) {
|
|
headers['x-ratelimit-key'] = this.rateLimitKeyResolved
|
|
}
|
|
|
|
return headers
|
|
}
|
|
}
|