blun-king-cli 6.3.3 → 6.3.5

package/bin/blun.js

@@ -115,7 +115,7 @@ async function main() {
       try {
         const res = await client.sendMessage(question);
         ui.stopSpinner(true);
-        const text = (res.data && (res.data.response || res.data.text || res.data.message)) || JSON.stringify(res.data);
+        const text = (res.data && (res.data.answer || res.data.response || res.data.text || res.data.message)) || JSON.stringify(res.data);
         ui.renderResponse(text, "agent");
       } catch (e) {
         ui.stopSpinner(false);
@@ -181,4 +181,4 @@ async function main() {
   }
 }
 
-main().catch((e) => { console.error("Fatal:", e.message); process.exit(1); });
+main().then(() => { process.exit(0); }).catch((e) => { console.error("Fatal:", e.message); process.exit(1); });

package/lib/auth.js

@@ -5,7 +5,6 @@ const https = require('https');
 const readline = require('readline');
 const chalk = require('chalk');
 const inquirer = require('inquirer');
-const inquirer = require("inquirer");
 
 const CREDS_DIR = path.join(os.homedir(), '.blun');
 const CREDS_FILE = path.join(CREDS_DIR, 'credentials.json');
@@ -42,17 +41,15 @@ function ensureAuth() {
   return getStoredCredentials();
 }
 
-function httpsRequest(options, body) {
-  return new Promise((resolve, reject) => {
-    const req = https.request(options, (res) => {
-      let data = ''; res.on('data', c => data += c);
-      res.on('end', () => {
-        try { resolve({ status: res.statusCode, data: JSON.parse(data) }); }
-        catch { resolve({ status: res.statusCode, data }); }
-      });
-    }); req.on('error', reject);
-    if (body) req.write(JSON.stringify(body)); req.end();
-  });
+async function httpsRequest(options, body) {
+  const url = 'https://' + (options.hostname || BASE_URL) + options.path;
+  const fetchOpts = { method: options.method || 'GET', headers: options.headers || {} };
+  if (body) { fetchOpts.body = JSON.stringify(body); }
+  const res = await fetch(url, fetchOpts);
+  let data;
+  const text = await res.text();
+  try { data = JSON.parse(text); } catch { data = text; }
+  return { status: res.status, data };
 }
 
 function prompt(question) {
@@ -81,19 +78,19 @@ function promptPassword(question) {
   });
 }
 
-async function promptMenu(title, options) {
-  console.log(''); console.log(chalk.bold.cyan('  ' + title));
-  console.log(chalk.dim('  ' + '\u2500'.repeat(40)));
-  options.forEach((opt, i) => console.log(chalk.yellow('  ' + (i + 1) + ')') + ' ' + opt.label));
-  console.log('');
-  const answer = await prompt(chalk.green('  > '));
-  const idx = parseInt(answer, 10) - 1;
-  return (idx >= 0 && idx < options.length) ? options[idx].value : null;
+async function promptMenu(title, choices) {
+  const { answer } = await inquirer.prompt([{
+    type: 'list',
+    name: 'answer',
+    message: title,
+    choices: choices.map(c => ({ name: c.label, value: c.value }))
+  }]);
+  return answer;
 }
 async function login() {
   console.log(chalk.bold.cyan('\n  BLUN Login\n'));
-  const email = await prompt(chalk.green('  Email: '));
-  const password = await promptPassword(chalk.green('  Password: '));
+  const { email } = await inquirer.prompt([{ type: 'input', name: 'email', message: 'Email:' }]);
+  const { password } = await inquirer.prompt([{ type: 'password', name: 'password', message: 'Password:', mask: '*' }]);
   if (!email || !password) throw new Error('Email and password required.');
   const res = await httpsRequest({
     hostname: BASE_URL, path: '/api/king/auth/login',
@@ -114,9 +111,9 @@ async function login() {
 
 async function register() {
   console.log(chalk.bold.cyan('\n  BLUN Registration\n'));
-  const name = await prompt(chalk.green('  Name: '));
-  const email = await prompt(chalk.green('  Email: '));
-  const password = await promptPassword(chalk.green('  Password: '));
+  const { name } = await inquirer.prompt([{ type: 'input', name: 'name', message: 'Name:' }]);
+  const { email } = await inquirer.prompt([{ type: 'input', name: 'email', message: 'Email:' }]);
+  const { password } = await inquirer.prompt([{ type: 'password', name: 'password', message: 'Password:', mask: '*' }]);
   if (!email || !password || !name) throw new Error('Name, email and password required.');
   const res = await httpsRequest({
     hostname: BASE_URL, path: '/api/king/auth/register',

package/lib/chat.js

@@ -10,14 +10,20 @@ async function startChat() {
   ui.renderBanner();
 
   if (!auth.isAuthenticated()) {
-    const result = await auth.showWelcomeMenu();
-    if (result === false) {
-      console.log(chalk.yellow('  Auth failed. Showing menu again...\n'));
-      const retry = await auth.showWelcomeMenu();
-      if (retry === false) { process.exit(1); }
-      if (retry === 'local') localMode = true;
+    try {
+      const result = await auth.showWelcomeMenu();
+      if (result === 'local') localMode = true;
+    } catch (e) {
+      console.log(chalk.red('\n  ' + e.message));
+      console.log(chalk.yellow('  Trying again...\n'));
+      try {
+        const retry = await auth.showWelcomeMenu();
+        if (retry === 'local') localMode = true;
+      } catch (e2) {
+        console.log(chalk.red('\n  ' + e2.message));
+        process.exit(1);
+      }
     }
-    if (result === 'local') localMode = true;
   }
 
   const creds = auth.getStoredCredentials();
@@ -38,6 +44,7 @@ async function startChat() {
   console.log('  Type /help for commands, /exit to quit.\n');
   rl.prompt();
 
+  return new Promise((resolveChat) => {
   rl.on('line', async (line) => {
     const input = line.trim();
     if (!input) { rl.prompt(); return; }
@@ -123,7 +130,7 @@ async function startChat() {
       const res = await client.sendMessage(input, { model: settings.model || 'auto' });
       ui.stopSpinner(true, 'Response received');
       if (res.status === 200 && res.data) {
-        const text = res.data.response || res.data.text || res.data.message || JSON.stringify(res.data);
+        const text = res.data.answer || res.data.response || res.data.text || res.data.message || JSON.stringify(res.data);
         ui.renderResponse(text, 'agent');
         if (res.data.usage) ui.addTokens(res.data.usage.total_tokens || 0, 0.000003);
       } else if (res.status === 401 || res.status === 403) {
@@ -138,7 +145,8 @@ async function startChat() {
     rl.prompt();
   });
 
-  rl.on('close', () => { console.log(''); process.exit(0); });
+  rl.on('close', () => { console.log(''); resolveChat(); });
+  });
 }
 
 module.exports = { startChat };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blun-king-cli",
-  "version": "6.3.3",
+  "version": "6.3.5",
   "description": "BLUN AI Assistant - Command Line Interface",
   "bin": {
     "blun": "./bin/blun.js"

package/node_modules/color-convert/CHANGELOG.md

@@ -1,54 +0,0 @@
-# 1.0.0 - 2016-01-07
-
-- Removed: unused speed test
-- Added: Automatic routing between previously unsupported conversions
-([#27](https://github.com/Qix-/color-convert/pull/27))
-- Removed: `xxx2xxx()` and `xxx2xxxRaw()` functions
-([#27](https://github.com/Qix-/color-convert/pull/27))
-- Removed: `convert()` class
-([#27](https://github.com/Qix-/color-convert/pull/27))
-- Changed: all functions to lookup dictionary
-([#27](https://github.com/Qix-/color-convert/pull/27))
-- Changed: `ansi` to `ansi256`
-([#27](https://github.com/Qix-/color-convert/pull/27))
-- Fixed: argument grouping for functions requiring only one argument
-([#27](https://github.com/Qix-/color-convert/pull/27))
-
-# 0.6.0 - 2015-07-23
-
-- Added: methods to handle
-[ANSI](https://en.wikipedia.org/wiki/ANSI_escape_code#Colors) 16/256 colors:
-  - rgb2ansi16
-  - rgb2ansi
-  - hsl2ansi16
-  - hsl2ansi
-  - hsv2ansi16
-  - hsv2ansi
-  - hwb2ansi16
-  - hwb2ansi
-  - cmyk2ansi16
-  - cmyk2ansi
-  - keyword2ansi16
-  - keyword2ansi
-  - ansi162rgb
-  - ansi162hsl
-  - ansi162hsv
-  - ansi162hwb
-  - ansi162cmyk
-  - ansi162keyword
-  - ansi2rgb
-  - ansi2hsl
-  - ansi2hsv
-  - ansi2hwb
-  - ansi2cmyk
-  - ansi2keyword
-([#18](https://github.com/harthur/color-convert/pull/18))
-
-# 0.5.3 - 2015-06-02
-
-- Fixed: hsl2hsv does not return `NaN` anymore when using `[0,0,0]`
-([#15](https://github.com/harthur/color-convert/issues/15))
-
----
-
-Check out commit logs for older releases