roxify 1.7.0 → 1.7.1

package/dist/utils/native.js

@@ -1,13 +1,44 @@
-import { existsSync } from 'fs';
+import { copyFileSync, existsSync } from 'fs';
 import { createRequire } from 'module';
 import { arch, platform } from 'os';
-import { dirname, join, resolve } from 'path';
+import { dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';
+/**
+ * Returns the Rust target triple(s) for the current OS + architecture.
+ * Multiple triples are returned when there are alternative toolchains
+ * (e.g. windows-msvc and windows-gnu).
+ */
+function getTargetTriples() {
+    const os = platform();
+    const cpu = arch();
+    const map = {
+        linux: {
+            x64: ['x86_64-unknown-linux-gnu'],
+            ia32: ['i686-unknown-linux-gnu'],
+            arm64: ['aarch64-unknown-linux-gnu'],
+            arm: ['armv7-unknown-linux-gnueabihf'],
+        },
+        win32: {
+            x64: ['x86_64-pc-windows-msvc', 'x86_64-pc-windows-gnu'],
+            ia32: ['i686-pc-windows-msvc', 'i686-pc-windows-gnu'],
+            arm64: ['aarch64-pc-windows-msvc'],
+        },
+        darwin: {
+            x64: ['x86_64-apple-darwin'],
+            arm64: ['aarch64-apple-darwin'],
+        },
+    };
+    const archMap = map[os];
+    if (!archMap)
+        throw new Error(`Unsupported OS: ${os}`);
+    const triples = archMap[cpu];
+    if (!triples)
+        throw new Error(`Unsupported architecture: ${os}-${cpu}`);
+    return triples;
+}
 function getNativeModule() {
     let moduleDir;
     let nativeRequire;
-    // In ESM, __dirname is not available — derive it from import.meta.url
-    // which always points to the actual file location on disk.
     const esmFilename = fileURLToPath(import.meta.url);
     const esmDirname = dirname(esmFilename);
     if (typeof __dirname !== 'undefined') {
@@ -24,32 +55,8 @@ function getNativeModule() {
         }
     }
     function getNativePath() {
-        const platformMap = {
-            linux: 'x86_64-unknown-linux-gnu',
-            darwin: arch() === 'arm64' ? 'aarch64-apple-darwin' : 'x86_64-apple-darwin',
-            win32: 'x86_64-pc-windows-gnu',
-        };
-        const platformAltMap = {
-            win32: 'x86_64-pc-windows-msvc',
-        };
-        const extMap = {
-            linux: 'so',
-            darwin: 'dylib',
-            win32: 'node',
-        };
-        const currentPlatform = platform();
-        const target = platformMap[currentPlatform];
-        const targetAlt = platformAltMap[currentPlatform];
-        const ext = extMap[currentPlatform];
-        if (!target || !ext) {
-            throw new Error(`Unsupported platform: ${currentPlatform}`);
-        }
-        const prebuiltPath = join(moduleDir, '../../roxify_native.node');
-        const prebuiltLibPath = join(moduleDir, '../../libroxify_native.node');
-        const bundlePath = join(moduleDir, '../roxify_native.node');
-        const bundleLibPath = join(moduleDir, '../libroxify_native.node');
-        const bundlePathWithTarget = join(moduleDir, `../roxify_native-${target}.node`);
-        const bundleLibPathWithTarget = join(moduleDir, `../libroxify_native-${target}.node`);
+        const triples = getTargetTriples();
+        // Walk up to find repository / package root
         let root = moduleDir && moduleDir !== '.' ? moduleDir : process.cwd();
         while (root.length > 1 &&
             !existsSync(resolve(root, 'package.json')) &&
@@ -59,50 +66,66 @@ function getNativeModule() {
                 break;
             root = parent;
         }
-        const bundleNode = resolve(moduleDir, '../roxify_native.node');
-        const bundleLibNode = resolve(moduleDir, '../libroxify_native.node');
-        const bundleNodeWithTarget = resolve(moduleDir, `../roxify_native-${target}.node`);
-        const bundleLibNodeWithTarget = resolve(moduleDir, `../libroxify_native-${target}.node`);
-        const repoNode = resolve(root, 'roxify_native.node');
-        const repoLibNode = resolve(root, 'libroxify_native.node');
-        const repoNodeWithTarget = resolve(root, `roxify_native-${target}.node`);
-        const repoLibNodeWithTarget = resolve(root, `libroxify_native-${target}.node`);
-        const targetNode = resolve(root, 'target/release/roxify_native.node');
-        const targetSo = resolve(root, 'target/release/roxify_native.so');
-        const targetLibSo = resolve(root, 'target/release/libroxify_native.so');
-        const nodeModulesNode = resolve(root, 'node_modules/roxify/roxify_native.node');
-        const nodeModulesNodeWithTarget = resolve(root, `node_modules/roxify/roxify_native-${target}.node`);
-        const prebuiltNode = resolve(moduleDir, '../../roxify_native.node');
-        const prebuiltLibNode = resolve(moduleDir, '../../libroxify_native.node');
-        const prebuiltNodeWithTarget = resolve(moduleDir, `../../roxify_native-${target}.node`);
-        const prebuiltLibNodeWithTarget = resolve(moduleDir, `../../libroxify_native-${target}.node`);
-        // Support multiple possible OS triples (e.g. windows-gnu and windows-msvc)
-        const targets = targetAlt ? [target, targetAlt] : [target];
+        // --- 1. Platform-specific candidates (checked FIRST) ---
+        // These are the ONLY safe candidates — they match the current OS+arch.
         const candidates = [];
-        for (const t of targets) {
-            const bundleNodeWithT = resolve(moduleDir, `../roxify_native-${t}.node`);
-            const bundleLibNodeWithT = resolve(moduleDir, `../libroxify_native-${t}.node`);
-            const repoNodeWithT = resolve(root, `roxify_native-${t}.node`);
-            const repoLibNodeWithT = resolve(root, `libroxify_native-${t}.node`);
-            const nodeModulesNodeWithT = resolve(root, `node_modules/roxify/roxify_native-${t}.node`);
-            const prebuiltNodeWithT = resolve(moduleDir, `../../roxify_native-${t}.node`);
-            const prebuiltLibNodeWithT = resolve(moduleDir, `../../libroxify_native-${t}.node`);
-            candidates.push(bundleLibNodeWithT, bundleNodeWithT, repoLibNodeWithT, repoNodeWithT, nodeModulesNodeWithT, prebuiltLibNodeWithT, prebuiltNodeWithT);
+        for (const triple of triples) {
+            const name = `roxify_native-${triple}.node`;
+            const libName = `libroxify_native-${triple}.node`;
+            candidates.push(
+            // dist/ sibling (npm-installed package)
+            resolve(moduleDir, '..', name), resolve(moduleDir, '..', libName), 
+            // package root
+            resolve(root, name), resolve(root, libName), 
+            // node_modules/roxify/
+            resolve(root, 'node_modules', 'roxify', name), resolve(root, 'node_modules', 'roxify', libName), 
+            // two levels up (global npm install)
+            resolve(moduleDir, '..', '..', name), resolve(moduleDir, '..', '..', libName));
         }
-        candidates.push(bundleLibNode, bundleNode, repoLibNode, repoNode, targetNode, targetLibSo, targetSo, nodeModulesNode, prebuiltLibNode, prebuiltNode);
+        // --- 2. Build output candidates (local dev) ---
+        for (const triple of triples) {
+            for (const profile of ['release', 'fastdev']) {
+                // Unix: libroxify_native.so / .dylib → renamed to .node
+                candidates.push(resolve(root, 'target', triple, profile, 'libroxify_native.so'));
+                candidates.push(resolve(root, 'target', triple, profile, 'libroxify_native.dylib'));
+                // Windows: roxify_native.dll
+                candidates.push(resolve(root, 'target', triple, profile, 'roxify_native.dll'));
+            }
+            // Default (non-cross-compiled) output
+            for (const profile of ['release', 'fastdev']) {
+                candidates.push(resolve(root, 'target', profile, 'libroxify_native.so'));
+                candidates.push(resolve(root, 'target', profile, 'libroxify_native.dylib'));
+                candidates.push(resolve(root, 'target', profile, 'roxify_native.dll'));
+                candidates.push(resolve(root, 'target', profile, 'roxify_native.node'));
+            }
+        }
+        // --- 3. Generic fallback names (ONLY if platform-specific not found) ---
+        // These are kept last intentionally: a generic roxify_native.node
+        // could be for the WRONG platform if multiple are shipped.
+        candidates.push(resolve(moduleDir, '..', 'roxify_native.node'), resolve(moduleDir, '..', 'libroxify_native.node'), resolve(root, 'roxify_native.node'), resolve(root, 'libroxify_native.node'), resolve(root, 'node_modules', 'roxify', 'roxify_native.node'), resolve(root, 'node_modules', 'roxify', 'libroxify_native.node'), resolve(moduleDir, '..', '..', 'roxify_native.node'), resolve(moduleDir, '..', '..', 'libroxify_native.node'));
+        // Deduplicate
+        const seen = new Set();
+        const unique = [];
         for (const c of candidates) {
+            if (!seen.has(c)) {
+                seen.add(c);
+                unique.push(c);
+            }
+        }
+        for (const c of unique) {
             try {
                 if (!existsSync(c))
                     continue;
-                if (c.endsWith('.so')) {
-                    const nodeAlias = c.replace(/\.so$/, '.node');
+                // .so/.dylib/.dll files need to be aliased as .node for require()
+                if (c.endsWith('.so') || c.endsWith('.dylib') || c.endsWith('.dll')) {
+                    const nodeAlias = c.replace(/\.(so|dylib|dll)$/, '.node');
                     try {
                         if (!existsSync(nodeAlias)) {
-                            require('fs').copyFileSync(c, nodeAlias);
+                            copyFileSync(c, nodeAlias);
                         }
                         return nodeAlias;
                     }
-                    catch (e) {
+                    catch {
                         return c;
                     }
                 }
@@ -110,7 +133,7 @@ function getNativeModule() {
             }
             catch { }
         }
-        throw new Error(`Native module not found for ${currentPlatform}-${arch()}. Checked: ${candidates.join(' ')}`);
+        throw new Error(`Native module not found for ${platform()}-${arch()} (triples: ${triples.join(', ')}). Searched ${unique.length} paths:\n${unique.join('\n')}`);
     }
     return nativeRequire(getNativePath());
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roxify",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "type": "module",
   "description": "Ultra-lightweight PNG steganography with native Rust acceleration. Encode binary data into PNG images with zstd compression.",
   "main": "dist/index.js",
@@ -13,10 +13,20 @@
     "dist",
     "roxify_native.node",
     "libroxify_native.node",
-    "roxify_native-x86_64-pc-windows-gnu.node",
-    "roxify_native-x86_64-pc-windows-msvc.node",
     "roxify_native-x86_64-unknown-linux-gnu.node",
+    "roxify_native-i686-unknown-linux-gnu.node",
+    "roxify_native-aarch64-unknown-linux-gnu.node",
+    "roxify_native-x86_64-apple-darwin.node",
+    "roxify_native-aarch64-apple-darwin.node",
+    "roxify_native-x86_64-pc-windows-msvc.node",
+    "roxify_native-i686-pc-windows-msvc.node",
+    "roxify_native-aarch64-pc-windows-msvc.node",
+    "roxify_native-x86_64-pc-windows-gnu.node",
     "libroxify_native-x86_64-unknown-linux-gnu.node",
+    "libroxify_native-i686-unknown-linux-gnu.node",
+    "libroxify_native-aarch64-unknown-linux-gnu.node",
+    "libroxify_native-x86_64-apple-darwin.node",
+    "libroxify_native-aarch64-apple-darwin.node",
     "README.md",
     "LICENSE"
   ],