Merge pull request #1022 from seocylucky/fix/#1021-fix-locales-error

seocylucky · web-flow · commit 4a3c54ab271b · 2025-10-26T23:36:17.000+09:00
fix: 에셋 경로 해석 공통화(assets resolver), 템플릿/로케일 리졸버 적용
diff --git a/packages/mcp/src/common/assetResolver.ts b/packages/mcp/src/common/assetResolver.ts
@@ -0,0 +1,110 @@
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+// 파일 위치 기준 dirname 조회
+export function getDirname(metaUrl?: string): string {
+  // CJS일 떄
+  if (typeof __dirname === "string") return __dirname as unknown as string;
+
+  // ESM일 때
+  if (metaUrl) {
+    try {
+      return path.dirname(fileURLToPath(metaUrl));
+    } catch {}
+  }
+  return process.cwd();
+}
+
+// 패키지 루트 탐색
+export function findPackageRoot(startDir: string): string {
+  let dir = startDir;
+  while (true) {
+    if (fs.existsSync(path.join(dir, "package.json"))) return dir;
+    const parent = path.dirname(dir);
+    if (parent === dir) return startDir;
+    dir = parent;
+  }
+}
+
+// 디렉토리 탐색 옵션
+type ResolveDirOpts = {
+  /** 최우선 ENV 이름 (예: GITHRU_LOCALES_DIR / GITHRU_TEMPLATES_DIR) */
+  envVar?: string;
+  /** 호출 파일의 위치(ESM일 때) */
+  callerMetaUrl?: string;
+  /** 호출 파일의 위치(CJS일 때) */
+  callerDirname?: string;
+  /** 패키지 루트(없으면 callerDirname에서 자동 탐색) */
+  packageRoot?: string;
+  /** 모듈(현재 파일) 기준 상대경로: ["resources/locales"] */
+  moduleAnchors?: string[];
+  /** 패키지 루트 기준 상대경로: ["dist/resources/locales", "resources/locales", "src/resources/locales"] */
+  packageAnchors?: string[];
+  /** 존재 확인용 필수 파일: ["en.json"] */
+  requiredFiles: string[];
+  // require.resolve로 위치 역추적 옵션
+  tryRequireResolve?: { request: string; bases?: string[] };
+  /** 디버그 로그 토글 ENV */
+  debugEnvVar?: string;
+};
+
+// 디렉토리 위치 탐색
+export function resolveAssetDir(opts: ResolveDirOpts): string {
+  const {
+    envVar,
+    callerMetaUrl,
+    callerDirname = getDirname(),
+    packageRoot = findPackageRoot(callerDirname),
+    moduleAnchors = [],
+    packageAnchors = [],
+    requiredFiles,
+    tryRequireResolve,
+    debugEnvVar,
+  } = opts;
+
+  const debug = debugEnvVar && process.env[debugEnvVar] === "1";
+
+  // 0) ENV 최우선
+  const envDir = envVar ? process.env[envVar]?.trim() : undefined;
+
+  // 1) require.resolve(CJS) 역추적
+  let resolvedByRequire: string | undefined;
+  if (tryRequireResolve?.request) {
+    try {
+      const bases = tryRequireResolve.bases ?? [callerDirname, packageRoot, process.cwd()];
+      for (const b of bases) {
+        const p = require.resolve(tryRequireResolve.request, { paths: [b] as any });
+        resolvedByRequire = path.dirname(p);
+        break;
+      }
+    } catch {}
+  }
+
+  // 2) 모듈 기준 후보
+  const moduleCandidates = moduleAnchors.map((a) => path.resolve(callerDirname, a));
+  // 3) 패키지 루트 기준 후보
+  const pkgCandidates = packageAnchors.map((a) => path.resolve(packageRoot, a));
+
+  const candidates = [envDir, resolvedByRequire, ...moduleCandidates, ...pkgCandidates].filter(Boolean) as string[];
+
+  for (const dir of candidates) {
+    const ok = requiredFiles.some((f) => fs.existsSync(path.join(dir, f)));
+    if (ok) {
+      if (debug) console.error(`[asset] resolved: ${dir}`);
+      return dir;
+    }
+  }
+
+  throw new Error("Cannot locate asset directory. Tried:\n" + candidates.map((p) => ` - ${p}`).join("\n"));
+}
+
+// 파일 접근 함수 생성
+export function makeAssetResolver(baseDir: string) {
+  return {
+    baseDir,
+    path: (...parts: string[]) => path.join(baseDir, ...parts),
+    readText: (file: string, enc: BufferEncoding = "utf8") => fs.readFileSync(path.join(baseDir, file), enc),
+    exists: (file: string) => fs.existsSync(path.join(baseDir, file)),
+  };
+}
diff --git a/packages/mcp/src/common/htmlAssets.ts b/packages/mcp/src/common/htmlAssets.ts
@@ -0,0 +1,18 @@
+import { resolveAssetDir, makeAssetResolver, getDirname } from "./assetResolver.js";
+
+// HTML 템플릿 디렉토리 위치 탐색
+const TEMPLATES_DIR = resolveAssetDir({
+  envVar: "GITHRU_TEMPLATES_DIR",
+  callerDirname: getDirname(),
+  moduleAnchors: ["html", "../html"],
+  packageAnchors: ["dist/html", "html", "src/html"],
+  requiredFiles: [
+    "contributors-chart.html",
+    "feature-impact.html",
+    "author-work-pattern.html",
+    "no-contributors.html",
+    "error-chart.html",
+  ],
+});
+
+export const htmlAssets = makeAssetResolver(TEMPLATES_DIR);
diff --git a/packages/mcp/src/common/i18n.ts b/packages/mcp/src/common/i18n.ts
@@ -1,25 +1,15 @@
-import * as fs from "fs";
-import * as path from "path";
-
-import { getDirname } from "./utils.js";
-
-const __dirname = getDirname();
-
-function findLocalesDir(): string {
-  const cands = [
-    path.resolve(__dirname, "../resources/locales"),
-    path.resolve(__dirname, "../../resources/locales"),
-    path.resolve(process.cwd(), "dist/resources/locales"),
-    path.resolve(process.cwd(), "src/resources/locales"),
-    path.resolve(process.cwd(), "resources/locales"),
-  ];
-  for (const p of cands) {
-    if (fs.existsSync(path.join(p, "en.json"))) return p;
-  }
-  throw new Error("Cannot locate locales directory. Tried:\n" + cands.map((p) => " - " + p).join("\n"));
-}
+import { getDirname, makeAssetResolver, resolveAssetDir } from "./assetResolver.js";
+
+const LOCALES_DIR = resolveAssetDir({
+  envVar: "GITHRU_LOCALES_DIR",
+  callerDirname: getDirname(),
+  moduleAnchors: ["resources/locales"],
+  packageAnchors: ["dist/resources/locales", "resources/locales", "src/resources/locales"],
+  requiredFiles: ["en.json"],
+  tryRequireResolve: { request: "./resources/locales/en.json" },
+});
 
