koishi-plugin-minecraft-search 1.2.0 → 1.2.1

package/lib/index.d.ts

@@ -5,6 +5,7 @@ export interface ServerConfig {
     name: string;
     host: string;
     minekuaiInstanceId?: string;
+    timeout?: number;
     serverType?: 'java' | 'bedrock';
 }
 export interface Config {

package/lib/index.js

@@ -34,6 +34,7 @@ var Config = import_koishi.Schema.intersect([
       name: import_koishi.Schema.string().required().description("服务器名称"),
       host: import_koishi.Schema.string().required().description("服务器地址"),
       serverType: import_koishi.Schema.union(["java", "bedrock"]).default("java").description("服务器类型"),
+      timeout: import_koishi.Schema.number().default(5).description("查询超时时间(秒)"),
       minekuaiInstanceId: import_koishi.Schema.string().description("麦块实例ID (可选)")
     })).description("服务器列表").role("table").required()
   }).description("服务器配置"),
@@ -93,38 +94,36 @@ function apply(ctx, config) {
     try {
       const defaultPort = server.serverType === "bedrock" ? 19132 : 25565;
       const { host, port } = parseServerAddress(server.host, defaultPort);
-      const apiUrl = `https://api.imlazy.ink/mcapi/?name=${encodeURIComponent(server.name)}&host=${encodeURIComponent(`${host}:${port}`)}&type=json&getmotd=%0a%0a&getbg=1.jpg`;
-      const response = await ctx.http.get(apiUrl);
-      let versionInfo = null;
-      if (response.motd && response.motd.text) {
-        const cleanMotd = response.motd.text.replace(/§[0-9a-fk-or]/gi, "");
-        const versionMatch = cleanMotd.match(/(v?\d+\.\d+\.?\d*)/);
-        if (versionMatch) {
-          versionInfo = {
-            name: versionMatch[0],
-            name_clean: versionMatch[0]
-          };
-        }
-      }
+      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 === "在线",
-        host,
-        port,
-        players: response.players_online !== null ? {
-          online: response.players_online,
-          max: response.players_max,
-          list: response.players
-        } : null,
-        version: response.version ? {
+        online: response.status === "online",
+        host: response.host.split(":")[0],
+        // 只使用主机名，不包含端口
+        port: parseInt(response.host.split(":")[1]) || port,
+        version: {
           name: response.version,
-          name_clean: response.version
-        } : versionInfo,
-        motd: response.motd ? {
-          clean: response.motd.text.replace(/§[0-9a-fk-or]/gi, ""),
+          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
-        } : null,
-        software: response.software,
-        retrieved_at: (/* @__PURE__ */ new Date()).toISOString()
+        },
+        icon: response.icon,
+        retrieved_at: (/* @__PURE__ */ new Date()).toISOString(),
+        // 保留原有结构中的其他字段
+        software: void 0,
+        ip_address: host
       };
       return {
         success: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-minecraft-search",
   "description": "使用API查询基础的mc服务器信息",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [