@dotobokuri/fleet-console 1.51.0 → 1.52.0

package/dist/fleet-plugins/repository/routes.mjs

@@ -36,6 +36,7 @@ var GitExecutorError = class extends Error {
 var DEFAULT_TIMEOUT_MS = 3e4;
 var DEFAULT_MAX_BUFFER = 8 * 1024 * 1024;
 var STDERR_MAX_BUFFER = 1024 * 1024;
+var PROBE_TIMEOUT_MS = 5e3;
 var GIT_HARDENING_PREFIX = ["-c", "core.fsmonitor=false", "--no-optional-locks"];
 function sanitizeGitEnvironment(environment) {
   const sanitized = {};
@@ -130,8 +131,13 @@ function runGit(args, opts) {
           resolve({ stdout: stdout2, stderr, truncated, stderrTruncated });
           return;
         }
-        const isNoRepo = stderr.toLowerCase().includes("not a git repository");
-        reject(new GitExecutorError(isNoRepo ? "no_git_repo" : "non_zero_exit", stderr, code ?? void 0));
+        if (stderr.toLowerCase().includes("not a git repository")) {
+          reject(new GitExecutorError("no_git_repo", stderr, code ?? void 0));
+          return;
+        }
+        isInsideRepository(opts.cwd).then((inside) => {
+          reject(new GitExecutorError(inside ? "non_zero_exit" : "no_git_repo", stderr, code ?? void 0));
+        });
         return;
       }
       const stdout = Buffer.concat(stdoutChunks).toString("utf8");
@@ -139,6 +145,40 @@ function runGit(args, opts) {
     });
   });
 }
