blockmine 1.4.4 → 1.4.7

package/backend/src/core/BotManager.js

@@ -24,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 {
@@ -33,6 +53,8 @@ class BotManager {
         this.resourceUsage = new Map();
         this.botConfigs = new Map();
 
+        getInstanceId();
+
         setInterval(() => this.updateAllResourceUsage(), 5000);
         if (config.telemetry?.enabled) {
             setInterval(() => this.sendHeartbeat(), 5 * 60 * 1000);
@@ -74,6 +96,17 @@ class BotManager {
         }
     }
 
+    reloadBotConfigInRealTime(botId) {
+        this.invalidateConfigCache(botId);
+        const child = this.bots.get(botId);
+        if (child && !child.killed) {
+            child.send({ type: 'config:reload' });
+            console.log(`[BotManager] Sent config:reload to bot process ${botId}`);
+            
+            getIO().emit('bot:config_reloaded', { botId });
+        }
+    }
+
     triggerHeartbeat() {
         if (!config.telemetry?.enabled) return;
         if (this.heartbeatDebounceTimer) {
@@ -538,6 +571,18 @@ class BotManager {
         }
         return { success: true };
     }
+
+    reloadBotConfigInRealTime(botId) {
+        this.invalidateConfigCache(botId);
+        const child = this.bots.get(botId);
+        if (child && !child.killed) {
+            child.send({ type: 'config:reload' });
+            console.log(`[BotManager] Sent config:reload to bot process ${botId}`);
+            
+            const { getIO } = require('../real-time/socketHandler');
+            getIO().emit('bot:config_reloaded', { botId });
+        }
+    }
 }
 
 module.exports = new BotManager();

package/backend/src/core/BotProcess.js

@@ -22,6 +22,29 @@ function sendLog(content) {
     }
 }
 
+async function fetchNewConfig(botId) {
+    try {
+        const botData = await prisma.bot.findUnique({
+            where: { id: botId },
+            include: {
+                server: true,
+                installedPlugins: {
+                    where: { isEnabled: true }
+                },
+            }
+        });
+
+        if (!botData) return null;
+
+        const commands = await prisma.command.findMany({ where: { botId } });
+
+        return { ...botData, commands };
+    } catch (error) {
+        sendLog(`[fetchNewConfig] Error: ${error.message}`);
+        return null;
+    }
+}
+
 function handleIncomingCommand(type, username, message) {
     if (!message.startsWith(bot.config.prefix || '@')) return;
 
@@ -51,7 +74,7 @@ function handleIncomingCommand(type, username, message) {
                 if (argDef.type === 'number') {
                     const numValue = parseFloat(value);
                     if (isNaN(numValue)) {
-                        bot.api.sendMessage(type, `Ошибка: Аргумент "${argDef.description}" должен быть числом.`, username);
+                        bot.api.sendMessage(type, `Ошибка: Аргумент \"${argDef.description}\" должен быть числом.`, username);
                         return;
                     }
                     value = numValue;
@@ -181,7 +204,7 @@ process.on('message', async (message) => {
                             }
                         });
                     }
-                    sendLog(`[API] Команда "${commandInstance.name}" от плагина "${commandInstance.owner}" зарегистрирована в процессе.`);
+                    sendLog(`[API] Команда \"${commandInstance.name}\" от плагина \"${commandInstance.owner}\" зарегистрирована в процессе.`);
                 },
                 performUserAction: (username, action, data = {}) => {
                     return new Promise((resolve, reject) => {
@@ -283,6 +306,26 @@ process.on('message', async (message) => {
             sendLog(`[CRITICAL] Критическая ошибка при создании бота: ${err.stack}`);
             process.exit(1);
         }
+    } else if (message.type === 'config:reload') {
+        sendLog('[System] Received config:reload command. Reloading configuration...');
+        try {
+            const newConfig = await fetchNewConfig(bot.config.id);
+            if (newConfig) {
+                bot.config = { ...bot.config, ...newConfig };
+
+                const newCommands = await loadCommands();
+                const newPlugins = bot.config.plugins;
+
+                bot.commands = newCommands;
+                await initializePlugins(bot, newPlugins, true);
+
+                sendLog('[System] Bot configuration and plugins reloaded successfully.');
+            } else {
+                sendLog('[System] Failed to fetch new configuration.');
+            }
+        } catch (error) {
+            sendLog(`[System] Error reloading configuration: ${error.message}`);
+        }
     } else if (message.type === 'stop') {
         if (bot) bot.quit();
         else process.exit(0);
@@ -340,4 +383,4 @@ process.on('unhandledRejection', (reason, promise) => {
     sendLog(errorMsg);
     console.error(errorMsg, promise);
     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/backend/src/server.js

@@ -12,6 +12,7 @@ const serverRoutes = require('./api/routes/servers');
 const permissionsRoutes = require('./api/routes/permissions');
 const taskRoutes = require('./api/routes/tasks');
 const authRoutes = require('./api/routes/auth');
+const searchRoutes = require('./api/routes/search');
 const BotManager = require('./core/BotManager');
 const TaskScheduler = require('./core/TaskScheduler');
 const panelRoutes = require('./api/routes/panel');
@@ -51,6 +52,7 @@ app.use('/api/bots', botRoutes);
 app.use('/api/plugins', pluginRoutes);
 app.use('/api/servers', serverRoutes);
 app.use('/api/permissions', permissionsRoutes);
+app.use('/api/search', searchRoutes);
 app.use('/api/panel', panelRoutes);
 
 app.use(express.static(frontendPath));