Merge pull request #238 from lidofinance/develop

Develop to main

Author: Jeday

src/http/common/middleware/logger.middleware.ts

@@ -1,20 +1,26 @@
 import { Inject, Injectable, LoggerService, NestMiddleware } from '@nestjs/common';
-import { LOGGER_PROVIDER } from '@lido-nestjs/logger';
+import { WINSTON_MODULE_NEST_PROVIDER } from 'nest-winston';
 import { Request, Reply } from './interfaces';
+import { FastifyRequest } from 'fastify';
 
 @Injectable()
 export class LoggerMiddleware implements NestMiddleware {
-  constructor(@Inject(LOGGER_PROVIDER) protected readonly logger: LoggerService) {}
+  constructor(
+    @Inject(WINSTON_MODULE_NEST_PROVIDER)
+    private readonly logger: LoggerService,
+  ) {}
 
-  use(request: Request, reply: Reply, next: () => void) {
+  use(request: any, reply: Reply, next: () => void) {
     const { ip, method, headers, originalUrl } = request;
     const userAgent = headers['user-agent'] ?? '';
 
+    const ips = request.ips ? request.ips : [];
+
     reply.on('finish', () => {
       const { statusCode } = reply;
-      const log = { method, originalUrl, statusCode, userAgent, ip };
+      const log = { method, originalUrl, statusCode, userAgent, ip, ips };
 
-      this.logger.log('Query', log);
+      this.logger.log(JSON.stringify(log));
     });
 
     next();

src/http/common/throttler/throttler.guard.ts

@@ -5,6 +5,6 @@ import { FastifyRequest } from 'fastify';
 @Injectable()
 export class ThrottlerBehindProxyGuard extends ThrottlerGuard {
   protected async getTracker(request: FastifyRequest) {
-    return request.ips?.length ? request.ips[0] : request.ip;
+    return request.ip;
   }
 }