feat: mods page

apps/oneclient/desktop/src/api/commands.rs

@@ -7,6 +7,7 @@ use onelauncher_core::error::LauncherResult;
 use tauri::Runtime;
 
 use crate::oneclient::bundles::BundlesManager;
+use crate::oneclient::clusters::{OnlineClusterManifest, get_data_storage_versions};
 
 #[taurpc::procedures(path = "oneclient", export_to = "../frontend/src/bindings.gen.ts")]
 pub trait OneClientApi {
@@ -18,6 +19,9 @@ pub trait OneClientApi {
 
 	#[taurpc(alias = "getBundlesFor")]
 	async fn get_bundles_for(cluster_id: ClusterId) -> LauncherResult<Vec<ModpackArchive>>;
+
+	#[taurpc(alias = "getVersions")]
+	async fn get_versions() -> LauncherResult<OnlineClusterManifest>;
 }
 
 #[taurpc::ipc_type]
@@ -72,4 +76,8 @@ impl OneClientApi for OneClientApiImpl {
 
 		Ok(bundles)
 	}
+
+	async fn get_versions(self) -> LauncherResult<OnlineClusterManifest> {
+		get_data_storage_versions().await
+	}
 }

apps/oneclient/desktop/src/oneclient/clusters.rs

@@ -6,7 +6,7 @@ use onelauncher_core::error::LauncherResult;
 use onelauncher_core::send_error;
 use onelauncher_core::utils::http::fetch_json;
 use reqwest::Method;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
 ///
 /// e.g.
@@ -15,44 +15,73 @@ use serde::Deserialize;
 /// 	"clusters": [
 /// 		{
 /// 			"major_version": 21,
+/// 			"name": "Tricky Trials",
+/// 			"art": "/versions/art/Tricky_Trials.png",
 /// 			"entries": [
 /// 				{
 /// 					"minor_version": 5,
-/// 					"loader": "fabric"
+/// 					"loader": "fabric",
+/// 					"tags": ["PvP", "Survival"]
 /// 				},
 /// 				{
 /// 					"minor_version": 5,
-/// 					"loader": "forge"
+/// 					"loader": "forge",
+/// 					"tags": ["PvP", "Survival"]
 /// 				}
 /// 			]
 /// 		},
 /// 		{
 /// 			"major_version": 20,
+/// 			"name": "Trails & Tales",
+/// 			"art": "/versions/art/Trails_Tales.png",
 /// 			"entries": [
 /// 				{
 /// 					"minor_version": 5,
-/// 					"loader": "fabric"
+/// 					"loader": "fabric",
+/// 					"tags": ["PvP", "Survival"]
 /// 				}
 /// 			]
 /// 		}
 /// 	]
 /// }
 /// ```
