Add IOS increment HTTP request support and JSON stream lib

src/index.js

@@ -22,6 +22,7 @@ import getUUID from './utils/uuid'
 import base64 from 'base-64'
 import polyfill from './polyfill'
 import android from './android'
+import JSONStream from './json-stream'
 const {
   RNFetchBlobSession,
   readStream,
@@ -126,7 +127,7 @@ function fetch(...args:any):Promise {
     // on progress event listener
     subscription = emitter.addListener('RNFetchBlobProgress', (e) => {
       if(e.taskId === taskId && promise.onProgress) {
-        promise.onProgress(e.written, e.total)
+        promise.onProgress(e.written, e.total, e.chunk)
       }
     })
 
@@ -398,5 +399,6 @@ export default {
   session,
   fs,
   wrap,
-  polyfill
+  polyfill,
+  JSONStream
 }

src/ios/RNFetchBlobNetwork.m

@@ -36,6 +36,7 @@ NSMutableDictionary * uploadProgressTable;
     long bodyLength;
     NSMutableDictionary * respInfo;
     NSInteger respStatus;
+    BOOL isInrement;
 }
 
 @end
@@ -125,6 +126,7 @@ NSOperationQueue *taskQueue;
     self.expectedBytes = 0;
     self.receivedBytes = 0;
     self.options = options;
+    isInrement = [options valueForKey:@"increment"] == nil ? NO : [[options valueForKey:@"increment"] boolValue];
 
     NSString * path = [self.options valueForKey:CONFIG_FILE_PATH];
     NSString * ext = [self.options valueForKey:CONFIG_FILE_EXT];
@@ -284,6 +286,13 @@ NSOperationQueue *taskQueue;
 {
     NSNumber * received = [NSNumber numberWithLong:[data length]];
     receivedBytes += [received longValue];
+    NSString * chunkString = @"";
+    
+    if(isInrement == YES)
+    {
+        chunkString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+    }
+    
     if(respFile == NO)
     {
         [respData appendData:data];
@@ -300,7 +309,8 @@ NSOperationQueue *taskQueue;
          body:@{
                 @"taskId": taskId,
                 @"written": [NSString stringWithFormat:@"%d", receivedBytes],
-                @"total": [NSString stringWithFormat:@"%d", expectedBytes]
+                @"total": [NSString stringWithFormat:@"%d", expectedBytes],
+                @"chunk": chunkString
             }
          ];
     }

src/json-stream.js

@@ -0,0 +1,16 @@
+import Oboe from './lib/oboe-browser.min.js'
+import XMLHttpRequest from './polyfill/XMLHttpRequest'
+
+const OboeExtended = (arg: string | object) => {
+  
+  window.XMLHttpRequest = XMLHttpRequest
+  window.location = ''
+
+  if(typeof arg === 'string')
+    arg = 'JSONStream://' + arg
+  else if(typeof arg === 'object')
+    arg = Object.assign(arg, { url : 'JSONStream://' + arg.url })
+  return Oboe(arg)
+}
+
+export default OboeExtended

src/polyfill/XMLHttpRequest.js

@@ -11,7 +11,7 @@ import ProgressEvent from './ProgressEvent.js'
 const log = new Log('XMLHttpRequest')
 
 log.disable()
-// log.level(2)
+// log.level(3)
 
 const UNSENT = 0
 const OPENED = 1
@@ -30,8 +30,9 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
 
   // readonly
   _readyState : number = UNSENT;
+  _uriType : 'net' | 'file' = 'net';
   _response : any = '';
-  _responseText : any = null;
+  _responseText : any = '';
   _responseHeaders : any = {};
   _responseType : '' | 'arraybuffer' | 'blob' | 'document' | 'json' | 'text' = '';
   // TODO : not suppoted ATM
@@ -42,6 +43,7 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
   _timeout : number = 60000;
   _sendFlag : boolean = false;
   _uploadStarted : boolean = false;
+  _increment : boolean = false;
 
   // RNFetchBlob compatible data structure
   _config : RNFetchBlobConfig = {};
@@ -122,7 +124,10 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
     this._method = method
     this._url = url
     this._headers = {}
+    this._increment = /^JSONStream\:\/\//.test(this._url)
+    this._url = this._url.replace(/^JSONStream\:\/\//, '')
     this._dispatchReadStateChange(XMLHttpRequest.OPENED)
+    
   }
 
   /**
@@ -130,7 +135,9 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
    * @param  {any} body Body in RNfetchblob flavor
    */
   send(body) {
+
     this._body = body
+
     if(this._readyState !== XMLHttpRequest.OPENED)
       throw 'InvalidStateError : XMLHttpRequest is not opened yet.'
     let promise = Promise.resolve()
@@ -164,10 +171,12 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
       for(let h in _headers) {
         _headers[h] = _headers[h].toString()
       }
+
       this._task = RNFetchBlob
                     .config({
                       auto: true,
                       timeout : this._timeout,
+                      increment : this._increment,
                       binaryContentTypes : XMLHttpRequest.binaryContentTypes
                     })
                     .fetch(_method, _url, _headers, body)
@@ -271,7 +280,7 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
     this.upload.dispatchEvent('progress', new ProgressEvent(true, send, total))
   }
 
-  _progressEvent(send:number, total:number) {
+  _progressEvent(send:number, total:number, chunk:string) {
     log.verbose(this.readyState)
     if(this._readyState === XMLHttpRequest.HEADERS_RECEIVED)
       this._dispatchReadStateChange(XMLHttpRequest.LOADING)
@@ -279,6 +288,10 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
     if(total && total >= 0)
         lengthComputable = true
     let e = new ProgressEvent(lengthComputable, send, total)
+
+    if(this._increment) {
+      this._responseText += chunk
+    }
     this.dispatchEvent('progress', e)
   }
 

src/polyfill/XMLHttpRequestEventTarget.js

@@ -8,6 +8,7 @@ import Log from '../utils/log.js'
 const log = new Log('XMLHttpRequestEventTarget')
 
 log.disable()
+// log.level(3)
 
 export default class XMLHttpRequestEventTarget extends EventTarget {