Merge pull request #15 from brown9804/update-traffic-api-14tohistorical

updating logic from 14 to historical

Author: brown9804

.github/workflows/update-metrics.yml

@@ -27,8 +27,23 @@ jobs:
         with:
           node-version: '20'
 
+      # You only need this if you want to isolate node_modules/npm install
+      # Otherwise, just run the next step in the main directory
+      - name: Run visitor counter logic in temp folder
+        run: |
+          mkdir temp-run
+          cp update_repo_views_counter.js package.json package-lock.json temp-run/
+          cd temp-run
+          npm ci
+          node update_repo_views_counter.js
+          cd ..
+          rm -rf temp-run
+        env:
+          TRAFFIC_TOKEN: ${{ secrets.TRAFFIC_TOKEN }}
+          REPO: ${{ github.repository }}
+
       - name: Install dependencies
-        run: npm install
+        run: npm ci
 
       - name: Update visitor count
         run: node update_repo_views_counter.js
@@ -41,37 +56,38 @@ jobs:
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
 
+      # For PRs: update the PR branch
       - name: Commit and push to PR branch
         if: github.event_name == 'pull_request'
         env:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           git fetch origin
-          git checkout -b ${{ github.event.pull_request.head.ref }} origin/${{ github.event.pull_request.head.ref }}
+          git checkout ${{ github.event.pull_request.head.ref }}
           git add -A
           git commit -m "Update visitor count" || echo "No changes to commit"
           git remote set-url origin https://x-access-token:${TOKEN}@github.com/${{ github.repository }}
           git push origin HEAD:${{ github.event.pull_request.head.ref }}
 
-      - name: Commit and push to new branch (non-PR)
-        if: github.event_name == 'pull_request'
+      # For non-PRs (scheduled/manual): push to a dedicated temp branch and create a PR
+      - name: Commit and push to temp branch
+        if: github.event_name != 'pull_request'
         env:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          git fetch origin
-          git checkout ${{ github.event.pull_request.head.ref }} || git checkout -b ${{ github.event.pull_request.head.ref }} origin/${{ github.event.pull_request.head.ref }}
+          BRANCH="visitor-counter-update-${{ github.run_id }}"
+          git checkout -b $BRANCH
           git add -A
           git commit -m "Update visitor count" || echo "No changes to commit"
           git remote set-url origin https://x-access-token:${TOKEN}@github.com/${{ github.repository }}
-          git pull --rebase origin ${{ github.event.pull_request.head.ref }} || echo "No rebase needed"
-          git push origin HEAD:${{ github.event.pull_request.head.ref }}
+          git push origin HEAD:$BRANCH
 
       - name: Create Pull Request (non-PR)
         if: github.event_name != 'pull_request'
         uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ steps.push.outputs.branch }}
+          branch: visitor-counter-update-${{ github.run_id }}
           title: "Update visitor count"
           body: "Automated update of visitor count"
           base: main

README.md

@@ -151,7 +151,7 @@ Last updated: 2025-07-10
 
 <!-- START BADGE -->
 <div align="center">
-  <img src="https://img.shields.io/badge/Total%20views-1022-limegreen" alt="Total views">
-  <p>Refresh Date: 2025-07-11</p>
+  <img src="https://img.shields.io/badge/Total%20views-1152-limegreen" alt="Total views">
+  <p>Refresh Date: 2025-07-14</p>
 </div>
 <!-- END BADGE -->

metrics.json

@@ -1,4 +1,32 @@
-{
-  "total_views": 1022,
-  "lastUpdated": "2025-07-11T20:07:49.421Z"
-}
+[
+  {
+    "date": "2025-07-07",
+    "count": 330,
+    "uniques": 20
+  },
+  {
+    "date": "2025-07-08",
+    "count": 159,
+    "uniques": 6
+  },
+  {
+    "date": "2025-07-10",
+    "count": 482,
+    "uniques": 1
+  },
+  {
+    "date": "2025-07-11",
+    "count": 170,
+    "uniques": 4
+  },
+  {
+    "date": "2025-07-12",
+    "count": 7,
+    "uniques": 1
+  },
+  {
+    "date": "2025-07-14",
+    "count": 4,
+    "uniques": 1
+  }
+]

update_repo_views_counter.js

