roxify 1.5.7 → 1.5.9

package/dist/utils/native.js

@@ -1,7 +1,8 @@
 import { arch, platform } from 'os';
-import { join, dirname } from 'path';
+import { join, dirname, resolve } from 'path';
 import { createRequire } from 'module';
 import { fileURLToPath } from 'url';
+import { existsSync } from 'fs';
 function getNativeModule() {
     let moduleDir;
     let nativeRequire;
@@ -12,11 +13,24 @@ function getNativeModule() {
         nativeRequire = require;
     }
     else {
-        // Mode ESM - utiliser import.meta.url
-        // @ts-ignore - import.meta.url existe en ESM
-        const __filename = fileURLToPath(import.meta.url);
-        moduleDir = dirname(__filename);
-        nativeRequire = createRequire(import.meta.url);
+        // Try ESM import.meta.url first (may throw in CJS/bundled contexts), otherwise fallback to CWD
+        try {
+            // @ts-ignore - import.meta.url exists in proper ESM contexts
+            const __filename = fileURLToPath(import.meta.url);
+            moduleDir = dirname(__filename);
+            nativeRequire = createRequire(import.meta.url);
+        }
+        catch {
+            // Fallback (bundled CJS without __dirname): use current working directory
+            moduleDir = process.cwd();
+            try {
+                // @ts-ignore
+                nativeRequire = require;
+            }
+            catch {
+                nativeRequire = createRequire(process.cwd());
+            }
+        }
     }
     function getNativePath() {
         const platformMap = {
@@ -41,36 +55,64 @@ function getNativeModule() {
         }
         const prebuiltPath = join(moduleDir, '../../libroxify_native.node');
         const bundlePath = join(moduleDir, '../libroxify_native.node');
-        const targetPath = join(moduleDir, `../../libroxify_native-${target}.${ext}`);
-        const targetAltPath = targetAlt
-            ? join(moduleDir, `../../libroxify_native-${targetAlt}.${ext}`)
-            : null;
-        try {
-            return nativeRequire.resolve(prebuiltPath);
+        // compute repo root by walking up from moduleDir (fallback to process.cwd())
+        // @ts-ignore
+        console.debug('[native] moduleDir', moduleDir);
+        let root = moduleDir && moduleDir !== '.' ? moduleDir : process.cwd();
+        while (root.length > 1 && !existsSync(resolve(root, 'package.json')) && !existsSync(resolve(root, 'Cargo.toml'))) {
+            const parent = resolve(root, '..');
+            if (parent === root)
+                break;
+            root = parent;
         }
-        catch {
+        const localTargetRelease = resolve(root, `target/release/libroxify_native${ext === 'node' ? '.node' : `-${target}.${ext}`}`);
+        const localReleaseGeneric = resolve(root, 'target/release/libroxify_native.so');
+        const nodeModulesBase = resolve(root, 'node_modules/roxify');
+        const nodeModulesTarget = resolve(nodeModulesBase, `libroxify_native-${target}.${ext}`);
+        const nodeModulesGeneric = resolve(nodeModulesBase, ext === 'node' ? 'libroxify_native.node' : `libroxify_native.${ext}`);
+        const bundleTarget = resolve(moduleDir, `../libroxify_native-${target}.${ext}`);
+        const bundleGeneric = resolve(moduleDir, bundlePath);
+        const candidates = [
+            localTargetRelease,
+            localReleaseGeneric,
+            nodeModulesTarget,
+            nodeModulesGeneric,
+            bundleTarget,
+            bundleGeneric,
+            prebuiltPath,
+        ];
+        // use built-in fs.existsSync (static import to work in ESM and CJS)
+        for (const c of candidates) {
             try {
-                return nativeRequire.resolve(bundlePath);
-            }
-            catch {
-                try {
-                    return nativeRequire.resolve(targetPath);
-                }
-                catch {
-                    if (targetAltPath) {
-                        try {
-                            return nativeRequire.resolve(targetAltPath);
-                        }
-                        catch {
-                            throw new Error(`Native module not found for ${currentPlatform}-${arch()}. ` +
-                                `Expected: ${prebuiltPath} or ${bundlePath} or ${targetPath} or ${targetAltPath}`);
+                if (!existsSync(c))
+                    continue;
+                // If it's a .so (native build) but Node expects .node extension, create a .node symlink
+                if (c.endsWith('.so')) {
+                    const nodeAlias = c.replace(/\.so$/, '.node');
+                    try {
+                        if (!existsSync(nodeAlias)) {
+                            // copy the .so to a .node so Node treats it as a native addon
+                            // @ts-ignore
+                            require('fs').copyFileSync(c, nodeAlias);
                         }
+                        // debug
+                        // @ts-ignore
+                        console.debug('[native] using node alias', nodeAlias);
+                        return nodeAlias;
+                    }
+                    catch (e) {
+                        // fallback to original .so (might fail to load via require)
+                        return c;
                     }
-                    throw new Error(`Native module not found for ${currentPlatform}-${arch()}. ` +
-                        `Expected: ${prebuiltPath} or ${bundlePath} or ${targetPath}`);
                 }
+                // debug
+                // @ts-ignore
+                console.debug('[native] using path', c);
+                return c;
             }
+            catch { }
         }
+        throw new Error(`Native module not found for ${currentPlatform}-${arch()}. Checked: ${candidates.join(' ')}`);
     }
     return nativeRequire(getNativePath());
 }

package/dist/utils/rust-cli-wrapper.js

@@ -2,8 +2,22 @@ import { spawn } from 'child_process';
 import { existsSync } from 'fs';
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+let moduleDir;
+try {
+    // CJS bundlers may provide __dirname; prefer it when available
+    if (typeof __dirname !== 'undefined') {
+        // @ts-ignore
+        moduleDir = __dirname;
+    }
+    else {
+        // @ts-ignore - import.meta.url exists in ESM
+        const __filename = fileURLToPath(import.meta.url);
+        moduleDir = dirname(__filename);
+    }
+}
+catch {
+    moduleDir = process.cwd();
+}
 function findRustBinary() {
     const candidates = [];
     const binNames = process.platform === 'win32'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roxify",
-  "version": "1.5.7",
+  "version": "1.5.9",
   "description": "Ultra-lightweight PNG steganography with native Rust acceleration. Encode binary data into PNG images with zstd compression.",
   "type": "module",
   "main": "dist/index.js",