swan-api 1.1.0 → 1.1.2

package/Socket.js

@@ -83,10 +83,13 @@ export default class Socket extends EventEmitter {
             if (connection == "close"){
                 const shouldReconnect = lastDisconnect?.error?.output?.statusCode
                                                     !== DisconnectReason.loggedOut;
-                if (shouldReconnect)
+                if (shouldReconnect){
+                    this.socket.ev.removeAllListeners()
                     await this.connect()
+                }
             } else if (connection == 'open'){
                 socketReady = true
+                this.groupMetadata = this.socket.groupMetadata;
                 this.userId = this.socket.user.id;
                 this.emit('ready');
             }

package/Sticker.js

@@ -1,7 +1,11 @@
 import sharp from "sharp";
+import { fileTypeFromBuffer } from "file-type";
+
+// imports for animated sticker only
 import ffmpegPath from "ffmpeg-static";
 import { execa } from "execa";
-import { fileTypeFromBuffer } from "file-type";
+import {tmpdir} from 'node:os'
+import fs from 'node:fs/promises'
 
 export default async function Sticker(buffer, opts = {}) {
     const author = opts.stickerAuthor ? opts.stickerAuthor : "";
@@ -13,7 +17,8 @@ export default async function Sticker(buffer, opts = {}) {
     if (!info)
         throw Error("Unknown file type");
 
-    if (info.mime.startsWith("video/"))
+    const isAnimated = info.mime.startsWith("video/");
+    if (isAnimated)
         buffer = await convertVideo(buffer);
     else if (!info.mime.startsWith("image/"))
         throw Error(`Unsupported media type: ${info.mime}`);
@@ -21,7 +26,7 @@ export default async function Sticker(buffer, opts = {}) {
     const fit = type === "full" ? "contain" :
                 type === "fill" ? "fill" : "cover"; // crop, circle, rounded
 
-    let image = sharp(buffer).resize(512, 512, {fit,
+    let image = sharp(buffer, {animated: isAnimated}).resize(512, 512, {fit,
                     background: { r: 0, g: 0, b: 0, alpha: 0 }}).ensureAlpha();
 
     if (type === "circle")
@@ -39,22 +44,38 @@ export default async function Sticker(buffer, opts = {}) {
                                         rx="64" ry="64" fill="white"/></svg>`),
         }]);
 
-    const webp = await image.webp({ quality }).toBuffer();    
+    const webp = await image.webp({ quality, loop:0 }).toBuffer();    
     return addExif(webp, author, pack)
 }
 
 // for animated stickers
 async function convertVideo(buffer) {
-    const { stdout } = await execa(ffmpegPath, [
-        "-i", "pipe:0", "-vcodec", "libwebp", "-vf",
-        "scale=512:512:force_original_aspect_ratio=decrease",
-        "-loop", "0", "-an", "-f", "webp", "pipe:1"
-    ], { input: buffer, encoding: null });
+    const inFile = `${tmpdir()}/tmp-input.webp`
+    const outFile = `${tmpdir()}/tmp-output.webp`
+
+    try {
+        await fs.writeFile(inFile, buffer);
+
+        const { stdout } = await execa(ffmpegPath, [
+            "-y", "-i", inFile, "-t", "10", "-vcodec", "libwebp", "-vf",
+            "scale=512:512:force_original_aspect_ratio=decrease,fps=15",
+            "-loop", "0", "-an", "-compression_level", "6", "-f", "webp", outFile
+        ], { timeout: 30000 });
+
+
+        const result = await fs.readFile(outFile);
+        if (!result.length)
+            throw new Error("ffmpeg produced an empty file");
+
+        return result;
+    } finally {
+        await fs.unlink(inFile).catch(() => {});
+        await fs.unlink(outFile).catch(() => {});
+    }
 
-    return stdout;
 }
 
-// Add metadata
+// Add metadata: Sticker Author and Pack
 function addExif(webp, author, pack) {
     const json = Buffer.from(JSON.stringify({
         "sticker-pack-id": "com.swan.sticker",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swan-api",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Simple WhatsApp API for Node",
   "keywords": [
     "whatsapp",