koishi-plugin-memesluna 0.4.3 → 0.4.4

package/lib/index.js

@@ -74,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;
@@ -87,40 +96,6 @@ __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);
@@ -129,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 = "";
@@ -159,7 +121,7 @@ function buildDhashFromLumaGrid(samples) {
   }
   return hex;
 }
-__name(buildDhashFromLumaGrid, "buildDhashFromLumaGrid");
+__name(buildDhashFromRgbaPixels, "buildDhashFromRgbaPixels");
 var RESERVED_PATHS = /* @__PURE__ */ new Set([
   "config",
   "admin",
@@ -382,15 +344,27 @@ var MemesLunaService = class extends import_koishi.Service {
     await this.backfillImageFingerprints();
   }
   async getImagePerceptualHash(buffer) {
-    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));
+    const photon = loadPhoton();
+    if (photon) {
+      let inputImage = null;
+      let resizedImage = null;
+      try {
+        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(`Failed to calculate perceptual hash with photon: ${error.message}`);
+      } finally {
+        try {
+          resizedImage?.free?.();
+        } catch {
+        }
+        try {
+          inputImage?.free?.();
+        } catch {
         }
       }
-      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.3",
+  "version": "0.4.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "types": "lib/index.d.ts",
@@ -41,12 +41,9 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "bmp-js": "^0.1.0",
-    "jpeg-js": "^0.4.4",
+    "@cf-wasm/photon": "^0.3.6",
     "koishi-plugin-chatluna": "^1.3.0-alpha.49",
-    "koishi-plugin-chatluna-storage-service": "^1.0.6",
-    "omggif": "^1.0.10",
-    "pngjs": "^7.0.0"
+    "koishi-plugin-chatluna-storage-service": "^1.0.6"
   },
   "devDependencies": {
     "@koishijs/client": "^5.30.11",