Use block in STNetTaskQueue for switching thread.

Use map table for mapping net task to session task.

Author: kevin-lyn

STNetTaskQueue/STHTTPNetTask.m

@@ -15,12 +15,6 @@
 NSString *const STHTTPNetTaskErrorResponseDataUserInfoKey = @"responseData";
 NSString *STHTTPNetTaskRequestObjectDefaultSeparator = @"_";
 
-@interface STHTTPNetTask ()
-
-@property (nonatomic, strong) NSURLSessionTask *sessionTask;
-
-@end
-
 @implementation STHTTPNetTask
 
 - (STHTTPNetTaskMethod)method

STNetTaskQueue/STHTTPNetTaskQueueHandler.m

@@ -78,11 +78,12 @@ - (STHTTPNetTaskQueueHandlerOperation *)operation
 static NSDictionary *STHTTPNetTaskMethodMap;
 static NSDictionary *STHTTPNetTaskContentTypeMap;
 static NSString *STHTTPNetTaskFormDataBoundary;
+static NSMapTable *STHTTPNetTaskToSessionTask;
 
 @interface STHTTPNetTaskQueueHandlerOperation : NSObject <NSURLSessionDataDelegate>
 
 @property (nonatomic, strong) STNetTaskQueue *queue;
-@property (nonatomic, weak) STHTTPNetTask *task;
+@property (nonatomic, strong) STHTTPNetTask *task;
 @property (nonatomic, strong) NSURLSession *session;
 @property (nonatomic, strong) NSURL *baseURL;
 
@@ -106,6 +107,7 @@ + (void)load
     STHTTPNetTaskContentTypeMap = @{ @(STHTTPNetTaskRequestJSON): @"application/json; charset=utf-8",
                                      @(STHTTPNetTaskRequestKeyValueString): @"application/x-www-form-urlencoded" };
     STHTTPNetTaskFormDataBoundary = [NSString stringWithFormat:@"ST-Boundary-%@", [[NSUUID UUID] UUIDString]];
+    STHTTPNetTaskToSessionTask = [[NSMapTable alloc] initWithKeyOptions:NSPointerFunctionsWeakMemory valueOptions:NSPointerFunctionsWeakMemory capacity:50];
 }
 
 - (void)start
@@ -164,7 +166,7 @@ - (void)start
             break;
     }
 
-    [_task setValue:sessionTask forKey:@"sessionTask"];
+    [STHTTPNetTaskToSessionTask setObject:sessionTask forKey:_task];
 
     sessionTask.operation = self;
     [sessionTask resume];
@@ -396,12 +398,8 @@ - (void)netTaskQueue:(STNetTaskQueue *)netTaskQueue didCancelTask:(STNetTask *)t
 {
     NSAssert([task isKindOfClass:[STHTTPNetTask class]], @"Net task should be subclass of STHTTPNetTask");
 
-    STHTTPNetTask *httpTask = (STHTTPNetTask *)task;
-    
-    NSURLSessionTask *sessionTask = [httpTask valueForKey:@"sessionTask"];
+    NSURLSessionTask *sessionTask = [STHTTPNetTaskToSessionTask objectForKey:task];
     [sessionTask cancel];
-    
-    [httpTask setValue:nil forKey:@"sessionTask"];
 }
 
 - (void)netTaskQueueDidBecomeInactive:(STNetTaskQueue *)netTaskQueue

STNetTaskQueue/STNetTaskQueue.m

@@ -60,12 +60,25 @@ - (void)threadEntryPoint
     }
 }
 
+- (void)performInThread:(NSThread *)thread usingBlock:(void(^)())block
+{
+    [self performSelector:@selector(performUsingBlock:) onThread:thread withObject:block waitUntilDone:NO];
+}
+
+- (void)performUsingBlock:(void(^)())block
+{
+    block();
+}
+
 - (void)addTask:(STNetTask *)task
 {
     NSAssert(self.handler, @"STNetTaskQueueHandler is not set.");
     NSAssert(!task.finished, @"STNetTask is finished, please recreate a net task.");
+    
     task.pending = YES;
-    [self performSelector:@selector(_addTask:) onThread:self.thred withObject:task waitUntilDone:NO];
+    [self performInThread:self.thred usingBlock:^{
+        [self _addTask:task];
+    }];
 }
 
 - (void)_addTask:(STNetTask *)task
@@ -84,7 +97,10 @@ - (void)cancelTask:(STNetTask *)task
     if (!task) {
         return;
     }
-    [self performSelector:@selector(_cancelTask:) onThread:self.thred withObject:task waitUntilDone:NO];
+    
+    [self performInThread:self.thred usingBlock:^{
+        [self _cancelTask:task];
+    }];
 }
 
 - (void)_cancelTask:(STNetTask *)task
@@ -124,14 +140,13 @@ - (void)_sendWatingTasks
 
 - (void)task:(STNetTask *)task didResponse:(id)response
 {
-    [self performSelector:@selector(_taskDidResponse:) onThread:self.thred withObject:@{ @"task": task, @"response": response } waitUntilDone:NO];
+    [self performInThread:self.thred usingBlock:^{
+        [self _task:task didResponse:response];
+    }];
 }
 
-- (void)_taskDidResponse:(NSDictionary *)params
+- (void)_task:(STNetTask *)task didResponse:(id)response
 {
-    STNetTask *task = params[@"task"];
-    id response = params[@"response"];
-    
     if (![self.tasks containsObject:task]) {
         return;
     }
@@ -144,7 +159,7 @@ - (void)_taskDidResponse:(NSDictionary *)params
         [STNetTaskQueueLog log:@"Exception in 'didResponse' - %@", exception.debugDescription];
         NSError *error = [NSError errorWithDomain:STNetTaskUnknownError
                                              code:-1
-                                         userInfo:@{ @"msg": exception.description }];
+                                         userInfo:@{ @"msg": exception.description ? : @"nil" }];
 
         if ([self _retryTask:task withError:error]) {
             return;
@@ -164,14 +179,13 @@ - (void)_taskDidResponse:(NSDictionary *)params
 
 - (void)task:(STNetTask *)task didFailWithError:(NSError *)error
 {
-    [self performSelector:@selector(_taskDidFailWithError:) onThread:self.thred withObject:@{ @"task": task, @"error": error } waitUntilDone:NO];
+    [self performInThread:self.thred usingBlock:^{
+        [self _task:task didFailWithError:error];
+    }];
 }
 
-- (void)_taskDidFailWithError:(NSDictionary *)params
+- (void)_task:(STNetTask *)task didFailWithError:(NSError *)error
 {
-    STNetTask *task = params[@"task"];
-    NSError *error = params[@"error"];
-    
     if (![self.tasks containsObject:task]) {
         return;
     }