chore: decoupling

.github/workflows/deploy.yaml

@@ -1,4 +1,4 @@
-name: Docker hub
+name: Build & deploy
 on:
   push:
     tags:

README.md

@@ -1,7 +1,21 @@
+<a href="https://allurereport.org/docs/">
+<img id="allure" src="assets/allure-logo.png" alt="Allure Logo" height="150">
+</a>
+<a href="https://docs.docker.com/">
+<img id="docker" src="assets/docker-logo.png" alt="Docker Logo" height="150">
+</a>
+<a href="https://firebase.google.com/docs">
+<img id="firebase"  src="assets/firebase-logo.png" alt="Firebase Logo" height="150">
+</a>
+
+# Allure Docker Deploy
+
+---
+
 ![Deployment](https://github.com/cybersokari/allure-docker-deploy/actions/workflows/deploy.yaml/badge.svg?branch=main)
 ![](https://img.shields.io/docker/pulls/sokari/allure-docker-deploy)
-# Allure Docker Deploy
-_An easy-to-use Docker solution for sharing and backing up Allure test reports_
+
+_An easy-to-use serverless Docker solution for sharing and backing up Allure test reports_
 
 This [Docker image](https://hub.docker.com/r/sokari/allure-docker-deploy) lets you share [Allure test reports](https://allurereport.org/) seamlessly via an ephemeral URL. It also backs up all report history and retries to Firebase Cloud Storage, enabling unique URLs for each test run and previewing previous reports.
 

worker/app/cloud-storage.ts

@@ -34,7 +34,7 @@ export class CloudStorage {
                     validation: process.env.DEBUG !== 'true',
                     destination: `${storageHomeDir}/${destinationFilePath}`,
                 });
-                counter.incrementFilesUploaded()
+                await counter.incrementFilesUploaded()
             } catch (error) {
                 console.error(`Failed to upload ${filePath}:`, error);
             }

worker/app/counter.ts

@@ -1,14 +1,24 @@
+import { Mutex } from 'async-mutex';
 class Counter {
     private startTime: number | null = null;
     private processed = 0
     private uploaded = 0
 
-    incrementFilesProcessed() {
-        this.processed ++
+    // Mutex for protecting critical sections
+    private mutex = new Mutex();
+
+    async incrementFilesProcessed(): Promise<void> {
+        await this.mutex.runExclusive(() => {
+            this.processed++;
+        });
     }
-    incrementFilesUploaded() {
-        this.uploaded++
+
+    async incrementFilesUploaded(): Promise<void> {
+        await this.mutex.runExclusive(() => {
+            this.uploaded++;
+        });
     }
+
     get filesUploaded(){
         return this.uploaded
     }

worker/app/report-builder.ts

@@ -1,7 +1,7 @@
 import {REPORTS_DIR, STAGING_PATH} from "../index";
 
 const allure = require('allure-commandline')
-import {deploy} from "./site-builder";
+import {changePermissionsRecursively, createFirebaseJson, publishToFireBaseHosting} from "./site-builder";
 import * as path from "node:path";
 import * as fs from 'fs/promises'
 import counter from "./counter";
@@ -17,10 +17,13 @@ class ReportBuilder {
 
     public setTtl() {
         clearTimeout(this.timeOut)
-        this.timeOut = setTimeout(this.generateAndHost, this.ttl * 1000)
+        this.timeOut = setTimeout(async () => {
+            await this.generate()
+            return await this.host()
+        }, this.ttl * 1000)
     }
 
-    public async generateAndHost() {
+    public async generate() {
 
         // History files can exist in reports directory in WATCH_MODE
         // due to multiple call to generateAndHost, so we try to move
@@ -53,7 +56,7 @@ class ReportBuilder {
         let success = false
         await new Promise((resolve, reject) => {
             generation.on('exit', async function (exitCode: number) {
-                success = exitCode == 0
+                success = exitCode === 0
                 if (success) {
                     resolve('success')
                 } else {
@@ -62,14 +65,6 @@ class ReportBuilder {
                 }
             })
         })
-        if (success){
-            try {
-                return await deploy()
-            } catch (e) {
-                console.log(`Hosting deployment failed: ${e}`)
-            }
-        }
-        return null
     }
 
     // Move from '/allure-results' mount to staging
@@ -79,7 +74,7 @@ class ReportBuilder {
                 const destinationFilePath = path.join(STAGING_PATH, path.basename(file));
                 await fs.mkdir(path.dirname(destinationFilePath), {recursive: true});// recursive, don't throw
                 await fs.copyFile(file, destinationFilePath);
-                counter.incrementFilesProcessed()
+                await counter.incrementFilesProcessed()
             } catch (e) {
                 console.warn(`Failed to move ${path.basename(file)} to staging area: ${e}`)
             }
@@ -88,6 +83,13 @@ class ReportBuilder {
         return this
     }
 
+    public async host() {
+        await createFirebaseJson()
+        // Grant execution permission to website files
+        await changePermissionsRecursively(REPORTS_DIR, 0o755)
+        return await publishToFireBaseHosting()
+    }
+
 }
 
 export default new ReportBuilder()

worker/app/site-builder.ts

@@ -10,7 +10,7 @@ import counter from "./counter";
 
 const exec = util.promisify(require('child_process').exec)
 
-async function createFirebaseJson() {
+export async function createFirebaseJson() {
     const hosting = {
         "hosting": {
             "public": ".",
@@ -30,7 +30,7 @@ async function createFirebaseJson() {
     }
 }
 
-async function changePermissionsRecursively(dirPath: string, mode: fsSync.Mode) {
+export async function changePermissionsRecursively(dirPath: string, mode: fsSync.Mode) {
     await fs.chmod(dirPath, mode);
 
     const files = await fs.readdir(dirPath);
@@ -47,7 +47,7 @@ async function changePermissionsRecursively(dirPath: string, mode: fsSync.Mode)
     }
 }
 
-async function publishToFireBaseHosting() {
+export async function publishToFireBaseHosting() {
     if (process.env.DEBUG === 'true') {
         console.warn('DEBUG=true: Skipping live deployment')
         return
@@ -118,12 +118,6 @@ export function writeGitHubSummary({summaryPath = '', url = ''}) {
     }
 }
 
-export async function deploy() {
-    await createFirebaseJson()
-    // Grant execution permission to website files
-    await changePermissionsRecursively(REPORTS_DIR, 0o755)
-    return await publishToFireBaseHosting()
-}
 
 
 

worker/app/util.ts

@@ -46,16 +46,19 @@ export async function getAllFiles(dirPath: string): Promise<string[]> {
 export function validateWebsiteExpires(expires: string): boolean {
     // Check if input is empty
     if (!expires) {
-        console.error('Error: WEBSITE_EXPIRES cannot be empty');
         return false;
     }
 
+    if(expires.trim().length > 3){
+        return false;
+    }
+
+
     // Regex to validate format: number followed by h/d/w
     const validFormatRegex = /^(\d+)([hdw])$/;
     const match = expires.match(validFormatRegex);
 
     if (!match) {
-        console.error('Error: Invalid WEBSITE_EXPIRES format. Use format like 12h, 7d, or 2w');
         return false;
     }
 

worker/index.ts

@@ -73,7 +73,8 @@ function main(): void {
                     ReportBuilder.stageFiles(await getAllFiles(MOUNTED_PATH)),
                     cloudStorage?.stageRemoteFiles()
                 ])
-                const url = await ReportBuilder.generateAndHost()
+                await ReportBuilder.generate()
+                const url = await ReportBuilder.host()
                 if(keepHistory){
                     await cloudStorage?.uploadHistory()
                 }