wok-server 0.4.13 → 0.6.0

package/dist/log/date.js

@@ -1,21 +1,21 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatDateTime = exports.currentDateTimeStr = void 0;
-function currentDateTimeStr() {
-    return formatDateTime(new Date());
-}
-exports.currentDateTimeStr = currentDateTimeStr;
-function formatDateTime(date) {
-    return (date.toLocaleString('zh-CN', {
-        timeZone: 'Asia/Shanghai',
-        year: 'numeric',
-        month: '2-digit',
-        day: '2-digit',
-        hour: '2-digit',
-        minute: '2-digit',
-        second: '2-digit',
-        hour12: false,
-        hourCycle: 'h23'
-    }) + `.${date.getMilliseconds()}`);
-}
-exports.formatDateTime = formatDateTime;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatDateTime = exports.currentDateTimeStr = void 0;
+function currentDateTimeStr() {
+    return formatDateTime(new Date());
+}
+exports.currentDateTimeStr = currentDateTimeStr;
+function formatDateTime(date) {
+    return (date.toLocaleString('zh-CN', {
+        timeZone: 'Asia/Shanghai',
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
+        hour: '2-digit',
+        minute: '2-digit',
+        second: '2-digit',
+        hour12: false,
+        hourCycle: 'h23'
+    }) + `.${date.getMilliseconds()}`);
+}
+exports.formatDateTime = formatDateTime;

package/dist/log/file.js

