koishi-plugin-csss 2.1.0 → 4.0.0

package/lib/index.js

@@ -30,172 +30,137 @@ var import_koishi = require("koishi");
 var name = "csss";
 var inject = ["puppeteer", "gamedig", "database"];
 var Config = import_koishi.Schema.object({
-  timeout: import_koishi.Schema.number().min(1e3).max(3e4).default(5e3).description("查询超时时间(毫秒)"),
-  cacheTime: import_koishi.Schema.number().min(0).max(3e5).default(3e4).description("缓存时间(毫秒，0为禁用缓存)"),
+  timeout: import_koishi.Schema.number().min(100).max(3e4).default(500).description("查询超时时间(毫秒)"),
+  cacheTime: import_koishi.Schema.number().min(0).max(3e5).default(3e3).description("缓存时间(毫秒，0为禁用缓存)"),
   maxPlayers: import_koishi.Schema.number().min(0).max(100).default(20).description("最大显示玩家数"),
-  retryCount: import_koishi.Schema.number().min(0).max(5).default(2).description("查询失败重试次数"),
+  retryCount: import_koishi.Schema.number().min(0).max(5).default(1).description("查询失败重试次数"),
   showVAC: import_koishi.Schema.boolean().default(true).description("是否显示VAC状态"),
   showPassword: import_koishi.Schema.boolean().default(true).description("是否显示密码保护信息"),
   generateImage: import_koishi.Schema.boolean().default(true).description("是否生成图片横幅（影响cs和csss命令）"),
   imageWidth: import_koishi.Schema.number().min(600).max(2e3).default(1200).description("图片宽度(像素)"),
   imageHeight: import_koishi.Schema.number().min(200).max(2500).default(500).description("图片最小高度(像素)，实际高度会根据内容自适应"),
-  fontSize: import_koishi.Schema.number().min(12).max(48).default(24).description("字体大小"),
-  fontFamily: import_koishi.Schema.string().default('"JetBrains Mono", monospace').description("字体"),
-  serverList: import_koishi.Schema.array(import_koishi.Schema.string()).role("table").description("批量查询服务器列表（格式: [地址]:[端口]，每行一个）").default([
-    "edgebug.cn:27015",
-    "edgebug.cn:27016",
-    "edgebug.cn:27017",
-    "edgebug.cn:27018",
-    "edgebug.cn:27019"
-  ]),
-  batchTimeout: import_koishi.Schema.number().min(1e3).max(6e4).default(15e3).description("批量查询总超时时间(毫秒)")
+  // 移除 fontSize 配置项
+  fontFamily: import_koishi.Schema.string().default("JetBrains Mono, monospace").description("字体"),
+  customCSS: import_koishi.Schema.string().role("textarea").description("自定义CSS样式，可通过此配置调整字体大小等").default("")
 });
-var COLORS = {
-  background: "#1c1c1fcc",
-  text: "#71717a",
-  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: "#fcf8de"
-};
+var CLEAN_NAME_REGEX = /^\d+|[\u0000-\u001F]/g;
+var ESCAPE_HTML_REGEX = /[&<>"']/g;
+var ESCAPE_MAP = { "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" };
 var utils = {
   formatPing(ping) {
-    if (!ping || ping < 0) return "未知";
+    if (!ping || ping <= 0) return "未知";
     if (ping < 50) return `🟢 ${ping}ms`;
     if (ping < 100) return `🟡 ${ping}ms`;
     if (ping < 200) return `🟠 ${ping}ms`;
     return `🔴 ${ping}ms`;
   },
   cleanName(name2) {
-    return name2 ? name2.replace(/\^[0-9]/g, "").replace(/[\u0000-\u001F]/g, "").trim() : "未知";
+    return name2 ? name2.replace(CLEAN_NAME_REGEX, "").trim() : "未知";
   },
   truncateText(text, maxLength) {
-    return text.length > maxLength ? text.substring(0, maxLength) + "..." : text;
+    return text.length > maxLength ? text.slice(0, maxLength) + "..." : text;
   },
   getPingColor(ping) {
-    if (ping < 50) return COLORS.pingGreen;
-    if (ping < 100) return COLORS.pingYellow;
-    if (ping < 200) return COLORS.pingOrange;
-    return COLORS.pingRed;
+    if (ping < 50) return "#4CAF50";
+    if (ping < 100) return "#FFC107";
+    if (ping < 200) return "#FF9800";
+    return "#c03f36";
   },
   getPlayerColor(count) {
-    return count > 0 ? COLORS.playerOnline : COLORS.playerOffline;
+    return count > 0 ? "#4CAF50" : "#c03f36";
   },
   formatTime(ms) {
     if (ms < 1e3) return `${ms}ms`;
     if (ms < 6e4) return `${(ms / 1e3).toFixed(1)}秒`;
     return `${(ms / 1e3).toFixed(0)}秒`;
+  },
+  escapeHtml(str) {
+    return str ? str.replace(ESCAPE_HTML_REGEX, (ch) => ESCAPE_MAP[ch] || ch) : "";
+  },
+  getVisualLength(str) {
+    let len = 0;
+    for (const char of str) {
+      len += char.charCodeAt(0) > 255 ? 2 : 1;
+    }
+    return len;
+  },
+  padEndVisual(str, targetLen) {
+    const currentLen = this.getVisualLength(str);
+    if (currentLen >= targetLen) return str;
+    return str + " ".repeat(targetLen - currentLen);
   }
 };
 function apply(ctx, config) {
   const cache = /* @__PURE__ */ new Map();
+  const logger = ctx.logger("csss");
   if (!ctx.gamedig) {
-    console.error("koishi-plugin-gamedig 未安装或未启用");
-    return ctx.logger("cs-server-status").error("需要安装并启用 koishi-plugin-gamedig 插件");
+    logger.error("需要安装并启用 koishi-plugin-gamedig 插件");
+    return;
   }
   if (!ctx.puppeteer) {
-    console.error("koishi-plugin-puppeteer 未安装或未启用");
-    return ctx.logger("cs-server-status").error("需要安装并启用 koishi-plugin-puppeteer 插件");
+    logger.error("需要安装并启用 koishi-plugin-puppeteer 插件");
+    return;
   }
-  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 };
+  if (!ctx.database) {
+    logger.error("需要安装并启用数据库插件以存储服务器列表");
+    return;
   }
-  __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;
+  ctx.model.extend("csss_server", {
+    id: "unsigned",
+    address: "string"
+  }, {
+    primary: "id",
+    autoInc: true,
+    unique: ["address"]
+  });
+  async function getServerList() {
+    const records = await ctx.database.get("csss_server", {}, ["id", "address"]);
+    return records.sort((a, b) => a.id - b.id).map((r) => r.address);
   }
-  __name(generateTextTable, "generateTextTable");
+  __name(getServerList, "getServerList");
+  async function addServer(address) {
+    try {
+      await ctx.database.create("csss_server", { address });
+      return true;
+    } catch (error) {
+      if (error.message.includes("UNIQUE")) return false;
+      throw error;
+    }
+  }
+  __name(addServer, "addServer");
+  async function removeServerByIndex(index) {
+    const records = await ctx.database.get("csss_server", {}, ["id"]);
+    if (index < 1 || index > records.length) return false;
+    await ctx.database.remove("csss_server", { id: records[index - 1].id });
+    return true;
+  }
+  __name(removeServerByIndex, "removeServerByIndex");
+  async function clearServers() {
+    const count = (await ctx.database.get("csss_server", {}, ["id"])).length;
+    if (count === 0) return 0;
+    await ctx.database.remove("csss_server", {});
+    return count;
+  }
+  __name(clearServers, "clearServers");
   function parseAddress(input) {
+    if (typeof input !== "string") throw new Error(`地址必须是字符串`);
     let address = input.replace(/^(http|https|udp|tcp):\/\//, "");
-    if (address.includes("[")) {
-      const match = address.match(/^\[([^\]]+)\](?::(\d+))?$/);
-      if (match) {
-        const host = match[1];
-        const port = match[2] ? parseInt(match[2]) : 27015;
-        if (port >= 1 && port <= 65535) return { host, port };
-      }
-    }
+    const ipv6WithPortMatch = address.match(/^\[([^\]]+)\]:(\d+)$/);
+    if (ipv6WithPortMatch) {
+      const port = parseInt(ipv6WithPortMatch[2], 10);
+      if (port >= 1 && port <= 65535) return { host: ipv6WithPortMatch[1], port };
+      throw new Error("端口无效");
+    }
+    const ipv6OnlyMatch = address.match(/^\[([^\]]+)\]$/);
+    if (ipv6OnlyMatch) return { host: ipv6OnlyMatch[1], port: 27015 };
     const parts = address.split(":");
     if (parts.length === 2) {
-      const host = parts[0];
-      const port = parseInt(parts[1]);
-      if (!isNaN(port) && port >= 1 && port <= 65535) return { host, port };
-    } else if (parts.length === 1) {
-      return { host: parts[0], port: 27015 };
+      const port = parseInt(parts[1], 10);
+      if (port >= 1 && port <= 65535) return { host: parts[0], port };
+      throw new Error("端口无效");
     }
