koishi-plugin-chat-analyse 0.4.0 → 0.4.1

package/lib/Collector.d.ts

@@ -18,6 +18,11 @@ declare module 'koishi' {
         analyse_msg: {
             uid: number;
             type: string;
+            count: number;
+            timestamp: Date;
+        };
+        analyse_rank: {
+            uid: number;
             hour: Date;
             count: number;
             timestamp: Date;
@@ -48,6 +53,7 @@ export declare class Collector {
     /** @const {number} BUFFER_THRESHOLD - 内存缓存区触发自动刷新的消息数量阈值。 */
     private static readonly BUFFER_THRESHOLD;
     private msgStatBuffer;
+    private rankStatBuffer;
     private cmdStatBuffer;
     private oriCacheBuffer;
     private whoAtBuffer;

package/lib/index.js

@@ -55,8 +55,9 @@ var Collector = class _Collector {
   static FLUSH_INTERVAL = 60 * 1e3;
   /** @const {number} BUFFER_THRESHOLD - 内存缓存区触发自动刷新的消息数量阈值。 */
   static BUFFER_THRESHOLD = 100;
-  // 统一的缓冲区
+  // 分离的缓冲区
   msgStatBuffer = /* @__PURE__ */ new Map();
+  rankStatBuffer = /* @__PURE__ */ new Map();
   cmdStatBuffer = /* @__PURE__ */ new Map();
   oriCacheBuffer = [];
   whoAtBuffer = [];
@@ -86,10 +87,15 @@ var Collector = class _Collector {
     this.ctx.model.extend("analyse_msg", {
       uid: "unsigned",
       type: "string",
+      count: "unsigned",
+      timestamp: "timestamp"
+    }, { primary: ["uid", "type"] });
+    this.ctx.model.extend("analyse_rank", {
+      uid: "unsigned",
       hour: "timestamp",
       count: "unsigned",
       timestamp: "timestamp"
-    }, { primary: ["uid", "type", "hour"] });
+    }, { primary: ["uid", "hour"] });
     if (this.config.enableOriRecord) {
       this.ctx.model.extend("analyse_cache", {
         id: "unsigned",
@@ -134,15 +140,23 @@ var Collector = class _Collector {
         }
       }
       const hourStart = new Date(messageTime.getFullYear(), messageTime.getMonth(), messageTime.getDate(), messageTime.getHours());
+      const rankKey = `${uid}:${hourStart.toISOString()}`;
+      const existingRank = this.rankStatBuffer.get(rankKey);
+      if (existingRank) {
+        existingRank.count++;
+        existingRank.timestamp = messageTime;
+      } else {
+        this.rankStatBuffer.set(rankKey, { uid, hour: hourStart, count: 1, timestamp: messageTime });
+      }
       const uniqueElementTypes = new Set(elements.map((e) => e.type));
       for (const type of uniqueElementTypes) {
-        const key = `${uid}:${type}:${hourStart.toISOString()}`;
+        const key = `${uid}:${type}`;
         const existing = this.msgStatBuffer.get(key);
         if (existing) {
           existing.count++;
           existing.timestamp = messageTime;
         } else {
-          this.msgStatBuffer.set(key, { uid, type, hour: hourStart, count: 1, timestamp: messageTime });
+          this.msgStatBuffer.set(key, { uid, type, count: 1, timestamp: messageTime });
         }
       }
       if (this.config.enableWhoAt) {
@@ -244,10 +258,12 @@ var Collector = class _Collector {
   async flushBuffers() {
     const cmdBufferToFlush = Array.from(this.cmdStatBuffer.values());
     const msgBufferToFlush = Array.from(this.msgStatBuffer.values());
+    const rankBufferToFlush = Array.from(this.rankStatBuffer.values());
     const oriCacheBufferToFlush = this.oriCacheBuffer;
     const whoAtBufferToFlush = this.whoAtBuffer;
     this.cmdStatBuffer.clear();
     this.msgStatBuffer.clear();
+    this.rankStatBuffer.clear();
     this.oriCacheBuffer = [];
     this.whoAtBuffer = [];
     try {
@@ -268,6 +284,16 @@ var Collector = class _Collector {
           (row) => msgBufferToFlush.map((item) => ({
             uid: item.uid,
             type: item.type,
+            count: import_koishi.$.add(import_koishi.$.ifNull(row.count, 0), item.count),
+            timestamp: item.timestamp
+          }))
+        );
+      }
+      if (rankBufferToFlush.length > 0) {
+        await this.ctx.database.upsert(
+          "analyse_rank",
+          (row) => rankBufferToFlush.map((item) => ({
+            uid: item.uid,
             hour: item.hour,
             count: import_koishi.$.add(import_koishi.$.ifNull(row.count, 0), item.count),
             timestamp: item.timestamp
@@ -753,13 +779,13 @@ var Stat = class {
       if (usersInGuild.length === 0) return "暂无统计数据";
       const uids = usersInGuild.map((u) => u.uid);
       const userNameMap = new Map(usersInGuild.map((u) => [u.uid, u.userName]));
-      const stats = await this.ctx.database.select("analyse_msg").where({ uid: { $in: uids }, hour: { $gte: since } }).groupBy("uid", { count: /* @__PURE__ */ __name((row) => import_koishi3.$.sum(row.count), "count") }).orderBy("count", "desc").limit(100).execute();
+      const stats = await this.ctx.database.select("analyse_rank").where({ uid: { $in: uids }, hour: { $gte: since } }).groupBy("uid", { count: /* @__PURE__ */ __name((row) => import_koishi3.$.sum(row.count), "count") }).orderBy("count", "desc").limit(100).execute();
       if (stats.length === 0) return "暂无统计数据";
       const total = stats.reduce((sum, record) => sum + record.count, 0);
       const list = stats.map((item) => [userNameMap.get(item.uid) || `UID ${item.uid}`, item.count]);
       return { list, total };
     } else {
-      const msgStats = await this.ctx.database.select("analyse_msg").where({ hour: { $gte: since } }).project(["uid", "count"]).execute();
+      const msgStats = await this.ctx.database.select("analyse_rank").where({ hour: { $gte: since } }).project(["uid", "count"]).execute();
       if (msgStats.length === 0) return "暂无统计数据";
       const allUsers = await this.ctx.database.get("analyse_user", {}, ["uid", "userId", "userName"]);
       const uidToUserMap = new Map(allUsers.map((u) => [u.uid, { userId: u.userId, userName: u.userName }]));

package/package.json

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