Code refactor

src/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java

@@ -27,9 +27,7 @@ import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.SocketTimeoutException;
 import java.net.URL;
-import java.net.URLEncoder;
 import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
 import java.nio.charset.CharacterCodingException;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;

src/ios/RNFetchBlobConst.h

@@ -16,6 +16,9 @@ extern NSString *const MSG_EVENT;
 extern NSString *const MSG_EVENT_LOG;
 extern NSString *const MSG_EVENT_WARN;
 extern NSString *const MSG_EVENT_ERROR;
+
+extern NSString *const EVENT_PROGRESS;
+extern NSString *const EVENT_PROGRESS_UPLOAD;
 extern NSString *const EVENT_STATE_CHANGE;
 
 extern NSString *const FILE_PREFIX;

src/ios/RNFetchBlobConst.m

@@ -23,6 +23,9 @@ extern NSString *const CONFIG_KEY = @"key";
 extern NSString *const CONFIG_EXTRA_BLOB_CTYPE = @"binaryContentTypes";
 
 extern NSString *const EVENT_STATE_CHANGE = @"RNFetchBlobState";
+extern NSString *const EVENT_PROGRESS = @"RNFetchBlobProgress";
+extern NSString *const EVENT_PROGRESS_UPLOAD = @"RNFetchBlobProgress-upload";
+
 extern NSString *const MSG_EVENT = @"RNFetchBlobMessage";
 extern NSString *const MSG_EVENT_LOG = @"log";
 extern NSString *const MSG_EVENT_WARN = @"warn";

src/ios/RNFetchBlobFS.m

@@ -63,6 +63,8 @@ NSMutableDictionary *fileStreams = nil;
     return assetURI;
 }
 
+#pragma mark - system directories
+
 + (NSString *) getCacheDir {
     return [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) firstObject];
 }
@@ -98,6 +100,8 @@ NSMutableDictionary *fileStreams = nil;
     return tempPath;
 }
 
+#pragma mark - read asset stream
+
 - (void) startAssetReadStream:(NSString *)assetUrl
 {
     ALAssetsLibraryAssetForURLResultBlock resultblock = ^(ALAsset *myasset)
@@ -185,6 +189,8 @@ NSMutableDictionary *fileStreams = nil;
     }
 }
 
+# pragma write file from file
+
 + (NSNumber *) writeFileFromFile:(NSString *)src toFile:(NSString *)dest append:(BOOL)append
 {
     NSInputStream * is = [[NSInputStream alloc] initWithFileAtPath:src];
@@ -205,6 +211,8 @@ NSMutableDictionary *fileStreams = nil;
     return [NSNumber numberWithLong:written];
 }
 
+# pragma mark - write file
+
 + (void) writeFile:(NSString *)path encoding:(NSString *)encoding data:(NSString *)data append:(BOOL)append resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject
 {
     @try {
@@ -226,14 +234,6 @@ NSMutableDictionary *fileStreams = nil;
         NSData * content = nil;
         if([encoding containsString:@"base64"]) {
             content = [[NSData alloc] initWithBase64EncodedString:data options:0];
-            if([encoding containsString:@"urlencode"])
-            {
-                NSString * decode = [[[NSString alloc] initWithData:content encoding:NSUTF8StringEncoding] stringByRemovingPercentEncoding];
-                if(decode != nil)
-                {
-                    content = [decode dataUsingEncoding:NSUTF8StringEncoding];
-                }
-            }
         }
         else if([encoding isEqualToString:@"uri"]) {
             NSNumber* size = [[self class] writeFileFromFile:data toFile:path append:append];
@@ -261,6 +261,8 @@ NSMutableDictionary *fileStreams = nil;
     }
 }
 
+# pragma mark - write file (array)
+
 + (void) writeFileArray:(NSString *)path data:(NSArray *)data append:(BOOL)append resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject {
     @try {
         NSFileManager * fm = [NSFileManager defaultManager];
@@ -303,6 +305,8 @@ NSMutableDictionary *fileStreams = nil;
     }
 }
 
+# pragma mark - read file
+
 + (void) readFile:(NSString *)path encoding:(NSString *)encoding
          resolver:(RCTPromiseResolveBlock)resolve
          rejecter:(RCTPromiseRejectBlock)reject
@@ -370,6 +374,8 @@ NSMutableDictionary *fileStreams = nil;
     }
 }
 
