asherah 4.0.0-beta.4 → 4.0.0-beta.5

package/npm/index.js

@@ -1,6 +1,24 @@
 const path = require('path');
 const os = require('os');
 
+// Detect musl libc (Alpine Linux, etc.)
+function isMusl() {
+  if (os.platform() !== 'linux') return false;
+  try {
+    // Node 18+: process.report.getReport() exposes glibc version
+    const report = process.report.getReport();
+    const header = typeof report === 'string' ? JSON.parse(report).header : report.header;
+    return !header.glibcVersionRuntime;
+  } catch {
+    // Fallback: check for musl dynamic linker
+    try {
+      return require('fs').readdirSync('/lib').some(f => f.startsWith('ld-musl-'));
+    } catch {
+      return false;
+    }
+  }
+}
+
 // Determine current platform
 function getPlatform() {
   const type = os.platform();
@@ -11,11 +29,13 @@ function getPlatform() {
     if (arch === 'arm64') return 'darwin-arm64';
   }
   if (type === 'linux') {
-    if (arch === 'x64') return 'linux-x64-gnu';
-    if (arch === 'arm64') return 'linux-arm64-gnu';
+    const libc = isMusl() ? 'musl' : 'gnu';
+    if (arch === 'x64') return `linux-x64-${libc}`;
+    if (arch === 'arm64') return `linux-arm64-${libc}`;
   }
   if (type === 'win32') {
     if (arch === 'x64') return 'win32-x64-msvc';
+    if (arch === 'arm64') return 'win32-arm64-msvc';
   }
 
   throw new Error(`Unsupported platform: ${type}-${arch}`);
@@ -23,17 +43,36 @@ function getPlatform() {
 
 const platform = getPlatform();
 
-// Try to load the native module
+// Map platform to npm package name (win32 needed a different name to avoid npm spam filter)
+const PLATFORM_PACKAGES = {
+  'darwin-arm64': 'asherah-darwin-arm64',
+  'darwin-x64': 'asherah-darwin-x64',
+  'linux-x64-gnu': 'asherah-linux-x64-gnu',
+  'linux-arm64-gnu': 'asherah-linux-arm64-gnu',
+  'linux-x64-musl': 'asherah-linux-x64-musl',
+  'linux-arm64-musl': 'asherah-linux-arm64-musl',
+  'win32-x64-msvc': 'asherah-windows-x64',
+  'win32-arm64-msvc': 'asherah-windows-arm64',
+};
+const packageName = PLATFORM_PACKAGES[platform] || `asherah-${platform}`;
+
+// Try to load the native module:
+// 1. Installed platform package (optionalDependency) — normal npm install
+// 2. Bundled in platform subdirectory — development / CI builds
+// 3. Legacy single-binary fallback
+let native = null;
+let lastErr = null;
+
 const attempts = [
-  // Platform-specific directory (for universal package)
+  // Platform package installed as optionalDependency (e.g., asherah-darwin-arm64)
+  packageName,
+  // Bundled in platform subdirectory (development builds)
   path.join(__dirname, platform, `index.${platform}.node`),
-  // Fallback to old single-binary location
+  // Fallback to old single-binary locations
   path.join(__dirname, 'asherah.node'),
   path.join(__dirname, '..', 'index.node'),
 ];
 
-let native = null;
-let lastErr = null;
 for (const candidate of attempts) {
   try {
     native = require(candidate);
@@ -53,7 +92,10 @@ for (const candidate of attempts) {
 
 if (!native) {
   const detail = lastErr ? `: ${lastErr.message || String(lastErr)}` : '';
-  throw new Error(`Failed to load Asherah native addon for ${platform}${detail}`);
+  throw new Error(
+    `Failed to load Asherah native addon for ${platform}. ` +
+    `Ensure the platform package '${packageName}' is installed${detail}`
+  );
 }
 
 // --- Canonical godaddy/asherah-node compatibility layer ---

package/package.json

@@ -1,20 +1,32 @@
 {
   "name": "asherah",
-  "version": "4.0.0-beta.4",
+  "version": "4.0.0-beta.5",
   "private": false,
   "description": "Asherah envelope encryption and key rotation library",
   "main": "npm/index.js",
   "types": "index.d.ts",
   "files": [
-    "npm/**/*",
+    "npm/index.js",
     "index.d.ts",
     "README.md",
     "LICENSE"
   ],
+  "napi": {
+    "binaryName": "index",
+    "targets": [
+      "x86_64-apple-darwin",
+      "aarch64-apple-darwin",
+      "x86_64-unknown-linux-gnu",
+      "aarch64-unknown-linux-gnu",
+      "x86_64-unknown-linux-musl",
+      "aarch64-unknown-linux-musl",
+      "x86_64-pc-windows-msvc",
+      "aarch64-pc-windows-msvc"
+    ]
+  },
   "scripts": {
     "build": "napi build",
     "build:release": "napi build --release",
-    "prepublishOnly": "napi prepublish -t npm",
     "test": "node test/roundtrip.js",
     "test:bun": "bun test/roundtrip.js"
   },
@@ -25,8 +37,13 @@
     "node": ">= 18"
   },
   "optionalDependencies": {
-    "asherah-win32-x64-msvc": "4.0.0-beta.4",
-    "asherah-darwin-x64": "4.0.0-beta.4",
-    "asherah-linux-x64-gnu": "4.0.0-beta.4"
+    "asherah-darwin-arm64": "4.0.0-beta.5",
+    "asherah-darwin-x64": "4.0.0-beta.5",
+    "asherah-linux-x64-gnu": "4.0.0-beta.5",
+    "asherah-linux-arm64-gnu": "4.0.0-beta.5",
+    "asherah-linux-x64-musl": "4.0.0-beta.5",
+    "asherah-linux-arm64-musl": "4.0.0-beta.5",
+    "asherah-windows-x64": "4.0.0-beta.5",
+    "asherah-windows-arm64": "4.0.0-beta.5"
   }
-}
+}