feat: 完善 Server 层并添加 CLI 和 Web 前端
Server 层增强: - 添加 Agent 适配层，支持动态加载 core 模块 - 实现 Token 认证机制，支持本地/远程模式 - WebSocket 集成 Agent 实时对话 CLI 模块 (packages/cli): - serve 命令启动 HTTP Server - attach 命令连接远程 Server - API Client 封装 Web 前端 (packages/web): - React 18 + Vite + Tailwind CSS - 会话管理侧边栏 - WebSocket 实时聊天界面 - 流式消息显示
This commit is contained in:
@@ -0,0 +1,190 @@
|
||||
/**
|
||||
* API Client
|
||||
*
|
||||
* 用于连接远程 Server 的客户端
|
||||
*/
|
||||
|
||||
export interface ClientConfig {
|
||||
/** 服务器地址 */
|
||||
baseUrl: string;
|
||||
/** 认证 token */
|
||||
token?: string;
|
||||
/** 请求超时 (ms) */
|
||||
timeout?: number;
|
||||
}
|
||||
|
||||
export interface Session {
|
||||
id: string;
|
||||
name?: string;
|
||||
createdAt: string;
|
||||
updatedAt: string;
|
||||
status: string;
|
||||
messageCount: number;
|
||||
}
|
||||
|
||||
export interface Message {
|
||||
id: string;
|
||||
role: 'user' | 'assistant' | 'system';
|
||||
content: string;
|
||||
timestamp: string;
|
||||
}
|
||||
|
||||
export interface HealthStatus {
|
||||
status: string;
|
||||
timestamp: string;
|
||||
agent: {
|
||||
coreAvailable: boolean;
|
||||
};
|
||||
auth: {
|
||||
enabled: boolean;
|
||||
tokenCount: number;
|
||||
};
|
||||
stats: {
|
||||
sessions: number;
|
||||
websocket: { connections: number };
|
||||
sse: { connections: number };
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* API Client 类
|
||||
*/
|
||||
export class APIClient {
|
||||
private baseUrl: string;
|
||||
private token?: string;
|
||||
private timeout: number;
|
||||
|
||||
constructor(config: ClientConfig) {
|
||||
this.baseUrl = config.baseUrl.replace(/\/$/, '');
|
||||
this.token = config.token;
|
||||
this.timeout = config.timeout || 30000;
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送 HTTP 请求
|
||||
*/
|
||||
private async request<T>(
|
||||
method: string,
|
||||
path: string,
|
||||
body?: unknown
|
||||
): Promise<T> {
|
||||
const url = `${this.baseUrl}${path}`;
|
||||
const headers: Record<string, string> = {
|
||||
'Content-Type': 'application/json',
|
||||
};
|
||||
|
||||
if (this.token) {
|
||||
headers['Authorization'] = `Bearer ${this.token}`;
|
||||
}
|
||||
|
||||
const controller = new AbortController();
|
||||
const timeoutId = setTimeout(() => controller.abort(), this.timeout);
|
||||
|
||||
try {
|
||||
const response = await fetch(url, {
|
||||
method,
|
||||
headers,
|
||||
body: body ? JSON.stringify(body) : undefined,
|
||||
signal: controller.signal,
|
||||
});
|
||||
|
||||
clearTimeout(timeoutId);
|
||||
|
||||
if (!response.ok) {
|
||||
const errorData = await response.json().catch(() => ({ error: response.statusText })) as { error?: string };
|
||||
throw new Error(errorData.error || `HTTP ${response.status}`);
|
||||
}
|
||||
|
||||
return response.json() as Promise<T>;
|
||||
} catch (error) {
|
||||
clearTimeout(timeoutId);
|
||||
if (error instanceof Error && error.name === 'AbortError') {
|
||||
throw new Error('Request timeout');
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// Health
|
||||
// ============================================================================
|
||||
|
||||
async health(): Promise<HealthStatus> {
|
||||
return this.request('GET', '/health');
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// Sessions
|
||||
// ============================================================================
|
||||
|
||||
async listSessions(): Promise<{ success: boolean; data: Session[] }> {
|
||||
return this.request('GET', '/api/sessions');
|
||||
}
|
||||
|
||||
async createSession(name?: string): Promise<{ success: boolean; data: Session }> {
|
||||
return this.request('POST', '/api/sessions', { name });
|
||||
}
|
||||
|
||||
async getSession(id: string): Promise<{ success: boolean; data: Session }> {
|
||||
return this.request('GET', `/api/sessions/${id}`);
|
||||
}
|
||||
|
||||
async deleteSession(id: string): Promise<{ success: boolean }> {
|
||||
return this.request('DELETE', `/api/sessions/${id}`);
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// Messages
|
||||
// ============================================================================
|
||||
|
||||
async getMessages(sessionId: string): Promise<{ success: boolean; data: Message[] }> {
|
||||
return this.request('GET', `/api/sessions/${sessionId}/messages`);
|
||||
}
|
||||
|
||||
async sendMessage(
|
||||
sessionId: string,
|
||||
content: string
|
||||
): Promise<{ success: boolean; data: Message }> {
|
||||
return this.request('POST', `/api/sessions/${sessionId}/messages`, { content });
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// WebSocket
|
||||
// ============================================================================
|
||||
|
||||
/**
|
||||
* 创建 WebSocket 连接
|
||||
*/
|
||||
connectWebSocket(sessionId: string): WebSocket {
|
||||
const wsUrl = this.baseUrl
|
||||
.replace(/^http/, 'ws')
|
||||
.concat(`/api/ws/${sessionId}`);
|
||||
|
||||
const url = this.token
|
||||
? `${wsUrl}?token=${encodeURIComponent(this.token)}`
|
||||
: wsUrl;
|
||||
|
||||
return new WebSocket(url);
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// SSE
|
||||
// ============================================================================
|
||||
|
||||
/**
|
||||
* 获取 SSE URL (用于外部 EventSource 连接)
|
||||
*/
|
||||
getSSEUrl(sessionId: string): string {
|
||||
const sseUrl = `${this.baseUrl}/api/sessions/${sessionId}/events`;
|
||||
return this.token
|
||||
? `${sseUrl}?token=${encodeURIComponent(this.token)}`
|
||||
: sseUrl;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建 API Client
|
||||
*/
|
||||
export function createClient(config: ClientConfig): APIClient {
|
||||
return new APIClient(config);
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
/**
|
||||
* Client Module
|
||||
*/
|
||||
|
||||
export { APIClient, createClient } from './api.js';
|
||||
export type { ClientConfig, Session, Message, HealthStatus } from './api.js';
|
||||
@@ -0,0 +1,236 @@
|
||||
/**
|
||||
* Attach Command
|
||||
*
|
||||
* 连接到远程 Server
|
||||
*/
|
||||
|
||||
import type { Command } from 'commander';
|
||||
import chalk from 'chalk';
|
||||
import ora from 'ora';
|
||||
import { createClient } from '../client/index.js';
|
||||
|
||||
export function registerAttachCommand(program: Command): void {
|
||||
program
|
||||
.command('attach')
|
||||
.description('Connect to a remote AI Assistant server')
|
||||
.argument('<url>', 'Server URL (e.g., http://192.168.1.100:3000)')
|
||||
.option('-t, --token <token>', 'Authentication token')
|
||||
.option('-s, --session <id>', 'Session ID to connect to')
|
||||
.action(async (url: string, options) => {
|
||||
const { token, session: sessionId } = options;
|
||||
|
||||
const spinner = ora('Connecting to server...').start();
|
||||
|
||||
try {
|
||||
// 创建客户端
|
||||
const client = createClient({
|
||||
baseUrl: url,
|
||||
token,
|
||||
});
|
||||
|
||||
// 检查服务器健康状态
|
||||
const health = await client.health();
|
||||
spinner.succeed(`Connected to server at ${url}`);
|
||||
|
||||
console.log(chalk.gray('─'.repeat(50)));
|
||||
console.log(chalk.bold('Server Status:'));
|
||||
console.log(` Status: ${chalk.green(health.status)}`);
|
||||
console.log(` Agent: ${health.agent.coreAvailable ? chalk.green('Available') : chalk.yellow('Not available')}`);
|
||||
console.log(` Auth: ${health.auth.enabled ? chalk.yellow('Enabled') : chalk.gray('Disabled')}`);
|
||||
console.log(` Sessions: ${health.stats.sessions}`);
|
||||
console.log(` WebSocket: ${health.stats.websocket.connections} connections`);
|
||||
console.log(chalk.gray('─'.repeat(50)));
|
||||
|
||||
// 如果指定了 session，连接到该 session
|
||||
if (sessionId) {
|
||||
await connectToSession(client, sessionId);
|
||||
} else {
|
||||
// 显示可用 sessions 或创建新的
|
||||
await showSessionMenu(client);
|
||||
}
|
||||
} catch (error) {
|
||||
spinner.fail('Failed to connect to server');
|
||||
if (error instanceof Error) {
|
||||
console.error(chalk.red(`Error: ${error.message}`));
|
||||
}
|
||||
process.exit(1);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
async function connectToSession(client: ReturnType<typeof createClient>, sessionId: string): Promise<void> {
|
||||
const spinner = ora(`Connecting to session ${sessionId}...`).start();
|
||||
|
||||
try {
|
||||
// 获取 session 信息
|
||||
const { data: session } = await client.getSession(sessionId);
|
||||
spinner.succeed(`Connected to session: ${session.name || session.id}`);
|
||||
|
||||
// 获取历史消息
|
||||
const { data: messages } = await client.getMessages(sessionId);
|
||||
|
||||
if (messages.length > 0) {
|
||||
console.log(chalk.gray('\n─── Recent Messages ───'));
|
||||
const recentMessages = messages.slice(-5);
|
||||
for (const msg of recentMessages) {
|
||||
const prefix = msg.role === 'user' ? chalk.blue('You: ') : chalk.green('AI: ');
|
||||
const content = msg.content.length > 100
|
||||
? msg.content.slice(0, 100) + '...'
|
||||
: msg.content;
|
||||
console.log(prefix + content);
|
||||
}
|
||||
console.log(chalk.gray('───────────────────────\n'));
|
||||
}
|
||||
|
||||
// 启动交互式会话
|
||||
await startInteractiveSession(client, sessionId);
|
||||
} catch (error) {
|
||||
spinner.fail('Failed to connect to session');
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
async function showSessionMenu(client: ReturnType<typeof createClient>): Promise<void> {
|
||||
const { default: inquirer } = await import('inquirer');
|
||||
|
||||
// 获取可用 sessions
|
||||
const { data: sessions } = await client.listSessions();
|
||||
|
||||
const choices = [
|
||||
{ name: chalk.green('+ Create new session'), value: 'new' },
|
||||
...sessions.map((s) => ({
|
||||
name: `${s.name || s.id} (${s.messageCount} messages)`,
|
||||
value: s.id,
|
||||
})),
|
||||
];
|
||||
|
||||
const { selection } = await inquirer.prompt([
|
||||
{
|
||||
type: 'list',
|
||||
name: 'selection',
|
||||
message: 'Select a session:',
|
||||
choices,
|
||||
},
|
||||
]);
|
||||
|
||||
if (selection === 'new') {
|
||||
const { name } = await inquirer.prompt([
|
||||
{
|
||||
type: 'input',
|
||||
name: 'name',
|
||||
message: 'Session name (optional):',
|
||||
},
|
||||
]);
|
||||
|
||||
const { data: newSession } = await client.createSession(name || undefined);
|
||||
console.log(chalk.green(`Created new session: ${newSession.id}`));
|
||||
await startInteractiveSession(client, newSession.id);
|
||||
} else {
|
||||
await connectToSession(client, selection);
|
||||
}
|
||||
}
|
||||
|
||||
async function startInteractiveSession(
|
||||
client: ReturnType<typeof createClient>,
|
||||
sessionId: string
|
||||
): Promise<void> {
|
||||
const { createInterface } = await import('readline');
|
||||
|
||||
console.log(chalk.gray('Type your message and press Enter. Type /quit to exit.\n'));
|
||||
|
||||
// 连接 WebSocket
|
||||
const ws = client.connectWebSocket(sessionId);
|
||||
|
||||
let currentResponse = '';
|
||||
|
||||
ws.onopen = () => {
|
||||
console.log(chalk.gray('[Connected to WebSocket]'));
|
||||
};
|
||||
|
||||
ws.onmessage = (event) => {
|
||||
try {
|
||||
const message = JSON.parse(event.data as string);
|
||||
|
||||
switch (message.type) {
|
||||
case 'chunk':
|
||||
process.stdout.write(message.payload?.content || '');
|
||||
currentResponse += message.payload?.content || '';
|
||||
break;
|
||||
case 'done':
|
||||
if (currentResponse) {
|
||||
console.log('\n');
|
||||
currentResponse = '';
|
||||
}
|
||||
break;
|
||||
case 'error':
|
||||
console.error(chalk.red(`\nError: ${message.payload?.message}`));
|
||||
break;
|
||||
}
|
||||
} catch {
|
||||
// 忽略解析错误
|
||||
}
|
||||
};
|
||||
|
||||
ws.onerror = (error) => {
|
||||
console.error(chalk.red('WebSocket error:', error));
|
||||
};
|
||||
|
||||
ws.onclose = () => {
|
||||
console.log(chalk.gray('[Disconnected from WebSocket]'));
|
||||
process.exit(0);
|
||||
};
|
||||
|
||||
// 创建交互式 readline
|
||||
const rl = createInterface({
|
||||
input: process.stdin,
|
||||
output: process.stdout,
|
||||
});
|
||||
|
||||
const prompt = () => {
|
||||
rl.question(chalk.blue('You: '), async (input) => {
|
||||
const trimmed = input.trim();
|
||||
|
||||
if (trimmed === '/quit' || trimmed === '/exit') {
|
||||
console.log(chalk.gray('Goodbye!'));
|
||||
ws.close();
|
||||
rl.close();
|
||||
return;
|
||||
}
|
||||
|
||||
if (!trimmed) {
|
||||
prompt();
|
||||
return;
|
||||
}
|
||||
|
||||
// 通过 WebSocket 发送消息
|
||||
ws.send(JSON.stringify({
|
||||
type: 'message',
|
||||
sessionId,
|
||||
payload: { content: trimmed },
|
||||
}));
|
||||
|
||||
process.stdout.write(chalk.green('AI: '));
|
||||
|
||||
// 等待响应完成后再提示
|
||||
const waitForDone = () => {
|
||||
if (currentResponse === '') {
|
||||
prompt();
|
||||
} else {
|
||||
setTimeout(waitForDone, 100);
|
||||
}
|
||||
};
|
||||
setTimeout(waitForDone, 500);
|
||||
});
|
||||
};
|
||||
|
||||
// 等待 WebSocket 连接
|
||||
await new Promise<void>((resolve) => {
|
||||
if (ws.readyState === WebSocket.OPEN) {
|
||||
resolve();
|
||||
} else {
|
||||
ws.onopen = () => resolve();
|
||||
}
|
||||
});
|
||||
|
||||
prompt();
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
/**
|
||||
* Commands Module
|
||||
*/
|
||||
|
||||
export { registerServeCommand } from './serve.js';
|
||||
export { registerAttachCommand } from './attach.js';
|
||||
@@ -0,0 +1,55 @@
|
||||
/**
|
||||
* Serve Command
|
||||
*
|
||||
* 启动 HTTP Server
|
||||
*/
|
||||
|
||||
import type { Command } from 'commander';
|
||||
|
||||
export function registerServeCommand(program: Command): void {
|
||||
program
|
||||
.command('serve')
|
||||
.description('Start the AI Assistant server')
|
||||
.option('-p, --port <port>', 'Port to listen on', '3000')
|
||||
.option('-H, --host <host>', 'Host to bind to', '127.0.0.1')
|
||||
.option('--auth', 'Enable authentication')
|
||||
.option('--no-auth', 'Disable authentication')
|
||||
.option('-t, --token <token>', 'Set authentication token')
|
||||
.action(async (options) => {
|
||||
const { port, host, auth, token } = options;
|
||||
|
||||
// 动态导入 server 模块
|
||||
const { app, websocket, startServer } = await import('@ai-assistant/server');
|
||||
|
||||
// 初始化并打印启动信息
|
||||
await startServer({
|
||||
port: parseInt(port, 10),
|
||||
host,
|
||||
auth,
|
||||
token,
|
||||
});
|
||||
|
||||
// 启动 Bun 服务器
|
||||
const server = Bun.serve({
|
||||
port: parseInt(port, 10),
|
||||
hostname: host,
|
||||
fetch: app.fetch,
|
||||
websocket,
|
||||
});
|
||||
|
||||
console.log(`Server running at http://${host}:${port}`);
|
||||
|
||||
// 优雅关闭
|
||||
process.on('SIGINT', () => {
|
||||
console.log('\nShutting down server...');
|
||||
server.stop();
|
||||
process.exit(0);
|
||||
});
|
||||
|
||||
process.on('SIGTERM', () => {
|
||||
console.log('\nShutting down server...');
|
||||
server.stop();
|
||||
process.exit(0);
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
#!/usr/bin/env bun
|
||||
/**
|
||||
* AI Assistant CLI
|
||||
*
|
||||
* 命令行入口
|
||||
*/
|
||||
|
||||
import { Command } from 'commander';
|
||||
import { registerServeCommand, registerAttachCommand } from './commands/index.js';
|
||||
|
||||
const program = new Command();
|
||||
|
||||
program
|
||||
.name('ai-assistant')
|
||||
.description('AI Terminal Assistant - Your AI-powered coding companion')
|
||||
.version('1.0.0');
|
||||
|
||||
// 注册命令
|
||||
registerServeCommand(program);
|
||||
registerAttachCommand(program);
|
||||
|
||||
// 默认命令 (无参数时的行为)
|
||||
program
|
||||
.action(() => {
|
||||
program.help();
|
||||
});
|
||||
|
||||
// 解析命令行参数
|
||||
program.parse(process.argv);
|
||||
Reference in New Issue
Block a user