three-blocks-login 0.1.0 → 0.1.2

package/bin/login.js

@@ -5,10 +5,12 @@
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
+import readline from "node:readline";
 import { createRequire } from "node:module";
 
 const require = createRequire(import.meta.url);
 const pkg = require("../package.json");
+const CLI_VERSION = pkg?.version ? String(pkg.version) : "?.?.?";
 
 // Simple ANSI color helpers (no deps)
 const ESC = (n) => `\u001b[${n}m`;
@@ -20,7 +22,209 @@ const green = (s) => ESC(32) + s + reset;
 const yellow = (s) => ESC(33) + s + reset;
 const cyan = (s) => ESC(36) + s + reset;
 const plainBanner = `[three-blocks-login@${pkg.version}]`;
-const banner = bold(cyan(plainBanner));
+const banner = cyan(plainBanner);
+
+const quoteShell = (value) => JSON.stringify(String(value ?? ''));
+
+const HEADER_WIDTH = 96;
+const LEFT_WIDTH = 60;
+const RIGHT_WIDTH = HEADER_WIDTH - LEFT_WIDTH - 3;
+
+const repeatChar = (ch, len) => ch.repeat(Math.max(0, len));
+const stripAnsi = (value) => String(value ?? '').replace(/\u001b\[[0-9;]*m/g, '');
+const ellipsize = (value, width) => {
+  const str = String(value ?? '');
+  const plain = stripAnsi(str);
+  if (plain.length <= width) return str;
+  if (width <= 1) return plain.slice(0, width);
+  const truncated = plain.slice(0, width - 1) + '…';
+  return plain === str ? truncated : truncated;
+};
+const visibleLength = (value) => stripAnsi(String(value ?? '')).length;
+const padText = (value, width, align = 'left') => {
+  const text = ellipsize(value, width);
+  const current = visibleLength(text);
+  const remaining = width - current;
+  if (remaining <= 0) return text;
+  if (align === 'center') {
+    const left = Math.floor(remaining / 2);
+    const right = remaining - left;
+    return `${' '.repeat(left)}${text}${' '.repeat(right)}`;
+  }
+  if (align === 'right') {
+    return `${' '.repeat(remaining)}${text}`;
+  }
+  return `${text}${' '.repeat(remaining)}`;
+};
+const makeHeaderRow = (left, right = '', leftAlign = 'left', rightAlign = 'left') =>
+  `│${padText(left, LEFT_WIDTH, leftAlign)}│${padText(right, RIGHT_WIDTH, rightAlign)}│`;
+
+const HEADER_COLOR = ESC(33);
+const CONTENT_COLOR = ESC(90); // bright black (grey)
+const reapplyColor = (value, color) => {
+  const str = String(value ?? '');
+  return `${color}${str.split(reset).join(`${reset}${color}`)}${reset}`;
+};
+
+const applyHeaderColor = (row, { keepContentYellow = false, tintContent = true } = {}) => {
+  if (keepContentYellow) return reapplyColor(row, HEADER_COLOR);
+  if (!row.startsWith('│') || !row.endsWith('│')) return reapplyColor(row, HEADER_COLOR);
+  const match = row.match(/^│(.*)│(.*)│$/);
+  if (!match) return reapplyColor(row, HEADER_COLOR);
+  const [, leftContent, rightContent] = match;
+  const leftSegment = tintContent ? reapplyColor(leftContent, CONTENT_COLOR) : leftContent;
+  const rightSegment = tintContent ? reapplyColor(rightContent, CONTENT_COLOR) : rightContent;
+  return `${HEADER_COLOR}│${reset}${leftSegment}${HEADER_COLOR}│${reset}${rightSegment}${HEADER_COLOR}│${reset}`;
+};
+
+const formatRegistryShort = (value) => {
+  if (!value) return '';
+  try {
+    const u = new URL(value);
+    const pathname = (u.pathname || '').replace(/\/$/, '');
+    return `${u.host}${pathname}`;
+  } catch {
+    return String(value);
+  }
+};
+
+const maskLicense = (s) => {
+  if (!s) return '••••';
+  const v = String(s);
+  if (v.length <= 8) return '••••';
+  return `${v.slice(0, 4)}••••${v.slice(-4)}`;
+};
+
+const capitalize = (value) => {
+  const str = String(value || '').trim();
+  if (!str) return '';
+  return str[0].toUpperCase() + str.slice(1);
+};
+
+const formatPlanLabel = (value) => {
+  const str = String(value || '').trim();
+  if (!str) return '';
+  return str
+    .split(/\s+/)
+    .map((part) => (part ? capitalize(part.toLowerCase()) : ''))
+    .join(' ')
+    .trim();
+};
+
+const normalizePlan = (plan) => {
+  const label = formatPlanLabel(plan);
+  if (!label) return 'Developer Plan';
+  return label.toLowerCase().includes('plan') ? label : `${label} Plan`;
+};
+
+const formatFirstName = (value) => {
+  const name = String(value || '').trim();
+  if (!name) return '';
+  const first = name.split(/\s+/)[0];
+  return capitalize(first.toLowerCase());
+};
+
+const getUserDisplayName = () => {
+  const candidate =
+    process.env.THREE_BLOCKS_USER_NAME ||
+    process.env.GIT_AUTHOR_NAME ||
+    process.env.USER ||
+    process.env.LOGNAME;
+  if (candidate) return formatFirstName(candidate);
+  try {
+    return formatFirstName(os.userInfo().username);
+  } catch {
+    return '';
+  }
+};
+
+const formatExpiryLabel = (iso) => {
+  if (!iso) return 'Expires: —';
+  const dt = new Date(iso);
+  if (Number.isNaN(dt.getTime())) return `Expires: ${iso}`;
+  return `Expires: ${dt.toISOString().replace('T', ' ').replace('Z', 'Z')}`;
+};
+
+const USER_DISPLAY_NAME = getUserDisplayName();
+
+const renderEnvHeader = ({
+  scope,
+  registry,
+  expiresAt,
+  tmpFile,
+  licenseMasked,
+  licenseId,
+  channel,
+  status,
+  plan,
+  teamName,
+  teamId,
+  repository,
+  domain,
+  region,
+  userDisplayName,
+}) => {
+  const title = `─── Three Blocks Login v${CLI_VERSION} `;
+  const separatorRow = makeHeaderRow(repeatChar('─', LEFT_WIDTH), repeatChar('─', RIGHT_WIDTH));
+  const channelDisplay = String(channel || '').toUpperCase() || 'STABLE';
+  const registryShort = formatRegistryShort(registry);
+
+  const displayName = userDisplayName || USER_DISPLAY_NAME;
+  const welcomeLine = displayName ? `Welcome back ${displayName}!` : 'Welcome back!';
+  const scopeLine = `Scope: ${scope}`;
+
+  const planLabel = normalizePlan(plan);
+  const teamLabel = teamName || teamId ? ` · Team: ${teamName || teamId}` : '';
+  const subscriptionLine = `Plan: ${planLabel}${teamLabel}`;
+  const channelLine = `Channel: ${channelDisplay}${region ? ` · Region: ${region}` : ''}`;
+
+  const repositoryBase = repository ? `Repository: ${repository}` : 'Repository: —';
+  const repositoryLine = registryShort ? `${repositoryBase} → ${registryShort}` : repositoryBase;
+  const registryLine = `Registry: ${registryShort || (registry || '—')}`;
+
+  let domainValue = domain || '';
+  if (!domainValue && registry) {
+    try {
+      domainValue = new URL(registry).host;
+    } catch {}
+  }
+  const domainLineText = `Domain: ${domainValue || '—'}`;
+  const regionLineText = `Region: ${region || '—'}`;
+
+  const licenseLine = `License: ${licenseMasked}${licenseId ? ` · ${licenseId}` : ''}`;
+  const expiresLine = formatExpiryLabel(expiresAt);
+
+  const ascii = [
+    'THREE.JS',
+    ' ______     __         ______     ______     __  __     ______   ',
+    '/\\  == \\   /\\ \\       /\\  __ \\   /\\  ___\\   /\\ \\/ /    /\\  ___\\  ',
+    '\\ \\  __<   \\ \\ \\____  \\ \\ \\/\\ \\  \\ \\ \\____  \\ \\  _"-.  \\ \\___  \\ ',
+    ' \\ \\_____\\  \\ \\_____\\  \\ \\_____\\  \\ \\_____\\  \\ \\_\\ \\_\\  \\/\\_____\\',
+    '  \\/_____\/   \\/_____/   \\/_____/   \\/_____/   \\/_/ \/_/   \\/_____/'
+  ];
+  const statusMessage = status?.message || (status?.ok ? 'access granted' : status ? 'no active access' : 'pending');
+  const statusText = status?.ok
+    ? green(bold(`Authenticated — ${statusMessage}`))
+    : status
+      ? red(bold(`Not authenticated — ${statusMessage}`))
+      : dim(bold(`Status: ${statusMessage}`));
+
+  const lines = [
+    applyHeaderColor(`╭${title}${repeatChar('─', HEADER_WIDTH - 2 - title.length)}╮`, { keepContentYellow: true }),
+    ...ascii.map((row) => applyHeaderColor(`│${padText(row, LEFT_WIDTH + RIGHT_WIDTH + 1, 'center')}│`, { keepContentYellow: true })),
+    applyHeaderColor(separatorRow, { keepContentYellow: true }),
+    applyHeaderColor(makeHeaderRow(welcomeLine, scopeLine, 'center', 'center')),
+    applyHeaderColor(separatorRow, { keepContentYellow: true }),
+    applyHeaderColor(makeHeaderRow(subscriptionLine, channelLine)),
+    applyHeaderColor(makeHeaderRow(repositoryLine, registryLine)),
+    applyHeaderColor(makeHeaderRow(domainLineText, regionLineText, 'left', 'center')),
+    applyHeaderColor(makeHeaderRow(licenseLine, expiresLine)),
+    applyHeaderColor(separatorRow, { keepContentYellow: true }),
+    applyHeaderColor(makeHeaderRow(statusText, '', 'left', 'center'), { tintContent: false }),
+    applyHeaderColor(`╰${repeatChar('─', HEADER_WIDTH - 2)}╯`, { keepContentYellow: true }),
+  ];
+  for (const row of lines) console.log(row);
+};
 
 const args = parseArgs(process.argv.slice(2));
 
@@ -29,6 +233,10 @@ const SCOPE = (args.scope || "@three-blocks").replace(/^\s+|\s+$/g, "");
 const MODE = (args.mode || "env").toLowerCase(); // env | project | user
 const QUIET = !!args.quiet;
 const VERBOSE = !!args.verbose;
+let CHANNEL = String(args.channel || process.env.THREE_BLOCKS_CHANNEL || "stable").toLowerCase();
+if (!['stable','alpha','beta'].includes(CHANNEL)) CHANNEL = 'stable';
+const PRINT_SHELL = !!(args['print-shell'] || args.printShell || process.env.THREE_BLOCKS_LOGIN_PRINT_SHELL === '1');
+const NON_INTERACTIVE = !!(args['non-interactive'] || args.nonInteractive || process.env.CI === '1');
 
 // Load .env from current working directory (no deps)
 loadEnvFromDotfile(process.cwd());
@@ -38,32 +246,46 @@ const BROKER_URL =
   process.env.THREE_BLOCKS_BROKER_URL ||
   "http://localhost:3000/api/npm/token"; // your Astro broker endpoint
 
-const LICENSE =
-  args.license || process.env.THREE_BLOCKS_SECRET_KEY || process.env.THREE_BLOCKS_LICENSE_KEY;
-
-if (!LICENSE || String(LICENSE).trim() === "") {
-  fail(
-    "Missing license key. Provide --license <key> or set THREE_BLOCKS_SECRET_KEY in your .env file."
-  );
-}
-
-// Sanitize + validate license early to avoid header ByteString errors
-const LICENSE_CLEAN = sanitizeLicense(LICENSE);
-if (!LICENSE_CLEAN) {
-  fail(
-    "Missing license key. Provide --license <key> or set THREE_BLOCKS_SECRET_KEY in your .env file."
-  );
-}
-const invalidIdx = findFirstNonByteChar(LICENSE_CLEAN);
-if (invalidIdx !== -1) {
-  if (VERBOSE) log.warn(`[debug] license contains non-ASCII/byte char at index ${invalidIdx}`);
-  fail("License appears malformed. Please copy your tb_… key exactly without extra characters.");
-}
-if (!looksLikeLicense(LICENSE_CLEAN)) {
-  if (VERBOSE) log.warn(`[debug] license failed format check: ${truncate(LICENSE_CLEAN, 16)}`);
-  fail("License appears malformed. Please copy your tb_… key exactly.");
-}
-
+const promptHidden = async (label) => {
+  return await new Promise((resolve) => {
+    const stdin = process.stdin;
+    const stdout = process.stdout;
+    let value = '';
+    const cleanup = () => {
+      stdin.removeListener('data', onData);
+      if (stdin.isTTY) stdin.setRawMode(false);
+      stdin.pause();
+    };
+    const onData = (chunk) => {
+      const str = String(chunk);
+      for (const ch of str) {
+        if (ch === '\u0003') { cleanup(); process.exit(1); }
+        if (ch === '\r' || ch === '\n' || ch === '\u0004') {
+          stdout.write('\n');
+          cleanup();
+          return resolve(value.trim());
+        }
+        if (ch === '\b' || ch === '\u007f') {
+          if (value.length) {
+            value = value.slice(0, -1);
+            readline.moveCursor(stdout, -1, 0);
+            stdout.write(' ');
+            readline.moveCursor(stdout, -1, 0);
+          }
+          continue;
+        }
+        if (ch === '\u001b') continue;
+        value += ch;
+        stdout.write('•');
+      }
+    };
+    stdout.write(label);
+    stdin.setEncoding('utf8');
+    if (stdin.isTTY) stdin.setRawMode(true);
+    stdin.resume();
+    stdin.on('data', onData);
+  });
+};
 
 // Pretty logger (respects --quiet except for errors)
 const log = {
@@ -75,8 +297,52 @@ const log = {
 
 (async () => {
   try {
-    const tokenData = await fetchToken(BROKER_URL, LICENSE_CLEAN);
-    const { registry, token, expiresAt } = tokenData;
+    let LICENSE = args.license || process.env.THREE_BLOCKS_SECRET_KEY;
+
+    if (!LICENSE || String(LICENSE).trim() === "") {
+      if (NON_INTERACTIVE) {
+        fail("Missing license key. Provide --license <key> or set THREE_BLOCKS_SECRET_KEY in your environment.");
+      }
+      console.log('');
+      log.info(bold(yellow('Three Blocks Login')) + ' ' + dim(`[mode: ${MODE}]`));
+      log.info(dim('Enter your license key to retrieve a scoped npm token.'));
+      log.info(dim('Tip: paste it here; input is hidden. Press Enter to submit.'));
+      LICENSE = await promptHidden(`${cyan('›')} License key ${dim('(tb_…)')}: `);
+      if (!LICENSE) fail('License key is required to continue.');
+    }
+
+    // Sanitize + validate license early to avoid header ByteString errors
+    const LICENSE_CLEAN = sanitizeLicense(LICENSE);
+    if (!LICENSE_CLEAN) {
+      fail(
+        "Missing license key. Provide --license <key> or set THREE_BLOCKS_SECRET_KEY in your .env file."
+      );
+    }
+    const invalidIdx = findFirstNonByteChar(LICENSE_CLEAN);
+    if (invalidIdx !== -1) {
+      if (VERBOSE) log.warn(`[debug] license contains non-ASCII/byte char at index ${invalidIdx}`);
+      fail("License appears malformed. Please copy your tb_… key exactly without extra characters.");
+    }
+    if (!looksLikeLicense(LICENSE_CLEAN)) {
+      if (VERBOSE) log.warn(`[debug] license failed format check: ${truncate(LICENSE_CLEAN, 16)}`);
+      fail("License appears malformed. Please copy your tb_… key exactly.");
+    }
+
+    const tokenData = await fetchToken(BROKER_URL, LICENSE_CLEAN, CHANNEL);
+    const {
+      registry,
+      token,
+      expiresAt,
+      status: rawStatus,
+      plan,
+      teamName,
+      teamId,
+      repository,
+      domain,
+      region,
+      licenseId,
+    } = tokenData;
+    const authStatus = rawStatus ?? { ok: true, message: 'access granted' };
 
     if (!registry || !token) fail("Broker response missing registry/token.");
 
@@ -97,14 +363,44 @@ const log = {
       fs.writeFileSync(tmpFile, npmrcContent, { mode: 0o600 });
 
       // Print shell exports; caller should `eval "$(npx -y three-blocks-login --mode env)"`
-      const lines = [
-        `# ${plainBanner} configure npm for current shell`,
-        `# scope: ${SCOPE} | registry: ${u.href} | expires: ${expiresAt ?? "unknown"}`,
-        `export NPM_CONFIG_USERCONFIG="${tmpFile}"`,
-        `export npm_config_userconfig="${tmpFile}"`,
-        `echo "${plainBanner} ${SCOPE} -> ${u.href} (expires ${expiresAt ?? "unknown"})"`
-      ];
-      console.log(lines.join("\n"));
+      const maskedLicense = maskLicense(LICENSE_CLEAN);
+      renderEnvHeader({
+        scope: SCOPE,
+        registry: u.href,
+        expiresAt,
+        tmpFile,
+        licenseMasked: maskedLicense,
+        licenseId,
+        channel: CHANNEL,
+        status: authStatus,
+        plan,
+        teamName,
+        teamId,
+        repository,
+        domain,
+        region,
+        userDisplayName: USER_DISPLAY_NAME,
+      });
+      if (PRINT_SHELL) {
+        const exportLines = [
+          `export NPM_CONFIG_USERCONFIG=${quoteShell(tmpFile)}`,
+          `export npm_config_userconfig=${quoteShell(tmpFile)}`,
+          `export THREE_BLOCKS_CHANNEL=${quoteShell(CHANNEL)}`,
+        ];
+        const summaryPrint = [
+          `cat <<'EOF'`,
+          `${plainBanner} scoped login ready (${authStatus.ok ? 'ok' : 'error'})`,
+          `  scope    : ${SCOPE}`,
+          `  registry : ${u.href}`,
+          `  expires  : ${expiresAt ?? 'unknown'}`,
+          `  license  : ${maskedLicense}`,
+          `  npmrc    : ${tmpFile}`,
+          `EOF`,
+        ];
+        console.log([...exportLines, '', ...summaryPrint].join('\n'));
+      } else {
+        log.info(`${plainBanner} temp npmrc ready. Use --print-shell to emit export commands.`);
+      }
       return;
     }
 
@@ -153,30 +449,39 @@ function ensureTrailingSlash(url) {
 
 function loadEnvFromDotfile(dir) {
   try {
-    const file = path.join(dir, ".env");
-    if (!fs.existsSync(file)) return;
-    const txt = fs.readFileSync(file, "utf8");
-    for (const raw of txt.split(/\r?\n/)) {
-      const line = raw.trim();
-      if (!line || line.startsWith("#")) continue;
-      const eq = line.indexOf("=");
-      if (eq === -1) continue;
-      const key = line.slice(0, eq).trim();
-      let val = line.slice(eq + 1).trim();
-      if ((val.startsWith('"') && val.endsWith('"')) || (val.startsWith("'") && val.endsWith("'"))) {
-        val = val.slice(1, -1);
+    const files = [path.join(dir, ".env.local"), path.join(dir, ".env")];
+    for (const file of files) {
+      if (!fs.existsSync(file)) continue;
+      const txt = fs.readFileSync(file, "utf8");
+      for (const raw of txt.split(/\r?\n/)) {
+        const line = raw.trim();
+        if (!line || line.startsWith("#")) continue;
+        const eq = line.indexOf("=");
+        if (eq === -1) continue;
+        const key = line.slice(0, eq).trim();
+        let val = line.slice(eq + 1).trim();
+        if ((val.startsWith('"') && val.endsWith('"')) || (val.startsWith("'") && val.endsWith("'"))) {
+          val = val.slice(1, -1);
+        }
+        if (process.env[key] === undefined) process.env[key] = val;
       }
-      if (process.env[key] === undefined) process.env[key] = val;
     }
   } catch {}
 }
 
-async function fetchToken(endpoint, license) {
-  const res = await fetch(endpoint, {
+async function fetchToken(endpoint, license, channel) {
+  let url = endpoint;
+  try {
+    const u = new URL(endpoint);
+    if (!u.searchParams.get('channel')) u.searchParams.set('channel', channel);
+    url = u.toString();
+  } catch {}
+  const res = await fetch(url, {
     method: "GET",
     headers: {
       "authorization": `Bearer ${license}`,
-      "accept": "application/json"
+      "accept": "application/json",
+      "x-three-blocks-channel": channel
     }
   });
   if (!res.ok) {

package/package.json

@@ -1,16 +1,24 @@
 {
   "name": "three-blocks-login",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Fetch a short-lived token from the three-blocks broker and configure npm for the current context.",
   "type": "module",
   "bin": {
     "three-blocks-login": "bin/login.js"
   },
   "license": "MIT",
-  "files": ["bin/"],
-  "keywords": ["npm", "login", "three-blocks", "token", "ci"],
+  "files": [
+    "bin/"
+  ],
+  "keywords": [
+    "npm",
+    "login",
+    "three-blocks",
+    "token",
+    "ci"
+  ],
   "dependencies": {},
   "publishConfig": {
     "access": "public"
   }
-}
+}