koishi-plugin-csss 1.0.1 → 1.1.1

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2026 Tang
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2026 Tang
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/lib/index.d.ts

@@ -20,6 +20,9 @@ export interface Config {
     scheduleEndTime: string;
     scheduleGroups: string[];
     scheduleUseImage: boolean;
+    qqAdapterName: string;
+    useFullChannelId: boolean;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;
+export declare const inject: string[];

package/lib/index.js

@@ -1,8 +1,6 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -32,11 +22,11 @@ var src_exports = {};
 __export(src_exports, {
   Config: () => Config,
   apply: () => apply,
+  inject: () => inject,
   name: () => name
 });
 module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
-var import_canvas = require("canvas");
 var name = "cs-server-status";
 var Config = import_koishi.Schema.object({
   timeout: import_koishi.Schema.number().min(1e3).max(3e4).default(5e3).description("查询超时时间(毫秒)"),
@@ -57,14 +47,41 @@ var Config = import_koishi.Schema.object({
     "edgebug.cn:27018"
   ]),
   batchTimeout: import_koishi.Schema.number().min(1e3).max(6e4).default(15e3).description("批量查询总超时时间(毫秒)"),
-  // 新增定时任务配置
+  // 定时任务配置
   scheduleEnabled: import_koishi.Schema.boolean().default(false).description("是否启用定时自动查询功能"),
   scheduleInterval: import_koishi.Schema.number().min(1).max(1440).default(5).description("定时查询间隔时间(分钟)"),
   scheduleStartTime: import_koishi.Schema.string().pattern(/^([01]?[0-9]|2[0-3]):[0-5][0-9]$/).default("08:00").description("定时任务开始时间(24小时制，格式: HH:MM)"),
   scheduleEndTime: import_koishi.Schema.string().pattern(/^([01]?[0-9]|2[0-3]):[0-5][0-9]$/).default("23:00").description("定时任务结束时间(24小时制，格式: HH:MM)"),
   scheduleGroups: import_koishi.Schema.array(import_koishi.Schema.string()).role("table").description("定时发送的群组ID列表（每行一个群组ID）").default([]),
-  scheduleUseImage: import_koishi.Schema.boolean().default(true).description("定时任务是否使用图片格式输出")
+  scheduleUseImage: import_koishi.Schema.boolean().default(true).description("定时任务是否使用图片格式输出"),
+  // QQ适配器配置
+  qqAdapterName: import_koishi.Schema.string().default("qq").description('QQ适配器名称（默认为"qq"，如果在QQ配置中指定了其他名称请修改）'),
+  useFullChannelId: import_koishi.Schema.boolean().default(true).description("是否使用完整的频道ID格式（推荐开启）")
 });
+var COLORS = {
+  background: "rgba(28,28,31,0.80)",
+  text: "rgb(113, 113, 122)",
+  textLight: "#aaaaaa",
+  textLighter: "#dddddd",
+  textWhite: "#ffffff",
+  border: "#2e2e33",
+  accent: "#fbbf24",
+  success: "#4CAF50",
+  warning: "#FFC107",
+  error: "#c03f36",
+  pingGreen: "#4CAF50",
+  pingYellow: "#FFC107",
+  pingOrange: "#FF9800",
+  pingRed: "#c03f36",
+  playerOnline: "#4CAF50",
+  playerOffline: "#c03f36",
+  title: "#71717a",
+  highlight: "#fbbf24",
+  divider: "#555555",
+  timestamp: "#666666",
+  gold: "#FFD700",
+  playerName: "rgb(252, 248, 222)"
+};
 var utils = {
   formatPing(ping) {
     if (!ping || ping < 0) return "未知";
@@ -80,37 +97,111 @@ var utils = {
     return text.length > maxLength ? text.substring(0, maxLength) + "..." : text;
   },
   getPingColor(ping) {
-    if (ping < 50) return "#4CAF50";
-    if (ping < 100) return "#FFC107";
-    if (ping < 200) return "#FF9800";
-    return "#c03f36";
+    if (ping < 50) return COLORS.pingGreen;
+    if (ping < 100) return COLORS.pingYellow;
+    if (ping < 200) return COLORS.pingOrange;
+    return COLORS.pingRed;
   },
   getPlayerColor(count) {
-    return count > 0 ? "#4CAF50" : "#c03f36";
+    return count > 0 ? COLORS.playerOnline : COLORS.playerOffline;
   },
-  // 新增：格式化时间
   formatTime(ms) {
     if (ms < 1e3) return `${ms}ms`;
     if (ms < 6e4) return `${(ms / 1e3).toFixed(1)}秒`;
     return `${(ms / 1e3).toFixed(0)}秒`;
   },
-  // 新增：解析时间字符串为分钟数
   parseTimeToMinutes(timeStr) {
     const [hours, minutes] = timeStr.split(":").map(Number);
     return hours * 60 + minutes;
   },
-  // 新增：检查当前时间是否在定时任务时间范围内
   isWithinScheduleTime(startTime, endTime) {
     const now = /* @__PURE__ */ new Date();
     const currentMinutes = now.getHours() * 60 + now.getMinutes();
     const startMinutes = this.parseTimeToMinutes(startTime);
     const endMinutes = this.parseTimeToMinutes(endTime);
     return currentMinutes >= startMinutes && currentMinutes <= endMinutes;
+  },
+  formatGroupId(groupId, adapterName, useFullChannelId) {
+    if (useFullChannelId) {
+      return `${adapterName}:${groupId}`;
+    }
+    return groupId;
   }
 };
 function apply(ctx, config) {
   const cache = /* @__PURE__ */ new Map();
   let scheduleTimer = null;
+  if (!ctx.gamedig) {
+    console.error("koishi-plugin-gamedig 未安装或未启用");
+    return ctx.logger("cs-server-status").error("需要安装并启用 koishi-plugin-gamedig 插件");
+  }
+  if (!ctx.canvas) {
+    console.error("koishi-plugin-canvas 未安装或未启用");
+    return ctx.logger("cs-server-status").error("需要安装并启用 koishi-plugin-canvas 插件");
+  }
+  async function queryServers(serversToQuery) {
+    const startTime = Date.now();
+    const results = await Promise.allSettled(
+      serversToQuery.map(async (server, index) => {
+        try {
+          const { host, port } = parseAddress(server);
+          const data = await queryServer(host, port);
+          return {
+            index: index + 1,
+            server,
+            success: true,
+            data
+          };
+        } catch (error) {
+          return {
+            index: index + 1,
+            server,
+            success: false,
+            error: error.message
+          };
+        }
+      })
+    );
+    const endTime = Date.now();
+    const queryTime = endTime - startTime;
+    return { results, queryTime, serversToQuery };
+  }
+  __name(queryServers, "queryServers");
+  function generateTextTable(results, serversToQuery, queryTime, title = "批量查询结果") {
+    const successful = results.filter((r) => r.status === "fulfilled" && r.value.success).length;
+    const failed = results.length - successful;
+    let message = `📊 ${title} (${utils.formatTime(queryTime)})
+`;
+    message += `✅ 成功: ${successful} 个 | ❌ 失败: ${failed} 个
+
+`;
+    message += "序号 服务器名称    在线人数\n";
+    message += "──────────────────────────────\n";
+    results.forEach((result, index) => {
+      const serverInfo = serversToQuery[index];
+      if (result.status === "fulfilled") {
+        const { success, data, error } = result.value;
+        if (success && data) {
+          const { result: serverData } = data;
+          const serverName = serverData.name ? utils.cleanName(serverData.name) : "未知";
+          const playerCount = serverData.players?.length || 0;
+          const maxPlayers = serverData.maxplayers || 0;
+          const truncatedName = utils.truncateText(serverName, 20);
+          const paddedName = truncatedName.padEnd(20, " ");
+          message += `${(index + 1).toString().padStart(2, " ")}  ${paddedName} ${playerCount}/${maxPlayers}
+`;
+        } else {
+          message += `${(index + 1).toString().padStart(2, " ")}  ${serverInfo} ❌ 查询失败: ${error}
+`;
+        }
+      } else {
+        message += `${(index + 1).toString().padStart(2, " ")}  ${serverInfo} ❌ 查询失败
+`;
+      }
+    });
+    return message;
+  }
+  __name(generateTextTable, "generateTextTable");
   async function executeScheduleTask() {
     if (!config.scheduleEnabled || config.scheduleGroups.length === 0 || config.serverList.length === 0) {
       return;
@@ -119,36 +210,13 @@ function apply(ctx, config) {
       return;
     }
     try {
-      const startTime = Date.now();
-      const results = await Promise.allSettled(
-        config.serverList.map(async (server, index) => {
-          try {
-            const { host, port } = parseAddress(server);
-            const data = await queryServer(host, port);
-            return {
-              index: index + 1,
-              server,
-              success: true,
-              data
-            };
-          } catch (error) {
-            return {
-              index: index + 1,
-              server,
-              success: false,
-              error: error.message
-            };
-          }
-        })
-      );
-      const endTime = Date.now();
-      const queryTime = endTime - startTime;
+      const { results, queryTime, serversToQuery } = await queryServers(config.serverList);
       const now = /* @__PURE__ */ new Date();
       const timeStr = now.toLocaleString("zh-CN");
       let outputContent;
       if (config.scheduleUseImage) {
         try {
-          const imageBuffer = await generateBatchImage(results, config.serverList, queryTime);
+          const imageBuffer = await generateBatchImage(results, serversToQuery, queryTime);
           outputContent = import_koishi.h.image(imageBuffer, "image/png");
         } catch (imageError) {
           console.error("定时任务生成图片失败:", imageError);
@@ -159,42 +227,16 @@ function apply(ctx, config) {
         }
       }
       if (typeof outputContent === "string" || !config.scheduleUseImage) {
-        const successful = results.filter((r) => r.status === "fulfilled" && r.value.success).length;
-        const failed = results.length - successful;
-        let textMessage = `🕒 ${timeStr} 服务器状态更新 (耗时: ${utils.formatTime(queryTime)})
-`;
-        textMessage += `✅ 成功: ${successful} 个 | ❌ 失败: ${failed} 个
+        const textMessage = generateTextTable(results, serversToQuery, queryTime, "服务器状态更新");
+        outputContent = `🕒 ${timeStr}
 
-`;
-        textMessage += "序号 服务器名称    在线人数\n";
-        textMessage += "──────────────────────────────\n";
-        results.forEach((result, index) => {
-          const serverInfo = config.serverList[index];
-          if (result.status === "fulfilled") {
-            const { success, data, error } = result.value;
-            if (success && data) {
-              const { result: serverData } = data;
-              const serverName = serverData.name ? utils.cleanName(serverData.name) : "未知";
-              const playerCount = serverData.players?.length || 0;
-              const maxPlayers = serverData.maxplayers || 0;
-              const truncatedName = utils.truncateText(serverName, 20);
-              const paddedName = truncatedName.padEnd(20, " ");
-              textMessage += `${(index + 1).toString().padStart(2, " ")}  ${paddedName} ${playerCount}/${maxPlayers}
-`;
-            } else {
-              textMessage += `${(index + 1).toString().padStart(2, " ")}  ${serverInfo} ❌ 查询失败: ${error}
-`;
-            }
-          } else {
-            textMessage += `${(index + 1).toString().padStart(2, " ")}  ${serverInfo} ❌ 查询失败
-`;
-          }
-        });
-        outputContent = typeof outputContent === "string" ? outputContent + textMessage : textMessage;
+${textMessage}`;
       }
       for (const groupId of config.scheduleGroups) {
         try {
-          await ctx.broadcast([`onebot:${groupId}`], outputContent);
+          const formattedGroupId = utils.formatGroupId(groupId, config.qqAdapterName, config.useFullChannelId);
+          await ctx.broadcast([formattedGroupId], outputContent);
+          console.log(`定时任务消息已发送到群组: ${formattedGroupId}`);
         } catch (error) {
           console.error(`定时任务发送消息到群组 ${groupId} 失败:`, error);
         }
@@ -231,16 +273,6 @@ function apply(ctx, config) {
       stopScheduleTask();
     }
   });
-  async function loadGamedig() {
-    try {
-      const gamedigModule = await import("gamedig");
-      return gamedigModule.default || gamedigModule.GameDig || gamedigModule;
-    } catch (error) {
-      throw new Error(`无法加载 gamedig 模块：${error.message}
-请确保已安装 gamedig：npm install gamedig`);
-    }
-  }
-  __name(loadGamedig, "loadGamedig");
   function parseAddress(input) {
     let address = input.replace(/^(http|https|udp|tcp):\/\//, "");
     if (address.includes("[")) {
@@ -272,11 +304,10 @@ function apply(ctx, config) {
         return cached.data;
       }
     }
-    const Gamedig = await loadGamedig();
     let lastError;
     for (let i = 0; i <= config.retryCount; i++) {
       try {
-        const result = await Gamedig.query({
+        const result = await ctx.gamedig.query({
           type: "csgo",
           host,
           port,
@@ -357,20 +388,17 @@ function apply(ctx, config) {
         needTwoColumns: playerCount > 10
       };
     },
-    drawBackground(ctx2, width, height) {
-      const gradient = ctx2.createLinearGradient(0, 0, width, height);
-      gradient.addColorStop(0, "#1a1a2e");
-      gradient.addColorStop(1, "#16213e");
-      ctx2.fillStyle = gradient;
+    drawBackground(ctx2, width, height, color = COLORS.background) {
+      ctx2.fillStyle = color;
       ctx2.fillRect(0, 0, width, height);
     },
-    drawTitle(ctx2, text, x, y, fontSize, fontFamily, color = "#ffffff") {
+    drawTitle(ctx2, text, x, y, fontSize, fontFamily, color = COLORS.textWhite) {
       ctx2.fillStyle = color;
       ctx2.font = `bold ${fontSize}px ${fontFamily}`;
       ctx2.textAlign = "center";
       ctx2.fillText(text, x, y);
     },
-    drawDivider(ctx2, x1, y1, x2, y2, color, width = 2) {
+    drawDivider(ctx2, x1, y1, x2, y2, color = COLORS.divider, width = 2) {
       ctx2.strokeStyle = color;
       ctx2.lineWidth = width;
       ctx2.beginPath();
@@ -380,7 +408,7 @@ function apply(ctx, config) {
     },
     drawText(ctx2, text, x, y, options = {}) {
       const {
-        color = "#cccccc",
+        color = COLORS.text,
         fontSize = config.fontSize,
         fontFamily = config.fontFamily,
         align = "left",
@@ -396,7 +424,7 @@ function apply(ctx, config) {
     drawPlayerList(ctx2, players, startY, width, maxHeight, params) {
       let y = startY;
       if (players.length === 0) {
-        this.drawText(ctx2, "服务器当前无在线玩家", 80, y, { italic: true, color: "#aaaaaa" });
+        this.drawText(ctx2, "服务器当前无在线玩家", 80, y, { color: COLORS.textLight });
         return { y: y + 35, displayedCount: 0 };
       }
       const sortedPlayers = [...players].sort((a, b) => {
@@ -417,7 +445,7 @@ function apply(ctx, config) {
           const name2 = utils.truncateText(utils.cleanName(player.name), params.nameMaxLength);
           this.drawText(ctx2, name2, leftColumnX, currentY, {
             fontSize: config.fontSize * params.fontSizeMultiplier,
-            color: "#dddddd"
+            color: COLORS.textLighter
           });
           currentY += params.rowHeight;
           displayedCount++;
@@ -427,7 +455,7 @@ function apply(ctx, config) {
           const name2 = utils.truncateText(utils.cleanName(player.name), params.nameMaxLength);
           this.drawText(ctx2, name2, rightColumnX, currentY, {
             fontSize: config.fontSize * params.fontSizeMultiplier,
-            color: "#dddddd"
+            color: COLORS.textLighter
           });
           currentY += params.rowHeight;
           displayedCount++;
@@ -437,7 +465,7 @@ function apply(ctx, config) {
         if (players.length > totalDisplayed) {
           this.drawText(ctx2, `... 还有 ${players.length - totalDisplayed} 位玩家未显示`, leftColumnX, y, {
             fontSize: config.fontSize * 0.8,
-            color: "#aaaaaa",
+            color: COLORS.textLight,
             italic: true
           });
           y += 30;
@@ -449,12 +477,29 @@ function apply(ctx, config) {
           const name2 = utils.truncateText(utils.cleanName(player.name), params.nameMaxLength);
           this.drawText(ctx2, name2, 80, y, {
             fontSize: config.fontSize * params.fontSizeMultiplier,
-            color: "#dddddd"
+            color: COLORS.textLighter
           });
           y += params.rowHeight;
         });
         return { y, displayedCount: displayPlayers.length };
       }
+    },
+    // 统一边框绘制函数
+    drawBorder(ctx2, width, height) {
+      this.drawDivider(ctx2, 1, 1, width - 1, 1, COLORS.border, 2);
+      this.drawDivider(ctx2, width - 1, 1, width - 1, height - 1, COLORS.border, 2);
+      this.drawDivider(ctx2, width - 1, height - 1, 1, height - 1, COLORS.border, 2);
+      this.drawDivider(ctx2, 1, height - 1, 1, 1, COLORS.border, 2);
+      this.drawDivider(ctx2, 5, 0.5 * height - 0.05 * height, 5, height - 0.5 * height + 0.05 * height, COLORS.border, 6);
+      this.drawDivider(ctx2, width - 5, 0.5 * height - 0.05 * height, width - 5, height - 0.5 * height + 0.05 * height, COLORS.border, 6);
+      this.drawDivider(ctx2, 2, 2, 0.025 * width, 2, COLORS.accent, 3);
+      this.drawDivider(ctx2, 2, 2, 2, 0.025 * width, COLORS.accent, 3);
+      this.drawDivider(ctx2, width - 2, 2, width - 2, 0.025 * width, COLORS.accent, 3);
+      this.drawDivider(ctx2, width - 2, 2, width - 0.025 * width, 2, COLORS.accent, 3);
+      this.drawDivider(ctx2, width - 2, height - 2, width - 2, height - 0.025 * width, COLORS.accent, 3);
+      this.drawDivider(ctx2, width - 2, height - 2, width - 0.025 * width, height - 2, COLORS.accent, 3);
+      this.drawDivider(ctx2, 2, height - 2, 0.025 * width, height - 2, COLORS.accent, 3);
+      this.drawDivider(ctx2, 2, height - 2, 2, height - 0.025 * width, COLORS.accent, 3);
     }
   };
   function calculateImageHeight(data) {
@@ -491,52 +536,49 @@ function apply(ctx, config) {
     const { result } = data;
     const width = config.imageWidth;
     const height = calculateImageHeight(data);
-    const canvas = (0, import_canvas.createCanvas)(width, height);
-    const ctx2 = canvas.getContext("2d");
-    imageUtils.drawBackground(ctx2, width, height);
+    const canvas = await ctx.canvas.createCanvas(width, height);
+    const ctx2d = canvas.getContext("2d");
+    imageUtils.drawBackground(ctx2d, width, height);
     const titleY = 80;
-    imageUtils.drawTitle(ctx2, "服务器状态", width / 2, titleY, config.fontSize * 2, config.fontFamily);
+    imageUtils.drawTitle(ctx2d, "[服务器状态查询]", width / 2, titleY, config.fontSize * 1.5, config.fontFamily, COLORS.title);
     if (result.name) {
       const cleanName = utils.cleanName(result.name);
-      const fontSize = imageUtils.calculateServerNameFontSize(ctx2, cleanName, width - 160, config.fontSize);
-      imageUtils.drawTitle(ctx2, cleanName, width / 2, titleY + 50, fontSize, config.fontFamily, "#FFD700");
+      const fontSize = imageUtils.calculateServerNameFontSize(ctx2d, cleanName, width - 160, config.fontSize);
+      imageUtils.drawTitle(ctx2d, cleanName, width / 2, titleY + 50, fontSize * 0.8, config.fontFamily, COLORS.highlight);
     }
-    imageUtils.drawDivider(ctx2, 80, titleY + 80, width - 80, titleY + 80, "#FFD700", 3);
+    imageUtils.drawDivider(ctx2d, 80, titleY + 80, width - 80, titleY + 80, COLORS.border, 2);
     let y = titleY + 120;
     if (result.map) {
-      imageUtils.drawText(ctx2, `地图: ${result.map}`, 80, y);
+      imageUtils.drawText(ctx2d, `地图: ${result.map}`, 80, y);
     }
-    imageUtils.drawText(ctx2, `IP: ${host}:${port}`, width - 80, y, { align: "right", color: "#bbbbbb" });
+    imageUtils.drawText(ctx2d, `IP: ${host}:${port}`, width - 80, y, { align: "right" });
     y += 40;
     const playerCount = result.players?.length || 0;
     const botCount = result.bots?.length || 0;
     const maxPlayers = result.maxplayers || 0;
     const playerText = `人数: ${playerCount}/${maxPlayers}${botCount > 0 ? ` (${botCount} Bot)` : ""}`;
-    imageUtils.drawText(ctx2, playerText, 80, y, { color: utils.getPlayerColor(playerCount) });
+    imageUtils.drawText(ctx2d, playerText, 80, y, { color: utils.getPlayerColor(playerCount) });
     if (result.ping) {
-      imageUtils.drawText(ctx2, `Ping: ${result.ping}ms`, width - 80, y, {
+      imageUtils.drawText(ctx2d, `Ping: ${result.ping}ms`, width - 80, y, {
         align: "right",
         color: utils.getPingColor(result.ping)
       });
     }
     y += 50;
     const playerParams = imageUtils.calculatePlayerListParams(playerCount);
-    imageUtils.drawText(ctx2, "在线玩家", 80, y, { color: "#ffffff", bold: true, fontSize: config.fontSize * 1.2 });
+    imageUtils.drawText(ctx2d, "在线玩家", 80, y, { color: COLORS.playerName, bold: true, fontSize: config.fontSize });
     y += 40;
-    imageUtils.drawDivider(ctx2, 80, y - 15, width - 80, y - 15, "#555555", 1.5);
+    imageUtils.drawDivider(ctx2d, 80, y - 15, width - 80, y - 15, COLORS.divider, 1.5);
     y += 25;
-    const playerListResult = imageUtils.drawPlayerList(ctx2, result.players || [], y, width, height, playerParams);
+    const playerListResult = imageUtils.drawPlayerList(ctx2d, result.players || [], y, width, height, playerParams);
     y = playerListResult.y;
     y += 30;
     const now = /* @__PURE__ */ new Date();
-    imageUtils.drawText(ctx2, `查询时间: ${now.toLocaleString("zh-CN")}`, 80, height - 20, {
+    imageUtils.drawText(ctx2d, `查询时间: ${now.toLocaleString("zh-CN")}`, 80, height - 20, {
       fontSize: config.fontSize * 0.8,
-      color: "#666666"
+      color: COLORS.timestamp
     });
-    imageUtils.drawDivider(ctx2, 8, 8, width - 8, 8, "#7D8B92", 4);
-    imageUtils.drawDivider(ctx2, width - 8, 8, width - 8, height - 8, "#7D8B92", 4);
-    imageUtils.drawDivider(ctx2, width - 8, height - 8, 8, height - 8, "#7D8B92", 4);
-    imageUtils.drawDivider(ctx2, 8, height - 8, 8, 8, "#7D8B92", 4);
+    imageUtils.drawBorder(ctx2d, width, height);
     return canvas.toBuffer("image/png");
   }
   __name(generateServerImage, "generateServerImage");
@@ -547,14 +589,14 @@ function apply(ctx, config) {
     const serverHeight = 100;
     const height = baseHeight + results.length * serverHeight;
     const width = 1200;
-    const canvas = (0, import_canvas.createCanvas)(width, height);
-    const ctx2 = canvas.getContext("2d");
-    imageUtils.drawBackground(ctx2, width, height);
-    imageUtils.drawTitle(ctx2, "服务器状态批量查询", width / 2, 100, config.fontSize * 2, config.fontFamily);
+    const canvas = await ctx.canvas.createCanvas(width, height);
+    const ctx2d = canvas.getContext("2d");
+    imageUtils.drawBackground(ctx2d, width, height);
+    imageUtils.drawTitle(ctx2d, "[服务器状态批量查询]", width / 2, 100, config.fontSize * 1.8, config.fontFamily, COLORS.title);
     const now = /* @__PURE__ */ new Date();
-    imageUtils.drawText(ctx2, `查询时间: ${now.toLocaleString("zh-CN")}`, 80, 150);
-    imageUtils.drawText(ctx2, `耗时: ${utils.formatTime(queryTime)}  成功: ${successful}/${results.length}`, width - 80, 150, { align: "right" });
-    imageUtils.drawDivider(ctx2, 80, 165, width - 80, 165, "#FFD700", 3);
+    imageUtils.drawText(ctx2d, `查询时间: ${now.toLocaleString("zh-CN")}`, 80, 150);
+    imageUtils.drawText(ctx2d, `耗时: ${utils.formatTime(queryTime)}  成功: ${successful}/${results.length}`, width - 80, 150, { align: "right" });
+    imageUtils.drawDivider(ctx2d, 80, 165, width - 80, 165, COLORS.gold, 2);
     let y = 200;
     results.forEach((result, index) => {
       const server = serversToQuery[index];
@@ -565,62 +607,60 @@ function apply(ctx, config) {
           const serverName = serverData.name ? utils.cleanName(serverData.name) : "未知";
           const playerCount = serverData.players?.length || 0;
           const maxPlayers = serverData.maxplayers || 0;
-          const botCount = serverData.bots?.length || 0;
-          imageUtils.drawText(ctx2, `${index + 1}. ${serverName}`, 80, y, {
-            color: "#ffffff",
+          imageUtils.drawText(ctx2d, `${index + 1}. ${serverName}`, 80, y, {
+            color: COLORS.textWhite,
             bold: true,
             fontSize: config.fontSize * 1.1
           });
-          imageUtils.drawText(ctx2, server, 80, y + 30, {
+          imageUtils.drawText(ctx2d, server, 80, y + 30, {
             fontSize: config.fontSize * 0.8,
-            color: "#aaaaaa"
+            color: COLORS.textLight
           });
           const playerText = `${playerCount}/${maxPlayers}`;
-          const playerColor = playerCount > 0 ? "#4CAF50" : "#c03f36";
-          imageUtils.drawText(ctx2, playerText, width - 80, y, {
+          const playerColor = playerCount > 0 ? COLORS.success : COLORS.error;
+          imageUtils.drawText(ctx2d, playerText, width - 80, y, {
             align: "right",
             color: playerColor,
             bold: true
           });
           if (serverData.map) {
-            imageUtils.drawText(ctx2, `地图: ${serverData.map}`, 80, y + 60, {
+            imageUtils.drawText(ctx2d, `地图: ${serverData.map}`, 80, y + 60, {
               fontSize: config.fontSize * 0.8,
-              color: "#aaaaaa"
+              color: COLORS.textLight
             });
           }
           if (serverData.ping) {
             const pingColor = utils.getPingColor(serverData.ping);
-            imageUtils.drawText(ctx2, `延迟: ${serverData.ping}ms`, width - 80, y + 60, {
+            imageUtils.drawText(ctx2d, `延迟: ${serverData.ping}ms`, width - 80, y + 60, {
               align: "right",
               fontSize: config.fontSize * 0.9,
               color: pingColor
             });
           }
         } else {
-          imageUtils.drawText(ctx2, `${index + 1}. ${server}`, 80, y, { color: "#ffffff", bold: true });
-          imageUtils.drawText(ctx2, `❌ 查询失败: ${error}`, 200, y + 35, { color: "#c03f36" });
+          imageUtils.drawText(ctx2d, `${index + 1}. ${server}`, 80, y, { color: COLORS.textWhite, bold: true });
+          imageUtils.drawText(ctx2d, `❌ 查询失败: ${error}`, 200, y + 35, { color: COLORS.error });
         }
       } else {
-        imageUtils.drawText(ctx2, `${index + 1}. ${server}`, 80, y, { color: "#ffffff", bold: true });
-        imageUtils.drawText(ctx2, "❌ 查询失败", 200, y + 35, { color: "#c03f36" });
+        imageUtils.drawText(ctx2d, `${index + 1}. ${server}`, 80, y, { color: COLORS.textWhite, bold: true });
+        imageUtils.drawText(ctx2d, "❌ 查询失败", 200, y + 35, { color: COLORS.error });
       }
       if (index < results.length - 1) {
-        imageUtils.drawDivider(ctx2, 80, y + 70, width - 80, y + 70, "#555555", 1);
+        imageUtils.drawDivider(ctx2d, 80, y + 70, width - 80, y + 70, COLORS.divider, 1);
       }
       y += 100;
     });
-    imageUtils.drawDivider(ctx2, 8, 8, width - 8, 8, "#7D8B92", 4);
-    imageUtils.drawDivider(ctx2, width - 8, 8, width - 8, height - 8, "#7D8B92", 4);
-    imageUtils.drawDivider(ctx2, width - 8, height - 8, 8, height - 8, "#7D8B92", 4);
-    imageUtils.drawDivider(ctx2, 8, height - 8, 8, 8, "#7D8B92", 4);
+    imageUtils.drawBorder(ctx2d, width, height);
     return canvas.toBuffer("image/png");
   }
   __name(generateBatchImage, "generateBatchImage");
-  ctx.command("cs.schedule", "定时任务管理").alias("定时任务").option("status", "-s 查看定时任务状态", { type: Boolean, fallback: false }).option("start", "-S 启动定时任务", { type: Boolean, fallback: false }).option("stop", "-T 停止定时任务", { type: Boolean, fallback: false }).option("test", "-t 测试定时任务", { type: Boolean, fallback: false }).option("addGroup", "-a <groupId> 添加群组到定时任务", { type: String }).option("removeGroup", "-r <groupId> 从定时任务移除群组", { type: String }).option("listGroups", "-l 列出定时任务群组", { type: Boolean, fallback: false }).option("run", "-R 立即执行一次定时任务", { type: Boolean, fallback: false }).action(async ({ session, options }) => {
+  ctx.command("cs.schedule", "定时任务管理").alias("定时任务").option("status", "-s 查看定时任务状态", { type: Boolean, fallback: false }).option("start", "-S 启动定时任务", { type: Boolean, fallback: false }).option("stop", "-T 停止定时任务", { type: Boolean, fallback: false }).option("test", "-t 测试定时任务", { type: Boolean, fallback: false }).option("addGroup", "-a <groupId> 添加群组到定时任务", { type: String }).option("removeGroup", "-r <groupId> 从定时任务移除群组", { type: String }).option("listGroups", "-l 列出定时任务群组", { type: Boolean, fallback: false }).option("run", "-R 立即执行一次定时任务", { type: Boolean, fallback: false }).option("testQQ", "-q 测试QQ适配器连接", { type: Boolean, fallback: false }).action(async ({ session, options }) => {
     if (options.status) {
       const status = config.scheduleEnabled ? "✅ 已启用" : "❌ 已禁用";
       const nextRun = scheduleTimer ? "运行中" : "未运行";
       const groups = config.scheduleGroups.length;
+      const qqBots = ctx.bots.filter((bot) => bot.platform === config.qqAdapterName);
+      const qqStatus = qqBots.length > 0 ? `✅ 可用 (${qqBots.length}个)` : "❌ 不可用";
       return `📅 定时任务状态
 状态: ${status}
 定时器: ${nextRun}
@@ -629,6 +669,8 @@ function apply(ctx, config) {
 输出格式: ${config.scheduleUseImage ? "图片" : "文本"}
 监控服务器: ${config.serverList.length}个
 目标群组: ${groups}个
+QQ适配器: ${qqStatus} (名称: ${config.qqAdapterName})
+群组ID格式: ${config.useFullChannelId ? "适配器:群号" : "群号"}
 
 使用 cs.schedule -h 查看所有命令选项`;
     }
@@ -650,12 +692,40 @@ function apply(ctx, config) {
       await executeScheduleTask();
       return "✅ 已立即执行一次定时任务";
     }
+    if (options.testQQ) {
+      const qqBots = ctx.bots.filter((bot) => bot.platform === config.qqAdapterName);
+      if (qqBots.length === 0) {
+        return `❌ 找不到 ${config.qqAdapterName} 适配器的机器人
+请确保已正确配置QQ适配器`;
+      }
+      let message = `✅ 找到 ${qqBots.length} 个 ${config.qqAdapterName} 适配器机器人:
+`;
+      qqBots.forEach((bot, index) => {
+        message += `${index + 1}. ${bot.selfId} (在线: ${bot.status})
+`;
+      });
+      if (session) {
+        try {
+          await session.send("测试消息: QQ适配器连接正常 ✓");
+          message += "\n✅ 当前会话消息发送测试成功";
+        } catch (error) {
+          message += `
+❌ 当前会话消息发送失败: ${error.message}`;
+        }
+      }
+      return message;
+    }
     if (options.addGroup) {
-      if (!config.scheduleGroups.includes(options.addGroup)) {
-        config.scheduleGroups.push(options.addGroup);
-        return `✅ 已添加群组 ${options.addGroup} 到定时任务`;
+      let groupId = options.addGroup.trim();
+      if (config.useFullChannelId && !groupId.includes(":")) {
+        groupId = `${config.qqAdapterName}:${groupId}`;
+      }
+      if (!config.scheduleGroups.includes(groupId)) {
+        config.scheduleGroups.push(groupId);
+        return `✅ 已添加群组 ${groupId} 到定时任务
+当前列表: ${config.scheduleGroups.length} 个群组`;
       } else {
-        return `❌ 群组 ${options.addGroup} 已在列表中`;
+        return `❌ 群组 ${groupId} 已在列表中`;
       }
     }
     if (options.removeGroup) {
@@ -686,6 +756,7 @@ function apply(ctx, config) {
 -T, -stop        停止定时任务
 -t, -test        测试定时任务
 -R, -run         立即执行一次定时任务
+-q, -testQQ      测试QQ适配器连接
 -a, -addGroup    添加群组到定时任务
 -r, -removeGroup 从定时任务移除群组
 -l, -listGroups  列出定时任务群组
@@ -694,7 +765,8 @@ function apply(ctx, config) {
 cs.schedule -s          # 查看状态
 cs.schedule -S          # 启动定时任务
 cs.schedule -a 123456   # 添加群组123456
-cs.schedule -t          # 测试执行`;
+cs.schedule -t          # 测试执行
+cs.schedule -q          # 测试QQ适配器连接`;
   });
   ctx.command("cs <address>", "查询服务器状态").alias("查询").alias("server").option("noPlayers", "-n 隐藏玩家列表", { type: Boolean, fallback: false }).option("image", "-i 生成图片横幅", { type: Boolean, fallback: false }).option("text", "-t 输出文本信息", { type: Boolean, fallback: false }).option("clear", "-c 清除缓存", { type: Boolean, fallback: false }).action(async ({ session, options }, address) => {
     if (!address) return "使用格式: cs [地址:端口]\n示例: cs 127.0.0.1:27015\n示例: cs edgebug.cn";
@@ -725,9 +797,9 @@ cs.schedule -t          # 测试执行`;
 
 `;
       if (error.message.includes("无法加载 gamedig")) {
-        errorMessage += "请确保已安装 gamedig：\n";
-        errorMessage += "1. 在插件目录运行：npm install gamedig\n";
-        errorMessage += "2. 重启 Koishi";
+        errorMessage += "请确保已安装 koishi-plugin-gamedig：\n";
+        errorMessage += "1. 在插件市场搜索并安装 koishi-plugin-gamedig\n";
+        errorMessage += "2. 启用该插件后重启";
       } else if (error.message.includes("无效的地址格式")) {
         errorMessage += "地址格式应为: 地址:端口\n";
         errorMessage += "示例: 127.0.0.1:27015 或 edgebug.cn:27015\n";
@@ -744,21 +816,28 @@ cs.schedule -t          # 测试执行`;
   });
   ctx.command("cs.status", "检查插件状态和配置").action(async () => {
     try {
-      await loadGamedig();
-      const cacheSize = cache.size;
+      const gamedigStatus = ctx.gamedig ? "✅ 可用" : "❌ 不可用";
       let canvasStatus = "❌ 不可用";
-      try {
-        (0, import_canvas.createCanvas)(1, 1);
-        canvasStatus = "✅ 可用";
-      } catch (error) {
-        canvasStatus = `❌ 不可用: ${error.message}`;
+      if (ctx.canvas) {
+        try {
+          const canvas = await ctx.canvas.createCanvas(1, 1);
+          const ctx2d = canvas.getContext("2d");
+          canvasStatus = "✅ 可用";
+        } catch (error) {
+          canvasStatus = `❌ 不可用: ${error.message}`;
+        }
       }
+      const cacheSize = cache.size;
       const scheduleStatus = config.scheduleEnabled ? "✅ 已启用" : "❌ 已禁用";
       const scheduleTimerStatus = scheduleTimer ? "运行中" : "未运行";
+      const qqBots = ctx.bots.filter((bot) => bot.platform === config.qqAdapterName);
+      const qqStatus = qqBots.length > 0 ? `✅ 可用 (${qqBots.length}个)` : "❌ 不可用";
       return `✅ CS服务器查询插件状态
 💾 缓存数量: ${cacheSize} 条
-🖼️ 图片生成: ${canvasStatus}
+🕹️ Gamedig插件: ${gamedigStatus}
+🖼️ Canvas插件: ${canvasStatus}
 📅 定时任务: ${scheduleStatus} (${scheduleTimerStatus})
+🤖 QQ适配器: ${qqStatus} (名称: ${config.qqAdapterName})
 ⚙️ 配置参数:
    超时时间: ${config.timeout}ms
    缓存时间: ${config.cacheTime}ms
@@ -770,13 +849,14 @@ cs.schedule -t          # 测试执行`;
    图片宽度: ${config.imageWidth}px
    图片最小高度: ${config.imageHeight}px
    字体大小: ${config.fontSize}px
+   群组ID格式: ${config.useFullChannelId ? "适配器:群号" : "群号"}
 
 📝 使用: cs [地址:端口]
 📝 选项: -i 生成图片, -t 输出文本, -c 清除缓存
 📅 定时任务: cs.schedule 查看定时任务管理`;
     } catch (error) {
       return `❌ 插件状态异常: ${error.message}
-请运行: npm install gamedig`;
+请确保已安装并启用 koishi-plugin-gamedig 和 koishi-plugin-canvas 插件`;
     }
   });
   ctx.command("cs.help", "查看帮助").action(() => {
@@ -804,12 +884,13 @@ cs.help - 显示此帮助
 定时自动向指定QQ群组发送服务器状态
 配置: 插件配置面板中设置
 管理: cs.schedule 命令
-群组ID: 填写QQ群号即可
+群组ID格式: ${config.useFullChannelId ? "适配器:群号 (如: qq:123456)" : "群号 (如: 123456)"}
 
 💡 提示:
 1. 如果不指定端口，默认使用27015
 2. 只支持CS服务器查询
-3. 查询结果缓存${config.cacheTime}ms，使用 -c 清除缓存`;
+3. 查询结果缓存${config.cacheTime}ms，使用 -c 清除缓存
+4. 需要安装 koishi-plugin-gamedig 和 koishi-plugin-canvas 插件`;
   });
   ctx.command("csss", "批量查询服务器状态").alias("batch").alias("multi").alias("批量查询").option("list", "-l 显示配置的服务器列表", { type: Boolean, fallback: false }).option("add", "-a <address> 添加服务器到列表", { type: String }).option("remove", "-r <index> 从列表中移除服务器", { type: Number }).option("clear", "-c 清空服务器列表", { type: Boolean, fallback: false }).option("image", "-i 生成图片横幅", { type: Boolean, fallback: false }).option("text", "-t 输出文本信息", { type: Boolean, fallback: false }).action(async ({ session, options }, ...addresses) => {
     if (options.list) {
@@ -860,30 +941,7 @@ cs.help - 显示此帮助
       session?.send(`⚠️ 服务器数量超过限制，仅查询前 ${maxServers} 个`);
     }
     try {
-      const startTime = Date.now();
-      const results = await Promise.allSettled(
-        serversToQuery.map(async (server, index) => {
-          try {
-            const { host, port } = parseAddress(server);
-            const data = await queryServer(host, port);
-            return {
-              index: index + 1,
-              server,
-              success: true,
-              data
-            };
-          } catch (error) {
-            return {
-              index: index + 1,
-              server,
-              success: false,
-              error: error.message
-            };
-          }
-        })
-      );
-      const endTime = Date.now();
-      const queryTime = endTime - startTime;
+      const { results, queryTime } = await queryServers(serversToQuery);
       const shouldGenerateImage = options.image || config.generateImage && !options.text;
       if (shouldGenerateImage) {
         try {
@@ -893,37 +951,7 @@ cs.help - 显示此帮助
           console.error("生成批量查询图片失败:", imageError);
         }
       }
-      const successful = results.filter((r) => r.status === "fulfilled" && r.value.success).length;
-      const failed = serversToQuery.length - successful;
-      let message = `📊 批量查询结果 (${utils.formatTime(queryTime)})
-`;
-      message += `✅ 成功: ${successful} 个 | ❌ 失败: ${failed} 个
-
-`;
-      message += "序号 服务器名称    在线人数\n";
-      message += "──────────────────────────────\n";
-      results.forEach((result, index) => {
-        const serverInfo = serversToQuery[index];
-        if (result.status === "fulfilled") {
-          const { success, data, error } = result.value;
-          if (success && data) {
-            const { result: serverData } = data;
-            const serverName = serverData.name ? utils.cleanName(serverData.name) : "未知";
-            const playerCount = serverData.players?.length || 0;
-            const maxPlayers = serverData.maxplayers || 0;
-            const truncatedName = utils.truncateText(serverName, 20);
-            const paddedName = truncatedName.padEnd(20, " ");
-            message += `${(index + 1).toString().padStart(2, " ")}  ${paddedName} ${playerCount}/${maxPlayers}
-`;
-          } else {
-            message += `${(index + 1).toString().padStart(2, " ")}  ${serverInfo} ❌ 查询失败: ${error}
-`;
-          }
-        } else {
-          message += `${(index + 1).toString().padStart(2, " ")}  ${serverInfo} ❌ 查询失败
-`;
-        }
-      });
+      let message = generateTextTable(results, serversToQuery, queryTime, "批量查询结果");
       message += "\n📋 输入 `cs <序号>` 查看服务器详情";
       message += "\n📋 输入 `cs <服务器地址>` 查询单个服务器";
       return message;
@@ -940,9 +968,11 @@ cs.help - 显示此帮助
   });
 }
 __name(apply, "apply");
+var inject = ["canvas", "gamedig"];
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Config,
   apply,
+  inject,
   name
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-csss",
   "description": "Check the status of the CS server",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -14,21 +14,25 @@
     "koishi",
     "plugin"
   ],
-  "peerDependencies": {
-    "koishi": "^4.18.7"
-  },
-  "dependencies": {
-    "canvas": "^3.2.1",
-    "gamedig": "^5.3.2"
-  },
   "koishi": {
     "description": {
       "zh": "CS服务器状态查询，包括CS1.6/CSS/CSGO/CS2"
     },
     "service": {
       "required": [
-        "database"
+        "canvas",
+        "gamedig"
       ]
+    },
+    "devDependencies": {
+      "koishi": "^4.18.7",
+      "koishi-plugin-canvas": "^0.2.2",
+      "koishi-plugin-gamedig": "^1.2.2"
     }
+  },
+  "dependencies": {
+    "koishi": "^4.18.7",
+    "koishi-plugin-canvas": "^0.2.2",
+    "koishi-plugin-gamedig": "^1.2.2"
   }
 }