koishi-plugin-jscn-aaaquery 1.0.20 → 1.0.22

package/lib/index.js

@@ -647,40 +647,77 @@ function apply(ctx, config) {
   __name(queryOrderLog, "queryOrderLog");
   async function queryRadiusUser(account) {
     return addToQueue("radiusUser", { account }, async () => {
-      try {
-        console.log("开始查询RADIUS用户信息...");
-        const response = await ctx.http.post(
-          `${config.radiusApiUrl}/userquery`,
-          {
-            login_name: account,
-            org_code: "403",
-            // 固定值
-            channel: "ALL"
-            // 固定值
-          },
-          {
-            headers: {
-              "Content-Type": "application/json",
-              "Accept": "application/json"
+      const maxRetries = 2;
+      let lastError = null;
+      for (let attempt = 1; attempt <= maxRetries; attempt++) {
+        try {
+          console.log(`开始查询RADIUS用户信息... (第${attempt}次尝试)`);
+          console.log(`RADIUS API地址: ${config.radiusApiUrl}/userquery`);
+          const response = await ctx.http.post(
+            `${config.radiusApiUrl}/userquery`,
+            {
+              login_name: account,
+              org_code: "403",
+              // 固定值
+              channel: "ALL"
+              // 固定值
             },
-            timeout: 2e4
-            // 设置20秒超时，避免长时间无响应
+            {
+              headers: {
+                "Content-Type": "application/json",
+                "Accept": "application/json",
+                "User-Agent": "JSCN-AAAQuery/1.0"
+              },
+              timeout: 15e3
+              // 减少超时时间到15秒
+            }
+          );
+          console.log("RADIUS查询成功，响应:", JSON.stringify(response, null, 2));
+          return response;
+        } catch (error) {
+          lastError = error;
+          console.error(`RADIUS查询第${attempt}次尝试失败:`, error.message || error);
+          if (error.code) {
+            console.error(`错误代码: ${error.code}`);
           }
-        );
-        console.log("查询响应:", JSON.stringify(response, null, 2));
-        return response;
-      } catch (error) {
-        console.error("查询RADIUS用户错误详情:", error);
-        if (error.response) {
-          console.error("错误响应:", error.response.data);
+          if (error.cause) {
+            console.error(`错误原因: ${error.cause.message || error.cause}`);
+            if (error.cause.code) {
+              console.error(`原因代码: ${error.cause.code}`);
+            }
+          }
+          if (error.response) {
+            console.error("HTTP响应状态:", error.response.status);
+            console.error("HTTP响应数据:", error.response.data);
+          }
+          const isNetworkError = error.code === "UND_ERR_CONNECT_TIMEOUT" || error.code === "UND_ERR_SOCKET" || error.message?.includes("fetch failed") || error.message?.includes("timeout") || error.message?.includes("network");
+          if (isNetworkError && attempt < maxRetries) {
+            console.log(`网络错误，${attempt < maxRetries ? "准备重试" : "重试次数已用完"}`);
+            await new Promise((resolve) => setTimeout(resolve, 2e3 * attempt));
+            continue;
+          }
+          break;
         }
-        const fallbackResponse = {
-          code: "ERROR",
-          message: `查询RADIUS系统失败: ${error.message || "未知错误，可能是网络连接问题"}`,
-          data: null
-        };
-        return fallbackResponse;
       }
+      console.error("RADIUS查询最终失败，所有重试已用完");
+      let errorMessage = "查询RADIUS系统失败";
+      if (lastError?.code === "UND_ERR_CONNECT_TIMEOUT") {
+        errorMessage = "RADIUS服务器连接超时，请检查网络连接或服务器状态";
+      } else if (lastError?.code === "UND_ERR_SOCKET") {
+        errorMessage = "RADIUS服务器网络连接失败，请检查网络配置";
+      } else if (lastError?.message?.includes("fetch failed")) {
+        errorMessage = "RADIUS服务器请求失败，可能是网络问题或服务器不可达";
+      } else if (lastError?.response?.status) {
+        errorMessage = `RADIUS服务器返回错误状态码: ${lastError.response.status}`;
+      } else {
+        errorMessage = `RADIUS查询失败: ${lastError?.message || "未知错误"}`;
+      }
+      const fallbackResponse = {
+        code: "ERROR",
+        message: errorMessage,
+        data: null
+      };
+      return fallbackResponse;
     });
   }
   __name(queryRadiusUser, "queryRadiusUser");
@@ -1101,7 +1138,7 @@ function apply(ctx, config) {
                   );
                 } else if (accountInfo.onlineStatus === "离线" && accountInfo.isPass === "原因未知") {
                   message.push(
-                    `未检索该账号的拨号记录⚠️`,
+                    `未检索到该账号的拨号记录⚠️`,
                     `请尝试重新拨号或检查ONU配置和账号是否正确！`
                   );
                 } else if (accountInfo.onlineStatus === "离线" || accountInfo.onlineStatus === "不在线") {
@@ -1583,6 +1620,47 @@ function apply(ctx, config) {
     const result = clearCache();
     return formatOutputMessage(`✅ ${result}`);
   });
+  async function diagnoseNetwork() {
+    const results = [];
+    results.push("🌐 网络连接诊断");
+    results.push(getSeparator());
+    try {
+      const radiusUrl = new URL(config.radiusApiUrl || "http://111.208.114.248:28210/api/radius");
+      const host = radiusUrl.hostname;
+      const port = radiusUrl.port || "80";
+      results.push(`RADIUS服务器: ${host}:${port}`);
+      try {
+        const startTime = Date.now();
+        const response = await ctx.http.get(`${config.radiusApiUrl}/health`, {
+          timeout: 5e3,
+          validateStatus: /* @__PURE__ */ __name(() => true, "validateStatus")
+          // 接受任何状态码
+        });
+        const endTime = Date.now();
+        const latency = endTime - startTime;
+        results.push(`✅ 连接正常 (延迟: ${latency}ms)`);
+        results.push(`   状态码: ${response.status || "N/A"}`);
+      } catch (error) {
+        results.push(`❌ 连接失败`);
+        if (error.code === "UND_ERR_CONNECT_TIMEOUT") {
+          results.push(`   原因: 连接超时`);
+        } else if (error.code === "UND_ERR_SOCKET") {
+          results.push(`   原因: 网络连接失败`);
+        } else {
+          results.push(`   原因: ${error.message || "未知错误"}`);
+        }
+      }
+      results.push("");
+      results.push("📋 当前配置");
+      results.push(`RADIUS API地址: ${config.radiusApiUrl || "未配置"}`);
+      results.push(`运维系统地址: ${config.baseUrl || "未配置"}`);
+    } catch (error) {
+      results.push(`❌ 诊断过程出错: ${error.message}`);
+    }
+    results.push(getSeparator());
+    return results.join("\n");
+  }
+  __name(diagnoseNetwork, "diagnoseNetwork");
   function getSystemStatus() {
     updateCacheStats();
     const hitRate = cacheStats.hits + cacheStats.misses > 0 ? Math.round(cacheStats.hits / (cacheStats.hits + cacheStats.misses) * 100) : 0;
@@ -1612,6 +1690,9 @@ function apply(ctx, config) {
   ctx.command("系统状态").alias("/系统状态").action(async ({ session }) => {
     return formatOutputMessage(getSystemStatus());
   });
+  ctx.command("网络诊断").alias("/网络诊断").action(async ({ session }) => {
+    return formatOutputMessage(await diagnoseNetwork());
+  });
   ctx.command("使用说明", "显示插件的使用方法和命令说明").alias("/使用说明").action(async ({ session }) => {
     const helpText = [
       "📋 JSCN小帮手使用说明",
@@ -1655,6 +1736,19 @@ function apply(ctx, config) {
       "  示例：",
       "    输入 GDC8510019239048 → 触发账号查询",
       "    输入 00:11:22:33:44:55 → 触发终端查询",
+      "",
+      "6. 系统管理",
+      "  命令：系统状态",
+      "  功能：查看系统运行状态、缓存统计、队列状态等。",
+      "",
+      "  命令：网络诊断",
+      "  功能：诊断RADIUS服务器网络连接状态，帮助排查连接问题。",
+      "",
+      "  命令：缓存统计",
+      "  功能：查看缓存使用情况和命中率统计。",
+      "",
+      "  命令：清理缓存",
+      "  功能：清理所有缓存数据。",
       getSeparator()
     ].join("\n");
     return formatOutputMessage(helpText);

package/package.json

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