-const LOCALES_DIR = findLocalesDir();
+const locales = makeAssetResolver(LOCALES_DIR);
 
 class I18nManager {
   private currentLocale = "en";
@@ -32,8 +22,7 @@ class I18nManager {
 
   private loadFallback() {
     try {
-      const fallbackPath = path.join(LOCALES_DIR, "en.json");
-      const fallbackData = fs.readFileSync(fallbackPath, "utf-8");
+      const fallbackData = locales.readText("en.json");
       this.fallbackTranslations = JSON.parse(fallbackData);
       this.translations = this.fallbackTranslations;
     } catch (error) {
@@ -52,8 +41,7 @@ class I18nManager {
     }
 
     try {
-      const localePath = path.join(LOCALES_DIR, `${locale}.json`);
-      const localeData = fs.readFileSync(localePath, "utf-8");
+      const localeData = locales.readText(`${locale}.json`);
       this.translations = JSON.parse(localeData);
     } catch (error) {
       console.error(`Locale '${locale}' not found, using English fallback`);
diff --git a/packages/mcp/src/common/utils.ts b/packages/mcp/src/common/utils.ts
@@ -4,8 +4,6 @@ import relativeTime from "dayjs/plugin/relativeTime.js";
 import customParseFormat from "dayjs/plugin/customParseFormat.js";
 import * as cp from "child_process";
 import type { GitHubRepoInfo } from "./types.js";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
 
 dayjs.extend(relativeTime);
 dayjs.extend(customParseFormat);
@@ -280,21 +278,3 @@ export const CommonUtils = {
     return isNaN(parsed) ? 0 : parsed;
   },
 };
-
-export function getFilename(): string {
-  if (typeof __filename !== "undefined") return __filename;
-  try {
-    const metaUrl = (0, eval)("import.meta.url");
-    if (metaUrl) return fileURLToPath(metaUrl);
-  } catch {}
-  return path.join(process.cwd(), "index.js");
-}
-
-export function getDirname(): string {
-  if (typeof __dirname !== "undefined") return __dirname;
-  try {
-    const metaUrl = (0, eval)("import.meta.url");
-    if (metaUrl) return path.dirname(fileURLToPath(metaUrl));
-  } catch {}
-  return process.cwd();
-}
diff --git a/packages/mcp/src/core/authorWorkPattern.ts b/packages/mcp/src/core/authorWorkPattern.ts
@@ -1,12 +1,8 @@
 import * as fs from "fs/promises";
-import * as path from "path";
-import { getDirname } from "../common/utils.js";
 import type { RestEndpointMethodTypes } from "@octokit/rest";
 import { GitHubUtils } from "../common/utils.js";
 import { I18n } from "../common/i18n.js";
-import { Config } from "../common/config.js";
-
-const __dirname = getDirname();
+import { htmlAssets } from "../common/htmlAssets.js";
 
 type CommitListItem = RestEndpointMethodTypes["repos"]["listCommits"]["response"]["data"][number];
 type GetCommitResponse = RestEndpointMethodTypes["repos"]["getCommit"]["response"]["data"];
@@ -47,6 +43,12 @@ function classifyType(msg?: string | null): CommitType {
   return "other";
 }
 
+const htmlEscape = (s: string) =>
+  String(s ?? "").replace(
+    /[&<>"']/g,
+    (ch) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[ch] as string
+  );
+
 export class AuthorWorkPatternAnalyzer {
   private owner: string;
   private repo: string;
@@ -106,14 +108,13 @@ export class AuthorWorkPatternAnalyzer {
     const details: GetCommitResponse[] = await Promise.all(
       picked.map(async (c: CommitListItem) => {
         const resp = await safeApiCall(() =>
-          octokit.repos.getCommit({
+          GitHubUtils.createGitHubAPIClient(this.githubToken).repos.getCommit({
             owner: this.owner,
             repo: this.repo,
             ref: c.sha,
           })
         );
-        const { data } = resp;
-        return data as GetCommitResponse;
+        return resp.data as GetCommitResponse;
       })
     );
 
@@ -155,7 +156,7 @@ export class AuthorWorkPatternAnalyzer {
   async generateReport(payload: Awaited<ReturnType<AuthorWorkPatternAnalyzer["analyze"]>>) {
     I18n.setLocale(this.locale);
 
-    const tplPath = path.join(__dirname, "../html/author-work-pattern.html");
+    const tplPath = htmlAssets.path("author-work-pattern.html");
     const exists = await fs
       .access(tplPath)
       .then(() => true)
@@ -170,17 +171,22 @@ export class AuthorWorkPatternAnalyzer {
     const from = new Date(payload.period.from).toISOString().slice(0, 10);
     const to = new Date(payload.period.to).toISOString().slice(0, 10);
 
-    const notes = [
-      I18n.t("notes.author", { author: payload.author }),
-      I18n.t("notes.repo", { repo: payload.repo }),
-      I18n.t("notes.period", { from, to }),
-    ].join(" · ");
+    const titleEsc = htmlEscape(`Author Work Pattern · ${payload.repo} · ${payload.author}`);
+    const notesEsc = htmlEscape(
+      [
+        I18n.t("notes.author", { author: payload.author }),
+        I18n.t("notes.repo", { repo: payload.repo }),
+        I18n.t("notes.period", { from, to }),
+      ].join(" · ")
+    );
 
     const noDataText = I18n.t("messages.no_data");
     const typeRows =
       payload.typeMix.length === 0
-        ? `<tr><td colspan="2" class="val-right" style="color:#777;">${noDataText}</td></tr>`
-        : payload.typeMix.map((t) => `<tr><td>${t.label}</td><td class="val-right">${t.value}</td></tr>`).join("");
+        ? `<tr><td colspan="2" class="val-right" style="color:#777;">${htmlEscape(noDataText)}</td></tr>`
+        : payload.typeMix
+            .map((t) => `<tr><td>${htmlEscape(t.label)}</td><td class="val-right">${t.value}</td></tr>`)
+            .join("");
 
     const barLabelsJson = JSON.stringify(["Commits", "Churn"]);
     const barValuesJson = JSON.stringify([payload.metrics.commits, payload.metrics.churn]);
@@ -201,19 +207,20 @@ export class AuthorWorkPatternAnalyzer {
 
     let html = await fs.readFile(tplPath, "utf8");
     html = html
-      .replaceAll("{{TITLE}}", `Author Work Pattern · ${payload.repo} · ${payload.author}`)
-      .replaceAll("{{NOTES}}", notes)
+      .replaceAll("{{TITLE}}", titleEsc)
+      .replaceAll("{{NOTES}}", notesEsc)
       .replaceAll("{{COMMITS}}", String(payload.metrics.commits))
       .replaceAll("{{INSERTIONS}}", String(payload.metrics.insertions))
       .replaceAll("{{DELETIONS}}", String(payload.metrics.deletions))
       .replaceAll("{{CHURN}}", String(payload.metrics.churn))
-      .replaceAll("{{BRANCH}}", payload.branch)
+      .replaceAll("{{BRANCH}}", htmlEscape(payload.branch))
       .replaceAll("{{TYPE_TABLE_ROWS}}", typeRows)
       .replaceAll("{{BAR_LABELS_JSON}}", barLabelsJson)
       .replaceAll("{{BAR_VALUES_JSON}}", barValuesJson)
       .replaceAll("{{DONUT_LABELS_JSON}}", donutLabelsJson)
       .replaceAll("{{DONUT_VALUES_JSON}}", donutValuesJson)
-      .replaceAll("{{DONUT_COLORS_JSON}}", donutColorsJson);
+      .replaceAll("{{DONUT_COLORS_JSON}}", donutColorsJson)
+      .replaceAll("</script>", "<\\/script>");
 
     return { content: [{ type: "text" as const, text: html }] };
   }
diff --git a/packages/mcp/src/core/contributorRecommender.ts b/packages/mcp/src/core/contributorRecommender.ts
@@ -1,12 +1,11 @@
 import { Octokit } from "@octokit/rest";
 import type { RestEndpointMethodTypes } from "@octokit/rest";
 import * as fs from "fs";
-import * as path from "path";
-import { getDirname } from "../common/utils.js";
 import { GitHubUtils, CommonUtils } from "../common/utils.js";
 import { I18n } from "../common/i18n.js";
 import type { ContributorRecommenderInputs, ContributorCandidate, ContributorRecommendation } from "../common/types.js";
-import { Config } from "../common/config.js";
+import { htmlAssets } from "../common/htmlAssets.js";
+import { getDirname } from "../common/assetResolver.js";
 
 const __dirname = getDirname();
 
@@ -244,17 +243,15 @@ export class ContributorRecommender {
 
     try {
       if (candidates.length === 0) {
-        const templatePath = path.join(__dirname, "../html/no-contributors.html");
-        let template = fs.readFileSync(templatePath, "utf8");
+        let template = fs.readFileSync(htmlAssets.path("no-contributors.html"), "utf8");
 
         const notesHtml = notes.map((note) => `<p style="color: #666; font-size: 14px;">📝 ${note}</p>`).join("");
         template = template.replace("{{NOTES}}", notesHtml);
 
         return template;
       }
 
-      const templatePath = path.join(__dirname, "../html/contributors-chart.html");
-      let template = fs.readFileSync(templatePath, "utf8");
+      let template = fs.readFileSync(htmlAssets.path("contributors-chart.html"), "utf8");
 
       const names = candidates.map((c) => c.name);
       const scores = candidates.map((c) => c.score);
@@ -287,14 +284,13 @@ export class ContributorRecommender {
       const errorMessage = error instanceof Error ? error.message : String(error);
       console.error("Chart generation error:", error);
 
-      const errorTemplatePath = path.join(__dirname, "../html/error-chart.html");
-      let errorTemplate = fs.readFileSync(errorTemplatePath, "utf8");
+      let errorTemplate = fs.readFileSync(htmlAssets.path("error-chart.html"), "utf8");
 
-      const templatePath = path.join(__dirname, "../html/contributors-chart.html");
-      const debugInfo = `Template directory exists: ${fs.existsSync(path.join(__dirname, "../html"))}
-          Contributors template exists: ${fs.existsSync(path.join(__dirname, "../html/contributors-chart.html"))}
-          No-contributors template exists: ${fs.existsSync(path.join(__dirname, "../html/no-contributors.html"))}
-          Error template exists: ${fs.existsSync(errorTemplatePath)}`;
+      const templatePath = htmlAssets.path("contributors-chart.html");
+      const debugInfo = `Template dir: ${htmlAssets.baseDir} ...
+          Contributors template exists: ${fs.existsSync(templatePath)}
+          No-contributors template exists: ${fs.existsSync(htmlAssets.path("no-contributors.html"))}
+          Error template exists: ${fs.existsSync(htmlAssets.path("error-chart.html"))}`;
 
       errorTemplate = errorTemplate.replace("{{ERROR_MESSAGE}}", errorMessage);
       errorTemplate = errorTemplate.replace("{{TEMPLATE_PATH}}", templatePath);
diff --git a/packages/mcp/src/core/featureImpactAnalyzer.ts b/packages/mcp/src/core/featureImpactAnalyzer.ts
diff --git a/packages/mcp/src/resources/html/author-work-pattern.html b/packages/mcp/src/resources/html/author-work-pattern.html
