Code IOS refactor

Author: wkh237

src/index.js

@@ -104,7 +104,6 @@ function fetch(...args:any):Promise {
   let options = this || {}
 
   let promise = new Promise((resolve, reject) => {
-
     let [method, url, headers, body] = [...args]
     let nativeMethodName = Array.isArray(body) ? 'fetchBlobForm' : 'fetchBlob'
 

src/ios/RNFetchBlob.xcodeproj/project.pbxproj

@@ -9,7 +9,7 @@
 /* Begin PBXBuildFile section */
 		A158F4271D052E49006FFD38 /* RNFetchBlobFS.m in Sources */ = {isa = PBXBuildFile; fileRef = A158F4261D052E49006FFD38 /* RNFetchBlobFS.m */; };
 		A158F42D1D0535BB006FFD38 /* RNFetchBlobConst.m in Sources */ = {isa = PBXBuildFile; fileRef = A158F42C1D0535BB006FFD38 /* RNFetchBlobConst.m */; };
-		A158F4301D0539DB006FFD38 /* RNFetchBlobResp.m in Sources */ = {isa = PBXBuildFile; fileRef = A158F42F1D0539DB006FFD38 /* RNFetchBlobResp.m */; };
+		A158F4301D0539DB006FFD38 /* RNFetchBlobNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = A158F42F1D0539DB006FFD38 /* RNFetchBlobNetwork.m */; };
 		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 */
@@ -31,8 +31,8 @@
 		A158F4281D052E57006FFD38 /* RNFetchBlobFS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFetchBlobFS.h; sourceTree = "<group>"; };
 		A158F4291D0534A9006FFD38 /* RNFetchBlobConst.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFetchBlobConst.h; sourceTree = "<group>"; };
 		A158F42C1D0535BB006FFD38 /* RNFetchBlobConst.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNFetchBlobConst.m; sourceTree = "<group>"; };
-		A158F42E1D0539CE006FFD38 /* RNFetchBlobResp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFetchBlobResp.h; sourceTree = "<group>"; };
-		A158F42F1D0539DB006FFD38 /* RNFetchBlobResp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNFetchBlobResp.m; sourceTree = "<group>"; };
+		A158F42E1D0539CE006FFD38 /* RNFetchBlobNetwork.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFetchBlobNetwork.h; sourceTree = "<group>"; };
+		A158F42F1D0539DB006FFD38 /* RNFetchBlobNetwork.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNFetchBlobNetwork.m; sourceTree = "<group>"; };
 		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>"; };
@@ -59,8 +59,8 @@
 		A15C30051CD25C330074CB35 = {
 			isa = PBXGroup;
 			children = (
-				A158F42F1D0539DB006FFD38 /* RNFetchBlobResp.m */,
-				A158F42E1D0539CE006FFD38 /* RNFetchBlobResp.h */,
+				A158F42F1D0539DB006FFD38 /* RNFetchBlobNetwork.m */,
+				A158F42E1D0539CE006FFD38 /* RNFetchBlobNetwork.h */,
 				A158F42C1D0535BB006FFD38 /* RNFetchBlobConst.m */,
 				A158F4291D0534A9006FFD38 /* RNFetchBlobConst.h */,
 				A158F4281D052E57006FFD38 /* RNFetchBlobFS.h */,
@@ -139,7 +139,7 @@
 				A166D1AA1CE0647A00273590 /* RNFetchBlob.h in Sources */,
 				A158F42D1D0535BB006FFD38 /* RNFetchBlobConst.m in Sources */,
 				A158F4271D052E49006FFD38 /* RNFetchBlobFS.m in Sources */,
-				A158F4301D0539DB006FFD38 /* RNFetchBlobResp.m in Sources */,
+				A158F4301D0539DB006FFD38 /* RNFetchBlobNetwork.m in Sources */,
 				A15C30141CD25C330074CB35 /* RNFetchBlob.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

src/ios/RNFetchBlob/RNFetchBlob.m

@@ -10,7 +10,7 @@
 #import "RCTBridge.h"
 #import "RCTEventDispatcher.h"
 #import "RNFetchBlobFS.h"
-#import "RNFetchBlobResp.h"
+#import "RNFetchBlobNetwork.h"
 #import "RNFetchBlobConst.h"
 
 
@@ -67,7 +67,7 @@ - (NSDictionary *)constantsToExport
                                     initWithURL:[NSURL
                                                  URLWithString: url]];
 
-    NSMutableDictionary *mheaders = [[NSMutableDictionary alloc] initWithDictionary:[ FetchBlobUtils normalizeHeaders:headers]];
+    NSMutableDictionary *mheaders = [[NSMutableDictionary alloc] initWithDictionary:[ RNFetchBlobNetwork normalizeHeaders:headers]];
 
 
     NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
@@ -128,7 +128,7 @@ - (NSDictionary *)constantsToExport
 
 
         // send HTTP request
-        FetchBlobUtils * utils = [[FetchBlobUtils alloc] init];
+        RNFetchBlobNetwork * utils = [[RNFetchBlobNetwork alloc] init];
         [utils sendRequest:options bridge:self.bridge taskId:taskId withRequest:request withData:postData callback:callback];
     });
 }
@@ -146,7 +146,8 @@ - (NSDictionary *)constantsToExport
                                     initWithURL:[NSURL
                                                  URLWithString: url]];
 
-    NSMutableDictionary *mheaders = [[NSMutableDictionary alloc] initWithDictionary:[FetchBlobUtils normalizeHeaders:headers]];
+    NSMutableDictionary *mheaders = [[NSMutableDictionary alloc] initWithDictionary:[RNFetchBlobNetwork normalizeHeaders:headers]];
+    
     // move heavy task to another thread
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         NSMutableData * blobData;
@@ -173,7 +174,7 @@ - (NSDictionary *)constantsToExport
         [request setAllHTTPHeaderFields:mheaders];
 
         // send HTTP request
-        FetchBlobUtils * utils = [[FetchBlobUtils alloc] init];
+        RNFetchBlobNetwork * utils = [[RNFetchBlobNetwork alloc] init];
         [utils sendRequest:options bridge:self.bridge taskId:taskId withRequest:request withData:blobData callback:callback];
     });
 }

src/ios/RNFetchBlobNetwork.h

@@ -1,9 +1,9 @@
 //
-//  RNFetchBlobResp.h
+//  RNFetchBlobNetwork.h
 //  RNFetchBlob
 //
-//  Created by Ben Hsieh on 2016/6/6.
-//  Copyright © 2016年 suzuri04x2. All rights reserved.
+//  Created by wkh237 on 2016/6/6.
+//  Copyright © 2016 wkh237. All rights reserved.
 //
 
 #ifndef RNFetchBlobResp_h
@@ -12,7 +12,7 @@
 #import <Foundation/Foundation.h>
 #import "RCTBridgeModule.h"
 
-@interface FetchBlobUtils : NSObject  <NSURLSessionDelegate, NSURLSessionTaskDelegate, NSURLSessionDataDelegate> {
+@interface RNFetchBlobNetwork : NSObject  <NSURLSessionDelegate, NSURLSessionTaskDelegate, NSURLSessionDataDelegate> {
 
     NSString * taskId;
     int expectedBytes;

src/ios/RNFetchBlobNetwork.m

@@ -1,9 +1,9 @@
 //
-//  RNFetchBlobResp.m
+//  RNFetchBlobNetwork.m
 //  RNFetchBlob
 //
-//  Created by Ben Hsieh on 2016/6/6.
-//  Copyright © 2016年 suzuri04x2. All rights reserved.
+//  Created by wkh237 on 2016/6/6.
+//  Copyright © 2016 wkh237. All rights reserved.
 //
 
 #import "RCTConvert.h"
@@ -12,7 +12,7 @@
 #import "RCTBridge.h"
 #import "RCTEventDispatcher.h"
 #import "RNFetchBlobFS.h"
-#import "RNFetchBlobResp.h"
+#import "RNFetchBlobNetwork.h"
 #import "RNFetchBlobConst.h"
 
 ////////////////////////////////////////
@@ -21,7 +21,7 @@
 //
 ////////////////////////////////////////
 
-@implementation FetchBlobUtils
+@implementation RNFetchBlobNetwork
 
 
 @synthesize taskId;
@@ -32,6 +32,12 @@ @implementation FetchBlobUtils
 @synthesize bridge;
 @synthesize options;
 
+// constructor
+- (id)init {
+    self = [super init];
+    return self;
+}
+
 
 // removing case from headers
 + (NSMutableDictionary *) normalizeHeaders:(NSDictionary *)headers {
@@ -44,12 +50,7 @@ + (NSMutableDictionary *) normalizeHeaders:(NSDictionary *)headers {
     return mheaders;
 }
 
-- (id)init {
-    self = [super init];
-    return self;
-}
-
-
+// send HTTP request
 - (void) sendRequest:(NSDictionary *)options bridge:(RCTBridge *)bridgeRef taskId:(NSString *)taskId withRequest:(NSURLRequest *)req withData:( NSData * _Nullable )data callback:(RCTResponseSenderBlock) callback {
     self.taskId = taskId;
     self.respData = [[NSMutableData alloc] initWithLength:0];
@@ -120,14 +121,22 @@ - (void) sendRequest:(NSDictionary *)options bridge:(RCTBridge *)bridgeRef taskI
     }
 }
 
+////////////////////////////////////////
+//
+//  NSURLSession delegates
+//
+////////////////////////////////////////
+
 
 #pragma mark NSURLSession delegate methods
 
+// set expected content length on response received
 - (void) URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveResponse:(NSURLResponse *)response completionHandler:(void (^)(NSURLSessionResponseDisposition))completionHandler
 {
     expectedBytes = [response expectedContentLength];
 }
 
+// download progress handler
 - (void) URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveData:(NSData *)data
 {
     receivedBytes += [data length];
@@ -149,6 +158,11 @@ - (void) URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dat
      ];
 }
 
+- (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error {
+    NSLog([error localizedDescription]);
+}
+
+// upload progress handler
 - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didSendBodyData:(int64_t)bytesSent totalBytesSent:(int64_t)totalBytesWritten totalBytesExpectedToSend:(int64_t)totalBytesExpectedToWrite
 {
     expectedBytes = totalBytesExpectedToWrite;