roxify 1.12.11 → 1.13.1

package/Cargo.toml

@@ -1,98 +1,98 @@
-[package]
-name = "roxify_native"
-version = "1.12.11"
-edition = "2021"
-publish = false
-
-[lib]
-name = "roxify_native"
-crate-type = ["cdylib"]
-path = "native/lib.rs"
-
-[[bin]]
-name = "roxify_native"
-path = "native/main.rs"
-
-[[bin]]
-name = "bench_hybrid"
-path = "native/bench_hybrid.rs"
-
-[[bin]]
-name = "test_stages"
-path = "native/test_stages.rs"
-
-[[bin]]
-name = "test_small_bwt"
-path = "native/test_small_bwt.rs"
-
-[dev-dependencies]
-
-[dependencies]
-napi = "2"
-napi-derive = "2"
-rayon = "1.7"
-zstd = { version = "0.11", features = ["zstdmt"] }
-crc32fast = "1.3"
-num_cpus = "1.16"
-clap = { version = "4", features = ["derive"] }
-serde_json = "1.0"
-anyhow = "1.0"
-png = "0.18.0"
-image = { version = "0.25", default-features = false, features = ["png"] }
-# indicatif removed from default deps to reduce heavy build graph
-walkdir = "2.5.0"
-tar = "0.4"
-aes-gcm = "0.10"
-aes = "0.8"
-ctr = "0.9"
-cipher = { version = "0.4", features = ["std"] }
-hmac = "0.12"
-pbkdf2 = "0.12"
-rand = "0.8"
-sha2 = "0.10"
-mimalloc = "0.1"
-
-wgpu = { version = "0.19", optional = true }
-memmap2 = "0.9"
-bytemuck = { version = "1.14", features = ["derive"] }
-# tokio is optional now; enable via the 'async' feature
-tokio = { version = "1", features = ["sync", "rt"], optional = true }
-parking_lot = "0.12"
-pollster = { version = "0.3", optional = true }
-libsais = { version = "0.2.0", default-features = false }
-
-[features]
-# default is intentionally empty so the crate compiles fast for local checks.
-# Enable 'gpu' to pull in the WGPU and pollster dependencies (heavy).
-# Enable 'async' to include tokio runtime (optional).
-# Example: `cargo build -p roxify_native --features gpu`
-default = []
-
-gpu = ["wgpu", "pollster"]
-async = ["tokio"]
-full = ["gpu", "async"]
-
-[profile.release]
-opt-level = 3
-lto = "fat"
-codegen-units = 1
-strip = true
-panic = "abort"
-
-[profile.release-size]
-inherits = "release"
-opt-level = "z"
-lto = true
-strip = true
-
-[profile.fastdev]
-# Fast development profile for minimal user CPU and fast compilation.
-# Lower optimization and high codegen units to parallelize compilation work,
-# enable incremental to speed up subsequent incremental builds.
-inherits = "release"
-opt-level = 1
-lto = false
-codegen-units = 16
-debug = false
-incremental = true
-panic = "abort"
+[package]
+name = "roxify_native"
+version = "1.13.1"
+edition = "2021"
+publish = false
+
+[lib]
+name = "roxify_native"
+crate-type = ["cdylib"]
+path = "native/lib.rs"
+
+[[bin]]
+name = "roxify_native"
+path = "native/main.rs"
+
+[[bin]]
+name = "bench_hybrid"
+path = "native/bench_hybrid.rs"
+
+[[bin]]
+name = "test_stages"
+path = "native/test_stages.rs"
+
+[[bin]]
+name = "test_small_bwt"
+path = "native/test_small_bwt.rs"
+
+[dev-dependencies]
+
+[dependencies]
+napi = "2"
+napi-derive = "2"
+rayon = "1.7"
+zstd = { version = "0.11", features = ["zstdmt"] }
+crc32fast = "1.3"
+num_cpus = "1.16"
+clap = { version = "4", features = ["derive"] }
+serde_json = "1.0"
+anyhow = "1.0"
+png = "0.18.0"
+image = { version = "0.25", default-features = false, features = ["png"] }
+# indicatif removed from default deps to reduce heavy build graph
+walkdir = "2.5.0"
+tar = "0.4"
+aes-gcm = "0.10"
+aes = "0.8"
+ctr = "0.9"
+cipher = { version = "0.4", features = ["std"] }
+hmac = "0.12"
+pbkdf2 = "0.12"
+rand = "0.8"
+sha2 = "0.10"
+mimalloc = "0.1"
+
+wgpu = { version = "0.19", optional = true }
+memmap2 = "0.9"
+bytemuck = { version = "1.14", features = ["derive"] }
+# tokio is optional now; enable via the 'async' feature
+tokio = { version = "1", features = ["sync", "rt"], optional = true }
+parking_lot = "0.12"
+pollster = { version = "0.3", optional = true }
+libsais = { version = "0.2.0", default-features = false }
+
+[features]
+# default is intentionally empty so the crate compiles fast for local checks.
+# Enable 'gpu' to pull in the WGPU and pollster dependencies (heavy).
+# Enable 'async' to include tokio runtime (optional).
+# Example: `cargo build -p roxify_native --features gpu`
+default = []
+
+gpu = ["wgpu", "pollster"]
+async = ["tokio"]
+full = ["gpu", "async"]
+
+[profile.release]
+opt-level = 3
+lto = "fat"
+codegen-units = 1
+strip = true
+panic = "abort"
+
+[profile.release-size]
+inherits = "release"
+opt-level = "z"
+lto = true
+strip = true
+
+[profile.fastdev]
+# Fast development profile for minimal user CPU and fast compilation.
+# Lower optimization and high codegen units to parallelize compilation work,
+# enable incremental to speed up subsequent incremental builds.
+inherits = "release"
+opt-level = 1
+lto = false
+codegen-units = 16
+debug = false
+incremental = true
+panic = "abort"

