feat: base api-client impl

apps/frontend/package.json

@@ -43,6 +43,7 @@
 		"@modrinth/moderation": "workspace:*",
 		"@modrinth/ui": "workspace:*",
 		"@modrinth/utils": "workspace:*",
+		"@modrinth/api-client": "workspace:*",
 		"@pinia/nuxt": "^0.5.1",
 		"@types/three": "^0.172.0",
 		"@vintl/vintl": "^4.4.1",

apps/frontend/src/app.vue

@@ -7,30 +7,21 @@
 </template>
 <script setup lang="ts">
 import { NotificationPanel, provideNotificationManager } from '@modrinth/ui'
-import { provideApi } from '@modrinth/ui/src/providers/api.ts'
-import { RestModrinthApi } from '@modrinth/utils'
 
 import ModrinthLoadingIndicator from '~/components/ui/modrinth-loading-indicator.ts'
 
+import { createModrinthClient, provideModrinthClient } from './providers/api-client.ts'
 import { FrontendNotificationManager } from './providers/frontend-notifications.ts'
 
-provideNotificationManager(new FrontendNotificationManager())
-
-provideApi(
-	new RestModrinthApi((url: string, options?: object) => {
-		const match = url.match(/^\/v(\d+)\/(.+)$/)
+const auth = await useAuth()
+const config = useRuntimeConfig()
 
-		if (match) {
-			const apiVersion = Number(match[1])
-			const path = match[2]
+provideNotificationManager(new FrontendNotificationManager())
 
-			return useBaseFetch(path, {
-				...options,
-				apiVersion,
-			}) as Promise<Response>
-		} else {
-			throw new Error('Invalid format')
-		}
-	}),
-)
+const client = createModrinthClient(auth.value, {
+	apiBaseUrl: config.public.apiBaseUrl.replace('/v2/', '/'),
+	archonBaseUrl: config.public.pyroBaseUrl.replace('/v2/', '/'),
+	rateLimitKey: config.rateLimitKey,
+})
+provideModrinthClient(client)
 </script>

apps/frontend/src/error.vue

@@ -59,9 +59,21 @@ import { IntlFormatted } from '@vintl/vintl/components'
 import Logo404 from '~/assets/images/404.svg'
 
 import ModrinthLoadingIndicator from './components/ui/modrinth-loading-indicator.ts'
+import { createModrinthClient, provideModrinthClient } from './providers/api-client.ts'
 import { FrontendNotificationManager } from './providers/frontend-notifications.ts'
 
+const auth = await useAuth()
+const config = useRuntimeConfig()
+
 provideNotificationManager(new FrontendNotificationManager())
+
+const client = createModrinthClient(auth.value, {
+	apiBaseUrl: config.public.apiBaseUrl.replace('/v2/', '/'),
+	archonBaseUrl: config.public.pyroBaseUrl.replace('/v2/', '/'),
+	rateLimitKey: config.rateLimitKey,
+})
+provideModrinthClient(client)
+
 const { formatMessage } = useVIntl()
 
 const props = defineProps({

apps/frontend/src/pages/[type]/[id]/settings/environment.vue

@@ -9,14 +9,15 @@ import {
 	UnsavedChangesPopup,
 	useSavable,
 } from '@modrinth/ui'
-import { injectApi } from '@modrinth/ui/src/providers/api.ts'
 import { defineMessages, useVIntl } from '@vintl/vintl'
 
+import { injectModrinthClient } from '~/providers/api-client.ts'
+
 const { formatMessage } = useVIntl()
 
 const { currentMember, projectV2, projectV3, refreshProject } = injectProjectPageContext()
 const { handleError } = injectNotificationManager()
-const api = injectApi()
+const client = injectModrinthClient()
 
 const saving = ref(false)
 
@@ -49,8 +50,8 @@ const { saved, current, reset, save } = useSavable(
 	({ environment, side_types_migration_review_status }) => {
 		saving.value = true
 		side_types_migration_review_status = 'reviewed'
-		api.projects
-			.editV3(projectV2.value.id, { environment, side_types_migration_review_status })
+		client.labrinth.projects_v3
+			.edit(projectV2.value.id, { environment, side_types_migration_review_status })
 			.then(() => refreshProject().then(reset))
 			.catch(handleError)
 			.finally(() => (saving.value = false))

apps/frontend/src/pages/[type]/[id]/settings/general.vue

@@ -7,14 +7,15 @@ import {
 	UnsavedChangesPopup,
 	useSavable,
 } from '@modrinth/ui'
-import { injectApi } from '@modrinth/ui/src/providers/api.ts'
 import { defineMessages, type MessageDescriptor, useVIntl } from '@vintl/vintl'
 
+import { injectModrinthClient } from '~/providers/api-client.ts'
+
 const { formatMessage } = useVIntl()
 
 const { projectV2: project, refreshProject } = injectProjectPageContext()
 const { handleError } = injectNotificationManager()
-const api = injectApi()
+const client = injectModrinthClient()
 
 const saving = ref(false)
 
@@ -34,7 +35,7 @@ const { saved, current, reset, save } = useSavable(
 
 		if (data) {
 			saving.value = true
-			api.projects
+			client.labrinth.projects_v2
 				.edit(project.value.id, { title, description: tagline, slug: url })
 				.then(() => refreshProject().then(reset))
 				.catch(handleError)

apps/frontend/src/pages/servers/manage/[id].vue

@@ -1044,7 +1044,7 @@ const nodeUnavailableDetails = computed(() => [
 	{
 		label: 'Node',
 		value:
-			server.moduleErrors?.general?.error.responseData?.hostname ??
+			(server.moduleErrors?.general?.error.responseData as any)?.hostname ??
 			server.general?.datacenter ??
 			'Unknown',
 		type: 'inline' as const,

apps/frontend/src/providers/api-client.ts

@@ -0,0 +1,42 @@
+import type { AbstractFeature, AuthConfig, NuxtClientConfig } from '@modrinth/api-client'
+import {
+	AuthFeature,
+	CircuitBreakerFeature,
+	NuxtCircuitBreakerStorage,
+	NuxtModrinthClient,
+	VerboseLoggingFeature,
+} from '@modrinth/api-client'
+import { createContext } from '@modrinth/ui'
+
+export function createModrinthClient(
+	auth: { token: string | undefined },
+	config: { apiBaseUrl: string; archonBaseUrl: string; rateLimitKey?: string },
+): NuxtModrinthClient {
+	const optionalFeatures = [
+		import.meta.dev ? (new VerboseLoggingFeature() as AbstractFeature) : undefined,
+	].filter(Boolean) as AbstractFeature[]
+
+	const clientConfig: NuxtClientConfig = {
+		labrinthBaseUrl: config.apiBaseUrl,
+		archonBaseUrl: config.archonBaseUrl,
+		rateLimitKey: config.rateLimitKey,
+		features: [
+			new AuthFeature({
+				token: async () => auth.token!,
+			} as AuthConfig),
+			new CircuitBreakerFeature({
+				storage: new NuxtCircuitBreakerStorage(),
+				maxFailures: 3,
+				resetTimeout: 30000,
+			}),
+			...optionalFeatures,
+		],
+	}
+
+	return new NuxtModrinthClient(clientConfig)
+}
+
+export const [injectModrinthClient, provideModrinthClient] = createContext<NuxtModrinthClient>(
+	'root',
+	'modrinthClient',
+)