npm - github-reporadar - Versions diffs - 0.6.0 → 0.8.0 - Mend

github-reporadar 0.6.0 → 0.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/README.md +15 -2
package/dist/assets/index-DQkwmLip.css +1 -0
package/dist/assets/index-DmB2CQfF.js +90 -0
package/dist/index.html +2 -2
package/dist-cli/cli.js +95 -41
package/package.json +1 -1
package/dist/assets/index-B3RBEh9j.js +0 -90
package/dist/assets/index-R2XOh3Es.css +0 -1

package/dist/index.html CHANGED Viewed

@@ -16,8 +16,8 @@
       href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@400;500;600&family=IBM+Plex+Sans:wght@400;500;600;700&display=swap"
       rel="stylesheet"
     />
-    <script type="module" crossorigin src="/assets/index-B3RBEh9j.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-R2XOh3Es.css">
+    <script type="module" crossorigin src="/assets/index-DmB2CQfF.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-DQkwmLip.css">
   </head>
   <body>
     <div id="root"></div>

package/dist-cli/cli.js CHANGED Viewed

@@ -653,6 +653,10 @@ function buildCql(spaces = []) {
   const scope = spaces.length > 0 ? `space in (${spaces.join(",")}) AND ` : "";
   return `${scope}contributor = currentUser() AND type = page ORDER BY lastmodified DESC`;
 }
+function buildFolderCql(folders) {
+  if (folders.length === 0) return "";
+  return `ancestor in (${folders.join(",")}) AND type = page ORDER BY lastmodified DESC`;
+}
 const ENTITIES = { amp: "&", lt: "<", gt: ">", quot: '"', apos: "'", nbsp: " ", "#39": "'" };
 const decodeEntities = (t) => t.replace(/&([a-z]+|#\d+);/gi, (m, name) => ENTITIES[name.toLowerCase()] ?? m);
 function stripMarkup(source) {
@@ -690,7 +694,7 @@ function extractRepoRefs(text, knownRepos) {
   }
   return found;
 }
-function mapPage(raw, site, knownRepos) {
+function mapPage(raw, site, knownRepos, origin = { mine: true, watched: false }) {
   const body = raw.body?.storage?.value;
   const text = `${raw.title} ${linkTargets(body)} ${stripMarkup(body)}`;
   const webui = raw._links?.webui ?? "";
@@ -702,9 +706,22 @@ function mapPage(raw, site, knownRepos) {
     url: webui ? `https://${site}/wiki${webui}` : `https://${site}/wiki/pages/viewpage.action?pageId=${raw.id}`,
     lastModified: raw.version?.when ?? "",
     lastModifiedBy: raw.version?.by?.accountId ?? "",
+    createdAt: raw.history?.createdDate ?? "",
+    mine: origin.mine,
+    watched: origin.watched,
     repos: extractRepoRefs(text, knownRepos)
   };
 }
+function mergePages(groups) {
+  const byId = /* @__PURE__ */ new Map();
+  for (const group of groups) {
+    for (const page of group) {
+      const seen = byId.get(page.id);
+      byId.set(page.id, seen ? { ...seen, mine: seen.mine || page.mine, watched: seen.watched || page.watched } : page);
+    }
+  }
+  return [...byId.values()];
+}
 const DAY = 24 * 60 * 60 * 1e3;
 function driftingPages(pages, repos, minDays = 1) {
   const pushedAt = new Map(repos.map((r) => [r.nameWithOwner, r.pushedAt]));
@@ -730,42 +747,56 @@ function driftingPages(pages, repos, minDays = 1) {
       });
     }
   }
-  return out.sort((a, b) => b.daysBehind - a.daysBehind || a.title.localeCompare(b.title));
+  return out.sort((a, b) => a.lastModified < b.lastModified ? 1 : a.lastModified > b.lastModified ? -1 : a.title.localeCompare(b.title));
 }
-const EXPAND = "space,version,body.storage";
+const EXPAND = "space,version,history,body.storage";
 const PAGE_SIZE = 50;
-const MAX_TOTAL = 200;
+const MAX_ROUNDS = 8;
+const accountIdCache = /* @__PURE__ */ new Map();
 async function fetchMyAccountId(cfg) {
+  const key2 = `${cfg.site}/${cfg.email}`;
+  const cached = accountIdCache.get(key2);
+  if (cached !== void 0) return cached;
   const token = getAtlassianToken(cfg.email);
   if (!token) return null;
   try {
     const res = await fetch(`https://${cfg.site}/wiki/rest/api/user/current`, { headers: basicAuthHeaders(cfg.email, token) });
     if (!res.ok) return null;
     const json = await res.json();
-    return json.accountId ?? null;
+    if (!json.accountId) return null;
+    accountIdCache.set(key2, json.accountId);
+    return json.accountId;
   } catch {
     return null;
   }
 }
