@certd/basic 1.36.21 → 1.36.23

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.23](https://github.com/certd/certd/compare/v1.36.22...v1.36.23) (2025-09-26)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
+
+### Performance Improvements
+
+* 优化连接失败的报错提示 ([71d8e7e](https://github.com/certd/certd/commit/71d8e7edd23ad63fdc01a92766b52ede5074fe7c))
+* 增加自签名证书提示 ([877c9c4](https://github.com/certd/certd/commit/877c9c4ff99f81d289f67afd96f440c0796b03ea))
+* dns支持新网域名解析 ([cf3a78e](https://github.com/certd/certd/commit/cf3a78e1145ff0505c87fbc485d9e731b1aa88a8))
+
 ## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)
 
 **Note:** Version bump only for package @certd/basic

package/build.md

@@ -1 +1 @@
-20:59
+01:39

package/dist/utils/index.d.ts

@@ -35,6 +35,9 @@ export declare const utils: {
         base64: (data: string) => string;
         base64Decode: (data: string) => string;
         hmacSha256: (data: string, digest?: import("crypto").BinaryToTextEncoding) => string;
+        toHex: (data: number | string) => string;
+        hexToStr: (data: string) => string;
+        hexToNumber: (data: string) => number;
     };
     promises: {
         TimeoutPromise: typeof import("./util.promise.js").TimeoutPromise;

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

@@ -4,11 +4,17 @@ declare function sha256(data: string, digest?: BinaryToTextEncoding): string;
 declare function hmacSha256(data: string, digest?: BinaryToTextEncoding): string;
 declare function base64(data: string): string;
 declare function base64Decode(data: string): string;
+declare function toHex(data: number | string): string;
+declare function hexToStr(data: string): string;
+declare function hexToNumber(data: string): number;
 export declare const hashUtils: {
     md5: typeof md5;
     sha256: typeof sha256;
     base64: typeof base64;
     base64Decode: typeof base64Decode;
     hmacSha256: typeof hmacSha256;
+    toHex: typeof toHex;
+    hexToStr: typeof hexToStr;
+    hexToNumber: typeof hexToNumber;
 };
 export {};

package/dist/utils/util.hash.js

@@ -14,11 +14,26 @@ function base64(data) {
 function base64Decode(data) {
     return Buffer.from(data, "base64").toString("utf8");
 }
+function toHex(data) {
+    if (typeof data === "number") {
+        return data.toString(16);
+    }
+    return Buffer.from(data).toString("hex");
+}
+function hexToStr(data) {
+    return Buffer.from(data, "hex").toString("utf8");
+}
+function hexToNumber(data) {
+    return parseInt(data, 16);
+}
 export const hashUtils = {
     md5,
     sha256,
     base64,
     base64Decode,
     hmacSha256,
+    toHex,
+    hexToStr,
+    hexToNumber,
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5oYXNoLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3V0aWwuaGFzaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLE1BQWdDLE1BQU0sUUFBUSxDQUFDO0FBRXRELFNBQVMsR0FBRyxDQUFDLElBQVksRUFBRSxTQUErQixLQUFLO0lBQzdELE9BQU8sTUFBTSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQzlELENBQUM7QUFDRCxTQUFTLE1BQU0sQ0FBQyxJQUFZLEVBQUUsU0FBK0IsS0FBSztJQUNoRSxPQUFPLE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUNqRSxDQUFDO0FBRUQsU0FBUyxVQUFVLENBQUMsSUFBWSxFQUFFLFNBQStCLFFBQVE7SUFDdkUsT0FBTyxNQUFNLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUNsRixDQUFDO0FBRUQsU0FBUyxNQUFNLENBQUMsSUFBWTtJQUMxQixPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBQzlDLENBQUM7QUFDRCxTQUFTLFlBQVksQ0FBQyxJQUFZO0lBQ2hDLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQ3RELENBQUM7QUFDRCxNQUFNLENBQUMsTUFBTSxTQUFTLEdBQUc7SUFDdkIsR0FBRztJQUNILE1BQU07SUFDTixNQUFNO0lBQ04sWUFBWTtJQUNaLFVBQVU7Q0FDWCxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5oYXNoLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3V0aWwuaGFzaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLE1BQWdDLE1BQU0sUUFBUSxDQUFDO0FBRXRELFNBQVMsR0FBRyxDQUFDLElBQVksRUFBRSxTQUErQixLQUFLO0lBQzdELE9BQU8sTUFBTSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQzlELENBQUM7QUFDRCxTQUFTLE1BQU0sQ0FBQyxJQUFZLEVBQUUsU0FBK0IsS0FBSztJQUNoRSxPQUFPLE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUNqRSxDQUFDO0FBRUQsU0FBUyxVQUFVLENBQUMsSUFBWSxFQUFFLFNBQStCLFFBQVE7SUFDdkUsT0FBTyxNQUFNLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUNsRixDQUFDO0FBRUQsU0FBUyxNQUFNLENBQUMsSUFBWTtJQUMxQixPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBQzlDLENBQUM7QUFDRCxTQUFTLFlBQVksQ0FBQyxJQUFZO0lBQ2hDLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQ3RELENBQUM7QUFFRCxTQUFTLEtBQUssQ0FBQyxJQUFxQjtJQUNsQyxJQUFJLE9BQU8sSUFBSSxLQUFLLFFBQVEsRUFBRSxDQUFDO1FBQzdCLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUMzQixDQUFDO0lBQ0QsT0FBTyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQztBQUMzQyxDQUFDO0FBQ0QsU0FBUyxRQUFRLENBQUMsSUFBWTtJQUM1QixPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUNuRCxDQUFDO0FBQ0QsU0FBUyxXQUFXLENBQUMsSUFBWTtJQUMvQixPQUFPLFFBQVEsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUM7QUFDNUIsQ0FBQztBQUNELE1BQU0sQ0FBQyxNQUFNLFNBQVMsR0FBRztJQUN2QixHQUFHO0lBQ0gsTUFBTTtJQUNOLE1BQU07SUFDTixZQUFZO0lBQ1osVUFBVTtJQUNWLEtBQUs7SUFDTCxRQUFRO0lBQ1IsV0FBVztDQUNaLENBQUMifQ==

package/dist/utils/util.request.js

@@ -7,6 +7,11 @@ import * as https from "node:https";
 import { merge } from "lodash-es";
 import { safePromise } from "./util.promise.js";
 import fs from "fs";
+const errorMap = {
+    "ssl3_get_record:wrong version number": "http协议错误，服务端要求http协议，请检查是否使用了https请求",
+    "getaddrinfo EAI_AGAIN": "无法解析域名，请检查网络连接或dns配置，更换docker-compose.yaml中dns配置",
+    "self-signed certificate": "目标站点为自签名证书，请勾选忽略证书校验",
+};
 export class HttpError extends Error {
     status;
     statusText;
@@ -20,12 +25,12 @@ 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) {
-                this.message = `${message}(http协议错误，服务端要求http协议，请检查是否使用了https请求)`;
-            }
-            else if (message.indexOf("getaddrinfo EAI_AGAIN") >= 0) {
-                this.message = `${message}(无法解析域名，请检查网络连接或dns配置，更换docker-compose.yaml中dns配置)`;
+        if (message && typeof message === "string" && message.indexOf) {
+            for (const key in errorMap) {
+                if (message.indexOf(key) > -1) {
+                    this.message = `${this.message}(${errorMap[key]})`;
+                    break;
+                }
             }
         }
         this.name = error.name;
@@ -180,10 +185,33 @@ export function createAxiosService({ logger }) {
             case 505:
                 error.message = "HTTP版本不受支持";
                 break;
+            case 302:
+                //重定向
+                return Promise.resolve(error.response);
             default:
                 break;
         }
-        logger.error(`请求出错：status:${error.response?.status},statusText:${error.response?.statusText},url:${error.config?.url},method:${error.config?.method}。`);
+        const errorCode = error.code;
+        let errorMessage = null;
+        if (errorCode === "ECONNABORTED") {
+            errorMessage = "请求连接终止";
+        }
+        else if (errorCode === "ETIMEDOUT") {
+            errorMessage = "请求连接超时";
+        }
+        else if (errorCode === "ECONNRESET") {
+            errorMessage = "请求连接被重置";
+        }
+        else if (errorCode === "ECONNREFUSED") {
+            errorMessage = "请求连接被服务端拒绝";
+        }
+        else if (errorCode === "ENOTFOUND") {
+            errorMessage = "请求地址不存在";
+        }
+        if (errorMessage) {
+            error.message = errorMessage + "," + error.message;
+        }
+        logger.error(`请求出错：status:${error.response?.status || error.code},statusText:${error.response?.statusText || error.code},url:${error.config?.url},method:${error.config?.method}。`);
         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;
@@ -291,4 +319,4 @@ export function getCookie(response, name) {
     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.36.21",
+  "version": "1.36.23",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -45,5 +45,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "3cedef4974708d828fb972acc54af0515e3ec3a0"
+  "gitHead": "f070030f6b5dd6dc1451400f55f5d723743a6aa9"
 }