Better error messages when retrieving betas

Author: airsquared

build.gradle

@@ -55,7 +55,7 @@ dependencies {
     implementation 'org.apache.commons:commons-compress:1.23.0'
     implementation 'info.picocli:picocli:4.7.4'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.9.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
     testImplementation 'org.testfx:openjfx-monocle:jdk-12.0.1+2'
 }
 

src/main/java/airsquared/blobsaver/app/Network.java

@@ -24,6 +24,7 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URI;
@@ -82,8 +83,15 @@ private static HttpRequest.BodyPublisher buildFormDataFromMap(Map<Object, Object
     }
 
     static JsonElement makeJsonRequest(String url) throws IOException {
-        try (var inputStream = new BufferedReader(new InputStreamReader(new URL(url).openStream()))) {
-            return JsonParser.parseReader(inputStream);
+        try {
+            HttpResponse<InputStream> response = httpClient.send(HttpRequest.newBuilder(URI.create(url)).build(),
+                    HttpResponse.BodyHandlers.ofInputStream());
+            if (failure(response.statusCode())) {
+                throw new IOException("HTTP Response was " + response);
+            }
+            return JsonParser.parseReader(new BufferedReader(new InputStreamReader(response.body())));
+        } catch (InterruptedException e) {
+            throw new IOException(e);
         }
     }
 
@@ -94,12 +102,16 @@ static void makeVoidRequest(String url) throws IOException, InterruptedException
     static HttpResponse<Path> downloadFile(String url, Path dir) throws IOException, InterruptedException {
         var response = httpClient.send(HttpRequest.newBuilder(URI.create(url)).build(),
                 HttpResponse.BodyHandlers.ofFile(dir, WRITE, CREATE, TRUNCATE_EXISTING));
-        if (response.statusCode() != 200) {
+        if (failure(response.statusCode())) {
             throw new IOException("HTTP Response was " + response);
         }
         return response;
     }
 
+    private static boolean failure(int statusCode) {
+        return statusCode < 200 || statusCode > 299;
+    }
+
     /**
      * Source: https://github.com/jcodec/jcodec/blob/6e1ec651eca92d21b41f9790143a0e6e4d26811e/android/src/main/org/jcodec/common/io/HttpChannel.java
      *

src/main/java/airsquared/blobsaver/app/TSS.java

@@ -302,7 +302,7 @@ private List<Utils.IOSVersion> getIOSVersions() throws TSSException {
                     Stream<Utils.IOSVersion> signedBetas = getSignedBetas(deviceIdentifier);
                     return Stream.concat(signedFirmwares, signedBetas).toList();
                 } catch (Exception e) {
-                    throw new TSSException("There was an error retrieving beta versions; try without including beta versions.", false, e);
+                    throw new TSSException("There was an error retrieving beta versions; try without including beta versions. For more information, try again with the debug log open.", false, e);
                 }
             } else { // all signed firmwares
                 return getSignedFirmwares(deviceIdentifier).toList();