koishi-plugin-mc-serverlist 1.1.0 → 1.1.1

package/lib/commands/mcquery.d.ts

@@ -22,6 +22,13 @@ export type McStatusResponse = {
         obfuscated?: boolean;
     };
     favicon?: string;
+    modinfo?: {
+        type: string;
+        modList: {
+            modid: string;
+            version: string;
+        }[];
+    };
 };
 export declare function formatMotdHtml(description?: McStatusResponse['description']): string;
 export declare function queryServerStatus(address: string): Promise<McStatusResponse>;

package/lib/index.d.ts

@@ -17,5 +17,5 @@ export interface Config {
     debug: boolean;
 }
 export declare const Config: Schema<Config>;
-export declare const usage = "\n\u67E5\u8BE2Minecraft JAVA \u7248\u670D\u52A1\u5668\u72B6\u6001\u7684\u63D2\u4EF6, \u5E76\u751F\u6210\u56FE\u7247\u3002\u652F\u6301\u540C\u65F6\u67E5\u8BE2\u591A\u4E2A\u670D\u52A1\u5668\u3002  \n~~\u4F7F\u7528 mcsrvstat.us API~~  \nv1.1.0 : \u4F7F\u7528 TCP ping \u534F\u8BAE\u76F4\u63A5\u67E5\u8BE2\u670D\u52A1\u5668\u72B6\u6001\u3002\n";
+export declare const usage = "\n\u67E5\u8BE2Minecraft JAVA \u7248\u670D\u52A1\u5668\u72B6\u6001\u7684\u63D2\u4EF6, \u5E76\u751F\u6210\u56FE\u7247\u3002\u652F\u6301\u540C\u65F6\u67E5\u8BE2\u591A\u4E2A\u670D\u52A1\u5668\u3002  \n\n### \u7528\u6CD5:  \nmcs [\u670D\u52A1\u5668\u5730\u5740]  \n\u4F8B\u5982:  \nmcs hypixel.net  \n\u5982\u679C\u4E0D\u6307\u5B9A\u670D\u52A1\u5668\u5730\u5740, \u5219\u67E5\u8BE2\u914D\u7F6E\u6587\u4EF6\u4E2D\u7684\u6240\u6709\u670D\u52A1\u5668\u3002\n\n~~\u4F7F\u7528 mcsrvstat.us API~~  \nv1.1.0 : \u4F7F\u7528 TCP ping \u534F\u8BAE\u76F4\u63A5\u67E5\u8BE2\u670D\u52A1\u5668\u72B6\u6001\u3002\n";
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -166,8 +166,14 @@ function renderComponent(component, inherited = {}) {
     obfuscated: component.obfuscated ?? inherited.obfuscated
   };
   let html = "";
-  if (typeof component.text === "string") {
-    html += wrapStyledText(component.text, style);
+  const baseText = typeof component.text === "string" ? component.text : typeof component.translate === "string" ? component.translate : "";
+  if (baseText) {
+    html += baseText.includes("§") ? renderLegacyToHtml(baseText) : wrapStyledText(baseText, style);
+  }
+  if (Array.isArray(component.with)) {
+    for (const part of component.with) {
+      html += renderComponent(part, style);
+    }
   }
   if (Array.isArray(component.extra)) {
     for (const child of component.extra) {
@@ -420,50 +426,39 @@ __name(bodyHtml, "bodyHtml");
 async function getStatus(serverName, serverIP, config) {
   let mcdata;
   try {
-    mcdata = await queryServerStatus(serverIP);
+    const status = await queryServerStatus(serverIP);
     if (config.debug) {
       try {
-        const { favicon, ...debugData } = mcdata;
+        const { favicon, modinfo, ...debugData } = status;
         logger.info("查询服务器:", `${serverName}`, `(${serverIP})`);
         logger.info("精简返回数据:", JSON.stringify(debugData, null, 2));
       } catch (e) {
         logger.info("调试信息时出错:", e);
       }
     }
-    const status = mcdata;
     let result = "";
-    if (status) {
-      result += `<p>${serverName}`;
-      if (config.showIP) {
-        result += ` ${serverIP} </p>`;
-      } else {
-        result += `</p>`;
-      }
-      if (config.showMotd) {
-        result += `<p>${formatMotdHtml(status.description)}</p>`;
-      }
-      const versionName = status.version?.name || "未知";
-      result += `<p>版本: ${escapeHtml2(versionName)}</p>`;
-      const online = status.players?.online ?? 0;
-      const max = status.players?.max ?? 0;
-      if (online > 0) {
-        if (status.players?.sample && status.players.sample.length > 0) {
-          const playerNames = status.players.sample.map((player) => player.name).join(", ");
-          result += `<p>在线玩家(${online}/${max}): ${escapeHtml2(playerNames)}</p>`;
-        } else {
-          result += `<p>在线玩家(${online}/${max}): 无法获取</p>`;
-        }
-      } else {
-        result += `<p>在线玩家(${online}/${max}): 无人在线</p>`;
-      }
+    result += `<p>${serverName}`;
+    if (config.showIP) {
+      result += ` ${serverIP} </p>`;
     } else {
-      result += `<p>${serverName}`;
-      if (config.showIP) {
-        result += ` ${serverIP} </p>`;
+      result += `</p>`;
+    }
+    if (config.showMotd) {
+      result += `<p>${formatMotdHtml(status.description)}</p>`;
+    }
+    const versionName = status.version?.name || "未知";
+    result += `<p>版本: ${escapeHtml2(versionName)}</p>`;
+    const online = status.players?.online ?? 0;
+    const max = status.players?.max ?? 0;
+    if (online > 0) {
+      if (status.players?.sample && status.players.sample.length > 0) {
+        const playerNames = status.players.sample.map((player) => player.name).join(", ");
+        result += `<p>在线玩家(${online}/${max}): ${escapeHtml2(playerNames)}</p>`;
       } else {
-        result += `</p>`;
+        result += `<p>在线玩家(${online}/${max}): 无法获取</p>`;
       }
-      result += "<p>查询失败</p>";
+    } else {
+      result += `<p>在线玩家(${online}/${max}): 无人在线</p>`;
     }
     return { result, icon: status.favicon || "" };
   } catch (error) {
@@ -542,6 +537,13 @@ var Config = import_koishi2.Schema.object({
 });
 var usage = `
 查询Minecraft JAVA 版服务器状态的插件, 并生成图片。支持同时查询多个服务器。  
+
+### 用法:  
+mcs [服务器地址]  
+例如:  
+mcs hypixel.net  
+如果不指定服务器地址, 则查询配置文件中的所有服务器。
+
 ~~使用 mcsrvstat.us API~~  
 v1.1.0 : 使用 TCP ping 协议直接查询服务器状态。
 `;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-mc-serverlist",
   "description": "查询Minecraft JAVA 版服务器状态的插件, 并生成图片。支持同时查询多个服务器。",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -7,5 +7,11 @@
 
 由 [koishi-plugin-mc-server-status](https://github.com/Kokoro-js/koishi-plugin-mc-server-status) 插件修改实现。
 
+### 用法:  
+``mcs [服务器地址]``  
+例如:  
+``mcs hypixel.net``  
+如果不指定服务器地址, 则查询配置文件中的所有服务器。
+
 ~~使用 mcsrvstat.us API~~  
 v1.1.0 : 使用 TCP ping 协议直接实现查询功能（Codex 大作）