Always specify BuildManifest in tsschecker arguments: greatly improves blob saving speed & performance (no more freezing)

Author: airsquared

dist/macos/Frameworks/libjnidispatch.jnilib

@@ -37,9 +37,11 @@
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -179,9 +181,9 @@ private static void saveBackgroundBlobs(int preset) {
             identifier = textToIdentifier(presetPrefs.get("Device Model", ""));
         }
         log("identifier:" + identifier);
-        List<String> signedVersions;
+        List<Map<String, Object>> signedFirmwares;
         try {
-            signedVersions = getAllSignedVersions(identifier);
+            signedFirmwares = getAllSignedFirmwares(identifier);
         } catch (IOException e) {
             Notification notification = new Notification("Saving blobs failed", "Check your internet connection.\nIf it is working, click here to report this error.", Notification.ERROR_ICON);
             Notification.Notifier.INSTANCE.setPopupLifetime(Duration.minutes(1));
@@ -199,20 +201,19 @@ private static void saveBackgroundBlobs(int preset) {
             Notification.Notifier.INSTANCE.notify(notification);
             return;
         }
-        log("signed versions:" + signedVersions);
         String ecid = presetPrefs.get("ECID", "");
         String path = presetPrefs.get("Path", "");
         String boardConfig = presetPrefs.get("Board Config", "");
         String apnonce = presetPrefs.get("Apnonce", "");
         File tsschecker = getTsschecker();
-        for (String version : signedVersions) {
+        for (Map<String, Object> firmware : signedFirmwares) {
             //noinspection ResultOfMethodCallIgnored
             new File(path).mkdirs();
             String tsscheckerLog;
             try {
                 ArrayList<String> args = new ArrayList<>();
                 Collections.addAll(args, tsschecker.getPath(), "--generator", "0x1111111111111111", "--nocache", "-d", identifier, "-s", "-e", ecid,
-                        "--save-path", path, "-i", version);
+                        "--save-path", path, "-m", extractBuildManifest(new URL(firmware.get("url").toString())).toString());
                 if (!"none".equals(boardConfig) && !"".equals(boardConfig)) { // needs board config
                     Collections.addAll(args, "--boardconfig", boardConfig);
                 }
@@ -244,7 +245,7 @@ private static void saveBackgroundBlobs(int preset) {
                 presetName = appPrefs.get("Name Preset" + preset, "");
             }
             if (containsIgnoreCase(tsscheckerLog, "Saved")) {
-                Notification notification = new Notification("Successfully saved blobs for", "iOS " + version + " (" + presetName + ") in\n" + path, Notification.SUCCESS_ICON);
+                Notification notification = new Notification("Successfully saved blobs for", "iOS " + firmware.get("version").toString() + " (" + presetName + ") in\n" + path, Notification.SUCCESS_ICON);
                 Notification.Notifier.INSTANCE.setPopupLifetime(Duration.seconds(30));
                 Notification.Notifier.INSTANCE.setOnNotificationPressed((event) -> {
                     Notification.Notifier.INSTANCE.stop();
@@ -275,7 +276,7 @@ private static void saveBackgroundBlobs(int preset) {
                     reportError(alert, tsscheckerLog);
                 });
                 Notification.Notifier.INSTANCE.notify(notification);
-            } else if (containsIgnoreCase(tsscheckerLog, "iOS " + version + " for device " + identifier + " IS NOT being signed")) {
+            } else if (containsIgnoreCase(tsscheckerLog, " IS NOT being signed")) {
                 continue;
             } else {
                 Notification notification = new Notification("Saving blobs failed", "An unknown error occurred. Click here to report this error.", Notification.ERROR_ICON);

dist/windows/lib/jnidispatch.dll

@@ -47,6 +47,8 @@
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 
 import static com.airsquared.blobsaver.Main.appPrefs;
 import static com.airsquared.blobsaver.Main.appVersion;
@@ -136,7 +138,7 @@ protected Void call() throws Exception {
         service.start();
     }
 
-    static String makeRequest(URL url) throws IOException {
+    private static String makeRequest(URL url) throws IOException {
         URLConnection urlConnection = url.openConnection();
         BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
         String inputLine;
@@ -173,7 +175,7 @@ static File getTsschecker() {
         return tsschecker;
     }
 
-    static void copyStreamToFile(InputStream inputStream, File file) throws IOException {
+    private static void copyStreamToFile(InputStream inputStream, File file) throws IOException {
         OutputStream out = new FileOutputStream(file);
         int read;
         byte[] bytes = new byte[1024];
@@ -263,11 +265,33 @@ static void runSafe(Runnable runnable) {
         }
     }
 
-    static List<String> getAllSignedVersions(String deviceIdentifier) throws IOException {
+    static List<Map<String, Object>> getFirmwareList(String deviceIdentifier) throws IOException {
         String response = makeRequest(new URL("https://api.ipsw.me/v4/device/" + deviceIdentifier));
         JSONArray firmwareListJson = new JSONObject(response).getJSONArray("firmwares");
         @SuppressWarnings("unchecked") List<Map<String, Object>> firmwareList = (List) firmwareListJson.toList();
-        return firmwareList.stream().filter(map -> Boolean.TRUE.equals(map.get("signed"))).map(map -> map.get("version").toString()).collect(Collectors.toList());
+        return firmwareList;
+    }
+
+    static List<Map<String, Object>> getAllSignedFirmwares(String deviceIdentifier) throws IOException {
+        return getFirmwareList(deviceIdentifier).stream().filter(map -> Boolean.TRUE.equals(map.get("signed"))).collect(Collectors.toList());
+    }
+
+//    static List<String> getAllSignedVersions(String deviceIdentifier) throws IOException {
+//        return getAllSignedFirmwares(deviceIdentifier).map(map -> map.get("version").toString()).collect(Collectors.toList());
+//    }
+
+    static File extractBuildManifest(URL ipswURL) throws IOException {
+        File buildManifestPlist = File.createTempFile("BuildManifest", ".plist");
+        ZipInputStream zin = new ZipInputStream(ipswURL.openStream());
+        ZipEntry ze;
+        while ((ze = zin.getNextEntry()) != null) {
+            if ("BuildManifest.plist".equals(ze.getName())) {
+                copyStreamToFile(zin, buildManifestPlist);
+                break;
+            }
+        }
+        buildManifestPlist.deleteOnExit();
+        return buildManifestPlist;
     }
 
     // temporary until ProGuard is implemented

src/main/java/com/airsquared/blobsaver/Background.java

@@ -24,13 +24,14 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import static com.airsquared.blobsaver.Shared.*;
 
@@ -43,9 +44,10 @@ class TSSChecker {
     static void run(String device) {
         Controller controller = Controller.INSTANCE;
         if (controller.versionCheckBox.isSelected()) {
-            List<String> signedVersions;
+            List<Map<String, Object>> allSignedFirmwares; // really is List<Map<String, String>>
+            ArrayList<String> signedVersionsStringList = new ArrayList<>();
             try {
-                signedVersions = getAllSignedVersions(device);
+                allSignedFirmwares = getAllSignedFirmwares(device);
             } catch (IOException e) {
                 Alert alert = new Alert(Alert.AlertType.ERROR,
                         "Saving blobs failed. Check your internet connection.\n\nIf your internet is working and you can connect to the website ipsw.me in your browser, please create a new issue on Github or PM me on Reddit. The log has been copied to your clipboard.",
@@ -57,29 +59,34 @@ static void run(String device) {
             }
             try {
                 // can't use the `forEach()` method because exception won't be caught properly
-                for (String version : signedVersions) {
-                    run(device, version);
+                for (Map<String, Object> firmware : allSignedFirmwares) { // really is List<Map<String, String>>
+                    signedVersionsStringList.add(firmware.get("version").toString());
+                    run(new URL(firmware.get("url").toString()), device, firmware.get("version").toString());
                 }
-            } catch (TSSCheckerException e) { // exception is only needed so lambda doesn't keep on going after an error
+            } catch (TSSCheckerException | MalformedURLException e) { // exception is only needed so lambda doesn't keep on going after an error
                 return; // the error alert should already be shown
             }
-            String signedVersionsString = signedVersions.toString().substring(1, signedVersions.toString().length() - 1);
+            String signedVersionsString = signedVersionsStringList.toString().substring(1, signedVersionsStringList.toString().length() - 1);
             Alert alert = new Alert(Alert.AlertType.INFORMATION,
                     "Successfully saved blobs in\n" + controller.pathField.getText() + "\n\nFor "
-                            + (signedVersions.size() == 1 ? "version " : "versions ") + signedVersionsString, ButtonType.OK);
+                            + (signedVersionsStringList.size() == 1 ? "version " : "versions ") + signedVersionsString, ButtonType.OK);
             alert.setHeaderText("Success!");
             alert.showAndWait();
         } else {
             try {
-                run(device, controller.versionField.getText());
+                Map<String, Object> firmware = getFirmwareList(device).stream().filter(stringObjectMap ->
+                        controller.versionField.getText().equals(stringObjectMap.get("version"))).collect(Collectors.toList()).get(0);
+                run(new URL(firmware.get("url").toString()), device, controller.versionField.getText());
             } catch (TSSCheckerException e) {
                 // the error alert should already be shown
+            } catch (IOException e) {
+                e.printStackTrace();
             }
 
         }
     }
 
-    private static void run(String device, String version) throws TSSCheckerException {
+    private static void run(URL ipswURL, String device, String version) throws TSSCheckerException {
         if ("".equals(device)) {
             return;
         }
@@ -89,12 +96,10 @@ private static void run(String device, String version) throws TSSCheckerExceptio
         String savePath = controller.pathField.getText();
         String boardConfig = controller.boardConfigField.getText();
         String apnonce = controller.apnonceField.getText();
-        String ipswURL = controller.ipswField.getText();
 
         Effect errorBorder = Controller.errorBorder;
 
         File tsschecker = getTsschecker();
-        File buildManifestPlist = null;
 
         File locationToSaveBlobs = new File(controller.pathField.getText());
         //noinspection ResultOfMethodCallIgnored
@@ -107,38 +112,18 @@ private static void run(String device, String version) throws TSSCheckerExceptio
             Collections.addAll(args, "--apnonce", apnonce);
         }
         if (controller.betaCheckBox.isSelected()) {
-            try {
-                if (!ipswURL.matches("https?://.*apple.*\\.ipsw")) {
-                    newUnreportableError("\"" + ipswURL + "\" is not a valid URL.\n\nMake sure it starts with \"http://\" or \"https://\", has \"apple\" in it, and ends with \".ipsw\"");
-                    return;
-                }
-                buildManifestPlist = File.createTempFile("BuildManifest", ".plist");
-                ZipInputStream zin;
-                try {
-                    URL url = new URL(ipswURL);
-                    zin = new ZipInputStream(url.openStream());
-                } catch (IOException e) {
-                    newUnreportableError("\"" + ipswURL + "\" is not a valid URL.\n\nMake sure it starts with \"http://\" or \"https://\", has \"apple\" in it, and ends with \".ipsw\"");
-                    deleteTempFiles(buildManifestPlist);
-                    return;
-                }
-                ZipEntry ze;
-                while ((ze = zin.getNextEntry()) != null) {
-                    if ("BuildManifest.plist".equals(ze.getName())) {
-                        copyStreamToFile(zin, buildManifestPlist);
-                        break;
-                    }
-                }
-                buildManifestPlist.deleteOnExit();
-            } catch (IOException e) {
-                newReportableError("Unable to get BuildManifest from .ipsw.", e.getMessage());
-                e.printStackTrace();
-                deleteTempFiles(buildManifestPlist);
+            if (!controller.ipswField.getText().matches("https?://.*apple.*\\.ipsw")) {
+                newUnreportableError("\"" + ipswURL + "\" is not a valid URL.\n\nMake sure it starts with \"http://\" or \"https://\", has \"apple\" in it, and ends with \".ipsw\"");
                 return;
             }
-            Collections.addAll(args, "-i", version, "--beta", "--buildid", controller.buildIDField.getText(), "-m", buildManifestPlist.toString());
-        } else {
-            Collections.addAll(args, "-i", version);
+            Collections.addAll(args, "--beta", "--buildid", controller.buildIDField.getText());
+        }
+        try {
+            Collections.addAll(args, "-m", extractBuildManifest(ipswURL).toString());
+        } catch (IOException e) {
+            newReportableError("Unable to extract BuildManifest from .ipsw.", e.getMessage());
+            e.printStackTrace();
+            return;
         }
         String tsscheckerLog;
         try {
@@ -148,7 +133,6 @@ private static void run(String device, String version) throws TSSCheckerExceptio
         } catch (IOException e) {
             newReportableError("There was an error starting tsschecker.", e.toString());
             e.printStackTrace();
-            deleteTempFiles(buildManifestPlist);
             throw new TSSCheckerException(e);
         }
 
@@ -160,7 +144,6 @@ private static void run(String device, String version) throws TSSCheckerExceptio
                 alert.setHeaderText("Success!");
                 alert.showAndWait();
             }
-            deleteTempFiles(buildManifestPlist);
             return;
         } else if (containsIgnoreCase(tsscheckerLog, "[Error] [TSSC] manually specified ecid=" + ecid + ", but parsing failed")) {
             newUnreportableError("\"" + ecid + "\"" + " is not a valid ECID. Try getting it from iTunes.\n\nIf this was done to test whether the preset works in the background, please cancel that preset, fix the error, and try again.");
@@ -221,15 +204,8 @@ && containsIgnoreCase(tsscheckerLog, "Error] [TSSC] checking tss status failed!"
         } else {
             newReportableError("Unknown result.\n\nIf this was done to test whether the preset works in the background, please cancel that preset, fix the error, and try again.", tsscheckerLog);
         }
-        deleteTempFiles(buildManifestPlist);
         throw new TSSCheckerException();
-    }
 
-    @SuppressWarnings("ResultOfMethodCallIgnored")
-    private static void deleteTempFiles(File buildManifestPlist) {
-        if (buildManifestPlist != null && buildManifestPlist.exists()) {
-            buildManifestPlist.delete();
-        }
     }
 
     /**