ai-agent-router 0.1.21 → 0.2.0

package/dist/src/cli/index.js

@@ -7,51 +7,249 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const os_1 = __importDefault(require("os"));
+const http_1 = __importDefault(require("http"));
 const database_1 = require("../db/database");
 const queries_1 = require("../db/queries");
 const program = new commander_1.Command();
 const packageJsonPath = require.resolve('../../../package.json');
 const packageJson = require(packageJsonPath);
+const AAR_DIR = path_1.default.join(os_1.default.homedir(), '.aar');
+const UI_PID_FILE = path_1.default.join(AAR_DIR, 'ui.pid');
+const GATEWAY_PID_FILE = path_1.default.join(AAR_DIR, 'gateway.pid');
+const GATEWAY_PORT_FILE = path_1.default.join(AAR_DIR, 'gateway.port');
+function ensureAarDir() {
+    if (!fs_1.default.existsSync(AAR_DIR)) {
+        fs_1.default.mkdirSync(AAR_DIR, { recursive: true });
+    }
+}
+function getPackageRoot() {
+    return path_1.default.dirname(path_1.default.dirname(path_1.default.dirname(__dirname)));
+}
+/** Wait for HTTP server to respond (e.g. UI or gateway ready) */
+function waitForReady(baseUrl, maxWaitMs = 30000) {
+    const url = new URL(baseUrl);
+    return new Promise((resolve) => {
+        const start = Date.now();
+        const tryOnce = () => {
+            const req = http_1.default.request({
+                hostname: url.hostname,
+                port: url.port || '80',
+                path: url.pathname || '/',
+                method: 'GET',
+                timeout: 2000,
+            }, (res) => {
+                resolve(res.statusCode !== undefined && res.statusCode < 500);
+            });
+            req.on('error', () => {
+                if (Date.now() - start >= maxWaitMs) {
+                    resolve(false);
+                    return;
+                }
+                setTimeout(tryOnce, 800);
+            });
+            req.on('timeout', () => {
+                req.destroy();
+                if (Date.now() - start >= maxWaitMs)
+                    resolve(false);
+                else
+                    setTimeout(tryOnce, 800);
+            });
+            req.end();
+        };
+        tryOnce();
+    });
+}
+function printStatus(uiPort, gatewayPort, gatewayRunning, background) {
+    const uiUrl = `http://localhost:${uiPort}`;
+    const gatewayUrl = `http://localhost:${gatewayPort}`;
+    console.log('');
+    console.log('-------------------------------------------');
+    console.log('  AI Agent Router');
+    console.log('-------------------------------------------');
+    console.log(`  前台 UI:     ${uiUrl}`);
+    console.log(`  网关地址:   ${gatewayUrl}`);
+    console.log(`  网关状态:   ${gatewayRunning ? '运行中' : '未启动'}`);
+    if (background) {
+        console.log('  运行模式:   后台运行（关闭终端不影响）');
+        console.log('  停止服务:   aar stop');
+    }
+    console.log('-------------------------------------------');
+    console.log('');
+}
 program
     .name('aar')
     .description('AI Agent Router - Web UI for managing the API gateway')
     .version(packageJson.version);
 program
     .command('start')
-    .description('Start the Web UI management interface')
+    .description('Start the Web UI and gateway (default: both; use --no-gateway for UI only)')
     .option('-p, --port <port>', 'Port for Web UI', '9527')
