refactor: Tiny changes due to eslint warnings / errors

sebbo2002 · Aug 3, 2024 · e675505 · e675505
1 parent d5ef430
commit e675505
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/src/bin/start.ts b/src/bin/start.ts
@@ -57,12 +57,12 @@ class AppServer {
                 result = await this.states.getState(req.params.projectId, req.params.branch);
             }
             catch(error) {
-                this.badges.sendError(res, label);
+                this.badges.sendError(res, label, error);
                 return;
             }
 
             if (['running', 'pending'].indexOf(result.status) > -1) {
-                this.badges.send(res, label, status, 'lightgrey');
+                this.badges.send(res, label, result.status, 'lightgrey');
             }
             else if (result.status === 'success') {
                 this.badges.send(res, label, 'passing', 'brightgreen');
@@ -80,7 +80,7 @@ class AppServer {
                 result = await this.states.getState(req.params.projectId, req.params.branch);
             }
             catch(error) {
-                this.badges.sendError(res, label);
+                this.badges.sendError(res, label, error);
                 return;
             }
 

diff --git a/src/lib/badge-response.ts b/src/lib/badge-response.ts
@@ -27,10 +27,10 @@ export default class BadgeResponse {
         res.send(badge);
     }
 
-    sendError (res: Response, label: string, error?: string): void {
+    sendError (res: Response, label: string, error?: string | unknown): void {
         this.sendBadge(res, makeBadge({
             label,
-            message: error || 'error',
+            message: String(error) || 'error',
             color: 'red',
             style: this.style
         }));

diff --git a/src/lib/states.ts b/src/lib/states.ts
@@ -50,6 +50,7 @@ export default class GitLabStateHelper {
             throw new Error('Unexpected answer from GitLab.');
         }
 
+        let error: unknown;
         let cacheDuration = 5;
         const result: Record<string, StateCachePipeline> = {};
         await Promise.all(body.map(async pipeline => {
@@ -66,7 +67,8 @@ export default class GitLabStateHelper {
                     status: pipeline.status,
                     coverage: extendedPipeline.coverage || undefined
                 };
-            } catch (error) {
+            } catch (err) {
+                error = err;
                 result[pipeline.ref] = {
                     status: pipeline.status,
                     coverage: undefined
@@ -84,6 +86,10 @@ export default class GitLabStateHelper {
         if (this.timeout) {
             this.refreshNextState();
         }
+
+        if (error) {
+            throw error;
+        }
     }
 
     protected refreshNextState (): void {

diff --git a/test/lib/states.ts b/test/lib/states.ts
@@ -22,7 +22,7 @@ describe('States', function () {
     describe('getState()', function() {
         this.timeout(30000);
         it('should work', projectId ? async function() {
-            const states = await new GitLabStateHelper();
+            const states = new GitLabStateHelper();
 
             const result1 = await states.getState(projectId, 'develop');
             assert.strictEqual(typeof result1.status, 'string');