Fix Android implementation #140

wkh237 · wkh237 · commit dc5c9591386c · 2016-09-26T13:18:26.000+08:00
diff --git a/src/android/src/main/java/com/RNFetchBlob/RNFetchBlobBody.java b/src/android/src/main/java/com/RNFetchBlob/RNFetchBlobBody.java
@@ -372,16 +372,16 @@ public FormField(ReadableMap rawData) {
      */
     private void emitUploadProgress(int written) {
         RNFetchBlobProgressConfig config = RNFetchBlobReq.getReportUploadProgress(mTaskId);
-        if(!config.enable)
-            return;
-        WritableMap args = Arguments.createMap();
-        args.putString("taskId", mTaskId);
-        args.putString("written", String.valueOf(written));
-        args.putString("total", String.valueOf(contentLength));
-
-        // emit event to js context
-        RNFetchBlob.RCTContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                .emit(RNFetchBlobConst.EVENT_UPLOAD_PROGRESS, args);
+        if(config.enable && config.shouldReport((float)written/contentLength)) {
+            WritableMap args = Arguments.createMap();
+            args.putString("taskId", mTaskId);
+            args.putString("written", String.valueOf(written));
+            args.putString("total", String.valueOf(contentLength));
+
+            // emit event to js context
+            RNFetchBlob.RCTContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                    .emit(RNFetchBlobConst.EVENT_UPLOAD_PROGRESS, args);
+        }
     }
 
 }
diff --git a/src/android/src/main/java/com/RNFetchBlob/RNFetchBlobProgressConfig.java b/src/android/src/main/java/com/RNFetchBlob/RNFetchBlobProgressConfig.java
@@ -5,26 +5,12 @@
  */
 public class RNFetchBlobProgressConfig {
 
-    public boolean shouldReport() {
-        boolean checkCount = true;
-        if(count > 0)
-            checkCount = Math.floor(progress*100/count)> tick;
-        return (lastTick - System.currentTimeMillis() > interval) && enable && checkCount;
-    }
-
-    public void tick(float progress) {
-        this.progress = progress;
-        this.tick ++;
-        this.lastTick = System.currentTimeMillis();
-    }
-
     public enum ReportType {
         Upload,
         Download
     };
 
     long lastTick = 0;
-    float progress = 0;
     int tick = 0;
     int count = -1;
     public int interval = -1;
@@ -38,4 +24,16 @@ public enum ReportType {
         this.count = count;
     }
 
+    public boolean shouldReport(float progress) {
+        boolean checkCount = true;
+        if(count > 0 && progress > 0)
+            checkCount = Math.floor(progress*count)> tick;
+        boolean result = (System.currentTimeMillis() - lastTick> interval) && enable && checkCount;
+        if(result) {
+            tick++;
+            lastTick = System.currentTimeMillis();
+        }
+        return result;
+    }
+
 }
