@certd/basic 1.38.9 → 1.38.11

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
+
+### Performance Improvements
+
+* 421 支持3次重试 ([b91548e](https://github.com/certd/certd/commit/b91548eef4c24faa822d3a40f1f6a77b41d274e4))
+
 ## [1.38.9](https://github.com/certd/certd/compare/v1.38.8...v1.38.9) (2026-02-09)
 
 ### Bug Fixes

package/build.md

@@ -1 +1 @@
-23:08
+23:40

package/dist/utils/util.request.js

@@ -7,6 +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 = {
     "ssl3_get_record:wrong version number": "http协议错误，服务端要求http协议，请检查是否使用了https请求",
     "getaddrinfo EAI_AGAIN": "无法解析域名，请检查网络连接或dns配置，更换docker-compose.yaml中dns配置",
@@ -129,6 +130,12 @@ export function createAxiosService({ logger }) {
         // });
         // config.httpsAgent = agent;
         config.proxy = false; //必须 否则还会走一层代理，
+        config.retry = merge({
+            status: [421],
+            count: 0,
+            max: 3,
+            delay: 1000,
+        }, config.retry);
         return config;
     }, (error) => {
         // 发送失败
@@ -152,7 +159,7 @@ export function createAxiosService({ logger }) {
             return response;
         }
         return response.data;
-    }, (error) => {
+    }, async (error) => {
         const status = error.response?.status;
         let message = "";
         switch (status) {
@@ -192,6 +199,9 @@ export function createAxiosService({ logger }) {
             case 302:
                 //重定向
                 return Promise.resolve(error.response);
+            case 421:
+                message = "源站请求超时";
+                break;
             default:
                 break;
         }
@@ -236,6 +246,20 @@ export function createAxiosService({ logger }) {
         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;

package/logs/app.log

@@ -0,0 +1,336 @@
+[2026-02-13T18:51:51.247] [INFO] default - http request:https://www.baidu.com，method:get
+[2026-02-13T18:51:51.538] [INFO] default - http response status: 200
+[2026-02-13T18:52:12.970] [INFO] default - http request:https://www.baidu1.com，method:get
+[2026-02-13T18:52:34.122] [ERROR] default - 请求出错：请求连接超时 [ETIMEDOUT] (connect ETIMEDOUT 103.233.82.15:443) status:undefined,statusText:ETIMEDOUT,url:https://www.baidu1.com,method:get。
+[2026-02-13T18:52:52.961] [INFO] default - http request:https://www.baidu.com/234234/3333，method:get
+[2026-02-13T18:52:53.224] [ERROR] default - 请求出错： [ERR_BAD_REQUEST] ,请求地址出错 [404] (Request failed with status code 404) status:404,statusText:Not Found,url:https://www.baidu.com/234234/3333,method:get。
+[2026-02-13T18:53:03.327] [INFO] default - http request:https://www.baidu.com/234234/3333，method:get
+[2026-02-13T18:53:03.598] [ERROR] default - 请求出错： [ERR_BAD_REQUEST] ,请求地址出错 [404] (Request failed with status code 404) status:404,statusText:Not Found,url:https://www.baidu.com/234234/3333,method:get。
+[2026-02-13T18:53:50.941] [INFO] default - http request:https://www.baidu.com/234234/3333，method:get
+[2026-02-13T18:53:51.212] [ERROR] default - 请求出错： [ERR_BAD_REQUEST] ,请求地址出错 [404] (Request failed with status code 404) status:404,statusText:Not Found,url:https://www.baidu.com/234234/3333,method:get。
+[2026-02-13T18:54:02.933] [INFO] default - http request:https://www.baidu.com/234234/3333，method:get
+[2026-02-13T18:54:03.107] [ERROR] default - 请求出错： [ERR_BAD_REQUEST] ,请求地址出错 [404] (Request failed with status code 404) status:404,statusText:Not Found,url:https://www.baidu.com/234234/3333,method:get。
+[2026-02-13T18:57:14.324] [INFO] default - http request:https://www.baidu.com/234234/3333，method:get
+[2026-02-13T18:57:14.592] [ERROR] default - 请求出错： [ERR_BAD_REQUEST] ,请求地址出错 [404] (Request failed with status code 404) status:404,statusText:Not Found,url:https://www.baidu.com/234234/3333,method:get。
+[2026-02-13T18:58:06.730] [INFO] default - http request:https://www.baidu.com/234234/3333，method:get
+[2026-02-13T18:58:06.909] [ERROR] default - 请求出错： [ERR_BAD_REQUEST] ,请求地址出错 [404] (Request failed with status code 404) status:404,statusText:Not Found,url:https://www.baidu.com/234234/3333,method:get。
+[2026-02-13T18:58:21.674] [INFO] default - http request:https://www.baidu.com/234234/3333，method:get
+[2026-02-13T18:58:21.933] [ERROR] default - 请求出错： [ERR_BAD_REQUEST] ,请求地址出错 [404] (Request failed with status code 404) status:404,statusText:Not Found,url:https://www.baidu.com/234234/3333,method:get。
+[2026-02-13T18:58:44.137] [INFO] default - http request:https://www.baidu.com/234234/3333，method:get
+[2026-02-13T18:58:44.381] [ERROR] default - 请求出错： [ERR_BAD_REQUEST] ,请求地址出错 [404] (Request failed with status code 404) status:404,statusText:Not Found,url:https://www.baidu.com/234234/3333,method:get。
+[2026-02-13T18:59:18.633] [INFO] default - http request:https://www.baidu.com/234234/3333，method:get
+[2026-02-13T18:59:18.853] [ERROR] default - 请求出错： [ERR_BAD_REQUEST] ,请求地址出错 [404] (Request failed with status code 404) status:404,statusText:Not Found,url:https://www.baidu.com/234234/3333,method:get。
+[2026-02-13T18:59:31.223] [INFO] default - http request:https://www.baidu.com/234234/3333，method:get
+[2026-02-13T18:59:31.444] [ERROR] default - 请求出错： [ERR_BAD_REQUEST] ,请求地址出错 [404] (Request failed with status code 404) status:404,statusText:Not Found,url:https://www.baidu.com/234234/3333,method:get。
+[2026-02-13T18:59:41.552] [INFO] default - http request:https://www.baidu.com/234234/3333，method:get
+[2026-02-13T18:59:41.761] [ERROR] default - 请求出错： [ERR_BAD_REQUEST] ,请求地址出错 [404] (Request failed with status code 404) status:404,statusText:Not Found,url:https://www.baidu.com/234234/3333,method:get。
+[2026-02-13T19:01:17.755] [INFO] default - http request:https://www.baidu.com/234234/3333，method:get
+[2026-02-13T19:01:17.992] [ERROR] default - 请求出错： [ERR_BAD_REQUEST] ,请求地址出错 [404] (Request failed with status code 404) status:404,statusText:Not Found,url:https://www.baidu.com/234234/3333,method:get。
+[2026-02-13T19:01:39.779] [INFO] default - http request:https://www.baidu.com/234234/3333，method:get
+[2026-02-13T19:01:40.039] [ERROR] default - 请求出错： [ERR_BAD_REQUEST] ,请求地址出错 [404] (Request failed with status code 404) status:404,statusText:Not Found,url:https://www.baidu.com/234234/3333,method:get。
+[2026-02-13T19:01:40.040] [ERROR] default - 返回数据: "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n<html><head>\n<title>404 Not Found</title>\n</head><body>\n<h1>Not Found</h1>\n<p>The requested URL /234234/3333 was not found on this server.</p>\n</body></html>\n"
+[2026-02-13T19:01:40.040] [INFO] default - config {
+  transitional: {
+    silentJSONParsing: true,
+    forcedJSONParsing: true,
+    clarifyTimeoutError: false
+  },
+  adapter: [ 'xhr', 'http', 'fetch' ],
+  transformRequest: [ [Function: transformRequest] ],
+  transformResponse: [ [Function: transformResponse] ],
+  timeout: 0,
+  xsrfCookieName: 'XSRF-TOKEN',
+  xsrfHeaderName: 'X-XSRF-TOKEN',
+  maxContentLength: -1,
+  maxBodyLength: -1,
+  env: {
+    FormData: [Function: FormData] [FormData] {
+      LINE_BREAK: '\r\n',
+      DEFAULT_CONTENT_TYPE: 'application/octet-stream'
+    },
+    Blob: [class Blob]
+  },
+  validateStatus: [Function: validateStatus],
+  headers: Object [AxiosHeaders] {
+    Accept: 'application/json, text/plain, */*',
+    'Content-Type': undefined,
+    'User-Agent': 'axios/1.9.0',
+    'Accept-Encoding': 'gzip, compress, deflate, br'
+  },
+  url: 'https://www.baidu.com/234234/3333',
+  retry: { status: [ 404 ], count: 0, max: 3, delay: 1000 },
+  allowAbsoluteUrls: true,
+  method: 'get',
+  logParams: false,
+  logRes: false,
+  logData: false,
+  httpsAgent: Agent {
+    _events: [Object: null prototype] {
+      free: [Function (anonymous)],
+      newListener: [Function: maybeEnableKeylog]
+    },
+    _eventsCount: 2,
+    _maxListeners: undefined,
+    defaultPort: 443,
+    protocol: 'https:',
+    options: [Object: null prototype] {
+      autoSelectFamily: true,
+      autoSelectFamilyAttemptTimeout: 1000,
+      noDelay: true,
+      path: null
+    },
+    requests: [Object: null prototype] {},
+    sockets: [Object: null prototype] {
+      'www.baidu.com:443:::::::::::::::::::::': [Array]
+    },
+    freeSockets: [Object: null prototype] {},
+    keepAliveMsecs: 1000,
+    keepAlive: false,
+    maxSockets: Infinity,
+    maxFreeSockets: 256,
+    scheduling: 'lifo',
+    maxTotalSockets: Infinity,
+    totalSocketCount: 1,
+    maxCachedSessions: 100,
+    _sessionCache: { map: [Object], list: [Array] },
+    [Symbol(shapeMode)]: false,
+    [Symbol(kCapture)]: false
+  },
+  httpAgent: Agent {
+    _events: [Object: null prototype] {
+      free: [Function (anonymous)],
+      newListener: [Function: maybeEnableKeylog]
+    },
+    _eventsCount: 2,
+    _maxListeners: undefined,
+    defaultPort: 80,
+    protocol: 'http:',
+    options: [Object: null prototype] {
+      autoSelectFamily: true,
+      autoSelectFamilyAttemptTimeout: 1000,
+      noDelay: true,
+      path: null
+    },
+    requests: [Object: null prototype] {},
+    sockets: [Object: null prototype] {},
+    freeSockets: [Object: null prototype] {},
+    keepAliveMsecs: 1000,
+    keepAlive: false,
+    maxSockets: Infinity,
+    maxFreeSockets: 256,
+    scheduling: 'lifo',
+    maxTotalSockets: Infinity,
+    totalSocketCount: 0,
+    [Symbol(shapeMode)]: false,
+    [Symbol(kCapture)]: false
+  },
+  proxy: false,
+  data: undefined
+}
+[2026-02-13T19:01:40.042] [ERROR] default - status=404，重试次数1,将在1000ms后重试，请求地址：https://www.baidu.com/234234/3333
+[2026-02-13T19:01:41.049] [INFO] default - http request:https://www.baidu.com/234234/3333，method:get
+[2026-02-13T19:01:41.163] [ERROR] default - 请求出错： [ERR_BAD_REQUEST] ,请求地址出错 [404] (Request failed with status code 404) status:404,statusText:Not Found,url:https://www.baidu.com/234234/3333,method:get。
+[2026-02-13T19:01:41.163] [ERROR] default - 返回数据: "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n<html><head>\n<title>404 Not Found</title>\n</head><body>\n<h1>Not Found</h1>\n<p>The requested URL /234234/3333 was not found on this server.</p>\n</body></html>\n"
+[2026-02-13T19:01:41.163] [INFO] default - config {
+  transitional: {
+    silentJSONParsing: true,
+    forcedJSONParsing: true,
+    clarifyTimeoutError: false
+  },
+  adapter: [ 'xhr', 'http', 'fetch' ],
+  transformRequest: [ [Function: transformRequest] ],
+  transformResponse: [ [Function: transformResponse] ],
+  timeout: 0,
+  xsrfCookieName: 'XSRF-TOKEN',
+  xsrfHeaderName: 'X-XSRF-TOKEN',
+  maxContentLength: -1,
+  maxBodyLength: -1,
+  env: {
+    FormData: [Function: FormData] [FormData] {
+      LINE_BREAK: '\r\n',
+      DEFAULT_CONTENT_TYPE: 'application/octet-stream'
+    },
+    Blob: [class Blob]
+  },
+  validateStatus: [Function: validateStatus],
+  headers: Object [AxiosHeaders] {
+    Accept: 'application/json, text/plain, */*',
+    'Content-Type': undefined,
+    'User-Agent': 'axios/1.9.0',
+    'Accept-Encoding': 'gzip, compress, deflate, br'
+  },
+  url: 'https://www.baidu.com/234234/3333',
+  retry: { status: [ 404 ], count: 1, max: 3, delay: 1000 },
+  allowAbsoluteUrls: true,
+  method: 'get',
+  logParams: false,
+  logRes: false,
+  logData: false,
+  httpsAgent: Agent {
+    _events: [Object: null prototype] {
+      free: [Function (anonymous)],
+      newListener: [Function: maybeEnableKeylog]
+    },
+    _eventsCount: 2,
+    _maxListeners: undefined,
+    defaultPort: 443,
+    protocol: 'https:',
+    options: [Object: null prototype] {
+      autoSelectFamily: true,
+      autoSelectFamilyAttemptTimeout: 1000,
+      noDelay: true,
+      path: null
+    },
+    requests: [Object: null prototype] {},
+    sockets: [Object: null prototype] {
+      'www.baidu.com:443:::::::::::::::::::::': [Array]
+    },
+    freeSockets: [Object: null prototype] {},
+    keepAliveMsecs: 1000,
+    keepAlive: false,
+    maxSockets: Infinity,
+    maxFreeSockets: 256,
+    scheduling: 'lifo',
+    maxTotalSockets: Infinity,
+    totalSocketCount: 1,
+    maxCachedSessions: 100,
+    _sessionCache: { map: [Object], list: [Array] },
+    [Symbol(shapeMode)]: false,
+    [Symbol(kCapture)]: false
+  },
+  httpAgent: Agent {
+    _events: [Object: null prototype] {
+      free: [Function (anonymous)],
+      newListener: [Function: maybeEnableKeylog]
+    },
+    _eventsCount: 2,
+    _maxListeners: undefined,
+    defaultPort: 80,
+    protocol: 'http:',
+    options: [Object: null prototype] {
+      autoSelectFamily: true,
+      autoSelectFamilyAttemptTimeout: 1000,
+      noDelay: true,
+      path: null
+    },
+    requests: [Object: null prototype] {},
+    sockets: [Object: null prototype] {},
+    freeSockets: [Object: null prototype] {},
+    keepAliveMsecs: 1000,
+    keepAlive: false,
+    maxSockets: Infinity,
+    maxFreeSockets: 256,
+    scheduling: 'lifo',
+    maxTotalSockets: Infinity,
+    totalSocketCount: 0,
+    [Symbol(shapeMode)]: false,
+    [Symbol(kCapture)]: false
+  },
+  proxy: false,
+  data: undefined
+}
+[2026-02-13T19:01:41.164] [ERROR] default - status=404，重试次数2,将在2000ms后重试，请求地址：https://www.baidu.com/234234/3333
+[2026-02-13T19:01:43.180] [INFO] default - http request:https://www.baidu.com/234234/3333，method:get
+[2026-02-13T19:01:43.289] [ERROR] default - 请求出错： [ERR_BAD_REQUEST] ,请求地址出错 [404] (Request failed with status code 404) status:404,statusText:Not Found,url:https://www.baidu.com/234234/3333,method:get。
+[2026-02-13T19:01:43.289] [ERROR] default - 返回数据: "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n<html><head>\n<title>404 Not Found</title>\n</head><body>\n<h1>Not Found</h1>\n<p>The requested URL /234234/3333 was not found on this server.</p>\n</body></html>\n"
+[2026-02-13T19:01:43.289] [INFO] default - config {
+  transitional: {
+    silentJSONParsing: true,
+    forcedJSONParsing: true,
+    clarifyTimeoutError: false
+  },
+  adapter: [ 'xhr', 'http', 'fetch' ],
+  transformRequest: [ [Function: transformRequest] ],
+  transformResponse: [ [Function: transformResponse] ],
+  timeout: 0,
+  xsrfCookieName: 'XSRF-TOKEN',
+  xsrfHeaderName: 'X-XSRF-TOKEN',
+  maxContentLength: -1,
+  maxBodyLength: -1,
+  env: {
+    FormData: [Function: FormData] [FormData] {
+      LINE_BREAK: '\r\n',
+      DEFAULT_CONTENT_TYPE: 'application/octet-stream'
+    },
+    Blob: [class Blob]
+  },
+  validateStatus: [Function: validateStatus],
+  headers: Object [AxiosHeaders] {
+    Accept: 'application/json, text/plain, */*',
+    'Content-Type': undefined,
+    'User-Agent': 'axios/1.9.0',
+    'Accept-Encoding': 'gzip, compress, deflate, br'
+  },
+  url: 'https://www.baidu.com/234234/3333',
+  retry: { status: [ 404 ], count: 2, max: 3, delay: 1000 },
+  allowAbsoluteUrls: true,
+  method: 'get',
+  logParams: false,
+  logRes: false,
+  logData: false,
+  httpsAgent: Agent {
+    _events: [Object: null prototype] {
+      free: [Function (anonymous)],
+      newListener: [Function: maybeEnableKeylog]
+    },
+    _eventsCount: 2,
+    _maxListeners: undefined,
+    defaultPort: 443,
+    protocol: 'https:',
+    options: [Object: null prototype] {
+      autoSelectFamily: true,
+      autoSelectFamilyAttemptTimeout: 1000,
+      noDelay: true,
+      path: null
+    },
+    requests: [Object: null prototype] {},
+    sockets: [Object: null prototype] {
+      'www.baidu.com:443:::::::::::::::::::::': [Array]
+    },
+    freeSockets: [Object: null prototype] {},
+    keepAliveMsecs: 1000,
+    keepAlive: false,
+    maxSockets: Infinity,
+    maxFreeSockets: 256,
+    scheduling: 'lifo',
+    maxTotalSockets: Infinity,
+    totalSocketCount: 1,
+    maxCachedSessions: 100,
+    _sessionCache: { map: [Object], list: [Array] },
+    [Symbol(shapeMode)]: false,
+    [Symbol(kCapture)]: false
+  },
+  httpAgent: Agent {
+    _events: [Object: null prototype] {
+      free: [Function (anonymous)],
+      newListener: [Function: maybeEnableKeylog]
+    },
+    _eventsCount: 2,
+    _maxListeners: undefined,
+    defaultPort: 80,
+    protocol: 'http:',
+    options: [Object: null prototype] {
+      autoSelectFamily: true,
+      autoSelectFamilyAttemptTimeout: 1000,
+      noDelay: true,
+      path: null
+    },
+    requests: [Object: null prototype] {},
+    sockets: [Object: null prototype] {},
+    freeSockets: [Object: null prototype] {},
+    keepAliveMsecs: 1000,
+    keepAlive: false,
+    maxSockets: Infinity,
+    maxFreeSockets: 256,
+    scheduling: 'lifo',
+    maxTotalSockets: Infinity,
+    totalSocketCount: 0,
+    [Symbol(shapeMode)]: false,
+    [Symbol(kCapture)]: false
+  },
+  proxy: false,
+  data: undefined
+}
+[2026-02-13T19:01:43.290] [ERROR] default - status=404，重试次数3,将在3000ms后重试，请求地址：https://www.baidu.com/234234/3333
+[2026-02-13T19:01:46.301] [INFO] default - http request:https://www.baidu.com/234234/3333，method:get
+[2026-02-13T19:01:46.435] [ERROR] default - 请求出错： [ERR_BAD_REQUEST] ,请求地址出错 [404] (Request failed with status code 404) status:404,statusText:Not Found,url:https://www.baidu.com/234234/3333,method:get。

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/basic",
   "private": false,
-  "version": "1.38.9",
+  "version": "1.38.11",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -47,5 +47,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "b30cb5d7dc8311af4863da7dc8781f7264ba0545"
+  "gitHead": "1f002159e2a3c73fb5e00341a344effa07d6f653"
 }

package/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);
+//   });