Implement CancelAsync

mythz · mythz · commit 617f09404cb8 · 2015-06-17T11:18:17.000+08:00
diff --git a/src/ServiceStack.HttpClient/JsonHttpClient.cs b/src/ServiceStack.HttpClient/JsonHttpClient.cs
@@ -7,6 +7,7 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using ServiceStack.Logging;
 using ServiceStack.Serialization;
@@ -41,6 +42,8 @@ public class JsonHttpClient : IServiceClient
         public string Password { get; set; }
         public bool AlwaysSendBasicAuthHeader { get; set; }
 
+        public CancellationTokenSource CancelTokenSource { get; set; }
+
         /// <summary>
         /// Gets the collection of headers to be added to outgoing requests.
         /// </summary>
@@ -115,10 +118,13 @@ public Task<TResponse> SendAsync<TResponse>(string httpMethod, string absoluteUr
 
             httpReq.Headers.Add(HttpHeaders.Accept, ContentType);
 
-            var sendAsyncTask = client.SendAsync(httpReq);
-
             ApplyWebRequestFilters(httpReq);
 
+            if (CancelTokenSource == null || CancelTokenSource.IsCancellationRequested)
+                CancelTokenSource = new CancellationTokenSource();
+
+            var sendAsyncTask = client.SendAsync(httpReq, CancelTokenSource.Token);
+
             if (typeof(TResponse) == typeof(HttpResponseMessage))
             {
                 return (Task<TResponse>)(object)sendAsyncTask;
@@ -493,15 +499,14 @@ public Task CustomMethodAsync(string httpVerb, IReturnVoid requestDto)
 
         public void CancelAsync()
         {
-            throw new System.NotImplementedException();
+            CancelTokenSource.Cancel();
         }
 
         public void Dispose()
         {
         }
 
 
-
         public void SendOneWay(object requestDto)
         {
             var requestUri = this.AsyncOneWayBaseUri.WithTrailingSlash() + requestDto.GetType().Name;
@@ -729,7 +734,6 @@ public List<TResponse> SendAll<TResponse>(IEnumerable<IReturn<TResponse>> reques
 
     public delegate void ResultsFilterHttpResponseDelegate(HttpResponseMessage webResponse, object response, string httpMethod, string requestUri, object request);
 
-
     public static class JsonHttpClientUtils
     {
         public static Dictionary<string, string> ToDictionary(this HttpResponseHeaders headers)
@@ -755,9 +759,9 @@ public static WebHeaderCollection ToWebHeaderCollection(this HttpResponseHeaders
         public static string GetContentType(this HttpResponseMessage httpRes)
         {
             IEnumerable<string> values;
-            if (httpRes.Headers.TryGetValues(HttpHeaders.ContentType, out values))
-                return values.FirstOrDefault();
-            return null;
+            return httpRes.Headers.TryGetValues(HttpHeaders.ContentType, out values) 
+                ? values.FirstOrDefault() 
+                : null;
         }
     }
 
