koishi-plugin-emojiluna-plus 0.0.3 → 0.0.4

package/lib/adapters/autoCommands.js

@@ -4,6 +4,8 @@ exports.registerAutoCollectCommands = registerAutoCollectCommands;
 const koishi_1 = require("koishi");
 const render_1 = require("./render");
 const types_1 = require("../types");
+const DEFAULT_HOUR_LIMIT = types_1.DEFAULT_COLLECT_LIMITS.hour;
+const DEFAULT_DAY_LIMIT = types_1.DEFAULT_COLLECT_LIMITS.day;
 const RECENT_RECORDS = 6;
 const DEBUG_LINES = 15;
 function registerAutoCollectCommands(ctx, config, autoCollector) {
@@ -83,7 +85,7 @@ function formatStatus(config, autoCollector) {
         `条件: ${config.minEmojiSize}KB-${config.maxEmojiSize}MB${config.minEdgePixels ? ` | 短边≥${config.minEdgePixels}px` : ''} | 相似度阈值 ${config.similarityThreshold}`,
         `取源: HTTP ${config.fetchTimeout}ms 超时 | 本地路径 ${config.allowLocalPaths ? '允许' : '禁止'}${config.localPathRoots.length ? `（限定 ${config.localPathRoots.length} 个目录）` : ''}`,
         `AI: 类型过滤 ${config.enableImageTypeFilter ? `开启（超时 ${config.aiFilterTimeout}ms，兜底 ${config.aiFilterFallback}）` : '关闭'} | 入库后分析 ${config.autoAnalyze ? '开启' : '关闭'}`,
-        `限流: 默认单会话 ${defaultHourLimit(config)}/小时、${defaultDayLimit(config)}/日 | 全局 ${config.globalDayLimit || '不限'}/日 | 库存上限 ${config.maxEmojiCount}`,
+        `限流: 单会话 ${quotaSummary(config)} | 全局 ${config.globalDayLimit || '不限'}/日 | 库存上限 ${config.maxEmojiCount}`,
         `统计: 收到 ${stats.seen} 张 | 成功 ${stats.collected} 张 | 队列 ${stats.queue}/${config.autoCollectQueueSize} | 处理中 ${stats.active} | 特征 ${stats.signatures}${stats.preloaded ? '' : '（预热中）'}`,
     ];
     const rejected = Object.entries(stats.rejected).sort((a, b) => b[1] - a[1]);
@@ -101,12 +103,8 @@ function formatStatus(config, autoCollector) {
     }
     return lines.join('\n');
 }
