playwright-slack-report-burak 3.5.3 → 3.5.5

package/dist/src/ResultsParser.js

@@ -9,14 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { exec, execFileSync } = require('child_process');
-let AdmZip;
-try {
-    AdmZip = require('adm-zip');
-} catch (e) {
-    // adm-zip is required for unzipping Playwright blob reports during merge
-    AdmZip = null;
-}
+const { execSync, execFileSync } = require('child_process');
 
 // ============================================================================
 // CONSTANTS
@@ -458,41 +451,17 @@ class ResultsParser {
         }
     }
     async mergeReports() {
-      let breakMergeWaiter = false;
       try {
-        
-        // Copy all blob files to playwright-report before merging
-        for (let i = 1; i <= this.totalShardCount; i++) {
-            const blobZipFile = path.join(SUMMARIES_DIR, `blob-report-node-${i}.zip`);
-            if (fs.existsSync(blobZipFile)) {
-                try {
-                    const destFile = path.join(PLAYWRIGHT_REPORT_DIR, `blob-report-node-${i}.zip`);
-                    fs.copyFileSync(blobZipFile, destFile);
-                } catch (error) {
-                    console.warn(`Failed to copy blob-report-node-${i}.zip for merging:`, error.message);
-                }
-            }
-        }
-        
-        // Execute the command to merge reports FROM playwright-report
-        // Playwright will output to playwright-report directory
-        exec(`npx playwright merge-reports --reporter html ${PLAYWRIGHT_REPORT_DIR}`);
-        
-        // Wait until index.html exists in playwright-report
-        while (!fs.existsSync(path.join(PLAYWRIGHT_REPORT_DIR, 'index.html'))) {
-          console.log('Waiting 2 seconds for merged html report to be generated...');
-          const currentTime = new Date().getTime();
-          breakMergeWaiter = false;
-          while (!breakMergeWaiter) {
-            if(new Date().getTime() - currentTime > 2000) {
-              breakMergeWaiter = true;
-            }
-          }
-        }
+        // Merge FROM SUMMARIES_DIR (where the blob zips live) so the HTML output
+        // folder (playwright-report) differs from the blob-extraction folder.
+        // When the two match, Playwright wipes the extracted resources before it
+        // serializes attachments, which leaves trace paths as absolute runner
+        // paths. Keeping them separate lets traces land in playwright-report/data
+        // with relative paths that resolve correctly when hosted.
+        // execSync blocks until the report (including the base64 data) is fully
+        // written, avoiding uploading a half-written index.html.
+        execSync(`npx playwright merge-reports --reporter html ${SUMMARIES_DIR}`, { stdio: 'inherit' });
         console.log('Reports merged successfully.');
-        
-        // After merge, extract all blobs from SUMMARIES_DIR to playwright-report
-        this.unzipBlobsAndCopyResources(SUMMARIES_DIR, PLAYWRIGHT_REPORT_DIR);
       } catch (error) {
           // Log a warning instead of throwing an error
           console.warn('Warning: Failed to merge reports. This may not affect the overall process.', error.message);
@@ -518,53 +487,6 @@ class ResultsParser {
         }
     }
     
-    unzipBlobsAndCopyResources(ARTIFACTS_DIR, FINAL_OUTPUT_DIR) {
-        if (!AdmZip) {
-            console.error('adm-zip is required for blob extraction. Please install it: npm install adm-zip');
-            return;
-        }
-        
-        // Unzip all blob files into separate folders
-        for (let i = 1; i <= this.totalShardCount; i++) {
-            const blobZipFile = path.join(ARTIFACTS_DIR, `blob-report-node-${i}.zip`);
-            if (fs.existsSync(blobZipFile)) {
-                const extractDir = path.join(ARTIFACTS_DIR, `${GITHUB_RUN_ID}-blob-contents-node-${i}`);
-                if (!fs.existsSync(extractDir)) {
-                    fs.mkdirSync(extractDir, { recursive: true });
-                }
-                
-                try {
-                    const zip = new AdmZip(blobZipFile);
-                    zip.extractAllTo(extractDir, true);
-                    
-                    // Check if this folder contains a "resources" folder with zip files
-                    const resourcesDir = path.join(extractDir, 'resources');
-                    if (fs.existsSync(resourcesDir) && fs.statSync(resourcesDir).isDirectory()) {
-                        const files = fs.readdirSync(resourcesDir);
-                        const zipFiles = files.filter(file => file.endsWith('.zip'));
-                        
-                        if (zipFiles.length > 0) {
-                            // Copy the resources folder to finalOutput
-                            const finalResourcesDir = path.join(FINAL_OUTPUT_DIR, 'resources');
-                            if (!fs.existsSync(finalResourcesDir)) {
-                                fs.mkdirSync(finalResourcesDir, { recursive: true });
-                            }
-                            
-                            // Copy each zip file to finalOutput/resources
-                            for (const zipFile of zipFiles) {
-                                const sourceFile = path.join(resourcesDir, zipFile);
-                                const destFile = path.join(finalResourcesDir, zipFile);
-                                fs.copyFileSync(sourceFile, destFile);
-                            }
-                        }
-                    }
-                } catch (error) {
-                    console.warn(`Failed to extract or process blob-report-node-${i}.zip:`, error.message);
-                }
-            }
-        }
-    }
-    
     async pushReportsToMinio() {
         if (!process.env.CI) {
             console.log('Skipping MinIO push: not in CI');
@@ -584,7 +506,11 @@ class ResultsParser {
             console.log(`Uploading playwright-report to MinIO: ${destination}`);
             // Pass credentials as separate args (not embedded in a URL) to avoid encoding issues.
             execFileSync('mc', ['--config-dir', mcConfigDir, 'alias', 'set', MINIO_ALIAS, MINIO_ENDPOINT, MINIO_ACCESS_KEY, MINIO_SECRET_KEY], { stdio: 'ignore' });
-            execFileSync('mc', ['--config-dir', mcConfigDir, 'cp', '--recursive', `${PLAYWRIGHT_REPORT_DIR}/`, `${destination}/`], { stdio: 'ignore' });
+            const cpOutput = execFileSync('mc', ['--config-dir', mcConfigDir, 'cp', '--recursive', `${PLAYWRIGHT_REPORT_DIR}/`, `${destination}/`], { encoding: 'utf8' });
+            const summary = cpOutput.split('\n').filter((line) => !line.includes(' -> ')).join('\n').trim();
+            if (summary) {
+                console.log(summary);
+            }
             console.log(`Successfully uploaded playwright-report to MinIO: ${destination}`);
         } catch (error) {
             console.warn('Warning: Failed to push reports to MinIO. This may not affect the overall process.', error.message);

package/package.json

@@ -33,7 +33,7 @@
     "lint-fix": "npx eslint . --ext .ts --fix"
   },
   "name": "playwright-slack-report-burak",
-  "version": "3.5.3",
+  "version": "3.5.5",
   "main": "index.js",
   "types": "dist/index.d.ts",
   "author": "Burak B. <burak.boluk@hotmail.com>",