@shibam/sticker-maker 1.3.0-rc6 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shibam/sticker-maker",
-  "version": "1.3.0-rc6",
+  "version": "1.3.0",
   "description": "A package for creating whatsapp stickers",
   "main": "src/index.js",
   "type": "module",

package/readme.md

@@ -1,6 +1,6 @@
 # @shibam/sticker-maker
 
-`@shibam/sticker-maker` is a lightweight utility library designed for converting images and videos into stickers while allowing customization of metadata. you have to download ffmpeg and canvas dependencies globally. It supports various input types and ensures high-quality sticker conversion. This module has minimal dependencies, ensuring efficient performance. If you encounter any issues, please feel free to open an issue. However, please check if a similar issue has already been reported before creating a new one. Happy Coding (⁠≧⁠▽⁠≦⁠).
+`@shibam/sticker-maker` is a lightweight utility library designed for converting images and videos into stickers while allowing customization of metadata. you have to download ffmpeg dependency. It supports various input types and ensures high-quality sticker conversion. This module has minimal dependencies, ensuring efficient performance. If you encounter any issues, please feel free to open an issue. However, please check if a similar issue has already been reported before creating a new one. Happy Coding (⁠≧⁠▽⁠≦⁠).
 
 # Sticker Class
 
@@ -20,10 +20,10 @@ Here's how you can use the `Sticker` class:
 ```typescript
 import fs from "fs";
 import { Readable } from "stream";
-import { Sticker, StickerTypes } from "@shibam/sticker-maker";
+import Sticker, { StickerTypes } from "@shibam/sticker-maker";
 
 // Example 1: Create a new sticker instance and convert to buffer
-const sticker = new Sticker("path/to/image.png", {
+const sticker = new Sticker("path/to/image.png", {// input can be file path or buffer or stream
   pack: "My Sticker Pack",
   author: "Shibam",
   id: "123467890",
@@ -41,7 +41,7 @@ try {
 }
 
 // Example 2: Create a new sticker instance and convert to file
-const sticker2 = new Sticker("path/to/another/image.png", {
+const sticker2 = new Sticker("path/to/another/image.png", {// input can be file path or buffer or stream
   pack: "Another Sticker Pack",
   author: "John Doe",
   id: "987654321",
@@ -81,7 +81,7 @@ Converts input data to a Buffer containing the converted sticker content.
 Converts input data and writes the converted sticker to a file at `outputPath`.
 
 
-#### `extractMetaData(data: Buffer): Promise<any>`
+# `extractMetaData(data: Buffer): Promise<any>`
 
 Extracts metadata from `data` and returns the extracted information.
 

package/src/lib/ToWebp.js

@@ -4,6 +4,7 @@ import fs from 'fs-extra'
 import os from 'os'
 import path from 'path'
 import toGif from './toGif.js'
+import toPng from './toPng.js'
 import TextOnImg from './textOnImg.js'
 
 const exec = promisify(execFile)
@@ -11,7 +12,7 @@ const textOnImg = new TextOnImg()
 
 export default async function ToWebp(buffer, metaInfo, mimeExt, mimeType) {
     const timestamp = Date.now()
-    const inputPath = path.join(os.tmpdir(), `input_${timestamp}.${mimeExt}`)
+    const inputPath = path.join(os.tmpdir(), `input_${timestamp}.png`)
     const outputPath = path.join(os.tmpdir(), `output_${timestamp}.webp`)
 
     try {
@@ -27,17 +28,22 @@ export default async function ToWebp(buffer, metaInfo, mimeExt, mimeType) {
         } else if (metaInfo.text) {
             processedData = await textOnImg.drawText(buffer, metaInfo.text)
             currentExt = 'png'
+        } else {
+            processedData = await toPng(buffer, mimeExt)
+            currentExt = 'png'
         }
 
         await fs.writeFile(inputPath, processedData)
 
         let videoFilter = ''
         if (metaInfo.type === 'CIRCLE') {
-            videoFilter = 'scale=512:512:force_original_aspect_ratio=increase,crop=512:512,format=rgba,geq=r=\'r(X,Y)\':g=\'g(X,Y)\':b=\'b(X,Y)\':a=\'if(lte((X-256)*(X-256)+(Y-256)*(Y-256),65536),255,0)\''
+            videoFilter =
+                "scale=512:512:force_original_aspect_ratio=increase,crop=512:512,format=rgba,geq=r='r(X,Y)':g='g(X,Y)':b='b(X,Y)':a='if(lte((X-256)*(X-256)+(Y-256)*(Y-256),65536),255,0)'"
         } else if (metaInfo.type === 'SQUARE') {
-            videoFilter = 'scale=512:512:force_original_aspect_ratio=decrease'
+            videoFilter = "scale=512:512:force_original_aspect_ratio=decrease"
         } else {
-            videoFilter = 'scale=512:512:force_original_aspect_ratio=decrease,pad=512:512:(ow-iw)/2:(oh-ih)/2:color=none@0'
+            videoFilter =
+                "scale=512:512:force_original_aspect_ratio=decrease,pad=512:512:(ow-iw)/2:(oh-ih)/2:color=0x00000000"
         }
 
         const ffmpegArgs = ['-y', '-i', inputPath, '-vf', videoFilter]
@@ -47,9 +53,12 @@ export default async function ToWebp(buffer, metaInfo, mimeExt, mimeType) {
         }
 
         ffmpegArgs.push(
-            '-c:v', 'libwebp',
-            '-quality', String(metaInfo.quality || 80),
-            '-lossless', currentExt === 'gif' ? '1' : '0',
+            '-c:v',
+            'libwebp',
+            '-quality',
+            String(metaInfo.quality || 90),
+            '-lossless',
+            '0',
             outputPath
         )
 
@@ -58,4 +67,4 @@ export default async function ToWebp(buffer, metaInfo, mimeExt, mimeType) {
     } finally {
         await Promise.all([fs.remove(inputPath), fs.remove(outputPath)]).catch(() => {})
     }
-}
+}

package/src/lib/textOnGif.js

@@ -77,7 +77,7 @@ export default class TextOnGif {
             const [width, height] = stdout.trim().split('x').map(Number)
             if (!width || !height) throw new Error('Invalid GIF dimensions')
 
-            const fontSize = Math.floor(height / 10)
+            const fontSize = Math.floor(height / 8)
             const lineHeight = fontSize * 1.2
             const lines = this.wrapText(text, this.maxCharsPerLine)
 

package/src/lib/textOnImg.js

@@ -77,7 +77,7 @@ export default class TextOnImg {
             const [width, height] = stdout.trim().split('x').map(Number)
             if (!width || !height) throw new Error('Invalid image dimensions')
 
-            const fontSize = Math.floor(height / 10)
+            const fontSize = Math.floor(height / 7)
             const lineHeight = fontSize * 1.2
             const lines = this.wrapText(text, this.maxCharsPerLine)
 

package/src/lib/toGif.js

@@ -17,9 +17,9 @@ export default async function videoToGif(buffer, extType, type, text = '') {
         try {
             await fs.writeFile(inputPath, buffer)
             const vf = type === 'SQUARE'
-                ? 'scale=320:-1:flags=lanczos,fps=10,crop=min(iw\\,ih):min(iw\\,ih)'
-                : 'scale=320:-1:flags=lanczos,fps=20'
-            await exec('ffmpeg', ['-y', '-i', inputPath, '-vf', vf, '-t', '7', '-loop', '0', '-f', 'gif', outputPath])
+                ? "scale=320:-1:flags=lanczos,fps=10,crop=min(iw\\,ih):min(iw\\,ih)"
+                : "scale=320:-1:flags=lanczos,fps=10"
+            await exec('ffmpeg', ['-y', '-i', inputPath, '-vf', vf, '-t', '6', '-loop', '0', '-f', 'gif', outputPath])
             let result = await fs.readFile(outputPath)
             if (text) result = await textOnGif.drawText(result, text)
             return result

package/src/lib/toPng.js

@@ -0,0 +1,23 @@
+import { promisify } from 'util'
+import { execFile } from 'child_process'
+import fs from 'fs-extra'
+import os from 'os'
+import path from 'path'
+const exec = promisify(execFile)
+
+export default async function toPng(buffer, mimeExt) {
+    if (mimeExt === 'png') return buffer
+    const timestamp = Date.now()
+    const inputPath = path.join(os.tmpdir(), `input_${timestamp}.${mimeExt}`)
+    const outputPath = path.join(os.tmpdir(), `output_${timestamp}.png`)
+    try {
+        await fs.writeFile(inputPath, buffer)
+        await exec('ffmpeg', ['-y', '-i', inputPath, outputPath])
+        const result = await fs.readFile(outputPath)
+        return result
+    } catch (err) {
+        throw new Error(`Failed to convert to PNG: ${err.message}`)
+    } finally {
+        await Promise.all([fs.remove(inputPath), fs.remove(outputPath)]).catch(() => {}) 
+    }
+}

package/src/lib/utils.js

@@ -20,7 +20,7 @@ export default class Utils {
     }
     getQuality(data) {
         const bytes = Buffer.from(data).length / 1024
-        return bytes > 4096 ? 8 : bytes > 3072 ? 10 : bytes > 2048 ? 12 : 15
+        return bytes > 4096 ? 70 : bytes > 3072 ? 80 : bytes > 2048 ? 85 : 90
     }
     async getMimeType(data) {
         try {