add RetryDomainsMiddleware

Author: lihsai0

src/Qiniu/Http/HttpCode.cs

@@ -51,6 +51,11 @@ public enum HttpCode
         /// 镜像回源失败
         /// </summary>
         PREFETCH_FAILED = 478,
+        
+        /// <summary>
+        /// 接口未实现
+        /// </summary>
+        NOT_IMPLEMENTED = 501,
 
         /// <summary>
         /// 错误网关
@@ -67,6 +72,11 @@ public enum HttpCode
         /// </summary>
         SERVER_TIME_EXCEED = 504,
 
+        /// <summary>
+        /// 超出带宽限制
+        /// </summary>
+        BANDWIDTH_LIMIT_EXCEEDED = 509,
+        
         /// <summary>
         /// 单个资源访问频率过高
         /// </summary>
@@ -88,15 +98,25 @@ public enum HttpCode
         CONTENT_MODIFIED = 608,
 
         /// <summary>
-        /// 文件不存在
+        /// 文件不存在/指定资源不存在或已被删除
         /// </summary>
         FILE_NOT_EXIST = 612,
 
         /// <summary>
-        /// 文件已存在
+        /// 文件已存在/目标资源已存在
         /// </summary>
         FILE_EXISTS = 614,
 
+        /// <summary>
+        /// 当前操作无法在共享空间执行（被共享的用户进行操作时）
+        /// </summary>
+        INVALID_SHARE_BUCKET = 616,
+
+        /// <summary>
+        /// 当前操作无法在共享空间执行（所有者进行操作时）
+        /// </summary>
+        BUCKET_IS_SHARING = 618,
+
         /// <summary>
         /// 空间数量已达上限
         /// </summary>
@@ -107,6 +127,11 @@ public enum HttpCode
         /// </summary>
         BUCKET_NOT_EXIST = 631,
 
+        /// <summary>
+        /// 共享空间达到上限
+        /// </summary>
+        EXCEED_SHARED_BUCKETS_LIMIT = 632,
+
         /// <summary>
         /// 列举资源(list)使用了非法的marker
         /// </summary>

src/Qiniu/Http/HttpManager.cs

@@ -24,7 +24,7 @@ public class HttpManager
         public HttpManager(bool allowAutoRedirect = false)
         {
             this.allowAutoRedirect = allowAutoRedirect;
-            userAgent = GetUserAgent();            
+            userAgent = GetUserAgent();
         }
 
         /// <summary>
@@ -45,7 +45,7 @@ public static string GetUserAgent()
         /// <returns>客户端标识UA</returns>
         public void SetUserAgent(string userAgent)
         {
-            if(!string.IsNullOrEmpty(userAgent))
+            if (!string.IsNullOrEmpty(userAgent))
             {
                 this.userAgent = userAgent;
             }
@@ -61,64 +61,46 @@ public static string CreateFormDataBoundary()
             return string.Format("-------{0}Boundary{1}", QiniuCSharpSDK.ALIAS, Hashing.CalcMD5X(now));
         }
 
