koishi-plugin-chat-analyse 1.4.4 → 1.4.6

package/lib/Renderer.d.ts

@@ -83,7 +83,7 @@ export declare class Renderer {
      * @public
      * @method renderWordCloud
      * @description 将词频数据渲染成一张词云图片，使用 Puppeteer 和 wordcloud2.js。
-     * @param {WordCloudData} data - 包含标题、时间和词汇列表，以及从config传入的options。
+     * @param {WordCloudData} data - 包含标题、时间和词汇列表的对象。
      * @returns {AsyncGenerator<Buffer>} - 一个异步生成器，产出渲染后的图片 Buffer。
      */
     renderWordCloud(data: WordCloudData): AsyncGenerator<Buffer>;

package/lib/index.d.ts

@@ -22,16 +22,6 @@ export interface Config {
     cacheRetentionDays: number;
     enableSimilarActivity: boolean;
     enableAutoBackup: boolean;
-    fontFamily: string;
-    minFontSize: number;
-    maxFontSize: number;
-    shape: string;
-    gridSize: number;
-    rotateRatio: number;
-    minRotation: number;
-    maxRotation: number;
-    ellipticity: number;
-    maskImage: string;
 }
 /** @description 插件的配置项定义 */
 export declare const Config: Schema<Config>;

package/lib/index.js

@@ -1775,18 +1775,19 @@ var Renderer = class {
    * @public
    * @method renderWordCloud
    * @description 将词频数据渲染成一张词云图片，使用 Puppeteer 和 wordcloud2.js。
-   * @param {WordCloudData} data - 包含标题、时间和词汇列表，以及从config传入的options。
+   * @param {WordCloudData} data - 包含标题、时间和词汇列表的对象。
    * @returns {AsyncGenerator<Buffer>} - 一个异步生成器，产出渲染后的图片 Buffer。
    */
   async *renderWordCloud(data) {
     const { title, time, words } = data;
-    const options = data.options;
-    if (!words?.length || !options) return;
+    if (!words?.length) return;
     const wordsJson = JSON.stringify(words);
     const selectedPalette = this.COLOR_PALETTES[Math.floor(Math.random() * this.COLOR_PALETTES.length)];
     const weights = words.map((w) => w[1]);
     const maxWeight = Math.max(...weights, 1);
     const minWeight = Math.min(...weights);
+    const MAX_FONT_SIZE = 64;
+    const MIN_FONT_SIZE = 4;
     const cardHtml = `
       <div class="container">
         <div class="header">
@@ -1794,55 +1795,31 @@ var Renderer = class {
           <h1 class="title-text">${title}</h1>
           <div class="time-label">${time.toLocaleString("zh-CN", { hour12: false })}</div>
         </div>
-        <div style="width: 512px; height: 512px; margin: auto; position: relative;">
-          <canvas id="wordcloud-canvas" width="512" height="512"></canvas>
-        </div>
+        <div id="wordcloud-container" style="width: 512px; height: 512px; margin: auto;"></div>
         <script>${wordCloudScript}</script>
         <script>
-          const canvas = document.getElementById('wordcloud-canvas');
-          const maskImageUrl = ${JSON.stringify(options.maskImage)};
           const palette = ${JSON.stringify(selectedPalette)};
-
-          const wordCloudOptions = {
-            list: ${wordsJson},
-            fontFamily: ${JSON.stringify(options.fontFamily)},
+          WordCloud(document.getElementById('wordcloud-container'), {
+            fontFamily: '"Noto Sans CJK SC", "Arial", sans-serif',
             weightFactor: (size) => {
-              if (${maxWeight} === ${minWeight}) return (${options.minFontSize} + ${options.maxFontSize}) / 2;
+              if (${maxWeight} === ${minWeight}) return (${MIN_FONT_SIZE} + ${MAX_FONT_SIZE}) / 2;
               const normalizedWeight = (size - ${minWeight}) / (${maxWeight} - ${minWeight});
-              return ${options.minFontSize} + normalizedWeight * (${options.maxFontSize} - ${options.minFontSize});
+              return ${MIN_FONT_SIZE} + normalizedWeight * (${MAX_FONT_SIZE} - ${MIN_FONT_SIZE});
             },
-            color: () => palette[Math.floor(Math.random() * palette.length)],
-            shape: ${JSON.stringify(options.shape)},
-            gridSize: ${options.gridSize},
-            rotateRatio: ${options.rotateRatio},
-            minRotation: ${options.minRotation},
-            maxRotation: ${options.maxRotation},
-            ellipticity: ${options.ellipticity},
-            shuffle: true,
-            drawOutOfBoundWords: false,
+            color: (word, weight, fontSize, distance, theta) => {
+              return palette[Math.floor(Math.random() * palette.length)];
+            },
+            list: ${wordsJson},
+            shape: 'square',
+            gridSize: 1,
+            ellipticity: 1,
+            rotateRatio: 0.5,
+            minRotation: Math.PI / 2,
+            maxRotation: Math.PI / 2,
             backgroundColor: 'transparent',
-          };
-
-          function drawWordCloud(isMasked) {
-            const finalOptions = { ...wordCloudOptions, clearCanvas: !isMasked };
-            WordCloud(canvas, finalOptions);
-          }
-
-          if (maskImageUrl) {
-            const img = new Image();
-            img.crossOrigin = "anonymous";
-            img.onload = () => {
-              const ctx = canvas.getContext('2d');
-              ctx.drawImage(img, 0, 0, canvas.width, canvas.height);
-              drawWordCloud(true);
-            };
-            img.onerror = () => {
-              drawWordCloud(false);
-            };
-            img.src = maskImageUrl;
-          } else {
-            drawWordCloud(false);
-          }
+            clearCanvas: true,
+            shuffle: true,
+          });
         </script>
       </div>`;
     const fullHtml = `<!DOCTYPE html>
@@ -2550,19 +2527,7 @@ var Config3 = import_koishi7.Schema.intersect([
     enableAutoBackup: import_koishi7.Schema.boolean().default(false).description("启用自动备份"),
     enableWordCloud: import_koishi7.Schema.boolean().default(true).description("启用词云生成"),
     enableSimilarActivity: import_koishi7.Schema.boolean().default(true).description("启用相似活跃分析")
-  }).description("高级分析配置"),
-  import_koishi7.Schema.object({
-    ellipticity: import_koishi7.Schema.number().min(0).max(1).default(1).description("长宽比"),
-    rotateRatio: import_koishi7.Schema.number().min(0).max(1).default(0.5).description("旋转比"),
-    minRotation: import_koishi7.Schema.number().default(Math.PI / 2).description("最小旋转角"),
-    maxRotation: import_koishi7.Schema.number().default(Math.PI / 2).description("最大旋转角"),
-    minFontSize: import_koishi7.Schema.number().min(1).default(4).description("最小字号"),
-    maxFontSize: import_koishi7.Schema.number().min(1).default(64).description("最大字号"),
-    gridSize: import_koishi7.Schema.number().min(0).default(1).description("词云间距"),
-    fontFamily: import_koishi7.Schema.string().default('"Noto Sans CJK SC", "Arial", sans-serif').description("词云字体"),
-    shape: import_koishi7.Schema.union(["square", "circle", "cardioid", "diamond", "triangle-forward", "triangle", "pentagon", "star"]).default("square").description("词云形状"),
-    maskImage: import_koishi7.Schema.string().role("link").description("词云蒙版")
-  }).description("词云生成配置")
+  }).description("高级分析配置")
 ]);
 async function parseQueryScope(ctx, session, options) {
   const scopeDesc = { guildId: options.guild, userId: void 0 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chat-analyse",
   "description": "强大而全面的聊天数据分析插件。支持多维度统计（命令、发言、消息类型、活跃度），可生成发言排行、词云图，并提供完善的数据管理。",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],
@@ -35,7 +35,7 @@
     "koishi-plugin-puppeteer": "^3.5.2"
   },
   "peerDependencies": {
-    "koishi": "4.18.8"
+    "koishi": "^4.18.8"
   },
   "dependencies": {
     "@node-rs/jieba": "^2.0.1"

package/readme.md

@@ -156,21 +156,6 @@
 `enableSimilarActivity`: **启用相似活跃分析**。
   > **!** 此功能依赖 **`启用发言排行`** 或 **`启用活跃统计`**。 (默认: `true`)
 
-### 词云生成配置
-
-| 配置项 | 描述 | 默认值 |
-| :--- | :--- | :--- |
-| `maskImage` | **词云蒙版**：提供一个图片的URL作为词云的形状蒙版。**注意：这会覆盖“基础形状”选项。** | (空) |
-| `fontFamily` | **词云字体**：用于渲染词云的字体列表。 | `"Noto Sans CJK SC", "Arial", sans-serif` |
-| `minFontSize` | **最小字号**：权重最小的单词所使用的字号。 | `4` |
-| `maxFontSize` | **最大字号**：权重最大的单词所使用的字号。 | `64` |
-| `gridSize` | **词云间距**：用于分隔单词的网格大小（像素）。值越大，单词间距越大。 | `1` |
-| `shape` | **基础形状**：选择词云的整体轮廓（无蒙版时生效）。 | `square` |
-| `ellipticity` | **长宽比**：当形状为“椭圆”时，定义其扁平程度。值越小越扁。 | `1` |
-| `rotateRatio` | **旋转比**：随机旋转的单词所占的比例（0 到 1）。 | `0.5` |
-| `minRotation` | **最小旋转角**：单词随机旋转的最小角度（弧度）。 | `1.570796` (π/2) |
-| `maxRotation` | **最大旋转角**：单词随机旋转的最大角度（弧度）。 | `1.570796` (π/2) |
-
 ## 📌 注意事项
 
 1. **Puppeteer 配置**：本插件的图片渲染强依赖 `puppeteer` 服务。请确保您已正确安装并配置了该服务，包括正确设置了可执行文件路径（如有需要）。渲染失败通常与此有关。