Cleaning up, adding QueryResponse

- Putting API classes under its own package. - Moved API calls from AntiVPN into new FunkemunkyAPI class. - Added QueryResponse object and FunkemunkyAPI#getQueryResponse get grab plan information.
2026-06-13 15:10:39 +00:00 · 2022-06-06 09:32:48 -04:00
parent bddf26359d
commit 0c903794e5
9 changed files with 90 additions and 23 deletions
@@ -0,0 +1,53 @@
+package dev.brighten.antivpn.web.objects;
+
+import dev.brighten.antivpn.utils.json.JSONException;
+import dev.brighten.antivpn.utils.json.JSONObject;
+import lombok.Builder;
+import lombok.Data;
+
+
+/**
+ * Used to format the JSON response from https://funkemunky.cc/vpn/queryCheck into an object for project use.
+ */
+@Data
+@Builder(toBuilder = true)
+public class QueryResponse {
+
+    private boolean validPlan;
+    private String planType;
+    private long queries;
+    private long queriesMax;
+
+    /**
+     *
+     * Takes a JSON String and feeds it into {@link QueryResponse#fromJson(JSONObject)}
+     *
+     * @param jsonString String (formatted in JSON)
+     * @return QueryResponse
+     * @throws JSONException Will throw if JSON is not formatted properly.
+     */
+    public static QueryResponse fromJson(String jsonString) throws JSONException {
+        return fromJson(new JSONObject(jsonString));
+    }
+
+    /**
+     *
+     * Will format response from https://funkemunky.cc/vpn/queryCheck into an Object for use.
+     *
+     * @param object JSOnObject
+     * @return QueryResponse
+     * @throws JSONException If there is an error with the API.
+     */
+    public static QueryResponse fromJson(JSONObject object) throws JSONException {
+        boolean validPlan = object.getBoolean("validPlan");
+
+        if(!validPlan) { // Nothing else will be returned from API if validPlan is false.
+            return QueryResponse.builder().validPlan(false).build();
+        }
+
+        return QueryResponse.builder().validPlan(object.getBoolean("validPlan"))
+                .planType(object.getString("planType"))
+                .queries(object.getLong("queries"))
+                .queriesMax(object.getLong("queriesMax")).build();
+    }
+}
@@ -0,0 +1,77 @@
+package dev.brighten.antivpn.web.objects;
+
+import dev.brighten.antivpn.utils.json.JSONException;
+import dev.brighten.antivpn.utils.json.JSONObject;
+import lombok.*;
+
+@Data
+@AllArgsConstructor
+@RequiredArgsConstructor
+@Builder
+public class VPNResponse {
+    private String asn, ip, countryName, countryCode, city, timeZone, method, isp, failureReason = "N/A";
+    private boolean proxy, cached;
+    private final boolean success;
+    private double latitude, longitude;
+    private long lastAccess;
+    private long queriesLeft;
+
+    public JSONObject toJson() throws JSONException {
+        JSONObject json = new JSONObject();
+
+        json.put("ip", ip);
+        json.put("countryName", countryName);
+        json.put("countryCode", countryCode);
+        json.put("city", city);
+        json.put("method", method);
+        json.put("isp", isp);
+        json.put("proxy", proxy);
+        json.put("success", success);
+        json.put("timeZone", timeZone);
+        json.put("success", true);
+        json.put("queriesLeft", queriesLeft);
+        json.put("cached", cached);
+
+        return json;
+    }
+
+    public static VPNResponse fromJson(String json) throws JSONException {
+        JSONObject jsonObject = new JSONObject(json);
+
+        if(jsonObject.getBoolean("success")) {
+            return new VPNResponse(jsonObject.getString("asn"), jsonObject.getString("ip"),
+                    jsonObject.getString("countryName"), jsonObject.getString("countryCode"),
+                    jsonObject.getString("city"), jsonObject.getString("timeZone"),
+                    jsonObject.has("method") ? jsonObject.getString("method") : "N/A",
+                    jsonObject.getString("isp"), "N/A", jsonObject.getBoolean("proxy"),
+                    jsonObject.getBoolean("cached"), jsonObject.getBoolean("success"),
+                    jsonObject.getDouble("latitude"), jsonObject.getDouble("longitude"),
+                    jsonObject.getLong("lastAccess"), jsonObject.getInt("queriesLeft"));
+        } else {
+            VPNResponse response = new VPNResponse(false);
+
+            response.failureReason = jsonObject.getString("failureReason");
+
+            return response;
+        }
+    }
+
+    public static VPNResponse fromJson(JSONObject jsonObject) throws JSONException {
+        if(jsonObject.getBoolean("success")) {
+            return new VPNResponse(jsonObject.getString("asn"), jsonObject.getString("ip"),
+                    jsonObject.getString("countryName"), jsonObject.getString("countryCode"),
+                    jsonObject.getString("city"), jsonObject.getString("timeZone"),
+                    jsonObject.has("method") ? jsonObject.getString("method") : "N/A",
+                    jsonObject.getString("isp"), "N/A", jsonObject.getBoolean("proxy"),
+                    jsonObject.getBoolean("cached"), jsonObject.getBoolean("success"),
+                    jsonObject.getDouble("latitude"), jsonObject.getDouble("longitude"),
+                    jsonObject.getLong("lastAccess"), jsonObject.getInt("queriesLeft"));
+        } else {
+            VPNResponse response = new VPNResponse(false);
+
+            response.failureReason = jsonObject.getString("failureReason");
+
+            return response;
+        }
+    }
+}