node-karin 1.9.7 → 1.9.9

package/dist/start/index.mjs

@@ -7,13 +7,11 @@ import { fork } from 'node:child_process';
 // src/start/index.ts
 var isStart = false;
 var child;
-var lastStartTime = 0;
-var isClosing = false;
-var minRestartInterval = 5e3;
 var _filename = fileURLToPath(import.meta.url);
 var _dirname = path.dirname(_filename);
 var getMainPath = () => {
-  const filePath = path.join(_dirname, import.meta.url.includes(".mjs") ? "app.mjs" : "app.ts");
+  const isESM = import.meta.url.includes(".mjs");
+  const filePath = path.join(_dirname, isESM ? "app.mjs" : "app.ts");
   if (fs.existsSync(filePath)) {
     return filePath;
   }
@@ -25,31 +23,23 @@ var start = () => {
     return child;
   }
   isStart = true;
-  lastStartTime = Date.now();
   child = fork(getMainPath());
   child.on("message", (message) => {
-    const { port, type, token } = JSON.parse(message) || {};
-    if (type === "restart") {
-      restart(port, token);
-      return;
-    }
-    if (type === "stop") {
-      process.exit(0);
-    }
-  });
-  child.on("exit", (code) => {
-    isStart = false;
-    if (!isClosing && Date.now() - lastStartTime > minRestartInterval) {
-      process.exit(code);
+    try {
+      const { port, type, token } = JSON.parse(message) || {};
+      if (type === "restart") {
+        restart(port, token);
+        return;
+      }
+      if (type === "stop") exit();
+    } catch (error) {
+      console.error("\u5904\u7406\u5B50\u8FDB\u7A0B\u6D88\u606F\u65F6\u51FA\u9519:", error);
     }
   });
-  child.on("error", (err) => {
-    console.error("\u5B50\u8FDB\u7A0B\u53D1\u751F\u9519\u8BEF:", err);
-  });
+  child.once("exit", exit);
   return child;
 };
 var restart = async (port, token, isFetch = true) => {
-  isClosing = true;
   if (isFetch) {
     await sendExit(port, token);
   }
@@ -101,7 +91,15 @@ var sendExit = async (port, token) => {
   } catch {
   }
 };
-process.on("exit", () => {
-  child.kill("SIGTERM");
-});
+var exit = () => {
+  try {
+    child.kill("SIGTERM");
+    process.kill(child.pid);
+  } catch {
+    child?.kill();
+  } finally {
+    process.exit(0);
+  }
+};
+process.on("exit", exit);
 start();

package/dist/{types-GyuTZPId.d.ts → types-BjA-iIW1.d.ts}

@@ -1,5 +1,6 @@
 import EventEmitter from 'events';
 import chalk__default from 'chalk';
+import { Logger as Logger$1 } from 'log4js';
 
 /**
  * @description 所有日志等级
@@ -13,7 +14,7 @@ type LogMethodsOnly = Pick<Logger, LogMethodNames>;
 /**
  * @description 日志接口
  */
-interface Logger {
+interface Logger extends Logger$1 {
     /** @description chalk模块 */
     chalk: typeof chalk__default;
     /** @description 将文本设置为红色 */
@@ -43,12 +44,6 @@ interface Logger {
      * @param args - 日志内容
      */
     bot: (level: LogMethodNames, id: string, ...args: any[]) => void;
-    /**
-     * @description 构建自定义前缀函数
-     * @param prefix - 前缀
-     * @returns 返回一个函数
-     */
-    prefix: (prefix: string) => (level: LogMethodNames, ...args: any[]) => void;
     /** @description 打印追踪日志 */
     trace(...args: any[]): void;
     /** @description 打印调试日志 */
@@ -67,17 +62,6 @@ interface Logger {
     off(): void;
     /** @description 打印日志 跟`info`日志相同 */
     log(...args: any[]): void;
-    /** @description 获取、设置日志等级 */
-    level: LoggerLevel;
-    /** @description 获取当前配置 */
-    readonly config: LoggerConfig;
-    /**
-     * @description 设置新的配置
-     * @param config - 日志配置
-     */
-    configure(config: Partial<LoggerConfig>): void;
-    /** @description 关闭并清理资源 */
-    close(): void;
 }
 /**
  * @description 文件日志配置
@@ -110,8 +94,6 @@ interface FileLogConfig {
  * @description 日志配置
  */
 interface LoggerConfig {
-    /** @description 日志前缀 @default '' */
-    prefix: string;
     /** @description 日志级别 @default 'info' */
     level: LoggerLevel;
     /** @description `logger.fnc`自定义颜色 @default '#FFFF00' */
@@ -123,29 +105,5 @@ interface LoggerConfig {
  * @description 默认配置
  */
 declare const DEFAULT_LOGGER_CONFIG: LoggerConfig;
-/**
- * @description 日志级别优先级
- */
-declare const LoggerLevelPriority: Record<LoggerLevel, number>;
-/**
- * @description 日志输出接口
- */
-interface LogWriter {
-    /**
-     * @description 输出日志
-     * @param level - 日志级别
-     * @param message - 日志消息
-     */
-    write(level: LoggerLevel, message: string): void;
-    /**
-     * @description 更新配置
-     * @param newConfig - 新的配置
-     */
-    updateConfig?(newConfig: Partial<FileLogConfig>): void;
-    /**
-     * @description 关闭输出
-     */
-    close?(): void;
-}
 
-export { DEFAULT_LOGGER_CONFIG as D, type FileLogConfig as F, type Logger as L, type LogMethodNames as a, type LoggerLevel as b, type LogMethodsOnly as c, type LoggerConfig as d, LoggerLevelPriority as e, type LogWriter as f };
+export { DEFAULT_LOGGER_CONFIG as D, type FileLogConfig as F, type Logger as L, type LogMethodNames as a, type LoggerLevel as b, type LogMethodsOnly as c, type LoggerConfig as d };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "1.9.7",
+  "version": "1.9.9",
   "description": "Lightweight, efficient, concise, and stable robot framework.",
   "keywords": [
     "node",
@@ -170,6 +170,7 @@
     "chokidar": "4.0.3",
     "express": "npm:@karinjs/express@1.0.3",
     "lodash": "npm:@karinjs/lodash@1.1.1",
+    "log4js": "^6.9.1",
     "moment": "npm:@karinjs/moment@1.1.5",
     "node-schedule": "npm:@karinjs/node-schedule@1.0.0",
     "redis": "npm:@karinjs/redis@1.1.3",