koishi-plugin-bilibili-notify 3.2.9-rc.0 → 3.2.9-rc.1

package/lib/index.js

@@ -799,196 +799,56 @@ var ComRegister = class {
 		});
 		biliCom.subcommand(".wc").action(async ({ session }) => {
 			const words = [
-				["kq8z1", 57],
-				["v2n3a", 142],
-				["b7x9p", 13],
-				["w4m2s", 199],
-				["t1j6u", 85],
-				["z8c5l", 120],
-				["h3r7y", 34],
-				["n6d2q", 178],
-				["p9s4e", 66],
-				["f2g8b", 101],
-				["m5v1k", 12],
-				["x7a3w", 154],
-				["c4t9z", 47],
-				["u1b6n", 193],
-				["e8y2h", 23],
-				["j3l7p", 88],
-				["s6q4d", 132],
-				["g9m5x", 59],
-				["a2w8c", 175],
-				["l5h1v", 99],
-				["y7k3t", 41],
-				["d4z9u", 186],
-				["q1e6j", 27],
-				["r8p2s", 112],
-				["b3n7f", 73],
-				["v6x4m", 160],
-				["t9c5w", 53],
-				["z2u8h", 141],
-				["h5y1j", 36],
-				["n7l3s", 190],
-				["p4d9g", 18],
-				["f1b6a", 124],
-				["m8v2x", 62],
-				["x3a7c", 157],
-				["c6t4u", 44],
-				["u9b5e", 183],
-				["e2y8k", 29],
-				["j1l6q", 91],
-				["s8g3m", 138],
-				["g5w1t", 55],
-				["a7z4h", 172],
-				["l2h8p", 97],
-				["y5k1n", 39],
-				["d7u3f", 188],
-				["q4e9v", 21],
-				["r1p6x", 117],
-				["b8n5c", 70],
-				["v3x7w", 163],
-				["t6c4a", 49],
-				["z9u2j", 146],
-				["k1q8z", 102],
-				["v7n2a", 31],
-				["b4x9p", 176],
-				["w2m5s", 61],
-				["t8j3u", 150],
-				["z5c7l", 84],
-				["h2r8y", 196],
-				["n9d1q", 44],
-				["p6s3e", 123],
-				["f8g2b", 17],
-				["m1v7k", 109],
-				["x4a9w", 72],
-				["c7t2z", 180],
-				["u5b8n", 38],
-				["e1y3h", 134],
-				["j8l6p", 56],
-				["s2q9d", 191],
-				["g7m4x", 25],
-				["a5w8c", 113],
-				["l9h2v", 68],
-				["y1k7t", 159],
-				["d8z3u", 45],
-				["q2e6j", 177],
-				["r7p1s", 80],
-				["b5n9f", 126],
-				["v1x4m", 32],
-				["t7c8w", 198],
-				["z4u2h", 54],
-				["h9y5j", 143],
-				["n2l7s", 19],
-				["p8d1g", 104],
-				["f5b3a", 67],
-				["m2v9x", 171],
-				["x8a4c", 40],
-				["c1t7u", 187],
-				["u4b2e", 28],
-				["e9y6k", 135],
-				["j2l8q", 60],
-				["s7g1m", 119],
-				["g4w5t", 76],
-				["a9z2h", 164],
-				["l1h7p", 35],
-				["y8k3n", 185],
-				["d2u9f", 22],
-				["q7e4v", 110],
-				["r5p8x", 69],
-				["b1n6c", 152],
-				["v8x2w", 48],
-				["t4c7a", 142],
-				["z7u1j", 99],
-				["k2q5z", 174],
-				["v9n8a", 37],
-				["b6x3p", 189],
-				["w1m7s", 24],
-				["t5j2u", 115],
-				["z1c8l", 63],
-				["h6r4y", 155],
-				["n3d9q", 50],
-				["p7s2e", 137],
-				["f9g1b", 81],
-				["m4v6k", 170],
-				["x1a8w", 42],
-				["c8t3z", 194],
-				["u2b7n", 26],
-				["e5y9h", 130],
-				["j9l1p", 58],
-				["s4q6d", 182],
-				["g1m8x", 33],
-				["a8w5c", 108],
-				["l3h9v", 75],
-				["y2k4t", 161],
-				["d9z1u", 46],
-				["q5e8j", 149],
-				["r2p7s", 20],
-				["b9n3f", 122],
-				["v4x6m", 65],
-				["t1c9w", 179],
-				["z8u5h", 30],
-				["h3y2j", 136],
-				["n5l8s", 52],
-				["p1d4g", 167],
-				["f6b9a", 95],
-				["m3v2x", 156],
-				["x9a5c", 43],
-				["c2t8u", 192],
-				["u7b1e", 16],
-				["e4y6k", 129],
-				["j5l3q", 78],
-				["s1g9m", 118],
-				["g8w2t", 71],
-				["a3z7h", 173],
-				["l6h1p", 36],
-				["y9k5n", 184],
-				["d1u8f", 15],
-				["q8e3v", 111],
-				["r4p6x", 64],
-				["b2n7c", 151],
-				["v5x1w", 47],
-				["t8c4a", 140],
-				["z3u9j", 98],
-				["k7q2z", 176],
-				["v1n5a", 55],
-				["b8x6p", 195],
-				["w3m1s", 14],
-				["t6j9u", 116],
-				["z2c5l", 61],
-				["h7r3y", 153],
-				["n4d8q", 51],
-				["p2s7e", 139],
-				["f7g5b", 82],
-				["m9v1k", 169],
-				["x5a3w", 38],
-				["c9t6z", 197],
-				["u3b8n", 17],
-				["e6y2h", 131],
-				["j7l5p", 59],
-				["s3q8d", 181],
-				["g2m4x", 34],
-				["a6w9c", 107],
-				["l8h2v", 74],
-				["y4k7t", 162],
-				["d6z5u", 49],
-				["q3e1j", 148],
-				["r9p2s", 21],
-				["b4n8f", 121],
-				["v7x5m", 68],
-				["t2c1w", 178],
-				["z5u3h", 31],
-				["h8y6j", 133],
-				["n1l4s", 57],
-				["p5d7g", 166],
-				["f3b2a", 96],
-				["m6v8x", 158],
-				["x2a9c", 45],
-				["c5t1u", 191],
-				["u8b4e", 19],
-				["e3y7k", 128],
-				["j6l2q", 79],
-				["s9g5m", 114],
-				["g5w3t", 73]
+				["弹幕护体", 77],
+				["笑死", 30],
+				["泪目", 45],
+				["加油", 70],
+				["？？？", 80],
+				["我可以", 66],
+				["无语", 55],
+				["梦开始的地方", 1],
+				["太真实了", 8],
+				["我哭死", 1],
+				["人呢", 2],
+				["有点意思", 4],
+				["妙啊", 4],
+				["这波啊", 11],
+				["懂了", 6],
+				["破防了", 65],
+				["蚌埠住了", 92],
+				["草", 100],
+				["针不戳", 68],
+				["yyds", 50],
+				["DNA动了", 58],
+				["猝不及防", 40],
+				["建议加精", 15],
+				["保护", 22],
+				["害怕", 18],
+				["就这？", 99],
+				["2333", 20],
+				["公开处刑", 35],
+				["血压上来了", 45],
+				["整不会了", 32],
+				["见证历史", 88],
+				["下次一定", 65],
+				["奥利给", 56],
+				["求更新", 18],
+				["真实", 20],
+				["好活当赏", 25],
+				["泪，冲了出来", 68],
+				["刻进DNA", 70],
+				["我直接好家伙", 55],
+				["夺笋啊", 40],
+				["歪歪滴艾斯", 1],
+				["典中典", 5],
+				["麻中麻", 3],
+				["绷不住了", 8],
+				["逆天", 95],
+				["寄", 65],
+				["孝", 20],
+				["乐", 101],
+				["急急急", 3],
+				["典", 5]
 			];
 			await session.send(/* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: koishi.h.image(await this.ctx.gi.generateWordCloudImg(words, "词云测试"), "image/jpg") }));
 		});
@@ -1436,12 +1296,12 @@ var ComRegister = class {
 		const liveMsgObj = this.liveMsgManager.get(uid);
 		const sendDanmakuWordCloud = async () => {
 			this.logger.info("开始制作弹幕词云");
-			this.logger.info("正在获取前150热词");
-			const top150Words = Object.entries(danmakuWeightRecord).sort((a$1, b$2) => b$2[1] - a$1[1]).slice(0, 150);
-			this.logger.info("弹幕词云前150词及权重：");
-			this.logger.info(top150Words);
+			this.logger.info("正在获取前50热词");
+			const top50Words = Object.entries(danmakuWeightRecord).sort((a$1, b$2) => b$2[1] - a$1[1]).slice(0, 50);
+			this.logger.info("弹幕词云前50词及权重：");
+			this.logger.info(top50Words);
 			this.logger.info("正在准备生成弹幕词云");
-			const buffer = await this.ctx.gi.generateWordCloudImg(top150Words, masterInfo.username);
+			const buffer = await this.ctx.gi.generateWordCloudImg(top50Words, masterInfo.username);
 			this.logger.info("弹幕词云生成完成，正在准备发送词云图片");
 			await this.broadcastToTargets(uid, koishi.h.image(buffer, "image/jpeg"), PushType.Live);
 		};
@@ -84385,6 +84245,7 @@ var require_tar_fs = __commonJS$1({ "node_modules/tar-fs/index.js"(exports) {
 		const now = /* @__PURE__ */ new Date();
 		const umask = typeof opts.umask === "number" ? ~opts.umask : ~processUmask();
 		const strict = opts.strict !== false;
+		const validateSymLinks = opts.validateSymlinks !== false;
 		let map = opts.map || noop;
 		let dmode = typeof opts.dmode === "number" ? opts.dmode : 0;
 		let fmode = typeof opts.fmode === "number" ? opts.fmode : 0;
@@ -84452,7 +84313,7 @@ var require_tar_fs = __commonJS$1({ "node_modules/tar-fs/index.js"(exports) {
 				if (win32$1) return next();
 				xfs.unlink(name$3, function() {
 					const dst = path$4.resolve(path$4.dirname(name$3), header.linkname);
-					if (!inCwd(dst)) return next(/* @__PURE__ */ new Error(name$3 + " is not a valid symlink"));
+					if (!inCwd(dst) && validateSymLinks) return next(/* @__PURE__ */ new Error(name$3 + " is not a valid symlink"));
 					xfs.symlink(header.linkname, name$3, stat);
 				});
 			}
@@ -94533,6 +94394,7 @@ var GenerateImg = class extends koishi.Service {
 	async generateWordCloudImg(words, masterName) {
 		const fontURL = (0, node_url.pathToFileURL)((0, node_path.resolve)(__dirname, "font/HYZhengYuan-75W.ttf"));
 		const wordcloudJS = (0, node_url.pathToFileURL)((0, node_path.resolve)(__dirname, "static/wordcloud2.min.js"));
+		const renderFunc = (0, node_url.pathToFileURL)((0, node_path.resolve)(__dirname, "static/render.js"));
 		const html = `
         <!DOCTYPE html>
         <html lang="zh-CN">
@@ -94540,7 +94402,6 @@ var GenerateImg = class extends koishi.Service {
         <head>
             <meta charset="UTF-8">
             <title>高清词云展示</title>
-            <link href="https://fonts.googleapis.com/css2?family=Quicksand:wght@500&display=swap" rel="stylesheet">
             <style>
                 @font-face {
                     font-family: "Custom Font";
@@ -94606,6 +94467,7 @@ var GenerateImg = class extends koishi.Service {
             </div>
 
             <script src="${wordcloudJS}"></script>
+            <script src="${renderFunc}"></script>
             <script>
                 const canvas = document.getElementById('wordCloudCanvas');
                 const ctx = canvas.getContext('2d');
@@ -94623,38 +94485,11 @@ var GenerateImg = class extends koishi.Service {
 
                 const words = ${JSON.stringify(words)}
 
-                // 词云大小缩放
-                const maxWeight = Math.max(...words.map(w => w[1]));
-                const minWeight = Math.min(...words.map(w => w[1]));
-
-                // 设置最大字体大小、最小字体大小（以像素为单位）
-                const maxFontSize = 80;
-                const minFontSize = 14;
-
-                // 用映射函数代替 weightFactor
-                function getWeightFactor(size) {
-                    if (maxWeight === minWeight) return maxFontSize; // 防止除0
-                    const ratio = (size - minWeight) / (maxWeight - minWeight);
-                    return minFontSize + (maxFontSize - minFontSize) * Math.pow(ratio, 0.85);
-                }
-
-                WordCloud(canvas, {
-                    list: words,
-                    gridSize: Math.max(4, Math.round(5 * (cssWidth / 1024))),
-                    weightFactor: getWeightFactor,
-                    fontFamily: 'Quicksand, sans-serif',
-                    color: () => {
-                        const colors = ['#007CF0', '#00DFD8', '#7928CA', '#FF0080', '#FF4D4D', '#F9CB28'];
-                        return colors[Math.floor(Math.random() * colors.length)];
-                    },
-                    rotateRatio: 0.5,
-                    rotationSteps: 2,
-                    backgroundColor: 'transparent',
-                    drawOutOfBound: false,
-                    origin: [cssWidth / 2, cssHeight / 2], // 居中关键点
-                    // 明确告诉 wordcloud2 使用这个宽高（以 CSS 尺寸为准）
-                    width: cssWidth,
-                    height: cssHeight,
+                renderAutoFitWordCloud(canvas, words, {
+                    maxFontSize: 40,
+                    minFontSize: 12,
+                    densityTarget: 0.3,
+                    weightExponent: 0.5
                 });
             </script>
         </body>

package/lib/index.mjs

@@ -801,196 +801,56 @@ var ComRegister = class {
 		});
 		biliCom.subcommand(".wc").action(async ({ session }) => {
 			const words = [
-				["kq8z1", 57],
-				["v2n3a", 142],
-				["b7x9p", 13],
-				["w4m2s", 199],
-				["t1j6u", 85],
-				["z8c5l", 120],
-				["h3r7y", 34],
-				["n6d2q", 178],
-				["p9s4e", 66],
-				["f2g8b", 101],
-				["m5v1k", 12],
-				["x7a3w", 154],
-				["c4t9z", 47],
-				["u1b6n", 193],
-				["e8y2h", 23],
-				["j3l7p", 88],
-				["s6q4d", 132],
-				["g9m5x", 59],
-				["a2w8c", 175],
-				["l5h1v", 99],
-				["y7k3t", 41],
-				["d4z9u", 186],
-				["q1e6j", 27],
-				["r8p2s", 112],
-				["b3n7f", 73],
-				["v6x4m", 160],
-				["t9c5w", 53],
-				["z2u8h", 141],
-				["h5y1j", 36],
-				["n7l3s", 190],
-				["p4d9g", 18],
-				["f1b6a", 124],
-				["m8v2x", 62],
-				["x3a7c", 157],
-				["c6t4u", 44],
-				["u9b5e", 183],
-				["e2y8k", 29],
-				["j1l6q", 91],
-				["s8g3m", 138],
-				["g5w1t", 55],
-				["a7z4h", 172],
-				["l2h8p", 97],
-				["y5k1n", 39],
-				["d7u3f", 188],
-				["q4e9v", 21],
-				["r1p6x", 117],
-				["b8n5c", 70],
-				["v3x7w", 163],
-				["t6c4a", 49],
-				["z9u2j", 146],
-				["k1q8z", 102],
-				["v7n2a", 31],
-				["b4x9p", 176],
-				["w2m5s", 61],
-				["t8j3u", 150],
-				["z5c7l", 84],
-				["h2r8y", 196],
-				["n9d1q", 44],
-				["p6s3e", 123],
-				["f8g2b", 17],
-				["m1v7k", 109],
-				["x4a9w", 72],
-				["c7t2z", 180],
-				["u5b8n", 38],
-				["e1y3h", 134],
-				["j8l6p", 56],
-				["s2q9d", 191],
-				["g7m4x", 25],
-				["a5w8c", 113],
-				["l9h2v", 68],
-				["y1k7t", 159],
-				["d8z3u", 45],
-				["q2e6j", 177],
-				["r7p1s", 80],
-				["b5n9f", 126],
-				["v1x4m", 32],
-				["t7c8w", 198],
-				["z4u2h", 54],
-				["h9y5j", 143],
-				["n2l7s", 19],
-				["p8d1g", 104],
-				["f5b3a", 67],
-				["m2v9x", 171],
-				["x8a4c", 40],
-				["c1t7u", 187],
-				["u4b2e", 28],
-				["e9y6k", 135],
-				["j2l8q", 60],
-				["s7g1m", 119],
-				["g4w5t", 76],
-				["a9z2h", 164],
-				["l1h7p", 35],
-				["y8k3n", 185],
-				["d2u9f", 22],
-				["q7e4v", 110],
-				["r5p8x", 69],
-				["b1n6c", 152],
-				["v8x2w", 48],
-				["t4c7a", 142],
-				["z7u1j", 99],
-				["k2q5z", 174],
-				["v9n8a", 37],
-				["b6x3p", 189],
-				["w1m7s", 24],
-				["t5j2u", 115],
-				["z1c8l", 63],
-				["h6r4y", 155],
-				["n3d9q", 50],
-				["p7s2e", 137],
-				["f9g1b", 81],
-				["m4v6k", 170],
-				["x1a8w", 42],
-				["c8t3z", 194],
-				["u2b7n", 26],
-				["e5y9h", 130],
-				["j9l1p", 58],
-				["s4q6d", 182],
-				["g1m8x", 33],
-				["a8w5c", 108],
-				["l3h9v", 75],
-				["y2k4t", 161],
-				["d9z1u", 46],
-				["q5e8j", 149],
-				["r2p7s", 20],
-				["b9n3f", 122],
-				["v4x6m", 65],
-				["t1c9w", 179],
-				["z8u5h", 30],
-				["h3y2j", 136],
-				["n5l8s", 52],
-				["p1d4g", 167],
-				["f6b9a", 95],
-				["m3v2x", 156],
-				["x9a5c", 43],
-				["c2t8u", 192],
-				["u7b1e", 16],
-				["e4y6k", 129],
-				["j5l3q", 78],
-				["s1g9m", 118],
-				["g8w2t", 71],
-				["a3z7h", 173],
-				["l6h1p", 36],
-				["y9k5n", 184],
-				["d1u8f", 15],
-				["q8e3v", 111],
-				["r4p6x", 64],
-				["b2n7c", 151],
-				["v5x1w", 47],
-				["t8c4a", 140],
-				["z3u9j", 98],
-				["k7q2z", 176],
-				["v1n5a", 55],
-				["b8x6p", 195],
-				["w3m1s", 14],
-				["t6j9u", 116],
-				["z2c5l", 61],
-				["h7r3y", 153],
-				["n4d8q", 51],
-				["p2s7e", 139],
-				["f7g5b", 82],
-				["m9v1k", 169],
-				["x5a3w", 38],
-				["c9t6z", 197],
-				["u3b8n", 17],
-				["e6y2h", 131],
-				["j7l5p", 59],
-				["s3q8d", 181],
-				["g2m4x", 34],
-				["a6w9c", 107],
-				["l8h2v", 74],
-				["y4k7t", 162],
-				["d6z5u", 49],
-				["q3e1j", 148],
-				["r9p2s", 21],
-				["b4n8f", 121],
-				["v7x5m", 68],
-				["t2c1w", 178],
-				["z5u3h", 31],
-				["h8y6j", 133],
-				["n1l4s", 57],
-				["p5d7g", 166],
-				["f3b2a", 96],
-				["m6v8x", 158],
-				["x2a9c", 45],
-				["c5t1u", 191],
-				["u8b4e", 19],
-				["e3y7k", 128],
-				["j6l2q", 79],
-				["s9g5m", 114],
-				["g5w3t", 73]
+				["弹幕护体", 77],
+				["笑死", 30],
+				["泪目", 45],
+				["加油", 70],
+				["？？？", 80],
+				["我可以", 66],
+				["无语", 55],
+				["梦开始的地方", 1],
+				["太真实了", 8],
+				["我哭死", 1],
+				["人呢", 2],
+				["有点意思", 4],
+				["妙啊", 4],
+				["这波啊", 11],
+				["懂了", 6],
+				["破防了", 65],
+				["蚌埠住了", 92],
+				["草", 100],
+				["针不戳", 68],
+				["yyds", 50],
+				["DNA动了", 58],
+				["猝不及防", 40],
+				["建议加精", 15],
+				["保护", 22],
+				["害怕", 18],
+				["就这？", 99],
+				["2333", 20],
+				["公开处刑", 35],
+				["血压上来了", 45],
+				["整不会了", 32],
+				["见证历史", 88],
+				["下次一定", 65],
+				["奥利给", 56],
+				["求更新", 18],
+				["真实", 20],
+				["好活当赏", 25],
+				["泪，冲了出来", 68],
+				["刻进DNA", 70],
+				["我直接好家伙", 55],
+				["夺笋啊", 40],
+				["歪歪滴艾斯", 1],
+				["典中典", 5],
+				["麻中麻", 3],
+				["绷不住了", 8],
+				["逆天", 95],
+				["寄", 65],
+				["孝", 20],
+				["乐", 101],
+				["急急急", 3],
+				["典", 5]
 			];
 			await session.send(/* @__PURE__ */ jsx("message", { children: h.image(await this.ctx.gi.generateWordCloudImg(words, "词云测试"), "image/jpg") }));
 		});
@@ -1438,12 +1298,12 @@ var ComRegister = class {
 		const liveMsgObj = this.liveMsgManager.get(uid);
 		const sendDanmakuWordCloud = async () => {
 			this.logger.info("开始制作弹幕词云");
-			this.logger.info("正在获取前150热词");
-			const top150Words = Object.entries(danmakuWeightRecord).sort((a$1, b$2) => b$2[1] - a$1[1]).slice(0, 150);
-			this.logger.info("弹幕词云前150词及权重：");
-			this.logger.info(top150Words);
+			this.logger.info("正在获取前50热词");
+			const top50Words = Object.entries(danmakuWeightRecord).sort((a$1, b$2) => b$2[1] - a$1[1]).slice(0, 50);
+			this.logger.info("弹幕词云前50词及权重：");
+			this.logger.info(top50Words);
 			this.logger.info("正在准备生成弹幕词云");
-			const buffer = await this.ctx.gi.generateWordCloudImg(top150Words, masterInfo.username);
+			const buffer = await this.ctx.gi.generateWordCloudImg(top50Words, masterInfo.username);
 			this.logger.info("弹幕词云生成完成，正在准备发送词云图片");
 			await this.broadcastToTargets(uid, h.image(buffer, "image/jpeg"), PushType.Live);
 		};
@@ -84387,6 +84247,7 @@ var require_tar_fs = __commonJS$1({ "node_modules/tar-fs/index.js"(exports) {
 		const now = /* @__PURE__ */ new Date();
 		const umask = typeof opts.umask === "number" ? ~opts.umask : ~processUmask();
 		const strict = opts.strict !== false;
+		const validateSymLinks = opts.validateSymlinks !== false;
 		let map = opts.map || noop;
 		let dmode = typeof opts.dmode === "number" ? opts.dmode : 0;
 		let fmode = typeof opts.fmode === "number" ? opts.fmode : 0;
@@ -84454,7 +84315,7 @@ var require_tar_fs = __commonJS$1({ "node_modules/tar-fs/index.js"(exports) {
 				if (win32$1) return next();
 				xfs.unlink(name$3, function() {
 					const dst = path$3.resolve(path$3.dirname(name$3), header.linkname);
-					if (!inCwd(dst)) return next(/* @__PURE__ */ new Error(name$3 + " is not a valid symlink"));
+					if (!inCwd(dst) && validateSymLinks) return next(/* @__PURE__ */ new Error(name$3 + " is not a valid symlink"));
 					xfs.symlink(header.linkname, name$3, stat);
 				});
 			}
@@ -94535,6 +94396,7 @@ var GenerateImg = class extends Service {
 	async generateWordCloudImg(words, masterName) {
 		const fontURL = pathToFileURL(resolve$1(__dirname, "font/HYZhengYuan-75W.ttf"));
 		const wordcloudJS = pathToFileURL(resolve$1(__dirname, "static/wordcloud2.min.js"));
+		const renderFunc = pathToFileURL(resolve$1(__dirname, "static/render.js"));
 		const html = `
         <!DOCTYPE html>
         <html lang="zh-CN">
@@ -94542,7 +94404,6 @@ var GenerateImg = class extends Service {
         <head>
             <meta charset="UTF-8">
             <title>高清词云展示</title>
-            <link href="https://fonts.googleapis.com/css2?family=Quicksand:wght@500&display=swap" rel="stylesheet">
             <style>
                 @font-face {
                     font-family: "Custom Font";
@@ -94608,6 +94469,7 @@ var GenerateImg = class extends Service {
             </div>
 
             <script src="${wordcloudJS}"></script>
+            <script src="${renderFunc}"></script>
             <script>
                 const canvas = document.getElementById('wordCloudCanvas');
                 const ctx = canvas.getContext('2d');
@@ -94625,38 +94487,11 @@ var GenerateImg = class extends Service {
 
                 const words = ${JSON.stringify(words)}
 
-                // 词云大小缩放
-                const maxWeight = Math.max(...words.map(w => w[1]));
-                const minWeight = Math.min(...words.map(w => w[1]));
-
-                // 设置最大字体大小、最小字体大小（以像素为单位）
-                const maxFontSize = 80;
-                const minFontSize = 14;
-
-                // 用映射函数代替 weightFactor
-                function getWeightFactor(size) {
-                    if (maxWeight === minWeight) return maxFontSize; // 防止除0
-                    const ratio = (size - minWeight) / (maxWeight - minWeight);
-                    return minFontSize + (maxFontSize - minFontSize) * Math.pow(ratio, 0.85);
-                }
-
-                WordCloud(canvas, {
-                    list: words,
-                    gridSize: Math.max(4, Math.round(5 * (cssWidth / 1024))),
-                    weightFactor: getWeightFactor,
-                    fontFamily: 'Quicksand, sans-serif',
-                    color: () => {
-                        const colors = ['#007CF0', '#00DFD8', '#7928CA', '#FF0080', '#FF4D4D', '#F9CB28'];
-                        return colors[Math.floor(Math.random() * colors.length)];
-                    },
-                    rotateRatio: 0.5,
-                    rotationSteps: 2,
-                    backgroundColor: 'transparent',
-                    drawOutOfBound: false,
-                    origin: [cssWidth / 2, cssHeight / 2], // 居中关键点
-                    // 明确告诉 wordcloud2 使用这个宽高（以 CSS 尺寸为准）
-                    width: cssWidth,
-                    height: cssHeight,
+                renderAutoFitWordCloud(canvas, words, {
+                    maxFontSize: 40,
+                    minFontSize: 12,
+                    densityTarget: 0.3,
+                    weightExponent: 0.5
                 });
             </script>
         </body>

package/lib/static/render.js

@@ -0,0 +1,107 @@
+/**
+ * 自动适配的词云渲染函数，直到填满画布
+ * @param {HTMLCanvasElement} canvas - canvas 元素
+ * @param {Array<[string, number]>} words - 词数组 [['哈哈', 20], ['666', 10]]
+ * @param {Object} options - 选项
+ */
+function renderAutoFitWordCloud(canvas, words, options = {}) {
+    const ctx = canvas.getContext("2d");
+    const style = getComputedStyle(canvas);
+    const cssWidth = parseInt(style.width);
+    const cssHeight = parseInt(style.height);
+    const ratio = window.devicePixelRatio || 1;
+
+    // 设置高清分辨率
+    canvas.width = cssWidth * ratio;
+    canvas.height = cssHeight * ratio;
+    ctx.scale(ratio, ratio);
+
+    const {
+        fontFamily = 'sans-serif',
+        maxFontSize = 72,
+        minFontSize = 12,
+        densityTarget = 0.25,
+        weightExponent = 0.5,
+        rotationSteps = 2,
+        rotateRatio = 0.4,
+        color = () => ['#007CF0', '#00DFD8', '#7928CA', '#FF0080', '#FF4D4D', '#F9CB28'][Math.floor(Math.random() * 6)],
+        backgroundColor = 'transparent'
+    } = options;
+
+    const weightFactor = createDynamicWeightFactor(words, cssWidth, cssHeight, {
+        maxFontSize,
+        minFontSize,
+        densityTarget,
+        weightExponent
+    });
+
+    WordCloud(canvas, {
+        list: words,
+        gridSize: Math.max(2, Math.floor(cssWidth / 100)), // 自动调整 gridSize
+        weightFactor,
+        fontFamily,
+        color,
+        rotateRatio,
+        rotationSteps,
+        backgroundColor,
+        drawOutOfBound: false,
+        origin: [cssWidth / 2, cssHeight / 2],
+        width: cssWidth,
+        height: cssHeight,
+    });
+}
+
+/* function createDynamicWeightFactor(words, width, height, {
+    maxFontSize = 72,
+    minFontSize = 12,
+    densityTarget = 0.25
+} = {}) {
+    const weights = words.map(w => w[1]);
+    const maxWeight = Math.max(...weights);
+    const minWeight = Math.min(...weights);
+    const range = maxWeight - minWeight || 1;
+
+    // 移除基于词数的自动缩放
+    const realMax = maxFontSize;
+    const realMin = minFontSize;
+
+    // 改为基于画布面积的密度控制
+    const areaPerWord = (width * height * densityTarget) / words.length;
+    const sizeScale = Math.min(1, Math.sqrt(areaPerWord / 500)); // 500是可调基准值
+
+    return function weightFactor(weight) {
+        const norm = (weight - minWeight) / range;
+        // 应用三次方曲线让大小差异更明显
+        const sizeRatio = Math.pow(norm, 0.33); 
+        return realMin + (realMax - realMin) * sizeRatio * sizeScale;
+    };
+} */
+
+function createDynamicWeightFactor(words, width, height, {
+    maxFontSize = 72,
+    minFontSize = 12,
+    densityTarget = 0.25,
+    weightExponent = 0.5 // 新增权重指数参数
+} = {}) {
+    const weights = words.map(w => w[1]);
+    const maxWeight = Math.max(...weights);
+    const minWeight = Math.min(...weights);
+    const range = Math.max(1, maxWeight - minWeight); // 确保不为0
+
+    // 计算权重转换曲线
+    const weightCurve = (weight) => {
+        const normalized = (weight - minWeight) / range;
+        // 使用指数曲线放大差异
+        return Math.pow(normalized, weightExponent);
+    };
+
+    // 计算动态缩放比例（基于画布面积和词数）
+    const areaScale = Math.sqrt((width * height * densityTarget) / words.length) / 20;
+    const sizeScale = Math.min(1, Math.max(0.3, areaScale)); // 限制在0.3-1之间
+
+    return function (weight) {
+        const curveValue = weightCurve(weight);
+        // 应用非线性放大
+        return minFontSize + (maxFontSize - minFontSize) * curveValue * sizeScale;
+    };
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.2.9-rc.0",
+  "version": "3.2.9-rc.1",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],

package/readme.md

@@ -306,6 +306,7 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 > - ver 3.2.9-alpha.3 修复：词云生成空白
 > - ver 3.2.9-alpha.4 修复：弹幕词云bug `Error: 生成图片失败！错误: TimeoutError: Navigation timeout of 30000 ms exceeded`
 > - ver 3.2.9-rc.0 优化：弹幕词云生成效果、选项 `pushTime` 设置为0时可关闭该功能； 新增：选项 `wordcloud` 可选择在直播结束后是否生成弹幕词云
+> - ver 3.2.9-rc.1 优化：弹幕词云生成效果；
 
 ## 交流群