session progress

Author: longbai

QiniuSDK.xcodeproj/project.pbxproj

@@ -109,6 +109,8 @@
 		DFF525341A6235D100D02BA1 /* QNSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DFF525301A6235D100D02BA1 /* QNSessionManager.m */; };
 		DFF525351A6235D100D02BA1 /* QNSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DFF525301A6235D100D02BA1 /* QNSessionManager.m */; };
 		DFF525371A626A3700D02BA1 /* QNhttpDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = DFF525361A626A3700D02BA1 /* QNhttpDelegate.h */; };
+		DFF525391A64079B00D02BA1 /* QNSessionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DFF525381A64079B00D02BA1 /* QNSessionTest.m */; };
+		DFF5253A1A64079B00D02BA1 /* QNSessionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DFF525381A64079B00D02BA1 /* QNSessionTest.m */; };
 		DFFE0E6019E6575600D7A0FC /* QNFileRecorderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DFFE0E5F19E6575600D7A0FC /* QNFileRecorderTest.m */; };
 		DFFE0E6119E6575600D7A0FC /* QNFileRecorderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DFFE0E5F19E6575600D7A0FC /* QNFileRecorderTest.m */; };
 		EE76B381AF33E356C2C8FC56 /* libPods-QiniuSDK MacTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EB0B4B6BA4EEC2DEF421644 /* libPods-QiniuSDK MacTests.a */; };
@@ -190,6 +192,7 @@
 		DFF5252F1A6235D100D02BA1 /* QNSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QNSessionManager.h; sourceTree = "<group>"; };
 		DFF525301A6235D100D02BA1 /* QNSessionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNSessionManager.m; sourceTree = "<group>"; };
 		DFF525361A626A3700D02BA1 /* QNhttpDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QNhttpDelegate.h; sourceTree = "<group>"; };
+		DFF525381A64079B00D02BA1 /* QNSessionTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNSessionTest.m; sourceTree = "<group>"; };
 		DFFE0E5F19E6575600D7A0FC /* QNFileRecorderTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNFileRecorderTest.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -361,6 +364,7 @@
 				DFA9B65E19E391A100A15FD1 /* QNTestConfig.h */,
 				DFFE0E5F19E6575600D7A0FC /* QNFileRecorderTest.m */,
 				DF609A001A5839B400AC7297 /* QNDnsTest.m */,
+				DFF525381A64079B00D02BA1 /* QNSessionTest.m */,
 			);
 			path = QiniuSDKTests;
 			sourceTree = SOURCE_ROOT;
@@ -711,6 +715,7 @@
 				DF2CDE8319DAF67F00CE01FB /* QNCrc32.m in Sources */,
 				DF293C9719DB865800799011 /* QNCrc32Test.m in Sources */,
 				DFA9B64519DFE43500A15FD1 /* QNTempFile.m in Sources */,
+				DFF525391A64079B00D02BA1 /* QNSessionTest.m in Sources */,
 				DF609A071A58E39D00AC7297 /* QNFormUpload.m in Sources */,
 				DFF525331A6235D100D02BA1 /* QNSessionManager.m in Sources */,
 				DFA9B63F19DFD8C900A15FD1 /* QNEtagTest.m in Sources */,
@@ -764,6 +769,7 @@
 				DF2CDE7719DAF65800CE01FB /* QNCrc32.m in Sources */,
 				DF293C9819DB865800799011 /* QNCrc32Test.m in Sources */,
 				DFA9B64619DFE43500A15FD1 /* QNTempFile.m in Sources */,
+				DFF5253A1A64079B00D02BA1 /* QNSessionTest.m in Sources */,
 				DF609A091A58E39D00AC7297 /* QNFormUpload.m in Sources */,
 				DFF525351A6235D100D02BA1 /* QNSessionManager.m in Sources */,
 				DFA9B64019DFD8C900A15FD1 /* QNEtagTest.m in Sources */,

QiniuSDK/Http/QNSessionManager.m

