@ryuu-reinzz/haruka-lib 2.2.6 → 2.3.0

package/main/sticker-engine/main-sticker.js

@@ -1,11 +1,32 @@
 import fs from 'fs-extra';
-import ffmpeg from 'fluent-ffmpeg';
+import ffmpeg from "fluent-ffmpeg";
+import ffmpegPath from "ffmpeg-static";
+import ffprobePath from "ffprobe-static";
 import { stickerVid } from './video-to-webp.js';
 import { stickerImg } from './image-to-webp.js';
 import path from 'path';
 import { tmpdir } from 'os';
 import Crypto from 'crypto';
 
+ffmpeg.setFfmpegPath(ffmpegPath);
+ffmpeg.setFfprobePath(ffprobePath.path);
+function isVideo(input) {
+  return new Promise((resolve) => {
+    ffmpeg.ffprobe(input, (err, metadata) => {
+      if (err) {
+        console.log("ffprobe error:", err);
+        return resolve(false);
+      }
+
+      const isVideo = metadata.streams.some(
+        (s) => s.codec_type === "video"
+      );
+
+      resolve(isVideo);
+    });
+  });
+}
+
 async function bufferToTmp(buffer, ext = '.bin') {
   const tmp = path.join(
     tmpdir(),
@@ -24,39 +45,60 @@ class Sticker {
   }
 
   async toStickerImg() {
-    const out = await stickerImg(this.media, {
-      packname: this.pack,
-      author: this.author,
-      categories: this.categories
-    })
-    return fs.readFile(out)
+    let buff =
+  Buffer.isBuffer(this.media)
+    ? this.media
+    : /^data:.*?\/.*?;base64,/i.test(this.media)
+    ? Buffer.from(this.media.split(',')[1], 'base64')
+    : /^https?:\/\//.test(this.media)
+    ? Buffer.from(await (await fetch(this.media)).arrayBuffer())
+    : fs.existsSync(this.media)
+    ? await fs.readFile(this.media)
+    : Buffer.alloc(0)
+    
+      let buffer = await stickerImg(buff, {
+        packname: this.pack,
+        author: this.author
+      });
+    return await fs.readFile(buffer)
   }
 
   async toStickerVid() {
-    const out = await stickerVid(this.media, {
-      packname: this.pack,
-      author: this.author,
-      categories: this.categories
-    })
-    return fs.readFile(out)
+let buff =
+  Buffer.isBuffer(this.media)
+    ? this.media
+    : /^data:.*?\/.*?;base64,/i.test(this.media)
+    ? Buffer.from(this.media.split(',')[1], 'base64')
+    : /^https?:\/\//.test(this.media)
+    ? Buffer.from(await (await fetch(this.media)).arrayBuffer())
+    : fs.existsSync(this.media)
+    ? await fs.readFile(this.media)
+    : Buffer.alloc(0)
+    
+      let buffer = await stickerVid(buff, {
+        packname: this.pack,
+        author: this.author
+      });
+
+    return await fs.readFile(buffer)
   }
 
   async build() {
-  const tmpPath = await bufferToTmp(this.media)
-
-  const isVideo = await new Promise(resolve => {
-    ffmpeg.ffprobe(tmpPath, (err, meta) => {
-      if (err) return resolve(false)
-      resolve(meta.streams.some(
-        s => s.codec_type === 'video' && s.duration > 0
-      ))
-    })
-  })
-
-  return isVideo
+  const buff =
+  Buffer.isBuffer(this.media)
+    ? this.media
+    : fs.existsSync(this.media)
+    ? await fs.readFile(this.media)
+    : Buffer.alloc(0);
+
+  const tmpPath = await bufferToTmp(buff);
+  const thisVideo = await isVideo(tmpPath);
+
+  return thisVideo
     ? await this.toStickerVid()
     : await this.toStickerImg()
+  }
 }
-}
 
-export default Sticker
+export default Sticker
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryuu-reinzz/haruka-lib",
-  "version": "2.2.6",
+  "version": "2.3.0",
   "description": "Library extra for bot WhatsApp",
   "main": "main/index.js",
   "type": "module",
@@ -19,11 +19,12 @@
     "better-sqlite3": "^12.5.0",
     "file-type": "^16.5.3",
     "fluent-ffmpeg": "^2.1.3",
+    "ffmpeg-static": "^5.3.0",
+    "ffprobe-static": "^3.1.0",
     "fs-extra": "^11.2.0",
     "path": "^0.12.7",
-    "node-fetch": "^3.3.2",
-    "node-webpmux": "^3.2.1",
     "node-fetch": "^2.6.1",
+    "node-webpmux": "^3.2.1",
     "sharp": "^0.34.1"
   }
 }