playwright-slack-report-burak 3.0.10 → 3.0.13

package/dist/src/SlackReporter.js

@@ -97,11 +97,13 @@ class SlackReporter {
         }
         try {
             // Get workflow run details
-            const apiUrl = `https://api.github.com/repos/safetywing/${repo}/actions/runs/${runId}/jobs`;
+            const apiUrl = `https://api.github.com/repos/${repo}/actions/runs/${runId}/jobs`;
+            this.log(`🔍 [GitHub Actions Detection] API URL: ${apiUrl}`);
             const response = await axios.get(apiUrl, {
                 headers: {
-                    'Authorization': `token ${githubToken}`,
-                    'Accept': 'application/vnd.github.v3+json'
+                    'Accept': 'application/vnd.github+json',
+                    'Authorization': `Bearer ${githubToken}`,
+                    'X-GitHub-Api-Version': '2022-11-28'
                 },
                 params: {
                     per_page: 100
@@ -112,41 +114,120 @@ class SlackReporter {
                 this.log(`🔍 [GitHub Actions Detection] No jobs found in workflow run`);
                 return null;
             }
-            // Filter jobs that are part of the same workflow run and have the same name (matrix jobs)
-            // Group by job name to find matrix jobs
+            
+            this.log(`🔍 [GitHub Actions Detection] Found ${jobs.length} total jobs in workflow run`);
+            
+            // Helper function to normalize job names by removing shard indicators
+            // e.g., "Run tests (shard 3/4)" -> "Run tests"
+            const normalizeJobName = (name) => {
+                if (!name) return '';
+                // Remove common matrix patterns: (shard X/Y), (X, Y), [X], etc.
+                return name
+                    .replace(/\s*\(shard\s+\d+\/\d+\)/gi, '')
+                    .replace(/\s*\(\d+\/\d+\)/g, '')
+                    .replace(/\s*\(\d+,\s*\d+\)/g, '')
+                    .replace(/\s*\[\d+\]/g, '')
+                    .trim();
+            };
+            
+            // Group jobs by normalized name to find matrix jobs
             const jobGroups = {};
             for (const job of jobs) {
                 const jobName = job.name || '';
-                if (!jobGroups[jobName]) {
-                    jobGroups[jobName] = [];
+                const normalizedName = normalizeJobName(jobName);
+                if (!jobGroups[normalizedName]) {
+                    jobGroups[normalizedName] = [];
                 }
-                jobGroups[jobName].push(job);
+                jobGroups[normalizedName].push(job);
             }
+            
+            this.log(`🔍 [GitHub Actions Detection] Grouped into ${Object.keys(jobGroups).length} job group(s)`);
+            for (const [groupName, groupJobs] of Object.entries(jobGroups)) {
+                this.log(`🔍   Group "${groupName}": ${groupJobs.length} job(s)`);
+            }
+            
             // Find the job group that contains the current job
             let currentJob = null;
             let jobGroup = null;
-            for (const [jobName, jobsInGroup] of Object.entries(jobGroups)) {
-                currentJob = jobsInGroup.find(j => j.id.toString() === currentJobId || j.name === currentJobId);
-                if (currentJob) {
-                    jobGroup = jobsInGroup;
-                    break;
+            
+            // Strategy 1: Find the currently running job (status: in_progress or completed recently)
+            const runningJobs = jobs.filter(j => j.status === 'in_progress' || j.status === 'queued');
+            this.log(`🔍 [GitHub Actions Detection] Found ${runningJobs.length} running/queued job(s)`);
+            
+            if (runningJobs.length === 1) {
+                // Perfect - only one job is running, must be us
+                currentJob = runningJobs[0];
+                const normalizedName = normalizeJobName(currentJob.name);
+                jobGroup = jobGroups[normalizedName];
+                this.log(`🔍 [GitHub Actions Detection] Matched by running status: "${currentJob.name}"`);
+            } else if (runningJobs.length > 1) {
+                // Multiple running jobs - try to match by job ID or name
+                for (const job of runningJobs) {
+                    // Check if this job's name contains the GITHUB_JOB id
+                    // But be more specific - avoid matching "Generate test matrix" when looking for "test"
+                    const jobIdLower = currentJobId.toLowerCase();
+                    const jobNameLower = (job.name || '').toLowerCase();
+                    
+                    // Match if job name starts with or equals the job ID (more specific)
+                    if (jobNameLower.startsWith(jobIdLower) || 
+                        jobNameLower.includes(`${jobIdLower} `) ||
+                        jobNameLower.includes(`${jobIdLower}(`) ||
+                        jobNameLower === jobIdLower) {
+                        currentJob = job;
+                        const normalizedName = normalizeJobName(job.name);
+                        jobGroup = jobGroups[normalizedName];
+                        this.log(`🔍 [GitHub Actions Detection] Matched running job by ID match: "${job.name}"`);
+                        break;
+                    }
+                }
+                
+                // Still no match? Take the first running job that looks like a test job
+                if (!currentJob) {
+                    for (const job of runningJobs) {
+                        if (job.name && (job.name.includes('shard') || job.name.includes('test') || job.name.includes('matrix'))) {
+                            currentJob = job;
+                            const normalizedName = normalizeJobName(job.name);
+                            jobGroup = jobGroups[normalizedName];
+                            this.log(`🔍 [GitHub Actions Detection] Matched by test-like name: "${job.name}"`);
+                            break;
+                        }
+                    }
                 }
             }
-            // If we can't find current job by ID, try to match by name from GITHUB_JOB
-            if (!currentJob && currentJobId) {
-                for (const [jobName, jobsInGroup] of Object.entries(jobGroups)) {
-                    if (jobName.includes(currentJobId) || currentJobId.includes(jobName)) {
-                        jobGroup = jobsInGroup;
-                        // Try to find the job by looking at run_attempt or other identifiers
-                        currentJob = jobsInGroup[0];
+            
+            // Strategy 2: If no running job found, look at all jobs
+            if (!currentJob) {
+                this.log(`🔍 [GitHub Actions Detection] No running job matched, checking all jobs`);
+                for (const job of jobs) {
+                    const jobIdLower = currentJobId.toLowerCase();
+                    const jobNameLower = (job.name || '').toLowerCase();
+                    
+                    if (jobNameLower.startsWith(jobIdLower) || 
+                        jobNameLower.includes(`${jobIdLower} `) ||
+                        jobNameLower.includes(`${jobIdLower}(`)) {
+                        currentJob = job;
+                        const normalizedName = normalizeJobName(job.name);
+                        jobGroup = jobGroups[normalizedName];
+                        this.log(`🔍 [GitHub Actions Detection] Matched job by name: "${job.name}"`);
                         break;
                     }
                 }
             }
-            // If still no match, use all jobs (might be a single job or we can't determine)
+            
+            // Fallback: Use the largest job group (likely the matrix jobs)
             if (!jobGroup || jobGroup.length === 0) {
-                jobGroup = jobs;
-                currentJob = jobs[0];
+                this.log(`🔍 [GitHub Actions Detection] Could not match job, using largest job group`);
+                let largestGroup = [];
+                let largestGroupName = '';
+                for (const [groupName, groupJobs] of Object.entries(jobGroups)) {
+                    if (groupJobs.length > largestGroup.length) {
+                        largestGroup = groupJobs;
+                        largestGroupName = groupName;
+                    }
+                }
+                jobGroup = largestGroup;
+                currentJob = jobGroup[0];
+                this.log(`🔍 [GitHub Actions Detection] Using largest group "${largestGroupName}" with ${jobGroup.length} job(s)`);
             }
             // Sort jobs by name or ID to get consistent ordering
             jobGroup.sort((a, b) => {
@@ -155,13 +236,23 @@ class SlackReporter {
                 }
                 return a.id - b.id;
             });
-            // Find index of current job
-            const currentJobIndex = jobGroup.findIndex(j => 
-                j.id === currentJob?.id || 
-                j.name === currentJob?.name ||
-                (currentJobId && (j.name === currentJobId || j.name?.includes(currentJobId)))
-            );
-            const shardIndex = currentJobIndex >= 0 ? currentJobIndex : 0;
+            
+            // 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)
+            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 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}`);
+                }
+            }
+            
             const totalShards = jobGroup.length;
             this.log(`🔍 [GitHub Actions Detection] Detected via API:`);
             this.log(`🔍   Total jobs in group: ${totalShards}`);
@@ -489,3 +580,4 @@ class SlackReporter {
     }
 }
 exports.default = SlackReporter;
+

package/package.json

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