@@ -35,7 +35,7 @@ - (instancetype)initWithProxy:(NSDictionary *)proxyDict {
 			configuration.connectionProxyDictionary = proxyDict;
 		}
 		_httpManager = [[AFHTTPSessionManager alloc] initWithSessionConfiguration:configuration];
-		_httpManager.responseSerializer = [AFJSONResponseSerializer serializer];
+		_httpManager.responseSerializer = [AFHTTPResponseSerializer serializer];
 	}
 
 	return self;
@@ -44,7 +44,7 @@ - (instancetype)initWithProxy:(NSDictionary *)proxyDict {
 + (QNResponseInfo *)buildResponseInfo:(NSHTTPURLResponse *)response
                             withError:(NSError *)error
                          withDuration:(double)duration
-                         withResponse:(id)responseObject
+                         withResponse:(NSData *)body
                              withHost:(NSString *)host {
 	QNResponseInfo *info;
 
@@ -53,7 +53,7 @@ + (QNResponseInfo *)buildResponseInfo:(NSHTTPURLResponse *)response
 		NSString *reqId = headers[@"X-Reqid"];
 		NSString *xlog = headers[@"X-Log"];
 		int status =  (int)[response statusCode];
-		info = [[QNResponseInfo alloc] init:status withReqId:reqId withXLog:xlog withHost:host withDuration:duration withBody:responseObject];
+		info = [[QNResponseInfo alloc] init:status withReqId:reqId withXLog:xlog withHost:host withDuration:duration withBody:body];
 	}
 	else {
 		info = [QNResponseInfo responseInfoWithNetError:error host:host duration:duration];
@@ -67,22 +67,27 @@ - (void)  sendRequest:(NSMutableURLRequest *)request
 	__block NSDate *startTime = [NSDate date];
 	NSProgress *progress = nil;
 	__block NSString *host = request.URL.host;
+
 	NSURLSessionUploadTask *uploadTask = [_httpManager uploadTaskWithStreamedRequest:request progress:&progress completionHandler: ^(NSURLResponse *response, id responseObject, NSError *error) {
+	    NSData *data = responseObject;
 	    NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
 	    double duration = [[NSDate date] timeIntervalSinceDate:startTime];
 	    QNResponseInfo *info;
 	    NSDictionary *resp = nil;
 	    if (error == nil) {
-	        info = [QNSessionManager buildResponseInfo:httpResponse withError:nil withDuration:duration withResponse:responseObject withHost:host];
+	        info = [QNSessionManager buildResponseInfo:httpResponse withError:nil withDuration:duration withResponse:data withHost:host];
 	        if (info.isOK) {
-	            resp = responseObject;
+	            NSError *tmp;
+	            resp = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableLeaves error:&tmp];
 			}
 		}
 	    else {
-	        info = [QNSessionManager buildResponseInfo:httpResponse withError:error withDuration:duration withResponse:responseObject withHost:host];
+	        info = [QNSessionManager buildResponseInfo:httpResponse withError:error withDuration:duration withResponse:data withHost:host];
 		}
+	    [progress removeObserver:self forKeyPath:@"fractionCompleted" context:(__bridge void *)(progressBlock)];
 	    completeBlock(info, resp);
 	}];
+	[progress addObserver:self forKeyPath:@"fractionCompleted" options:NSKeyValueObservingOptionNew context:(__bridge void *)(progressBlock)];
 
 	[request setTimeoutInterval:kQNTimeoutInterval];
 
@@ -91,6 +96,19 @@ - (void)  sendRequest:(NSMutableURLRequest *)request
 	[uploadTask resume];
 }
 
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
+	if ([keyPath isEqualToString:@"fractionCompleted"]) {
+		NSProgress *progress = (NSProgress *)object;
+		QNInternalProgressBlock progressBlock = (__bridge QNInternalProgressBlock)context;
+		if (progress != nil && progressBlock != nil) {
+			progressBlock(progress.completedUnitCount, progress.totalUnitCount);
+		}
+	}
+	else {
+		[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+	}
+}
+
 - (void)multipartPost:(NSString *)url
              withData:(NSData *)data
            withParams:(NSDictionary *)params

