bugfix

Author: Moebytes

.DS_Store

@@ -55,7 +55,7 @@ const removeDoubles = async (images: string[], dontProcessAll?: boolean) => {
   let widthMap = {} as any 
 
   for (let i = 0; i < images.length; i++) {
-    const metadata = await sharp(images[i]).metadata()
+    const metadata = await sharp(images[i], {limitInputPixels: false}).metadata()
     const width = metadata.width || 0
     if (widthMap[width]) {
       widthMap[width] += 1
@@ -76,7 +76,7 @@ const removeDoubles = async (images: string[], dontProcessAll?: boolean) => {
   }
 
   for (let i = 0; i < images.length; i++) {
-    const metadata = await sharp(images[i]).metadata()
+    const metadata = await sharp(images[i], {limitInputPixels: false}).metadata()
     const width = metadata.width || 0
     if (width > commonWidth * 1.5) {
       doubleImages.push(images[i])
@@ -89,16 +89,16 @@ const removeDoubles = async (images: string[], dontProcessAll?: boolean) => {
   }
 
   for (let i = 0; i < doubleImages.length; i++) {
-    const metadata = await sharp(doubleImages[i]).metadata()
+    const metadata = await sharp(doubleImages[i], {limitInputPixels: false}).metadata()
     const width = metadata.width || 0
     const height = metadata.height || 0
     const newWidth = Math.floor(width / 2)
     const page1 = `${path.dirname(doubleImages[i])}/${path.basename(doubleImages[i], path.extname(doubleImages[i]))}.1${path.extname(doubleImages[i])}`
     const page2 = `${path.dirname(doubleImages[i])}/${path.basename(doubleImages[i], path.extname(doubleImages[i]))}.2${path.extname(doubleImages[i])}`
-    await sharp(doubleImages[i])
+    await sharp(doubleImages[i], {limitInputPixels: false})
         .extract({left: newWidth, top: 0, width: newWidth, height: height})
         .toFile(page1)
-    await sharp(doubleImages[i])
+    await sharp(doubleImages[i], {limitInputPixels: false})
         .extract({left: 0, top: 0, width: newWidth, height: height})
         .toFile(page2)
   }
@@ -701,14 +701,14 @@ const compress = async (info: any) => {
           const {frameArray, delayArray} = await functions.getGIFFrames(info.source)
           const newFrameArray = [] as Buffer[]
           for (let i = 0; i < frameArray.length; i++) {
-            const newFrame = await sharp(frameArray[i])
+            const newFrame = await sharp(frameArray[i], {limitInputPixels: false})
             .resize(width, height, {fit: "fill"})
             .toBuffer()
             newFrameArray.push(newFrame)
           }
           buffer = await functions.encodeGIF(newFrameArray, delayArray, width, height)
         } else {
-          buffer = await sharp(buffer, {animated: true}).resize(width, height, {fit: "fill"}).gif().toBuffer()
+          buffer = await sharp(buffer, {animated: true, limitInputPixels: false}).resize(width, height, {fit: "fill"}).gif().toBuffer()
         }
         if (options.quality !== 100) {
           buffer = await imagemin.buffer(buffer, {plugins: [
@@ -724,10 +724,10 @@ const compress = async (info: any) => {
       }
     } else {
       if (resizeCondition) {
-        buffer = await sharp(buffer, {animated: true}).resize(width, height, {fit: "fill"}).toBuffer()
+        buffer = await sharp(buffer, {animated: true, limitInputPixels: false}).resize(width, height, {fit: "fill"}).toBuffer()
       }
       if (sourceExt !== ext) {
-        let s = sharp(buffer, {animated: true})
+        let s = sharp(buffer, {animated: true, limitInputPixels: false})
         if (ext === "jpg" || ext === "jpeg") s.jpeg({optimiseScans: options.progressive, quality: options.quality})
         if (ext === "png") s.png({quality: options.quality})
         if (ext === "webp") s.webp({quality: options.quality})
@@ -819,14 +819,14 @@ ipcMain.handle("compress-realtime", async (event, info: any) => {
           const {frameArray, delayArray} = await functions.getGIFFrames(info.source)
           const newFrameArray = [] as Buffer[]
           for (let i = 0; i < frameArray.length; i++) {
-            const newFrame = await sharp(frameArray[i])
+            const newFrame = await sharp(frameArray[i], {limitInputPixels: false})
             .resize(width, height, {fit: "fill"})
             .toBuffer()
             newFrameArray.push(newFrame)
           }
           buffer = await functions.encodeGIF(newFrameArray, delayArray, width, height)
         } else {
-          buffer = await sharp(buffer, {animated: true}).resize(width, height, {fit: "fill"}).gif().toBuffer()
+          buffer = await sharp(buffer, {animated: true, limitInputPixels: false}).resize(width, height, {fit: "fill"}).gif().toBuffer()
         }
         if (options.quality !== 100) {
           buffer = await imagemin.buffer(buffer, {plugins: [
@@ -842,10 +842,10 @@ ipcMain.handle("compress-realtime", async (event, info: any) => {
       }
     } else {
       if (resizeCondition) {
-        buffer = await sharp(buffer, {animated: true}).resize(width, height, {fit: "fill"}).toBuffer()
+        buffer = await sharp(buffer, {animated: true, limitInputPixels: false}).resize(width, height, {fit: "fill"}).toBuffer()
       }
       if (sourceExt !== ext) {
-        let s = sharp(buffer, {animated: true})
+        let s = sharp(buffer, {animated: true, limitInputPixels: false})
         if (ext === "jpg" || ext === "jpeg") s.jpeg({optimiseScans: options.progressive, quality: options.quality})
         if (ext === "png") s.png({quality: options.quality})
         if (ext === "webp") s.webp({quality: options.quality})

main.ts

@@ -1,12 +1,12 @@
 {
   "name": "image-compressor",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Compresses, resizes, and renames images.",
   "main": "dist/main.js",
   "scripts": {
     "start": "npm run clean && webpack && cross-env DEVELOPMENT=true electron dist/main.js",
     "clean": "del-cli ./dist",
-    "build": "npm run clean ./build && webpack && npm run sharp:mac && cross-env CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder -m -p never",
+    "build": "npm run clean ./build && webpack && cross-env CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder -m -p never",
     "rebuild": "npm rebuild --runtime=electron --target=14.0.0 --disturl=https://atom.io/download/atom-shell --abi=83",
     "release": "npm run release:mac && npm run release:win",
     "release:mac": "npm run clean ./build && webpack && npm run sharp:mac && cross-env CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder -m -p always",
@@ -46,11 +46,23 @@
       "extraFiles": [
         "poppler/mac/**"
       ],
-      "files": [
-        "vendor/cjpeg",
-        "vendor/cwebp",
-        "vendor/gifsicle",
-        "vendor/pngquant"
+      "extraResources": [
+        {
+          "from": "vendor/cjpeg",
+          "to": "app/vendor/cjpeg"
+        },
+        {
+          "from": "vendor/cwebp",
+          "to": "app/vendor/cwebp"
+        },
+        {
+          "from": "vendor/gifsicle",
+          "to": "app/vendor/gifsicle"
+        },
+        {
+          "from": "vendor/pngquant",
+          "to": "app/vendor/pngquant"
+        }
       ]
     },
     "dmg": {

package-lock.json

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+import process from 'node:process';
+import {spawn} from 'node:child_process';
+import binPath from './index.js';
+
+spawn(binPath, process.argv.slice(2), {stdio: 'inherit'})
+	.on('exit', process.exit);

package.json

@@ -0,0 +1,3 @@
+import lib from './lib/index.js';
+
+export default lib.path();

patch/.DS_Store

@@ -0,0 +1,28 @@
+import process from 'node:process';
+import {fileURLToPath} from 'node:url';
+import binBuild from 'bin-build';
+import bin from './index.js';
+
+bin.run(['-version']).then(() => {
+	console.log('cwebp pre-build test passed successfully');
+}).catch(error => {
+	console.warn(error.message);
+	console.warn('cwebp pre-build test failed');
+	console.info('compiling from source');
+
+	try {
+		const source = fileURLToPath(new URL('../vendor/source/libwebp-1.2.1.tar.gz', import.meta.url));
+
+		binBuild.file(source, [
+			`./configure --disable-shared --prefix="${bin.dest()}" --bindir="${bin.dest()}"`,
+			'make && make install',
+		]);
+
+		console.log('cwebp built successfully');
+	} catch (error) {
+		console.error(error.stack);
+
+		// eslint-disable-next-line unicorn/no-process-exit
+		process.exit(1);
+	}
+});

patch/cwebp-bin/.DS_Store

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) Imagemin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.