@rmdes/indiekit-endpoint-github 1.0.1 → 1.0.3

package/index.js

@@ -82,6 +82,7 @@ export default class GitHubEndpoint {
     // JSON API for widgets - publicly accessible
     publicRouter.get("/api/commits", commitsController.api);
     publicRouter.get("/api/stars", starsController.api);
+    publicRouter.get("/api/contributions", contributionsController.api);
     publicRouter.get("/api/activity", activityController.api);
     publicRouter.get("/api/featured", featuredController.api);
 

package/lib/controllers/contributions.js

@@ -1,6 +1,53 @@
 import { GitHubClient } from "../github-client.js";
 import * as utils from "../utils.js";
 
+/**
+ * Fetch contributions using GitHub Search API
+ * More reliable than Events API which has 90-day/300-event limits
+ * @param {GitHubClient} client - GitHub client
+ * @param {string} username - GitHub username
+ * @param {number} limit - Max contributions to return
+ * @returns {Promise<Array>} - Formatted contributions
+ */
+async function fetchContributionsFromSearch(client, username, limit = 10) {
+  try {
+    const [prsResult, issuesResult] = await Promise.all([
+      client.getUserPRs(username, limit),
+      client.getUserIssues(username, limit),
+    ]);
+
+    const prs = (prsResult.items || []).map((item) => ({
+      type: "pr",
+      title: utils.truncate(item.title),
+      url: item.html_url,
+      repo: item.repository_url?.split("/").slice(-2).join("/"),
+      repoUrl: item.html_url?.split("/pull/")[0],
+      number: item.number,
+      date: item.created_at,
+      state: item.state,
+    }));
+
+    const issues = (issuesResult.items || []).map((item) => ({
+      type: "issue",
+      title: utils.truncate(item.title),
+      url: item.html_url,
+      repo: item.repository_url?.split("/").slice(-2).join("/"),
+      repoUrl: item.html_url?.split("/issues/")[0],
+      number: item.number,
+      date: item.created_at,
+      state: item.state,
+    }));
+
+    // Combine, sort by date, and limit
+    return [...prs, ...issues]
+      .toSorted((a, b) => new Date(b.date) - new Date(a.date))
+      .slice(0, limit);
+  } catch (error) {
+    console.error("[contributions] Error fetching from search:", error.message);
+    return [];
+  }
+}
+
 /**
  * Display PRs and issues created by user
  * @type {import("express").RequestHandler}
@@ -20,27 +67,26 @@ export const contributionsController = {
 
       const client = new GitHubClient({ token, cacheTtl });
 
-      let events = [];
+      // Try events API first
+      let contributions = [];
       try {
-        events = await client.getUserEvents(username, 100);
+        const events = await client.getUserEvents(username, 100);
+        contributions = utils.extractContributions(events);
       } catch (apiError) {
-        console.error("GitHub API error:", apiError);
-        return response.render("contributions", {
-          title: response.locals.__("github.contributions.title"),
-          actions: [],
-          parent: {
-            href: request.baseUrl,
-            text: response.locals.__("github.title"),
-          },
-          error: {
-            message: apiError.message || "Failed to fetch contributions",
-          },
-        });
+        console.log("[contributions] Events API error:", apiError.message);
+      }
+
+      // Fallback: use Search API if events didn't have contributions
+      if (contributions.length === 0) {
+        console.log("[contributions] Events API returned no contributions, using Search API");
+        contributions = await fetchContributionsFromSearch(
+          client,
+          username,
+          limits.contributions * 2
+        );
       }
 
-      const contributions = utils
-        .extractContributions(events)
-        .slice(0, limits.contributions * 2);
+      contributions = contributions.slice(0, limits.contributions * 2);
 
       response.render("contributions", {
         title: response.locals.__("github.contributions.title"),
@@ -57,4 +103,40 @@ export const contributionsController = {
       next(error);
     }
   },
+
+  async api(request, response, next) {
+    try {
+      const { username, token, cacheTtl, limits } =
+        request.app.locals.application.githubConfig;
+
+      if (!username) {
+        return response.status(400).json({ error: "No username configured" });
+      }
+
+      const client = new GitHubClient({ token, cacheTtl });
+
+      // Try events API first
+      let contributions = [];
+      try {
+        const events = await client.getUserEvents(username, 100);
+        contributions = utils.extractContributions(events);
+      } catch (apiError) {
+        console.log("[contributions API] Events API error:", apiError.message);
+      }
+
+      // Fallback: use Search API if events didn't have contributions
+      if (contributions.length === 0) {
+        console.log("[contributions API] Events API returned no contributions, using Search API");
+        contributions = await fetchContributionsFromSearch(
+          client,
+          username,
+          limits.contributions
+        );
+      }
+
+      response.json({ contributions: contributions.slice(0, limits.contributions) });
+    } catch (error) {
+      next(error);
+    }
+  },
 };

package/lib/controllers/dashboard.js

@@ -1,6 +1,99 @@
 import { GitHubClient } from "../github-client.js";
 import * as utils from "../utils.js";
 
+/**
+ * Fetch commits from user's recently pushed repos
+ * Used as fallback when Events API doesn't include commit details
+ * @param {GitHubClient} client - GitHub client
+ * @param {string} username - GitHub username
+ * @param {number} limit - Max commits to return
+ * @returns {Promise<Array>} - Formatted commits
+ */
+async function fetchCommitsFromRepos(client, username, limit = 10) {
+  try {
+    const repos = await client.getUserRepos(username, 8, "pushed");
+    if (!Array.isArray(repos) || repos.length === 0) {
+      return [];
+    }
+
+    const commitPromises = repos.slice(0, 5).map(async (repo) => {
+      try {
+        const repoCommits = await client.getRepoCommits(
+          repo.owner?.login || username,
+          repo.name,
+          5,
+        );
+        return repoCommits.map((c) => ({
+          sha: c.sha.slice(0, 7),
+          message: utils.truncate(c.commit?.message?.split("\n")[0]),
+          url: c.html_url,
+          repo: repo.full_name,
+          repoUrl: repo.html_url,
+          date: c.commit?.author?.date || c.commit?.committer?.date,
+          author: c.commit?.author?.name,
+        }));
+      } catch {
+        return [];
+      }
+    });
+
+    const commitResults = await Promise.all(commitPromises);
+    return commitResults
+      .flat()
+      .toSorted((a, b) => new Date(b.date) - new Date(a.date))
+      .slice(0, limit);
+  } catch (error) {
+    console.error("[dashboard] Error fetching commits from repos:", error.message);
+    return [];
+  }
+}
+
+/**
+ * Fetch contributions using GitHub Search API
+ * More reliable than Events API which has 90-day/300-event limits
+ * @param {GitHubClient} client - GitHub client
+ * @param {string} username - GitHub username
+ * @param {number} limit - Max contributions to return
+ * @returns {Promise<Array>} - Formatted contributions
+ */
+async function fetchContributionsFromSearch(client, username, limit = 10) {
+  try {
+    const [prsResult, issuesResult] = await Promise.all([
+      client.getUserPRs(username, limit),
+      client.getUserIssues(username, limit),
+    ]);
+
+    const prs = (prsResult.items || []).map((item) => ({
+      type: "pr",
+      title: utils.truncate(item.title),
+      url: item.html_url,
+      repo: item.repository_url?.split("/").slice(-2).join("/"),
+      repoUrl: item.html_url?.split("/pull/")[0],
+      number: item.number,
+      date: item.created_at,
+      state: item.state,
+    }));
+
+    const issues = (issuesResult.items || []).map((item) => ({
+      type: "issue",
+      title: utils.truncate(item.title),
+      url: item.html_url,
+      repo: item.repository_url?.split("/").slice(-2).join("/"),
+      repoUrl: item.html_url?.split("/issues/")[0],
+      number: item.number,
+      date: item.created_at,
+      state: item.state,
+    }));
+
+    return [...prs, ...issues]
+      .toSorted((a, b) => new Date(b.date) - new Date(a.date))
+      .slice(0, limit);
+  } catch (error) {
+    console.error("[dashboard] Error fetching contributions from search:", error.message);
+    return [];
+  }
+}
+
 /**
  * Display GitHub activity dashboard
  * @type {import("express").RequestHandler}
@@ -70,11 +163,25 @@ export const dashboardController = {
       }
 
       console.log("[GitHub Endpoint] Processing data...");
-      const commits = utils.extractCommits(events);
-      console.log("[GitHub Endpoint] Extracted commits:", commits?.length);
+      let commits = utils.extractCommits(events);
+      console.log("[GitHub Endpoint] Extracted commits from events:", commits?.length);
+
+      // Fallback: fetch commits directly from repos if events didn't have them
+      if (commits.length === 0) {
+        console.log("[GitHub Endpoint] Events API returned no commits, fetching from repos");
+        commits = await fetchCommitsFromRepos(client, username, limits.commits || 10);
+        console.log("[GitHub Endpoint] Fetched commits from repos:", commits?.length);
+      }
+
+      let contributions = utils.extractContributions(events);
+      console.log("[GitHub Endpoint] Extracted contributions from events:", contributions?.length);
 
-      const contributions = utils.extractContributions(events);
-      console.log("[GitHub Endpoint] Extracted contributions:", contributions?.length);
+      // Fallback: use Search API if events didn't have contributions
+      if (contributions.length === 0) {
+        console.log("[GitHub Endpoint] Events API returned no contributions, using Search API");
+        contributions = await fetchContributionsFromSearch(client, username, limits.contributions || 10);
+        console.log("[GitHub Endpoint] Fetched contributions from search:", contributions?.length);
+      }
 
       const stars = utils.formatStarred(starred);
       console.log("[GitHub Endpoint] Formatted stars:", stars?.length);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-github",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "GitHub activity endpoint for Indiekit. Display commits, stars, contributions, and featured repositories.",
   "keywords": [
     "indiekit",