@ondrej-svec/hog 1.23.1 → 1.24.0

package/dist/fetch-worker.js

@@ -11,16 +11,17 @@ var __export = (target, all) => {
 // src/github.ts
 import { execFile, execFileSync } from "child_process";
 import { promisify } from "util";
-function runGh(args) {
-  return execFileSync("gh", args, { encoding: "utf-8", timeout: 3e4, stdio: "pipe" }).trim();
+async function runGhAsync(args) {
+  const { stdout } = await execFileAsync("gh", args, { encoding: "utf-8", timeout: 3e4 });
+  return stdout.trim();
 }
-function runGhJson(args) {
-  const output = runGh(args);
+async function runGhJsonAsync(args) {
+  const output = await runGhAsync(args);
   return JSON.parse(output);
 }
-function runGhGraphQL(args) {
+async function runGhGraphQLAsync(args) {
   try {
-    return runGhJson(args);
+    return await runGhJsonAsync(args);
   } catch (err) {
     if (err && typeof err === "object" && "stdout" in err) {
       const stdout = err.stdout;
@@ -35,7 +36,26 @@ function runGhGraphQL(args) {
     throw err;
   }
 }
-function fetchRepoIssues(repo, options2 = {}) {
+function parseFieldValues(fieldValues, statusKey) {
+  const result = {};
+  for (const fv of fieldValues) {
+    if (!fv) continue;
+    const fieldName = fv.field?.name ?? "";
+    if ("date" in fv && fv.date && DATE_FIELD_NAME_RE.test(fieldName)) {
+      result.targetDate = fv.date;
+    } else if ("name" in fv && fieldName === "Status" && fv.name) {
+      result[statusKey] = fv.name;
+    } else if (fieldName) {
+      const value = "text" in fv && fv.text != null ? fv.text : "number" in fv && fv.number != null ? String(fv.number) : "name" in fv && fv.name != null ? fv.name : "title" in fv && fv.title != null ? fv.title : null;
+      if (value != null) {
+        if (!result.customFields) result.customFields = {};
+        result.customFields[fieldName] = value;
+      }
+    }
+  }
+  return result;
+}
+async function fetchRepoIssuesAsync(repo, options2 = {}) {
   const { state = "open", limit = 100 } = options2;
   const args = [
     "issue",
@@ -52,9 +72,9 @@ function fetchRepoIssues(repo, options2 = {}) {
   if (options2.assignee) {
     args.push("--assignee", options2.assignee);
   }
-  return runGhJson(args);
+  return runGhJsonAsync(args);
 }
-function fetchProjectEnrichment(repo, projectNumber) {
+async function fetchProjectEnrichmentAsync(repo, projectNumber) {
   const [owner] = repo.split("/");
   if (!owner) return /* @__PURE__ */ new Map();
   const projectItemsFragment = `
@@ -116,29 +136,13 @@ function fetchProjectEnrichment(repo, projectNumber) {
         `projectNumber=${String(projectNumber)}`
       ];
       if (cursor) args.push("-f", `cursor=${cursor}`);
-      const result = runGhGraphQL(args);
+      const result = await runGhGraphQLAsync(args);
       const ownerNode = result?.data?.organization ?? result?.data?.user;
       const page = ownerNode?.projectV2?.items;
       const nodes = page?.nodes ?? [];
       for (const item of nodes) {
         if (!item?.content?.number) continue;
-        const enrichment = {};
-        const fieldValues = item.fieldValues?.nodes ?? [];
-        for (const fv of fieldValues) {
-          if (!fv) continue;
-          const fieldName = fv.field?.name ?? "";
-          if ("date" in fv && fv.date && DATE_FIELD_NAME_RE.test(fieldName)) {
-            enrichment.targetDate = fv.date;
-          } else if ("name" in fv && fieldName === "Status" && fv.name) {
-            enrichment.projectStatus = fv.name;
-          } else if (fieldName) {
-            const value = "text" in fv && fv.text != null ? fv.text : "number" in fv && fv.number != null ? String(fv.number) : "name" in fv && fv.name != null ? fv.name : "title" in fv && fv.title != null ? fv.title : null;
-            if (value != null) {
-              if (!enrichment.customFields) enrichment.customFields = {};
-              enrichment.customFields[fieldName] = value;
-            }
-          }
-        }
+        const enrichment = parseFieldValues(item.fieldValues?.nodes ?? [], "projectStatus");
         enrichMap.set(item.content.number, enrichment);
       }
       if (!page?.pageInfo?.hasNextPage) break;
@@ -149,7 +153,7 @@ function fetchProjectEnrichment(repo, projectNumber) {
     return /* @__PURE__ */ new Map();
   }
 }
-function fetchProjectStatusOptions(repo, projectNumber, _statusFieldId) {
+async function fetchProjectStatusOptionsAsync(repo, projectNumber, _statusFieldId) {
   const [owner] = repo.split("/");
   if (!owner) return [];
   const statusFragment = `
@@ -171,7 +175,7 @@ function fetchProjectStatusOptions(repo, projectNumber, _statusFieldId) {
     }
   `;
   try {
-    const result = runGhGraphQL([
+    const result = await runGhGraphQLAsync([
       "api",
       "graphql",
       "-f",
@@ -216,7 +220,8 @@ __export(fetch_exports, {
   fetchDashboard: () => fetchDashboard,
   fetchRecentActivity: () => fetchRecentActivity
 });
-import { execFileSync as execFileSync2 } from "child_process";
+import { execFile as execFile2, execFileSync as execFileSync2 } from "child_process";
+import { promisify as promisify2 } from "util";
 function extractSlackUrl(body) {
   if (!body) return void 0;
   const match = body.match(SLACK_URL_RE);
@@ -233,6 +238,116 @@ function extractLinkedIssueNumbers(title, body) {
   if (!matches) return [];
   return [...new Set(matches.map((m) => parseInt(m.slice(1), 10)).filter((n) => n > 0))];
 }
+function parseActivityOutput(output, shortName) {
+  const cutoff = Date.now() - 24 * 60 * 60 * 1e3;
+  const events = [];
+  for (const line of output.trim().split("\n")) {
+    if (!line.trim()) continue;
+    try {
+      const ev = JSON.parse(line);
+      const timestamp = new Date(ev.created_at);
+      if (timestamp.getTime() < cutoff) continue;
+      if (ev.type === "CreateEvent") {
+        if (ev.ref_type !== "branch" || !ev.ref) continue;
+        const issueNumbers = extractIssueNumbersFromBranch(ev.ref);
+        for (const num of issueNumbers) {
+          events.push({
+            type: "branch_created",
+            repoShortName: shortName,
+            issueNumber: num,
+            actor: ev.actor,
+            summary: `created branch ${ev.ref}`,
+            timestamp,
+            branchName: ev.ref
+          });
+        }
+        continue;
+      }
+      if (!ev.number) continue;
+      let eventType;
+      let summary;
+      let extras = {};
+      if (ev.type === "IssueCommentEvent") {
+        eventType = "comment";
+        const preview = ev.body ? ev.body.slice(0, 60).replace(/\n/g, " ") : "";
+        summary = `commented on #${ev.number}${preview ? ` \u2014 "${preview}${(ev.body?.length ?? 0) > 60 ? "..." : ""}"` : ""}`;
+      } else if (ev.type === "IssuesEvent") {
+        switch (ev.action) {
+          case "opened":
+            eventType = "opened";
+            summary = `opened #${ev.number}: ${ev.title ?? ""}`;
+            break;
+          case "closed":
+            eventType = "closed";
+            summary = `closed #${ev.number}`;
+            break;
+          case "assigned":
+            eventType = "assignment";
+            summary = `assigned #${ev.number}`;
+            break;
+          case "labeled":
+            eventType = "labeled";
+            summary = `labeled #${ev.number}`;
+            break;
+          default:
+            continue;
+        }
+      } else if (ev.type === "PullRequestEvent") {
+        const prNumber = ev.number;
+        extras = { prNumber };
+        if (ev.action === "opened") {
+          eventType = "pr_opened";
+          summary = `opened PR #${prNumber}: ${ev.title ?? ""}`;
+        } else if (ev.action === "closed" && ev.merged) {
+          eventType = "pr_merged";
+          summary = `merged PR #${prNumber}: ${ev.title ?? ""}`;
+        } else if (ev.action === "closed") {
+          eventType = "pr_closed";
+          summary = `closed PR #${prNumber}`;
+        } else {
+          continue;
+        }
+        const linkedIssues = extractLinkedIssueNumbers(ev.title, ev.body);
+        for (const issueNum of linkedIssues) {
+          events.push({
+            type: eventType,
+            repoShortName: shortName,
+            issueNumber: issueNum,
+            actor: ev.actor,
+            summary,
+            timestamp,
+            prNumber
+          });
+        }
+        if (linkedIssues.length === 0) {
+          events.push({
+            type: eventType,
+            repoShortName: shortName,
+            issueNumber: prNumber,
+            actor: ev.actor,
+            summary,
+            timestamp,
+            prNumber
+          });
+        }
+        continue;
+      } else {
+        continue;
+      }
+      events.push({
+        type: eventType,
+        repoShortName: shortName,
+        issueNumber: ev.number,
+        actor: ev.actor,
+        summary,
+        timestamp,
+        ...extras
+      });
+    } catch {
+    }
+  }
+  return events.slice(0, 15);
+}
 function fetchRecentActivity(repoName, shortName) {
   try {
     const output = execFileSync2(
@@ -247,114 +362,61 @@ function fetchRecentActivity(repoName, shortName) {
       ],
       { encoding: "utf-8", timeout: 15e3, stdio: "pipe" }
     );
-    const cutoff = Date.now() - 24 * 60 * 60 * 1e3;
-    const events = [];
-    for (const line of output.trim().split("\n")) {
-      if (!line.trim()) continue;
-      try {
-        const ev = JSON.parse(line);
-        const timestamp = new Date(ev.created_at);
-        if (timestamp.getTime() < cutoff) continue;
-        if (ev.type === "CreateEvent") {
-          if (ev.ref_type !== "branch" || !ev.ref) continue;
-          const issueNumbers = extractIssueNumbersFromBranch(ev.ref);
-          for (const num of issueNumbers) {
-            events.push({
-              type: "branch_created",
-              repoShortName: shortName,
-              issueNumber: num,
-              actor: ev.actor,
-              summary: `created branch ${ev.ref}`,
-              timestamp,
-              branchName: ev.ref
-            });
-          }
-          continue;
-        }
-        if (!ev.number) continue;
-        let eventType;
-        let summary;
-        let extras = {};
-        if (ev.type === "IssueCommentEvent") {
-          eventType = "comment";
-          const preview = ev.body ? ev.body.slice(0, 60).replace(/\n/g, " ") : "";
-          summary = `commented on #${ev.number}${preview ? ` \u2014 "${preview}${(ev.body?.length ?? 0) > 60 ? "..." : ""}"` : ""}`;
-        } else if (ev.type === "IssuesEvent") {
-          switch (ev.action) {
-            case "opened":
-              eventType = "opened";
-              summary = `opened #${ev.number}: ${ev.title ?? ""}`;
-              break;
-            case "closed":
-              eventType = "closed";
-              summary = `closed #${ev.number}`;
-              break;
-            case "assigned":
-              eventType = "assignment";
-              summary = `assigned #${ev.number}`;
-              break;
-            case "labeled":
-              eventType = "labeled";
-              summary = `labeled #${ev.number}`;
-              break;
-            default:
-              continue;
-          }
-        } else if (ev.type === "PullRequestEvent") {
-          const prNumber = ev.number;
-          extras = { prNumber };
-          if (ev.action === "opened") {
-            eventType = "pr_opened";
-            summary = `opened PR #${prNumber}: ${ev.title ?? ""}`;
-          } else if (ev.action === "closed" && ev.merged) {
-            eventType = "pr_merged";
-            summary = `merged PR #${prNumber}: ${ev.title ?? ""}`;
-          } else if (ev.action === "closed") {
-            eventType = "pr_closed";
-            summary = `closed PR #${prNumber}`;
-          } else {
-            continue;
-          }
-          const linkedIssues = extractLinkedIssueNumbers(ev.title, ev.body);
-          for (const issueNum of linkedIssues) {
-            events.push({
-              type: eventType,
-              repoShortName: shortName,
-              issueNumber: issueNum,
-              actor: ev.actor,
-              summary,
-              timestamp,
-              prNumber
-            });
-          }
-          if (linkedIssues.length === 0) {
-            events.push({
-              type: eventType,
-              repoShortName: shortName,
-              issueNumber: prNumber,
-              actor: ev.actor,
-              summary,
-              timestamp,
-              prNumber
-            });
-          }
-          continue;
-        } else {
-          continue;
-        }
-        events.push({
-          type: eventType,
-          repoShortName: shortName,
-          issueNumber: ev.number,
-          actor: ev.actor,
-          summary,
-          timestamp,
-          ...extras
-        });
-      } catch {
-      }
+    return parseActivityOutput(output, shortName);
+  } catch {
+    return [];
+  }
+}
+async function fetchRepoDataAsync(repo, assignee) {
+  try {
+    const fetchOpts = {};
+    if (assignee) fetchOpts.assignee = assignee;
+    const issues = await fetchRepoIssuesAsync(repo.name, fetchOpts);
+    let enrichedIssues = issues;
+    let statusOptions = [];
+    try {
+      const [enrichMap, opts] = await Promise.all([
+        fetchProjectEnrichmentAsync(repo.name, repo.projectNumber),
+        fetchProjectStatusOptionsAsync(repo.name, repo.projectNumber, repo.statusFieldId)
+      ]);
+      enrichedIssues = issues.map((issue) => {
+        const e = enrichMap.get(issue.number);
+        const slackUrl = extractSlackUrl(issue.body ?? "");
+        return {
+          ...issue,
+          ...e?.targetDate !== void 0 ? { targetDate: e.targetDate } : {},
+          ...e?.projectStatus !== void 0 ? { projectStatus: e.projectStatus } : {},
+          ...e?.customFields !== void 0 ? { customFields: e.customFields } : {},
+          ...slackUrl ? { slackThreadUrl: slackUrl } : {}
+        };
+      });
+      statusOptions = opts;
+    } catch {
+      enrichedIssues = issues.map((issue) => {
+        const slackUrl = extractSlackUrl(issue.body ?? "");
+        return slackUrl ? { ...issue, slackThreadUrl: slackUrl } : issue;
+      });
     }
-    return events.slice(0, 15);
+    return { repo, issues: enrichedIssues, statusOptions, error: null };
+  } catch (err) {
+    return { repo, issues: [], statusOptions: [], error: formatError(err) };
+  }
+}
+async function fetchRecentActivityAsync(repoName, shortName) {
+  try {
+    const { stdout } = await execFileAsync2(
+      "gh",
+      [
+        "api",
+        `repos/${repoName}/events`,
+        "-f",
+        "per_page=30",
+        "-q",
+        '.[] | select(.type == "IssuesEvent" or .type == "IssueCommentEvent" or .type == "PullRequestEvent" or .type == "CreateEvent") | {type: .type, actor: .actor.login, action: .payload.action, number: (.payload.issue.number // .payload.pull_request.number), title: (.payload.issue.title // .payload.pull_request.title), body: (.payload.comment.body // .payload.pull_request.body), created_at: .created_at, ref: .payload.ref, ref_type: .payload.ref_type, merged: .payload.pull_request.merged}'
+      ],
+      { encoding: "utf-8", timeout: 15e3 }
+    );
+    return parseActivityOutput(stdout, shortName);
   } catch {
     return [];
   }
@@ -363,62 +425,25 @@ async function fetchDashboard(config2, options2 = {}) {
   const repos = options2.repoFilter ? config2.repos.filter(
     (r) => r.shortName === options2.repoFilter || r.name === options2.repoFilter
   ) : config2.repos;
-  const repoData = repos.map((repo) => {
-    try {
-      const fetchOpts = {};
-      if (options2.mineOnly) {
-        fetchOpts.assignee = config2.board.assignee;
-      }
-      const issues = fetchRepoIssues(repo.name, fetchOpts);
-      let enrichedIssues = issues;
-      let statusOptions = [];
-      try {
-        const enrichMap = fetchProjectEnrichment(repo.name, repo.projectNumber);
-        enrichedIssues = issues.map((issue) => {
-          const e = enrichMap.get(issue.number);
-          const slackUrl = extractSlackUrl(issue.body ?? "");
-          return {
-            ...issue,
-            ...e?.targetDate !== void 0 ? { targetDate: e.targetDate } : {},
-            ...e?.projectStatus !== void 0 ? { projectStatus: e.projectStatus } : {},
-            ...e?.customFields !== void 0 ? { customFields: e.customFields } : {},
-            ...slackUrl ? { slackThreadUrl: slackUrl } : {}
-          };
-        });
-        statusOptions = fetchProjectStatusOptions(
-          repo.name,
-          repo.projectNumber,
-          repo.statusFieldId
-        );
-      } catch {
-        enrichedIssues = issues.map((issue) => {
-          const slackUrl = extractSlackUrl(issue.body ?? "");
-          return slackUrl ? { ...issue, slackThreadUrl: slackUrl } : issue;
-        });
-      }
-      return { repo, issues: enrichedIssues, statusOptions, error: null };
-    } catch (err) {
-      return { repo, issues: [], statusOptions: [], error: formatError(err) };
-    }
-  });
-  const activity = [];
-  for (const repo of repos) {
-    const events = fetchRecentActivity(repo.name, repo.shortName);
-    activity.push(...events);
-  }
-  activity.sort((a, b) => b.timestamp.getTime() - a.timestamp.getTime());
+  const assignee = options2.mineOnly ? config2.board.assignee : void 0;
+  const [repoData, ...activityResults] = await Promise.all([
+    Promise.all(repos.map((repo) => fetchRepoDataAsync(repo, assignee))),
+    ...repos.map((repo) => fetchRecentActivityAsync(repo.name, repo.shortName))
+  ]);
+  const activity = activityResults.flat().sort((a, b) => b.timestamp.getTime() - a.timestamp.getTime());
   return {
     repos: repoData,
     activity: activity.slice(0, 15),
     fetchedAt: /* @__PURE__ */ new Date()
   };
 }
-var SLACK_URL_RE;
+var execFileAsync2, SLACK_URL_RE;
 var init_fetch = __esm({
   "src/board/fetch.ts"() {
     "use strict";
     init_github();
     init_utils();
+    execFileAsync2 = promisify2(execFile2);
     SLACK_URL_RE = /https:\/\/[^/]+\.slack\.com\/archives\/[A-Z0-9]+\/p[0-9]+/i;
   }
 });