fnva 0.0.27 → 0.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fnva",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "description": "跨平台环境切换工具，支持 Java 和 LLM 环境配置",
   "author": "protagonistss",
   "license": "MIT",

package/scripts/ensure-executable-permissions.js

@@ -2,130 +2,81 @@
 
 const fs = require('fs');
 const path = require('path');
+const { spawnSync } = require('child_process');
 
-/**
- * 确保 fnva 二进制文件有可执行权限
- * 这是一个全局的 postinstall 脚本，处理本地安装和全局安装的权限问题
- */
-function ensureExecutablePermissions() {
-  try {
-    const scriptDir = __dirname;
-    const projectRoot = path.resolve(scriptDir, '..');
-    const platformsDir = path.join(projectRoot, 'platforms');
-
-    console.log('✅ Ensuring fnva binary permissions...');
+function log(msg) {
+  console.log(msg);
+}
 
-    // 如果没有 platforms 目录，说明是开发模式，不需要处理
-    if (!fs.existsSync(platformsDir)) {
-      console.log('ℹ️  No platforms directory found, skipping permission check');
-      return;
+function ensureExecutable(filePath, label) {
+  try {
+    const stats = fs.statSync(filePath);
+    const hasExec = (stats.mode & 0o111) !== 0;
+    log(`Checking ${label}: ${filePath}`);
+    log(`   Current permissions: ${(stats.mode & 0o777).toString(8)}`);
+
+    if (!hasExec) {
+      fs.chmodSync(filePath, 0o755);
+      const newStats = fs.statSync(filePath);
+      log(`   Updated permissions: ${(newStats.mode & 0o777).toString(8)}`);
+    } else {
+      log('   Executable bit already set');
     }
 
-    const platform = process.platform;
-    const arch = process.arch === 'arm64' ? 'arm64' : 'x64';
-    const platformDir = `${platform}-${arch}`;
-
-    const binaryName = platform === 'win32' ? 'fnva.exe' : 'fnva';
-    const archBinaryPath = path.join(platformsDir, platformDir, binaryName);
-    const flatBinaryPath = path.join(platformsDir, binaryName);
-
-    /**
-     * 确保指定路径的二进制文件具有可执行权限，并做一次简单的运行测试
-     */
-    function ensureExecutable(binaryPath, label) {
-      try {
-        const stats = fs.statSync(binaryPath);
-        const hasExecPermission = (stats.mode & 0o111) !== 0;
-
-        console.log(`📍 Checking binary (${label}): ${binaryPath}`);
-        console.log(`   Current permissions: ${(stats.mode & 0o777).toString(8)}`);
-
-        if (!hasExecPermission) {
-          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 (${label})`);
-          } else {
-            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 (${label})`);
-        }
+    const res = spawnSync(filePath, ['--version'], { encoding: 'utf8', timeout: 3000, stdio: 'pipe' });
+    if (res.error && res.error.code === 'EACCES') {
+      log('WARNING: still not executable; please chmod +x manually');
+    }
+  } catch (err) {
+    log(`WARNING: could not ensure permissions for ${label}: ${err.message}`);
+  }
+}
 
-        // 尝试执行一次 --version 做简单验证
-        try {
-          const { spawnSync } = require('child_process');
-          const testResult = spawnSync(binaryPath, ['--version'], {
-            encoding: 'utf8',
-            timeout: 3000,
-            stdio: 'pipe',
-          });
+function ensureExecutablePermissions() {
+  const scriptDir = __dirname;
+  const projectRoot = path.resolve(scriptDir, '..');
+  const platformsDir = path.join(projectRoot, 'platforms');
 
-          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(`   Manual fix required: chmod +x "${binaryPath}"`);
-          }
-        } catch {
-          // 测试失败不视为致命错误，可能是二进制本身的问题
-        }
-      } catch (error) {
-        console.warn(`⚠️  Could not fix binary permissions (${label}): ${error.message}`);
-        console.log(`   Manual fix required: chmod +x "${binaryPath}"`);
-      }
-    }
+  log('Ensuring fnva binary permissions...');
 
-    // 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: ${archBinaryPath}`);
-      console.log(`   Also checked legacy path: ${flatBinaryPath}`);
-      console.log('   This might indicate an incomplete installation');
-    }
+  if (!fs.existsSync(platformsDir)) {
+    log('Info: no platforms directory found; skipping (dev install)');
+    return;
+  }
 
-    // 额外检查：如果是全局安装，也尝试检查路径上的 fnva 权限
-    if (process.env.npm_config_global === 'true') {
-      try {
-        const { execSync } = require('child_process');
-        const globalFnvaPath = execSync('which fnva', { encoding: 'utf8' }).trim();
+  const platform = process.platform;
+  const arch = process.arch === 'arm64' ? 'arm64' : 'x64';
+  const platformDir = `${platform}-${arch}`;
+  const binaryName = platform === 'win32' ? 'fnva.exe' : 'fnva';
+  const archBinaryPath = path.join(platformsDir, platformDir, binaryName);
+  const flatBinaryPath = path.join(platformsDir, binaryName);
 
-        if (globalFnvaPath && fs.existsSync(globalFnvaPath)) {
-          console.log(`📍 Checking globally installed binary: ${globalFnvaPath}`);
+  if (platform === 'win32') {
+    log('Info: Windows detected; chmod not required; skipping permission changes');
+    return;
+  }
 
-          const globalStats = fs.statSync(globalFnvaPath);
-          const globalHasExecPermission = (globalStats.mode & 0o111) !== 0;
+  if (fs.existsSync(archBinaryPath)) {
+    ensureExecutable(archBinaryPath, platformDir);
+  } else if (fs.existsSync(flatBinaryPath)) {
+    log('Info: falling back to legacy platforms/fnva layout');
+    ensureExecutable(flatBinaryPath, 'platforms/fnva');
+  } else {
+    log(`Warning: binary not found: ${archBinaryPath}`);
+    log(`         Also checked: ${flatBinaryPath}`);
+  }
 
-          if (!globalHasExecPermission) {
-            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');
-          }
-        }
-      } catch {
-        console.log('ℹ️  Could not verify global installation');
+  if (process.env.npm_config_global === 'true') {
+    try {
+      const which = spawnSync('which', ['fnva'], { encoding: 'utf8' });
+      const globalPath = which.stdout?.trim();
+      if (globalPath && fs.existsSync(globalPath)) {
+        ensureExecutable(globalPath, 'global fnva');
       }
+    } catch {
+      // ignore
     }
-  } catch (error) {
-    console.warn(`⚠️  Permission check failed: ${error.message}`);
   }
 }
 
-// 运行权限检查
-ensureExecutablePermissions();
-
+ensureExecutablePermissions();

package/scripts/install-shell-integration.js

@@ -1,4 +1,8 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
+
+// Shell integration installer for fnva (npm postinstall helper).
+// Generates a lightweight function wrapper per shell that calls the real
+// `fnva` binary and applies environment switch scripts.
 
 const fs = require('fs');
 const path = require('path');
@@ -14,7 +18,12 @@ function detectShell() {
 function getShellConfigPath(shell) {
   switch (shell) {
     case 'powershell':
-      return path.join(process.env.USERPROFILE || os.homedir(), 'Documents', 'WindowsPowerShell', 'Microsoft.PowerShell_profile.ps1');
+      return path.join(
+        process.env.USERPROFILE || os.homedir(),
+        'Documents',
+        'WindowsPowerShell',
+        'Microsoft.PowerShell_profile.ps1'
+      );
     case 'bash':
       return path.join(os.homedir(), '.bashrc');
     case 'zsh':
@@ -28,41 +37,28 @@ function getShellConfigPath(shell) {
 
 function getPowerShellFunction() {
   return `
-# fnva 自动化函数 - 用 npm 安装自动添加
+# fnva auto integration (added by npm install)
 function fnva {
     if ($args.Count -ge 2 -and ($args[0] -eq "java" -or $args[0] -eq "llm" -or $args[0] -eq "cc") -and ($args[1] -eq "use")) {
         $tempFile = Join-Path $env:TEMP ("fnva_script_" + (Get-Random) + ".ps1")
 
         $env:FNVAAUTOMODE = "1"
         try {
-            # 捕获 fnva 输出并保存到临时文件
             $output = cmd.exe /c "set FNVA_AUTO_MODE=%FNVAAUTOMODE% && fnva $args" 2>&1
 
-            # 如果输出包含 PowerShell 脚本内容，则保存并执行
-            if ($output -match '\$env:' -or $output -match 'Write-Host') {
+            if ($output -match '\\$env:' -or $output -match 'Write-Host') {
                 $output | Out-File -FilePath $tempFile -Encoding UTF8
-                try {
-                    & $tempFile
-                } catch {
-                    Write-Host "执行脚本时出错: $_" -ForegroundColor Red
-                }
+                try { & $tempFile } catch { Write-Host "Error executing script: $_" -ForegroundColor Red }
             } else {
-                # 如果不是脚本内容，直接输出
                 $output
             }
         } finally {
             $env:FNVAAUTOMODE = ""
-            if (Test-Path $tempFile) {
-                Remove-Item $tempFile -ErrorAction SilentlyContinue
-            }
+            if (Test-Path $tempFile) { Remove-Item $tempFile -ErrorAction SilentlyContinue }
         }
     } else {
         $env:FNVAAUTOMODE = "1"
-        try {
-            cmd.exe /c "set FNVA_AUTO_MODE=%FNVAAUTOMODE% && fnva $args"
-        } finally {
-            $env:FNVAAUTOMODE = ""
-        }
+        try { cmd.exe /c "set FNVA_AUTO_MODE=%FNVAAUTOMODE% && fnva $args" } finally { $env:FNVAAUTOMODE = "" }
     }
 }
 `;
@@ -70,7 +66,7 @@ function fnva {
 
 function getBashFunction() {
   return `
-# fnva 自动化函数 - 用 npm 安装自动添加
+# fnva auto integration (added by npm install)
 fnva() {
     local __fnva_bin
     __fnva_bin="$(command -v fnva | head -n 1)"
@@ -96,7 +92,7 @@ fnva() {
 
 function getFishFunction() {
   return `
-# fnva 自动化函数 - 用 npm 安装自动添加
+# fnva auto integration (added by npm install)
 function fnva
     set __fnva_bin (command -v fnva | head -n 1)
     if test -z "$__fnva_bin"
@@ -122,9 +118,8 @@ function getShellFunction(shell) {
     case 'powershell':
       return getPowerShellFunction();
     case 'bash':
-      return getBashFunction();
     case 'zsh':
-      return getBashFunction(); // zsh 使用与 bash 相同的函数
+      return getBashFunction();
     case 'fish':
       return getFishFunction();
     default:
@@ -136,9 +131,8 @@ function isFunctionInstalled(configPath) {
   if (!fs.existsSync(configPath)) {
     return false;
   }
-
   const content = fs.readFileSync(configPath, 'utf8');
-  return content.includes('fnva 自动化函数 - 用 npm 安装自动添加');
+  return content.includes('fnva auto integration (added by npm install)');
 }
 
 function installShellIntegration() {
@@ -146,13 +140,13 @@ function installShellIntegration() {
   const configPath = getShellConfigPath(shell);
 
   if (!configPath) {
-    console.log(`⚠️  不支持的 shell: ${shell}`);
-    console.log('请手动配置 fnva，详见 README');
+    console.log(`⚠️  Unsupported shell: ${shell}`);
+    console.log('Please configure fnva manually (see README).');
     return false;
   }
 
   if (isFunctionInstalled(configPath)) {
-    console.log(`✅ fnva shell 集成已存在: ${configPath}`);
+    console.log(`✅ fnva shell integration already present: ${configPath}`);
     return true;
   }
 
@@ -171,9 +165,8 @@ function installShellIntegration() {
       fs.writeFileSync(configPath, functionCode);
     }
 
-    console.log(`✅ fnva shell 集成已安装到: ${configPath}`);
-    console.log('🔄 请重新加载你的 shell 配置:');
-
+    console.log(`✅ fnva shell integration installed at: ${configPath}`);
+    console.log('🔄 Reload your shell config:');
     switch (shell) {
       case 'powershell':
         console.log('   . $PROFILE');
@@ -188,29 +181,28 @@ function installShellIntegration() {
         console.log('   source ~/.config/fish/config.fish');
         break;
     }
-
     return true;
   } catch (error) {
-    console.log(`❌ 安装失败: ${error.message}`);
-    console.log('请手动配置 fnva');
+    console.log(`❌ Install failed: ${error.message}`);
+    console.log('Please configure fnva manually (see README).');
     return false;
   }
 }
 
 function promptInstallation() {
   if (process.env.FNVA_SKIP_SHELL_SETUP === '1') {
-    console.log('⏭️  跳过 shell 集成安装');
+    console.log('⏭️  Skipping shell integration (FNVA_SKIP_SHELL_SETUP=1)');
     return;
   }
 
   const shell = detectShell();
-  console.log(`🔍 检测到 shell: ${shell}`);
-  console.log('❓ 是否安装 fnva shell 集成? (y/N)');
+  console.log(`🔍 Detected shell: ${shell}`);
+  console.log('❓ Install fnva shell integration? (y/N)');
 
   const readline = require('readline');
   const rl = readline.createInterface({
     input: process.stdin,
-    output: process.stdout
+    output: process.stdout,
   });
 
   rl.question('> ', (answer) => {
@@ -218,21 +210,21 @@ function promptInstallation() {
     if (normalized === 'y' || normalized === 'yes') {
       installShellIntegration();
     } else {
-      console.log('⏩ 已跳过 shell 集成安装');
+      console.log('⏩ Skipped shell integration.');
     }
     rl.close();
   });
 }
 
 function main() {
-  console.log('🛠️ fnva shell 集成安装器');
-  console.log(`📦 Node.js 版本: ${process.version}`);
-  console.log(`📍 进程工作目录: ${process.cwd()}`);
+  console.log('🛠️ fnva shell integration installer');
+  console.log(`📦 Node.js version: ${process.version}`);
+  console.log(`📍 CWD: ${process.cwd()}`);
 
   if (process.argv.includes('--auto') || process.argv.includes('--yes')) {
-    console.log('🤖 自动模式启动安装...');
+    console.log('🤖 Auto mode: installing...');
     const result = installShellIntegration();
-    console.log(`📄 安装结果: ${result ? '成功' : '失败'}`);
+    console.log(`📄 Install result: ${result ? 'success' : 'failed'}`);
   } else {
     promptInstallation();
   }
@@ -247,5 +239,5 @@ module.exports = {
   getShellConfigPath,
   getShellFunction,
   isFunctionInstalled,
-  installShellIntegration
+  installShellIntegration,
 };

package/scripts/uninstall-shell-integration.js

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
 
+// Shell integration uninstaller for fnva (npm postuninstall helper).
+// Cleans fnva wrapper functions from common shell config files.
+
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
 
 function detectShell() {
-  if (process.platform === 'win32') {
-    return 'powershell';
-  }
+  if (process.platform === 'win32') return 'powershell';
   return process.env.SHELL?.split('/').pop() || 'bash';
 }
 
@@ -33,7 +34,7 @@ function cleanConfigFile(cfgPath) {
   let content = fs.readFileSync(cfgPath, 'utf8');
   const originalContent = content;
 
-  const marker = '# fnva 自动化函数 - 用 npm 安装自动添加';
+  const marker = '# fnva auto integration (added by npm install)';
   const startIndex = content.indexOf(marker);
 
   if (startIndex !== -1) {
@@ -69,10 +70,9 @@ function cleanConfigFile(cfgPath) {
     }
   }
 
-  // 正则兜底：移除残留 fnva 片段
   if (content === originalContent) {
     content = content
-      .replace(/# fnva 自动化函数 - 用 npm 安装自动添加[\s\S]*?(?=\n\S|\n$)/g, '')
+      .replace(/# fnva auto integration \(added by npm install\)[\s\S]*?(?=\n\S|\n$)/g, '')
       .replace(/.*fnva.*\n?/g, '')
       .replace(/.*FNVAAUTOMODE.*\n?/g, '')
       .replace(/.*cmd\.exe.*fnva.*\n?/g, '')
@@ -82,50 +82,50 @@ function cleanConfigFile(cfgPath) {
 
   if (content !== originalContent) {
     fs.writeFileSync(cfgPath, content);
-    console.log(`✅ fnva shell 集成已从 ${cfgPath} 移除`);
+    console.log(`✅ fnva shell integration removed from ${cfgPath}`);
     return true;
   }
 
-  console.log(`⚠️  未在 ${cfgPath} 找到需要清理的内容`);
+  console.log(`⚠️  No fnva block found in ${cfgPath}`);
   return false;
 }
 
 function removeShellIntegration(configPath, shell) {
-  const paths = getShellConfigPaths(shell);
-  if (configPath) paths.unshift(configPath); // 兼容传入单一路径
-
+  const paths = configPath ? [configPath] : getShellConfigPaths(shell);
   let removedAny = false;
+
   for (const cfgPath of paths) {
     if (!cfgPath || !fs.existsSync(cfgPath)) continue;
     try {
       const removed = cleanConfigFile(cfgPath);
       removedAny = removedAny || removed;
     } catch (error) {
-      console.log(`❌ 移除失败 (${cfgPath}): ${error.message}`);
+      console.log(`❌ Remove failed (${cfgPath}): ${error.message}`);
     }
   }
 
   if (!removedAny) {
-    console.log('⚠️  未找到可清理的 shell 配置文件或未匹配到 fnva 片段');
+    console.log('⚠️  No shell config cleaned (file missing or no fnva block)');
   }
+
   return removedAny;
 }
 
 function main() {
-  console.log('🧹 fnva shell 集成卸载');
+  console.log('🧹 fnva shell integration uninstaller');
 
   const shell = detectShell();
   const paths = getShellConfigPaths(shell);
 
-  if (paths.length === 0) {
-    console.log(`⚠️  不支持的 shell: ${shell}`);
+  if (!paths.length) {
+    console.log(`⚠️  Unsupported shell: ${shell}`);
     return;
   }
 
   const success = removeShellIntegration(null, shell);
 
   if (success) {
-    console.log('🔄 请重新加载你的 shell 配置:');
+    console.log('🔄 Reload your shell config:');
     switch (shell) {
       case 'powershell':
         console.log('   . $PROFILE');
@@ -151,4 +151,4 @@ module.exports = {
   detectShell,
   getShellConfigPaths,
   removeShellIntegration,
-};
+};