fnva 0.0.29 → 0.0.31

package/bin/fnva.js

@@ -55,12 +55,6 @@ function buildBinaryPath() {
   // 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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fnva",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "description": "跨平台环境切换工具，支持 Java 和 LLM 环境配置",
   "author": "protagonistss",
   "license": "MIT",
@@ -13,6 +13,8 @@
     "install-shell": "node scripts/install-shell-integration.js",
     "uninstall-shell": "node scripts/uninstall-shell-integration.js",
     "build": "scripts/build-local.sh",
+    "build:platforms": "node scripts/build-platforms.js",
+    "build:platforms:sh": "bash scripts/build-platforms.sh",
     "build:all": "scripts/build-all.sh",
     "check-permissions": "node scripts/check-permissions.js",
     "postuninstall": "echo 'Uninstalling fnva shell integration...' && node scripts/uninstall-shell-integration.js"

package/scripts/build-platforms.js

@@ -0,0 +1,82 @@
+#!/usr/bin/env node
+
+/**
+ * Cross-platform build helper to compile fnva binaries for common targets.
+ * Uses the current host toolchain; make sure required targets are installed via `rustup target add ...`.
+ */
+
+const fs = require('fs');
+const path = require('path');
+const { spawnSync } = require('child_process');
+
+const ROOT = path.resolve(__dirname, '..');
+
+const TARGETS = [
+  { target: 'aarch64-apple-darwin', platform: 'darwin-arm64', bin: 'fnva' },
+  { target: 'x86_64-apple-darwin', platform: 'darwin-x64', bin: 'fnva' },
+  { target: 'x86_64-unknown-linux-gnu', platform: 'linux-x64', bin: 'fnva' },
+  { target: 'x86_64-pc-windows-msvc', platform: 'win32-x64', bin: 'fnva.exe' },
+];
+
+function run(cmd, args, options = {}) {
+  const result = spawnSync(cmd, args, { stdio: 'inherit', ...options });
+  if (result.error) {
+    throw result.error;
+  }
+  if (result.status !== 0) {
+    throw new Error(`${cmd} ${args.join(' ')} exited with code ${result.status}`);
+  }
+}
+
+function commandExists(cmd) {
+  const probe = spawnSync(cmd, ['--version'], { stdio: 'ignore' });
+  return probe.error == null && probe.status === 0;
+}
+
+function targetInstalled(target) {
+  const res = spawnSync('rustup', ['target', 'list', '--installed'], {
+    encoding: 'utf8',
+    stdio: ['ignore', 'pipe', 'ignore'],
+  });
+  if (res.error || typeof res.stdout !== 'string') {
+    return false;
+  }
+  return res.stdout.split(/\r?\n/).some((line) => line.trim() === target);
+}
+
+function buildTarget(entry) {
+  const { target, platform, bin } = entry;
+  console.log(`==> Building ${target} -> platforms/${platform}/${bin}`);
+
+  if (!commandExists('cargo')) {
+    console.error('!! cargo not found; install Rust toolchain first');
+    process.exitCode = 1;
+    return;
+  }
+
+  if (!targetInstalled(target)) {
+    console.warn(`!! target ${target} not installed; run: rustup target add ${target}`);
+    return;
+  }
+
+  run('cargo', ['build', '--release', '--target', target], { cwd: ROOT });
+
+  const source = path.join(ROOT, 'target', target, 'release', bin);
+  const destDir = path.join(ROOT, 'platforms', platform);
+  const dest = path.join(destDir, bin);
+
+  if (!fs.existsSync(source)) {
+    console.warn(`!! Missing build output: ${source}`);
+    return;
+  }
+
+  fs.mkdirSync(destDir, { recursive: true });
+  fs.copyFileSync(source, dest);
+}
+
+function main() {
+  TARGETS.forEach(buildTarget);
+  console.log('==> Done. Binaries are in platforms/<os>-<arch>/');
+}
+
+main();

package/scripts/build-platforms.sh

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+# Build platform-specific fnva binaries and place them under platforms/<os>-<arch>/
+# Requires the corresponding Rust targets to be installed.
+
+set -euo pipefail
+
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+
+targets=(
+  "aarch64-apple-darwin:darwin-arm64:fnva"
+  "x86_64-apple-darwin:darwin-x64:fnva"
+  "x86_64-unknown-linux-gnu:linux-x64:fnva"
+  "x86_64-pc-windows-msvc:win32-x64:fnva.exe"
+)
+
+for entry in "${targets[@]}"; do
+  IFS=: read -r target triple_dir bin_name <<<"${entry}"
+  echo "==> Building ${target} -> platforms/${triple_dir}/${bin_name}"
+  if ! command -v cargo >/dev/null 2>&1; then
+    echo "!! cargo not found; install Rust toolchain first" >&2
+    exit 1
+  fi
+
+  if ! rustup target list --installed | grep -q "^${target}$"; then
+    echo "!! target ${target} not installed; run: rustup target add ${target}" >&2
+    continue
+  fi
+
+  cargo build --release --target "${target}"
+
+  src="${ROOT}/target/${target}/release/${bin_name}"
+  dest_dir="${ROOT}/platforms/${triple_dir}"
+
+  if [[ ! -f "${src}" ]]; then
+    echo "!! Missing build output: ${src}" >&2
+    continue
+  fi
+
+  mkdir -p "${dest_dir}"
+  cp "${src}" "${dest_dir}/${bin_name}"
+done
+
+echo "==> Done. Binaries are in ${ROOT}/platforms/<os>-<arch>/"

package/scripts/ensure-executable-permissions.js

@@ -49,7 +49,6 @@ function ensureExecutablePermissions() {
   const platformDir = `${platform}-${arch}`;
   const binaryName = platform === 'win32' ? 'fnva.exe' : 'fnva';
   const archBinaryPath = path.join(platformsDir, platformDir, binaryName);
-  const flatBinaryPath = path.join(platformsDir, binaryName);
 
   if (platform === 'win32') {
     log('Info: Windows detected; chmod not required; skipping permission changes');
@@ -58,12 +57,8 @@ function ensureExecutablePermissions() {
 
   if (fs.existsSync(archBinaryPath)) {
     ensureExecutable(archBinaryPath, platformDir);
-  } else if (fs.existsSync(flatBinaryPath)) {
-    log('Info: falling back to legacy platforms/fnva layout');
-    ensureExecutable(flatBinaryPath, 'platforms/fnva');
   } else {
     log(`Warning: binary not found: ${archBinaryPath}`);
-    log(`         Also checked: ${flatBinaryPath}`);
   }
 
   if (process.env.npm_config_global === 'true') {
@@ -79,4 +74,4 @@ function ensureExecutablePermissions() {
   }
 }
 
-ensureExecutablePermissions();
+ensureExecutablePermissions();

package/scripts/install-shell-integration.js

@@ -7,6 +7,9 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 
+// Absolute path to the packaged fnva shim (bin/fnva.js)
+const FNVA_SHIM = path.resolve(__dirname, '..', 'bin', 'fnva.js');
+
 function detectShell() {
   if (process.platform === 'win32') {
     return 'powershell';
@@ -82,9 +85,8 @@ function getBashFunction() {
   return `
 # fnva auto integration (added by npm install)
 fnva() {
-    local __fnva_bin
-    __fnva_bin="$(command -v fnva | head -n 1)"
-    if [[ -z "$__fnva_bin" || ! -x "$__fnva_bin" ]]; then
+    local __fnva_bin="${FNVA_SHIM}"
+    if [[ ! -x "$__fnva_bin" ]]; then
         echo "fnva: binary not found in PATH" >&2
         return 127
     fi
@@ -108,8 +110,8 @@ function getFishFunction() {
   return `
 # fnva auto integration (added by npm install)
 function fnva
-    set __fnva_bin (command -v fnva | head -n 1)
-    if test -z "$__fnva_bin"
+    set __fnva_bin "${FNVA_SHIM}"
+    if test ! -x "$__fnva_bin"
         echo "fnva: binary not found in PATH" >&2
         return 127
     end
@@ -239,4 +241,4 @@ module.exports = {
   getShellFunction,
   isFunctionInstalled,
   installShellIntegration,
-};
+};

package/platforms/skip.txt

@@ -1 +0,0 @@
-Skipping cross-compiled build for aarch64-unknown-linux-gnu