@kaynooo/forgejo-tools 0.7.1 → 0.9.0

package/README.md

@@ -33,7 +33,7 @@ Needs [tea](https://gitea.com/gitea/tea) logged in to the Forgejo instance (`tea
 | `ft milestone <title\|id>` | shows a milestone's open issues as `ft board` does (available, taken, claimed by one gone); `ft milestone new <title> [-d text] [--due YYYY-MM-DD]` creates one through the API, sending no `due_on` unless `--due` is given, never a zero date; `ft milestone close <m>` refuses while issues are open in it, naming them, unless `--force` |
 | `ft remote [--fix]` | switches an origin using an ssh alias (`forgejo:owner/repo`) to `git@<host>:owner/repo.git`, which tea matches; the host comes from `--host` or `remoteHost` in `~/.config/ft/config.json` (`{"remoteHost": "git.example.com"}`), and with neither it checks nothing |
 
-`ft <command> --help` lists each command's options. Waiting commands exit 0 when the runs pass, 1 when one fails, 2 on a timeout, a stalled queue or bad usage; the other commands exit 0 when done, 1 when Forgejo refuses or a check fails, 2 on a usage error.
+`ft <command> --help` lists each command's options. Waiting commands show one line per run with how long it has been waiting or running (`● running for 1m 12s`), redrawn in place on a terminal and left at its last status with the time it took (`✓ success in 3m 2s`), and a line per status change in a log or a pipe; they exit 0 when the runs pass, 1 when one fails, 2 on a timeout, a stalled queue or bad usage; the other commands exit 0 when done, 1 when Forgejo refuses or a check fails, 2 on a usage error.
 
 ## CI
 

package/dist/cli.js

@@ -599,15 +599,15 @@ function wholeNumber(value, name, fallback, min = 1) {
     badUsage(`${name.startsWith("<") ? name : `--${name}`} takes a whole number from ${min}, not ${value}`);
   return number;
 }
-var DURATION = /^(\d+(?:\.\d+)?)(ms|[smh])?$/;
-var UNIT_MS = { ms: 1, s: 1000, m: 60000, h: 3600000 };
+var DURATION = /^(\d+(?:\.\d+)?)(ms|[smhd])?$/;
+var UNIT_MS = { ms: 1, s: 1000, m: 60000, h: 3600000, d: 86400000 };
 function duration(value, name, fallback, unit = "s") {
   if (value === undefined)
     return fallback;
   const match = DURATION.exec(value.trim());
   const ms = match === null ? 0 : Number(match[1]) * UNIT_MS[match[2] ?? unit];
   if (ms < 1)
-    badUsage(`--${name} takes a duration such as 30s, 5m or 1h, not ${value}`);
+    badUsage(`--${name} takes a duration such as 30s, 5m, 1h or 7d, not ${value}`);
   return ms;
 }
 async function readInput(path, { noStdin = "nothing is piped on stdin" } = {}) {
@@ -754,6 +754,7 @@ var LINE_UP = "\x1B[1A\x1B[2K";
 var ESC = String.fromCharCode(27);
 var ESCAPE_CODE = new RegExp(`${ESC}(?:\\[[\\x30-\\x3F]*[\\x20-\\x2F]*[\\x40-\\x7E]|\\][^\\u0007${ESC}]*(?:\\u0007|${ESC}\\\\))`, "y");
 var RESET_STYLE = `${ESC}[0m`;
+var CTRL_C = 3;
 var CLOSE_LINK = `${ESC}]8;;${ESC}\\`;
 var CONSOLE_METHODS = ["log", "info", "warn", "error", "debug", "dir", "dirxml", "table", "trace", "group", "groupCollapsed", "count", "timeEnd", "timeLog", "assert"];
 function liveRegion(render, stream = process6.stderr, env = process6.env) {
@@ -786,12 +787,17 @@ function liveRegion(render, stream = process6.stderr, env = process6.env) {
   };
   const timer = setInterval(draw, FRAME_MS);
   const restore = interceptOutput(clear);
-  const onExit = () => clear();
+  const release = swallowInput();
+  const onExit = () => {
+    clear();
+    release();
+  };
   const signals = holdSignals(stop);
   function stop() {
     clearInterval(timer);
     clear();
     restore();
+    release();
     process6.off("exit", onExit);
     signals.release();
   }
@@ -834,6 +840,29 @@ function cutToWidth(line, width) {
   }
   return `${kept}${RESET_STYLE}${linked ? CLOSE_LINK : ""}`;
 }
+function swallowInput() {
+  const input = process6.stdin;
+  if (!input.isTTY)
+    return () => {
+      return;
+    };
+  const onData = (data) => {
+    if (data.includes(CTRL_C))
+      process6.kill(process6.pid, "SIGINT");
+  };
+  input.setRawMode(true);
+  input.on("data", onData);
+  input.resume();
+  let released = false;
+  return () => {
+    if (released)
+      return;
+    released = true;
+    input.off("data", onData);
+    input.pause();
+    input.setRawMode(false);
+  };
+}
 function interceptOutput(clear) {
   const targets = [...CONSOLE_METHODS.map((name) => [console, name]), [process6.stdout, "write"], [process6.stderr, "write"]];
   const wrapped = targets.map(([target, name]) => {
@@ -1292,7 +1321,7 @@ async function currentSession(sessions) {
   return;
 }
 // package.json
-var version = "0.7.1";
+var version = "0.9.0";
 
 // src/args.ts
 var repoOption = {
@@ -1980,8 +2009,12 @@ var EPOCH = Date.parse("2000-01-01T00:00:00Z");
 function runSeconds(run) {
   return run.duration / NANOSECONDS;
 }
+function startedAt(run) {
+  const at = Date.parse(run.started);
+  return Number.isNaN(at) || at < EPOCH ? undefined : at;
+}
 function startedAge(run, now = Date.now()) {
-  return Date.parse(run.started) < EPOCH ? "-" : formatAge(run.started, now);
+  return startedAt(run) === undefined ? "-" : formatAge(run.started, now);
 }
 var RUNS_PAGE = 50;
 async function runsListing(limit, repo, workflow) {
@@ -3065,9 +3098,12 @@ var options5 = {
 var timing = { poll: 1e4 };
 var LIMIT = 20;
 var STALLED2 = 3 * 60000;
-async function watchRuns(pick, timeout, repo, idle) {
+async function watchRuns(pick, timeout, repo, idle, out = process.stdout) {
   const started = Date.now();
-  const reported = new Map;
+  const latest = new Map;
+  const seen = new Map;
+  const line = (run) => `${run.workflow_id} run ${run.id} on ${run.prettyref}: ${badge(run.status, out)}${elapsed(run, seen.get(run.id) ?? Date.now())}`;
+  const region = takesControlCodes(out) ? liveRegion(() => [...latest.values()].map(line), out) : undefined;
   const followed = new Set;
   const failed = new Set;
   let moving = started;
@@ -3078,10 +3114,14 @@ async function watchRuns(pick, timeout, repo, idle) {
     for (const run of runs)
       followed.add(run.id);
     for (const run of runs) {
-      if (reported.get(run.id) !== run.status)
-        console.log(`${run.workflow_id} run ${run.id} on ${run.prettyref}: ${badge(run.status, process.stdout)}`);
-      reported.set(run.id, run.status);
+      if (!seen.has(run.id))
+        seen.set(run.id, Date.now());
+      if (region === undefined && latest.get(run.id)?.status !== run.status)
+        out.write(`${line(run)}
+`);
+      latest.set(run.id, run);
     }
+    region?.redraw();
     if (runs.length === 0) {
       if (idle !== undefined && Date.now() - started > idle) {
         console.log("no run started, so nothing was waited for");
@@ -3109,24 +3149,42 @@ ${run.html_url}`);
       fail(`queued runs are not moving: ${stall.reason}`);
     return;
   }
-  for (;; ) {
-    await Bun.sleep(timing.poll);
-    if (Date.now() - started > timeout)
-      fail(`the runs did not finish in ${formatDuration(timeout)}`);
-    try {
-      const code = await poll();
-      if (code !== undefined)
-        return code;
-    } catch (error) {
-      if (error instanceof Exit)
-        throw error;
-      const message = error instanceof Error ? error.message : String(error);
-      if (isPermanentFailure(error))
-        fail(message);
-      console.warn(`ft watch: ${message}, polling again`);
+  async function settle() {
+    for (;; ) {
+      await Bun.sleep(timing.poll);
+      if (Date.now() - started > timeout)
+        fail(`the runs did not finish in ${formatDuration(timeout)}`);
+      try {
+        const code = await poll();
+        if (code !== undefined)
+          return code;
+      } catch (error) {
+        if (error instanceof Exit)
+          throw error;
+        const message = error instanceof Error ? error.message : String(error);
+        if (isPermanentFailure(error))
+          fail(message);
+        console.warn(`ft watch: ${message}, polling again`);
+      }
+    }
+  }
+  try {
+    return await settle();
+  } finally {
+    if (region !== undefined) {
+      region.stop();
+      for (const run of latest.values())
+        out.write(`${line(run)}
+`);
     }
   }
 }
+function elapsed(run, seen) {
+  if (FINISHED.has(run.status))
+    return run.duration > 0 ? ` in ${formatSeconds(runSeconds(run))}` : "";
+  const seconds = Math.floor((Date.now() - (startedAt(run) ?? seen)) / 1000);
+  return seconds > 0 ? ` for ${formatSeconds(seconds)}` : "";
+}
 async function watch(args) {
   const parsed = parse(args, usage4, options5);
   const { values } = parsed;
@@ -3170,6 +3228,7 @@ var REGISTRY_POLL = 5000;
 var limits = { pushMs: 5 * 60000 };
 var REGISTRY_INFO_MS = 30000;
 var NO_RUN2 = 3 * 60000;
+var RUNS_LOOKED_AT = 20;
 function taggedVersion(tag, prefix) {
   const version = tag.slice(prefix.length);
   return tag.startsWith(prefix) && VERSION.test(version) ? version : undefined;
@@ -3234,6 +3293,14 @@ async function waitForRegistry(name, version) {
   }
   return false;
 }
+async function alreadyPassed(sha) {
+  try {
+    const own = newestPerWorkflow((await recentRuns(RUNS_LOOKED_AT)).filter((run) => run.commit_sha === sha));
+    return own.length > 0 && own.every((run) => FINISHED.has(run.status)) && ["success", "skipped"].includes(overall(own));
+  } catch {
+    return false;
+  }
+}
 async function testsPass(sha, branch, timeout) {
   if (!await gitOk(["merge-base", "--is-ancestor", sha, `origin/${branch}`])) {
     const held = holdSignals();
@@ -3249,6 +3316,10 @@ async function testsPass(sha, branch, timeout) {
       fail(`origin refused the push of ${sha.slice(0, 7)}, so nothing was bumped:
 ${push.stderr.trim()}`, 1);
     console.log(`pushed ${branch} at ${sha.slice(0, 7)}, waiting for its runs before the bump`);
+  } else if (await alreadyPassed(sha)) {
+    return true;
+  } else {
+    console.log(`${branch} at ${sha.slice(0, 7)} is on origin, waiting for its runs before the bump`);
   }
   return await watchRuns((runs) => newestPerWorkflow(runs.filter((run) => run.commit_sha === sha)), timeout, undefined, NO_RUN2) === 0;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kaynooo/forgejo-tools",
   "type": "module",
-  "version": "0.7.1",
+  "version": "0.9.0",
   "description": "ft: Forgejo CI runs, logs, releases and issue checklists from the terminal, through tea.",
   "author": "Kaynooo <contact@kaynooo.fr>",
   "license": "MIT",