@shibam/sticker-maker 1.1.10 → 1.1.12

package/dist/lib/toGif.js

@@ -1,46 +1,44 @@
 import ffmpeg from 'fluent-ffmpeg';
 import ffmpegInstaller from '@ffmpeg-installer/ffmpeg';
-import { PassThrough } from 'stream';
+import { tmpdir } from 'os';
+import { writeFile, readFile, unlink } from 'fs/promises';
+import { join } from 'path';
 import { StickerTypes } from '../types/StickerTypes.js';
 ffmpeg.setFfmpegPath(ffmpegInstaller.path);
-const videoToGif = (buffer, extType, type) => {
+const videoToGif = (buffer, extType, type, retries = 3) => {
     return new Promise(async (resolve, reject) => {
-        try {
-            const outputStream = new PassThrough({ allowHalfOpen: false });
-            const inputStream = new PassThrough({ allowHalfOpen: false });
-            inputStream.write(buffer);
-            inputStream.end();
-            const chunks = [];
-            outputStream.on('data', (chunk) => {
-                chunks.push(chunk);
-            });
-            outputStream.on('end', () => {
-                resolve(Buffer.concat(chunks));
-                inputStream.destroy();
-                outputStream.destroy();
-            });
-            outputStream.on('error', (err) => {
-                reject(err);
-                inputStream.destroy();
-                outputStream.destroy();
-            });
-            const shape = type === StickerTypes.SQUARE
-                ? 'scale=320:-1:flags=lanczos,fps=10,crop=min(iw\\,ih):min(iw\\,ih)'
-                : 'scale=320:-1:flags=lanczos,fps=10';
-            ffmpeg(inputStream)
-                .inputFormat(extType)
-                .outputOptions(['-vf', shape, '-loop', '0', '-lossless', '0', '-t', '7', '-preset', 'ultrafast'])
-                .toFormat('gif')
-                .pipe(outputStream)
-                .on('error', (err) => {
-                inputStream.destroy();
-                outputStream.destroy();
-                reject(err);
-            });
-        }
-        catch (error) {
-            reject(error);
-        }
+        const execute = async (attempt) => {
+            const filename = join(tmpdir(), `${Math.random().toString(36)}.${extType}`);
+            const outputFilename = join(tmpdir(), `${Math.random().toString(36)}.gif`);
+            try {
+                await writeFile(filename, buffer);
+                const shape = type === StickerTypes.SQUARE
+                    ? 'scale=320:-1:flags=lanczos,fps=10,crop=min(iw\\,ih):min(iw\\,ih)'
+                    : 'scale=320:-1:flags=lanczos,fps=20';
+                await new Promise((resolveFfmpeg, rejectFfmpeg) => {
+                    ffmpeg(filename)
+                        .inputFormat(extType)
+                        .outputOptions(['-vf', shape, '-loop', '0', '-lossless', '0', '-t', '7', '-preset', 'ultrafast'])
+                        .toFormat('gif')
+                        .save(outputFilename)
+                        .on('end', resolveFfmpeg)
+                        .on('error', rejectFfmpeg);
+                });
+                const gifBuffer = await readFile(outputFilename);
+                await Promise.all([unlink(filename), unlink(outputFilename)]);
+                resolve(gifBuffer);
+            }
+            catch (error) {
+                if (attempt < retries) {
+                    execute(++attempt);
+                }
+                else {
+                    await Promise.all([unlink(filename).catch(() => { }), unlink(outputFilename).catch(() => { })]);
+                    reject(error);
+                }
+            }
+        };
+        execute(1);
     });
 };
 export default videoToGif;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shibam/sticker-maker",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "description": "A package for creating stickers",
   "main": "dist/index.js",
   "type": "module",