Pr#38 fix offline message queuing

Analytics.Xamarin.Pcl/Client.cs

@@ -53,7 +53,7 @@ public Client(string writeKey, Config config)
 			this._writeKey = writeKey;
 			this._config = config;
 
-			IRequestHandler requestHandler = new BlockingRequestHandler(config.Host, config.Timeout);
+			IRequestHandler requestHandler = new BlockingRequestHandler(this, config.Timeout);
 			IBatchFactory batchFactory = new SimpleBatchFactory(this._writeKey);
 
 			requestHandler.Succeeded += (action) =>

Analytics.Xamarin.Pcl/Config.cs

@@ -15,6 +15,8 @@ public class Config
 		/// </summary>
 		internal string Host { get; set; }
 
+		internal string Proxy { get; set; }
+
 		internal int MaxQueueSize { get; set; }
 
 		internal bool Async { get; set; }
@@ -40,6 +42,18 @@ public Config SetHost(string host)
  			return this;
  		}
 
+		/// <summary>
+		/// Set the proxy server Uri
+		/// </summary>
+		/// <param name="proxy">Proxy server Uri</param>
+		/// <returns></returns>
+		public Config SetProxy(string proxy)
+		{
+			this.Proxy = proxy;
+			return this;
+		}
+
+
 		/// <summary>
 		/// Sets the maximum amount of timeout on the HTTP request flushes to the server.
 		/// </summary>

Analytics.Xamarin.Pcl/Flush/AsyncFlushHandler.cs

@@ -163,11 +163,13 @@ private void Loop()
 						{ "batch size", current.Count }
 					});
 
-					// make the request here
-					_requestHandler.SendBatch(batch);
-
-					// mark the current batch as null
-					current = new List<BaseAction>();
+					// send the batch async
+					Task<bool> res = Task.Run(() => _requestHandler.SendBatch(batch));
+					// clear the current only of the batch was sent successfully
+					if (res.Result)
+					{
+						current = new List<BaseAction>();
+					}
 				}
 			}
 		}

Analytics.Xamarin.Pcl/Request/BlockingRequestHandler.cs

@@ -16,6 +16,37 @@
 
 namespace Segment.Request
 {
+	class WebProxy : System.Net.IWebProxy
+	{
+		private string _proxy;
+
+		public WebProxy(string proxy)
+		{
+			_proxy = proxy;
+			GetProxy(new Uri(proxy)); // ** What does this do?
+		}
+
+		public System.Net.ICredentials Credentials
+		{
+			get; set;
+		}
+
+		public Uri GetProxy(Uri destination)
+		{
+			if (!String.IsNullOrWhiteSpace(destination.ToString()))
+				return destination;
+			else
+				return new Uri("");
+		}
+
+		public bool IsBypassed(Uri host)
+		{
+			if (!String.IsNullOrWhiteSpace(host.ToString()))
+				return true;
+			else
+				return false;
+		}
+	}
 	internal class BlockingRequestHandler : IRequestHandler
 	{
 		/// <summary>
@@ -29,39 +60,53 @@ internal class BlockingRequestHandler : IRequestHandler
 		public event SucceededActionHandler Succeeded;
 
 		/// <summary>
-		/// Segment API endpoint.
+		/// Segment client
 		/// </summary>
-		private string _host;
+		private readonly Client _client;
 
 		/// <summary>
 		/// Http client
 		/// </summary>
-		private HttpClient _client;
+		private readonly HttpClient _httpClient;
 
-		internal BlockingRequestHandler(string host, TimeSpan timeout)
+
+
+		internal BlockingRequestHandler(Client client, TimeSpan timeout)
 		{
-			this._host = host;
-			this._client = new HttpClient();
-			this._client.Timeout = timeout;
+			this._client = client;
+
+			if (!string.IsNullOrEmpty(_client.Config.Proxy))
+			{
+				var handler = new HttpClientHandler
+				{
+					Proxy = new WebProxy(_client.Config.Proxy),
+					UseProxy = true
+				};
+				this._httpClient = new HttpClient(handler);
+			}
+			else
+				this._httpClient = new HttpClient();
+
+			this._httpClient.Timeout = timeout;
 			// do not use the expect 100-continue behavior
-			this._client.DefaultRequestHeaders.ExpectContinue = false;
+			this._httpClient.DefaultRequestHeaders.ExpectContinue = false;
 		}
 
-		public void SendBatch(Batch batch)
+		public bool SendBatch(Batch batch)
 		{
 			Dict props = new Dict {
 				{ "batch id", batch.MessageId },
 				{ "batch size", batch.batch.Count }
 			};
-
+			bool sentBatch = false;
 			try
 			{
 				// set the current request time
 				batch.SentAt = DateTime.Now.ToString("o");
 				string json = JsonConvert.SerializeObject(batch);
 				props["json size"] = json.Length;
 
-				Uri uri = new Uri(_host + "/v1/import");
+				Uri uri = new Uri(_client.Config.Host + "/v1/import");
 
 				HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Post, uri);
 
@@ -73,7 +118,7 @@ public void SendBatch(Batch batch)
 
 				var start = DateTime.Now;
 
-				var response = _client.SendAsync(request).Result;
+				var response = _httpClient.SendAsync(request).Result;
 
 				var duration = DateTime.Now - start;
 				props["success"] = response.IsSuccessStatusCode;
@@ -83,6 +128,7 @@ public void SendBatch(Batch batch)
 				{
 					Succeed(batch);
 					Logger.Info("Request successful", props);
+					sentBatch = true;
 				}
 				else
 				{
@@ -99,6 +145,7 @@ public void SendBatch(Batch batch)
 				Logger.Error("Request failed", props);
 				Fail(batch, e);
 			}
+			return sentBatch;
 		}
 
 		private void Fail(Batch batch, System.Exception e)

Analytics.Xamarin.Pcl/Request/IRequestHandler.cs

@@ -13,7 +13,7 @@ internal interface IRequestHandler : IDisposable
 		/// Send an action batch to the Segment tracking API.
 		/// </summary>
 		/// <param name="batch">Batch.</param>
-		void SendBatch(Batch batch);
+		bool SendBatch(Batch batch);
 
 		/// <summary>
 		/// Occurs when an action fails.