Merge pull request #42 from longbai/ip_backup

longbai · longbai · commit 245033e0136f · 2015-05-25T00:38:48.000+08:00
ip_backup
diff --git a/QiniuSDK.xcodeproj/xcshareddata/xcschemes/QiniuSDK Mac.xcscheme b/QiniuSDK.xcodeproj/xcshareddata/xcschemes/QiniuSDK Mac.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0510"
+   LastUpgradeVersion = "0630"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/QiniuSDK.xcodeproj/xcshareddata/xcschemes/QiniuSDK iOS.xcscheme b/QiniuSDK.xcodeproj/xcshareddata/xcschemes/QiniuSDK iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0510"
+   LastUpgradeVersion = "0630"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/QiniuSDK/Http/QNDns.h b/QiniuSDK/Http/QNDns.h
@@ -14,4 +14,6 @@
 
 + (NSString *)getAddressesString:(NSString *)hostName;
 
++ (NSString *)getAddress:(NSString *)hostName;
+
 @end
diff --git a/QiniuSDK/Http/QNDns.m b/QiniuSDK/Http/QNDns.m
@@ -54,6 +54,14 @@ + (NSArray *)getAddresses:(NSString *)hostName {
 	return ret;
 }
 
++ (NSString *)getAddress:(NSString *)hostName {
+	NSArray *result = [QNDns getAddresses:hostName];
+	if (result == nil || result.count == 0) {
+		return @"";
+	}
+	return result[0];
+}
+
 + (NSString *)getAddressesString:(NSString *)hostName {
 	NSArray *result = [QNDns getAddresses:hostName];
 	if (result == nil || result.count == 0) {
diff --git a/QiniuSDK/Http/QNHttpManager.h b/QiniuSDK/Http/QNHttpManager.h
@@ -14,7 +14,8 @@
 @interface QNHttpManager : NSObject <QNHttpDelegate>
 
 - (instancetype)initWithTimeout:(UInt32)timeout
-                   urlConverter:(QNUrlConvert)converter;
+                   urlConverter:(QNUrlConvert)converter
+                       backupIp:(NSString *)ip;
 
 - (void)multipartPost:(NSString *)url
              withData:(NSData *)data
diff --git a/QiniuSDK/Http/QNHttpManager.m b/QiniuSDK/Http/QNHttpManager.m
@@ -12,35 +12,40 @@
 #import "QNHttpManager.h"
 #import "QNUserAgent.h"
 #import "QNResponseInfo.h"
+#import "QNDns.h"
 
 @interface QNHttpManager ()
 @property (nonatomic) AFHTTPRequestOperationManager *httpManager;
 @property UInt32 timeout;
 @property (nonatomic, strong) QNUrlConvert converter;
+@property (nonatomic) NSString *backupIp;
 @end
 
 @implementation QNHttpManager
 
 - (instancetype)initWithTimeout:(UInt32)timeout
-                   urlConverter:(QNUrlConvert)converter {
+                   urlConverter:(QNUrlConvert)converter
+                       backupIp:(NSString *)ip {
 	if (self = [super init]) {
 		_httpManager = [[AFHTTPRequestOperationManager alloc] init];
 		_httpManager.responseSerializer = [AFJSONResponseSerializer serializer];
 		_timeout = timeout;
 		_converter = converter;
+		_backupIp = ip;
 	}
 
 	return self;
 }
 
 - (instancetype)init {
-	return [self initWithTimeout:60 urlConverter:nil];
+	return [self initWithTimeout:60 urlConverter:nil backupIp:nil];
 }
 
 + (QNResponseInfo *)buildResponseInfo:(AFHTTPRequestOperation *)operation
                             withError:(NSError *)error
                          withDuration:(double)duration
-                         withResponse:(id)responseObject {
+                         withResponse:(id)responseObject
+                               withIp:(NSString *)ip {
 	QNResponseInfo *info;
 	NSString *host = operation.request.URL.host;
 
@@ -53,7 +58,7 @@ + (QNResponseInfo *)buildResponseInfo:(AFHTTPRequestOperation *)operation
 		if (xvia == nil) {
 			xvia = headers[@"X-Px"];
 		}
-		info = [[QNResponseInfo alloc] init:status withReqId:reqId withXLog:xlog withXVia:xvia withHost:host withDuration:duration withBody:responseObject];
+		info = [[QNResponseInfo alloc] init:status withReqId:reqId withXLog:xlog withXVia:xvia withHost:host withIp:ip withDuration:duration withBody:responseObject];
 	}
 	else {
 		info = [QNResponseInfo responseInfoWithNetError:error host:host duration:duration];
@@ -64,12 +69,35 @@ + (QNResponseInfo *)buildResponseInfo:(AFHTTPRequestOperation *)operation
 - (void)  sendRequest:(NSMutableURLRequest *)request
     withCompleteBlock:(QNCompleteBlock)completeBlock
     withProgressBlock:(QNInternalProgressBlock)progressBlock {
+	NSString *u = request.URL.absoluteString;
+	NSURL *url = request.URL;
+	__block NSString *ip = nil;
+	if (_converter != nil) {
+		url = [[NSURL alloc] initWithString:_converter(u)];
+	}
+	else {
+		if (_backupIp != nil && ![_backupIp isEqualToString:@""]) {
+			NSString *host = url.host;
+			ip = [QNDns getAddress:host];
+			if ([ip isEqualToString:@""]) {
+				ip = _backupIp;
+			}
+			NSString *path = url.path;
+			if (path == nil || [@"" isEqualToString:path]) {
+				path = @"/";
+			}
+			url = [[NSURL alloc] initWithScheme:url.scheme host:ip path:path];
+			[request setValue:host forHTTPHeaderField:@"Host"];
+		}
+	}
+	request.URL = url;
+
 	__block NSDate *startTime = [NSDate date];
 	AFHTTPRequestOperation *operation = [_httpManager
 	                                     HTTPRequestOperationWithRequest:request
 	                                                             success: ^(AFHTTPRequestOperation *operation, id responseObject) {
 	    double duration = [[NSDate date] timeIntervalSinceDate:startTime];
-	    QNResponseInfo *info = [QNHttpManager buildResponseInfo:operation withError:nil withDuration:duration withResponse:operation.responseData];
+	    QNResponseInfo *info = [QNHttpManager buildResponseInfo:operation withError:nil withDuration:duration withResponse:operation.responseData withIp:ip];
 	    NSDictionary *resp = nil;
 	    if (info.isOK) {
 	        resp = responseObject;
@@ -78,11 +106,10 @@ - (void)  sendRequest:(NSMutableURLRequest *)request
 	    completeBlock(info, resp);
 	}                                                                failure: ^(AFHTTPRequestOperation *operation, NSError *error) {
 	    double duration = [[NSDate date] timeIntervalSinceDate:startTime];
-	    QNResponseInfo *info = [QNHttpManager buildResponseInfo:operation withError:error withDuration:duration withResponse:operation.responseData];
+	    QNResponseInfo *info = [QNHttpManager buildResponseInfo:operation withError:error withDuration:duration withResponse:operation.responseData withIp:ip];
 	    NSLog(@"failure %@", info);
 	    completeBlock(info, nil);
 	}
-
 	    ];
 
 	if (progressBlock) {
@@ -105,9 +132,6 @@ - (void)multipartPost:(NSString *)url
     withCompleteBlock:(QNCompleteBlock)completeBlock
     withProgressBlock:(QNInternalProgressBlock)progressBlock
       withCancelBlock:(QNCancelBlock)cancelBlock {
-	if (_converter != nil) {
-		url = _converter(url);
-	}
 	NSMutableURLRequest *request = [_httpManager.requestSerializer
 	                                multipartFormRequestWithMethod:@"POST"
 	                                                     URLString:url
@@ -129,10 +153,6 @@ - (void)         post:(NSString *)url
     withCompleteBlock:(QNCompleteBlock)completeBlock
     withProgressBlock:(QNInternalProgressBlock)progressBlock
       withCancelBlock:(QNCancelBlock)cancelBlock {
-	if (_converter != nil) {
-		url = _converter(url);
-	}
-
 	NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[[NSURL alloc] initWithString:url]];
 	if (headers) {
 		[request setAllHTTPHeaderFields:headers];
diff --git a/QiniuSDK/Http/QNResponseInfo.h b/QiniuSDK/Http/QNResponseInfo.h
@@ -159,6 +159,7 @@ extern const int kQNFileError;
             withXLog:(NSString *)xlog
             withXVia:(NSString *)xvia
             withHost:(NSString *)host
+              withIp:(NSString *)ip
         withDuration:(double)duration
             withBody:(NSData *)body;
 
diff --git a/QiniuSDK/Http/QNResponseInfo.m b/QiniuSDK/Http/QNResponseInfo.m
@@ -122,6 +122,7 @@ - (instancetype)init:(int)status
             withXLog:(NSString *)xlog
             withXVia:(NSString *)xvia
             withHost:(NSString *)host
+              withIp:(NSString *)ip
         withDuration:(double)duration
             withBody:(NSData *)body {
 	if (self = [super init]) {
@@ -131,6 +132,7 @@ - (instancetype)init:(int)status
 		_xvia = [xvia copy];
 		_host = [host copy];
 		_duration = duration;
+		_serverIp = ip;
 		if (status != 200) {
 			if (body == nil) {
 				_error = [[NSError alloc] initWithDomain:domain code:_statusCode userInfo:nil];
@@ -158,7 +160,7 @@ - (instancetype)init:(int)status
 }
 
 - (NSString *)description {
-	return [NSString stringWithFormat:@"<%@: %p, status: %d, requestId: %@, xlog: %@, xvia: %@, host: %@ duration:%f s error: %@>", NSStringFromClass([self class]), self, _statusCode, _reqId, _xlog, _xvia, _host, _duration, _error];
+	return [NSString stringWithFormat:@"<%@: %p, status: %d, requestId: %@, xlog: %@, xvia: %@, host: %@ ip: %@ duration:%f s error: %@>", NSStringFromClass([self class]), self, _statusCode, _reqId, _xlog, _xvia, _host, _serverIp, _duration, _error];
 }
 
 - (BOOL)isCancelled {
diff --git a/QiniuSDK/Http/QNSessionManager.h b/QiniuSDK/Http/QNSessionManager.h
@@ -9,7 +9,8 @@
 
 - (instancetype)initWithProxy:(NSDictionary *)proxyDict
                       timeout:(UInt32)timeout
-                 urlConverter:(QNUrlConvert)converter;
+                 urlConverter:(QNUrlConvert)converter
+                     backupIp:(NSString *)ip;
 
 - (void)multipartPost:(NSString *)url
              withData:(NSData *)data
diff --git a/QiniuSDK/Http/QNSessionManager.m b/QiniuSDK/Http/QNSessionManager.m
@@ -13,6 +13,7 @@
 #import "QNUserAgent.h"
 #import "QNResponseInfo.h"
 #import "QNAsyncRun.h"
+#import "QNDns.h"
 
 #if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
 
@@ -55,36 +56,45 @@ @interface QNSessionManager ()
 @property (nonatomic) AFHTTPSessionManager *httpManager;
 @property UInt32 timeout;
 @property (nonatomic, strong) QNUrlConvert converter;
+@property (nonatomic) NSString *backupIp;
+@property bool noProxy;
 @end
 
 @implementation QNSessionManager
 
 - (instancetype)initWithProxy:(NSDictionary *)proxyDict
                       timeout:(UInt32)timeout
-                 urlConverter:(QNUrlConvert)converter {
+                 urlConverter:(QNUrlConvert)converter
+                     backupIp:(NSString *)ip {
 	if (self = [super init]) {
 		NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
 		if (proxyDict != nil) {
 			configuration.connectionProxyDictionary = proxyDict;
+			_noProxy = NO;
+		}
+		else {
+			_noProxy = YES;
 		}
 		_httpManager = [[AFHTTPSessionManager alloc] initWithSessionConfiguration:configuration];
 		_httpManager.responseSerializer = [AFHTTPResponseSerializer serializer];
 		_timeout = timeout;
 		_converter = converter;
+		_backupIp = ip;
 	}
 
 	return self;
 }
 
 - (instancetype)init {
-	return [self initWithProxy:nil timeout:60 urlConverter:nil];
+	return [self initWithProxy:nil timeout:60 urlConverter:nil backupIp:nil];
 }
 
 + (QNResponseInfo *)buildResponseInfo:(NSHTTPURLResponse *)response
                             withError:(NSError *)error
                          withDuration:(double)duration
                          withResponse:(NSData *)body
-                             withHost:(NSString *)host {
+                             withHost:(NSString *)host
+                               withIp:(NSString *)ip {
 	QNResponseInfo *info;
 
 	if (response) {
@@ -99,7 +109,7 @@ + (QNResponseInfo *)buildResponseInfo:(NSHTTPURLResponse *)response
 		if (xvia == nil) {
 			xvia = headers[@"Fw-Via"];
 		}
-		info = [[QNResponseInfo alloc] init:status withReqId:reqId withXLog:xlog withXVia:xvia withHost:host withDuration:duration withBody:body];
+		info = [[QNResponseInfo alloc] init:status withReqId:reqId withXLog:xlog withXVia:xvia withHost:host withIp:ip withDuration:duration withBody:body];
 	}
 	else {
 		info = [QNResponseInfo responseInfoWithNetError:error host:host duration:duration];
@@ -113,6 +123,30 @@ - (void)  sendRequest:(NSMutableURLRequest *)request
 	__block NSDate *startTime = [NSDate date];
 	NSProgress *progress = nil;
 	__block NSString *host = request.URL.host;
+	__block NSString *ip = nil;
+	NSString *u = request.URL.absoluteString;
+	NSURL *url = request.URL;
+	if (_converter != nil) {
+		url = [[NSURL alloc] initWithString:_converter(u)];
+		host = url.host;
+	}
+	else {
+		if (_noProxy && _backupIp != nil && ![_backupIp isEqualToString:@""]) {
+			NSString *host = url.host;
+			ip = [QNDns getAddress:host];
+			if ([ip isEqualToString:@""]) {
+				ip = _backupIp;
+			}
+			NSString *path = url.path;
+			if (path == nil || [@"" isEqualToString:path]) {
+				path = @"/";
+			}
+			url = [[NSURL alloc] initWithScheme:url.scheme host:ip path:path];
+			NSLog(@"%@", url);
+			[request setValue:host forHTTPHeaderField:@"Host"];
+		}
+	}
+	request.URL = url;
 
 	if (progressBlock == nil) {
 		progressBlock = ^(long long totalBytesWritten, long long totalBytesExpectedToWrite) {
@@ -127,14 +161,14 @@ - (void)  sendRequest:(NSMutableURLRequest *)request
 	    QNResponseInfo *info;
 	    NSDictionary *resp = nil;
 	    if (error == nil) {
-	        info = [QNSessionManager buildResponseInfo:httpResponse withError:nil withDuration:duration withResponse:data withHost:host];
+	        info = [QNSessionManager buildResponseInfo:httpResponse withError:nil withDuration:duration withResponse:data withHost:host withIp:ip];
 	        if (info.isOK) {
 	            NSError *tmp;
 	            resp = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableLeaves error:&tmp];
 			}
 		}
 	    else {
-	        info = [QNSessionManager buildResponseInfo:httpResponse withError:error withDuration:duration withResponse:data withHost:host];
+	        info = [QNSessionManager buildResponseInfo:httpResponse withError:error withDuration:duration withResponse:data withHost:host withIp:ip];
 		}
 
 	    if (delegate.progress != nil) {
@@ -163,10 +197,6 @@ - (void)multipartPost:(NSString *)url
     withCompleteBlock:(QNCompleteBlock)completeBlock
     withProgressBlock:(QNInternalProgressBlock)progressBlock
       withCancelBlock:(QNCancelBlock)cancelBlock {
-	if (_converter != nil) {
-		url = _converter(url);
-	}
-
 	NSMutableURLRequest *request = [_httpManager.requestSerializer
 	                                multipartFormRequestWithMethod:@"POST"
 	                                                     URLString:url
@@ -188,10 +218,6 @@ - (void)         post:(NSString *)url
     withCompleteBlock:(QNCompleteBlock)completeBlock
     withProgressBlock:(QNInternalProgressBlock)progressBlock
       withCancelBlock:(QNCancelBlock)cancelBlock {
-	if (_converter != nil) {
-		url = _converter(url);
-	}
-
 	NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[[NSURL alloc] initWithString:url]];
 	if (headers) {
 		[request setAllHTTPHeaderFields:headers];
diff --git a/QiniuSDK/Storage/QNConfiguration.m b/QiniuSDK/Storage/QNConfiguration.m
@@ -22,7 +22,7 @@ - (instancetype)initWithBuilder:(QNConfigurationBuilder *)builder {
 	if (self = [super init]) {
 		_upHost = builder.zone.upHost;
 		_upHostBackup = builder.zone.upHostBackup;
-		_upIp = builder.zone.upIp;
+
 		_chunkSize = builder.chunkSize;
 		_putThreshold = builder.putThreshold;
 		_retryMax = builder.retryMax;
@@ -34,6 +34,9 @@ - (instancetype)initWithBuilder:(QNConfigurationBuilder *)builder {
 		_proxy = builder.proxy;
 
 		_converter = builder.converter;
+		if (builder.converter == nil) {
+			_upIp = builder.zone.upIp;
+		}
 	}
 	return self;
 }
diff --git a/QiniuSDK/Storage/QNUploadManager.m b/QiniuSDK/Storage/QNUploadManager.m
@@ -74,14 +74,14 @@ - (instancetype)initWithConfiguration:(QNConfiguration *)config {
 		}
 	#endif
 		if (lowVersion) {
-			_httpManager = [[QNHttpManager alloc] initWithTimeout:config.timeoutInterval urlConverter:config.converter];
+			_httpManager = [[QNHttpManager alloc] initWithTimeout:config.timeoutInterval urlConverter:config.converter backupIp:config.upIp];
 		}
 		else {
 			_httpManager = [[QNSessionManager alloc] initWithProxy:config.proxy timeout:config.timeoutInterval
-			                                          urlConverter:config.converter];
+			                                          urlConverter:config.converter backupIp:config.upIp];
 		}
 #else
-		_httpManager = [[QNHttpManager alloc] initWithTimeout:config.timeoutInterval urlConverter:config.converter];
+		_httpManager = [[QNHttpManager alloc] initWithTimeout:config.timeoutInterval urlConverter:config.converter backupIp:config.upIp];
 #endif
 	}
 	return self;
diff --git a/QiniuSDKTests/QNHttpTest.m b/QiniuSDKTests/QNHttpTest.m
diff --git a/QiniuSDKTests/QNSessionTest.m b/QiniuSDKTests/QNSessionTest.m
