- Better Exception handling

Signed-off-by: syeyoung <cyoung06@naver.com>

1 files changed, 129 insertions, 96 deletions

diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/UpdateRetrieverUtil.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/UpdateRetrieverUtil.java
index fe7e54dd..abc0cff4 100644
--- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/UpdateRetrieverUtil.java
+++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/UpdateRetrieverUtil.java
@@ -1,21 +1,19 @@
 package kr.syeyoung.dungeonsguide.launcher.branch;
 
 import kr.syeyoung.dungeonsguide.launcher.Main;
-import kr.syeyoung.dungeonsguide.launcher.auth.DGResponse;
+import kr.syeyoung.dungeonsguide.launcher.auth.AuthManager;
 import kr.syeyoung.dungeonsguide.launcher.exceptions.AssetNotFoundException;
 import kr.syeyoung.dungeonsguide.launcher.exceptions.NoVersionFoundException;
-import kr.syeyoung.dungeonsguide.launcher.exceptions.ResponseParsingException;
+import kr.syeyoung.dungeonsguide.launcher.exceptions.http.ResponseParsingException;
 import lombok.Builder;
 import lombok.Data;
 import org.apache.commons.io.IOUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import javax.net.ssl.HttpsURLConnection;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.ProtocolException;
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.time.Instant;
 import java.util.List;
