2025-11-12 20:29:12 +00:00
|
|
|
import type { ModrinthApiError } from '../core/errors'
|
|
|
|
|
import type { ClientConfig } from '../types/client'
|
|
|
|
|
import type { RequestOptions } from '../types/request'
|
2025-12-04 02:32:03 +00:00
|
|
|
import { GenericWebSocketClient } from './websocket-generic'
|
2026-01-06 00:35:51 +00:00
|
|
|
import { XHRUploadClient } from './xhr-upload-client'
|
2025-11-12 20:29:12 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Tauri-specific configuration
|
|
|
|
|
* TODO: extend into interface if needed.
|
|
|
|
|
*/
|
|
|
|
|
export type TauriClientConfig = ClientConfig
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Extended error type with HTTP response metadata
|
|
|
|
|
*/
|
|
|
|
|
interface HttpError extends Error {
|
|
|
|
|
statusCode?: number
|
|
|
|
|
responseData?: unknown
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Tauri platform client using Tauri v2 HTTP plugin
|
2026-01-06 00:35:51 +00:00
|
|
|
*
|
|
|
|
|
* Extends XHRUploadClient to provide upload with progress tracking.
|
|
|
|
|
*
|
2025-11-12 20:29:12 +00:00
|
|
|
* @example
|
|
|
|
|
* ```typescript
|
|
|
|
|
* import { getVersion } from '@tauri-apps/api/app'
|
|
|
|
|
*
|
|
|
|
|
* const version = await getVersion()
|
|
|
|
|
* const client = new TauriModrinthClient({
|
|
|
|
|
* userAgent: `modrinth/theseus/${version} (support@modrinth.com)`,
|
|
|
|
|
* features: [
|
|
|
|
|
* new AuthFeature({ token: 'mrp_...' })
|
|
|
|
|
* ]
|
|
|
|
|
* })
|
|
|
|
|
*
|
|
|
|
|
* const project = await client.request('/project/sodium', { api: 'labrinth', version: 2 })
|
|
|
|
|
* ```
|
|
|
|
|
*/
|
2026-01-06 00:35:51 +00:00
|
|
|
export class TauriModrinthClient extends XHRUploadClient {
|
2025-12-30 15:06:52 +00:00
|
|
|
declare protected config: TauriClientConfig
|
2025-11-12 20:29:12 +00:00
|
|
|
|
2025-12-04 02:32:03 +00:00
|
|
|
constructor(config: TauriClientConfig) {
|
|
|
|
|
super(config)
|
|
|
|
|
|
|
|
|
|
Object.defineProperty(this.archon, 'sockets', {
|
|
|
|
|
value: new GenericWebSocketClient(this),
|
|
|
|
|
writable: false,
|
|
|
|
|
enumerable: true,
|
|
|
|
|
configurable: false,
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
2025-11-12 20:29:12 +00:00
|
|
|
protected async executeRequest<T>(url: string, options: RequestOptions): Promise<T> {
|
|
|
|
|
try {
|
|
|
|
|
// Dynamically import Tauri HTTP plugin
|
|
|
|
|
// This allows the package to be used in non-Tauri environments
|
|
|
|
|
const { fetch: tauriFetch } = await import('@tauri-apps/plugin-http')
|
|
|
|
|
|
|
|
|
|
let body: BodyInit | null | undefined = undefined
|
|
|
|
|
if (options.body) {
|
2026-04-13 16:52:35 +02:00
|
|
|
const raw = options.body
|
|
|
|
|
if (
|
|
|
|
|
typeof raw === 'object' &&
|
|
|
|
|
!(raw instanceof FormData) &&
|
|
|
|
|
!(raw instanceof URLSearchParams) &&
|
|
|
|
|
!(raw instanceof Blob) &&
|
|
|
|
|
!(raw instanceof ArrayBuffer) &&
|
|
|
|
|
!ArrayBuffer.isView(raw as ArrayBufferView)
|
|
|
|
|
) {
|
|
|
|
|
body = JSON.stringify(raw)
|
2025-11-12 20:29:12 +00:00
|
|
|
} else {
|
2026-04-13 16:52:35 +02:00
|
|
|
body = raw as BodyInit
|
2025-11-12 20:29:12 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let fullUrl = url
|
|
|
|
|
if (options.params) {
|
feat: content tab rewrite for worlds (#5136)
* 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>
2026-03-12 20:24:32 +00:00
|
|
|
const filteredParams: Record<string, string> = {}
|
|
|
|
|
for (const [key, value] of Object.entries(options.params)) {
|
|
|
|
|
if (value !== undefined && value !== null) {
|
|
|
|
|
filteredParams[key] = String(value)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
const queryString = new URLSearchParams(filteredParams).toString()
|
|
|
|
|
if (queryString) {
|
|
|
|
|
fullUrl = `${url}?${queryString}`
|
|
|
|
|
}
|
2025-11-12 20:29:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const response = await tauriFetch(fullUrl, {
|
|
|
|
|
method: options.method ?? 'GET',
|
|
|
|
|
headers: options.headers,
|
|
|
|
|
body,
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
if (!response.ok) {
|
|
|
|
|
let responseData: unknown
|
|
|
|
|
try {
|
|
|
|
|
responseData = await response.json()
|
|
|
|
|
} catch {
|
|
|
|
|
responseData = undefined
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const error = new Error(`HTTP ${response.status}: ${response.statusText}`) as HttpError
|
|
|
|
|
|
|
|
|
|
error.statusCode = response.status
|
|
|
|
|
error.responseData = responseData
|
|
|
|
|
|
|
|
|
|
throw error
|
|
|
|
|
}
|
|
|
|
|
|
2026-04-12 15:38:08 -06:00
|
|
|
// 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
|
|
|
|
|
}
|
2025-11-12 20:29:12 +00:00
|
|
|
} catch (error) {
|
|
|
|
|
throw this.normalizeError(error)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
protected normalizeError(error: unknown): ModrinthApiError {
|
|
|
|
|
if (error instanceof Error) {
|
|
|
|
|
const httpError = error as HttpError
|
|
|
|
|
const statusCode = httpError.statusCode
|
|
|
|
|
const responseData = httpError.responseData
|
|
|
|
|
|
|
|
|
|
return this.createNormalizedError(error, statusCode, responseData)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return super.normalizeError(error)
|
|
|
|
|
}
|
|
|
|
|
}
|