chore: update @nestjs packages and other dependencies; refactor torrent blocker state management and API config generation

Author: kastov

package-lock.json

@@ -35,17 +35,17 @@
     "@henrygd/semaphore": "0.1.0",
     "@kastov/body-parser-with-zstd": "2.2.2",
     "@kastov/node-supervisord": ">=2.0.3",
-    "@nestjs/common": "11.1.15",
+    "@nestjs/common": "11.1.16",
     "@nestjs/config": "4.0.3",
-    "@nestjs/core": "11.1.15",
+    "@nestjs/core": "11.1.16",
     "@nestjs/jwt": "11.0.2",
     "@nestjs/passport": "11.0.5",
-    "@nestjs/platform-express": "11.1.15",
+    "@nestjs/platform-express": "11.1.16",
     "@peculiar/webcrypto": "^1.5.0",
     "@peculiar/x509": "^1.14.3",
     "@remnawave/hashed-set": "^0.0.4",
     "@nestjs/cqrs": "11.0.3",
-    "@remnawave/node-plugins": "0.1.1",
+    "@remnawave/node-plugins": "0.1.3",
     "@remnawave/supervisord-nestjs": "0.3.1",
     "@remnawave/xtls-sdk": "0.11.1",
     "@remnawave/xtls-sdk-nestjs": "0.6.1",

package.json

@@ -15,14 +15,32 @@ import { getServerCerts } from './generate-mtls-certs';
 import { getXtlsApiPort } from './get-initial-ports';
 import { IPolicyConfig } from './interfaces';
 
-export const generateApiConfig = (
-    config: Record<string, unknown>,
-    isTorrentBlockerEnabled: boolean,
+interface IRoutingXrayConfig {
+    rules: {
+        ruleTag?: string;
+        webhook?: {
+            url: string;
+            deduplication: number;
+        };
+        [key: string]: unknown;
+    }[];
+}
+
+interface IGenerateApiConfigParams {
+    config: Record<string, unknown>;
+    torrentBlockerState: {
+        enabled: boolean;
+        includeRuleTags: Set<string>;
+    };
     internal: {
         socketPath: string;
         token: string;
-    },
-): Record<string, unknown> => {
+    };
+}
+
+export const generateApiConfig = (args: IGenerateApiConfigParams): Record<string, unknown> => {
+    const { config, torrentBlockerState, internal } = args;
+
     const policyConfig = config.policy as undefined | IPolicyConfig;
     const serverCerts = getServerCerts();
     const hasCapNetAdminResult = hasCapNetAdmin();
@@ -39,7 +57,7 @@ export const generateApiConfig = (
         system: XRAY_DEFAULT_POLICY_MODEL.policy.system,
     };
 
-    return {
+    const result = {
         ...config,
         ...XRAY_DEFAULT_STATS_MODEL,
         ...XRAY_DEFAULT_API_MODEL,
@@ -52,24 +70,44 @@ export const generateApiConfig = (
             }),
             ...(Array.isArray(config.inbounds) ? config.inbounds : []),
         ],
-        outbounds: [
-            ...(Array.isArray(config.outbounds) ? config.outbounds : []),
-            ...(isTorrentBlockerEnabled ? [XRAY_TORRENT_BLOCKER_OUTBOUND_MODEL] : []),
-        ],
+        outbounds: [...(Array.isArray(config.outbounds) ? config.outbounds : [])],
         policy: builtPolicy,
         routing: {
             ...(config.routing || {}),
             rules: [
                 XRAY_ROUTING_RULES_MODEL,
-                ...(isTorrentBlockerEnabled
-                    ? [
-                          XRAY_TORRENT_BLOCKER_ROUTING_RULES_MODEL({
-                              webhookUrl: `/${internal.socketPath}:${XRAY_INTERNAL_FULL_WEBHOOK_PATH}?token=${internal.token}`,
-                          }),
-                      ]
-                    : []),
                 ...((config.routing as { rules?: unknown[] })?.rules || []),
             ],
         },
     };
+
+    if (torrentBlockerState.enabled) {
+        const webhookUrl = buildWebhookUrl(internal);
+        const routing = result.routing as IRoutingXrayConfig;
+
+        result.outbounds.push(XRAY_TORRENT_BLOCKER_OUTBOUND_MODEL);
+
+        routing.rules.splice(1, 0, XRAY_TORRENT_BLOCKER_ROUTING_RULES_MODEL({ webhookUrl }));
+
+        if (torrentBlockerState.includeRuleTags.size > 0) {
+            for (const rule of routing.rules) {
+                if (
+                    rule.ruleTag &&
+                    typeof rule.ruleTag === 'string' &&
+                    torrentBlockerState.includeRuleTags.has(rule.ruleTag)
+                ) {
+                    rule.webhook = {
+                        url: webhookUrl,
+                        deduplication: 30,
+                    };
+                }
+            }
+        }
+    }
+
+    return result;
+};
+
+const buildWebhookUrl = (internal: { socketPath: string; token: string }): string => {
+    return `/${internal.socketPath}:${XRAY_INTERNAL_FULL_WEBHOOK_PATH}?token=${internal.token}`;
 };