package/dist/cli.js

@@ -2,11 +2,25 @@
 import { mkdirSync, readdirSync, readFileSync, statSync, writeFileSync, } from 'fs';
 import { open } from 'fs/promises';
 import { basename, dirname, join, resolve } from 'path';
-import { DataFormatError, decodePngToBinary, encodeBinaryToPng, hasPassphraseInPng, IncorrectPassphraseError, listFilesInPng, PassphraseRequiredError, } from './index.js';
-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.12.0';
+import { decodeWithRustCLI, encodeWithRustCLI, havepassphraseWithRustCLI, isRustBinaryAvailable, listWithRustCLI, } from './utils/rust-cli-wrapper.js';
+async function loadJsEngine() {
+    const indexMod = await import('./index.js');
+    const packMod = await import('./pack.js');
+    return {
+        decodePngToBinary: indexMod.decodePngToBinary,
+        encodeBinaryToPng: indexMod.encodeBinaryToPng,
+        hasPassphraseInPng: indexMod.hasPassphraseInPng,
+        listFilesInPng: indexMod.listFilesInPng,
+        DataFormatError: indexMod.DataFormatError,
+        IncorrectPassphraseError: indexMod.IncorrectPassphraseError,
+        PassphraseRequiredError: indexMod.PassphraseRequiredError,
+        packPathsGenerator: packMod.packPathsGenerator,
+        unpackBuffer: packMod.unpackBuffer,
+        VFSIndexEntry: undefined,
+    };
+}
+const VERSION = '1.13.1';
 function getDirectorySize(dirPath) {
     let totalSize = 0;
     try {
@@ -51,54 +65,54 @@ async function readLargeFile(filePath) {
     return Buffer.concat(chunks);
 }
 function showHelp() {
-    console.log(`
-ROX CLI — Encode/decode binary in PNG or WAV
-
-Usage:
-  npx rox <command> [options]
-
-Commands:
-  encode <input>... [output]   Encode one or more files/directories
-  decode <input> [output]      Decode PNG/WAV to original file
-  list <input>                 List files in a Rox archive
-  havepassphrase <input>       Check whether the archive requires a passphrase
-
-Options:
-  --image                   Use PNG container (default)
-  --sound                   Use WAV audio container (smaller overhead, faster)
-  --bwt-ans                 Use BWT-ANS compression instead of Zstd
-  -p, --passphrase <pass>   Use passphrase (AES-256-GCM)
-  -m, --mode <mode>         Mode: screenshot (default)
-  -e, --encrypt <type>      auto|aes|xor|none
-  --no-compress             Disable compression
-  --dict <file>             Use zstd dictionary when compressing
-  --force-ts                Force TypeScript encoder (slower but supports encryption)
-  -o, --output <path>       Output file path
-  -s, --sizes               Show file sizes in 'list' output (default)
-  --no-sizes                Disable file size reporting in 'list'
-  --files <list>            Extract only specified files (comma-separated)
-  --view-reconst            Export the reconstituted PNG for debugging
-  --debug                   Export debug images (doubled.png, reconstructed.png)
-  -v, --verbose             Show detailed errors
-
-Lossy-Resilient Encoding:
-  --lossy-resilient         Enable lossy-resilient mode (survives JPEG/MP3)
-  --ecc-level <level>       ECC redundancy: low|medium|quartile|high (default: medium)
-  --block-size <n>          Robust image block size: 2-8 pixels (default: 4)
-
-  When --lossy-resilient is active, data is encoded with Reed-Solomon ECC
-  and rendered as a QR-code-style grid (image) or MFSK tones (audio).
-  Use --sound or --image to choose the container format.
-
-Examples:
-  npx rox encode secret.pdf                      Encode to PNG
-  npx rox encode secret.pdf --sound               Encode to WAV
-  npx rox encode secret.pdf --lossy-resilient     Lossy-resilient PNG
-  npx rox encode secret.pdf --lossy-resilient --sound --ecc-level high
-  npx rox decode secret.pdf.png                   Decode back
-  npx rox decode secret.pdf.wav                   Decode WAV back
-
-Run "npx rox help" for this message.
+    console.log(`
+ROX CLI — Encode/decode binary in PNG or WAV
+
+Usage:
+  npx rox <command> [options]
+
+Commands:
+  encode <input>... [output]   Encode one or more files/directories
+  decode <input> [output]      Decode PNG/WAV to original file
+  list <input>                 List files in a Rox archive
+  havepassphrase <input>       Check whether the archive requires a passphrase
+
+Options:
+  --image                   Use PNG container (default)
+  --sound                   Use WAV audio container (smaller overhead, faster)
+  --bwt-ans                 Use BWT-ANS compression instead of Zstd
+  -p, --passphrase <pass>   Use passphrase (AES-256-GCM)
+  -m, --mode <mode>         Mode: screenshot (default)
+  -e, --encrypt <type>      auto|aes|xor|none
+  --no-compress             Disable compression
+  --dict <file>             Use zstd dictionary when compressing
+  --force-ts                Force TypeScript encoder (slower but supports encryption)
+  -o, --output <path>       Output file path
+  -s, --sizes               Show file sizes in 'list' output (default)
+  --no-sizes                Disable file size reporting in 'list'
+  --files <list>            Extract only specified files (comma-separated)
+  --view-reconst            Export the reconstituted PNG for debugging
+  --debug                   Export debug images (doubled.png, reconstructed.png)
+  -v, --verbose             Show detailed errors
+
+Lossy-Resilient Encoding:
+  --lossy-resilient         Enable lossy-resilient mode (survives JPEG/MP3)
+  --ecc-level <level>       ECC redundancy: low|medium|quartile|high (default: medium)
+  --block-size <n>          Robust image block size: 2-8 pixels (default: 4)
+
+  When --lossy-resilient is active, data is encoded with Reed-Solomon ECC
+  and rendered as a QR-code-style grid (image) or MFSK tones (audio).
+  Use --sound or --image to choose the container format.
+
+Examples:
+  npx rox encode secret.pdf                      Encode to PNG
+  npx rox encode secret.pdf --sound               Encode to WAV
+  npx rox encode secret.pdf --lossy-resilient     Lossy-resilient PNG
+  npx rox encode secret.pdf --lossy-resilient --sound --ecc-level high
+  npx rox decode secret.pdf.png                   Decode back
+  npx rox decode secret.pdf.wav                   Decode WAV back
+
+Run "npx rox help" for this message.
 `);
 }
 function parseArgs(args) {
@@ -280,8 +294,9 @@ async function encodeCommand(args) {
                 return false;
             }
         });
-        if (anyDir) {
-            const { index } = await packPathsGenerator(inputPaths, undefined, () => { });
+        if (anyDir && !isRustBinaryAvailable()) {
+            const js = await loadJsEngine();
+            const { index } = await js.packPathsGenerator(inputPaths, undefined, () => { });
             if (!index || index.length === 0) {
                 console.log(' ');
                 console.error('Error: No files found in specified input paths.');
@@ -357,6 +372,7 @@ async function encodeCommand(args) {
         }
     }
     try {
+        const js = await loadJsEngine();
         const encodeBar = new cliProgress.SingleBar({
             format: ' {bar} {percentage}% | {step} | {elapsed}s',
         }, cliProgress.Presets.shades_classic);
@@ -428,7 +444,7 @@ async function encodeCommand(args) {
         };
         if (inputPaths.length > 1) {
             currentEncodeStep = 'Reading files';
-            const { index, stream, totalSize } = await packPathsGenerator(inputPaths, undefined, onProgress);
+            const { index, stream, totalSize } = await js.packPathsGenerator(inputPaths, undefined, onProgress);
             if (!index || index.length === 0) {
                 console.log(' ');
                 console.error('Error: No files found in specified input paths.');
@@ -448,7 +464,7 @@ async function encodeCommand(args) {
             const st = statSync(resolvedInput);
             if (st.isDirectory()) {
                 currentEncodeStep = 'Reading files';
-                const { index, stream, totalSize } = await packPathsGenerator([resolvedInput], dirname(resolvedInput), onProgress);
+                const { index, stream, totalSize } = await js.packPathsGenerator([resolvedInput], dirname(resolvedInput), onProgress);
                 if (!index || index.length === 0) {
                     console.log(' ');
                     console.error(`Error: No files found in ${resolvedInput}`);
@@ -535,7 +551,7 @@ async function encodeCommand(args) {
         else {
             inputBuffer = inputData;
         }
-        const output = await encodeBinaryToPng(inputBuffer, options);
+        const output = await js.encodeBinaryToPng(inputBuffer, options);
         const encodeTime = Date.now() - startEncode;
         clearInterval(encodeHeartbeat);
         if (barStarted) {
@@ -574,7 +590,38 @@ async function decodeCommand(args) {
         process.exit(1);
     }
     const resolvedInput = resolve(inputPath);
-    const resolvedOutput = parsed.output || outputPath || 'decoded.bin';
+    const resolvedOutput = parsed.output || outputPath || '.';
+    if (isRustBinaryAvailable() && !parsed.forceTs && !parsed.lossyResilient) {
+        try {
+            console.log(' ');
+            console.log('Decoding... (Using native Rust decoder)\n');
+            const startTime = Date.now();
+            const decodeBar = new cliProgress.SingleBar({ format: ' {bar} {percentage}% | {step} | {elapsed}s' }, cliProgress.Presets.shades_classic);
+            let barValue = 0;
+            decodeBar.start(100, 0, { step: 'Decoding', elapsed: '0' });
+            const progressInterval = setInterval(() => {
+                barValue = Math.min(barValue + 2, 99);
+                decodeBar.update(barValue, {
+                    step: 'Decoding',
+                    elapsed: String(Math.floor((Date.now() - startTime) / 1000)),
+                });
+            }, 300);
+            await decodeWithRustCLI(resolvedInput, resolvedOutput, parsed.passphrase, parsed.files, parsed.dict);
+            clearInterval(progressInterval);
+            const decodeTime = Date.now() - startTime;
+            decodeBar.update(100, { step: 'done', elapsed: String(Math.floor(decodeTime / 1000)) });
+            decodeBar.stop();
+            console.log(`\nSuccess!`);
+            console.log(`  Time: ${decodeTime}ms`);
+            console.log(`  Output: ${resolve(resolvedOutput)}`);
+            console.log(' ');
+            return;
+        }
+        catch (err) {
+            console.warn('\nRust decoder failed, falling back to TypeScript decoder...');
+            console.warn(`Reason: ${err.message}\n`);
+        }
+    }
     try {
         const options = {};
         if (parsed.passphrase) {
@@ -645,7 +692,8 @@ async function decodeCommand(args) {
             }
         };
         const inputBuffer = await readLargeFile(resolvedInput);
-        const result = await decodePngToBinary(inputBuffer, options);
+        const js = await loadJsEngine();
+        const result = await js.decodePngToBinary(inputBuffer, options);
         const decodeTime = Date.now() - startDecode;
         clearInterval(heartbeat);
         if (barStarted) {
@@ -684,7 +732,7 @@ async function decodeCommand(args) {
             console.log(`Time: ${decodeTime}ms`);
         }
         else if (result.buf) {
-            const unpacked = unpackBuffer(result.buf);
+            const unpacked = js.unpackBuffer(result.buf);
             if (unpacked) {
                 const baseDir = parsed.output || outputPath || '.';
                 for (const file of unpacked.files) {
@@ -720,17 +768,17 @@ async function decodeCommand(args) {
         console.log(' ');
     }
     catch (err) {
-        if (err instanceof PassphraseRequiredError ||
+        if ((err.message && err.message.includes('passphrase required')) ||
             (err.message && err.message.includes('passphrase') && !parsed.passphrase)) {
             console.log(' ');
             console.error('File appears to be encrypted. Provide a passphrase with -p');
         }
-        else if (err instanceof IncorrectPassphraseError ||
+        else if ((err.message && err.message.includes('Incorrect passphrase')) ||
             (err.message && err.message.includes('Incorrect passphrase'))) {
             console.log(' ');
             console.error('Incorrect passphrase');
         }
-        else if (err instanceof DataFormatError ||
+        else if ((err.message && err.message.includes('data format error')) ||
             (err.message &&
                 (err.message.includes('decompression failed') ||
                     err.message.includes('missing ROX1') ||
@@ -761,40 +809,25 @@ async function listCommand(args) {
     const resolvedInput = resolve(inputPath);
     if (isRustBinaryAvailable()) {
         try {
-            const { findRustBinary } = await import('./utils/rust-cli-wrapper.js');
-            const cliPath = findRustBinary();
-            if (cliPath) {
-                const { execSync } = await import('child_process');
-                try {
-                    const help = execSync(`"${cliPath}" --help`, { encoding: 'utf-8' });
-                    if (!help.includes('list')) {
-                        throw new Error('native CLI does not support list');
-                    }
-                    const output = execSync(`"${cliPath}" list "${resolvedInput}"`, {
-                        encoding: 'utf-8',
-                        stdio: ['pipe', 'pipe', 'inherit'],
-                        timeout: 30000,
-                    });
-                    const fileList = JSON.parse(output.trim());
-                    console.log(`Files in ${resolvedInput}:`);
-                    for (const file of fileList) {
-                        if (typeof file === 'string') {
-                            console.log(`  ${file}`);
-                        }
-                        else {
-                            console.log(`  ${file.name} (${file.size} bytes)`);
-                        }
-                    }
-                    return;
+            const output = await listWithRustCLI(resolvedInput);
+            const fileList = JSON.parse(output.trim());
+            console.log(`Files in ${resolvedInput}:`);
+            for (const file of fileList) {
+                if (typeof file === 'string') {
+                    console.log(`  ${file}`);
+                }
+                else {
+                    console.log(`  ${file.name} (${file.size} bytes)`);
                 }
-                catch (e) { }
             }
+            return;
         }
-        catch (err) { }
+        catch (e) { }
     }
     try {
         const inputBuffer = readFileSync(resolvedInput);
-        const fileList = await listFilesInPng(inputBuffer, {
+        const js = await loadJsEngine();
+        const fileList = await js.listFilesInPng(inputBuffer, {
             includeSizes: parsed.sizes !== false,
         });
         if (fileList) {
@@ -831,9 +864,18 @@ async function havePassphraseCommand(args) {
         process.exit(1);
     }
     const resolvedInput = resolve(inputPath);
+    if (isRustBinaryAvailable()) {
+        try {
+            const output = await havepassphraseWithRustCLI(resolvedInput);
+            console.log(output.trim());
+            return;
+        }
+        catch (e) { }
+    }
     try {
         const inputBuffer = readFileSync(resolvedInput);
-        const has = await hasPassphraseInPng(inputBuffer);
+        const js = await loadJsEngine();
+        const has = await js.hasPassphraseInPng(inputBuffer);
         console.log(has ? 'Passphrase detected.' : 'No passphrase detected.');
     }
     catch (err) {

package/dist/index.d.ts

@@ -12,7 +12,7 @@ export * from './utils/optimization.js';
 export * from './utils/reconstitution.js';
 export * from './utils/robust-audio.js';
 export * from './utils/robust-image.js';
-export { encodeWithRustCLI, isRustBinaryAvailable } from './utils/rust-cli-wrapper.js';
+export { decodeWithRustCLI, encodeWithRustCLI, havepassphraseWithRustCLI, isRustBinaryAvailable, listWithRustCLI, } from './utils/rust-cli-wrapper.js';
 export * from './utils/types.js';
 export * from './utils/zstd.js';
 export { packPaths, packPathsToParts, unpackBuffer } from './pack.js';

package/dist/index.js

@@ -12,7 +12,7 @@ export * from './utils/optimization.js';
 export * from './utils/reconstitution.js';
 export * from './utils/robust-audio.js';
 export * from './utils/robust-image.js';
-export { encodeWithRustCLI, isRustBinaryAvailable } from './utils/rust-cli-wrapper.js';
+export { decodeWithRustCLI, encodeWithRustCLI, havepassphraseWithRustCLI, isRustBinaryAvailable, listWithRustCLI, } from './utils/rust-cli-wrapper.js';
 export * from './utils/types.js';
 export * from './utils/zstd.js';
 export { packPaths, packPathsToParts, unpackBuffer } from './pack.js';

package/dist/pack.js

@@ -161,7 +161,7 @@ export async function packPathsGenerator(paths, baseDir, onProgress) {
         indexHeader.writeUInt32BE(indexBuf.length, 4);
         yield Buffer.concat([indexHeader, indexBuf]);
         let readSoFar = 0;
-        const BATCH_SIZE = 1000;
+        const BATCH_SIZE = 100;
         const chunks = [];
         let chunkSize = 0;
         for (let batchStart = 0; batchStart < files.length; batchStart += BATCH_SIZE) {

package/dist/utils/decoder.js

@@ -849,6 +849,32 @@ export async function decodePngToBinary(input, opts = {}) {
                 }
             }
         }
+        if (endStartPixel === -1) {
+            const scanLines = Math.min(logicalHeight, 5);
+            for (let row = logicalHeight - 1; row >= logicalHeight - scanLines && endStartPixel === -1; row--) {
+                const rowStart = row * logicalWidth;
+                for (let col = logicalWidth - MARKER_END.length; col >= 0 && endStartPixel === -1; col--) {
+                    let match = true;
+                    for (let mi = 0; mi < MARKER_END.length && match; mi++) {
+                        const pixelIdx = rowStart + col + mi;
+                        if (pixelIdx >= curTotalPixels) {
+                            match = false;
+                            break;
+                        }
+                        const offset = pixelIdx * 3;
+                        if (!isColorMatch(logicalData[offset], logicalData[offset + 1], logicalData[offset + 2], MARKER_END[mi].r, MARKER_END[mi].g, MARKER_END[mi].b)) {
+                            match = false;
+                        }
+                    }
+                    if (match) {
+                        endStartPixel = rowStart + col - startIdx;
+                        if (process.env.ROX_DEBUG) {
+                            console.log(`DEBUG: Found END marker via scan at row=${row}, col=${col}`);
+                        }
+                    }
+                }
+            }
+        }
         if (endStartPixel === -1) {
             if (process.env.ROX_DEBUG) {
                 console.log('DEBUG: END marker not found at expected position');
@@ -862,13 +888,16 @@ export async function decodePngToBinary(input, opts = {}) {
             endStartPixel = curTotalPixels - startIdx;
         }
         const dataPixelCount = endStartPixel - (MARKER_START.length + 1);
-        const pixelBytes = Buffer.allocUnsafe(dataPixelCount * 3);
-        for (let i = 0; i < dataPixelCount; i++) {
-            const srcOffset = (dataStartPixel + i) * 3;
-            const dstOffset = i * 3;
-            pixelBytes[dstOffset] = logicalData[srcOffset];
-            pixelBytes[dstOffset + 1] = logicalData[srcOffset + 1];
-            pixelBytes[dstOffset + 2] = logicalData[srcOffset + 2];
+        const srcByteOffset = dataStartPixel * 3;
+        const byteCount = dataPixelCount * 3;
+        const pixelBytes = Buffer.allocUnsafe(byteCount);
+        if (Buffer.isBuffer(logicalData)) {
+            logicalData.copy(pixelBytes, 0, srcByteOffset, srcByteOffset + byteCount);
+        }
+        else {
+            for (let i = 0; i < byteCount; i++) {
+                pixelBytes[i] = logicalData[srcByteOffset + i];
+            }
         }
         if (process.env.ROX_DEBUG) {
             console.log('DEBUG: extracted len', pixelBytes.length);
@@ -1079,6 +1108,29 @@ export async function decodePngToBinary(input, opts = {}) {
                                 }
                             }
                         }
+                        if (endStartPixel2 === -1) {
+                            const scanLines2 = Math.min(logicalHeight2, 5);
+                            for (let row2 = logicalHeight2 - 1; row2 >= logicalHeight2 - scanLines2 && endStartPixel2 === -1; row2--) {
+                                const rowStart2 = row2 * logicalWidth2;
+                                for (let col2 = logicalWidth2 - MARKER_END.length; col2 >= 0 && endStartPixel2 === -1; col2--) {
+                                    let m2 = true;
+                                    for (let mi = 0; mi < MARKER_END.length && m2; mi++) {
+                                        const pixelIdx2 = rowStart2 + col2 + mi;
+                                        if (pixelIdx2 >= curTotalPixels2) {
+                                            m2 = false;
+                                            break;
+                                        }
+                                        const off2 = pixelIdx2 * 3;
+                                        if (!isColorMatch(logicalData2[off2], logicalData2[off2 + 1], logicalData2[off2 + 2], MARKER_END[mi].r, MARKER_END[mi].g, MARKER_END[mi].b)) {
+                                            m2 = false;
+                                        }
+                                    }
+                                    if (m2) {
+                                        endStartPixel2 = rowStart2 + col2 - startIdx2;
+                                    }
+                                }
+                            }
+                        }
                         if (endStartPixel2 === -1) {
                             if (process.env.ROX_DEBUG) {
                                 console.log('DEBUG: END marker not found in fallback; using end of grid');