altalandi 0.6.0 → 0.6.1

package/auth.mjs

@@ -1,223 +1,223 @@
-// `altalandi login` — connect this computer to an Altalandi account once.
-//
-// Device login, the same pattern as `gh auth login`: the CLI asks the API for a
-// short code, the user opens altalandi.is/tengja, signs in or creates an
-// account, and approves. The CLI then receives a key for that account exactly
-// once and stores it in the user's config directory. The key never passes
-// through a chat, a prompt, the clipboard or shell history.
-//
-// Afterwards every `altalandi` call finds the key on its own, so an agent (the
-// Claude Code skill, a script) needs no environment variable at all.
-//
-// Zero dependencies, like the rest of the CLI.
-
-import { spawn } from "node:child_process";
-import { chmod, mkdir, readFile, rm, writeFile } from "node:fs/promises";
-import { existsSync, readFileSync } from "node:fs";
-import { homedir, hostname } from "node:os";
-import path from "node:path";
-
-import { skillStatus, skillTarget, writeSkill } from "./update.mjs";
-
-export const DEFAULT_BASE_URL = "https://altalandi.is/api";
-
-/** Where the key is stored. ALTALANDI_CONFIG_DIR overrides (tests, CI). */
-export function configDir({ env = process.env, home = homedir(), platform = process.platform } = {}) {
-  if (env.ALTALANDI_CONFIG_DIR) return env.ALTALANDI_CONFIG_DIR;
-  if (platform === "win32") return path.join(env.APPDATA || path.join(home, "AppData", "Roaming"), "altalandi");
-  return path.join(env.XDG_CONFIG_HOME || path.join(home, ".config"), "altalandi");
-}
-
-export function credentialsFile(opts) {
-  return path.join(configDir(opts), "credentials.json");
-}
-
-/** The stored credentials, or null. Never throws. */
-export function readCredentials(opts) {
-  try {
-    const data = JSON.parse(readFileSync(credentialsFile(opts), "utf8"));
-    return data && typeof data.apiKey === "string" && data.apiKey ? data : null;
-  } catch {
-    return null;
-  }
-}
-
-/** Key resolution order: explicit flag, ALTALANDI_API_KEY, stored login. */
-export function resolveKey({ flag, env = process.env, ...opts } = {}) {
-  if (flag) return { key: flag, source: "flag" };
-  const fromEnv = env.ALTALANDI_API_KEY || env.ALTALANDI_KEY;
-  if (fromEnv) return { key: fromEnv, source: "env" };
-  const stored = readCredentials({ env, ...opts });
-  return stored ? { key: stored.apiKey, source: "login", username: stored.username } : { key: "", source: "none" };
-}
-
-async function saveCredentials(data, opts) {
-  const dir = configDir(opts);
-  await mkdir(dir, { recursive: true });
-  const file = credentialsFile(opts);
-  await writeFile(file, JSON.stringify(data, null, 2) + "\n", { encoding: "utf8", mode: 0o600 });
-  try { await chmod(file, 0o600); } catch { /* Windows: the per-user profile directory is the protection */ }
-  return file;
-}
-
-function clientName(env = process.env) {
-  const where = (hostname() || "").split(".")[0].slice(0, 24);
-  const who = env.CLAUDECODE || env.CLAUDE_CODE_ENTRYPOINT ? "Claude Code" : "altalandi CLI";
-  return where ? `${who} á ${where}` : who;
-}
-
-function openBrowser(url) {
-  try {
-    const [cmd, args] = process.platform === "win32" ? ["cmd", ["/c", "start", "", url]]
-      : process.platform === "darwin" ? ["open", [url]] : ["xdg-open", [url]];
-    const child = spawn(cmd, args, { stdio: "ignore", detached: true, windowsHide: true });
-    child.on("error", () => {});
-    child.unref();
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
-
-async function postJson(fetchImpl, url, body) {
-  const res = await fetchImpl(url, {
-    method: "POST",
-    headers: { "content-type": "application/json", accept: "application/json" },
-    body: JSON.stringify(body),
-  });
-  let data = {};
-  try { data = await res.json(); } catch { /* keep {} */ }
-  return { status: res.status, data };
-}
-
-/**
- * Run the device login. Returns an exit code.
- *   0 logged in · 1 failed or expired · 2 bad usage
- */
-export async function runLogin(flags = {}, io = {}) {
-  const env = io.env || process.env;
-  const fetchImpl = io.fetch || globalThis.fetch;
-  const log = io.log || ((m) => console.error(m));
-  const base = (flags.baseUrl || env.ALTALANDI_BASE_URL || DEFAULT_BASE_URL).replace(/\/$/, "");
-  const wait = io.sleep || sleep;
-
-  let start;
-  try {
-    start = await postJson(fetchImpl, `${base}/v1/device/start`, { clientName: clientName(env) });
-  } catch (e) {
-    log(`Náði ekki sambandi við Altalandi (${e.message}).`);
-    return 1;
-  }
-  if (start.status !== 200 || !start.data.deviceCode) {
-    log(`Innskráning fór ekki af stað: ${start.data.detail || `HTTP ${start.status}`}`);
-    return 1;
-  }
-  const { deviceCode, userCode, verificationUriComplete, verificationUri, interval = 3, expiresIn = 600 } = start.data;
-
-  log("");
-  log("  Tengdu þessa tölvu við Altalandi-aðganginn þinn:");
-  log("");
-  log(`    1. Opnaðu   ${verificationUriComplete}`);
-  log(`    2. Skráðu þig inn eða stofnaðu aðgang (500 kr. prufuinneign fylgir)`);
-  log(`    3. Staðfestu kóðann   ${userCode}`);
-  log("");
-  log(`  (Connect this computer: open the link, sign in or sign up, confirm the code.`);
-  log(`   Code page: ${verificationUri})`);
-  log("");
-  if (!flags.noBrowser && !io.noBrowser) openBrowser(verificationUriComplete);
-  log("  Bíð eftir staðfestingu…");
-
-  const deadline = Date.now() + expiresIn * 1000;
-  let result = null;
-  while (Date.now() < deadline) {
-    await wait(Math.max(1, interval) * 1000);
-    let poll;
-    try {
-      poll = await postJson(fetchImpl, `${base}/v1/device/token`, { deviceCode });
-    } catch {
-      continue; // transient network error: keep waiting until the code expires
-    }
-    if (poll.status === 200 && poll.data.status === "approved") { result = poll.data; break; }
-    if (poll.status === 200 && poll.data.status === "pending") continue;
-    if (poll.status === 429) { await wait(10_000); continue; }
-    log(`  Kóðinn rann út eða var hafnað. Keyrðu \`altalandi login\` aftur.`);
-    return 1;
-  }
-  if (!result) {
-    log(`  Kóðinn rann út. Keyrðu \`altalandi login\` aftur.`);
-    return 1;
-  }
-
-  const file = await saveCredentials({
-    apiKey: result.apiKey,
-    username: result.username,
-    baseUrl: base === DEFAULT_BASE_URL ? undefined : base,
-    savedAt: new Date().toISOString(),
-  }, { env });
-  log("");
-  log(`  ✓ Tengt sem ${result.username}. Lykillinn er vistaður í ${file}`);
-
-  // Install or refresh the Claude Code skill — the point of logging in for most
-  // people. Only where Claude Code exists; never create ~/.claude for someone who
-  // does not use it. --no-skill opts out.
-  if (!flags.noSkill) {
-    const target = skillTarget({ env });
-    const status = await skillStatus({ target });
-    if (status === "missing" || status === "outdated") {
-      const { file: skillFile, backup } = await writeSkill({ target });
-      log(`  ✓ Claude Code-hæfnin „altalandi" sett upp: ${skillFile}${backup ? ` (eldri útgáfa afrituð í ${backup})` : ""}`);
-    } else if (status === "current") {
-      log(`  ✓ Claude Code-hæfnin „altalandi" er þegar uppfærð.`);
-    } else if (status === "absent") {
-      log(`  (Claude Code fannst ekki á þessari tölvu, svo hæfnin var ekki sett upp.)`);
-    }
-  }
-  log("");
-  log(`  Prófaðu:   altalandi "Make sure to reach out to us today."`);
-  log(`  Eða segðu Claude:  „Skrifaðu þetta á góðri íslensku með Altalandi."`);
-  return 0;
-}
-
-export async function runLogout(io = {}) {
-  const env = io.env || process.env;
-  const log = io.log || ((m) => console.error(m));
-  const file = credentialsFile({ env });
-  if (!existsSync(file)) { log("Engin vistuð innskráning."); return 0; }
-  await rm(file, { force: true });
-  log(`Innskráning fjarlægð (${file}). Lykillinn sjálfur er enn virkur þar til þú afturkallar hann á https://altalandi.is/portal`);
-  return 0;
-}
-
-export async function runWhoami(flags = {}, io = {}) {
-  const env = io.env || process.env;
-  const fetchImpl = io.fetch || globalThis.fetch;
-  const out = io.out || ((m) => console.log(m));
-  const log = io.log || ((m) => console.error(m));
-  const { key, source } = resolveKey({ flag: flags.key, env });
-  if (!key) { log("Ekki innskráð(ur). Keyrðu: npx altalandi login"); return 2; }
-  const stored = readCredentials({ env });
-  const base = (flags.baseUrl || env.ALTALANDI_BASE_URL || stored?.baseUrl || DEFAULT_BASE_URL).replace(/\/$/, "");
-  let res;
-  try {
-    res = await fetchImpl(`${base}/v1/me`, { headers: { authorization: `Bearer ${key}`, accept: "application/json" } });
-  } catch (e) {
-    log(`Náði ekki sambandi við Altalandi (${e.message}).`);
-    return 1;
-  }
-  if (res.status === 401) { log("Lykillinn er ógildur eða afturkallaður. Keyrðu: npx altalandi login"); return 1; }
-  if (!res.ok) { log(`Villa: HTTP ${res.status}`); return 1; }
-  const me = await res.json();
-  if (flags.json) out(JSON.stringify({ ...me, keySource: source }, null, 2));
-  else {
-    const { formatInt, formatIsk } = await import("./report.mjs");
-    const free = me.freeUnitsLeftToday != null && me.freeDailyUnits != null
-      ? `ókeypis eftir í dag ${formatInt(me.freeUnitsLeftToday)} af ${formatInt(me.freeDailyUnits)} einingum`
-      : me.freeDailyUnits ? `ókeypis ${formatInt(me.freeDailyUnits)} einingar á dag` : "";
-    out([me.username ?? "(lykill án aðgangs)",
-      `inneign ${me.balanceIsk != null ? formatIsk(me.balanceIsk) : "—"}`,
-      free, `lykill ${me.keyId} (${source})`].filter(Boolean).join(" · "));
-  }
-  return 0;
-}
+// `altalandi login` — connect this computer to an Altalandi account once.
+//
+// Device login, the same pattern as `gh auth login`: the CLI asks the API for a
+// short code, the user opens altalandi.is/tengja, signs in or creates an
+// account, and approves. The CLI then receives a key for that account exactly
+// once and stores it in the user's config directory. The key never passes
+// through a chat, a prompt, the clipboard or shell history.
+//
+// Afterwards every `altalandi` call finds the key on its own, so an agent (the
+// Claude Code skill, a script) needs no environment variable at all.
+//
+// Zero dependencies, like the rest of the CLI.
+
+import { spawn } from "node:child_process";
+import { chmod, mkdir, readFile, rm, writeFile } from "node:fs/promises";
+import { existsSync, readFileSync } from "node:fs";
+import { homedir, hostname } from "node:os";
+import path from "node:path";
+
+import { skillStatus, skillTarget, writeSkill } from "./update.mjs";
+
+export const DEFAULT_BASE_URL = "https://altalandi.is/api";
+
+/** Where the key is stored. ALTALANDI_CONFIG_DIR overrides (tests, CI). */
+export function configDir({ env = process.env, home = homedir(), platform = process.platform } = {}) {
+  if (env.ALTALANDI_CONFIG_DIR) return env.ALTALANDI_CONFIG_DIR;
+  if (platform === "win32") return path.join(env.APPDATA || path.join(home, "AppData", "Roaming"), "altalandi");
+  return path.join(env.XDG_CONFIG_HOME || path.join(home, ".config"), "altalandi");
+}
+
+export function credentialsFile(opts) {
+  return path.join(configDir(opts), "credentials.json");
+}
+
+/** The stored credentials, or null. Never throws. */
+export function readCredentials(opts) {
+  try {
+    const data = JSON.parse(readFileSync(credentialsFile(opts), "utf8"));
+    return data && typeof data.apiKey === "string" && data.apiKey ? data : null;
+  } catch {
+    return null;
+  }
+}
+
+/** Key resolution order: explicit flag, ALTALANDI_API_KEY, stored login. */
+export function resolveKey({ flag, env = process.env, ...opts } = {}) {
+  if (flag) return { key: flag, source: "flag" };
+  const fromEnv = env.ALTALANDI_API_KEY || env.ALTALANDI_KEY;
+  if (fromEnv) return { key: fromEnv, source: "env" };
+  const stored = readCredentials({ env, ...opts });
+  return stored ? { key: stored.apiKey, source: "login", username: stored.username } : { key: "", source: "none" };
+}
+
+async function saveCredentials(data, opts) {
+  const dir = configDir(opts);
+  await mkdir(dir, { recursive: true });
+  const file = credentialsFile(opts);
+  await writeFile(file, JSON.stringify(data, null, 2) + "\n", { encoding: "utf8", mode: 0o600 });
+  try { await chmod(file, 0o600); } catch { /* Windows: the per-user profile directory is the protection */ }
+  return file;
+}
+
+function clientName(env = process.env) {
+  const where = (hostname() || "").split(".")[0].slice(0, 24);
+  const who = env.CLAUDECODE || env.CLAUDE_CODE_ENTRYPOINT ? "Claude Code" : "altalandi CLI";
+  return where ? `${who} á ${where}` : who;
+}
+
+function openBrowser(url) {
+  try {
+    const [cmd, args] = process.platform === "win32" ? ["cmd", ["/c", "start", "", url]]
+      : process.platform === "darwin" ? ["open", [url]] : ["xdg-open", [url]];
+    const child = spawn(cmd, args, { stdio: "ignore", detached: true, windowsHide: true });
+    child.on("error", () => {});
+    child.unref();
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+
+async function postJson(fetchImpl, url, body) {
+  const res = await fetchImpl(url, {
+    method: "POST",
+    headers: { "content-type": "application/json", accept: "application/json" },
+    body: JSON.stringify(body),
+  });
+  let data = {};
+  try { data = await res.json(); } catch { /* keep {} */ }
+  return { status: res.status, data };
+}
+
+/**
+ * Run the device login. Returns an exit code.
+ *   0 logged in · 1 failed or expired · 2 bad usage
+ */
+export async function runLogin(flags = {}, io = {}) {
+  const env = io.env || process.env;
+  const fetchImpl = io.fetch || globalThis.fetch;
+  const log = io.log || ((m) => console.error(m));
+  const base = (flags.baseUrl || env.ALTALANDI_BASE_URL || DEFAULT_BASE_URL).replace(/\/$/, "");
+  const wait = io.sleep || sleep;
+
+  let start;
+  try {
+    start = await postJson(fetchImpl, `${base}/v1/device/start`, { clientName: clientName(env) });
+  } catch (e) {
+    log(`Náði ekki sambandi við Altalandi (${e.message}).`);
+    return 1;
+  }
+  if (start.status !== 200 || !start.data.deviceCode) {
+    log(`Innskráning fór ekki af stað: ${start.data.detail || `HTTP ${start.status}`}`);
+    return 1;
+  }
+  const { deviceCode, userCode, verificationUriComplete, verificationUri, interval = 3, expiresIn = 600 } = start.data;
+
+  log("");
+  log("  Tengdu þessa tölvu við Altalandi-aðganginn þinn:");
+  log("");
+  log(`    1. Opnaðu   ${verificationUriComplete}`);
+  log(`    2. Skráðu þig inn eða stofnaðu aðgang (500 kr. prufuinneign fylgir)`);
+  log(`    3. Staðfestu kóðann   ${userCode}`);
+  log("");
+  log(`  (Connect this computer: open the link, sign in or sign up, confirm the code.`);
+  log(`   Code page: ${verificationUri})`);
+  log("");
+  if (!flags.noBrowser && !io.noBrowser) openBrowser(verificationUriComplete);
+  log("  Bíð eftir staðfestingu…");
+
+  const deadline = Date.now() + expiresIn * 1000;
+  let result = null;
+  while (Date.now() < deadline) {
+    await wait(Math.max(1, interval) * 1000);
+    let poll;
+    try {
+      poll = await postJson(fetchImpl, `${base}/v1/device/token`, { deviceCode });
+    } catch {
+      continue; // transient network error: keep waiting until the code expires
+    }
+    if (poll.status === 200 && poll.data.status === "approved") { result = poll.data; break; }
+    if (poll.status === 200 && poll.data.status === "pending") continue;
+    if (poll.status === 429) { await wait(10_000); continue; }
+    log(`  Kóðinn rann út eða var hafnað. Keyrðu \`altalandi login\` aftur.`);
+    return 1;
+  }
+  if (!result) {
+    log(`  Kóðinn rann út. Keyrðu \`altalandi login\` aftur.`);
+    return 1;
+  }
+
+  const file = await saveCredentials({
+    apiKey: result.apiKey,
+    username: result.username,
+    baseUrl: base === DEFAULT_BASE_URL ? undefined : base,
+    savedAt: new Date().toISOString(),
+  }, { env });
+  log("");
+  log(`  ✓ Tengt sem ${result.username}. Lykillinn er vistaður í ${file}`);
+
+  // Install or refresh the Claude Code skill — the point of logging in for most
+  // people. Only where Claude Code exists; never create ~/.claude for someone who
+  // does not use it. --no-skill opts out.
+  if (!flags.noSkill) {
+    const target = skillTarget({ env });
+    const status = await skillStatus({ target });
+    if (status === "missing" || status === "outdated") {
+      const { file: skillFile, backup } = await writeSkill({ target });
+      log(`  ✓ Claude Code-hæfnin „altalandi" sett upp: ${skillFile}${backup ? ` (eldri útgáfa afrituð í ${backup})` : ""}`);
+    } else if (status === "current") {
+      log(`  ✓ Claude Code-hæfnin „altalandi" er þegar uppfærð.`);
+    } else if (status === "absent") {
+      log(`  (Claude Code fannst ekki á þessari tölvu, svo hæfnin var ekki sett upp.)`);
+    }
+  }
+  log("");
+  log(`  Prófaðu:   altalandi "Make sure to reach out to us today."`);
+  log(`  Eða segðu Claude:  „Skrifaðu þetta á góðri íslensku með Altalandi."`);
+  return 0;
+}
+
+export async function runLogout(io = {}) {
+  const env = io.env || process.env;
+  const log = io.log || ((m) => console.error(m));
+  const file = credentialsFile({ env });
+  if (!existsSync(file)) { log("Engin vistuð innskráning."); return 0; }
+  await rm(file, { force: true });
+  log(`Innskráning fjarlægð (${file}). Lykillinn sjálfur er enn virkur þar til þú afturkallar hann á https://altalandi.is/stjornbord/forritarar`);
+  return 0;
+}
+
+export async function runWhoami(flags = {}, io = {}) {
+  const env = io.env || process.env;
+  const fetchImpl = io.fetch || globalThis.fetch;
+  const out = io.out || ((m) => console.log(m));
+  const log = io.log || ((m) => console.error(m));
+  const { key, source } = resolveKey({ flag: flags.key, env });
+  if (!key) { log("Ekki innskráð(ur). Keyrðu: npx altalandi login"); return 2; }
+  const stored = readCredentials({ env });
+  const base = (flags.baseUrl || env.ALTALANDI_BASE_URL || stored?.baseUrl || DEFAULT_BASE_URL).replace(/\/$/, "");
+  let res;
+  try {
+    res = await fetchImpl(`${base}/v1/me`, { headers: { authorization: `Bearer ${key}`, accept: "application/json" } });
+  } catch (e) {
+    log(`Náði ekki sambandi við Altalandi (${e.message}).`);
+    return 1;
+  }
+  if (res.status === 401) { log("Lykillinn er ógildur eða afturkallaður. Keyrðu: npx altalandi login"); return 1; }
+  if (!res.ok) { log(`Villa: HTTP ${res.status}`); return 1; }
+  const me = await res.json();
+  if (flags.json) out(JSON.stringify({ ...me, keySource: source }, null, 2));
+  else {
+    const { formatInt, formatIsk } = await import("./report.mjs");
+    const free = me.freeUnitsLeftToday != null && me.freeDailyUnits != null
+      ? `ókeypis eftir í dag ${formatInt(me.freeUnitsLeftToday)} af ${formatInt(me.freeDailyUnits)} einingum`
+      : me.freeDailyUnits ? `ókeypis ${formatInt(me.freeDailyUnits)} einingar á dag` : "";
+    out([me.username ?? "(lykill án aðgangs)",
+      `inneign ${me.balanceIsk != null ? formatIsk(me.balanceIsk) : "—"}`,
+      free, `lykill ${me.keyId} (${source})`].filter(Boolean).join(" · "));
+  }
+  return 0;
+}