greybull 0.1.0 → 0.2.1

package/dist/index.js

@@ -94,7 +94,7 @@ var ApiError = class extends Error {
     this.status = status;
   }
 };
-var VERSION = "0.1.0";
+var VERSION = "0.2.1";
 function buildRequest(opts) {
   const url = new URL(opts.apiUrl.replace(/\/+$/, "") + opts.path);
   if (opts.query) {
@@ -148,13 +148,21 @@ async function apiRequest(opts) {
 }
 
 // src/output.ts
-function formatTable(headers, rows) {
+function formatTable(headers, rows, opts = {}) {
   if (rows.length === 0) return "(none)";
+  const max = opts.max ?? [];
+  const clip = (s, i) => {
+    const w = max[i];
+    return w && s.length > w ? s.slice(0, w - 1) + "\u2026" : s;
+  };
+  const hdr = headers.map((h, i) => clip(h, i));
+  const cells = rows.map((r) => headers.map((_, i) => clip(String(r[i] ?? ""), i)));
+  const last = headers.length - 1;
   const widths = headers.map(
-    (h, i) => Math.max(h.length, ...rows.map((r) => (r[i] ?? "").length))
+    (_, i) => Math.max(hdr[i].length, ...cells.map((r) => r[i].length))
   );
-  const line = (cells) => cells.map((c, i) => (c ?? "").padEnd(widths[i])).join("  ").trimEnd();
-  return [line(headers), ...rows.map(line)].join("\n");
+  const line = (row) => row.map((c, i) => i === last ? c : c.padEnd(widths[i])).join("  ").trimEnd();
+  return [line(hdr), ...cells.map(line)].join("\n");
 }
 function fail(error, opts) {
   let message = error instanceof Error ? error.message : String(error);
@@ -300,7 +308,38 @@ function page(title, body) {
 }
 
 // src/commands/dns.ts
-var RECORD_TYPES = ["A", "AAAA", "CNAME", "MX", "TXT", "NS", "SRV"];
+import fs2 from "fs";
+import os3 from "os";
+import path2 from "path";
+import readline2 from "readline/promises";
+import { spawnSync } from "child_process";
+var RECORD_TYPES = [
+  "A",
+  "AAAA",
+  "ALIAS",
+  "CAA",
+  "CERT",
+  "CNAME",
+  "DNSKEY",
+  "DS",
+  "HINFO",
+  "HTTPS",
+  "LOC",
+  "MX",
+  "NAPTR",
+  "NS",
+  "OPENPGPKEY",
+  "PTR",
+  "RP",
+  "SMIMEA",
+  "SPF",
+  "SRV",
+  "SSHFP",
+  "SVCB",
+  "TLSA",
+  "TXT",
+  "URI"
+];
 function buildListRecords(apiUrl, zone, opts) {
   return buildRequest({
     apiUrl,
@@ -368,11 +407,11 @@ async function listCmd(ctx2, zone, opts) {
   const rows = res.data.map((r) => [
     r.name,
     r.type,
-    r.content,
     String(r.ttl),
-    r.priority !== void 0 ? String(r.priority) : ""
+    r.priority !== void 0 ? String(r.priority) : "",
+    r.content
   ]);
-  process.stdout.write(formatTable(["NAME", "TYPE", "CONTENT", "TTL", "PRIO"], rows) + "\n");
+  process.stdout.write(formatTable(["NAME", "TYPE", "TTL", "PRIO", "CONTENT"], rows, { max: [48] }) + "\n");
 }
 async function addCmd(ctx2, zone, type, name, content, opts) {
   const upperType = assertType(type, ctx2);
@@ -424,6 +463,170 @@ async function deleteCmd(ctx2, zone, type, name, content, opts) {
 function runSpec(spec, ctx2) {
   return performRequest(spec, ctx2.apiKey).catch((err) => fail(err, ctx2));
 }
+function renderZoneFile(zone, records) {
+  const rows = records.map((r) => {
+    const content = r.type === "MX" && r.priority !== void 0 ? `${r.priority} ${r.content}` : r.content;
+    return { name: r.name, ttl: String(r.ttl), type: r.type, content };
+  }).sort((a, b) => a.name.localeCompare(b.name) || a.type.localeCompare(b.type));
+  const nameW = Math.max(1, ...rows.map((r) => r.name.length));
+  const ttlW = Math.max(3, ...rows.map((r) => r.ttl.length));
+  const typeW = Math.max(4, ...rows.map((r) => r.type.length));
+  const header = [
+    // Editor mode hints (comments, so the parser ignores them): Emacs dns-mode
+    // on line 1, Vim bindzone via the modeline at the end. Together with the
+    // .zone temp-file extension these give BIND zone syntax highlighting.
+    "; -*- mode: dns -*-",
+    `; Zone: ${zone}`,
+    "; Edit records below, then save and close your editor to apply.",
+    "; Format:  NAME  TTL  TYPE  CONTENT   (use @ for the zone apex)",
+    "; TXT values keep their quotes; MX/SRV keep priority in CONTENT.",
+    "; SOA and the apex NS records are managed for you and not shown.",
+    ";"
+  ];
+  const body = rows.map(
+    (r) => `${r.name.padEnd(nameW)}  ${r.ttl.padEnd(ttlW)}  ${r.type.padEnd(typeW)}  ${r.content}`
+  );
+  return [...header, ...body, "; vim: set ft=bindzone:", ""].join("\n");
+}
+function parseZoneFile(text) {
+  const recs = [];
+  const lines = text.split("\n");
+  for (let i = 0; i < lines.length; i++) {
+    const trimmed = lines[i].trim();
+    if (!trimmed || trimmed.startsWith(";")) continue;
+    const m = trimmed.match(/^(\S+)\s+(\d+)\s+(?:IN\s+)?([A-Za-z][A-Za-z0-9]*)\s+(.+)$/i);
+    if (!m) {
+      throw new Error(`line ${i + 1}: could not parse "${trimmed}" (expected: NAME TTL TYPE CONTENT)`);
+    }
+    const [, name, ttlStr, typeRaw, content] = m;
+    recs.push({ name, type: typeRaw.toUpperCase(), content: content.trim(), ttl: parseInt(ttlStr) });
+  }
+  return recs;
+}
+function zoneDiff(before, after) {
+  const norm = (t) => t.split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith(";")).map((l) => l.replace(/\s+/g, " "));
+  const a = new Set(norm(before));
+  const b = new Set(norm(after));
+  return {
+    removed: [...a].filter((l) => !b.has(l)).sort(),
+    added: [...b].filter((l) => !a.has(l)).sort()
+  };
+}
+async function prompt(question, valid, def, nonTtyDefault = def) {
+  if (!process.stdin.isTTY) return nonTtyDefault;
+  const rl = readline2.createInterface({ input: process.stdin, output: process.stdout });
+  try {
+    for (; ; ) {
+      const ans = (await rl.question(question)).trim().toLowerCase();
+      if (!ans) return def;
+      if (valid.includes(ans[0])) return ans[0];
+      process.stdout.write(`Please choose one of: ${valid.join(", ")}
+`);
+    }
+  } finally {
+    rl.close();
+  }
+}
+function openInEditor(zone, content) {
+  const file = path2.join(os3.tmpdir(), `greybull-${zone}-${process.pid}.zone`);
+  fs2.writeFileSync(file, content);
+  const editor = process.env.VISUAL || process.env.EDITOR || (process.platform === "win32" ? "notepad" : "vi");
+  const [cmd, ...args] = editor.split(" ");
+  try {
+    const r = spawnSync(cmd, [...args, file], { stdio: "inherit" });
+    if (r.error) return null;
+    return fs2.readFileSync(file, "utf8");
+  } finally {
+    try {
+      fs2.unlinkSync(file);
+    } catch {
+    }
+  }
+}
+var ABORTED = "Aborted. No changes made.\n";
+async function editCmd(ctx2, zone) {
+  const res = await apiRequest({
+    apiUrl: ctx2.apiUrl,
+    apiKey: ctx2.apiKey,
+    method: "GET",
+    path: `/api/v1/dns/zones/${encodeURIComponent(zone)}/records`
+  }).catch((err) => fail(err, ctx2));
+  const originalText = renderZoneFile(zone, res.data);
+  let buffer = originalText;
+  for (; ; ) {
+    const edited = openInEditor(zone, buffer);
+    if (edited === null) fail(new Error("Could not launch editor. Set $EDITOR or $VISUAL."), ctx2);
+    let records;
+    try {
+      records = parseZoneFile(edited);
+    } catch (err) {
+      process.stdout.write(`
+Error parsing the zone: ${err.message}
+`);
+      const c2 = await prompt(
+        "Options are: (e)dit your changes, (r)etry with original zone, (a)bort? [e] ",
+        ["e", "r", "a"],
+        "e",
+        "a"
+      );
+      if (c2 === "a") return void process.stdout.write(ABORTED);
+      buffer = c2 === "r" ? originalText : edited;
+      continue;
+    }
+    const { added, removed } = zoneDiff(originalText, edited);
+    if (added.length === 0 && removed.length === 0) {
+      return void process.stdout.write("No changes.\n");
+    }
+    process.stdout.write("\nChanges to apply:\n");
+    removed.forEach((l) => process.stdout.write(`  - ${l}
+`));
+    added.forEach((l) => process.stdout.write(`  + ${l}
+`));
+    process.stdout.write("\n");
+    const c = await prompt(
+      "(a)pply these changes, (e)dit again, (r)etry with original zone, (q)uit? [a] ",
+      ["a", "e", "r", "q"],
+      "a"
+    );
+    if (c === "q") return void process.stdout.write(ABORTED);
+    if (c === "e") {
+      buffer = edited;
+      continue;
+    }
+    if (c === "r") {
+      buffer = originalText;
+      continue;
+    }
+    try {
+      const put = await apiRequest({
+        apiUrl: ctx2.apiUrl,
+        apiKey: ctx2.apiKey,
+        method: "PUT",
+        path: `/api/v1/dns/zones/${encodeURIComponent(zone)}`,
+        body: { records }
+      });
+      process.stdout.write(`Applied. ${zone} now has ${put.data.applied} record(s).
+`);
+      return;
+    } catch (err) {
+      if (err instanceof ApiError && (err.status === 422 || err.status === 400)) {
+        process.stdout.write(`
+The DNS server rejected the zone: ${err.message}
+`);
+        const c2 = await prompt(
+          "Options are: (e)dit your changes, (r)etry with original zone, (a)bort? [e] ",
+          ["e", "r", "a"],
+          "e",
+          "a"
+        );
+        if (c2 === "a") return void process.stdout.write(ABORTED);
+        buffer = c2 === "r" ? originalText : edited;
+        continue;
+      }
+      fail(err, ctx2);
+    }
+  }
+}
 
 // src/commands/domains.ts
 async function domainsListCmd(ctx2) {
@@ -464,7 +667,7 @@ async function domainsCheckCmd(ctx2, query, opts) {
 
 // src/index.ts
 var program = new Command();
-program.name("greybull").description("Manage Greybull DNS records and domains from the command line").version("0.1.0").option("--json", "output raw JSON", false).option("--api-url <url>", "portal base URL (or set GREYBULL_API_URL)");
+program.name("greybull").description("Manage Greybull DNS records and domains from the command line").version("0.2.1").option("--json", "output raw JSON", false).option("--api-url <url>", "portal base URL (or set GREYBULL_API_URL)");
 function ctx(requireAuth = true) {
   const opts = program.opts();
   const apiUrl = resolveApiUrl(opts.apiUrl);
@@ -506,6 +709,9 @@ dns.command("update <zone> <type> <name> <old-content> <new-content>").descripti
 dns.command("delete <zone> <type> <name> <content>").description("Delete one specific record (content required \u2014 sibling-safe)").option("--priority <n>", "priority (MX/SRV)").action(async (zone, type, name, content, opts) => {
   await deleteCmd(ctx(), zone, type, name, content, opts);
 });
+dns.command("edit <zone>").description("Edit the whole zone in $EDITOR (like pdnsutil edit-zone)").action(async (zone) => {
+  await editCmd(ctx(), zone);
+});
 var domains = program.command("domains").description("Manage domains");
 domains.command("list").description("List your registered domains").action(async () => {
   await domainsListCmd(ctx());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "greybull",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "Command-line tool for the Greybull portal — manage DNS records and domains",
   "type": "module",
   "bin": {