playwright-slack-report-burak 3.0.40 → 3.0.41

package/dist/src/ResultsParser.js

@@ -19,10 +19,15 @@ try {
 }
 
 const SUMMARIES_DIR = path.join('./', 'playwright-artifacts');
-const NODE_ARTIFACTS_DIR = path.join(SUMMARIES_DIR, 'nodeArtifacts');
 const PLAYWRIGHT_REPORT_DIR = path.join('./', 'playwright-report');
 const FINAL_OUTPUT_DIR = path.join('./', 'playwright-report');
 
+// Environment variables
+const IS_CI = !!process.env.CI;
+const GITHUB_TOKEN = process.env.SAFETYWINGTEST_GITHUB_TOKEN;
+const GITHUB_REPOSITORY = process.env.GITHUB_REPOSITORY;
+const GITHUB_RUN_ID = process.env.GITHUB_RUN_ID || 'local';
+
 class ResultsParser {
     result;
     separateFlakyTests;
@@ -91,7 +96,7 @@ class ResultsParser {
         fs.writeFileSync(nodeSummaryFile, JSON.stringify(nodeSummary, null, 2));
 
         if (this.shardIndex === 1 && this.totalShardCount > 1) {
-          if (process.env.CI) {
+          if (IS_CI) {
             console.log('Fetching all artifacts...');
             await this.fetchAllArtifacts();
           } else {
@@ -331,7 +336,7 @@ class ResultsParser {
       console.log('Checking if all blob zips exist...');
       
         for (let i = 1; i <= this.totalShardCount; i++) {
-            const blobZipFile = path.join(NODE_ARTIFACTS_DIR, `blob-report-node-${i}.zip`);
+            const blobZipFile = path.join(SUMMARIES_DIR, `blob-report-node-${i}.zip`);
             if (!fs.existsSync(blobZipFile)) {
                 return false;
             }
@@ -345,28 +350,25 @@ class ResultsParser {
             fs.mkdirSync(SUMMARIES_DIR, { recursive: true });
         }
         
-        // Create nodeArtifacts directory under summaries
-        if (!fs.existsSync(NODE_ARTIFACTS_DIR)) {
-            fs.mkdirSync(NODE_ARTIFACTS_DIR, { recursive: true });
-        }
-        
-        // Copy entire contents of playwright-report to NODE_ARTIFACTS_DIR
+        // Copy entire contents of playwright-report to SUMMARIES_DIR
+        // This copies both blob-report-node-1.zip and node_summary_1.json to SUMMARIES_DIR
         const playwrightReportDir = path.join('./', 'playwright-report');
         if (fs.existsSync(playwrightReportDir)) {
-            this.copyDirectoryRecursive(playwrightReportDir, NODE_ARTIFACTS_DIR);
-            console.log(`Copied entire contents of playwright-report to ${NODE_ARTIFACTS_DIR}`);
+            this.copyDirectoryRecursive(playwrightReportDir, SUMMARIES_DIR);
+            console.log(`Copied entire contents of playwright-report to ${SUMMARIES_DIR}`);
         } else {
             console.warn('Warning: playwright-report directory not found');
         }
         
         while (!this.allNodeSummaryFilesExist() || !this.allBlobZipsExist()) {
+          console.log('Checking if all node summary files exist...');
           console.log('Waiting for all blob zips to exist...');
           if (!fs.existsSync(SUMMARIES_DIR)) {
               fs.mkdirSync(SUMMARIES_DIR, { recursive: true });
           }
           for (let i = 2; i <= this.totalShardCount; i++) {            
               await this.fetchArtifact(i, `node_summary_${i}.json`, SUMMARIES_DIR);
-              await this.fetchArtifact(i, `blob-report-node-${i}.zip`, NODE_ARTIFACTS_DIR);
+              await this.fetchArtifact(i, `blob-report-node-${i}.zip`, SUMMARIES_DIR);
           }
         }
     }
@@ -377,9 +379,7 @@ class ResultsParser {
     }
 
     async fetchArtifactFromGitHubActions(i, file, filePath) {
-        const githubToken = process.env.SAFETYWINGTEST_GITHUB_TOKEN;
-        const repo = process.env.GITHUB_REPOSITORY;
-        const githubApiUrl = `https://api.github.com/repos/${repo}/actions/artifacts`;
+        const githubApiUrl = `https://api.github.com/repos/${GITHUB_REPOSITORY}/actions/artifacts`;
         
         // Try multiple artifact naming patterns
         const artifactNamePatterns = [
@@ -393,7 +393,7 @@ class ResultsParser {
                 // List all artifacts to find the one we need
                 const listResponse = await axios.get(githubApiUrl, {
                     headers: {
-                        'Authorization': `token ${githubToken}`,
+                        'Authorization': `token ${GITHUB_TOKEN}`,
                         'Accept': 'application/vnd.github.v3+json'
                     },
                     params: {
@@ -416,7 +416,7 @@ class ResultsParser {
                     // Download the artifact ZIP
                     const downloadResponse = await axios.get(artifact.archive_download_url, {
                         headers: {
-                            'Authorization': `token ${githubToken}`,
+                            'Authorization': `token ${GITHUB_TOKEN}`,
                             'Accept': 'application/vnd.github.v3+json'
                         },
                         responseType: 'arraybuffer'
@@ -460,7 +460,7 @@ class ResultsParser {
         
         // Copy all blob files to playwright-report before merging
         for (let i = 1; i <= this.totalShardCount; i++) {
-            const blobZipFile = path.join(NODE_ARTIFACTS_DIR, `blob-report-node-${i}.zip`);
+            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`);
@@ -489,8 +489,8 @@ class ResultsParser {
         }
         console.log('Reports merged successfully.');
         
-        // After merge, extract all blobs from nodeArtifacts to playwright-report
-        this.unzipBlobsAndCopyResources(NODE_ARTIFACTS_DIR, PLAYWRIGHT_REPORT_DIR);
+        // 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);
@@ -516,17 +516,17 @@ class ResultsParser {
         }
     }
     
-    unzipBlobsAndCopyResources(NODE_ARTIFACTS_DIR, FINAL_OUTPUT_DIR) {
+    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 in nodeArtifacts into separate folders
+        // Unzip all blob files into separate folders
         for (let i = 1; i <= this.totalShardCount; i++) {
-            const blobZipFile = path.join(NODE_ARTIFACTS_DIR, `blob-report-node-${i}.zip`);
+            const blobZipFile = path.join(ARTIFACTS_DIR, `blob-report-node-${i}.zip`);
             if (fs.existsSync(blobZipFile)) {
-                const extractDir = path.join(NODE_ARTIFACTS_DIR, `node-${i}`);
+                const extractDir = path.join(ARTIFACTS_DIR, `${GITHUB_RUN_ID}-blob-contents-node-${i}`);
                 if (!fs.existsSync(extractDir)) {
                     fs.mkdirSync(extractDir, { recursive: true });
                 }

package/package.json

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