fnva 0.0.12 → 0.0.14

package/bin/fnva.js

@@ -43,6 +43,11 @@ function buildBinaryPath() {
     return null;
   }
 
+  // 如果设置了 FNVA_AUTO_MODE，自动使用 Node.js 模式
+  if (process.env.FNVA_AUTO_MODE === '1') {
+    return null;
+  }
+
   const platform = resolvePlatform();
   const binaryCandidates = [];
 
@@ -314,28 +319,50 @@ function handleNodeOnlyMode(args) {
       } else {
         console.log('Available java environments:');
         versions.forEach(version => {
-          const jdkPath = path.join(fnvaDir, version);
-          if (fs.existsSync(path.join(jdkPath, 'release'))) {
-            try {
-              const releaseContent = fs.readFileSync(path.join(jdkPath, 'release'), 'utf8');
-              const versionMatch = releaseContent.match(/JAVA_VERSION="(.+)"/);
-              const javaVersion = versionMatch ? versionMatch[1].replace(/"/g, '') : 'Unknown';
-              console.log(`  ${version}: Java ${javaVersion} (${jdkPath})`);
-            } catch (e) {
-              console.log(`  ${version}: (${jdkPath})`);
+          const versionDir = path.join(fnvaDir, version);
+          const jdkSubdirs = fs.readdirSync(versionDir, { withFileTypes: true })
+            .filter(dirent => dirent.isDirectory())
+            .map(dirent => dirent.name);
+
+          if (jdkSubdirs.length > 0) {
+            const jdkSubdir = jdkSubdirs[0];
+            const fullJdkPath = path.join(versionDir, jdkSubdir);
+
+            if (fs.existsSync(path.join(fullJdkPath, 'release'))) {
+              try {
+                const releaseContent = fs.readFileSync(path.join(fullJdkPath, 'release'), 'utf8');
+                const versionMatch = releaseContent.match(/JAVA_VERSION="(.+)"/);
+                const javaVersion = versionMatch ? versionMatch[1].replace(/"/g, '') : 'Unknown';
+                console.log(`  ${version} (current): Java ${javaVersion} (${fullJdkPath})`);
+              } catch (e) {
+                console.log(`  ${version} (${fullJdkPath})`);
+              }
             }
           }
         });
       }
     } else if (args[1] === 'use' && args[2]) {
       const version = args[2];
-      const jdkPath = path.join(fnvaDir, version);
+      const versionDir = path.join(fnvaDir, version);
 
-      if (!fs.existsSync(jdkPath)) {
+      if (!fs.existsSync(versionDir)) {
         console.error(`Java environment '${version}' not found`);
         process.exit(1);
       }
 
+      // 查找实际的 JDK 目录
+      const jdkSubdirs = fs.readdirSync(versionDir, { withFileTypes: true })
+        .filter(dirent => dirent.isDirectory())
+        .map(dirent => dirent.name);
+
+      if (jdkSubdirs.length === 0) {
+        console.error(`No JDK installation found in ${versionDir}`);
+        process.exit(1);
+      }
+
+      const jdkPath = path.join(versionDir, jdkSubdirs[0]);
+      const jdkBinPath = path.join(jdkPath, 'bin');
+
       // 生成环境切换脚本
       const envVars = {
         JAVA_HOME: jdkPath
@@ -357,7 +384,7 @@ function run() {
   const binaryPath = buildBinaryPath();
 
   if (!binaryPath) {
-    if (process.env.FNVA_SKIP_NATIVE === '1') {
+    if (process.env.FNVA_SKIP_NATIVE === '1' || process.env.FNVA_AUTO_MODE === '1') {
       // 纯 Node.js 模式 - 实现基本的环境切换功能
       const args = process.argv.slice(2);
       handleNodeOnlyMode(args);

package/package.json

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