aicodeswitch 1.2.5 → 1.2.6

package/bin/update.js

@@ -1,73 +1,35 @@
+const { spawn } = require('child_process');
+const https = require('https');
 const path = require('path');
 const fs = require('fs');
 const os = require('os');
-const https = require('https');
-const http = require('http');
-const { spawn } = require('child_process');
 const chalk = require('chalk');
-const ora = require('ora');
 const boxen = require('boxen');
-const tar = require('tar');
+const ora = require('ora');
 
-const AICOSWITCH_DIR = path.join(os.homedir(), '.aicodeswitch');
-const RELEASES_DIR = path.join(AICOSWITCH_DIR, 'releases');
-const CURRENT_FILE = path.join(AICOSWITCH_DIR, 'current');
 const PACKAGE_NAME = 'aicodeswitch';
+const NPM_REGISTRY = 'registry.npmjs.org';
 
-// 确保目录存在
-const ensureDir = (dirPath) => {
-  if (!fs.existsSync(dirPath)) {
-    fs.mkdirSync(dirPath, { recursive: true });
-  }
-};
-
-// 获取当前使用的版本（从 current 文件或本地 package.json）
+// 获取当前版本
 const getCurrentVersion = () => {
-  // 先检查是否有 current 文件（更新的版本）
-  if (fs.existsSync(CURRENT_FILE)) {
-    try {
-      const currentPath = fs.readFileSync(CURRENT_FILE, 'utf-8').trim();
-      const currentPackageJson = path.join(currentPath, 'package.json');
-      if (fs.existsSync(currentPackageJson)) {
-        const pkg = JSON.parse(fs.readFileSync(currentPackageJson, 'utf-8'));
-        return pkg.version;
-      }
-    } catch (err) {
-      // 读取失败，fallback 到本地版本
-    }
-  }
-
-  // 使用本地 package.json
+  const packageJsonPath = path.join(__dirname, '..', 'package.json');
   try {
-    const packageJson = path.join(__dirname, '..', 'package.json');
-    const pkg = JSON.parse(fs.readFileSync(packageJson, 'utf-8'));
-    return pkg.version;
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
+    return packageJson.version;
   } catch (err) {
-    return '0.0.0';
+    return null;
   }
 };
 