-#[derive(Deserialize)]
-struct OnlineClusterManifest {
+#[derive(specta::Type, Deserialize, Serialize)]
+pub struct OnlineClusterManifest {
 	clusters: Vec<OnlineCluster>,
 }
 
-#[derive(Deserialize)]
-struct OnlineCluster {
+#[derive(specta::Type, Deserialize, Serialize)]
+pub struct OnlineCluster {
 	major_version: u8,
+	name: String,
+	art: String,
 	entries: Vec<OnlineClusterEntry>,
 }
 
-#[derive(Deserialize)]
-struct OnlineClusterEntry {
+#[derive(specta::Type, Deserialize, Serialize)]
+pub struct OnlineClusterEntry {
 	minor_version: u8,
 	loader: GameLoader,
+	tags: Vec<String>,
+}
+
+pub async fn get_data_storage_versions() -> LauncherResult<OnlineClusterManifest> {
+	let manifest = match fetch_json::<OnlineClusterManifest>(
+		Method::GET,
+		&format!("{}/versions/versions.json", crate::constants::META_URL_BASE),
+		None,
+		None,
+	)
+	.await
+	{
+		Ok(m) => m,
+		Err(e) => {
+			send_error!("failed to fetch clusters manifest: {}", e);
+			return Err(e);
+		}
+	};
+
+	Ok(manifest)
 }
 
 pub async fn init_clusters() -> LauncherResult<()> {

apps/oneclient/frontend/src/bindings.gen.ts

@@ -117,6 +117,50 @@ export type MojangSkin = { id: string; state: string; url: string; variant: Skin
 
 export type MowojangProfile = { id: string; username: string }
 
+export type OnlineCluster = { major_version: number; name: string; art: string; entries: OnlineClusterEntry[] }
+
+export type OnlineClusterEntry = { minor_version: number; loader: GameLoader; tags: string[] }
+
+/**
+ * e.g.
+ * ```json
+ * {
+ * "clusters": [
+ * {
+ * "major_version": 21,
+ * "name": "Tricky Trials",
+ * "art": "/versions/art/Tricky_Trials.png",
+ * "entries": [
+ * {
+ * "minor_version": 5,
+ * "loader": "fabric",
+ * "tags": ["PvP", "Survival"]
+ * },
+ * {
+ * "minor_version": 5,
+ * "loader": "forge",
+ * "tags": ["PvP", "Survival"]
+ * }
+ * ]
+ * },
+ * {
+ * "major_version": 20,
+ * "name": "Trails & Tales",
+ * "art": "/versions/art/Trails_Tales.png",
+ * "entries": [
+ * {
+ * "minor_version": 5,
+ * "loader": "fabric",
+ * "tags": ["PvP", "Survival"]
+ * }
+ * ]
+ * }
+ * ]
+ * }
+ * ```
+ */
+export type OnlineClusterManifest = { clusters: OnlineCluster[] }
+
 export type PackageAuthor = { Team: { team_id: string; org_id: string | null } } | { Users: ManagedUser[] }
 
 export type PackageCategories = { Mod: PackageModCategory[] } | { ResourcePack: PackageResourcePackCategory[] } | { Shader: PackageShaderCategory[] } | { DataPack: PackageModCategory[] } | { ModPack: PackageModPackCategory[] }
@@ -188,7 +232,7 @@ gallery: string[] }
 
 export type SettingProfileModel = { name: string; java_id: number | null; res: Resolution | null; force_fullscreen: boolean | null; mem_max: number | null; launch_args: string | null; launch_env: string | null; hook_pre: string | null; hook_wrapper: string | null; hook_post: string | null; os_extra: SettingsOsExtra | null }
 
-export type Settings = { global_game_settings: SettingProfileModel; allow_parallel_running_clusters: boolean; enable_gamemode: boolean; discord_enabled: boolean; seen_onboarding: boolean; max_concurrent_requests: number; settings_version: number; native_window_frame: boolean; show_tanstack_dev_tools: boolean }
+export type Settings = { global_game_settings: SettingProfileModel; allow_parallel_running_clusters: boolean; enable_gamemode: boolean; discord_enabled: boolean; seen_onboarding: boolean; mod_list_use_grid: boolean; max_concurrent_requests: number; settings_version: number; native_window_frame: boolean; show_tanstack_dev_tools: boolean }
 
 export type SettingsOsExtra = Record<string, never>
 
@@ -255,8 +299,14 @@ export type VersionType =
  */
 "old_beta"
 
-const ARGS_MAP = { 'oneclient':'{"getClustersGroupedByMajor":[],"openDevTools":[],"getBundlesFor":["cluster_id"]}', 'core':'{"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"getRunningProcesses":[],"getClusters":[],"updateClusterById":["id","request"],"getGameVersions":[],"getLoadersForVersion":["mc_version"],"getUsers":[],"setDefaultUser":["uuid"],"changeSkin":["access_token","skin_url","skin_variant"],"getWorlds":["id"],"fetchLoggedInProfile":["access_token"],"createCluster":["options"],"getScreenshots":["id"],"searchPackages":["provider","query"],"installModpack":["modpack","cluster_id"],"changeCape":["access_token","cape_uuid"],"getLogs":["id"],"readSettings":[],"getRunningProcessesByClusterId":["cluster_id"],"getUsersFromAuthor":["provider","author"],"createSettingsProfile":["name"],"getPackageBody":["provider","body"],"convertUsernameUUID":["username_uuid"],"getClusterById":["id"],"getUser":["uuid"],"launchCluster":["id","uuid"],"getLogByName":["id","name"],"openMsaLogin":[],"getPackage":["provider","slug"],"getDefaultUser":["fallback"],"updateClusterProfile":["name","profile"],"open":["input"],"getGlobalProfile":[],"isClusterRunning":["cluster_id"],"removeCluster":["id"],"killProcess":["pid"],"writeSettings":["setting"],"removeUser":["uuid"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"getMultiplePackages":["provider","slugs"],"fetchMinecraftProfile":["uuid"],"uploadSkinBytes":["access_token","skin_data","image_format","skin_variant"],"removeCape":["access_token"],"getProfileOrDefault":["name"]}', 'events':'{"message":["event"],"ingress":["event"],"process":["event"]}', 'folders':'{"fromCluster":["folder_name"],"openCluster":["folder_name"]}' }
-export type Router = { 'core': { getClusters: () => Promise<ClusterModel[]>, 
+const ARGS_MAP = { 'oneclient':'{"getVersions":[],"openDevTools":[],"getBundlesFor":["cluster_id"],"getClustersGroupedByMajor":[]}', 'core':'{"getRunningProcessesByClusterId":["cluster_id"],"getScreenshots":["id"],"getProfileOrDefault":["name"],"searchPackages":["provider","query"],"changeSkin":["access_token","skin_url","skin_variant"],"launchCluster":["id","uuid"],"getLoadersForVersion":["mc_version"],"fetchMinecraftProfile":["uuid"],"removeCape":["access_token"],"updateClusterById":["id","request"],"createSettingsProfile":["name"],"changeCape":["access_token","cape_uuid"],"getGlobalProfile":[],"getMultiplePackages":["provider","slugs"],"getUsers":[],"removeUser":["uuid"],"getRunningProcesses":[],"readSettings":[],"isClusterRunning":["cluster_id"],"getLogByName":["id","name"],"getClusterById":["id"],"killProcess":["pid"],"writeSettings":["setting"],"getMods":["id"],"getLogs":["id"],"getPackageBody":["provider","body"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"createCluster":["options"],"getUsersFromAuthor":["provider","author"],"getPackage":["provider","slug"],"installModpack":["modpack","cluster_id"],"convertUsernameUUID":["username_uuid"],"getClusters":[],"removeCluster":["id"],"fetchLoggedInProfile":["access_token"],"setDefaultUser":["uuid"],"getWorlds":["id"],"getGameVersions":[],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"uploadSkinBytes":["access_token","skin_data","image_format","skin_variant"],"open":["input"],"getUser":["uuid"],"getDefaultUser":["fallback"],"updateClusterProfile":["name","profile"],"openMsaLogin":[]}', 'folders':'{"fromCluster":["folder_name"],"openCluster":["folder_name"]}', 'events':'{"ingress":["event"],"message":["event"],"process":["event"]}' }
+export type Router = { 'folders': { fromCluster: (folderName: string) => Promise<string>, 
+openCluster: (folderName: string) => Promise<null> },
+'oneclient': { openDevTools: () => Promise<void>, 
+getClustersGroupedByMajor: () => Promise<Partial<{ [key in number]: ClusterModel[] }>>, 
+getBundlesFor: (clusterId: number) => Promise<ModpackArchive[]>, 
+getVersions: () => Promise<OnlineClusterManifest> },
+'core': { getClusters: () => Promise<ClusterModel[]>, 
 getClusterById: (id: number) => Promise<ClusterModel | null>, 
 removeCluster: (id: number) => Promise<null>, 
 createCluster: (options: CreateCluster) => Promise<ClusterModel>, 
@@ -266,6 +316,7 @@ getScreenshots: (id: number) => Promise<string[]>,
 getWorlds: (id: number) => Promise<string[]>, 
 getLogs: (id: number) => Promise<string[]>, 
 getLogByName: (id: number, name: string) => Promise<string | null>, 
+getMods: (id: number) => Promise<string[]>, 
 getRunningProcesses: () => Promise<Process[]>, 
 getRunningProcessesByClusterId: (clusterId: number) => Promise<Process[]>, 
 isClusterRunning: (clusterId: number) => Promise<boolean>, 
@@ -300,11 +351,6 @@ changeCape: (accessToken: string, capeUuid: string) => Promise<MojangFullPlayerP
 removeCape: (accessToken: string) => Promise<MojangFullPlayerProfile>, 
 convertUsernameUUID: (usernameUuid: string) => Promise<MowojangProfile>, 
 open: (input: string) => Promise<null> },
-'oneclient': { openDevTools: () => Promise<void>, 
-getClustersGroupedByMajor: () => Promise<Partial<{ [key in number]: ClusterModel[] }>>, 
-getBundlesFor: (clusterId: number) => Promise<ModpackArchive[]> },
-'folders': { fromCluster: (folderName: string) => Promise<string>, 
-openCluster: (folderName: string) => Promise<null> },
 'events': { ingress: (event: IngressPayload) => Promise<void>, 
 message: (event: MessagePayload) => Promise<void>, 
 process: (event: ProcessPayload) => Promise<void> } };

apps/oneclient/frontend/src/components/Bundle/Bundle.tsx

@@ -0,0 +1,26 @@
+import type { ClusterModel, ModpackArchive } from '@/bindings.gen';
+import { useSettings } from '@/hooks/useSettings';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-react';
+import { twMerge } from 'tailwind-merge';
+import { ModCard, useModCardContext } from '.';
+
+interface BundleProps {
+	bundleData: ModpackArchive;
+	cluster: ClusterModel;
+}
+
+export function Bundle({ bundleData, cluster }: BundleProps) {
+	const { useVerticalGridLayout } = useModCardContext();
+	const { setting } = useSettings();
+	const useGridLayout = setting('mod_list_use_grid');
+
+	return (
+		<OverlayScrollbarsComponent>
+			<div className={twMerge('grid gap-2', useGridLayout ? 'grid-cols-3' : 'grid-cols-1', useGridLayout && useVerticalGridLayout ? 'max-h-128' : 'max-h-112')}>
+				{bundleData.manifest.files.map((file, index) => (
+					<ModCard cluster={cluster} file={file} key={index} />
+				))}
+			</div>
+		</OverlayScrollbarsComponent>
+	);
+}

apps/oneclient/frontend/src/components/Bundle/DownloadModButton.tsx

@@ -0,0 +1,31 @@
+import type { ClusterModel, ManagedPackage, ManagedVersion } from '@/bindings.gen';
+import { useSettings } from '@/hooks/useSettings';
+import { bindings } from '@/main';
+import { useCommandMut } from '@onelauncher/common';
+import { Button } from '@onelauncher/common/components';
+import { Download01Icon } from '@untitled-theme/icons-react';
+import { twMerge } from 'tailwind-merge';
+
+export function DownloadModButton({ pkg, version, cluster }: { pkg: ManagedPackage; version: ManagedVersion; cluster: ClusterModel }) {
+	const download = useCommandMut(() => bindings.core.downloadPackage(pkg.provider, pkg.id, version.version_id, cluster.id, true));
+
+	const handleDownload = () => {
+		(async () => {
+			await download.mutateAsync();
+		})();
+	};
+
+	const { setting } = useSettings();
+	const useGridLayout = setting('mod_list_use_grid');
+
+	return (
+		<Button
+			className={twMerge('flex flex-col items-center justify-center', useGridLayout ? 'w-full' : '')}
+			color="primary"
+			onClick={handleDownload}
+			size={useGridLayout ? 'large' : 'iconLarge'}
+		>
+			<Download01Icon />
+		</Button>
+	);
+}