+    .option('-g, --gateway-port <port>', 'Port for gateway (default: from config or 1357)')
+    .option('--no-gateway', 'Only start Web UI, do not start gateway')
+    .option('--no-background', 'Run in foreground (attach to terminal)')
     .action(async (options) => {
-    const port = parseInt(options.port || '9527');
-    console.log(`Starting AI Agent Router Web UI`);
-    console.log(`  Port: ${port}`);
-    console.log(`  Access the UI at: http://localhost:${port}`);
-    console.log('');
-    // Get the package root directory (where package.json is located)
-    const packageRoot = path_1.default.dirname(path_1.default.dirname(path_1.default.dirname(__dirname)));
-    // Start Web UI using Next.js
-    // Always use production mode for globally installed package
+    const uiPort = parseInt(options.port || '9527', 10);
+    const startGateway = options.gateway !== false;
+    const background = options.background !== false;
+    const packageRoot = getPackageRoot();
+    let gatewayPort = 1357;
+    if (startGateway) {
+        try {
+            await (0, database_1.getDatabase)();
+            const portConfig = await (0, queries_1.getConfig)('port');
+            gatewayPort = options.gatewayPort
+                ? parseInt(options.gatewayPort, 10)
+                : parseInt(portConfig?.value || '1357', 10);
+        }
+        catch (e) {
+            gatewayPort = options.gatewayPort ? parseInt(options.gatewayPort, 10) : 1357;
+        }
+    }
     const serverPath = path_1.default.join(packageRoot, 'node_modules', 'next', 'dist', 'bin', 'next');
-    const uiProcess = (0, child_process_1.spawn)(process.execPath, [serverPath, 'start', '-p', port.toString()], {
+    const gatewayScriptPath = path_1.default.join(packageRoot, 'dist', 'src', 'cli', 'gateway-server.js');
+    if (background) {
+        ensureAarDir();
+        const envBase = { ...process.env, NODE_ENV: 'production' };
+        const uiProc = (0, child_process_1.spawn)(process.execPath, [serverPath, 'start', '-p', uiPort.toString()], {
+            cwd: packageRoot,
+            env: { ...envBase, PORT: uiPort.toString() },
+            detached: true,
+            stdio: 'ignore',
+        });
+        uiProc.unref();
+        if (uiProc.pid) {
+            fs_1.default.writeFileSync(UI_PID_FILE, String(uiProc.pid));
+        }
+        let gatewayRunning = false;
+        if (startGateway && fs_1.default.existsSync(gatewayScriptPath)) {
+            const gwProc = (0, child_process_1.spawn)(process.execPath, [gatewayScriptPath, '--port', String(gatewayPort)], {
+                cwd: packageRoot,
+                env: envBase,
+                detached: true,
+                stdio: 'ignore',
+            });
+            gwProc.unref();
+            if (gwProc.pid) {
+                fs_1.default.writeFileSync(GATEWAY_PID_FILE, String(gwProc.pid));
+                fs_1.default.writeFileSync(GATEWAY_PORT_FILE, String(gatewayPort));
+                gatewayRunning = true;
+            }
+            try {
+                await (0, database_1.getDatabase)();
+                await (0, queries_1.setServiceStatus)({
+                    status: 'running',
+                    port: gatewayPort,
+                    pid: gwProc.pid ?? null,
+                    started_at: new Date().toISOString(),
+                });
+            }
+            catch {
+                // ignore db errors
+            }
+        }
+        printStatus(uiPort, gatewayPort, gatewayRunning, true);
+        process.exit(0);
+    }
+    // Foreground: start UI first
+    console.log('Starting AI Agent Router...');
+    const uiProcess = (0, child_process_1.spawn)(process.execPath, [serverPath, 'start', '-p', uiPort.toString()], {
         cwd: packageRoot,
         stdio: ['ignore', 'inherit', 'inherit'],
-        env: { ...process.env, PORT: port.toString(), NODE_ENV: 'production' },
-    });
-    // Handle UI process exit
-    uiProcess.on('exit', (code) => {
-        console.log(`Web UI process exited with code ${code}`);
-        process.exit(code || 0);
+        env: { ...process.env, PORT: uiPort.toString(), NODE_ENV: 'production' },
     });
     uiProcess.on('error', (error) => {
         console.error(`Failed to start Web UI: ${error.message}`);
         process.exit(1);
     });
-    // Keep the process alive
-    process.on('SIGINT', () => {
-        console.log('\nShutting down...');
+    const gatewayProcess = startGateway && fs_1.default.existsSync(gatewayScriptPath)
+        ? (0, child_process_1.spawn)(process.execPath, [gatewayScriptPath, '--port', String(gatewayPort)], {
+            cwd: packageRoot,
+            stdio: ['ignore', 'pipe', 'pipe'],
+            env: { ...process.env, NODE_ENV: 'production' },
+        })
+        : null;
+    if (gatewayProcess?.stdout) {
+        gatewayProcess.stdout.on('data', (d) => process.stdout.write(d));
+    }
+    if (gatewayProcess?.stderr) {
+        gatewayProcess.stderr.on('data', (d) => process.stderr.write(d));
+    }
+    const ready = await waitForReady(`http://localhost:${uiPort}`);
+    if (ready) {
+        printStatus(uiPort, gatewayPort, !!gatewayProcess, false);
+    }
+    const shutdown = (signal) => {
+        console.log(`\nShutting down (${signal})...`);
+        if (gatewayProcess?.pid) {
+            try {
+                process.kill(gatewayProcess.pid, 'SIGTERM');
+            }
+            catch {
+                // ignore
+            }
+        }
         uiProcess.kill('SIGTERM');
         process.exit(0);
+    };
+    process.on('SIGINT', () => shutdown('SIGINT'));
+    process.on('SIGTERM', () => shutdown('SIGTERM'));
+    uiProcess.on('exit', (code) => {
+        if (gatewayProcess?.pid) {
+            try {
+                process.kill(gatewayProcess.pid, 'SIGTERM');
+            }
+            catch {
+                // ignore
+            }
+        }
+        process.exit(code ?? 0);
     });
 });
+program
+    .command('stop')
+    .description('Stop AI Agent Router when running in background')
+    .action(async () => {
+    ensureAarDir();
+    let stopped = 0;
+    const killPidFile = (file, name) => {
+        if (!fs_1.default.existsSync(file))
+            return;
+        try {
+            const pid = parseInt(fs_1.default.readFileSync(file, 'utf8').trim(), 10);
+            if (!isNaN(pid)) {
+                try {
+                    process.kill(pid, 'SIGTERM');
+                    console.log(`Stopped ${name} (PID ${pid})`);
+                    stopped++;
+                }
+                catch (e) {
+                    if (e?.code !== 'ESRCH')
+                        console.warn(`${name} (PID ${pid}): ${e.message}`);
+                }
+            }
+            fs_1.default.unlinkSync(file);
+        }
+        catch (e) {
+            // ignore
+        }
+    };
+    killPidFile(GATEWAY_PID_FILE, 'gateway');
+    killPidFile(UI_PID_FILE, 'Web UI');
+    if (fs_1.default.existsSync(GATEWAY_PORT_FILE))
+        fs_1.default.unlinkSync(GATEWAY_PORT_FILE);
+    try {
+        await (0, database_1.getDatabase)();
+        await (0, queries_1.updateServiceStatus)({ status: 'stopped', pid: null });
+    }
+    catch {
+        // ignore
+    }
+    if (stopped === 0) {
+        console.log('No background processes found (or already stopped).');
+    }
+});
 program
     .command('config')
     .description('Manage gateway configuration')

package/dist/src/db/database.js

@@ -17,6 +17,27 @@ const os_1 = __importDefault(require("os"));
 const DB_PATH = process.env.DB_PATH || path_1.default.join(os_1.default.homedir(), '.aar', 'gateway.db');
 let dbInstance = null;
 let sqlJsInstance = null;
+/** 上次从磁盘加载 DB 的时间（用于多进程时发现磁盘被其他进程更新则重新加载） */
+let lastLoadMtimeMs = 0;
+/** 若磁盘上的 DB 被其他进程更新则重新加载，以便读到最新数据 */
+function reloadFromFileIfNewer() {
+    if (!dbInstance || !fs_1.default.existsSync(DB_PATH))
+        return;
+    const mtime = fs_1.default.statSync(DB_PATH).mtimeMs;
+    if (mtime <= lastLoadMtimeMs)
+        return;
+    try {
+        const fresh = loadDatabase();
+        if (fresh) {
+            dbInstance.close();
+            dbInstance = fresh;
+            lastLoadMtimeMs = fs_1.default.statSync(DB_PATH).mtimeMs;
+        }
+    }
+    catch (e) {
+        console.warn('[Database] Reload from file failed:', e.message);
+    }
+}
 async function initSqlJsEngine() {
     if (!sqlJsInstance) {
         sqlJsInstance = await (0, sql_js_1.default)({
@@ -39,6 +60,9 @@ function saveDatabase(db) {
             fs_1.default.mkdirSync(dbDir, { recursive: true });
         }
         fs_1.default.writeFileSync(DB_PATH, buffer);
+        if (fs_1.default.existsSync(DB_PATH)) {
+            lastLoadMtimeMs = fs_1.default.statSync(DB_PATH).mtimeMs;
+        }
     }
     catch (error) {
         console.error('Failed to save database:', error);
@@ -59,7 +83,16 @@ function loadDatabase() {
 async function getDatabase() {
     if (!dbInstance) {
         const engine = await initSqlJsEngine();
-        dbInstance = loadDatabase() || new engine.Database();
+        const loaded = loadDatabase();
+        if (loaded) {
+            dbInstance = loaded;
+            if (fs_1.default.existsSync(DB_PATH))
+                lastLoadMtimeMs = fs_1.default.statSync(DB_PATH).mtimeMs;
+        }
+        else {
+            dbInstance = new engine.Database();
+            lastLoadMtimeMs = 0;
+        }
         try {
             dbInstance.run(schema_1.CREATE_TABLES_SQL);
             // Migration: Allow NULL model_id in request_logs table
@@ -113,6 +146,7 @@ async function getDatabase() {
             }
         }
     }
+    reloadFromFileIfNewer();
     return dbInstance;
 }
 async function closeDatabase() {

package/dist/src/db/queries.js

@@ -155,9 +155,9 @@ async function createRequestLog(log) {
     try {
         const result = await (0, database_1.run)(`INSERT INTO request_logs (
         model_id, request_method, request_path, request_headers,
-        request_query, request_body, response_status, response_body, response_time_ms
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
-            log.model_id || null,
+        request_query, request_body, response_status, response_body, response_time_ms, created_at
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, datetime('now', 'localtime'))`, [
+            log.model_id === undefined ? null : log.model_id,
             log.request_method,
             log.request_path,
             log.request_headers,
@@ -178,9 +178,9 @@ async function createRequestLog(log) {
             console.warn(`[RequestLog] Foreign key constraint failed for model_id ${log.model_id}, retrying with NULL`);
             const result = await (0, database_1.run)(`INSERT INTO request_logs (
           model_id, request_method, request_path, request_headers,
-          request_query, request_body, response_status, response_body, response_time_ms
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
-                null,
+          request_query, request_body, response_status, response_body, response_time_ms, created_at
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, datetime('now', 'localtime'))`, [
+                log.model_id === undefined ? null : log.model_id,
                 log.request_method,
                 log.request_path,
                 log.request_headers,

package/dist/src/server/logger.js

@@ -3,6 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.logRequest = logRequest;
 const queries_1 = require("../db/queries");
 const crypto_1 = require("./crypto");
+/** Safe JSON.stringify that never throws; use for logging arbitrary response/request bodies. */
+function safeStringify(value) {
+    if (value === undefined)
+        return '';
+    if (value === null)
+        return 'null';
+    try {
+        return JSON.stringify(value);
+    }
+    catch {
+        try {
+            return String(value);
+        }
+        catch {
+            return '[Non-serializable]';
+        }
+    }
+}
 async function logRequest(request, response) {
     try {
         // Mask sensitive information
@@ -12,11 +30,11 @@ async function logRequest(request, response) {
             model_id: request.modelId,
             request_method: request.method,
             request_path: request.path,
-            request_headers: JSON.stringify(maskedHeaders),
-            request_query: JSON.stringify(request.query),
-            request_body: JSON.stringify(maskedBody),
+            request_headers: safeStringify(maskedHeaders),
+            request_query: safeStringify(request.query),
+            request_body: safeStringify(maskedBody),
             response_status: response.status,
-            response_body: JSON.stringify(response.body),
+            response_body: safeStringify(response.body),
             response_time_ms: response.responseTimeMs,
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-agent-router",
-  "version": "0.1.21",
+  "version": "0.2.0",
   "description": "A unified API gateway for managing multiple AI model providers (Anthropic, OpenAI, Gemini, etc.)",
   "main": "dist/src/cli/index.js",
   "bin": {
@@ -10,6 +10,7 @@
     "dev": "next dev -p 9527",
     "build": "next build && tsc",
     "start": "node dist/src/cli/index.js start",
+    "stop": "node dist/src/cli/index.js stop",
     "lint": "eslint .",
     "pub": "npm run build && npm publish",
     "type-check": "tsc --noEmit"

package/src/app/api/gateway/[...path]/route.ts

@@ -51,7 +51,7 @@ async function handleRequest(
   method: string
 ) {
   try {
-    getDatabase();
+    await getDatabase();
 
     const path = params.path.join('/');
     const searchParams = request.nextUrl.searchParams;

package/src/app/api/gateway/route.ts

@@ -19,7 +19,7 @@ async function handleGatewayRequestDirect(
   method: string
 ) {
   try {
-    getDatabase();
+    await getDatabase();
     const searchParams = request.nextUrl.searchParams;
     let modelId = searchParams.get('model') || searchParams.get('model_id');
     const providerName = searchParams.get('provider');

package/src/app/api/logs/route.ts

@@ -34,7 +34,7 @@ function cleanLogData(log: any) {
 
 export async function GET(request: NextRequest) {
   try {
-    getDatabase();
+    await getDatabase();
     const { searchParams } = new URL(request.url);
     const id = searchParams.get('id');
     const limit = parseInt(searchParams.get('limit') || '100');
@@ -79,7 +79,7 @@ export async function GET(request: NextRequest) {
 
 export async function DELETE(request: NextRequest) {
   try {
-    getDatabase();
+    await getDatabase();
     const { searchParams } = new URL(request.url);
     const ids = searchParams.get('ids');
     const clearAll = searchParams.get('clear_all') === 'true';

package/src/app/api/models/route.ts

@@ -16,7 +16,7 @@ export const runtime = 'nodejs';
 
 export async function GET(request: NextRequest) {
   try {
-    getDatabase();
+    await getDatabase();
     const { searchParams } = new URL(request.url);
     const providerId = searchParams.get('provider_id');
     const enabledOnly = searchParams.get('enabled');
@@ -47,7 +47,7 @@ export async function GET(request: NextRequest) {
 
 export async function POST(request: NextRequest) {
   try {
-    getDatabase();
+    await getDatabase();
     const body = await request.json();
     const { provider_id, name, model_id, enabled } = body;
 
@@ -77,7 +77,7 @@ export async function POST(request: NextRequest) {
 
 export async function PUT(request: NextRequest) {
   try {
-    getDatabase();
+    await getDatabase();
     const body = await request.json();
     const { id, name, model_id, enabled, provider_id } = body;
 
@@ -114,7 +114,7 @@ export async function PUT(request: NextRequest) {
 
 export async function DELETE(request: NextRequest) {
   try {
-    getDatabase();
+    await getDatabase();
     const { searchParams } = new URL(request.url);
     const id = searchParams.get('id');
 
@@ -146,7 +146,7 @@ export async function DELETE(request: NextRequest) {
 // Fetch models from provider
 export async function PATCH(request: NextRequest) {
   try {
-    getDatabase();
+    await getDatabase();
     const body = await request.json();
     const { provider_id } = body;
 

package/src/app/api/providers/route.ts

@@ -8,7 +8,7 @@ export const runtime = 'nodejs';
 
 export async function GET(request: NextRequest) {
   try {
-    getDatabase();
+    await getDatabase();
     const { searchParams } = new URL(request.url);
     const id = searchParams.get('id');
     const includeKey = searchParams.get('includeKey') === 'true';
@@ -48,7 +48,7 @@ export async function GET(request: NextRequest) {
 
 export async function POST(request: NextRequest) {
   try {
-    getDatabase();
+    await getDatabase();
     const body = await request.json();
     const { name, protocol, base_url, api_key } = body;
 
@@ -82,7 +82,7 @@ export async function POST(request: NextRequest) {
 
 export async function PUT(request: NextRequest) {
   try {
-    getDatabase();
+    await getDatabase();
     const body = await request.json();
     const { id, name, protocol, base_url, api_key } = body;
 
@@ -132,7 +132,7 @@ export async function PUT(request: NextRequest) {
 
 export async function DELETE(request: NextRequest) {
   try {
-    getDatabase();
+    await getDatabase();
     const { searchParams } = new URL(request.url);
     const id = searchParams.get('id');
 

package/src/app/api/providers/test/route.ts

@@ -9,7 +9,7 @@ export const runtime = 'nodejs';
 
 export async function POST(request: NextRequest) {
   try {
-    getDatabase();
+    await getDatabase();
     const body = await request.json();
     const { provider_id, model_id } = body;
 

package/src/app/api/service/start/route.ts

@@ -10,7 +10,7 @@ export const runtime = 'nodejs';
 export async function POST(request: NextRequest) {
   try {
     // Initialize database
-    getDatabase();
+    await getDatabase();
     
     const body = await request.json().catch(() => ({}));
     const port = body.port ? parseInt(body.port, 10) : null;

package/src/app/api/service/status/route.ts

@@ -8,7 +8,7 @@ export const runtime = 'nodejs';
 export async function GET(request: NextRequest) {
   try {
     // Initialize database
-    getDatabase();
+    await getDatabase();
     
     const status = await serviceManager.getStatus();
     return NextResponse.json(status);

package/src/app/api/service/stop/route.ts

@@ -8,7 +8,7 @@ export const runtime = 'nodejs';
 export async function POST(request: NextRequest) {
   try {
     // Initialize database
-    getDatabase();
+    await getDatabase();
     
     const result = await serviceManager.stop();
     

package/src/app/logs/page.tsx

@@ -7,9 +7,9 @@ import ConfirmDialog from '../components/ConfirmDialog';
 
 interface RequestLog {
   id: number;
-  model_id: number;
-  model_name?: string;
-  provider_name?: string;
+  model_id: number | null;
+  model_name?: string | null;
+  provider_name?: string | null;
   request_method: string;
   request_path: string;
   request_headers: string;
@@ -21,6 +21,17 @@ interface RequestLog {
   created_at: string;
 }
 
+/** 将服务端返回的 created_at 格式化为本地显示。无时区后缀时按 UTC 解析再转本地，避免差 8 小时。 */
+function formatCreatedAt(createdAt: string): string {
+  if (!createdAt || typeof createdAt !== 'string') return '';
+  const s = createdAt.trim();
+  if (!s) return '';
+  const hasTz = /[Z+-]\d{2}:?\d{2}$/.test(s);
+  const iso = hasTz ? s : s.replace(' ', 'T') + 'Z';
+  const date = new Date(iso);
+  return Number.isNaN(date.getTime()) ? s : date.toLocaleString('zh-CN');
+}
+
 export default function LogsPage() {
   const [logs, setLogs] = useState<RequestLog[]>([]);
   const [selectedLog, setSelectedLog] = useState<RequestLog | null>(null);
@@ -413,8 +424,7 @@ export default function LogsPage() {
                         </td>
                         <td className="px-4 py-3 whitespace-nowrap">
                           <div className="text-xs text-slate-600">
-                            {/* 使用本地时区显示时间 */}
-                            {new Date(log.created_at + 'Z').toLocaleString('zh-CN')}
+                            {formatCreatedAt(log.created_at)}
                           </div>
                         </td>
                         <td className="px-4 py-3 whitespace-nowrap">