feat: docker, --force, move bsdiff libs, env vars for java home

radstevee · radstevee · commit 264344b91fbd · 2024-11-15T19:54:07.000+01:00
fix: a bunch of issues with extracting jars
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,5 @@
+config.toml
+target
+run
+.git
+.idea
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,10 +18,10 @@ log = "0.4.22"
 env_logger = "0.11.5"
 tracing-subscriber = "0.3.18"
 chrono = "0.4.38"
-bsdiff = "0.2.0"
 zip = "2.2.0"
-bzip2 = { version = "0.4", features = [] }
 toml = "0.8.19"
 sha1 = "0.10.6"
 hex = "0.4.3"
 clap = { version = "4.5.21", features = ["derive"] }
+qbsdiff = "1.4.2"
+bzip2 = "0.4.4"
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,39 @@
+FROM rust:bookworm
+
+# avoid any prompts
+ARG DEBIAN_FRONTEND=noninteractive
+
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    wget \
+    curl \
+    gnupg \
+    lsb-release \
+    ca-certificates \
+    unzip \
+    build-essential \
+    libssl-dev \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# temurin 8
+RUN wget -qO- 'https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u432b06.tar.gz' | tar -xz -C /opt/
+# temurin 16
+RUN wget -qO- 'https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz' | tar -xz -C /opt/
+# temurin 17
+RUN wget -qO- 'https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_linux_hotspot_17.0.13_11.tar.gz' | tar -xz -C /opt/
+# temurin 21
+RUN wget -qO- 'https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_linux_hotspot_21.0.5_11.tar.gz' | tar -xz -C /opt/
+
+ENV JAVA_HOME_8=/opt/jdk8u432-b06
+ENV JAVA_HOME_16=/opt/jdk-16.0.2+7
+ENV JAVA_HOME_17=/opt/jdk-17.0.13+11
+ENV JAVA_HOME_21=/opt/jdk-21.0.5+11
+
+WORKDIR /app
+
+COPY . .
+
+RUN cargo install --path .
+
+CMD ["bin_patch_gen", "-v", "1.21.3"]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,8 @@
+services:
+  gen:
+    container_name: sploon-bin-patch-gen
+    build: .
+    volumes:
+      - ./config.toml:/app/config.toml
+      - /tmp/bpg:/tmp/bin-patch-gen
+    mem_limit: 2G
diff --git a/src/build_tools.rs b/src/build_tools.rs
@@ -9,7 +9,7 @@ use regex::Regex;
 use crate::util::dir;
 
 /// The URL of the latest BuildTools JAR build from SpigotMC's Jenkins.
-pub const VANILLA_JAR_REGEX: &str = r"minecraft_server.(1\.\d{1,2}(?:\.\d{1,2})?)\.jar";
+pub const VANILLA_JAR_REGEX: &str = r"(minecraft_)?server.(1\.\d{1,2}(?:\.\d{1,2})?)\.jar";
 const BUILDTOOLS_URL: &str = "https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar";
 const SPIGOT_JAR_REGEX: &str = r"spigot-(1\.\d{1,2}(?:\.\d{1,2})?)\.jar";
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,12 +1,11 @@
 use crate::util::dir;
-use bzip2::write::BzEncoder;
-use bzip2::Compression;
 use futures_util::StreamExt;
+use qbsdiff::Bsdiff;
 use reqwest::IntoUrl;
 use scraper::Html;
 use std::fmt::Display;
 use std::fs::File;
-use std::io::{Read, Write};
+use std::io::{Cursor, Read, Write};
 use std::path::Path;
 use std::{fs, io};
 
@@ -89,7 +88,7 @@ pub async fn fetch_url<U: IntoUrl>(url: U) -> Reqwsult<Html> {
 pub fn write_patch<P, P1>(vanilla_jar: P, spigot_jar: P, out: P1) -> io::Result<()>
 where
     P: AsRef<Path>,
-    P1: AsRef<Path>
+    P1: AsRef<Path>,
 {
     let mut vanilla = File::open(vanilla_jar)?;
     let mut vanilla_bytes = Vec::new();
@@ -100,14 +99,12 @@ where
     spigot.read_to_end(&mut spigot_bytes)?;
 
     let mut diff = Vec::new();
-    bsdiff::diff(&vanilla_bytes, &spigot_bytes, &mut diff)?;
 
-    let mut encoder = BzEncoder::new(Vec::new(), Compression::best());
-    encoder.write_all(&diff)?;
+    Bsdiff::new(&vanilla_bytes, &spigot_bytes)
+        .compression_level(9)
+        .compare(Cursor::new(&mut diff))?;
 
-    let compressed = encoder.finish()?;
-
-    fs::write(out, compressed)
+    fs::write(out, diff)
 }
 
 pub struct MinecraftVersion(u8, u8, u8);
@@ -129,15 +126,15 @@ impl MinecraftVersion {
 
     pub fn get_java_version(&self) -> u8 {
         if self.1 < 17 {
-            return 8
+            return 8;
         }
 
         if self.1 == 17 {
-            return 16
+            return 16;
         }
 
         if self.1 < 20 && self.2 < 5 {
-            return 17
+            return 17;
         }
 
         21
diff --git a/src/main.rs b/src/main.rs

-Original file line number
+Diff line change
 +config.toml
 +target
 +run
 +.git
 +.idea