koishi-plugin-jscn-aaaquery 1.0.13 → 1.0.14

package/lib/index.js

@@ -51,7 +51,7 @@ function evaluateOpticalPower(power) {
   }
 }
 __name(evaluateOpticalPower, "evaluateOpticalPower");
-var CACHE_EXPIRE_TIME = 5 * 60 * 1e3;
+var CACHE_EXPIRE_TIME = 2 * 60 * 1e3;
 var CACHE_CLEAN_INTERVAL = 60 * 1e3;
 var CACHE_STATS_RESET_INTERVAL = 24 * 60 * 60 * 1e3;
 var QUEUE_EXPIRE_TIME = 2 * 60 * 1e3;
@@ -60,6 +60,12 @@ var MAX_CONCURRENT_REQUESTS = 5;
 var MESSAGE_TIMEOUT = 2 * 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_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;
   let currentToken = null;
   let tokenExpireTime = 0;
   const requestQueue = {};
@@ -140,7 +146,7 @@ function apply(ctx, config) {
     cacheStats.misses = 0;
     cacheStats.cleanups = 0;
     cacheStats.itemsRemoved = 0;
-  }, CACHE_STATS_RESET_INTERVAL);
+  }, CACHE_STATS_RESET_INTERVAL2);
   function getCacheStats() {
     updateCacheStats();
     const hitRate = cacheStats.hits + cacheStats.misses > 0 ? Math.round(cacheStats.hits / (cacheStats.hits + cacheStats.misses) * 100) : 0;
@@ -245,12 +251,32 @@ function apply(ctx, config) {
   __name(isAccountResponseComplete, "isAccountResponseComplete");
   async function getToken() {
     const now = Date.now();
+    if (currentToken && now < tokenExpireTime - TOKEN_REFRESH_THRESHOLD) {
+      console.log("使用缓存的token，过期时间:", new Date(tokenExpireTime).toLocaleString());
+      return currentToken;
+    }
     if (currentToken && now < tokenExpireTime) {
-      console.log("使用缓存的token");
+      console.log("token即将过期，后台刷新token");
+      refreshTokenInBackground();
       return currentToken;
     }
+    return refreshToken();
+  }
+  __name(getToken, "getToken");
+  async function refreshTokenInBackground() {
     try {
-      console.log("开始登录请求...");
+      console.log("开始在后台刷新token...");
+      refreshToken().catch((error) => {
+        console.error("后台刷新token失败:", error);
+      });
+    } catch (error) {
+      console.error("启动后台刷新token失败:", error);
+    }
+  }
+  __name(refreshTokenInBackground, "refreshTokenInBackground");
+  async function refreshToken() {
+    try {
+      console.log("开始登录请求刷新token...");
       await waitForRequestSlot();
       const response = await ctx.http.post(
         `${config.baseUrl}/admin/login`,
@@ -280,7 +306,7 @@ function apply(ctx, config) {
       releaseRequestSlot();
     }
   }
-  __name(getToken, "getToken");
+  __name(refreshToken, "refreshToken");
   async function queryAccount(account) {
     const formattedAccount = formatAccount(account);
     const cachedData = getFromCache("account", { account: formattedAccount });
@@ -289,10 +315,83 @@ function apply(ctx, config) {
       return cachedData;
     }
     return addToQueue("account", { account: formattedAccount }, async () => {
+      let retryCount = 0;
+      const maxRetries = 1;
+      while (retryCount <= maxRetries) {
+        try {
+          console.log("开始查询账号信息...");
+          const token = await getToken();
+          const response = await ctx.http.get(`${config.baseUrl}/fttx/aaa/aaaCertification`, {
+            params: { accessUserName: formattedAccount },
+            headers: {
+              "Authorization": token,
+              "Accept": "application/json",
+              "Content-Type": "application/json"
+            }
+          });
+          console.log("查询响应:", JSON.stringify(response, null, 2));
+          if (response.status === 200 && response.data) {
+            if (response.data.isPass === "上线失败") {
+              console.log("账号上线失败，将使用失败信息");
+              if (!response.data.startTimeSum) response.data.startTimeSum = 0;
+              if (!response.data.maxUpSpeed) response.data.maxUpSpeed = 0;
+              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 === "原因未知") {
+              console.log("账号离线或状态异常，将使用有限信息");
+              if (!response.data.startTimeSum) response.data.startTimeSum = 0;
+              if (!response.data.maxUpSpeed) response.data.maxUpSpeed = 0;
+              if (!response.data.maxDownSpeed) response.data.maxDownSpeed = 0;
+              if (!response.data.startTime) response.data.startTime = response.data.userLoginOutTime || "未知";
+              if (!response.data.nickName) response.data.nickName = "未知";
+              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 || "未知错误"}`);
+        } catch (error) {
+          console.error("查询错误详情:", error);
+          if (error.response) {
+            console.error("错误响应:", error.response.data);
+            if (error.response.status === 401) {
+              console.log("Token已过期或无效，正在重置token并重试...");
+              currentToken = null;
+              tokenExpireTime = 0;
+              if (retryCount < maxRetries) {
+                retryCount++;
+                console.log(`重试第${retryCount}次`);
+                continue;
+              }
+            }
+          }
+          throw error;
+        }
+      }
+      throw new Error("请求失败，重试次数已用完");
+    });
+  }
+  __name(queryAccount, "queryAccount");
+  async function queryAccountDetail(account) {
+    const formattedAccount = formatAccount(account);
+    let retryCount = 0;
+    const maxRetries = 1;
+    while (retryCount <= maxRetries) {
       try {
-        console.log("开始查询账号信息...");
+        console.log("开始查询账号详情记录...");
         const token = await getToken();
-        const response = await ctx.http.get(`${config.baseUrl}/fttx/aaa/aaaCertification`, {
+        const response = await ctx.http.get(`${config.baseUrl}/fttx/aaa/getMoreRecord`, {
           params: { accessUserName: formattedAccount },
           headers: {
             "Authorization": token,
@@ -302,33 +401,6 @@ function apply(ctx, config) {
         });
         console.log("查询响应:", JSON.stringify(response, null, 2));
         if (response.status === 200 && response.data) {
-          if (response.data.isPass === "上线失败") {
-            console.log("账号上线失败，将使用失败信息");
-            if (!response.data.startTimeSum) response.data.startTimeSum = 0;
-            if (!response.data.maxUpSpeed) response.data.maxUpSpeed = 0;
-            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 === "原因未知") {
-            console.log("账号离线或状态异常，将使用有限信息");
-            if (!response.data.startTimeSum) response.data.startTimeSum = 0;
-            if (!response.data.maxUpSpeed) response.data.maxUpSpeed = 0;
-            if (!response.data.maxDownSpeed) response.data.maxDownSpeed = 0;
-            if (!response.data.startTime) response.data.startTime = response.data.userLoginOutTime || "未知";
-            if (!response.data.nickName) response.data.nickName = "未知";
-            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 || "未知错误"}`);
@@ -336,37 +408,21 @@ function apply(ctx, config) {
         console.error("查询错误详情:", error);
         if (error.response) {
           console.error("错误响应:", error.response.data);
+          if (error.response.status === 401) {
+            console.log("Token已过期或无效，正在重置token并重试...");
+            currentToken = null;
+            tokenExpireTime = 0;
+            if (retryCount < maxRetries) {
+              retryCount++;
+              console.log(`重试第${retryCount}次`);
+              continue;
+            }
+          }
         }
         throw error;
       }
-    });
-  }
-  __name(queryAccount, "queryAccount");
-  async function queryAccountDetail(account) {
-    const formattedAccount = formatAccount(account);
-    try {
-      console.log("开始查询账号详情记录...");
-      const token = await getToken();
-      const response = await ctx.http.get(`${config.baseUrl}/fttx/aaa/getMoreRecord`, {
-        params: { accessUserName: formattedAccount },
-        headers: {
-          "Authorization": token,
-          "Accept": "application/json",
-          "Content-Type": "application/json"
-        }
-      });
-      console.log("查询响应:", JSON.stringify(response, null, 2));
-      if (response.status === 200 && response.data) {
-        return response.data;
-      }
-      throw new Error(`查询失败：${response.message || "未知错误"}`);
-    } catch (error) {
-      console.error("查询错误详情:", error);
-      if (error.response) {
-        console.error("错误响应:", error.response.data);
-      }
-      throw error;
     }
+    throw new Error("请求失败，重试次数已用完");
   }
   __name(queryAccountDetail, "queryAccountDetail");
   async function queryOnuList(mac) {
@@ -376,38 +432,53 @@ function apply(ctx, config) {
       return cachedData;
     }
     return addToQueue("onuList", { mac }, async () => {
-      try {
-        console.log("开始查询MAC设备信息...");
-        const token = await getToken();
-        const response = await ctx.http.get(`${config.baseUrl}/fttx/onu/searchOnuList`, {
-          params: { mac, limit: 10, page: 1 },
-          headers: {
-            "Authorization": token,
-            "Accept": "application/json",
-            "Content-Type": "application/json"
+      let retryCount = 0;
+      const maxRetries = 1;
+      while (retryCount <= maxRetries) {
+        try {
+          console.log("开始查询MAC设备信息...");
+          const token = await getToken();
+          const response = await ctx.http.get(`${config.baseUrl}/fttx/onu/searchOnuList`, {
+            params: { mac, limit: 10, page: 1 },
+            headers: {
+              "Authorization": token,
+              "Accept": "application/json",
+              "Content-Type": "application/json"
+            }
+          });
+          console.log("查询响应:", JSON.stringify(response, null, 2));
+          if (response.status === 200 && response.data && response.data.rows && response.data.rows.length > 0) {
+            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;
           }
-        });
-        console.log("查询响应:", JSON.stringify(response, null, 2));
-        if (response.status === 200 && response.data && response.data.rows && response.data.rows.length > 0) {
-          const activeOnu = response.data.rows.find((row) => row.status === 1);
-          if (activeOnu) {
-            console.log("找到在线设备:", activeOnu);
-            setCache("onuList", { mac }, activeOnu);
-            return activeOnu;
+          throw new Error(`查询失败：${response.message || "未找到设备信息"}`);
+        } catch (error) {
+          console.error("查询错误详情:", error);
+          if (error.response) {
+            console.error("错误响应:", error.response.data);
+            if (error.response.status === 401) {
+              console.log("Token已过期或无效，正在重置token并重试...");
+              currentToken = null;
+              tokenExpireTime = 0;
+              if (retryCount < maxRetries) {
+                retryCount++;
+                console.log(`重试第${retryCount}次`);
+                continue;
+              }
+            }
           }
-          const lastOnu = response.data.rows[response.data.rows.length - 1];
-          console.log("没有在线设备，返回最后一条记录:", lastOnu);
-          setCache("onuList", { mac }, lastOnu);
-          return lastOnu;
+          throw error;
         }
-        throw new Error(`查询失败：${response.message || "未找到设备信息"}`);
-      } catch (error) {
-        console.error("查询错误详情:", error);
-        if (error.response) {
-          console.error("错误响应:", error.response.data);
-        }
-        throw error;
       }
+      throw new Error("请求失败，重试次数已用完");
     });
   }
   __name(queryOnuList, "queryOnuList");
@@ -418,68 +489,45 @@ function apply(ctx, config) {
       return cachedData;
     }
     return addToQueue("onuDetail", { onuId }, async () => {
-      try {
-        console.log("开始查询MAC详细信息...");
-        const token = await getToken();
-        const response = await ctx.http.get(`${config.baseUrl}/fttx/onu/onuDetailInfo`, {
-          params: { onuId },
-          headers: {
-            "Authorization": token,
-            "Accept": "application/json",
-            "Content-Type": "application/json"
+      let retryCount = 0;
+      const maxRetries = 1;
+      while (retryCount <= maxRetries) {
+        try {
+          console.log("开始查询MAC详细信息...");
+          const token = await getToken();
+          const response = await ctx.http.get(`${config.baseUrl}/fttx/onu/onuDetailInfo`, {
+            params: { onuId },
+            headers: {
+              "Authorization": token,
+              "Accept": "application/json",
+              "Content-Type": "application/json"
+            }
+          });
+          console.log("查询响应:", JSON.stringify(response, null, 2));
+          if (response.status === 200 && response.data) {
+            setCache("onuDetail", { onuId }, response.data);
+            return response.data;
           }
-        });
-        console.log("查询响应:", JSON.stringify(response, null, 2));
-        if (response.status === 200 && response.data) {
-          console.log("尝试刷新设备光功率...");
-          try {
-            const powerResponse = await ctx.http.get(
-              `${config.baseUrl}/fttx/onu/refreshOnuPower`,
-              {
-                params: {
-                  cid: response.data.cid,
-                  gponIndex: response.data.gponIndex,
-                  onuIndex: response.data.onuIndex
-                },
-                headers: {
-                  "Authorization": token,
-                  "Accept": "application/json",
-                  "Content-Type": "application/json"
-                }
-              }
-            );
-            if (powerResponse.status === 200 && powerResponse.data) {
-              console.log("光功率刷新结果:", powerResponse.data);
-              if (powerResponse.data.status !== void 0) {
-                response.data.status = powerResponse.data.status;
-              }
-              if (response.data.status !== 1 && (powerResponse.data.onuReceivePower === void 0 || powerResponse.data.onuSendPower === void 0)) {
-                response.data.onuReceivePower = "设备不在线";
-                response.data.onuSendPower = "设备不在线";
-              } else {
-                response.data.onuReceivePower = powerResponse.data.onuReceivePower;
-                response.data.onuSendPower = powerResponse.data.onuSendPower;
+          throw new Error(`查询失败：${response.message || "未知错误"}`);
+        } catch (error) {
+          console.error("查询错误详情:", error);
+          if (error.response) {
+            console.error("错误响应:", error.response.data);
+            if (error.response.status === 401) {
+              console.log("Token已过期或无效，正在重置token并重试...");
+              currentToken = null;
+              tokenExpireTime = 0;
+              if (retryCount < maxRetries) {
+                retryCount++;
+                console.log(`重试第${retryCount}次`);
+                continue;
               }
-              response.data.statusHealth = powerResponse.data.statusHealth;
-            }
-          } catch (error) {
-            console.error("刷新光功率过程中出错:", error);
-            if (response.data.status !== 1 && (response.data.onuReceivePower === void 0 || response.data.onuReceivePower === null || response.data.onuSendPower === void 0 || response.data.onuSendPower === null)) {
-              response.data.onuReceivePower = "设备不在线";
-              response.data.onuSendPower = "设备不在线";
             }
           }
-          setCache("onuDetail", { onuId }, response.data);
-          return response.data;
+          throw error;
         }
-        throw new Error(`查询失败：${response.message || "未知错误"}`);
-      } catch (error) {
-        console.error("查询错误详情:", error);
-        if (error.response) {
-          console.error("错误响应:", error.response.data);
-        }
-        throw error;
       }
+      throw new Error("请求失败，重试次数已用完");
     });
   }
   __name(queryOnuDetailInfo, "queryOnuDetailInfo");
@@ -1035,11 +1083,24 @@ function apply(ctx, config) {
                     `回复消息: ${accountInfo.failReplyMessage || "未知"}`,
                     `原因分析: ${accountInfo.reasonAnaly || "未知"}`
                   );
-                } else if (accountInfo.onlineStatus === "离线" || accountInfo.onlineStatus === "不在线" || accountInfo.isPass === "原因未知") {
+                } else if (accountInfo.onlineStatus === "离线" && accountInfo.isPass === "原因未知") {
                   message.push(
                     `未检索到账号信息⚠️`,
                     `请检查ONU配置和账号是否正确或尝试重新拨号！`
                   );
+                } else if (accountInfo.onlineStatus === "离线" || accountInfo.onlineStatus === "不在线") {
+                  message.push(
+                    `MAC地址: ${accountInfo.mac || "未知"}`
+                  );
+                  if (accountInfo.startTime) {
+                    message.push(`最后在线: ${accountInfo.startTime || "未知"}`);
+                  }
+                  if (accountInfo.offlineReason) {
+                    message.push(`离线原因: ${accountInfo.offlineReason || "未知"}`);
+                  }
+                  if (accountInfo.reasonAnaly) {
+                    message.push(`原因分析: ${accountInfo.reasonAnaly || "未知"}`);
+                  }
                 } else {
                   message.push(
                     `IP地址: ${accountInfo.userIp}`,
@@ -1161,11 +1222,24 @@ function apply(ctx, config) {
                 `回复消息: ${accountInfo.failReplyMessage || "未知"}`,
                 `原因分析: ${accountInfo.reasonAnaly || "未知"}`
               );
-            } else if (accountInfo.onlineStatus === "离线" || accountInfo.onlineStatus === "不在线" || accountInfo.isPass === "原因未知") {
+            } else if (accountInfo.onlineStatus === "离线" && accountInfo.isPass === "原因未知") {
               message.push(
                 `未检索到账号信息⚠️`,
                 `请检查ONU配置和账号是否正确或尝试重新拨号！`
               );
+            } else if (accountInfo.onlineStatus === "离线" || accountInfo.onlineStatus === "不在线") {
+              message.push(
+                `MAC地址: ${accountInfo.mac || "未知"}`
+              );
+              if (accountInfo.startTime) {
+                message.push(`最后在线: ${accountInfo.startTime || "未知"}`);
+              }
+              if (accountInfo.offlineReason) {
+                message.push(`离线原因: ${accountInfo.offlineReason || "未知"}`);
+              }
+              if (accountInfo.reasonAnaly) {
+                message.push(`原因分析: ${accountInfo.reasonAnaly || "未知"}`);
+              }
             } else {
               message.push(
                 `IP地址: ${accountInfo.userIp}`,

package/package.json

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