Merge pull request #15 from CodyBatt/master

A bunch of random hacking

Author: jordansjones

ReleaseNotes.md

@@ -1,3 +1,7 @@
+### new in 1.0.7 (Release 2018/08/09)
+* New: EndpointPool.Build()..WithHttpReadTimeout() - Set timeout for HTTP GET requests
+* Fixed: NullReferenceException thrown in certain HTTP timeout conditions is now EtcdTimeoutException
+
 ### new in 1.0.6.1 (Release 2018/08/02)
 * Change: Updated `build.cake` to support deploying symbol package
 

source/Draft/Endpoints/EndpointPool.Builder.cs

@@ -27,15 +27,13 @@ public sealed class Builder
 
             private EndpointVerificationStrategy _verificationStrategy;
 
-            internal EndpointRoutingStrategy RoutingStrategy
-            {
-                get { return _routingStrategy ?? EndpointRoutingStrategy.Default; }
-            }
+            private TimeSpan? _httpGetTimeout;
 
-            internal EndpointVerificationStrategy VerificationStrategy
-            {
-                get { return _verificationStrategy ?? EndpointVerificationStrategy.Default; }
-            }
+            private EndpointRoutingStrategy RoutingStrategy => _routingStrategy ?? EndpointRoutingStrategy.Default;
+
+            private EndpointVerificationStrategy VerificationStrategy => _verificationStrategy ?? EndpointVerificationStrategy.Default;
+
+            internal TimeSpan? HttpGetTimeout => _httpGetTimeout;
 
             /// <summary>
             ///     Verifies the passed <paramref name="uris" /> first to ensure that they are <see cref="Uri.IsAbsoluteUri" />. Then
@@ -54,19 +52,22 @@ public async Task<EndpointPool> VerifyAndBuild(params Uri[] uris)
             {
                 if (uris == null || !uris.Any())
                 {
-                    throw new ArgumentNullException("uris", "You must supply at least 1 Uri");
+                    throw new ArgumentNullException(nameof(uris), "You must supply at least 1 Uri");
                 }
                 var invalidUris = uris.Where(x => !x.IsAbsoluteUri).ToList();
                 if (invalidUris.Any())
                 {
                     throw new ArgumentException(
-                        string.Format("The following Uri(s) are not valid absolute Uri(s): '{0}'", string.Join(", ", invalidUris)),
-                        "uris"
+                        $"The following Uri(s) are not valid absolute Uri(s): '{string.Join(", ", invalidUris)}'",
+                        nameof(uris)
                         );
                 }
                 var endpoints = await VerificationStrategy.Verify(uris);
 
-                return new EndpointPool(endpoints, RoutingStrategy);
+                return new EndpointPool(endpoints, RoutingStrategy)
+                {
+                    HttpGetTimeout = _httpGetTimeout
+                };
             }
 
             /// <summary>
@@ -77,7 +78,7 @@ public Builder WithRoutingStrategy(EndpointRoutingStrategy routingStrategy)
             {
                 if (routingStrategy == null)
                 {
-                    throw new ArgumentNullException("routingStrategy");
+                    throw new ArgumentNullException(nameof(routingStrategy));
                 }
                 _routingStrategy = routingStrategy;
                 return this;
@@ -91,12 +92,27 @@ public Builder WithVerificationStrategy(EndpointVerificationStrategy verificatio
             {
                 if (verificationStrategy == null)
                 {
-                    throw new ArgumentNullException("verificationStrategy");
+                    throw new ArgumentNullException(nameof(verificationStrategy));
                 }
                 _verificationStrategy = verificationStrategy;
                 return this;
             }
 
+            /// <summary>
+            ///     Sets the default timeout for HTTP GET requests
+            /// </summary>
+            /// <param name="httpGetTimeout"></param>
+            /// <returns></returns>
+            public Builder WithHttpReadTimeout(TimeSpan httpGetTimeout)
+            {
+                if (httpGetTimeout == null)
+                {
+                    throw new ArgumentNullException(nameof(httpGetTimeout));
+                }
+                _httpGetTimeout = httpGetTimeout;
+                return this;
+            }
+
         }
 
     }

source/Draft/Endpoints/EndpointPool.cs

@@ -38,5 +38,8 @@ internal Url GetEndpointUrl(params string[] pathParts)
             return pathSegment.ToUrl(RoutingStrategy.Select(pathSegment.Value, OnlineEndpoints).Uri);
         }
 
+        [IgnoreDataMember]
+        internal TimeSpan? HttpGetTimeout { get; set; } = null;
+
     }
 }

source/Draft/Exceptions/ExceptionHandling.cs

@@ -36,6 +36,8 @@ public static EtcdException ProcessException(this FlurlHttpException This)
 
             var etcdError = This.GetResponseJson<EtcdError>();
 
+            if (etcdError == null) { return new UnknownErrorException(This.Message); }
+
             var message = etcdError.Message;
 
             etcdError.ErrorCode = etcdError.ErrorCode
@@ -254,7 +256,9 @@ private static EtcdException AsTimeoutException(this FlurlHttpException This)
 
         private static bool IsTimeoutException(this FlurlHttpException This)
         {
-            return This is FlurlHttpTimeoutException;
+            if (This is FlurlHttpTimeoutException) return true;
+
+            return This.InnerException is OperationCanceledException;
         }
 
         #endregion

source/Draft/Extensions/Flurl.Extensions.cs

@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 
 using Flurl;
+using Flurl.Http;
 
 namespace Draft
 {
@@ -20,6 +21,11 @@ public static Url Conditionally(this Url This, bool predicate, Func<Url, Url> ac
             return predicate ? action(This) : This;
         }
 
+        public static IFlurlClient Conditionally(this Url This, bool predicate, Func<Url, IFlurlClient> action)
+        {
+            return predicate ? action(This) : new FlurlClient(This, true);
+        }
+
         public static Task<HttpResponseMessage> Conditionally(this Url This, bool predicate, object data, Func<Url, object, Task<HttpResponseMessage>> ifTrue, Func<Url, object, Task<HttpResponseMessage>> ifFalse)
         {
             return predicate ? ifTrue(This, data) : ifFalse(This, data);

source/Draft/Requests/BaseRequest.cs

@@ -31,5 +31,6 @@ public Url TargetUrl
             }
         }
 
+        protected TimeSpan? HttpGetTimeout => _endpointPool.HttpGetTimeout;
     }
 }

source/Draft/Requests/GetRequest.cs

@@ -28,6 +28,7 @@ public async Task<IKeyEvent> Execute()
                 return await TargetUrl
                     .Conditionally(Quorum.HasValue && Quorum.Value, x => x.SetQueryParam(Constants.Etcd.Parameter_Quorum, Constants.Etcd.Parameter_True))
                     .Conditionally(Recursive.HasValue && Recursive.Value, x => x.SetQueryParam(Constants.Etcd.Parameter_Recursive, Constants.Etcd.Parameter_True))
+                    .Conditionally(HttpGetTimeout != null, x=>x.WithTimeout(HttpGetTimeout.GetValueOrDefault()))
                     .GetAsync()
                     .ReceiveEtcdResponse<KeyEvent>(EtcdClient);
             }