roxify 1.2.5 → 1.2.6

package/dist/cli.js

@@ -4,7 +4,7 @@ import { mkdirSync, readFileSync, statSync, writeFileSync } from 'fs';
 import { basename, dirname, join, resolve } from 'path';
 import { DataFormatError, decodePngToBinary, encodeBinaryToPng, hasPassphraseInPng, IncorrectPassphraseError, listFilesInPng, PassphraseRequiredError, } from './index.js';
 import { packPathsGenerator, unpackBuffer } from './pack.js';
-const VERSION = '1.2.4';
+const VERSION = '1.2.6';
 function showHelp() {
     console.log(`
 ROX CLI — Encode/decode binary in PNG
@@ -24,6 +24,8 @@ Options:
   -e, --encrypt <type>      auto|aes|xor|none
   --no-compress             Disable compression
   -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)
@@ -51,6 +53,14 @@ function parseArgs(args) {
                 parsed.viewReconst = true;
                 i++;
             }
+            else if (key === 'sizes') {
+                parsed.sizes = true;
+                i++;
+            }
+            else if (key === 'no-sizes') {
+                parsed.sizes = false;
+                i++;
+            }
             else if (key === 'debug') {
                 parsed.debug = true;
                 i++;
@@ -92,6 +102,11 @@ function parseArgs(args) {
                     parsed.verbose = true;
                     i += 1;
                     break;
+                case 's':
+                    parsed.sizes = true;
+                    i += 1;
+                    break;
+                    break;
                 case 'd':
                     parsed.debugDir = value;
                     i += 2;
@@ -202,7 +217,10 @@ async function encodeCommand(args) {
             inputSizeVal = totalSize;
             displayName = parsed.outputName || 'archive';
             options.includeFileList = true;
-            options.fileList = index.map((e) => e.path);
+            options.fileList = index.map((e) => ({
+                name: e.path,
+                size: e.size,
+            }));
         }
         else {
             const resolvedInput = resolvedInputs[0];
@@ -214,14 +232,17 @@ async function encodeCommand(args) {
                 inputSizeVal = totalSize;
                 displayName = parsed.outputName || basename(resolvedInput);
                 options.includeFileList = true;
-                options.fileList = index.map((e) => e.path);
+                options.fileList = index.map((e) => ({
+                    name: e.path,
+                    size: e.size,
+                }));
             }
             else {
                 inputData = readFileSync(resolvedInput);
                 inputSizeVal = inputData.length;
                 displayName = basename(resolvedInput);
                 options.includeFileList = true;
-                options.fileList = [basename(resolvedInput)];
+                options.fileList = [{ name: basename(resolvedInput), size: st.size }];
             }
         }
         options.name = displayName;
@@ -404,7 +425,8 @@ async function decodeCommand(args) {
             const baseDir = parsed.output || outputPath || '.';
             const totalBytes = result.files.reduce((s, f) => s + f.buf.length, 0);
             const extractBar = new cliProgress.SingleBar({ format: ' {bar} {percentage}% | {step} | {elapsed}s' }, cliProgress.Presets.shades_classic);
-            extractBar.start(totalBytes, 0, { step: 'Writing files' });
+            const extractStart = Date.now();
+            extractBar.start(totalBytes, 0, { step: 'Writing files', elapsed: '0' });
             let written = 0;
             for (const file of result.files) {
                 const fullPath = join(baseDir, file.path);
@@ -412,9 +434,15 @@ async function decodeCommand(args) {
                 mkdirSync(dir, { recursive: true });
                 writeFileSync(fullPath, file.buf);
                 written += file.buf.length;
-                extractBar.update(written, { step: `Writing ${file.path}` });
+                extractBar.update(written, {
+                    step: `Writing ${file.path}`,
+                    elapsed: String(Math.floor((Date.now() - extractStart) / 1000)),
+                });
             }
-            extractBar.update(totalBytes, { step: 'Done' });
+            extractBar.update(totalBytes, {
+                step: 'Done',
+                elapsed: String(Math.floor((Date.now() - extractStart) / 1000)),
+            });
             extractBar.stop();
             console.log(`\nSuccess!`);
             console.log(`Unpacked ${result.files.length} files to directory : ${resolve(baseDir)}`);
@@ -424,20 +452,12 @@ async function decodeCommand(args) {
             const unpacked = unpackBuffer(result.buf);
             if (unpacked) {
                 const baseDir = parsed.output || outputPath || '.';
-                const totalBytes = unpacked.files.reduce((s, f) => s + f.buf.length, 0);
-                const extractBar = new cliProgress.SingleBar({ format: ' {bar} {percentage}% | {step} | {elapsed}s' }, cliProgress.Presets.shades_classic);
-                extractBar.start(totalBytes, 0, { step: 'Writing files' });
-                let written = 0;
                 for (const file of unpacked.files) {
                     const fullPath = join(baseDir, file.path);
                     const dir = dirname(fullPath);
                     mkdirSync(dir, { recursive: true });
                     writeFileSync(fullPath, file.buf);
-                    written += file.buf.length;
-                    extractBar.update(written, { step: `Writing ${file.path}` });
                 }
-                extractBar.update(totalBytes, { step: 'Done' });
-                extractBar.stop();
                 console.log(`\nSuccess!`);
                 console.log(`Time: ${decodeTime}ms`);
                 console.log(`Unpacked ${unpacked.files.length} files to current directory`);
@@ -506,11 +526,18 @@ async function listCommand(args) {
     const resolvedInput = resolve(inputPath);
     try {
         const inputBuffer = readFileSync(resolvedInput);
-        const fileList = await listFilesInPng(inputBuffer);
+        const fileList = await listFilesInPng(inputBuffer, {
+            includeSizes: parsed.sizes !== false,
+        });
         if (fileList) {
             console.log(`Files in ${resolvedInput}:`);
             for (const file of fileList) {
-                console.log(`  ${file}`);
+                if (typeof file === 'string') {
+                    console.log(`  ${file}`);
+                }
+                else {
+                    console.log(`  ${file.name} (${file.size} bytes)`);
+                }
             }
         }
         else {

package/dist/utils/encoder.js

@@ -3,6 +3,7 @@ import { createCipheriv, pbkdf2Sync, randomBytes } from 'crypto';
 import encode from 'png-chunks-encode';
 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, PNG_HEADER, PNG_HEADER_HEX, } from './constants.js';
 import { applyXor, colorsToBytes } from './helpers.js';
 import { optimizePngBuffer } from './optimization.js';
@@ -118,7 +119,28 @@ export async function encodeBinaryToPng(input, opts = {}) {
     metaParts.push(payload);
     let meta = Buffer.concat(metaParts);
     if (opts.includeFileList && opts.fileList) {
-        const jsonBuf = Buffer.from(JSON.stringify(opts.fileList), 'utf8');
+        let sizeMap = null;
+        try {
+            const unpack = unpackBuffer(input);
+            if (unpack) {
+                sizeMap = {};
+                for (const ef of unpack.files)
+                    sizeMap[ef.path] = ef.buf.length;
+            }
+        }
+        catch (e) { }
+        const normalized = opts.fileList.map((f) => {
+            if (typeof f === 'string')
+                return { name: f, size: sizeMap && sizeMap[f] ? sizeMap[f] : 0 };
+            if (f && typeof f === 'object') {
+                if (f.name)
+                    return { name: f.name, size: f.size ?? 0 };
+                if (f.path)
+                    return { name: f.path, size: f.size ?? 0 };
+            }
+            return { name: String(f), size: 0 };
+        });
+        const jsonBuf = Buffer.from(JSON.stringify(normalized), 'utf8');
         const lenBuf = Buffer.alloc(4);
         lenBuf.writeUInt32BE(jsonBuf.length, 0);
         meta = Buffer.concat([meta, Buffer.from('rXFL', 'utf8'), lenBuf, jsonBuf]);
@@ -142,7 +164,28 @@ export async function encodeBinaryToPng(input, opts = {}) {
             payload,
         ]);
         if (opts.includeFileList && opts.fileList) {
-            const jsonBuf = Buffer.from(JSON.stringify(opts.fileList), 'utf8');
+            let sizeMap2 = null;
+            try {
+                const unpack = unpackBuffer(input);
+                if (unpack) {
+                    sizeMap2 = {};
+                    for (const ef of unpack.files)
+                        sizeMap2[ef.path] = ef.buf.length;
+                }
+            }
+            catch (e) { }
+            const normalized = opts.fileList.map((f) => {
+                if (typeof f === 'string')
+                    return { name: f, size: sizeMap2 && sizeMap2[f] ? sizeMap2[f] : 0 };
+                if (f && typeof f === 'object') {
+                    if (f.name)
+                        return { name: f.name, size: f.size ?? 0 };
+                    if (f.path)
+                        return { name: f.path, size: f.size ?? 0 };
+                }
+                return { name: String(f), size: 0 };
+            });
+            const jsonBuf = Buffer.from(JSON.stringify(normalized), 'utf8');
             const lenBuf = Buffer.alloc(4);
             lenBuf.writeUInt32BE(jsonBuf.length, 0);
             metaPixel = Buffer.concat([

package/dist/utils/inspection.d.ts

@@ -6,7 +6,12 @@
  * @param pngBuf - PNG data
  * @public
  */
-export declare function listFilesInPng(pngBuf: Buffer): Promise<string[] | null>;
+export declare function listFilesInPng(pngBuf: Buffer, opts?: {
+    includeSizes?: boolean;
+}): Promise<string[] | {
+    name: string;
+    size: number;
+}[] | null>;
 /**
  * Detect if a PNG/ROX buffer contains an encrypted payload (requires passphrase)
  * Returns true if encryption flag indicates AES or XOR.

package/dist/utils/inspection.js

@@ -1,6 +1,7 @@
 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';
@@ -11,18 +12,14 @@ import { cropAndReconstitute } from './reconstitution.js';
  * @param pngBuf - PNG data
  * @public
  */
-export async function listFilesInPng(pngBuf) {
-    console.log('listFilesInPng called, size:', pngBuf.length);
+export async function listFilesInPng(pngBuf, opts = {}) {
     try {
         const chunks = extract(pngBuf);
-        console.log('Chunks found:', chunks.length);
         const ihdr = chunks.find((c) => c.name === 'IHDR');
         const idatChunks = chunks.filter((c) => c.name === 'IDAT');
-        console.log('IHDR found:', !!ihdr, 'IDAT chunks:', idatChunks.length);
         if (ihdr && idatChunks.length > 0) {
             const ihdrData = Buffer.from(ihdr.data);
             const width = ihdrData.readUInt32BE(0);
-            console.log('Fast list: width', width);
             const bpp = 3;
             const rowLen = 1 + width * bpp;
             const files = await new Promise((resolve) => {
@@ -33,8 +30,6 @@ export async function listFilesInPng(pngBuf) {
                     if (resolved)
                         return;
                     buffer = Buffer.concat([buffer, chunk]);
-                    console.log('Fast list: got chunk', chunk.length, 'total', buffer.length);
-                    console.log('Fast list: buffer hex', buffer.slice(0, 20).toString('hex'));
                     const cleanBuffer = Buffer.alloc(buffer.length);
                     let cleanPtr = 0;
                     let ptr = 0;
@@ -53,14 +48,10 @@ export async function listFilesInPng(pngBuf) {
                         }
                     }
                     const validClean = cleanBuffer.slice(0, cleanPtr);
-                    console.log('Fast list: validClean len', validClean.length);
-                    console.log('Fast list: validClean hex', validClean.slice(0, 20).toString('hex'));
                     if (validClean.length < 12)
                         return;
                     const magic = validClean.slice(8, 12);
-                    console.log('Fast list: magic', magic.toString());
                     if (!magic.equals(PIXEL_MAGIC)) {
-                        console.log('Fast list: magic mismatch');
                         resolved = true;
                         inflate.destroy();
                         resolve(null);
@@ -71,7 +62,6 @@ export async function listFilesInPng(pngBuf) {
                         return;
                     idx++;
                     const nameLen = validClean[idx++];
-                    console.log('Fast list: nameLen', nameLen);
                     if (validClean.length < idx + nameLen + 4)
                         return;
                     idx += nameLen;
@@ -79,7 +69,6 @@ export async function listFilesInPng(pngBuf) {
                     if (validClean.length < idx + 4)
                         return;
                     const marker = validClean.slice(idx, idx + 4).toString('utf8');
-                    console.log('Fast list: marker', marker);
                     if (marker === 'rXFL') {
                         idx += 4;
                         if (validClean.length < idx + 4)
@@ -90,10 +79,37 @@ export async function listFilesInPng(pngBuf) {
                             return;
                         const jsonBuf = validClean.slice(idx, idx + jsonLen);
                         try {
-                            const files = JSON.parse(jsonBuf.toString('utf8'));
+                            const parsedFiles = JSON.parse(jsonBuf.toString('utf8'));
                             resolved = true;
                             inflate.destroy();
-                            resolve(files.sort());
+                            if (parsedFiles.length > 0 &&
+                                typeof parsedFiles[0] === 'object' &&
+                                (parsedFiles[0].name || parsedFiles[0].path)) {
+                                const objs = parsedFiles.map((p) => ({
+                                    name: p.name ?? p.path,
+                                    size: typeof p.size === 'number' ? p.size : 0,
+                                }));
+                                resolve(objs.sort((a, b) => a.name.localeCompare(b.name)));
+                                return;
+                            }
+                            const names = parsedFiles;
+                            if (opts.includeSizes) {
+                                getFileSizesFromPng(pngBuf)
+                                    .then((sizes) => {
+                                    if (sizes) {
+                                        resolve(names
+                                            .map((f) => ({ name: f, size: sizes[f] ?? 0 }))
+                                            .sort((a, b) => a.name.localeCompare(b.name)));
+                                    }
+                                    else {
+                                        resolve(names.sort());
+                                    }
+                                })
+                                    .catch(() => resolve(names.sort()));
+                            }
+                            else {
+                                resolve(names.sort());
+                            }
                         }
                         catch (e) {
                             resolved = true;
@@ -127,7 +143,7 @@ export async function listFilesInPng(pngBuf) {
         }
     }
     catch (e) {
-        console.log('Fast list error:', e);
+        console.log(' error:', e);
     }
     try {
         try {
@@ -169,7 +185,25 @@ export async function listFilesInPng(pngBuf) {
                                     const jsonEnd = jsonStart + jsonLen;
                                     if (jsonEnd <= rawRGB.length) {
                                         const jsonBuf = rawRGB.slice(jsonStart, jsonEnd);
-                                        const files = JSON.parse(jsonBuf.toString('utf8'));
+                                        const parsedFiles = JSON.parse(jsonBuf.toString('utf8'));
+                                        if (parsedFiles.length > 0 &&
+                                            typeof parsedFiles[0] === 'object' &&
+                                            (parsedFiles[0].name || parsedFiles[0].path)) {
+                                            const objs = parsedFiles.map((p) => ({
+                                                name: p.name ?? p.path,
+                                                size: typeof p.size === 'number' ? p.size : 0,
+                                            }));
+                                            return objs.sort((a, b) => a.name.localeCompare(b.name));
+                                        }
+                                        const files = parsedFiles;
+                                        if (opts.includeSizes) {
+                                            const sizes = await getFileSizesFromPng(pngBuf);
+                                            if (sizes) {
+                                                return files
+                                                    .map((f) => ({ name: f, size: sizes[f] ?? 0 }))
+                                                    .sort((a, b) => a.name.localeCompare(b.name));
+                                            }
+                                        }
                                         return files.sort();
                                     }
                                 }
@@ -223,7 +257,25 @@ export async function listFilesInPng(pngBuf) {
                                     const jsonEnd = jsonStart + jsonLen;
                                     if (jsonEnd <= rawRGB.length) {
                                         const jsonBuf = rawRGB.slice(jsonStart, jsonEnd);
-                                        const files = JSON.parse(jsonBuf.toString('utf8'));
+                                        const parsedFiles = JSON.parse(jsonBuf.toString('utf8'));
+                                        if (parsedFiles.length > 0 &&
+                                            typeof parsedFiles[0] === 'object' &&
+                                            (parsedFiles[0].name || parsedFiles[0].path)) {
+                                            const objs = parsedFiles.map((p) => ({
+                                                name: p.name ?? p.path,
+                                                size: typeof p.size === 'number' ? p.size : 0,
+                                            }));
+                                            return objs.sort((a, b) => a.name.localeCompare(b.name));
+                                        }
+                                        const files = parsedFiles;
+                                        if (opts.includeSizes) {
+                                            const sizes = await getFileSizesFromPng(reconstructed);
+                                            if (sizes) {
+                                                return files
+                                                    .map((f) => ({ name: f, size: sizes[f] ?? 0 }))
+                                                    .sort((a, b) => a.name.localeCompare(b.name));
+                                            }
+                                        }
                                         return files.sort();
                                     }
                                 }
@@ -241,7 +293,25 @@ export async function listFilesInPng(pngBuf) {
                 const data = Buffer.isBuffer(fileListChunk.data)
                     ? fileListChunk.data
                     : Buffer.from(fileListChunk.data);
-                const files = JSON.parse(data.toString('utf8'));
+                const parsedFiles = JSON.parse(data.toString('utf8'));
+                if (parsedFiles.length > 0 &&
+                    typeof parsedFiles[0] === 'object' &&
+                    (parsedFiles[0].name || parsedFiles[0].path)) {
+                    const objs = parsedFiles.map((p) => ({
+                        name: p.name ?? p.path,
+                        size: typeof p.size === 'number' ? p.size : 0,
+                    }));
+                    return objs.sort((a, b) => a.name.localeCompare(b.name));
+                }
+                const files = parsedFiles;
+                if (opts.includeSizes) {
+                    const sizes = await getFileSizesFromPng(pngBuf);
+                    if (sizes) {
+                        return files
+                            .map((f) => ({ name: f, size: sizes[f] ?? 0 }))
+                            .sort((a, b) => a.name.localeCompare(b.name));
+                    }
+                }
                 return files.sort();
             }
             const metaChunk = chunks.find((c) => c.name === CHUNK_TYPE);
@@ -255,7 +325,17 @@ export async function listFilesInPng(pngBuf) {
                     const jsonStart = markerIdx + 8;
                     const jsonEnd = jsonStart + jsonLen;
                     if (jsonEnd <= dataBuf.length) {
-                        const files = JSON.parse(dataBuf.slice(jsonStart, jsonEnd).toString('utf8'));
+                        const parsedFiles = JSON.parse(dataBuf.slice(jsonStart, jsonEnd).toString('utf8'));
+                        if (parsedFiles.length > 0 &&
+                            typeof parsedFiles[0] === 'object' &&
+                            (parsedFiles[0].name || parsedFiles[0].path)) {
+                            const objs = parsedFiles.map((p) => ({
+                                name: p.name ?? p.path,
+                                size: typeof p.size === 'number' ? p.size : 0,
+                            }));
+                            return objs.sort((a, b) => a.name.localeCompare(b.name));
+                        }
+                        const files = parsedFiles;
                         return files.sort();
                     }
                 }
@@ -271,7 +351,25 @@ export async function listFilesInPng(pngBuf) {
             const data = Buffer.isBuffer(fileListChunk.data)
                 ? fileListChunk.data
                 : Buffer.from(fileListChunk.data);
-            const files = JSON.parse(data.toString('utf8'));
+            const parsedFiles = JSON.parse(data.toString('utf8'));
+            if (parsedFiles.length > 0 &&
+                typeof parsedFiles[0] === 'object' &&
+                (parsedFiles[0].name || parsedFiles[0].path)) {
+                const objs = parsedFiles.map((p) => ({
+                    name: p.name ?? p.path,
+                    size: typeof p.size === 'number' ? p.size : 0,
+                }));
+                return objs.sort((a, b) => a.name.localeCompare(b.name));
+            }
+            const files = parsedFiles;
+            if (opts.includeSizes) {
+                const sizes = await getFileSizesFromPng(pngBuf);
+                if (sizes) {
+                    return files
+                        .map((f) => ({ name: f, size: sizes[f] ?? 0 }))
+                        .sort((a, b) => a.name.localeCompare(b.name));
+                }
+            }
             return files.sort();
         }
         const metaChunk = chunks.find((c) => c.name === CHUNK_TYPE);
@@ -285,7 +383,17 @@ export async function listFilesInPng(pngBuf) {
                 const jsonStart = markerIdx + 8;
                 const jsonEnd = jsonStart + jsonLen;
                 if (jsonEnd <= dataBuf.length) {
-                    const files = JSON.parse(dataBuf.slice(jsonStart, jsonEnd).toString('utf8'));
+                    const parsedFiles = JSON.parse(dataBuf.slice(jsonStart, jsonEnd).toString('utf8'));
+                    if (parsedFiles.length > 0 &&
+                        typeof parsedFiles[0] === 'object' &&
+                        (parsedFiles[0].name || parsedFiles[0].path)) {
+                        const objs = parsedFiles.map((p) => ({
+                            name: p.name ?? p.path,
+                            size: typeof p.size === 'number' ? p.size : 0,
+                        }));
+                        return objs.sort((a, b) => a.name.localeCompare(b.name));
+                    }
+                    const files = parsedFiles;
                     return files.sort();
                 }
             }
@@ -294,6 +402,28 @@ export async function listFilesInPng(pngBuf) {
     catch (e) { }
     return null;
 }
+async function getFileSizesFromPng(pngBuf) {
+    try {
+        const res = await decodePngToBinary(pngBuf, { showProgress: false });
+        if (res && res.files) {
+            const map = {};
+            for (const f of res.files)
+                map[f.path] = f.buf.length;
+            return map;
+        }
+        if (res && res.buf) {
+            const unpack = unpackBuffer(res.buf);
+            if (unpack) {
+                const map = {};
+                for (const f of unpack.files)
+                    map[f.path] = f.buf.length;
+                return map;
+            }
+        }
+    }
+    catch (e) { }
+    return null;
+}
 /**
  * Detect if a PNG/ROX buffer contains an encrypted payload (requires passphrase)
  * Returns true if encryption flag indicates AES or XOR.

package/dist/utils/types.d.ts

@@ -11,7 +11,10 @@ export interface EncodeOptions {
     output?: 'auto' | 'png' | 'rox';
     includeName?: boolean;
     includeFileList?: boolean;
-    fileList?: string[];
+    fileList?: Array<string | {
+        name: string;
+        size: number;
+    }>;
     onProgress?: (info: {
         phase: string;
         loaded?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roxify",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Encode binary data into PNG images with Zstd compression and decode them back. Supports CLI and programmatic API (Node.js ESM).",
   "type": "module",
   "main": "dist/index.js",