Make FlowFile async-first and use a couple of Jasmine expectAsync()

Author: Raphaël Droz

src/AsyncFlowFile.js

@@ -4,7 +4,6 @@
 
 import Eventizer from './Eventizer';
 import FlowFile from './FlowFile';
-import AsyncFlowFile from './AsyncFlowFile';
 import {each, webAPIFileRead} from './tools';
 
 /**
@@ -533,7 +532,7 @@ export default class Flow extends Eventizer {
    * @param {File} file
    * @param Any other parameters supported by addFiles.
    *
-   * @return (async) An initialized <AsyncFlowFile>.
+   * @return (async) An initialized <FlowFile>.
    */
   async addFile(file, ...args) {
     return (await this.addFiles([file], ...args))[0];
@@ -545,7 +544,7 @@ export default class Flow extends Eventizer {
    * @param {FileList|Array} fileList
    * @param {Event} [event] event is optional
    *
-   * @return Promise{[<AsyncFlowFile>,...]} The promise of getting an array of AsyncFlowFile.
+   * @return Promise{[<FlowFile>,...]} The promise of getting an array of FlowFile.
    */
   async addFiles(fileList, event = null, initFileFn = this.opts.initFileFn) {
     let item, file, flowfile, uniqueIdentifier, states = [];
@@ -559,7 +558,7 @@ export default class Flow extends Eventizer {
       }
 
       // ToDo: parallelizable ?
-      var flowFile = new AsyncFlowFile(this, file, uniqueIdentifier),
+      var flowFile = new FlowFile(this, file, uniqueIdentifier),
           state = flowFile.bootstrap(event, initFileFn);
       states.push(state);
     }

src/Flow.js

@@ -182,11 +182,11 @@ export default class FlowFile {
 
   /**
    * Resume file upload
-   * @function
+   * @return Promise
    */
   resume() {
     this.paused = false;
-    this.flowObj.upload();
+    return this.flowObj.upload();
   }
 
   /**
@@ -220,21 +220,25 @@ export default class FlowFile {
    * Retry aborted file upload
    * @function
    */
-  retry() {
-    this.bootstrap('retry');
-    this.flowObj.upload();
+  async retry() {
+    await this.bootstrap('retry');
+    return await this.flowObj.upload();
   }
 
-  /**
-   * Clear current chunks and slice file again
-   * @function
-   */
-  bootstrap(event = null, initFileFn = this.flowObj.opts.initFileFn) {
-    if (typeof initFileFn === "function") {
-      initFileFn(this);
+  async bootstrap(event = null, initFileFn = this.flowObj.opts.initFileFn) {
+    /**
+     * Asynchronous initialization function, if defined, is run
+     * Then _bootstrap follow-up occurs
+     * And, optionally (in case of initial FlowFile creation), the `file-added` event is fired.
+     */
+    if (typeof initFileFn === 'function') {
+      await initFileFn(this, event);
     }
 
     this._bootstrap();
+
+    // console.log("Flowfile returns [async]", this._bootstrapped);
+    return this;
   }
 
   _bootstrap() {
@@ -295,6 +299,20 @@ export default class FlowFile {
     return uploading;
   }
 
+  /**
+   * Indicates if string is being read at the moment
+   * @function
+   * @returns {boolean}
+   */
+  isReading() {
+    for (let chunk of this.chunks) {
+      if (chunk.status() === 'reading') {
+        return true;
+      }
+    }
+    return false;
+  }
+
   /**
    * Indicates if file is has finished uploading and received a response
    * @function

src/FlowFile.js

@@ -156,7 +156,7 @@ describe('fileAdd event', function() {
         new File(['GGG'], 'GGG.bin'),
       ]);
       expect(flowfiles[0].name).toBe('bbb.bin');
-      expect(await flowfiles[0].file.text()).toBe('xxx');
+      expectAsync(flowfiles[0].file.text()).toBe('xxx');
     });
 
     it('A files-added hook can actually change files', async function() {

test/fileAddSpec.js

@@ -33,7 +33,7 @@ describe('setup', function() {
   });
 
   it('should show methods initial state', async function() {
-    expect(await flow.uploadNextChunk()).toBe(false);
+    expectAsync(flow.uploadNextChunk()).toBe(false);
 
     expect(flow.progress()).toBe(0);
     expect(flow.isUploading()).toBe(false);