aicodeswitch 1.10.2 → 2.0.2

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### 2.0.2 (2026-01-27)
+
+### 2.0.1 (2026-01-27)
+
 ### 1.10.2 (2026-01-26)
 
 ### 1.10.1 (2026-01-25)

package/bin/cli.js

@@ -1,18 +1,16 @@
 #!/usr/bin/env node
 
-const path = require('path');
-
 const args = process.argv.slice(2);
 const command = args[0];
 
 const commands = {
-  start: () => require(path.join(__dirname, 'start')),
-  stop: () => require(path.join(__dirname, 'stop')),
-  restart: () => require(path.join(__dirname, 'restart')),
-  update: () => require(path.join(__dirname, 'update')),
-  restore: () => require(path.join(__dirname, 'restore')),
-  version: () => require(path.join(__dirname, 'version')),
-  ui: () => require(path.join(__dirname, 'ui')),
+  start: require('./start'),
+  stop: require('./stop'),
+  restart: require('./restart'),
+  update: require('./update'),
+  restore: require('./restore'),
+  version: require('./version'),
+  ui: require('./ui'),
 };
 
 if (!command || !commands[command]) {

package/bin/restart.js

@@ -1,232 +1,10 @@
-const { spawn } = require('child_process');
-const path = require('path');
-const fs = require('fs');
-const os = require('os');
-const chalk = require('chalk');
-const boxen = require('boxen');
-const ora = require('ora');
+// 重启服务器 - 依次执行 stop 和 start 命令
+// 这样可以复用 stop 和 start 命令中的所有逻辑
+const stop = require('./stop');
+const start = require('./start');
 
-const PID_FILE = path.join(os.homedir(), '.aicodeswitch', 'server.pid');
-const LOG_FILE = path.join(os.homedir(), '.aicodeswitch', 'server.log');
-
-// 确保目录存在
-const ensureDir = (filePath) => {
-  const dir = path.dirname(filePath);
-  if (!fs.existsSync(dir)) {
-    fs.mkdirSync(dir, { recursive: true });
-  }
-};
-
-const isServerRunning = () => {
-  if (!fs.existsSync(PID_FILE)) {
-    return false;
-  }
-
-  try {
-    const pid = parseInt(fs.readFileSync(PID_FILE, 'utf-8'), 10);
-    // 检查进程是否存在
-    process.kill(pid, 0);
-    return true;
-  } catch (err) {
-    // 进程不存在,删除过期的 PID 文件
-    fs.unlinkSync(PID_FILE);
-    return false;
-  }
-};
-
-const getServerInfo = () => {
-  // 尝试多个可能的配置文件位置
-  const possiblePaths = [
-    path.join(os.homedir(), '.aicodeswitch', '.env'),
-    path.join(os.homedir(), '.aicodeswitch', 'aicodeswitch.conf')
-  ];
-
-  let host = '127.0.0.1';
-  let port = 4567;
-
-  for (const dotenvPath of possiblePaths) {
-    if (fs.existsSync(dotenvPath)) {
-      const content = fs.readFileSync(dotenvPath, 'utf-8');
-      const hostMatch = content.match(/HOST=(.+)/);
-      const portMatch = content.match(/PORT=(.+)/);
-
-      if (hostMatch) host = hostMatch[1].trim();
-      if (portMatch) port = parseInt(portMatch[1].trim(), 10);
-      break;
-    }
-  }
-
-  return { host, port };
-};
-
-const stopServer = async () => {
-  if (!fs.existsSync(PID_FILE)) {
-    return true; // 服务未运行,视为停止成功
-  }
-
-  const spinner = ora({
-    text: chalk.cyan('Stopping server...'),
-    color: 'cyan'
-  }).start();
-
-  try {
-    const pid = parseInt(fs.readFileSync(PID_FILE, 'utf-8'), 10);
-
-    try {
-      process.kill(pid, 'SIGTERM');
-
-      // 等待进程停止
-      let attempts = 0;
-      const maxAttempts = 10;
-
-      await new Promise((resolve) => {
-        const checkStopped = setInterval(() => {
-          attempts++;
-          try {
-            process.kill(pid, 0);
-            if (attempts >= maxAttempts) {
-              clearInterval(checkStopped);
-              // 强制终止
-              try {
-                process.kill(pid, 'SIGKILL');
-              } catch (e) {
-                // 进程可能已经停止
-              }
-              resolve();
-            }
-          } catch (err) {
-            // 进程已停止
-            clearInterval(checkStopped);
-            resolve();
-          }
-        }, 200);
-      });
-
-      spinner.succeed(chalk.green('Server stopped'));
-      fs.unlinkSync(PID_FILE);
-      return true;
-    } catch (err) {
-      // 进程不存在
-      spinner.succeed(chalk.green('Server stopped'));
-      fs.unlinkSync(PID_FILE);
-      return true;
-    }
-  } catch (err) {
-    spinner.fail(chalk.red('Failed to stop server'));
-    return false;
-  }
-};
-
-const startServer = async () => {
-  const spinner = ora({
-    text: chalk.cyan('Starting server...'),
-    color: 'cyan'
-  }).start();
-
-  ensureDir(PID_FILE);
-  ensureDir(LOG_FILE);
-
-  // 找到 main.js 的路径
-  const serverPath = path.join(__dirname, '..', 'dist', 'server', 'main.js');
-
-  if (!fs.existsSync(serverPath)) {
-    spinner.fail(chalk.red('Server file not found!'));
-    console.log(chalk.yellow(`\nPlease run ${chalk.cyan('npm run build')} first.\n`));
-    return false;
-  }
-
-  // 启动服务器进程 - 完全分离
-  // 打开日志文件用于输出
-  const logFd = fs.openSync(LOG_FILE, 'a');
-
-  const serverProcess = spawn('node', [serverPath], {
-    detached: true,
-    stdio: ['ignore', logFd, logFd]  // 使用文件描述符
-  });
-
-  // 关闭文件描述符(子进程会保持打开)
-  fs.closeSync(logFd);
-
-  // 保存 PID
-  fs.writeFileSync(PID_FILE, serverProcess.pid.toString());
-
-  // 分离进程,让父进程可以退出
-  serverProcess.unref();
-
-  // 等待服务器启动
-  await new Promise(resolve => setTimeout(resolve, 2000));
-
-  // 检查服务器是否成功启动
-  if (fs.existsSync(PID_FILE)) {
-    try {
-      const pid = parseInt(fs.readFileSync(PID_FILE, 'utf-8'), 10);
-      process.kill(pid, 0);
-      spinner.succeed(chalk.green('Server started'));
-      return true;
-    } catch (err) {
-      spinner.fail(chalk.red('Failed to start server'));
-      return false;
-    }
-  } else {
-    spinner.fail(chalk.red('Failed to start server'));
-    return false;
-  }
-};
-
-const restart = async () => {
-  console.log('\n');
-
-  const wasRunning = isServerRunning();
-
-  if (wasRunning) {
-    console.log(chalk.cyan('🔄 Restarting AI Code Switch server...\n'));
-
-    // 停止服务器
-    const stopped = await stopServer();
-    if (!stopped) {
-      console.log(chalk.red('\nFailed to stop server. Restart aborted.\n'));
-      process.exit(1);
-    }
-
-    // 等待一下确保端口释放
-    await new Promise(resolve => setTimeout(resolve, 500));
-  } else {
-    console.log(chalk.cyan('Starting AI Code Switch server...\n'));
-  }
-
-  // 启动服务器
-  const started = await startServer();
-
-  if (!started) {
-    console.log(chalk.yellow(`\nCheck logs: ${chalk.cyan(LOG_FILE)}\n`));
-    process.exit(1);
-  }
-
-  const { host, port } = getServerInfo();
-  const url = `http://${host}:${port}`;
-
-  // 显示漂亮的启动信息
-  console.log(boxen(
-    chalk.green.bold('🚀 AI Code Switch Server\n\n') +
-    chalk.white('Status:  ') + chalk.green.bold('● Running\n') +
-    chalk.white('URL:     ') + chalk.cyan.bold(url) + '\n' +
-    chalk.white('Logs:    ') + chalk.gray(LOG_FILE) + '\n\n' +
-    chalk.gray('Server has been ' + (wasRunning ? 'restarted' : 'started') + ' successfully'),
-    {
-      padding: 1,
-      margin: 1,
-      borderStyle: 'double',
-      borderColor: 'green'
-    }
-  ));
-
-  console.log(chalk.cyan('💡 Tips:\n'));
-  console.log(chalk.white('  • Open browser: ') + chalk.cyan(url));
-  console.log(chalk.white('  • View logs:    ') + chalk.gray(`tail -f ${LOG_FILE}`));
-  console.log(chalk.white('  • Stop server:  ') + chalk.yellow('aicos stop'));
-  console.log('\n');
-
-  process.exit(0);
+const restart = () => {
+  stop({ silent: true, callback: () => start() });
 };
 
-module.exports = restart();
+module.exports = restart;

package/bin/restore.js

@@ -225,4 +225,4 @@ const restore = async () => {
   console.log('\n');
 };
 
-module.exports = restore();
+module.exports = restore;

package/bin/start.js

@@ -5,6 +5,8 @@ const os = require('os');
 const chalk = require('chalk');
 const boxen = require('boxen');
 const ora = require('ora');
+const { isServerRunning, getServerInfo } = require('./utils/get-server');
+const { findPidByPort } = require('./utils/port-utils');
 
 const PID_FILE = path.join(os.homedir(), '.aicodeswitch', 'server.pid');
 const LOG_FILE = path.join(os.homedir(), '.aicodeswitch', 'server.log');
@@ -17,71 +19,50 @@ const ensureDir = (filePath) => {
   }
 };
 
-const isServerRunning = () => {
-  if (!fs.existsSync(PID_FILE)) {
-    return false;
-  }
+const start = async (options = {}) => {
+  const { silent = false, noExit = false, callback } = options;
+  console.log('\n');
 
-  try {
-    const pid = parseInt(fs.readFileSync(PID_FILE, 'utf-8'), 10);
-    // 检查进程是否存在
-    process.kill(pid, 0);
-    return true;
-  } catch (err) {
-    // 进程不存在,删除过期的 PID 文件
-    fs.unlinkSync(PID_FILE);
-    return false;
-  }
-};
+  // 已经运行
+  const { host, port } = getServerInfo();
+  if (isServerRunning() || await findPidByPort(port)) {
+    if (!silent) {
+      if (!silent) {
+        console.log(boxen(
+          chalk.yellow.bold('⚠ Server is already running!\n\n') +
+          chalk.white(`URL: `) + chalk.cyan.bold(`http://${host}:${port}\n\n`) +
+          chalk.white('Use ') + chalk.cyan('aicos restart') + chalk.white(' to restart the server.\n'),
+          {
+            padding: 1,
+            margin: 1,
+            borderStyle: 'round',
+            borderColor: 'yellow'
+          }
+        ));
+        console.log('');
+      }
 
-const getServerInfo = () => {
-  // 尝试多个可能的配置文件位置
-  const possiblePaths = [
-    path.join(os.homedir(), '.aicodeswitch', '.env'),
-    path.join(os.homedir(), '.aicodeswitch', 'aicodeswitch.conf')
-  ];
-
-  let host = '127.0.0.1';
-  let port = 4567;
-
-  for (const dotenvPath of possiblePaths) {
-    if (fs.existsSync(dotenvPath)) {
-      const content = fs.readFileSync(dotenvPath, 'utf-8');
-      const hostMatch = content.match(/HOST=(.+)/);
-      const portMatch = content.match(/PORT=(.+)/);
-
-      if (hostMatch) host = hostMatch[1].trim();
-      if (portMatch) port = parseInt(portMatch[1].trim(), 10);
-      break;
+      if (callback) {
+        callback();
+      }
+
+      if (!noExit) {
+        process.exit(0);
+      }
+
+      return true;
     }
+    if (callback) callback();
+    if (!noExit) process.exit(0);
+    return true;
   }
 
-  return { host, port };
-};
-
-const start = async () => {
-  console.log('\n');
 
-  // 检查是否已经运行
-  if (isServerRunning()) {
-    const { host, port } = getServerInfo();
-    console.log(boxen(
-      chalk.yellow.bold('⚠ Server is already running!\n\n') +
-      chalk.white(`URL: `) + chalk.cyan.bold(`http://${host}:${port}`),
-      {
-        padding: 1,
-        margin: 1,
-        borderStyle: 'round',
-        borderColor: 'yellow'
-      }
-    ));
-    console.log('');
-    process.exit(0);
-  }
+  // 启动服务器
 
   const spinner = ora({
     text: chalk.cyan('Starting AI Code Switch server...'),
-    color: 'cyan'
+    color: 'cyan',
   }).start();
 
   ensureDir(PID_FILE);
@@ -93,7 +74,8 @@ const start = async () => {
   if (!fs.existsSync(serverPath)) {
     spinner.fail(chalk.red('Server file not found!'));
     console.log(chalk.yellow(`\nPlease run ${chalk.cyan('npm run build')} first.\n`));
-    process.exit(1);
+    if (!noExit) process.exit(1);
+    return false;
   }
 
   // 启动服务器进程 - 完全分离
@@ -122,45 +104,53 @@ const start = async () => {
     try {
       const pid = parseInt(fs.readFileSync(PID_FILE, 'utf-8'), 10);
       process.kill(pid, 0);
-      spinner.succeed(chalk.green('Server started successfully!'));
-
-      const { host, port } = getServerInfo();
-      const url = `http://${host}:${port}`;
-
-      // 显示漂亮的启动信息
-      console.log(boxen(
-        chalk.green.bold('🚀 AI Code Switch Server\n\n') +
-        chalk.white('Status:  ') + chalk.green.bold('● Running\n') +
-        chalk.white('URL:     ') + chalk.cyan.bold(url) + '\n' +
-        chalk.white('PID:     ') + chalk.yellow(pid) + '\n' +
-        chalk.white('Logs:    ') + chalk.gray(LOG_FILE) + '\n\n' +
-        chalk.gray('Open the URL in your browser to access the dashboard'),
-        {
-          padding: 1,
-          margin: 1,
-          borderStyle: 'double',
-          borderColor: 'green'
-        }
-      ));
-
-      console.log(chalk.cyan('💡 Tips:\n'));
-      console.log(chalk.white('  • Open browser: ') + chalk.cyan(url));
-      console.log(chalk.white('  • View logs:    ') + chalk.gray(`tail -f ${LOG_FILE}`));
-      console.log(chalk.white('  • Stop server:  ') + chalk.yellow('aicos stop'));
-      console.log('\n');
+      if (!silent) {
+        spinner.succeed(chalk.green('Server started successfully!'));
+
+        const { host, port } = getServerInfo();
+        const url = `http://${host}:${port}`;
+
+        // 显示漂亮的启动信息
+        console.log(boxen(
+          chalk.green.bold('🚀 AI Code Switch Server\n\n') +
+          chalk.white('Status:  ') + chalk.green.bold('● Running\n') +
+          chalk.white('URL:     ') + chalk.cyan.bold(url) + '\n' +
+          chalk.white('PID:     ') + chalk.yellow(pid) + '\n' +
+          chalk.white('Logs:    ') + chalk.gray(LOG_FILE) + '\n\n' +
+          chalk.gray('Open the URL in your browser to access the dashboard'),
+          {
+            padding: 1,
+            margin: 1,
+            borderStyle: 'double',
+            borderColor: 'green'
+          }
+        ));
+
+        console.log(chalk.cyan('💡 Tips:\n'));
+        console.log(chalk.white('  • Open browser: ') + chalk.cyan(url));
+        console.log(chalk.white('  • View logs:    ') + chalk.gray(`tail -f ${LOG_FILE}`));
+        console.log(chalk.white('  • Stop server:  ') + chalk.yellow('aicos stop'));
+        console.log('\n');
+      }
 
+      // (callback)
+      if (callback) callback();
       // 立即退出,返回控制台
-      process.exit(0);
+      if (!noExit) process.exit(0);
+      return true;
     } catch (err) {
       spinner.fail(chalk.red('Failed to start server!'));
       console.log(chalk.yellow(`\nCheck logs: ${chalk.cyan(LOG_FILE)}\n`));
-      process.exit(1);
+      if (!noExit) process.exit(1);
+      return false;
     }
   } else {
     spinner.fail(chalk.red('Failed to start server!'));
     console.log(chalk.yellow(`\nCheck logs: ${chalk.cyan(LOG_FILE)}\n`));
-    process.exit(1);
+    if (!noExit) process.exit(1);
+    return false;
   }
 };
 
-module.exports = start();
+// 导出辅助函数供其他模块使用
+module.exports = start;

package/bin/stop.js

@@ -4,73 +4,102 @@ const os = require('os');
 const chalk = require('chalk');
 const boxen = require('boxen');
 const ora = require('ora');
+const { findPidByPort, killProcess, getProcessInfo } = require('./utils/port-utils');
+const { getServerInfo } = require('./utils/get-server');
 
 const PID_FILE = path.join(os.homedir(), '.aicodeswitch', 'server.pid');
 
-const stop = () => {
+const stop = async (options = {}) => {
+  const { callback, silent } = options;
+
   console.log('\n');
 
-  if (!fs.existsSync(PID_FILE)) {
-    console.log(boxen(
-      chalk.yellow.bold('⚠ Server is not running'),
-      {
-        padding: 1,
-        margin: 1,
-        borderStyle: 'round',
-        borderColor: 'yellow'
-      }
-    ));
-    console.log('\n');
-    return;
-  }
+  const spinner = ora({ text: chalk.cyan('Stopping server...'), color: 'cyan' }).start();
 
-  const spinner = ora({
-    text: chalk.cyan('Stopping server...'),
-    color: 'cyan'
-  }).start();
+  // 第一步：如果 PID 文件存在，优先通过 PID 文件停止服务器
+  if (fs.existsSync(PID_FILE)) {
+    try {
+      const pid = parseInt(fs.readFileSync(PID_FILE, 'utf-8'), 10);
 
-  try {
-    const pid = parseInt(fs.readFileSync(PID_FILE, 'utf-8'), 10);
+      const processInfo = await getProcessInfo(pid);
+      if (!silent) {
+        console.log('\n' + chalk.gray(`Process found: ${chalk.white(pid)} (${chalk.gray(processInfo)})`));
+      }
 
-    // 尝试终止进程
-    try {
+      // 尝试终止进程
       process.kill(pid, 'SIGTERM');
 
       // 等待进程停止
       let attempts = 0;
       const maxAttempts = 10;
 
-      const checkStopped = setInterval(() => {
-        attempts++;
-        try {
-          process.kill(pid, 0);
-          if (attempts >= maxAttempts) {
+      await new Promise((resolve) => {
+        const checkStopped = setInterval(() => {
+          attempts++;
+          try {
+            process.kill(pid, 0);
+            if (attempts >= maxAttempts) {
+              clearInterval(checkStopped);
+              // 强制终止
+              process.kill(pid, 'SIGKILL');
+              spinner.warn(chalk.yellow(`PID ${pid} forcefully killed!`));
+              fs.unlinkSync(PID_FILE);
+              resolve();
+            }
+          } catch (err) {
+            spinner.succeed(chalk.green(`PID ${pid} killed!`));
+            // 进程已停止
             clearInterval(checkStopped);
-            // 强制终止
-            process.kill(pid, 'SIGKILL');
-            spinner.warn(chalk.yellow('Server forcefully stopped'));
             fs.unlinkSync(PID_FILE);
-            showStoppedMessage();
+            resolve();
           }
-        } catch (err) {
-          // 进程已停止
-          clearInterval(checkStopped);
-          spinner.succeed(chalk.green('Server stopped successfully'));
-          fs.unlinkSync(PID_FILE);
-          showStoppedMessage();
-        }
-      }, 200);
-
-    } catch (err) {
+        }, 200);
+      });
+    }
+    catch (err) {
       // 进程不存在
-      spinner.warn(chalk.yellow('Process not found'));
+      if (err.code === 'ESRCH') {
+          spinner.warn(chalk.yellow(`PID ${pid} not found!`));
+      }
+      else {
+        spinner.fail(chalk.red(`\nError: ${err.message}\n`));
+      }
       fs.unlinkSync(PID_FILE);
+    }
+  }
+
+  // 第二步：如果 PID 文件不存在，通过端口检测进程并停止
+  const { port } = getServerInfo();
+  spinner.text = chalk.yellow(`⚠ Checking port... (port: ${port})`);
+  const pid = await findPidByPort(port);
+  if (pid) {
+    spinner.text = chalk.cyan(`Found process on port ${port}, stopping...`);
+
+    const processInfo = await getProcessInfo(pid);
+    if (!silent) {
+      console.log('\n' + chalk.gray(`Process found: ${chalk.white(pid)} (${chalk.gray(processInfo)})`));
+    }
+
+    const killed = await killProcess(pid);
+    if (killed) {
+      spinner.succeed(chalk.green(`Process ${pid} terminated successfully`));
+      if (!silent) {
+        showStoppedMessage();
+      }
+    }
+    else {
+      spinner.fail(chalk.red('Failed to terminate process'));
+    }
+  }
+  else {
+    spinner.info(chalk.yellow(`No process found on port ${port}`));
+    if (!silent) {
       showStoppedMessage();
     }
-  } catch (err) {
-    spinner.fail(chalk.red('Failed to stop server'));
-    console.log(chalk.red(`\nError: ${err.message}\n`));
   }
+
+  // 第三步：(callback)
+  callback && callback();
 };
 
 const showStoppedMessage = () => {
@@ -87,4 +116,4 @@ const showStoppedMessage = () => {
   console.log(chalk.white('Use ') + chalk.cyan('aicos start') + chalk.white(' to start the server again.\n'));
 };
 
-module.exports = stop();
+module.exports = stop;