koishi-plugin-jscn-aaaquery 1.0.14 → 1.0.15

package/lib/index.js

@@ -51,21 +51,21 @@ function evaluateOpticalPower(power) {
   }
 }
 __name(evaluateOpticalPower, "evaluateOpticalPower");
-var CACHE_EXPIRE_TIME = 2 * 60 * 1e3;
+var CACHE_EXPIRE_TIME = 1 * 60 * 1e3;
 var CACHE_CLEAN_INTERVAL = 60 * 1e3;
 var CACHE_STATS_RESET_INTERVAL = 24 * 60 * 60 * 1e3;
-var QUEUE_EXPIRE_TIME = 2 * 60 * 1e3;
+var QUEUE_EXPIRE_TIME = 1 * 60 * 1e3;
 var QUEUE_CLEAN_INTERVAL = 30 * 1e3;
 var MAX_CONCURRENT_REQUESTS = 5;
-var MESSAGE_TIMEOUT = 2 * 60 * 1e3;
+var MESSAGE_TIMEOUT = 1 * 60 * 1e3;
 var MESSAGE_CLEAN_INTERVAL = 60 * 1e3;
 function apply(ctx, config) {
-  const CACHE_EXPIRATION = 2 * 60 * 1e3;
-  const CACHE_CLEANUP_INTERVAL = 10 * 60 * 1e3;
+  const CACHE_EXPIRATION = 1 * 60 * 1e3;
+  const CACHE_CLEANUP_INTERVAL = 5 * 60 * 1e3;
   const CACHE_STATS_RESET_INTERVAL2 = 24 * 60 * 60 * 1e3;
-  const REQUEST_QUEUE_EXPIRATION = 5 * 60 * 1e3;
-  const REQUEST_QUEUE_CLEANUP_INTERVAL = 10 * 60 * 1e3;
-  const TOKEN_REFRESH_THRESHOLD = 5 * 60 * 1e3;
+  const REQUEST_QUEUE_EXPIRATION = 1 * 60 * 1e3;
+  const REQUEST_QUEUE_CLEANUP_INTERVAL = 5 * 60 * 1e3;
+  const TOKEN_REFRESH_THRESHOLD = 30 * 60 * 1e3;
   let currentToken = null;
   let tokenExpireTime = 0;
   const requestQueue = {};
@@ -83,7 +83,7 @@ function apply(ctx, config) {
   const requestWaitQueue = [];
   const messageQueue = [];
   let isProcessingMessage = false;
-  const MESSAGE_TIMEOUT2 = 2 * 60 * 1e3;
+  const MESSAGE_TIMEOUT2 = 1 * 60 * 1e3;
   const MESSAGE_CLEAN_INTERVAL2 = 60 * 1e3;
   const MAX_QUEUE_LENGTH = 50;
   function getCacheKey(type, params) {
@@ -309,11 +309,6 @@ function apply(ctx, config) {
   __name(refreshToken, "refreshToken");
   async function queryAccount(account) {
     const formattedAccount = formatAccount(account);
-    const cachedData = getFromCache("account", { account: formattedAccount });
-    if (cachedData) {
-      console.log("使用缓存的账号信息");
-      return cachedData;
-    }
     return addToQueue("account", { account: formattedAccount }, async () => {
       let retryCount = 0;
       const maxRetries = 1;
@@ -338,7 +333,6 @@ function apply(ctx, config) {
               if (!response.data.maxDownSpeed) response.data.maxDownSpeed = 0;
               if (!response.data.startTime) response.data.startTime = response.data.onlineFailTime || "未知";
               if (!response.data.nickName) response.data.nickName = response.data.nickName || "未知";
-              setCache("account", { account: formattedAccount }, response.data);
               return response.data;
             }
             if (response.data.onlineStatus === "离线" || response.data.onlineStatus === "不在线" || response.data.isPass === "原因未知") {
@@ -351,13 +345,11 @@ function apply(ctx, config) {
               if (!response.data.mac) response.data.mac = "未知";
               if (!response.data.userIp) response.data.userIp = "未知";
               if (!response.data.accessDomain) response.data.accessDomain = "未知";
-              setCache("account", { account: formattedAccount }, response.data);
               return response.data;
             }
             if (!isAccountResponseComplete(response.data)) {
               throw new Error("账号信息有误，请检查账号是否正确");
             }
-            setCache("account", { account: formattedAccount }, response.data);
             return response.data;
           }
           throw new Error(`查询失败：${response.message || "未知错误"}`);
@@ -426,11 +418,6 @@ function apply(ctx, config) {
   }
   __name(queryAccountDetail, "queryAccountDetail");
   async function queryOnuList(mac) {
-    const cachedData = getFromCache("onuList", { mac });
-    if (cachedData) {
-      console.log("使用缓存的设备信息");
-      return cachedData;
-    }
     return addToQueue("onuList", { mac }, async () => {
       let retryCount = 0;
       const maxRetries = 1;
@@ -451,12 +438,10 @@ function apply(ctx, config) {
             const activeOnu = response.data.rows.find((row) => row.status === 1);
             if (activeOnu) {
               console.log("找到在线设备:", activeOnu);
-              setCache("onuList", { mac }, activeOnu);
               return activeOnu;
             }
             const lastOnu = response.data.rows[response.data.rows.length - 1];
             console.log("没有在线设备，返回最后一条记录:", lastOnu);
-            setCache("onuList", { mac }, lastOnu);
             return lastOnu;
           }
           throw new Error(`查询失败：${response.message || "未找到设备信息"}`);
@@ -483,11 +468,6 @@ function apply(ctx, config) {
   }
   __name(queryOnuList, "queryOnuList");
   async function queryOnuDetailInfo(onuId) {
-    const cachedData = getFromCache("onuDetail", { onuId });
-    if (cachedData) {
-      console.log("使用缓存的设备详细信息");
-      return cachedData;
-    }
     return addToQueue("onuDetail", { onuId }, async () => {
       let retryCount = 0;
       const maxRetries = 1;
@@ -505,7 +485,6 @@ function apply(ctx, config) {
           });
           console.log("查询响应:", JSON.stringify(response, null, 2));
           if (response.status === 200 && response.data) {
-            setCache("onuDetail", { onuId }, response.data);
             return response.data;
           }
           throw new Error(`查询失败：${response.message || "未知错误"}`);
@@ -1138,7 +1117,7 @@ function apply(ctx, config) {
                   `账号: ${input}`,
                   `RADIUS状态: ${translateUserStatus(user.user_status)} ${user.user_status === "active" ? "✅" : user.user_status === "suspend" ? "⚠️" : "❌"}`,
                   "",
-                  "⚠️ 账号详细信息查询失败，只显示基本信息",
+                  "⚠️ 账号信息查询失败",
                   `错误信息: ${accountError.message || "未知错误"}`,
                   ""
                 ];
@@ -1277,7 +1256,7 @@ function apply(ctx, config) {
               `账号: ${account}`,
               `RADIUS状态: ${translateUserStatus(user.user_status)} ${user.user_status === "active" ? "✅" : user.user_status === "suspend" ? "⚠️" : "❌"}`,
               "",
-              "⚠️ 账号详细信息查询失败，只显示基本信息",
+              "⚠️ 账号信息查询失败",
               `错误信息: ${accountError.message || "未知错误"}`,
               ""
             ];

package/package.json

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