src/common/utils/generate-api-config.ts

@@ -95,9 +95,18 @@ export class PluginService {
             this.logger.log('[PLUGIN] Plugins changed...');
 
             if (currentTorrentBlocker && !pluginData.torrentBlocker?.enabled) {
-                await this.commandBus.execute(
-                    new RemoveOutboundCommand(XRAY_TORRENT_BLOCKER_OUTBOUND_TAG),
-                );
+                if (!pluginData.torrentBlocker?.includeRuleTags) {
+                    await this.commandBus.execute(
+                        new RemoveOutboundCommand(XRAY_TORRENT_BLOCKER_OUTBOUND_TAG),
+                    );
+                } else {
+                    await this.commandBus.execute(
+                        new StopXrayCommand({
+                            withOnlineCheck: true,
+                            withPluginCleanup: false,
+                        }),
+                    );
+                }
             } else if (!currentTorrentBlocker && pluginData.torrentBlocker?.enabled) {
                 await this.commandBus.execute(
                     new StopXrayCommand({
@@ -158,6 +167,7 @@ export class PluginService {
         this.state.torrentBlocker.setIgnoredIps(ips);
         this.state.torrentBlocker.setIgnoredUsers(users);
         this.state.torrentBlocker.configure(blockDuration);
+        this.state.torrentBlocker.setIncludeRuleTags(pluginData.torrentBlocker.includeRuleTags);
 
         this.logger.log(
             `[PLUGIN] Torrent-Blocker: blockDuration=${blockDuration}s, ${ips.length} ignored IPs, ${users.length} ignored users`,

src/modules/_plugin/plugin.service.ts

@@ -13,10 +13,16 @@ export class GetTorrentBlockerStateHandler implements IQueryHandler<GetTorrentBl
         try {
             const isEnabled = this.pluginState.torrentBlocker.isEnabled;
 
-            return isEnabled;
+            return {
+                enabled: isEnabled,
+                includeRuleTags: this.pluginState.torrentBlocker.includeRuleTagsSet,
+            };
         } catch (error) {
             this.logger.error(error);
-            return false;
+            return {
+                enabled: false,
+                includeRuleTags: new Set<string>(),
+            };
         }
     }
 }

src/modules/_plugin/queries/get-torrent-blocker-state/get-torrent-blocker-state.handler.ts

@@ -1,6 +1,9 @@
 import { Query } from '@nestjs/cqrs';
 
-export class GetTorrentBlockerStateQuery extends Query<boolean> {
+export class GetTorrentBlockerStateQuery extends Query<{
+    enabled: boolean;
+    includeRuleTags: Set<string>;
+}> {
     constructor() {
         super();
     }

src/modules/_plugin/queries/get-torrent-blocker-state/get-torrent-blocker-state.query.ts

@@ -5,6 +5,7 @@ export class TorrentBlockerState {
     private blockDuration: number | null = null;
     private ignoredIps = new Set<string>();
     private ignoredUsers = new Set<string>();
+    private includeRuleTags = new Set<string>();
     private reports: TorrentBlockerReportModel[] = [];
 
     get isEnabled(): boolean {
@@ -55,5 +56,15 @@ export class TorrentBlockerState {
         this.blockDuration = null;
         this.ignoredIps.clear();
         this.ignoredUsers.clear();
+        this.includeRuleTags.clear();
+    }
+
+    setIncludeRuleTags(tags: string[] | undefined): void {
+        if (!tags) return;
+        this.includeRuleTags = new Set(tags);
+    }
+
+    get includeRuleTagsSet(): Set<string> {
+        return this.includeRuleTags;
     }
 }

src/modules/_plugin/services/states/torrent-blocker.state.ts

@@ -160,11 +160,11 @@ export class XrayService implements OnApplicationBootstrap {
                 new GetTorrentBlockerStateQuery(),
             );
 
-            const fullConfig = generateApiConfig(
-                body.xrayConfig,
-                isTorrentBlockerEnabled,
-                this.internal,
-            );
+            const fullConfig = generateApiConfig({
+                config: body.xrayConfig,
+                torrentBlockerState: isTorrentBlockerEnabled,
+                internal: this.internal,
+            });
 
             await this.internalService.extractUsersFromConfig(body.internals.hashes, fullConfig);