koishi-plugin-memesluna 0.4.0 → 0.4.2

package/lib/index.js

@@ -39,6 +39,7 @@ __export(index_exports, {
   name: () => name
 });
 module.exports = __toCommonJS(index_exports);
+var import_fs = require("fs");
 var import_path2 = __toESM(require("path"));
 var import_koishi3 = require("koishi");
 
@@ -63,15 +64,25 @@ function hashImageBuffer(buffer) {
   return (0, import_crypto.createHash)("sha256").update(buffer).digest("hex");
 }
 __name(hashImageBuffer, "hashImageBuffer");
-function loadSharp() {
+function loadJimp() {
   try {
-    const sharpModule = require("sharp");
+    const jimpModule = require("jimp");
+    return jimpModule.Jimp || jimpModule.default?.Jimp || null;
+  } catch {
+    return null;
+  }
+}
+__name(loadJimp, "loadJimp");
+function loadOptionalSharp() {
+  try {
+    const packageName = "sharp";
+    const sharpModule = require(packageName);
     return sharpModule.default || sharpModule;
   } catch {
     return null;
   }
 }
-__name(loadSharp, "loadSharp");
+__name(loadOptionalSharp, "loadOptionalSharp");
 function countHexBitDistance(a, b) {
   if (!a || !b || a.length !== b.length) return 64;
   let distance = 0;
@@ -83,6 +94,47 @@ function countHexBitDistance(a, b) {
 }
 __name(countHexBitDistance, "countHexBitDistance");
 var DHASH_BITS = 64;
+var DHASH_WIDTH = 9;
+var DHASH_HEIGHT = 8;
+function lumaFromRgba(data, offset) {
+  const alpha = data[offset + 3] / 255;
+  const r = data[offset] * alpha + 255 * (1 - alpha);
+  const g = data[offset + 1] * alpha + 255 * (1 - alpha);
+  const b = data[offset + 2] * alpha + 255 * (1 - alpha);
+  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) {
+  let bits = "";
+  for (let y = 0; y < DHASH_HEIGHT; y++) {
+    const row = y * DHASH_WIDTH;
+    for (let x = 0; x < DHASH_WIDTH - 1; x++) {
+      bits += samples[row + x] > samples[row + x + 1] ? "1" : "0";
+    }
+  }
+  let hex = "";
+  for (let i = 0; i < bits.length; i += 4) {
+    hex += Number.parseInt(bits.slice(i, i + 4), 2).toString(16);
+  }
+  return hex;
+}
+__name(buildDhashFromLumaGrid, "buildDhashFromLumaGrid");
 var RESERVED_PATHS = /* @__PURE__ */ new Set([
   "config",
   "admin",
@@ -305,7 +357,24 @@ var MemesLunaService = class extends import_koishi.Service {
     await this.backfillImageFingerprints();
   }
   async getImagePerceptualHash(buffer) {
-    const sharp = loadSharp();
+    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));
+          }
+        }
+        return buildDhashFromLumaGrid(samples);
+      } catch (error) {
+        this.ctx.logger("memesluna").debug(`Jimp failed to calculate perceptual hash: ${error.message}`);
+      }
+    }
+    const sharp = loadOptionalSharp();
     if (!sharp) return "";
     try {
       const raw = await sharp(buffer, { animated: false, failOn: "none" }).resize(9, 8, { fit: "fill" }).grayscale().raw().toBuffer();
@@ -408,18 +477,17 @@ var MemesLunaService = class extends import_koishi.Service {
   }
   async getSimilarStagedImages(threshold = this.config.similarityThreshold || 0.9) {
     const normalizedThreshold = Math.min(1, Math.max(0.5, Number(threshold) || 0.9));
-    const sharp = loadSharp();
-    if (!sharp) {
+    await this.backfillImageFingerprints();
+    const rows = await this.ctx.database.get("memesluna_staged_images", {});
+    const items = rows.map((row) => this.mapStagedImage(row)).filter((item) => item.perceptualHash);
+    if (!items.length) {
       return {
-        available: false,
+        available: true,
         threshold: normalizedThreshold,
         groups: [],
-        message: "sharp 未安装，暂时无法筛选相似图片"
+        message: rows.length ? "暂缓区图片暂未生成可比较的感知哈希" : "暂缓区暂无图片"
       };
     }
-    await this.backfillImageFingerprints();
-    const rows = await this.ctx.database.get("memesluna_staged_images", {});
-    const items = rows.map((row) => this.mapStagedImage(row)).filter((item) => item.perceptualHash);
     const parent = /* @__PURE__ */ new Map();
     const groupSimilarity = /* @__PURE__ */ new Map();
     const find = /* @__PURE__ */ __name((id) => {
@@ -1413,15 +1481,15 @@ async function updateMemesVariable(ctx, config, service) {
 }
 __name(updateMemesVariable, "updateMemesVariable");
 function applyConsole(ctx, config, service) {
-  console.log("[MemesLuna] applyConsole started!");
   if (!ctx.console) {
-    console.log("[MemesLuna] ctx.console is missing!");
     return;
   }
   const consoleService = ctx.console;
-  const devPath = import_path2.default.resolve(__dirname, "..", "client/index.ts");
-  const prodPath = import_path2.default.join(ctx.baseDir, "node_modules", "koishi-plugin-memesluna", "dist");
-  console.log("[MemesLuna] Registering console entry:", { dev: devPath, prod: prodPath });
+  const packageBase = import_path2.default.resolve(__dirname, "..");
+  const installedBase = import_path2.default.resolve(ctx.baseDir, "node_modules", "koishi-plugin-memesluna");
+  const consoleBase = (0, import_fs.existsSync)(installedBase) ? installedBase : packageBase;
+  const devPath = import_path2.default.resolve(consoleBase, "client/index.ts");
+  const prodPath = import_path2.default.resolve(consoleBase, "dist");
   const withReady = /* @__PURE__ */ __name((handler) => {
     return async (...args) => {
       await service.ready;
@@ -1914,7 +1982,6 @@ function apply(ctx, config) {
     applyServer(ctx2, config, service);
   });
   ctx.inject(["memesluna", "console"], async (ctx2) => {
-    console.log("[MemesLuna] Console inject hook triggered!");
     const service = ctx2.memesluna;
     applyConsole(ctx2, config, service);
   });

package/package.json

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