koishi-plugin-jscn-aaaquery 1.0.1 → 1.0.2

package/lib/index.js

@@ -35,6 +35,97 @@ var Config = import_koishi.Schema.object({
 function apply(ctx, config) {
   let currentToken = null;
   let tokenExpireTime = 0;
+  const requestQueue = {};
+  const cache = {};
+  const CACHE_EXPIRE_TIME = 5 * 60 * 1e3;
+  const CACHE_CLEAN_INTERVAL = 60 * 1e3;
+  const QUEUE_EXPIRE_TIME = 10 * 60 * 1e3;
+  const QUEUE_CLEAN_INTERVAL = 5 * 60 * 1e3;
+  const MAX_CONCURRENT_REQUESTS = 10;
+  let currentConcurrentRequests = 0;
+  const requestWaitQueue = [];
+  function getCacheKey(type, params) {
+    return `${type}:${JSON.stringify(params)}`;
+  }
+  __name(getCacheKey, "getCacheKey");
+  function getFromCache(type, params) {
+    const key = getCacheKey(type, params);
+    const item = cache[key];
+    if (item && Date.now() - item.timestamp <= CACHE_EXPIRE_TIME) {
+      return item.data;
+    }
+    return null;
+  }
+  __name(getFromCache, "getFromCache");
+  function setCache(type, params, data) {
+    const key = getCacheKey(type, params);
+    cache[key] = {
+      data,
+      timestamp: Date.now()
+    };
+  }
+  __name(setCache, "setCache");
+  setInterval(() => {
+    const now = Date.now();
+    for (const key in cache) {
+      if (now - cache[key].timestamp > CACHE_EXPIRE_TIME) {
+        delete cache[key];
+      }
+    }
+  }, CACHE_CLEAN_INTERVAL);
+  setInterval(() => {
+    const now = Date.now();
+    for (const key in requestQueue) {
+      if (now - requestQueue[key].timestamp > QUEUE_EXPIRE_TIME) {
+        delete requestQueue[key];
+      }
+    }
+  }, QUEUE_CLEAN_INTERVAL);
+  function getQueueKey(type, params) {
+    return `${type}:${JSON.stringify(params)}`;
+  }
+  __name(getQueueKey, "getQueueKey");
+  async function waitForRequestSlot() {
+    if (currentConcurrentRequests < MAX_CONCURRENT_REQUESTS) {
+      currentConcurrentRequests++;
+      return;
+    }
+    return new Promise((resolve) => {
+      requestWaitQueue.push(() => {
+        currentConcurrentRequests++;
+        resolve();
+      });
+    });
+  }
+  __name(waitForRequestSlot, "waitForRequestSlot");
+  function releaseRequestSlot() {
+    currentConcurrentRequests--;
+    if (requestWaitQueue.length > 0) {
+      const nextRequest = requestWaitQueue.shift();
+      if (nextRequest) {
+        nextRequest();
+      }
+    }
+  }
+  __name(releaseRequestSlot, "releaseRequestSlot");
+  async function addToQueue(type, params, fn) {
+    const key = getQueueKey(type, params);
+    if (requestQueue[key]) {
+      return requestQueue[key].promise;
+    }
+    await waitForRequestSlot();
+    const promise = fn();
+    requestQueue[key] = {
+      promise,
+      timestamp: Date.now()
+    };
+    promise.finally(() => {
+      delete requestQueue[key];
+      releaseRequestSlot();
+    });
+    return promise;
+  }
+  __name(addToQueue, "addToQueue");
   function formatMacAddress(mac) {
     return mac.replace(/[:-\s.]/g, "").toLowerCase();
   }
@@ -44,6 +135,14 @@ function apply(ctx, config) {
     return /^[0-9a-f]{12}$/i.test(cleanMac);
   }
   __name(isValidMacAddress, "isValidMacAddress");
+  function formatAccount(account) {
+    return account.toUpperCase();
+  }
+  __name(formatAccount, "formatAccount");
+  function isAccountResponseComplete(data) {
+    return !!(data.accessUserName && data.onlineStatus && data.isPass && data.userIp && data.mac && data.maxUpSpeed !== void 0 && data.maxDownSpeed !== void 0 && data.accessDomain && data.startTime && data.startTimeSum !== void 0 && data.nickName);
+  }
+  __name(isAccountResponseComplete, "isAccountResponseComplete");
   async function getToken() {
     const now = Date.now();
     if (currentToken && now < tokenExpireTime) {
@@ -52,10 +151,7 @@ function apply(ctx, config) {
     }
     try {
       console.log("开始登录请求...");
-      console.log("请求参数:", {
-        loginName: config.loginName,
-        pwd: config.password
-      });
+      await waitForRequestSlot();
       const response = await ctx.http.post(
         `${config.baseUrl}/admin/login`,
         `loginName=${encodeURIComponent(config.loginName)}&pwd=${encodeURIComponent(config.password)}`,
@@ -80,41 +176,56 @@ function apply(ctx, config) {
         console.error("错误响应:", error.response.data);
       }
       throw error;
+    } finally {
+      releaseRequestSlot();
     }
   }
   __name(getToken, "getToken");
   async function queryAccount(account) {
-    try {
-      console.log("开始查询账号信息...");
-      const token = await getToken();
-      const response = await ctx.http.get(`${config.baseUrl}/fttx/aaa/aaaCertification`, {
-        params: { accessUserName: account },
-        headers: {
-          "Authorization": token,
-          "Accept": "application/json",
-          "Content-Type": "application/json"
+    const formattedAccount = formatAccount(account);
+    const cachedData = getFromCache("account", { account: formattedAccount });
+    if (cachedData) {
+      console.log("使用缓存的账号信息");
+      return cachedData;
+    }
+    return addToQueue("account", { account: formattedAccount }, async () => {
+      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 (!isAccountResponseComplete(response.data)) {
+            throw new Error("账号信息不完整，请检查账号是否正确");
+          }
+          setCache("account", { account: formattedAccount }, response.data);
+          return response.data;
         }
-      });
-      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 new Error(`查询失败：${response.message || "未知错误"}`);
+      } catch (error) {
+        console.error("查询错误详情:", error);
+        if (error.response) {
+          console.error("错误响应:", error.response.data);
+        }
+        throw error;
       }
-      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: account },
+        params: { accessUserName: formattedAccount },
         headers: {
           "Authorization": token,
           "Accept": "application/json",
@@ -136,188 +247,243 @@ function apply(ctx, config) {
   }
   __name(queryAccountDetail, "queryAccountDetail");
   async function queryOnuList(mac) {
-    try {
-      console.log("开始查询MAC设备信息...");
-      const token = await getToken();
-      const response = await ctx.http.get(`${config.baseUrl}/fttx/onu/searchOnuList`, {
-        params: { mac, limit: 50, page: 1 },
-        // 增加limit以获取更多结果
-        headers: {
-          "Authorization": token,
-          "Accept": "application/json",
-          "Content-Type": "application/json"
+    const cachedData = getFromCache("onuList", { mac });
+    if (cachedData) {
+      console.log("使用缓存的设备信息");
+      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"
+          }
+        });
+        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);
-          return activeOnu;
+        throw new Error(`查询失败：${response.message || "未找到设备信息"}`);
+      } catch (error) {
+        console.error("查询错误详情:", error);
+        if (error.response) {
+          console.error("错误响应:", error.response.data);
         }
-        const lastOnu = response.data.rows[response.data.rows.length - 1];
-        console.log("没有在线设备，返回最后一条记录:", 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;
-    }
+    });
   }
   __name(queryOnuList, "queryOnuList");
   async function queryOnuDetailInfo(onuId) {
-    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) {
-        if (response.data.status === 1 && (response.data.onuReceivePower === "0" || response.data.onuSendPower === "0")) {
-          console.log("设备在线但光功率为0，尝试刷新光功率...");
-          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"
+    const cachedData = getFromCache("onuDetail", { onuId });
+    if (cachedData) {
+      console.log("使用缓存的设备详细信息");
+      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"
+          }
+        });
+        console.log("查询响应:", JSON.stringify(response, null, 2));
+        if (response.status === 200 && response.data) {
+          if (response.data.status === 1 && (response.data.onuReceivePower === "0" || response.data.onuSendPower === "0")) {
+            console.log("设备在线但光功率为0，尝试刷新光功率...");
+            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);
+                response.data.onuReceivePower = powerResponse.data.onuReceivePower;
+                response.data.onuSendPower = powerResponse.data.onuSendPower;
+                response.data.statusHealth = powerResponse.data.statusHealth;
               }
-            );
-            if (powerResponse.status === 200 && powerResponse.data) {
-              console.log("光功率刷新成功:", powerResponse.data);
-              response.data.onuReceivePower = powerResponse.data.onuReceivePower;
-              response.data.onuSendPower = powerResponse.data.onuSendPower;
-              response.data.statusHealth = powerResponse.data.statusHealth;
+            } catch (error) {
+              console.error("刷新光功率失败:", error);
             }
-          } catch (error) {
-            console.error("刷新光功率失败:", error);
           }
+          setCache("onuDetail", { onuId }, response.data);
+          return response.data;
         }
-        return response.data;
-      }
-      throw new Error(`查询失败：${response.message || "未知错误"}`);
-    } catch (error) {
-      console.error("查询错误详情:", error);
-      if (error.response) {
-        console.error("错误响应:", error.response.data);
+        throw new Error(`查询失败：${response.message || "未知错误"}`);
+      } catch (error) {
+        console.error("查询错误详情:", error);
+        if (error.response) {
+          console.error("错误响应:", error.response.data);
+        }
+        throw error;
       }
-      throw error;
-    }
+    });
   }
   __name(queryOnuDetailInfo, "queryOnuDetailInfo");
   async function queryCCName(mac) {
-    try {
-      console.log("开始查询CCNAME...");
-      const token = await getToken();
-      const response = await ctx.http.get(`${config.baseUrl}/fttx/onu/getCCname`, {
-        params: { mac },
-        headers: {
-          "Authorization": token,
-          "Accept": "application/json",
-          "Content-Type": "application/json"
+    const cachedData = getFromCache("ccname", { mac });
+    if (cachedData) {
+      console.log("使用缓存的CCNAME");
+      return cachedData;
+    }
+    return addToQueue("ccname", { mac }, async () => {
+      try {
+        console.log("开始查询CCNAME...");
+        const token = await getToken();
+        const response = await ctx.http.get(`${config.baseUrl}/fttx/onu/getCCname`, {
+          params: { mac },
+          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.ccname) {
+          setCache("ccname", { mac }, response.data.ccname);
+          return response.data.ccname;
         }
-      });
-      console.log("查询响应:", JSON.stringify(response, null, 2));
-      if (response.status === 200 && response.data && response.data.ccname) {
-        return response.data.ccname;
+        return "无CCName";
+      } catch (error) {
+        console.error("查询错误详情:", error);
+        return "无CCName";
       }
-      return "无CCName";
-    } catch (error) {
-      console.error("查询错误详情:", error);
-      return "无CCName";
-    }
+    });
   }
   __name(queryCCName, "queryCCName");
   async function queryOnuOrder(onuDetail) {
-    try {
-      console.log("开始查询工单信息...");
-      const token = await getToken();
-      const response = await ctx.http.get(`${config.baseUrl}/fttx/onu/onuOrderList`, {
-        params: {
-          cid: onuDetail.cid,
-          gponIndex: onuDetail.gponIndex,
-          onuIndex: onuDetail.onuIndex,
-          serial: onuDetail.serial
-        },
-        headers: {
-          "Authorization": token,
-          "Accept": "application/json",
-          "Content-Type": "application/json"
+    const cacheKey = {
+      cid: onuDetail.cid,
+      gponIndex: onuDetail.gponIndex,
+      onuIndex: onuDetail.onuIndex,
+      serial: onuDetail.serial
+    };
+    const cachedData = getFromCache("onuOrder", cacheKey);
+    if (cachedData) {
+      console.log("使用缓存的工单信息");
+      return cachedData;
+    }
+    return addToQueue("onuOrder", cacheKey, async () => {
+      try {
+        console.log("开始查询工单信息...");
+        const token = await getToken();
+        const response = await ctx.http.get(`${config.baseUrl}/fttx/onu/onuOrderList`, {
+          params: {
+            cid: onuDetail.cid,
+            gponIndex: onuDetail.gponIndex,
+            onuIndex: onuDetail.onuIndex,
+            serial: onuDetail.serial
+          },
+          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.length > 0) {
+          setCache("onuOrder", cacheKey, response.data[0]);
+          return response.data[0];
         }
-      });
-      console.log("查询响应:", JSON.stringify(response, null, 2));
-      if (response.status === 200 && response.data && response.data.length > 0) {
-        return response.data[0];
+        return null;
+      } catch (error) {
+        console.error("查询错误详情:", error);
+        return null;
       }
-      return null;
-    } catch (error) {
-      console.error("查询错误详情:", error);
-      return null;
-    }
+    });
   }
   __name(queryOnuOrder, "queryOnuOrder");
   async function queryOnuDetailVlanInfo(onuId) {
-    try {
-      console.log("开始查询业务配置信息...");
-      const token = await getToken();
-      const response = await ctx.http.get(`${config.baseUrl}/fttx/onu/onuDetailVlanInfo`, {
-        params: { onuId },
-        headers: {
-          "Authorization": token,
-          "Accept": "application/json",
-          "Content-Type": "application/json"
-        }
-      });
-      console.log("查询响应:", JSON.stringify(response, null, 2));
-      return response;
-    } catch (error) {
-      console.error("查询错误详情:", error);
-      return [];
+    const cachedData = getFromCache("onuVlan", { onuId });
+    if (cachedData) {
+      console.log("使用缓存的业务配置信息");
+      return cachedData;
     }
+    return addToQueue("onuVlan", { onuId }, async () => {
+      try {
+        console.log("开始查询业务配置信息...");
+        const token = await getToken();
+        const response = await ctx.http.get(`${config.baseUrl}/fttx/onu/onuDetailVlanInfo`, {
+          params: { onuId },
+          headers: {
+            "Authorization": token,
+            "Accept": "application/json",
+            "Content-Type": "application/json"
+          }
+        });
+        console.log("查询响应:", JSON.stringify(response, null, 2));
+        setCache("onuVlan", { onuId }, response);
+        return response;
+      } catch (error) {
+        console.error("查询错误详情:", error);
+        return [];
+      }
+    });
   }
   __name(queryOnuDetailVlanInfo, "queryOnuDetailVlanInfo");
   async function queryOrderLog(mac, startTime, endTime) {
-    try {
-      console.log("开始查询工单日志...");
-      const token = await getToken();
-      const formattedMac = formatMacAddress(mac);
-      console.log("处理后的MAC地址:", formattedMac);
-      const response = await ctx.http.get(`${config.baseUrl}/fttx/orderAnalyBlock/selectorderAnalyBlockOneList`, {
-        params: {
-          mac: formattedMac,
-          startTime,
-          endTime
-        },
-        headers: {
-          "Authorization": token,
-          "Accept": "application/json",
-          "Content-Type": "application/json"
-        }
-      });
-      console.log("查询响应:", JSON.stringify(response, null, 2));
-      return response;
-    } catch (error) {
-      console.error("查询错误详情:", error);
-      return [];
+    const cacheKey = { mac, startTime, endTime };
+    const cachedData = getFromCache("orderLog", cacheKey);
+    if (cachedData) {
+      console.log("使用缓存的工单日志");
+      return cachedData;
     }
+    return addToQueue("orderLog", cacheKey, async () => {
+      try {
+        console.log("开始查询工单日志...");
+        const token = await getToken();
+        const formattedMac = formatMacAddress(mac);
+        console.log("处理后的MAC地址:", formattedMac);
+        const response = await ctx.http.get(`${config.baseUrl}/fttx/orderAnalyBlock/selectorderAnalyBlockOneList`, {
+          params: {
+            mac: formattedMac,
+            startTime,
+            endTime
+          },
+          headers: {
+            "Authorization": token,
+            "Accept": "application/json",
+            "Content-Type": "application/json"
+          }
+        });
+        console.log("查询响应:", JSON.stringify(response, null, 2));
+        setCache("orderLog", cacheKey, response);
+        return response;
+      } catch (error) {
+        console.error("查询错误详情:", error);
+        return [];
+      }
+    });
   }
   __name(queryOrderLog, "queryOrderLog");
   ctx.middleware(async (session, next) => {
@@ -394,7 +560,7 @@ function apply(ctx, config) {
         return message;
       } catch (error) {
         console.error("查询过程出错:", error);
-        return "查询失败，请稍后重试";
+        return error.message || "查询失败，请检查账号是否正确";
       }
     }
   });
@@ -420,7 +586,7 @@ function apply(ctx, config) {
       return message;
     } catch (error) {
       console.error("查询过程出错:", error);
-      return "查询失败，请稍后重试";
+      return error.message || "查询失败，请检查账号是否正确";
     }
   });
   ctx.command("账号详情 <account:string>", "查询宽带账号详细记录").action(async (_, account) => {
@@ -445,7 +611,7 @@ function apply(ctx, config) {
       return messages.join("\n\n");
     } catch (error) {
       console.error("查询过程出错:", error);
-      return "查询失败，请稍后重试";
+      return error.message || "查询失败，请稍后重试";
     }
   });
   ctx.command("终端查询 <mac:string>", "查询终端基本信息").action(async (_, mac) => {

package/package.json

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