koishi-plugin-chat-analyse 1.1.4 → 1.2.1

package/lib/Renderer.d.ts

@@ -63,26 +63,26 @@ export declare class Renderer {
     /**
      * @public
      * @method renderList
-     * @description 将表格型数据渲染成一个或多个列表形式的图片。如果数据过多，会自动进行分页渲染。
+     * @description 将表格型数据渲染成列表形式的图片。如果数据过多，会通过异步生成器逐个产出图片。
      * @param {ListRenderData} data - 包含标题、时间、总计和列表数据的对象。
      * @param {string[]} [headers] - （可选）列表的表头数组。
-     * @returns {Promise<string | Buffer[]>} - 成功时返回包含图片 Buffer 的数组，失败或无数据时返回提示字符串。
+     * @returns {AsyncGenerator<Buffer>} - 一个异步生成器，每次迭代产出一张图片的 Buffer。
      */
-    renderList(data: ListRenderData, headers?: string[]): Promise<string | Buffer[]>;
+    renderList(data: ListRenderData, headers?: string[]): AsyncGenerator<Buffer>;
     /**
      * @public
      * @method renderCircadianChart
-     * @description 将 24 小时制的活跃度数据渲染成一张柱状图图片。
+     * @description 将 24 小时制的活跃度数据渲染成一张柱状图图片。通过异步生成器产出图片。
      * @param {CircadianChartData} data - 包含标题、时间、总计和 24 小时数据数组的对象。
-     * @returns {Promise<string | Buffer[]>} - 成功时返回包含图片 Buffer 的数组，失败或无数据时返回提示字符串。
+     * @returns {AsyncGenerator<Buffer>} - 一个异步生成器，产出渲染后的图片 Buffer。
      */
-    renderCircadianChart(data: CircadianChartData): Promise<string | Buffer[]>;
+    renderCircadianChart(data: CircadianChartData): AsyncGenerator<Buffer>;
     /**
      * @public
      * @method renderWordCloud
      * @description 将词频数据渲染成一张词云图片，使用 Puppeteer 和 wordcloud2.js。
      * @param {WordCloudData} data - 包含标题、时间和词汇列表的对象。
-     * @returns {Promise<string | Buffer[]>} - 成功时返回图片 Buffer 数组，否则返回提示。
+     * @returns {AsyncGenerator<Buffer>} - 一个异步生成器，产出渲染后的图片 Buffer。
      */
-    renderWordCloud(data: WordCloudData): Promise<string | Buffer[]>;
+    renderWordCloud(data: WordCloudData): AsyncGenerator<Buffer>;
 }

package/lib/index.js

