fnva 0.0.20 → 0.0.22

package/package.json

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

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

@@ -4,8 +4,8 @@ const fs = require('fs');
 const path = require('path');
 
 /**
- * 确保fnva二进制文件有可执行权限
- * 这是一个轻量级的postinstall脚本，专门用来解决npm打包时权限丢失的问题
+ * 确保 fnva 二进制文件有可执行权限
+ * 这是一个全局的 postinstall 脚本，处理本地安装和全局安装的权限问题
  */
 function ensureExecutablePermissions() {
   try {
@@ -13,47 +13,119 @@ function ensureExecutablePermissions() {
     const projectRoot = path.resolve(scriptDir, '..');
     const platformsDir = path.join(projectRoot, 'platforms');
 
-    // 如果没有platforms目录，说明是开发模式，不需要处理
+    console.log('✅ Ensuring fnva binary permissions...');
+
+    // 如果没有 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 (${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
-          // 只在实际修复了权限时才输出消息，避免在正常安装时产生噪音
-          if (process.env.DEBUG || process.env.NPM_DEBUG) {
-            console.log(`🔧 Fixed executable permissions for fnva binary`);
+
+          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})`);
+        }
+
+        // 尝试执行一次 --version 做简单验证
+        try {
+          const { spawnSync } = require('child_process');
+          const testResult = spawnSync(binaryPath, ['--version'], {
+            encoding: 'utf8',
+            timeout: 3000,
+            stdio: 'pipe',
+          });
+
+          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) {
-        // 静默处理错误，不干扰正常安装流程
-        if (process.env.DEBUG || process.env.NPM_DEBUG) {
-          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}"`);
+      }
+    }
+
+    // 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');
+    }
+
+    // 额外检查：如果是全局安装，也尝试检查路径上的 fnva 权限
+    if (process.env.npm_config_global === 'true') {
+      try {
+        const { execSync } = require('child_process');
+        const globalFnvaPath = execSync('which fnva', { encoding: 'utf8' }).trim();
+
+        if (globalFnvaPath && fs.existsSync(globalFnvaPath)) {
+          console.log(`📍 Checking globally installed binary: ${globalFnvaPath}`);
+
+          const globalStats = fs.statSync(globalFnvaPath);
+          const globalHasExecPermission = (globalStats.mode & 0o111) !== 0;
+
+          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');
       }
     }
   } catch (error) {
-    // 静默处理错误，不干扰正常安装流程
-    if (process.env.DEBUG || process.env.NPM_DEBUG) {
-      console.warn(`⚠️  Permission check failed: ${error.message}`);
-    }
+    console.warn(`⚠️  Permission check failed: ${error.message}`);
   }
 }
 
 // 运行权限检查
-ensureExecutablePermissions();
+ensureExecutablePermissions();
+

package/scripts/fix-fnva-permissions.sh

@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# fnva权限修复脚本 - 临时解决方案
+# 适用于Mac/Linux系统的全局安装权限修复
+
+set -e
+
+echo "🔧 fnva权限修复工具"
+echo "=================="
+
+# 检查fnva是否已安装
+if ! command -v fnva &> /dev/null; then
+    echo "❌ fnva未找到，请先安装: npm install -g fnva"
+    exit 1
+fi
+
+# 获取fnva路径
+FNVA_PATH=$(which fnva)
+echo "📍 找到fnva: $FNVA_PATH"
+
+# 检查权限
+if [ -x "$FNVA_PATH" ]; then
+    echo "✅ fnva已有可执行权限"
+    echo "🧪 测试fnva是否正常工作..."
+    if fnva --version &> /dev/null || [ $? -eq 1 ]; then
+        echo "✅ fnva正常工作！"
+        exit 0
+    else
+        echo "⚠️  fnva有权限但执行仍有问题"
+    fi
+else
+    echo "❌ fnva缺少可执行权限"
+fi
+
+# 尝试修复权限
+echo "🔧 修复fnva权限..."
+if sudo chmod +x "$FNVA_PATH"; then
+    echo "✅ 权限修复成功"
+
+    # 验证修复结果
+    echo "🧪 验证fnva是否正常工作..."
+    if fnva --version &> /dev/null || [ $? -eq 1 ]; then
+        echo "🎉 fnva权限修复完成！现在可以使用fnva了"
+        exit 0
+    else
+        echo "⚠️  权限已修复但执行仍有问题"
+    fi
+else
+    echo "❌ 权限修复失败"
+fi
+
+# 如果上述方法失败，尝试其他方法
+echo ""
+echo "🔄 尝试其他修复方法..."
+
+# 方法1: 查找所有fnva二进制文件
+echo "🔍 查找所有fnva二进制文件..."
+FNVA_FILES=$(find /usr/local /opt /home -name "fnva" -type f 2>/dev/null || true)
+
+if [ -n "$FNVA_FILES" ]; then
+    echo "📁 找到以下fnva文件:"
+    echo "$FNVA_FILES"
+    echo ""
+
+    echo "🔧 修复所有fnva文件的权限..."
+    echo "$FNVA_FILES" | while read -r file; do
+        if [ -f "$file" ]; then
+            echo "  修复: $file"
+            sudo chmod +x "$file"
+        fi
+    done
+else
+    echo "📁 未找到其他fnva文件"
+fi
+
+# 方法2: 查找npm全局目录中的fnva
+echo ""
+echo "🔍 检查npm全局安装目录..."
+NPM_GLOBAL_ROOT=$(npm root -g 2>/dev/null || echo "")
+if [ -n "$NPM_GLOBAL_ROOT" ]; then
+    FNVA_MODULE_PATH="$NPM_GLOBAL_ROOT/fnva"
+    if [ -d "$FNVA_MODULE_PATH" ]; then
+        echo "📁 找到fnva模块: $FNVA_MODULE_PATH"
+        echo "🔧 修复模块中的二进制文件权限..."
+
+        # 查找模块中的所有fnva文件
+        find "$FNVA_MODULE_PATH" -name "fnva" -type f -exec sudo chmod +x {} \; 2>/dev/null || true
+    fi
+fi
+
+# 最终测试
+echo ""
+echo "🧪 最终测试..."
+if fnva --version &> /dev/null || [ $? -eq 1 ]; then
+    echo "🎉 修复成功！fnva现在可以正常使用"
+    exit 0
+else
+    echo "❌ 修复失败，请尝试以下方法:"
+    echo "  1. 重新安装: npm uninstall -g fnva && npm install -g fnva --force"
+    echo "  2. 手动找到fnva文件并修复权限"
+    echo "  3. 使用 FNVA_AUTO_MODE=1 fnva list 使用Node.js模式"
+    exit 1
+fi