-async function fetchConfluencePages(cfg, knownRepos) {
-  if (!cfg?.site || !cfg.email) return [];
-  const token = getAtlassianToken(cfg.email);
-  if (!token) return [];
-  const headers = basicAuthHeaders(cfg.email, token);
-  const cql = buildCql(cfg.spaces ?? []);
+function nextPath(link) {
+  return link && link.startsWith("/rest/") ? link : null;
+}
+async function searchByCql(cfg, cql, headers, knownRepos, origin) {
+  const params = new URLSearchParams({ cql, expand: EXPAND, limit: String(PAGE_SIZE) });
+  let path = `/rest/api/content/search?${params}`;
   const out = [];
-  for (let start = 0; start < MAX_TOTAL; start += PAGE_SIZE) {
-    const params = new URLSearchParams({ cql, expand: EXPAND, limit: String(PAGE_SIZE), start: String(start) });
-    const res = await fetch(`https://${cfg.site}/wiki/rest/api/content/search?${params}`, { headers });
+  for (let round = 0; round < MAX_ROUNDS && path; round++) {
+    const res = await fetch(`https://${cfg.site}/wiki${path}`, { headers });
     if (!res.ok)
       throw new Error(`Confluence /content/search HTTP ${res.status}: ${(await res.text()).slice(0, 200)}${authHint(res.status, cfg.email)}`);
     const json = await res.json();
-    const batch = json.results ?? [];
-    for (const raw of batch) if (raw?.id) out.push(mapPage(raw, cfg.site, knownRepos));
-    if (batch.length < PAGE_SIZE) break;
+    for (const raw of json.results ?? []) if (raw?.id) out.push(mapPage(raw, cfg.site, knownRepos, origin));
+    path = nextPath(json._links?.next);
   }
   return out;
 }
+async function fetchConfluencePages(cfg, knownRepos) {
+  if (!cfg?.site || !cfg.email) return [];
+  const token = getAtlassianToken(cfg.email);
+  if (!token) return [];
+  const headers = basicAuthHeaders(cfg.email, token);
+  const groups = [await searchByCql(cfg, buildCql(cfg.spaces ?? []), headers, knownRepos, { mine: true, watched: false })];
+  const folderCql = buildFolderCql(cfg.folders ?? []);
+  if (folderCql) groups.push(await searchByCql(cfg, folderCql, headers, knownRepos, { mine: false, watched: true }));
+  return mergePages(groups);
+}
 function buildSlackQuery(repo) {
   return `"${repo}"`;
 }
@@ -888,24 +919,22 @@ async function fetchMyMentions(max = COUNT) {
     return [];
   }
 }
-function diffWikiPages(prev, next, now, myAccountId) {
+function diffWikiPages(prev, next, now, opts = {}) {
   if (prev === null) return [];
   const before = new Map(prev.map((p) => [p.id, p]));
+  const since = opts.since ?? null;
   const out = [];
+  const base = (page) => ({ at: now, repo: page.space, number: 0, title: page.title, url: page.url, source: "wiki" });
   for (const page of next) {
     const b = before.get(page.id);
-    if (!b || !page.lastModified || page.lastModified <= b.lastModified) continue;
-    if (myAccountId && page.lastModifiedBy === myAccountId) continue;
-    out.push({
-      id: `wiki:${page.id}:${page.lastModified}`,
-      at: now,
-      kind: "wiki_updated",
-      repo: page.space,
-      number: 0,
-      title: page.title,
-      url: page.url,
-      source: "wiki"
-    });
+    if (!b) {
+      if (!since || !page.createdAt || page.createdAt <= since || page.byMe) continue;
+      out.push({ id: `wiki:${page.id}:added`, kind: "wiki_added", ...base(page) });
+      continue;
+    }
+    if (!page.lastModified || page.lastModified <= b.lastModified) continue;
+    if (page.byMe) continue;
+    out.push({ id: `wiki:${page.id}:${page.lastModified}`, kind: "wiki_updated", ...base(page) });
   }
   return out;
 }
@@ -1052,6 +1081,7 @@ async function runSync(opts) {
   mkdirSync(opts.dataDir, { recursive: true });
   const prevIssues = readJson("issues.json");
   const prevRepos = readJson("repos.json");
+  const prevSyncAt = readJson("meta.json")?.lastSyncAt ?? null;
   const lastComments = await fetchLastComments(token, commentIncreased(prevIssues, issues), MAX_COMMENT_LOOKUPS);
   const fresh = diffEvents(prevIssues, issues, login, to.toISOString(), {
     prevRepos: prevRepos ? new Set(prevRepos.map((r) => r.nameWithOwner)) : void 0,
@@ -1072,7 +1102,7 @@ async function runSync(opts) {
   writeFileSync(join(opts.dataDir, "refs.json"), JSON.stringify(refStates, null, 2));
   warnMissingAtlassianToken(opts, log);
   await writeJira(opts, log);
-  await writeConfluence(opts, repos, to.toISOString(), readJson, log);
+  await writeConfluence(opts, repos, to.toISOString(), readJson, log, prevSyncAt);
   await writeSlack(opts, to.toISOString(), readJson, log);
   await writeSlackLinks(opts, issues, login, log);
   const totalCommits = activity.reduce((sum, a) => sum + a.commits, 0);
@@ -1107,7 +1137,7 @@ async function runLightSync(opts, log, readJson) {
   writeFileSync(join(opts.dataDir, "repos.json"), JSON.stringify(repos, null, 2));
   if (meta) writeFileSync(join(opts.dataDir, "meta.json"), JSON.stringify({ ...meta, lastSyncAt: to.toISOString() }, null, 2));
   await writeJira(opts, log);
-  await writeConfluence(opts, repos, to.toISOString(), readJson, log);
+  await writeConfluence(opts, repos, to.toISOString(), readJson, log, meta?.lastSyncAt ?? null);
   await writeSlack(opts, to.toISOString(), readJson, log);
   log(`更新: open ${issues.length}件${fresh.length > 0 ? ` / 受信箱に${fresh.length}件` : ""}`);
   return { login, repos: repos.length, commits: 0, issues: issues.length, events: fresh.length };
@@ -1163,11 +1193,16 @@ function warnMissingAtlassianToken(opts, log) {
   log(`  security add-generic-password -s github-reporadar-atlassian -a "${cfg.email}" -w "<APIトークン>"`);
   log(`  トークンは https://id.atlassian.com/manage-profile/security/api-tokens で作れます`);
 }
-async function writeConfluence(opts, repos, now, readJson, log) {
+async function writeConfluence(opts, repos, now, readJson, log, since) {
   if (!opts.confluence) return;
   try {
     const pages = await fetchConfluencePages(opts.confluence, repos.map((r) => r.nameWithOwner));
-    const drifts = driftingPages(pages, repos.map((r) => ({ nameWithOwner: r.nameWithOwner, pushedAt: r.pushedAt })));
+    const myAccountId = pages.length === 0 ? null : await fetchMyAccountId(opts.confluence);
+    if (pages.length > 0 && myAccountId === null) {
+      log(`Confluence: 自分のaccountIdを取れませんでした。誰が更新したかは「不明」として扱います`);
+    }
+    const mine = pages.filter((p) => p.mine);
+    const drifts = driftingPages(mine, repos.map((r) => ({ nameWithOwner: r.nameWithOwner, pushedAt: r.pushedAt })));
     writeFileSync(join(opts.dataDir, "confluence.json"), JSON.stringify(drifts, null, 2));
     if (drifts.length > 0) log(`Confluence: 要確認${drifts.length}件`);
     const refs = pages.map((p) => ({
@@ -1176,16 +1211,19 @@ async function writeConfluence(opts, repos, now, readJson, log) {
       space: p.space,
       url: p.url,
       lastModified: p.lastModified,
-      lastModifiedBy: p.lastModifiedBy
+      lastModifiedBy: p.lastModifiedBy,
+      byMe: myAccountId === null || p.lastModifiedBy === "" ? void 0 : p.lastModifiedBy === myAccountId,
+      createdAt: p.createdAt,
+      watched: p.watched
     }));
     const prevPages = readJson("confluence-pages.json");
-    const myAccountId = prevPages === null ? null : await fetchMyAccountId(opts.confluence);
-    const fresh = diffWikiPages(prevPages, refs, now, myAccountId);
+    const fresh = diffWikiPages(prevPages, refs, now, { since });
     writeFileSync(join(opts.dataDir, "confluence-pages.json"), JSON.stringify(refs, null, 2));
     if (fresh.length > 0) {
       const events = mergeEvents(readJson("events.json") ?? [], fresh);
       writeFileSync(join(opts.dataDir, "events.json"), JSON.stringify(events, null, 2));
-      log(`Confluence: 更新${fresh.length}件を受信箱へ`);
+      const added = fresh.filter((e) => e.kind === "wiki_added").length;
+      log(`Confluence: ${added > 0 ? `追加${added}件 / ` : ""}更新${fresh.length - added}件を受信箱へ`);
     }
   } catch (err) {
     log(`Confluenceの取得に失敗: ${err instanceof Error ? err.message : String(err)}`);
@@ -1218,8 +1256,16 @@ const DEFAULTS = {
   atlassianSite: null,
   atlassianEmail: null,
   jiraProjects: [],
-  confluenceSpaces: []
+  confluenceSpaces: [],
+  confluenceFolders: []
 };
+function parseFolderId(raw) {
+  const trimmed = raw.trim();
+  if (/^\d+$/.test(trimmed)) return trimmed;
+  const m = /\/folder\/(\d+)/.exec(trimmed);
+  if (m) return m[1];
+  throw new RangeError(`--confluence-folderはフォルダのID(数字)か、フォルダのURLで指定してください(受け取った値: ${raw})`);
+}
 function intIn(flag, raw, min, max) {
   if (raw === void 0 || raw.startsWith("--")) throw new RangeError(`${flag} には値が要ります`);
   const n = Number(raw);
@@ -1229,7 +1275,7 @@ function intIn(flag, raw, min, max) {
   return n;
 }
 function parseArgs(argv) {
-  const out = { ...DEFAULTS, orgs: [], jiraProjects: [], confluenceSpaces: [] };
+  const out = { ...DEFAULTS, orgs: [], jiraProjects: [], confluenceSpaces: [], confluenceFolders: [] };
   let command = null;
   for (let i = 0; i < argv.length; i++) {
     const a = argv[i];
@@ -1280,6 +1326,13 @@ function parseArgs(argv) {
         if (!out.confluenceSpaces.includes(v)) out.confluenceSpaces.push(v);
         break;
       }
+      case "--confluence-folder": {
+        const v = argv[++i];
+        if (v === void 0 || v.startsWith("--")) throw new RangeError(`${a}には値が要ります`);
+        const id = parseFolderId(v);
+        if (!out.confluenceFolders.includes(id)) out.confluenceFolders.push(id);
+        break;
+      }
       case "--jira-project": {
         const v = argv[++i];
         if (v === void 0 || v.startsWith("--")) throw new RangeError(`${a}には値が要ります`);
@@ -1341,6 +1394,7 @@ const USAGE = [
   row("--atlassian-site HOST", "Atlassianのサイト(example.atlassian.net)。--atlassian-emailとセット"),
   row("--atlassian-email ADDR", "Atlassianのメールアドレス。トークンはキーチェーンから取る"),
   row("--confluence-space KEY", "齟齬を見るスペースキー(繰り返し可)。省略すると自分が関わった全ページ"),
+  row("--confluence-folder ID", "見張るフォルダ(繰り返し可)。IDでもフォルダのURLでも可。配下は他人が足した / 直したページも知らせる"),
   row("--jira-project KEY", "取得するプロジェクトキー(繰り返し可)。省略すると全部"),
   row("--org NAME", "組織のrepoも取得する(繰り返し可)。組織では自分がauthorのコミットと、自分が作ったか担当のissue/PRだけ数える"),
   row("--data-dir DIR", "データの置き場(既定: $XDG_CACHE_HOME か ~/.cache の github-reporadar/data)"),
@@ -1505,7 +1559,7 @@ async function main() {
   const site = args.atlassianSite;
   const email = args.atlassianEmail;
   const jira = site && email ? { site, email, projects: args.jiraProjects } : null;
-  const confluence = site && email ? { site, email, spaces: args.confluenceSpaces } : null;
+  const confluence = site && email ? { site, email, spaces: args.confluenceSpaces, folders: args.confluenceFolders } : null;
   if (args.command === "sync") {
     await runSync({ dataDir, days: args.days, orgs: args.orgs, jira, confluence });
     return;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "github-reporadar",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "自分のGitHub活動を一晩ぶん眺める計器盤。npx github-reporadarでローカルに開く",
   "license": "MIT",
   "bin": {