+# pragma mark - mkdir
+
 + (BOOL) mkdir:(NSString *) path {
     BOOL isDir;
     NSError * err = nil;
@@ -380,6 +386,8 @@ NSMutableDictionary *fileStreams = nil;
     return err == nil;
 }
 
+# pragma mark - stat
+
 + (NSDictionary *) stat:(NSString *) path error:(NSError **) error {
     NSMutableDictionary *stat = [[NSMutableDictionary alloc] init];
     BOOL isDir = NO;
@@ -401,6 +409,8 @@ NSMutableDictionary *fileStreams = nil;
              };
 }
 
+# pragma mark - exists
+
 + (BOOL) exists:(NSString *) path {
     return [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:NULL];
 }
@@ -422,6 +432,8 @@ NSMutableDictionary *fileStreams = nil;
     return self;
 }
 
+# pragma mark - open file stream
+
 // Create file stream for write data
 - (NSString *)openWithPath:(NSString *)destPath encode:(nullable NSString *)encode appendData:(BOOL)append {
     self.outStream = [[NSOutputStream alloc] initToFileAtPath:destPath append:append];
@@ -434,6 +446,8 @@ NSMutableDictionary *fileStreams = nil;
     return uuid;
 }
 
+# pragma mark - file stream write chunk
+
 // Write file chunk into an opened stream
 - (void)writeEncodeChunk:(NSString *) chunk {
     NSMutableData * decodedData = [NSData alloc];
@@ -679,6 +693,8 @@ NSMutableDictionary *fileStreams = nil;
     
 }
 
