fnva 0.0.21 → 0.0.23

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fnva",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "跨平台环境切换工具，支持 Java 和 LLM 环境配置",
   "author": "protagonistss",
   "license": "MIT",
@@ -48,4 +48,3 @@
     "node": ">=14.0.0"
   }
 }
-

package/scripts/check-permissions.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const path = require('path');
 
 /**
- * 检查platforms目录中二进制文件的权限
+ * 检查 platforms 目录中二进制文件的权限
  */
 function checkPermissions() {
   console.log('🔍 检查二进制文件权限...');
@@ -12,13 +12,14 @@ function checkPermissions() {
   const platformsDir = path.join(__dirname, '..', 'platforms');
 
   if (!fs.existsSync(platformsDir)) {
-    console.log('❌ platforms目录不存在');
+    console.log('❌ platforms 目录不存在');
     process.exit(1);
   }
 
   const platforms = fs.readdirSync(platformsDir);
   let allGood = true;
 
+  // 优先检查新的 platform-arch 目录结构
   for (const platform of platforms) {
     const platformDir = path.join(platformsDir, platform);
 
@@ -43,6 +44,22 @@ function checkPermissions() {
     }
   }
 
+  // 额外检查一次扁平结构: platforms/fnva
+  const flatBinaryName = process.platform === 'win32' ? 'fnva.exe' : 'fnva';
+  const flatBinaryPath = path.join(platformsDir, flatBinaryName);
+
+  if (fs.existsSync(flatBinaryPath)) {
+    const stats = fs.statSync(flatBinaryPath);
+    const hasExecPermission = (stats.mode & 0o111) !== 0;
+    const mode = stats.mode.toString(8).padStart(4, '0');
+
+    console.log(`   (legacy)/${flatBinaryName}: ${mode} ${hasExecPermission ? '✅' : '❌'}`);
+
+    if (!hasExecPermission && flatBinaryName !== 'fnva.exe') {
+      allGood = false;
+    }
+  }
+
   console.log(`\n${allGood ? '✅' : '❌'} 权限检查${allGood ? '通过' : '失败'}`);
 
   if (!allGood) {
@@ -56,4 +73,5 @@ if (require.main === module) {
   checkPermissions();
 }
 
-module.exports = { checkPermissions };
+module.exports = { checkPermissions };
+

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/ensure-executable-permissions.js

@@ -4,8 +4,8 @@ const fs = require('fs');
 const path = require('path');
 
 /**
- * 确保fnva二进制文件有可执行权限
- * 这是一个全面的postinstall脚本，处理本地安装和全局安装的权限问题
+ * 确保 fnva 二进制文件有可执行权限
+ * 这是一个全局的 postinstall 脚本，处理本地安装和全局安装的权限问题
  */
 function ensureExecutablePermissions() {
   try {
@@ -13,82 +13,92 @@ function ensureExecutablePermissions() {
     const projectRoot = path.resolve(scriptDir, '..');
     const platformsDir = path.join(projectRoot, 'platforms');
 
-    console.log('🔧 Ensuring fnva binary permissions...');
+    console.log('✅ Ensuring fnva binary permissions...');
 
-    // 如果没有platforms目录，说明是开发模式，不需要处理
+    // 如果没有 platforms 目录，说明是开发模式，不需要处理
     if (!fs.existsSync(platformsDir)) {
       console.log('ℹ️  No platforms directory found, skipping permission check');
       return;
     }
 
-    // 检测当前平台
     const platform = process.platform;
     const arch = process.arch === 'arm64' ? 'arm64' : 'x64';
     const platformDir = `${platform}-${arch}`;
 
-    // 确定二进制文件名和路径
     const binaryName = platform === 'win32' ? 'fnva.exe' : 'fnva';
-    const binaryPath = path.join(platformsDir, platformDir, binaryName);
+    const archBinaryPath = path.join(platformsDir, platformDir, binaryName);
+    const flatBinaryPath = path.join(platformsDir, binaryName);
 
-    // 如果二进制文件存在且不是Windows，设置可执行权限
-    if (fs.existsSync(binaryPath) && platform !== 'win32') {
+    /**
+     * 确保指定路径的二进制文件具有可执行权限，并做一次简单的运行测试
+     */
+    function ensureExecutable(binaryPath, label) {
       try {
         const stats = fs.statSync(binaryPath);
         const hasExecPermission = (stats.mode & 0o111) !== 0;
 
-        console.log(`📍 Checking binary: ${binaryPath}`);
+        console.log(`📍 Checking binary (${label}): ${binaryPath}`);
         console.log(`   Current permissions: ${(stats.mode & 0o777).toString(8)}`);
 
         if (!hasExecPermission) {
-          console.log(`🔧 Setting executable permissions...`);
+          console.log('🔧 Setting executable permissions...');
           fs.chmodSync(binaryPath, 0o755); // rwxr-xr-x
 
-          // 验证权限设置成功
           const newStats = fs.statSync(binaryPath);
           const newHasExecPermission = (newStats.mode & 0o111) !== 0;
 
           if (newHasExecPermission) {
-            console.log(`✅ Successfully set executable permissions (${platformDir})`);
+            console.log(`✅ Successfully set executable permissions (${label})`);
           } else {
-            console.log(`❌ Failed to set executable permissions (${platformDir})`);
+            console.log(`❌ Failed to set executable permissions (${label})`);
             console.log(`   New permissions: ${(newStats.mode & 0o777).toString(8)}`);
             console.log(`   Manual fix may be required: chmod +x "${binaryPath}"`);
           }
         } else {
-          console.log(`✅ fnva binary already has executable permissions (${platformDir})`);
+          console.log(`✅ fnva binary already has executable permissions (${label})`);
         }
 
-        // 尝试测试二进制文件是否可以执行（简单测试）
+        // 尝试执行一次 --version 做简单验证
         try {
           const { spawnSync } = require('child_process');
           const testResult = spawnSync(binaryPath, ['--version'], {
             encoding: 'utf8',
             timeout: 3000,
-            stdio: 'pipe'
+            stdio: 'pipe',
           });
 
-          if (testResult.status === 0 || testResult.status === 1) { // status 1 可能是正常的错误状态
-            console.log(`✅ fnva binary is executable and responding`);
+          if (testResult.status === 0 || testResult.status === 1) {
+            console.log('✅ fnva binary is executable and responding');
           } else if (testResult.error && testResult.error.code === 'EACCES') {
-            console.log(`❌ fnva binary still has permission issues`);
+            console.log('❌ fnva binary still has permission issues');
             console.log(`   Manual fix required: chmod +x "${binaryPath}"`);
           }
-        } catch (testError) {
-          // 测试失败不算严重错误，可能是因为二进制文件本身有问题
+        } catch {
+          // 测试失败不视为致命错误，可能是二进制本身的问题
         }
-
       } catch (error) {
-        console.warn(`⚠️  Could not fix binary permissions: ${error.message}`);
+        console.warn(`⚠️  Could not fix binary permissions (${label}): ${error.message}`);
         console.log(`   Manual fix required: chmod +x "${binaryPath}"`);
       }
-    } else if (platform === 'win32') {
-      console.log(`ℹ️  Windows platform detected, skipping permission check`);
+    }
+
+    // Windows 不需要 chmod，可直接跳过
+    if (platform === 'win32') {
+      console.log('ℹ️  Windows platform detected, skipping permission check');
+    } else if (fs.existsSync(archBinaryPath)) {
+      // 优先处理新的平台子目录结构: platforms/<platform>-<arch>/fnva
+      ensureExecutable(archBinaryPath, platformDir);
+    } else if (fs.existsSync(flatBinaryPath)) {
+      // 兼容旧版本扁平结构: platforms/fnva
+      console.log('ℹ️  Platform-specific binary not found, falling back to legacy flat layout');
+      ensureExecutable(flatBinaryPath, 'platforms/fnva');
     } else {
-      console.log(`❌ Binary not found: ${binaryPath}`);
-      console.log(`   This might indicate an incomplete installation`);
+      console.log(`❌ Binary not found: ${archBinaryPath}`);
+      console.log(`   Also checked legacy path: ${flatBinaryPath}`);
+      console.log('   This might indicate an incomplete installation');
     }
 
-    // 额外检查：如果是全局安装，也检查全局路径中的fnva
+    // 额外检查：如果是全局安装，也尝试检查路径上的 fnva 权限
     if (process.env.npm_config_global === 'true') {
       try {
         const { execSync } = require('child_process');
@@ -101,22 +111,21 @@ function ensureExecutablePermissions() {
           const globalHasExecPermission = (globalStats.mode & 0o111) !== 0;
 
           if (!globalHasExecPermission) {
-            console.log(`🔧 Global fnva binary lacks executable permissions`);
+            console.log('❌ Global fnva binary lacks executable permissions');
             console.log(`   Please run: sudo chmod +x "${globalFnvaPath}"`);
           } else {
-            console.log(`✅ Global fnva binary has correct permissions`);
+            console.log('✅ Global fnva binary has correct permissions');
           }
         }
-      } catch (globalError) {
-        // 无法检查全局安装，不视为错误
-        console.log(`ℹ️  Could not verify global installation`);
+      } catch {
+        console.log('ℹ️  Could not verify global installation');
       }
     }
-
   } catch (error) {
     console.warn(`⚠️  Permission check failed: ${error.message}`);
   }
 }
 
 // 运行权限检查
-ensureExecutablePermissions();
+ensureExecutablePermissions();
+

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 "✅ 格式化完成！"