Support retrying net task if error is encountered.

kevin-lyn · kevin-lyn · commit c3483c5c980c · 2015-07-14T22:54:11.000+08:00
diff --git a/STNetTaskQueue/STNetTask.h b/STNetTaskQueue/STNetTask.h
@@ -12,9 +12,14 @@
 
 @property (nonatomic, strong) NSError *error;
 @property (nonatomic, assign) BOOL pending;
+@property (nonatomic, assign) NSUInteger retryCount;
 
 - (NSString *)uri;
 - (void)didResponse:(NSObject *)response;
 - (void)didFail;
+- (void)didRetry;
+
+- (NSUInteger)maxRetryCount;
+- (BOOL)shouldRetryForError:(NSError *)error;
 
 @end
diff --git a/STNetTaskQueue/STNetTask.m b/STNetTaskQueue/STNetTask.m
@@ -25,4 +25,19 @@ - (void)didFail
     
 }
 
+- (void)didRetry
+{
+    
+}
+
+- (NSUInteger)maxRetryCount
+{
+    return 0;
+}
+
+- (BOOL)shouldRetryForError:(NSError *)error
+{
+    return YES;
+}
+
 @end
diff --git a/STNetTaskQueue/STNetTaskQueue.m b/STNetTaskQueue/STNetTaskQueue.m
@@ -96,6 +96,17 @@ - (void)cancelTask:(STNetTask *)task
     }];
 }
 
+- (BOOL)retryTask:(STNetTask *)task error:(NSError *)error
+{
+    if ([task shouldRetryForError:error] && task.retryCount < task.maxRetryCount) {
+        task.retryCount++;
+        [task didRetry];
+        [self addTask:task];
+        return YES;
+    }
+    return NO;
+}
+
 - (void)didResponse:(NSObject *)response taskId:(int)taskId
 {
     __weak STNetTaskQueue *weakSelf = self;
@@ -118,7 +129,13 @@ - (void)didResponse:(NSObject *)response taskId:(int)taskId
             NSError *error = [NSError errorWithDomain:STNetTaskQueueErrorUnknown
                                                  code:-1
                                              userInfo:@{ @"msg": @"Unknown Error" }];
+            
+            if ([self retryTask:task error:error]) {
+                return;
+            }
+            
             task.error = error;
+            [task didFail];
         }
         
         [weakSelf netTaskDidEnd:task];
@@ -142,6 +159,10 @@ - (void)didFailWithError:(NSError *)error taskId:(int)taskId
             [weakSelf.tasks removeObjectForKey:@(taskId)];
         }
         
+        if ([self retryTask:task error:error]) {
+            return;
+        }
+        
         task.error = error;
         [task didFail];
         [weakSelf netTaskDidEnd:task];
diff --git a/STNetTaskQueueTest/STNetTaskQueueTest.xcodeproj/project.pbxproj b/STNetTaskQueueTest/STNetTaskQueueTest.xcodeproj/project.pbxproj
diff --git a/STNetTaskQueueTest/STNetTaskQueueTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/STNetTaskQueueTest/STNetTaskQueueTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/STNetTaskQueueTest/STNetTaskQueueTest/Info.plist b/STNetTaskQueueTest/STNetTaskQueueTest/Info.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>me.sth4.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/STNetTaskQueueTest/STNetTaskQueueTest/STNetTaskQueueTest.m b/STNetTaskQueueTest/STNetTaskQueueTest/STNetTaskQueueTest.m
@@ -0,0 +1,57 @@
+//
+//  STNetTaskQueueTest.m
+//  STNetTaskQueueTest
+//
+//  Created by Kevin Lin on 14/7/15.
+//
+//
+
+#import <UIKit/UIKit.h>
+#import <XCTest/XCTest.h>
+#import "STHTTPNetTaskQueueHandler.h"
+#import "STTestRetryNetTask.h"
+
+@interface STNetTaskQueueTest : XCTestCase <STNetTaskDelegate>
+
+@end
+
+@implementation STNetTaskQueueTest
+{
+    XCTestExpectation *_expectation;
+}
+
+- (void)setUp
+{
+    [super setUp];
+    
+    STHTTPNetTaskQueueHandler *httpHandler = [[STHTTPNetTaskQueueHandler alloc] initWithBaseURL:[NSURL URLWithString:@"https://www.google.com"]];
+    [STNetTaskQueue sharedQueue].handler = httpHandler;
+}
+
+- (void)tearDown
+{
+    [super tearDown];
+}
+
+- (void)testRetryNetTask
+{
+    _expectation = [self expectationWithDescription:@"testRetryNetTask"];
+    
+    STTestRetryNetTask *testRetryTask = [STTestRetryNetTask new];
+    [[STNetTaskQueue sharedQueue] addTaskDelegate:self uri:testRetryTask.uri];
+    [[STNetTaskQueue sharedQueue] addTask:testRetryTask];
+    
+    [self waitForExpectationsWithTimeout:10 handler:nil];
+}
+
+- (void)netTaskDidEnd:(STNetTask *)task
+{
+    if ([task isKindOfClass:[STTestRetryNetTask class]]) {
+        [_expectation fulfill];
+        if (task.retryCount != task.maxRetryCount) {
+            XCTFail(@"testRetryNetTask failed");
+        }
+    }
+}
+
+@end
diff --git a/STNetTaskQueueTest/STNetTaskQueueTest/STTestRetryNetTask.h b/STNetTaskQueueTest/STNetTaskQueueTest/STTestRetryNetTask.h
@@ -0,0 +1,13 @@
+//
+//  STTestRetryNetTask.h
+//  STNetTaskQueueTest
+//
+//  Created by Kevin Lin on 14/7/15.
+//
+//
+
+#import "STHTTPNetTask.h"
+
+@interface STTestRetryNetTask : STHTTPNetTask
+
+@end
diff --git a/STNetTaskQueueTest/STNetTaskQueueTest/STTestRetryNetTask.m b/STNetTaskQueueTest/STNetTaskQueueTest/STTestRetryNetTask.m
@@ -0,0 +1,28 @@
+//
+//  STTestRetryNetTask.m
+//  STNetTaskQueueTest
+//
+//  Created by Kevin Lin on 14/7/15.
+//
+//
+
+#import "STTestRetryNetTask.h"
+
+@implementation STTestRetryNetTask
+
+- (NSString *)uri
+{
+    return @"nonexist_uri";
+}
+
+- (void)didRetry
+{
+    NSLog(@"retryCount: %ld", self.retryCount);
+}
+
+- (NSUInteger)maxRetryCount
+{
+    return 5;
+}
+
+@end
