fnva 0.0.21 → 0.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fnva",
-  "version": "0.0.21",
+  "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脚本，处理本地安装和全局安装的权限问题
+ * 确保 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();
+