Skip to content

upload installers to R2 #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dankmeme01 merged 3 commits into from
Aug 29, 2026
Merged

upload installers to R2 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cc9060
upload installers to R2
dankmeme01 Aug 29, 2026
ebc8ad7
nvm
dankmeme01 Aug 29, 2026
94ee770
fix mime types
dankmeme01 Aug 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 109 additions & 31 deletions src/s3_worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@ pub enum S3WorkerTask {
},
}

fn installer_ext_for_platform(platform: &str) -> &'static str {
match platform {
"win" => "exe",
"mac" => "pkg",
"linux" => "sh",
_ => panic!("Unsupported platform for installer: {}", platform),
}
}

fn path_for_mod(mod_id: &str, version: &str) -> String {
format!("mods/{mod_id}/{version}/{mod_id}.geode")
}
Expand All @@ -40,6 +49,11 @@ fn path_for_loader(tag: &str, platform: &str) -> String {
format!("geode/{tag}/geode-v{tag}-{platform}.zip")
}

fn path_for_installer(tag: &str, platform: &str) -> String {
let ext = installer_ext_for_platform(platform);
format!("geode/{tag}/geode-installer-v{tag}-{platform}.{ext}")
}

fn path_for_resources(tag: &str) -> String {
format!("geode/{tag}/resources.zip")
}
Expand All @@ -50,40 +64,82 @@ fn github_url_for_loader(tag: &str, platform: &str) -> String {
)
}

fn github_url_for_installer(tag: &str, platform: &str) -> String {
let ext = installer_ext_for_platform(platform);
format!(
"https://github.com/geode-sdk/geode/releases/download/v{tag}/geode-installer-v{tag}-{platform}.{ext}"
)
}

fn github_url_for_resources(tag: &str) -> String {
format!("https://github.com/geode-sdk/geode/releases/download/v{tag}/resources.zip")
}

