koishi-plugin-csss 1.2.0 → 2.0.0

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 import { Context, Schema } from 'koishi';
-export declare const name = "cs-server-status";
+export declare const name = "csss";
+export declare const inject: string[];
 export interface Config {
     timeout: number;
     cacheTime: number;
@@ -14,15 +15,6 @@ export interface Config {
     fontFamily: string;
     serverList: string[];
     batchTimeout: number;
-    scheduleEnabled: boolean;
-    scheduleInterval: number;
-    scheduleStartTime: string;
-    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

@@ -27,7 +27,8 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
-var name = "cs-server-status";
+var name = "csss";
+var inject = ["canvas", "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为禁用缓存)"),
@@ -39,24 +40,15 @@ var Config = import_koishi.Schema.object({
   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("Microsoft YaHei, sans-serif").description("字体家族"),
-  serverList: import_koishi.Schema.array(import_koishi.Schema.string()).role("table").description("批量查询服务器列表（格式: 地址:端口，每行一个）").default([
+  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:27018",
+    "edgebug.cn:27019"
   ]),
-  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("定时任务是否使用图片格式输出"),
-  // QQ适配器配置
-  qqAdapterName: import_koishi.Schema.string().default("qq").description('QQ适配器名称（默认为"qq"，如果在QQ配置中指定了其他名称请修改）'),
-  useFullChannelId: import_koishi.Schema.boolean().default(true).description("是否使用完整的频道ID格式（推荐开启）")
+  batchTimeout: import_koishi.Schema.number().min(1e3).max(6e4).default(15e3).description("批量查询总超时时间(毫秒)")
 });
 var COLORS = {
   background: "rgba(28,28,31,0.80)",
@@ -109,28 +101,10 @@ var utils = {
     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 插件");
@@ -175,7 +149,7 @@ function apply(ctx, config) {
     message += `✅ 成功: ${successful} 个 | ❌ 失败: ${failed} 个
 
 `;
-    message += "序号 服务器名称    在线人数\n";
+    message += "序号 服务器名称       在线人数\n";
     message += "──────────────────────────────\n";
     results.forEach((result, index) => {
       const serverInfo = serversToQuery[index];
@@ -202,77 +176,6 @@ function apply(ctx, config) {
     return message;
   }
   __name(generateTextTable, "generateTextTable");
-  async function executeScheduleTask() {
-    if (!config.scheduleEnabled || config.scheduleGroups.length === 0 || config.serverList.length === 0) {
-      return;
-    }
-    if (!utils.isWithinScheduleTime(config.scheduleStartTime, config.scheduleEndTime)) {
-      return;
-    }
-    try {
-      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, serversToQuery, queryTime);
-          outputContent = import_koishi.h.image(imageBuffer, "image/png");
-        } catch (imageError) {
-          console.error("定时任务生成图片失败:", imageError);
-          outputContent = `🕒 ${timeStr} 服务器状态更新
-生成图片失败，使用文本格式：
-
-`;
-        }
-      }
-      if (typeof outputContent === "string" || !config.scheduleUseImage) {
-        const textMessage = generateTextTable(results, serversToQuery, queryTime, "服务器状态更新");
-        outputContent = `🕒 ${timeStr}
-
-${textMessage}`;
-      }
-      for (const groupId of config.scheduleGroups) {
-        try {
-          const formattedGroupId = utils.formatGroupId(groupId, config.qqAdapterName, config.useFullChannelId);
-          await ctx.broadcast([formattedGroupId], outputContent);
-          console.log(`定时任务消息已发送到群组: ${formattedGroupId}`);
-        } catch (error) {
-          console.error(`定时任务发送消息到群组 ${groupId} 失败:`, error);
-        }
-      }
-    } catch (error) {
-      console.error("定时任务执行失败:", error);
-    }
-  }
-  __name(executeScheduleTask, "executeScheduleTask");
-  function startScheduleTask() {
-    if (scheduleTimer) {
-      clearInterval(scheduleTimer);
-    }
-    if (config.scheduleEnabled && config.scheduleInterval > 0) {
-      const intervalMs = config.scheduleInterval * 60 * 1e3;
-      executeScheduleTask();
-      scheduleTimer = setInterval(executeScheduleTask, intervalMs);
-      console.log(`定时任务已启动，间隔: ${config.scheduleInterval}分钟，时间范围: ${config.scheduleStartTime}-${config.scheduleEndTime}`);
-    }
-  }
-  __name(startScheduleTask, "startScheduleTask");
-  function stopScheduleTask() {
-    if (scheduleTimer) {
-      clearInterval(scheduleTimer);
-      scheduleTimer = null;
-      console.log("定时任务已停止");
-    }
-  }
-  __name(stopScheduleTask, "stopScheduleTask");
-  ctx.on("config", () => {
-    if (config.scheduleEnabled) {
-      startScheduleTask();
-    } else {
-      stopScheduleTask();
-    }
-  });
   function parseAddress(input) {
     let address = input.replace(/^(http|https|udp|tcp):\/\//, "");
     if (address.includes("[")) {
@@ -292,7 +195,7 @@ ${textMessage}`;
       return { host: parts[0], port: 27015 };
     }
     throw new Error(`无效的地址格式: ${input}
-正确格式: 地址:端口 或 地址`);
+正确格式: [地址]:[端口] 或 [地址]`);
   }
   __name(parseAddress, "parseAddress");
   async function queryServer(host, port) {
@@ -434,7 +337,7 @@ ${textMessage}`;
     drawPlayerList(ctx2, players, startY, width, maxHeight, params) {
       let y = startY;
       if (players.length === 0) {
-        this.drawText(ctx2, "服务器当前无在线玩家", 80, y, { color: COLORS.textLight });
+        this.drawText(ctx2, "服务器当前无玩家在线", 80, y, { color: COLORS.textLight });
         return { y: y + 35, displayedCount: 0 };
       }
       const sortedPlayers = [...players].sort((a, b) => {
@@ -494,7 +397,7 @@ ${textMessage}`;
         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);
@@ -554,7 +457,7 @@ ${textMessage}`;
     if (result.name) {
       const cleanName = utils.cleanName(result.name);
       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.drawTitle(ctx2d, cleanName, width / 2, titleY + 50, fontSize * 1.8, config.fontFamily, COLORS.highlight);
     }
     imageUtils.drawDivider(ctx2d, 80, titleY + 80, width - 80, titleY + 80, COLORS.border, 2);
     let y = titleY + 120;
@@ -664,122 +567,8 @@ ${textMessage}`;
     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 }).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}
-间隔: ${config.scheduleInterval}分钟
-时间范围: ${config.scheduleStartTime} - ${config.scheduleEndTime}
-输出格式: ${config.scheduleUseImage ? "图片" : "文本"}
-监控服务器: ${config.serverList.length}个
-目标群组: ${groups}个
-QQ适配器: ${qqStatus} (名称: ${config.qqAdapterName})
-群组ID格式: ${config.useFullChannelId ? "适配器:群号" : "群号"}
-
-使用 cs.schedule -h 查看所有命令选项`;
-    }
-    if (options.start) {
-      config.scheduleEnabled = true;
-      startScheduleTask();
-      return "✅ 定时任务已启动";
-    }
-    if (options.stop) {
-      config.scheduleEnabled = false;
-      stopScheduleTask();
-      return "✅ 定时任务已停止";
-    }
-    if (options.test) {
-      await executeScheduleTask();
-      return "✅ 定时任务测试执行完成";
-    }
-    if (options.run) {
-      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) {
-      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 `❌ 群组 ${groupId} 已在列表中`;
-      }
-    }
-    if (options.removeGroup) {
-      const index = config.scheduleGroups.indexOf(options.removeGroup);
-      if (index !== -1) {
-        config.scheduleGroups.splice(index, 1);
-        return `✅ 已从定时任务移除群组 ${options.removeGroup}`;
-      } else {
-        return `❌ 群组 ${options.removeGroup} 不在列表中`;
-      }
-    }
-    if (options.listGroups) {
-      if (config.scheduleGroups.length === 0) {
-        return "📋 定时任务群组列表为空\n使用 cs.schedule -a <群组ID> 添加群组";
-      }
-      let message = "📋 定时任务群组列表:\n";
-      config.scheduleGroups.forEach((groupId, index) => {
-        message += `${index + 1}. ${groupId}
-`;
-      });
-      return message;
-    }
-    return `📅 定时任务管理命令
-
-选项:
--s, -status      查看定时任务状态
--S, -start       启动定时任务
--T, -stop        停止定时任务
--t, -test        测试定时任务
--R, -run         立即执行一次定时任务
--q, -testQQ      测试QQ适配器连接
--a, -addGroup    添加群组到定时任务
--r, -removeGroup 从定时任务移除群组
--l, -listGroups  列出定时任务群组
-
-示例:
-cs.schedule -s          # 查看状态
-cs.schedule -S          # 启动定时任务
-cs.schedule -a 123456   # 添加群组123456
-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";
+    if (!address) return "使用格式: cs [地址:端口]\n示例: cs 127.0.0.1:27015 / cs edgebug.cn";
     if (options.clear) {
       const count = cache.size;
       cache.clear();
@@ -837,16 +626,10 @@ cs.schedule -q          # 测试QQ适配器连接`;
         }
       }
       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} 条
 🕹️ Gamedig插件: ${gamedigStatus}
 🖼️ Canvas插件: ${canvasStatus}
