playwright-slack-report-burak 3.0.25 → 3.0.27

package/dist/src/ResultsParser.js

@@ -9,7 +9,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require('fs');
 const path = require('path');
 const axios = require('axios');
-const { exec } = require('child_process');
+const { exec, execSync } = require('child_process');
+const { promisify } = require('util');
+const execAsync = promisify(exec);
 let AdmZip;
 try {
     AdmZip = require('adm-zip');
@@ -159,7 +161,7 @@ class ResultsParser {
                 }
             }
             
-            this.mergeReports();
+            await this.mergeReports();
         }
         return summary;
     }
@@ -567,13 +569,65 @@ class ResultsParser {
             }
         }
     }
-    mergeReports() {
+    async mergeReports() {
       let breakMergeWaiter = false;
       try {
-        // Execute the command to merge reports
-        exec(`npx playwright merge-reports --reporter html -c ./playwright-report playwright-report`);
-        // Wait until index.html exists
-        while (!fs.existsSync(path.join('./playwright-report', 'index.html'))) {
+        const summariesDir = path.join('./', 'playwright-report');
+        const blobReportsDir = path.join(summariesDir, 'blob-reports');
+        const mergedBlobsDir = path.join(summariesDir, 'mergedBlobsDir');
+        
+        // Create directory for extracted blob reports
+        if (!fs.existsSync(blobReportsDir)) {
+          fs.mkdirSync(blobReportsDir, { recursive: true });
+        }
+        
+        // Create directory for merged blob reports output
+        if (!fs.existsSync(mergedBlobsDir)) {
+          fs.mkdirSync(mergedBlobsDir, { recursive: true });
+        }
+        
+        // Extract all blob zips to preserve traces
+        console.log('Extracting blob reports to preserve traces...');
+        let hasBlobReports = false;
+        for (let i = 1; i <= this.totalShardCount; i++) {
+          const blobZipFile = path.join(summariesDir, `blob-report-node-${i}.zip`);
+          if (fs.existsSync(blobZipFile)) {
+            if (!AdmZip) {
+              console.warn('adm-zip is required for blob extraction. Falling back to HTML report merge.');
+              break;
+            }
+            
+            const zip = new AdmZip(blobZipFile);
+            const extractPath = path.join(blobReportsDir, `node-${i}`);
+            zip.extractAllTo(extractPath, true);
+            console.log(`Extracted blob report from shard ${i}`);
+            hasBlobReports = true;
+          }
+        }
+        
+        // Merge blob reports instead of HTML reports to preserve traces
+        if (hasBlobReports && fs.existsSync(blobReportsDir) && fs.readdirSync(blobReportsDir).length > 0) {
+          console.log('Merging blob reports (preserves traces)...');
+          try {
+            // Merge blob reports - use relative path from summariesDir and output to mergedBlobsDir
+            // This prevents wiping the playwright-report directory
+            const blobReportsRelativePath = path.relative(summariesDir, blobReportsDir);
+            const mergedBlobsRelativePath = path.relative(summariesDir, mergedBlobsDir);
+            await execAsync(`npx playwright merge-reports --reporter html --output-dir "${mergedBlobsRelativePath}" "${blobReportsRelativePath}"`, { cwd: summariesDir });
+            console.log('Blob reports merged successfully with traces preserved.');
+          } catch (error) {
+            console.warn('Warning: Failed to merge blob reports. Falling back to HTML merge.', error.message);
+            // Fallback to HTML merge
+            execSync(`npx playwright merge-reports --reporter html -c ./playwright-report playwright-report`, { stdio: 'inherit' });
+          }
+        } else {
+          // Fallback to HTML merge if no blob reports found
+          console.log('No blob reports found, falling back to HTML report merge...');
+          execSync(`npx playwright merge-reports --reporter html -c ./playwright-report playwright-report`, { stdio: 'inherit' });
+        }
+        
+        // Wait until index.html exists in mergedBlobsDir
+        while (!fs.existsSync(path.join(mergedBlobsDir, 'index.html'))) {
           console.log('Waiting 2 seconds for merged html report to be generated...');
           const currentTime = new Date().getTime();
           breakMergeWaiter = false;

package/package.json

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