+function isInsideRepository(cwd) {
+  return new Promise((resolve) => {
+    let settled = false;
+    const done = (inside) => {
+      if (settled) return;
+      settled = true;
+      resolve(inside);
+    };
+    try {
+      const probeOptions = {
+        cwd,
+        env: sanitizeGitEnvironment(process.env),
+        stdio: "ignore",
+        shell: false
+      };
+      const probe = spawn("git", [...GIT_HARDENING_PREFIX, "rev-parse", "--git-dir"], withHidden(probeOptions));
+      const timer = setTimeout(() => {
+        probe.kill("SIGKILL");
+        done(true);
+      }, PROBE_TIMEOUT_MS);
+      timer.unref?.();
+      probe.on("error", () => {
+        clearTimeout(timer);
+        done(true);
+      });
+      probe.on("close", (code) => {
+        clearTimeout(timer);
+        done(code === 0);
+      });
+    } catch {
+      done(true);
+    }
+  });
+}
 function isPathContained(root, candidate) {
   const relative = path3.relative(root, candidate);
   return relative === "" || !path3.isAbsolute(relative) && relative !== ".." && !relative.startsWith(`..${path3.sep}`);
@@ -1051,6 +1091,14 @@ async function handleRepositoryFetch(req, res, ctx) {
 var WORKTREE_SHA_RE = /^[0-9a-f]{40}$/;
 var CANONICAL_REF_RE = /^refs\/(?:heads|remotes|tags)\//;
 var REF_METACHAR_RE = /[~^:?*\[\\\s\x00-\x1f\x7f]/;
+var LOG_PRETTY_FORMAT = "--pretty=format:%x1e%H%x00%h%x00%s%x00%an%x00%ar%x00%at%x00%D%x00%P%x00%<(8,trunc)%b";
+var LOG_FIELD_COUNT = 9;
+var FULL_HASH_RE = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/;
+var LOG_ORDER_ARGS = { topo: "--topo-order", date: "--date-order" };
+function resolveLogOrder(requested) {
+  if (requested === void 0) return "topo";
+  return requested === "topo" || requested === "date" ? requested : null;
+}
 function isPlainObject7(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -1074,9 +1122,10 @@ function parseLogOutput(stdout) {
     const authorAt = Number.parseInt(fields[5] ?? "0", 10);
     const refsRaw = fields[6] ?? "";
     const parentsRaw = fields[7] ?? "";
-    if (!fullHash) continue;
+    if (fields.length < LOG_FIELD_COUNT || !FULL_HASH_RE.test(fullHash)) continue;
     const refs = refsRaw.split(",").map((r) => r.trim()).filter(Boolean);
     const parents = parentsRaw.split(" ").map((p) => p.trim()).filter(Boolean);
+    const hasBody = (fields[8] ?? "").trim() !== "";
     commits.push({
       shortHash,
       fullHash,
@@ -1086,7 +1135,8 @@ function parseLogOutput(stdout) {
       authorAt: Number.isFinite(authorAt) ? authorAt : 0,
       refs,
       parents,
-      onHead: true
+      onHead: true,
+      hasBody
     });
   }
   return commits;
@@ -1185,6 +1235,11 @@ async function handleRepositoryLog(req, res, ctx) {
     ctx.host.http.writeJson(res, 400, { error: "invalid_request" });
     return;
   }
+  const order = resolveLogOrder(body.order);
+  if (order === null) {
+    ctx.host.http.writeJson(res, 400, { error: "invalid_request" });
+    return;
+  }
   const limit = body.limit === void 0 ? 200 : body.limit;
   const skip = body.skip === void 0 ? 0 : body.skip;
   if (!Number.isInteger(limit) || typeof limit !== "number" || limit < 1 || limit > 500 || !Number.isInteger(skip) || typeof skip !== "number" || skip < 0) {
@@ -1225,13 +1280,14 @@ async function handleRepositoryLog(req, res, ctx) {
     const [realGitCwd, realToplevel] = await Promise.all([normalizeWorktreePath(gitCwd), normalizeWorktreePath(currentWorktreePath)]);
     const scopePathspec = realToplevel !== "" && realGitCwd === realToplevel ? [] : ["."];
     const skipArg = skip > 0 ? [`--skip=${skip}`] : [];
-    const result = resolvedRef ? await runGit(["log", resolvedRef, "--date-order", "-n", String(limit + 1), ...skipArg, "--decorate=full", "--pretty=format:%x1e%H%x00%h%x00%s%x00%an%x00%ar%x00%at%x00%D%x00%P", "--", ...scopePathspec], { cwd: gitCwd }) : await runGit(
+    const orderArg = LOG_ORDER_ARGS[order];
+    const result = resolvedRef ? await runGit(["log", resolvedRef, orderArg, "-n", String(limit + 1), ...skipArg, "--decorate=full", LOG_PRETTY_FORMAT, "--", ...scopePathspec], { cwd: gitCwd }) : await runGit(
       // --all은 refs/stash·refs/notes까지 그래프에 유입시키므로 브랜치/태그/원격 + 현재 HEAD + 워크트리 HEAD로 한정한다
-      ["log", "--branches", "--tags", "--remotes", "--date-order", "-n", String(limit + 1), ...skipArg, "--decorate=full", "--pretty=format:%x1e%H%x00%h%x00%s%x00%an%x00%ar%x00%at%x00%D%x00%P", ...headRevs, ...worktreeRevs, "--", ...scopePathspec],
+      ["log", "--branches", "--tags", "--remotes", orderArg, "-n", String(limit + 1), ...skipArg, "--decorate=full", LOG_PRETTY_FORMAT, ...headRevs, ...worktreeRevs, "--", ...scopePathspec],
       { cwd: gitCwd }
     );
     const parsedCommits = parseLogOutput(result.stdout);
-    const hasMore = parsedCommits.length > limit;
+    const hasMore = parsedCommits.length > limit || result.truncated && parsedCommits.length > 0;
     const commits = annotateHeadReachability(parsedCommits.slice(0, limit), headRevList);
     ctx.host.http.writeJson(res, 200, { commits, checkouts, hasMore, ...result.truncated ? { truncated: true } : {} });
   } catch (error) {