Move IOS fs.readStream buffer to heap

src/ios/RNFetchBlobFS.m

@@ -127,12 +127,12 @@ NSMutableDictionary *fileStreams = nil;
     [[self class] getPathFromUri:uri completionHandler:^(NSString *path, ALAssetRepresentation *asset) {
     
         RCTEventDispatcher * event = bridgeRef.eventDispatcher;
+        int read = 0;
+        int chunkSize = bufferSize;
+        // allocate buffer in heap instead of stack
+        uint8_t * buffer = (uint8_t *) malloc(bufferSize);
         @try
         {
-            int read = 0;
-            int chunkSize = bufferSize;
-            uint8_t * buffer[bufferSize];
-            
             if(path != nil)
             {
                 if([[NSFileManager defaultManager] fileExistsAtPath:path] == NO)
@@ -140,6 +140,7 @@ NSMutableDictionary *fileStreams = nil;
                     NSString * message = [NSString stringWithFormat:@"File not exists at path %@", path];
                     NSDictionary * payload = @{ @"event": FS_EVENT_ERROR, @"detail": message };
                     [event sendDeviceEventWithName:streamId body:payload];
+                    free(buffer);
                     return ;
                 }
                 NSInputStream * stream = [[NSInputStream alloc] initWithFileAtPath:path];
@@ -165,6 +166,7 @@ NSMutableDictionary *fileStreams = nil;
                 NSDictionary * payload = @{ @"event": FS_EVENT_ERROR, @"detail": @"RNFetchBlob.readStream unable to resolve URI" };
                 [event sendDeviceEventWithName:streamId body:payload];
             }
+            
         }
         @catch (NSError * err)
         {
@@ -173,6 +175,8 @@ NSMutableDictionary *fileStreams = nil;
         }
         @finally
         {
+            // release buffer
+            free(buffer);
             NSDictionary * payload = @{ @"event": FS_EVENT_END, @"detail": @"" };
             [event sendDeviceEventWithName:streamId body:payload];
         }

test/test-0.9.4.js

@@ -27,84 +27,84 @@ const dirs = RNFetchBlob.fs.dirs
 
 let prefix = ((Platform.OS === 'android') ? 'file://' : '')
 
-describe('issue #105', (report, done) => {
-  let tmp = null
-  RNFetchBlob
-    .config({ fileCache : true })
-    .fetch('GET', `${TEST_SERVER_URL}/public/github.png`)
-    .then((res) => {
-      tmp = res.path()
-      return RNFetchBlob.fetch('POST', `${TEST_SERVER_URL}/upload-form`, {
-        'Content-Type' : 'multipart/form-data',
-        'Expect' : '100-continue'
-      }, [
-        { name : 'data', data : 'issue#105 test' },
-        { name : 'file', filename : 'github.png', data : RNFetchBlob.wrap(tmp) }
-      ])
-    })
-    .then((res) => {
-      done()
-    })
-})
-
-describe('issue #106', (report, done) => {
-
-  fetch('https://rnfb-test-app.firebaseapp.com/6m-json.json')
-    .then((res) => {
-      console.log('## converted')
-      return res.json()
-    })
-    .then((data) => {
-      // console.log(data)
-      report(<Assert key="fetch request success" expect={20000} actual={data.total}/>)
-      done()
-    })
-
-})
-
-describe('issue #111 get redirect destination', (report, done) => {
-  RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/redirect`)
-  .then((res) => {
-    report(
-      <Assert key="redirect history should tracable"
-        expect={2}
-        actual={res.info().redirects.length}/>,
-      <Assert key="redirect history verify"
-        expect={[`${TEST_SERVER_URL}/redirect`, `${TEST_SERVER_URL}/public/github.png`]}
-        comparer={Comparer.equalToArray}
-        actual={res.info().redirects}/>,
-    )
-    done()
-  })
-})
-
-describe('chunked encoding option test', (report, done) => {
-
-  let path = null
-  let base64 = null
-
-  RNFetchBlob
-    // .config({ fileCache : true })
-    .fetch('GET', `${TEST_SERVER_URL}/public/1600k-img-dummy.jpg`)
-    .then((res) => {
-      base64 = res.base64()
-      return RNFetchBlob
-        .fetch('POST', `${TEST_SERVER_URL}/upload`, {
-          'Content-Type' : 'application/octet-stream;BASE64'
-        }, base64)
-    })
-    .then((res) => {
-      let headers = res.info().headers
-      console.log(res.text())
-      report(<Assert key="request should not use chunked encoding"
-        expect={undefined}
-        actual={headers['transfer-encoding']}/>)
-      fs.unlink(path)
-      done()
-    })
-})
-
-describe('#118 ', (report, done) => {
+// describe('issue #105', (report, done) => {
+//   let tmp = null
+//   RNFetchBlob
+//     .config({ fileCache : true })
+//     .fetch('GET', `${TEST_SERVER_URL}/public/github.png`)
+//     .then((res) => {
+//       tmp = res.path()
+//       return RNFetchBlob.fetch('POST', `${TEST_SERVER_URL}/upload-form`, {
+//         'Content-Type' : 'multipart/form-data',
+//         'Expect' : '100-continue'
+//       }, [
+//         { name : 'data', data : 'issue#105 test' },
+//         { name : 'file', filename : 'github.png', data : RNFetchBlob.wrap(tmp) }
+//       ])
+//     })
+//     .then((res) => {
+//       done()
+//     })
+// })
+//
+// describe('issue #106', (report, done) => {
+//
+//   fetch('https://rnfb-test-app.firebaseapp.com/6m-json.json')
+//     .then((res) => {
+//       console.log('## converted')
+//       return res.json()
+//     })
+//     .then((data) => {
+//       // console.log(data)
+//       report(<Assert key="fetch request success" expect={20000} actual={data.total}/>)
+//       done()
+//     })
+//
+// })
+//
+// describe('issue #111 get redirect destination', (report, done) => {
+//   RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/redirect`)
+//   .then((res) => {
+//     report(
+//       <Assert key="redirect history should tracable"
+//         expect={2}
+//         actual={res.info().redirects.length}/>,
+//       <Assert key="redirect history verify"
+//         expect={[`${TEST_SERVER_URL}/redirect`, `${TEST_SERVER_URL}/public/github.png`]}
+//         comparer={Comparer.equalToArray}
+//         actual={res.info().redirects}/>,
+//     )
+//     done()
+//   })
+// })
+//
+// describe('chunked encoding option test', (report, done) => {
+//
+//   let path = null
+//   let base64 = null
+//
+//   RNFetchBlob
+//     // .config({ fileCache : true })
+//     .fetch('GET', `${TEST_SERVER_URL}/public/1600k-img-dummy.jpg`)
+//     .then((res) => {
+//       base64 = res.base64()
+//       return RNFetchBlob
+//         .fetch('POST', `${TEST_SERVER_URL}/upload`, {
+//           'Content-Type' : 'application/octet-stream;BASE64'
+//         }, base64)
+//     })
+//     .then((res) => {
+//       let headers = res.info().headers
+//       console.log(res.text())
+//       report(<Assert key="request should not use chunked encoding"
+//         expect={undefined}
+//         actual={headers['transfer-encoding']}/>)
+//       fs.unlink(path)
+//       done()
+//     })
+// })
+
+describe('#118 readStream performance prepare the file', (report, done) => {
   let cache = null
   let size = 0
   let tick = Date.now()
@@ -114,59 +114,62 @@ describe('#118 ', (report, done) => {
   RNFetchBlob.config({fileCache : true})
     .fetch('GET', `${TEST_SERVER_URL}/public/22mb-dummy`)
     .then((res) => {
+      report(<Info key="preparation complete"><Text>start in 3 seconds</Text></Info>)
       cache = res.path()
-      return fs.readStream(cache, 'utf8', 102400)
+      setTimeout(() => {
+        fs.readStream(cache, 'utf8', 102400)
+          .then((stream) => {
+            stream.open()
+            start = Date.now()
+            stream.onData((chunk) => {
+              count++
+              size += chunk.length
+              if(Date.now() - tick > 500) {
+                tick = Date.now()
+                report(
+                  <Info key="size" uid="100"><Text>{size} bytes read</Text></Info>)
+              }
+            })
+            stream.onEnd(() => {
+              report(
+                <Info key="size" uid="100"><Text>{size} bytes read</Text></Info>,
+                <Info key="elapsed"><Text>{Date.now() - start} ms</Text></Info>,
+                <Info key="events"><Text>{count} times</Text></Info>,
+                <Assert key="JS thread is not blocked" expect={true} actual={true}/>,)
+              fs.stat(cache).then((stat) => {
+                report(
+                  <Info key="info"><Text>{JSON.stringify(stat)}</Text></Info>)
+                fs.unlink(cache)
+                done()
+              })
+            })
+          })
+      }, 3000)
     })
-    .then((stream) => {
-      stream.open()
-      start = Date.now()
-      stream.onData((chunk) => {
-        count++
-        size += chunk.length
-        if(Date.now() - tick > 500) {
-          tick = Date.now()
-          report(
-            <Info key="size" uid="100"><Text>{size} bytes read</Text></Info>)
-        }
-      })
-      stream.onEnd(() => {
-        report(
-          <Info key="size" uid="100"><Text>{size} bytes read</Text></Info>,
-          <Info key="elapsed"><Text>{Date.now() - start} ms</Text></Info>,
-          <Info key="events"><Text>{count} times</Text></Info>,
-          <Assert key="JS thread is not blocked" expect={true} actual={true}/>,)
-        fs.stat(cache).then((stat) => {
-          report(
-            <Info key="info"><Text>{JSON.stringify(stat)}</Text></Info>)
-          fs.unlink(cache)
-        })
-      })
-    })
-
 })
 
-describe('issue #120 upload progress should work when sending body as-is', (report, done) => {
-
-  let data = RNTest.prop('image')
-  let tick = 0
-
-  let task = RNFetchBlob.fetch('POST', 'https://content.dropboxapi.com/2/files/upload', {
-    Authorization : `Bearer ${DROPBOX_TOKEN}`,
-    'Dropbox-API-Arg': '{\"path\": \"/rn-upload/'+FILENAME+'\",\"mode\": \"add\",\"autorename\": true,\"mute\": false}',
-    'Content-Type' : 'text/plain; charset=dropbox-cors-hack',
-  }, data)
-
-  task.uploadProgress((current, total) => {
-    tick ++
-  })
-  .then((res) => {
-    let resp = res.json()
-    report(
-      <Info key="viewer"><Text>{JSON.stringify(resp)}</Text></Info>,
-      <Assert key="event should be triggered"
-        expect={tick}
-        comparer={Comparer.greater} actual={0}/>)
-    done()
-  })
-
-})
+// describe('issue #120 upload progress should work when sending body as-is', (report, done) => {
+//
+//   let data = RNTest.prop('image')
+//   let tick = 0
+//
+//   let task = RNFetchBlob.fetch('POST', 'https://content.dropboxapi.com/2/files/upload', {
+//     Authorization : `Bearer ${DROPBOX_TOKEN}`,
+//     'Dropbox-API-Arg': '{\"path\": \"/rn-upload/'+FILENAME+'\",\"mode\": \"add\",\"autorename\": true,\"mute\": false}',
+//     'Content-Type' : 'text/plain; charset=dropbox-cors-hack',
+//   }, data)
+//
+//   task.uploadProgress((current, total) => {
+//     tick ++
+//   })
+//   .then((res) => {
+//     let resp = res.json()
+//     report(
+//       <Info key="viewer"><Text>{JSON.stringify(resp)}</Text></Info>,
+//       <Assert key="event should be triggered"
+//         expect={tick}
+//         comparer={Comparer.greater} actual={0}/>)
+//     done()
+//   })
+//
+// })