fnva 0.0.46 → 0.0.48

package/README.md

@@ -14,9 +14,9 @@ Cross-platform environment switcher for Java, Claude Code (CC), and LLM setups.
 
 ## Quick start
 
-- Init shell (Bash/Zsh): `eval "$(fnva env --shell bash)"`
-  PowerShell: `fnva env --shell powershell | Out-String | Invoke-Expression`
-  Fish: `fnva env --shell fish | source`
+- Init shell (Bash/Zsh): `eval "$(fnva env env --shell bash)"`
+  PowerShell: `fnva env env --shell powershell | Out-String | Invoke-Expression`
+  Fish: `fnva env env --shell fish | source`
 - Scan Java: `fnva java scan`
 - Switch Java for current session: `fnva java use jdk-17` (with shell integration)
 - Switch CC profile: `fnva cc use glmcc` (with shell integration)

package/bin/fnva.js

@@ -501,6 +501,27 @@ function run() {
   }
   const isSwitchCommand = isEnvironmentSwitchCommand(args);
 
+  // Unix: 直接透传给 Rust 二进制，不拦截参数
+  // shell wrapper 函数负责捕获输出并 source
+  if (process.platform !== 'win32') {
+    const result = spawnSync(binaryPath, args, {
+      stdio: 'inherit',
+    });
+
+    if (result.error) {
+      if (result.error.code === 'EACCES') {
+        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(`[ERROR] Failed to execute fnva: ${result.error.message}`);
+      }
+      process.exit(result.status ?? 1);
+    }
+
+    process.exit(result.status ?? 0);
+  }
+
   if (isSwitchCommand) {
     const shellArg = getShellArg(args);
     if (!shellArg || shellArg === 'auto') {

package/package.json

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

package/scripts/install-shell-integration.js

@@ -41,12 +41,12 @@ function getShellConfigPath(shell) {
 function getIntegrationLine(shell) {
   switch (shell) {
     case 'powershell':
-      return 'fnva env --shell powershell | Out-String | Invoke-Expression';
+      return 'fnva env env --shell powershell | Out-String | Invoke-Expression';
     case 'bash':
     case 'zsh':
-      return 'eval "$(fnva env --shell bash)"';
+      return 'eval "$(fnva env env --shell bash)"';
     case 'fish':
-      return 'fnva env --shell fish | source';
+      return 'fnva env env --shell fish | source';
     default:
       return null;
   }
@@ -57,7 +57,7 @@ function isInstalled(configPath) {
     return false;
   }
   const content = fs.readFileSync(configPath, 'utf8');
-  return content.includes('fnva env --shell');
+  return content.includes('fnva env env --shell');
 }
 
 function installShellIntegration() {

package/scripts/update-java-versions.js

@@ -0,0 +1,132 @@
+#!/usr/bin/env node
+
+/**
+ * 从 Adoptium GitHub Releases 查询最新 Java 版本，
+ * 生成简化的 config/java_versions.toml（LTS + 最新非 LTS）
+ */
+
+const https = require('https');
+
+const REPOS = [
+  { repo: 'temurin8-binaries', major: 8, lts: true },
+  { repo: 'temurin11-binaries', major: 11, lts: true },
+  { repo: 'temurin17-binaries', major: 17, lts: true },
+  { repo: 'temurin21-binaries', major: 21, lts: true },
+  { repo: 'temurin25-binaries', major: 25, lts: false },
+];
+
+const PLATFORMS = [
+  { key: 'windows-x64', pattern: /jdk_x64_windows_hotspot/ },
+  { key: 'linux-x64', pattern: /jdk_x64_linux_hotspot/ },
+  { key: 'linux-aarch64', pattern: /jdk_aarch64_linux_hotspot/ },
+  { key: 'macos-x64', pattern: /jdk_x64_mac_hotspot/ },
+  { key: 'macos-aarch64', pattern: /jdk_aarch64_mac_hotspot/ },
+];
+
+function fetchJSON(url) {
+  return new Promise((resolve, reject) => {
+    https.get(url, { headers: { 'User-Agent': 'fnva-ci' } }, (res) => {
+      let data = '';
+      res.on('data', (chunk) => data += chunk);
+      res.on('end', () => {
+        try { resolve(JSON.parse(data)); }
+        catch (e) { reject(new Error(`Parse error: ${e.message}`)); }
+      });
+    }).on('error', reject);
+  });
+}
+
+function parseVersion(tagName) {
+  // jdk-21.0.10+7 -> { version: "21.0.10", tag: "jdk-21.0.10+7" }
+  // jdk8u482-b08 -> { version: "8u482b08", tag: "jdk8u482-b08" }
+  const match = tagName.match(/^jdk-?([\d.]+u?\d*)(?:\+|b|-b?)(\d+)$/i);
+  if (!match) return null;
+  const base = match[1].replace(/\.0(?=\d)/g, '.');
+  const build = match[2];
+  if (tagName.includes('jdk8u')) {
+    return { version: `8u${base.replace(/^8u?/, '')}b${build.padStart(2, '0')}`, tag: tagName };
+  }
+  return { version: `${base}+${build}`, tag: tagName };
+}
+
+async function getLatestVersion(repo, major) {
+  const url = `https://api.github.com/repos/adoptium/${repo}/releases?per_page=5`;
+  const releases = await fetchJSON(url);
+
+  for (const release of releases) {
+    if (release.prerelease) continue;
+    const parsed = parseVersion(release.tag_name);
+    if (!parsed) continue;
+
+    const assets = {};
+    for (const asset of release.assets) {
+      for (const p of PLATFORMS) {
+        if (p.pattern.test(asset.name) && (asset.name.endsWith('.zip') || asset.name.endsWith('.tar.gz'))) {
+          assets[p.key] = asset.name;
+        }
+      }
+    }
+
+    if (Object.keys(assets).length >= 3) {
+      return { ...parsed, major, assets };
+    }
+  }
+  return null;
+}
+
+function toToml(entry) {
+  let lines = [
+    `[[versions]]`,
+    `version = "${entry.version}"`,
+    `major = ${entry.major}`,
+    `lts = ${entry.lts}`,
+    `tag_name = "${entry.tag}"`,
+    `[versions.assets]`,
+  ];
+  for (const [key, name] of Object.entries(entry.assets)) {
+    lines.push(`${key} = "${name}"`);
+  }
+  return lines.join('\n');
+}
+
+async function main() {
+  console.log('🔍 查询 Adoptium 最新版本...');
+
+  const entries = [];
+  for (const { repo, major, lts } of REPOS) {
+    console.log(`  检查 ${repo}...`);
+    try {
+      const entry = await getLatestVersion(repo, major);
+      if (entry) {
+        entries.push({ ...entry, lts });
+        console.log(`  ✅ Java ${major}: ${entry.version}`);
+      } else {
+        console.log(`  ⚠️  Java ${major}: 未找到可用版本`);
+      }
+    } catch (e) {
+      console.log(`  ❌ Java ${major}: ${e.message}`);
+    }
+  }
+
+  entries.sort((a, b) => b.major - a.major);
+
+  const toml = entries.map(toToml).join('\n\n') + '\n';
+
+  const fs = require('fs');
+  const path = require('path');
+  const targetPath = path.join(__dirname, '..', 'config', 'java_versions.toml');
+
+  const existing = fs.readFileSync(targetPath, 'utf-8');
+  if (existing.trim() === toml.trim()) {
+    console.log('\n📋 版本注册表无变化');
+    process.exit(0);
+  }
+
+  fs.writeFileSync(targetPath, toml, 'utf-8');
+  console.log(`\n✅ 已更新 ${targetPath}`);
+}
+
+main().catch((e) => {
+  console.error(e);
+  process.exit(1);
+});