koishi-plugin-minecraft-search 0.0.6 → 0.0.8

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

@@ -6,9 +6,14 @@ export interface ServerConfig {
     host: string;
     port: number;
 }
+export interface InstanceMapping {
+    id: number;
+    instanceId: string;
+}
 export interface MinekuaiConfig {
     apiKey: string;
     baseUrl?: string;
+    instances?: InstanceMapping[];
 }
 export interface Config {
     servers: ServerConfig[];

package/lib/index.js

@@ -37,7 +37,11 @@ var Config = import_koishi.Schema.object({
   })).description("Minecraft服务器列表").role("table").collapse().required(),
   minekuai: import_koishi.Schema.object({
     apiKey: import_koishi.Schema.string().description("麦块联机API密钥"),
-    baseUrl: import_koishi.Schema.string().description("API基础URL").default("https://minekuai.com/api/client")
+    baseUrl: import_koishi.Schema.string().description("API基础URL").default("https://minekuai.com/api/client"),
+    instances: import_koishi.Schema.array(import_koishi.Schema.object({
+      id: import_koishi.Schema.number().description("服务器ID（对应上方服务器列表中的ID）"),
+      instanceId: import_koishi.Schema.string().description("麦块联机实例ID")
+    })).description("服务器与实例关联配置（将服务器ID映射到麦块联机实例ID）").role("table").collapse()
   }).description("麦块联机配置")
 });
 function removeFormatting(str) {
@@ -75,6 +79,43 @@ async function minekuaiRequest(ctx, config, endpoint, method = "GET", data) {
   }
 }
 __name(minekuaiRequest, "minekuaiRequest");
