@shibam/sticker-maker 1.2.6 → 1.2.8

package/index.js

@@ -98,13 +98,10 @@ export default class Sticker {
   }
 
   async build() {
-    // Process input to buffer
     const inputBuffer = await this.processImage(this.image);
 
-    // Convert to WebP using imported converter
     const webpBuffer = await this.converter.convertToWebp(inputBuffer);
 
-    // Add metadata using imported Exif handler
     const exif = new Exif({
       id: this.id,
       pack: this.pack,
@@ -120,11 +117,11 @@ export default class Sticker {
     return await this.build();
   }
 
-    async metadata() {
-        if (!this.buffer) {
-            await this.build();
-        }
-    
-        return await extractMetadata(this.buffer);
+  async metadata() {
+    if (!this.buffer) {
+      await this.build();
     }
+
+    return await extractMetadata(this.buffer);
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shibam/sticker-maker",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -11,10 +11,8 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
-    "cwebp": "^3.1.0",
     "file-type": "^20.0.0",
-    "jimp": "^1.6.0",
     "node-webpmux": "^3.2.0",
-    "webp-converter": "^2.3.3"
+    "sharp": "^0.33.5"
   }
 }

package/utils/convert.js

@@ -4,15 +4,15 @@ import { promises as fs } from "fs";
 import { tmpdir } from "os";
 import { join } from "path";
 import { fileTypeFromBuffer } from "file-type";
-
+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.width = options.width || 512;
+    this.fps = 12;
+    this.quality = options.quality ?? 10;
+    this.width = options.width ?? 320;
     this.mime = null;
   }
 
@@ -24,11 +24,11 @@ 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: ${this.mime}`);
@@ -55,51 +55,24 @@ export default class MediaConverter {
     }
   }
 
-  async gifToWebp(buffer) {
-    const tempInput = join(tmpdir(), `input_${Date.now()}.gif`);
-    const tempOutput = join(tmpdir(), `output_${Date.now()}.webp`);
-
-    try {
-      await fs.writeFile(tempInput, buffer);
-
-      // Use gif2webp to convert GIF to WebP
-      const gif2webpCmd = `gif2webp "${tempInput}" -q ${this.quality} -o "${tempOutput}"`;
-      await exec(gif2webpCmd);
+  async ToWebp(buffer) {
 
-      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 {
-      // Write the input buffer to a temporary file
-      await fs.writeFile(tempInput, buffer);
-
-      // Use cwebp to convert the image to WebP
-      const cwebpCmd = `cwebp "${tempInput}" -q ${this.quality} -o "${tempOutput}"`;
-      await exec(cwebpCmd);
-
-      // Read the resulting WebP file as a buffer
-      const webpBuffer = await fs.readFile(tempOutput);
-
-      // Clean up temporary files
-      await Promise.all([fs.unlink(tempInput).catch(() => {}), fs.unlink(tempOutput).catch(() => {})]);
-
-      return webpBuffer;  // Return the WebP buffer as output
-    } catch (error) {
-      // Clean up temporary files in case of 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();
   }
 }

package/test/index.js

@@ -1,11 +0,0 @@
-import Sticker from '../index.js';
-import * as fs from 'fs';
-const sticker = new Sticker('./test/lol.mp4',{
-    pack: 'My Pack',
-    author: 'Me',
-    category: ['😹'],
-    quality: 80,
-    text: 'Hello World'
-});
-sticker.metadata().then(console.log);
-fs.writeFileSync('sticker.webp', await sticker.build());