koishi-plugin-minecraft-search 0.0.2 → 0.0.3

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2025 forgetmelody
-
-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) 2025 forgetmelody
+
+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

@@ -1,9 +1,12 @@
 import { Context, Schema } from 'koishi';
 export declare const name = "minecraft-search";
+export interface ServerConfig {
+    name: string;
+    host: string;
+    port: number;
+}
 export interface Config {
-    server: string;
-    picture: '1.jpg' | '2.jpg' | '3.jpg' | '4.jpg' | '5.jpg' | '6.jpg' | '7.jpg' | '8.jpg' | '9.jpg';
-    type: 'json' | 'image';
+    servers: ServerConfig[];
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -28,57 +28,91 @@ module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
 var name = "minecraft-search";
 var Config = import_koishi.Schema.object({
-  server: import_koishi.Schema.string().description("MC服务器地址").required(),
-  type: import_koishi.Schema.union(["json", "image"]).description("返回格式类型").default("image"),
-  picture: import_koishi.Schema.union([
-    "1.jpg",
-    "2.jpg",
-    "3.jpg",
-    "4.jpg",
-    "5.jpg",
-    "6.jpg",
-    "7.jpg",
-    "8.jpg",
-    "9.jpg"
-  ]).description("背景图").default("3.jpg")
+  servers: import_koishi.Schema.array(import_koishi.Schema.object({
+    name: import_koishi.Schema.string().description("服务器名称").required(),
+    host: import_koishi.Schema.string().description("服务器地址").required(),
+    port: import_koishi.Schema.number().description("服务器端口").default(25565)
+  })).description("Minecraft服务器列表").role("table").collapse().required()
 });
 function removeFormatting(str) {
   return str.replace(/§[0-9a-fk-or]/g, "");
 }
 __name(removeFormatting, "removeFormatting");
 function apply(ctx, config) {
-  ctx.command("mc/查服").action(async ({ session }) => {
-    const { server, picture, type } = config;
-    const apiUrl = `https://api.imlazy.ink/mcapi/?name=Minecraft%20服务器&host=${server}&type=${type}&getmotd=%0a%0a&getbg=${picture}`;
+  ctx.command("mc/查服 [serverName:string]").action(async ({ session }, serverName) => {
+    const { servers } = config;
+    if (!servers || servers.length === 0) {
+      return "未配置任何Minecraft服务器";
+    }
+    if (serverName) {
+      const targetServer = servers.find(
+        (server) => server.name.toLowerCase() === serverName.toLowerCase()
+      );
+      if (!targetServer) {
+        return `未找到名为"${serverName}"的服务器。可用服务器: ${servers.map((s) => s.name).join(", ")}`;
+      }
+      return await queryServer(targetServer);
+    }
+    const results = [];
+    for (const server of servers) {
+      try {
+        const result = await queryServer(server);
+        results.push(result);
+      } catch (error) {
+        results.push(`❌ ${server.name} 查询失败: ${error.message}`);
+      }
+    }
+    return results.join("\n\n");
+  });
+  async function queryServer(server) {
+    const hostWithPort = `${server.host}:${server.port}`;
+    const apiUrl = `https://motd.minebbs.com/api/status?ip=${server.host}&port=${server.port}`;
     try {
-      if (type === "image") {
-        await session.send(`<img src="${apiUrl}"/>`);
-      } else {
-        const response = await ctx.http.get(apiUrl);
-        if (response.status !== "在线") {
-          return `服务器 ${server} 当前离线`;
-        }
-        let message = `🟢 服务器信息 [${response.name}]
+      const response = await ctx.http.get(apiUrl);
+      if (response.status !== "online") {
+        return `🔴 ${server.name}
+🌐 ${hostWithPort}
+状态: 离线`;
+      }
+      let message = `🟢 ${server.name}
+`;
+      message += `🌐 IP: ${hostWithPort}
 `;
-        message += `🔗 地址: ${response.host}
+      message += `📝 MOTD: ${removeFormatting(response.pureMotd || response.motd?.text || "无")}
 `;
-        message += `📝 MOTD: 
-${removeFormatting(response.motd.text)}
+      message += `🎮 版本: ${response.version} (协议 ${response.protocol})
 `;
-        message += `👥 玩家: ${response.players_online}/${response.players_max}
+      message += `👥 玩家: ${response.players.online}/${response.players.max}
 `;
-        if (response.players_online > 0) {
-          const playerNames = response.players.map((p) => p.name);
-          message += `🎮 在线玩家: ${playerNames.join(", ")}`;
-        } else {
-          message += "🎮 当前没有在线玩家";
-        }
-        await session.send(message);
+      message += `⏱️ 延迟: ${response.delay}ms
+`;
+      if (response.players.online > 0 && response.players.sample) {
+        const playerNames = Array.isArray(response.players.sample) ? response.players.sample : response.players.sample.split(", ");
+        message += `🎯 在线玩家: ${playerNames.join(", ")}`;
+      } else if (response.players.online > 0) {
+        message += "🎯 在线玩家: 有玩家在线但未获取到列表";
+      } else {
+        message += "🎯 当前没有在线玩家";
       }
+      return message;
     } catch (error) {
-      ctx.logger("minecraft-search").warn("查询服务器失败", error);
-      return `查询服务器失败: ${error.message}`;
+      ctx.logger("minecraft-search").warn(`查询服务器 ${server.name} 失败`, error);
+      throw new Error(`查询失败: ${error.message}`);
     }
+  }
+  __name(queryServer, "queryServer");
+  ctx.command("mc/服务器列表").action(async ({ session }) => {
+    const { servers } = config;
+    if (!servers || servers.length === 0) {
+      return "未配置任何Minecraft服务器";
+    }
+    const serverList = servers.map(
+      (server) => `• ${server.name} - ${server.host}:${server.port}`
+    ).join("\n");
+    return `📋 已配置的Minecraft服务器:
+${serverList}
+
+使用"mc/查服 服务器名称"查询特定服务器`;
   });
 }
 __name(apply, "apply");

package/package.json

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

package/readme.md

@@ -2,4 +2,4 @@
 
 [![npm](https://img.shields.io/npm/v/koishi-plugin-minecraft-search?style=flat-square)](https://www.npmjs.com/package/koishi-plugin-minecraft-search)
 
-使用雫 API查询基础的mc服务器信息
+使用API查询基础的mc服务器信息