koishi-plugin-lolbaninfo 1.1.0 → 1.1.1

package/lib/index.d.ts

@@ -1,18 +1,26 @@
 import { Context, Schema } from 'koishi';
 export declare const name = "lolbaninfo";
-export declare const usage = "\n# \u26A0\uFE0F LOL\u5C01\u53F7\u67E5\u8BE2\u63D2\u4EF6 \u26A0\uFE0F\n- **\u6B64\u63D2\u4EF6\u4F5C\u8005\u53EA\u662F\u5236\u4F5C\u5DE5\u5177\uFF0C\u7F51\u7AD9API\u53CA\u5176\u5185\u5BB9\u5747\u4E0E\u4F5C\u8005\u65E0\u5173\uFF0C\u8BF7\u5408\u7406\u4F7F\u7528**\n- \u65E0\u9700\u5BC6\u7801\uFF0C\u76F4\u63A5\u6839\u636EQQ\u53F7\u67E5\u8BE2\u8D26\u53F7\u5C01\u7981\u72B6\u6001\u4E0E\u8BE6\u7EC6\u4FE1\u606F\n\n---\n\n<details>\n<summary><strong><span style=\"font-size: 1.3em; color: #2a2a2a;\">\uD83D\uDCE2 \u529F\u80FD\u7279\u70B9</span></strong></summary>\n\n- \u652F\u6301\u901A\u8FC7QQ\u53F7\u5FEB\u901F\u67E5\u8BE2LOL\u8D26\u53F7\u5C01\u7981\u72B6\u6001\n- \u81EA\u52A8\u91CD\u8BD5\u673A\u5236\uFF0C\u63D0\u9AD8\u67E5\u8BE2\u6210\u529F\u7387\n- \u65E5\u5FD7\u81EA\u52A8\u6E05\u7406\uFF0C\u907F\u514D\u65E5\u5FD7\u8FC7\u591A\u5360\u7528\u5185\u5B58\n- \u7B80\u5355\u6613\u7528\u7684\u6307\u4EE4\u64CD\u4F5C\uFF0C\u9002\u5408\u5404\u7C7B\u7528\u6237\n\n</details>\n\n<details>\n<summary><strong><span style=\"font-size: 1.3em; color: #2a2a2a;\">\uD83D\uDEE0\uFE0F \u914D\u7F6E\u8BF4\u660E</span></strong></summary>\n\n- apiUrl: \u76EE\u6807\u7F51\u7AD9\u7684API\u63A5\u53E3\u5730\u5740\uFF0C\u901A\u5E38\u65E0\u9700\u4FEE\u6539\n- apiToken: \u7F51\u7AD9API\u7684\u8BBF\u95EEToken\uFF08\u6CE8\u518C\u5373\u53EF\u83B7\u5F97\uFF09\uFF0C\u6CE8\u518C\u7F51\u7AD9\uFF1Ahttps://yun.4png.com/\n- retryTimes: \u8BF7\u6C42\u5931\u8D25\u65F6\u7684\u6700\u5927\u91CD\u8BD5\u6B21\u6570\uFF0C\u5EFA\u8BAE\u8BBE\u7F6E\u4E3A2-3\u6B21\n- retryDelay: \u6BCF\u6B21\u91CD\u8BD5\u7684\u95F4\u9694\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09\uFF0C\u5EFA\u8BAE\u8BBE\u7F6E\u4E3A1000-2000ms\n- maxLogCount: \u65E5\u5FD7\u81EA\u52A8\u6E05\u7406\u9608\u503C\uFF08\u6700\u5927\u5B58\u50A8\u6761\u6570\uFF09\uFF0C\u5EFA\u8BAE\u8BBE\u7F6E\u4E3A100-200\u6761\n\n</details>\n\n<details>\n<summary><strong><span style=\"font-size: 1.3em; color: #2a2a2a;\">\uD83D\uDCA1 \u4F7F\u7528\u6307\u4EE4</span></strong></summary>\n\n- \u67E5\u5C01\u53F7+\u7A7A\u683C+<qq\u53F7>\uFF1A\u67E5\u8BE2\u6307\u5B9AQQ\u53F7\u7684LOL\u5C01\u7981\u72B6\u6001\n- \u793A\u4F8B\uFF1A<pre><code>\u67E5\u5C01\u53F7 123456789</code></pre>\n\n</details>\n\n<details>\n<summary><strong><span style=\"font-size: 1.3em; color: #2a2a2a;\">\uD83D\uDCA1 \u4F7F\u7528\u6307\u4EE4</span></strong></summary>\n\n- \u67E5\u5C01\u53F7+\u7A7A\u683C+<qq\u53F7>\uFF1A\u67E5\u8BE2\u6307\u5B9AQQ\u53F7\u7684LOL\u5C01\u7981\u72B6\u6001\n- \u793A\u4F8B\uFF1A<pre><code>\u67E5\u5C01\u53F7 123456789</code></pre>\n\n</details>\n\n<details>\n<summary><strong><span style=\"font-size: 1.3em; color: #2a2a2a;\">\uD83D\uDCC4 \u6CE8\u610F\u4E8B\u9879</span></strong></summary>\n\n- \u8BF7\u786E\u4FDD\u63D0\u4F9B\u7684API Token\u6709\u6548\u4E14\u6709\u67E5\u8BE2\u6743\u9650\n- \u672C\u63D2\u4EF6\u4EC5\u4F9B\u67E5\u8BE2\u5C01\u7981\u72B6\u6001\uFF0C\u8BF7\u52FF\u7528\u4E8E\u5176\u4ED6\u7528\u9014\n\n</details>\n";
+export declare const usage = "\n# \u26A0\uFE0F LOL\u5C01\u53F7\u67E5\u8BE2\u63D2\u4EF6 \u26A0\uFE0F\n- **\u6B64\u63D2\u4EF6\u4F5C\u8005\u53EA\u662F\u5236\u4F5C\u5DE5\u5177\uFF0C\u7F51\u7AD9API\u53CA\u5176\u5185\u5BB9\u5747\u4E0E\u4F5C\u8005\u65E0\u5173\uFF0C\u8BF7\u5408\u7406\u4F7F\u7528**\n- \u65E0\u9700\u5BC6\u7801\uFF0C\u76F4\u63A5\u6839\u636EQQ\u53F7\u67E5\u8BE2\u8D26\u53F7\u5C01\u7981\u72B6\u6001\u4E0E\u8BE6\u7EC6\u4FE1\u606F\n- \u6CE8\u518C\u7F51\u7AD9\uFF1Ahttps://yun.4png.com/\n---\n\n<details>\n<summary><strong><span style=\"font-size: 1.3em; color: #2a2a2a;\">\uD83D\uDCE2 \u529F\u80FD\u7279\u70B9</span></strong></summary>\n\n- \u652F\u6301\u901A\u8FC7QQ\u53F7\u5FEB\u901F\u67E5\u8BE2LOL\u8D26\u53F7\u5C01\u7981\u72B6\u6001\n- \u81EA\u52A8\u91CD\u8BD5\u673A\u5236\uFF0C\u63D0\u9AD8\u67E5\u8BE2\u6210\u529F\u7387\n- \u65E5\u5FD7\u81EA\u52A8\u6E05\u7406\uFF0C\u907F\u514D\u65E5\u5FD7\u8FC7\u591A\u5360\u7528\u5185\u5B58\n- \u7B80\u5355\u6613\u7528\u7684\u6307\u4EE4\u64CD\u4F5C\uFF0C\u9002\u5408\u5404\u7C7B\u7528\u6237\n\n</details>\n\n<details>\n<summary><strong><span style=\"font-size: 1.3em; color: #2a2a2a;\">\uD83D\uDEE0\uFE0F \u914D\u7F6E\u8BF4\u660E</span></strong></summary>\n\n- apiUrl: \u76EE\u6807\u7F51\u7AD9\u7684API\u63A5\u53E3\u5730\u5740\uFF0C\u901A\u5E38\u65E0\u9700\u4FEE\u6539\n- apiToken: \u7F51\u7AD9API\u7684\u8BBF\u95EEToken\uFF08\u6CE8\u518C\u5373\u53EF\u83B7\u5F97\uFF09\uFF0C\u6CE8\u518C\u7F51\u7AD9\uFF1Ahttps://yun.4png.com/\n- retryTimes: \u8BF7\u6C42\u5931\u8D25\u65F6\u7684\u6700\u5927\u91CD\u8BD5\u6B21\u6570\uFF0C\u5EFA\u8BAE\u8BBE\u7F6E\u4E3A2-3\u6B21\n- retryDelay: \u6BCF\u6B21\u91CD\u8BD5\u7684\u95F4\u9694\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09\uFF0C\u5EFA\u8BAE\u8BBE\u7F6E\u4E3A1000-2000ms\n- maxLogCount: \u65E5\u5FD7\u81EA\u52A8\u6E05\u7406\u9608\u503C\uFF08\u6700\u5927\u5B58\u50A8\u6761\u6570\uFF09\uFF0C\u5EFA\u8BAE\u8BBE\u7F6E\u4E3A100-200\u6761\n\n</details>\n\n<details>\n<summary><strong><span style=\"font-size: 1.3em; color: #2a2a2a;\">\uD83D\uDCA1 \u4F7F\u7528\u6307\u4EE4</span></strong></summary>\n\n- \u67E5\u5C01\u53F7+\u7A7A\u683C+<qq\u53F7>\uFF1A\u67E5\u8BE2\u6307\u5B9AQQ\u53F7\u7684LOL\u5C01\u7981\u72B6\u6001\n- \u793A\u4F8B\uFF1A<pre><code>\u67E5\u5C01\u53F7 123456789</code></pre>\n\n</details>\n\n<details>\n<summary><strong><span style=\"font-size: 1.3em; color: #2a2a2a;\">\uD83D\uDCA1 \u4F7F\u7528\u6307\u4EE4</span></strong></summary>\n\n- \u67E5\u5C01\u53F7+\u7A7A\u683C+<qq\u53F7>\uFF1A\u67E5\u8BE2\u6307\u5B9AQQ\u53F7\u7684LOL\u5C01\u7981\u72B6\u6001\n- \u793A\u4F8B\uFF1A<pre><code>\u67E5\u5C01\u53F7 123456789</code></pre>\n\n</details>\n\n<details>\n<summary><strong><span style=\"font-size: 1.3em; color: #2a2a2a;\">\uD83D\uDCC4 \u6CE8\u610F\u4E8B\u9879</span></strong></summary>\n\n- \u8BF7\u786E\u4FDD\u63D0\u4F9B\u7684API Token\u6709\u6548\u4E14\u6709\u67E5\u8BE2\u6743\u9650\n- \u672C\u63D2\u4EF6\u4EC5\u4F9B\u67E5\u8BE2\u5C01\u7981\u72B6\u6001\uFF0C\u8BF7\u52FF\u7528\u4E8E\u5176\u4ED6\u7528\u9014\n\n</details>\n";
 export declare enum ReplyMode {
     MENTION = "mention",// @用户
     QUOTE = "quote",// 引用回复
     NORMAL = "normal"
 }
 export interface Config {
-    apiUrl: string;
-    apiToken: string;
-    retryTimes: number;
-    retryDelay: number;
-    maxLogCount: number;
-    replyMode: ReplyMode;
+    api: {
+        apiUrl: string;
+        apiToken: string;
+    };
+    reply: {
+        replyMode: ReplyMode;
+    };
+    retry: {
+        retryTimes: number;
+        retryDelay: number;
+    };
+    log: {
+        maxLogCount: number;
+    };
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -33,7 +33,7 @@ var usage = `
 # ⚠️ LOL封号查询插件 ⚠️
 - **此插件作者只是制作工具，网站API及其内容均与作者无关，请合理使用**
 - 无需密码，直接根据QQ号查询账号封禁状态与详细信息
-
+- 注册网站：https://yun.4png.com/
 ---
 
 <details>
@@ -87,20 +87,37 @@ var ReplyMode = /* @__PURE__ */ ((ReplyMode2) => {
   ReplyMode2["NORMAL"] = "normal";
   return ReplyMode2;
 })(ReplyMode || {});
-var Config = import_koishi.Schema.object({
-  apiUrl: import_koishi.Schema.string().description("目标网站的API接口地址").default("https://yun.4png.com/api/query.html    "),
-  apiToken: import_koishi.Schema.string().description("网站API的访问Token（注册即可获得）").required(),
-  replyMode: import_koishi.Schema.union([
-    // 新增配置项
-    import_koishi.Schema.const("mention" /* MENTION */).description("使用 @ 用户进行回复"),
-    import_koishi.Schema.const("quote" /* QUOTE */).description("使用引用进行回复"),
-    import_koishi.Schema.const("normal" /* NORMAL */).description("保持普通回复")
-  ]).description("机器人回复消息的方式").default("normal" /* NORMAL */),
-  // 默认为普通模式
-  retryTimes: import_koishi.Schema.number().description("请求失败时的最大重试次数").default(2).min(0).max(5),
-  retryDelay: import_koishi.Schema.number().description("每次重试的间隔时间（毫秒）").default(1e3).min(500).max(5e3),
-  maxLogCount: import_koishi.Schema.number().description("日志自动清理阈值（最大存储条数）").default(100).min(20).max(500)
-});
+var Config = import_koishi.Schema.intersect([
+  // 使用 intersect 来组合多个对象
+  import_koishi.Schema.object({
+    api: import_koishi.Schema.object({
+      apiUrl: import_koishi.Schema.string().description("目标网站的API接口地址").default("https://yun.4png.com/api/query.html"),
+      // .required(), // 移除 .required()，因为有默认值
+      apiToken: import_koishi.Schema.string().description("网站API的访问Token（注册即可获得）").required()
+      // 这个是真正需要用户输入的
+    }).description("API 设置"),
+    // API 相关配置的分组描述
+    reply: import_koishi.Schema.object({
+      replyMode: import_koishi.Schema.union([
+        import_koishi.Schema.const("mention" /* MENTION */).description("使用 @ 用户进行回复"),
+        import_koishi.Schema.const("quote" /* QUOTE */).description("使用引用进行回复"),
+        import_koishi.Schema.const("normal" /* NORMAL */).description("保持普通回复")
+      ]).description("机器人回复消息的方式").default("normal" /* NORMAL */)
+      // 默认为普通模式
+    }).description("回复 设置"),
+    // 回复相关配置的分组描述
+    retry: import_koishi.Schema.object({
+      retryTimes: import_koishi.Schema.number().description("请求失败时的最大重试次数").default(2).min(0).max(5),
+      retryDelay: import_koishi.Schema.number().description("每次重试的间隔时间（毫秒）").default(1e3).min(500).max(5e3)
+    }).description("重试 设置"),
+    // 重试相关配置的分组描述
+    log: import_koishi.Schema.object({
+      // 新增日志配置分组
+      maxLogCount: import_koishi.Schema.number().description("日志自动清理阈值（最大存储条数）").default(100).min(20).max(500)
+    }).description("日志 设置")
+    // 日志相关配置的分组描述
+  })
+]);
 var logCache = [];
 function addLogAndClean(logger, content, maxCount) {
   const formattedLog = `[${(/* @__PURE__ */ new Date()).toLocaleString()}] ${content}`;
@@ -114,40 +131,45 @@ function addLogAndClean(logger, content, maxCount) {
 __name(addLogAndClean, "addLogAndClean");
 async function requestWithRetry(ctx, config, qq, logger) {
   let attempt = 0;
-  while (attempt <= config.retryTimes) {
+  const { apiUrl, apiToken } = config.api;
+  const { retryTimes, retryDelay } = config.retry;
+  const { maxLogCount } = config.log;
+  while (attempt <= retryTimes) {
     try {
-      const requestLog = `[第${attempt + 1}次请求] 开始查询QQ：${qq}，目标API：${config.apiUrl}`;
-      addLogAndClean(logger, requestLog, config.maxLogCount);
+      const requestLog = `[第${attempt + 1}次请求] 开始查询QQ：${qq}，目标API：${apiUrl}`;
+      addLogAndClean(logger, requestLog, maxLogCount);
       logger.info(requestLog);
-      const response = await ctx.http.get(config.apiUrl, {
+      const response = await ctx.http.get(apiUrl, {
+        // 使用解构后的值
         params: {
           qq,
-          token: config.apiToken
+          token: apiToken
+          // 使用解构后的值
         },
         // 强制解析JSON，避免返回文本格式
         responseType: "json"
       });
       const successLog = `[第${attempt + 1}次请求] 查询成功，返回状态码：200`;
-      addLogAndClean(logger, successLog, config.maxLogCount);
+      addLogAndClean(logger, successLog, maxLogCount);
       logger.success(successLog);
       return response;
     } catch (error) {
       attempt++;
       const status = error.response?.status || "未知状态";
       const failLog = `[第${attempt}次请求] 失败，状态码：${status}，错误信息：${error.message}`;
-      addLogAndClean(logger, failLog, config.maxLogCount);
+      addLogAndClean(logger, failLog, maxLogCount);
       logger.warn(failLog);
       const isRetryable = [400, 403].includes(status);
-      if (!isRetryable || attempt > config.retryTimes) {
-        const endLog = `[请求终止] 非重试错误或已达最大重试次数(${config.retryTimes}次)`;
-        addLogAndClean(logger, endLog, config.maxLogCount);
+      if (!isRetryable || attempt > retryTimes) {
+        const endLog = `[请求终止] 非重试错误或已达最大重试次数(${retryTimes}次)`;
+        addLogAndClean(logger, endLog, maxLogCount);
         logger.error(endLog);
         throw error;
       }
-      const retryLog = `[准备重试] 间隔${config.retryDelay}ms后进行第${attempt}次重试`;
-      addLogAndClean(logger, retryLog, config.maxLogCount);
+      const retryLog = `[准备重试] 间隔${retryDelay}ms后进行第${attempt}次重试`;
+      addLogAndClean(logger, retryLog, maxLogCount);
       logger.info(retryLog);
-      await (0, import_koishi.sleep)(config.retryDelay);
+      await (0, import_koishi.sleep)(retryDelay);
     }
   }
   throw new Error("达到最大重试次数，请求失败");
@@ -159,10 +181,10 @@ function isValidQQ(qq) {
 __name(isValidQQ, "isValidQQ");
 function formatReplyMessage(session, message, config) {
   let prefix = "";
-  if (config.replyMode === "mention" /* MENTION */) {
-    prefix = import_koishi.h.at(session.userId).toString();
+  if (config.reply.replyMode === "mention" /* MENTION */) {
+    prefix = import_koishi.h.at(session.userId).toString() + "\n";
   }
-  if (config.replyMode === "quote" /* QUOTE */) {
+  if (config.reply.replyMode === "quote" /* QUOTE */) {
     prefix = import_koishi.h.quote(session.messageId).toString();
   }
   return prefix + message;
@@ -173,7 +195,7 @@ function apply(ctx, config) {
   ctx.command("查封号 <qq号>", "查询QQ号封号状态").action(async ({ session }, qq) => {
     if (!isValidQQ(qq)) {
       const errMsg = `QQ号格式错误：${qq}（需5-13位数字）`;
-      addLogAndClean(logger, errMsg, config.maxLogCount);
+      addLogAndClean(logger, errMsg, config.log.maxLogCount);
       logger.warn(errMsg);
       return formatReplyMessage(session, `❌ ${errMsg}`, config);
     }
@@ -184,25 +206,25 @@ function apply(ctx, config) {
         case 200:
           const banInfo = result.data?.banmsg || "无详细封禁信息";
           const successResLog = `[查询结果] QQ${qq}：${msg} → ${banInfo}`;
-          addLogAndClean(logger, successResLog, config.maxLogCount);
+          addLogAndClean(logger, successResLog, config.log.maxLogCount);
           logger.success(successResLog);
           return formatReplyMessage(session, `✅ 查询成功：${msg}
 📝 详细信息：${banInfo}`, config);
         case 400:
           const warnResLog = `[查询结果] QQ${qq} 400错误：${msg}`;
-          addLogAndClean(logger, warnResLog, config.maxLogCount);
+          addLogAndClean(logger, warnResLog, config.log.maxLogCount);
           logger.warn(warnResLog);
           return formatReplyMessage(session, `❌ 查询失败 [错误码400]：${msg}（参数缺失，请检查配置）`, config);
         default:
           const infoResLog = `[查询结果] QQ${qq} 错误码${result.code}：${msg}`;
-          addLogAndClean(logger, infoResLog, config.maxLogCount);
+          addLogAndClean(logger, infoResLog, config.log.maxLogCount);
           logger.info(infoResLog);
           return formatReplyMessage(session, `❌ 查询失败 [错误码${result.code}]：${msg}`, config);
       }
     } catch (error) {
       const errMsg = error.message || "未知错误";
       const errorLog = `[接口调用出错] QQ${qq}：${errMsg}`;
-      addLogAndClean(logger, errorLog, config.maxLogCount);
+      addLogAndClean(logger, errorLog, config.log.maxLogCount);
       logger.error(errorLog);
       return formatReplyMessage(session, `⚠️  接口调用出错：${errMsg}`, config);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-lolbaninfo",
   "description": "LOL封号查询插件",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lenksen/lolbaninfo.git"