Fix eslint errors (#1384)

* Fix eslint errors

Related to #1362.
Signed-off-by: Denis Golovin <dgolovin@redhat.com>

Author: dgolovin

.eslintrc

@@ -62,6 +62,7 @@
     "import/no-duplicates": ["error"],
     "import/prefer-default-export": 0,
     "max-nested-callbacks": [1, 4],
+    "max-classes-per-file": [0],
     "no-alert": 2,
     "no-caller": 2,
     "no-console": 2,

src/util/archive.ts

@@ -26,7 +26,7 @@ export class Archive {
                     .then(resolve)
                     .catch(reject);
             } else {
-                reject(`Unsupported extension for '${zipFile}'`);
+                reject(Error(`Unsupported extension for '${zipFile}'`));
             }
         });
     }
@@ -47,7 +47,13 @@ export class Archive {
             src: zipFile,
             dest: extractTo,
             tar: {
-                map: (header) => prefix && header.name.startsWith(prefix) ? (header.name = header.name.substring(prefix.length), header) : header
+                map: (header: { name: string; }): { name: string; } => {
+                  const result = header;
+                  if (prefix && header.name.startsWith(prefix)) {
+                    result.name = header.name.substring(prefix.length);
+                  }
+                  return result;
+                }
             }
         });
     }

src/util/async.ts

@@ -18,10 +18,6 @@ export interface Task<T> {
 	(): T;
 }
 
-// export interface IDisposable {
-// 	dispose(): void;
-// }
-
 export class Delayer<T> {
 
 	private timeout: any;
@@ -30,29 +26,27 @@ export class Delayer<T> {
 
 	private doResolve: ((value?: any | Promise<any>) => void) | null;
 
-	private doReject: (err: any) => void;
-
 	private task: Task<T | Promise<T>> | null;
 
 	constructor(public defaultDelay: number) {
 		this.timeout = null;
 		this.completionPromise = null;
 		this.doResolve = null;
-		this.doReject;
 		this.task = null;
 	}
 
 	trigger(task: Task<T | Promise<T>>, delay: number = this.defaultDelay): Promise<T> {
 		this.task = task;
 		this.cancelTimeout();
 
+		// eslint-disable-next-line @typescript-eslint/no-misused-promises
 		if (!this.completionPromise) {
 			this.completionPromise = new Promise((c, e) => {
 				this.doResolve = c;
-				this.doReject = e;
 			}).then(() => {
 				this.completionPromise = null;
 				this.doResolve = null;
+				// eslint-disable-next-line no-shadow
 				const {task} = this;
 				this.task = null;
 
@@ -68,27 +62,10 @@ export class Delayer<T> {
 		return this.completionPromise;
 	}
 
-	// isTriggered(): boolean {
-	// 	return this.timeout !== null;
-	// }
-
-	// cancel(): void {
-	// 	this.cancelTimeout();
-
-	// 	if (this.completionPromise) {
-	// 		this.doReject(Error('Canceled'));
-	// 		this.completionPromise = null;
-	// 	}
-	// }
-
 	private cancelTimeout(): void {
 		if (this.timeout !== null) {
 			clearTimeout(this.timeout);
 			this.timeout = null;
 		}
 	}
-
-	// dispose(): void {
-	// 	this.cancelTimeout();
-	// }
-}
+}

src/util/download.ts

@@ -16,25 +16,20 @@ export class DownloadUtil {
 
   static async downloadFile(fromUrl: string, toFile: string, progressCb?: (current: number, increment: number) => void, throttle = 250): Promise<void> {
     const dls = got.stream(fromUrl);
-    let previous = 0;
-    // Process progress event from 'got'
-    const progress = fromEvent(dls, 'downloadProgress').pipe(throttleTime(throttle)).subscribe((progress: { percent: number }) => {
-        const current = Math.round(progress.percent * 100);
-        current !== previous && progressCb && progressCb(current, current - previous);
-        previous = current;
-    });
-    // process end event from 'got'
-    const end = fromEvent(dls, 'end').subscribe(() => {
-        progressCb && progressCb(100, 100 - previous);
-    });
-    // Pipe url to file
-    try {
-      await pipeline(dls, fs.createWriteStream(toFile));
-    } finally {
-      // Unsubscribe form 'downloadProgress' and 'end' events
-      // Is it really required?
-      progress.unsubscribe();
-      end.unsubscribe();
+    if (progressCb) {
+      let previous = 0;
+      // Process progress event from 'got'
+      fromEvent(dls, 'downloadProgress').pipe(throttleTime(throttle)).subscribe((progress: { percent: number }) => {
+          const current = Math.round(progress.percent * 100);
+          progressCb(current, current - previous);
+          previous = current;
+      });
+      // process end event from 'got'
+      fromEvent(dls, 'end').subscribe(() => {
+          progressCb(100, 100 - previous);
+      });
     }
+    // Pipe url to file
+    await pipeline(dls, fs.createWriteStream(toFile));
   }
 }

src/util/refs.ts

@@ -27,13 +27,13 @@ export class Refs {
 
     static async fetchTag(input: string): Promise<Map<string, Ref>> {
         return new Promise((resolve, reject) => {
-            input = input.replace(/^(?!(?:https|git):\/\/)/, 'https://');
+            const gitUrl = input.replace(/^(?!(?:https|git):\/\/)/, 'https://');
 
             const tcp = net.connect({
-                host: url.parse(input).host,
+                host: url.parse(gitUrl).host,
                 port: 9418
             });
-            const client = gitClient(input);
+            const client = gitClient(gitUrl);
             const tags = new Map<string, Ref>();
 
             client.refs.on('data', (ref: { name: string; hash: string }) => {

src/util/watch.ts

@@ -21,16 +21,15 @@ export class WatchUtil {
                 if (timer) {
                     clearTimeout(timer);
                 }
-
-                timer = setTimeout(async () => {
+                timer = setTimeout(() => {
                     timer = undefined;
-                    const newContext = await WatchUtil.grep(path.join(location, filename), /current-context:.*/);
-                    if (context !== newContext) {
-                        emitter.emit('file-changed');
-                        context = newContext;
-                    }
+                    WatchUtil.grep(path.join(location, filename), /current-context:.*/).then((newContext: string)=> {
+                        if (context !== newContext) {
+                          emitter.emit('file-changed');
+                          context = newContext;
+                        }
+                    });
                 }, 500);
-
             }
         });
         return { watcher, emitter };

test/unit/util/archive.test.ts

@@ -106,7 +106,7 @@ suite('Archive Utility', () => {
         try {
             await Archive.extract('file.whatever', extractTo);
         } catch (err) {
-            expect(err).equals(`Unsupported extension for '${file}'`);
+            expect(err.message).equals(`Unsupported extension for '${file}'`);
         }
     });
-});
+});