From 2bdc60266adc1920a31488309657dd8db13b33f0 Mon Sep 17 00:00:00 2001 From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com> Date: Tue, 14 Feb 2023 00:00:47 +0100 Subject: refactor: Get TS package API response from backend (#168) * refactor: Get TS package API response from backend Previously Thunderstore package index was done in frontend. Should be moved to backend instead as backend is reponsible for such tasks while frontend should just be used to store and display information. * refactor: Filter TS API response in backend * refactor: Rename function Makes it more descriptive what it does * refactor: Use gen. binds instead of duped struct Replaces the current TypeScript interface defintions with autogenerated bindings. * fix: Properly type variable * fix: Correct imported path of interface file * fix: Update struct field types to fix typing issue i32 should be big enough unless Thunderstore and Northstar suddenly becomes really huge and we start seeing over 4 million downloads on some mod * fix: Correct imported path of interface file --- src-tauri/bindings/ThunderstoreMod.ts | 4 ++ src-tauri/bindings/ThunderstoreModVersion.ts | 3 + src-tauri/src/main.rs | 4 ++ src-tauri/src/thunderstore/mod.rs | 78 ++++++++++++++++++++++ src-vue/src/components/ThunderstoreModCard.vue | 4 +- src-vue/src/plugins/store.ts | 22 ++++-- .../src/utils/thunderstore/ThunderstoreMod.d.ts | 12 ---- .../utils/thunderstore/ThunderstoreModVersion.d.ts | 9 --- src-vue/src/views/mods/ThunderstoreModsView.vue | 4 +- 9 files changed, 108 insertions(+), 32 deletions(-) create mode 100644 src-tauri/bindings/ThunderstoreMod.ts create mode 100644 src-tauri/bindings/ThunderstoreModVersion.ts create mode 100644 src-tauri/src/thunderstore/mod.rs delete mode 100644 src-vue/src/utils/thunderstore/ThunderstoreMod.d.ts delete mode 100644 src-vue/src/utils/thunderstore/ThunderstoreModVersion.d.ts diff --git a/src-tauri/bindings/ThunderstoreMod.ts b/src-tauri/bindings/ThunderstoreMod.ts new file mode 100644 index 00000000..25d119cb --- /dev/null +++ b/src-tauri/bindings/ThunderstoreMod.ts @@ -0,0 +1,4 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { ThunderstoreModVersion } from "./ThunderstoreModVersion"; + +export interface ThunderstoreMod { name: string, full_name: string, owner: string, package_url: string, date_created: string, date_updated: string, uuid4: string, rating_score: number, is_pinned: boolean, is_deprecated: boolean, has_nsfw_content: boolean, categories: Array, versions: Array, } \ No newline at end of file diff --git a/src-tauri/bindings/ThunderstoreModVersion.ts b/src-tauri/bindings/ThunderstoreModVersion.ts new file mode 100644 index 00000000..7e76308e --- /dev/null +++ b/src-tauri/bindings/ThunderstoreModVersion.ts @@ -0,0 +1,3 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export interface ThunderstoreModVersion { name: string, full_name: string, description: string, icon: string, version_number: string, dependencies: Array, download_url: string, downloads: number, date_created: string, website_url: string, is_active: boolean, uuid4: string, file_size: bigint, } \ No newline at end of file diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 63b30e9e..12fa477a 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -33,6 +33,9 @@ use mod_management::{ mod northstar; use northstar::get_northstar_version_number; +mod thunderstore; +use thunderstore::query_thunderstore_packages_api; + use tauri::Manager; use tauri_plugin_store::PluginBuilder; use tokio::time::sleep; @@ -111,6 +114,7 @@ fn main() { delete_northstar_mod, get_server_player_count, delete_thunderstore_mod, + query_thunderstore_packages_api, ]) .run(tauri::generate_context!()) .expect("error while running tauri application"); diff --git a/src-tauri/src/thunderstore/mod.rs b/src-tauri/src/thunderstore/mod.rs new file mode 100644 index 00000000..c07c27ff --- /dev/null +++ b/src-tauri/src/thunderstore/mod.rs @@ -0,0 +1,78 @@ +//! For interacting with Thunderstore API +use app::constants::APP_USER_AGENT; +use serde::{Deserialize, Serialize}; +use std::collections::HashSet; +use ts_rs::TS; + +use crate::mod_management::BLACKLISTED_MODS; + +#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize, TS)] +#[ts(export)] +pub struct ThunderstoreMod { + pub name: String, + pub full_name: String, + pub owner: String, + pub package_url: String, + pub date_created: String, + pub date_updated: String, + pub uuid4: String, + pub rating_score: i32, + pub is_pinned: bool, + pub is_deprecated: bool, + pub has_nsfw_content: bool, + pub categories: Vec, + pub versions: Vec, +} + +#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize, TS)] +#[ts(export)] +pub struct ThunderstoreModVersion { + pub name: String, + pub full_name: String, + pub description: String, + pub icon: String, + pub version_number: String, + pub dependencies: Vec, + pub download_url: String, + pub downloads: i32, + pub date_created: String, + pub website_url: String, + pub is_active: bool, + pub uuid4: String, + pub file_size: i64, +} + +/// Queries Thunderstore packages API +#[tauri::command] +pub async fn query_thunderstore_packages_api() -> Result, String> { + println!("Fetching Thunderstore API"); + + // Fetches + let url = "https://northstar.thunderstore.io/api/v1/package/"; + + let client = reqwest::Client::new(); + let res = client + .get(url) + .header(reqwest::header::USER_AGENT, APP_USER_AGENT) + .send() + .await + .unwrap() + .text() + .await + .unwrap(); + + // Parse response + let parsed_json: Vec = match serde_json::from_str(&res) { + Ok(res) => res, + Err(err) => return Err(err.to_string()), + }; + + // Remove some mods from listing + let to_remove_set: HashSet<&str> = BLACKLISTED_MODS.iter().map(|s| s.as_ref()).collect(); + let filtered_packages = parsed_json + .into_iter() + .filter(|package| !to_remove_set.contains(&package.full_name.as_ref())) + .collect::>(); + + Ok(filtered_packages) +} diff --git a/src-vue/src/components/ThunderstoreModCard.vue b/src-vue/src/components/ThunderstoreModCard.vue index d125e9f5..c9f6768c 100644 --- a/src-vue/src/components/ThunderstoreModCard.vue +++ b/src-vue/src/components/ThunderstoreModCard.vue @@ -66,8 +66,8 @@