greybull 0.2.2 → 0.2.4

package/dist/index.js

@@ -94,7 +94,7 @@ var ApiError = class extends Error {
     this.status = status;
   }
 };
-var VERSION = "0.2.2";
+var VERSION = "0.2.4";
 function buildRequest(opts) {
   const url = new URL(opts.apiUrl.replace(/\/+$/, "") + opts.path);
   if (opts.query) {
@@ -148,6 +148,17 @@ async function apiRequest(opts) {
 }
 
 // src/output.ts
+var COLOR = Boolean(process.stdout.isTTY) && !process.env.NO_COLOR;
+function paint(code, s) {
+  return COLOR ? `\x1B[${code}m${s}\x1B[0m` : s;
+}
+var color = {
+  red: (s) => paint("31", s),
+  green: (s) => paint("32", s),
+  yellow: (s) => paint("33", s),
+  bold: (s) => paint("1", s),
+  dim: (s) => paint("2", s)
+};
 function formatTable(headers, rows, opts = {}) {
   if (rows.length === 0) return "(none)";
   const max = opts.max ?? [];
@@ -175,7 +186,7 @@ Run 'greybull login' to authenticate (or set GREYBULL_API_KEY).`;
 Your API key is missing a required scope \u2014 create one with DNS/domain permissions at ${opts.apiUrl}/api-settings.`;
     }
   }
-  process.stderr.write(`Error: ${message}
+  process.stderr.write(`${color.red(color.bold("Error:"))} ${color.red(message)}
 `);
   process.exit(1);
 }
@@ -478,7 +489,7 @@ function renderZoneFile(zone, records) {
     "; -*- 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)",
+    "; Format:  NAME  [TTL]  TYPE  CONTENT   (@ = apex; TTL optional, default 3600)",
     "; TXT values keep their quotes; MX/SRV keep priority in CONTENT.",
     "; SOA and the apex NS records are managed for you and not shown.",
     ";"
@@ -494,12 +505,17 @@ function parseZoneFile(text) {
   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);
+    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)`);
+      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) });
+    recs.push({
+      name,
+      type: typeRaw.toUpperCase(),
+      content: content.trim(),
+      ttl: ttlStr ? parseInt(ttlStr) : 3600
+    });
   }
   return recs;
 }
@@ -527,11 +543,21 @@ async function prompt(question, valid, def, nonTtyDefault = def) {
     rl.close();
   }
 }
-function editorArgv(cmd, args, file) {
+function isVimFamily(cmd) {
   const base = path2.basename(cmd).replace(/\.exe$/i, "").toLowerCase();
-  if (["vim", "nvim", "gvim", "mvim"].includes(base)) {
-    return [...args, "-c", "syntax enable", "-c", "set ft=bindzone", file];
+  if (["vim", "nvim", "gvim", "mvim", "vimdiff", "view"].includes(base)) return true;
+  if (base === "vi") {
+    try {
+      const r = spawnSync(cmd, ["--version"], { encoding: "utf8", timeout: 2e3 });
+      return /\bn?vim\b/i.test(`${r.stdout ?? ""}${r.stderr ?? ""}`);
+    } catch {
+      return false;
+    }
   }
+  return false;
+}
+function editorArgv(args, file, forceVim) {
+  if (forceVim) return [...args, "-c", "syntax enable", "-c", "set ft=bindzone", file];
   return [...args, file];
 }
 function openInEditor(zone, content) {
@@ -540,7 +566,7 @@ function openInEditor(zone, content) {
   const editor = process.env.VISUAL || process.env.EDITOR || (process.platform === "win32" ? "notepad" : "vi");
   const [cmd, ...args] = editor.split(" ");
   try {
-    const r = spawnSync(cmd, editorArgv(cmd, args, file), { stdio: "inherit" });
+    const r = spawnSync(cmd, editorArgv(args, file, isVimFamily(cmd)), { stdio: "inherit" });
     if (r.error) return null;
     return fs2.readFileSync(file, "utf8");
   } finally {
@@ -567,9 +593,9 @@ async function editCmd(ctx2, zone) {
     try {
       records = parseZoneFile(edited);
     } catch (err) {
-      process.stdout.write(`
-Error parsing the zone: ${err.message}
-`);
+      process.stdout.write(
+        "\n" + color.red(color.bold("Error parsing the zone: ") + err.message) + "\n"
+      );
       const c2 = await prompt(
         "Options are: (e)dit your changes, (r)etry with original zone, (a)bort? [e] ",
         ["e", "r", "a"],
@@ -584,11 +610,9 @@ Error parsing the zone: ${err.message}
     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" + color.bold("Changes to apply:") + "\n");
+    removed.forEach((l) => process.stdout.write(color.red(`  - ${l}`) + "\n"));
+    added.forEach((l) => process.stdout.write(color.green(`  + ${l}`) + "\n"));
     process.stdout.write("\n");
     const c = await prompt(
       "(a)pply these changes, (e)dit again, (r)etry with original zone, (q)uit? [a] ",
@@ -612,14 +636,15 @@ Error parsing the zone: ${err.message}
         path: `/api/v1/dns/zones/${encodeURIComponent(zone)}`,
         body: { records }
       });
-      process.stdout.write(`Applied. ${zone} now has ${put.data.applied} record(s).
-`);
+      process.stdout.write(
+        color.green(`Applied. ${zone} now has ${put.data.applied} record(s).`) + "\n"
+      );
       return;
     } catch (err) {
       if (err instanceof ApiError && (err.status === 422 || err.status === 400)) {
-        process.stdout.write(`
-The DNS server rejected the zone: ${err.message}
-`);
+        process.stdout.write(
+          "\n" + color.red(color.bold("The DNS server rejected the zone: ") + err.message) + "\n"
+        );
         const c2 = await prompt(
           "Options are: (e)dit your changes, (r)etry with original zone, (a)bort? [e] ",
           ["e", "r", "a"],
@@ -674,7 +699,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.2.2").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.4").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);

package/package.json

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