blockmine 1.4.3 → 1.4.6

package/backend/cli.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 const fs = require('fs');
 const os = require('os');
 const path = require('path');

package/backend/prisma/migrations/20250614085849_add_bot_note/migration.sql

@@ -1,126 +1,126 @@
--- CreateTable
-CREATE TABLE "Server" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "name" TEXT NOT NULL,
-    "host" TEXT NOT NULL,
-    "port" INTEGER NOT NULL DEFAULT 25565,
-    "version" TEXT NOT NULL
-);
-
--- CreateTable
-CREATE TABLE "Bot" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "username" TEXT NOT NULL,
-    "password" TEXT,
-    "prefix" TEXT DEFAULT '@',
-    "note" TEXT,
-    "serverId" INTEGER NOT NULL,
-    "proxyHost" TEXT,
-    "proxyPort" INTEGER,
-    "proxyUsername" TEXT,
-    "proxyPassword" TEXT,
-    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" DATETIME NOT NULL,
-    CONSTRAINT "Bot_serverId_fkey" FOREIGN KEY ("serverId") REFERENCES "Server" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
-);
-
--- CreateTable
-CREATE TABLE "InstalledPlugin" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "botId" INTEGER NOT NULL,
-    "name" TEXT NOT NULL,
-    "version" TEXT NOT NULL,
-    "description" TEXT,
-    "sourceType" TEXT NOT NULL,
-    "sourceUri" TEXT,
-    "path" TEXT NOT NULL,
-    "isEnabled" BOOLEAN NOT NULL DEFAULT true,
-    "manifest" TEXT,
-    "settings" TEXT DEFAULT '{}',
-    CONSTRAINT "InstalledPlugin_botId_fkey" FOREIGN KEY ("botId") REFERENCES "Bot" ("id") ON DELETE CASCADE ON UPDATE CASCADE
-);
-
--- CreateTable
-CREATE TABLE "Command" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "botId" INTEGER NOT NULL,
-    "name" TEXT NOT NULL,
-    "isEnabled" BOOLEAN NOT NULL DEFAULT true,
-    "cooldown" INTEGER NOT NULL DEFAULT 0,
-    "aliases" TEXT NOT NULL DEFAULT '[]',
-    "description" TEXT,
-    "owner" TEXT,
-    "permissionId" INTEGER,
-    "allowedChatTypes" TEXT NOT NULL DEFAULT '["chat", "private"]',
-    CONSTRAINT "Command_botId_fkey" FOREIGN KEY ("botId") REFERENCES "Bot" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
-    CONSTRAINT "Command_permissionId_fkey" FOREIGN KEY ("permissionId") REFERENCES "Permission" ("id") ON DELETE SET NULL ON UPDATE CASCADE
-);
-
--- CreateTable
-CREATE TABLE "User" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "username" TEXT NOT NULL,
-    "isBlacklisted" BOOLEAN NOT NULL DEFAULT false,
-    "botId" INTEGER NOT NULL,
-    CONSTRAINT "User_botId_fkey" FOREIGN KEY ("botId") REFERENCES "Bot" ("id") ON DELETE CASCADE ON UPDATE CASCADE
-);
-
--- CreateTable
-CREATE TABLE "Group" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "name" TEXT NOT NULL,
-    "owner" TEXT NOT NULL DEFAULT 'system',
-    "botId" INTEGER NOT NULL,
-    CONSTRAINT "Group_botId_fkey" FOREIGN KEY ("botId") REFERENCES "Bot" ("id") ON DELETE CASCADE ON UPDATE CASCADE
-);
-
--- CreateTable
-CREATE TABLE "Permission" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "name" TEXT NOT NULL,
-    "description" TEXT,
-    "owner" TEXT NOT NULL DEFAULT 'system',
-    "botId" INTEGER NOT NULL,
-    CONSTRAINT "Permission_botId_fkey" FOREIGN KEY ("botId") REFERENCES "Bot" ("id") ON DELETE CASCADE ON UPDATE CASCADE
-);
-
--- CreateTable
-CREATE TABLE "UserGroup" (
-    "userId" INTEGER NOT NULL,
-    "groupId" INTEGER NOT NULL,
-
-    PRIMARY KEY ("userId", "groupId"),
-    CONSTRAINT "UserGroup_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
-    CONSTRAINT "UserGroup_groupId_fkey" FOREIGN KEY ("groupId") REFERENCES "Group" ("id") ON DELETE CASCADE ON UPDATE CASCADE
-);
-
--- CreateTable
-CREATE TABLE "GroupPermission" (
-    "groupId" INTEGER NOT NULL,
-    "permissionId" INTEGER NOT NULL,
-
-    PRIMARY KEY ("groupId", "permissionId"),
-    CONSTRAINT "GroupPermission_groupId_fkey" FOREIGN KEY ("groupId") REFERENCES "Group" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
-    CONSTRAINT "GroupPermission_permissionId_fkey" FOREIGN KEY ("permissionId") REFERENCES "Permission" ("id") ON DELETE CASCADE ON UPDATE CASCADE
-);
-
--- CreateIndex
-CREATE UNIQUE INDEX "Server_name_key" ON "Server"("name");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Bot_username_key" ON "Bot"("username");
-
--- CreateIndex
-CREATE UNIQUE INDEX "InstalledPlugin_botId_name_key" ON "InstalledPlugin"("botId", "name");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Command_botId_name_key" ON "Command"("botId", "name");
-
--- CreateIndex
-CREATE UNIQUE INDEX "User_botId_username_key" ON "User"("botId", "username");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Group_botId_name_key" ON "Group"("botId", "name");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Permission_botId_name_key" ON "Permission"("botId", "name");
+-- CreateTable
+CREATE TABLE "Server" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "name" TEXT NOT NULL,
+    "host" TEXT NOT NULL,
+    "port" INTEGER NOT NULL DEFAULT 25565,
+    "version" TEXT NOT NULL
+);
+
+-- CreateTable
+CREATE TABLE "Bot" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "username" TEXT NOT NULL,
+    "password" TEXT,
+    "prefix" TEXT DEFAULT '@',
+    "note" TEXT,
+    "serverId" INTEGER NOT NULL,
+    "proxyHost" TEXT,
+    "proxyPort" INTEGER,
+    "proxyUsername" TEXT,
+    "proxyPassword" TEXT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "Bot_serverId_fkey" FOREIGN KEY ("serverId") REFERENCES "Server" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "InstalledPlugin" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "botId" INTEGER NOT NULL,
+    "name" TEXT NOT NULL,
+    "version" TEXT NOT NULL,
+    "description" TEXT,
+    "sourceType" TEXT NOT NULL,
+    "sourceUri" TEXT,
+    "path" TEXT NOT NULL,
+    "isEnabled" BOOLEAN NOT NULL DEFAULT true,
+    "manifest" TEXT,
+    "settings" TEXT DEFAULT '{}',
+    CONSTRAINT "InstalledPlugin_botId_fkey" FOREIGN KEY ("botId") REFERENCES "Bot" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "Command" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "botId" INTEGER NOT NULL,
+    "name" TEXT NOT NULL,
+    "isEnabled" BOOLEAN NOT NULL DEFAULT true,
+    "cooldown" INTEGER NOT NULL DEFAULT 0,
+    "aliases" TEXT NOT NULL DEFAULT '[]',
+    "description" TEXT,
+    "owner" TEXT,
+    "permissionId" INTEGER,
+    "allowedChatTypes" TEXT NOT NULL DEFAULT '["chat", "private"]',
+    CONSTRAINT "Command_botId_fkey" FOREIGN KEY ("botId") REFERENCES "Bot" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT "Command_permissionId_fkey" FOREIGN KEY ("permissionId") REFERENCES "Permission" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "User" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "username" TEXT NOT NULL,
+    "isBlacklisted" BOOLEAN NOT NULL DEFAULT false,
+    "botId" INTEGER NOT NULL,
+    CONSTRAINT "User_botId_fkey" FOREIGN KEY ("botId") REFERENCES "Bot" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "Group" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "name" TEXT NOT NULL,
+    "owner" TEXT NOT NULL DEFAULT 'system',
+    "botId" INTEGER NOT NULL,
+    CONSTRAINT "Group_botId_fkey" FOREIGN KEY ("botId") REFERENCES "Bot" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "Permission" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "name" TEXT NOT NULL,
+    "description" TEXT,
+    "owner" TEXT NOT NULL DEFAULT 'system',
+    "botId" INTEGER NOT NULL,
+    CONSTRAINT "Permission_botId_fkey" FOREIGN KEY ("botId") REFERENCES "Bot" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "UserGroup" (
+    "userId" INTEGER NOT NULL,
+    "groupId" INTEGER NOT NULL,
+
+    PRIMARY KEY ("userId", "groupId"),
+    CONSTRAINT "UserGroup_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT "UserGroup_groupId_fkey" FOREIGN KEY ("groupId") REFERENCES "Group" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "GroupPermission" (
+    "groupId" INTEGER NOT NULL,
+    "permissionId" INTEGER NOT NULL,
+
+    PRIMARY KEY ("groupId", "permissionId"),
+    CONSTRAINT "GroupPermission_groupId_fkey" FOREIGN KEY ("groupId") REFERENCES "Group" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT "GroupPermission_permissionId_fkey" FOREIGN KEY ("permissionId") REFERENCES "Permission" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Server_name_key" ON "Server"("name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Bot_username_key" ON "Bot"("username");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "InstalledPlugin_botId_name_key" ON "InstalledPlugin"("botId", "name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Command_botId_name_key" ON "Command"("botId", "name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_botId_username_key" ON "User"("botId", "username");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Group_botId_name_key" ON "Group"("botId", "name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Permission_botId_name_key" ON "Permission"("botId", "name");

package/backend/prisma/migrations/20250614153037_add_plugin_installed_date/migration.sql

@@ -1,27 +1,27 @@
--- AlterTable
-ALTER TABLE "Bot" ADD COLUMN "owners" TEXT DEFAULT '';
-
--- RedefineTables
-PRAGMA defer_foreign_keys=ON;
-PRAGMA foreign_keys=OFF;
-CREATE TABLE "new_InstalledPlugin" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "botId" INTEGER NOT NULL,
-    "name" TEXT NOT NULL,
-    "version" TEXT NOT NULL,
-    "description" TEXT,
-    "sourceType" TEXT NOT NULL,
-    "sourceUri" TEXT,
-    "path" TEXT NOT NULL,
-    "isEnabled" BOOLEAN NOT NULL DEFAULT true,
-    "manifest" TEXT,
-    "settings" TEXT DEFAULT '{}',
-    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    CONSTRAINT "InstalledPlugin_botId_fkey" FOREIGN KEY ("botId") REFERENCES "Bot" ("id") ON DELETE CASCADE ON UPDATE CASCADE
-);
-INSERT INTO "new_InstalledPlugin" ("botId", "description", "id", "isEnabled", "manifest", "name", "path", "settings", "sourceType", "sourceUri", "version") SELECT "botId", "description", "id", "isEnabled", "manifest", "name", "path", "settings", "sourceType", "sourceUri", "version" FROM "InstalledPlugin";
-DROP TABLE "InstalledPlugin";
-ALTER TABLE "new_InstalledPlugin" RENAME TO "InstalledPlugin";
-CREATE UNIQUE INDEX "InstalledPlugin_botId_name_key" ON "InstalledPlugin"("botId", "name");
-PRAGMA foreign_keys=ON;
-PRAGMA defer_foreign_keys=OFF;
+-- AlterTable
+ALTER TABLE "Bot" ADD COLUMN "owners" TEXT DEFAULT '';
+
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_InstalledPlugin" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "botId" INTEGER NOT NULL,
+    "name" TEXT NOT NULL,
+    "version" TEXT NOT NULL,
+    "description" TEXT,
+    "sourceType" TEXT NOT NULL,
+    "sourceUri" TEXT,
+    "path" TEXT NOT NULL,
+    "isEnabled" BOOLEAN NOT NULL DEFAULT true,
+    "manifest" TEXT,
+    "settings" TEXT DEFAULT '{}',
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT "InstalledPlugin_botId_fkey" FOREIGN KEY ("botId") REFERENCES "Bot" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+INSERT INTO "new_InstalledPlugin" ("botId", "description", "id", "isEnabled", "manifest", "name", "path", "settings", "sourceType", "sourceUri", "version") SELECT "botId", "description", "id", "isEnabled", "manifest", "name", "path", "settings", "sourceType", "sourceUri", "version" FROM "InstalledPlugin";
+DROP TABLE "InstalledPlugin";
+ALTER TABLE "new_InstalledPlugin" RENAME TO "InstalledPlugin";
+CREATE UNIQUE INDEX "InstalledPlugin_botId_name_key" ON "InstalledPlugin"("botId", "name");
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;

package/backend/prisma/migrations/20250615232848_add_scheduled_tasks/migration.sql

@@ -1,13 +1,13 @@
--- CreateTable
-CREATE TABLE "ScheduledTask" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "name" TEXT NOT NULL,
-    "cronPattern" TEXT NOT NULL,
-    "action" TEXT NOT NULL,
-    "targetBotIds" TEXT NOT NULL,
-    "payload" TEXT DEFAULT '{}',
-    "isEnabled" BOOLEAN NOT NULL DEFAULT true,
-    "lastRun" DATETIME,
-    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" DATETIME NOT NULL
-);
+-- CreateTable
+CREATE TABLE "ScheduledTask" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "name" TEXT NOT NULL,
+    "cronPattern" TEXT NOT NULL,
+    "action" TEXT NOT NULL,
+    "targetBotIds" TEXT NOT NULL,
+    "payload" TEXT DEFAULT '{}',
+    "isEnabled" BOOLEAN NOT NULL DEFAULT true,
+    "lastRun" DATETIME,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL
+);

