From b91548eef4c24faa822d3a40f1f6a77b41d274e4 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Fri, 13 Feb 2026 19:02:53 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20421=20=E6=94=AF=E6=8C=813=E6=AC=A1?= =?UTF-8?q?=E9=87=8D=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- packages/core/basic/src/utils/util.request.ts | 33 +++++++++++++++++-- packages/core/basic/test.mjs | 17 ++++++++-- 3 files changed, 48 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9c7c6565e..e3c1e6bf4 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,5 @@ test/**/*.js /packages/ui/certd-server/data/keys.yaml /packages/pro/ test.js -.history \ No newline at end of file +.history +/logs \ No newline at end of file diff --git a/packages/core/basic/src/utils/util.request.ts b/packages/core/basic/src/utils/util.request.ts index 2a509d5db..4a46e77b5 100644 --- a/packages/core/basic/src/utils/util.request.ts +++ b/packages/core/basic/src/utils/util.request.ts @@ -7,7 +7,7 @@ import * as https from "node:https"; import { merge } from "lodash-es"; import { safePromise } from "./util.promise.js"; import fs from "fs"; - +import sleep from "./util.sleep.js"; const errorMap: Record = { "ssl3_get_record:wrong version number": "http协议错误,服务端要求http协议,请检查是否使用了https请求", "getaddrinfo EAI_AGAIN": "无法解析域名,请检查网络连接或dns配置,更换docker-compose.yaml中dns配置", @@ -148,6 +148,16 @@ export function createAxiosService({ logger }: { logger: ILogger }) { // }); // config.httpsAgent = agent; config.proxy = false; //必须 否则还会走一层代理, + + config.retry = merge( + { + status: [421], + count: 0, + max: 3, + delay: 1000, + }, + config.retry + ); return config; }, (error: Error) => { @@ -175,7 +185,7 @@ export function createAxiosService({ logger }: { logger: ILogger }) { } return response.data; }, - (error: any) => { + async (error: any) => { const status = error.response?.status; let message = ""; switch (status) { @@ -215,6 +225,9 @@ export function createAxiosService({ logger }: { logger: ILogger }) { case 302: //重定向 return Promise.resolve(error.response); + case 421: + message = "源站请求超时"; + break; default: break; } @@ -256,6 +269,22 @@ export function createAxiosService({ logger }: { logger: ILogger }) { if (error instanceof AggregateError) { logger.error("AggregateError", error); } + + const originalRequest = error.config || {}; + logger.info(`config`, originalRequest); + const retry = originalRequest.retry || {}; + if (retry.status && retry.status.includes(status)) { + if (retry.max > 0 && retry.count < retry.max) { + // 重试次数增加 + retry.count++; + const delay = retry.delay * retry.count; + logger.error(`status=${status},重试次数${retry.count},将在${delay}ms后重试,请求地址:${originalRequest.url}`); + await sleep(delay); + return service.request(originalRequest); // 重试请求 + } + logger.error(`重试超过最大次数${retry.max},请求失败:${originalRequest.url}`); + } + const err = new HttpError(error); if (error.response?.config?.logParams === false) { delete err.request?.params; diff --git a/packages/core/basic/test.mjs b/packages/core/basic/test.mjs index c8889c56e..1a679ce2c 100644 --- a/packages/core/basic/test.mjs +++ b/packages/core/basic/test.mjs @@ -13,6 +13,19 @@ // await testLocker(); -import { domainUtils } from "./dist/utils/util.domain.js"; +// import { domainUtils } from "./dist/utils/util.domain.js"; -console.log(domainUtils.isIpv6("::0:0:0:FFFF:129.144.52.38")); +// console.log(domainUtils.isIpv6("::0:0:0:FFFF:129.144.52.38")); + +// import { http } from "./dist/utils/util.request.js"; + +// http +// .request({ +// url: "https://www.baidu.com/234234/3333", +// retry: { +// status: [404], +// }, +// }) +// .then(res => { +// console.log(res.data); +// });