koishi-plugin-memesluna 0.4.2 → 0.4.3

package/lib/index.js

@@ -64,15 +64,6 @@ function hashImageBuffer(buffer) {
   return (0, import_crypto.createHash)("sha256").update(buffer).digest("hex");
 }
 __name(hashImageBuffer, "hashImageBuffer");
-function loadJimp() {
-  try {
-    const jimpModule = require("jimp");
-    return jimpModule.Jimp || jimpModule.default?.Jimp || null;
-  } catch {
-    return null;
-  }
-}
-__name(loadJimp, "loadJimp");
 function loadOptionalSharp() {
   try {
     const packageName = "sharp";
@@ -96,6 +87,40 @@ __name(countHexBitDistance, "countHexBitDistance");
 var DHASH_BITS = 64;
 var DHASH_WIDTH = 9;
 var DHASH_HEIGHT = 8;
+function decodeImagePixels(buffer) {
+  try {
+    if (buffer.length >= 8 && buffer.readUInt32BE(0) === 2303741511 && buffer.readUInt32BE(4) === 218765834) {
+      const png = require("pngjs").PNG.sync.read(buffer);
+      return { data: png.data, width: png.width, height: png.height };
+    }
+    if (buffer.length >= 3 && buffer[0] === 255 && buffer[1] === 216 && buffer[2] === 255) {
+      const jpeg = require("jpeg-js").decode(buffer, { useTArray: true });
+      return { data: jpeg.data, width: jpeg.width, height: jpeg.height };
+    }
+    if (buffer.length >= 6 && buffer.toString("ascii", 0, 3) === "GIF") {
+      const { GifReader } = require("omggif");
+      const reader = new GifReader(buffer);
+      const data = Buffer.alloc(reader.width * reader.height * 4);
+      reader.decodeAndBlitFrameRGBA(0, data);
+      return { data, width: reader.width, height: reader.height };
+    }
+    if (buffer.length >= 2 && buffer[0] === 66 && buffer[1] === 77) {
+      const bmp = require("bmp-js").decode(buffer);
+      const data = Buffer.alloc(bmp.width * bmp.height * 4);
+      for (let i = 0; i < bmp.data.length; i += 4) {
+        data[i] = bmp.data[i + 3];
+        data[i + 1] = bmp.data[i + 2];
+        data[i + 2] = bmp.data[i + 1];
+        data[i + 3] = bmp.data[i];
+      }
+      return { data, width: bmp.width, height: bmp.height };
+    }
+  } catch {
+    return null;
+  }
+  return null;
+}
+__name(decodeImagePixels, "decodeImagePixels");
 function lumaFromRgba(data, offset) {
   const alpha = data[offset + 3] / 255;
   const r = data[offset] * alpha + 255 * (1 - alpha);
@@ -357,22 +382,15 @@ var MemesLunaService = class extends import_koishi.Service {
     await this.backfillImageFingerprints();
   }
   async getImagePerceptualHash(buffer) {
-    const Jimp = loadJimp();
-    if (Jimp) {
-      try {
-        const image = await Jimp.read(buffer);
-        const { data, width, height } = image.bitmap;
-        if (!data || !width || !height) return "";
-        const samples = [];
-        for (let y = 0; y < DHASH_HEIGHT; y++) {
-          for (let x = 0; x < DHASH_WIDTH; x++) {
-            samples.push(averageCellLuma(data, width, height, x, y));
-          }
+    const decoded = decodeImagePixels(buffer);
+    if (decoded) {
+      const samples = [];
+      for (let y = 0; y < DHASH_HEIGHT; y++) {
+        for (let x = 0; x < DHASH_WIDTH; x++) {
+          samples.push(averageCellLuma(decoded.data, decoded.width, decoded.height, x, y));
         }
-        return buildDhashFromLumaGrid(samples);
-      } catch (error) {
-        this.ctx.logger("memesluna").debug(`Jimp failed to calculate perceptual hash: ${error.message}`);
       }
+      return buildDhashFromLumaGrid(samples);
     }
     const sharp = loadOptionalSharp();
     if (!sharp) return "";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-memesluna",
   "description": "Image Forward service for Koishi with ChatLuna integration",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "types": "lib/index.d.ts",
@@ -41,9 +41,12 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "jimp": "^1.6.1",
+    "bmp-js": "^0.1.0",
+    "jpeg-js": "^0.4.4",
     "koishi-plugin-chatluna": "^1.3.0-alpha.49",
-    "koishi-plugin-chatluna-storage-service": "^1.0.6"
+    "koishi-plugin-chatluna-storage-service": "^1.0.6",
+    "omggif": "^1.0.10",
+    "pngjs": "^7.0.0"
   },
   "devDependencies": {
     "@koishijs/client": "^5.30.11",