+# pragma mark - get absolute path of resource
+
 + (void) getPathFromUri:(NSString *)uri completionHandler:(void(^)(NSString * path, ALAssetRepresentation *asset)) onComplete
 {
     if([uri hasPrefix:AL_PREFIX])

src/ios/RNFetchBlobNetwork.m

@@ -134,9 +134,8 @@ NSOperationQueue *taskQueue;
     bodyLength = contentLength;
 
     // the session trust any SSL certification
-
-    
     NSURLSessionConfiguration *defaultConfigObject = [NSURLSessionConfiguration defaultSessionConfiguration];
+    // set request timeout
     float timeout = [options valueForKey:@"timeout"] == nil ? -1 : [[options valueForKey:@"timeout"] floatValue];
     if(timeout > 0)
     {
@@ -202,9 +201,7 @@ NSOperationQueue *taskQueue;
     if ([response respondsToSelector:@selector(allHeaderFields)])
     {
         NSDictionary *headers = [httpResponse allHeaderFields];
-        NSString * respCType = [[RNFetchBlobReqBuilder getHeaderIgnoreCases:@"Content-Type"
-                                                               fromHeaders:headers]
-                               lowercaseString];
+        NSString * respCType = [[RNFetchBlobReqBuilder getHeaderIgnoreCases:@"Content-Type" fromHeaders:headers] lowercaseString];
         if(respCType != nil)
         {
             NSArray * extraBlobCTypes = [options objectForKey:CONFIG_EXTRA_BLOB_CTYPE];
@@ -299,12 +296,12 @@ NSOperationQueue *taskQueue;
     if([progressTable valueForKey:taskId] == @YES)
     {
         [self.bridge.eventDispatcher
-         sendDeviceEventWithName:@"RNFetchBlobProgress"
+         sendDeviceEventWithName:EVENT_PROGRESS 
          body:@{
                 @"taskId": taskId,
                 @"written": [NSString stringWithFormat:@"%d", receivedBytes],
                 @"total": [NSString stringWithFormat:@"%d", expectedBytes]
-                }
+            }
          ];
     }
     received = nil;
@@ -376,7 +373,7 @@ NSOperationQueue *taskQueue;
     @synchronized(taskTable, uploadProgressTable, progressTable)
     {
         if([taskTable objectForKey:taskId] == nil)
-            NSLog(@"object released.");
+            NSLog(@"object released by ARC.");
         else
             [taskTable removeObjectForKey:taskId];
         [uploadProgressTable removeObjectForKey:taskId];
@@ -394,7 +391,7 @@ NSOperationQueue *taskQueue;
 {
     if([uploadProgressTable valueForKey:taskId] == @YES) {
         [self.bridge.eventDispatcher
-         sendDeviceEventWithName:@"RNFetchBlobProgress-upload"
+         sendDeviceEventWithName:EVENT_PROGRESS_UPLOAD
          body:@{
                 @"taskId": taskId,
                 @"written": [NSString stringWithFormat:@"%d", totalBytesWritten],

src/polyfill/Fetch.js

@@ -110,17 +110,34 @@ class RNFetchBlobFetchRepsonse {
     return readJSON(this.rnfbResp, this.rnfbRespInfo)
   }
 
-  formData() {
-    log.verbose('to formData', this.rnfbResp, this.rnfbRespInfo)
-    return readFormData(this.rnfbResp, this.rnfbRespInfo)
-  }
-
   blob() {
     log.verbose('to blob', this.rnfbResp, this.rnfbRespInfo)
     return readBlob(this.rnfbResp, this.rnfbRespInfo)
   }
 }
 
+/**
+ * Get response data as array.
+ * @param  {FetchBlobResponse} resp Response data object from RNFB fetch call.
+ * @param  {RNFetchBlobResponseInfo} info Response informations.
+ * @return {Promise<Array>}
+ */
+function readArrayBuffer(resp, info):Promise<Array> {
+  switch (info.rnfbEncode) {
+    case 'path':
+      return resp.readFile('ascii')
+      break
+    default:
+      let buffer = []
+      let str = resp.text()
+      for (let i in str) {
+        buffer[i] = str.charCodeAt(i);
+      }
+      return Promise.resolve(buffer)
+      break
+  }
+}
+
 /**
  * Get response data as string.
  * @param  {FetchBlobResponse} resp Response data object from RNFB fetch call.

src/polyfill/XMLHttpRequest.js

@@ -10,7 +10,8 @@ import ProgressEvent from './ProgressEvent.js'
 
 const log = new Log('XMLHttpRequest')
 
-log.level(2)
+log.disable()
+// log.level(2)
 
 const UNSENT = 0
 const OPENED = 1

test/test-0.8.0.js

@@ -27,32 +27,42 @@ let prefix = ((Platform.OS === 'android') ? 'file://' : '')
 
 describe('fs URI encoding support', (report, done) => {
 
-  let testData1 = `test date write file from file ${Date.now()}`
-  let testData2 = `test date write file from file ${Date.now()*Math.random()}`
-  let file1 = dirs.DocumentDir + '/testFiletFile1' + Date.now()
-  let file2 = dirs.DocumentDir + '/testFiletFile2' + Date.now()
-  let init = [fs.createFile(file1, testData1, 'utf8'),
-              fs.createFile(file2, testData2, 'utf8')]
-  Promise.all(init)
-    .then(() => fs.appendFile(file1, file2, 'uri'))
-    .then(() => fs.readFile(file1, 'utf8'))
-    .then((data) => {
-      report(
-        <Assert key="append content from URI should be correct"
-          expect={testData1 + testData2}
-          actual={data}
-        />)
-      return fs.writeFile(file1, file2, 'uri')
-    })
-    .then(() => fs.readFile(file1, 'utf8'))
-    .then((data) => {
-      report(
-        <Assert key="write content from URI should be correct"
-          expect={testData2}
-          actual={data}
-        />)
-      done()
-    })
+  let testFiles = []
+  let sizes = []
+
+  RNFetchBlob.config({
+    fileCache : true
+  })
+  .fetch('GET', `${TEST_SERVER_URL}/public/github.png`)
+  .then((res) => {
+    testFiles.push(res.path())
+    sizes.push(Math.floor(res.info().headers['Content-Length']))
+    return RNFetchBlob.config({fileCache : true}).fetch('GET', `${TEST_SERVER_URL}/public/github2.jpg`)
+  })
+  .then((res) => {
+    testFiles.push(res.path())
+    sizes.push(Math.floor(res.info().headers['Content-Length']))
+    return fs.appendFile(testFiles[0], testFiles[1], 'uri')
+  })
+  .then(() => fs.stat(testFiles[0]))
+  .then((stat) => {
+    report(
+      <Assert key="append content from URI should be correct"
+        expect={sizes[0] + sizes[1]}
+        actual={Math.floor(stat.size)}
+      />)
+    return fs.writeFile(testFiles[0], testFiles[1], 'uri')
+  })
+  .then(() => fs.stat(testFiles[0]))
+  .then((stat) => {
+    report(
+      <Assert key="replace content from URI should be correct"
+        expect={sizes[1]}
+        actual={Math.floor(stat.size)}
+      />)
+    done()
+  })
+
 })
 
 describe('request timeout working properly', (report, done) => {

test/test-0.8.2.js → test/test-0.9.0.js

@@ -22,7 +22,7 @@ window.fetch = new RNFetchBlob.polyfill.Fetch({
 const fs = RNFetchBlob.fs
 const { Assert, Comparer, Info, prop } = RNTest
 const describe = RNTest.config({
-  group : '0.8.2',
+  group : '0.9.0',
   run : true,
   expand : true,
   timeout : 20000,
@@ -63,7 +63,7 @@ describe('#73 unicode response content test', (report, done) => {
 })
 
 describe = RNTest.config({
-  group : '0.8.2',
+  group : '0.9.0',
   run : true,
   expand : true,
   timeout : 24000
@@ -88,7 +88,7 @@ describe('request should not retry after timed out', (report, done) => {
 })
 
 describe = RNTest.config({
-  group : '0.8.2',
+  group : '0.9.0',
   run : true,
   expand : true,
   timeout : 65000
@@ -105,5 +105,4 @@ describe('long live download or upload task won\'t timeout', (report, done) => {
     done()
   })
 
-
 })

test/test-init.js

@@ -18,14 +18,15 @@ const { Assert, Comparer, Info, prop } = RNTest
 // test environment variables
 
 prop('FILENAME', `${Platform.OS}-0.8.0-${Date.now()}.png`)
-prop('TEST_SERVER_URL', 'http://192.168.16.70:8123')
-prop('TEST_SERVER_URL_SSL', 'https://192.168.16.70:8124')
+prop('TEST_SERVER_URL', 'http://192.168.0.11:8123')
+prop('TEST_SERVER_URL_SSL', 'https://192.168.0.11:8124')
 prop('DROPBOX_TOKEN', 'fsXcpmKPrHgAAAAAAAAAoXZhcXYWdgLpQMan6Tb_bzJ237DXhgQSev12hA-gUXt4')
 prop('styles', {
   image : {
     width: Dimensions.get('window').width*0.9,
     height : Dimensions.get('window').width*0.9,
-    margin : 16
+    margin : 16,
+    flex : 1
   }
 })
 
@@ -65,9 +66,9 @@ describe('GET image from server', (report, done) => {
 // require('./test-0.6.2')
 // require('./test-0.6.3')
 // require('./test-0.7.0')
-// require('./test-0.8.0')
+require('./test-0.8.0')
 // require('./test-0.8.2')
-require('./test-fetch')
+// require('./test-fetch')
 // require('./test-fs')
 // require('./test-xmlhttp')
 // require('./test-blob')