roxify 1.4.0 → 1.5.0

package/dist/utils/encoder.js

@@ -1,20 +1,19 @@
-import cliProgress from 'cli-progress';
 import { createCipheriv, pbkdf2Sync, randomBytes } from 'crypto';
-import sharp from 'sharp';
 import * as zlib from 'zlib';
 import { unpackBuffer } from '../pack.js';
 import { COMPRESSION_MARKERS, ENC_AES, ENC_NONE, ENC_XOR, MAGIC, MARKER_END, MARKER_START, PIXEL_MAGIC, PIXEL_MAGIC_BLOCK, PNG_HEADER, } from './constants.js';
 import { crc32 } from './crc.js';
 import { colorsToBytes } from './helpers.js';
-import { optimizePngBuffer } from './optimization.js';
+import { native } from './native.js';
 import { parallelZstdCompress } from './zstd.js';
 export async function encodeBinaryToPng(input, opts = {}) {
     let progressBar = null;
     if (opts.showProgress) {
-        progressBar = new cliProgress.SingleBar({
-            format: ' {bar} {percentage}% | {step} | {elapsed}s',
-        }, cliProgress.Presets.shades_classic);
-        progressBar.start(100, 0, { step: 'Starting', elapsed: '0' });
+        progressBar = {
+            start: () => { },
+            update: () => { },
+            stop: () => { },
+        };
         const startTime = Date.now();
         if (!opts.onProgress) {
             opts.onProgress = (info) => {
@@ -34,10 +33,6 @@ export async function encodeBinaryToPng(input, opts = {}) {
                 else if (info.phase === 'done') {
                     pct = 100;
                 }
-                progressBar.update(Math.floor(pct), {
-                    step: info.phase.replace('_', ' '),
-                    elapsed: String(Math.floor((Date.now() - startTime) / 1000)),
-                });
             };
         }
     }
@@ -220,7 +215,7 @@ export async function encodeBinaryToPng(input, opts = {}) {
             lenBuf.writeUInt32BE(jsonBuf.length, 0);
             metaPixel = [...metaPixel, Buffer.from('rXFL', 'utf8'), lenBuf, jsonBuf];
         }
-        const useBlockEncoding = opts.useBlockEncoding ?? true;
+        const useBlockEncoding = false;
         const pixelMagic = useBlockEncoding ? PIXEL_MAGIC_BLOCK : PIXEL_MAGIC;
         const dataWithoutMarkers = [pixelMagic, ...metaPixel];
         const dataWithoutMarkersLen = dataWithoutMarkers.reduce((a, b) => a + b.length, 0);
@@ -261,15 +256,7 @@ export async function encodeBinaryToPng(input, opts = {}) {
                     }
                 }
             }
-            bufScr = await sharp(rgbBuffer, {
-                raw: { width, height, channels: 3 },
-            })
-                .png({
-                compressionLevel: 9,
-                adaptiveFiltering: true,
-                effort: 9,
-            })
-                .toBuffer();
+            bufScr = Buffer.from(native.rgbToPng(rgbBuffer, width, height));
         }
         else {
             const bytesPerPixel = 3;
@@ -394,27 +381,10 @@ export async function encodeBinaryToPng(input, opts = {}) {
             else {
                 const outputFormat = opts.outputFormat || 'png';
                 if (outputFormat === 'webp') {
-                    bufScr = await sharp(raw, {
-                        raw: { width, height, channels: 3 },
-                    })
-                        .webp({
-                        lossless: true,
-                        quality: 100,
-                        effort: 6,
-                    })
-                        .toBuffer();
+                    throw new Error('WebP output format not supported with native backend');
                 }
                 else {
-                    bufScr = await sharp(raw, {
-                        raw: { width, height, channels: 3 },
-                    })
-                        .png({
-                        compressionLevel: 3,
-                        palette: false,
-                        effort: 1,
-                        adaptiveFiltering: false,
-                    })
-                        .toBuffer();
+                    bufScr = Buffer.from(native.rgbToPng(raw, width, height));
                 }
             }
         }
@@ -426,22 +396,7 @@ export async function encodeBinaryToPng(input, opts = {}) {
         dataWithoutMarkers.length = 0;
         if (opts.onProgress)
             opts.onProgress({ phase: 'png_compress', loaded: 100, total: 100 });
-        if (opts.skipOptimization || opts.outputFormat === 'webp') {
-            progressBar?.stop();
-            return bufScr;
-        }
-        if (opts.onProgress)
-            opts.onProgress({ phase: 'optimizing', loaded: 0, total: 100 });
-        try {
-            const optimized = await optimizePngBuffer(bufScr, true);
-            if (opts.onProgress)
-                opts.onProgress({ phase: 'optimizing', loaded: 100, total: 100 });
-            progressBar?.stop();
-            return optimized;
-        }
-        catch (e) {
-            progressBar?.stop();
-            return bufScr;
-        }
+        progressBar?.stop();
+        return bufScr;
     }
 }

