release: 1.3.5

multiple host support

Author: 1zun4

src/main/java/net/ccbluex/liquidbounce/mcef/MCEFResourceManager.java

@@ -47,16 +47,17 @@ public class MCEFResourceManager {
     private static final String JAVA_CEF_CHECKSUM_DOWNLOAD_URL =
             "${host}/mcef-cef/${java-cef-commit}/${platform}/checksum";
 
-    private final String host;
+    private final String[] hosts;
     private final String javaCefCommitHash;
     private final MCEFPlatform platform;
     public final MCEFProgressTracker progressTracker = new MCEFProgressTracker();
+    public int hostCounter = 0;
 
     private final File commitDirectory;
     private final File platformDirectory;
 
-    private MCEFResourceManager(String host, String javaCefCommitHash, MCEFPlatform platform, File directory) {
-        this.host = host;
+    private MCEFResourceManager(String[] hosts, String javaCefCommitHash, MCEFPlatform platform, File directory) {
+        this.hosts = hosts;
         this.javaCefCommitHash = javaCefCommitHash;
         this.platform = platform;
         this.commitDirectory = new File(directory, javaCefCommitHash);
@@ -75,7 +76,7 @@ static MCEFResourceManager newResourceManager() throws IOException {
         MCEF.INSTANCE.getLogger().info("JCEF Commit: " + javaCefCommit);
         var settings = MCEF.INSTANCE.getSettings();
 
-        return new MCEFResourceManager(settings.getDownloadMirror(), javaCefCommit,
+        return new MCEFResourceManager(settings.getHosts().toArray(new String[0]), javaCefCommit,
                 MCEFPlatform.getPlatform(), settings.getLibrariesDirectory());
     }
 
@@ -90,6 +91,11 @@ public boolean requiresDownload() throws IOException {
 
         var checksumFile = new File(commitDirectory, platform.getNormalizedName() + ".tar.gz.sha256");
 
+        // If checksum file doesn't exist, we need to download JCEF
+        if (!checksumFile.exists()) {
+            return true;
+        }
+
         // We always download the checksum for the java-cef build
         // We will compare this with <platform>.tar.gz.sha256
         // If the contents of the files differ (or it doesn't exist locally), we know we need to redownload JCEF
@@ -104,14 +110,14 @@ public boolean requiresDownload() throws IOException {
         }
         var platformDirectoryExists = platformDirectory.exists();
 
-        MCEF.INSTANCE.getLogger().info("Checksum matches: " + checksumMatches);
-        MCEF.INSTANCE.getLogger().info("Platform directory exists: " + platformDirectoryExists);
+        MCEF.INSTANCE.getLogger().info("Checksum matches: {}", checksumMatches);
+        MCEF.INSTANCE.getLogger().info("Platform directory exists: {}", platformDirectoryExists);
 
         return !checksumMatches || !platformDirectoryExists;
     }
 
     public void downloadJcef() throws IOException {
-        var retry = 0;
+        hostCounter = 0;
 
         while (true) {
             try {
@@ -126,19 +132,26 @@ public void downloadJcef() throws IOException {
                     }
                 }
 
-                // Checksum file should have been created by [compareChecksum] call in [requiresDownload]
-                // However if not, we either attempt to download it again.
-                if (!checksumFile.exists()) {
+                if (checksumFile.exists()) {
                     try {
-                        downloadFile(getJavaCefChecksumDownloadUrl(), checksumFile, progressTracker);
+                        FileUtils.forceDelete(checksumFile);
                     } catch (Exception e) {
-                        MCEF.INSTANCE.getLogger().error("Failed to download checksum file", e);
-                        throw e;
+                        MCEF.INSTANCE.getLogger().warn("Failed to delete existing .tar.gz file", e);
                     }
                 }
 
+                // Download checksum file
+                MCEF.INSTANCE.getLogger().info("Downloading checksum file... [{}/{}]", hostCounter + 1, hosts.length);
+                progressTracker.setTask("Downloading Checksum");
+                try {
+                    downloadFile(getJavaCefChecksumDownloadUrl(), checksumFile, progressTracker);
+                } catch (Exception e) {
+                    MCEF.INSTANCE.getLogger().error("Failed to download checksum file", e);
+                    throw e;
+                }
+
                 // Download JCEF from file hosting
-                MCEF.INSTANCE.getLogger().info("Downloading JCEF...");
+                MCEF.INSTANCE.getLogger().info("Downloading JCEF... [{}/{}]", hostCounter + 1, hosts.length);
                 progressTracker.setTask("Downloading JCEF");
                 downloadFile(getJavaCefDownloadUrl(), tarGzArchive, progressTracker);
 
@@ -173,10 +186,9 @@ public void downloadJcef() throws IOException {
                 break;
             } catch (Exception e) {
                 MCEF.INSTANCE.getLogger().error("Failed to download and extract JCEF", e);
-                retry++;
 
-                // Retry up to 3 times
-                if (retry >= 3) {
+                hostCounter++;
+                if (hostCounter >= hosts.length) {
                     throw e;
                 }
             }
@@ -185,8 +197,8 @@ public void downloadJcef() throws IOException {
         progressTracker.done();
     }
 
-    public String getHost() {
-        return host;
+    public String[] getHosts() {
+        return hosts;
     }
 
     public String getJavaCefDownloadUrl() {
@@ -199,7 +211,7 @@ public String getJavaCefChecksumDownloadUrl() {
 
     private String formatURL(String url) {
         return url
-                .replace("${host}", host)
+                .replace("${host}", hosts[hostCounter])
                 .replace("${java-cef-commit}", javaCefCommitHash)
                 .replace("${platform}", platform.getNormalizedName());
     }

src/main/java/net/ccbluex/liquidbounce/mcef/MCEFSettings.java

@@ -26,7 +26,14 @@
 
 public class MCEFSettings {
 
-    private String downloadMirror = "https://api.liquidbounce.net/api/v3/resource";
+    private List<String> hosts = Arrays.asList(
+            // Cloudflare Certificate
+            "https://api.liquidbounce.net/api/v3/resource",
+            // Let's Encrypt Certificate
+            "https://api.ccbluex.net/api/v3/resource",
+            // No SSL
+            "http://nossl.api.liquidbounce.net/api/v3/resource"
+    );
     private String userAgent = null;
     private List<String> cefSwitches = Arrays.asList(
             "--autoplay-policy=no-user-gesture-required",
@@ -37,12 +44,20 @@ public class MCEFSettings {
     private File cacheDirectory = null;
     private File librariesDirectory = null;
 
-    public String getDownloadMirror() {
-        return downloadMirror;
+    public List<String> getHosts() {
+        return hosts;
+    }
+
+    public void setHosts(List<String> hosts) {
+        this.hosts = hosts;
+    }
+
+    public void appendHosts(String... hosts) {
+        this.hosts.addAll(Arrays.asList(hosts));
     }
 
-    public void setDownloadMirror(String downloadMirror) {
-        this.downloadMirror = downloadMirror;
+    public void removeHosts(String... hosts) {
+        this.hosts.removeAll(Arrays.asList(hosts));
     }
 
     public String getUserAgent() {