dfcode 3.3.17 → 3.3.18

package/bin/dfcode

@@ -33,19 +33,21 @@ function run(target) {
 
 function resetTerminal() {
   if (!process.stdout.isTTY && process.env.DFCODE_FORCE_TERMINAL_RESET !== "1") return
-  process.stdout.write([
-    "\x1b[0m",
-    "\x1b[?25h",
-    "\x1b[?1000l",
-    "\x1b[?1002l",
-    "\x1b[?1003l",
-    "\x1b[?1004l",
-    "\x1b[?1005l",
-    "\x1b[?1006l",
-    "\x1b[?1015l",
-    "\x1b[?2004l",
-    "\x1b[?1049l",
-  ].join(""))
+  process.stdout.write(
+    [
+      "\x1b[0m",
+      "\x1b[?25h",
+      "\x1b[?1000l",
+      "\x1b[?1002l",
+      "\x1b[?1003l",
+      "\x1b[?1004l",
+      "\x1b[?1005l",
+      "\x1b[?1006l",
+      "\x1b[?1015l",
+      "\x1b[?2004l",
+      "\x1b[?1049l",
+    ].join(""),
+  )
 }
 
 const envPath = process.env.DFCODE_BIN_PATH
@@ -56,124 +58,19 @@ if (envPath) {
 const scriptPath = fs.realpathSync(__filename)
 const scriptDir = path.dirname(scriptPath)
 
-const platformMap = {
-  darwin: "darwin",
-  linux: "linux",
-  win32: "windows",
-}
-const archMap = {
-  x64: "x64",
-  arm64: "arm64",
-  arm: "arm",
-}
-
-const platformName = process.env.DFCODE_TEST_PLATFORM || os.platform()
-const archName = process.env.DFCODE_TEST_ARCH || os.arch()
-const platform = platformMap[platformName] || platformName
-const arch = archMap[archName] || archName
-const base = "dfcode-" + platform + "-" + arch
-const binary = platform === "windows" ? "dfcode.exe" : "dfcode"
-
-function supportsAvx2() {
-  if (arch !== "x64") return false
-
-  const override = process.env.DFCODE_TEST_AVX2
-  if (override === "1" || override === "true") return true
-  if (override === "0" || override === "false") return false
-
-  if (platform === "linux") {
-    const result = childProcess.spawnSync("cat", ["/proc/cpuinfo"], { encoding: "utf8" })
-    return result.status === 0 && /(^|\s)avx2(\s|$)/i.test(result.stdout || "")
-  }
-
-  if (platform === "darwin") {
-    const result = childProcess.spawnSync("sysctl", ["-n", "hw.optional.avx2_0"], {
-      encoding: "utf8",
-      timeout: 1500,
-    })
-    if (result.status !== 0) return false
-    return (result.stdout || "").trim() === "1"
-  }
-
-  if (platform === "windows") {
-    const command =
-      '(Add-Type -MemberDefinition "[DllImport(""kernel32.dll"")] public static extern bool IsProcessorFeaturePresent(int ProcessorFeature);" -Name Kernel32 -Namespace Win32 -PassThru)::IsProcessorFeaturePresent(40)'
-
-    for (const executable of ["powershell.exe", "pwsh.exe", "pwsh", "powershell"]) {
-      const result = childProcess.spawnSync(executable, ["-NoProfile", "-NonInteractive", "-Command", command], {
-        encoding: "utf8",
-        timeout: 3000,
-        windowsHide: true,
-      })
-      if (result.status !== 0 || result.error) continue
-      const output = (result.stdout || "").trim().toLowerCase()
-      if (output === "true" || output === "1") return true
-      if (output === "false" || output === "0") return false
-    }
-  }
-
-  return false
-}
-
-function isMusl() {
-  if (platform !== "linux") return false
-
-  const override = process.env.DFCODE_TEST_LIBC?.toLowerCase()
-  if (override) return override === "musl"
-
-  if (fs.existsSync("/etc/alpine-release")) return true
-
-  const result = childProcess.spawnSync("ldd", ["--version"], { encoding: "utf8" })
-  return `${result.stdout || ""}${result.stderr || ""}`.toLowerCase().includes("musl")
-}
-
-function packageNames() {
-  const baseline = arch === "x64" && !supportsAvx2()
-
-  if (platform === "linux") {
-    if (isMusl()) {
-      if (arch === "x64")
-        return baseline ? [`${base}-baseline-musl`] : [`${base}-musl`, `${base}-baseline-musl`]
-      return [`${base}-musl`]
-    }
-
-    if (arch === "x64") return baseline ? [`${base}-baseline`] : [base, `${base}-baseline`]
-    return [base]
-  }
-
-  if (arch === "x64") return baseline ? [`${base}-baseline`] : [base, `${base}-baseline`]
-  return [base]
-}
+const resolver = require(
+  fs.existsSync(path.join(scriptDir, "../platform.cjs"))
+    ? path.join(scriptDir, "../platform.cjs")
+    : path.join(scriptDir, "../script/platform.cjs"),
+)
 
 function findBinary(startDir) {
-  let current = startDir
-  const names = packageNames()
-  for (;;) {
-    const modules = path.join(current, "node_modules")
-    if (fs.existsSync(modules)) {
-      for (const name of names) {
-        const candidate = path.join(modules, name, "bin", binary)
-        if (fs.existsSync(candidate)) {
-          return candidate
-        }
-      }
-    }
-    const parent = path.dirname(current)
-    if (parent === current) {
-      return
-    }
-    current = parent
-  }
+  return resolver.findBinary(startDir).binaryPath
 }
 
-const resolved = findBinary(scriptDir)
-if (!resolved) {
-  console.error(
-    'It seems that your package manager failed to install the right version of the dfcode CLI for your platform. You can try manually installing the "' +
-      packageNames().join('" or "') +
-      '" package',
-  )
+try {
+  run(findBinary(scriptDir))
+} catch (error) {
+  console.error(error.message)
   process.exit(1)
 }
-
-run(resolved)

package/package.json

@@ -1,23 +1,32 @@
 {
   "name": "dfcode",
+  "version": "3.3.18",
+  "license": "MIT",
   "bin": {
     "dfcode": "./bin/dfcode"
   },
+  "engines": {
+    "node": ">=18"
+  },
   "scripts": {
-    "postinstall": "bun ./postinstall.mjs || node ./postinstall.mjs"
+    "postinstall": "node ./postinstall.mjs"
   },
-  "version": "3.3.17",
+  "files": [
+    "bin/dfcode",
+    "postinstall.mjs",
+    "platform.cjs"
+  ],
   "optionalDependencies": {
-    "dfcode-linux-arm64": "3.3.17",
-    "dfcode-linux-x64": "3.3.17",
-    "dfcode-linux-x64-baseline": "3.3.17",
-    "dfcode-linux-arm64-musl": "3.3.17",
-    "dfcode-linux-x64-musl": "3.3.17",
-    "dfcode-linux-x64-baseline-musl": "3.3.17",
-    "dfcode-darwin-arm64": "3.3.17",
-    "dfcode-darwin-x64": "3.3.17",
-    "dfcode-darwin-x64-baseline": "3.3.17",
-    "dfcode-windows-x64": "3.3.17",
-    "dfcode-windows-x64-baseline": "3.3.17"
+    "dfcode-darwin-arm64": "3.3.18",
+    "dfcode-darwin-x64": "3.3.18",
+    "dfcode-darwin-x64-baseline": "3.3.18",
+    "dfcode-linux-arm64": "3.3.18",
+    "dfcode-linux-arm64-musl": "3.3.18",
+    "dfcode-linux-x64": "3.3.18",
+    "dfcode-linux-x64-baseline": "3.3.18",
+    "dfcode-linux-x64-baseline-musl": "3.3.18",
+    "dfcode-linux-x64-musl": "3.3.18",
+    "dfcode-windows-x64": "3.3.18",
+    "dfcode-windows-x64-baseline": "3.3.18"
   }
-}
+}

package/platform.cjs

@@ -0,0 +1,126 @@
+const childProcess = require("child_process")
+const fs = require("fs")
+const os = require("os")
+const path = require("path")
+
+function probe(command, args, timeout = 1500) {
+  return childProcess.spawnSync(command, args, {
+    encoding: "utf8",
+    timeout,
+    killSignal: "SIGKILL",
+    maxBuffer: 1024 * 1024,
+    windowsHide: true,
+  })
+}
+
+function supportsAvx2(platform, arch) {
+  if (arch !== "x64") return false
+
+  // Trusted test fixtures use these overrides to exercise selection on one host.
+  const override = process.env.DFCODE_TEST_AVX2
+  if (override === "1" || override === "true") return true
+  if (override === "0" || override === "false") return false
+
+  if (platform === "linux") {
+    const result = probe("cat", ["/proc/cpuinfo"])
+    return !result.error && result.status === 0 && /(^|\s)avx2(\s|$)/i.test(result.stdout || "")
+  }
+
+  if (platform === "darwin") {
+    const result = probe("sysctl", ["-n", "hw.optional.avx2_0"])
+    return !result.error && result.status === 0 && (result.stdout || "").trim() === "1"
+  }
+
+  if (platform === "windows") {
+    const command =
+      '(Add-Type -MemberDefinition "[DllImport(""kernel32.dll"")] public static extern bool IsProcessorFeaturePresent(int ProcessorFeature);" -Name Kernel32 -Namespace Win32 -PassThru)::IsProcessorFeaturePresent(40)'
+    for (const executable of ["powershell.exe", "pwsh.exe", "pwsh", "powershell"]) {
+      const result = probe(executable, ["-NoProfile", "-NonInteractive", "-Command", command], 3000)
+      if (result.error || result.status !== 0) continue
+      const output = (result.stdout || "").trim().toLowerCase()
+      if (output === "true" || output === "1") return true
+      if (output === "false" || output === "0") return false
+    }
+  }
+
+  // An unavailable or inconclusive probe must never select an AVX2-only build.
+  return false
+}
+
+function isMusl(platform) {
+  if (platform !== "linux") return false
+  const override = process.env.DFCODE_TEST_LIBC?.toLowerCase()
+  if (override === "musl" || override === "glibc") return override === "musl"
+  if (fs.existsSync("/etc/alpine-release")) return true
+
+  const result = probe("ldd", ["--version"])
+  const output = `${result.stdout || ""}${result.stderr || ""}`.toLowerCase()
+  if (!result.error && output.includes("musl")) return true
+  if (!result.error && /glibc|gnu libc|gnu c library/.test(output)) return false
+  if (process.platform === "linux" && process.report?.getReport().header.glibcVersionRuntime) return false
+  throw new Error("Could not determine Linux libc; refusing to select an incompatible dfcode binary")
+}
+
+function target() {
+  const system = process.env.DFCODE_TEST_PLATFORM || os.platform()
+  const platform = system === "win32" ? "windows" : system
+  const arch = process.env.DFCODE_TEST_ARCH || os.arch()
+  const base = `dfcode-${platform}-${arch}`
+  const baseline = arch === "x64" && !supportsAvx2(platform, arch)
+  const suffix = isMusl(platform) ? "-musl" : ""
+  const names =
+    arch === "x64"
+      ? baseline
+        ? [`${base}-baseline${suffix}`]
+        : [`${base}${suffix}`, `${base}-baseline${suffix}`]
+      : [`${base}${suffix}`]
+  return { platform, names, binary: platform === "windows" ? "dfcode.exe" : "dfcode" }
+}
+
+function readPackage(file) {
+  try {
+    return JSON.parse(fs.readFileSync(file, "utf8"))
+  } catch {
+    return undefined
+  }
+}
+
+function roots(startDir) {
+  const result = []
+  for (let current = startDir; ; current = path.dirname(current)) {
+    result.push(current)
+    if (path.dirname(current) === current) return result
+  }
+}
+
+function findBinary(startDir) {
+  const selected = target()
+  const directories = roots(startDir)
+  const pkg = directories
+    .map((directory) => readPackage(path.join(directory, "package.json")))
+    .find((pkg) => pkg?.name === "dfcode" && typeof pkg.version === "string")
+  const expectedVersion = pkg?.version
+  const rejected = []
+
+  for (const directory of directories) {
+    for (const name of selected.names) {
+      const root = path.join(directory, "node_modules", name)
+      const binaryPath = path.join(root, "bin", selected.binary)
+      if (!fs.existsSync(binaryPath)) continue
+      const candidate = readPackage(path.join(root, "package.json"))
+      if (expectedVersion && (candidate?.name !== name || candidate?.version !== expectedVersion)) {
+        rejected.push(`${name}: expected ${expectedVersion}, found ${candidate?.version || "missing package metadata"}`)
+        continue
+      }
+      return { ...selected, binaryPath, name, version: candidate?.version, expectedVersion }
+    }
+  }
+
+  throw new Error(
+    `Could not find a compatible dfcode platform package${expectedVersion ? ` at version ${expectedVersion}` : ""}. ` +
+      `Install ${selected.names.map((name) => `"${name}${expectedVersion ? `@${expectedVersion}` : ""}"`).join(" or ")}.` +
+      (rejected.length ? ` Rejected packages: ${rejected.join("; ")}` : ""),
+  )
+}
+
+module.exports = { findBinary }

package/postinstall.mjs

@@ -1,125 +1,41 @@
 #!/usr/bin/env node
 
-import fs from "fs"
+import { spawnSync } from "child_process"
 import path from "path"
-import os from "os"
 import { fileURLToPath } from "url"
-import { createRequire } from "module"
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-const require = createRequire(import.meta.url)
-
-function detectPlatformAndArch() {
-  // Map platform names
-  let platform
-  switch (os.platform()) {
-    case "darwin":
-      platform = "darwin"
-      break
-    case "linux":
-      platform = "linux"
-      break
-    case "win32":
-      platform = "windows"
-      break
-    default:
-      platform = os.platform()
-      break
-  }
-
-  // Map architecture names
-  let arch
-  switch (os.arch()) {
-    case "x64":
-      arch = "x64"
-      break
-    case "arm64":
-      arch = "arm64"
-      break
-    case "arm":
-      arch = "arm"
-      break
-    default:
-      arch = os.arch()
-      break
-  }
-
-  return { platform, arch }
-}
-
-function findBinary() {
-  const { platform, arch } = detectPlatformAndArch()
-  const packageName = `dfcode-${platform}-${arch}`
-  const binaryName = platform === "windows" ? "dfcode.exe" : "dfcode"
-
-  try {
-    // Use require.resolve to find the package
-    const packageJsonPath = require.resolve(`${packageName}/package.json`)
-    const packageDir = path.dirname(packageJsonPath)
-    const binaryPath = path.join(packageDir, "bin", binaryName)
-
-    if (!fs.existsSync(binaryPath)) {
-      throw new Error(`Binary not found at ${binaryPath}`)
-    }
-
-    return { binaryPath, binaryName }
-  } catch (error) {
-    throw new Error(`Could not find package ${packageName}: ${error.message}`)
-  }
-}
-
-function prepareBinDirectory(binaryName) {
-  const binDir = path.join(__dirname, "bin")
-  const targetPath = path.join(binDir, binaryName)
-
-  // Ensure bin directory exists
-  if (!fs.existsSync(binDir)) {
-    fs.mkdirSync(binDir, { recursive: true })
-  }
-
-  // Remove existing binary/symlink if it exists
-  if (fs.existsSync(targetPath)) {
-    fs.unlinkSync(targetPath)
-  }
-
-  return { binDir, targetPath }
-}
-
-function symlinkBinary(sourcePath, binaryName) {
-  const { targetPath } = prepareBinDirectory(binaryName)
-
-  fs.symlinkSync(sourcePath, targetPath)
-  console.log(`dfcode binary symlinked: ${targetPath} -> ${sourcePath}`)
-
-  // Verify the file exists after operation
-  if (!fs.existsSync(targetPath)) {
-    throw new Error(`Failed to symlink binary to ${targetPath}`)
-  }
-}
-
-async function main() {
-  try {
-    if (os.platform() === "win32") {
-      // On Windows, the .exe is already included in the package and bin field points to it
-      // No postinstall setup needed
-      console.log("Windows detected: binary setup not needed (using packaged .exe)")
-      return
-    }
-
-    // On non-Windows platforms, just verify the binary package exists
-    // Don't replace the wrapper script - it handles binary execution
-    const { binaryPath } = findBinary()
-    console.log(`Platform binary verified at: ${binaryPath}`)
-    console.log("Wrapper script will handle binary execution")
-  } catch (error) {
-    console.error("Failed to setup dfcode binary:", error.message)
-    process.exit(1)
+import resolver from "./platform.cjs"
+
+const directory = path.dirname(fileURLToPath(import.meta.url))
+
+function main() {
+  const resolved = resolver.findBinary(directory)
+  if (!resolved.expectedVersion)
+    throw new Error("Could not determine the dfcode package version for installation verification")
+
+  const env = { ...process.env }
+  if (resolved.platform === "windows" && env.BUN_JSC_useJIT === undefined) env.BUN_JSC_useJIT = "0"
+  const result = spawnSync(resolved.binaryPath, ["--version"], {
+    encoding: "utf8",
+    timeout: 15000,
+    killSignal: "SIGKILL",
+    maxBuffer: 1024 * 1024,
+    windowsHide: true,
+    env,
+  })
+  if (result.error) throw new Error(`Could not run ${resolved.name} --version: ${result.error.message}`)
+  if (result.status !== 0) throw new Error(`${resolved.name} --version failed (${result.signal || result.status})`)
+  const version = (result.stdout || "").trim()
+  if (version !== resolved.expectedVersion) {
+    throw new Error(
+      `${resolved.name} reported version ${JSON.stringify(version)}; expected ${resolved.expectedVersion}`,
+    )
   }
+  console.log(`Verified ${resolved.name}@${version}: ${resolved.binaryPath}`)
 }
 
 try {
   main()
 } catch (error) {
-  console.error("Postinstall script error:", error.message)
-  process.exit(0)
+  console.error("Failed to verify dfcode installation:", error.message)
+  process.exit(1)
 }