roxify 1.1.0 → 1.1.1

package/dist/cli.js

@@ -173,7 +173,7 @@ async function decodeCommand(args) {
         catch (e) {
             console.log('Could not generate reconst PNG:', e.message);
         }
-        console.log(`Reading: ${resolvedInputPath}`);
+        console.log(`Reading: ${resolvedInputPath.replace('_reconst.png', '.png')}`);
         const options = {};
         if (parsed.passphrase) {
             options.passphrase = parsed.passphrase;

package/dist/index.js

@@ -108,6 +108,19 @@ async function loadRaw(imgInput) {
     return { data, info };
 }
 export async function cropAndReconstitute(input) {
+    async function loadRaw(imgInput) {
+        const { data, info } = await sharp(imgInput)
+            .ensureAlpha()
+            .raw()
+            .toBuffer({ resolveWithObject: true });
+        return { data, info };
+    }
+    function idxFor(x, y, width) {
+        return (y * width + x) * 4;
+    }
+    function eqRGB(a, b) {
+        return a[0] === b[0] && a[1] === b[1] && a[2] === b[2];
+    }
     const { data, info } = await loadRaw(input);
     const w = info.width;
     const h = info.height;
@@ -183,8 +196,8 @@ export async function cropAndReconstitute(input) {
     const sy1 = Math.min(startPoint.y, endPoint.y);
     const sx2 = Math.max(startPoint.x, endPoint.x);
     const sy2 = Math.max(startPoint.y, endPoint.y);
-    const cropW = sx2 - sx1;
-    const cropH = sy2 - sy1;
+    const cropW = sx2 - sx1 + 1;
+    const cropH = sy2 - sy1 + 1;
     if (cropW <= 0 || cropH <= 0)
         throw new Error('Invalid crop dimensions');
     const cropped = await sharp(input)
@@ -212,19 +225,84 @@ export async function cropAndReconstitute(input) {
                 return false;
         return true;
     }
-    const compressedLines = [];
+    const newWidth = cw;
+    const newHeight = ch + 1;
+    const out = Buffer.alloc(newWidth * newHeight * 4, 0);
+    for (let i = 0; i < out.length; i += 4)
+        out[i + 3] = 255;
     for (let y = 0; y < ch; y++) {
+        for (let x = 0; x < cw; x++) {
+            const srcI = ((y * cw + x) * 4) | 0;
+            const dstI = ((y * newWidth + x) * 4) | 0;
+            out[dstI] = cdata[srcI];
+            out[dstI + 1] = cdata[srcI + 1];
+            out[dstI + 2] = cdata[srcI + 2];
+            out[dstI + 3] = cdata[srcI + 3];
+        }
+    }
+    if (cw >= 3) {
+        const targetY = ch - 1;
+        for (let x = cw - 3; x < cw; x++) {
+            const i = ((targetY * newWidth + x) * 4) | 0;
+            out[i] = 0;
+            out[i + 1] = 0;
+            out[i + 2] = 0;
+            out[i + 3] = 255;
+        }
+    }
+    else {
+        const targetY = ch - 1;
+        for (let x = 0; x < cw; x++) {
+            const i = ((targetY * newWidth + x) * 4) | 0;
+            out[i] = 0;
+            out[i + 1] = 0;
+            out[i + 2] = 0;
+            out[i + 3] = 255;
+        }
+    }
+    const lastY = ch;
+    for (let x = 0; x < newWidth; x++) {
+        const i = ((lastY * newWidth + x) * 4) | 0;
+        out[i] = 0;
+        out[i + 1] = 0;
+        out[i + 2] = 0;
+        out[i + 3] = 255;
+    }
+    if (newWidth >= 3) {
+        const bgrStart = newWidth - 3;
+        let i = ((lastY * newWidth + bgrStart) * 4) | 0;
+        out[i] = 0;
+        out[i + 1] = 0;
+        out[i + 2] = 255;
+        out[i + 3] = 255;
+        i = ((lastY * newWidth + bgrStart + 1) * 4) | 0;
+        out[i] = 0;
+        out[i + 1] = 255;
+        out[i + 2] = 0;
+        out[i + 3] = 255;
+        i = ((lastY * newWidth + bgrStart + 2) * 4) | 0;
+        out[i] = 255;
+        out[i + 1] = 0;
+        out[i + 2] = 0;
+        out[i + 3] = 255;
+    }
+    function getPixel(x, y) {
+        const i = ((y * newWidth + x) * 4) | 0;
+        return [out[i], out[i + 1], out[i + 2], out[i + 3]];
+    }
+    const compressedLines = [];
+    for (let y = 0; y < newHeight; y++) {
         const line = [];
         let x = 0;
-        while (x < cw) {
-            const current = cat(x, y);
+        while (x < newWidth) {
+            const current = getPixel(x, y);
             if (current[0] === 0 && current[1] === 0 && current[2] === 0) {
                 x++;
                 continue;
             }
             line.push(current);
             let nx = x + 1;
-            while (nx < cw && eq(cat(nx, y), current))
+            while (nx < newWidth && eq(getPixel(nx, y), current))
                 nx++;
             x = nx;
         }
@@ -246,90 +324,25 @@ export async function cropAndReconstitute(input) {
             .png()
             .toBuffer();
     }
-    const newWidth = Math.max(...compressedLines.map((l) => l.length));
-    const newHeight = compressedLines.length + 1;
-    const out = Buffer.alloc(newWidth * newHeight * 4, 0);
-    for (let i = 0; i < out.length; i += 4)
-        out[i + 3] = 255;
+    const finalWidth = Math.max(...compressedLines.map((l) => l.length));
+    const finalHeight = compressedLines.length;
+    const finalOut = Buffer.alloc(finalWidth * finalHeight * 4, 0);
+    for (let i = 0; i < finalOut.length; i += 4)
+        finalOut[i + 3] = 255;
     for (let y = 0; y < compressedLines.length; y++) {
         const line = compressedLines[y];
-        const isSecondToLast = y === compressedLines.length - 1;
-        const startX = 0;
-        const effectiveLength = isSecondToLast
-            ? Math.max(0, line.length - 3)
-            : line.length;
-        for (let x = 0; x < effectiveLength; x++) {
-            const i = ((y * newWidth + startX + x) * 4) | 0;
-            out[i] = line[x][0];
-            out[i + 1] = line[x][1];
-            out[i + 2] = line[x][2];
-            out[i + 3] = line[x][3] === 0 ? 255 : line[x][3];
-        }
-        if (isSecondToLast) {
-            for (let x = effectiveLength; x < Math.min(effectiveLength + 3, newWidth); x++) {
-                const i = ((y * newWidth + x) * 4) | 0;
-                out[i] = 0;
-                out[i + 1] = 0;
-                out[i + 2] = 0;
-                out[i + 3] = 255;
-            }
-        }
-    }
-    const secondToLastY = newHeight - 2;
-    let secondToLastIsBlack = true;
-    for (let x = 0; x < newWidth; x++) {
-        const i = ((secondToLastY * newWidth + x) * 4) | 0;
-        if (out[i] !== 0 || out[i + 1] !== 0 || out[i + 2] !== 0) {
-            secondToLastIsBlack = false;
-            break;
-        }
-    }
-    let finalHeight = newHeight;
-    let finalOut = out;
-    if (secondToLastIsBlack) {
-        finalHeight = newHeight - 1;
-        finalOut = Buffer.alloc(newWidth * finalHeight * 4, 0);
-        for (let i = 0; i < finalOut.length; i += 4)
-            finalOut[i + 3] = 255;
-        for (let y = 0; y < newHeight - 2; y++) {
-            for (let x = 0; x < newWidth; x++) {
-                const srcI = ((y * newWidth + x) * 4) | 0;
-                const dstI = ((y * newWidth + x) * 4) | 0;
-                finalOut[dstI] = out[srcI];
-                finalOut[dstI + 1] = out[srcI + 1];
-                finalOut[dstI + 2] = out[srcI + 2];
-                finalOut[dstI + 3] = out[srcI + 3];
-            }
+        const isLastLine = y === compressedLines.length - 1;
+        const startX = isLastLine ? finalWidth - line.length : 0;
+        for (let x = 0; x < line.length; x++) {
+            const i = ((y * finalWidth + startX + x) * 4) | 0;
+            finalOut[i] = line[x][0];
+            finalOut[i + 1] = line[x][1];
+            finalOut[i + 2] = line[x][2];
+            finalOut[i + 3] = line[x][3] === 0 ? 255 : line[x][3];
         }
     }
-    const lastY = finalHeight - 1;
-    for (let x = 0; x < newWidth; x++) {
-        const i = ((lastY * newWidth + x) * 4) | 0;
-        finalOut[i] = 0;
-        finalOut[i + 1] = 0;
-        finalOut[i + 2] = 0;
-        finalOut[i + 3] = 255;
-    }
-    if (newWidth >= 3) {
-        const bgrStart = newWidth - 3;
-        let i = ((lastY * newWidth + bgrStart) * 4) | 0;
-        finalOut[i] = 0;
-        finalOut[i + 1] = 0;
-        finalOut[i + 2] = 255;
-        finalOut[i + 3] = 255;
-        i = ((lastY * newWidth + bgrStart + 1) * 4) | 0;
-        finalOut[i] = 0;
-        finalOut[i + 1] = 255;
-        finalOut[i + 2] = 0;
-        finalOut[i + 3] = 255;
-        i = ((lastY * newWidth + bgrStart + 2) * 4) | 0;
-        finalOut[i] = 255;
-        finalOut[i + 1] = 0;
-        finalOut[i + 2] = 0;
-        finalOut[i + 3] = 255;
-    }
     return sharp(finalOut, {
-        raw: { width: newWidth, height: finalHeight, channels: 4 },
+        raw: { width: finalWidth, height: finalHeight, channels: 4 },
     })
         .png()
         .toBuffer();
@@ -442,7 +455,7 @@ export async function encodeBinaryToPng(input, opts = {}) {
         const spaceInLastRow = pixelsInLastRow === 0 ? logicalWidth : logicalWidth - pixelsInLastRow;
         const needsExtraRow = spaceInLastRow < MARKER_END.length;
         const logicalHeight = needsExtraRow ? dataRows + 1 : dataRows;
-        const scale = 1;
+        const scale = 2;
         const width = logicalWidth * scale;
         const height = logicalHeight * scale;
         const raw = Buffer.alloc(width * height * bytesPerPixel);
@@ -489,10 +502,10 @@ export async function encodeBinaryToPng(input, opts = {}) {
             raw: { width, height, channels: 3 },
         })
             .png({
-            compressionLevel: 0,
+            compressionLevel: 9,
             palette: false,
-            effort: 1,
-            adaptiveFiltering: false,
+            effort: 10,
+            adaptiveFiltering: true,
         })
             .toBuffer();
     }

package/package.json

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