@@ -14,7 +14,8 @@ if (!GITHUB_TOKEN || !REPO) {
 
 const METRICS_FILE = 'metrics.json';
 
-async function getVisitorCount() {
+// Fetch the last 14 days of traffic data (GitHub API returns up to 14 days)
+async function getLast14DaysTraffic() {
   const res = await fetch(`https://api.github.com/repos/${REPO}/traffic/views`, {
     headers: {
       'Accept': 'application/vnd.github+json',
@@ -29,20 +30,55 @@ async function getVisitorCount() {
   }
 
   const data = await res.json();
-  return data.count || 0;
+  // Each entry contains: timestamp, count, uniques
+  return data.views.map(item => ({
+    date: item.timestamp.slice(0, 10), // Keep only YYYY-MM-DD
+    count: item.count,
+    uniques: item.uniques
+  }));
 }
 
-function updateMetricsFile(total_views) {
-  const lastUpdated = new Date().toISOString();
-  const metrics = { total_views, lastUpdated };
+// Read metrics.json as an array of daily entries (if exists)
+function readMetrics() {
+  if (fs.existsSync(METRICS_FILE)) {
+    const raw = fs.readFileSync(METRICS_FILE, 'utf-8');
+    try {
+      const arr = JSON.parse(raw);
+      if (Array.isArray(arr)) return arr;
+    } catch (e) {
+      console.error('metrics.json is not valid JSON. Starting fresh.');
+    }
+  }
+  return [];
+}
+
+// Write the updated metrics array back to metrics.json
+function writeMetrics(metrics) {
   fs.writeFileSync(METRICS_FILE, JSON.stringify(metrics, null, 2));
-  console.log(`metrics.json updated with ${total_views} views`);
+  console.log(`metrics.json updated with ${metrics.length} days`);
 }
 
+// Merge existing and new metrics, using the date as the unique key
+function mergeMetrics(existing, fetched) {
+  // Use an object for fast deduplication by date
+  const byDate = {};
+  existing.forEach(entry => { byDate[entry.date] = entry; });
+  fetched.forEach(entry => { byDate[entry.date] = entry; });
+  // Convert back to array and sort by date ascending
+  return Object.values(byDate).sort((a, b) => a.date.localeCompare(b.date));
+}
+
+// Calculate the sum of all view counts (historical total)
+function calculateTotalViews(metrics) {
+  return metrics.reduce((sum, entry) => sum + entry.count, 0);
+}
+
+// Find and update the badge block in all Markdown files (recursive)
 function updateMarkdownBadges(total_views) {
   const refreshDate = new Date().toISOString().split('T')[0];
   const badgeRegex = /<!-- START BADGE -->[\s\S]*?<!-- END BADGE -->/g;
 
+  // This is your existing badge schema, preserved as requested
   const badgeBlock = `<!-- START BADGE -->
 <div align="center">
   <img src="https://img.shields.io/badge/Total%20views-${total_views}-limegreen" alt="Total views">
@@ -63,6 +99,7 @@ function updateMarkdownBadges(total_views) {
   });
 }
 
+// Recursively find all Markdown files in a directory
 function findMarkdownFiles(dir) {
   let results = [];
   const list = fs.readdirSync(dir);
@@ -78,17 +115,29 @@ function findMarkdownFiles(dir) {
   return results;
 }
 
+// Optionally delete node_modules after running
 function deleteNodeModules() {
   if (fs.existsSync('node_modules')) {
     execSync('rm -rf node_modules', { stdio: 'inherit' });
     console.log('node_modules folder deleted.');
   }
 }
 
+// Main async function to orchestrate update
 (async () => {
   try {
-    const total_views = await getVisitorCount();
-    updateMetricsFile(total_views);
+    // Fetch latest 14 days of traffic data
+    const fetched = await getLast14DaysTraffic();
+    // Load existing metrics.json (if present)
+    const existing = readMetrics();
+    // Merge and deduplicate daily metrics
+    const merged = mergeMetrics(existing, fetched);
+    // Save the updated metrics array
+    writeMetrics(merged);
+
+    // Calculate historical total views for badge
+    const total_views = calculateTotalViews(merged);
+    // Update the badge in Markdown files
     updateMarkdownBadges(total_views);
   } catch (err) {
     console.error(err);