@shibam/sticker-maker 1.2.5 → 1.2.7

package/index.js

@@ -116,6 +116,10 @@ export default class Sticker {
     return this.buffer;
   }
 
+  async toBuffer() {
+    return await this.build();
+  }
+
     async metadata() {
         if (!this.buffer) {
             await this.build();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shibam/sticker-maker",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -14,6 +14,8 @@
     "cwebp": "^3.1.0",
     "file-type": "^20.0.0",
     "jimp": "^1.6.0",
-    "node-webpmux": "^3.2.0"
+    "node-webpmux": "^3.2.0",
+    "sharp": "0.30.0",
+    "webp-converter": "^2.3.3"
   }
 }

package/utils/convert.js

@@ -4,14 +4,14 @@ import { promises as fs } from "fs";
 import { tmpdir } from "os";
 import { join } from "path";
 import { fileTypeFromBuffer } from "file-type";
-import { Jimp } from "jimp";
+import sharp from "sharp";
 
 const exec = promisify(execCallback);
 
 export default class MediaConverter {
   constructor(options = {}) {
     this.fps = options.fps || 12;
-    this.quality = options.quality || 80;
+    this.quality = options.quality || 10;
     this.width = options.width || 512;
     this.mime = null;
   }
@@ -24,14 +24,14 @@ export default class MediaConverter {
 
     if (this.mime.startsWith("video/")) {
       const gif = await this.videoToGif(buffer);
-      return await this.gifToWebp(gif);
+      return await this.ToWebp(gif);
     } else if (this.mime === "image/gif") {
-      return await this.gifToWebp(buffer);
+      return await this.ToWebp(buffer);
     } else if (this.mime.startsWith("image/")) {
-      return await this.imageToWebp(buffer);
+      return await this.ToWebp(buffer);
     }
 
-    throw new Error(`Unsupported file type: ${mime}`);
+    throw new Error(`Unsupported file type: ${this.mime}`);
   }
 
   async videoToGif(buffer) {
@@ -46,74 +46,33 @@ export default class MediaConverter {
 
       const gifBuffer = await fs.readFile(tempOutput);
 
-      await Promise.all([
-        fs.unlink(tempInput).catch(() => {}),
-        fs.unlink(tempOutput).catch(() => {}),
-      ]);
+      await Promise.all([fs.unlink(tempInput).catch(() => {}), fs.unlink(tempOutput).catch(() => {})]);
 
       return gifBuffer;
     } catch (error) {
-      await Promise.all([
-        fs.unlink(tempInput).catch(() => {}),
-        fs.unlink(tempOutput).catch(() => {}),
-      ]);
+      await Promise.all([fs.unlink(tempInput).catch(() => {}), fs.unlink(tempOutput).catch(() => {})]);
       throw new Error(`Failed to convert video to gif: ${error.message}`);
     }
   }
 
-  async gifToWebp(buffer) {
-    const tempInput = join(tmpdir(), `input_${Date.now()}.gif`);
-    const tempOutput = join(tmpdir(), `output_${Date.now()}.webp`);
+  async ToWebp(buffer) {
 
-    try {
-      await fs.writeFile(tempInput, buffer);
-
-      const ffmpegCmd = `ffmpeg -i "${tempInput}" -vf "scale=${this.width}:-1" -c:v libwebp -quality ${this.quality} -loop 0 -lossless ${this.mime.startsWith("image/")?'1':'0'} -preset picture -an -vsync 0 "${tempOutput}"`;
-      await exec(ffmpegCmd);
-
-      const webpBuffer = await fs.readFile(tempOutput);
+    const mimeType = this.mime;
+    const isAnimated = mimeType?.includes("video") || mimeType?.includes("gif");
 
-      await Promise.all([
-        fs.unlink(tempInput).catch(() => {}),
-        fs.unlink(tempOutput).catch(() => {}),
-      ]);
-
-      return webpBuffer;
-    } catch (error) {
-      await Promise.all([
-        fs.unlink(tempInput).catch(() => {}),
-        fs.unlink(tempOutput).catch(() => {}),
-      ]);
-      throw new Error(`Failed to convert gif to webp: ${error.message}`);
-    }
-  }
+    // Initialize sharp with animation support for GIFs or video frames
+    const res = sharp(buffer, { animated: isAnimated });
 
-  async imageToWebp(buffer) {
-    const tempInput = join(tmpdir(), `input_${Date.now()}.png`);
-    const tempOutput = join(tmpdir(), `output_${Date.now()}.webp`);
+    // Resize image to fit within the specified width while preserving aspect ratio
+    res.resize(this.width, this.width, {
+      fit: sharp.fit.contain,
+      background: { r: 0, g: 0, b: 0, alpha: 0 }, // Transparent background
+    });
 
-    try {
-      const image = await Jimp.read(buffer);
-      image.resize(this.width, Jimp.AUTO);
-      await image.writeAsync(tempInput);
-
-      const ffmpegCmd = `ffmpeg -i "${tempInput}" -quality ${this.quality} "${tempOutput}"`;
-      await exec(ffmpegCmd);
-
-      const webpBuffer = await fs.readFile(tempOutput);
-
-      await Promise.all([
-        fs.unlink(tempInput).catch(() => {}),
-        fs.unlink(tempOutput).catch(() => {}),
-      ]);
-
-      return webpBuffer;
-    } catch (error) {
-      await Promise.all([
-        fs.unlink(tempInput).catch(() => {}),
-        fs.unlink(tempOutput).catch(() => {}),
-      ]);
-      throw new Error(`Failed to convert image to webp: ${error.message}`);
-    }
+    // Convert to WebP format with the specified quality
+    return await res
+      .toFormat("webp")
+      .webp({ quality: this.quality, lossless: isAnimated }) // Lossless for GIFs or animations
+      .toBuffer();
   }
 }