koishi-plugin-memesluna 0.4.2 → 0.4.4

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";
@@ -83,6 +74,15 @@ function loadOptionalSharp() {
   }
 }
 __name(loadOptionalSharp, "loadOptionalSharp");
+function loadPhoton() {
+  try {
+    const packageName = "@cf-wasm/photon/node";
+    return require(packageName);
+  } catch {
+    return null;
+  }
+}
+__name(loadPhoton, "loadPhoton");
 function countHexBitDistance(a, b) {
   if (!a || !b || a.length !== b.length) return 64;
   let distance = 0;
@@ -104,28 +104,15 @@ function lumaFromRgba(data, offset) {
   return 0.299 * r + 0.587 * g + 0.114 * b;
 }
 __name(lumaFromRgba, "lumaFromRgba");
-function averageCellLuma(data, width, height, cellX, cellY) {
-  const xStart = Math.floor(cellX * width / DHASH_WIDTH);
-  const xEnd = Math.max(xStart + 1, Math.floor((cellX + 1) * width / DHASH_WIDTH));
-  const yStart = Math.floor(cellY * height / DHASH_HEIGHT);
-  const yEnd = Math.max(yStart + 1, Math.floor((cellY + 1) * height / DHASH_HEIGHT));
-  let total = 0;
-  let count = 0;
-  for (let y = yStart; y < Math.min(yEnd, height); y++) {
-    for (let x = xStart; x < Math.min(xEnd, width); x++) {
-      total += lumaFromRgba(data, (y * width + x) * 4);
-      count++;
-    }
-  }
-  return count ? total / count : 0;
-}
-__name(averageCellLuma, "averageCellLuma");
-function buildDhashFromLumaGrid(samples) {
+function buildDhashFromRgbaPixels(raw) {
+  if (raw.length < DHASH_WIDTH * DHASH_HEIGHT * 4) return "";
   let bits = "";
   for (let y = 0; y < DHASH_HEIGHT; y++) {
-    const row = y * DHASH_WIDTH;
+    const row = y * DHASH_WIDTH * 4;
     for (let x = 0; x < DHASH_WIDTH - 1; x++) {
-      bits += samples[row + x] > samples[row + x + 1] ? "1" : "0";
+      const left = lumaFromRgba(raw, row + x * 4);
+      const right = lumaFromRgba(raw, row + (x + 1) * 4);
+      bits += left > right ? "1" : "0";
     }
   }
   let hex = "";
@@ -134,7 +121,7 @@ function buildDhashFromLumaGrid(samples) {
   }
   return hex;
 }
-__name(buildDhashFromLumaGrid, "buildDhashFromLumaGrid");
+__name(buildDhashFromRgbaPixels, "buildDhashFromRgbaPixels");
 var RESERVED_PATHS = /* @__PURE__ */ new Set([
   "config",
   "admin",
@@ -357,21 +344,26 @@ var MemesLunaService = class extends import_koishi.Service {
     await this.backfillImageFingerprints();
   }
   async getImagePerceptualHash(buffer) {
-    const Jimp = loadJimp();
-    if (Jimp) {
+    const photon = loadPhoton();
+    if (photon) {
+      let inputImage = null;
+      let resizedImage = null;
       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));
-          }
-        }
-        return buildDhashFromLumaGrid(samples);
+        inputImage = photon.PhotonImage.new_from_byteslice(new Uint8Array(buffer));
+        resizedImage = photon.resize(inputImage, DHASH_WIDTH, DHASH_HEIGHT, photon.SamplingFilter.Nearest);
+        const hash = buildDhashFromRgbaPixels(resizedImage.get_raw_pixels());
+        if (hash) return hash;
       } catch (error) {
-        this.ctx.logger("memesluna").debug(`Jimp failed to calculate perceptual hash: ${error.message}`);
+        this.ctx.logger("memesluna").debug(`Failed to calculate perceptual hash with photon: ${error.message}`);
+      } finally {
+        try {
+          resizedImage?.free?.();
+        } catch {
+        }
+        try {
+          inputImage?.free?.();
+        } catch {
+        }
       }
     }
     const sharp = loadOptionalSharp();

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.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "types": "lib/index.d.ts",
@@ -41,7 +41,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "jimp": "^1.6.1",
+    "@cf-wasm/photon": "^0.3.6",
     "koishi-plugin-chatluna": "^1.3.0-alpha.49",
     "koishi-plugin-chatluna-storage-service": "^1.0.6"
   },