gpteam 0.1.6 → 0.1.8

package/lib/cli.js

@@ -5,6 +5,7 @@ import { CLIENTS, writeClientConfig } from './config.js';
 import { getHelpText, PACKAGE_NAME, PACKAGE_VERSION } from './help.js';
 import { modelByID, validateApiKey } from './models.js';
 import { describeSplit, INGRESS_NODES } from './nodes.js';
+import { createTheme, stripAnsi } from './terminal.js';
 
 export async function runCli(argv = []) {
   const normalizedArgv = normalizeSubcommand(argv);
@@ -18,25 +19,27 @@ export async function runCli(argv = []) {
     return;
   }
   const rl = readline.createInterface({ input, output });
+  const theme = createTheme({ stream: output });
   try {
-    console.log('GPTeam API 配置助手');
-    console.log('接下来会用你的 key 跑几次真实请求测速，然后把选中的入口写进客户端配置。原来的配置会先备份。\n');
+    printBanner(theme);
 
     const apiKey = args.key || args.apiKey || await askRequired(rl, '请输入 API key：');
-    console.log('\n正在校验 API key，会请求 /v1/models。校验通过后才会继续。');
+    printStep(theme, 1, 5, '校验 API key', '请求 /v1/models，校验通过后才继续。');
     const validation = await validateApiKey(INGRESS_NODES, apiKey);
-    console.log(`API key 校验通过：${validation.node.label}`);
-    const client = await choose(rl, '请选择客户端类型', CLIENTS, args.client);
+    printStatus(theme, '通过', `API key 可用，校验入口：${validation.node.label}`);
+
+    printStep(theme, 2, 5, '选择客户端和模型');
+    const client = await choose(rl, '请选择客户端类型', CLIENTS, args.client, theme);
     const models = validation.models;
-    const model = await chooseModel(rl, models, args.model);
+    const model = await chooseModel(rl, models, args.model, theme);
     const contextLength = await askContextLength(rl, model, args.context);
-    const effort = await choose(rl, '请选择思考深度', model.efforts.map((id) => ({ id, label: id })), args.effort);
+    const effort = await choose(rl, '请选择思考深度', model.efforts.map((id) => ({ id, label: id })), args.effort, theme);
     const maxOutputTokens = Number(args.maxOutputTokens || 648);
 
-    console.log('\n开始真实测速：GET /api/health + POST /v1/responses stream=true');
-    console.log('测速会按入口并行执行，每个入口内部仍按轮次顺序执行，避免同时打出过多真实请求。');
-    console.log('推荐规则：成功率优先，其次按首包、完成、尾延迟和健康检查计算体验分，分数越低越好。');
-    console.log(`模型：${model.id}，测速输出上限：${maxOutputTokens}`);
+    printStep(theme, 3, 5, '真实请求测速', 'GET /api/health + POST /v1/responses stream=true');
+    printHint(theme, '入口之间并行测速，单入口多轮顺序执行，避免同时打出过多真实请求。');
+    printHint(theme, '推荐规则：成功率优先，其次按首包、完成、尾延迟和健康检查计算体验分，分数越低越好。');
+    printHint(theme, `模型：${model.id}，测速输出上限：${maxOutputTokens}`);
     const results = await benchmarkNodes(INGRESS_NODES, {
       apiKey,
       model: model.id,
@@ -44,11 +47,14 @@ export async function runCli(argv = []) {
       maxOutputTokens,
       rounds: Number(args.rounds || 3)
     });
-    printResults(results);
+    printResults(results, theme);
 
     const recommended = results.find((item) => item.successRate > 0) || results[0];
-    const selectedNode = await chooseNode(rl, results, args.node, recommended && recommended.node.id);
+    printStep(theme, 4, 5, '选择入口');
+    const selectedNode = await chooseNode(rl, results, args.node, recommended && recommended.node.id, theme);
     assertNodeConfig(selectedNode);
+
+    printStep(theme, 5, 5, '写入配置');
     const written = writeClientConfig(client.id, {
       apiKey,
       model: model.id,
@@ -58,7 +64,8 @@ export async function runCli(argv = []) {
       node: selectedNode
     });
 
-    console.log('\n已写入配置：');
+    console.log('');
+    printStatus(theme, '完成', '配置已写入，旧配置已按时间戳备份。');
     for (const filePath of written) console.log(`- ${filePath}`);
     console.log(`入口：${formatNodeLabel(selectedNode)}`);
     console.log(`地址：${selectedNode.baseUrl}`);
@@ -88,7 +95,7 @@ export function parseArgs(argv) {
   return result;
 }
 
-export function printResults(results) {
+export function printResults(results, theme = createTheme()) {
   const recommended = results.find((item) => item.successRate > 0);
   const rows = results.map((item) => [
     `${item.node.label}（${describeSplit(item.node)}）`,
@@ -101,22 +108,25 @@ export function printResults(results) {
     `${Math.round(item.successRate * 100)}%`,
     formatScore(item.experienceScore),
     formatMs(item.healthMs),
-    item === recommended ? '推荐' : '-',
+    item === recommended ? theme.ok('推荐') : '-',
     item.error || '-'
   ]);
   const header = ['节点', 'DNS', 'TCP', 'TLS', '首包', '完成', '尾延迟', '成功率', '体验分', '健康检查', '推荐', '错误'];
   const widths = header.map((name, i) => Math.max(displayWidth(name), ...rows.map((row) => displayWidth(row[i]))) + 2);
   console.log('');
-  console.log(formatRow(header, widths));
-  for (const row of rows) console.log(formatRow(row, widths));
+  console.log(theme.title(formatRow(header, widths)));
+  for (const row of rows) {
+    const line = formatRow(row, widths);
+    console.log(row[10] === '-' ? line : theme.ok(line));
+  }
 }
 
-async function chooseModel(rl, models, preferred) {
+async function chooseModel(rl, models, preferred, theme) {
   const selected = preferred ? modelByID(models, preferred) : null;
   if (selected) return selected;
-  console.log('\n可用模型：');
+  printSubTitle(theme, '可用模型');
   models.forEach((model, index) => {
-    console.log(`${index + 1}. ${formatModelLabel(model)}`);
+    console.log(`  ${theme.info(String(index + 1).padStart(2, ' '))}  ${formatModelLabel(model)}`);
   });
   const answer = await askRequired(rl, '请选择模型序号：');
   const index = Math.max(1, Math.min(models.length, Number(answer) || 1)) - 1;
@@ -130,25 +140,25 @@ async function askContextLength(rl, model, preferred) {
   return clamp(Number(answer || max), 1, max);
 }
 
-export async function chooseNode(rl, results, preferred, recommendedID) {
+export async function chooseNode(rl, results, preferred, recommendedID, theme = createTheme()) {
   const nodes = results.map((item) => item.node);
   const preferredNode = nodes.find((node) => node.id === preferred);
   if (preferredNode) return preferredNode;
   if (recommendedID) {
-    console.log(`\n推荐入口：${recommendedID}`);
+    printStatus(theme, '推荐', recommendedID);
   }
   return (await choose(rl, '请选择最终写入的入口', nodes.map((node) => ({
     id: node.id,
     label: formatNodeLabel(node),
     raw: node
-  })))).raw;
+  })), undefined, theme)).raw;
 }
 
-async function choose(rl, title, items, preferred) {
+async function choose(rl, title, items, preferred, theme = createTheme()) {
   const found = items.find((item) => item.id === preferred);
   if (found) return { ...found, raw: found.raw || found };
-  console.log(`\n${title}：`);
-  items.forEach((item, index) => console.log(`${index + 1}. ${item.label}`));
+  printSubTitle(theme, title);
+  items.forEach((item, index) => console.log(`  ${theme.info(String(index + 1).padStart(2, ' '))}  ${item.label}`));
   const answer = await askRequired(rl, '请输入序号：');
   const index = Math.max(1, Math.min(items.length, Number(answer) || 1)) - 1;
   const item = items[index];
@@ -172,7 +182,7 @@ function padCell(value, width) {
 }
 
 function displayWidth(value) {
-  return Array.from(String(value)).reduce((sum, char) => sum + (char.charCodeAt(0) > 255 ? 2 : 1), 0);
+  return Array.from(stripAnsi(String(value))).reduce((sum, char) => sum + (char.charCodeAt(0) > 255 ? 2 : 1), 0);
 }
 
 function formatScore(value) {
@@ -200,6 +210,30 @@ export function assertNodeConfig(node) {
   }
 }
 
+function printBanner(theme) {
+  console.log(theme.brand('GPTeam API 配置助手'));
+  console.log(theme.muted('真实请求测速，自动写入客户端配置，旧配置会先备份。'));
+}
+
+function printStep(theme, current, total, title, detail = '') {
+  console.log('');
+  console.log(`${theme.info(`[${current}/${total}]`)} ${theme.title(title)}`);
+  if (detail) printHint(theme, detail);
+}
+
+function printSubTitle(theme, title) {
+  console.log('');
+  console.log(theme.title(title));
+}
+
+function printHint(theme, text) {
+  console.log(theme.muted(`  ${text}`));
+}
+
+function printStatus(theme, label, detail) {
+  console.log(`${theme.ok(`[${label}]`)} ${detail}`);
+}
+
 function toCamel(value) {
   return value.replace(/-([a-z])/g, (_, char) => char.toUpperCase());
 }

package/lib/help.js

@@ -1,5 +1,5 @@
 export const PACKAGE_NAME = 'gpteam';
-export const PACKAGE_VERSION = '0.1.6';
+export const PACKAGE_VERSION = '0.1.8';
 
 export function getHelpText() {
   return [

package/lib/nodes.js

@@ -1,7 +1,7 @@
 export const INGRESS_NODES = [
   {
     id: 'jp-direct',
-    label: '日本主机直连',
+    label: '直连',
     region: 'JP',
     split: false,
     baseUrl: 'https://api.gpteamservices.com/v1',

package/lib/terminal.js

@@ -0,0 +1,42 @@
+const ANSI_PATTERN = /\u001b\[[0-9;]*m/g;
+
+const CODES = {
+  reset: '\u001b[0m',
+  bold: '\u001b[1m',
+  dim: '\u001b[2m',
+  cyan: '\u001b[36m',
+  green: '\u001b[32m',
+  yellow: '\u001b[33m',
+  red: '\u001b[31m',
+  gray: '\u001b[90m'
+};
+
+export function createTheme(options = {}) {
+  const enabled = shouldUseColor(options);
+  const wrap = (code, value) => enabled ? `${code}${value}${CODES.reset}` : String(value);
+  return {
+    enabled,
+    brand: (value) => wrap(CODES.bold + CODES.cyan, value),
+    title: (value) => wrap(CODES.bold, value),
+    muted: (value) => wrap(CODES.gray, value),
+    info: (value) => wrap(CODES.cyan, value),
+    ok: (value) => wrap(CODES.green, value),
+    warn: (value) => wrap(CODES.yellow, value),
+    error: (value) => wrap(CODES.red, value),
+    dim: (value) => wrap(CODES.dim, value)
+  };
+}
+
+export function shouldUseColor(options = {}) {
+  const env = options.env || process.env;
+  if (env.NO_COLOR) return false;
+  if (env.FORCE_COLOR && env.FORCE_COLOR !== '0') return true;
+  const stream = options.stream || process.stdout;
+  if (!stream || !stream.isTTY) return false;
+  if (env.TERM === 'dumb') return false;
+  return true;
+}
+
+export function stripAnsi(value) {
+  return String(value).replace(ANSI_PATTERN, '');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gpteam",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "GPTeam API interactive client configurator and ingress benchmark CLI.",
   "type": "module",
   "bin": {