fnva 0.0.22 → 0.0.24

package/README.md

@@ -487,7 +487,7 @@ description = "AnyCC 代理服务"
 # 仓库配置
 [repositories]
 java = [
-    "https://mirrors.aliyun.com/eclipse/temurin-compliance/temurin",
+    "https://mirrors.tuna.tsinghua.edu.cn/Adoptium",
     "https://api.adoptium.net/v3"
 ]
 maven = [
@@ -496,6 +496,8 @@ maven = [
 ]
 ```
 
+> Java downloads default to the Tsinghua Adoptium mirror (https://mirrors.tuna.tsinghua.edu.cn/Adoptium). For fully stable setups, manually maintain versions in ~/.fnva/config.toml [[java_environments]] and JAVA_HOME.
+
 ### 常用命令速查
 
 | 命令 | 功能 | 示例 |

package/bin/fnva.js

@@ -3,6 +3,7 @@
 const { spawnSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
+const EncodingUtils = require('../lib/encoding-utils');
 
 function resolvePlatform() {
   switch (process.platform) {
@@ -132,21 +133,18 @@ function removeAutoFlag(args) {
 function createTempScriptFile(script, envType, envName) {
   try {
     const os = require('os');
-    const fs = require('fs');
     const path = require('path');
 
-    const tempDir = os.tmpdir();
-    const scriptFile = path.join(tempDir, `fnva_${envType}_${envName}_${Date.now()}.ps1`);
-
-    fs.writeFileSync(scriptFile, script, 'utf8');
+    const prefix = `fnva_${envType}_${envName}`;
+    const scriptFile = EncodingUtils.createTempPowerShellScript(script, prefix);
 
     console.log('');
-    console.log('💡 环境已切换到当前进程。要在新的 PowerShell 窗口中使用此环境，运行：');
+    console.log('[INFO] 环境已切换到当前进程。要在新的 PowerShell 窗口中使用此环境，运行：');
     console.log(`   ${scriptFile}`);
     console.log('   或者: fnva', envType, 'use', envName, '--auto');
 
   } catch (error) {
-    console.warn('⚠️  无法创建临时脚本文件:', error.message);
+    console.warn('[WARN] 无法创建临时脚本文件:', error.message);
   }
 }
 
@@ -208,18 +206,18 @@ function applyEnvironmentVariables(envVars) {
 }
 
 function displaySuccessMessage(envType, envName, envVars) {
-  console.log(`✅ Switched to ${envType} environment: ${envName}`);
+  console.log(`[OK] Switched to ${envType} environment: ${envName}`);
 
   if (envVars.JAVA_HOME) {
-    console.log(`📁 JAVA_HOME: ${envVars.JAVA_HOME}`);
+    console.log(`[DIR] JAVA_HOME: ${envVars.JAVA_HOME}`);
   }
 
   if (envVars.ANTHROPIC_AUTH_TOKEN) {
-    console.log(`🔑 ANTHROPIC_AUTH_TOKEN: [已设置]`);
+    console.log(`[KEY] ANTHROPIC_AUTH_TOKEN: [已设置]`);
   }
 
   if (envVars.OPENAI_API_KEY) {
-    console.log(`🔑 OPENAI_API_KEY: [已设置]`);
+    console.log(`[KEY] OPENAI_API_KEY: [已设置]`);
   }
 }
 
@@ -227,7 +225,8 @@ function generateSimpleScript(envVars, envType, envName) {
   const lines = [];
 
   if (process.platform === 'win32') {
-    // Windows PowerShell
+    // Windows PowerShell - 使用编码工具设置
+    lines.push(EncodingUtils.generatePowerShellEncodingSetup());
     lines.push(`Write-Host "Switched to ${envType} environment: ${envName}" -ForegroundColor Green`);
 
     if (envVars.JAVA_HOME) {
@@ -381,6 +380,9 @@ function handleNodeOnlyMode(args) {
 }
 
 function run() {
+  // 设置Windows控制台编码
+  EncodingUtils.setWindowsConsoleEncoding();
+
   const binaryPath = buildBinaryPath();
 
   if (!binaryPath) {
@@ -432,11 +434,11 @@ function run() {
 
     if (result.error) {
       if (result.error.code === 'EACCES' && process.platform !== 'win32') {
-        console.error(`❌ Permission denied. The fnva binary is not executable.`);
-        console.error(`💡 To fix this, run: sudo chmod +x "${binaryPath}"`);
-        console.error(`   Or reinstall: npm install -g fnva --force`);
+        console.error(`[ERROR] Permission denied. The fnva binary is not executable.`);
+        console.error(`[INFO] To fix this, run: sudo chmod +x "${binaryPath}"`);
+        console.error(`[INFO] Or reinstall: npm install -g fnva --force`);
       } else {
-        console.error(`Failed to execute fnva: ${result.error.message}`);
+        console.error(`[ERROR] Failed to execute fnva: ${result.error.message}`);
       }
       process.exit(result.status ?? 1);
     }
@@ -456,16 +458,16 @@ function run() {
       // Windows：默认不启动新的会话；可通过 --session 开启旧行为
       if (process.platform === 'win32') {
         if (hasSessionFlag(args)) {
-          console.log(`✅ Switched to ${envType} environment: ${envName}`);
-          console.log(`🚀 Starting new PowerShell session with ${envName} environment...`);
+          console.log(`[OK] Switched to ${envType} environment: ${envName}`);
+          console.log(`[INFO] Starting new PowerShell session with ${envName} environment...`);
           console.log(`Type "exit" to return to previous session\n`);
 
           try {
             const os = require('os');
-            const fs = require('fs');
             const tempScript = os.tmpdir() + '\\fnva_env_' + Date.now() + '.ps1';
             const fullScript = script + '\n';
-            fs.writeFileSync(tempScript, fullScript, 'utf8');
+            // 使用编码工具写入文件
+            EncodingUtils.writeFileWithEncoding(tempScript, fullScript);
             const { spawn } = require('child_process');
             const ps = spawn('powershell', ['-NoExit', '-ExecutionPolicy', 'Bypass', '-File', tempScript], {
               stdio: 'inherit',
@@ -473,7 +475,7 @@ function run() {
             });
             ps.on('exit', () => {
               try { fs.unlinkSync(tempScript); } catch (_) {}
-              console.log('👋 Returned to original session');
+              console.log('[INFO] Returned to original session');
             });
             return;
           } catch (error) {
@@ -501,7 +503,8 @@ function run() {
 
               try {
                 const tempFile = path.join(os.tmpdir(), `fnva_auto_${Date.now()}.ps1`);
-                fs.writeFileSync(tempFile, simpleScript, 'utf8');
+                // 使用编码工具写入文件
+                EncodingUtils.writeFileWithEncoding(tempFile, simpleScript);
 
                 // 使用 PowerShell 执行脚本
                 spawn('powershell', ['-ExecutionPolicy', 'Bypass', '-File', tempFile], {
@@ -511,10 +514,10 @@ function run() {
                   try { fs.unlinkSync(tempFile); } catch (_) {}
                 });
 
-                console.log('✅ 环境已自动切换');
+                console.log('[OK] 环境已自动切换');
                 return;
               } catch (error) {
-                console.warn('⚠️  自动执行失败，回退到脚本输出');
+                console.warn('[WARN] 自动执行失败，回退到脚本输出');
               }
             }
 
@@ -524,9 +527,9 @@ function run() {
         }
       } else {
         // Unix-like systems: 显示使用说明
-        console.log(`✅ Switched to ${envType} environment: ${envName}`);
+        console.log(`[OK] Switched to ${envType} environment: ${envName}`);
         console.log('');
-        console.log('💡 To apply this environment, run:');
+        console.log('[INFO] To apply this environment, run:');
         console.log(`  node bin/fnva.js ${args.join(' ')} | bash`);
       }
     } else {
@@ -548,11 +551,11 @@ function run() {
 
     if (result.error) {
       if (result.error.code === 'EACCES' && process.platform !== 'win32') {
-        console.error(`❌ Permission denied. The fnva binary is not executable.`);
-        console.error(`💡 To fix this, run: sudo chmod +x "${binaryPath}"`);
-        console.error(`   Or reinstall: npm install -g fnva --force`);
+        console.error(`[ERROR] Permission denied. The fnva binary is not executable.`);
+        console.error(`[INFO] To fix this, run: sudo chmod +x "${binaryPath}"`);
+        console.error(`[INFO] Or reinstall: npm install -g fnva --force`);
       } else {
-        console.error(`Failed to execute fnva: ${result.error.message}`);
+        console.error(`[ERROR] Failed to execute fnva: ${result.error.message}`);
       }
       process.exit(result.status ?? 1);
     }

package/lib/encoding-utils.js

@@ -0,0 +1,152 @@
+/**
+ * 编码处理工具模块
+ * 用于统一处理跨平台字符编码问题
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * 编码处理工具类
+ */
+class EncodingUtils {
+  /**
+   * 设置Windows控制台编码为UTF-8
+   */
+  static setWindowsConsoleEncoding() {
+    if (process.platform === 'win32') {
+      try {
+        // 尝试设置控制台编码为UTF-8
+        const { execSync } = require('child_process');
+        execSync('chcp 65001 > nul 2>&1', { stdio: 'ignore' });
+
+        // 设置Node.js输出编码
+        if (process.stdout._handle && process.stdout._handle.setEncoding) {
+          process.stdout._handle.setEncoding('utf8');
+        }
+        if (process.stderr._handle && process.stderr._handle.setEncoding) {
+          process.stderr._handle.setEncoding('utf8');
+        }
+      } catch (error) {
+        // 静默忽略错误，避免影响正常功能
+      }
+    }
+  }
+
+  /**
+   * 为文件内容添加适当的编码标记
+   * @param {string} content - 文件内容
+   * @param {string} filePath - 文件路径（用于确定文件类型）
+   * @returns {string} - 处理后的内容
+   */
+  static addEncodingSignature(content, filePath) {
+    // 为Windows PowerShell脚本添加BOM
+    if (process.platform === 'win32' && this.isPowerShellScript(filePath)) {
+      return '\ufeff' + content;
+    }
+    return content;
+  }
+
+  /**
+   * 检查文件是否为PowerShell脚本
+   * @param {string} filePath - 文件路径
+   * @returns {boolean} - 是否为PowerShell脚本
+   */
+  static isPowerShellScript(filePath) {
+    const ext = path.extname(filePath).toLowerCase();
+    return ext === '.ps1';
+  }
+
+  /**
+   * 安全地写入文件，自动处理编码
+   * @param {string} filePath - 文件路径
+   * @param {string} content - 文件内容
+   * @param {string} encoding - 编码格式，默认为utf8
+   */
+  static writeFileWithEncoding(filePath, content, encoding = 'utf8') {
+    const processedContent = this.addEncodingSignature(content, filePath);
+    fs.writeFileSync(filePath, processedContent, encoding);
+  }
+
+  /**
+   * 生成PowerShell编码设置脚本
+   * @returns {string} - PowerShell编码设置代码
+   */
+  static generatePowerShellEncodingSetup() {
+    return [
+      '# 设置UTF-8编码以正确显示中文',
+      '[Console]::OutputEncoding = [System.Text.Encoding]::UTF8',
+      '$OutputEncoding = [System.Console]::OutputEncoding',
+      ''
+    ].join('\n');
+  }
+
+  /**
+   * 检测系统默认编码
+   * @returns {string} - 系统编码名称
+   */
+  static detectSystemEncoding() {
+    if (process.platform === 'win32') {
+      try {
+        const { execSync } = require('child_process');
+        const result = execSync('chcp', { encoding: 'utf8' });
+        const match = result.match(/活动代码页: (\d+)/);
+        return match ? `cp${match[1]}` : 'utf8';
+      } catch (e) {
+        return 'cp936'; // Windows中文默认编码
+      }
+    } else {
+      return 'utf8'; // Unix-like系统默认UTF-8
+    }
+  }
+
+  /**
+   * 创建临时PowerShell脚本文件
+   * @param {string} content - 脚本内容
+   * @param {string} prefix - 文件名前缀
+   * @returns {string} - 临时文件路径
+   */
+  static createTempPowerShellScript(content, prefix = 'fnva') {
+    const os = require('os');
+    const path = require('path');
+
+    const tempDir = os.tmpdir();
+    const timestamp = Date.now();
+    const scriptFile = path.join(tempDir, `${prefix}_${timestamp}.ps1`);
+
+    // 在脚本开头添加编码设置
+    const encodingSetup = this.generatePowerShellEncodingSetup();
+    const fullContent = encodingSetup + content;
+
+    this.writeFileWithEncoding(scriptFile, fullContent);
+
+    return scriptFile;
+  }
+
+  /**
+   * 安全地执行PowerShell脚本，确保编码正确
+   * @param {string} scriptPath - 脚本路径
+   * @param {Array} args - 传递给PowerShell的参数
+   * @param {Object} options - 执行选项
+   * @returns {Object} - 执行结果
+   */
+  static executePowerShellScript(scriptPath, args = [], options = {}) {
+    const { spawn } = require('child_process');
+
+    const defaultOptions = {
+      stdio: 'inherit',
+      shell: false,
+      ...options
+    };
+
+    const psArgs = [
+      '-ExecutionPolicy', 'Bypass',
+      '-File', scriptPath,
+      ...args
+    ];
+
+    return spawn('powershell', psArgs, defaultOptions);
+  }
+}
+
+module.exports = EncodingUtils;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fnva",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "跨平台环境切换工具，支持 Java 和 LLM 环境配置",
   "author": "protagonistss",
   "license": "MIT",
@@ -18,6 +18,7 @@
   },
   "files": [
     "bin/",
+    "lib/",
     "platforms/",
     "scripts/",
     "README.md",

package/scripts/check-style.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+
+# 代码风格检查脚本
+# 用于检查和格式化fnva项目的代码风格
+
+set -e
+
+echo "🔍 开始代码风格检查..."
+
+# 检查是否安装了必要的工具
+check_tool() {
+    if ! command -v $1 &> /dev/null; then
+        echo "❌ $1 未安装，请先安装 $1"
+        echo "安装命令: cargo install $1"
+        exit 1
+    fi
+}
+
+echo "📦 检查工具是否安装..."
+check_tool "rustfmt"
+check_tool "clippy"
+
+# 运行rustfmt格式化代码
+echo "🎨 格式化代码..."
+cargo fmt --all
+
+# 运行clippy检查
+echo "🔍 运行Clippy静态分析..."
+cargo clippy --all-targets --all-features -- -D warnings
+
+# 检查是否有未提交的格式化更改
+echo "📝 检查格式化结果..."
+if ! git diff --exit-code --quiet; then
+    echo "⚠️  代码格式化产生了更改，请提交这些更改"
+    echo "运行 'git add .' 和 'git commit' 来提交格式化结果"
+    exit 1
+fi
+
+# 检查文档注释
+echo "📚 检查文档注释..."
+cargo doc --no-deps --document-private-items 2>/dev/null | grep -E "(warning|error)" || true
+
+# 检查重复的代码
+echo "🔄 检查重复代码..."
+if command -v cargo-dup &> /dev/null; then
+    cargo dup
+else
+    echo "💡 提示: 安装 cargo-dup 可以检查重复代码 (cargo install cargo-dup)"
+fi
+
+# 检查依赖安全性
+echo "🔒 检查依赖安全性..."
+if command -v cargo-audit &> /dev/null; then
+    cargo audit
+else
+    echo "💡 提示: 安装 cargo-audit 可以检查依赖安全性 (cargo install cargo-audit)"
+fi
+
+# 检查未使用的依赖
+echo "🧹 检查未使用的依赖..."
+if command -v cargo-udeps &> /dev/null; then
+    cargo udeps --all-targets
+else
+    echo "💡 提示: 安装 cargo-udeps 可以检查未使用的依赖 (cargo install cargo-udeps)"
+fi
+
+# 统计代码行数
+echo "📊 代码统计:"
+echo "总Rust代码行数: $(find src -name '*.rs' -exec wc -l {} + | tail -1)"
+echo "测试代码行数: $(find tests -name '*.rs' -exec wc -l {} + 2>/dev/null | tail -1 || echo "0")"
+
+echo "✅ 代码风格检查完成！"

package/scripts/format-code.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# 代码格式化脚本
+# 自动格式化fnva项目的代码
+
+set -e
+
+echo "🎨 开始格式化代码..."
+
+# 格式化所有Rust代码
+cargo fmt --all
+
+# 检查格式化结果
+if git diff --exit-code --quiet; then
+    echo "✅ 代码已经是标准格式"
+else
+    echo "📝 代码已格式化，请查看更改:"
+    git diff --stat
+    echo ""
+    echo "💡 提示: 使用 'git add .' 和 'git commit' 提交格式化更改"
+fi
+
+echo "✅ 格式化完成！"