koishi-plugin-chat-analyse 0.2.1 → 0.2.3

package/lib/Collector.d.ts

@@ -2,6 +2,7 @@ import { Context } from 'koishi';
 declare module 'koishi' {
     interface Tables {
         analyse_msg: {
+            id: number;
             channelId: string;
             userId: string;
             type: string;
@@ -28,6 +29,7 @@ export declare class Collector {
     private msgBuffer;
     private flushInterval;
     private nameCache;
+    private pendingNameRequests;
     /**
      * @constructor
      * @param ctx {Context} Koishi 的上下文对象
@@ -40,9 +42,6 @@ export declare class Collector {
     private handleMessage;
     /**
      * 从消息元素中提取并汇总类型。
-     * @example
-     * // returns "[text][img]"
-     * summarizeElementTypes([{type: 'text'}, {type: 'img'}])
      */
     private summarizeElementTypes;
     /**
@@ -55,7 +54,11 @@ export declare class Collector {
     private flushBuffer;
     /**
      * 检查并更新用户和群组的名称信息。
-     * 如果名称不在缓存或缓存已过期 (超过24小时)，则从 API 获取并更新到数据库。
      */
     private updateNameIfNeeded;
+    /**
+     * @private
+     * 封装了实际获取和更新名称的异步逻辑。
+     */
+    private fetchAndUpdateNames;
 }

package/lib/index.js

@@ -38,14 +38,16 @@ var Collector = class _Collector {
   constructor(ctx) {
     this.ctx = ctx;
     this.ctx.model.extend("analyse_msg", {
+      id: "unsigned",
       channelId: "string",
       userId: "string",
       type: "string",
       content: "text",
       timestamp: "timestamp"
     }, {
-      primary: ["channelId", "userId", "timestamp"],
-      indexes: ["type"]
+      primary: "id",
+      autoInc: true,
+      indexes: ["timestamp", "channelId", "userId", "type"]
     });
     this.ctx.model.extend("analyse_name", {
       channelId: "string",
@@ -67,16 +69,12 @@ var Collector = class _Collector {
   static {
     __name(this, "Collector");
   }
-  // 每隔 1 分钟将缓冲区数据写入数据库
   static FLUSH_INTERVAL = 60 * 1e3;
-  // 当缓冲区数据达到 100 条时，立即写入数据库
   static BUFFER_THRESHOLD = 100;
-  // 消息数据写入缓冲区
   msgBuffer = [];
-  // 定时器，用于周期性地清空缓冲区
   flushInterval;
-  // 名称缓存，减少不必要的 API 请求 (key: 'channelId:userId')
   nameCache = /* @__PURE__ */ new Map();
+  pendingNameRequests = /* @__PURE__ */ new Map();
   /**
    * 核心消息处理函数。
    * @param session {Session} 消息会话对象
@@ -84,8 +82,8 @@ var Collector = class _Collector {
   async handleMessage(session) {
     const { userId, channelId, guildId, content, timestamp, argv, elements } = session;
     const effectiveId = channelId || guildId;
-    if (!effectiveId || !userId) return;
-    this.updateNameIfNeeded(session, effectiveId);
+    if (!effectiveId || !userId || !timestamp) return;
+    await this.updateNameIfNeeded(session, effectiveId);
     const isCommand = !!argv?.command;
     const type = isCommand ? argv.command.name : this.summarizeElementTypes(elements);
     const finalContent = isCommand ? content : this.sanitizeContent(elements);
@@ -103,9 +101,6 @@ var Collector = class _Collector {
   }
   /**
    * 从消息元素中提取并汇总类型。
-   * @example
-   * // returns "[text][img]"
-   * summarizeElementTypes([{type: 'text'}, {type: 'img'}])
    */
   summarizeElementTypes(elements) {
     return [...new Set(elements.map((e) => `[${e.type}]`))].join("");
@@ -135,39 +130,57 @@ var Collector = class _Collector {
     const bufferToFlush = this.msgBuffer;
     this.msgBuffer = [];
     try {
-      await this.ctx.database.create("analyse_msg", bufferToFlush);
+      await this.ctx.database.upsert("analyse_msg", bufferToFlush);
     } catch (error) {
-      this.ctx.logger.error("数据库写入失败:", error);
+      this.ctx.logger.error("数据写入失败:", error);
       this.msgBuffer.unshift(...bufferToFlush);
     }
   }
   /**
    * 检查并更新用户和群组的名称信息。
-   * 如果名称不在缓存或缓存已过期 (超过24小时)，则从 API 获取并更新到数据库。
    */
   async updateNameIfNeeded(session, effectiveId) {
-    const { userId, guildId, bot } = session;
+    const { userId } = session;
+    if (!userId) return;
     const cacheKey = `${effectiveId}:${userId}`;
+    if (this.pendingNameRequests.has(cacheKey)) return this.pendingNameRequests.get(cacheKey);
     const cached = this.nameCache.get(cacheKey);
     const CACHE_EXPIRATION = 24 * 60 * 60 * 1e3;
     if (cached && Date.now() - cached.timestamp < CACHE_EXPIRATION) return;
+    const promise = this.fetchAndUpdateNames(session, effectiveId, cacheKey);
+    this.pendingNameRequests.set(cacheKey, promise);
     try {
+      await promise;
+    } finally {
+      this.pendingNameRequests.delete(cacheKey);
+    }
+  }
+  /**
+   * @private
+   * 封装了实际获取和更新名称的异步逻辑。
+   */
+  async fetchAndUpdateNames(session, effectiveId, cacheKey) {
+    try {
+      const { userId, guildId, bot } = session;
       const [guild, member] = await Promise.all([
-        bot.getGuild(guildId),
-        bot.getGuildMember(guildId, userId)
+        guildId ? bot.getGuild(guildId).catch(() => null) : Promise.resolve(null),
+        guildId && userId ? bot.getGuildMember(guildId, userId).catch(() => null) : Promise.resolve(null)
       ]);
       const channelName = guild?.name;
       const userName = member?.nick || member?.name;
-      if (!channelName || !userName) return;
+      if (!channelName || !userName) {
+        this.nameCache.set(cacheKey, { name: null, timestamp: Date.now() });
+        return;
+      }
       await this.ctx.database.upsert("analyse_name", [{
         channelId: effectiveId,
-        channelName,
         userId,
+        channelName,
         userName
       }]);
       this.nameCache.set(cacheKey, { name: userName, timestamp: Date.now() });
     } catch (error) {
-      this.ctx.logger.warn("更新用户/群组名称失败:", error);
+      this.nameCache.set(cacheKey, { name: null, timestamp: Date.now() });
     }
   }
 };
@@ -331,7 +344,7 @@ var CmdStat = class {
     }, { primary: ["channelId", "userId", "command"] });
     this.ctx.on("command/before-execute", async ({ command, session }) => {
       const { userId, guildId } = session;
-      if (!guildId || !userId || command.name === "analyse" || command.parent?.name === "analyse") return;
+      if (!guildId || !userId) return;
       const commandName = command.name;
       const query = { channelId: guildId, userId, command: commandName };
       await this.ctx.database.upsert("analyse_cmd", (row) => [{
@@ -398,25 +411,25 @@ var CmdStat = class {
     const query = {};
     if (guildId) query.channelId = guildId;
     if (userId) query.userId = userId;
-    const records = await this.ctx.database.get("analyse_cmd", query);
-    if (records.length === 0) return "暂无统计数据";
-    const totalCount = records.reduce((sum, record) => sum + record.count, 0);
-    let sortedList;
     if (userId) {
-      sortedList = records.map((r) => ({ name: r.command, count: r.count, lastUsed: r.timestamp })).sort((a, b) => b.count - a.count);
-    } else {
-      const commandMap = /* @__PURE__ */ new Map();
-      for (const record of records) {
-        const existing = commandMap.get(record.command) || { count: 0, lastUsed: /* @__PURE__ */ new Date(0) };
-        existing.count += record.count;
-        if (record.timestamp > existing.lastUsed) {
-          existing.lastUsed = record.timestamp;
-        }
-        commandMap.set(record.command, existing);
-      }
-      sortedList = Array.from(commandMap.entries()).map(([name2, data]) => ({ name: name2, ...data })).sort((a, b) => b.count - a.count);
+      const records = await this.ctx.database.get("analyse_cmd", query);
+      if (records.length === 0) return "暂无统计数据";
+      const totalCount2 = records.reduce((sum, record) => sum + record.count, 0);
+      const sortedList2 = records.map((r) => ({ name: r.command, count: r.count, lastUsed: r.timestamp })).sort((a, b) => b.count - a.count);
+      const list2 = sortedList2.map((item) => [item.name, item.count, item.lastUsed]);
+      return { list: list2, total: totalCount2 };
     }
-    const list = sortedList.map((item) => [item.name, item.count, item.lastUsed]);
+    const aggregatedStats = await this.ctx.database.select("analyse_cmd", query).groupBy(
+      ["command"],
+      {
+        count: /* @__PURE__ */ __name((row) => import_koishi2.$.sum(row.count), "count"),
+        lastUsed: /* @__PURE__ */ __name((row) => import_koishi2.$.max(row.timestamp), "lastUsed")
+      }
+    ).execute();
+    if (aggregatedStats.length === 0) return "暂无统计数据";
+    const totalCount = aggregatedStats.reduce((sum, record) => sum + record.count, 0);
+    const sortedList = aggregatedStats.sort((a, b) => b.count - a.count);
+    const list = sortedList.map((item) => [item.command, item.count, item.lastUsed]);
     return { list, total: totalCount };
   }
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chat-analyse",
   "description": "聊天记录分析",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],