-// 比较版本号
-const compareVersions = (v1, v2) => {
-  const parts1 = v1.split('.').map(Number);
-  const parts2 = v2.split('.').map(Number);
-
-  for (let i = 0; i < 3; i++) {
-    if (parts1[i] > parts2[i]) return 1;
-    if (parts1[i] < parts2[i]) return -1;
-  }
-  return 0;
-};
-
-// 从 npm registry 获取最新版本
+// 从 npm 获取最新版本
 const getLatestVersion = () => {
   return new Promise((resolve, reject) => {
     const options = {
-      hostname: 'registry.npmjs.org',
+      hostname: NPM_REGISTRY,
       path: `/${PACKAGE_NAME}`,
       method: 'GET',
       headers: {
-        'User-Agent': 'aicodeswitch'
+        'User-Agent': 'aicodeswitch-update'
       }
     };
 
@@ -81,164 +43,126 @@ const getLatestVersion = () => {
       res.on('end', () => {
         try {
           const packageInfo = JSON.parse(data);
-          const latestVersion = packageInfo['dist-tags'].latest;
-          resolve({
-            version: latestVersion,
-            tarball: packageInfo.versions[latestVersion].dist.tarball
-          });
+          resolve(packageInfo['dist-tags'].latest);
         } catch (err) {
-          reject(new Error('Failed to parse package info from npm'));
+          reject(new Error('Failed to parse npm response'));
         }
       });
     });
 
-    req.on('error', reject);
-    req.end();
-  });
-};
-
-// 下载 tarball 文件
-const downloadTarball = (url, destPath) => {
-  return new Promise((resolve, reject) => {
-    const urlObj = new URL(url);
-    const protocol = urlObj.protocol === 'http:' ? http : https;
-
-    const requestOptions = {
-      hostname: urlObj.hostname,
-      port: urlObj.port,
-      path: urlObj.pathname + urlObj.search,
-      method: 'GET',
-      headers: {
-        'User-Agent': 'aicodeswitch'
-      }
-    };
-
-    const req = protocol.request(requestOptions, (res) => {
-      if (res.statusCode !== 200) {
-        reject(new Error(`Failed to download: HTTP ${res.statusCode}`));
-        return;
-      }
-
-      const fileStream = fs.createWriteStream(destPath);
-      res.pipe(fileStream);
-
-      fileStream.on('finish', () => {
-        fileStream.close();
-        resolve(destPath);
-      });
-
-      fileStream.on('error', (err) => {
-        fs.unlink(destPath, () => {});
-        reject(err);
-      });
-    });
-
     req.on('error', (err) => {
-      if (fs.existsSync(destPath)) {
-        fs.unlink(destPath, () => {});
-      }
       reject(err);
     });
 
-    req.setTimeout(60000, () => {
+    req.setTimeout(10000, () => {
       req.destroy();
-      if (fs.existsSync(destPath)) {
-        fs.unlink(destPath, () => {});
-      }
-      reject(new Error('Download timeout'));
+      reject(new Error('Request timeout'));
     });
 
     req.end();
   });
 };
 
-// 解压 tarball 到指定目录
-const extractTarball = (tarballPath, destDir) => {
-  return tar.x({
-    file: tarballPath,
-    cwd: destDir,
-    strip: 1, // 去掉 package 目录层级
-  });
-};
-
-// 安装 npm 依赖
-const installDependencies = (dir) => {
+// 执行命令
+const execCommand = (command, args, options = {}) => {
   return new Promise((resolve, reject) => {
-    console.log(chalk.cyan('Installing dependencies...'));
-
-    const installProcess = spawn('npm', ['install', '--production'], {
-      cwd: dir,
-      stdio: 'inherit'
+    const proc = spawn(command, args, {
+      stdio: options.silent ? 'pipe' : 'inherit',
+      ...options
     });
 
-    installProcess.on('close', (code) => {
+    let output = '';
+    let errorOutput = '';
+
+    if (options.silent) {
+      proc.stdout.on('data', (data) => {
+        output += data.toString();
+      });
+      proc.stderr.on('data', (data) => {
+        errorOutput += data.toString();
+      });
+    }
+
+    proc.on('close', (code) => {
       if (code === 0) {
-        console.log(chalk.green('Dependencies installed successfully'));
-        resolve();
+        resolve({ output, errorOutput });
       } else {
-        reject(new Error(`npm install failed with exit code ${code}`));
+        reject({ code, output, errorOutput });
       }
     });
 
-    installProcess.on('error', reject);
+    proc.on('error', (err) => {
+      reject(err);
+    });
   });
 };
 
-// 更新 current 文件
-const updateCurrentFile = (versionPath) => {
-  fs.writeFileSync(CURRENT_FILE, versionPath);
-};
+// 检查是否需要 sudo 权限
+const needsSudo = () => {
+  const npmPrefix = process.env.npm_config_prefix || '/usr/local';
+  const globalInstallPath = path.join(npmPrefix, 'lib', 'node_modules');
+  const aicosPath = path.join(globalInstallPath, PACKAGE_NAME);
 
-// 执行 restart
-const restart = () => {
-  return new Promise((resolve, reject) => {
-    const restartScript = path.join(__dirname, 'restart.js');
+  // 如果全局安装路径存在且不可写，可能需要 sudo
+  if (fs.existsSync(globalInstallPath)) {
+    try {
+      fs.accessSync(globalInstallPath, fs.constants.W_OK);
+      return false;
+    } catch (err) {
+      return true;
+    }
+  }
 
-    const restartProcess = spawn('node', [restartScript], {
-      stdio: 'inherit'
-    });
+  // 检查当前 aicos 安装位置
+  const currentLink = path.join(__dirname, 'cli.js');
+  const realPath = fs.realpathSync(currentLink);
 
-    restartProcess.on('close', (code) => {
-      if (code === 0) {
-        resolve();
-      } else {
-        reject(new Error(`Restart failed with exit code ${code}`));
-      }
-    });
+  // 如果在全局目录下，需要检查权限
+  if (realPath.includes('/usr/local/') || realPath.includes('/usr/lib/')) {
+    try {
+      fs.accessSync(path.dirname(realPath), fs.constants.W_OK);
+      return false;
+    } catch (err) {
+      return true;
+    }
+  }
 
-    restartProcess.on('error', reject);
-  });
+  return false;
 };
 
-// 清理旧版本的下载文件（保留最近 3 个版本）
-const cleanupOldVersions = () => {
+// 停止服务器
+const stopServer = async () => {
+  const stopPath = path.join(__dirname, 'stop.js');
   try {
-    if (!fs.existsSync(RELEASES_DIR)) {
-      return;
-    }
-
-    const versions = fs.readdirSync(RELEASES_DIR)
-      .filter(item => {
-        const itemPath = path.join(RELEASES_DIR, item);
-        return fs.statSync(itemPath).isDirectory();
-      })
-      .sort((a, b) => {
-        // 按版本号降序排序
-        return compareVersions(b, a);
-      });
+    await execCommand('node', [stopPath], { silent: true });
+    return true;
+  } catch (err) {
+    // 停止失败可能是因为服务未运行，这不是致命错误
+    return false;
+  }
+};
 
-    // 保留最近 3 个版本，删除其他版本
-    if (versions.length > 3) {
-      const versionsToDelete = versions.slice(3);
-      versionsToDelete.forEach(version => {
-        const versionPath = path.join(RELEASES_DIR, version);
-        fs.rmSync(versionPath, { recursive: true, force: true });
-      });
-    }
+// 启动服务器
+const startServer = async () => {
+  const startPath = path.join(__dirname, 'start.js');
+  try {
+    await execCommand('node', [startPath], { silent: true });
+    return true;
   } catch (err) {
-    // 清理失败不影响更新流程
-    console.error(chalk.yellow(`Warning: Failed to cleanup old versions: ${err.message}`));
+    return false;
+  }
+};
+
+// 比较版本号
+const compareVersions = (v1, v2) => {
+  const parts1 = v1.split('.').map(Number);
+  const parts2 = v2.split('.').map(Number);
+
+  for (let i = 0; i < 3; i++) {
+    if (parts1[i] > parts2[i]) return 1;
+    if (parts1[i] < parts2[i]) return -1;
   }
+  return 0;
 };
 
 // 主更新逻辑
@@ -246,125 +170,147 @@ const update = async () => {
   console.log('\n');
 
   const currentVersion = getCurrentVersion();
-  const spinner = ora({
+  if (!currentVersion) {
+    console.log(boxen(
+      chalk.red.bold('✗ Failed to read current version\n\n') +
+      chalk.white('Please reinstall the package.'),
+      {
+        padding: 1,
+        margin: 1,
+        borderStyle: 'round',
+        borderColor: 'red'
+      }
+    ));
+    console.log('');
+    process.exit(1);
+  }
+
+  // 显示当前版本
+  console.log(chalk.cyan('📦 Current Version: ') + chalk.white.bold(currentVersion));
+  console.log('');
+
+  // 检查最新版本
+  const checkSpinner = ora({
     text: chalk.cyan('Checking for updates...'),
-    color: 'cyan'
+    color: 'cyan',
+    hideCursor: false
   }).start();
 
+  let latestVersion;
   try {
-    // 获取最新版本信息
-    const latestInfo = await getLatestVersion();
-    const latestVersion = latestInfo.version;
-
-    spinner.succeed(chalk.green(`Latest version: ${chalk.bold(latestVersion)}`));
-
-    // 检查是否需要更新
-    const comparison = compareVersions(latestVersion, currentVersion);
-
-    if (comparison <= 0) {
-      console.log(chalk.yellow(`\n✓ You are already on the latest version (${chalk.bold(currentVersion)})\n`));
-      process.exit(0);
-    }
-
-    console.log(chalk.cyan(`\n📦 Update available: ${chalk.bold(currentVersion)} → ${chalk.bold(latestVersion)}\n`));
-
-    // 确保目录存在
-    ensureDir(RELEASES_DIR);
-
-    // 创建版本目录
-    const versionDir = path.join(RELEASES_DIR, latestVersion);
-    ensureDir(versionDir);
-
-    // 下载 tarball
-    const downloadSpinner = ora({
-      text: chalk.cyan('Downloading from npm...'),
-      color: 'cyan'
-    }).start();
-
-    const tarballPath = path.join(versionDir, 'package.tgz');
-
-    try {
-      await downloadTarball(latestInfo.tarball, tarballPath);
-      downloadSpinner.succeed(chalk.green('Download completed'));
-    } catch (err) {
-      downloadSpinner.fail(chalk.red('Download failed'));
-      console.log(chalk.red(`Error: ${err.message}\n`));
-      process.exit(1);
-    }
-
-    // 解压 tarball
-    const extractSpinner = ora({
-      text: chalk.cyan('Extracting package...'),
-      color: 'cyan'
-    }).start();
-
-    try {
-      await extractTarball(tarballPath, versionDir);
-      extractSpinner.succeed(chalk.green('Package extracted'));
-    } catch (err) {
-      extractSpinner.fail(chalk.red('Extraction failed'));
-      console.log(chalk.red(`Error: ${err.message}\n`));
-      process.exit(1);
-    } finally {
-      // 删除 tarball 文件
-      if (fs.existsSync(tarballPath)) {
-        fs.unlinkSync(tarballPath);
-      }
-    }
-
-    // 安装依赖
-    const installSpinner = ora({
-      text: chalk.cyan('Installing dependencies...'),
-      color: 'cyan'
-    }).start();
-
-    try {
-      await installDependencies(versionDir);
-      installSpinner.succeed(chalk.green('Dependencies installed'));
-    } catch (err) {
-      installSpinner.fail(chalk.red('Dependencies installation failed'));
-      console.log(chalk.red(`Error: ${err.message}\n`));
-      process.exit(1);
-    }
+    latestVersion = await getLatestVersion();
+    checkSpinner.succeed(chalk.green('Checked for updates'));
+  } catch (err) {
+    checkSpinner.fail(chalk.red('Failed to check for updates'));
+    console.log(chalk.yellow(`\nError: ${err.message}\n`));
+    console.log(chalk.white('You can manually update by running:\n'));
+    console.log(chalk.cyan('  npm update -g aicodeswitch\n'));
+    process.exit(1);
+  }
 
-    // 更新 current 文件
-    updateCurrentFile(versionDir);
+  console.log(chalk.cyan('📦 Latest Version:  ') + chalk.white.bold(latestVersion));
+  console.log('');
 
-    // 清理旧版本
-    cleanupOldVersions();
+  // 比较版本
+  const versionCompare = compareVersions(latestVersion, currentVersion);
 
-    // 显示更新成功信息
+  if (versionCompare <= 0) {
     console.log(boxen(
-      chalk.green.bold('✨ Update Successful!\n\n') +
-      chalk.white('Version:  ') + chalk.cyan.bold(latestVersion) + '\n' +
-      chalk.white('Location: ') + chalk.gray(versionDir) + '\n\n' +
-      chalk.gray('Restarting server with the new version...'),
+      chalk.green.bold('✓ You are already using the latest version!\n\n') +
+      chalk.white(`Current version: ${chalk.cyan.bold(currentVersion)}\n`) +
+      chalk.white(`Latest version:  ${chalk.cyan.bold(latestVersion)}`),
       {
         padding: 1,
         margin: 1,
-        borderStyle: 'double',
+        borderStyle: 'round',
         borderColor: 'green'
       }
     ));
+    console.log('');
+    process.exit(0);
+  }
 
-    // 重启服务器
-    try {
-      await restart();
-    } catch (err) {
-      console.log(chalk.yellow(`\n⚠️  Update completed, but restart failed: ${err.message}`));
-      console.log(chalk.cyan('Please manually run: ') + chalk.yellow('aicos restart\n'));
-      process.exit(1);
+  // 有新版本可用
+  console.log(boxen(
+    chalk.yellow.bold('⬆️  New version available!\n\n') +
+    chalk.white('Current: ') + chalk.gray(currentVersion) + '\n' +
+    chalk.white('Latest:  ') + chalk.green.bold(latestVersion) + '\n\n' +
+    chalk.gray('Preparing to update...'),
+    {
+      padding: 1,
+      margin: 1,
+      borderStyle: 'round',
+      borderColor: 'yellow'
     }
+  ));
+  console.log('');
+
+  // 检查是否需要 sudo
+  const needSudo = needsSudo();
+  if (needSudo) {
+    console.log(chalk.yellow.bold('⚠️  Note: '));
+    console.log(chalk.white('This operation may require ') + chalk.yellow.bold('sudo') + chalk.white(' privileges.'));
+    console.log(chalk.gray('If prompted, please enter your password.\n'));
+  }
 
-    process.exit(0);
+  // 停止服务器
+  const stopSpinner = ora({
+    text: chalk.cyan('Stopping server...'),
+    color: 'cyan'
+  }).start();
+
+  await stopServer();
+  stopSpinner.succeed(chalk.green('Server stopped'));
 
+  // 执行更新
+  const updateSpinner = ora({
+    text: chalk.cyan('Updating to latest version...'),
+    color: 'cyan'
+  }).start();
+
+  try {
+    const npmArgs = ['install', '-g', `${PACKAGE_NAME}@latest`];
+    if (needSudo) {
+      npmArgs.unshift('sudo');
+    }
+
+    await execCommand(needSudo ? 'sudo' : 'npm', npmArgs);
+    updateSpinner.succeed(chalk.green('Update successful!'));
   } catch (err) {
-    spinner.fail(chalk.red('Update check failed'));
-    console.log(chalk.red(`Error: ${err.message}\n`));
-    console.log(chalk.gray('You can check for updates manually at:\n'));
-    console.log(chalk.cyan('  https://www.npmjs.com/package/aicodeswitch\n'));
+    updateSpinner.fail(chalk.red('Update failed'));
+    console.log(chalk.yellow(`\nUpdate failed with error code ${err.code || 'unknown'}\n`));
+    console.log(chalk.white('You can try manually updating:\n'));
+    console.log(chalk.cyan(`  ${needSudo ? 'sudo ' : ''}npm install -g ${PACKAGE_NAME}@latest\n`));
+
+    // 尝试重新启动服务器
+    console.log(chalk.yellow('Attempting to restart server...\n'));
+    await startServer();
     process.exit(1);
   }
+
+  console.log('');
+  console.log(boxen(
+    chalk.green.bold('✓ Successfully updated!\n\n') +
+    chalk.white('Previous version: ') + chalk.gray(currentVersion) + '\n' +
+    chalk.white('New version:     ') + chalk.green.bold(latestVersion) + '\n\n' +
+    chalk.gray('Starting server...'),
+    {
+      padding: 1,
+      margin: 1,
+      borderStyle: 'double',
+      borderColor: 'green'
+    }
+  ));
+  console.log('');
+
+  // 启动服务器
+  await startServer();
+
+  console.log('');
+  console.log(chalk.cyan('💡 Tips:\n'));
+  console.log(chalk.white('  • Check version: ') + chalk.cyan('aicos version'));
+  console.log(chalk.white('  • View logs:     ') + chalk.gray('tail -f ~/.aicodeswitch/server.log'));
+  console.log('\n');
 };
 
 module.exports = update();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aicodeswitch",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "A tool to help you manage AI programming tools to access large language models locally. It allows your Claude Code, Codex and other tools to no longer be limited to official models.",
   "author": "tangshuang",
   "license": "MIT",
@@ -55,8 +55,7 @@
     "express": "^4.18.2",
     "jsonwebtoken": "^9.0.3",
     "level": "^8.0.0",
-    "ora": "^5.4.1",
-    "tar": "^7.4.3"
+    "ora": "^5.4.1"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.9",