QiniuSDK/Storage/QNFormUpload.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "QNUploadManager.h"
+#import "QNhttpDelegate.h"
 
 @class QNHttpManager;
 @interface QNFormUpload : NSObject
@@ -17,7 +18,7 @@
                    withToken:(NSString *)token
        withCompletionHandler:(QNUpCompletionHandler)block
                   withOption:(QNUploadOption *)option
-             withHttpManager:(QNHttpManager *)http;
+             withHttpManager:(id <QNHttpDelegate> )http;
 
 - (void)put;
 

QiniuSDK/Storage/QNFormUpload.m

@@ -19,7 +19,7 @@
 @interface QNFormUpload ()
 
 @property (nonatomic, strong) NSData *data;
-@property (nonatomic, strong) QNHttpManager *httpManager;
+@property (nonatomic, strong) id <QNHttpDelegate> httpManager;
 @property (nonatomic) int retryTimes;
 @property (nonatomic, strong) NSString *key;
 @property (nonatomic, strong) NSString *token;
@@ -36,7 +36,7 @@ - (instancetype)initWithData:(NSData *)data
                    withToken:(NSString *)token
        withCompletionHandler:(QNUpCompletionHandler)block
                   withOption:(QNUploadOption *)option
-             withHttpManager:(QNHttpManager *)http {
+             withHttpManager:(id <QNHttpDelegate> )http {
 	if (self = [super init]) {
 		_data = data;
 		_key = key;

QiniuSDK/Storage/QNResumeUpload.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "QNUploadManager.h"
+#import "QNhttpDelegate.h"
 
 @class QNHttpManager;
 @interface QNResumeUpload : NSObject
@@ -21,7 +22,7 @@
               withModifyTime:(NSDate *)time
                 withRecorder:(id <QNRecorderDelegate> )recorder
              withRecorderKey:(NSString *)recorderKey
-             withHttpManager:(QNHttpManager *)http;
+             withHttpManager:(id <QNHttpDelegate> )http;
 
 - (void)run;
 

QiniuSDK/Storage/QNResumeUpload.m

@@ -67,7 +67,7 @@ - (instancetype)initWithData:(NSData *)data
               withModifyTime:(NSDate *)time
                 withRecorder:(id <QNRecorderDelegate> )recorder
              withRecorderKey:(NSString *)recorderKey
-             withHttpManager:(QNHttpManager *)http {
+             withHttpManager:(id <QNHttpDelegate> )http {
 	if (self = [super init]) {
 		_data = data;
 		_size = size;
@@ -77,7 +77,7 @@ - (instancetype)initWithData:(NSData *)data
 		_complete = block;
 		_headers = @{ @"Authorization":tok, @"Content-Type":@"application/octet-stream" };
 		_recorder = recorder;
-		_httpManager = [[QNHttpManager alloc] init];
+		_httpManager = http;
 		if (time != nil) {
 			_modifyTime = [time timeIntervalSince1970];
 		}

QiniuSDK/Storage/QNUploadManager.m

@@ -45,7 +45,25 @@ - (instancetype)initWithRecorder:(id <QNRecorderDelegate> )recorder
                            proxy:(NSDictionary *)proxyDict {
 	if (self = [super init]) {
 #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)
-		_httpManager = [[QNSessionManager alloc] initWithProxy:proxyDict];
+		BOOL lowVersion = NO;
+	#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED)
+		float sysVersion = [[[UIDevice currentDevice] systemVersion] floatValue];
+		if (sysVersion < 7.0) {
+			lowVersion = YES;
+		}
+	#else
+		NSOperatingSystemVersion sysVersion = [[NSProcessInfo processInfo] operatingSystemVersion];
+
+		if ((sysVersion.majorVersion = 10 && sysVersion.minorVersion < 9)) {
+			lowVersion = YES;
+		}
+	#endif
+		if (lowVersion) {
+			_httpManager = [[QNHttpManager alloc] init];
+		}
+		else {
+			_httpManager = [[QNSessionManager alloc] initWithProxy:proxyDict];
+		}
 #else
 		_httpManager = [[QNHttpManager alloc] init];
 #endif

QiniuSDKTests/QNSessionTest.m

@@ -0,0 +1,88 @@
+//
+//  QNHttpTest.m
+//  QiniuSDK
+//
+//  Created by bailong on 14/10/3.
+//  Copyright (c) 2014年 Qiniu. All rights reserved.
+//
+
+#import <Foundation/Foundation.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)
+#import <XCTest/XCTest.h>
+
+#import <AGAsyncTestHelper.h>
+
+#import "QNSessionManager.h"
+#import "QNResponseInfo.h"
+
+@interface QNSessionTest : XCTestCase
+@property QNSessionManager *httpManager;
+@end
+
+@implementation QNSessionTest
+
+- (void)setUp {
+    [super setUp];
+    _httpManager = [[QNSessionManager alloc] initWithProxy:nil];
+}
+
+- (void)tearDown {
+    [super tearDown];
+}
+
+- (void)testPost {
+    __block QNResponseInfo *testInfo = nil;
+    NSData *data = [@"Hello, World!" dataUsingEncoding : NSUTF8StringEncoding];
+    [_httpManager post:@"http://www.baidu.com" withData:data withParams:nil withHeaders:nil withCompleteBlock: ^(QNResponseInfo *info, NSDictionary *resp) {
+        testInfo = info;
+    } withProgressBlock:nil withCancelBlock:nil];
+    AGWW_WAIT_WHILE(testInfo == nil, 100.0);
+    NSLog(@"%@", testInfo);
+    
+    XCTAssert(testInfo.reqId == nil, @"Pass");
+    
+    testInfo = nil;
+    
+    [_httpManager post:@"http://up.qiniu.com" withData:nil withParams:nil withHeaders:nil withCompleteBlock: ^(QNResponseInfo *info, NSDictionary *resp) {
+        testInfo = info;
+    } withProgressBlock:nil withCancelBlock:nil];
+    
+    AGWW_WAIT_WHILE(testInfo == nil, 100.0);
+    NSLog(@"%@", testInfo);
+    XCTAssert(testInfo.reqId, @"Pass");
+    
+    testInfo = nil;
+    [_httpManager post:@"http://httpbin.org/status/500" withData:nil withParams:nil withHeaders:nil withCompleteBlock: ^(QNResponseInfo *info, NSDictionary *resp) {
+        testInfo = info;
+    } withProgressBlock:nil withCancelBlock:nil];
+    
+    AGWW_WAIT_WHILE(testInfo == nil, 100.0);
+    NSLog(@"%@", testInfo);
+    XCTAssert(testInfo.statusCode == 500, @"Pass");
+    XCTAssert(testInfo.error != nil, @"Pass");
+    
+    testInfo = nil;
+    [_httpManager post:@"http://httpbin.org/status/418" withData:nil withParams:nil withHeaders:nil withCompleteBlock: ^(QNResponseInfo *info, NSDictionary *resp) {
+        testInfo = info;
+    } withProgressBlock:nil withCancelBlock:nil];
+    
+    AGWW_WAIT_WHILE(testInfo == nil, 100.0);
+    NSLog(@"%@", testInfo);
+    XCTAssert(testInfo.statusCode == 418, @"Pass");
+    XCTAssert(testInfo.error != nil, @"Pass");
+    
+    testInfo = nil;
+    [_httpManager post:@"http://httpbin.org/status/200" withData:nil withParams:nil withHeaders:nil withCompleteBlock: ^(QNResponseInfo *info, NSDictionary *resp) {
+        testInfo = info;
+    } withProgressBlock:nil withCancelBlock:nil];
+    
+    AGWW_WAIT_WHILE(testInfo == nil, 100.0);
+    NSLog(@"%@", testInfo);
+    XCTAssert(testInfo.statusCode == 200, @"Pass");
+    XCTAssert(!testInfo.isOK, @"Pass");
+    XCTAssert(testInfo.error != nil, @"Pass");
+}
+
+@end
+
+#endif