Merge branch 'development'

Author: borntocompile

Http.cs

@@ -1,64 +1,123 @@
 using System;
 using System.Collections.Generic;
-using UnityEngine;
 using UnityEngine.Networking;
 
 namespace DUCK.Http
 {
 	public class HttpRequest
 	{
-		public UnityWebRequest UnityWebRequest { get; private set; }
+		internal UnityWebRequest UnityWebRequest { get { return unityWebRequest; } }
 
-		private readonly Dictionary<string, string> headers;
-		private Coroutine coroutine;
+		private readonly UnityWebRequest unityWebRequest;
+		private Dictionary<string, string> headers;
+
+		private event Action<float> onUploadProgress;
+		private event Action<float> onDownloadProgress;
+		private event Action<HttpResponse> onSuccess;
+		private event Action<HttpResponse> onError;
+		private event Action<HttpResponse> onNetworkError;
+
+		private float downloadProgress;
+		private float uploadProgress;
 
 		public HttpRequest(UnityWebRequest unityWebRequest)
 		{
-			UnityWebRequest = unityWebRequest;
+			this.unityWebRequest = unityWebRequest;
+			headers = new Dictionary<string, string>(Http.GetSuperHeaders());
+		}
+
+		public HttpRequest RemoveSuperHeaders()
+		{
+			foreach (var kvp in Http.GetSuperHeaders())
+			{
+				headers.Remove(kvp.Key);
+			}
 
-			headers = Http.Instance.GetSuperHeaders();
+			return this;
 		}
 
-		public void SetHeader(string key, string value)
+		public HttpRequest SetHeader(string key, string value)
 		{
 			headers[key] = value;
+			return this;
 		}
 
-		public void SetHeaders(IEnumerable<KeyValuePair<string, string>> headers)
+		public HttpRequest SetHeaders(IEnumerable<KeyValuePair<string, string>> headers)
 		{
-			if (headers == null) return;
-
 			foreach (var kvp in headers)
 			{
 				SetHeader(kvp.Key, kvp.Value);
 			}
+
+			return this;
+		}
+
+		public HttpRequest OnUploadProgress(Action<float> onProgress)
+		{
+			onUploadProgress += onProgress;
+			return this;
+		}
+
+		public HttpRequest OnDownloadProgress(Action<float> onProgress)
+		{
+			onDownloadProgress += onProgress;
+			return this;
+		}
+
+		public HttpRequest OnSuccess(Action<HttpResponse> onSuccess)
+		{
+			this.onSuccess += onSuccess;
+			return this;
+		}
+
+		public HttpRequest OnError(Action<HttpResponse> onError)
+		{
+			this.onError += onError;
+			return this;
+		}
+
+		public HttpRequest OnNetworkError(Action<HttpResponse> onNetworkError)
+		{
+			this.onNetworkError += onNetworkError;
+			return this;
 		}
 
 		public bool RemoveHeader(string key)
 		{
 			return headers.Remove(key);
 		}
 
-		public void Send(Action<HttpResponse> onSuccess = null, Action<HttpResponse> onError = null)
+		public HttpRequest Send()
 		{
 			foreach (var header in headers)
 			{
-				UnityWebRequest.SetRequestHeader(header.Key, header.Value);
+				unityWebRequest.SetRequestHeader(header.Key, header.Value);
 			}
 
-			coroutine = Http.Instance.Send(this, onSuccess, onError);
+			Http.Instance.Send(this, onSuccess, onError, onNetworkError);
+			return this;
 		}
 
 		public void Abort()
 		{
-			if (UnityWebRequest != null && !UnityWebRequest.isDone)
-			{
-				UnityWebRequest.Abort();
-			}
+			Http.Instance.Abort(this);
+		}
 
-			if (coroutine != null)
+		internal void UpdateProgress()
+		{
+			UpdateProgress(ref downloadProgress, unityWebRequest.downloadProgress, onDownloadProgress);
+			UpdateProgress(ref uploadProgress, unityWebRequest.uploadProgress, onUploadProgress);
+		}
+
+		private void UpdateProgress(ref float currentProgress, float progress, Action<float> onProgress)
+		{
+			if (currentProgress < progress)
 			{
-				Http.Instance.Abort(coroutine);
+				currentProgress = progress;
+				if (onProgress != null)
+				{
+					onProgress.Invoke(downloadProgress);
+				}
 			}
 		}
 	}

HttpHelpers.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Networking;
 
@@ -11,7 +10,7 @@ public class HttpResponse
 		public bool IsSuccessful { get; private set; }
 		public bool IsHttpError { get; private set; }
 		public bool IsNetworkError { get; private set; }
-		public long ResponseCode { get; private set; }
+		public long StatusCode { get; private set; }
 		public ResponseType ResponseType { get; private set; }
 		public byte[] Bytes { get; private set; }
 		public string Text { get; private set; }
@@ -26,8 +25,8 @@ public HttpResponse(UnityWebRequest unityWebRequest)
 			IsSuccessful = !unityWebRequest.isHttpError && !unityWebRequest.isNetworkError;
 			IsHttpError = unityWebRequest.isHttpError;
 			IsNetworkError = unityWebRequest.isNetworkError;
-			ResponseCode = unityWebRequest.responseCode;
-			ResponseType = HttpUtils.GetResponseType(ResponseCode);
+			StatusCode = unityWebRequest.responseCode;
+			ResponseType = HttpUtils.GetResponseType(StatusCode);
 			ResponseHeaders = unityWebRequest.GetResponseHeaders();
 
 			var downloadHandlerTexture = unityWebRequest.downloadHandler as DownloadHandlerTexture;
@@ -36,29 +35,5 @@ public HttpResponse(UnityWebRequest unityWebRequest)
 				Texture = downloadHandlerTexture.texture;
 			}
 		}
-
-		public T ParseBodyAs<T>()
-		{
-			try
-			{
-				return JsonUtility.FromJson<T>(Text);
-			}
-			catch
-			{
-				return default(T);
-			}
-		}
-
-		public object ParseBodyAs(Type type)
-		{
-			try
-			{
-				return JsonUtility.FromJson(Text, type);
-			}
-			catch
-			{
-				return default(Type);
-			}
-		}
 	}
-}
+}

HttpHelpers.cs.meta

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using UnityEngine;
 
 namespace DUCK.Http
 {
@@ -70,7 +69,7 @@ public static bool RemoveCustomResponseMessage(long responseCode)
 
 		public static string GetResponseTypeMessage(HttpResponse response)
 		{
-			return GetResponseTypeMessage(response.ResponseCode, response.Url);
+			return GetResponseTypeMessage(response.StatusCode, response.Url);
 		}
 
 		public static string GetResponseTypeMessage(long responseCode, string url)

HttpRequest.cs

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017-2018 Dubit Ltd.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.