@jayfong/x-server 2.49.4 → 2.50.0

package/lib/_cjs/core/server.js

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.Server = void 0;
 var _interopRequireWildcard2 = _interopRequireDefault(require("@babel/runtime/helpers/interopRequireWildcard"));
+var _nodeProcess = _interopRequireDefault(require("node:process"));
 var _fastify = _interopRequireDefault(require("fastify"));
 var _vtils = require("vtils");
 var _x = require("../x");
@@ -15,6 +16,9 @@ class Server {
     this.fastify = void 0;
     this.routes = [];
     Server.options = options;
+    _nodeProcess.default.on('unhandledRejection', (reason, promise) => {
+      console.error('未捕获的错误', reason, promise);
+    });
   }
   async start() {
     this.applyServices();
@@ -33,7 +37,7 @@ class Server {
   }
   async prepareFastify() {
     this.fastify = await (0, _fastify.default)({
-      logger: process.env.NODE_ENV === 'development' ? {
+      logger: _nodeProcess.default.env.NODE_ENV === 'development' ? {
         transport: {
           target: 'pino-pretty'
         }

package/lib/_cjs/services/log.js

@@ -17,6 +17,53 @@ class LogService {
         flags: 'a'
       });
     }, logFile => logFile);
+    this.info = (title, desc) => {
+      this.log({
+        level: 'info',
+        title,
+        desc
+      });
+    };
+    this.success = (title, desc) => {
+      this.log({
+        level: 'success',
+        title,
+        desc
+      });
+    };
+    this.error = (title, desc) => {
+      this.log({
+        level: 'error',
+        title,
+        desc
+      });
+    };
+    this.console = {
+      info: (title, desc) => {
+        this.log({
+          writer: 'console',
+          level: 'info',
+          title,
+          desc
+        });
+      },
+      success: (title, desc) => {
+        this.log({
+          writer: 'console',
+          level: 'success',
+          title,
+          desc
+        });
+      },
+      error: (title, desc) => {
+        this.log({
+          writer: 'console',
+          level: 'error',
+          title,
+          desc
+        });
+      }
+    };
   }
   getLogFile(date) {
     const year = date.getFullYear();
@@ -44,28 +91,12 @@ class LogService {
     };
   }
   log(payload) {
-    this.getLogWriter(this.logFile).write(`${[(0, _date.formatDate)(new Date(), 'yyyy-mm-dd hh:ii:ss'), payload.level, payload.title, ...(!payload.desc ? [] : Array.isArray(payload.desc) ? payload.desc : Object.keys(payload.desc).map(key => `${key}:${payload.desc[key]}`))].map(item => String(item).replace(/[\r\n\t]+/g, ' ')).join('\t')}\n`);
-  }
-  info(title, desc) {
-    this.log({
-      level: 'info',
-      title,
-      desc
-    });
-  }
-  success(title, desc) {
-    this.log({
-      level: 'success',
-      title,
-      desc
-    });
-  }
-  error(title, desc) {
-    this.log({
-      level: 'error',
-      title,
-      desc
-    });
+    const getContent = () => `${[(0, _date.formatDate)(new Date(), 'yyyy-mm-dd hh:ii:ss'), payload.level, payload.title, ...(!payload.desc ? [] : Array.isArray(payload.desc) ? payload.desc : Object.keys(payload.desc).map(key => `${key}:${payload.desc[key]}`))].map(item => String(item).replace(/[\r\n\t]+/g, ' ')).join('\t')}`;
+    if (payload.writer === 'console') {
+      console[payload.level === 'error' ? 'error' : 'log'](getContent());
+    } else {
+      this.getLogWriter(this.logFile).write(`${getContent()}\n`);
+    }
   }
 }
 exports.LogService = LogService;

package/lib/core/server.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import Fastify from 'fastify';
 import { base64UrlDecode, castArray, keyBy, noop, rot13 } from 'vtils';
 import { x } from "../x";
@@ -9,6 +10,9 @@ export class Server {
     this.fastify = void 0;
     this.routes = [];
     Server.options = options;
+    process.on('unhandledRejection', (reason, promise) => {
+      console.error('未捕获的错误', reason, promise);
+    });
   }
   async start() {
     this.applyServices();

package/lib/services/log.d.ts

@@ -2,7 +2,9 @@ import { Merge } from 'vtils/types';
 import { BaseService } from './base';
 export type LogServiceLevel = 'error' | 'info' | 'success';
 export type LogServiceDesc = Record<string, any> | any[];
+export type LogServiceWriter = 'file' | 'console';
 export type LogServicePayload = {
+    writer?: LogServiceWriter;
     level: LogServiceLevel;
     title: string;
     desc?: LogServiceDesc;
@@ -18,9 +20,14 @@ export declare class LogService implements BaseService {
     private getLogWriter;
     parseLogLineText<K extends string = string>(text: string, keysMap?: Record<string, string[]>): LogServiceLogItem<K>;
     private log;
-    info(title: string, desc?: LogServiceDesc): void;
-    success(title: string, desc?: LogServiceDesc): void;
-    error(title: string, desc?: LogServiceDesc): void;
+    info: (title: string, desc?: LogServiceDesc) => void;
+    success: (title: string, desc?: LogServiceDesc) => void;
+    error: (title: string, desc?: LogServiceDesc) => void;
+    console: {
+        info: (title: string, desc?: LogServiceDesc) => void;
+        success: (title: string, desc?: LogServiceDesc) => void;
+        error: (title: string, desc?: LogServiceDesc) => void;
+    };
 }
 declare module '../x' {
     interface X {

package/lib/services/log.js

@@ -12,6 +12,53 @@ export class LogService {
         flags: 'a'
       });
     }, logFile => logFile);
+    this.info = (title, desc) => {
+      this.log({
+        level: 'info',
+        title,
+        desc
+      });
+    };
+    this.success = (title, desc) => {
+      this.log({
+        level: 'success',
+        title,
+        desc
+      });
+    };
+    this.error = (title, desc) => {
+      this.log({
+        level: 'error',
+        title,
+        desc
+      });
+    };
+    this.console = {
+      info: (title, desc) => {
+        this.log({
+          writer: 'console',
+          level: 'info',
+          title,
+          desc
+        });
+      },
+      success: (title, desc) => {
+        this.log({
+          writer: 'console',
+          level: 'success',
+          title,
+          desc
+        });
+      },
+      error: (title, desc) => {
+        this.log({
+          writer: 'console',
+          level: 'error',
+          title,
+          desc
+        });
+      }
+    };
   }
   getLogFile(date) {
     const year = date.getFullYear();
@@ -39,27 +86,11 @@ export class LogService {
     };
   }
   log(payload) {
-    this.getLogWriter(this.logFile).write(`${[formatDate(new Date(), 'yyyy-mm-dd hh:ii:ss'), payload.level, payload.title, ...(!payload.desc ? [] : Array.isArray(payload.desc) ? payload.desc : Object.keys(payload.desc).map(key => `${key}:${payload.desc[key]}`))].map(item => String(item).replace(/[\r\n\t]+/g, ' ')).join('\t')}\n`);
-  }
-  info(title, desc) {
-    this.log({
-      level: 'info',
-      title,
-      desc
-    });
-  }
-  success(title, desc) {
-    this.log({
-      level: 'success',
-      title,
-      desc
-    });
-  }
-  error(title, desc) {
-    this.log({
-      level: 'error',
-      title,
-      desc
-    });
+    const getContent = () => `${[formatDate(new Date(), 'yyyy-mm-dd hh:ii:ss'), payload.level, payload.title, ...(!payload.desc ? [] : Array.isArray(payload.desc) ? payload.desc : Object.keys(payload.desc).map(key => `${key}:${payload.desc[key]}`))].map(item => String(item).replace(/[\r\n\t]+/g, ' ')).join('\t')}`;
+    if (payload.writer === 'console') {
+      console[payload.level === 'error' ? 'error' : 'log'](getContent());
+    } else {
+      this.getLogWriter(this.logFile).write(`${getContent()}\n`);
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.49.4",
+  "version": "2.50.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",