package/backend/prisma/migrations/20250617133815_add_panel_users_and_roles/migration.sql

@@ -1,26 +1,26 @@
--- CreateTable
-CREATE TABLE "PanelUser" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "uuid" TEXT NOT NULL,
-    "username" TEXT NOT NULL,
-    "passwordHash" TEXT NOT NULL,
-    "roleId" INTEGER NOT NULL,
-    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    CONSTRAINT "PanelUser_roleId_fkey" FOREIGN KEY ("roleId") REFERENCES "PanelRole" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
-);
-
--- CreateTable
-CREATE TABLE "PanelRole" (
-    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    "name" TEXT NOT NULL,
-    "permissions" TEXT NOT NULL DEFAULT '[]'
-);
-
--- CreateIndex
-CREATE UNIQUE INDEX "PanelUser_uuid_key" ON "PanelUser"("uuid");
-
--- CreateIndex
-CREATE UNIQUE INDEX "PanelUser_username_key" ON "PanelUser"("username");
-
--- CreateIndex
-CREATE UNIQUE INDEX "PanelRole_name_key" ON "PanelRole"("name");
+-- CreateTable
+CREATE TABLE "PanelUser" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "uuid" TEXT NOT NULL,
+    "username" TEXT NOT NULL,
+    "passwordHash" TEXT NOT NULL,
+    "roleId" INTEGER NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT "PanelUser_roleId_fkey" FOREIGN KEY ("roleId") REFERENCES "PanelRole" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "PanelRole" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "name" TEXT NOT NULL,
+    "permissions" TEXT NOT NULL DEFAULT '[]'
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "PanelUser_uuid_key" ON "PanelUser"("uuid");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "PanelUser_username_key" ON "PanelUser"("username");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "PanelRole_name_key" ON "PanelRole"("name");