+function resolveInstanceIdentifier(input, minekuaiConfig, servers) {
+  if (!isNaN(Number(input))) {
+    const serverId = parseInt(input);
+    const mapping = minekuaiConfig.instances?.find((m) => m.id === serverId);
+    if (mapping) {
+      return mapping.instanceId;
+    } else {
+      const server = servers.find((s) => s.id === serverId);
+      if (server) {
+        throw new Error(`服务器ID ${serverId} (${server.name}) 未配置实例映射关系`);
+      } else {
+        throw new Error(`未找到ID为 ${serverId} 的服务器`);
+      }
+    }
+  }
+  return input;
+}
+__name(resolveInstanceIdentifier, "resolveInstanceIdentifier");
+function getServerName(instanceId, minekuaiConfig, servers) {
+  const mapping = minekuaiConfig.instances?.find((m) => m.instanceId === instanceId);
+  if (mapping) {
+    const server = servers.find((s) => s.id === mapping.id);
+    return server ? server.name : `服务器ID: ${mapping.id}`;
+  }
+  return instanceId;
+}
+__name(getServerName, "getServerName");
+function mapActionToEnglish(action) {
+  const actionMap = {
+    "启动": "start",
+    "关闭": "stop",
+    "重启": "restart",
+    "强制关闭": "kill"
+  };
+  return actionMap[action] || action;
+}
+__name(mapActionToEnglish, "mapActionToEnglish");
 function apply(ctx, config) {
   ctx.command("mc/查服 [serverName:string]").action(async ({ session }, serverName) => {
     const { servers } = config;
@@ -111,38 +152,52 @@ function apply(ctx, config) {
   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 {
-      const response = await ctx.http.get(apiUrl);
-      if (response.status !== "online") {
-        return `🔴 ${server.id} ${server.name}
-🌐 ${hostWithPort}
+    let retryCount = 0;
+    const maxRetries = 3;
+    const retryDelay = 1e3;
+    while (retryCount <= maxRetries) {
+      try {
+        const response = await ctx.http.get(apiUrl, {
+          timeout: 5e3
+          // 设置5秒超时
+        });
+        if (response.status !== "online") {
+          return `🔴 [${server.id}] ${server.name}
+🌐 IP: ${hostWithPort}
 状态: 离线`;
-      }
-      let message = `🟢 [${server.id}] ${server.name}
+        }
+        let message = `🟢 [${server.id}] ${server.name}
 `;
-      message += `🌐 IP: ${hostWithPort}
+        message += `🌐 IP: ${hostWithPort}
 `;
-      message += `📝 MOTD: 
+        message += `📝 MOTD: 
 ${removeFormatting(response.pureMotd || response.motd?.text || "无")}
 `;
-      message += `🎮 版本: ${response.version} (协议 ${response.protocol})
+        message += `🎮 版本: ${response.version} (协议 ${response.protocol})
 `;
-      message += `👥 玩家: ${response.players.online}/${response.players.max}
+        message += `👥 玩家: ${response.players.online}/${response.players.max}
 `;
-      message += `⏱️ 延迟: ${response.delay}ms
+        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 += "🎯 当前没有在线玩家";
+        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) {
+        retryCount++;
+        if (retryCount <= maxRetries) {
+          ctx.logger("minecraft-search").warn(`查询服务器 ${server.id} ${server.name} 失败，第 ${retryCount} 次重试...`, error.message);
+          await new Promise((resolve) => setTimeout(resolve, retryDelay * retryCount));
+        } else {
+          ctx.logger("minecraft-search").warn(`查询服务器 ${server.id} ${server.name} 重试 ${maxRetries} 次后失败`, error);
+          throw new Error("服务器繁忙，请稍后再试。");
+        }
       }
-      return message;
-    } catch (error) {
-      ctx.logger("minecraft-search").warn(`查询服务器 ${server.id} ${server.name} 失败`, error);
-      throw new Error(`查询失败: ${error.message}`);
     }
   }
   __name(queryServer, "queryServer");
@@ -162,6 +217,19 @@ ${serverList}
   });
   if (config.minekuai?.apiKey) {
     const minekuaiConfig = config.minekuai;
+    ctx.command("麦块/实例映射", { authority: 3 }).action(async ({ session }) => {
+      if (!minekuaiConfig.instances || minekuaiConfig.instances.length === 0) {
+        return "❌ 未配置任何服务器与实例的映射关系";
+      }
+      let message = "📋 服务器与实例映射关系:\n";
+      minekuaiConfig.instances.forEach((mapping, index) => {
+        const server = config.servers.find((s) => s.id === mapping.id);
+        const serverName = server ? server.name : "未知服务器";
+        message += `
+${index + 1}. 服务器: ${serverName} (ID: ${mapping.id}) → 实例ID: ${mapping.instanceId}`;
+      });
+      return message;
+    });
     ctx.command("麦块/实例列表", { authority: 3 }).action(async ({ session }) => {
       try {
         const response = await minekuaiRequest(ctx, minekuaiConfig, "/");
@@ -171,8 +239,9 @@ ${serverList}
         let message = "📋 麦块联机实例列表:\n";
         response.data.forEach((instance, index) => {
           const attrs = instance.attributes;
+          const serverName = getServerName(attrs.identifier, minekuaiConfig, config.servers);
           message += `
-${index + 1}. ${removeFormatting(attrs.name || attrs.identifier)}
+${index + 1}. ${removeFormatting(attrs.name || serverName)}
 `;
           message += `   🔧 标识符: ${attrs.identifier}
 `;
@@ -190,20 +259,26 @@ ${index + 1}. ${removeFormatting(attrs.name || attrs.identifier)}
     });
     ctx.command("麦块/实例信息 <identifier:string>", { authority: 3 }).action(async ({ session }, identifier) => {
       if (!identifier) {
-        return "❌ 请提供实例标识符";
+        return "❌ 请提供实例标识符或服务器ID";
       }
       try {
-        const response = await minekuaiRequest(ctx, minekuaiConfig, `/servers/${identifier}`);
+        const instanceId = resolveInstanceIdentifier(identifier, minekuaiConfig, config.servers);
+        const serverName = getServerName(instanceId, minekuaiConfig, config.servers);
+        const response = await minekuaiRequest(ctx, minekuaiConfig, `/servers/${instanceId}`);
         if (!response || !response.attributes) {
           return "❌ 未找到指定实例";
         }
         const attrs = response.attributes;
         const allocations = attrs.relationships?.allocations?.data || [];
         const defaultAllocation = allocations.find((alloc) => alloc.attributes.is_default) || allocations[0];
-        let message = `🖥️ 实例信息: ${removeFormatting(attrs.name || identifier)}
+        let message = `🖥️ 实例信息: ${removeFormatting(attrs.name || serverName)}
 `;
-        message += `🔧 标识符: ${identifier}
+        message += `🔧 标识符: ${instanceId}
 `;
+        if (identifier !== instanceId) {
+          message += `🔗 对应服务器ID: ${identifier}
+`;
+        }
         message += `📝 描述: ${removeFormatting(attrs.description || "无")}
 `;
         message += `🌐 节点: ${attrs.node}
@@ -230,17 +305,23 @@ ${index + 1}. ${removeFormatting(attrs.name || attrs.identifier)}
     });
     ctx.command("麦块/实例资源 <identifier:string>", { authority: 3 }).action(async ({ session }, identifier) => {
       if (!identifier) {
-        return "❌ 请提供实例标识符";
+        return "❌ 请提供实例标识符或服务器ID";
       }
       try {
-        const response = await minekuaiRequest(ctx, minekuaiConfig, `/servers/${identifier}/resources`);
+        const instanceId = resolveInstanceIdentifier(identifier, minekuaiConfig, config.servers);
+        const serverName = getServerName(instanceId, minekuaiConfig, config.servers);
+        const response = await minekuaiRequest(ctx, minekuaiConfig, `/servers/${instanceId}/resources`);
         if (!response || !response.attributes) {
           return "❌ 未找到指定实例的资源信息";
         }
         const attrs = response.attributes;
         const resources = attrs.resources;
-        let message = `📊 实例资源使用情况: ${identifier}
+        let message = `📊 实例资源使用情况: ${serverName}
 `;
+        if (identifier !== instanceId) {
+          message += `🔗 对应服务器ID: ${identifier}
+`;
+        }
         message += `🔧 当前状态: ${attrs.current_state}
 `;
         message += `⏸️ 是否暂停: ${attrs.is_suspended ? "是" : "否"}
@@ -264,30 +345,44 @@ ${index + 1}. ${removeFormatting(attrs.name || attrs.identifier)}
     });
     ctx.command("麦块/实例电源 <identifier:string> <action:string>", { authority: 3 }).action(async ({ session }, identifier, action) => {
       if (!identifier || !action) {
-        return "❌ 请提供实例标识符和操作类型 (start/stop/restart/kill)";
+        return "❌ 请提供实例标识符/服务器ID和操作类型 (启动/关闭/重启/强制关闭)";
       }
-      const validActions = ["start", "stop", "restart", "kill"];
-      if (!validActions.includes(action)) {
+      const englishAction = mapActionToEnglish(action);
+      const validActions = ["启动", "关闭", "重启", "强制关闭"];
+      const validEnglishActions = ["start", "stop", "restart", "kill"];
+      if (!validActions.includes(action) && !validEnglishActions.includes(englishAction)) {
         return `❌ 无效的操作类型。可用操作: ${validActions.join(", ")}`;
       }
       try {
-        await minekuaiRequest(ctx, minekuaiConfig, `/servers/${identifier}/power`, "POST", {
-          signal: action
+        const instanceId = resolveInstanceIdentifier(identifier, minekuaiConfig, config.servers);
+        const serverName = getServerName(instanceId, minekuaiConfig, config.servers);
+        await minekuaiRequest(ctx, minekuaiConfig, `/servers/${instanceId}/power`, "POST", {
+          signal: englishAction
         });
-        return `✅ 已发送 ${action} 指令到实例 ${identifier}`;
+        let message = `✅ 已发送 ${action} 指令到实例 ${serverName}`;
+        if (identifier !== instanceId) {
+          message += ` (服务器ID: ${identifier})`;
+        }
+        return message;
       } catch (error) {
         return `❌ 电源操作失败: ${error.message}`;
       }
     });
     ctx.command("麦块/实例命令 <identifier:string> <command:text>", { authority: 3 }).action(async ({ session }, identifier, command) => {
       if (!identifier || !command) {
-        return "❌ 请提供实例标识符和命令内容";
+        return "❌ 请提供实例标识符/服务器ID和命令内容";
       }
       try {
-        await minekuaiRequest(ctx, minekuaiConfig, `/servers/${identifier}/command`, "POST", {
+        const instanceId = resolveInstanceIdentifier(identifier, minekuaiConfig, config.servers);
+        const serverName = getServerName(instanceId, minekuaiConfig, config.servers);
+        await minekuaiRequest(ctx, minekuaiConfig, `/servers/${instanceId}/command`, "POST", {
           command
         });
-        return `✅ 已发送命令到实例 ${identifier}: ${command}`;
+        let message = `✅ 已发送命令到实例 ${serverName}: ${command}`;
+        if (identifier !== instanceId) {
+          message += ` (服务器ID: ${identifier})`;
+        }
+        return message;
       } catch (error) {
         return `❌ 发送命令失败: ${error.message}`;
       }

package/package.json

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