@kaynooo/cli-docker 0.3.0 → 0.4.0

package/README.md

@@ -1,6 +1,6 @@
 # docker
 
-Three helpers: `dc` runs compose on the stack found here, `dx` lists a stack's services and opens a shell in one, follows its logs, restarts, stops or rebuilds it, `sf` picks a Symfony console command and runs it.
+Four helpers: `dc` runs compose on the stack found here, `dx` lists a stack's services and opens a shell in one, follows its logs, restarts, stops or rebuilds it, `dlog` shows every service's health and recent errors, `sf` picks a Symfony console command and runs it.
 
 ```sh
 bun install -g @kaynooo/cli-docker
@@ -15,6 +15,7 @@ bun install -g @kaynooo/cli-docker
 | `dx` | picks a service with fzf: enter opens its shell (or brings it up), ctrl-l follows its logs, ctrl-r restarts, ctrl-x stops, ctrl-b rebuilds; the ones acted on last come first. Without fzf or a terminal it lists them with their state, ports and image (`--json` for the full record) |
 | `dx -` | the last action again |
 | `dx <service> [action]` | `shell` (the default, `up` for a stopped service), `logs`, `restart`, `up`, `stop` or `build` |
+| `dlog [service...]` | one line per service with its state and health, then the last distinct error lines of its logs (`-n` per service, `--since 1h`), a repeated message once with `×N` and secrets masked as `redact` does; `--all` adds the last lines of a quiet service. Exits 1 when a service is down or unhealthy or logged an error |
 | `sf` | picks a Symfony console command with fzf and runs it, asking for each required argument; the commands run last come first, and the picker opens on the list cached from the last run. It runs in the php service of the nearest compose stack, else with the local php. Without fzf or a terminal it lists the commands |
 | `sf -` | the last command again, with the arguments it ran with |
 | `sf <command> [args...]` | runs without the picker; a name the list does not hold goes to the console as is, which resolves `c:c` to `cache:clear` itself |

package/dist/dc-cli.js

@@ -349,6 +349,9 @@ function optionRows(options, colors = paint(process3.stdout)) {
 
 // ../kit/src/text.ts
 var ANSI = new RegExp(`${String.fromCharCode(27)}\\[[\\d;?]*[a-z]`, "gi");
+function stripAnsi(text) {
+  return text.replace(ANSI, "");
+}
 function distance(a, b) {
   let previous = Array.from({ length: b.length + 1 }, (_, index) => index);
   for (const [i, left] of [...a].entries()) {
@@ -745,7 +748,7 @@ var {Glob } = globalThis.Bun;
 var SESSION_FILES = new Glob("*.json");
 var ACCOUNT_DIRS = new Glob("*/sessions");
 // package.json
-var version = "0.3.0";
+var version = "0.4.0";
 
 // src/dc.ts
 import process8 from "process";
@@ -827,9 +830,17 @@ async function recordedNearby() {
   const dirs = new Set([...up("."), ...children()].map((dir) => resolve(dir)));
   return (await labels()).filter((stack) => dirs.has(stack.workdir));
 }
-async function output(stack, args) {
+async function attempt(stack, args) {
   const proc = Bun.spawn([...stack.list.argv, ...args], { cwd: stack.list.cwd, env: stack.list.env, stdout: "pipe", stderr: "pipe" });
-  return await proc.exited === 0 ? new Response(proc.stdout).text() : "";
+  const [text, stderr, code] = await Promise.all([new Response(proc.stdout).text(), new Response(proc.stderr).text(), proc.exited]);
+  if (code === 0)
+    return { text, error: undefined };
+  const last = stderr.trim().split(`
+`).at(-1) ?? "";
+  return { text: "", error: last === "" ? `exit ${code}` : last };
+}
+async function output(stack, args) {
+  return (await attempt(stack, args)).text;
 }
 function containers(text) {
   const trimmed = text.trim();