roxify 1.6.1 → 1.6.4

package/dist/cli.js

@@ -6,7 +6,7 @@ import { DataFormatError, decodePngToBinary, encodeBinaryToPng, hasPassphraseInP
 import { packPathsGenerator, unpackBuffer } from './pack.js';
 import * as cliProgress from './stub-progress.js';
 import { encodeWithRustCLI, isRustBinaryAvailable, } from './utils/rust-cli-wrapper.js';
-const VERSION = '1.6.1';
+const VERSION = '1.6.2';
 function getDirectorySize(dirPath) {
     let totalSize = 0;
     try {

package/dist/utils/native.js

@@ -1,7 +1,8 @@
 import { existsSync } from 'fs';
 import { createRequire } from 'module';
 import { arch, platform } from 'os';
-import { join, resolve } from 'path';
+import { dirname, resolve } from 'path';
+import { fileURLToPath } from 'url';
 function getNativeModule() {
     let moduleDir;
     let nativeRequire;
@@ -10,12 +11,13 @@ function getNativeModule() {
         nativeRequire = require;
     }
     else {
-        moduleDir = process.cwd();
+        // ESM: derive module directory from this file's URL and create a require based on it
+        moduleDir = dirname(fileURLToPath(import.meta.url));
         try {
             nativeRequire = require;
         }
         catch {
-            nativeRequire = createRequire(process.cwd() + '/package.json');
+            nativeRequire = createRequire(import.meta.url);
         }
     }
     function getNativePath() {
@@ -39,13 +41,18 @@ function getNativeModule() {
         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`);
-        console.debug('[native] moduleDir', moduleDir);
+        const targets = targetAlt ? [target, targetAlt] : [target];
+        const candidates = [];
+        const pushIf = (...paths) => {
+            for (const p of paths)
+                candidates.push(p);
+        };
+        // Try multiple locations relative to the compiled JS file (dist),
+        // package root and common 'dist' directories used by packaging tools.
+        for (const t of targets) {
+            pushIf(resolve(moduleDir, `../roxify_native-${t}.node`), resolve(moduleDir, `../libroxify_native-${t}.node`), resolve(moduleDir, `../../roxify_native-${t}.node`), resolve(moduleDir, `../../libroxify_native-${t}.node`), resolve(moduleDir, `../dist/roxify_native-${t}.node`), resolve(moduleDir, `../../dist/roxify_native-${t}.node`));
+        }
+        pushIf(resolve(moduleDir, '../roxify_native.node'), resolve(moduleDir, '../libroxify_native.node'), resolve(moduleDir, '../../roxify_native.node'), resolve(moduleDir, '../../libroxify_native.node'), resolve(moduleDir, '../dist/roxify_native.node'), resolve(moduleDir, '../../dist/roxify_native.node'));
         let root = moduleDir && moduleDir !== '.' ? moduleDir : process.cwd();
         while (root.length > 1 &&
             !existsSync(resolve(root, 'package.json')) &&
@@ -55,38 +62,13 @@ 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];
-        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);
+            pushIf(resolve(root, `roxify_native-${t}.node`), resolve(root, `libroxify_native-${t}.node`), resolve(root, `dist/roxify_native-${t}.node`));
         }
-        candidates.push(bundleLibNode, bundleNode, repoLibNode, repoNode, targetNode, targetLibSo, targetSo, nodeModulesNode, prebuiltLibNode, prebuiltNode);
-        for (const c of candidates) {
+        pushIf(resolve(root, 'roxify_native.node'), resolve(root, 'libroxify_native.node'), resolve(root, 'dist/roxify_native.node'), resolve(root, 'target/release/roxify_native.node'), resolve(root, 'target/release/libroxify_native.so'), resolve(root, 'target/release/roxify_native.so'), resolve(root, 'node_modules/roxify/roxify_native.node'));
+        // Remove duplicates while preserving order
+        const uniqueCandidates = [...new Set(candidates)];
+        for (const c of uniqueCandidates) {
             try {
                 if (!existsSync(c))
                     continue;
@@ -96,19 +78,19 @@ function getNativeModule() {
                         if (!existsSync(nodeAlias)) {
                             require('fs').copyFileSync(c, nodeAlias);
                         }
-                        console.debug('[native] using node alias', nodeAlias);
                         return nodeAlias;
                     }
                     catch (e) {
                         return c;
                     }
                 }
-                console.debug('[native] using path', c);
                 return c;
             }
-            catch { }
+            catch (e) {
+                // ignore errors while checking candidates
+            }
         }
-        throw new Error(`Native module not found for ${currentPlatform}-${arch()}. Checked: ${candidates.join(' ')}`);
+        throw new Error(`Native module not found for ${currentPlatform}-${arch()}. Checked: ${uniqueCandidates.join(' ')}`);
     }
     return nativeRequire(getNativePath());
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roxify",
-  "version": "1.6.1",
+  "version": "1.6.4",
   "type": "module",
   "description": "Ultra-lightweight PNG steganography with native Rust acceleration. Encode binary data into PNG images with zstd compression.",
   "main": "dist/index.js",
@@ -33,11 +33,11 @@
     "build:all": "npm run build:native && npm run build && npm run build:cli",
     "build:cross": "node scripts/build-all-platforms.js && npm run build && npm run build:cli",
     "build:native:fast": "cargo build -p roxify_native --release --lib --no-default-features",
-    "build:native:quick-release": "FAST_RELEASE=1 cargo build --profile fastdev -p roxify_native --lib --no-default-features",
-    "build:native:super-fast": "USE_SYSTEM_ZSTD=1 FAST_RELEASE=1 cargo build --profile fastdev -p roxify_native --lib --no-default-features -j 1",
-    "build:native:low-cpu": "LOW_CPU=1 USE_SYSTEM_ZSTD=1 FAST_RELEASE=1 MAX_JOBS=1 node scripts/build-native-targets.cjs",
+    "build:native:quick-release": "cross-env FAST_RELEASE=1 cargo build --profile fastdev -p roxify_native --lib --no-default-features",
+    "build:native:super-fast": "cross-env USE_SYSTEM_ZSTD=1 FAST_RELEASE=1 cargo build --profile fastdev -p roxify_native --lib --no-default-features -j 1",
+    "build:native:low-cpu": "cross-env LOW_CPU=1 USE_SYSTEM_ZSTD=1 FAST_RELEASE=1 MAX_JOBS=1 node scripts/build-native-targets.cjs",
     "build:native:targets": "node scripts/build-native-targets.cjs",
-    "build:native:targets:fast": "FAST_RELEASE=1 node scripts/build-native-targets.cjs",
+    "build:native:targets:fast": "cross-env FAST_RELEASE=1 node scripts/build-native-targets.cjs",
     "build:pkg": "npm run build && npx pkg . --target node18-win-x64 --output dist/rox.exe --compress Brotli --public",
     "postbuild:native": "node scripts/copy-native.js",
     "clean:targets": "node scripts/clean-artifacts.js",
@@ -85,6 +85,7 @@
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^22.0.0",
+    "cross-env": "^7.0.3",
     "pkg": "^5.8.1",
     "typescript": "^5.6.0"
   },