koishi-plugin-jscn-aaaquery 1.0.22 → 1.1.1

package/lib/index.d.ts

@@ -5,6 +5,7 @@ export interface Config {
     password: string;
     baseUrl: string;
     radiusApiUrl?: string;
+    captchaMode?: 'interactive';
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -32,7 +32,9 @@ var Config = import_koishi.Schema.object({
   password: import_koishi.Schema.string().required().description("运维系统登录密码").default("admin"),
   baseUrl: import_koishi.Schema.string().default("http://172.16.251.75:8090/nms/api").description("运维系统API地址"),
   // 添加RADIUS API的配置项
-  radiusApiUrl: import_koishi.Schema.string().description("RADIUS API基础URL").default("http://111.208.114.248:28210/api/radius")
+  radiusApiUrl: import_koishi.Schema.string().description("RADIUS API基础URL").default("http://111.208.114.248:28210/api/radius"),
+  // 验证码模式
+  captchaMode: import_koishi.Schema.const("interactive").description("登录验证码获取方式（发送图片到对话，用户输入）").default("interactive")
 });
 function evaluateOpticalPower(power) {
   if (power === "设备不在线" || power === void 0 || power === null) {
@@ -83,6 +85,7 @@ function apply(ctx, config) {
   const requestWaitQueue = [];
   const messageQueue = [];
   let isProcessingMessage = false;
+  let currentSession = null;
   const MESSAGE_TIMEOUT2 = 1 * 60 * 1e3;
   const MESSAGE_CLEAN_INTERVAL2 = 60 * 1e3;
   const MAX_QUEUE_LENGTH = 50;
@@ -255,47 +258,110 @@ function apply(ctx, config) {
       console.log("使用缓存的token，过期时间:", new Date(tokenExpireTime).toLocaleString());
       return currentToken;
     }
-    if (currentToken && now < tokenExpireTime) {
-      console.log("token即将过期，后台刷新token");
-      refreshTokenInBackground();
-      return currentToken;
-    }
-    return refreshToken();
+    return refreshToken(currentSession);
   }
   __name(getToken, "getToken");
-  async function refreshTokenInBackground() {
-    try {
-      console.log("开始在后台刷新token...");
-      refreshToken().catch((error) => {
-        console.error("后台刷新token失败:", error);
-      });
-    } catch (error) {
-      console.error("启动后台刷新token失败:", error);
+  const captchaPendingMap = /* @__PURE__ */ new Map();
+  const CAPTCHA_TIMEOUT = 5 * 60 * 1e3;
+  setInterval(() => {
+    const now = Date.now();
+    for (const [key, task] of captchaPendingMap) {
+      if (now - task.timestamp > CAPTCHA_TIMEOUT) {
+        task.reject(new Error("验证码输入超时（5分钟），登录已取消"));
+        captchaPendingMap.delete(key);
+        console.log(`清理超时的验证码等待任务: ${key}`);
+      }
     }
+  }, 30 * 1e3);
+  function extractBase64(dataUri) {
+    const commaIdx = dataUri.indexOf(",");
+    if (commaIdx >= 0) return dataUri.substring(commaIdx + 1);
+    return dataUri;
   }
-  __name(refreshTokenInBackground, "refreshTokenInBackground");
-  async function refreshToken() {
+  __name(extractBase64, "extractBase64");
+  async function fetchCaptcha() {
+    const response = await ctx.http.get(`${config.baseUrl}/admin/captcha`, {
+      headers: {
+        "Accept": "application/json"
+      },
+      timeout: 1e4
+    });
+    if (response.status === 200 && response.data && response.data.captchaKey && response.data.captchaImage) {
+      return {
+        captchaKey: response.data.captchaKey,
+        captchaImage: response.data.captchaImage
+      };
+    }
+    throw new Error(`获取验证码失败：${response.message || "未知错误"}`);
+  }
+  __name(fetchCaptcha, "fetchCaptcha");
+  async function refreshToken(session) {
     try {
       console.log("开始登录请求刷新token...");
       await waitForRequestSlot();
-      const response = await ctx.http.post(
-        `${config.baseUrl}/admin/login`,
-        `loginName=${encodeURIComponent(config.loginName)}&pwd=${encodeURIComponent(config.password)}`,
-        {
-          headers: {
-            "Content-Type": "application/x-www-form-urlencoded",
-            "Accept": "application/json"
+      let captchaKey = "";
+      let captchaCode = "";
+      if (config.captchaMode === "interactive") {
+        if (!session) {
+          throw new Error("交互式验证码需要 session，但未检测到用户会话，请稍后重试");
+        }
+        const MAX_CAPTCHA_ATTEMPTS = 5;
+        const sessionKey = `${session.userId || "anon"}:${session.channelId || "dm"}`;
+        for (let attempt = 1; attempt <= MAX_CAPTCHA_ATTEMPTS; attempt++) {
+          captchaPendingMap.delete(sessionKey);
+          const { captchaKey: key, captchaImage } = await fetchCaptcha();
+          captchaKey = key;
+          try {
+            const base64Data = extractBase64(captchaImage);
+            const promptText = attempt > 1 ? `🔐 验证码错误，请重新输入新图中的验证码（第${attempt}/${MAX_CAPTCHA_ATTEMPTS}次）` : "🔐 请输入图中验证码（5分钟内有效，超时需重新发起查询）";
+            await session.send([
+              import_koishi.h.image(Buffer.from(base64Data, "base64"), "image/png"),
+              promptText
+            ]);
+          } catch (sendError) {
+            console.error("发送验证码图片失败:", sendError);
+            throw new Error("发送验证码图片失败，请检查图片发送权限");
           }
+          captchaCode = await new Promise((resolve, reject) => {
+            captchaPendingMap.set(sessionKey, {
+              session,
+              captchaKey,
+              captchaImage,
+              resolve,
+              reject,
+              timestamp: Date.now()
+            });
+            console.log(`验证码等待任务已注册: ${sessionKey}, captchaKey: ${captchaKey}, 第${attempt}轮`);
+          });
+          const response = await ctx.http.post(
+            `${config.baseUrl}/admin/login`,
+            `loginName=${encodeURIComponent(config.loginName)}&pwd=${encodeURIComponent(config.password)}&captchaKey=${encodeURIComponent(captchaKey)}&captchaCode=${encodeURIComponent(captchaCode)}`,
+            {
+              headers: {
+                "Content-Type": "application/x-www-form-urlencoded",
+                "Accept": "application/json"
+              }
+            }
+          );
+          console.log("登录响应:", JSON.stringify(response, null, 2));
+          if (response.status === 200 && response.data && response.data.token) {
+            currentToken = response.data.token;
+            tokenExpireTime = response.data.timeStamp * 1e3;
+            console.log("获取新token成功，过期时间:", new Date(tokenExpireTime).toLocaleString());
+            return currentToken;
+          }
+          const message = response.data?.message || response.message || "";
+          if (message.includes("验证码") || message.includes("captcha")) {
+            console.log(`验证码错误，第${attempt}轮失败，准备进入第${attempt + 1}轮`);
+            captchaPendingMap.delete(sessionKey);
+            if (attempt === MAX_CAPTCHA_ATTEMPTS) {
+              throw new Error("验证码错误次数过多，请稍后重新发起查询");
+            }
+            continue;
+          }
+          throw new Error(`登录失败：${message || "未知错误"}`);
         }
-      );
-      console.log("登录响应:", JSON.stringify(response, null, 2));
-      if (response.status === 200 && response.data && response.data.token) {
-        currentToken = response.data.token;
-        tokenExpireTime = response.data.timeStamp * 1e3;
-        console.log("获取新token成功，过期时间:", new Date(tokenExpireTime).toLocaleString());
-        return currentToken;
       }
-      throw new Error(`登录失败：${response.message || "未知错误"}`);
     } catch (error) {
       console.error("登录错误详情:", error);
       if (error.response) {
@@ -893,6 +959,7 @@ function apply(ctx, config) {
         return;
       }
       console.log("开始处理消息队列中的任务");
+      currentSession = task.session || null;
       const result = await task.handler();
       if (result && task.session?.send) {
         const formattedResult = formatOutputMessage(result);
@@ -1069,6 +1136,26 @@ function apply(ctx, config) {
     }
   }
   __name(smartQueryMacAddress, "smartQueryMacAddress");
+  ctx.middleware(async (session, next) => {
+    const input = (session.stripped?.content || session.content || "").trim();
+    if (!input) return next();
+    const sessionKey = `${session.userId || "anon"}:${session.channelId || "dm"}`;
+    const pendingTask = captchaPendingMap.get(sessionKey);
+    if (!pendingTask) {
+      return next();
+    }
+    console.log(`捕获到验证码输入: "${input}"，对应 captchaKey: ${pendingTask.captchaKey}`);
+    if (!/^[a-z0-9]{2,8}$/i.test(input)) {
+      return next();
+    }
+    captchaPendingMap.delete(sessionKey);
+    pendingTask.resolve(input.replace(/\s+/g, "").toLowerCase());
+    try {
+      await session.send("✅ 验证码已接收，正在登录...");
+    } catch (_) {
+    }
+    return;
+  });
   ctx.middleware(async (session, next) => {
     console.log("原始消息:", session.content);
     const originalInput = session.stripped.content.trim();
@@ -1620,6 +1707,12 @@ function apply(ctx, config) {
     const result = clearCache();
     return formatOutputMessage(`✅ ${result}`);
   });
+  ctx.command("强制刷新token", "强制清除缓存的token，重新获取登录验证码").action(async ({ session }) => {
+    currentToken = null;
+    tokenExpireTime = 0;
+    const token = await refreshToken(session);
+    return formatOutputMessage(`✅ Token已刷新，过期时间: ${new Date(tokenExpireTime).toLocaleString()}`);
+  });
   async function diagnoseNetwork() {
     const results = [];
     results.push("🌐 网络连接诊断");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-jscn-aaaquery",
   "description": "江苏有线无锡分公司宽带信息查询插件",
-  "version": "1.0.22",
+  "version": "1.1.01",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [