@synsci/openscience 1.2.4 → 1.2.6

package/bin/openscience

@@ -10,12 +10,18 @@ function run(target) {
   // Install dir stays as ~/.openscience/ until the path-migration follow-up PR.
   const openscienceDir = path.join(os.homedir(), ".openscience")
   for (const poison of ["package.json", ".gitignore", "bun.lockb", "bunfig.toml"]) {
-    try { fs.unlinkSync(path.join(openscienceDir, poison)) } catch {}
+    try {
+      fs.unlinkSync(path.join(openscienceDir, poison))
+    } catch {}
   }
-  try { fs.rmSync(path.join(openscienceDir, "node_modules"), { recursive: true }) } catch {}
+  try {
+    fs.rmSync(path.join(openscienceDir, "node_modules"), { recursive: true })
+  } catch {}
   // Clear macOS extended attributes that cause Bun binaries to hang
   if (os.platform() === "darwin") {
-    try { childProcess.spawnSync("xattr", ["-rc", openscienceDir], { stdio: "ignore" }) } catch {}
+    try {
+      childProcess.spawnSync("xattr", ["-rc", openscienceDir], { stdio: "ignore" })
+    } catch {}
   }
 
   const result = childProcess.spawnSync(target, process.argv.slice(2), {
@@ -61,6 +67,26 @@ const arch = archMap[os.arch()] || os.arch()
 const base = "openscience-" + platform + "-" + arch
 const scopedBase = "openscience-" + platform + "-" + arch
 
+// Rank matching platform packages instead of trusting readdir order (which
+// is filesystem-dependent): right libc first, exact name before suffixed
+// variants like -baseline, wrong libc only as a last resort.
+const musl = (() => {
+  if (platform !== "linux") return false
+  try {
+    return fs.readdirSync("/lib").some((f) => f.startsWith("ld-musl-"))
+  } catch {
+    return false
+  }
+})()
+function variantRank(prefix, entry) {
+  const entryMusl = entry.includes("-musl")
+  if (entryMusl !== musl) return 0
+  return entry === prefix || entry === prefix + "-musl" ? 2 : 1
+}
+function matchingVariants(prefix, entries) {
+  return entries.filter((e) => e.startsWith(prefix)).sort((a, b) => variantRank(prefix, b) - variantRank(prefix, a))
+}
+
 // 2. Search this install's node_modules for the matching platform package.
 // This must come before ~/.openscience or Homebrew fallbacks; otherwise an npm
 // install can accidentally launch an older globally-installed binary.
@@ -70,21 +96,17 @@ while (true) {
   if (fs.existsSync(modules)) {
     try {
       const entries = fs.readdirSync(modules)
-      for (const entry of entries) {
-        if (entry.startsWith(base)) {
-          const candidate = path.join(modules, entry, "bin", binary)
-          if (isBinary(candidate)) run(candidate)
-        }
+      for (const entry of matchingVariants(base, entries)) {
+        const candidate = path.join(modules, entry, "bin", binary)
+        if (isBinary(candidate)) run(candidate)
       }
       // Check scoped packages (@synsci/openscience-darwin-arm64)
       const scoped = path.join(modules, "@synsci")
       if (fs.existsSync(scoped)) {
         const scopedEntries = fs.readdirSync(scoped)
-        for (const entry of scopedEntries) {
-          if (entry.startsWith(scopedBase)) {
-            const candidate = path.join(scoped, entry, "bin", binary)
-            if (isBinary(candidate)) run(candidate)
-          }
+        for (const entry of matchingVariants(scopedBase, scopedEntries)) {
+          const candidate = path.join(scoped, entry, "bin", binary)
+          if (isBinary(candidate)) run(candidate)
         }
       }
     } catch {}
@@ -111,6 +133,6 @@ if (isBinary("/usr/local/bin/openscience")) {
 }
 
 console.error("openscience binary not found.")
-console.error("Install with: curl -fsSL https://syntheticsciences.ai/install | bash")
+console.error("Install with: curl -fsSL https://openscience.sh/install | bash")
 console.error("Or set OPENSCIENCE_BIN_PATH environment variable.")
 process.exit(1)

package/package.json

@@ -7,22 +7,22 @@
     "preinstall": "node ./preinstall.mjs || exit 0",
     "postinstall": "bun ./postinstall.mjs || node ./postinstall.mjs"
   },
-  "version": "1.2.4",
+  "version": "1.2.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/synthetic-sciences/openscience.git"
   },
   "optionalDependencies": {
-    "@synsci/openscience-linux-x64-baseline": "1.2.4",
-    "@synsci/openscience-linux-arm64": "1.2.4",
-    "@synsci/openscience-linux-x64": "1.2.4",
-    "@synsci/openscience-windows-x64": "1.2.4",
-    "@synsci/openscience-darwin-arm64": "1.2.4",
-    "@synsci/openscience-darwin-x64": "1.2.4",
-    "@synsci/openscience-linux-x64-baseline-musl": "1.2.4",
-    "@synsci/openscience-linux-x64-musl": "1.2.4",
-    "@synsci/openscience-linux-arm64-musl": "1.2.4",
-    "@synsci/openscience-windows-x64-baseline": "1.2.4",
-    "@synsci/openscience-darwin-x64-baseline": "1.2.4"
+    "@synsci/openscience-linux-x64-baseline": "1.2.6",
+    "@synsci/openscience-linux-arm64": "1.2.6",
+    "@synsci/openscience-linux-x64": "1.2.6",
+    "@synsci/openscience-windows-x64": "1.2.6",
+    "@synsci/openscience-darwin-arm64": "1.2.6",
+    "@synsci/openscience-darwin-x64": "1.2.6",
+    "@synsci/openscience-linux-x64-baseline-musl": "1.2.6",
+    "@synsci/openscience-linux-x64-musl": "1.2.6",
+    "@synsci/openscience-linux-arm64-musl": "1.2.6",
+    "@synsci/openscience-windows-x64-baseline": "1.2.6",
+    "@synsci/openscience-darwin-x64-baseline": "1.2.6"
   }
 }

package/postinstall.mjs

@@ -52,10 +52,7 @@ function findBinary() {
   const binaryName = platform === "windows" ? "openscience.exe" : "openscience"
 
   // Try scoped package first (@synsci/openscience-darwin-arm64), then unscoped (openscience-darwin-arm64)
-  const packageNames = [
-    `@synsci/openscience-${platform}-${arch}`,
-    `openscience-${platform}-${arch}`,
-  ]
+  const packageNames = [`@synsci/openscience-${platform}-${arch}`, `openscience-${platform}-${arch}`]
 
   for (const packageName of packageNames) {
     try {