Add ios task cancel implementation, add test case for task cancel #39

wkh237 · wkh237 · commit 05ade3a0d81a · 2016-07-16T22:22:14.000+08:00
diff --git a/src/index.js b/src/index.js
@@ -160,6 +160,7 @@ function fetch(...args:any):Promise {
     return promise
   }
   promise.cancel = (fn) => {
+    fn = fn || function(){}
     RNFetchBlob.cancelRequest(taskId, fn)
   }
 
diff --git a/src/ios/RNFetchBlob/RNFetchBlob.m b/src/ios/RNFetchBlob/RNFetchBlob.m
@@ -347,6 +347,12 @@ - (NSDictionary *)constantsToExport
                ]);
 }
 
+RCT_EXPORT_METHOD(cancelRequest:(NSString *)taskId callback:(RCTResponseSenderBlock)callback) {
+    [RNFetchBlobNetwork cancelRequest:taskId];
+    callback(@[[NSNull null], taskId]);
+    
+}
+
 #pragma mark RNFetchBlob private methods
 
 
diff --git a/src/ios/RNFetchBlobNetwork.h b/src/ios/RNFetchBlobNetwork.h
@@ -35,6 +35,7 @@ typedef void(^DataTaskCompletionHander) (NSData * _Nullable resp, NSURLResponse
 - (void) sendRequest;
 
 + (NSMutableDictionary  * _Nullable ) normalizeHeaders:(NSDictionary * _Nullable)headers;
++ (void) cancelRequest:(NSString *)taskId;
 - (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
@@ -21,6 +21,8 @@
 //
 ////////////////////////////////////////
 
+NSMutableDictionary * taskTable;
+
 @interface RNFetchBlobNetwork ()
 {
     BOOL * respFile;
@@ -53,6 +55,9 @@ - (id)init {
     if(taskQueue == nil) {
         taskQueue = [[NSOperationQueue alloc] init];
     }
+    if(taskTable == nil) {
+        taskTable = [[NSMutableDictionary alloc] init];
+    }
     return self;
 }
 
@@ -109,7 +114,7 @@ - (void) sendRequest:(NSDictionary  * _Nullable )options
         respFile = NO;
     }
     NSURLSessionDataTask * task = [session dataTaskWithRequest:req];
-    
+    [taskTable setValue:task forKey:taskId];
     [task resume];
     
     // network status indicator
@@ -189,7 +194,7 @@ - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCom
 - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didSendBodyData:(int64_t)bytesSent totalBytesSent:(int64_t)totalBytesWritten totalBytesExpectedToSend:(int64_t)totalBytesExpectedToWrite
 {
     [self.bridge.eventDispatcher
-     sendDeviceEventWithName:@"RNFetchBlobProgress"
+     sendDeviceEventWithName:@"RNFetchBlobProgress-upload"
      body:@{
             @"taskId": taskId,
             @"written": [NSString stringWithFormat:@"%d", totalBytesWritten],
@@ -198,6 +203,13 @@ - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didSen
      ];
 }
 
++ (void) cancelRequest:(NSString *)taskId
+{
+    NSURLSessionDataTask * task = (NSURLSessionDataTask *)[taskTable objectForKey:taskId];
+    if(task != nil && task.state == NSURLSessionTaskStateRunning)
+        [task cancel];
+}
+
 //- (void) application:(UIApplication *)application handleEventsForBackgroundURLSession:(NSString *)identifier completionHandler:(void (^)())completionHandler {
 //    
 //}
diff --git a/test/test-0.7.0.js b/test/test-0.7.0.js
@@ -26,9 +26,10 @@ const { TEST_SERVER_URL, TEST_SERVER_URL_SSL, DROPBOX_TOKEN, styles } = prop()
 const  dirs = RNFetchBlob.fs.dirs
 
 let prefix = ((Platform.OS === 'android') ? 'file://' : '')
+let bigfile = null
 
 describe('Upload and download large file', (report, done) => {
-  let filename = '22mb-dummy-' + Date.now()
+  let filename = Platform.OS+'-0.7.0-22mb-dummy-' + Date.now()
   let begin = -1
   let begin2 = -1
   let deb = Date.now()
@@ -49,35 +50,91 @@ describe('Upload and download large file', (report, done) => {
     </Info>)
   })
   .then((res) => {
-    try {
+    bigfile = res.path()
+    done()
+  })
+  // .then((res) => {
+  //   bigfile = res.path()
+  //   try {
+  //   deb = Date.now()
+  //   let promise =  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' : 'application/octet-stream',
+  //   }, RNFetchBlob.wrap(res.path()))
+  //   promise.uploadProgress((now, total) => {
+  //     if(Date.now() - deb < 1000)
+  //       return
+  //     deb = Date.now()
+  //     if(begin2 === -1)
+  //       begin2 = Date.now()
+  //     let speed = Math.floor(now / (Date.now() - begin2))
+  //     report(<Info uid="100"  key="progress">
+  //       <Text>
+  //         {`upload ${now} / ${total} bytes (${speed} kb/s)`}
+  //         {` ${Math.floor((total-now)/speed/1000)} seconds left`}
+  //       </Text>
+  //     </Info>)
+  //   })
+  //   return promise
+  // } catch(err) { console.log(err) }
+  // })
+  // .then((res) => {
+  //   report(<Assert
+  //     key="upload should success without crashing app"
+  //     expect={filename}
+  //     actual={res.json().name}/>)
+  //   done()
+  // })
+})
+
+describe('cancel task should work properly', (report, done) => {
+  let filename = Platform.OS+'-0.7.0-cancel-test-22mb-dummy-' + Date.now()
+  let bytesWitten = 0
+  let deb = Date.now()
+  let begin = -1
+  let promise =  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' : 'application/octet-stream',
+  }, RNFetchBlob.wrap(bigfile))
+  promise.uploadProgress((now, total) => {
+    bytesWitten = now
+    if(Date.now() - deb < 1000)
+      return
     deb = Date.now()
-    let promise =  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' : 'application/octet-stream',
-    }, RNFetchBlob.wrap(res.path()))
-    promise.uploadProgress((now, total) => {
-      if(Date.now() - deb < 1000)
-        return
-      deb = Date.now()
-      if(begin2 === -1)
-        begin2 = Date.now()
-      let speed = Math.floor(now / (Date.now() - begin2))
-      report(<Info uid="100"  key="progress">
-        <Text>
-          {`upload ${now} / ${total} bytes (${speed} kb/s)`}
-          {` ${Math.floor((total-now)/speed/1000)} seconds left`}
-        </Text>
-      </Info>)
-    })
-    return promise
-  } catch(err) { console.log(err) }
+    if(begin === -1)
+      begin = Date.now()
+    let speed = Math.floor(now / (Date.now() - begin))
+    report(<Info uid="100"  key="progress">
+      <Text>
+        {`upload ${now} / ${total} bytes (${speed} kb/s)`}
+        {` ${Math.floor((total-now)/speed/1000)} seconds left`}
+      </Text>
+    </Info>)
   })
