allow to specify number of parallel uploads

README.md

@@ -67,7 +67,6 @@ Easy to use Angular2 directives for files upload ([demo](http://valor-software.g
   5. `formatDataFunction` - Function to modify the request body. 'DisableMultipart' must be 'true' for this function to be called.
   6. `formatDataFunctionIsAsync` - Informs if the function sent in 'formatDataFunction' is asynchronous. Defaults to false.
   7. `parametersBeforeFiles` - States if additional parameters should be appended before or after the file. Defaults to false.
-  8. `uploadFilesInSingleRequest` - If 'true', all files in the queue will be uploaded using one multipart request. Defaults to false. Notice this cannot be combined with 'disableMultipart' is 'true'. 
 
 ### Events
 

demo/src/app/components/file-upload/simple-demo.ts

@@ -18,9 +18,8 @@ export class SimpleDemoComponent {
   constructor (){
     this.uploader = new FileUploader({
       url: URL,
-      disableMultipart: false, // 'DisableMultipart' must be 'true' for formatDataFunction to be called.  
-      uploadFilesInSingleRequest: true,    
-      formatDataFunctionIsAsync: false,
+      disableMultipart: true, // 'DisableMultipart' must be 'true' for formatDataFunction to be called.
+      formatDataFunctionIsAsync: true,
       formatDataFunction: async (item) => {
         return new Promise( (resolve, reject) => {
           resolve({

package.json

@@ -7,9 +7,7 @@
     "lite-server": "lite-server -c demo/bs-config.json",
     "demo.serve": "run-s build link demo.build lite-server",
     "demo.gh-pages": "run-s build demo.build demo.deploy",
-    "demo.build": "ng build",
-    "demo.build.watch": "ng build --watch",
-    "demo.buildOld": "ng build -prod --aot",
+    "demo.build": "ng build -prod --aot",
     "demo.deploy": "gh-pages -d demo/dist",
     "link": "ngm link -p src --here",
     "lint": "exit 0",

src/file-upload/file-uploader.class.ts

@@ -39,13 +39,12 @@ export interface FileUploaderOptions {
   parametersBeforeFiles?: boolean;
   formatDataFunction?: Function;
   formatDataFunctionIsAsync?: boolean;
-  uploadFilesInSingleRequest?: boolean;
+  parallelUploads?: number;
 }
 
 export class FileUploader {
 
   public authToken: string;
-  public isUploading: boolean = false;
   public queue: FileItem[] = [];
   public progress: number = 0;
   public _nextIndex: number = 0;
@@ -53,6 +52,10 @@ export class FileUploader {
   public authTokenHeader: string;
   public response: EventEmitter<any>;
 
+  public get isUploading(): boolean {
+    return this.queue.some((item: FileItem) => item.isUploading);
+  }
+
   public options: FileUploaderOptions = {
     autoUpload: false,
     isHTML5: true,
@@ -60,8 +63,7 @@ export class FileUploader {
     removeAfterUpload: false,
     disableMultipart: false,
     formatDataFunction: (item: FileItem) => item._file,
-    formatDataFunctionIsAsync: false,
-    uploadFilesInSingleRequest : false
+    formatDataFunctionIsAsync: false
   };
 
   protected _failFilterIndex: number;
@@ -73,6 +75,7 @@ export class FileUploader {
 
   public setOptions(options: FileUploaderOptions): void {
     this.options = Object.assign(this.options, options);
+
     this.authToken = this.options.authToken;
     this.authTokenHeader = this.options.authTokenHeader || 'Authorization';
     this.autoUpload = this.options.autoUpload;
@@ -90,8 +93,8 @@ export class FileUploader {
       this.options.filters.unshift({ name: 'mimeType', fn: this._mimeTypeFilter });
     }
 
-    for (let i = 0; i < this.queue.length; i++) {
-      this.queue[ i ].url = this.options.url;
+    for (let item of this.queue) {
+      item.url = this.options.url;
     }
   }
 
@@ -147,23 +150,11 @@ export class FileUploader {
   }
 
   public uploadItem(value: FileItem): void {
-    this.uploadItems(new Array<FileItem>(value));
-  }
-
-  public uploadItems(values: FileItem[]): void {
-    values.forEach(element => {
-      let index = this.getIndexOfItem(element);
-      let item = this.queue[ index ];
-      item._prepareToUploading();
-    });
-        
+    let index = this.getIndexOfItem(value);
+    let item = this.queue[ index ];
     let transport = this.options.isHTML5 ? '_xhrTransport' : '_iframeTransport';
-    
-    if (this.isUploading) {
-      return;
-    }
-    this.isUploading = true;    
-    (this as any)[ transport ](values);
+    item._prepareToUploading();
+    (this as any)[ transport ](item);
   }
 
   public cancelItem(value: FileItem): void {
@@ -180,14 +171,10 @@ export class FileUploader {
     if (!items.length) {
       return;
     }
-
     items.map((item: FileItem) => item._prepareToUploading());
-
-    if (this.options.uploadFilesInSingleRequest){
-      this.uploadItems(items);      
-    }
-    else{
-      items[ 0 ].upload();
+    let numberUploadsToStart = Math.min(items.length, this.options.parallelUploads || 1);
+    for (let i = 0; i < numberUploadsToStart; ++i) {
+      items[ i ].upload();
     }
   }
 
@@ -291,27 +278,11 @@ export class FileUploader {
   public _onCompleteItem(item: FileItem, response: string, status: number, headers: ParsedResponseHeaders): void {
     item._onComplete(response, status, headers);
     this.onCompleteItem(item, response, status, headers);
-    
-    if (!this.options.uploadFilesInSingleRequest)
-    {
-      let nextItem = this.getReadyItems()[ 0 ];
-      this.isUploading = false;
-      if (nextItem) {
-        nextItem.upload();
-        return;
-      }
-      this.onCompleteAll();
-      this.progress = this._getTotalProgress();
-      this._render();
+    let nextItem = this.getReadyItems()[ 0 ];
+    if (nextItem) {
+      nextItem.upload();
+      return;
     }
-  }
-
-  public _onCompleteAllItems(items: FileItem[], response: string, status: number, headers: ParsedResponseHeaders): void {
-    items.forEach(item => {
-      item._onComplete(response, status, headers);
-      this.onCompleteItem(item, response, status, headers);
-    });    
-    this.isUploading = false;
     this.onCompleteAll();
     this.progress = this._getTotalProgress();
     this._render();
@@ -326,36 +297,22 @@ export class FileUploader {
     };
   }
 
-  protected _xhrTransport(items: FileItem[]): any {  
+  protected _xhrTransport(item: FileItem): any {
     let that = this;
-    let firstItem = items[0];    
-    let xhr = firstItem._xhr = new XMLHttpRequest();
+    let xhr = item._xhr = new XMLHttpRequest();
     let sendable: any;
+    this._onBeforeUploadItem(item);
 
-    items.forEach(item => {
-      this._onBeforeUploadItem(item);  
-    });
-    
-    items.forEach(item => {
-      if (typeof item._file.size !== 'number') {
-        throw new TypeError('The file specified is no longer valid');
-      }
-    });
-
+    if (typeof item._file.size !== 'number') {
+      throw new TypeError('The file specified is no longer valid');
+    }
     if (!this.options.disableMultipart) {
       sendable = new FormData();
-      items.forEach(item => {
-        this._onBuildItemForm(item, sendable);
-      });
-
-      const appendFiles = () => {
-        items.forEach(item => {
-          sendable.append(item.alias, item._file, item.file.name)
-        });        
-      };
+      this._onBuildItemForm(item, sendable);
 
+      const appendFile = () => sendable.append(item.alias, item._file, item.file.name);
       if (!this.options.parametersBeforeFiles) {
-        appendFiles();
+        appendFile();
       }
 
       // For AWS, Additional Parameters must come BEFORE Files
@@ -363,55 +320,53 @@ export class FileUploader {
         Object.keys(this.options.additionalParameter).forEach((key: string) => {
           let paramVal = this.options.additionalParameter[ key ];
           // Allow an additional parameter to include the filename
-          if (!this.options.uploadFilesInSingleRequest && typeof paramVal === 'string' && paramVal.indexOf('{{file_name}}') >= 0) {
-            paramVal = paramVal.replace('{{file_name}}', firstItem.file.name);
+          if (typeof paramVal === 'string' && paramVal.indexOf('{{file_name}}') >= 0) {
+            paramVal = paramVal.replace('{{file_name}}', item.file.name);
           }
           sendable.append(key, paramVal);
         });
       }
 
       if (this.options.parametersBeforeFiles) {
-        appendFiles();
+        appendFile();
       }
     } else {
-      sendable = this.options.formatDataFunction(firstItem);
+      sendable = this.options.formatDataFunction(item);
     }
 
+    xhr.upload.onprogress = (event: any) => {
+      let progress = Math.round(event.lengthComputable ? event.loaded * 100 / event.total : 0);
+      this._onProgressItem(item, progress);
+    };
     xhr.onload = () => {
       let headers = this._parseHeaders(xhr.getAllResponseHeaders());
       let response = this._transformResponse(xhr.response, headers);
       let gist = this._isSuccessCode(xhr.status) ? 'Success' : 'Error';
       let method = '_on' + gist + 'Item';
-      items.forEach(item => {
-        (this as any)[ method ](item, response, xhr.status, headers);        
-      });
-      this._onCompleteAllItems(items, response, xhr.status, headers);      
+      (this as any)[ method ](item, response, xhr.status, headers);
+      this._onCompleteItem(item, response, xhr.status, headers);
     };
     xhr.onerror = () => {
       let headers = this._parseHeaders(xhr.getAllResponseHeaders());
       let response = this._transformResponse(xhr.response, headers);
-      items.forEach(item => {
-        this._onErrorItem(firstItem, response, xhr.status, headers);
-      });
-      this._onCompleteAllItems(items, response, xhr.status, headers); 
+      this._onErrorItem(item, response, xhr.status, headers);
+      this._onCompleteItem(item, response, xhr.status, headers);
     };
     xhr.onabort = () => {
       let headers = this._parseHeaders(xhr.getAllResponseHeaders());
       let response = this._transformResponse(xhr.response, headers);
-      items.forEach(item => {
-        this._onCancelItem(firstItem, response, xhr.status, headers);
-      });
-      this._onCompleteAllItems(items, response, xhr.status, headers); 
+      this._onCancelItem(item, response, xhr.status, headers);
+      this._onCompleteItem(item, response, xhr.status, headers);
     };
-    xhr.open(firstItem.method, firstItem.url, true);
-    xhr.withCredentials = firstItem.withCredentials;
+    xhr.open(item.method, item.url, true);
+    xhr.withCredentials = item.withCredentials;
     if (this.options.headers) {
       for (let header of this.options.headers) {
         xhr.setRequestHeader(header.name, header.value);
       }
     }
-    if (firstItem.headers.length) {
-      for (let header of firstItem.headers) {
+    if (item.headers.length) {
+      for (let header of item.headers) {
         xhr.setRequestHeader(header.name, header.value);
       }
     }
@@ -420,7 +375,7 @@ export class FileUploader {
     }
     xhr.onreadystatechange = function () {
       if (xhr.readyState == XMLHttpRequest.DONE) {
-        that.response.emit(xhr.responseText)
+        that.response.emit(xhr.responseText);
       }
     }
     if (this.options.formatDataFunctionIsAsync) {