refactor: improve usage tracking

- Updating user handling to use numeric ID instead of username
- Implementing more efficient Redis-based user usage tracking
- Adjusting node and user synchronization mechanisms
- Improving error handling and performance in various queues
- Adding support for dynamic worker concurrency

Author: kastov

Dockerfile

@@ -24,7 +24,7 @@ RUN if [ "$BRANCH" = "dev" ]; then \
     mkdir -p frontend_crowdin_temp/dist; \
     fi
 
-FROM node:22.21-alpine AS backend-build
+FROM node:24.11-alpine AS backend-build
 WORKDIR /opt/app
 
 # RUN apk add python3 python3-dev build-base pkgconfig libunwind-dev
@@ -49,7 +49,7 @@ RUN npm cache clean --force
 
 RUN npm prune --omit=dev
 
-FROM node:22.21-alpine
+FROM node:24.11-alpine
 WORKDIR /opt/app
 
 ARG BRANCH=main

ecosystem.config.js

@@ -40,8 +40,8 @@ module.exports = {
             name: 'remnawave-jobs',
             script: 'dist/src/bin/processors/processors.js',
             watch: false,
-            instances: 1,
-            exec_mode: 'fork',
+            instances: process.env.WORKER_INSTANCES || 1,
+            exec_mode: 'cluster',
             merge_logs: true,
             instance_var: 'INSTANCE_ID',
             env_development: {

libs/contract/api/controllers/users.ts

@@ -17,6 +17,7 @@ export const USERS_ROUTES = {
         REVOKE_SUBSCRIPTION: (uuid: string) => `${uuid}/${USERS_ACTIONS_ROUTE}/revoke`,
     },
     GET_BY: {
+        ID: (id: string) => `by-id/${id}`,
         SHORT_UUID: (shortUuid: string) => `by-short-uuid/${shortUuid}`,
         USERNAME: (username: string) => `by-username/${username}`,
         SUBSCRIPTION_UUID: (subscriptionUuid: string) => `by-subscription-uuid/${subscriptionUuid}`,

libs/contract/api/routes.ts

@@ -121,6 +121,8 @@ export const REST_API = {
         },
 
         GET_BY: {
+            ID: (id: string) =>
+                `${ROOT}/${CONTROLLERS.USERS_CONTROLLER}/${CONTROLLERS.USERS_ROUTES.GET_BY.ID(id)}`,
             SHORT_UUID: (shortUuid: string) =>
                 `${ROOT}/${CONTROLLERS.USERS_CONTROLLER}/${CONTROLLERS.USERS_ROUTES.GET_BY.SHORT_UUID(
                     shortUuid,

libs/contract/commands/users/get-by/get-user-by-id.command.ts

@@ -0,0 +1,28 @@
+import { z } from 'zod';
+
+import { getEndpointDetails } from '../../../constants';
+import { ExtendedUsersSchema } from '../../../models';
+import { REST_API, USERS_ROUTES } from '../../../api';
+
+export namespace GetUserByIdCommand {
+    export const url = REST_API.USERS.GET_BY.ID;
+    export const TSQ_url = url(':id');
+
+    export const endpointDetails = getEndpointDetails(
+        USERS_ROUTES.GET_BY.ID(':id'),
+        'get',
+        'Get user by ID',
+    );
+
+    export const RequestSchema = z.object({
+        id: z.coerce.bigint(),
+    });
+
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = z.object({
+        response: ExtendedUsersSchema,
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

libs/contract/commands/users/get-by/index.ts

@@ -1,4 +1,5 @@
 export * from './get-user-by-email.command';
+export * from './get-user-by-id.command';
 export * from './get-user-by-short-uuid.command';
 export * from './get-user-by-tag.command';
 export * from './get-user-by-telegram-id.command';

libs/contract/constants/cache-keys/cache-keys.constants.ts

@@ -17,3 +17,15 @@ export const CACHE_KEYS_TTL = {
     SUBSCRIPTION_SETTINGS: 3_600_000, // 1 hour
     SHORT_UUID_RANGE: 86_400_000, // 1 day
 } as const;
+
+export const INTERNAL_CACHE_KEYS = {
+    NODE_USER_USAGE_PREFIX: 'node_user_usage:',
+    NODE_USER_USAGE: (nodeId: bigint) =>
+        `${INTERNAL_CACHE_KEYS.NODE_USER_USAGE_PREFIX}${nodeId.toString()}`,
+    NODE_USER_USAGE_KEYS: 'node_user_usage_keys',
+    PROCESSING_POSTFIX: ':processing',
+} as const;
+
+export const INTERNAL_CACHE_KEYS_TTL = {
+    NODE_USER_USAGE: 10_800, // 3 hours in seconds
+} as const;

libs/contract/models/users.schema.ts

@@ -4,6 +4,7 @@ import { RESET_PERIODS, USERS_STATUS } from '../constants';
 
 export const UsersSchema = z.object({
     uuid: z.string().uuid(),
+    id: z.number(),
     shortUuid: z.string(),
     username: z.string(),
 

libs/contract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remnawave/backend-contract",
-  "version": "2.3.26",
+  "version": "2.3.28",
   "public": true,
   "license": "AGPL-3.0-only",
   "description": "A contract library for Remnawave Backend. It can be used in backend and frontend.",