subto 9.0.0 → 9.0.2

package/dist/package/index.js

@@ -11,7 +11,7 @@ const chalk = (_chalk && _chalk.default) ? _chalk.default : _chalk;
 const CONFIG_DIR = path.join(os.homedir(), '.subto');
 const CONFIG_PATH = path.join(CONFIG_DIR, 'config.json');
 const DEFAULT_API_BASE = 'https://subto.one';
-const CLIENT_META = { name: 'subto-cli', version: '9.0.0' };
+const CLIENT_META = { name: 'subto-cli', version: '9.0.2' };
 
 function configFilePath() { return CONFIG_PATH; }
 
@@ -122,9 +122,52 @@ function printScanSummary(obj) {
   if (keys.length) console.log(chalk.dim('  Additional keys: ' + keys.join(', ')));
 }
 
+async function fetchWithKey(url, opts, apiKey) {
+  const fetchFn = global.fetch || (function(){ try{ const u = require('undici'); if (u && typeof u.fetch === 'function') { global.fetch = u.fetch; return global.fetch; } } catch(e){} return null; })();
+  if (typeof fetchFn !== 'function') throw new Error('Global fetch() is not available in this Node runtime. Install Node 18+ or run `npm install undici`.');
+  const baseHeaders = (opts && opts.headers) ? Object.assign({}, opts.headers) : {};
+  const headers = Object.assign({}, baseHeaders, { 'Authorization': `Bearer ${apiKey}`, 'x-api-key': String(apiKey) });
+  return fetchFn(url, Object.assign({}, opts || {}, { headers }));
+}
+
+async function fetchJsonWithKey(url, opts, apiKey) {
+  const res = await fetchWithKey(url, opts, apiKey);
+  const text = await res.text();
+  let data = null;
+  try { data = text ? JSON.parse(text) : null; } catch (e) { data = text; }
+  return { status: res.status, headers: res.headers, body: data };
+}
+
+function formatCount(value) {
+  const numeric = Number(value);
+  if (!Number.isFinite(numeric)) return '0';
+  return numeric.toLocaleString('en-US');
+}
+
+function formatMemberSince(value) {
+  if (!value) return 'Unknown';
+  const parsed = new Date(value);
+  if (Number.isNaN(parsed.getTime())) return String(value);
+  return parsed.toLocaleDateString('en-US', { month: 'short', year: 'numeric' });
+}
+
+function printAccountSummary(payload) {
+  const account = payload && payload.account ? payload.account : {};
+  const stats = account && account.stats ? account.stats : {};
+  const title = account.name || payload.accountId || payload.userId || 'Account';
+
+  console.log(chalk.bold('Account summary:'));
+  console.log(chalk.green('  Name:') + ' ' + title);
+  if (account.email) console.log(chalk.green('  Email:') + ' ' + account.email);
+  if (payload.accountId) console.log(chalk.green('  Account ID:') + ' ' + payload.accountId);
+  console.log(chalk.green('  API calls:') + ' ' + formatCount(stats.apiCalls));
+  console.log(chalk.green('  Scans:') + ' ' + formatCount(stats.scans));
+  console.log(chalk.green('  Member since:') + ' ' + formatMemberSince(account.createdAt));
+}
+
 async function run(argv) {
   const program = new Command();
-  program.name('subto').description('Subto CLI — wrapper around Subto.One API').version(CLIENT_META.version || '7.0.0');
+  program.name('subto').description('Subto CLI — wrapper around Subto.One API').version(CLIENT_META.version || '9.0.2');
 
   program.command('login').description('Store your API key in ~/.subto/config.json').action(async () => {
     try {
@@ -143,6 +186,45 @@ async function run(argv) {
     } catch (err) { if (err && err.message === 'Aborted') { console.log('\n' + chalk.yellow('Login aborted.')); process.exit(1); } throw err; }
   });
 
+  program
+    .command('account')
+    .description('Show the current account name, API calls, and scans')
+    .option('--json', 'Output raw JSON')
+    .action(async (opts) => {
+      const cfg = await readConfig();
+      if (!cfg || !cfg.apiKey) {
+        console.error(chalk.red('Missing API key. Run:'), chalk.cyan('subto login'));
+        process.exit(1);
+      }
+
+      try {
+        const endpoint = new URL('/api/v1/account/me', process.env.SUBTO_API_BASE_URL || DEFAULT_API_BASE).toString();
+        const resp = await fetchJsonWithKey(endpoint, { headers: { 'Accept': 'application/json' } }, cfg.apiKey);
+
+        if (resp.status === 401 || resp.status === 403) {
+          console.error(chalk.red('Authentication failed. Check your API key with `subto login`.'));
+          process.exit(1);
+        }
+        if (resp.status < 200 || resp.status >= 300) {
+          let msg = `Request failed with status ${resp.status}`;
+          if (resp.body && typeof resp.body === 'object' && resp.body.error) msg += ': ' + resp.body.error;
+          console.error(chalk.red(msg));
+          process.exit(1);
+        }
+
+        if (opts.json) {
+          console.log(JSON.stringify(resp.body, null, 2));
+          return;
+        }
+
+        printAccountSummary(resp.body);
+      } catch (err) {
+        const msg = err && err.message ? err.message : String(err);
+        console.error(chalk.red('Network error:'), msg);
+        process.exit(1);
+      }
+    });
+
   program
     .command('scan <url>')
     .description('Request a scan for <url> via the Subto API')

package/index.js

@@ -11,7 +11,7 @@ const chalk = (_chalk && _chalk.default) ? _chalk.default : _chalk;
 const CONFIG_DIR = path.join(os.homedir(), '.subto');
 const CONFIG_PATH = path.join(CONFIG_DIR, 'config.json');
 const DEFAULT_API_BASE = 'https://subto.one/api/v1';
-const CLIENT_META = { name: 'subto-cli', version: '9.0.0' };
+const CLIENT_META = { name: 'subto-cli', version: '9.0.2' };
 const cp = require('child_process');
 
 // Normalize SUBTO API base so callers can set either
@@ -296,6 +296,41 @@ function printScanSummary(obj) {
   if (keys.length) console.log(chalk.dim('  Additional keys: ' + keys.join(', ')));
 }
 
+async function fetchJsonWithKey(url, opts, apiKey, debug=false) {
+  const res = await fetchWithKey(url, opts, apiKey, debug);
+  const text = typeof res._cached_text === 'string' ? res._cached_text : await res.text();
+  let data = null;
+  try { data = text ? JSON.parse(text) : null; } catch (e) { data = text; }
+  return { status: res.status, headers: res.headers, body: data };
+}
+
+function formatCount(value) {
+  const numeric = Number(value);
+  if (!Number.isFinite(numeric)) return '0';
+  return numeric.toLocaleString('en-US');
+}
+
+function formatMemberSince(value) {
+  if (!value) return 'Unknown';
+  const parsed = new Date(value);
+  if (Number.isNaN(parsed.getTime())) return String(value);
+  return parsed.toLocaleDateString('en-US', { month: 'short', year: 'numeric' });
+}
+
+function printAccountSummary(payload) {
+  const account = payload && payload.account ? payload.account : {};
+  const stats = account && account.stats ? account.stats : {};
+  const title = account.name || payload.accountId || payload.userId || 'Account';
+
+  console.log(chalk.bold('Account summary:'));
+  console.log(chalk.green('  Name:') + ' ' + title);
+  if (account.email) console.log(chalk.green('  Email:') + ' ' + account.email);
+  if (payload.accountId) console.log(chalk.green('  Account ID:') + ' ' + payload.accountId);
+  console.log(chalk.green('  API calls:') + ' ' + formatCount(stats.apiCalls));
+  console.log(chalk.green('  Scans:') + ' ' + formatCount(stats.scans));
+  console.log(chalk.green('  Member since:') + ' ' + formatMemberSince(account.createdAt));
+}
+
 async function printFullReport(data) {
   const scan = (data && data.results) ? data.results : data;
   if (!scan || typeof scan !== 'object') { console.log(JSON.stringify(data, null, 2)); return; }
@@ -577,7 +612,7 @@ async function startChatREPL(scanData){
 
 async function run(argv) {
   const program = new Command();
-  program.name('subto').description('Subto CLI — wrapper around Subto.One API').version(CLIENT_META.version || '9.0.0');
+  program.name('subto').description('Subto CLI — wrapper around Subto.One API').version(CLIENT_META.version || '9.0.2');
   program.option('-v, --verbose', 'Show verbose HTTP logs');
   program.option('--debug', 'Show debug HTTP headers and responses');
   program.option('--chat', 'Start local AI assistant (no command required)');
@@ -603,6 +638,46 @@ async function run(argv) {
     } catch (err) { if (err && err.message === 'Aborted') { console.log('\n' + chalk.yellow('Login aborted.')); process.exit(1); } throw err; }
   });
 
+  program
+    .command('account')
+    .description('Show the current account name, API calls, and scans')
+    .option('--json', 'Output raw JSON')
+    .action(async (opts) => {
+      const cfg = await readConfig();
+      if (!cfg || !cfg.apiKey) {
+        console.error(chalk.red('Missing API key. Run:'), chalk.cyan('subto login'));
+        process.exit(1);
+      }
+
+      try {
+        const DEBUG = (program && typeof program.opts === 'function') ? Boolean(program.opts().debug) : false;
+        const endpoint = new URL('account/me', SUBTO_API_BASE_SLASH).toString();
+        const resp = await fetchJsonWithKey(endpoint, { headers: { 'Accept': 'application/json' } }, cfg.apiKey, DEBUG);
+
+        if (resp.status === 401 || resp.status === 403) {
+          console.error(chalk.red('Authentication failed. Check your API key with `subto login`.'));
+          process.exit(1);
+        }
+        if (resp.status < 200 || resp.status >= 300) {
+          let msg = `Request failed with status ${resp.status}`;
+          if (resp.body && typeof resp.body === 'object' && resp.body.error) msg += ': ' + resp.body.error;
+          console.error(chalk.red(msg));
+          process.exit(1);
+        }
+
+        if (opts.json) {
+          console.log(JSON.stringify(resp.body, null, 2));
+          return;
+        }
+
+        printAccountSummary(resp.body);
+      } catch (err) {
+        const msg = err && err.message ? err.message : String(err);
+        console.error(chalk.red('Network error:'), msg);
+        process.exit(1);
+      }
+    });
+
   program
     .command('scan <url>')
     .description('Request a scan for <url> via the Subto API')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "subto",
-  "version": "9.0.0",
+  "version": "9.0.2",
   "description": "Subto CLI — thin wrapper around the Subto.One API",
   "bin": {
     "subto": "bin/subto.js"