@@ -24,94 +22,110 @@ import java.util.UUID;
 import java.util.stream.Collectors;
 
 public class UpdateRetrieverUtil {
-    private static String getResponse(HttpsURLConnection connection) throws IOException {
+    private static String getResponse(HttpURLConnection connection) throws IOException {
         connection.getResponseCode();
         InputStream toRead = connection.getErrorStream();
         if (toRead == null)
             toRead = connection.getInputStream();
-        String payload = IOUtils.readLines(toRead).stream().collect(Collectors.joining("\n"));
-        return payload;
+        return IOUtils.readLines(toRead).stream().collect(Collectors.joining("\n"));
     }
 
     public static List<UpdateBranch> getUpdateBranches() throws IOException {
-        HttpsURLConnection connection = (HttpsURLConnection) new URL(Main.DOMAIN + "/updates/").openConnection();
+        HttpURLConnection connection = (HttpURLConnection) new URL(Main.DOMAIN + "/updates/").openConnection();
         connection.setRequestProperty("User-Agent", "DungeonsGuide/1.0");
-        connection.setRequestProperty("Content-Type", "application/json");
+        connection.setRequestProperty("Authorization", "Bearer "+ AuthManager.getInstance().getWorkingTokenOrThrow());
         connection.setRequestMethod("GET");
         connection.setDoInput(true);
         connection.setDoOutput(true);
 
-        JSONArray jsonArray = new JSONArray(getResponse(connection));
-        return jsonArray.toList()
-                .stream()
-                    .map(a -> (JSONObject)a)
-                .map(a -> {
-                    UpdateBranch updateBranch = new UpdateBranch();
-                    updateBranch.setId(a.getLong("id"));
-                    updateBranch.setName(a.getString("name"));
-                    updateBranch.setMetadata(a.getJSONObject("metadata"));
-                    return updateBranch;
-                }).collect(Collectors.toList());
+        String payload = getResponse(connection);
+        try {
+            JSONArray jsonArray = new JSONArray(payload);
+            return jsonArray.toList()
+                    .stream()
+                    .map(a -> (JSONObject) a)
+                    .map(a -> {
+                        UpdateBranch updateBranch = new UpdateBranch();
+                        updateBranch.setId(a.getLong("id"));
+                        updateBranch.setName(a.getString("name"));
+                        updateBranch.setMetadata(a.getJSONObject("metadata"));
+                        return updateBranch;
+                    }).collect(Collectors.toList());
+        } catch (Exception e) {
+            throw new ResponseParsingException(payload, e);
+        }
     }
 
     public static List<Update> getLatestUpdates(long branchId, int page) throws IOException {
-        HttpsURLConnection connection = (HttpsURLConnection) new URL(Main.DOMAIN + "/updates/"+branchId+"/?page="+page).openConnection();
+        HttpURLConnection connection = (HttpURLConnection) new URL(Main.DOMAIN + "/updates/"+branchId+"/?page="+page).openConnection();
         connection.setRequestProperty("User-Agent", "DungeonsGuide/1.0");
         connection.setRequestMethod("GET");
+        connection.setRequestProperty("Authorization", "Bearer "+ AuthManager.getInstance().getWorkingTokenOrThrow());
         connection.setDoInput(true);
         connection.setDoOutput(true);
 
-        JSONArray jsonArray = new JSONArray(getResponse(connection));
-        return jsonArray.toList()
-                .stream()
-                .map(a -> (JSONObject)a)
-                .map(a -> {
-                    Update update = new Update();
-                    update.setId(a.getLong("id"));
-                    update.setBranchId(a.getLong("branchId"));
-                    update.setName(a.getString("name"));
-                    update.setUpdateLog(a.getString("updateLog"));
-                    update.setMetadata(a.getJSONObject("metadata"));
-                    update.setAssets(a.getJSONObject("assets").getJSONArray("assets").toList().stream().map(b -> (JSONObject)b)
-                            .map(b -> {
-                                Update.Asset asset = new Update.Asset();
-                                asset.setName(b.getString("name"));
-                                asset.setAssetId(UUID.fromString(b.getString("assetId")));
-                                asset.setSize(b.getLong("size"));
-                                asset.setObjectId(b.getString("objectId"));
-                                return asset;
-                            }).collect(Collectors.toList()));
-                    update.setReleaseDate(Instant.parse(a.getString("releaseDate")));
-                    return update;
-                }).collect(Collectors.toList());
+        String payload = getResponse(connection);
+        try {
+            JSONArray jsonArray = new JSONArray(payload);
+            return jsonArray.toList()
+                    .stream()
+                    .map(a -> (JSONObject) a)
+                    .map(a -> {
+                        Update update = new Update();
+                        update.setId(a.getLong("id"));
+                        update.setBranchId(a.getLong("branchId"));
+                        update.setName(a.getString("name"));
+                        update.setUpdateLog(a.getString("updateLog"));
+                        update.setMetadata(a.getJSONObject("metadata"));
+                        update.setAssets(a.getJSONObject("assets").getJSONArray("assets").toList().stream().map(b -> (JSONObject) b)
+                                .map(b -> {
+                                    Update.Asset asset = new Update.Asset();
+                                    asset.setName(b.getString("name"));
+                                    asset.setAssetId(UUID.fromString(b.getString("assetId")));
+                                    asset.setSize(b.getLong("size"));
+                                    asset.setObjectId(b.getString("objectId"));
+                                    return asset;
+                                }).collect(Collectors.toList()));
+                        update.setReleaseDate(Instant.parse(a.getString("releaseDate")));
+                        return update;
+                    }).collect(Collectors.toList());
+        } catch (Exception e) {
+            throw new ResponseParsingException(payload, e);
+        }
     }
 
     public static Update getUpdate(long branchId, long updateId) throws IOException {
-        HttpsURLConnection connection = (HttpsURLConnection) new URL(Main.DOMAIN + "/updates/"+branchId+"/"+updateId).openConnection();
+        HttpURLConnection connection = (HttpURLConnection) new URL(Main.DOMAIN + "/updates/"+branchId+"/"+updateId).openConnection();
         connection.setRequestProperty("User-Agent", "DungeonsGuide/1.0");
+        connection.setRequestProperty("Authorization", "Bearer "+ AuthManager.getInstance().getWorkingTokenOrThrow());
         connection.setRequestMethod("GET");
         connection.setDoInput(true);
         connection.setDoOutput(true);
 
-        JSONObject a = new JSONObject(getResponse(connection));
-
-        Update update = new Update();
-        update.setId(a.getLong("id"));
-        update.setBranchId(a.getLong("branchId"));
-        update.setName(a.getString("name"));
-        update.setUpdateLog(a.getString("updateLog"));
-        update.setMetadata(a.getJSONObject("metadata"));
-        update.setAssets(a.getJSONObject("assets").getJSONArray("assets").toList().stream().map(b -> (JSONObject)b)
-                .map(b -> {
-                    Update.Asset asset = new Update.Asset();
-                    asset.setName(b.getString("name"));
-                    asset.setAssetId(UUID.fromString(b.getString("assetId")));
-                    asset.setSize(b.getLong("size"));
-                    asset.setObjectId(b.getString("objectId"));
-                    return asset;
-                }).collect(Collectors.toList()));
-        update.setReleaseDate(Instant.parse(a.getString("releaseDate")));
-        return update;
+        String payload = getResponse(connection);
+        try {
+            JSONObject a = new JSONObject();
+
+            Update update = new Update();
+            update.setId(a.getLong("id"));
+            update.setBranchId(a.getLong("branchId"));
+            update.setName(a.getString("name"));
+            update.setUpdateLog(a.getString("updateLog"));
+            update.setMetadata(a.getJSONObject("metadata"));
+            update.setAssets(a.getJSONObject("assets").getJSONArray("assets").toList().stream().map(b -> (JSONObject) b)
+                    .map(b -> {
+                        Update.Asset asset = new Update.Asset();
+                        asset.setName(b.getString("name"));
+                        asset.setAssetId(UUID.fromString(b.getString("assetId")));
+                        asset.setSize(b.getLong("size"));
+                        asset.setObjectId(b.getString("objectId"));
+                        return asset;
+                    }).collect(Collectors.toList()));
+            update.setReleaseDate(Instant.parse(a.getString("releaseDate")));
+            return update;
+        } catch (Exception e) {
+            throw new ResponseParsingException(payload, e);
+        }
     }
 
     public static InputStream downloadFile(Update update, String assetName) throws IOException {
@@ -119,17 +133,22 @@ public class UpdateRetrieverUtil {
                 .findFirst().orElseThrow(() -> new AssetNotFoundException(update.getBranchId()+"", update.getId()+"("+update.getName()+")", assetName));
 
 
-        HttpsURLConnection connection = (HttpsURLConnection) new URL(Main.DOMAIN + "/updates/"+update.getBranchId()+"/"+update.getId()+"/"+asset.getAssetId()).openConnection();
+        HttpURLConnection connection = (HttpURLConnection) new URL(Main.DOMAIN + "/updates/"+update.getBranchId()+"/"+update.getId()+"/"+asset.getAssetId()).openConnection();
         connection.setRequestProperty("User-Agent", "DungeonsGuide/1.0");
         connection.setRequestMethod("GET");
         connection.setDoInput(true);
         connection.setDoOutput(true);
 
-        JSONObject result = new JSONObject(getResponse(connection));
-        String url = result.getString("url");
-        String method = result.getString("method");
-
-        connection = (HttpsURLConnection) new URL(url).openConnection();
+        String payload = getResponse(connection);
+        String url, method;
+        try {
+            JSONObject result = new JSONObject(payload);
+            url = result.getString("url");
+            method = result.getString("method");
+        } catch (Exception e) {
+            throw new ResponseParsingException(payload, e);
+        }
+        connection = (HttpURLConnection) new URL(url).openConnection();
         connection.setRequestProperty("User-Agent", "DungeonsGuide/1.0");
         connection.setRequestMethod(method);
         return connection.getInputStream();
@@ -142,41 +161,55 @@ public class UpdateRetrieverUtil {
         String friendlyVersionName = "";
         long updateId;
     }
-    public static VersionInfo getIds(String branch, String version) throws IOException {
-        long branchId = -1, updateId = -1;
-        UpdateBranch branch1 = null;
-            for (UpdateBranch updateBranch : UpdateRetrieverUtil.getUpdateBranches()) {
+    public static VersionInfo getIds(String branch, String version) throws IOException, NoVersionFoundException {
+        try {
+            long branchId = -1, updateId = -1;
+            UpdateBranch branch1 = null;
+            List<UpdateBranch> branches = UpdateRetrieverUtil.getUpdateBranches();
+            for (UpdateBranch updateBranch : branches) {
                 if (updateBranch.getName().equals(branch) || (branch.equals("$default") &&
                         Optional.ofNullable(updateBranch.getMetadata())
-                                .map(a -> a.getJSONObject("additionalMeta"))
-                                .map(a -> a.getBoolean("defaultMod")).orElse(false))) {
+                                .map(a -> a.isNull("additionalMeta") ? null : a.getJSONObject("additionalMeta"))
+                                .map(a -> a.isNull("defaultMod") ? null : a.getBoolean("defaultMod")).orElse(false))) {
                     branchId = updateBranch.getId();
                     branch1 = updateBranch;
                     break;
                 }
             }
-        if (branchId == -1) return null;
-
-        Update target = null;
-        int page = 0;
-        while (updateId == -1) {
-            List<Update> updateList = UpdateRetrieverUtil.getLatestUpdates(branchId, page++);
-            if (updateList == null || updateList.isEmpty()) return null;
-            for (Update update : updateList) {
-                if (update.getName().equals(version) || version.equals("latest")) { // if latest, get the first one.
-                    updateId = update.getId();
-                    target = update;
-                    break;
+            if (branchId == -1) {
+                throw new NoVersionFoundException(branch, version,
+                        branches.stream()
+                                .map(a -> a.getName() +
+                                        Optional.ofNullable(a.getMetadata()).map(b -> b.getJSONObject("additionalMeta")).map(b -> b.toString()).orElse(""))
+                                .collect(Collectors.joining(", "))
+                );
+            }
+
+            Update target = null;
+            int page = 0;
+            while (updateId == -1) {
+                List<Update> updateList = UpdateRetrieverUtil.getLatestUpdates(branchId, page++);
+                if (updateList == null || updateList.isEmpty()) {
+                    throw new NoVersionFoundException(branch, version, "Unable to find version / branchId: " + branchId);
+                }
+                for (Update update : updateList) {
+                    if (update.getName().equals(version) || version.equals("latest")) { // if latest, get the first one.
+                        updateId = update.getId();
+                        target = update;
+                        break;
+                    }
                 }
             }
-        }
 
 
-        return VersionInfo.builder()
-                .branchId(branchId)
-                .updateId(updateId)
-                .friendlyBranchName(branch1.getName())
-                .friendlyVersionName(target.getName())
-                .build();
+            return VersionInfo.builder()
+                    .branchId(branchId)
+                    .updateId(updateId)
+                    .friendlyBranchName(branch1.getName())
+                    .friendlyVersionName(target.getName())
+                    .build();
+        } catch (Exception e) {
+            throw new NoVersionFoundException(branch, version, "Exception occured", e);
+        }
     }
 }