package/dist/utils/helpers.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 export declare function colorsToBytes(colors: Array<{
     r: number;
     g: number;

package/dist/utils/helpers.js

@@ -1,20 +1,18 @@
 import { createDecipheriv, pbkdf2Sync } from 'crypto';
 import { ENC_AES, ENC_NONE, ENC_XOR } from './constants.js';
 import { IncorrectPassphraseError, PassphraseRequiredError } from './errors.js';
+import { native } from './native.js';
 let nativeDeltaEncode = null;
 let nativeDeltaDecode = null;
 let hasNative = false;
 try {
-    const native = require('../../libroxify_native.node');
     if (native?.nativeDeltaEncode && native?.nativeDeltaDecode) {
         nativeDeltaEncode = native.nativeDeltaEncode;
         nativeDeltaDecode = native.nativeDeltaDecode;
         hasNative = true;
     }
 }
-catch (e) {
-    // Native module not available, will use TS fallback
-}
+catch (e) { }
 export function colorsToBytes(colors) {
     const buf = Buffer.alloc(colors.length * 3);
     for (let i = 0; i < colors.length; i++) {

package/dist/utils/inspection.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 /**
  * List files in a Rox PNG archive without decoding the full payload.
  * Returns the file list if available, otherwise null.

package/dist/utils/inspection.js

@@ -1,10 +1,9 @@
-import extract from 'png-chunks-extract';
-import sharp from 'sharp';
 import * as zlib from 'zlib';
 import { unpackBuffer } from '../pack.js';
 import { CHUNK_TYPE, ENC_AES, ENC_XOR, MAGIC, MARKER_COLORS, PIXEL_MAGIC, } from './constants.js';
 import { decodePngToBinary } from './decoder.js';
 import { PassphraseRequiredError } from './errors.js';
+import { native } from './native.js';
 import { cropAndReconstitute } from './reconstitution.js';
 /**
  * List files in a Rox PNG archive without decoding the full payload.
@@ -14,7 +13,7 @@ import { cropAndReconstitute } from './reconstitution.js';
  */
 export async function listFilesInPng(pngBuf, opts = {}) {
     try {
-        const chunks = extract(pngBuf);
+        const chunks = native.extractPngChunks(pngBuf);
         const ihdr = chunks.find((c) => c.name === 'IHDR');
         const idatChunks = chunks.filter((c) => c.name === 'IDAT');
         if (ihdr && idatChunks.length > 0) {
@@ -147,15 +146,13 @@ export async function listFilesInPng(pngBuf, opts = {}) {
     }
     try {
         try {
-            const { data, info } = await sharp(pngBuf)
-                .ensureAlpha()
-                .raw()
-                .toBuffer({ resolveWithObject: true });
-            const currentWidth = info.width;
-            const currentHeight = info.height;
+            const rawData = native.sharpToRaw(pngBuf);
+            const data = rawData.pixels;
+            const currentWidth = rawData.width;
+            const currentHeight = rawData.height;
             const rawRGB = Buffer.alloc(currentWidth * currentHeight * 3);
             for (let i = 0; i < currentWidth * currentHeight; i++) {
-                rawRGB[i * 3] = data[i * 4];
+                rawRGB[i * 3] = data[i * 3];
                 rawRGB[i * 3 + 1] = data[i * 4 + 1];
                 rawRGB[i * 3 + 2] = data[i * 4 + 2];
             }
@@ -219,17 +216,15 @@ export async function listFilesInPng(pngBuf, opts = {}) {
     try {
         const reconstructed = await cropAndReconstitute(pngBuf);
         try {
-            const { data, info } = await sharp(reconstructed)
-                .ensureAlpha()
-                .raw()
-                .toBuffer({ resolveWithObject: true });
-            const currentWidth = info.width;
-            const currentHeight = info.height;
+            const rawData = native.sharpToRaw(reconstructed);
+            const data = rawData.pixels;
+            const currentWidth = rawData.width;
+            const currentHeight = rawData.height;
             const rawRGB = Buffer.alloc(currentWidth * currentHeight * 3);
             for (let i = 0; i < currentWidth * currentHeight; i++) {
-                rawRGB[i * 3] = data[i * 4];
-                rawRGB[i * 3 + 1] = data[i * 4 + 1];
-                rawRGB[i * 3 + 2] = data[i * 4 + 2];
+                rawRGB[i * 3] = data[i * 3];
+                rawRGB[i * 3 + 1] = data[i * 3 + 1];
+                rawRGB[i * 3 + 2] = data[i * 3 + 2];
             }
             const found = rawRGB.indexOf(PIXEL_MAGIC);
             if (found !== -1) {
@@ -287,12 +282,10 @@ export async function listFilesInPng(pngBuf, opts = {}) {
         }
         catch (e) { }
         try {
-            const chunks = extract(reconstructed);
+            const chunks = native.extractPngChunks(reconstructed);
             const fileListChunk = chunks.find((c) => c.name === 'rXFL');
             if (fileListChunk) {
-                const data = Buffer.isBuffer(fileListChunk.data)
-                    ? fileListChunk.data
-                    : Buffer.from(fileListChunk.data);
+                const data = Buffer.from(fileListChunk.data);
                 const parsedFiles = JSON.parse(data.toString('utf8'));
                 if (parsedFiles.length > 0 &&
                     typeof parsedFiles[0] === 'object' &&
@@ -316,9 +309,7 @@ export async function listFilesInPng(pngBuf, opts = {}) {
             }
             const metaChunk = chunks.find((c) => c.name === CHUNK_TYPE);
             if (metaChunk) {
-                const dataBuf = Buffer.isBuffer(metaChunk.data)
-                    ? metaChunk.data
-                    : Buffer.from(metaChunk.data);
+                const dataBuf = Buffer.from(metaChunk.data);
                 const markerIdx = dataBuf.indexOf(Buffer.from('rXFL'));
                 if (markerIdx !== -1 && markerIdx + 8 <= dataBuf.length) {
                     const jsonLen = dataBuf.readUInt32BE(markerIdx + 4);
@@ -345,12 +336,10 @@ export async function listFilesInPng(pngBuf, opts = {}) {
     }
     catch (e) { }
     try {
-        const chunks = extract(pngBuf);
+        const chunks = native.extractPngChunks(pngBuf);
         const fileListChunk = chunks.find((c) => c.name === 'rXFL');
         if (fileListChunk) {
-            const data = Buffer.isBuffer(fileListChunk.data)
-                ? fileListChunk.data
-                : Buffer.from(fileListChunk.data);
+            const data = Buffer.from(fileListChunk.data);
             const parsedFiles = JSON.parse(data.toString('utf8'));
             if (parsedFiles.length > 0 &&
                 typeof parsedFiles[0] === 'object' &&
@@ -374,9 +363,7 @@ export async function listFilesInPng(pngBuf, opts = {}) {
         }
         const metaChunk = chunks.find((c) => c.name === CHUNK_TYPE);
         if (metaChunk) {
-            const dataBuf = Buffer.isBuffer(metaChunk.data)
-                ? metaChunk.data
-                : Buffer.from(metaChunk.data);
+            const dataBuf = Buffer.from(metaChunk.data);
             const markerIdx = dataBuf.indexOf(Buffer.from('rXFL'));
             if (markerIdx !== -1 && markerIdx + 8 <= dataBuf.length) {
                 const jsonLen = dataBuf.readUInt32BE(markerIdx + 4);
@@ -442,7 +429,7 @@ export async function hasPassphraseInPng(pngBuf) {
             return flag === ENC_AES || flag === ENC_XOR;
         }
         try {
-            const chunksRaw = extract(pngBuf);
+            const chunksRaw = native.extractPngChunks(pngBuf);
             const target = chunksRaw.find((c) => c.name === CHUNK_TYPE);
             if (target) {
                 const data = Buffer.isBuffer(target.data)
@@ -460,12 +447,8 @@ export async function hasPassphraseInPng(pngBuf) {
         }
         catch (e) { }
         try {
-            const sharpLib = await import('sharp');
-            const { data } = await sharpLib
-                .default(pngBuf)
-                .raw()
-                .toBuffer({ resolveWithObject: true });
-            const rawRGB = Buffer.from(data);
+            const rawData = native.sharpToRaw(pngBuf);
+            const rawRGB = Buffer.from(rawData.pixels);
             const markerLen = MARKER_COLORS.length * 3;
             for (let i = 0; i <= rawRGB.length - markerLen; i += 3) {
                 let ok = true;

package/dist/utils/native.d.ts

@@ -0,0 +1 @@
+export declare const native: any;

package/dist/utils/native.js

@@ -0,0 +1,7 @@
+import { createRequire } from 'module';
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const require = createRequire(import.meta.url);
+export const native = require(join(__dirname, '../../libroxify_native.node'));

package/dist/utils/optimization.d.ts

@@ -1,3 +1 @@
-/// <reference types="node" />
-/// <reference types="node" />
 export declare function optimizePngBuffer(pngBuf: Buffer, fast?: boolean): Promise<Buffer>;

package/dist/utils/optimization.js

@@ -2,8 +2,6 @@ import { spawn, spawnSync } from 'child_process';
 import { existsSync, readFileSync, unlinkSync, writeFileSync } from 'fs';
 import { tmpdir } from 'os';
 import { join } from 'path';
-import encode from 'png-chunks-encode';
-import extract from 'png-chunks-extract';
 import * as zlib from 'zlib';
 import { PNG_HEADER, PNG_HEADER_HEX } from './constants.js';
 export async function optimizePngBuffer(pngBuf, fast = false) {
@@ -11,6 +9,9 @@ export async function optimizePngBuffer(pngBuf, fast = false) {
     if (pngBuf.length > MAX_OPTIMIZE_SIZE) {
         return pngBuf;
     }
+    if (fast) {
+        return pngBuf;
+    }
     const runCommandAsync = (cmd, args, timeout = 120000) => {
         return new Promise((resolve) => {
             try {
@@ -67,13 +68,12 @@ export async function optimizePngBuffer(pngBuf, fast = false) {
     }
     catch (e) { }
     try {
-        const chunksRaw = extract(pngBuf);
+        const nativeExtract = require('../../libroxify_native.node');
+        const chunksRaw = nativeExtract.extractPngChunks(pngBuf);
         const ihdr = chunksRaw.find((c) => c.name === 'IHDR');
         if (!ihdr)
             return pngBuf;
-        const ihdrData = Buffer.isBuffer(ihdr.data)
-            ? ihdr.data
-            : Buffer.from(ihdr.data);
+        const ihdrData = Buffer.from(ihdr.data);
         const width = ihdrData.readUInt32BE(0);
         const height = ihdrData.readUInt32BE(4);
         const bitDepth = ihdrData[8];
@@ -81,9 +81,7 @@ export async function optimizePngBuffer(pngBuf, fast = false) {
         if (bitDepth !== 8 || colorType !== 2)
             return pngBuf;
         const idatChunks = chunksRaw.filter((c) => c.name === 'IDAT');
-        const idatData = Buffer.concat(idatChunks.map((c) => Buffer.isBuffer(c.data)
-            ? c.data
-            : Buffer.from(c.data)));
+        const idatData = Buffer.concat(idatChunks.map((c) => Buffer.from(c.data)));
         let raw;
         try {
             raw = zlib.inflateSync(idatData);
@@ -204,7 +202,8 @@ export async function optimizePngBuffer(pngBuf, fast = false) {
                 ? buf
                 : Buffer.concat([PNG_HEADER, buf]);
         }
-        const out = ensurePng(Buffer.from(encode(newChunks)));
+        const nativeEnc = require('../../libroxify_native.node');
+        const out = ensurePng(Buffer.from(nativeEnc.encodePngChunks(newChunks)));
         let bestBuf = out.length < pngBuf.length ? out : pngBuf;
         const strategies = [
             zlib.constants.Z_DEFAULT_STRATEGY,
@@ -227,7 +226,8 @@ export async function optimizePngBuffer(pngBuf, fast = false) {
                 const idx = altChunks.findIndex((c) => c.name === 'IDAT');
                 if (idx !== -1)
                     altChunks[idx] = { name: 'IDAT', data: comp };
-                const candidate = ensurePng(Buffer.from(encode(altChunks)));
+                const nativeOptim = require('../../libroxify_native.node');
+                const candidate = ensurePng(Buffer.from(nativeOptim.encodePngChunks(altChunks)));
                 if (candidate.length < bestBuf.length)
                     bestBuf = candidate;
             }
@@ -245,7 +245,8 @@ export async function optimizePngBuffer(pngBuf, fast = false) {
                 const idx = altChunks.findIndex((c) => c.name === 'IDAT');
                 if (idx !== -1)
                     altChunks[idx] = { name: 'IDAT', data: Buffer.from(comp) };
-                const candidate = ensurePng(Buffer.from(encode(altChunks)));
+                const native = require('../../libroxify_native.node');
+                const candidate = ensurePng(Buffer.from(native.encodePngChunks(altChunks)));
                 if (candidate.length < bestBuf.length)
                     bestBuf = candidate;
             }
@@ -303,7 +304,8 @@ export async function optimizePngBuffer(pngBuf, fast = false) {
                                 const idx = altChunks.findIndex((c) => c.name === 'IDAT');
                                 if (idx !== -1)
                                     altChunks[idx] = { name: 'IDAT', data: comp };
-                                const candidate = ensurePng(Buffer.from(encode(altChunks)));
+                                const native = require('../../libroxify_native.node');
+                                const candidate = ensurePng(Buffer.from(native.encodePngChunks(altChunks)));
                                 if (candidate.length < bestBuf.length)
                                     bestBuf = candidate;
                             }
@@ -383,7 +385,8 @@ export async function optimizePngBuffer(pngBuf, fast = false) {
                 const idx = altChunks.findIndex((c) => c.name === 'IDAT');
                 if (idx !== -1)
                     altChunks[idx] = { name: 'IDAT', data: comp };
-                const candidate = ensurePng(Buffer.from(encode(altChunks)));
+                const nativeOptim2 = require('../../libroxify_native.node');
+                const candidate = ensurePng(Buffer.from(nativeOptim2.encodePngChunks(altChunks)));
                 if (candidate.length < bestBuf.length)
                     bestBuf = candidate;
             }
@@ -589,7 +592,8 @@ export async function optimizePngBuffer(pngBuf, fast = false) {
                         data: zlib.deflateSync(idxFilteredAllVar, { level: 9 }),
                     });
                     palChunksVar.push({ name: 'IEND', data: Buffer.alloc(0) });
-                    const palOutVar = ensurePng(Buffer.from(encode(palChunksVar)));
+                    const native = require('../../libroxify_native.node');
+                    const palOutVar = ensurePng(Buffer.from(native.encodePngChunks(palChunksVar)));
                     if (palOutVar.length < bestBuf.length)
                         bestBuf = palOutVar;
                 }

package/dist/utils/reconstitution.d.ts

@@ -1,3 +1 @@
-/// <reference types="node" />
-/// <reference types="node" />
 export declare function cropAndReconstitute(input: Buffer, debugDir?: string): Promise<Buffer>;