@@ -1487,20 +1487,20 @@ var Renderer = class {
     __name(this, "Renderer");
   }
   COLOR_PALETTES = [
-    ["#2c5b7a", "#3a8fb7", "#64b9cc", "#97d8c4", "#ccece6", "#7f8c8d"],
-    // Blue/Teal
-    ["#d946ef", "#a21caf", "#86198f", "#fdf4ff", "#faf5ff", "#f5d0fe"],
-    // Fuchsia/Purple
-    ["#4f46e5", "#6366f1", "#a5b4fc", "#e0e7ff", "#eef2ff", "#3730a3"],
-    // Indigo
-    ["#d97706", "#f59e0b", "#fcd34d", "#fefce8", "#fffbeb", "#b45309"],
-    // Amber/Yellow
-    ["#059669", "#10b981", "#6ee7b7", "#ecfdf5", "#d1fae5", "#047857"],
-    // Emerald/Green
-    ["#db2777", "#ec4899", "#f9a8d4", "#fdf2f8", "#fce7f3", "#be185d"],
-    // Pink
-    ["#e11d48", "#f43f5e", "#fb7185", "#fff1f2", "#ffe4e6", "#be123c"]
-    // Rose/Red
+    // 1. Oceanic: 深邃的海洋蓝与青色系，沉稳专业
+    ["#003f5c", "#2f4b7c", "#0077b6", "#023e8a", "#2a6f97", "#0096c7"],
+    // 2. Sunset: 充满活力的日落色系，温暖而醒目
+    ["#c1121f", "#d9501e", "#e36414", "#9a031e", "#5f0f40", "#fb8500"],
+    // 3. Forest: 茂密森林的绿色系，自然且舒适
+    ["#1b4332", "#2d6a4f", "#40916c", "#52b788", "#283618", "#081c15"],
+    // 4. Grape: 浓郁的葡萄与浆果色系，高贵而神秘
+    ["#4a0072", "#6a00a8", "#810099", "#c71585", "#58004f", "#3d0c4c"],
+    // 5. Candy: 甜美的糖果色系，活泼有趣
+    ["#e63946", "#f77f00", "#2a9d8f", "#457b9d", "#8d99ae", "#d62828"],
+    // 6. Retro: 复古风格色盘，兼具沉稳与活力
+    ["#264653", "#2a9d8f", "#e76f51", "#f4a261", "#bc6c25", "#a56c03"],
+    // 7. Midnight: 深邃的午夜色系，搭配亮色点缀，对比强烈
+    ["#03045e", "#0077b6", "#00b4d8", "#d00000", "#e85d04", "#212529"]
   ];
   COMMON_STYLE = `
     :root {
@@ -1606,16 +1606,14 @@ var Renderer = class {
   /**
    * @public
    * @method renderList
-   * @description 将表格型数据渲染成一个或多个列表形式的图片。如果数据过多，会自动进行分页渲染。
+   * @description 将表格型数据渲染成列表形式的图片。如果数据过多，会通过异步生成器逐个产出图片。
    * @param {ListRenderData} data - 包含标题、时间、总计和列表数据的对象。
    * @param {string[]} [headers] - （可选）列表的表头数组。
-   * @returns {Promise<string | Buffer[]>} - 成功时返回包含图片 Buffer 的数组，失败或无数据时返回提示字符串。
+   * @returns {AsyncGenerator<Buffer>} - 一个异步生成器，每次迭代产出一张图片的 Buffer。
    */
-  async renderList(data, headers) {
+  async *renderList(data, headers) {
     const { title, time, list } = data;
-    if (!list?.length) return "暂无数据可供渲染";
     const CHUNK_SIZE = 100;
-    const imageBuffers = [];
     const totalItems = list.length;
     const countHeaderIndex = headers?.findIndex((h6) => ["总计发言", "条数", "次数", "数量"].includes(h6)) ?? -1;
     const totalCount = data.total || (countHeaderIndex > -1 ? list.reduce((sum, row) => sum + (Number(row[countHeaderIndex]) || 0), 0) : totalItems);
@@ -1680,20 +1678,18 @@ var Renderer = class {
         </div>`;
       const fullHtml = this.generateFullHtml(cardHtml, listStyles);
       const imageBuffer = await this.htmlToImage(fullHtml);
-      if (imageBuffer) imageBuffers.push(imageBuffer);
+      if (imageBuffer) yield imageBuffer;
     }
-    return imageBuffers.length > 0 ? imageBuffers : "图片渲染失败";
   }
   /**
    * @public
    * @method renderCircadianChart
-   * @description 将 24 小时制的活跃度数据渲染成一张柱状图图片。
+   * @description 将 24 小时制的活跃度数据渲染成一张柱状图图片。通过异步生成器产出图片。
    * @param {CircadianChartData} data - 包含标题、时间、总计和 24 小时数据数组的对象。
-   * @returns {Promise<string | Buffer[]>} - 成功时返回包含图片 Buffer 的数组，失败或无数据时返回提示字符串。
+   * @returns {AsyncGenerator<Buffer>} - 一个异步生成器，产出渲染后的图片 Buffer。
    */
