Upload new loader versions to CDN & serve links to users

migrations/20260721182316_add_download_link_to_geode_version.down.sql

@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS geode_version_download;
+
+ALTER TABLE geode_versions
+    DROP COLUMN resources_url,
+    DROP COLUMN resources_hash;

migrations/20260721182316_add_download_link_to_geode_version.up.sql

@@ -0,0 +1,11 @@
+CREATE TABLE geode_version_download (
+    tag TEXT NOT NULL REFERENCES geode_versions(tag) ON DELETE CASCADE,
+    platform TEXT NOT NULL,
+    url TEXT NOT NULL,
+    hash TEXT NOT NULL,
+    PRIMARY KEY (tag, platform)
+);
+
+ALTER TABLE geode_versions
+    ADD COLUMN resources_url TEXT,
+    ADD COLUMN resources_hash TEXT;

src/config.rs

@@ -28,7 +28,7 @@ pub struct AppData {
     static_storage: PublicDisk,
     public_storage: PublicDisk,
     private_storage: PrivateDisk,
-    mod_storage: Option<PublicDisk>,
+    cdn_storage: Option<PublicDisk>,
     disable_downloads: bool,
     max_download_mb: u32,
     port: u16,
@@ -79,7 +79,7 @@ pub async fn build_config() -> anyhow::Result<AppData> {
         .time_to_live(Duration::from_mins(10))
         .build();
 
-    let mod_storage = if let Some(s3_config) = S3Configuration::from_env()? {
+    let cdn_storage = if let Some(s3_config) = S3Configuration::from_env()? {
         let backend = Arc::new(S3Backend::new(&s3_config)?);
         Some(PublicDisk::new(backend, s3_config.public_url))
     } else {
@@ -113,7 +113,7 @@ pub async fn build_config() -> anyhow::Result<AppData> {
             format!("{app_url}/storage"),
         ),
         private_storage: PrivateDisk::new(Arc::new(LocalBackend::new("storage/private"))),
-        mod_storage,
+        cdn_storage,
         disable_downloads,
         max_download_mb,
         port,
@@ -192,8 +192,8 @@ impl AppData {
         &self.private_storage
     }
 
-    pub fn mod_storage(&self) -> Option<&PublicDisk> {
-        self.mod_storage.as_ref()
+    pub fn cdn_storage(&self) -> Option<&PublicDisk> {
+        self.cdn_storage.as_ref()
     }
 
     pub fn mods_cache(&self) -> &Cache<IndexQueryParams, ApiResponse<PaginatedData<Mod>>> {

src/database/repository/geode_versions.rs

@@ -0,0 +1,44 @@
+use sqlx::PgConnection;
+
+use crate::database::DatabaseError;
+
+#[tracing::instrument(skip_all, fields(tag = %tag, platform = %platform, url = %url, hash = %hash))]
+pub async fn upsert_download(
+    tag: &str,
+    platform: &str,
+    url: &str,
+    hash: &str,
+    conn: &mut PgConnection,
+) -> Result<(), DatabaseError> {
+    sqlx::query(
+        "INSERT INTO geode_version_download (tag, platform, url, hash) VALUES ($1, $2, $3, $4)
+        ON CONFLICT (tag, platform) DO UPDATE SET url = $3, hash = $4",
+    )
+    .bind(tag)
+    .bind(platform)
+    .bind(url)
+    .bind(hash)
+    .execute(&mut *conn)
+    .await
+    .inspect_err(|e| tracing::error!("{:?}", e))?;
+
+    Ok(())
+}
+
+#[tracing::instrument(skip_all, fields(tag = %tag, url = %url, hash = %hash))]
+pub async fn update_resources_download(
+    tag: &str,
+    url: &str,
+    hash: &str,
+    conn: &mut PgConnection,
+) -> Result<(), DatabaseError> {
+    sqlx::query("UPDATE geode_versions SET resources_url = $2, resources_hash = $3 WHERE tag = $1")
+        .bind(tag)
+        .bind(url)
+        .bind(hash)
+        .execute(&mut *conn)
+        .await
+        .inspect_err(|e| tracing::error!("{:?}", e))?;
+
+    Ok(())
+}

src/database/repository/mod.rs

@@ -2,6 +2,7 @@ pub mod auth_tokens;
 pub mod dependencies;
 pub mod deprecations;
 pub mod developers;
+pub mod geode_versions;
 pub mod github_login_attempts;
 pub mod github_web_logins;
 pub mod incompatibilities;

src/endpoints/loader.rs

@@ -6,6 +6,7 @@ use utoipa::{IntoParams, ToSchema};
 use sqlx::Acquire;
 
 use crate::endpoints::ApiError;
+use crate::s3_worker::S3WorkerTask;
 use crate::{
     config::AppData,
     extractors::auth::Auth,
@@ -122,10 +123,12 @@ pub async fn create_version(
         return Err(ApiError::Authorization);
     }
 
+    let tag = payload.tag.trim_start_matches('v').to_string();
+
     let mut tx = pool.begin().await?;
     LoaderVersion::create_version(
         LoaderVersionCreate {
-            tag: payload.tag.trim_start_matches('v').to_string(),
+            tag: tag.clone(),
             prerelease: payload.prerelease,
             commit_hash: payload.commit_hash.clone(),
             win: payload.gd.win,
@@ -139,6 +142,8 @@ pub async fn create_version(
 
     tx.commit().await?;
 
+    data.send_s3_task(S3WorkerTask::UploadLoader { tag });
+
     Ok(HttpResponse::NoContent())
 }
 

src/endpoints/mod_versions.rs

@@ -241,7 +241,7 @@ pub async fn download_version(
     let url = mod_version
         .managed_download_link
         .as_deref()
-        .take_if(|_| data.mod_storage().is_some())
+        .take_if(|_| data.cdn_storage().is_some())
         .unwrap_or(&mod_version.download_link);
 
     if data.disable_downloads() || mod_version.status != ModVersionStatusEnum::Accepted {

src/main.rs

@@ -39,8 +39,8 @@ async fn main() -> anyhow::Result<()> {
     let app_data = config::build_config().await?;
     app_data.static_storage().init().await?;
     app_data.private_storage().init().await?;
-    if let Some(mod_storage) = app_data.mod_storage() {
-        mod_storage.init().await?;
+    if let Some(cdn_storage) = app_data.cdn_storage() {
+        cdn_storage.init().await?;
     }
 
     if cli::maybe_cli(&app_data).await? {