@certd/basic 1.36.18 → 1.36.20

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.36.20](https://github.com/certd/certd/compare/v1.36.19...v1.36.20) (2025-09-13)
+
+**Note:** Version bump only for package @certd/basic
+
+## [1.36.19](https://github.com/certd/certd/compare/v1.36.18...v1.36.19) (2025-09-05)
+
+### Bug Fixes
+
+* 修复批量流水线执行时日志显示错乱的问题 ([4372adc](https://github.com/certd/certd/commit/4372adc703b9a4c785664054ab2a533626d815a8))
+
+### Performance Improvements
+
+* 去掉宝塔url后面的斜杠 ([8a0c2b9](https://github.com/certd/certd/commit/8a0c2b9b13628da750c25757e0cb8ed3038775ba))
+
 ## [1.36.18](https://github.com/certd/certd/compare/v1.36.17...v1.36.18) (2025-08-28)
 
 **Note:** Version bump only for package @certd/basic

package/build.md

@@ -1 +1 @@
-00:39
+00:56

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

@@ -1,6 +1,71 @@
-import log4js, { Logger } from "log4js";
+import log4js, { CallStack, Level } from "log4js";
 export declare function resetLogConfigure(): void;
 export declare const logger: log4js.Logger;
 export declare function resetLogFilePath(filePath: string): void;
-export declare function buildLogger(write: (text: string) => void): log4js.Logger;
-export type ILogger = Logger;
+export declare function buildLogger(write: (text: string) => void): PipelineLogger;
+export type ILogger = {
+    readonly category: string;
+    level: Level | string;
+    log(level: Level | string, ...args: any[]): void;
+    isLevelEnabled(level?: string): boolean;
+    isTraceEnabled(): boolean;
+    isDebugEnabled(): boolean;
+    isInfoEnabled(): boolean;
+    isWarnEnabled(): boolean;
+    isErrorEnabled(): boolean;
+    isFatalEnabled(): boolean;
+    _log(level: Level, data: any): void;
+    addContext(key: string, value: any): void;
+    removeContext(key: string): void;
+    clearContext(): void;
+    /**
+     * Replace the basic parse function with a new custom one
+     * - Note that linesToSkip will be based on the origin of the Error object in addition to the callStackLinesToSkip (at least 1)
+     * @param parseFunction the new parseFunction. Use `undefined` to reset to the base implementation
+     */
+    setParseCallStackFunction(parseFunction: (error: Error, linesToSkip: number) => CallStack | undefined): void;
+    /**
+     * Adjust the value of linesToSkip when the parseFunction is called.
+     *
+     * Cannot be less than 0.
+     */
+    callStackLinesToSkip: number;
+    trace(message: any, ...args: any[]): void;
+    debug(message: any, ...args: any[]): void;
+    info(message: any, ...args: any[]): void;
+    warn(message: any, ...args: any[]): void;
+    error(message: any, ...args: any[]): void;
+    fatal(message: any, ...args: any[]): void;
+    mark(message: any, ...args: any[]): void;
+};
+export declare class PipelineLogger implements ILogger {
+    callStackLinesToSkip: number;
+    readonly category: string;
+    level: Level | string;
+    _secrets: string[];
+    logger: ILogger;
+    customWriter: (text: string) => void;
+    constructor(name: string, write: (text: string) => void);
+    addSecret(secret: string): void;
+    _doLog(level: string, ...args: any[]): void;
+    _log(level: Level, data: any): void;
+    addContext(key: string, value: any): void;
+    clearContext(): void;
+    debug(message: any, ...args: any[]): void;
+    error(message: any, ...args: any[]): void;
+    fatal(message: any, ...args: any[]): void;
+    info(message: any, ...args: any[]): void;
+    trace(message: any, ...args: any[]): void;
+    warn(message: any, ...args: any[]): void;
+    isDebugEnabled(): boolean;
+    isErrorEnabled(): boolean;
+    isFatalEnabled(): boolean;
+    isInfoEnabled(): boolean;
+    isLevelEnabled(level?: string): boolean;
+    isTraceEnabled(): boolean;
+    isWarnEnabled(): boolean;
+    log(level: Level | string, ...args: any[]): void;
+    mark(message: any, ...args: any[]): void;
+    removeContext(key: string): void;
+    setParseCallStackFunction(parseFunction: (error: Error, linesToSkip: number) => CallStack | undefined): void;
+}

package/dist/utils/util.log.js

@@ -1,28 +1,10 @@
 import log4js from "log4js";
-const OutputAppender = {
-    configure: (config, layouts, findAppender, levels) => {
-        let layout = layouts.basicLayout;
-        if (config.layout) {
-            layout = layouts.layout(config.layout.type, config.layout);
-        }
-        function customAppender(layout, timezoneOffset) {
-            return (loggingEvent) => {
-                if (loggingEvent.context.outputHandler?.write) {
-                    const text = `${layout(loggingEvent, timezoneOffset)}\n`;
-                    loggingEvent.context.outputHandler.write(text);
-                }
-            };
-        }
-        return customAppender(layout, config.timezoneOffset);
-    },
-};
 let logFilePath = "./logs/app.log";
 export function resetLogConfigure() {
     // @ts-ignore
     log4js.configure({
         appenders: {
             std: { type: "stdout" },
-            output: { type: OutputAppender },
             file: {
                 type: "dateFile",
                 filename: logFilePath,
@@ -31,7 +13,7 @@ export function resetLogConfigure() {
                 numBackups: 3,
             },
         },
-        categories: { default: { appenders: ["std", "file"], level: "info" }, pipeline: { appenders: ["std", "file", "output"], level: "info" } },
+        categories: { default: { appenders: ["std", "file"], level: "info" }, pipeline: { appenders: ["std", "file"], level: "info" } },
     });
 }
 resetLogConfigure();
@@ -41,15 +23,42 @@ export function resetLogFilePath(filePath) {
     resetLogConfigure();
 }
 export function buildLogger(write) {
-    const logger = log4js.getLogger("pipeline");
-    const _secrets = [];
-    //@ts-ignore
-    logger.addSecret = (secret) => {
-        _secrets.push(secret);
-    };
-    logger.addContext("outputHandler", {
-        write: (text) => {
-            for (const item of _secrets) {
+    return new PipelineLogger("pipeline", write);
+}
+const locale = Intl.DateTimeFormat().resolvedOptions().locale;
+const formatter = new Intl.DateTimeFormat(locale, {
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit",
+    hour12: false,
+});
+function formatDateIntl(date = new Date()) {
+    const milliseconds = date.getMilliseconds(); // 获取毫秒
+    const formattedMilliseconds = milliseconds.toString().padStart(3, "0");
+    return formatter.format(date) + "." + formattedMilliseconds;
+}
+// @ts-ignore
+export class PipelineLogger {
+    callStackLinesToSkip = 3;
+    category = "pipeline";
+    level = "info";
+    _secrets = [];
+    logger;
+    customWriter;
+    constructor(name, write) {
+        this.customWriter = write;
+        this.logger = log4js.getLogger(name);
+    }
+    addSecret(secret) {
+        this._secrets.push(secret);
+    }
+    _doLog(level, ...args) {
+        let text = args.join(" ");
+        if (this.customWriter) {
+            for (const item of this._secrets) {
                 if (item == null) {
                     continue;
                 }
@@ -63,9 +72,69 @@ export function buildLogger(write) {
                     text = text.replaceAll(item, "*".repeat(item.length));
                 }
             }
-            write(text);
-        },
-    });
-    return logger;
+            text = `[${formatDateIntl()}] [${level.toUpperCase()}] - ${text} \n`;
+            this.customWriter(text);
+        }
+        // @ts-ignore
+        this.logger[level](...args);
+    }
+    _log(level, data) { }
+    addContext(key, value) { }
+    clearContext() { }
+    debug(message, ...args) {
+        if (this.isDebugEnabled()) {
+            this._doLog("debug", message, ...args);
+        }
+    }
+    error(message, ...args) {
+        if (this.isErrorEnabled()) {
+            this._doLog("error", message, ...args);
+        }
+    }
+    fatal(message, ...args) {
+        if (this.isFatalEnabled()) {
+            this._doLog("fatal", message, ...args);
+        }
+    }
+    info(message, ...args) {
+        if (this.isInfoEnabled()) {
+            this._doLog("info", message, ...args);
+        }
+    }
+    trace(message, ...args) {
+        if (this.isTraceEnabled()) {
+            this._doLog("trace", message, ...args);
+        }
+    }
+    warn(message, ...args) {
+        if (this.isWarnEnabled()) {
+            this._doLog("warn", message, ...args);
+        }
+    }
+    isDebugEnabled() {
+        return logger.isDebugEnabled();
+    }
+    isErrorEnabled() {
+        return logger.isErrorEnabled();
+    }
+    isFatalEnabled() {
+        return logger.isFatalEnabled();
+    }
+    isInfoEnabled() {
+        return logger.isInfoEnabled();
+    }
+    isLevelEnabled(level) {
+        return logger.isLevelEnabled();
+    }
+    isTraceEnabled() {
+        return logger.isTraceEnabled();
+    }
+    isWarnEnabled() {
+        return logger.isWarnEnabled();
+    }
+    log(level, ...args) { }
+    mark(message, ...args) { }
+    removeContext(key) { }
+    setParseCallStackFunction(parseFunction) { }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5sb2cuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvdXRpbC5sb2cudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxNQUFnQyxNQUFNLFFBQVEsQ0FBQztBQUV0RCxNQUFNLGNBQWMsR0FBRztJQUNyQixTQUFTLEVBQUUsQ0FBQyxNQUFXLEVBQUUsT0FBWSxFQUFFLFlBQWlCLEVBQUUsTUFBVyxFQUFFLEVBQUU7UUFDdkUsSUFBSSxNQUFNLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQztRQUNqQyxJQUFJLE1BQU0sQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNsQixNQUFNLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDN0QsQ0FBQztRQUNELFNBQVMsY0FBYyxDQUFDLE1BQVcsRUFBRSxjQUFtQjtZQUN0RCxPQUFPLENBQUMsWUFBMEIsRUFBRSxFQUFFO2dCQUNwQyxJQUFJLFlBQVksQ0FBQyxPQUFPLENBQUMsYUFBYSxFQUFFLEtBQUssRUFBRSxDQUFDO29CQUM5QyxNQUFNLElBQUksR0FBRyxHQUFHLE1BQU0sQ0FBQyxZQUFZLEVBQUUsY0FBYyxDQUFDLElBQUksQ0FBQztvQkFDekQsWUFBWSxDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNqRCxDQUFDO1lBQ0gsQ0FBQyxDQUFDO1FBQ0osQ0FBQztRQUNELE9BQU8sY0FBYyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDdkQsQ0FBQztDQUNGLENBQUM7QUFFRixJQUFJLFdBQVcsR0FBRyxnQkFBZ0IsQ0FBQztBQUNuQyxNQUFNLFVBQVUsaUJBQWlCO0lBQy9CLGFBQWE7SUFDYixNQUFNLENBQUMsU0FBUyxDQUFDO1FBQ2YsU0FBUyxFQUFFO1lBQ1QsR0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRTtZQUN2QixNQUFNLEVBQUUsRUFBRSxJQUFJLEVBQUUsY0FBYyxFQUFFO1lBQ2hDLElBQUksRUFBRTtnQkFDSixJQUFJLEVBQUUsVUFBVTtnQkFDaEIsUUFBUSxFQUFFLFdBQVc7Z0JBQ3JCLFdBQVcsRUFBRSxJQUFJO2dCQUNqQixRQUFRLEVBQUUsSUFBSTtnQkFDZCxVQUFVLEVBQUUsQ0FBQzthQUNkO1NBQ0Y7UUFDRCxVQUFVLEVBQUUsRUFBRSxPQUFPLEVBQUUsRUFBRSxTQUFTLEVBQUUsQ0FBQyxLQUFLLEVBQUUsTUFBTSxDQUFDLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxFQUFFLFFBQVEsRUFBRSxFQUFFLFNBQVMsRUFBRSxDQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsUUFBUSxDQUFDLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxFQUFFO0tBQzFJLENBQUMsQ0FBQztBQUNMLENBQUM7QUFDRCxpQkFBaUIsRUFBRSxDQUFDO0FBQ3BCLE1BQU0sQ0FBQyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBRWxELE1BQU0sVUFBVSxnQkFBZ0IsQ0FBQyxRQUFnQjtJQUMvQyxXQUFXLEdBQUcsUUFBUSxDQUFDO0lBQ3ZCLGlCQUFpQixFQUFFLENBQUM7QUFDdEIsQ0FBQztBQUNELE1BQU0sVUFBVSxXQUFXLENBQUMsS0FBNkI7SUFDdkQsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUM1QyxNQUFNLFFBQVEsR0FBYSxFQUFFLENBQUM7SUFDOUIsWUFBWTtJQUNaLE1BQU0sQ0FBQyxTQUFTLEdBQUcsQ0FBQyxNQUFjLEVBQUUsRUFBRTtRQUNwQyxRQUFRLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3hCLENBQUMsQ0FBQztJQUNGLE1BQU0sQ0FBQyxVQUFVLENBQUMsZUFBZSxFQUFFO1FBQ2pDLEtBQUssRUFBRSxDQUFDLElBQVksRUFBRSxFQUFFO1lBQ3RCLEtBQUssTUFBTSxJQUFJLElBQUksUUFBUSxFQUFFLENBQUM7Z0JBQzVCLElBQUksSUFBSSxJQUFJLElBQUksRUFBRSxDQUFDO29CQUNqQixTQUFTO2dCQUNYLENBQUM7Z0JBQ0QsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7b0JBQ3hCLE1BQU07b0JBQ04sSUFBSSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO29CQUMvQixTQUFTO2dCQUNYLENBQUM7Z0JBQ0QsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7b0JBQ3hCLHFCQUFxQjtvQkFDckIsSUFBSSxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ3hELENBQUM7WUFDSCxDQUFDO1lBQ0QsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2QsQ0FBQztLQUNGLENBQUMsQ0FBQztJQUNILE9BQU8sTUFBTSxDQUFDO0FBQ2hCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5sb2cuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvdXRpbC5sb2cudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxNQUE0QixNQUFNLFFBQVEsQ0FBQztBQUVsRCxJQUFJLFdBQVcsR0FBRyxnQkFBZ0IsQ0FBQztBQUNuQyxNQUFNLFVBQVUsaUJBQWlCO0lBQy9CLGFBQWE7SUFDYixNQUFNLENBQUMsU0FBUyxDQUFDO1FBQ2YsU0FBUyxFQUFFO1lBQ1QsR0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRTtZQUN2QixJQUFJLEVBQUU7Z0JBQ0osSUFBSSxFQUFFLFVBQVU7Z0JBQ2hCLFFBQVEsRUFBRSxXQUFXO2dCQUNyQixXQUFXLEVBQUUsSUFBSTtnQkFDakIsUUFBUSxFQUFFLElBQUk7Z0JBQ2QsVUFBVSxFQUFFLENBQUM7YUFDZDtTQUNGO1FBQ0QsVUFBVSxFQUFFLEVBQUUsT0FBTyxFQUFFLEVBQUUsU0FBUyxFQUFFLENBQUMsS0FBSyxFQUFFLE1BQU0sQ0FBQyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsRUFBRSxRQUFRLEVBQUUsRUFBRSxTQUFTLEVBQUUsQ0FBQyxLQUFLLEVBQUUsTUFBTSxDQUFDLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxFQUFFO0tBQ2hJLENBQUMsQ0FBQztBQUNMLENBQUM7QUFDRCxpQkFBaUIsRUFBRSxDQUFDO0FBQ3BCLE1BQU0sQ0FBQyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBRWxELE1BQU0sVUFBVSxnQkFBZ0IsQ0FBQyxRQUFnQjtJQUMvQyxXQUFXLEdBQUcsUUFBUSxDQUFDO0lBQ3ZCLGlCQUFpQixFQUFFLENBQUM7QUFDdEIsQ0FBQztBQUNELE1BQU0sVUFBVSxXQUFXLENBQUMsS0FBNkI7SUFDdkQsT0FBTyxJQUFJLGNBQWMsQ0FBQyxVQUFVLEVBQUUsS0FBSyxDQUFDLENBQUM7QUFD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

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

@@ -1,6 +1,5 @@
 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";
@@ -35,7 +34,7 @@ export declare function getGlobalAgents(): {
  * @description 创建请求实例
  */
 export declare function createAxiosService({ logger }: {
-    logger: Logger;
+    logger: ILogger;
 }): import("axios").AxiosInstance;
 export declare const http: HttpClient;
 export type HttpClientResponse<R> = any;

package/dist/utils/util.request.js

@@ -291,4 +291,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.18",
+  "version": "1.36.20",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -45,5 +45,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "ea18a5ad151b296fda54fb5bcbe64c7d80cdff2f"
+  "gitHead": "ef46aeae6fd766883aeac61a59ce1dfec07f6ca6"
 }