playwright-slack-report-burak 3.0.18 → 3.0.20

package/dist/src/ResultsParser.js

@@ -44,33 +44,20 @@ class ResultsParser {
             ? parseInt(process.env.MATRIX_SHARD, 10) 
             : (process.env.MATRIX_INDEX !== undefined ? parseInt(process.env.MATRIX_INDEX, 10) : 0));
     
-    // Determine if we're using 1-based indexing (workflow-style) or 0-based
-    // This is detected by checking if artifacts exist with 1-based naming
-    isOneBasedIndexing = false;
     constructor(options = { separateFlakyTests: false }) {
         this.result = [];
         this.separateFlakyTests = options.separateFlakyTests;
         // Log package version
         console.log(`📦 [ResultsParser] playwright-slack-report-burak v${packageVersion}`);
-        // Log shard detection in ResultsParser
-        console.log('🔍 [ResultsParser] Initialized with shard detection:');
-        console.log(`🔍   SHARD_INDEX env: ${process.env.SHARD_INDEX !== undefined ? `"${process.env.SHARD_INDEX}"` : 'undefined'}`);
-        console.log(`🔍   TOTAL_SHARDS env: ${process.env.TOTAL_SHARDS !== undefined ? `"${process.env.TOTAL_SHARDS}"` : 'undefined'}`);
-        console.log(`🔍   MATRIX_SHARD env: ${process.env.MATRIX_SHARD !== undefined ? `"${process.env.MATRIX_SHARD}"` : 'undefined'}`);
-        console.log(`🔍   MATRIX_INDEX env: ${process.env.MATRIX_INDEX !== undefined ? `"${process.env.MATRIX_INDEX}"` : 'undefined'}`);
-        console.log(`🔍   MATRIX_COUNT env: ${process.env.MATRIX_COUNT !== undefined ? `"${process.env.MATRIX_COUNT}"` : 'undefined'}`);
-        console.log(`🔍   Calculated shardIndex: ${this.shardIndex}`);
-        console.log(`🔍   Calculated totalShardCount: ${this.totalShardCount}`);
     }
     /**
      * Update shard information after detection (e.g., from GitHub API)
-     * @param {number} shardIndex - The current shard index (0-based)
+     * @param {number} shardIndex - The current shard index (1-based, shard 1 is aggregator)
      * @param {number} totalShardCount - The total number of shards
      */
     updateShardInfo(shardIndex, totalShardCount) {
         this.shardIndex = shardIndex;
         this.totalShardCount = totalShardCount;
-        console.log(`🔍 [ResultsParser] Updated shard info: shardIndex=${this.shardIndex}, totalShardCount=${this.totalShardCount}`);
     }
     async getParsedResults() {
       const summary = {
@@ -127,29 +114,20 @@ class ResultsParser {
         // Create the file
         fs.writeFileSync(nodeSummaryFile, JSON.stringify(nodeSummary, null, 2));
 
-        console.log(`🔍 [ResultsParser] Current shard: ${this.shardIndex}, Total shards: ${this.totalShardCount}`);
-        console.log(`🔍 [ResultsParser] Created node summary file: ${nodeSummaryFile}`);
-
-        if (this.shardIndex === 0 && this.totalShardCount > 1) {
-          console.log(`🔍 [ResultsParser] Shard 0 detected with ${this.totalShardCount} total shards - will fetch artifacts from other shards`);
+        if (this.shardIndex === 1 && this.totalShardCount > 1) {
           if (process.env.CI) {
-            console.log('🔍 [ResultsParser] CI environment detected - fetching all artifacts from GitHub Actions...');
             await this.fetchAllArtifacts();
           } else {
-            console.log('🔍 [ResultsParser] Local environment - waiting for artifacts to appear...');
             while (!this.allNodeSummaryFilesExist() || !this.allBlobZipsExist()) {
-              console.log('🔍 [ResultsParser] Waiting for all artifacts to exist...');
               await new Promise(resolve => setTimeout(resolve, 1000)); // Wait for 1 second
             }
           }
-        } else {
-          console.log(`🔍 [ResultsParser] Not shard 0 (current: ${this.shardIndex}) or single shard (total: ${this.totalShardCount}) - skipping artifact fetch`);
         }
 
-        if (this.shardIndex === 0 && this.allNodeSummaryFilesExist() && this.allBlobZipsExist()) {
-            console.log(`🔍 [ResultsParser] Shard 0: All artifacts available, merging results from all shards...`);
+        if (this.shardIndex === 1 && this.allNodeSummaryFilesExist() && this.allBlobZipsExist()) {
             // Merge all node summaries into the final summary
-            for (let i = 0; i < this.totalShardCount; i++) {
+            // Loop from 1 to totalShardCount (1-based indexing)
+            for (let i = 1; i <= this.totalShardCount; i++) {
                 const nodeSummaryFile = path.join(summariesDir, `node_summary_${i}.json`);
                 const fileToRead = nodeSummaryFile;
 
@@ -364,7 +342,8 @@ class ResultsParser {
       console.log('Checking if all node summary files exist...');
       const summariesDir = path.join('./', 'playwright-report');
       
-      for (let i = 0; i < this.totalShardCount; i++) {
+      // Check files from 1 to totalShardCount (1-based indexing)
+      for (let i = 1; i <= this.totalShardCount; i++) {
           const nodeSummaryFile = path.join(summariesDir, `node_summary_${i}.json`);
           if (!fs.existsSync(nodeSummaryFile)) {
               return false;
@@ -377,7 +356,8 @@ class ResultsParser {
       console.log('Checking if all blob zips exist...');
       const summariesDir = path.join('./', 'playwright-report');
       
-        for (let i = 0; i < this.totalShardCount; i++) {
+        // Check files from 1 to totalShardCount (1-based indexing)
+        for (let i = 1; i <= this.totalShardCount; i++) {
             const blobZipFile = path.join(summariesDir, `blob-report-node-${i}.zip`);
             if (!fs.existsSync(blobZipFile)) {
                 return false;
@@ -392,12 +372,13 @@ class ResultsParser {
             fs.mkdirSync(summariesDir, { recursive: true });
         }
         
-        console.log(`Shard 0: Waiting for artifacts from ${this.totalShardCount - 1} other shard(s)...`);
+        console.log(`Shard 1: Waiting for artifacts from ${this.totalShardCount - 1} other shard(s)...`);
         
-        // Fetch artifacts for shards 1 to totalShardCount-1 (since we're shard 0)
-        // We need to fetch from all other shards before proceeding
-        for (let i = 1; i < this.totalShardCount; i++) {
-            console.log(`Shard 0: Fetching artifacts from shard ${i}...`);
+        // Fetch artifacts for all shards except shard 1 (since we're shard 1)
+        // We need to fetch from shards 2, 3, 4, ... (all except shard 1, using 1-based indexing)
+        for (let i = 1; i <= this.totalShardCount; i++) {
+            if (i === 1) continue; // Skip shard 1 (we are shard 1)
+            console.log(`Shard 1: Fetching artifacts from shard ${i}...`);
             await this.fetchArtifact(i, `node_summary_${i}.json`, summariesDir);
             await this.fetchArtifact(i, `blob-report-node-${i}.zip`, summariesDir);
         }
@@ -407,20 +388,21 @@ class ResultsParser {
         const maxRetries = 60; // Wait up to 10 minutes (60 * 10 seconds)
         
         while ((!this.allNodeSummaryFilesExist() || !this.allBlobZipsExist()) && retryCount < maxRetries) {
-            console.log(`Shard 0: Waiting for all artifacts to be available (attempt ${retryCount + 1}/${maxRetries})...`);
+            console.log(`Shard 1: Waiting for all artifacts to be available (attempt ${retryCount + 1}/${maxRetries})...`);
             
             // Re-fetch any missing artifacts
-            for (let i = 1; i < this.totalShardCount; i++) {
+            for (let i = 1; i <= this.totalShardCount; i++) {
+                if (i === 1) continue; // Skip shard 1 (we are shard 1)
                 const nodeSummaryFile = path.join(summariesDir, `node_summary_${i}.json`);
                 const blobZipFile = path.join(summariesDir, `blob-report-node-${i}.zip`);
                 
                 if (!fs.existsSync(nodeSummaryFile)) {
-                    console.log(`Shard 0: Re-fetching missing node_summary_${i}.json...`);
+                    console.log(`Shard 1: Re-fetching missing node_summary_${i}.json...`);
                     await this.fetchArtifact(i, `node_summary_${i}.json`, summariesDir);
                 }
                 
                 if (!fs.existsSync(blobZipFile)) {
-                    console.log(`Shard 0: Re-fetching missing blob-report-node-${i}.zip...`);
+                    console.log(`Shard 1: Re-fetching missing blob-report-node-${i}.zip...`);
                     await this.fetchArtifact(i, `blob-report-node-${i}.zip`, summariesDir);
                 }
             }
@@ -432,9 +414,9 @@ class ResultsParser {
         }
         
         if (this.allNodeSummaryFilesExist() && this.allBlobZipsExist()) {
-            console.log(`Shard 0: Successfully fetched all artifacts from ${this.totalShardCount - 1} other shard(s).`);
+            console.log(`Shard 1: Successfully fetched all artifacts from ${this.totalShardCount - 1} other shard(s).`);
         } else {
-            console.warn(`Shard 0: Warning - Some artifacts may still be missing after ${maxRetries} attempts.`);
+            console.warn(`Shard 1: Warning - Some artifacts may still be missing after ${maxRetries} attempts.`);
         }
     }
 
@@ -443,21 +425,6 @@ class ResultsParser {
         await this.fetchArtifactFromGitHubActions(i, file, filePath);
     }
 
-    // Helper to extract shard index from artifact name
-    extractShardIndexFromArtifactName(artifactName, i) {
-        // Try to extract number from artifact name (e.g., html-report-1 -> 1)
-        const match = artifactName.match(/-(\d+)$/);
-        if (match) {
-            const artifactShard = parseInt(match[1], 10);
-            // If artifact uses 1-based indexing, convert to 0-based for internal use
-            // html-report-1 (workflow) -> shard 0 (internal)
-            // html-report-2 (workflow) -> shard 1 (internal)
-            return artifactShard - 1;
-        }
-        // Fallback to the provided index
-        return i;
-    }
-
     async fetchArtifactFromGitHubActions(i, file, filePath) {
         const githubToken = process.env.SAFETYWINGTEST_GITHUB_TOKEN;
         const repo = process.env.GITHUB_REPOSITORY;
@@ -472,16 +439,16 @@ class ResultsParser {
         const githubApiUrl = `https://api.github.com/repos/${repo}/actions/artifacts`;
         
         // Try multiple artifact naming patterns:
-        // 1. html-report-{i} (1-based workflow style)
-        // 2. blob-report-node-{i} (direct blob reports)
-        // 3. test-results-{i} (alternative naming)
-        // Note: i is 0-based internally, so for 1-based workflows we need i+1
+        // 1. html-report-{i} (1-based workflow style, i is already 1-based)
+        // 2. blob-report-node-{i} (direct blob reports, i is 1-based)
+        // 3. test-results-{i} (alternative naming, i is 1-based)
+        // Note: i is 1-based internally now, so we use it directly for GitHub Actions artifacts
         const artifactNamePatterns = [
-            `html-report-${i + 1}`,  // 1-based workflow style (most common)
-            `blob-report-node-${i}`,  // 0-based direct blob
-            `blob-report-node-${i + 1}`, // 1-based direct blob
-            `html-report-${i}`,       // 0-based html-report
-            `test-results-${i + 1}`,  // Alternative naming
+            `html-report-${i}`,  // 1-based workflow style (i is already 1-based)
+            `blob-report-node-${i}`,  // 1-based direct blob
+            `html-report-${i - 1}`,       // 0-based html-report (fallback)
+            `blob-report-node-${i - 1}`,  // 0-based direct blob (fallback)
+            `test-results-${i}`,  // Alternative naming
         ];
         
         while (true) {
@@ -503,9 +470,9 @@ class ResultsParser {
                     artifact = listResponse.data.artifacts.find(
                         (a) => a.name === pattern || 
                                a.name.includes(`shard-${i}`) || 
-                               a.name.includes(`shard-${i + 1}`) ||
+                               a.name.includes(`shard-${i - 1}`) ||
                                a.name.includes(`node-${i}`) ||
-                               a.name.includes(`node-${i + 1}`)
+                               a.name.includes(`node-${i - 1}`)
                     );
                     if (artifact) {
                         console.log(`Found artifact: ${artifact.name} (matched pattern: ${pattern})`);
@@ -540,8 +507,8 @@ class ResultsParser {
                             file,
                             `playwright-report/${file}`,
                             `playwright-report/${file}`,
-                            `html-report-${i + 1}/${file}`,
                             `html-report-${i}/${file}`,
+                            `html-report-${i - 1}/${file}`,
                         ];
                         for (const possiblePath of possiblePaths) {
                             zipEntry = zip.getEntry(possiblePath);
@@ -558,10 +525,7 @@ class ResultsParser {
                         const extractPath = path.join(path.dirname(filePath), `temp-artifact-${i}`);
                         zip.extractAllTo(extractPath, true);
                         
-                        // Extract shard index from artifact name to handle files named with index 0
-                        const artifactShardIndex = this.extractShardIndexFromArtifactName(artifact.name, i);
-                        
-                        // Look for the file recursively, also try with shard index from artifact name
+                        // Look for the file recursively
                         const searchInDir = (dir, targetFile, alternateTargetFile = null) => {
                             const entries = fs.readdirSync(dir, { withFileTypes: true });
                             for (const entry of entries) {

package/dist/src/SlackReporter.js

@@ -259,19 +259,29 @@ class SlackReporter {
             // Find index of current job in the sorted group
             const currentJobIndex = jobGroup.findIndex(j => j.id === currentJob?.id || j.name === currentJob?.name);
             
-            // Try to extract shard number from job name (e.g., "shard 3/4" -> index 2)
+            // Try to extract shard number from job name (e.g., "shard 3/4" -> index 3)
+            // GitHub Actions uses 1-based indexing (shard 1, 2, 3, 4), we keep it 1-based internally for shard 1 logic
             let shardIndex = currentJobIndex >= 0 ? currentJobIndex : 0;
             if (currentJob && currentJob.name) {
                 const shardMatch = currentJob.name.match(/shard\s+(\d+)\/(\d+)/i);
                 if (shardMatch) {
-                    const shardNum = parseInt(shardMatch[1], 10);
+                    const shardNum = parseInt(shardMatch[1], 10); // 1-based from GitHub Actions (1, 2, 3, 4)
                     const totalFromName = parseInt(shardMatch[2], 10);
-                    // Convert to 0-based index (shard 3/4 -> index 2)
-                    shardIndex = shardNum - 1;
-                    this.log(`🔍 [GitHub Actions Detection] Extracted shard info from name: ${shardNum}/${totalFromName} -> index ${shardIndex}`);
+                    // Keep GitHub Actions 1-based indexing (shard 1 -> index 1, shard 2 -> index 2, etc.)
+                    // This allows shard 1 to be the aggregator
+                    shardIndex = shardNum;
+                    this.log(`🔍 [GitHub Actions Detection] Extracted shard info from name: ${shardNum}/${totalFromName} (GitHub Actions 1-based) -> index ${shardIndex} (internal 1-based)`);
                 }
             }
             
+            // If we couldn't extract from name but have job index, convert from 0-based array index to 1-based
+            // GitHub Actions jobs are numbered starting from 1, so array index 0 = shard 1, index 1 = shard 2, etc.
+            // We need to convert: array index 0 -> shard 1, array index 1 -> shard 2, etc.
+            if (shardIndex === currentJobIndex && currentJobIndex >= 0) {
+                shardIndex = currentJobIndex + 1; // Convert 0-based array index to 1-based shard index
+                this.log(`🔍 [GitHub Actions Detection] Using array index ${currentJobIndex} -> shard ${shardIndex} (1-based)`);
+            }
+            
             const totalShards = jobGroup.length;
             this.log(`🔍 [GitHub Actions Detection] Detected via API:`);
             this.log(`🔍   Total jobs in group: ${totalShards}`);
@@ -320,8 +330,8 @@ class SlackReporter {
             this.log(message);
             return;
         }
-        // SHARDING SUPPORT - Stop slack messages for non-zero index shard(s)
-        // Only shard 0 (0-based) should post when aggregating results from multiple shards
+        // SHARDING SUPPORT - Stop slack messages for non-shard-1 shard(s)
+        // Only shard 1 should post when aggregating results from multiple shards
         
         this.log('🔍 [Shard Detection] Starting shard detection logic...');
         
@@ -382,7 +392,7 @@ class SlackReporter {
                         current: parseInt(shardMatch[1], 10),
                         total: parseInt(shardMatch[2], 10)
                     };
-                    this.log(`🔍 [Shard Detection] Found shard in command line args: ${playwrightShardInfo.current}/${playwrightShardInfo.total}`);
+                    this.log(`🔍 [Shard Detection] Found shard in command line args: ${playwrightShardInfo.current}/${playwrightShardInfo.total} (1-based)`);
                 }
             }
         }
@@ -399,9 +409,9 @@ class SlackReporter {
         // Step 2: Detect shard index (priority order: Playwright config > env vars > GitHub API)
         let currentShardIndex;
         if (playwrightShardInfo) {
-            // Playwright uses 1-based indexing, convert to 0-based
-            currentShardIndex = (playwrightShardInfo.current - 1).toString();
-            this.log(`🔍 [Shard Detection] Using Playwright shard config (converted to 0-based): "${currentShardIndex}"`);
+            // Playwright uses 1-based indexing, keep it 1-based for shard 1 logic
+            currentShardIndex = playwrightShardInfo.current.toString();
+            this.log(`🔍 [Shard Detection] Using Playwright shard config (1-based): "${currentShardIndex}"`);
         } else if (process.env.SHARD_INDEX !== undefined) {
             currentShardIndex = process.env.SHARD_INDEX;
             this.log(`🔍 [Shard Detection] Using SHARD_INDEX env var: "${currentShardIndex}"`);
@@ -463,6 +473,7 @@ class SlackReporter {
         // CRITICAL: In CI (especially GitHub Actions), if we can't detect shard info, block posting
         // This prevents duplicate messages when running with multiple shards
         // BUT: Don't block if we're running locally (even if CI env vars are set)
+        // Note: GitHub Actions uses 1-based indexing (shard 1, 2, 3, 4), but we use 0-based internally
         if (isActuallyInGitHubActions && currentShardIndex === undefined) {
             if (process.env.GITHUB_ACTIONS === 'true') {
                 this.log(`❌ [Shard Detection] BLOCKING: GitHub Actions detected but shard index cannot be determined.`);
@@ -476,14 +487,14 @@ class SlackReporter {
             this.log(`❌ Skipping Slack report to prevent duplicate messages from all shards.`);
             this.log(`💡 Fix: Add these env vars to your workflow:`);
             this.log(`💡   env:`);
-            this.log(`💡     MATRIX_SHARD: $\{\{ strategy.job-index \}\}  # 0-based (only shard 0 posts)`);
+            this.log(`💡     MATRIX_SHARD: $\{\{ strategy.job-index \}\}  # GitHub Actions uses 1-based, convert to 0-based (only shard 1/internal index 1 posts)`);
             this.log(`💡     MATRIX_COUNT: $\{\{ strategy.job-total \}\}`);
             this.log(`💡   OR ensure SAFETYWINGTEST_GITHUB_TOKEN has workflow permissions for API detection`);
             return;
         }
         
-        // Convert to number for comparison (default to 0 if undefined)
-        const shardIndexNum = currentShardIndex !== undefined ? parseInt(currentShardIndex, 10) : 0;
+        // Convert to number for comparison (default to 1 if undefined, since shard 1 is the aggregator)
+        const shardIndexNum = currentShardIndex !== undefined ? parseInt(currentShardIndex, 10) : 1;
         
         this.log(`🔍 [Shard Detection] Final values:`);
         this.log(`🔍   currentShardIndex (string): ${currentShardIndex !== undefined ? `"${currentShardIndex}"` : 'undefined'}`);
@@ -495,30 +506,37 @@ class SlackReporter {
         this.resultsParser.updateShardInfo(shardIndexNum, totalShards);
         
         // For local runs with CI env vars set but not actually in CI, allow posting if single shard
-        // or if shard index is 0
+        // or if shard index is 1
         if (!isActuallyInGitHubActions && process.env.CI && totalShards > 1 && currentShardIndex === undefined) {
             this.log(`⚠️ [Shard Detection] Local run with CI env vars but shard info unclear - allowing post (may cause duplicates)`);
         }
         
-        // CRITICAL: For GitHub Actions with multiple shards, only shard 0 should post
+        // CRITICAL: For GitHub Actions with multiple shards, only shard 1 should post
         // If we're in CI with multiple shards and don't know which shard we are, block all posts
         // This prevents duplicate messages when MATRIX_SHARD/MATRIX_INDEX is not set
+        // Note: GitHub Actions uses 1-based indexing (shard 1, 2, 3, 4)
+        // We use 0-based internally, so GitHub Actions shard 1 = internal index 1
         if (isActuallyInGitHubActions && totalShards > 1 && currentShardIndex === undefined) {
             this.log(`❌ [Shard Detection] BLOCKING: GitHub Actions detected with ${totalShards} shards but shard index not set (MATRIX_SHARD/MATRIX_INDEX missing).`);
             this.log(`❌ Skipping Slack report to prevent duplicate messages from all shards.`);
             this.log(`💡 Fix: Add these env vars to your workflow:`);
             this.log(`💡   env:`);
-            this.log(`💡     MATRIX_SHARD: $\{\{ strategy.job-index \}\}  # 0-based (only shard 0 posts)`);
+            this.log(`💡     MATRIX_SHARD: $\{\{ strategy.job-index \}\}  # GitHub Actions uses 1-based, convert to 0-based (only shard 1/internal index 1 posts)`);
             this.log(`💡     MATRIX_COUNT: $\{\{ strategy.job-total \}\}`);
+            this.log(`💡   OR ensure SAFETYWINGTEST_GITHUB_TOKEN has workflow permissions for API detection`);
             return;
         }
         
-        // Only allow shard 0 (0-based) to post when there are multiple shards
+        // Only allow shard 1 to post when there are multiple shards
         // This ensures only one shard posts the aggregated report
-        if (totalShards > 1 && shardIndexNum !== 0) {
-            this.log(`❌ [Shard Detection] BLOCKING: Non-zero shard detected (shard ${currentShardIndex} of ${totalShards})`);
-            this.log(`❌ Stopping reporter for non-zero index shard ${currentShardIndex} of ${totalShards}`);
-            this.log(`ℹ️ Only shard 0 will post the aggregated report.`);
+        // Note: GitHub Actions uses 1-based indexing (shard 1, 2, 3, 4)
+        // We use 0-based internally, so shard 1 in GitHub Actions = index 1 internally
+        if (totalShards > 1 && shardIndexNum !== 1) {
+            // Convert back to 1-based for display if from GitHub Actions
+            const displayShard = isActuallyInGitHubActions ? shardIndexNum + 1 : shardIndexNum;
+            this.log(`❌ [Shard Detection] BLOCKING: Non-shard-1 detected (shard ${displayShard} of ${totalShards}${isActuallyInGitHubActions ? ' [GitHub Actions 1-based]' : ''})`);
+            this.log(`❌ Stopping reporter for shard ${displayShard} of ${totalShards}`);
+            this.log(`ℹ️ Only shard 1 will post the aggregated report.`);
             return;
         }
         
@@ -526,7 +544,9 @@ class SlackReporter {
         if (totalShards === 1) {
             this.log(`✅ [Shard Detection] ALLOWING: Single shard detected. Posting Slack report.`);
         } else {
-            this.log(`✅ [Shard Detection] ALLOWING: Multiple shards detected (${totalShards}). Shard ${currentShardIndex} (index ${shardIndexNum}) will post aggregated report.`);
+            // Convert back to 1-based for display if from GitHub Actions
+            const displayShard = isActuallyInGitHubActions ? shardIndexNum + 1 : shardIndexNum;
+            this.log(`✅ [Shard Detection] ALLOWING: Multiple shards detected (${totalShards}). Shard ${displayShard} (index ${shardIndexNum}${isActuallyInGitHubActions ? ', GitHub Actions 1-based' : ''}) will post aggregated report.`);
         }
         
         const resultSummary = await this.resultsParser.getParsedResults();

package/package.json

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