@nestica/cli 0.3.0 → 0.4.0

package/README.md

@@ -74,7 +74,10 @@ Global flags: `-H/--base-url`, `--api-key`, `--profile`,
   needs the Firebase project's web OAuth client id):
   `nestica login --google --google-client-id <id> --api-key <key>`
 
-`logout` deletes the session file.
+`logout` deletes the session file. Running `login` while already
+signed in just reports the current session — `logout` first to switch
+accounts (ID tokens refresh automatically, so re-login is never needed
+to renew them).
 
 ### set-profile
 

package/dist/cli.js

@@ -3380,7 +3380,7 @@ var program = new Command();
 // package.json
 var package_default = {
   name: "@nestica/cli",
-  version: "0.3.0",
+  version: "0.4.0",
   type: "module",
   description: "Command-line client for the Nestica REST API",
   license: "MIT",
@@ -3788,40 +3788,148 @@ ${url2}`
   }
 }
 
-// src/commands/prompt.ts
-import * as readline from "node:readline/promises";
-async function prompt(question) {
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
-  try {
-    return await rl.question(question);
-  } finally {
-    rl.close();
+// src/output/colors.ts
+var IDENTITY_COLORS = {
+  dim: (text) => text,
+  bold: (text) => text,
+  cyan: (text) => text,
+  green: (text) => text,
+  yellow: (text) => text,
+  red: (text) => text,
+  magenta: (text) => text
+};
+function wrap(code) {
+  return (text) => `\x1B[${code}m${text}\x1B[0m`;
+}
+var ANSI_COLORS = {
+  dim: wrap("2"),
+  bold: wrap("1"),
+  cyan: wrap("36"),
+  green: wrap("32"),
+  yellow: wrap("33"),
+  red: wrap("31"),
+  magenta: wrap("35")
+};
+function pickColors(options) {
+  const stream = options.stream ?? process.stdout;
+  if (options.noColor || process.env["NO_COLOR"] !== void 0 || !stream.isTTY) {
+    return IDENTITY_COLORS;
   }
+  return ANSI_COLORS;
 }
-async function promptHidden(question) {
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout
+
+// src/commands/prompt.ts
+import { createInterface, emitKeypressEvents } from "node:readline";
+var lines = [];
+var reader;
+var closed = false;
+var resolveLine;
+function ensureReader() {
+  if (reader || closed) {
+    return;
+  }
+  reader = createInterface({ input: process.stdin, output: process.stdout });
+  reader.on("line", (line) => {
+    lines.push(line);
+    resolveLine?.();
+    resolveLine = void 0;
   });
-  const mutable = rl;
-  mutable._writeToOutput = () => {
-  };
-  process.stdout.write(question);
-  try {
-    return await rl.question("");
-  } finally {
-    process.stdout.write("\n");
-    rl.close();
+  reader.on("close", () => {
+    closed = true;
+    resolveLine?.();
+    resolveLine = void 0;
+  });
+}
+async function nextLine() {
+  ensureReader();
+  if (lines.length > 0) {
+    return lines.shift() ?? "";
+  }
+  if (closed) {
+    return "";
   }
+  await new Promise((resolve) => {
+    resolveLine = resolve;
+  });
+  return lines.shift() ?? "";
+}
+function closePrompts() {
+  reader?.close();
+  reader = void 0;
+  closed = false;
+}
+async function prompt(label2) {
+  process.stdout.write(`${label2} `);
+  return (await nextLine()).trim();
+}
+async function promptHidden(label2) {
+  process.stdout.write(`${label2} `);
+  if (!process.stdin.isTTY) {
+    const answer = await nextLine();
+    return answer.replace(/\r$/, "");
+  }
+  if (lines.length > 0) {
+    return lines.shift()?.replace(/\r$/, "") ?? "";
+  }
+  closePrompts();
+  const input = process.stdin;
+  return new Promise((resolve) => {
+    let value = "";
+    const onKey = (ch, key) => {
+      if (key.ctrl && (key.name === "c" || key.name === "d")) {
+        restore();
+        process.stdout.write("\n");
+        process.kill(process.pid, "SIGINT");
+        return;
+      }
+      if (key.name === "return" || key.name === "enter") {
+        restore();
+        process.stdout.write("\n");
+        resolve(value);
+        return;
+      }
+      if (key.name === "backspace") {
+        value = value.slice(0, -1);
+        process.stdout.write("\b \b");
+        return;
+      }
+      if (typeof ch === "string" && ch.length === 1 && !key.ctrl && !key.meta) {
+        value += ch;
+        process.stdout.write("*");
+      }
+    };
+    const restore = () => {
+      input.removeListener("keypress", onKey);
+      input.removeListener("end", onEnd);
+      input.pause();
+      if (input.isRaw) {
+        input.setRawMode(false);
+      }
+    };
+    const onEnd = () => {
+      restore();
+      process.stdout.write("\n");
+      resolve(value);
+    };
+    emitKeypressEvents(input);
+    input.on("keypress", onKey);
+    input.once("end", onEnd);
+    input.setRawMode(true);
+    input.resume();
+  });
 }
 
 // src/commands/login.ts
 var EXPIRY_MARGIN_MS = 6e4;
 async function loginAction(options) {
   const session = loadSession();
+  if (session.idToken) {
+    const identity = session.email ?? session.uid;
+    console.log(`Session: ${sessionPath()}`);
+    console.log("Run `nestica logout` first to change account.");
+    console.log(pickColors({}).green(`Already logged in as ${identity}.`));
+    return;
+  }
   const connection = resolveConnection(
     { baseUrl: options.baseUrl, apiKey: options.apiKey },
     session
@@ -3832,21 +3940,27 @@ async function loginAction(options) {
     );
   }
   const result = options.google ? await googleLogin(connection.apiKey, connection.baseUrl, options, session) : await passwordLogin(connection.baseUrl, connection.apiKey, options);
-  saveSession({
-    ...session,
-    baseUrl: connection.baseUrl,
-    apiKey: connection.apiKey,
-    email: result.email ?? session.email,
-    uid: result.uid,
-    idToken: result.idToken,
-    refreshToken: result.refreshToken,
-    expiresAt: Date.now() + result.expiresIn * 1e3 - EXPIRY_MARGIN_MS
-  });
-  console.log(`Logged in as ${result.email ?? result.uid}.`);
+  const path2 = sessionPath();
+  saveSession(
+    {
+      ...session,
+      baseUrl: connection.baseUrl,
+      apiKey: connection.apiKey,
+      email: result.email ?? session.email,
+      uid: result.uid,
+      idToken: result.idToken,
+      refreshToken: result.refreshToken,
+      expiresAt: Date.now() + result.expiresIn * 1e3 - EXPIRY_MARGIN_MS
+    },
+    path2
+  );
+  console.log(`Session saved to ${path2}`);
+  console.log(pickColors({}).green(`Logged in as ${result.email ?? result.uid}.`));
 }
 async function passwordLogin(baseUrl, apiKey, options) {
-  const email3 = options.email ?? await prompt("Email: ");
-  const password = options.password ?? await promptHidden("Password: ");
+  const email3 = options.email ?? await prompt("Email:");
+  const password = options.password ?? await promptHidden("Password:");
+  closePrompts();
   if (!email3 || !password) {
     throw new Error("Email and password are required.");
   }
@@ -3865,10 +3979,16 @@ async function googleLogin(apiKey, baseUrl, options, session) {
 
 // src/commands/logout.ts
 function logoutAction() {
+  const session = loadSession();
   if (removeSession()) {
-    console.log("Logged out.");
+    const identity = session.email ?? session.uid;
+    console.log(`Session removed: ${sessionPath()}`);
+    console.log(
+      pickColors({}).green(identity ? `Logged out as ${identity}.` : "Logged out.")
+    );
   } else {
-    console.log("Not logged in.");
+    console.log(`(no session file at ${sessionPath()})`);
+    console.log(pickColors({}).green("Not logged in."));
   }
 }
 
@@ -3886,7 +4006,7 @@ function withComma(block) {
   const last = block.pop() ?? "";
   return [...block, `${last},`];
 }
-function lines(value, colors, depth) {
+function lines2(value, colors, depth) {
   const pad = "  ".repeat(depth);
   const inner = "  ".repeat(depth + 1);
   if (value === null) {
@@ -3906,7 +4026,7 @@ function lines(value, colors, depth) {
     }
     const out2 = [pad + colors.dim("[")];
     value.forEach((item, index) => {
-      const block = lines(item, colors, depth + 1);
+      const block = lines2(item, colors, depth + 1);
       out2.push(...index < value.length - 1 ? withComma(block) : block);
     });
     out2.push(pad + colors.dim("]"));
@@ -3918,7 +4038,7 @@ function lines(value, colors, depth) {
   }
   const out = [pad + colors.dim("{")];
   entries.forEach(([key, val], index) => {
-    const block = lines(val, colors, depth + 1);
+    const block = lines2(val, colors, depth + 1);
     const first = block[0] ?? "";
     block[0] = `${inner}${colors.cyan(JSON.stringify(key))}: ${first.slice(inner.length)}`;
     out.push(...index < entries.length - 1 ? withComma(block) : block);
@@ -3927,7 +4047,7 @@ function lines(value, colors, depth) {
   return out;
 }
 function prettyJson(value, colors) {
-  return lines(value, colors, 0).join("\n");
+  return lines2(value, colors, 0).join("\n");
 }
 function compactJson(value) {
   return JSON.stringify(value);
@@ -4122,8 +4242,9 @@ async function pickProfile(ctx) {
   items.forEach((profile, index2) => {
     console.log(`${index2 + 1}. ${profile.name ?? profile.id}`);
   });
-  const answer = await prompt("Select a profile [1]: ");
-  const index = answer.trim() === "" ? 0 : Number(answer) - 1;
+  const answer = await prompt("Select a profile [1]:");
+  closePrompts();
+  const index = answer === "" ? 0 : Number(answer) - 1;
   const chosen = items[index];
   if (!Number.isInteger(index) || index < 0 || chosen === void 0) {
     throw new Error(`Pick a number between 1 and ${items.length}.`);
@@ -4257,36 +4378,6 @@ function makeClient(deps) {
   };
 }
 
-// src/output/colors.ts
-var IDENTITY_COLORS = {
-  dim: (text) => text,
-  bold: (text) => text,
-  cyan: (text) => text,
-  green: (text) => text,
-  yellow: (text) => text,
-  red: (text) => text,
-  magenta: (text) => text
-};
-function wrap(code) {
-  return (text) => `\x1B[${code}m${text}\x1B[0m`;
-}
-var ANSI_COLORS = {
-  dim: wrap("2"),
-  bold: wrap("1"),
-  cyan: wrap("36"),
-  green: wrap("32"),
-  yellow: wrap("33"),
-  red: wrap("31"),
-  magenta: wrap("35")
-};
-function pickColors(options) {
-  const stream = options.stream ?? process.stdout;
-  if (options.noColor || process.env["NO_COLOR"] !== void 0 || !stream.isTTY) {
-    return IDENTITY_COLORS;
-  }
-  return ANSI_COLORS;
-}
-
 // ../node_modules/.pnpm/zod@4.4.3/node_modules/zod/v4/classic/external.js
 var external_exports = {};
 __export(external_exports, {
@@ -5711,14 +5802,14 @@ function toDotPath(_path) {
   return segs.join("");
 }
 function prettifyError(error51) {
-  const lines2 = [];
+  const lines3 = [];
   const issues = [...error51.issues].sort((a, b) => (a.path ?? []).length - (b.path ?? []).length);
   for (const issue2 of issues) {
-    lines2.push(`\u2716 ${issue2.message}`);
+    lines3.push(`\u2716 ${issue2.message}`);
     if (issue2.path?.length)
-      lines2.push(`  \u2192 at ${toDotPath(issue2.path)}`);
+      lines3.push(`  \u2192 at ${toDotPath(issue2.path)}`);
   }
-  return lines2.join("\n");
+  return lines3.join("\n");
 }
 
 // ../node_modules/.pnpm/zod@4.4.3/node_modules/zod/v4/core/parse.js
@@ -6536,9 +6627,9 @@ var Doc = class {
       return;
     }
     const content = arg;
-    const lines2 = content.split("\n").filter((x) => x);
-    const minIndent = Math.min(...lines2.map((x) => x.length - x.trimStart().length));
-    const dedented = lines2.map((x) => x.slice(minIndent)).map((x) => " ".repeat(this.indent * 2) + x);
+    const lines3 = content.split("\n").filter((x) => x);
+    const minIndent = Math.min(...lines3.map((x) => x.length - x.trimStart().length));
+    const dedented = lines3.map((x) => x.slice(minIndent)).map((x) => " ".repeat(this.indent * 2) + x);
     for (const line of dedented) {
       this.content.push(line);
     }
@@ -6547,8 +6638,8 @@ var Doc = class {
     const F = Function;
     const args = this?.args;
     const content = this?.content ?? [``];
-    const lines2 = [...content.map((x) => `  ${x}`)];
-    return new F(...args, lines2.join("\n"));
+    const lines3 = [...content.map((x) => `  ${x}`)];
+    return new F(...args, lines3.join("\n"));
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestica/cli",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "type": "module",
   "description": "Command-line client for the Nestica REST API",
   "license": "MIT",