chunk.abort() to set FlowFile status to "pending" instead of "uploading" (#349)

status: When a chunk abort(), eg when parent's FlowFile.pause(), set its status back to pending (and pendingRetry === true) since it's not actually "uploading" anymore

Author: Raphaël Droz

dist/flow.js

@@ -444,11 +444,11 @@ export default class FlowChunk {
   status(isTest) {
     if (this.readState === 1) {
       return 'reading';
-    } else if (this.pendingRetry || this.preprocessState === 1) {
+    } else if (this.preprocessState === 1) {
       // if pending retry then that's effectively the same as actively uploading,
       // there might just be a slight delay before the retry starts
       return 'uploading';
-    } else if (!this.xhr) {
+    } else if (!this.xhr || this.pendingRetry) {
       return 'pending';
     } else if (this.xhr.readyState < 4) {
       // Status is really 'OPENED', 'HEADERS_RECEIVED'

dist/flow.min.js

@@ -196,16 +196,16 @@ export default class FlowFile {
   abort(reset) {
     this.currentSpeed = 0;
     this.averageSpeed = 0;
-    var chunks = this.chunks;
     if (reset) {
       this.chunks = [];
     }
-    each(chunks, function (c) {
+    for (let c of this.chunks) {
       if (c.status() === 'uploading') {
         c.abort();
+        c.pendingRetry = true;
         this.flowObj.uploadNextChunk();
       }
-    }, this);
+    }
   }
 
   /**

src/FlowChunk.js

@@ -127,6 +127,7 @@ describe('upload file', function() {
   it('should pause and resume file', function () {
     flow.opts.chunkSize = 1;
     flow.opts.simultaneousUploads = 2;
+    flow.opts.testChunks = false;
     flow.addFile(new Blob(['1234']));
     flow.addFile(new Blob(['56']));
     var files = flow.files;
@@ -271,14 +272,15 @@ describe('upload file', function() {
     flow.addFile(new Blob(['12']));
     var file = flow.files[0];
     flow.upload();
+    expect(file.chunks[0].status()).toBe('uploading');
     expect(xhr.requests.length).toBe(1);
 
     xhr.requests[0].respond(400);
     expect(xhr.requests.length).toBe(1);
     expect(error).not.toHaveBeenCalled();
     expect(success).not.toHaveBeenCalled();
     expect(retry).toHaveBeenCalled();
-    expect(file.chunks[0].status()).toBe('uploading');
+    expect(file.chunks[0].status()).toBe('pending');
 
     jasmine.clock().tick(100);
     expect(xhr.requests.length).toBe(2);