@anjianshi/utils 2.4.13 → 2.4.15

package/env-node/logging/handlers.d.ts

@@ -49,9 +49,9 @@ export declare class FileHandler extends LogHandler {
     protected stringifyDataItem(item: unknown): string;
     private buffer;
     private bufferSize;
+    private flushTimeoutId;
     protected pushBuffer(...strings: string[]): void;
     protected flush(sync?: boolean): void;
-    protected initFlush(): void;
     get filepath(): string;
     protected initLogDir(): void;
     protected write(content: string, sync?: boolean): void;

package/env-node/logging/handlers.js

@@ -70,7 +70,9 @@ export class FileHandler extends LogHandler {
             ...(options ?? {}),
         };
         this.initLogDir();
-        this.initFlush();
+        // 进程退出前把尚未写入文件的日志强制写入
+        // 这里必须用同步的方式来写，不然会写入不进去（可能是因为异步的话是放到下一个事件循环，但进程在这个事件循环内就退出了）
+        process.on('exit', () => this.flush(true));
     }
     // Format log content
     log(info) {
@@ -103,16 +105,25 @@ export class FileHandler extends LogHandler {
         // 利用 util.format() 获得和 console.log() 相同的输出（因为 console.log() 底层也是用的 util.format()）
         return util.format(item);
     }
-    // Handle buffer
+    // Handle buffer & flush
     buffer = [];
     bufferSize = 0;
+    flushTimeoutId = null;
     pushBuffer(...strings) {
         this.buffer.push(...strings);
         this.bufferSize = strings.reduce((sum, v) => sum + v.length, this.bufferSize);
-        if (this.options.flushInterval === 0 || this.bufferSize >= this.options.flushLength)
+        if (this.options.flushInterval === 0 || this.bufferSize >= this.options.flushLength) {
             this.flush();
+        }
+        else if (!this.flushTimeoutId) {
+            this.flushTimeoutId = setTimeout(() => this.flush(), this.options.flushInterval);
+        }
     }
     flush(sync) {
+        if (this.flushTimeoutId) {
+            clearTimeout(this.flushTimeoutId);
+            this.flushTimeoutId = null;
+        }
         if (this.buffer.length) {
             const content = this.buffer.join('');
             this.buffer = [];
@@ -120,14 +131,6 @@ export class FileHandler extends LogHandler {
             this.write(content, sync);
         }
     }
-    initFlush() {
-        if (this.options.flushInterval !== 0) {
-            setInterval(() => this.flush(), this.options.flushInterval);
-        }
-        // 进程退出前把尚未写入文件的日志强制写入
-        // 这里必须用同步的方式来写，不然会写入不进去（可能是因为异步的话是放到下一个事件循环，但进程在这个事件循环内就退出了）
-        process.on('exit', () => this.flush(true));
-    }
     // 文件系统交互 File system interaction
     get filepath() {
         const { dir, filePrefix } = this.options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anjianshi/utils",
-  "version": "2.4.13",
+  "version": "2.4.15",
   "description": "Common JavaScript Utils",
   "homepage": "https://github.com/anjianshi/js-packages/utils",
   "bugs": {
@@ -27,11 +27,11 @@
     "redis": "^4.7.0",
     "typescript": "^5.6.3",
     "vconsole": "^3.15.1",
+    "@anjianshi/presets-eslint-node": "4.0.14",
+    "@anjianshi/presets-eslint-react": "4.0.13",
     "@anjianshi/presets-eslint-typescript": "5.0.11",
     "@anjianshi/presets-prettier": "3.0.1",
-    "@anjianshi/presets-eslint-node": "4.0.14",
-    "@anjianshi/presets-typescript": "3.2.3",
-    "@anjianshi/presets-eslint-react": "4.0.13"
+    "@anjianshi/presets-typescript": "3.2.3"
   },
   "peerDependencies": {
     "@emotion/react": "^11.13.3",

package/validators/factory.js

@@ -43,6 +43,7 @@ export function getValidator(definition) {
             });
         case 'oneOf':
             return getOneOfValidator({
+                ...definition,
                 validators: definition.validators.map(def => getValidator(def)),
             });
     }