-📅 定时任务: ${scheduleStatus} (${scheduleTimerStatus})
-🤖 QQ适配器: ${qqStatus} (名称: ${config.qqAdapterName})
 ⚙️ 配置参数:
    超时时间: ${config.timeout}ms
    缓存时间: ${config.cacheTime}ms
@@ -857,11 +640,9 @@ cs.schedule -q          # 测试QQ适配器连接`;
    生成图片横幅: ${config.generateImage ? "是" : "否"}
    图片最小高度: ${config.imageHeight}px
    字体大小: ${config.fontSize}px
-   群组ID格式: ${config.useFullChannelId ? "适配器:群号" : "群号"}
 
 📝 使用: cs [地址:端口]
-📝 选项: -i 生成图片, -t 输出文本, -c 清除缓存
-📅 定时任务: cs.schedule 查看定时任务管理`;
+📝 选项: -i 生成图片, -t 输出文本, -c 清除缓存`;
     } catch (error) {
       return `❌ 插件状态异常: ${error.message}
 请确保已安装并启用 koishi-plugin-gamedig 和 koishi-plugin-canvas 插件`;
@@ -872,9 +653,7 @@ cs.schedule -q          # 测试QQ适配器连接`;
 
 📝 基本用法:
 cs [地址:端口]
-示例: cs 127.0.0.1:27015
-示例: cs edgebug.cn
-
+示例: cs 127.0.0.1:27015 / cs edgebug.cn
 🔧 选项:
 -i 生成图片横幅
 -t 输出文本信息
@@ -882,18 +661,11 @@ cs [地址:端口]
 
 🎯 快捷命令:
 csss - 批量查询服务器状态
-cs.schedule - 定时任务管理
 
 📋 其他命令:
 cs.status - 检查插件状态和配置
 cs.help - 显示此帮助
 
-📅 定时任务:
-定时自动向指定QQ群组发送服务器状态
-配置: 插件配置面板中设置
-管理: cs.schedule 命令
-群组ID格式: ${config.useFullChannelId ? "适配器:群号 (如: qq:123456)" : "群号 (如: 123456)"}
-
 💡 提示:
 1. 如果不指定端口，默认使用27015
 2. 只支持CS服务器查询
@@ -960,23 +732,17 @@ cs.help - 显示此帮助
         }
       }
       let message = generateTextTable(results, serversToQuery, queryTime, "批量查询结果");
-      message += "\n📋 输入 `cs <序号>` 查看服务器详情";
       message += "\n📋 输入 `cs <服务器地址>` 查询单个服务器";
       return message;
     } catch (error) {
       return `❌ 批量查询失败: ${error.message}`;
     }
   });
-  if (config.scheduleEnabled) {
-    startScheduleTask();
-  }
   ctx.on("dispose", () => {
     cache.clear();
-    stopScheduleTask();
   });
 }
 __name(apply, "apply");
-var inject = ["canvas", "gamedig", "database"];
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Config,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-csss",
   "description": "Check the status of the CS server",
-  "version": "1.2.0",
+  "version": "2.0.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -9,6 +9,11 @@
     "dist"
   ],
   "license": "MIT",
+  "homepage": "https://github.com/sanksu/koishi-plugin-csss",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sanksu/koishi-plugin-csss.git"
+  },
   "keywords": [
     "chatbot",
     "koishi",