-  .then((res) => {
-    report(<Assert
-      key="upload should success without crashing app"
-      expect={filename}
-      actual={res.json().name}/>)
+  let checkpoint1 = 0
+  Timer.setTimeout(() => {
+    promise.cancel()
+  }, 5000)
+  Timer.setTimeout(() => {
+    checkpoint1 = bytesWitten
+  }, 6000)
+  Timer.setTimeout(() => {
+    report(<Assert key="data should not write to stream after task is canceled"
+      expect={checkpoint1}
+      actual={bytesWitten}/>)
     done()
+  }, 10000)
+  promise.then((res) => {
+    report(
+      <Assert key="task not canceled"
+        expected={false}
+        actual={true}/>)
+  })
+  promise.catch((resp) => {
+    report(<Assert key="task cancelled rejection should be catachable"
+      expect={true}
+      actual={true}/>)
   })
 })
diff --git a/test/test-init.js b/test/test-init.js
@@ -58,12 +58,12 @@ describe('GET image from server', (report, done) => {
 })
 
 
-require('./test-0.1.x-0.4.x')
-require('./test-0.5.1')
-require('./test-0.5.2')
-require('./test-0.6.0')
-require('./test-0.6.2')
-require('./test-0.6.3')
+// require('./test-0.1.x-0.4.x')
+// require('./test-0.5.1')
+// require('./test-0.5.2')
+// require('./test-0.6.0')
+// require('./test-0.6.2')
+// require('./test-0.6.3')
 require('./test-0.7.0')
-require('./test-fs')
-require('./test-android')
+// require('./test-fs')
+// require('./test-android')

Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,7 @@ function fetch(...args:any):Promise {`
`160`	`160`	`return promise`
`161`	`161`	`}`
`162`	`162`	`promise.cancel = (fn) => {`
	`163`	`+ fn = fn \|\| function(){}`
`163`	`164`	`RNFetchBlob.cancelRequest(taskId, fn)`
`164`	`165`	`}`
`165`	`166`