koishi-plugin-minecraft-search 0.1.2 → 1.0.1

package/lib/index.d.ts

@@ -10,6 +10,7 @@ export interface Config {
     servers: ServerConfig[];
     querySettings: QuerySettings;
     minekuaiSettings: MinekuaiSettings;
+    apiSettings: ApiSettings;
 }
 export interface QuerySettings {
     defaultTimeout: number;
@@ -24,5 +25,12 @@ export interface MinekuaiSettings {
     apiUrl: string;
     apiKey: string;
 }
+export interface ApiSettings {
+    apiProvider: 'mcstatus' | 'lazy';
+    lazyApiUrl: string;
+    useBackup: boolean;
+    returnType: 'json' | 'image' | 'html';
+    autoDetectBedrock: boolean;
+}
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -28,6 +28,23 @@ module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
 var name = "minecraft-status";
 var Config = import_koishi.Schema.intersect([
+  // 新增：API配置分类
+  import_koishi.Schema.object({
+    apiSettings: import_koishi.Schema.object({
+      apiProvider: import_koishi.Schema.union([
+        import_koishi.Schema.const("mcstatus").description("mcstatus.io API (默认)"),
+        import_koishi.Schema.const("lazy").description("Lazy Minecraft API")
+      ]).description("API提供商选择").default("mcstatus"),
+      lazyApiUrl: import_koishi.Schema.string().description("Lazy API地址").default("https://api.imlazy.ink/mcapi"),
+      useBackup: import_koishi.Schema.boolean().description("使用备用API地址").default(false),
+      returnType: import_koishi.Schema.union([
+        import_koishi.Schema.const("json").description("JSON格式"),
+        import_koishi.Schema.const("image").description("图片格式"),
+        import_koishi.Schema.const("html").description("网页格式")
+      ]).description("返回类型 (仅Lazy API)").default("json"),
+      autoDetectBedrock: import_koishi.Schema.boolean().description("自动检测基岩版服务器").default(true)
+    })
+  }).description("API设置"),
   import_koishi.Schema.object({
     servers: import_koishi.Schema.array(import_koishi.Schema.object({
       id: import_koishi.Schema.number().required().description("服务器ID (数字)"),
@@ -131,7 +148,25 @@ function apply(ctx, config) {
       return `❌ 重启服务器 ${server.name} 失败: ${error.message}`;
     }
   });
-  ctx.command("mcstatus [server]", "查询 Minecraft 服务器状态").alias("服务器状态", "查服").option("list", "-l 查看服务器列表").option("info", "-i <id> 查看服务器详细信息", { type: "number" }).option("timeout", "-t <seconds> 设置超时时间", { type: "number" }).option("force", "-f 强制刷新缓存").action(async ({ session, options }, server) => {
+  ctx.command("mcstatus [server]", "查询 Minecraft 服务器状态").alias("服务器状态", "查服").option("list", "-l 查看服务器列表").option("info", "-i <id> 查看服务器详细信息", { type: "number" }).option("timeout", "-t <seconds> 设置超时时间", { type: "number" }).option("force", "-f 强制刷新缓存").option("api", "-a <provider> 临时切换API提供商", { type: "string" }).action(async ({ session, options }, server) => {
+    if (options.api) {
+      const tempProvider = options.api.toLowerCase();
+      if (["mcstatus", "lazy"].includes(tempProvider)) {
+        const originalProvider = config.apiSettings.apiProvider;
+        config.apiSettings.apiProvider = tempProvider;
+        try {
+          const result = await handleMcStatusCommand(server, options);
+          return result;
+        } finally {
+          config.apiSettings.apiProvider = originalProvider;
+        }
+      } else {
+        return "❌ 无效的API提供商，可选: mcstatus, lazy";
+      }
+    }
+    return await handleMcStatusCommand(server, options);
+  });
+  async function handleMcStatusCommand(server, options) {
     if (options.list) {
       return getServerList(config.servers);
     }
@@ -150,7 +185,8 @@ function apply(ctx, config) {
       return getServerInfo(serverConfig, config, options.force, options.timeout || config.querySettings.defaultTimeout);
     }
     return getDirectServerStatus(server, config, options.force, options.timeout || config.querySettings.defaultTimeout);
-  });
+  }
+  __name(handleMcStatusCommand, "handleMcStatusCommand");
   function getServerList(servers) {
     if (servers.length === 0) {
       return "暂无服务器配置，请在插件配置中添加服务器。";
@@ -231,12 +267,18 @@ function apply(ctx, config) {
           iconElement ? (0, import_koishi.h)("span", [iconElement, " "]) : "",
           `🟢 ${server.name}`
         ]),
-        (0, import_koishi.h)("p", `📍 地址: ${server.host}`),
-        (0, import_koishi.h)("p", `🎮 版本: ${status.version.name_clean} (协议: ${status.version.protocol})`),
+        (0, import_koishi.h)("p", `📍 地址: ${server.host}`)
+      );
+      let versionDisplay = `🎮 版本: ${status.version.name_clean}`;
+      if (status.version.protocol && status.version.protocol !== 0) {
+        versionDisplay += ` (协议: ${status.version.protocol})`;
+      }
+      message.children.push((0, import_koishi.h)("p", versionDisplay));
+      message.children.push(
         (0, import_koishi.h)("p", `📅 状态获取时间: ${new Date(status.retrieved_at).toLocaleString("zh-CN")}`)
       );
       if (status.motd) {
-        const cleanMotd = status.motd.clean.replace(/\n/g, " ").replace(/\s+/g, " ").trim();
+        let cleanMotd = status.motd.clean.replace(/\n/g, " ").replace(/\s+/g, " ").trim().replace(/§./g, "");
         if (cleanMotd) {
           message.children.push(
             (0, import_koishi.h)("p", "📋 MOTD: " + cleanMotd.substring(0, 100) + (cleanMotd.length > 100 ? "..." : ""))
@@ -254,11 +296,6 @@ function apply(ctx, config) {
           );
         }
       }
-      if (status.software) {
-        message.children.push(
-          (0, import_koishi.h)("p", `💻 核心: ${status.software}`)
-        );
-      }
       if (config2.querySettings.showPlugins && status.plugins && status.plugins.length > 0) {
         const pluginCount = status.plugins.length;
         const pluginList = status.plugins.slice(0, 5).map((p) => p.version ? `${p.name} v${p.version}` : p.name).join(", ");
@@ -273,11 +310,6 @@ function apply(ctx, config) {
           (0, import_koishi.h)("p", `⚙️ 模组 (${modCount}个): ${modList}`)
         );
       }
-      if (status.srv_record) {
-        message.children.push(
-          (0, import_koishi.h)("p", `🔗 SRV记录: ${status.srv_record.host}:${status.srv_record.port}`)
-        );
-      }
       if (status.expires_at) {
         const cacheTime = Math.max(0, Math.floor((status.expires_at - Date.now()) / 1e3));
         message.children.push(
@@ -322,31 +354,143 @@ function apply(ctx, config) {
     if (!address || address.trim() === "") {
       throw new Error("服务器地址不能为空");
     }
-    const cacheKey = `mcstatus:${address}:${enableQuery}`;
+    const cacheKey = `mcstatus:${address}:${enableQuery}:${config.apiSettings.apiProvider}`;
     if (!force) {
       const cached = cache.get(cacheKey);
       if (cached && Date.now() - cached.timestamp < config.querySettings.cacheTime * 1e3) {
         return cached.data;
       }
     }
-    const url = `https://api.mcstatus.io/v2/status/java/${encodeURIComponent(address)}`;
-    const params = {
-      query: enableQuery.toString(),
-      timeout: timeout.toString()
-    };
+    let response;
+    const { apiProvider } = config.apiSettings;
     try {
-      const response = await ctx.http.get(url, { params });
+      if (apiProvider === "lazy") {
+        response = await queryWithLazyApi(address, timeout);
+      } else {
+        const url = `https://api.mcstatus.io/v2/status/java/${encodeURIComponent(address)}`;
+        const params = {
+          query: enableQuery.toString()
+        };
+        response = await ctx.http.get(url, {
+          params,
+          timeout: timeout * 1e3 + 5e3
+        });
+      }
       cache.set(cacheKey, {
         data: response,
         timestamp: Date.now()
       });
+      ctx.logger.debug(`${apiProvider.toUpperCase()} API查询成功: ${address}`);
       return response;
     } catch (error) {
-      ctx.logger.error(`查询服务器状态失败: ${address}`, error);
-      throw new Error(`查询服务器状态失败: ${address}`);
+      ctx.logger.error(`${apiProvider.toUpperCase()} API查询失败: ${address}`, error);
+      throw new Error(`查询服务器状态失败: ${address} (${error.message})`);
     }
   }
   __name(getServerStatus, "getServerStatus");
+  async function queryWithLazyApi(host, timeout) {
+    const { lazyApiUrl, useBackup, returnType, autoDetectBedrock } = config.apiSettings;
+    const baseUrl = useBackup ? "https://api.lazy.ink/mcapi" : lazyApiUrl;
+    const params = new URLSearchParams({
+      type: returnType,
+      host
+    });
+    if (autoDetectBedrock) {
+      params.append("be", "false");
+    }
+    const url = `${baseUrl}?${params.toString()}`;
+    try {
+      const response = await ctx.http.get(url, { timeout: timeout * 1e3 });
+      return transformLazyResponse(response, host);
+    } catch (error) {
+      ctx.logger.error("Lazy API查询失败:", error);
+      throw new Error(`Lazy API查询失败: ${error.message}`);
+    }
+  }
+  __name(queryWithLazyApi, "queryWithLazyApi");
+  function transformLazyResponse(lazyData, host) {
+    let cleanMotd = "";
+    if (lazyData.motd && lazyData.motd.extra) {
+      cleanMotd = lazyData.motd.extra.map((item) => item.text).join("");
+      cleanMotd = cleanMotd.replace(/§./g, "");
+    }
+    let versionName = lazyData.version || "Unknown";
+    if (versionName === "Unknown" || !versionName) {
+      versionName = "未知";
+    }
+    return {
+      online: lazyData.status === "在线",
+      host: lazyData.host || host,
+      version: {
+        name_clean: versionName,
+        protocol: lazyData.protocol || 0
+      },
+      players: {
+        online: lazyData.players_online || 0,
+        max: lazyData.players_max || 0,
+        list: (lazyData.players || []).map((p) => ({
+          name_clean: p.name
+        }))
+      },
+      motd: {
+        clean: cleanMotd || lazyData.motd?.text || "A Minecraft Server"
+      },
+      icon: lazyData.favicon || null,
+      software: lazyData.software || "",
+      plugins: lazyData.plugins || [],
+      mods: lazyData.mods || [],
+      retrieved_at: Date.now(),
+      expires_at: Date.now() + config.querySettings.cacheTime * 1e3
+    };
+  }
+  __name(transformLazyResponse, "transformLazyResponse");
+  ctx.command("mcstatus.api", "检查API状态").option("switch", "-s <provider> 切换API提供商", { type: "string" }).option("test", "-t 测试所有API").action(async ({ session, options }) => {
+    if (options.switch) {
+      if (["mcstatus", "lazy"].includes(options.switch.toLowerCase())) {
+        config.apiSettings.apiProvider = options.switch.toLowerCase();
+        return `✅ 已切换API提供商为: ${options.switch.toUpperCase()}`;
+      } else {
+        return "❌ 无效的API提供商，可选: mcstatus, lazy";
+      }
+    }
+    if (options.test) {
+      const testServers = [
+        { name: "Hypixel", host: "mc.hypixel.net" },
+        { name: "演示服务器", host: "demo.mcstatus.io" }
+      ];
+      const results = [];
+      for (const server of testServers) {
+        try {
+          const startTime = Date.now();
+          await getServerStatus(server.host, 5, false, true);
+          const responseTime = Date.now() - startTime;
+          results.push(`🟢 ${server.name}: ${responseTime}ms`);
+        } catch (error) {
+          results.push(`🔴 ${server.name}: 失败`);
+        }
+      }
+      return (0, import_koishi.h)("message", [
+        (0, import_koishi.h)("p", `当前API提供商: ${config.apiSettings.apiProvider.toUpperCase()}`),
+        (0, import_koishi.h)("p", "API测试结果:"),
+        ...results.map((r) => (0, import_koishi.h)("p", r)),
+        (0, import_koishi.h)(
+          "p",
+          { style: { fontSize: "12px", color: "#888" } },
+          '使用 "mcstatus.api -s <provider>" 切换API'
+        )
+      ]);
+    }
+    return (0, import_koishi.h)("message", [
+      (0, import_koishi.h)("p", `当前API提供商: ${config.apiSettings.apiProvider.toUpperCase()}`),
+      (0, import_koishi.h)("p", `Lazy API地址: ${config.apiSettings.useBackup ? "备用地址" : config.apiSettings.lazyApiUrl}`),
+      (0, import_koishi.h)("p", `返回类型: ${config.apiSettings.returnType.toUpperCase()}`),
+      (0, import_koishi.h)(
+        "p",
+        { style: { fontSize: "12px", color: "#888" } },
+        '使用 "mcstatus.api -t" 测试API或 "mcstatus.api -s <provider>" 切换'
+      )
+    ]);
+  });
   setInterval(() => {
     const now = Date.now();
     for (const [key, value] of cache.entries()) {

package/package.json

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