koishi-plugin-chat-analyse 0.1.1 → 0.1.2

package/lib/collector.d.ts

@@ -1,42 +1,63 @@
 import { Context } from 'koishi';
 /**
  * @file collector.ts
- * @description 通过独立的事件监听器，分别持久化存储收到的普通消息和已确认的命令，并高效地维护ID与名称的映射。
+ * @description 通过统一的事件监听器，持久化存储所有收到的消息和命令，并高效地维护用户/群组ID与名称的映射。
  */
 declare module 'koishi' {
     interface Tables {
-        analyse_origin_msg: {
+        analyse_msg: {
             id: number;
             channelId: string;
             userId: string;
+            type: string;
             content: string;
             timestamp: Date;
         };
-        analyse_origin_cmd: {
-            id: number;
-            channelId: string;
-            userId: string;
-            command: string;
-            content: string;
-            timestamp: Date;
-        };
-        analyse_name_map: {
+        analyse_name: {
             id: number;
             channelId: string;
             channelName: string;
             userId: string;
             userName: string;
-            timestamp: Date;
         };
     }
 }
 /**
  * @class Collector
- * @description 使用双监听器，精确捕获并存储消息和命令，并维护一个ID到名称的映射表。
+ * @description 核心收集器类。负责初始化数据库、监听消息、分类处理并持久化数据。
  */
 export declare class Collector {
     private ctx;
+    /**
+     * @property {Map<string, { name: string, timestamp: number }>} nameCache
+     * @description 用户名缓存，键为“频道ID:用户ID”，值为名称和时间戳。
+     */
     private nameCache;
+    /**
+     * @constructor
+     * @param {Context} ctx Koishi 的上下文对象
+     */
     constructor(ctx: Context);
-    private updateName;
+    /**
+     * @private
+     * @method defineModels
+     * @description 初始化插件所需的两个数据表模型。
+     */
+    private defineModels;
+    /**
+     * @private
+     * @method sanitizeContent
+     * @description 将消息元素数组转换并清理为用于存储的字符串。
+     * @param {Element[]} elements 消息元素数组
+     * @returns {string} 清理后的消息内容
+     */
+    private sanitizeContent;
+    /**
+     * @private
+     * @method updateNameIfNeeded
+     * @description 检查并按需更新用户和频道的名称。
+     * @param {Session} session 当前会话对象
+     * @param {string} effectiveId 当前生效的频道/群组ID
+     */
+    private updateNameIfNeeded;
 }

package/lib/index.js

@@ -31,108 +31,113 @@ var import_koishi = require("koishi");
 
 // src/collector.ts
 var Collector = class {
+  /**
+   * @constructor
+   * @param {Context} ctx Koishi 的上下文对象
+   */
   constructor(ctx) {
     this.ctx = ctx;
-    ctx.model.extend("analyse_origin_msg", {
-      id: "unsigned",
-      channelId: "string",
-      userId: "string",
-      content: "text",
-      timestamp: "timestamp"
-    }, {
-      autoInc: true,
-      indexes: ["channelId", "userId", "timestamp"]
+    this.defineModels();
+    ctx.on("message", async (session) => {
+      const { userId, channelId, guildId, content, timestamp, argv, elements } = session;
+      const effectiveId = channelId || guildId;
+      if (!effectiveId || !userId) return;
+      this.updateNameIfNeeded(session, effectiveId);
+      const isCommand = !!argv?.command;
+      const type = isCommand ? argv.command.name : [...new Set(elements.map((e) => `[${e.type}]`))].join("");
+      const finalContent = isCommand ? content : this.sanitizeContent(elements);
+      if (!finalContent?.trim()) return;
+      await ctx.database.create("analyse_msg", {
+        channelId: effectiveId,
+        userId,
+        type,
+        content: finalContent,
+        timestamp: new Date(timestamp)
+      });
     });
-    ctx.model.extend("analyse_origin_cmd", {
+  }
+  static {
+    __name(this, "Collector");
+  }
+  /**
+   * @property {Map<string, { name: string, timestamp: number }>} nameCache
+   * @description 用户名缓存，键为“频道ID:用户ID”，值为名称和时间戳。
+   */
+  nameCache = /* @__PURE__ */ new Map();
+  /**
+   * @private
+   * @method defineModels
+   * @description 初始化插件所需的两个数据表模型。
+   */
+  defineModels() {
+    this.ctx.model.extend("analyse_msg", {
       id: "unsigned",
       channelId: "string",
       userId: "string",
-      command: "string",
+      type: "string",
       content: "text",
       timestamp: "timestamp"
-    }, {
-      autoInc: true,
-      indexes: ["channelId", "userId", "command", "timestamp"]
-    });
-    ctx.model.extend("analyse_name_map", {
+    }, { autoInc: true, indexes: ["channelId", "userId", "type", "timestamp"] });
+    this.ctx.model.extend("analyse_name", {
       id: "unsigned",
       channelId: "string",
       channelName: "string",
       userId: "string",
-      userName: "string",
-      timestamp: "timestamp"
-    }, {
-      autoInc: true,
-      unique: [["channelId", "userId"]]
-    });
-    ctx.on("command/before-execute", async (argv) => {
-      const effectiveId = argv.session.channelId || argv.session.guildId;
-      if (!effectiveId) return;
-      await ctx.database.create("analyse_origin_cmd", {
-        channelId: effectiveId,
-        userId: argv.session.userId,
-        command: argv.command.name,
-        content: argv.session.content,
-        timestamp: new Date(argv.session.timestamp)
-      });
-    });
-    ctx.on("message", async (session) => {
-      const { userId, author } = session;
-      const effectiveId = session.channelId || session.guildId;
-      const { channelName, guildName } = session;
-      const effectiveName = channelName || guildName;
-      const currentName = author?.name || author?.nick;
-      if (currentName && effectiveName && effectiveId && userId) {
-        const cacheKey = `${effectiveId}:${userId}`;
-        const cachedName = this.nameCache.get(cacheKey);
-        if (cachedName && currentName !== cachedName) await this.updateName(effectiveId, effectiveName, userId, currentName);
-        else if (!cachedName) {
-          const dbRecord = await ctx.database.get("analyse_name_map", {
-            channelId: effectiveId,
-            userId
-          });
-          const dbName = dbRecord[0]?.userName;
-          if (!dbName || currentName !== dbName) await this.updateName(effectiveId, effectiveName, userId, currentName);
-          else this.nameCache.set(cacheKey, currentName);
-        }
-      }
-      if (session.argv?.command) return;
-      if (!effectiveId) return;
-      const content = session.elements.map((element) => {
-        switch (element.type) {
-          case "text":
-            return element.attrs.content;
-          case "img":
-            return element.attrs.summary === "[动画表情]" ? "[gif]" : `[${element.type}]`;
-          case "at":
-            return `[at:${element.attrs.id}]`;
-          default:
-            return `[${element.type}]`;
-        }
-      }).join("");
-      const sanitizedContent = content.trim();
-      if (!sanitizedContent) return;
-      await ctx.database.create("analyse_origin_msg", {
-        channelId: effectiveId,
-        userId: session.userId,
-        content: sanitizedContent,
-        timestamp: new Date(session.timestamp)
-      });
-    });
+      userName: "string"
+    }, { autoInc: true, unique: [["channelId", "userId"]] });
   }
-  static {
-    __name(this, "Collector");
+  /**
+   * @private
+   * @method sanitizeContent
+   * @description 将消息元素数组转换并清理为用于存储的字符串。
+   * @param {Element[]} elements 消息元素数组
+   * @returns {string} 清理后的消息内容
+   */
+  sanitizeContent(elements) {
+    return elements.map((element) => {
+      switch (element.type) {
+        case "text":
+          return element.attrs.content;
+        case "img":
+          return element.attrs.summary === "[动画表情]" ? "[gif]" : `[img]`;
+        case "at":
+          return `[at:${element.attrs.id}]`;
+        default:
+          return `[${element.type}]`;
+      }
+    }).join("");
   }
-  nameCache = /* @__PURE__ */ new Map();
-  async updateName(channelId, channelName, userId, userName) {
-    await this.ctx.database.upsert("analyse_name_map", [{
-      channelId,
+  /**
+   * @private
+   * @method updateNameIfNeeded
+   * @description 检查并按需更新用户和频道的名称。
+   * @param {Session} session 当前会话对象
+   * @param {string} effectiveId 当前生效的频道/群组ID
+   */
+  async updateNameIfNeeded(session, effectiveId) {
+    const { userId, guildId, bot } = session;
+    const cacheKey = `${effectiveId}:${userId}`;
+    const cached = this.nameCache.get(cacheKey);
+    if (cached && Date.now() - cached.timestamp < 864e5) return;
+    const [guild, member] = await Promise.all([
+      bot.getGuild(guildId),
+      bot.getGuildMember(guildId, userId)
+    ]);
+    const channelName = guild?.name;
+    const userName = member?.nick || member?.name;
+    if (!channelName || !userName) return;
+    const [record] = await this.ctx.database.get("analyse_name", { channelId: effectiveId, userId });
+    if (record?.userName === userName && record?.channelName === channelName) {
+      this.nameCache.set(cacheKey, { name: userName, timestamp: Date.now() });
+      return;
+    }
+    await this.ctx.database.upsert("analyse_name", [{
+      channelId: effectiveId,
       channelName,
       userId,
-      userName,
-      timestamp: /* @__PURE__ */ new Date()
+      userName
     }]);
-    this.nameCache.set(`${channelId}:${userId}`, userName);
+    this.nameCache.set(cacheKey, { name: userName, timestamp: Date.now() });
   }
 };
 

package/package.json

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