Merge pull request #2 from kepuss/URLConnection

Response wrapper for KeybaseLib (for open-keychain okhttp3)

Author: Dominik Schürmann

Lib/src/main/java/com/textuality/keybase/lib/DefaultKeybaseUrlConnectionClient.java

@@ -25,7 +25,7 @@
 public class DefaultKeybaseUrlConnectionClient implements KeybaseUrlConnectionClient {
 
     @Override
-    public HttpURLConnection openConnection(URL url, Proxy proxy, boolean isKeybase) throws IOException {
+    public Response getUrlResponse(URL url, Proxy proxy, boolean isKeybase) throws IOException {
         HttpURLConnection conn;
         if (proxy == null) {
             conn = (HttpURLConnection) url.openConnection();
@@ -36,7 +36,10 @@ public HttpURLConnection openConnection(URL url, Proxy proxy, boolean isKeybase)
             conn.setConnectTimeout(30000);
             conn.setReadTimeout(40000);
         }
-        return conn;
+        conn.connect();
+
+
+        return new Response(conn.getInputStream(),conn.getResponseCode(),conn.getResponseMessage(),conn.getHeaderFields());
     }
 
     @Override

Lib/src/main/java/com/textuality/keybase/lib/KeybaseQuery.java

@@ -25,7 +25,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.Proxy;
 import java.net.URL;
@@ -62,14 +61,9 @@ public JSONObject getFromKeybase(String path, String query) throws KeybaseExcept
             String url = connectionClient.getKeybaseBaseUrl() + path + URLEncoder.encode(query, "utf8");
 
             URL realUrl = new URL(url);
-
-            HttpURLConnection conn = (HttpURLConnection) connectionClient.openConnection(realUrl, proxy, true);
-            conn.connect();
-
-            int response = conn.getResponseCode();
-
-            if (response >= 200 && response < 300) {
-                String text = snarf(conn.getInputStream());
+            KeybaseUrlConnectionClient.Response response = connectionClient.getUrlResponse(realUrl, proxy, true);
+            if (response.getCode() >= 200 && response.getCode() < 300) {
+                String text = snarf(response.getStream());
                 try {
                     JSONObject json = new JSONObject(text);
                     if (JWalk.getInt(json, "status", "code") != 0) {
@@ -81,7 +75,7 @@ public JSONObject getFromKeybase(String path, String query) throws KeybaseExcept
                     throw KeybaseException.keybaseScrewup(e);
                 }
             } else {
-                String message = snarf(conn.getErrorStream());
+                String message = response.getMessage();
                 throw KeybaseException.networkScrewup("api.keybase.io query error (status=" + response + "): " + message);
             }
         } catch (Exception e) {
@@ -103,27 +97,23 @@ public Fetch fetchProof(String urlString) {
         Fetch result = new Fetch();
 
         try {
-            HttpURLConnection conn = null;
-            int status = 0;
+            KeybaseUrlConnectionClient.Response response  = null;
             int redirects = 0;
             while (redirects < REDIRECT_TRIES) {
                 result.mActualUrl = urlString;
                 URL url = new URL(urlString);
-                conn = (HttpURLConnection) connectionClient.openConnection(url, proxy, false);
-                conn.addRequestProperty("User-Agent", "Keybase Java client, github.com/timbray/KeybaseLib");
-                conn.connect();
-                status = conn.getResponseCode();
-                if (status == 301) {
+                response = connectionClient.getUrlResponse(url, proxy, false);
+                if (response.getCode() == 301) {
                     redirects++;
-                    urlString = conn.getHeaderFields().get("Location").get(0);
+                    urlString = response.getHeaders().get("Location").get(0);
                 } else {
                     break;
                 }
             }
-            if (status >= 200 && status < 300) {
-                result.mBody = KeybaseQuery.snarf(conn.getInputStream());
+            if (response.getCode() >= 200 && response.getCode() < 300) {
+                result.mBody = KeybaseQuery.snarf(response.getStream());
             } else {
-                result.mProblem = "Fetch failed, status " + status + ": " + KeybaseQuery.snarf(conn.getErrorStream());
+                result.mProblem = "Fetch failed, status " + response.getCode() + ": " + response.getMessage();
             }
 
         } catch (MalformedURLException e) {

Lib/src/main/java/com/textuality/keybase/lib/KeybaseUrlConnectionClient.java

@@ -18,15 +18,51 @@
 package com.textuality.keybase.lib;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.Proxy;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * wrapper
  */
 public interface KeybaseUrlConnectionClient {
 
-    URLConnection openConnection(URL url, Proxy proxy, boolean isKeybase) throws IOException;
+    Response getUrlResponse(URL url, Proxy proxy, boolean isKeybase) throws IOException;
     String getKeybaseBaseUrl();
+
+    class Response {
+        private final InputStream stream;
+        private final int code;
+        private final String message;
+        private final Map<String, List<String>> headers;
+
+        public Response(InputStream stream, int code, String  message, Map<String, List<String>> headers) {
+            if (stream == null) {
+                throw new IllegalArgumentException("Stream may not be null.");
+            }
+            this.stream = stream;
+            this.code = code;
+            this.message = message;
+            this.headers = headers;
+        }
+
+        public InputStream getStream() {
+            return stream;
+        }
+
+        public int getCode() {
+            return code;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        public Map<String, List<String>> getHeaders() {
+            return headers;
+        }
+    }
 }