Merge pull request #252 from easy-games/feature/ratelimit-retry-logic

Expose headers via HttpResponse

Author: ZeroParticle

Runtime/Code/Http/HttpResponse.cs

@@ -1,8 +1,17 @@
+using System.Collections.Generic;
+
 namespace Code.Http {
     public struct HttpResponse {
         public bool success;
-        public int statusCode;
+// workable data
         public string data;
         public string error;
+// meta data
+        public int statusCode;
+        public Dictionary<string, string> headers;
+
+        public string GetHeader(string headerName) {
+            return headers[headerName];
+        }
     }
 }

Runtime/Code/Http/Public/HttpManager.cs

@@ -38,14 +38,25 @@ public static async Task<HttpResponse> GetAsync(string url, string headers) {
                 return new HttpResponse() {
                     success = false,
                     error = req.error,
-                    statusCode = (int)req.responseCode
+                    statusCode = (int)req.responseCode,
+                    headers = req.GetResponseHeaders()
+                };
+            }
+
+            if (req.result == UnityWebRequest.Result.ConnectionError) {
+                return new HttpResponse() {
+                    success = false,
+                    error = req.error,
+                    statusCode = (int)req.responseCode,
+                    headers = req.GetResponseHeaders()
                 };
             }
 
             return new HttpResponse() {
                 success = true,
                 data = req.downloadHandler.text,
-                statusCode = (int)req.responseCode
+                statusCode = (int)req.responseCode,
+                headers = req.GetResponseHeaders()
             };
 
 
@@ -83,11 +94,13 @@ public static Task<HttpResponse> PostAsync(string url, string data, string heade
             if (string.IsNullOrEmpty(data)) {
                 options = new RequestHelper {
                     Uri = url,
+                    IgnoreHttpException = true
                 };
             } else {
                 options = new RequestHelper {
                     Uri = url,
-                    BodyString = data
+                    BodyString = data,
+                    IgnoreHttpException = true
                 };
             }
             if (headers != "") {
@@ -102,9 +115,10 @@ public static Task<HttpResponse> PostAsync(string url, string data, string heade
 
             RestClient.Post(UnityWebRequestProxyHelper.ApplyProxySettings(options)).Then((res) => {
                 task.SetResult(new HttpResponse() {
-                    success = true,
+                    success = 200 <= res.StatusCode && res.StatusCode < 300,
                     data = res.Text,
-                    statusCode = (int)res.StatusCode
+                    statusCode = (int)res.StatusCode,
+                    headers = res.Headers
                 });
             }).Catch((err) => {
                 var error = err as RequestException;
@@ -113,8 +127,9 @@ public static Task<HttpResponse> PostAsync(string url, string data, string heade
                 }
                 task.SetResult(new HttpResponse() {
                     success = false,
-                    statusCode = (int) error.StatusCode,
-                    error = error.Response
+                    statusCode = 0,
+                    error = error.Message,
+                    headers = {}
                 });
             });
 
@@ -130,6 +145,7 @@ public static Task<HttpResponse> DeleteAsync(string url, string headers) {
 
             var options = new RequestHelper {
                 Uri = url,
+                IgnoreHttpException = true
             };
             if (headers != "") {
                 var split = headers.Split(",");
@@ -143,9 +159,10 @@ public static Task<HttpResponse> DeleteAsync(string url, string headers) {
 
             RestClient.Delete(UnityWebRequestProxyHelper.ApplyProxySettings(options)).Then((res) => {
                 task.SetResult(new HttpResponse() {
-                    success = true,
+                    success = 200 <= res.StatusCode && res.StatusCode < 300,
                     data = res.Text,
-                    statusCode = (int)res.StatusCode
+                    statusCode = (int)res.StatusCode,
+                    headers = res.Headers
                 });
             }).Catch((err) => {
                 var error = err as RequestException;
@@ -154,8 +171,9 @@ public static Task<HttpResponse> DeleteAsync(string url, string headers) {
                 }
                 task.SetResult(new HttpResponse() {
                     success = false,
-                    statusCode = (int) error.StatusCode,
-                    error = error.Response
+                    statusCode = 0,
+                    error = error.Message,
+                    headers = {}
                 });
             });
 
@@ -171,7 +189,8 @@ public static Task<HttpResponse> PatchAsync(string url, string data, string head
 
             var options = new RequestHelper {
                 Uri = url,
-                BodyString = data
+                BodyString = data,
+                IgnoreHttpException = true
             };
             if (headers != "") {
                 var split = headers.Split(",");
@@ -185,9 +204,10 @@ public static Task<HttpResponse> PatchAsync(string url, string data, string head
 
             RestClient.Patch(UnityWebRequestProxyHelper.ApplyProxySettings(options)).Then((res) => {
                 task.SetResult(new HttpResponse() {
-                    success = true,
+                    success = 200 <= res.StatusCode && res.StatusCode < 300,
                     data = res.Text,
-                    statusCode = (int)res.StatusCode
+                    statusCode = (int)res.StatusCode,
+                    headers = res.Headers
                 });
             }).Catch((err) => {
                 var error = err as RequestException;
@@ -196,16 +216,17 @@ public static Task<HttpResponse> PatchAsync(string url, string data, string head
                 }
                 task.SetResult(new HttpResponse() {
                     success = false,
-                    statusCode = (int) error.StatusCode,
-                    error = error.Response
+                    statusCode = 0,
+                    error = error.Message,
+                    headers = {}
                 });
             });
 
             return task.Task;
         }
 
         private static void LogRequestError(string url, RequestException error) {
-            Debug.LogError(url + " " + error + " " + error.Response);
+            Debug.LogError(url + " " + error + " " + error.Message);
         }
 
         public static Task<HttpResponse> PutAsync(string url, string data) {
@@ -216,6 +237,7 @@ public static Task<HttpResponse> PutAsync(string url, string data, string header
             return PutAsync(new RequestHelper {
                 Uri = url,
                 BodyString = data,
+                IgnoreHttpException = true
             }, headers);
         }
 
@@ -234,9 +256,10 @@ public static Task<HttpResponse> PutAsync(RequestHelper options, string headers)
 
             RestClient.Put(UnityWebRequestProxyHelper.ApplyProxySettings(options)).Then((res) => {
                 task.SetResult(new HttpResponse() {
-                    success = true,
+                    success = 200 <= res.StatusCode && res.StatusCode < 300,
                     data = res.Text,
-                    statusCode = (int)res.StatusCode
+                    statusCode = (int)res.StatusCode,
+                    headers = res.Headers
                 });
             }).Catch((err) => {
                 var error = err as RequestException;
@@ -245,8 +268,9 @@ public static Task<HttpResponse> PutAsync(RequestHelper options, string headers)
                 }
                 task.SetResult(new HttpResponse() {
                     success = false,
-                    statusCode = (int) error.StatusCode,
-                    error = error.Response
+                    statusCode = 0,
+                    error = error.Message,
+                    headers = {}
                 });
             });