@ericsanchezok/synergy 1.2.2 → 1.2.3

package/bin/platform-package.cjs

@@ -0,0 +1,124 @@
+const childProcess = require("child_process")
+const fs = require("fs")
+const os = require("os")
+const path = require("path")
+
+function mapPlatform(input) {
+  switch (input) {
+    case "darwin":
+      return "darwin"
+    case "linux":
+      return "linux"
+    case "win32":
+      return "windows"
+    default:
+      return input
+  }
+}
+
+function mapArch(input) {
+  switch (input) {
+    case "x64":
+      return "x64"
+    case "arm64":
+      return "arm64"
+    case "arm":
+      return "arm"
+    default:
+      return input
+  }
+}
+
+function commandOutput(command, args) {
+  try {
+    const result = childProcess.spawnSync(command, args, {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "pipe"],
+    })
+    if (result.error) return ""
+    return `${result.stdout || ""}${result.stderr || ""}`
+  } catch {
+    return ""
+  }
+}
+
+function detectArch(platform, arch) {
+  if (platform === "darwin" && arch === "x64") {
+    const translated = commandOutput("sysctl", ["-n", "sysctl.proc_translated"]).trim()
+    if (translated === "1") return "arm64"
+  }
+  return arch
+}
+
+function detectMusl(platform) {
+  if (platform !== "linux") return false
+  if (fs.existsSync("/etc/alpine-release")) return true
+  return /musl/i.test(commandOutput("ldd", ["--version"]))
+}
+
+function detectBaseline(platform, arch) {
+  if (arch !== "x64") return false
+  if (platform === "linux") {
+    try {
+      return !/avx2/i.test(fs.readFileSync("/proc/cpuinfo", "utf8"))
+    } catch {
+      return false
+    }
+  }
+  if (platform === "darwin") {
+    return commandOutput("sysctl", ["-n", "hw.optional.avx2_0"]).trim() !== "1"
+  }
+  return false
+}
+
+function detectRuntimeTarget() {
+  const platform = mapPlatform(os.platform())
+  const arch = detectArch(platform, mapArch(os.arch()))
+  return {
+    platform,
+    arch,
+    musl: detectMusl(platform),
+    baseline: detectBaseline(platform, arch),
+  }
+}
+
+function candidatePackageNames(scope = "@ericsanchezok") {
+  const target = detectRuntimeTarget()
+  const base = `${scope}/synergy-${target.platform}-${target.arch}`
+  const candidates = []
+
+  if (target.baseline && target.musl) candidates.push(`${base}-baseline-musl`)
+  if (target.musl) candidates.push(`${base}-musl`)
+  if (target.baseline) candidates.push(`${base}-baseline`)
+  candidates.push(base)
+
+  return [...new Set(candidates)]
+}
+
+function packageBinaryName() {
+  return os.platform() === "win32" ? "synergy.exe" : "synergy"
+}
+
+function findInstalledBinary(startDir) {
+  const binary = packageBinaryName()
+  let current = startDir
+  for (;;) {
+    const modules = path.join(current, "node_modules")
+    if (fs.existsSync(modules)) {
+      for (const packageName of candidatePackageNames()) {
+        const candidate = path.join(modules, packageName, "bin", binary)
+        if (fs.existsSync(candidate)) return candidate
+      }
+    }
+    const parent = path.dirname(current)
+    if (parent === current) return
+    current = parent
+  }
+}
+
+module.exports = {
+  candidatePackageNames,
+  detectRuntimeTarget,
+  findInstalledBinary,
+  packageBinaryName,
+}

package/bin/synergy

@@ -3,7 +3,6 @@
 const childProcess = require("child_process")
 const fs = require("fs")
 const path = require("path")