@@ -1,72 +1,198 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fileStore = void 0;
-const fs_1 = require("fs");
-const promises_1 = require("fs/promises");
-const os_1 = require("os");
-const path_1 = require("path");
-const task_1 = require("../task");
-const config_1 = require("./config");
-let QUEUE = [];
-/**
- * 文件存储.
- * @param log
- */
-function fileStore(log) {
-    QUEUE.push(log);
-    setTimeout(() => write().catch(e => console.error('Writing log file failed', e)), 0);
-}
-exports.fileStore = fileStore;
-function buildFilePath() {
-    const date = new Date();
-    let fileName = `${date.getFullYear()}-`;
-    const month = date.getMonth() + 1;
-    fileName += month.toFixed(0).padStart(2, '0');
-    fileName += '-';
-    const day = date.getDate();
-    fileName += day.toFixed(0).padStart(2, '0');
-    fileName += '.log';
-    return (0, path_1.resolve)(config_1.config.fileDir, fileName);
-}
-async function write() {
-    if (!QUEUE.length) {
-        return;
-    }
-    const path = buildFilePath();
-    const dir = (0, path_1.dirname)(path);
-    if (!(0, fs_1.existsSync)(dir)) {
-        await (0, promises_1.mkdir)(dir, { recursive: true });
-    }
-    const lines = QUEUE.join(os_1.EOL);
-    QUEUE = [];
-    await (0, promises_1.appendFile)(path, lines);
-}
-if (config_1.config.file) {
-    /**
-     * 清理任务.
-     */
-    (0, task_1.scheduleDailyTask)(3, 0, {
-        name: 'Log files clear',
-        async run() {
-            const files = await (0, promises_1.readdir)(config_1.config.fileDir);
-            const now = new Date().getTime();
-            for (const file of files) {
-                const dotIdx = file.indexOf('.');
-                if (dotIdx === -1) {
-                    console.warn(`Unable to process the log file: ${file}`);
-                    return;
-                }
-                const dateStr = file.substring(0, dotIdx);
-                const timestamp = Date.parse(dateStr);
-                if (isNaN(timestamp)) {
-                    console.warn(`Unable to process the log file: ${file}`);
-                    return;
-                }
-                if (timestamp + config_1.config.fileMaxDays * 24 * 3600 * 1000 < now) {
-                    console.warn(`Remove log file： ${file}`);
-                    await (0, promises_1.rm)((0, path_1.resolve)(config_1.config.fileDir, file));
-                }
-            }
-        }
-    });
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.flushLogsToFile = exports.fileStore = void 0;
+const fs_1 = require("fs");
+const promises_1 = require("fs/promises");
+const os_1 = require("os");
+const path_1 = require("path");
+const config_1 = require("./config");
+const log_1 = require("./log");
+// 日志队列
+let LOG_QUEUE = [];
+// 最大缓冲数量
+const MAX_QUEUE_SIZE = 1024;
+// 写入定时器
+let WRITE_TIMER = null;
+// 延迟写入时间（毫秒）
+const WRITE_DELAY = 100;
+// 是否已经安排了清理任务
+let CLEANUP_SCHEDULED = false;
+// 清理任务定时器
+let CLEANUP_TIMER = null;
+/**
+ * 文件存储.
+ * @param log 日志对象
+ * @param logConfig 日志配置
+ */
+function fileStore(log, logConfig) {
+    // 将日志添加到队列
+    LOG_QUEUE.push(log);
+    // 如果队列超过最大缓冲数量，立即写入
+    if (LOG_QUEUE.length >= MAX_QUEUE_SIZE) {
+        writeLogs(logConfig).catch(e => console.error('Writing log file failed', e));
+        // 在写入前检查是否需要安排清理任务
+        if (!CLEANUP_SCHEDULED) {
+            scheduleCleanupTask(logConfig);
+        }
+        return;
+    }
+    // 安排延迟写入
+    if (!WRITE_TIMER) {
+        WRITE_TIMER = setTimeout(() => {
+            WRITE_TIMER = null;
+            writeLogs(logConfig).catch(e => console.error('Writing log file failed', e));
+        }, WRITE_DELAY);
+    }
+    // 如果启用了文件存储并且还没有安排清理任务，则安排清理任务
+    if (!CLEANUP_SCHEDULED) {
+        scheduleCleanupTask(logConfig);
+    }
+}
+exports.fileStore = fileStore;
+/**
+ * 根据日期构建日志文件路径
+ * @param logConfig 日志配置
+ * @param dateKey 数字键 (格式：年*10000 + 月*100 + 日)
+ * @returns 日志文件路径
+ */
+function buildFilePathByDate(logConfig, dateKey) {
+    const fileName = `${dateKey}.log`;
+    // 确保目录是绝对路径
+    let fileDir = logConfig.fileDir;
+    if (!(0, path_1.isAbsolute)(fileDir)) {
+        fileDir = (0, path_1.resolve)(process.cwd(), fileDir);
+    }
+    return (0, path_1.resolve)(fileDir, fileName);
+}
+/**
+ * 根据日期对象计算数字键
+ * @param date 日期对象
+ * @returns 数字键 (格式：年*10000 + 月*100 + 日)
+ */
+function calculateDateKey(date) {
+    const year = date.getFullYear();
+    const month = date.getMonth() + 1; // 转换为1-12
+    const day = date.getDate();
+    return year * 10000 + month * 100 + day;
+}
+/**
+ * 写入日志到文件
+ * @param logConfig 日志配置
+ */
+async function writeLogs(logConfig) {
+    if (!LOG_QUEUE.length || !logConfig.file) {
+        return;
+    }
+    // 复制队列并清空原始队列
+    const logsToWrite = [...LOG_QUEUE];
+    LOG_QUEUE = [];
+    // 按日期对日志进行分组 - 使用数字键提升性能
+    const logsByDate = new Map();
+    logsToWrite.forEach(log => {
+        const logDate = new Date(log.time);
+        // 直接使用日期对象计算数字键
+        const dateKey = calculateDateKey(logDate);
+        const dateLogs = logsByDate.get(dateKey);
+        if (dateLogs) {
+            dateLogs.push(log);
+        }
+        else {
+            logsByDate.set(dateKey, [log]);
+        }
+    });
+    // 为每个日期组写入对应的日志文件
+    for (const [dateKey, dateLogs] of logsByDate.entries()) {
+        // 直接使用数字键构建文件路径
+        const filePath = buildFilePathByDate(logConfig, dateKey);
+        const dir = (0, path_1.dirname)(filePath);
+        // 确保目录存在
+        if (!(0, fs_1.existsSync)(dir)) {
+            await (0, promises_1.mkdir)(dir, { recursive: true });
+        }
+        // 格式化并写入该日期的所有日志
+        const lines = dateLogs
+            .map(log => (logConfig.format === 'json' ? (0, log_1.formatLogJson)(log) : (0, log_1.formatLogText)(log)))
+            .join(os_1.EOL);
+        try {
+            await (0, promises_1.appendFile)(filePath, lines);
+        }
+        catch (error) {
+            console.error(`Failed to write logs for date ${dateKey}:`, error);
+            // 继续处理下一个日期的日志，不中断整个写入过程
+        }
+    }
+}
+/**
+ * 执行日志清理任务
+ * @param logConfig 日志配置
+ */
+async function performCleanupTask(logConfig) {
+    try {
+        let dir = logConfig.fileDir;
+        if (!(0, path_1.isAbsolute)(dir)) {
+            dir = (0, path_1.resolve)(process.cwd(), dir);
+        }
+        // 确保目录存在
+        if (!(0, fs_1.existsSync)(dir)) {
+            return;
+        }
+        const files = await (0, promises_1.readdir)(dir);
+        const now = new Date().getTime();
+        const maxAge = logConfig.fileMaxDays * 24 * 3600 * 1000;
+        for (const file of files) {
+            try {
+                // 获取文件的完整路径
+                const filePath = (0, path_1.resolve)(dir, file);
+                // 获取文件的最后修改时间
+                const fileStats = (0, fs_1.statSync)(filePath);
+                const lastModifiedTime = fileStats.mtime.getTime();
+                // 检查文件是否过期（最后修改时间早于最大保留天数）
+                if (lastModifiedTime + maxAge < now) {
+                    console.warn(`Remove log file： ${file}`);
+                    await (0, promises_1.rm)(filePath);
+                }
+            }
+            catch (error) {
+                console.error(`Failed to process log file ${file}:`, error);
+                // 继续处理下一个文件，不中断清理过程
+                continue;
+            }
+        }
+    }
+    catch (error) {
+        console.error('Error during log cleanup:', error);
+    }
+    finally {
+        // 清理完成后，重置清理任务安排状态
+        CLEANUP_SCHEDULED = false;
+    }
+}
+/**
+ * 安排日志清理任务
+ * @param logConfig 日志配置
+ */
+function scheduleCleanupTask(logConfig) {
+    CLEANUP_SCHEDULED = true;
+    // 清除现有的清理定时器
+    if (CLEANUP_TIMER) {
+        clearTimeout(CLEANUP_TIMER);
+    }
+    // 设置清理任务在一天后执行
+    const delay = 24 * 60 * 60 * 1000;
+    CLEANUP_TIMER = setTimeout(() => {
+        CLEANUP_TIMER = null;
+        performCleanupTask(logConfig).catch(e => console.error('Cleanup task failed', e));
+    }, delay);
+}
+/**
+ * 确保所有日志都被写入文件
+ * 可以在应用程序关闭时调用
+ */
+async function flushLogsToFile() {
+    if (WRITE_TIMER) {
+        clearTimeout(WRITE_TIMER);
+        WRITE_TIMER = null;
+    }
+    await writeLogs(config_1.config);
+}
+exports.flushLogsToFile = flushLogsToFile;

package/dist/log/index.js

@@ -1,105 +1,135 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setLogStore = exports.getLogger = void 0;
-const tslib_1 = require("tslib");
-const os_1 = require("os");
-const config_1 = require("./config");
-const date_1 = require("./date");
-const file_1 = require("./file");
-const level_1 = require("./level");
-const store_1 = require("./store");
-/**
- * 文件存储
- */
-if (config_1.config.file) {
-    (0, store_1.setLogStore)(file_1.fileStore);
-}
-/**
- * 输出日志
- * @param level
- * @param message
- * @param error
- */
-function log(level, message, error) {
-    if (level < config_1.config.level) {
-        return;
-    }
-    const date = new Date();
-    // 控制台输出日志
-    let msg = `[${(0, date_1.formatDateTime)(date)}][${level_1.LogLevel[level]}]${message}`;
-    console.log(msg);
-    if (error) {
-        console.log(error);
-    }
-    // 存储中输出日志
-    const store = (0, store_1.getLogStore)();
-    if (store) {
-        if (error) {
-            if (error.stack) {
-                msg += os_1.EOL + error.stack;
-            }
-            else if (error.message) {
-                msg += os_1.EOL + error.message;
-            }
-            else {
-                msg += os_1.EOL + error;
-            }
-        }
-        store(msg);
-    }
-}
-const logger = Object.freeze({
-    /**
-     * debug 日志
-     */
-    debug(message) {
-        log(level_1.LogLevel.DEBUG, message);
-    },
-    isDebugEnabled() {
-        return level_1.LogLevel.DEBUG >= config_1.config.level;
-    },
-    /**
-     * info 日志
-     * @param message
-     */
-    info(message) {
-        log(level_1.LogLevel.INFO, message);
-    },
-    isInfoEnabled() {
-        return level_1.LogLevel.INFO >= config_1.config.level;
-    },
-    /**
-     * 警告日志
-     * @param message
-     * @param error
-     */
-    warn(message, error) {
-        log(level_1.LogLevel.WARN, message, error);
-    },
-    isWarnEnabled() {
-        return level_1.LogLevel.WARN >= config_1.config.level;
-    },
-    /**
-     * 错误日志
-     * @param message
-     * @param error
-     */
-    error(message, error) {
-        log(level_1.LogLevel.ERROR, message, error);
-    },
-    isErrorEnabled() {
-        return level_1.LogLevel.ERROR >= config_1.config.level;
-    }
-});
-/**
- * 获取日志对象.
- * @returns
- */
-function getLogger() {
-    return logger;
-}
-exports.getLogger = getLogger;
-tslib_1.__exportStar(require("./config"), exports);
-tslib_1.__exportStar(require("./level"), exports);
-var store_2 = require("./store");
-Object.defineProperty(exports, "setLogStore", { enumerable: true, get: function () { return store_2.setLogStore; } });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setLogStore = exports.getLogger = void 0;
+const tslib_1 = require("tslib");
+const config_1 = require("./config");
+const file_1 = require("./file");
+const level_1 = require("./level");
+const log_1 = require("./log");
+const store_1 = require("./store");
+/**
+ * 文件存储
+ */
+if (config_1.config.file) {
+    (0, store_1.setLogStore)(file_1.fileStore);
+}
+class Logger {
+    prefix;
+    constructor(prefix) {
+        this.prefix = prefix;
+    }
+    /**
+     * 输出日志
+     * @param level
+     * @param message
+     * @param error
+     */
+    log(level, message, error) {
+        if (level < config_1.config.level) {
+            return;
+        }
+        const log = {
+            level,
+            content: message,
+            time: new Date(),
+            prefix: this.prefix,
+            error
+        };
+        // 控制台输出日志
+        if (config_1.config.console) {
+            // const msg = config.format === 'text' ? formatLogText(log, true) : formatLogJson(log, true)
+            // 控制台强制使用 text 格式，json 格式只在文件中输出
+            const msg = (0, log_1.formatLogText)(log, true);
+            switch (level) {
+                case level_1.LogLevel.DEBUG:
+                    console.debug(msg);
+                    break;
+                case level_1.LogLevel.INFO:
+                    console.info(msg);
+                    break;
+                case level_1.LogLevel.WARN:
+                    console.warn(msg);
+                    break;
+                case level_1.LogLevel.ERROR:
+                    console.error(msg);
+                    break;
+            }
+            if (error) {
+                console.error(error);
+            }
+        }
+        // 自定义存储中输出日志
+        const store = (0, store_1.getLogStore)();
+        if (store) {
+            store(log, config_1.config);
+        }
+    }
+    /**
+     * debug 日志
+     */
+    debug(message) {
+        this.log(level_1.LogLevel.DEBUG, message);
+    }
+    isDebugEnabled() {
+        return level_1.LogLevel.DEBUG >= config_1.config.level;
+    }
+    /**
+     * info 日志
+     * @param message
+     */
+    info(message) {
+        this.log(level_1.LogLevel.INFO, message);
+    }
+    isInfoEnabled() {
+        return level_1.LogLevel.INFO >= config_1.config.level;
+    }
+    /**
+     * 警告日志
+     * @param message
+     * @param error
+     */
+    warn(message, error) {
+        this.log(level_1.LogLevel.WARN, message, error);
+    }
+    /**
+     * 等同于 warn
+     * @param message
+     * @param error
+     */
+    warning(message, error) {
+        this.log(level_1.LogLevel.WARN, message, error);
+    }
+    isWarnEnabled() {
+        return level_1.LogLevel.WARN >= config_1.config.level;
+    }
+    /**
+     * 错误日志
+     * @param message
+     * @param error
+     */
+    error(message, error) {
+        this.log(level_1.LogLevel.ERROR, message, error);
+    }
+    isErrorEnabled() {
+        return level_1.LogLevel.ERROR >= config_1.config.level;
+    }
+}
+const defaultLogger = new Logger();
+/**
+ * 获取日志对象.
+ *
+ * @param prefix 日志前缀，如果有值，每条日志前都会加上前缀信息
+ * @returns
+ */
+function getLogger(prefix) {
+    if (prefix) {
+        return new Logger(prefix);
+    }
+    return defaultLogger;
+}
+exports.getLogger = getLogger;
+tslib_1.__exportStar(require("./config"), exports);
+tslib_1.__exportStar(require("./level"), exports);
+tslib_1.__exportStar(require("./log"), exports);
+var store_2 = require("./store");
+Object.defineProperty(exports, "setLogStore", { enumerable: true, get: function () { return store_2.setLogStore; } });

package/dist/log/level.js

@@ -1,33 +1,33 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseLogLevel = exports.LogLevel = void 0;
-/**
- * 日志级别.
- */
-var LogLevel;
-(function (LogLevel) {
-    LogLevel[LogLevel["DEBUG"] = 1] = "DEBUG";
-    LogLevel[LogLevel["INFO"] = 2] = "INFO";
-    LogLevel[LogLevel["WARN"] = 3] = "WARN";
-    LogLevel[LogLevel["ERROR"] = 4] = "ERROR";
-})(LogLevel = exports.LogLevel || (exports.LogLevel = {}));
-/**
- * 解析日志级别
- * @param level
- */
-function parseLogLevel(level) {
-    const iLevel = level.toUpperCase();
-    switch (iLevel) {
-        case 'DEBUG':
-            return LogLevel.DEBUG;
-        case 'INFO':
-            return LogLevel.INFO;
-        case 'WARN':
-            return LogLevel.WARN;
-        case 'ERROR':
-            return LogLevel.ERROR;
-        default:
-            throw new Error(`Unknown log level ：${level}`);
-    }
-}
-exports.parseLogLevel = parseLogLevel;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseLogLevel = exports.LogLevel = void 0;
+/**
+ * 日志级别.
+ */
+var LogLevel;
+(function (LogLevel) {
+    LogLevel[LogLevel["DEBUG"] = 1] = "DEBUG";
+    LogLevel[LogLevel["INFO"] = 2] = "INFO";
+    LogLevel[LogLevel["WARN"] = 3] = "WARN";
+    LogLevel[LogLevel["ERROR"] = 4] = "ERROR";
+})(LogLevel = exports.LogLevel || (exports.LogLevel = {}));
+/**
+ * 解析日志级别
+ * @param level
+ */
+function parseLogLevel(level) {
+    const iLevel = level.toUpperCase();
+    switch (iLevel) {
+        case 'DEBUG':
+            return LogLevel.DEBUG;
+        case 'INFO':
+            return LogLevel.INFO;
+        case 'WARN':
+            return LogLevel.WARN;
+        case 'ERROR':
+            return LogLevel.ERROR;
+        default:
+            throw new Error(`Unknown log level ：${level}`);
+    }
+}
+exports.parseLogLevel = parseLogLevel;