Add progress report support for IOS #1

src/index.js

  * @version 0.3.3
  */
 
-import { NativeModules } from 'react-native'
-import { DeviceEventEmitter } from 'react-native';
-import base64 from 'base-64'
+import {
+  NativeModules,
+  DeviceEventEmitter,
+  NativeAppEventEmitter,
+  Platform,
+} from 'react-native'
 
+import base64 from 'base-64'
+const emitter = (Platform.OS === 'android' ? DeviceEventEmitter : NativeAppEventEmitter)
 const RNFetchBlob = NativeModules.RNFetchBlob
 
 // Show warning if native module not detected
 
     let [method, url, headers, body] = [...args]
     let nativeMethodName = Array.isArray(body) ? 'fetchBlobForm' : 'fetchBlob'
-    let handle = DeviceEventEmitter.addListener('RNFetchBlobProgress', (e) => {
+    let subscription = emitter.addListener('RNFetchBlobProgress', (e) => {
       if(e.taskId === taskId && promise.onProgress) {
         promise.onProgress(e.written, e.total)
       }
     RNFetchBlob[nativeMethodName](taskId, method, url, headers || {}, body, (err, ...data) => {
 
       // task done, remove event listener
-      handle.remove()
+      subscription.remove()
 
       if(err)
         reject(new Error(err, ...data))

src/ios/RNFetchBlob.xcodeproj/project.pbxproj

 	};
 	objectVersion = 46;
 	objects = {
+
 /* Begin PBXBuildFile section */
 		A15C30141CD25C330074CB35 /* RNFetchBlob.m in Sources */ = {isa = PBXBuildFile; fileRef = A15C30131CD25C330074CB35 /* RNFetchBlob.m */; };
 		A166D1AA1CE0647A00273590 /* RNFetchBlob.h in Sources */ = {isa = PBXBuildFile; fileRef = A15C30111CD25C330074CB35 /* RNFetchBlob.h */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		A1BAA89E1CF415DF003A9374 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = ADC1D945EE804D3DA47CF622 /* RNFetchBlob.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = A15C300E1CD25C330074CB35;
+			remoteInfo = RNFetchBlob;
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXCopyFilesBuildPhase section */
 		A15C300C1CD25C330074CB35 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 		A15C300E1CD25C330074CB35 /* libRNFetchBlob.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNFetchBlob.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		A15C30111CD25C330074CB35 /* RNFetchBlob.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RNFetchBlob.h; path = RNFetchBlob/RNFetchBlob.h; sourceTree = "<group>"; };
 		A15C30131CD25C330074CB35 /* RNFetchBlob.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RNFetchBlob.m; path = RNFetchBlob/RNFetchBlob.m; sourceTree = "<group>"; };
-		ADC1D945EE804D3DA47CF622 /* RNFetchBlob.xcodeproj */ = {isa = PBXFileReference; name = "RNFetchBlob.xcodeproj"; path = "../../node_modules/react-native-fetch-blob/ios/RNFetchBlob.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
+		ADC1D945EE804D3DA47CF622 /* RNFetchBlob.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNFetchBlob.xcodeproj; path = "../../node_modules/react-native-fetch-blob/ios/RNFetchBlob.xcodeproj"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		8BD9ABDFAF76406291A798F2 /* Libraries */ = {
+			isa = PBXGroup;
+			children = (
+				ADC1D945EE804D3DA47CF622 /* RNFetchBlob.xcodeproj */,
+			);
+			name = Libraries;
+			sourceTree = "<group>";
+		};
 		A15C30051CD25C330074CB35 = {
 			isa = PBXGroup;
 			children = (
 			name = Products;
 			sourceTree = "<group>";
 		};
-		8BD9ABDFAF76406291A798F2 /* Libraries */ = {
+		A1BAA8981CF415DF003A9374 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				ADC1D945EE804D3DA47CF622 /* RNFetchBlob.xcodeproj */,
+				A1BAA89F1CF415DF003A9374 /* libRNFetchBlob.a */,
 			);
-			name = Libraries;
-			path = "";
+			name = Products;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 			mainGroup = A15C30051CD25C330074CB35;
 			productRefGroup = A15C300F1CD25C330074CB35 /* Products */;
 			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = A1BAA8981CF415DF003A9374 /* Products */;
+					ProjectRef = ADC1D945EE804D3DA47CF622 /* RNFetchBlob.xcodeproj */;
+				},
+			);
 			projectRoot = "";
 			targets = (
 				A15C300D1CD25C330074CB35 /* RNFetchBlob */,
 		};
 /* End PBXProject section */
 
+/* Begin PBXReferenceProxy section */
+		A1BAA89F1CF415DF003A9374 /* libRNFetchBlob.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libRNFetchBlob.a;
+			remoteRef = A1BAA89E1CF415DF003A9374 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
 /* Begin PBXSourcesBuildPhase section */
 		A15C300A1CD25C330074CB35 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 					"$(SRCROOT)/../../react-native/React/**",
 					"$(SRCROOT)/../../node_modules/react-native/React/**",
 					"$(SRCROOT)/../../node_modules/react-native-fetch-blob/ios/RNFetchBlob",
+					"$(SRCROOT)/../../RNFetchBlobTest/node_modules/react-native/**",
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 					"$(SRCROOT)/../../react-native/React/**",
 					"$(SRCROOT)/../../node_modules/react-native/React/**",
 					"$(SRCROOT)/../../node_modules/react-native-fetch-blob/ios/RNFetchBlob",
+					"$(SRCROOT)/../../RNFetchBlobTest/node_modules/react-native/**",
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";

src/ios/RNFetchBlob/RNFetchBlob.h

 //
 //  RNFetchBlob.h
 //
-//  Created by suzuri04x2 on 2016/4/28.
-//  Copyright © 2016年 Facebook. All rights reserved.
+//  Created by wkh237 on 2016/4/28.
 //
 
 #ifndef RNFetchBlob_h
 #define RNFetchBlob_h
-
+#import <Foundation/Foundation.h>
 #import "RCTBridgeModule.h"
 
 @interface RNFetchBlob : NSObject <RCTBridgeModule> 
 
 @end
 
-@interface FetchBlobUtils : NSObject
+@interface FetchBlobUtils : NSObject  <NSURLConnectionDelegate, NSURLConnectionDataDelegate> {
+
+    NSString * taskId;
+    int expectedBytes;
+    int receivedBytes;
+    NSMutableData * respData;
+    RCTResponseSenderBlock callback;
+    RCTBridge * bridge;
+}
+@property (nonatomic) NSString * taskId;
+@property (nonatomic) int expectedBytes;
+@property (nonatomic) int receivedBytes;
+@property (nonatomic) NSMutableData * respData;
+@property (nonatomic) RCTResponseSenderBlock callback;
+@property (nonatomic) RCTBridge * bridge;
+
+
+- (id) init;
+- (id) delegate;
+- (void) sendRequest;
 
-+ (void) onBlobResponse;
 + (NSMutableDictionary *) normalizeHeaders;
 
+
 @end
 
 

src/ios/RNFetchBlob/RNFetchBlob.m

 //  RNFetchBlob.m
 //
 //  Created by suzuri04x2 on 2016/4/28.
-//  Copyright © 2016年 Facebook. All rights reserved.
 //
 
 #import "RNFetchBlob.h"
 #import "RCTConvert.h"
 #import "RCTLog.h"
 #import <Foundation/Foundation.h>
+#import "RCTBridge.h"
+#import "RCTEventDispatcher.h"
 
 
 ////////////////////////////////////////
 
 @implementation FetchBlobUtils
 
-// callback class method to handle request
-+ (void) onBlobResponse:(NSURLResponse * _Nullable)response withData:(NSData * _Nullable)data withError:(NSError * _Nullable)connectionError withCallback:(RCTResponseSenderBlock)callback{
-    
-    NSHTTPURLResponse* resp = (NSHTTPURLResponse *) response;
-    NSString* status = [NSString stringWithFormat:@"%d", resp.statusCode];
-    
-    if(connectionError)
-    {
-        callback(@[[connectionError localizedDescription], [NSNull null]]);
-    }
-    else if(![status isEqualToString:@"200"]) {
-        callback(@[status, [NSNull null]]);
-    }
-    else {
-        callback(@[[NSNull null], [data base64EncodedStringWithOptions:0]]);
-    }
-    
-}
+
+@synthesize taskId;
+@synthesize expectedBytes;
+@synthesize receivedBytes;
+@synthesize respData;
+@synthesize callback;
+@synthesize bridge;
+
 
 // removing case of headers
 + (NSMutableDictionary *) normalizeHeaders:(NSDictionary *)headers {
     return mheaders;
 }
 
+- (id)init {
+    self = [super init];
+    return self;
+}
+
+- (id)delegate:(id)delegate {
+    return delegate;
+}
+
+- (void) sendRequest:(RCTBridge *)bridgeRef taskId:(NSString *)taskId withRequest:(NSURLRequest *)req callback:(RCTResponseSenderBlock) callback {
+    self.taskId = taskId;
+    self.respData = [[NSMutableData alloc] initWithLength:0];
+    self.callback = callback;
+    self.bridge = bridgeRef;
+    // Call long-running code on background thread
+    NSURLConnection *conn = [[NSURLConnection alloc] initWithRequest:req delegate:self startImmediately:NO];
+    [conn scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
+    [conn start];
+    
+    if(!conn) {
+        callback(@[[NSString stringWithFormat:@"RNFetchBlob could not initialize connection"], [NSNull null]]);
+    }
+}
+
+
+#pragma mark NSURLConnection delegate methods
+
+
+- (void) connection:(NSURLConnection *)connection didReceiveResponse:(nonnull NSURLResponse *)response {
+    [UIApplication sharedApplication].networkActivityIndicatorVisible = YES;
+    expectedBytes = [response expectedContentLength];
+}
+
+- (void) connection:(NSURLConnection *)connection didReceiveData:(nonnull NSData *)data {
+    receivedBytes = data.length;
+    [respData appendData:data];
+    
+    [self.bridge.eventDispatcher
+        sendAppEventWithName:@"RNFetchBlobProgress"
+        body:@{
+            @"taskId": taskId,
+            @"written": [NSString stringWithFormat:@"%d", receivedBytes],
+            @"total": [NSString stringWithFormat:@"%d", expectedBytes]
+        }
+     ];
+}
+
+- (void) connection:(NSURLConnection *)connection didSendBodyData:(NSInteger)bytesWritten totalBytesWritten:(NSInteger)totalBytesWritten totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite {
+    
+    expectedBytes = totalBytesExpectedToWrite;
+    receivedBytes = totalBytesWritten;
+    [self.bridge.eventDispatcher
+        sendAppEventWithName:@"RNFetchBlobProgress"
+            body:@{
+                    @"taskId": taskId,
+                    @"written": [NSString stringWithFormat:@"%d", receivedBytes],
+                    @"total": [NSString stringWithFormat:@"%d", expectedBytes]
+                }
+     ];
+    
+}
+
+- (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
+    [UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
+    callback(@[[error localizedDescription], [NSNull null]]);
+}
+
+- (NSCachedURLResponse *) connection:(NSURLConnection *)connection willCacheResponse: (NSCachedURLResponse *)cachedResponse {
+    return nil;
+}
+
+
+// handle 301 and 302 responses
+- (NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)request redirectResponse:response {
+    
+    return request;
+}
+
+// request complete
+- (void) connectionDidFinishLoading:(NSURLConnection *)connection {
+    NSData * data = [NSData dataWithData:respData];
+    callback(@[[NSNull null], [data base64EncodedStringWithOptions:0]]);
+}
+
 @end
 
 
 
 @implementation RNFetchBlob
 
+@synthesize bridge = _bridge;
+
 RCT_EXPORT_MODULE();
 
 // Fetch blob data request
-RCT_EXPORT_METHOD(fetchBlobForm:(NSString *)method url:(NSString *)url headers:(NSDictionary *)headers form:(NSArray *)form callback:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(fetchBlobForm:(NSString *)taskId method:(NSString *)method url:(NSString *)url headers:(NSDictionary *)headers form:(NSArray *)form callback:(RCTResponseSenderBlock)callback)
 {
     
     // send request
     NSMutableURLRequest *request = [[NSMutableURLRequest alloc]
                                     initWithURL:[NSURL
                                                  URLWithString: url]];
+    
     NSMutableDictionary *mheaders = [[NSMutableDictionary alloc] initWithDictionary:[ FetchBlobUtils normalizeHeaders:headers]];
     
     
     [request setHTTPMethod: method];
     [request setAllHTTPHeaderFields:mheaders];
     
+    [[[FetchBlobUtils alloc] init] sendRequest:self.bridge taskId:taskId withRequest:request callback:callback];
+    
     // create thread for http request
-    NSOperationQueue *queue = [[NSOperationQueue alloc] init];
-    [NSURLConnection sendAsynchronousRequest:request queue:queue completionHandler:^(NSURLResponse * _Nullable response, NSData * _Nullable data, NSError * _Nullable connectionError) {
-        
-        [FetchBlobUtils onBlobResponse:response withData:data withError: connectionError withCallback: callback];
-        
-    }];
+//    NSOperationQueue *queue = [[NSOperationQueue alloc] init];
+//    [NSURLConnection sendAsynchronousRequest:request queue:queue completionHandler:^(NSURLResponse * _Nullable response, NSData * _Nullable data, NSError * _Nullable connectionError) {
+//        
+//        [FetchBlobUtils onBlobResponse:response withData:data withError: connectionError withCallback: callback];
+//        
+//    }];
     
 }
 
 // Fetch blob data request
-RCT_EXPORT_METHOD(fetchBlob:(NSString *)method url:(NSString *)url headers:(NSDictionary *)headers body:(NSString *)body callback:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(fetchBlob:(NSString *)taskId method:(NSString *)method url:(NSString *)url headers:(NSDictionary *)headers body:(NSString *)body callback:(RCTResponseSenderBlock)callback)
 {
     // send request
     NSMutableURLRequest *request = [[NSMutableURLRequest alloc]
     [request setHTTPMethod: method];
     [request setAllHTTPHeaderFields:mheaders];
     
+    [[[FetchBlobUtils alloc] init] sendRequest:self.bridge taskId:taskId withRequest:request callback:callback];
+    
     // create thread for http request
-    NSOperationQueue *queue = [[NSOperationQueue alloc] init];
-    [NSURLConnection sendAsynchronousRequest:request queue:queue completionHandler:^(NSURLResponse * _Nullable response, NSData * _Nullable data, NSError * _Nullable connectionError) {
-        
-        [FetchBlobUtils onBlobResponse:response withData:data withError: connectionError withCallback: callback];
-        
-    }];
+//    NSOperationQueue *queue = [[NSOperationQueue alloc] init];
+//    
+//    
+//    [NSURLConnection sendAsynchronousRequest:request queue:queue completionHandler:^(NSURLResponse * _Nullable response, NSData * _Nullable data, NSError * _Nullable connectionError) {
+//        
+//        [FetchBlobUtils onBlobResponse:response withData:data withError: connectionError withCallback: callback];
+//        
+//    }];
     
 }
-@end
 
+@end

src/ios/RNFetchBlobUtil.h

+//
+//  RNFetchBlobUtil.h
+//  RNFetchBlob
+//
+//  Created by Ben Hsieh on 2016/5/24.
+//  Copyright © 2016年 suzuri04x2. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "RCTBridgeModule.h"
+
+#ifndef RNFetchBlobUtil_h
+#define RNFetchBlobUtil_h
+
+@class FetchBlobUtils;
+
+
+@interface FetchBlobUtils : NSObject  <RCTBridgeModule, NSURLConnectionDelegate, NSURLConnectionDataDelegate> {
+    
+    NSString * taskId;
+    int expectedBytes;
+    int receivedBytes;
+    NSMutableData * respData;
+    RCTResponseSenderBlock callback;
+}
+@property (nonatomic) NSString * taskId;
+@property (nonatomic) int expectedBytes;
+@property (nonatomic) int receivedBytes;
+@property (nonatomic) NSMutableData * respData;
+@property (nonatomic) RCTResponseSenderBlock callback;
+
+
+- (id) init;
+- (id) delegate;
+- (void) sendRequest;
+
++ (NSMutableDictionary *) normalizeHeaders;
+
+
+@end
+
+
+
+#endif /* RNFetchBlobUtil_h */

src/ios/RNFetchBlobUtil.m

+//
+//  RNFetchBlobUtil.m
+//  RNFetchBlob
+//
+//  Created by Ben Hsieh on 2016/5/24.
+//  Copyright © 2016年 suzuri04x2. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "RNFetchBlobUtil.h"
+
+
+////////////////////////////////////////
+//
+//  Util functions
+//
+////////////////////////////////////////
+
+@implementation FetchBlobUtils
+
+
+@synthesize taskId;
+@synthesize expectedBytes;
+@synthesize receivedBytes;
+@synthesize respData;
+@synthesize callback;
+
+RCT_EXPORT_MODULE();
+
+// callback class method to handle request
+//+ (void) onBlobResponse:(NSURLResponse * _Nullable)response withData:(NSData * _Nullable)data withError:(NSError * _Nullable)connectionError withCallback:(RCTResponseSenderBlock) callback{
+//
+//    NSHTTPURLResponse* resp = (NSHTTPURLResponse *) response;
+//    NSString* status = [NSString stringWithFormat:@"%d", resp.statusCode];
+//
+//    if(connectionError)
+//    {
+//        callback(@[[connectionError localizedDescription], [NSNull null]]);
+//    }
+//    else if(![status isEqualToString:@"200"]) {
+//        callback(@[status, [NSNull null]]);
+//    }
+//    else {
+//        callback(@[[NSNull null], [data base64EncodedStringWithOptions:0]]);
+//    }
+//
+//}
+
+// removing case of headers
++ (NSMutableDictionary *) normalizeHeaders:(NSDictionary *)headers {
+    
+    NSMutableDictionary * mheaders = [[NSMutableDictionary alloc]init];
+    for(NSString * key in headers) {
+        [mheaders setValue:[headers valueForKey:key] forKey:[key lowercaseString]];
+    }
+    
+    return mheaders;
+}
+
+- (id)init {
+    self = [super init];
+    return self;
+}
+
+- (id)delegate:(id)delegate {
+    return delegate;
+}
+
+- (void) sendRequest:(NSString *)taskId withRequest:(NSURLRequest *)req callback:(RCTResponseSenderBlock) callback {
+    self.taskId = taskId;
+    self.respData = [[NSMutableData alloc] initWithLength:0];
+    // Call long-running code on background thread
+    NSURLConnection *conn = [[NSURLConnection alloc] initWithRequest:req delegate:self startImmediately:NO];
+    [conn scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
+    [conn start];
+    
+    if(!conn) {
+        callback(@[[NSString stringWithFormat:@"RNFetchBlob could not initialize connection"], [NSNull null]]);
+    }
+}
+
+
+#pragma mark NSURLConnection delegate methods
+
+
+- (void) connection:(NSURLConnection *)connection didReceiveResponse:(nonnull NSURLResponse *)response {
+    [UIApplication sharedApplication].networkActivityIndicatorVisible = YES;
+    expectedBytes = [response expectedContentLength];
+}
+
+- (void) connection:(NSURLConnection *)connection didReceiveData:(nonnull NSData *)data {
+    receivedBytes = data.length;
+    [respData appendData:data];
+    [self.bridge.eventDispatcher
+     sendAppEventWithName:@"RNFetchBlobProgress"
+     body:@{
+            @"taskId": taskId,
+            @"written": [NSString stringWithFormat:@"%@", receivedBytes],
+            @"total": [NSString stringWithFormat:@"%@", expectedBytes]
+            }
+     ];
+}
+
+- (void) connection:(NSURLConnection *)connection didSendBodyData:(NSInteger)bytesWritten totalBytesWritten:(NSInteger)totalBytesWritten totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite {
+    
+    expectedBytes = totalBytesExpectedToWrite;
+    receivedBytes = totalBytesWritten;
+    [self.bridge.eventDispatcher
+     sendAppEventWithName:@"RNFetchBlobProgress"
+     body:@{
+            @"taskId": taskId,
+            @"written": [NSString stringWithFormat:@"%@", receivedBytes],
+            @"total": [NSString stringWithFormat:@"%@", expectedBytes]
+            }
+     ];
+    
+}
+
+- (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
+    [UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
+    callback(@[[error localizedDescription], [NSNull null]]);
+}
+
+- (NSCachedURLResponse *) connection:(NSURLConnection *)connection willCacheResponse: (NSCachedURLResponse *)cachedResponse {
+    return nil;
+}
+
+
+// handle 301 and 302 responses
+- (NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)request redirectResponse:response {
+    
+    return request;
+}
+
+// request complete
+- (void) connectionDidFinishLoading:(NSURLConnection *)connection {
+    callback(@[[NSNull null], [respData base64EncodedStringWithOptions:0]]);
+}
+
+@end