Synchronized dictionaries and tables operations

Author: Artur Chrusciel

ios/RNFetchBlobNetwork.m

@@ -105,33 +105,35 @@ @implementation RNFetchBlobNetwork
 // constructor
 - (id)init {
     self = [super init];
-    if(taskQueue == nil) {
-        @synchronized ([RNFetchBlobNetwork class]) {
-            if (taskQueue == nil) {
-                taskQueue = [[NSOperationQueue alloc] init];
-                taskQueue.maxConcurrentOperationCount = 10;
-            }
+    @synchronized ([RNFetchBlobNetwork class]) {
+        if (taskQueue == nil) {
+            taskQueue = [[NSOperationQueue alloc] init];
+            taskQueue.maxConcurrentOperationCount = 10;
         }
     }
     return self;
 }
 
 + (void) enableProgressReport:(NSString *) taskId config:(RNFetchBlobProgress *)config
 {
-    if(progressTable == nil)
-    {
-        progressTable = [[NSMutableDictionary alloc] init];
+    @synchronized ([RNFetchBlobNetwork class]) {
+        if(progressTable == nil)
+        {
+            progressTable = [[NSMutableDictionary alloc] init];
+        }
+        [progressTable setValue:config forKey:taskId];
     }
-    [progressTable setValue:config forKey:taskId];
 }
 
 + (void) enableUploadProgress:(NSString *) taskId config:(RNFetchBlobProgress *)config
 {
-    if(uploadProgressTable == nil)
-    {
-        uploadProgressTable = [[NSMutableDictionary alloc] init];
+    @synchronized ([RNFetchBlobNetwork class]) {
+        if(uploadProgressTable == nil)
+        {
+            uploadProgressTable = [[NSMutableDictionary alloc] init];
+        }
+        [uploadProgressTable setValue:config forKey:taskId];
     }
-    [uploadProgressTable setValue:config forKey:taskId];
 }
 
 // removing case from headers
@@ -245,8 +247,10 @@ - (void) sendRequest:(__weak NSDictionary  * _Nullable )options
     }
 
     __block NSURLSessionDataTask * task = [session dataTaskWithRequest:req];
-    [taskTable setObject:task forKey:taskId];
-    [task resume];
+    @synchronized ([RNFetchBlobNetwork class]){
+        [taskTable setObject:task forKey:taskId];
+        [task resume];
+    }
 
     // network status indicator
     if([[options objectForKey:CONFIG_INDICATOR] boolValue] == YES)
@@ -258,21 +262,22 @@ - (void) sendRequest:(__weak NSDictionary  * _Nullable )options
 // #115 Invoke fetch.expire event on those expired requests so that the expired event can be handled
 + (void) emitExpiredTasks
 {
-    NSEnumerator * emu =  [expirationTable keyEnumerator];
-    NSString * key;
-
-    while((key = [emu nextObject]))
-    {
-        RCTBridge * bridge = [RNFetchBlob getRCTBridge];
-        NSData * args = @{ @"taskId": key };
-        [bridge.eventDispatcher sendDeviceEventWithName:EVENT_EXPIRE body:args];
+    @synchronized ([RNFetchBlobNetwork class]){
+        NSEnumerator * emu =  [expirationTable keyEnumerator];
+        NSString * key;
 
-    }
+        while((key = [emu nextObject]))
+        {
+            RCTBridge * bridge = [RNFetchBlob getRCTBridge];
+            NSData * args = @{ @"taskId": key };
+            [bridge.eventDispatcher sendDeviceEventWithName:EVENT_EXPIRE body:args];
 
-    // clear expired task entries
-    [expirationTable removeAllObjects];
-    expirationTable = [[NSMapTable alloc] init];
+        }
 
+        // clear expired task entries
+        [expirationTable removeAllObjects];
+        expirationTable = [[NSMapTable alloc] init];
+    }
 }
 
 ////////////////////////////////////////
@@ -452,10 +457,18 @@ - (void) URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dat
     {
         [writeStream write:[data bytes] maxLength:[data length]];
     }
-    RNFetchBlobProgress * pconfig = [progressTable valueForKey:taskId];
+    
     if(expectedBytes == 0)
         return;
+    
+    RNFetchBlobProgress * pconfig;
+    
+    @synchronized ([RNFetchBlobNetwork class]){
+        pconfig = [progressTable valueForKey:taskId];
+    }
+        
     NSNumber * now =[NSNumber numberWithFloat:((float)receivedBytes/(float)expectedBytes)];
+    
     if(pconfig != nil && [pconfig shouldReport:now])
     {
         [self.bridge.eventDispatcher
@@ -465,11 +478,9 @@ - (void) URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dat
                 @"written": [NSString stringWithFormat:@"%d", receivedBytes],
                 @"total": [NSString stringWithFormat:@"%d", expectedBytes],
                 @"chunk": chunkString
-            }
+                }
          ];
     }
-    received = nil;
-
 }
 
 - (void) URLSession:(NSURLSession *)session didBecomeInvalidWithError:(nullable NSError *)error
@@ -541,7 +552,7 @@ - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCom
 
     callback(@[ errMsg, rnfbRespType, respStr]);
 
-    @synchronized(taskTable, uploadProgressTable, progressTable)
+    @synchronized ([RNFetchBlobNetwork class])
     {
         if([taskTable objectForKey:taskId] == nil)
             NSLog(@"object released by ARC.");
@@ -560,25 +571,36 @@ - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCom
 // upload progress handler
 - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didSendBodyData:(int64_t)bytesSent totalBytesSent:(int64_t)totalBytesWritten totalBytesExpectedToSend:(int64_t)totalBytesExpectedToWrite
 {
-    RNFetchBlobProgress * pconfig = [uploadProgressTable valueForKey:taskId];
     if(totalBytesExpectedToWrite == 0)
         return;
+    
+    RNFetchBlobProgress * pconfig;
+    
+    @synchronized ([RNFetchBlobNetwork class]) {
+        pconfig = [uploadProgressTable valueForKey:taskId];
+    }
+    
     NSNumber * now = [NSNumber numberWithFloat:((float)totalBytesWritten/(float)totalBytesExpectedToWrite)];
     if(pconfig != nil && [pconfig shouldReport:now]) {
         [self.bridge.eventDispatcher
          sendDeviceEventWithName:EVENT_PROGRESS_UPLOAD
          body:@{
                 @"taskId": taskId,
-                @"written": [NSString stringWithFormat:@"%d", totalBytesWritten],
-                @"total": [NSString stringWithFormat:@"%d", totalBytesExpectedToWrite]
+                @"written": [NSString stringWithFormat:@"%ld", (long) totalBytesWritten],
+                @"total": [NSString stringWithFormat:@"%ld", (long) totalBytesExpectedToWrite]
                 }
          ];
     }
 }
 
 + (void) cancelRequest:(NSString *)taskId
 {
-    NSURLSessionDataTask * task = [taskTable objectForKey:taskId];
+    NSURLSessionDataTask * task;
+    
+    @synchronized ([RNFetchBlobNetwork class]) {
+        task = [taskTable objectForKey:taskId];
+    }
+    
     if(task != nil && task.state == NSURLSessionTaskStateRunning)
         [task cancel];
 }