Fix CI correctly

package.json

@@ -107,4 +107,4 @@
             "**/*.spec.js"
         ]
     }
-}
+}

src/lib/Dispatcher.ts

@@ -28,4 +28,13 @@ export class Dispatcher {
       }
     }
   }
+
+  clean() {
+    Object.values(this.events).forEach((event: DispatcherEvent) => {
+      event.callbacks.forEach((callback) => {
+        event.unregisterCallback(callback);
+      });
+    });
+    this.events = {};
+  }
 }

src/lib/Downloader.spec.ts

@@ -40,6 +40,7 @@ function waitDownloadForEnd(downloader) {
     downloader.on('error', (err) => {
       reject(err);
     });
+    downloader.start();
   });
 }
 
@@ -63,7 +64,6 @@ function checkFileIntegrity(
       return false;
     }
   }
-
   return true;
 }
 
@@ -81,7 +81,7 @@ test('createDownloader return Downloader instance', (t) => {
   t.true(downloader instanceof Downloader);
 });
 
-test('addFile must increment files in stats', (t) => {
+test('addFile must increment files in stats', async (t) => {
   const downloader = createDownloader();
   const file = filesLibrary[0];
   t.is(0, downloader.stats().files);
@@ -93,10 +93,9 @@ test('start function must start downloads', async (t) => {
   const downloader = createDownloader();
 
   t.is(0, downloader.stats().fileDownloaded);
-  filesLibrary.forEach((file) => {
+  for (const file of filesLibrary) {
     downloader.addFile(file.url, installPath);
-  });
-  await downloader.start();
+  }
   await waitDownloadForEnd(downloader);
   t.is(filesLibrary.length, downloader.stats().fileDownloaded);
 
@@ -110,10 +109,9 @@ test('downloads files checksum must be created if specified', async (t) => {
   downloader.checksumAlgo = 'sha1';
 
   t.is(0, downloader.stats().fileDownloaded);
-  filesLibrary.forEach((file) => {
+  for (const file of filesLibrary) {
     downloader.addFile(file.url, installPath, null, file.sha1);
-  });
-  await downloader.start();
+  }
   await waitDownloadForEnd(downloader);
   t.is(filesLibrary.length, downloader.stats().fileDownloaded);
 
@@ -127,10 +125,9 @@ test('downloads files checksum with another algo must work', async (t) => {
   downloader.checksumAlgo = 'md5';
 
   t.is(0, downloader.stats().fileDownloaded);
-  filesLibrary.forEach((file) => {
+  for (const file of filesLibrary) {
     downloader.addFile(file.url, installPath, null, file.md5);
-  });
-  await downloader.start();
+  }
   await waitDownloadForEnd(downloader);
   t.is(filesLibrary.length, downloader.stats().fileDownloaded);
 
@@ -145,8 +142,6 @@ test('downloads files with wrong checksum must fail', async (t) => {
   downloader.checksumAlgo = 'md5';
 
   downloader.addFile(filesLibrary[0].url, installPath, null, badChecksum);
-  await downloader.start();
-
   try {
     await waitDownloadForEnd(downloader);
     t.fail();
@@ -160,10 +155,9 @@ test('downloads with low simulataneousDownload must download all files', async (
   downloader.simultaneusDownloads = 1;
 
   t.is(0, downloader.stats().fileDownloaded);
-  filesLibrary.forEach((file) => {
+  for (const file of filesLibrary) {
     downloader.addFile(file.url, installPath);
-  });
-  await downloader.start();
+  }
   await waitDownloadForEnd(downloader);
   t.is(filesLibrary.length, downloader.stats().fileDownloaded);
 });
@@ -177,7 +171,6 @@ test('download with existing file and correct checksum must not restart download
     return newDownloader;
   };
   let downloader = createDownload();
-  await downloader.start();
   await waitDownloadForEnd(downloader);
 
   let stats = getFileStats(file.name);
@@ -187,7 +180,6 @@ test('download with existing file and correct checksum must not restart download
     // @ts-ignore
     setTimeout(async () => {
       downloader = createDownload();
-      await downloader.start();
       await waitDownloadForEnd(downloader);
 
       stats = getFileStats(file.name);
@@ -210,7 +202,6 @@ test('two files with same name must redownload', async (t) => {
     return newDownloader;
   };
   let downloader = createDownload(file1);
-  await downloader.start();
   await waitDownloadForEnd(downloader);
   t.true(checkFileIntegrity(fileName, file1.sha1, downloader.checksumAlgo));
 
@@ -221,7 +212,6 @@ test('two files with same name must redownload', async (t) => {
     // @ts-ignore
     setTimeout(async () => {
       downloader = createDownload(file2);
-      await downloader.start();
       await waitDownloadForEnd(downloader);
 
       t.true(checkFileIntegrity(fileName, file2.sha1, downloader.checksumAlgo));

src/lib/Downloader.ts

@@ -30,7 +30,7 @@ export class Downloader {
   public maxRetries = 3;
   public checksumAlgo = 'sha256';
 
-  private downloaderOptions = {};
+  private readonly downloaderOptions = {};
 
   constructor(downloaderOptions = {}) {
     this.downloaderOptions = downloaderOptions;
@@ -63,12 +63,7 @@ export class Downloader {
     } else {
       return true;
     }
-
-    if (localChecksum !== checksum) {
-      return true;
-    }
-
-    return false;
+    return localChecksum !== checksum;
   }
 
   private async startDownloader(downloader) {
@@ -116,14 +111,15 @@ export class Downloader {
           checksum
         );
       }
-      await this.downloaderCompleted(downloader);
+
+      this.downloaderCompleted(downloader);
     });
 
     if (
       !this.forceDownload &&
       !(await this.isFileNeedUpdate(downloader.filePath, downloader.checksum))
     ) {
-      await this.downloaderCompleted(downloader, true);
+      this.downloaderCompleted(downloader, true);
       return;
     }
 
@@ -133,13 +129,11 @@ export class Downloader {
     await downloader.start();
   }
 
-  private async downloaderCompleted(downloader, pass = false) {
+  private downloaderCompleted(downloader, pass = false) {
     this.filesDownloaded++;
     const stats = downloader.getStats();
     if (pass) {
-      const stats = await downloader.getTotalSize();
-      const fileSize = stats.total;
-      this.bytesDownloaded += fileSize;
+      this.bytesDownloaded += downloader.fileSize;
     }
 
     this.progress = (this.bytesDownloaded * 100) / this.bytesToDownload;
@@ -190,6 +184,7 @@ export class Downloader {
     if (this.state === DownloaderState.DOWNLOADING) {
       throw new Error('Cannot clean while downloading.');
     }
+    //this.dispatcher.clean();
     this.downloadersQueue = [];
     this.downloadersInProgress = [];
     this.filesToDownload = 0;
@@ -242,11 +237,12 @@ export class Downloader {
 
     this.filesToDownload = this.downloadersQueue.length;
 
-    await this.downloadersQueue.forEach(async (downloader) => {
+    for (const downloader of this.downloadersQueue) {
       const stats = await downloader.getTotalSize();
       const fileSize = stats.total;
       this.bytesToDownload = this.bytesToDownload + fileSize;
-    });
+      downloader.fileSize = fileSize;
+    }
 
     this.downloadersQueue.forEach(() => {
       if (this.startNextDownloader() == false) {
@@ -270,15 +266,15 @@ export class Downloader {
     });
   }
 
-  resume() {
+  async resume() {
     this.state = DownloaderState.DOWNLOADING;
 
     if (this.downloadersInProgress.length > 0) {
       this.downloadersInProgress.forEach((downloader) => {
         downloader.resume();
       });
     } else {
-      this.startNextDownloader();
+      await this.startNextDownloader();
     }
   }