-    throw new Error(`无效的地址格式: ${input}
-正确格式: [地址]:[端口] 或 [地址]`);
+    if (parts.length === 1) return { host: parts[0], port: 27015 };
+    throw new Error(`无效的地址格式 "${input}"。支持: IP:端口, 域名:端口, [IPv6]:端口`);
   }
   __name(parseAddress, "parseAddress");
   async function queryServer(host, port) {
@@ -225,400 +190,207 @@ function apply(ctx, config) {
         return data;
       } catch (error) {
         lastError = error;
-        if (i < config.retryCount) {
-          await new Promise((resolve) => setTimeout(resolve, 1e3));
-        }
+        if (i < config.retryCount) await new Promise((resolve) => setTimeout(resolve, 1e3));
       }
     }
-    throw new Error(`无法连接到服务器: ${lastError?.message || "未知错误"}`);
+    throw new Error(`无法连接到服务器 ${lastError instanceof Error ? lastError.message : "未知错误"}`);
   }
   __name(queryServer, "queryServer");
+  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 };
+        }
+      })
+    );
+    return {
+      results: results.map((res, idx) => res.status === "fulfilled" ? res.value : { index: idx + 1, server: serversToQuery[idx], success: false, error: "未知错误" }),
+      queryTime: Date.now() - startTime,
+      serversToQuery
+    };
+  }
+  __name(queryServers, "queryServers");
+  function generateTextTable(results, serversToQuery, queryTime, title = "批量查询结果") {
+    const successful = results.filter((r) => r.success).length;
+    let message = `📊 ${title} (${utils.formatTime(queryTime)})
+✅ 成功 ${successful} 个 ❌ 失败 ${results.length - successful} 个
+
+`;
+    results.forEach((result, idx) => {
+      const num = (idx + 1).toString().padStart(2, " ");
+      if (result.success && result.data) {
+        const d = result.data.result;
+        const name2 = utils.cleanName(d.name || "未知");
+        const truncated = utils.truncateText(name2, 12);
+        const paddedName = utils.padEndVisual(truncated, 24);
+        message += `${num} ${paddedName} ${d.players.length}/${d.maxplayers}
+`;
+      } else {
+        message += `${num} ${serversToQuery[idx].padEnd(20)} ❌ 查询失败
+`;
+      }
+    });
+    return message;
+  }
+  __name(generateTextTable, "generateTextTable");
   function formatServerInfo(data) {
-    const { result } = data;
+    const r = data.result;
     const lines = [
       ` Counter-Strike 服务器
 `,
-      result.name ? `🏷️ 名称: ${utils.cleanName(result.name)}` : null,
-      result.map ? `🗺️ 地图: ${result.map}` : null,
-      `👥 玩家: ${result.players?.length || 0}/${result.maxplayers || 0}${result.bots?.length ? ` (${result.bots.length} Bot)` : ""}`,
-      config.showPassword && result.password !== void 0 ? `🔒 密码: ${result.password ? "是 🔐" : "否 🔓"}` : null,
-      result.ping ? `📶 Ping: ${utils.formatPing(result.ping)}` : null,
-      result.connect ? `🔗 连接: ${result.connect}` : `📍 地址: ${result.host || "未知"}:${result.port || "未知"}`,
-      config.showVAC && result.raw?.secure !== void 0 ? `🛡️ VAC: ${result.raw.secure ? "启用 ✅" : "关闭 ❌"}` : null
+      r.name ? `🏷️ 名称 ${utils.cleanName(r.name)}` : null,
+      r.map ? `🗺️ 地图 ${r.map}` : null,
+      `👥 玩家 ${r.players.length}/${r.maxplayers}${r.bots.length ? ` (${r.bots.length} Bot)` : ""}`,
+      config.showPassword && r.password !== void 0 ? `🔒 密码 ${r.password ? "是 🔐" : "否 🔓"}` : null,
+      r.ping ? `📶 Ping ${utils.formatPing(r.ping)}` : null,
+      r.connect ? `🔗 连接 ${r.connect}` : `📍 地址 ${r.host || "未知"}:${r.port || "未知"}`,
+      config.showVAC && r.raw?.secure !== void 0 ? `🛡️ VAC ${r.raw.secure ? "启用 ✅" : "关闭 ❌"}` : null
     ];
     return lines.filter(Boolean).join("\n");
   }
   __name(formatServerInfo, "formatServerInfo");
   function formatPlayers(players) {
-    if (!players || players.length === 0) {
-      return "👤 服务器当前无在线玩家";
-    }
-    const sortedPlayers = [...players].sort((a, b) => {
-      const nameA = utils.cleanName(a.name).toLowerCase();
-      const nameB = utils.cleanName(b.name).toLowerCase();
-      return nameA.localeCompare(nameB);
-    });
-    const displayPlayers = sortedPlayers.slice(0, config.maxPlayers);
-    let message = `👤 在线玩家 (${players.length}人):
+    if (!players.length) return "👤 服务器当前无在线玩家";
+    const sorted = [...players].sort((a, b) => utils.cleanName(a.name).localeCompare(utils.cleanName(b.name)));
+    const display = sorted.slice(0, config.maxPlayers);
+    let msg = `👤 在线玩家 (${players.length}人)
 `;
-    displayPlayers.forEach((player, index) => {
-      message += `${index + 1}. ${utils.cleanName(player.name)}
-`;
-    });
-    if (players.length > config.maxPlayers) {
-      message += `... 还有 ${players.length - config.maxPlayers} 位玩家未显示`;
-    }
-    return message.trim();
+    display.forEach((p, i) => msg += `${i + 1}. ${utils.cleanName(p.name)}
+`);
+    if (players.length > config.maxPlayers) msg += `... 还有 ${players.length - config.maxPlayers} 位玩家未显示`;
+    return msg.trim();
   }
   __name(formatPlayers, "formatPlayers");
+  function getBaseCSS() {
+    return `
+      * { margin: 0; padding: 0; box-sizing: border-box; }
+      body { 
+        background: #1c1c1fcc; 
+        font-family: ${config.fontFamily}; 
+        width: ${config.imageWidth}px; 
+        min-height: ${config.imageHeight}px; 
+        padding: 40px; 
+        color: #71717a; 
+        position: relative; 
+        border: 2px solid #2e2e33; 
+        font-size: 24px; /* 基础字体大小，原 fontSize 默认值 */
+      }
+      .corner { position: absolute; width: 25px; height: 25px; border-color: #fbbf24; border-style: solid; border-width: 0; }
+      .corner-tl { top: 2px; left: 2px; border-top-width: 3px; border-left-width: 3px; }
+      .corner-tr { top: 2px; right: 2px; border-top-width: 3px; border-right-width: 3px; }
+      .corner-bl { bottom: 2px; left: 2px; border-bottom-width: 3px; border-left-width: 3px; }
+      .corner-br { bottom: 2px; right: 2px; border-bottom-width: 3px; border-right-width: 3px; }
+      .divider { height: 2px; background: #2e2e33; margin: 20px 0; }
+      .timestamp { margin-top: 30px; font-size: 0.8em; color: #666666; text-align: left; }
+      ${config.customCSS ? `
+/* 用户自定义样式 */
+${config.customCSS}
+` : ""}
+    `;
+  }
+  __name(getBaseCSS, "getBaseCSS");
   function generateServerHTML(data, host, port) {
-    const { result } = data;
-    const playerCount = result.players?.length || 0;
-    const botCount = result.bots?.length || 0;
-    const maxPlayers = result.maxplayers || 0;
-    const cleanName = result.name ? utils.cleanName(result.name) : "未知服务器";
-    const now = (/* @__PURE__ */ new Date()).toLocaleString("zh-CN");
+    const r = data.result;
+    const pCount = r.players.length;
     let playersHTML = "";
-    if (playerCount === 0) {
-      playersHTML = `<div class="player-row" style="color: ${COLORS.textLight};">服务器当前无玩家在线</div>`;
+    if (pCount === 0) {
+      playersHTML = `<div class="player-row" style="color: #aaaaaa;">服务器当前无玩家在线</div>`;
     } else {
-      const sortedPlayers = [...result.players].sort(
-        (a, b) => utils.cleanName(a.name).localeCompare(utils.cleanName(b.name))
-      );
-      const displayPlayers = sortedPlayers.slice(0, config.maxPlayers);
-      const needTwoColumns = playerCount > 10;
-      if (needTwoColumns) {
-        const half = Math.ceil(displayPlayers.length / 2);
-        const left = displayPlayers.slice(0, half);
-        const right = displayPlayers.slice(half, half * 2);
-        playersHTML = '<div style="display: flex; gap: 40px;">';
-        playersHTML += "<div>" + left.map(
-          (p) => `<div class="player-row">${utils.truncateText(utils.cleanName(p.name), 30)}</div>`
-        ).join("") + "</div>";
-        playersHTML += "<div>" + right.map(
-          (p) => `<div class="player-row">${utils.truncateText(utils.cleanName(p.name), 30)}</div>`
-        ).join("") + "</div>";
-        playersHTML += "</div>";
+      const sorted = [...r.players].sort((a, b) => utils.cleanName(a.name).localeCompare(utils.cleanName(b.name))).slice(0, config.maxPlayers);
+      const isTwoCols = pCount > 10;
+      if (isTwoCols) {
+        const half = Math.ceil(sorted.length / 2);
+        const renderCol = /* @__PURE__ */ __name((arr) => arr.map((p) => `<div class="player-row">${utils.escapeHtml(utils.truncateText(utils.cleanName(p.name), 20))}</div>`).join(""), "renderCol");
+        playersHTML = `<div style="display: flex; gap: 40px;"><div>${renderCol(sorted.slice(0, half))}</div><div>${renderCol(sorted.slice(half))}</div></div>`;
       } else {
-        playersHTML = displayPlayers.map(
-          (p) => `<div class="player-row">${utils.truncateText(utils.cleanName(p.name), 40)}</div>`
-        ).join("");
+        playersHTML = sorted.map((p) => `<div class="player-row">${utils.escapeHtml(utils.truncateText(utils.cleanName(p.name), 20))}</div>`).join("");
       }
-      if (playerCount > config.maxPlayers) {
-        playersHTML += `<div class="player-row" style="color: ${COLORS.textLight}; font-style: italic;">... 还有 ${playerCount - config.maxPlayers} 位玩家未显示</div>`;
+      if (pCount > config.maxPlayers) {
+        playersHTML += `<div class="player-row" style="color: #aaaaaa; font-style: italic;">... 还有 ${pCount - config.maxPlayers} 位玩家未显示</div>`;
       }
     }
-    return `<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="UTF-8">
-  <style>
-    * { margin: 0; padding: 0; box-sizing: border-box; }
-    body {
-      background: rgba(28,28,31,0.8);
-      font-family: ${config.fontFamily};
-      width: ${config.imageWidth}px;
-      min-height: ${config.imageHeight}px;
-      padding: 40px;
-      color: ${COLORS.text};
-      position: relative;
-      border: 2px solid ${COLORS.border};
-    }
-    /* 边框装饰 */
-    .corner {
-      position: absolute;
-      width: 25px;
-      height: 25px;
-      border-color: ${COLORS.accent};
-      border-style: solid;
-      border-width: 0;
-    }
-    .corner-tl { top: 2px; left: 2px; border-top-width: 3px; border-left-width: 3px; }
-    .corner-tr { top: 2px; right: 2px; border-top-width: 3px; border-right-width: 3px; }
-    .corner-bl { bottom: 2px; left: 2px; border-bottom-width: 3px; border-left-width: 3px; }
-    .corner-br { bottom: 2px; right: 2px; border-bottom-width: 3px; border-right-width: 3px; }
-
-
-    .title {
-      text-align: center;
-      font-size: ${config.fontSize * 1.5}px;
-      color: ${COLORS.title};
-      margin-bottom: 20px;
-    }
-    .server-name {
-      text-align: center;
-      font-size: ${config.fontSize * 1.8}px;
-      font-weight: bold;
-      color: ${COLORS.highlight};
-      margin: 10px 0 20px;
-      word-break: break-word;
-    }
-    .divider {
-      height: 2px;
-      background: ${COLORS.border};
-      margin: 20px 0;
-    }
-    .info-row {
-      display: flex;
-      justify-content: space-between;
-      margin: 15px 0;
-      font-size: ${config.fontSize}px;
-    }
-    .player-section {
-      margin-top: 20px;
-    }
-    .player-section-title {
-      font-size: ${config.fontSize}px;
-      font-weight: bold;
-      color: ${COLORS.playerName};
-      margin-bottom: 10px;
-    }
-    .player-row {
-      font-size: ${config.fontSize * 0.9}px;
-      color: ${COLORS.textLighter};
-      line-height: 1.8;
-    }
-    .timestamp {
-      margin-top: 30px;
-      font-size: ${config.fontSize * 0.8}px;
-      color: ${COLORS.timestamp};
-      text-align: left;
-    }
-  </style>
-</head>
-<body>
-  <div class="corner corner-tl"></div>
-  <div class="corner corner-tr"></div>
-  <div class="corner corner-bl"></div>
-  <div class="corner corner-br"></div>
-
-  <div class="title">[服务器状态查询]</div>
-  <div class="server-name">${cleanName}</div>
-  <div class="divider"></div>
-
-  <div class="info-row">
-    <span>地图: ${result.map || "未知"}</span>
-    <span>IP: ${host}:${port}</span>
-  </div>
-  <div class="info-row">
-    <span style="color: ${utils.getPlayerColor(playerCount)};">人数: ${playerCount}/${maxPlayers}${botCount ? ` (${botCount} Bot)` : ""}</span>
-    <span style="color: ${utils.getPingColor(result.ping)};">Ping: ${result.ping ? result.ping + "ms" : "未知"}</span>
-  </div>
-
-  <div class="player-section">
-    <div class="player-section-title">在线玩家</div>
-    <div class="divider" style="margin: 5px 0 15px;"></div>
-    ${playersHTML}
-  </div>
-
-  <div class="timestamp">查询时间: ${now}</div>
-</body>
-</html>`;
+    return `<!DOCTYPE html><html><head><meta charset="UTF-8"><style>
+      ${getBaseCSS()}
+      .title { text-align: center; font-size: 1.5em; color: #71717a; margin-bottom: 20px; }
+      .server-name { text-align: center; font-size: 1.8em; font-weight: bold; color: #fbbf24; margin: 10px 0 20px; word-break: break-word; }
+      .info-row { display: flex; justify-content: space-between; margin: 15px 0; font-size: 1em; }
+      .player-section { margin-top: 20px; }
+      .player-section-title { font-size: 1em; font-weight: bold; color: #fcf8de; margin-bottom: 10px; }
+      .player-row { font-size: 0.9em; color: #dddddd; line-height: 1.8; }
+    </style></head><body>
+      <div class="corner corner-tl"></div><div class="corner corner-tr"></div><div class="corner corner-bl"></div><div class="corner corner-br"></div>
+      <div class="title">[服务器状态查询]</div>
+      <div class="server-name">${utils.escapeHtml(utils.cleanName(r.name || "未知服务器"))}</div>
+      <div class="divider"></div>
+      <div class="info-row"><span>地图: ${utils.escapeHtml(r.map || "未知")}</span><span>IP: ${utils.escapeHtml(`${host}:${port}`)}</span></div>
+      <div class="info-row"><span style="color: ${utils.getPlayerColor(pCount)};">人数: ${pCount}/${r.maxplayers}${r.bots.length ? ` (${r.bots.length} Bot)` : ""}</span><span style="color: ${utils.getPingColor(r.ping)};">Ping: ${r.ping ? r.ping + "ms" : "未知"}</span></div>
+      <div class="player-section"><div class="player-section-title">在线玩家</div><div class="divider" style="margin: 5px 0 15px;"></div>${playersHTML}</div>
+      <div class="timestamp">查询时间: ${(/* @__PURE__ */ new Date()).toLocaleString("zh-CN")}</div>
+    </body></html>`;
   }
   __name(generateServerHTML, "generateServerHTML");
   function generateBatchHTML(results, serversToQuery, queryTime) {
-    const successful = results.filter((r) => r.status === "fulfilled" && r.value.success).length;
-    const failed = results.length - successful;
-    const now = (/* @__PURE__ */ new Date()).toLocaleString("zh-CN");
-    let serversHTML = "";
-    results.forEach((result, index) => {
-      const server = serversToQuery[index];
-      if (result.status === "fulfilled" && result.value.success) {
-        const data = result.value.data.result;
-        const name2 = data.name ? utils.cleanName(data.name) : "未知";
-        const playerCount = data.players?.length || 0;
-        const maxPlayers = data.maxplayers || 0;
-        const map = data.map || "";
-        const ping = data.ping || "?";
-        const pingColor = utils.getPingColor(ping);
-        const playerColor = playerCount > 0 ? COLORS.success : COLORS.error;
-        serversHTML += `
-        <div class="server-item">
-          <div class="server-header">
-            <span class="server-index">${index + 1}.</span>
-            <span class="server-name">${name2}</span>
-            <span class="server-players" style="color: ${playerColor};">${playerCount}/${maxPlayers}</span>
-          </div>
-          <div class="server-details">
-            <span class="server-addr">${server}</span>
-            <span class="server-map">地图: ${map}</span>
-            <span class="server-ping" style="color: ${pingColor};">延迟: ${ping}ms</span>
-          </div>
-        </div>
-      `;
-      } else {
-        const errorMsg = result.value?.error || "未知错误";
-        serversHTML += `
-        <div class="server-item error">
-          <div class="server-header">
-            <span class="server-index">${index + 1}.</span>
-            <span class="server-name">${server}</span>
-            <span class="server-status">❌ 查询失败</span>
-          </div>
-          <div class="server-details error-msg">${errorMsg}</div>
-        </div>
-      `;
+    const successful = results.filter((r) => r.success).length;
+    let serversHTML = results.map((result, index) => {
+      if (result.success && result.data) {
+        const d = result.data.result;
+        return `<div class="server-item">
+          <div class="server-header"><span class="server-index">${index + 1}.</span><span class="server-name">${utils.escapeHtml(utils.cleanName(d.name || "未知"))}</span><span class="server-players" style="color: ${utils.getPlayerColor(d.players.length)};">${d.players.length}/${d.maxplayers}</span></div>
+          <div class="server-details"><span class="server-addr">${utils.escapeHtml(serversToQuery[index])}</span></div>
+          <div class="server-details"><span class="server-map">地图: ${utils.escapeHtml(d.map || "")}</span><span class="server-ping" style="color: ${utils.getPingColor(d.ping)};">延迟: ${d.ping}ms</span></div>
+        </div>`;
       }
-    });
-    return `<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="UTF-8">
-  <style>
-    * { margin: 0; padding: 0; box-sizing: border-box; }
-    body {
-      background: rgba(28,28,31,0.8);
-      font-family: ${config.fontFamily};
-      width: ${config.imageWidth}px;
-      min-height: ${config.imageHeight}px;
-      padding: 40px;
-      color: ${COLORS.text};
-      position: relative;
-      border: 2px solid ${COLORS.border};
-    }
-    .corner {
-      position: absolute;
-      width: 25px;
-      height: 25px;
-      border-color: ${COLORS.accent};
-      border-style: solid;
-      border-width: 0;
-    }
-    .corner-tl { top: 2px; left: 2px; border-top-width: 3px; border-left-width: 3px; }
-    .corner-tr { top: 2px; right: 2px; border-top-width: 3px; border-right-width: 3px; }
-    .corner-bl { bottom: 2px; left: 2px; border-bottom-width: 3px; border-left-width: 3px; }
-    .corner-br { bottom: 2px; right: 2px; border-bottom-width: 3px; border-right-width: 3px; }
-
-    .title {
-      text-align: center;
-      font-size: ${config.fontSize * 1.8}px;
-      color: ${COLORS.title};
-      margin-bottom: 20px;
-    }
-    .stats {
-      display: flex;
-      justify-content: space-between;
-      font-size: ${config.fontSize}px;
-      margin-bottom: 10px;
-    }
-    .divider {
-      height: 2px;
-      background: ${COLORS.gold};
-      margin: 15px 0 30px;
-    }
-    .server-item {
-      margin-bottom: 30px;
-      border-bottom: 1px solid ${COLORS.divider};
-      padding-bottom: 20px;
-    }
-    .server-item:last-child {
-      border-bottom: none;
-    }
-    .server-header {
-      display: flex;
-      align-items: center;
-      gap: 10px;
-      font-size: ${config.fontSize * 1.1}px;
-      font-weight: bold;
-      color: ${COLORS.textWhite};
-      margin-bottom: 8px;
-    }
-    .server-index {
-      color: ${COLORS.accent};
-    }
-    .server-players {
-      margin-left: auto;
-    }
-    .server-details {
-      display: flex;
-      flex-wrap: wrap;
-      gap: 20px;
-      font-size: ${config.fontSize * 0.9}px;
-      color: ${COLORS.textLight};
-    }
-    .server-details span {
-      white-space: nowrap;
-    }
-    .error .server-name {
-      color: ${COLORS.error};
-    }
-    .error-msg {
-      color: ${COLORS.error};
-      font-size: ${config.fontSize}px;
-    }
-    .timestamp {
-      margin-top: 20px;
-      font-size: ${config.fontSize * 0.8}px;
-      color: ${COLORS.timestamp};
-    }
-  </style>
-</head>
-<body>
-  <!-- 边框装饰 -->
-  <div class="corner corner-tl"></div>
-  <div class="corner corner-tr"></div>
-  <div class="corner corner-bl"></div>
-  <div class="corner corner-br"></div>
-
-  <div class="title">[服务器状态批量查询]</div>
-  <div class="stats">
-    <span>查询时间: ${now}</span>
-    <span>耗时: ${utils.formatTime(queryTime)}  成功: ${successful}/${results.length}</span>
-  </div>
-  <div class="divider"></div>
-
-  ${serversHTML}
-
-  <div class="timestamp">📋 输入 \`cs <服务器地址>\` 查询单个服务器</div>
-</body>
-</html>`;
+      return `<div class="server-item error">
+        <div class="server-header"><span class="server-index">${index + 1}.</span><span class="server-name">${utils.escapeHtml(serversToQuery[index])}</span><span class="server-status">❌ 查询失败</span></div>
+        <div class="server-details error-msg">${utils.escapeHtml(result.error || "未知错误")}</div>
+      </div>`;
+    }).join("");
+    return `<!DOCTYPE html><html><head><meta charset="UTF-8"><style>
+      ${getBaseCSS()}
+      .title { text-align: center; font-size: 1.8em; color: #71717a; margin-bottom: 20px; font-weight: bold; }
+      .stats { display: flex; justify-content: space-between; font-size: 1em; margin-bottom: 10px; }
+      .divider { background: #FFD700; margin: 15px 0 30px; }
+      .server-item { margin-bottom: 30px; border-bottom: 1px solid #555555; padding-bottom: 20px; }
+      .server-item:last-child { border-bottom: none; }
+      .server-header { display: flex; align-items: center; gap: 10px; font-size: 1.2em; font-weight: bold; color: #ffffff; margin-bottom: 8px; }
+      .server-index { color: #fbbf24; }
+      .server-players { margin-left: auto; }
+      .server-details { display: flex; flex-wrap: wrap; gap: 20px; font-size: 0.9em; color: #aaaaaa; position: relative; }
+      .server-details span { white-space: nowrap; }
+      .server-details .server-ping {position: absolute;right: 0;font-size: 24px;}
+      .error .server-name { color: #c03f36; }
+      .error-msg { color: #c03f36; font-size: 1em; }
+    </style></head><body>
+      <div class="corner corner-tl"></div><div class="corner corner-tr"></div><div class="corner corner-bl"></div><div class="corner corner-br"></div>
+      <div class="title">[服务器状态批量查询]</div>
+      <div class="stats"><span>查询时间: ${(/* @__PURE__ */ new Date()).toLocaleString("zh-CN")}</span><span>耗时: ${utils.formatTime(queryTime)} | 成功: ${successful}/${results.length}</span></div>
+      <div class="divider"></div>
+      ${serversHTML}
+      <div class="timestamp">📋 输入 \`cs 服务器地址\` 查询单个服务器</div>
+    </body></html>`;
   }
   __name(generateBatchHTML, "generateBatchHTML");
-  async function generateServerImage(data, host, port) {
-    const html = generateServerHTML(data, host, port);
+  async function renderToImage(html) {
     const page = await ctx.puppeteer.page();
     try {
-      await page.setViewport({
-        width: config.imageWidth,
-        height: config.imageHeight,
-        deviceScaleFactor: 2
-      });
-      await page.setContent(html, { waitUntil: "networkidle0" });
-      const buffer = await page.screenshot({
-        fullPage: true,
-        type: "png"
-      });
-      return buffer;
+      await page.setViewport({ width: config.imageWidth, height: config.imageHeight, deviceScaleFactor: 2 });
+      await page.setContent(html, { waitUntil: "load" });
+      return await page.screenshot({ fullPage: true, type: "png" });
     } finally {
       await page.close().catch(() => {
       });
     }
   }
-  __name(generateServerImage, "generateServerImage");
-  async function generateBatchImage(results, serversToQuery, queryTime) {
-    const html = generateBatchHTML(results, serversToQuery, queryTime);
-    const page = await ctx.puppeteer.page();
-    try {
-      await page.setViewport({
-        width: config.imageWidth,
-        height: config.imageHeight,
-        deviceScaleFactor: 2
-      });
-      await page.setContent(html, { waitUntil: "networkidle0" });
-      const buffer = await page.screenshot({
-        fullPage: true,
-        type: "png"
-      });
-      return buffer;
-    } finally {
-      await page.close().catch(() => {
-      });
-    }
-  }
-  __name(generateBatchImage, "generateBatchImage");
-  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 / cs edgebug.cn";
-    if (options.clear) {
+  __name(renderToImage, "renderToImage");
+  ctx.command("cs <address:string>", "查询服务器状态").alias("查询").alias("server").option("image", "-i 生成图片横幅").option("text", "-t 输出文本信息").option("clear", "-c 清除缓存").action(async ({ options }, address) => {
+    if (!address) return "使用格式 cs [地址:端口]\n示例 cs 127.0.0.1:27015 cs edgebug.cn";
+    if (options?.clear) {
       const count = cache.size;
       cache.clear();
       return `已清除 ${count} 条缓存记录`;
@@ -626,175 +398,120 @@ function apply(ctx, config) {
     try {
       const { host, port } = parseAddress(address);
       const data = await queryServer(host, port);
-      const shouldGenerateImage = options.image || config.generateImage && !options.text;
-      if (shouldGenerateImage) {
+      const shouldGenImage = options?.image || config.generateImage && !options?.text;
+      if (shouldGenImage) {
         try {
-          const imageBuffer = await generateServerImage(data, host, port);
-          return import_koishi.h.image(imageBuffer, "image/png");
-        } catch (imageError) {
-          console.error("生成图片失败:", imageError);
-          return `生成图片失败: ${imageError.message}，已转为文本输出。
+          return import_koishi.h.image(await renderToImage(generateServerHTML(data, host, port)), "image/png");
+        } catch (imgErr) {
+          logger.error("生成图片失败", imgErr);
+          return `生成图片失败，已转为文本输出。
 
 ${formatServerInfo(data)}
 
-${formatPlayers(data.result.players || [])}`;
+${formatPlayers(data.result.players)}`;
         }
       }
-      let message = formatServerInfo(data);
-      message += "\n\n" + formatPlayers(data.result.players || []);
-      return message;
+      return `${formatServerInfo(data)}
+
+${formatPlayers(data.result.players)}`;
     } catch (error) {
-      let errorMessage = `查询失败: ${error.message}
+      const err = error;
+      let msg = `查询失败: ${err.message}
 
 `;
-      if (error.message.includes("无法加载 gamedig")) {
-        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";
-        errorMessage += "如果不指定端口，默认使用 27015";
-      } else {
-        errorMessage += "请检查：\n";
-        errorMessage += "1. 服务器地址和端口是否正确\n";
-        errorMessage += "2. 服务器是否已开启并允许查询\n";
-        errorMessage += "3. 防火墙是否允许访问\n";
-        errorMessage += "4. 服务器是否为CS服务器";
-      }
-      return errorMessage;
+      if (err.message.includes("无效的地址格式")) msg += "地址格式应为 地址:端口，默认端口27015";
+      else msg += "请检查地址、防火墙及服务器类型";
+      return msg;
     }
   });
   ctx.command("cs.status", "检查插件状态和配置").action(async () => {
-    try {
-      const gamedigStatus = ctx.gamedig ? "✅ 可用" : "❌ 不可用";
-      let puppeteerStatus = "❌ 不可用";
-      if (ctx.puppeteer) {
-        try {
-          await ctx.puppeteer.render("<div>test</div>");
-          puppeteerStatus = "✅ 可用";
-        } catch (e) {
-          puppeteerStatus = `❌ 不可用: ${e.message}`;
-        }
+    const gamedigStatus = ctx.gamedig ? "✅ 可用" : "❌ 不可用";
+    let puppeteerStatus = "❌ 不可用";
+    if (ctx.puppeteer) {
+      try {
+        const page = await ctx.puppeteer.page();
+        await page.setContent("<div>test</div>");
+        await page.close();
+        puppeteerStatus = "✅ 可用";
+      } catch (e) {
+        puppeteerStatus = `❌ 不可用`;
       }
-      const cacheSize = cache.size;
-      return `✅ CS服务器查询插件状态
-💾 缓存数量: ${cacheSize} 条
-🕹️ Gamedig插件: ${gamedigStatus}
-🖼️ Puppeteer插件: ${puppeteerStatus}
-⚙️ 配置参数:
-   超时时间: ${config.timeout}ms
-   缓存时间: ${config.cacheTime}ms
-   重试次数: ${config.retryCount}
-   最大显示玩家数: ${config.maxPlayers}
-   显示VAC状态: ${config.showVAC ? "是" : "否"}
-   显示密码保护: ${config.showPassword ? "是" : "否"}
-   生成图片横幅: ${config.generateImage ? "是" : "否"}
-   图片宽度: ${config.imageWidth}px
-   图片最小高度: ${config.imageHeight}px
-   字体大小: ${config.fontSize}px
-   字体: ${config.fontFamily}
-
-📝 使用: cs [地址:端口]
-📝 选项: -i 生成图片, -t 输出文本, -c 清除缓存`;
-    } catch (error) {
-      return `❌ 插件状态异常: ${error.message}
-请确保已安装并启用 koishi-plugin-gamedig 和 koishi-plugin-puppeteer`;
     }
+    return `✅ CS服务器查询插件状态
+💾 缓存数量: ${cache.size}
+🗄️ 数据库服务器数量: ${(await getServerList()).length}
+🕹️ Gamedig: ${gamedigStatus}
+🖼️ Puppeteer: ${puppeteerStatus}
+⚙️ 配置: 超时=${config.timeout}ms 缓存=${config.cacheTime}ms 重试=${config.retryCount} 最大玩家=${config.maxPlayers} 图片=${config.generateImage ? "是" : "否"}`;
   });
-  ctx.command("cs.help", "查看帮助").action(() => {
-    return `🔫 CS服务器查询插件帮助
-
-📝 基本用法:
-cs [地址:端口]
-示例: cs 127.0.0.1:27015 / cs edgebug.cn
-🔧 选项:
--i 生成图片横幅
--t 输出文本信息
--c 清除缓存
+  ctx.command("cs.help", "查看帮助").action(() => `🔫 CS服务器查询插件帮助
 
-🎯 快捷命令:
-csss - 批量查询服务器状态
+📝 单服查询: cs [地址:端口]
+选项: -i 图片, -t 文本, -c 清除缓存
 
-📋 其他命令:
-cs.status - 检查插件状态和配置
-cs.help - 显示此帮助
+🎯 批量查询: csss [地址1 地址2 ...]  (不指定地址则查询数据库列表)
+管理命令:
+csss -l                查看数据库列表
+csss -a <地址:端口>    添加服务器
+csss -r <序号>         移除服务器
+csss -c                清空数据库列表
 
-💡 提示:
-1. 如果不指定端口，默认使用27015
-2. 只支持CS服务器查询
-3. 查询结果缓存${config.cacheTime}ms，使用 -c 清除缓存
-4. 需要安装 koishi-plugin-gamedig 和 koishi-plugin-puppeteer 插件`;
-  });
-  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) {
-      let listMessage = "📋 配置的服务器列表:\n";
-      config.serverList.forEach((server, index) => {
-        listMessage += `${index + 1}. ${server}
-`;
-      });
-      return listMessage;
-    }
-    if (options.add) {
+📋 状态: cs.status
+💡 默认端口27015，支持IPv6 (如 [::1]:27015)`);
+  ctx.command("csss", "批量查询服务器状态").alias("批量查询").option("list", "-l 显示配置的服务器列表").option("add", "-a <address:string> 添加服务器到列表").option("remove", "-r <index:number> 从列表中移除服务器").option("clear", "-c 清空服务器列表").option("image", "-i 生成图片横幅").option("text", "-t 输出文本信息").action(async ({ session, options }, ...addresses) => {
+    if (options?.list) {
+      const list = await getServerList();
+      if (!list.length) return "📋 服务器列表为空，请使用 csss -a 地址:端口 添加";
+      return "📋 数据库中的服务器列表\n" + list.map((s, i) => `${i + 1}. ${s}`).join("\n");
+    }
+    if (options?.add !== void 0) {
+      if (typeof options.add !== "string" || !options.add.trim()) return "❌ 请提供要添加的服务器地址\n正确用法：csss -a 127.0.0.1:27015";
       try {
         parseAddress(options.add);
-        config.serverList.push(options.add);
-        return `✅ 已添加服务器: ${options.add}
-当前列表: ${config.serverList.length} 个服务器`;
+        const added = await addServer(options.add);
+        if (!added) return `⚠️ 服务器 ${options.add} 已存在于列表中`;
+        return `✅ 已添加服务器 ${options.add}
+当前列表 ${(await getServerList()).length} 个服务器`;
       } catch (error) {
-        return `❌ 添加失败: ${error.message}
-正确格式: 地址:端口 (例如: 127.0.0.1:27015)`;
+        return `❌ 添加失败: ${error.message}`;
       }
     }
-    if (options.remove !== void 0) {
-      const index = options.remove - 1;
-      if (index >= 0 && index < config.serverList.length) {
-        const removed = config.serverList.splice(index, 1)[0];
-        return `✅ 已移除服务器: ${removed}
-当前列表: ${config.serverList.length} 个服务器`;
-      } else {
-        return `❌ 索引无效，请输入 1-${config.serverList.length} 之间的数字`;
+    if (options?.remove !== void 0) {
+      const index = options.remove;
+      if (typeof index !== "number" || !Number.isInteger(index) || index < 1) {
+        return "❌ 请提供有效的服务器序号（正整数）";
       }
+      const success = await removeServerByIndex(options.remove);
+      if (success) return `✅ 已移除序号 ${options.remove}
+当前列表 ${(await getServerList()).length} 个服务器`;
+      return `❌ 索引无效，请输入 1-${(await getServerList()).length} 之间的数字`;
     }
-    if (options.clear) {
-      const count = config.serverList.length;
-      config.serverList.length = 0;
-      return `✅ 已清空服务器列表，共移除 ${count} 个服务器`;
-    }
-    let serversToQuery;
-    if (addresses.length > 0) {
-      serversToQuery = addresses;
-    } else if (config.serverList.length > 0) {
-      serversToQuery = config.serverList;
-    } else {
-      return "❌ 没有可查询的服务器\n请使用: csss -a <地址:端口> 添加服务器\n或使用: csss <地址1> <地址2> ... 临时查询";
+    if (options?.clear) {
+      return `✅ 已清空服务器列表，共移除 ${await clearServers()} 个服务器`;
     }
+    let serversToQuery = addresses.length > 0 ? addresses : await getServerList();
+    if (!serversToQuery.length) return "❌ 没有可查询的服务器\n请使用 csss -a 地址:端口 添加服务器\n或使用 csss 地址1 地址2 ... 临时查询";
     const maxServers = 10;
     if (serversToQuery.length > maxServers) {
       serversToQuery = serversToQuery.slice(0, maxServers);
-      session?.send(`⚠️ 服务器数量超过限制，仅查询前 ${maxServers} 个`);
+      if (session) session.send(`⚠️ 服务器数量超过限制，仅查询前 ${maxServers} 个`);
     }
     try {
       const { results, queryTime } = await queryServers(serversToQuery);
-      const shouldGenerateImage = options.image || config.generateImage && !options.text;
-      if (shouldGenerateImage) {
+      const shouldGenImage = options?.image || config.generateImage && !options?.text;
+      if (shouldGenImage) {
         try {
-          const imageBuffer = await generateBatchImage(results, serversToQuery, queryTime);
-          return import_koishi.h.image(imageBuffer, "image/png");
-        } catch (imageError) {
-          console.error("生成批量查询图片失败:", imageError);
+          return import_koishi.h.image(await renderToImage(generateBatchHTML(results, serversToQuery, queryTime)), "image/png");
+        } catch (imgErr) {
+          logger.error("生成批量查询图片失败", imgErr);
         }
       }
-      let message = generateTextTable(results, serversToQuery, queryTime, "批量查询结果");
-      message += "\n📋 输入 `cs <服务器地址>` 查询单个服务器";
-      return message;
+      return generateTextTable(results, serversToQuery, queryTime) + "\n📋 输入 `cs 服务器地址` 查询单个服务器";
     } catch (error) {
       return `❌ 批量查询失败: ${error.message}`;
     }
   });
-  ctx.on("dispose", () => {
-    cache.clear();
-  });
+  ctx.on("dispose", () => cache.clear());
 }
 __name(apply, "apply");
 // Annotate the CommonJS export names for ESM import in node: