@certd/basic 1.33.5 → 1.33.7

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.33.7](https://github.com/certd/certd/compare/v1.33.6...v1.33.7) (2025-04-22)
+
+### Performance Improvements
+
+* 支持51dns ([96a0900](https://github.com/certd/certd/commit/96a0900edc95dcfd9acccf9d13592f12f5a09b3d))
+
+## [1.33.6](https://github.com/certd/certd/compare/v1.33.5...v1.33.6) (2025-04-20)
+
+**Note:** Version bump only for package @certd/basic
+
 ## [1.33.5](https://github.com/certd/certd/compare/v1.33.4...v1.33.5) (2025-04-17)
 
 ### Performance Improvements

package/build.md

@@ -1 +1 @@
-23:32
+22:12

package/dist/utils/util.request.d.ts

@@ -1,9 +1,9 @@
-import { AxiosHeaders, AxiosRequestConfig } from 'axios';
-import { ILogger } from './util.log.js';
-import { Logger } from 'log4js';
-import { HttpsProxyAgent } from 'https-proxy-agent';
-import nodeHttp from 'http';
-import * as https from 'node:https';
+import { AxiosHeaders, AxiosRequestConfig } from "axios";
+import { ILogger } from "./util.log.js";
+import { Logger } from "log4js";
+import { HttpsProxyAgent } from "https-proxy-agent";
+import nodeHttp from "http";
+import * as https from "node:https";
 export declare class HttpError extends Error {
     status?: number;
     statusText?: string;

package/dist/utils/util.request.js

@@ -1,12 +1,12 @@
-import axios from 'axios';
-import { logger } from './util.log.js';
-import { HttpProxyAgent } from 'http-proxy-agent';
-import { HttpsProxyAgent } from 'https-proxy-agent';
-import nodeHttp from 'http';
-import * as https from 'node:https';
-import { merge } from 'lodash-es';
-import { safePromise } from './util.promise.js';
-import fs from 'fs';
+import axios from "axios";
+import { logger } from "./util.log.js";
+import { HttpProxyAgent } from "http-proxy-agent";
+import { HttpsProxyAgent } from "https-proxy-agent";
+import nodeHttp from "http";
+import * as https from "node:https";
+import { merge } from "lodash-es";
+import { safePromise } from "./util.promise.js";
+import fs from "fs";
 export class HttpError extends Error {
     status;
     statusText;
@@ -20,11 +20,11 @@ export class HttpError extends Error {
         }
         super(error.message || error.response?.statusText);
         const message = error?.message;
-        if (message && typeof message === 'string') {
-            if (message.indexOf && message.indexOf('ssl3_get_record:wrong version number') >= 0) {
+        if (message && typeof message === "string") {
+            if (message.indexOf && message.indexOf("ssl3_get_record:wrong version number") >= 0) {
                 this.message = `${message}(http协议错误，服务端要求http协议，请检查是否使用了https请求)`;
             }
-            else if (message.indexOf('getaddrinfo EAI_AGAIN') >= 0) {
+            else if (message.indexOf("getaddrinfo EAI_AGAIN") >= 0) {
                 this.message = `${message}(无法解析域名，请检查网络连接或dns配置，更换docker-compose.yaml中dns配置)`;
             }
         }
@@ -44,7 +44,7 @@ export class HttpError extends Error {
         };
         let url = error.config?.url;
         if (error.config?.baseURL) {
-            url = (error.config?.baseURL || '') + url;
+            url = (error.config?.baseURL || "") + url;
         }
         if (url) {
             this.message = `${this.message} 【${url}】`;
@@ -65,7 +65,7 @@ export class HttpError extends Error {
 export const HttpCommonError = HttpError;
 let defaultAgents = createAgent();
 export function setGlobalProxy(opts) {
-    logger.info('setGlobalProxy:', opts);
+    logger.info("setGlobalProxy:", opts);
     defaultAgents = createAgent(opts);
 }
 export function getGlobalAgents() {
@@ -90,12 +90,12 @@ export function createAxiosService({ logger }) {
         if (config.skipSslVerify || config.httpProxy) {
             let rejectUnauthorized = true;
             if (config.skipSslVerify) {
-                logger.info('跳过SSL验证');
+                logger.info("跳过SSL验证");
                 rejectUnauthorized = false;
             }
             const proxy = {};
             if (config.httpProxy) {
-                logger.info('使用自定义http代理:', config.httpProxy);
+                logger.info("使用自定义http代理:", config.httpProxy);
                 proxy.httpProxy = config.httpProxy;
                 proxy.httpsProxy = config.httpProxy;
             }
@@ -112,7 +112,7 @@ export function createAxiosService({ logger }) {
         return config;
     }, (error) => {
         // 发送失败
-        logger.error('接口请求失败：', error);
+        logger.error("接口请求失败：", error);
         return Promise.reject(error);
     });
     // 响应拦截
@@ -126,7 +126,7 @@ export function createAxiosService({ logger }) {
             logger.info(`http response : status=${response?.status},data=${resData}`);
         }
         else {
-            logger.info('http response status:', response?.status);
+            logger.info("http response status:", response?.status);
         }
         if (response?.config?.returnResponse) {
             return response;
@@ -136,51 +136,51 @@ export function createAxiosService({ logger }) {
         const status = error.response?.status;
         switch (status) {
             case 400:
-                error.message = '请求错误';
+                error.message = "请求错误";
                 break;
             case 401:
-                error.message = '认证/登录失败';
+                error.message = "认证/登录失败";
                 break;
             case 403:
-                error.message = '拒绝访问';
+                error.message = "拒绝访问";
                 break;
             case 404:
                 error.message = `请求地址出错`;
                 break;
             case 408:
-                error.message = '请求超时';
+                error.message = "请求超时";
                 break;
             case 500:
-                error.message = '服务器内部错误';
+                error.message = "服务器内部错误";
                 break;
             case 501:
-                error.message = '服务未实现';
+                error.message = "服务未实现";
                 break;
             case 502:
-                error.message = '网关错误';
+                error.message = "网关错误";
                 break;
             case 503:
-                error.message = '服务不可用';
+                error.message = "服务不可用";
                 break;
             case 504:
-                error.message = '网关超时';
+                error.message = "网关超时";
                 break;
             case 505:
-                error.message = 'HTTP版本不受支持';
+                error.message = "HTTP版本不受支持";
                 break;
             default:
                 break;
         }
         logger.error(`请求出错：status:${error.response?.status},statusText:${error.response?.statusText},url:${error.config?.url},method:${error.config?.method}。`);
-        logger.error('返回数据:', JSON.stringify(error.response?.data));
+        logger.error("返回数据:", JSON.stringify(error.response?.data));
         if (error.response?.data) {
             const message = error.response.data.message || error.response.data.msg || error.response.data.error;
-            if (typeof message === 'string') {
+            if (typeof message === "string") {
                 error.message = message;
             }
         }
         if (error instanceof AggregateError) {
-            logger.error('AggregateError', error);
+            logger.error("AggregateError", error);
         }
         const err = new HttpError(error);
         return Promise.reject(err);
@@ -198,26 +198,26 @@ export function createAgent(opts = {}) {
     if (httpProxy) {
         process.env.HTTP_PROXY = httpProxy;
         process.env.http_proxy = httpProxy;
-        logger.info('use httpProxy:', httpProxy);
+        logger.info("use httpProxy:", httpProxy);
         httpAgent = new HttpProxyAgent(httpProxy, opts);
         merge(httpAgent.options, opts);
     }
     else {
-        process.env.HTTP_PROXY = '';
-        process.env.http_proxy = '';
+        process.env.HTTP_PROXY = "";
+        process.env.http_proxy = "";
         httpAgent = new nodeHttp.Agent(opts);
     }
     const httpsProxy = opts.httpsProxy;
     if (httpsProxy) {
         process.env.HTTPS_PROXY = httpsProxy;
         process.env.https_proxy = httpsProxy;
-        logger.info('use httpsProxy:', httpsProxy);
+        logger.info("use httpsProxy:", httpsProxy);
         httpsAgent = new HttpsProxyAgent(httpsProxy, opts);
         merge(httpsAgent.options, opts);
     }
     else {
-        process.env.HTTPS_PROXY = '';
-        process.env.https_proxy = '';
+        process.env.HTTPS_PROXY = "";
+        process.env.https_proxy = "";
         httpsAgent = new https.Agent(opts);
     }
     return {
@@ -231,27 +231,27 @@ export async function download(req) {
         http
             .request({
             logRes: false,
-            responseType: 'stream',
+            responseType: "stream",
             ...config,
         })
             .then(res => {
             const writer = fs.createWriteStream(savePath);
             res.pipe(writer);
-            writer.on('close', () => {
-                logger.info('文件下载成功');
+            writer.on("close", () => {
+                logger.info("文件下载成功");
                 resolve(true);
             });
             //error
-            writer.on('error', err => {
-                logger.error('下载失败', err);
+            writer.on("error", err => {
+                logger.error("下载失败", err);
                 reject(err);
             });
             //进度条打印
-            const totalLength = res.headers['content-length'];
+            const totalLength = res.headers["content-length"];
             let currentLength = 0;
             // 每5%打印一次
             const step = (totalLength / 100) * 5;
-            res.on('data', (chunk) => {
+            res.on("data", (chunk) => {
                 currentLength += chunk.length;
                 if (currentLength % step < chunk.length) {
                     const percent = ((currentLength / totalLength) * 100).toFixed(2);
@@ -260,19 +260,19 @@ export async function download(req) {
             });
         })
             .catch(err => {
-            logger.info('下载失败', err);
+            logger.info("下载失败", err);
             reject(err);
         });
     });
 }
 export function getCookie(response, name) {
-    const cookies = response.headers['set-cookie'];
+    const cookies = response.headers["set-cookie"];
     //根据name 返回对应的cookie
     const found = cookies.find((cookie) => cookie.includes(name));
     if (!found) {
         return null;
     }
-    const cookie = found.split(';')[0];
-    return cookie.substring(cookie.indexOf('=') + 1);
+    const cookie = found.split(";")[0];
+    return cookie.substring(cookie.indexOf("=") + 1);
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"util.request.js","sourceRoot":"","sources":["../../src/utils/util.request.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"util.request.js","sourceRoot":"","sources":["../../src/utils/util.request.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/basic",
   "private": false,
-  "version": "1.33.5",
+  "version": "1.33.7",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -44,5 +44,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "198a97b00c75219ea8efdc6db4676158506a07c1"
+  "gitHead": "a188385817e8dbd270dbdbf7f86a5b812884cf59"
 }