-const os = require("os")
 
 function run(target) {
   const result = childProcess.spawnSync(target, process.argv.slice(2), {
@@ -25,65 +24,14 @@ 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",
-}
-
-let platform = platformMap[os.platform()]
-if (!platform) {
-  platform = os.platform()
-}
-let arch = archMap[os.arch()]
-if (!arch) {
-  arch = os.arch()
-}
-const base = "synergy-" + platform + "-" + arch
-const scopedBase = "@ericsanchezok/" + base
-const binary = platform === "windows" ? "synergy.exe" : "synergy"
-
-function findBinary(startDir) {
-  let current = startDir
-  for (;;) {
-    const modules = path.join(current, "node_modules")
-    if (fs.existsSync(modules)) {
-      // Check scoped package first (@ericsanchezok/synergy-windows-x64)
-      const scopedCandidate = path.join(modules, scopedBase, "bin", binary)
-      if (fs.existsSync(scopedCandidate)) {
-        return scopedCandidate
-      }
-      // Fallback: check non-scoped packages
-      const entries = fs.readdirSync(modules)
-      for (const entry of entries) {
-        if (!entry.startsWith(base)) {
-          continue
-        }
-        const candidate = path.join(modules, entry, "bin", binary)
-        if (fs.existsSync(candidate)) {
-          return candidate
-        }
-      }
-    }
-    const parent = path.dirname(current)
-    if (parent === current) {
-      return
-    }
-    current = parent
-  }
-}
+const { findInstalledBinary, candidatePackageNames } = require(path.join(scriptDir, "platform-package.cjs"))
 
-const resolved = findBinary(scriptDir)
+const resolved = findInstalledBinary(scriptDir)
 if (!resolved) {
+  const names = candidatePackageNames()
   console.error(
-    'It seems that your package manager failed to install the right version of the Synergy CLI for your platform. You can try manually installing the "' +
-      scopedBase +
-      '" package',
+    "It seems that your package manager failed to install the right version of the Synergy CLI for your platform. You can try manually installing one of: " +
+      names.join(", "),
   )
   process.exit(1)
 }

package/package.json

@@ -6,19 +6,19 @@
   "scripts": {
     "postinstall": "bun ./postinstall.mjs || node ./postinstall.mjs"
   },
-  "version": "1.2.2",
+  "version": "1.2.3",
   "optionalDependencies": {
-    "@ericsanchezok/synergy-linux-x64-baseline": "1.2.2",
-    "@ericsanchezok/synergy-darwin-x64": "1.2.2",
-    "@ericsanchezok/synergy-linux-arm64": "1.2.2",
-    "@ericsanchezok/synergy-windows-x64-baseline": "1.2.2",
-    "@ericsanchezok/synergy-darwin-x64-baseline": "1.2.2",
-    "@ericsanchezok/synergy-windows-x64": "1.2.2",
-    "@ericsanchezok/synergy-linux-arm64-musl": "1.2.2",
-    "@ericsanchezok/synergy-linux-x64-baseline-musl": "1.2.2",
-    "@ericsanchezok/synergy-darwin-arm64": "1.2.2",
-    "@ericsanchezok/synergy-linux-x64-musl": "1.2.2",
-    "@ericsanchezok/synergy-linux-x64": "1.2.2"
+    "@ericsanchezok/synergy-linux-x64-baseline": "1.2.3",
+    "@ericsanchezok/synergy-darwin-x64": "1.2.3",
+    "@ericsanchezok/synergy-linux-arm64": "1.2.3",
+    "@ericsanchezok/synergy-windows-x64-baseline": "1.2.3",
+    "@ericsanchezok/synergy-darwin-x64-baseline": "1.2.3",
+    "@ericsanchezok/synergy-windows-x64": "1.2.3",
+    "@ericsanchezok/synergy-linux-arm64-musl": "1.2.3",
+    "@ericsanchezok/synergy-linux-x64-baseline-musl": "1.2.3",
+    "@ericsanchezok/synergy-darwin-arm64": "1.2.3",
+    "@ericsanchezok/synergy-linux-x64-musl": "1.2.3",
+    "@ericsanchezok/synergy-linux-x64": "1.2.3"
   },
   "repository": {
     "type": "git",

package/postinstall.mjs

@@ -9,63 +9,26 @@ 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 }
-}
+// Load shared platform detection from platform-package.cjs (co-located in bin/)
+const platformPkg = require(path.join(__dirname, "bin/platform-package.cjs"))
 
 function findBinary() {
-  const { platform, arch } = detectPlatformAndArch()
-  const packageName = `@ericsanchezok/synergy-${platform}-${arch}`
-  const binaryName = platform === "windows" ? "synergy.exe" : "synergy"
-
-  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}`)
+  const candidates = platformPkg.candidatePackageNames()
+  const binaryName = platformPkg.packageBinaryName()
+
+  for (const packageName of candidates) {
+    try {
+      const packageJsonPath = require.resolve(`${packageName}/package.json`)
+      const packageDir = path.dirname(packageJsonPath)
+      const binaryPath = path.join(packageDir, "bin", binaryName)
+
+      if (fs.existsSync(binaryPath)) {
+        return { binaryPath, binaryName }
+      }
+    } catch {}
   }
+
+  throw new Error(`Could not find a platform package for this system. Tried: ${candidates.join(", ")}`)
 }
 
 function prepareBinDirectory(binaryName) {