-  async renderCircadianChart(data) {
+  async *renderCircadianChart(data) {
     const { title, time, total, data: hourlyCounts, labels } = data;
-    if (!hourlyCounts || hourlyCounts.every((c) => c === 0)) return "暂无数据可供渲染";
     const maxCount = Math.max(...hourlyCounts, 1);
     const chartStyles = `
       .chart-container { display: flex; align-items: flex-end; gap: 4px; height: 180px; padding: 30px 15px 10px; }
@@ -1723,33 +1719,28 @@ var Renderer = class {
       </div>`;
     const fullHtml = this.generateFullHtml(cardHtml, chartStyles);
     const imageBuffer = await this.htmlToImage(fullHtml);
-    return imageBuffer ? [imageBuffer] : "图片渲染失败";
+    if (imageBuffer) yield imageBuffer;
   }
   /**
    * @public
    * @method renderWordCloud
    * @description 将词频数据渲染成一张词云图片，使用 Puppeteer 和 wordcloud2.js。
    * @param {WordCloudData} data - 包含标题、时间和词汇列表的对象。
-   * @returns {Promise<string | Buffer[]>} - 成功时返回图片 Buffer 数组，否则返回提示。
+   * @returns {AsyncGenerator<Buffer>} - 一个异步生成器，产出渲染后的图片 Buffer。
    */
-  async renderWordCloud(data) {
+  async *renderWordCloud(data) {
     const { title, time, words } = data;
     if (!words?.length) return "暂无数据可供渲染";
-    const wordListJson = JSON.stringify(words);
+    const wordsJson = JSON.stringify(words);
     const selectedPalette = this.COLOR_PALETTES[Math.floor(Math.random() * this.COLOR_PALETTES.length)];
-    let weightFactor = 64;
     const count = words.length;
-    if (count <= 32) {
-      weightFactor = 64;
-    } else if (count <= 64) {
-      weightFactor = 48;
-    } else if (count <= 128) {
-      weightFactor = 32;
-    } else if (count <= 256) {
-      weightFactor = 24;
-    } else {
-      weightFactor = 12;
-    }
+    const minWords = 64;
+    const maxWords = 512;
+    const maxWeight = 32;
+    const minWeight = 4;
+    const progress = (count - minWords) / (maxWords - minWords);
+    const clampedProgress = Math.max(0, Math.min(1, progress));
+    const dynamicWeightFactor = maxWeight - (maxWeight - minWeight) * clampedProgress;
     const cardHtml = `
       <div class="container">
         <div class="header">
@@ -1762,14 +1753,16 @@ var Renderer = class {
         <script>
           const palette = ${JSON.stringify(selectedPalette)};
           WordCloud(document.getElementById('wordcloud-container'), {
-            list: ${wordListJson},
-            fontFamily: '"Noto Sans CJK SC", "Helvetica Neue", "Arial", sans-serif',
-            weightFactor: (size) => (Math.log(size) + 1) * ${weightFactor},
+            list: ${wordsJson},
+            fontFamily: '"Noto Sans CJK SC", "Arial", sans-serif',
+            weightFactor: (size) => Math.max((Math.log(size) + 1) * ${dynamicWeightFactor}, 8),
             color: (word, weight, fontSize, distance, theta) => {
               return palette[Math.floor(Math.random() * palette.length)];
             },
             backgroundColor: 'transparent',
-            gridSize: 8,
+            shape: 'square',
+            ellipticity: 0.6,
+            gridSize: 2,
             rotateRatio: 1,
             minRotation: -Math.PI / 4,
             maxRotation: Math.PI / 4,
@@ -1788,7 +1781,7 @@ var Renderer = class {
         </body>
       </html>`;
     const imageBuffer = await this.htmlToImage(fullHtml);
-    return imageBuffer ? [imageBuffer] : "图片渲染失败";
+    if (imageBuffer) yield imageBuffer;
   }
 };
 
@@ -1826,12 +1819,9 @@ var Stat = class {
         try {
           const result = await handler(scope, options);
           if (typeof result === "string") return result;
-          if (Array.isArray(result) && result.length > 0) {
-            for (const buffer of result) await session.sendQueued(import_koishi3.h.image(buffer, "image/png"));
-            return;
-          }
+          for await (const buffer of result) await session.send(import_koishi3.h.image(buffer, "image/png"));
         } catch (error) {
-          this.ctx.logger.error("渲染统计图片失败:", error);
+          this.ctx.logger.error("图片渲染失败:", error);
           return "图片渲染失败";
         }
       };
@@ -1981,7 +1971,7 @@ var WhoAt = class {
    * @param cmd - 主命令实例。
    */
   registerCommand(cmd) {
-    cmd.subcommand("whoatme", "谁提及我").usage("查看最近提及我的消息，不分群组。").action(async ({ session }) => {
+    cmd.subcommand("whoatme", "谁提及我").usage("查看最近提及我的消息，查看后自动删除。").action(async ({ session }) => {
       if (!session.userId) return "无法获取用户信息";
       try {
         const records = await this.ctx.database.get("analyse_at", { target: session.userId }, {
@@ -1997,6 +1987,8 @@ var WhoAt = class {
           const author = (0, import_koishi4.h)("author", { id: senderInfo.id, name: senderInfo.name });
           return (0, import_koishi4.h)("message", {}, [author, import_koishi4.h.text(record.content)]);
         });
+        const recordIdsToDelete = records.map((r) => r.id);
+        await this.ctx.database.remove("analyse_at", { id: { $in: recordIdsToDelete } });
         return (0, import_koishi4.h)("message", { forward: true }, messageElements);
       } catch (error) {
         this.ctx.logger.error("查询提及记录失败:", error);
@@ -2181,30 +2173,33 @@ var Analyse = class {
   registerCommands(cmd) {
     if (this.config.enableWordCloud) {
       cmd.subcommand("wordcloud", "生成词云").usage("基于聊天记录生成词云图，可指定范围，默认当前群组。").option("guild", "-g <guildId:string> 指定群组").option("user", "-u <user:string> 指定用户").option("hours", "-t <hours:number> 指定时长", { fallback: 24 }).option("all", "-a 全局").action(async ({ session, options }) => {
-        if (!this.jieba) return "Jieba 分词服务未就绪";
-        const scope = await parseQueryScope(this.ctx, session, options);
-        if (scope.error) return scope.error;
-        scope.uids ??= (await this.ctx.database.get("analyse_user", {}, ["uid"])).map((u) => u.uid);
-        if (!scope.uids?.length) return "暂无用户数据";
-        const since = new Date(Date.now() - options.hours * import_koishi6.Time.hour);
-        const records = await this.ctx.database.get("analyse_cache", { uid: { $in: scope.uids }, timestamp: { $gte: since } }, ["content"]);
-        if (!records.length) return "暂无统计数据";
-        const exclusionRegex = /\[(face|file|forward|img|gif|audio|video|json|rps|markdown|dice|at:.*?)\]/g;
-        const allText = records.map((r) => r.content.replace(exclusionRegex, "")).join(" ");
-        const words = this.jieba.cut(allText).filter((w) => {
-          if (w.trim().length <= 1) return false;
-          if (/^\d+$/.test(w)) return false;
-          return true;
-        });
-        if (!words.length) return "暂无有效词语";
-        const wordCounts = words.reduce((map, word) => map.set(word, (map.get(word) || 0) + 1), /* @__PURE__ */ new Map());
-        const wordList = Array.from(wordCounts.entries()).sort((a, b) => b[1] - a[1]);
-        session.send(`正在生成词云:${wordList.slice(0, 10)}`);
-        const title = await generateTitle(this.ctx, scope.scopeDesc, { main: "词云" });
-        const result = await this.renderer.renderWordCloud({ title, time: /* @__PURE__ */ new Date(), words: wordList });
-        if (typeof result === "string") return result;
-        if (Array.isArray(result) && result.length > 0) {
-          for (const buffer of result) await session.sendQueued(import_koishi6.h.image(buffer, "image/png"));
+        try {
+          if (!this.jieba) return "Jieba 分词服务未就绪";
+          const scope = await parseQueryScope(this.ctx, session, options);
+          if (scope.error) return scope.error;
+          scope.uids ??= (await this.ctx.database.get("analyse_user", {}, ["uid"])).map((u) => u.uid);
+          if (!scope.uids?.length) return "暂无用户数据";
+          const since = new Date(Date.now() - options.hours * import_koishi6.Time.hour);
+          const records = await this.ctx.database.get("analyse_cache", { uid: { $in: scope.uids }, timestamp: { $gte: since } }, ["content"]);
+          if (!records.length) return "暂无统计数据";
+          const exclusionRegex = /\[(face|file|forward|img|gif|audio|video|json|rps|markdown|dice|at:.*?)\]/g;
+          const allText = records.map((r) => r.content.replace(exclusionRegex, "")).join(" ");
+          const words = this.jieba.cut(allText).filter((w) => {
+            if (w.trim().length <= 1) return false;
+            if (/^\d+$/.test(w)) return false;
+            return true;
+          });
+          if (!words.length) return "暂无有效词语";
+          const wordCounts = words.reduce((map, word) => map.set(word, (map.get(word) || 0) + 1), /* @__PURE__ */ new Map());
+          const wordList = Array.from(wordCounts.entries()).sort((a, b) => b[1] - a[1]).slice(0, 512);
+          const topWordsPreview = wordList.slice(0, 10).map((item) => item[0]).join(", ");
+          session.send(`正在生成词云，热门词汇：${topWordsPreview}...`);
+          const title = await generateTitle(this.ctx, scope.scopeDesc, { main: "词云" });
+          const imageGenerator = this.renderer.renderWordCloud({ title, time: /* @__PURE__ */ new Date(), words: wordList });
+          for await (const buffer of imageGenerator) await session.send(import_koishi6.h.image(buffer, "image/png"));
+        } catch (error) {
+          this.ctx.logger.error("生成词云图片失败:", error);
+          return "图片渲染失败";
         }
       });
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chat-analyse",
   "description": "强大而全面的聊天数据分析，支持统计命令，发言，消息类型，活跃度，支持发言排行和生成词云",
-  "version": "1.1.4",
+  "version": "1.2.1",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],