@nubjs/nub 0.0.9 → 0.0.11

package/bin/launch.js

@@ -12,38 +12,17 @@
 // crates/nub-cli/src/cli.rs Argv0::detect). spawnSync's `argv0` option sets that
 // basename for the child without changing process.execPath, so the binary still
 // resolves its sibling runtime/ directory by walking up from its real location.
-const { spawnSync, execSync } = require("child_process");
-
-const PLATFORMS = {
-  "darwin-arm64": "@nubjs/nub-darwin-arm64",
-  "darwin-x64": "@nubjs/nub-darwin-x64",
-  "linux-x64": "@nubjs/nub-linux-x64",
-  "linux-x64-musl": "@nubjs/nub-linux-x64-musl",
-  "linux-arm64": "@nubjs/nub-linux-arm64",
-  "linux-arm64-musl": "@nubjs/nub-linux-arm64-musl",
-  "win32-x64": "@nubjs/nub-win32-x64",
-  "win32-arm64": "@nubjs/nub-win32-arm64",
-};
+const { spawnSync } = require("child_process");
+const { platformPackage } = require("../platform.js");
 
 function resolveBinary() {
-  const { platform, arch } = process;
-  const isMusl =
-    platform === "linux" &&
-    (() => {
-      try {
-        return execSync("ldd --version 2>&1", { encoding: "utf8" }).includes("musl");
-      } catch (e) {
-        return ((e && e.stderr) || "").toString().includes("musl");
-      }
-    })();
-  const key = `${platform}-${arch}${isMusl ? "-musl" : ""}`;
-  const pkg = PLATFORMS[key];
+  const { key, pkg } = platformPackage();
   if (!pkg) {
-    console.error(`@nubjs/nub: no prebuilt binary for ${platform}-${arch}`);
+    console.error(`@nubjs/nub: no prebuilt binary for ${key}`);
     process.exit(1);
   }
   try {
-    return require.resolve(`${pkg}/bin/nub${platform === "win32" ? ".exe" : ""}`);
+    return require.resolve(`${pkg}/bin/nub${process.platform === "win32" ? ".exe" : ""}`);
   } catch {
     console.error(`@nubjs/nub: the ${pkg} package is not installed. Try: npm rebuild @nubjs/nub`);
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nubjs/nub",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "TypeScript-first developer supertool — a fast script runner and TS runtime powered by Node.js",
   "license": "MIT",
   "repository": "https://github.com/colinhacks/nub",
@@ -11,19 +11,20 @@
   },
   "files": [
     "bin",
+    "platform.js",
     "postinstall.js"
   ],
   "scripts": {
     "postinstall": "node postinstall.js"
   },
   "optionalDependencies": {
-    "@nubjs/nub-darwin-arm64": "0.0.9",
-    "@nubjs/nub-darwin-x64": "0.0.9",
-    "@nubjs/nub-linux-x64": "0.0.9",
-    "@nubjs/nub-linux-x64-musl": "0.0.9",
-    "@nubjs/nub-linux-arm64": "0.0.9",
-    "@nubjs/nub-linux-arm64-musl": "0.0.9",
-    "@nubjs/nub-win32-x64": "0.0.9",
-    "@nubjs/nub-win32-arm64": "0.0.9"
+    "@nubjs/nub-darwin-arm64": "0.0.11",
+    "@nubjs/nub-darwin-x64": "0.0.11",
+    "@nubjs/nub-linux-x64": "0.0.11",
+    "@nubjs/nub-linux-x64-musl": "0.0.11",
+    "@nubjs/nub-linux-arm64": "0.0.11",
+    "@nubjs/nub-linux-arm64-musl": "0.0.11",
+    "@nubjs/nub-win32-x64": "0.0.11",
+    "@nubjs/nub-win32-arm64": "0.0.11"
   }
 }

package/platform.js

