@nest-omni/core 4.1.3-27 → 4.1.3-28

package/filters/bad-request.filter.js

@@ -13,7 +13,7 @@ const nestjs_i18n_1 = require("nestjs-i18n");
 const validation_metadata_helper_1 = require("../common/helpers/validation-metadata-helper");
 let HttpExceptionFilter = class HttpExceptionFilter {
     catch(exception, host) {
-        var _a, _b, _c, _d, _e;
+        var _a;
         const i18n = nestjs_i18n_1.I18nContext.current(host);
         const ctx = host.switchToHttp();
         const response = ctx.getResponse();
@@ -26,19 +26,13 @@ let HttpExceptionFilter = class HttpExceptionFilter {
             statusCode = 404;
             error = 'Entity not found';
         }
-        if (statusCode === 500) {
-            console.error({
-                message: exception.message,
-                stack: exception.stack,
-                connection: {
-                    localAddress: (_a = request.socket) === null || _a === void 0 ? void 0 : _a.localAddress,
-                    remoteAddress: (_b = request.socket) === null || _b === void 0 ? void 0 : _b.remoteAddress,
-                    bytesRead: (_c = request.socket) === null || _c === void 0 ? void 0 : _c.bytesRead,
-                    bytesWritten: (_d = request.socket) === null || _d === void 0 ? void 0 : _d.bytesWritten,
-                },
-                headers: request.headers,
-            });
-        }
+        // 将异常信息存储到 request 对象上，供 HttpLoggingInterceptor 使用
+        request._exception = {
+            message: exception.message,
+            stack: exception.stack,
+            code: exception.code,
+            statusCode,
+        };
         const getFirstError = (error, property = '') => {
             var _a;
             if (((_a = error === null || error === void 0 ? void 0 : error.children) === null || _a === void 0 ? void 0 : _a.length) > 0) {
@@ -57,7 +51,7 @@ let HttpExceptionFilter = class HttpExceptionFilter {
             const lang = i18n.lang || 'zh';
             // 在 stringify 之前获取 target
             // firstError.target 可能是实例而不是构造函数，所以需要获取 constructor
-            let target = ((_e = firstError.target) === null || _e === void 0 ? void 0 : _e.constructor) || firstError.target;
+            let target = ((_a = firstError.target) === null || _a === void 0 ? void 0 : _a.constructor) || firstError.target;
             if (!target && (firstError === null || firstError === void 0 ? void 0 : firstError.object)) {
                 target = firstError.object.constructor;
             }

package/interceptors/http-logging-interceptor.service.d.ts

@@ -4,7 +4,7 @@ import { ApiConfigService } from '../shared/services/api-config.service';
 /**
  * HTTP 日志拦截器
  * 参考 Tomcat AccessLog 的实现，每个请求只记录一条日志
- * 在请求完成时同时记录请求和响应的完整信息
+ * 只在 finish 事件中记录，因为异常过滤器会处理所有错误并返回响应
  */
 export declare class HttpLoggingInterceptor implements NestInterceptor {
     private readonly configService;
@@ -18,11 +18,7 @@ export declare class HttpLoggingInterceptor implements NestInterceptor {
     /**
      * 记录请求和响应（一条日志）
      */
-    private logRequestResponse;
-    /**
-     * 记录请求和错误（一条日志）
-     */
-    private logRequestError;
+    private logRequest;
     /**
      * 清理敏感的 header 信息
      */

package/interceptors/http-logging-interceptor.service.js

@@ -12,12 +12,11 @@ var HttpLoggingInterceptor_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpLoggingInterceptor = void 0;
 const common_1 = require("@nestjs/common");
-const operators_1 = require("rxjs/operators");
 const api_config_service_1 = require("../shared/services/api-config.service");
 /**
  * HTTP 日志拦截器
  * 参考 Tomcat AccessLog 的实现，每个请求只记录一条日志
- * 在请求完成时同时记录请求和响应的完整信息
+ * 只在 finish 事件中记录，因为异常过滤器会处理所有错误并返回响应
  */
 let HttpLoggingInterceptor = HttpLoggingInterceptor_1 = class HttpLoggingInterceptor {
     constructor(configService) {
@@ -29,18 +28,15 @@ let HttpLoggingInterceptor = HttpLoggingInterceptor_1 = class HttpLoggingInterce
         const request = ctx.getRequest();
         const response = ctx.getResponse();
         const startTime = Date.now();
-        const { method, url, headers, body } = request;
-        const requestId = String(request.id || headers['x-request-id'] || this.generateRequestId());
-        // 监听响应完成事件，一条日志同时记录请求和响应
+        // 只在 finish 事件中记录日志（此时响应已完成，状态码已确定）
         response.on('finish', () => {
             const duration = Date.now() - startTime;
-            this.logRequestResponse(requestId, request, response, duration);
+            const requestId = String(request.id ||
+                request.headers['x-request-id'] ||
+                this.generateRequestId());
+            this.logRequest(requestId, request, response, duration);
         });
-        return next.handle().pipe((0, operators_1.catchError)((error) => {
-            const duration = Date.now() - startTime;
-            this.logRequestError(requestId, request, error, duration);
-            throw error;
-        }));
+        return next.handle();
     }
     /**
      * 生成请求 ID
@@ -51,31 +47,30 @@ let HttpLoggingInterceptor = HttpLoggingInterceptor_1 = class HttpLoggingInterce
     /**
      * 记录请求和响应（一条日志）
      */
-    logRequestResponse(requestId, request, response, duration) {
+    logRequest(requestId, request, response, duration) {
         const statusCode = response.statusCode;
-        const logData = {
-            requestId,
-            timestamp: new Date().toISOString(),
-            env: this.configService.nodeEnv,
-            appName: this.configService.getString('NAME'),
-            http: {
-                method: request.method,
-                url: request.url,
-                query: request.query,
-                statusCode,
-                duration: `${duration}ms`,
-                req: {
-                    headers: this.sanitizeHeaders(request.headers),
-                    body: this.sanitizeBody(request.body),
-                },
-                res: {
-                    headers: this.sanitizeHeaders(response.getHeaders()),
-                },
-            },
-            user: this.extractUser(request.headers),
-        };
-        const message = `HTTP ${request.method} ${request.url} ${statusCode} (${duration}ms)`;
-        if (statusCode >= 500) {
+        // 从 request 对象中读取异常信息（由 HttpExceptionFilter 存储）
+        const exception = request._exception;
+        // 将异常信息放在 message 中，这样一定会被输出
+        let errorMessage = '';
+        if (exception) {
+            errorMessage = `\n  Error: ${exception.message}\n  Stack: ${exception.stack}`;
+        }
+        const logData = Object.assign(Object.assign({ requestId, timestamp: new Date().toISOString(), env: this.configService.nodeEnv, appName: this.configService.getString('NAME'), httpMethod: request.method, httpUrl: request.url, query: request.query, statusCode, duration: `${duration}ms`, requestHeaders: this.sanitizeHeaders(request.headers), requestBody: this.sanitizeBody(request.body), responseHeaders: this.sanitizeHeaders(response.getHeaders()) }, (exception && {
+            errorMessage: exception.message,
+            errorStack: exception.stack,
+            errorCode: exception.code,
+            originalStatusCode: exception.statusCode,
+        })), { user: this.extractUser(request.headers) });
+        const message = `HTTP ${request.method} ${request.url} ${statusCode} (${duration}ms)${errorMessage}`;
+        // 根据是否有异常来决定日志级别
+        if ((exception === null || exception === void 0 ? void 0 : exception.statusCode) >= 500) {
+            this.logger.error(message, logData);
+        }
+        else if ((exception === null || exception === void 0 ? void 0 : exception.statusCode) >= 400) {
+            this.logger.warn(message, logData);
+        }
+        else if (statusCode >= 500) {
             this.logger.error(message, logData);
         }
         else if (statusCode >= 400) {
@@ -85,35 +80,6 @@ let HttpLoggingInterceptor = HttpLoggingInterceptor_1 = class HttpLoggingInterce
             this.logger.log(message, logData);
         }
     }
-    /**
-     * 记录请求和错误（一条日志）
-     */
-    logRequestError(requestId, request, error, duration) {
-        const logData = {
-            requestId,
-            timestamp: new Date().toISOString(),
-            env: this.configService.nodeEnv,
-            appName: this.configService.getString('NAME'),
-            http: {
-                method: request.method,
-                url: request.url,
-                query: request.query,
-                statusCode: (error === null || error === void 0 ? void 0 : error.status) || 500,
-                duration: `${duration}ms`,
-                req: {
-                    headers: this.sanitizeHeaders(request.headers),
-                    body: this.sanitizeBody(request.body),
-                },
-            },
-            error: {
-                message: error.message,
-                stack: error.stack,
-                code: error.code,
-            },
-            user: this.extractUser(request.headers),
-        };
-        this.logger.error(`HTTP ${request.method} ${request.url} ${(error === null || error === void 0 ? void 0 : error.status) || 500} (${duration}ms) - ${error.message}`, logData);
-    }
     /**
      * 清理敏感的 header 信息
      */
@@ -121,7 +87,13 @@ let HttpLoggingInterceptor = HttpLoggingInterceptor_1 = class HttpLoggingInterce
         if (!headers)
             return {};
         const sanitized = Object.assign({}, headers);
-        const sensitiveKeys = ['authorization', 'apikey', 'x-api-key', 'token', 'cookie'];
+        const sensitiveKeys = [
+            'authorization',
+            'apikey',
+            'x-api-key',
+            'token',
+            'cookie',
+        ];
         for (const key of Object.keys(sanitized)) {
             if (sensitiveKeys.includes(key.toLowerCase())) {
                 sanitized[key] = '[REDACTED]';
@@ -135,7 +107,6 @@ let HttpLoggingInterceptor = HttpLoggingInterceptor_1 = class HttpLoggingInterce
     sanitizeBody(body) {
         if (!body)
             return body;
-        // 如果 body 太大，只记录部分信息
         const bodyStr = JSON.stringify(body);
         if (bodyStr.length > 1000) {
             return { _large: `${bodyStr.length} bytes` };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nest-omni/core",
-  "version": "4.1.3-27",
+  "version": "4.1.3-28",
   "description": "A comprehensive NestJS framework for building enterprise-grade applications with best practices",
   "main": "index.js",
   "types": "index.d.ts",