async fn migrate_geode_version_opt(
struct LoaderMigration {
github_url: String,
path: String,
download_name: String,
tag: String,
resources: bool,
mime_type: String,
}

impl LoaderMigration {
fn new(tag: &str, platform: &str) -> Self {
LoaderMigration {
github_url: github_url_for_loader(tag, platform),
path: path_for_loader(tag, platform),
tag: tag.to_owned(),
download_name: platform.to_owned(),
resources: false,
mime_type: "application/zip".to_owned(),
}
}

fn new_installer(tag: &str, platform: &str) -> Self {
LoaderMigration {
github_url: github_url_for_installer(tag, platform),
path: path_for_installer(tag, platform),
tag: tag.to_owned(),
resources: false,
download_name: format!("{platform}-installer"),
mime_type: "application/octet-stream".to_owned(),
}
}

fn new_resources(tag: &str) -> Self {
LoaderMigration {
github_url: github_url_for_resources(tag),
path: path_for_resources(tag),
tag: tag.to_owned(),
resources: true,
download_name: "resources".to_owned(),
mime_type: "application/zip".to_owned(),
}
}
}

async fn migrate_artifact(
data: &AppData,
db: &mut sqlx::Transaction<'_, sqlx::Postgres>,
tag: &str,
platform: &str,
mig: &LoaderMigration,
) -> anyhow::Result<Option<LoaderDownload>> {
let storage = data.cdn_storage().expect("mod storage must be set by now");
let (github_url, new_path) = match platform {
"resources" => (github_url_for_resources(tag), path_for_resources(tag)),
_ => (
github_url_for_loader(tag, platform),
path_for_loader(tag, platform),
),
};

let resp = data.http_client().get(&github_url).send().await?;

let resp = data.http_client().get(&mig.github_url).send().await?;
if resp.status() == StatusCode::NOT_FOUND {
return Ok(None);
}

let bytes = resp.error_for_status()?.bytes().await?;
let public_url = storage.asset_url(&new_path);
let public_url = storage.asset_url(&mig.path);
let hash = sha256::digest(&bytes[..]);
storage.store(&new_path, &bytes, "application/zip").await?;
storage.store(&mig.path, &bytes, &mig.mime_type).await?;

if platform == "resources" {
update_resources_download(tag, &public_url, &hash, db).await?;
if mig.resources {
update_resources_download(&mig.tag, &public_url, &hash, db).await?;
} else {
upsert_download(tag, platform, &public_url, &hash, db).await?;
upsert_download(&mig.tag, &mig.download_name, &public_url, &hash, db).await?;
}

Ok(Some(LoaderDownload {
Expand All @@ -98,7 +154,7 @@ async fn migrate_geode_version(
tag: &str,
platform: &str,
) -> anyhow::Result<LoaderDownload> {
match migrate_geode_version_opt(data, db, tag, platform).await? {
match migrate_artifact(data, db, &LoaderMigration::new(tag, platform)).await? {
Some(download) => Ok(download),
None => Err(anyhow::anyhow!(
"Geode version {} for platform '{}' not found on GitHub",
Expand All @@ -108,6 +164,33 @@ async fn migrate_geode_version(
}
}

async fn migrate_geode_installer(
data: &AppData,
db: &mut sqlx::Transaction<'_, sqlx::Postgres>,
tag: &str,
platform: &str,
) -> anyhow::Result<LoaderDownload> {
match migrate_artifact(data, db, &LoaderMigration::new_installer(tag, platform)).await? {
Some(download) => Ok(download),
None => Err(anyhow::anyhow!(
"Geode {} installer for platform '{}' not found on GitHub",
tag,
platform
)),
}
}

async fn migrate_resources(
data: &AppData,
db: &mut sqlx::Transaction<'_, sqlx::Postgres>,
tag: &str,
) -> anyhow::Result<LoaderDownload> {
match migrate_artifact(data, db, &LoaderMigration::new_resources(tag)).await? {
Some(download) => Ok(download),
None => Err(anyhow::anyhow!("Resources for {} not found on GitHub", tag,)),
}
}

fn path_for_mod_logo(mod_id: &str) -> String {
format!("mods/{mod_id}/logo.png")
}
Expand Down Expand Up @@ -184,24 +267,19 @@ async fn process_task(

let mut tx = data.db().begin().await?;

let ios = match migrate_geode_version_opt(data, &mut tx, &tag, "ios").await? {
Some(download) => download,
None => {
tracing::warn!(
"Geode version {} for iOS not found on GitHub, skipping iOS",
tag
);
LoaderDownload::default()
}
};

let downloads = LoaderDownloads {
win: migrate_geode_version(data, &mut tx, &tag, "win").await?,
mac: migrate_geode_version(data, &mut tx, &tag, "mac").await?,
android32: migrate_geode_version(data, &mut tx, &tag, "android32").await?,
android64: migrate_geode_version(data, &mut tx, &tag, "android64").await?,
ios,
resources: migrate_geode_version(data, &mut tx, &tag, "resources").await?,
ios: migrate_artifact(data, &mut tx, &LoaderMigration::new(&tag, "ios"))
.await?
.unwrap_or_default(),
resources: migrate_resources(data, &mut tx, &tag).await?,

win_installer: migrate_geode_installer(data, &mut tx, &tag, "win").await?,
mac_installer: migrate_geode_installer(data, &mut tx, &tag, "mac").await?,
linux_installer: migrate_geode_installer(data, &mut tx, &tag, "linux").await?,
};

tx.commit().await?;
Expand Down
25 changes: 24 additions & 1 deletion src/types/models/loader_version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,17 @@ pub struct LoaderDownload {
}

#[derive(Serialize, Deserialize, Default, Debug, ToSchema)]
#[serde(rename_all = "kebab-case")]
pub struct LoaderDownloads {
pub win: LoaderDownload,
pub mac: LoaderDownload,
pub android32: LoaderDownload,
pub android64: LoaderDownload,
pub ios: LoaderDownload,
pub resources: LoaderDownload,
pub win_installer: LoaderDownload,
pub mac_installer: LoaderDownload,
pub linux_installer: LoaderDownload,
}

#[derive(Serialize, Debug, ToSchema)]
Expand Down Expand Up @@ -91,6 +95,12 @@ fn github_url(tag: &str, platform: &str) -> String {
)
}

fn github_installer_url(tag: &str, platform_ext: &str) -> String {
format!(
"https://github.com/geode-sdk/geode/releases/download/v{tag}/geode-installer-v{tag}-{platform_ext}"
)
}

fn github_resources_url(tag: &str) -> String {
format!("https://github.com/geode-sdk/geode/releases/download/v{tag}/resources.zip")
}
Expand All @@ -105,6 +115,13 @@ impl LoaderDownload {
}
}

pub fn new_github_installer(tag: &str, platform_ext: &str) -> Self {
LoaderDownload {
url: github_installer_url(tag, platform_ext),
hash: String::new(),
}
}

pub fn new_github_resources(tag: &str) -> Self {
LoaderDownload {
url: github_resources_url(tag),
Expand All @@ -123,6 +140,9 @@ fn build_downloads(
android32: LoaderDownload::new_github(&version.tag, "android32"),
android64: LoaderDownload::new_github(&version.tag, "android64"),
ios: LoaderDownload::new_github(&version.tag, "ios"),
win_installer: LoaderDownload::new_github_installer(&version.tag, "win.exe"),
mac_installer: LoaderDownload::new_github_installer(&version.tag, "mac.pkg"),
linux_installer: LoaderDownload::new_github_installer(&version.tag, "linux.sh"),
resources: LoaderDownload::new_github_resources(&version.tag),
};

Expand All @@ -138,6 +158,9 @@ fn build_downloads(
"android32" => out.android32 = download,
"android64" => out.android64 = download,
"ios" => out.ios = download,
"win-installer" => out.win_installer = download,
"mac-installer" => out.mac_installer = download,
"linux-installer" => out.linux_installer = download,
_ => {}
}
}
Expand Down Expand Up @@ -410,7 +433,7 @@ impl LoaderVersion {
};
}
(None, Some(g)) => {
query_builder.push(" WHERE (((((((((android=");
query_builder.push(" WHERE (android=");
query_builder.push_bind(g);
query_builder.push(" or mac=");
query_builder.push_bind(g);
Expand Down
Loading