feat: time remaining will return infinity if average speed is zero

Author: AidasK

src/flow.js

@@ -589,11 +589,16 @@
      * @returns {number}
      */
     timeRemaining: function () {
-      var time = 0;
+      var sizeDelta = 0;
+      var averageSpeed = 0;
       each(this.files, function (file) {
-        time += file.timeRemaining();
+        sizeDelta += file.size - file.sizeUploaded();
+        averageSpeed += file.averageSpeed;
       });
-      return time;
+      if (!averageSpeed) {
+        return Number.POSITIVE_INFINITY;
+      }
+      return sizeDelta / averageSpeed;
     }
   };
 
@@ -708,8 +713,11 @@
      * @function
      */
     measureSpeed: function () {
-      var smoothingFactor = this.flowObj.opts.speedSmoothingFactor;
       var timeSpan = Date.now() - this._lastProgressCallback;
+      if (!timeSpan) {
+        return ;
+      }
+      var smoothingFactor = this.flowObj.opts.speedSmoothingFactor;
       var uploaded = this.sizeUploaded();
       // Prevent negative upload speed after file upload resume
       this.currentSpeed = Math.max((uploaded - this._prevUploadedSize) / timeSpan * 1000, 0);
@@ -722,7 +730,7 @@
      * Callback when something happens within the chunk.
      * @function
      * @param {string} event can be 'progress', 'success', 'error' or 'retry'
-     * @param {string} message
+     * @param {string} [message]
      */
     chunkEvent: function (event, message) {
       switch (event) {
@@ -746,8 +754,10 @@
           if (this.error) {
             return;
           }
+          this.measureSpeed();
           this.flowObj.fire('fileProgress', this);
           this.flowObj.fire('progress');
+          this._lastProgressCallback = Date.now();
           if (this.isComplete()) {
             this.flowObj.fire('fileSuccess', this, message);
           }
@@ -915,7 +925,7 @@
      */
     timeRemaining: function () {
       if (!this.averageSpeed) {
-        return 0;
+        return Number.POSITIVE_INFINITY;
       }
       return Math.floor(Math.max(this.size - this.sizeUploaded(), 0) / this.averageSpeed);
     },
@@ -972,7 +982,7 @@
      * File size
      * @type {number}
      */
-    this. fileObjSize = fileObj.size;
+    this.fileObjSize = fileObj.size;
 
     /**
      * File offset

test/setupSpec.js

@@ -39,7 +39,7 @@ describe('setup', function() {
 
     expect(flow.progress()).toBe(0);
     expect(flow.isUploading()).toBe(false);
-    expect(flow.timeRemaining()).toBe(0);
+    expect(flow.timeRemaining()).toBe(Number.POSITIVE_INFINITY);
     expect(flow.sizeUploaded()).toBe(0);
   });
 

test/uploadSpec.js

@@ -380,4 +380,53 @@ describe('upload file', function() {
     expect(success).wasCalledWith(file, "response");
     expect(error).not.toHaveBeenCalled();
   });
+
+  it('should have upload speed', function() {
+    var clock = sinon.useFakeTimers();
+    flow.opts.testChunks = false;
+    flow.opts.speedSmoothingFactor = 0.5;
+    flow.opts.simultaneousUploads = 1;
+    var fileProgress = jasmine.createSpy('fileProgress');
+    flow.on('fileProgress', fileProgress);
+    flow.addFile(new Blob(['0123456789']));
+    flow.addFile(new Blob(['12345']));
+    var fileFirst = flow.files[0];
+    var fileSecond = flow.files[1];
+    expect(fileFirst.currentSpeed).toBe(0);
+    expect(fileFirst.averageSpeed).toBe(0);
+    expect(fileFirst.sizeUploaded()).toBe(0);
+    expect(fileFirst.timeRemaining()).toBe(Number.POSITIVE_INFINITY);
+    expect(flow.sizeUploaded()).toBe(0);
+    expect(flow.timeRemaining()).toBe(Number.POSITIVE_INFINITY);
+    flow.upload();
+
+    clock.tick(1000);
+    requests[0].progress(5, 10, true);
+    expect(fileProgress).toHaveBeenCalled();
+    expect(fileFirst.currentSpeed).toBe(5);
+    expect(fileFirst.averageSpeed).toBe(2.5);
+    expect(fileFirst.sizeUploaded()).toBe(5);
+    expect(fileFirst.timeRemaining()).toBe(2);
+
+    expect(flow.sizeUploaded()).toBe(5);
+    expect(flow.timeRemaining()).toBe(4);
+
+    clock.tick(1000);
+    requests[0].progress(10, 10, true);
+    expect(fileFirst.currentSpeed).toBe(5);
+    expect(fileFirst.averageSpeed).toBe(3.75);
+
+    requests[0].respond(200, [], "response");
+    expect(fileFirst.currentSpeed).toBe(5);
+    expect(fileFirst.averageSpeed).toBe(3.75);
+
+    requests[1].respond(200, [], "response");
+    expect(fileFirst.sizeUploaded()).toBe(10);
+    expect(fileFirst.timeRemaining()).toBe(0);
+    expect(fileSecond.sizeUploaded()).toBe(5);
+    expect(fileSecond.timeRemaining()).toBe(0);
+    expect(flow.sizeUploaded()).toBe(15);
+    expect(flow.timeRemaining()).toBe(0);
+
+  });
 });