diff --git a/src/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobDefaultResp.java b/src/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobDefaultResp.java
@@ -63,8 +63,7 @@ public long read(Buffer sink, long byteCount) throws IOException {
             long read =  mOriginalSource.read(sink, byteCount);
             bytesRead += read > 0 ? read : 0;
             RNFetchBlobProgressConfig reportConfig = RNFetchBlobReq.getReportProgress(mTaskId);
-            if(reportConfig != null && reportConfig.shouldReport()) {
-                reportConfig.tick(bytesRead/contentLength());
+            if(reportConfig != null && reportConfig.shouldReport(bytesRead/contentLength())) {
                 WritableMap args = Arguments.createMap();
                 args.putString("taskId", mTaskId);
                 args.putString("written", String.valueOf(bytesRead));
diff --git a/src/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java b/src/android/src/main/java/com/RNFetchBlob/Response/RNFetchBlobFileResp.java
@@ -71,24 +71,27 @@ public BufferedSource source() {
     private class ProgressReportingSource implements Source {
         @Override
         public long read(Buffer sink, long byteCount) throws IOException {
-            byte [] bytes = new byte[(int) byteCount];
-            long read = originalBody.byteStream().read(bytes, 0, (int) byteCount);
-            bytesDownloaded += read > 0 ? read : 0;
-            Log.i("bytes downloaded", String.valueOf(byteCount) +"/"+ String.valueOf(read) + "=" + String.valueOf(bytesDownloaded));
-            if(read > 0 ) {
-                ofStream.write(bytes, 0, (int) read);
+            try {
+                byte[] bytes = new byte[(int) byteCount];
+                long read = originalBody.byteStream().read(bytes, 0, (int) byteCount);
+                bytesDownloaded += read > 0 ? read : 0;
+                Log.i("bytes downloaded", String.valueOf(byteCount) + "/" + String.valueOf(read) + "=" + String.valueOf(bytesDownloaded));
+                if (read > 0) {
+                    ofStream.write(bytes, 0, (int) read);
+                }
+                RNFetchBlobProgressConfig reportConfig = RNFetchBlobReq.getReportProgress(mTaskId);
+                if (reportConfig != null && reportConfig.shouldReport(bytesDownloaded / contentLength())) {
+                    WritableMap args = Arguments.createMap();
+                    args.putString("taskId", mTaskId);
+                    args.putString("written", String.valueOf(bytesDownloaded));
+                    args.putString("total", String.valueOf(contentLength()));
+                    rctContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                            .emit(RNFetchBlobConst.EVENT_PROGRESS, args);
+                }
+                return read;
+            } catch(Exception ex) {
+                return -1;
             }
-            RNFetchBlobProgressConfig reportConfig = RNFetchBlobReq.getReportProgress(mTaskId);
-            if(reportConfig != null && reportConfig.shouldReport()) {
-                reportConfig.tick(bytesDownloaded/contentLength());
-                WritableMap args = Arguments.createMap();
-                args.putString("taskId", mTaskId);
-                args.putString("written", String.valueOf(bytesDownloaded));
-                args.putString("total", String.valueOf(contentLength()));
-                rctContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                        .emit(RNFetchBlobConst.EVENT_PROGRESS, args);
-            }
-            return read;
         }
 
         @Override
diff --git a/src/ios/RNFetchBlob/RNFetchBlob.m b/src/ios/RNFetchBlob/RNFetchBlob.m
@@ -414,13 +414,14 @@ - (NSDictionary *)constantsToExport
 }
 
 #pragma mark - net.enableProgressReport
-RCT_EXPORT_METHOD(enableProgressReport:(NSString *)taskId interval:(NSNumber*)interval count:(NSNumber*)count  {
+RCT_EXPORT_METHOD(enableProgressReport:(NSString *)taskId interval:(nonnull NSNumber*)interval count:(nonnull NSNumber*)count  {
+    
     RNFetchBlobProgress * cfg = [[RNFetchBlobProgress alloc] initWithType:Download interval:interval count:count];
     [RNFetchBlobNetwork enableProgressReport:taskId config:cfg];
 })
 
 #pragma mark - net.enableUploadProgressReport
-RCT_EXPORT_METHOD(enableUploadProgressReport:(NSString *)taskId interval:(NSNumber*)interval count:(NSNumber*)count{
+RCT_EXPORT_METHOD(enableUploadProgressReport:(NSString *)taskId interval:(nonnull NSNumber*)interval count:(nonnull NSNumber*)count{
     RNFetchBlobProgress * cfg = [[RNFetchBlobProgress alloc] initWithType:Upload interval:interval count:count];
     [RNFetchBlobNetwork enableUploadProgress:taskId config:cfg];
 })
diff --git a/src/ios/RNFetchBlobNetwork.h b/src/ios/RNFetchBlobNetwork.h
@@ -37,8 +37,8 @@ typedef void(^DataTaskCompletionHander) (NSData * _Nullable resp, NSURLResponse
 
 + (NSMutableDictionary  * _Nullable ) normalizeHeaders:(NSDictionary * _Nullable)headers;
 + (void) cancelRequest:(NSString *)taskId;
-+ (void) enableProgressReport:(NSString *) taskId config:(RNFetchBlobProgress*)config;
-+ (void) enableUploadProgress:(NSString *) taskId config:(RNFetchBlobProgress*)config;
++ (void) enableProgressReport:(NSString *) taskId config:(RNFetchBlobProgress *)config;
++ (void) enableUploadProgress:(NSString *) taskId config:(RNFetchBlobProgress *)config;
 - (void) sendRequest:(NSDictionary  * _Nullable )options contentLength:(long)contentLength bridge:(RCTBridge * _Nullable)bridgeRef taskId:(NSString * _Nullable)taskId withRequest:(NSURLRequest * _Nullable)req callback:(_Nullable RCTResponseSenderBlock) callback;
 
 
diff --git a/src/ios/RNFetchBlobNetwork.m b/src/ios/RNFetchBlobNetwork.m
@@ -85,14 +85,14 @@ - (id)init {
     return self;
 }
 
-+ (void) enableProgressReport:(NSString *) taskId
++ (void) enableProgressReport:(NSString *) taskId config:(RNFetchBlobProgress *)config
 {
-    [progressTable setValue:@YES forKey:taskId];
+    [progressTable setValue:config forKey:taskId];
 }
 
-+ (void) enableUploadProgress:(NSString *) taskId
++ (void) enableUploadProgress:(NSString *) taskId config:(RNFetchBlobProgress *)config
 {
-    [uploadProgressTable setValue:@YES forKey:taskId];
+    [uploadProgressTable setValue:config forKey:taskId];
 }
 
 // removing case from headers
@@ -221,11 +221,6 @@ - (void) URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dat
     if ([response respondsToSelector:@selector(allHeaderFields)])
     {
         NSDictionary *headers = [httpResponse allHeaderFields];
-        if(expectedBytes < 0)
-        {
-            expectedBytes = [[headers valueForKey:@"Content-Length"] intValue];
-            
-        }
         NSString * respCType = [[RNFetchBlobReqBuilder getHeaderIgnoreCases:@"Content-Type" fromHeaders:headers] lowercaseString];
         if(respCType != nil)
         {
@@ -329,8 +324,9 @@ - (void) URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dat
     {
         [writeStream write:[data bytes] maxLength:[data length]];
     }
-
-    if([progressTable valueForKey:taskId] == @YES)
+    RNFetchBlobProgress * pconfig = [progressTable valueForKey:taskId];
+    NSNumber * now =[NSNumber numberWithFloat:((float)receivedBytes/(float)expectedBytes)];
+    if(pconfig != nil && [pconfig shouldReport:now])
     {
         [self.bridge.eventDispatcher
          sendDeviceEventWithName:EVENT_PROGRESS
@@ -433,13 +429,15 @@ - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCom
 // upload progress handler
 - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didSendBodyData:(int64_t)bytesSent totalBytesSent:(int64_t)totalBytesWritten totalBytesExpectedToSend:(int64_t)totalBytesExpectedToWrite
 {
-    if([uploadProgressTable valueForKey:taskId] == @YES) {
+    RNFetchBlobProgress * pconfig = [uploadProgressTable valueForKey:taskId];
+    NSNumber * now = [NSNumber numberWithFloat:((float)totalBytesWritten/(float)totalBytesExpectedToWrite)];
+    if(pconfig != nil && [pconfig shouldReport:now]) {
         [self.bridge.eventDispatcher
          sendDeviceEventWithName:EVENT_PROGRESS_UPLOAD
          body:@{
                 @"taskId": taskId,
                 @"written": [NSString stringWithFormat:@"%d", totalBytesWritten],
-                @"total": [NSString stringWithFormat:@"%d", bodyLength]
+                @"total": [NSString stringWithFormat:@"%d", totalBytesExpectedToWrite]
                 }
          ];
     }
diff --git a/src/ios/RNFetchBlobProgress.h b/src/ios/RNFetchBlobProgress.h
@@ -31,8 +31,7 @@ typedef NS_ENUM(NSUInteger, ProgressType) {
 @property (nonatomic) BOOL enable;
 
 -(id)initWithType:(ProgressType)type interval:(NSNumber*)interval count:(NSNumber *)count;
--(BOOL)shouldReport;
--(void)tick;
+-(BOOL)shouldReport:(NSNumber *) nextProgress;
 
 
 @end
diff --git a/src/ios/RNFetchBlobProgress.m b/src/ios/RNFetchBlobProgress.m
@@ -12,7 +12,7 @@ @interface RNFetchBlobProgress ()
 {
     float progress;
     int tick;
-    long lastTick;
+    double lastTick;
 }
 @end
 
@@ -22,33 +22,34 @@ -(id)initWithType:(ProgressType)type interval:(NSNumber *)interval count:(NSNumb
 {
     self = [super init];
     self.count = count;
-    self.interval = interval;
+    self.interval = [NSNumber numberWithFloat:[interval floatValue] /1000];
     self.type = type;
     self.enable = YES;
+    lastTick = 0;
+    tick = 1;
     return self;
 }
 
--(void)tick:(NSNumber *) nextProgress
-{
-    progress = [nextProgress floatValue];
-    tick++;
-    NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
-    // NSTimeInterval is defined as double
-    NSNumber *timeStampObj = [NSNumber numberWithDouble: timeStamp];
-    lastTick = [timeStampObj longValue];
-}
-
--(BOOL)shouldReport
+-(BOOL)shouldReport:(NSNumber *)nextProgress
 {
     BOOL result = YES;
-    if(self.count > 0)
+    float countF = [self.count floatValue];
+    if(countF > 0 && [nextProgress floatValue] > 0)
     {
-        result = floorf(progress*100/[count floatValue]) > tick;
+        result = (int)(floorf([nextProgress floatValue]*countF)) >= tick;
     }
+    
     NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
     // NSTimeInterval is defined as double
     NSNumber *timeStampObj = [NSNumber numberWithDouble: timeStamp];
-    return lastTick - [timeStampObj longValue] > [self.interval longValue] && self.enable && result;
+    float delta = [timeStampObj doubleValue] - lastTick;
+    BOOL shouldReport = delta > [self.interval doubleValue] && self.enable && result;
+    if(shouldReport)
+    {
+        tick++;
+        lastTick = [timeStampObj doubleValue];
+    }
+    return shouldReport;
     
 }
 
diff --git a/src/polyfill/XMLHttpRequest.js b/src/polyfill/XMLHttpRequest.js
@@ -33,7 +33,7 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
   _response : any = '';
   _responseText : any = null;
   _responseHeaders : any = {};
-  _responseType : '' | 'arraybuffer' | 'blob' | 'document' | 'json' | 'text' = '';
+  _responseType : '' | 'arraybuffer' | 'blob'  | 'json' | 'text' = '';
   // TODO : not suppoted ATM
   _responseURL : null = '';
   _responseXML : null = '';
@@ -331,6 +331,13 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
             responseDataReady()
           })
         break;
+        case 'arraybuffer':
+          // TODO : to array buffer
+        break
+        case 'json':
+          this._response = resp.json()
+          this._responseText = resp.text()
+        break
         default :
           this._responseText = resp.text()
           this._response = this.responseText

Original file line number	Diff line number	Diff line change
`@@ -85,14 +85,14 @@ - (id)init {`
`85`	`85`	`return self;`
`86`	`86`	`}`
`87`	`87`
`88`		`-+ (void) enableProgressReport:(NSString *) taskId`
	`88`	`++ (void) enableProgressReport:(NSString ) taskId config:(RNFetchBlobProgress )config`
`89`	`89`	`{`
`90`		`- [progressTable setValue:@YES forKey:taskId];`
	`90`	`+ [progressTable setValue:config forKey:taskId];`
`91`	`91`	`}`
`92`	`92`
`93`		`-+ (void) enableUploadProgress:(NSString *) taskId`
	`93`	`++ (void) enableUploadProgress:(NSString ) taskId config:(RNFetchBlobProgress )config`
`94`	`94`	`{`
`95`		`- [uploadProgressTable setValue:@YES forKey:taskId];`
	`95`	`+ [uploadProgressTable setValue:config forKey:taskId];`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`// removing case from headers`
`@@ -221,11 +221,6 @@ - (void) URLSession:(NSURLSession )session dataTask:(NSURLSessionDataTask )dat`
`221`	`221`	`if ([response respondsToSelector:@selector(allHeaderFields)])`
`222`	`222`	`{`
`223`	`223`	`NSDictionary *headers = [httpResponse allHeaderFields];`
`224`		`- if(expectedBytes < 0)`
`225`		`- {`
`226`		`- expectedBytes = [[headers valueForKey:@"Content-Length"] intValue];`
`227`		`-`
`228`		`- }`
`229`	`224`	`NSString * respCType = [[RNFetchBlobReqBuilder getHeaderIgnoreCases:@"Content-Type" fromHeaders:headers] lowercaseString];`
`230`	`225`	`if(respCType != nil)`
`231`	`226`	`{`
`@@ -329,8 +324,9 @@ - (void) URLSession:(NSURLSession )session dataTask:(NSURLSessionDataTask )dat`
`329`	`324`	`{`
`330`	`325`	`[writeStream write:[data bytes] maxLength:[data length]];`
`331`	`326`	`}`
`332`		`-`
`333`		`- if([progressTable valueForKey:taskId] == @YES)`
	`327`	`+ RNFetchBlobProgress * pconfig = [progressTable valueForKey:taskId];`
	`328`	`+ NSNumber * now =[NSNumber numberWithFloat:((float)receivedBytes/(float)expectedBytes)];`
	`329`	`+ if(pconfig != nil && [pconfig shouldReport:now])`
`334`	`330`	`{`
`335`	`331`	`[self.bridge.eventDispatcher`
`336`	`332`	`sendDeviceEventWithName:EVENT_PROGRESS`
`@@ -433,13 +429,15 @@ - (void) URLSession:(NSURLSession )session task:(NSURLSessionTask )task didCom`
`433`	`429`	`// upload progress handler`
`434`	`430`	`- (void) URLSession:(NSURLSession )session task:(NSURLSessionTask )task didSendBodyData:(int64_t)bytesSent totalBytesSent:(int64_t)totalBytesWritten totalBytesExpectedToSend:(int64_t)totalBytesExpectedToWrite`
`435`	`431`	`{`
`436`		`- if([uploadProgressTable valueForKey:taskId] == @YES) {`
	`432`	`+ RNFetchBlobProgress * pconfig = [uploadProgressTable valueForKey:taskId];`
	`433`	`+ NSNumber * now = [NSNumber numberWithFloat:((float)totalBytesWritten/(float)totalBytesExpectedToWrite)];`
	`434`	`+ if(pconfig != nil && [pconfig shouldReport:now]) {`
`437`	`435`	`[self.bridge.eventDispatcher`
`438`	`436`	`sendDeviceEventWithName:EVENT_PROGRESS_UPLOAD`
`439`	`437`	`body:@{`
`440`	`438`	`@"taskId": taskId,`
`441`	`439`	`@"written": [NSString stringWithFormat:@"%d", totalBytesWritten],`
`442`		`- @"total": [NSString stringWithFormat:@"%d", bodyLength]`
	`440`	`+ @"total": [NSString stringWithFormat:@"%d", totalBytesExpectedToWrite]`
`443`	`441`	`}`
`444`	`442`	`];`
`445`	`443`	`}`