-        public HttpWebRequest CreateHttpWebRequest(
+        public HttpRequestOptions CreateHttpRequestOptions(
             string method,
             string url,
             StringDictionary headers,
             string token = null
         )
         {
-            HttpWebRequest wReq = WebRequest.Create(url) as HttpWebRequest;
+            HttpRequestOptions reqOpts = new HttpRequestOptions();
 
-            if (wReq == null)
-            {
-                StringBuilder msg = new StringBuilder();
-                msg.AppendFormat("Failed to create HttpWebRequest with URL \"{0}\".", url);
-                throw new InvalidOperationException(msg.ToString());
-            }
-
-            wReq.Method = method;
+            reqOpts.Method = method;
+            reqOpts.Url = url;
 
             if (headers != null)
             {
-                foreach (string fieldName in headers.Keys)
-                {
-                    if (!WebHeaderCollection.IsRestricted(fieldName))
-                    {
-                        wReq.Headers.Add(fieldName, headers[fieldName]);
-                    }
-                }
-
-                if (headers.ContainsKey("Content-Type"))
-                {
-                    wReq.ContentType = headers["Content-Type"];
-                }
+                reqOpts.Headers = headers;
             }
-            
+
             if (!string.IsNullOrEmpty(token))
             {
-                wReq.Headers.Add("Authorization", token);
+                reqOpts.Headers.Add("Authorization", token);
             }
-            
-            wReq.UserAgent = userAgent;
-            wReq.AllowAutoRedirect = allowAutoRedirect;
-            wReq.ServicePoint.Expect100Continue = false;
-            
-            return wReq;
+
+            reqOpts.Headers.Add("User-Agent", userAgent);
+            reqOpts.AllowAutoRedirect = allowAutoRedirect;
+
+            return reqOpts;
         }
 
         public HttpResult CreateHttpResult(HttpWebResponse wResp, bool binaryMode = false)
         {
             HttpResult result = new HttpResult();
-            
+
             if (wResp == null)
             {
                 return result;
             }
 
             result.Code = (int)wResp.StatusCode;
             result.RefCode = (int)wResp.StatusCode;
-            
+
             getHeaders(ref result, wResp);
 
             Stream respStream = wResp.GetResponseStream();
@@ -156,12 +138,14 @@ public HttpResult CreateHttpResult(HttpWebResponse wResp, bool binaryMode = fals
             return result;
         }
 
-        public HttpResult SendRequest(HttpWebRequest wReq, Boolean binaryMode = false)
+        public HttpResult SendRequest(HttpRequestOptions reqOpts, Boolean binaryMode = false)
         {
             HttpResult result;
+            HttpWebRequest wReq = null;
 
             try
             {
+                wReq = reqOpts.CreateHttpWebRequest();
                 HttpWebResponse wResp = wReq.GetResponse() as HttpWebResponse;
 
                 result = CreateHttpResult(wResp, binaryMode);
@@ -178,7 +162,7 @@ public HttpResult SendRequest(HttpWebRequest wReq, Boolean binaryMode = false)
                     "[{0}] [{1}] [HTTP-{2}] Error:  ",
                     DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"),
                     userAgent,
-                    wReq.Method
+                    reqOpts.Method
                 );
                 Exception e = ex;
                 while (e != null)
@@ -203,23 +187,23 @@ public HttpResult SendRequest(HttpWebRequest wReq, Boolean binaryMode = false)
             return result;
         }
 
-        public HttpResult SendRequest(HttpWebRequest wReq, List<IMiddleware> middlewares, Boolean binaryMode = false)
+        public HttpResult SendRequest(HttpRequestOptions reqOpts, List<IMiddleware> middlewares, Boolean binaryMode = false)
         {
             if (middlewares == null || middlewares.Count == 0)
             {
-                return SendRequest(wReq, binaryMode);
+                return SendRequest(reqOpts, binaryMode);
             }
-            
+
             List<IMiddleware> reversedMiddlewares = new List<IMiddleware>(middlewares);
             reversedMiddlewares.Reverse();
             DNextSend composedHandle = reversedMiddlewares.Aggregate<IMiddleware, DNextSend>(
                 req => SendRequest(req, binaryMode),
                 (handle, middleware) => request => middleware.Send(request, handle)
             );
 
-            return composedHandle(wReq);
+            return composedHandle(reqOpts);
         }
-        
+
         /// <summary>
         /// HTTP-GET 方法（不包含 headers）
         /// </summary>
@@ -262,14 +246,25 @@ public HttpResult Get(string url, StringDictionary headers, Auth auth, bool bina
         /// <returns>HTTP-GET的响应结果</returns>
         public HttpResult Get(string url, StringDictionary headers, string token, bool binaryMode = false)
         {
-            HttpWebRequest wReq = CreateHttpWebRequest("GET", url, headers, token);
-            return SendRequest(wReq, binaryMode);
+            return Get(url, headers, token, null, binaryMode);
         }
 
         public HttpResult Get(string url, StringDictionary headers, string token, List<IMiddleware> middlewares, bool binaryMode = false)
         {
-            HttpWebRequest wReq = CreateHttpWebRequest("GET", url, headers, token);
-            return SendRequest(wReq, middlewares, binaryMode);
+            if (headers == null)
+            {
+                headers = new StringDictionary{
+                    {"Content-Type", ContentType.WWW_FORM_URLENC}
+                };
+            }
+
+            if (!headers.ContainsKey("Content-Type"))
+            {
+                headers["Content-Type"] = ContentType.WWW_FORM_URLENC;
+            }
+
+            HttpRequestOptions requestOptions = CreateHttpRequestOptions("GET", url, headers, token);
+            return SendRequest(requestOptions, middlewares, binaryMode);
         }
 
         /// <summary>
@@ -297,7 +292,7 @@ public HttpResult Post(string url, StringDictionary headers, Auth auth, bool bin
             {
                 headers["Content-Type"] = ContentType.WWW_FORM_URLENC;
             }
-            
+
             addAuthHeaders(ref headers, auth);
 
             string token = auth.CreateManageTokenV2("POST", url, headers);
@@ -314,8 +309,8 @@ public HttpResult Post(string url, StringDictionary headers, Auth auth, bool bin
         /// <returns>HTTP-POST 的响应结果</returns>
         public HttpResult Post(string url, StringDictionary headers, string token, bool binaryMode = false)
         {
-            HttpWebRequest wReq = CreateHttpWebRequest("POST", url, headers, token);
-            return SendRequest(wReq, binaryMode);
+            HttpRequestOptions reqOpts = CreateHttpRequestOptions("POST", url, headers, token);
+            return SendRequest(reqOpts, binaryMode);
         }
 
         /// <summary>
@@ -348,20 +343,16 @@ public HttpResult PostData(string url, byte[] data, string token, bool binaryMod
         /// <returns>HTTP-POST的响应结果</returns>
         public HttpResult PostData(string url, byte[] data, string mimeType, string token, bool binaryMode = false)
         {
-            HttpWebRequest wReq = CreateHttpWebRequest("POST", url, null, token);
+            HttpRequestOptions reqOpts = CreateHttpRequestOptions("POST", url, null, token);
 
-            wReq.ContentType = mimeType;
+            reqOpts.Headers.Add("Content-Type", mimeType);
             if (data != null)
             {
-                wReq.AllowWriteStreamBuffering = true;
-                using (Stream sReq = wReq.GetRequestStream())
-                {
-                    sReq.Write(data, 0, data.Length);
-                    sReq.Flush();
-                }
+                reqOpts.AllowWriteStreamBuffering = true;
+                reqOpts.RequestData = data;
             }
-            
-            return SendRequest(wReq, binaryMode);
+
+            return SendRequest(reqOpts, binaryMode);
         }
 
         /// <summary>
@@ -416,7 +407,8 @@ public HttpResult PostForm(string url, Dictionary<string, string> kvData, string
                 data = string.Join("&",
                     kvData.Select(kvp => Uri.EscapeDataString(kvp.Key) + "=" + Uri.EscapeDataString(kvp.Value)));
             }
-            return PostForm(url, data, token, binaryMode);        }
+            return PostForm(url, data, token, binaryMode);
+        }
 
         /// <summary>
         /// HTTP-POST方法(包含表单数据)
@@ -480,22 +472,18 @@ public HttpResult PostForm(string url, byte[] data, string token, bool binaryMod
         /// <returns>HTTP-POST的响应结果</returns>
         public HttpResult PostForm(string url, StringDictionary headers, byte[] data, string token, bool binaryMode = false)
         {
-            
-            
-            HttpWebRequest wReq = CreateHttpWebRequest("POST", url, headers, token);
-
-            wReq.ContentType = ContentType.WWW_FORM_URLENC;
+            HttpRequestOptions reqOpts = CreateHttpRequestOptions("POST", url, headers, token);
+            if (!reqOpts.Headers.ContainsKey("Content-Type"))
+            {
+                reqOpts.Headers.Add("Content-Type", ContentType.WWW_FORM_URLENC);
+            }
             if (data != null)
             {
-                wReq.AllowWriteStreamBuffering = true;
-                using (Stream sReq = wReq.GetRequestStream())
-                {
-                    sReq.Write(data, 0, data.Length);
-                    sReq.Flush();
-                }
+                reqOpts.AllowWriteStreamBuffering = true;
+                reqOpts.RequestData = data;
             }
-            
-            return SendRequest(wReq, binaryMode);
+
+            return SendRequest(reqOpts, binaryMode);
         }
 
         /// <summary>
@@ -509,21 +497,20 @@ public HttpResult PostForm(string url, StringDictionary headers, byte[] data, st
         /// <returns>HTTP-POST的响应结果</returns>
         public HttpResult PostMultipart(string url, byte[] data, string boundary, string token, bool binaryMode = false)
         {
-            HttpWebRequest wReq = CreateHttpWebRequest("POST", url, null, token);
+            HttpRequestOptions reqOpts = CreateHttpRequestOptions("POST", url, null, token);
 
-            wReq.ContentType = string.Format("{0}; boundary={1}", ContentType.MULTIPART_FORM_DATA, boundary);
+            reqOpts.Headers.Add(
+                "Content-Type",
+                string.Format("{0}; boundary={1}", ContentType.MULTIPART_FORM_DATA, boundary)
+            );
 
             if (data != null)
             {
-                wReq.AllowWriteStreamBuffering = true;
-                using (Stream sReq = wReq.GetRequestStream())
-                {
-                    sReq.Write(data, 0, data.Length);
-                    sReq.Flush();
-                }
+                reqOpts.AllowWriteStreamBuffering = true;
+                reqOpts.RequestData = data;
             }
 
-            return SendRequest(wReq, binaryMode);
+            return SendRequest(reqOpts, binaryMode);
         }
 
         /// <summary>
@@ -543,20 +530,16 @@ public HttpResult PutDataWithHeaders(string url, byte[] data, Dictionary<string,
                 headersDict.Add(kvp.Key, kvp.Value);
             }
 
-            HttpWebRequest wReq = CreateHttpWebRequest("PUT", url, headersDict);
+            HttpRequestOptions wReq = CreateHttpRequestOptions("PUT", url, headersDict);
 
-            wReq.ContentType = ContentType.APPLICATION_OCTET_STREAM;
+            wReq.Headers.Add("Content-Type", ContentType.APPLICATION_OCTET_STREAM);
 
             if (data != null)
             {
                 wReq.AllowWriteStreamBuffering = true;
-                using (Stream sReq = wReq.GetRequestStream())
-                {
-                    sReq.Write(data, 0, data.Length);
-                    sReq.Flush();
-                }
+                wReq.RequestData = data;
             }
-            
+
             return SendRequest(wReq, binaryMode);
         }
 
@@ -591,7 +574,7 @@ private void getHeaders(ref HttpResult hr, HttpWebResponse resp)
                     hr.RefInfo.Add("ContentType", resp.ContentType);
                 }
 
-                hr.RefInfo.Add("ContentLength", resp.ContentLength.ToString());                
+                hr.RefInfo.Add("ContentLength", resp.ContentLength.ToString());
 
                 var headers = resp.Headers;
                 if (headers != null && headers.Count > 0)