fnva 0.0.6 → 0.0.8

package/bin/fnva.cmd

@@ -17,9 +17,17 @@ REM 构建二进制文件路径
 set PLATFORM_DIR=%OS%-%ARCH%
 set BINARY_PATH=%~dp0..\platforms\%PLATFORM_DIR%\fnva.exe
 
+REM 如果分层结构不存在，尝试扁平结构
+if not exist "%BINARY_PATH%" (
+    set BINARY_PATH=%~dp0..\platforms\fnva.exe
+)
+
 REM 检查二进制文件是否存在
 if not exist "%BINARY_PATH%" (
-    echo 错误: 未找到二进制文件: %BINARY_PATH%
+    echo 错误: 未找到二进制文件
+    echo 尝试的路径:
+    echo   1. %~dp0..\platforms\%PLATFORM_DIR%\fnva.exe
+    echo   2. %~dp0..\platforms\fnva.exe
     echo 请运行 'npm run build' 构建二进制文件
     exit /b 1
 )

package/bin/fnva.js

@@ -27,8 +27,8 @@ function resolveArch() {
   return 'x64';
 }
 
-function buildBinaryPath() {
-  const platform = resolvePlatform();
+function platformBinaryPath(platformOverride) {
+  const platform = platformOverride || resolvePlatform();
   const arch = resolveArch();
   const scriptDir = __dirname;
   const projectRoot = path.resolve(scriptDir, '..');
@@ -37,13 +37,53 @@ function buildBinaryPath() {
   return path.join(projectRoot, 'platforms', platformDir, binaryName);
 }
 
+function buildBinaryPath() {
+  const platform = resolvePlatform();
+  const binaryCandidates = [];
+
+  // 1. Prebuilt binary shipped with the npm package
+  binaryCandidates.push(platformBinaryPath(platform));
+
+  // Flat legacy structure: platforms/fnva(.exe)
+  const scriptDir = __dirname;
+  const projectRoot = path.resolve(scriptDir, '..');
+  const flatBinaryName = platform === 'win32' ? 'fnva.exe' : 'fnva';
+  binaryCandidates.push(path.join(projectRoot, 'platforms', flatBinaryName));
+
+  // 2. User-provided override via environment variable
+  if (process.env.FNVA_NATIVE_PATH) {
+    binaryCandidates.push(process.env.FNVA_NATIVE_PATH);
+  }
+
+  // 3. Local cargo build outputs (helpful for development installs)
+  const targetDir = path.resolve(__dirname, '..', 'target');
+  if (platform === 'win32') {
+    binaryCandidates.push(path.join(targetDir, 'release', 'fnva.exe'));
+    binaryCandidates.push(path.join(targetDir, 'debug', 'fnva.exe'));
+  } else {
+    binaryCandidates.push(path.join(targetDir, 'release', 'fnva'));
+    binaryCandidates.push(path.join(targetDir, 'debug', 'fnva'));
+  }
+
+  for (const candidate of binaryCandidates) {
+    if (candidate && fs.existsSync(candidate)) {
+      return candidate;
+    }
+  }
+
+  return null;
+}
+
 function run() {
   const binaryPath = buildBinaryPath();
 
-  if (!fs.existsSync(binaryPath)) {
-    console.error(`Error: binary not found: ${binaryPath}`);
+  if (!binaryPath) {
+    console.error('Error: fnva native binary not found.');
     console.error('');
-    console.error("Please build the CLI binaries first, e.g. run 'npm run build' or 'npm run build:all'.");
+    console.error("Please either:");
+    console.error("  1) Run 'npm run build' (or 'npm run build:all') to produce platform binaries,");
+    console.error("  2) Install a release package that includes the platforms directory, or");
+    console.error("  3) Set FNVA_NATIVE_PATH to the full path of an existing fnva executable.");
     process.exit(1);
   }
 

package/bin/fnva.ps1

@@ -14,9 +14,17 @@ $platformDir = "$os-$arch"
 $scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
 $binaryPath = Join-Path $scriptDir ".." "platforms" $platformDir "fnva.exe"
 
+# 如果分层结构不存在，尝试扁平结构
+if (-not (Test-Path $binaryPath)) {
+    $binaryPath = Join-Path $scriptDir ".." "platforms" "fnva.exe"
+}
+
 # 检查二进制文件是否存在
 if (-not (Test-Path $binaryPath)) {
-    Write-Host "错误: 未找到二进制文件: $binaryPath" -ForegroundColor Red
+    Write-Host "错误: 未找到二进制文件" -ForegroundColor Red
+    Write-Host "尝试的路径: " -ForegroundColor Yellow
+    Write-Host "  1. $(Join-Path $scriptDir ".." "platforms" $platformDir "fnva.exe")" -ForegroundColor Yellow
+    Write-Host "  2. $(Join-Path $scriptDir ".." "platforms" "fnva.exe")" -ForegroundColor Yellow
     Write-Host "请运行 'npm run build' 构建二进制文件" -ForegroundColor Yellow
     exit 1
 }

package/package.json

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