package/backend/prisma/migrations/migration_lock.toml

@@ -1,3 +1,3 @@
-# Please do not edit this file manually
-# It should be added in your version-control system (i.e. Git)
+# Please do not edit this file manually
+# It should be added in your version-control system (i.e. Git)
 provider = "sqlite"

package/backend/src/api/middleware/auth.js

@@ -1,17 +1,14 @@
-
 const jwt = require('jsonwebtoken');
 const config = require('../../config');
 
 const JWT_SECRET = config.security.jwtSecret;
 
-/**
- * Middleware для проверки JWT-токена.
- * Извлекает токен из заголовка Authorization, проверяет его подлинность
- * и добавляет расшифрованные данные (payload) в req.user.
- */
+const tokenCache = new Map();
+const CACHE_TTL = 5 * 60 * 1000;
+
+
 function authenticate(req, res, next) {
     const authHeader = req.header('Authorization');
-
     if (!authHeader) {
         return res.status(401).json({ error: 'Нет токена, доступ запрещен' });
     }
@@ -23,28 +20,39 @@ function authenticate(req, res, next) {
 
     const token = tokenParts[1];
 
+    if (tokenCache.has(token)) {
+        const cached = tokenCache.get(token);
+        if (Date.now() < cached.expires) {
+            req.user = cached.payload;
+            return next();
+        } else {
+            tokenCache.delete(token);
+        }
+    }
+
     try {
-        const decoded = jwt.verify(token, JWT_SECRET);
+        const decoded = jwt.verify(token, JWT_SECRET, { algorithms: ['HS256'] });
         req.user = decoded;
+        
+        tokenCache.set(token, {
+            payload: decoded,
+            expires: Date.now() + CACHE_TTL
+        });
+
         next();
     } catch (err) {
         res.status(401).json({ error: 'Невалидный токен' });
     }
 }
 
-/**
- * Middleware-фабрика для проверки прав доступа.
- * @param {string} requiredPermission - Право, необходимое для доступа к роуту (например, 'bot:delete').
- * @returns {function} - Express middleware.
- */
+
 function authorize(requiredPermission) {
     return (req, res, next) => {
-        if (!req.user || !req.user.permissions) {
-            return res.status(403).json({ error: 'Ошибка прав доступа: пользователь не аутентифицирован.' });
+        if (!req.user || !Array.isArray(req.user.permissions)) {
+            return res.status(403).json({ error: 'Ошибка прав доступа: пользователь не аутентифицирован или формат прав некорректен.' });
         }
 
         const userPermissions = req.user.permissions;
-
         if (userPermissions.includes('*') || userPermissions.includes(requiredPermission)) {
             next();
         } else {

package/backend/src/core/BotManager.js

@@ -5,7 +5,6 @@ const { PrismaClient } = require('@prisma/client');
 const pidusage = require('pidusage');
 const DependencyService = require('./DependencyService');
 const config = require('../config');
-
 const fs = require('fs');
 const os = require('os');
 const { v4: uuidv4 } = require('uuid');
@@ -25,6 +24,26 @@ const WARNING_COOLDOWN = 10 * 1000;
 const STATS_SERVER_URL = 'http://185.65.200.184:3000';
 let instanceId = null;
 const DATA_DIR = path.join(os.homedir(), '.blockmine');
+const INSTANCE_ID_PATH = path.join(DATA_DIR, '.instance_id');
+
+function getInstanceId() {
+    if (instanceId) return instanceId;
+    try {
+        if (fs.existsSync(INSTANCE_ID_PATH)) {
+            instanceId = fs.readFileSync(INSTANCE_ID_PATH, 'utf-8');
+        } else {
+            instanceId = uuidv4();
+            if (!fs.existsSync(DATA_DIR)) {
+                fs.mkdirSync(DATA_DIR, { recursive: true });
+            }
+            fs.writeFileSync(INSTANCE_ID_PATH, instanceId, 'utf-8');
+        }
+    } catch (error) {
+        console.error('[Telemetry] Ошибка при загрузке/создании Instance ID:', error);
+        return null;
+    }
+    return instanceId;
+}
 
 
 class BotManager {
@@ -34,9 +53,9 @@ class BotManager {
         this.resourceUsage = new Map();
         this.botConfigs = new Map();
 
-        setInterval(() => this.updateAllResourceUsage(), 5000);
-        
+        getInstanceId();
 
+        setInterval(() => this.updateAllResourceUsage(), 5000);
         if (config.telemetry?.enabled) {
             setInterval(() => this.sendHeartbeat(), 5 * 60 * 1000);
         }
@@ -49,13 +68,11 @@ class BotManager {
                 prisma.command.findMany({ where: { botId } }),
                 prisma.permission.findMany({ where: { botId } }),
             ]);
-            
             const config = {
                 commands: new Map(commands.map(cmd => [cmd.name, cmd])),
                 permissionsById: new Map(permissions.map(p => [p.id, p])),
                 commandAliases: new Map()
             };
-
             for (const cmd of commands) {
                 const aliases = JSON.parse(cmd.aliases || '[]');
                 for (const alias of aliases) {
@@ -81,7 +98,6 @@ class BotManager {
 
     triggerHeartbeat() {
         if (!config.telemetry?.enabled) return;
-
         if (this.heartbeatDebounceTimer) {
             clearTimeout(this.heartbeatDebounceTimer);
         }
@@ -105,7 +121,6 @@ class BotManager {
 
     async sendHeartbeat() {
         if (!config.telemetry?.enabled) return;
-
         if (!instanceId) return;
 
         try {
@@ -131,7 +146,6 @@ class BotManager {
                 return;
             }
             const { challenge, difficulty, prefix } = await challengeRes.json();
-
             let nonce = 0;
             let hash = '';
             do {
@@ -150,7 +164,6 @@ class BotManager {
                     nonce: nonce
                 })
             });
-
         } catch (error) {
             console.error(`[Telemetry] Не удалось отправить heartbeat: ${error.message}`);
         }
@@ -170,7 +183,6 @@ class BotManager {
           "User": ["user.say"],
           "Admin": ["admin.*", "admin.cooldown.bypass", "user.cooldown.bypass", "user.*"]
         };
-        
         console.log(`[Permission Sync] Синхронизация системных прав для бота ID ${botId}...`);
 
         for (const perm of systemPermissions) {
@@ -218,7 +230,6 @@ class BotManager {
 
         const pids = Array.from(this.bots.values()).map(child => child.pid).filter(Boolean);
         if (pids.length === 0) return;
-        
         try {
             const stats = await pidusage(pids);
             const usageData = [];
@@ -237,7 +248,6 @@ class BotManager {
                 }
             }
             getIO().emit('bots:usage', usageData);
-
         } catch (error) {
         }
     }
@@ -291,18 +301,15 @@ class BotManager {
 
         await this._syncSystemPermissions(botConfig.id);
         await this.loadConfigForBot(botConfig.id);
-
         this.logCache.set(botConfig.id, []);
         this.emitStatusUpdate(botConfig.id, 'starting', '');
 
         const allPluginsForBot = await prisma.installedPlugin.findMany({
             where: { botId: botConfig.id },
         });
-
         const enabledPlugins = allPluginsForBot.filter(p => p.isEnabled);
 
         const { sortedPlugins, pluginInfo, hasCriticalIssues } = DependencyService.resolveDependencies(enabledPlugins, allPluginsForBot);
-
         if (hasCriticalIssues) {
             this.appendLog(botConfig.id, '[DependencyManager] Обнаружены критические проблемы с зависимостями:');
             for (const plugin of Object.values(pluginInfo)) {
@@ -328,20 +335,16 @@ class BotManager {
         }
 
         const fullBotConfig = { ...decryptedConfig, plugins: sortedPlugins };
-        
         const botProcessPath = path.resolve(__dirname, 'BotProcess.js');
         const child = fork(botProcessPath, [], { stdio: ['pipe', 'pipe', 'pipe', 'ipc'] });
 
         child.botConfig = botConfig;
-
         child.on('error', (err) => {
             this.appendLog(botConfig.id, `[PROCESS FATAL] КРИТИЧЕСКАЯ ОШИБКА ПРОЦЕССА: ${err.stack}`);
         });
-
         child.stderr.on('data', (data) => {
             this.appendLog(botConfig.id, `[STDERR] ${data.toString()}`);
         });
-
         child.on('message', async (message) => {
             if (message.type === 'log') {
                 this.appendLog(botConfig.id, message.content);
@@ -351,9 +354,48 @@ class BotManager {
                 await this.handleCommandValidation(botConfig, message);
             } else if (message.type === 'register_command') {
                 await this.handleCommandRegistration(botConfig.id, message.commandConfig);
+            } else if (message.type === 'request_user_action') {
+                const { requestId, payload } = message;
+                const { targetUsername, action, data } = payload;
+                const botId = botConfig.id;
+            
+                try {
+                    const targetUser = await RealUserService.getUser(targetUsername, botId);
+                    let replyPayload = {};
+            
+                    switch (action) {
+                        case 'toggle_blacklist': {
+                            const isCurrentlyBlacklisted = targetUser.isBlacklisted;
+                            await targetUser.setBlacklist(!isCurrentlyBlacklisted);
+                            replyPayload.newStatus = !isCurrentlyBlacklisted; 
+                            break;
+                        }
+            
+                        case 'toggle_group': {
+                            if (!data.groupName) throw new Error('Название группы не указано.');
+                            const hasGroup = targetUser.hasGroup(data.groupName);
+                            if (hasGroup) {
+                                await targetUser.removeGroup(data.groupName);
+                                replyPayload.actionTaken = 'removed'; 
+                            } else {
+                                await targetUser.addGroup(data.groupName);
+                                replyPayload.actionTaken = 'added'; 
+                            }
+                            break;
+                        }
+            
+                        default:
+                            throw new Error(`Неизвестное действие: ${action}`);
+                    }
+            
+                    child.send({ type: 'user_action_response', requestId, payload: replyPayload });
+            
+                } catch (error) {
+                    console.error(`[BotManager] Ошибка выполнения действия '${action}' для пользователя '${targetUsername}':`, error);
+                    child.send({ type: 'user_action_response', requestId, error: error.message });
+                }
             }
         });
-
         child.on('exit', (code, signal) => {
             const botId = botConfig.id;
             this.bots.delete(botId);
@@ -362,7 +404,6 @@ class BotManager {
             this.emitStatusUpdate(botId, 'stopped', `Процесс завершился с кодом ${code} (сигнал: ${signal || 'none'}).`);
             this.updateAllResourceUsage();
         });
-
         this.bots.set(botConfig.id, child);
         child.send({ type: 'start', config: fullBotConfig });
 
@@ -433,7 +474,6 @@ class BotManager {
             }
 
             child.send({ type: 'execute_handler', commandName: dbCommand.name, username, args, typeChat });
-
         } catch (error) {
             console.error(`[BotManager] Command validation error for botId: ${botId}`, {
                 command: commandName,
@@ -477,18 +517,15 @@ class BotManager {
                 allowedChatTypes: JSON.stringify(commandConfig.allowedChatTypes || []),
                 cooldown: commandConfig.cooldown || 0,
             };
-
             const updateData = {
                 description: commandConfig.description,
                 owner: commandConfig.owner,
             };
-
             await prisma.command.upsert({
                 where: { botId_name: { botId, name: commandConfig.name } },
                 update: updateData,
                 create: createData,
             });
-
             this.invalidateConfigCache(botId);
 
         } catch (error) {

package/backend/src/core/BotProcess.js

@@ -1,7 +1,7 @@
-
 const mineflayer = require('mineflayer');
 const { SocksClient } = require('socks');
 const EventEmitter = require('events');
+const { v4: uuidv4 } = require('uuid');
 const { loadCommands } = require('./system/CommandRegistry');
 const { initializePlugins } = require('./PluginLoader');
 const MessageQueue = require('./MessageQueue');
@@ -12,6 +12,7 @@ const UserService = require('./ipc/UserService.stub.js');
 const PermissionManager = require('./ipc/PermissionManager.stub.js');
 
 let bot = null;
+const pendingRequests = new Map(); 
 
 function sendLog(content) {
     if (process.send) {
@@ -29,8 +30,8 @@ function handleIncomingCommand(type, username, message) {
     const commandName = commandParts.shift().toLowerCase();
     const restOfMessage = commandParts.join(' ');
 
-    const commandInstance = bot.commands.get(commandName) || 
-                            Array.from(bot.commands.values()).find(cmd => cmd.aliases.includes(commandName));
+    const commandInstance = bot.commands.get(commandName) ||
+    Array.from(bot.commands.values()).find(cmd => cmd.aliases.includes(commandName));
 
     if (!commandInstance) return;
 
@@ -90,7 +91,17 @@ function handleIncomingCommand(type, username, message) {
 }
 
 process.on('message', async (message) => {
-    if (message.type === 'start') {
+    if (message.type === 'user_action_response') {
+        if (pendingRequests.has(message.requestId)) {
+            const { resolve, reject } = pendingRequests.get(message.requestId);
+            if (message.error) {
+                reject(new Error(message.error));
+            } else {
+                resolve(message.payload);
+            }
+            pendingRequests.delete(message.requestId);
+        }
+    } else if (message.type === 'start') {
         const config = message.config;
         sendLog(`[System] Получена команда на запуск бота ${config.username}...`);
         try {
@@ -130,18 +141,17 @@ process.on('message', async (message) => {
                 }
            } else {
                 sendLog(`[System] Прокси не настроен, используется прямое подключение.`);
-           }
+            }
 
             bot = mineflayer.createBot(botOptions);
 
             bot.events = new EventEmitter();
-            bot.events.setMaxListeners(30); 
+            bot.events.setMaxListeners(30);
             bot.config = config;
             bot.sendLog = sendLog;
             bot.messageQueue = new MessageQueue(bot);
 
             const installedPluginNames = config.plugins.map(p => p.name);
-
             bot.api = {
                 Command: Command,
                 events: bot.events,
@@ -172,17 +182,43 @@ process.on('message', async (message) => {
                         });
                     }
                     sendLog(`[API] Команда "${commandInstance.name}" от плагина "${commandInstance.owner}" зарегистрирована в процессе.`);
+                },
+                performUserAction: (username, action, data = {}) => {
+                    return new Promise((resolve, reject) => {
+                        const requestId = uuidv4();
+                        pendingRequests.set(requestId, { resolve, reject });
+        
+                        if (process.send) {
+                            process.send({
+                                type: 'request_user_action',
+                                requestId,
+                                payload: {
+                                    targetUsername: username,
+                                    action,
+                                    data
+                                }
+                            });
+                        } else {
+                            reject(new Error('IPC channel is not available.'));
+                        }
+        
+                        setTimeout(() => {
+                            if (pendingRequests.has(requestId)) {
+                                reject(new Error('Request to main process timed out.'));
+                                pendingRequests.delete(requestId);
+                            }
+                        }, 5000);
+                    });
                 }
             };
 
             bot.commands = await loadCommands();
-
             if (process.send) {
                 for (const cmd of bot.commands.values()) {
                     process.send({
                         type: 'register_command',
                         commandConfig: {
-                            name: cmd.name,
+                             name: cmd.name,
                             description: cmd.description,
                             aliases: cmd.aliases,
                             owner: cmd.owner,
@@ -207,7 +243,6 @@ process.on('message', async (message) => {
                     handleIncomingCommand(type, username, message);
                 }
             });
-            
             bot.on('message', (jsonMsg) => {
                 const ansiMessage = jsonMsg.toAnsi();
                 if (ansiMessage.trim()) {
@@ -218,39 +253,32 @@ process.on('message', async (message) => {
                 const rawMessageText = jsonMsg.toString();
                 bot.events.emit('core:raw_message', rawMessageText, jsonMsg);
             });
-            
             bot.on('chat', (username, message) => {
                 if (messageHandledByCustomParser) {
                     return;
                 }
                 handleIncomingCommand('chat', username, message);
             });
-
             bot.on('login', () => {
                 sendLog('[Event: login] Успешно залогинился!');
                 if (process.send) {
                     process.send({ type: 'status', status: 'running' });
                 }
             });
-
             bot.on('spawn', () => {
                 sendLog('[Event: spawn] Бот заспавнился в мире. Полностью готов к работе!');
             });
-            
             bot.on('kicked', (reason) => {
                 let reasonText;
                 try { reasonText = JSON.parse(reason).text || reason; } catch (e) { reasonText = reason; }
                 sendLog(`[Event: kicked] Меня кикнули. Причина: ${reasonText}.`);
                 process.exit(0);
             });
-
             bot.on('error', (err) => sendLog(`[Event: error] Произошла ошибка: ${err.stack || err.message}`));
-
             bot.on('end', (reason) => {
                 sendLog(`[Event: end] Отключен от сервера. Причина: ${reason}`);
                 process.exit(0);
             });
-
         } catch (err) {
             sendLog(`[CRITICAL] Критическая ошибка при создании бота: ${err.stack}`);
             process.exit(1);

package/backend/src/core/utils/crypto.js

@@ -1,24 +1,30 @@
-
 const crypto = require('crypto');
 const config = require('../../config');
-
 const ALGORITHM = 'aes-256-gcm';
 const IV_LENGTH = 16;
-const AUTH_TAG_LENGTH = 16;
-const KEY = Buffer.from(config.security.encryptionKey, 'hex');
+
+
+function getEncryptionKey() {
+    const key = config.security.encryptionKey;
+    if (!key || key.length !== 64) {
+        throw new Error('[Crypto] Ключ шифрования не настроен или имеет неверную длину в config.json');
+    }
+    return Buffer.from(key, 'hex');
+}
+
 
 function encrypt(text) {
     if (!text) return null;
     try {
+        const key = getEncryptionKey();
         const iv = crypto.randomBytes(IV_LENGTH);
-        const cipher = crypto.createCipheriv(ALGORITHM, KEY, iv);
+        const cipher = crypto.createCipheriv(ALGORITHM, key, iv);
         const encrypted = Buffer.concat([cipher.update(text, 'utf8'), cipher.final()]);
         const authTag = cipher.getAuthTag();
         
         return `${iv.toString('hex')}:${authTag.toString('hex')}:${encrypted.toString('hex')}`;
     } catch (error) {
-        console.error('[Crypto] Ошибка шифрования:', error);
-        return null;
+        throw new Error(`[Crypto] Ошибка шифрования: ${error.message}`);
     }
 }
 
@@ -27,22 +33,21 @@ function decrypt(hash) {
     try {
         const parts = hash.split(':');
         if (parts.length !== 3) {
-            console.error('[Crypto] Неверный формат зашифрованных данных. Возвращаем как есть.');
-            return hash;
+            return hash; 
         }
 
+        const key = getEncryptionKey();
         const iv = Buffer.from(parts[0], 'hex');
         const authTag = Buffer.from(parts[1], 'hex');
         const encrypted = Buffer.from(parts[2], 'hex');
 
-        const decipher = crypto.createDecipheriv(ALGORITHM, KEY, iv);
+        const decipher = crypto.createDecipheriv(ALGORITHM, key, iv);
         decipher.setAuthTag(authTag);
         
         const decrypted = Buffer.concat([decipher.update(encrypted), decipher.final()]);
         return decrypted.toString('utf8');
     } catch (error) {
-        console.error('[Crypto] Ошибка дешифрования. Возможно, ключ был изменен или данные повреждены.', error);
-        return null;
+        throw new Error(`[Crypto] Ошибка дешифрования. Возможно, ключ был изменен или данные повреждены. ${error.message}`);
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockmine",
-  "version": "1.4.3",
+  "version": "1.4.6",
   "description": "Мощная панель управления ботами для Майнкрафта.",
   "author": "merka",
   "license": "MIT",