@@ -0,0 +1,52 @@
+"use strict";
+// Platform → @nubjs/nub-<platform> package selection, shared by postinstall.js
+// (install-time symlink/copy of the native binary) and bin/launch.js (runtime
+// spawn). Keep the musl detection in ONE place — it shipped wrong in 0.0.10
+// duplicated across both files (see isMusl below).
+
+const PLATFORMS = {
+  "darwin-arm64": "@nubjs/nub-darwin-arm64",
+  "darwin-x64": "@nubjs/nub-darwin-x64",
+  "linux-x64": "@nubjs/nub-linux-x64",
+  "linux-x64-musl": "@nubjs/nub-linux-x64-musl",
+  "linux-arm64": "@nubjs/nub-linux-arm64",
+  "linux-arm64-musl": "@nubjs/nub-linux-arm64-musl",
+  "win32-x64": "@nubjs/nub-win32-x64",
+  "win32-arm64": "@nubjs/nub-win32-arm64",
+};
+
+// True on a musl Linux (Alpine, etc.), where the `-musl` platform package is the
+// one npm installs and the one the binary must come from.
+//
+// Primary signal: Node's own diagnostic report. `header.glibcVersionRuntime` is
+// present on glibc and ABSENT on musl — no subprocess, and what detect-libc keys
+// on. Fallback: `ldd --version`, which on musl exits NON-ZERO and prints
+// "musl libc …". 0.0.10 shipped a detection that, in that throw path, checked only
+// `e.stderr` — but with `2>&1` the text lands in `e.stdout`, so musl read as glibc
+// and the launcher resolved the wrong (uninstalled) package. Check the merged output.
+function isMusl() {
+  if (process.platform !== "linux") return false;
+  try {
+    const report = process.report.getReport();
+    const header = (typeof report === "string" ? JSON.parse(report) : report).header;
+    if (header && "glibcVersionRuntime" in header) {
+      return !header.glibcVersionRuntime;
+    }
+  } catch {
+    // process.report unavailable — fall through to ldd.
+  }
+  try {
+    const out = require("child_process").execSync("ldd --version 2>&1", { encoding: "utf8" });
+    return out.includes("musl");
+  } catch (e) {
+    return (((e && e.stdout) || "") + ((e && e.stderr) || "")).includes("musl");
+  }
+}
+
+// { key, pkg }. `pkg` is undefined for an unsupported platform.
+function platformPackage() {
+  const key = `${process.platform}-${process.arch}${isMusl() ? "-musl" : ""}`;
+  return { key, pkg: PLATFORMS[key] };
+}
+
+module.exports = { PLATFORMS, isMusl, platformPackage };

package/postinstall.js

@@ -1,31 +1,12 @@
-const { platform, arch } = process;
+const { platform } = process;
 const { mkdirSync, unlinkSync, symlinkSync, copyFileSync, chmodSync } = require("fs");
 const { join } = require("path");
+const { platformPackage } = require("./platform.js");
 
-const PLATFORMS = {
-  "darwin-arm64": "@nubjs/nub-darwin-arm64",
-  "darwin-x64": "@nubjs/nub-darwin-x64",
-  "linux-x64": "@nubjs/nub-linux-x64",
-  "linux-x64-musl": "@nubjs/nub-linux-x64-musl",
-  "linux-arm64": "@nubjs/nub-linux-arm64",
-  "linux-arm64-musl": "@nubjs/nub-linux-arm64-musl",
-  "win32-x64": "@nubjs/nub-win32-x64",
-  "win32-arm64": "@nubjs/nub-win32-arm64",
-};
-
-const isMusl = platform === "linux" && (() => {
-  try {
-    return require("child_process").execSync("ldd --version 2>&1", { encoding: "utf8" }).includes("musl");
-  } catch (e) {
-    return (e.stderr || "").includes("musl");
-  }
-})();
-
-const key = `${platform}-${arch}${isMusl ? "-musl" : ""}`;
-const pkg = PLATFORMS[key];
+const { key, pkg } = platformPackage();
 
 if (!pkg) {
-  console.error(`@nubjs/nub: no prebuilt binary for ${platform}-${arch}`);
+  console.error(`@nubjs/nub: no prebuilt binary for ${key}`);
   process.exit(0);
 }