-function defaultHourLimit(config) {
-    return firstQuota(config)?.hourLimit ?? 20;
-}
-function defaultDayLimit(config) {
-    return firstQuota(config)?.dayLimit ?? 100;
-}
-function firstQuota(config) {
-    return Object.values(config.groupAutoCollectLimit ?? {})[0];
+function quotaSummary(config) {
+    const overrides = Object.keys(config.groupAutoCollectLimit ?? {}).length;
+    const scope = overrides ? `，按群覆盖 ${overrides} 个` : '';
+    return `默认 ${DEFAULT_HOUR_LIMIT}/小时、${DEFAULT_DAY_LIMIT}/日${scope}`;
 }

package/lib/adapters/commands.js

@@ -25,7 +25,7 @@ function registerTriggerMiddleware(ctx, config) {
         const content = session.content.trim();
         if (content.length < TRIGGER_MATCH_MIN_LENGTH)
             return next();
-        const emoji = await ctx.emojiluna.getEmojiByName(content);
+        const emoji = await ctx.emojiluna.getTriggerEmoji(content);
         if (!emoji)
             return next();
         return next(async () => (0, render_1.emojiMessage)(ctx, config, emoji));
@@ -157,7 +157,7 @@ function registerLibraryCommands(ctx, config, emojiluna) {
             `自动分析: ${flag(config.autoAnalyze)}`,
             `图片类型过滤: ${flag(config.enableImageTypeFilter)}`,
             `使用模型: ${config.model || '未配置'}`,
-            `AI分析统计: ${JSON.stringify(emojiluna.getAiTaskStats())}`,
+            `AI分析统计: ${JSON.stringify(await emojiluna.getAiTaskStats())}`,
             '',
             '自动获取:',
             `状态: ${flag(config.autoCollect)}`,

package/lib/adapters/consoleListeners.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyConsoleListeners = applyConsoleListeners;
+const types_1 = require("../types");
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const render_1 = require("./render");
@@ -32,7 +33,7 @@ const DIRECT_EVENTS = {
     'emojiluna/deleteAiTask': 'deleteAiTask',
     'emojiluna/retryAiTask': 'retryAiTask',
 };
-const MAX_REQUESTED_EMOJI_NAME = 64;
+const MAX_REQUESTED_EMOJI_NAME = types_1.MAX_EMOJI_NAME_LENGTH;
 function resolveClientRoot(fromDir) {
     let current = fromDir;
     for (let depth = 0; depth < 5; depth++) {
@@ -45,7 +46,7 @@ function resolveClientRoot(fromDir) {
             break;
         current = parent;
     }
-    return path_1.default.resolve(fromDir, '..', '..', '..');
+    return path_1.default.resolve(fromDir, '..', '..');
 }
 function applyConsoleListeners(ctx, config) {
     ctx.inject(['console', 'emojiluna'], (ctx) => {
@@ -62,7 +63,15 @@ async function registerListeners(ctx, config) {
         prod: path_1.default.join(clientRoot, 'dist'),
     });
     for (const [event, method] of Object.entries(DIRECT_EVENTS)) {
-        ctx.console.addListener(event, invoke[method]);
+        const handler = invoke[method];
+        if (typeof handler !== 'function') {
+            emojiluna.debug.log('service', `控制台事件目标方法缺失，已跳过注册: ${event} -> ${method}`);
+            continue;
+        }
+        ctx.console.addListener(event, 
+        // Koishi invokes listeners with its own `this`, so the service
+        // receiver has to be bound explicitly before handing the method over.
+        handler.bind(emojiluna));
     }
     ctx.console.addListener('emojiluna/getBaseUrl', async () => {
         const selfUrl = (0, render_1.resolveSelfUrl)(ctx, config);

package/lib/adapters/restApi.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyRestApi = applyRestApi;
+const types_1 = require("../types");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("../utils");
@@ -176,10 +177,11 @@ function applyRestApi(ctx, config) {
                 if (!file?.filepath) {
                     return json(koa, { success: false, message: 'No file uploaded' }, 400);
                 }
+                const requestedName = firstField(fields, 'name') ||
+                    file.originalFilename?.replace(/\.[^/.]+$/, '') ||
+                    'uploaded';
                 const emoji = await ctx.emojiluna.addEmoji({
-                    name: firstField(fields, 'name') ||
-                        file.originalFilename?.replace(/\.[^/.]+$/, '') ||
-                        'uploaded',
+                    name: requestedName.slice(0, types_1.MAX_EMOJI_NAME_LENGTH),
                     category: firstField(fields, 'category'),
                     tags: parseTagsField(firstField(fields, 'tags')),
                 }, { path: file.filepath }, firstField(fields, 'aiAnalysis') === 'true');

package/lib/collectors/autoCollector.d.ts

@@ -33,6 +33,7 @@ export declare class AutoCollector {
     private rejectedHashes;
     private aiVerdicts;
     private queue;
+    private commitTail;
     private active;
     private nameSeq;
     private manualEnabled;
@@ -52,12 +53,15 @@ export declare class AutoCollector {
     dispose(): void;
     private pump;
     private processJob;
+    private commit;
     private save;
     private evaluateScope;
     private evaluateSize;
     private evaluateResolution;
     private evaluateKnownHash;
+    private findSimilar;
     private evaluateSimilarity;
+    private serialize;
     private evaluateFrequency;
     private evaluateLimit;
     private evaluateLibrary;

package/lib/collectors/autoCollector.js

@@ -7,6 +7,8 @@ const image_1 = require("../image");
 const utils_1 = require("../utils");
 const HOUR_MS = 3_600_000;
 const DAY_MS = 86_400_000;
+const DEFAULT_HOUR_LIMIT = types_1.DEFAULT_COLLECT_LIMITS.hour;
+const DEFAULT_DAY_LIMIT = types_1.DEFAULT_COLLECT_LIMITS.day;
 const PENDING_REF_TTL_MS = 60_000;
 const REJECTED_HASH_TTL_MS = 6 * HOUR_MS;
 const AI_VERDICT_TTL_MS = 24 * HOUR_MS;
@@ -39,6 +41,7 @@ class AutoCollector {
     rejectedHashes = new Map();
     aiVerdicts = new Map();
     queue = [];
+    commitTail = Promise.resolve();
     active = 0;
     nameSeq = 0;
     manualEnabled = null;
@@ -64,12 +67,10 @@ class AutoCollector {
         return !this.stopped && (this.manualEnabled ?? this.config.autoCollect);
     }
     start() {
-        if (!this.config.autoCollect) {
-            this.debug.log('collect', '自动获取未启用，跳过监听注册');
-            return;
-        }
         this.ctx.on('message', (session) => this.observe(session));
-        this.ctx.logger.info('Auto collector started');
+        this.ctx.logger.info(this.config.autoCollect
+            ? 'Auto collector started'
+            : 'Auto collector idle: 自动获取未启用，可用 emojiluna.auto.toggle on 临时开启');
     }
     observe(session) {
         if (!this.isEnabled)
@@ -237,7 +238,7 @@ class AutoCollector {
                         detail: `试运行：将保存为 "${this.buildName(session, isDirect)}"，未实际写入`,
                     });
                 }
-                const saved = await this.save(image.buffer, signature, hash, session, isDirect);
+                const saved = await this.serialize(() => this.commit(image.buffer, signature, hash, session, isDirect));
                 if (!pass(saved))
                     return;
                 this.consumeQuota(chatKey);
@@ -252,6 +253,22 @@ class AutoCollector {
             this.pendingRefs.delete(ref);
         }
     }
+    async commit(buffer, signature, hash, session, isDirect) {
+        if (this.luna.uploadManager.hasHash(hash)) {
+            return { gate: '去重', ok: false, detail: '入库前已出现相同内容' };
+        }
+        if (signature) {
+            const similar = this.findSimilar(signature);
+            if (similar) {
+                return {
+                    gate: '相似',
+                    ok: false,
+                    detail: `入库前与 ${similar.hash.slice(0, 8)} 相似度 ${similar.score.toFixed(3)}`,
+                };
+            }
+        }
+        return this.save(buffer, signature, hash, session, isDirect);
+    }
     async save(buffer, signature, hash, session, isDirect) {
         const name = this.buildName(session, isDirect);
         const tags = this.buildTags(session, isDirect);
@@ -366,7 +383,7 @@ class AutoCollector {
         }
         return { gate: '去重', ok: true, detail: `内容哈希 ${hash.slice(0, 8)}` };
     }
-    evaluateSimilarity(signature) {
+    findSimilar(signature) {
         let best = null;
         for (const [hash, cached] of this.signatures) {
             const score = similarityScore(signature, cached);
@@ -374,6 +391,10 @@ class AutoCollector {
                 best = { hash, score };
             }
         }
+        return best;
+    }
+    evaluateSimilarity(signature) {
+        const best = this.findSimilar(signature);
         if (!best) {
             return {
                 gate: '相似',
@@ -387,6 +408,11 @@ class AutoCollector {
             detail: `与表情 ${best.hash.slice(0, 8)} 相似度 ${best.score.toFixed(3)}，阈值 ${this.config.similarityThreshold}`,
         };
     }
+    serialize(task) {
+        const run = this.commitTail.then(task, task);
+        this.commitTail = run.then(() => undefined, () => undefined);
+        return run;
+    }
     evaluateFrequency(hash, chatKey) {
         const windowMs = this.config.frequencyWindow * 60_000;
         const key = `${hash}|${chatKey}`;
@@ -411,8 +437,8 @@ class AutoCollector {
     evaluateLimit(chatKey) {
         const counter = this.windowCounter(chatKey);
         const quota = this.config.groupAutoCollectLimit?.[chatKey.split(':')[1]];
-        const hourLimit = quota?.hourLimit ?? 20;
-        const dayLimit = quota?.dayLimit ?? 100;
+        const hourLimit = quota?.hourLimit ?? DEFAULT_HOUR_LIMIT;
+        const dayLimit = quota?.dayLimit ?? DEFAULT_DAY_LIMIT;
         if (hourLimit > 0 && counter.hourCount >= hourLimit) {
             return {
                 gate: '限流',
@@ -594,6 +620,13 @@ class AutoCollector {
             else
                 this.frequency.delete(key);
         }
+        for (const [key, counter] of this.counters) {
+            if (!counter.hourCount &&
+                !counter.dayCount &&
+                now - counter.dayStart >= DAY_MS) {
+                this.counters.delete(key);
+            }
+        }
     }
     chatKey(session, isDirect) {
         return isDirect

package/lib/services/emojiluna.d.ts

@@ -48,6 +48,12 @@ export declare class EmojiLunaService extends Service {
         buffer: Buffer;
     }[], aiAnalysis: boolean): Promise<EmojiItem[]>;
     getEmojiByName(name: string): Promise<EmojiItem | null>;
+    /**
+     * Trigger-word replies should only fire on an exact emoji name or tag; the
+     * four-level lookup used by `emojiluna.get` also matches categories and ids,
+     * which would make ordinary messages steal a sticker.
+     */
+    getTriggerEmoji(text: string): Promise<EmojiItem | null>;
     getEmojisByName(name: string): Promise<EmojiItem[]>;
     getEmojiById(id: string): Promise<EmojiItem | null>;
     private filterEmojis;

package/lib/services/emojiluna.js

@@ -13,6 +13,7 @@ const debug_1 = require("../debug");
 const path_1 = __importDefault(require("path"));
 const promises_1 = __importDefault(require("fs/promises"));
 const crypto_1 = require("crypto");
+const MAX_IMPORT_ERRORS = 20;
 class EmojiLunaService extends koishi_1.Service {
     config;
     _emojiStorage = {};
@@ -304,6 +305,18 @@ class EmojiLunaService extends koishi_1.Service {
         const byCategory = this._byCategory.get(name)?.values().next().value;
         return byCategory ? this._emojiStorage[byCategory] ?? null : null;
     }
+    /**
+     * Trigger-word replies should only fire on an exact emoji name or tag; the
+     * four-level lookup used by `emojiluna.get` also matches categories and ids,
+     * which would make ordinary messages steal a sticker.
+     */
+    async getTriggerEmoji(text) {
+        const byName = this._byName.get(text);
+        if (byName)
+            return this._emojiStorage[byName] ?? null;
+        const byTag = this._byTag.get(text)?.values().next().value;
+        return byTag ? this._emojiStorage[byTag] ?? null : null;
+    }
     async getEmojisByName(name) {
         const ids = new Set([
             ...(this._byName.get(name) ? [this._byName.get(name)] : []),
@@ -384,9 +397,15 @@ class EmojiLunaService extends koishi_1.Service {
         try {
             const emojis = Object.values(this._emojiStorage);
             const concurrency = 4;
+            let failures = 0;
             for (let i = 0; i < emojis.length; i += concurrency) {
                 const batch = emojis.slice(i, i + concurrency);
-                await Promise.all(batch.map((emoji) => this.deleteEmoji(emoji.id)));
+                const results = await Promise.all(batch.map((emoji) => this.deleteEmoji(emoji.id)));
+                failures += results.filter((deleted) => !deleted).length;
+            }
+            if (failures) {
+                this.ctx.logger.warn(`清空表情包时有 ${failures} 个未能删除`);
+                return false;
             }
         }
         catch (error) {
@@ -617,7 +636,7 @@ class EmojiLunaService extends koishi_1.Service {
         return removedCount;
     }
     async categorizeExistingEmojis() {
-        if (!this._aiAnalyzer.model || !this.config.autoCategorize) {
+        if (!this._aiAnalyzer.hasModel || !this.config.autoCategorize) {
             return { success: 0, failed: 0 };
         }
         let success = 0, failed = 0;
@@ -776,7 +795,9 @@ class EmojiLunaService extends koishi_1.Service {
                 }
                 catch (error) {
                     result.failed++;
-                    result.errors.push(`导入 ${file.name} 失败: ${error.message}`);
+                    if (result.errors.length < MAX_IMPORT_ERRORS) {
+                        result.errors.push(`导入 ${file.name} 失败: ${error.message}`);
+                    }
                     this.ctx.logger.error(`导入失败 ${file.path}:`, error);
                 }
             }

package/lib/types.d.ts

@@ -111,6 +111,11 @@ export declare const GROUP_SCOPES: {
     readonly whitelist: "仅白名单群";
     readonly blacklist: "排除黑名单群";
 };
+export declare const DEFAULT_COLLECT_LIMITS: {
+    readonly hour: 20;
+    readonly day: 100;
+};
+export declare const MAX_EMOJI_NAME_LENGTH = 64;
 export declare const COLLECT_MODES: {
     readonly instant: "立即收集";
     readonly frequency: "频次达标后收集";

package/lib/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IMAGE_TYPE_LABELS = exports.DEBUG_SCOPES = exports.AI_FILTER_FALLBACKS = exports.COLLECT_MODES = exports.GROUP_SCOPES = exports.DEFAULT_ACCEPTED_IMAGE_TYPES = exports.IMAGE_CONTENT_TYPES = void 0;
+exports.IMAGE_TYPE_LABELS = exports.DEBUG_SCOPES = exports.AI_FILTER_FALLBACKS = exports.COLLECT_MODES = exports.MAX_EMOJI_NAME_LENGTH = exports.DEFAULT_COLLECT_LIMITS = exports.GROUP_SCOPES = exports.DEFAULT_ACCEPTED_IMAGE_TYPES = exports.IMAGE_CONTENT_TYPES = void 0;
 exports.IMAGE_CONTENT_TYPES = [
     {
         type: 'emoji',
@@ -72,6 +72,11 @@ exports.GROUP_SCOPES = {
     whitelist: '仅白名单群',
     blacklist: '排除黑名单群',
 };
+exports.DEFAULT_COLLECT_LIMITS = {
+    hour: 20,
+    day: 100,
+};
+exports.MAX_EMOJI_NAME_LENGTH = 64;
 exports.COLLECT_MODES = {
     instant: '立即收集',
     frequency: '频次达标后收集',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-emojiluna-plus",
   "description": "Koishi 智能表情包管理插件（emojiluna fork），支持群聊/私聊自动获取表情包、AI自动分类打标、WebUI管理与HTTP API",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [