chore: release v1.6.1

kastov · web-flow · commit e3b8ae0bda31 · 2025-05-11T03:20:23.000+03:00
diff --git a/libs/contract/constants/events/events.ts b/libs/contract/constants/events/events.ts
@@ -26,9 +26,16 @@ export const EVENTS = {
         CONNECTION_RESTORED: 'node.connection_restored',
         TRAFFIC_NOTIFY: 'node.traffic_notify',
     },
+    SERVICE: {
+        PANEL_STARTED: 'service.panel_started',
+        LOGIN_ATTEMPT_FAILED: 'service.login_attempt_failed',
+        LOGIN_ATTEMPT_SUCCESS: 'service.login_attempt_success',
+    },
     CATCH_ALL_USER_EVENTS: 'user.*',
     CATCH_ALL_NODE_EVENTS: 'node.*',
+    CATCH_ALL_SERVICE_EVENTS: 'service.*',
 } as const;
 
 export type TNodeEvents = (typeof EVENTS.NODE)[keyof typeof EVENTS.NODE];
 export type TUserEvents = (typeof EVENTS.USER)[keyof typeof EVENTS.USER];
+export type TServiceEvents = (typeof EVENTS.SERVICE)[keyof typeof EVENTS.SERVICE];
diff --git a/libs/contract/package.json b/libs/contract/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remnawave/backend-contract",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "public": true,
   "license": "AGPL-3.0-only",
   "description": "A contract library for Remnawave Backend. It can be used in backend and frontend.",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remnawave/backend",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Remnawave Panel Backend",
   "private": false,
   "type": "commonjs",
@@ -101,6 +101,7 @@
     "prisma": "6.5.0",
     "prom-client": "^15.1.3",
     "reflect-metadata": "0.2.2",
+    "request-ip": "^3.3.0",
     "rxjs": "7.8.2",
     "semver": "^7.7.1",
     "superjson": "2.2.2",
@@ -125,6 +126,7 @@
     "@types/node": "^22.15.14",
     "@types/passport-http": "^0.3.11",
     "@types/passport-jwt": "^4.0.1",
+    "@types/request-ip": "^0.0.41",
     "@types/semver": "^7.7.0",
     "@typescript-eslint/eslint-plugin": "^8.32.0",
     "@typescript-eslint/parser": "^8.32.0",
diff --git a/src/common/decorators/get-ip/get-ip.ts b/src/common/decorators/get-ip/get-ip.ts
@@ -1,8 +1,14 @@
+import requestIp from 'request-ip';
+
 import { createParamDecorator, ExecutionContext } from '@nestjs/common';
 
-export const ClientIp = createParamDecorator((data: unknown, ctx: ExecutionContext): string => {
+export const IpAddress = createParamDecorator((data, ctx: ExecutionContext) => {
     const request = ctx.switchToHttp().getRequest();
-    const ip = request.headers['cf-connecting-ip'] as string;
 
-    return Array.isArray(ip) ? ip[0] : ip.split(',')[0].trim();
+    if (request.clientIp) {
+        return request.clientIp;
+    }
+
+    const ip = requestIp.getClientIp(request);
+    return ip || 'Unknown';
 });
diff --git a/src/common/decorators/get-useragent/get-useragent.ts b/src/common/decorators/get-useragent/get-useragent.ts
@@ -0,0 +1,11 @@
+import { createParamDecorator, ExecutionContext } from '@nestjs/common';
+
+export const UserAgent = createParamDecorator((data, ctx: ExecutionContext) => {
+    const request = ctx.switchToHttp().getRequest();
+
+    if (request.headers['user-agent']) {
+        return request.headers['user-agent'];
+    }
+
+    return 'Unknown';
+});
diff --git a/src/common/decorators/get-useragent/index.ts b/src/common/decorators/get-useragent/index.ts
@@ -0,0 +1 @@
+export * from './get-useragent';
diff --git a/src/integration-modules/telegram-bot/events/index.ts b/src/integration-modules/telegram-bot/events/index.ts
@@ -1,4 +1,5 @@
+import { ServiceEvents } from './service/service.events';
 import { UsersEvents } from './users/users.events';
 import { NodesEvents } from './nodes';
 
-export const TELEGRAM_BOT_EVENTS = [UsersEvents, NodesEvents];
+export const TELEGRAM_BOT_EVENTS = [UsersEvents, NodesEvents, ServiceEvents];
diff --git a/src/integration-modules/telegram-bot/events/service/index.ts b/src/integration-modules/telegram-bot/events/service/index.ts
@@ -0,0 +1 @@
+export * from './service.events';
diff --git a/src/integration-modules/telegram-bot/events/service/interfaces/index.ts b/src/integration-modules/telegram-bot/events/service/interfaces/index.ts
@@ -0,0 +1 @@
+export * from './service.event.interface';
diff --git a/src/integration-modules/telegram-bot/events/service/interfaces/service.event.interface.ts b/src/integration-modules/telegram-bot/events/service/interfaces/service.event.interface.ts
@@ -0,0 +1,21 @@
+import { TServiceEvents } from '@libs/contracts/constants';
+
+export interface IServiceEvent {
+    loginAttempt?: {
+        username: string;
+        ip: string;
+        userAgent: string;
+        description?: string;
+        password?: string;
+    };
+}
+
+export class ServiceEvent {
+    eventName: TServiceEvents;
+    data: IServiceEvent;
+
+    constructor(event: TServiceEvents, data: IServiceEvent) {
+        this.eventName = event;
+        this.data = data;
+    }
+}
diff --git a/src/integration-modules/telegram-bot/events/service/service.events.ts b/src/integration-modules/telegram-bot/events/service/service.events.ts
@@ -0,0 +1,86 @@
+import { InjectBot } from '@kastov/grammy-nestjs';
+import { readPackageJSON } from 'pkg-types';
+import { Context } from 'grammy';
+import { Bot } from 'grammy';
+
+import { OnEvent } from '@nestjs/event-emitter';
+import { ConfigService } from '@nestjs/config';
+
+import { EVENTS } from '@libs/contracts/constants';
+
+import { BOT_NAME } from '@integration-modules/telegram-bot/constants';
+
+import { TelegramBotLoggerQueueService } from '@queue/loggers/telegram-bot-logger';
+
+import { ServiceEvent } from './interfaces/service.event.interface';
+
+export class ServiceEvents {
+    private readonly adminId: string;
+    private readonly adminThreadId: string | undefined;
+    constructor(
+        @InjectBot(BOT_NAME)
+        private readonly _: Bot<Context>,
+
+        private readonly telegramBotLoggerQueueService: TelegramBotLoggerQueueService,
+        private readonly configService: ConfigService,
+    ) {
+        this.adminId = this.configService.getOrThrow<string>('TELEGRAM_NOTIFY_NODES_CHAT_ID');
+        this.adminThreadId = this.configService.get<string>('TELEGRAM_NOTIFY_NODES_THREAD_ID');
+    }
+
+    @OnEvent(EVENTS.SERVICE.PANEL_STARTED)
+    async onPanelStarted(): Promise<void> {
+        const pkg = await readPackageJSON();
+
+        const msg = `
+🌊 <b>#panel_started</b>
+➖➖➖➖➖➖➖➖➖
+✅ Remnawave v${pkg.version} is up and running.
+
+🦋 Join community: @remnawave
+📚 Documentation: https://remna.st
+
+⭐ <a href="https://github.com/remnawave/panel">Leave a star on GitHub</a>
+        `;
+        await this.telegramBotLoggerQueueService.addJobToSendTelegramMessage({
+            message: msg,
+            chatId: this.adminId,
+            threadId: this.adminThreadId,
+        });
+    }
+
+    @OnEvent(EVENTS.SERVICE.LOGIN_ATTEMPT_FAILED)
+    async onLoginAttemptFailed(event: ServiceEvent): Promise<void> {
+        const msg = `
+🔑 ❌ <b>#login_attempt_failed</b>
+➖➖➖➖➖➖➖➖➖
+<b>👥</b> <code>${event.data.loginAttempt?.username}</code>
+<b>🔑 Password:</b> <code>${event.data.loginAttempt?.password}</code>
+<b>🌐 IP:</b> <code>${event.data.loginAttempt?.ip}</code>
+<b>💻 User agent:</b> <code>${event.data.loginAttempt?.userAgent}</code>
+<b>💬 Description:</b> <code>${event.data.loginAttempt?.description}</code>
+        `;
+        await this.telegramBotLoggerQueueService.addJobToSendTelegramMessage({
+            message: msg,
+            chatId: this.adminId,
+            threadId: this.adminThreadId,
+        });
+    }
+
+    @OnEvent(EVENTS.SERVICE.LOGIN_ATTEMPT_SUCCESS)
+    async onLoginAttemptSuccess(event: ServiceEvent): Promise<void> {
+        const msg = `
+🔑 ✅ <b>#login_attempt_success</b>
+➖➖➖➖➖➖➖➖➖
+<b>👥</b> <code>${event.data.loginAttempt?.username}</code>
+<b>🌐 IP:</b> <code>${event.data.loginAttempt?.ip}</code>
+<b>💻 User agent:</b> <code>${event.data.loginAttempt?.userAgent}</code>
+<b>💬 Description:</b> <code>${event.data.loginAttempt?.description}</code>
+        `;
+        await this.telegramBotLoggerQueueService.addJobToSendTelegramMessage({
+            message: msg,
+            chatId: this.adminId,
+            threadId: this.adminThreadId,
+        });
+    }
+}
diff --git a/src/integration-modules/webhook-module/events/webhook.events.ts b/src/integration-modules/webhook-module/events/webhook.events.ts
@@ -7,6 +7,7 @@ import { OnEvent } from '@nestjs/event-emitter';
 
 import { EVENTS } from '@libs/contracts/constants';
 
+import { ServiceEvent } from '@integration-modules/telegram-bot/events/service/interfaces';
 import { UserEvent } from '@integration-modules/telegram-bot/events/users/interfaces';
 import { NodeEvent } from '@integration-modules/telegram-bot/events/nodes/interfaces';
 
@@ -56,4 +57,24 @@ export class WebhookEvents {
             this.logger.error(`Error sending webhook event: ${error}`);
         }
     }
+
+    @OnEvent(EVENTS.CATCH_ALL_SERVICE_EVENTS)
+    async onCatchAllServiceEvents(event: ServiceEvent): Promise<void> {
+        try {
+            const payload = {
+                event: event.eventName,
+                timestamp: dayjs().toISOString(),
+                data: instanceToPlain(event.data),
+            };
+
+            const { json } = serialize(payload);
+
+            await this.webhookLoggerQueueService.sendWebhook({
+                payload: JSON.stringify(json),
+                timestamp: payload.timestamp,
+            });
+        } catch (error) {
+            this.logger.error(`Error sending webhook event: ${error}`);
+        }
+    }
 }
diff --git a/src/main.ts b/src/main.ts
@@ -3,6 +3,7 @@ import { patchNestJsSwagger, ZodValidationPipe } from 'nestjs-zod';
 import { createLogger } from 'winston';
 import compression from 'compression';
 import * as winston from 'winston';
+import requestIp from 'request-ip';
 import { json } from 'express';
 import helmet from 'helmet';
 import morgan from 'morgan';
@@ -61,6 +62,8 @@ async function bootstrap(): Promise<void> {
 
     app.use(json({ limit: '100mb' }));
 
+    app.use(requestIp.mw());
+
     const config = app.get(ConfigService);
 
     app.use(
diff --git a/src/modules/auth/auth.controller.ts b/src/modules/auth/auth.controller.ts
@@ -7,7 +7,9 @@ import {
 import { Body, Controller, HttpStatus, UseFilters } from '@nestjs/common';
 
 import { HttpExceptionFilter } from '@common/exception/httpException.filter';
+import { UserAgent } from '@common/decorators/get-useragent/get-useragent';
 import { errorHandler } from '@common/helpers/error-handler.helper';
+import { IpAddress } from '@common/decorators/get-ip/get-ip';
 import { Endpoint } from '@common/decorators/base-endpoint';
 import {
     GetStatusCommand,
@@ -53,8 +55,12 @@ export class AuthController {
         httpCode: HttpStatus.OK,
         apiBody: LoginRequestDto,
     })
-    async login(@Body() body: LoginRequestDto): Promise<LoginResponseDto> {
-        const result = await this.authService.login(body);
+    async login(
+        @Body() body: LoginRequestDto,
+        @IpAddress() ip: string,
+        @UserAgent() userAgent: string,
+    ): Promise<LoginResponseDto> {
+        const result = await this.authService.login(body, ip, userAgent);
 
         const data = errorHandler(result);
         return {
@@ -113,8 +119,10 @@ export class AuthController {
     })
     async telegramCallback(
         @Body() body: TelegramCallbackRequestDto,
+        @IpAddress() ip: string,
+        @UserAgent() userAgent: string,
     ): Promise<TelegramCallbackResponseDto> {
-        const result = await this.authService.telegramCallback(body);
+        const result = await this.authService.telegramCallback(body, ip, userAgent);
 
         const data = errorHandler(result);
         return {
diff --git a/src/modules/auth/auth.service.ts b/src/modules/auth/auth.service.ts
diff --git a/src/modules/remnawave-backend.modules.ts b/src/modules/remnawave-backend.modules.ts
diff --git a/src/modules/remnawave-service/remnawave-service.module.ts b/src/modules/remnawave-service/remnawave-service.module.ts
diff --git a/src/modules/remnawave-service/remnawave-service.service.ts b/src/modules/remnawave-service/remnawave-service.service.ts
diff --git a/src/queue/loggers/telegram-bot-logger/telegram-bot-logger.processor.ts b/src/queue/loggers/telegram-bot-logger/telegram-bot-logger.processor.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@remnawave/backend-contract",`
`3`		`- "version": "0.7.0",`
	`3`	`+ "version": "0.7.1",`
`4`	`4`	`"public": true,`
`5`	`5`	`"license": "AGPL-3.0-only",`
`6`	`6`	`"description": "A contract library for Remnawave Backend. It can be used in backend and frontend.",`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export * from './service.event.interface';`