koishi-plugin-minecraft-search 1.2.2 → 1.3.1

package/lib/index.js

@@ -26,6 +26,7 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
+var import_mc_server_util = require("mc-server-util");
 var name = "minecraft-search";
 var Config = import_koishi.Schema.intersect([
   import_koishi.Schema.object({
@@ -94,37 +95,16 @@ function apply(ctx, config) {
     try {
       const defaultPort = server.serverType === "bedrock" ? 19132 : 25565;
       const { host, port } = parseServerAddress(server.host, defaultPort);
-      const apiUrl = `https://motd.minebbs.com/api/status`;
-      const params = new URLSearchParams();
-      params.append("ip", host);
-      params.append("port", port.toString());
-      params.append("stype", server.serverType === "bedrock" ? "be" : "je");
-      const response = await ctx.http.get(`${apiUrl}?${params.toString()}`);
-      const result = {
-        online: response.status === "online",
-        host: response.host.split(":")[0],
-        // 只使用主机名，不包含端口
-        port: parseInt(response.host.split(":")[1]) || port,
-        version: {
-          name: response.version,
-          name_clean: response.version,
-          protocol: response.protocol
-        },
-        players: {
-          online: response.players.online,
-          max: response.players.max,
-          list: response.players.sample ? [{ name_clean: response.players.sample }] : []
-        },
-        motd: {
-          clean: response.pureMotd,
-          raw: response.motd.text
-        },
-        icon: response.icon,
-        retrieved_at: (/* @__PURE__ */ new Date()).toISOString(),
-        // 保留原有结构中的其他字段
-        software: void 0,
-        ip_address: host
-      };
+      const timeout = (server.timeout || 5) * 1e3;
+      let result;
+      if (server.serverType === "bedrock") {
+        throw new Error("Bedrock服务器暂不支持");
+      } else {
+        result = await (0, import_mc_server_util.getMinecraftServerStatus)(host, port, {
+          timeout,
+          debug: false
+        });
+      }
       return {
         success: true,
         data: result,
@@ -144,7 +124,7 @@ function apply(ctx, config) {
       return `🔴 ${server.name} - 离线`;
     }
     const players = result.players ? `${result.players.online}/${result.players.max}` : "N/A";
-    const version = result.version ? result.version.name_clean || result.version.name : "N/A";
+    const version = result.version ? result.version.name : "N/A";
     return `🟢 ${server.name} - 在线 | 玩家: ${players} | 版本: ${version}`;
   }
   __name(formatShortStatus, "formatShortStatus");
@@ -153,33 +133,46 @@ function apply(ctx, config) {
       return `🔴 服务器 ${server.name} (${server.host}) 当前离线`;
     }
     let motdText = "暂无描述";
-    if (result.motd && result.motd.clean) {
-      motdText = result.motd.clean.replace(/\n/g, " ").replace(/\s+/g, " ").trim();
+    if (result.description) {
+      let descriptionStr = result.description;
+      if (typeof descriptionStr !== "string") {
+        if (typeof descriptionStr === "object" && descriptionStr !== null) {
+          if (descriptionStr.text) {
+            descriptionStr = descriptionStr.text;
+          } else {
+            descriptionStr = JSON.stringify(descriptionStr);
+          }
+        } else {
+          descriptionStr = String(descriptionStr);
+        }
+      }
+      descriptionStr = descriptionStr.replace(/§[0-9a-fk-or]/gi, "");
+      motdText = descriptionStr.replace(/\n/g, " ").replace(/\s+/g, " ").trim();
     }
+    const defaultPort = server.serverType === "bedrock" ? 19132 : 25565;
+    const { host, port } = parseServerAddress(server.host, defaultPort);
     let message = `🟢 ${server.name} 状态信息
 `;
-    message += `📡 地址: ${result.host}:${result.port}
+    message += `📡 地址: ${host}:${port}
 `;
     message += `🎮 类型: ${server.serverType || "Java"}
 `;
     if (result.version) {
-      message += `📦 版本: ${result.version.name_clean || result.version.name}
+      message += `📦 版本: ${result.version.name}
 `;
     }
     if (result.players) {
       message += `👥 人数: ${result.players.online}/${result.players.max}
 `;
-      if (result.players.list && result.players.list.length > 0) {
-        const allPlayers = result.players.list.map((p) => p.name_clean).join(", ");
+      if (result.players.sample && result.players.sample.length > 0) {
+        const allPlayers = result.players.sample.map((p) => p.name).join(", ");
         message += `👤 在线玩家: ${allPlayers}
 `;
       }
     }
     message += `📋 MOTD: ${motdText}
 `;
-    if (result.software) {
-    }
-    message += `⏰ 查询时间: ${new Date(result.retrieved_at).toLocaleString("zh-CN")}`;
+    message += `⏰ 查询时间: ${(/* @__PURE__ */ new Date()).toLocaleString("zh-CN")}`;
     return message;
   }
   __name(formatDetailedStatus, "formatDetailedStatus");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-minecraft-search",
   "description": "使用API查询基础的mc服务器信息",
-  "version": "1.2.2",
+  "version": "1.3.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -12,14 +12,20 @@
   "keywords": [
     "chatbot",
     "koishi",
-    "plugin"
+    "plugin",
+    "minecraft",
+    "server",
+    "status"
   ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/yourusername/koishi-plugin-minecraft-search.git"
+  },
+  "homepage": "https://github.com/yourusername/koishi-plugin-minecraft-search",
   "peerDependencies": {
     "koishi": "^4.18.7"
   },
-  "homepage": "https://github.com/forgetmelodyXL/minecraft-search",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/forgetmelodyXL/minecraft-search.git"
+  "dependencies": {
+    "mc-server-util": "^1.0.0"
   }
 }

package/readme.md

@@ -7,10 +7,11 @@
 ## 功能特性
 
 ### 🎮 服务器状态查询
-- 支持 Java 版和基岩版服务器
+- 支持 Java 版服务器
 - 支持查询全部服务器状态（简短信息）
 - 支持查询指定服务器状态（详细信息）
-- 可配置查询超时时间和 Query 查询选项
+- 可配置查询超时时间
+- 自动移除 Minecraft 颜色代码，显示纯文本 MOTD
 
 ### ⚡ 服务器电源控制
 - 支持通过麦块联机 API 启动服务器
@@ -80,9 +81,7 @@ minekuaiSettings: {
 
 ### 服务器类型 (serverType)
 - `java`：Java 版服务器（默认）
-- `bedrock`：基岩版服务器
-
-
+- `bedrock`：基岩版服务器（暂不支持）
 
 ### 超时时间 (timeout)
 - 默认值：5.0 秒
@@ -98,7 +97,7 @@ minekuaiSettings: {
 
 ## 依赖说明
 
-- 使用 https://motd.minebbs.com/api/status API 进行服务器状态查询
+- 使用 https://www.npmjs.com/package/mc-server-util 库进行服务器状态查询
 - 支持麦块联机平台的 API 集成
 - 基于 Koishi 框架开发
 
@@ -119,12 +118,12 @@ minekuaiSettings: {
 
 ## 更新日志
 
-### v1.2.0
-- 新增强制重启服务器功能
-- 修正包名为 koishi-plugin-minecraft-search
-- 更新服务器状态查询使用 minebbs.com API
-- 优化服务器状态查询输出格式，添加服务器ID显示
-- 改进服务器状态汇总信息，显示在线服务器数量
+### v1.3.0
+- 替换服务器状态查询库为 mc-server-util
+- 移除对基岩版服务器的支持（暂不支持）
+- 移除 Query 查询选项
+- 添加自动移除 Minecraft 颜色代码功能
+- 优化错误处理和类型检查
 
 ### v1.1.1
 - 初始版本发布