blockmine 1.4.6 → 1.4.7

package/backend/package.json

@@ -14,8 +14,7 @@
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "dependencies": {},
   "devDependencies": {
     "nodemon": "^3.1.2"
   }
-}
+}

package/backend/src/api/routes/bots.js

@@ -518,13 +518,36 @@ router.get('/:botId/management-data', authorize('management:view'), async (req,
             };
         })
 
-        const [groups, users, allPermissions] = await Promise.all([
+        const page = parseInt(req.query.page) || 1;
+        const pageSize = parseInt(req.query.pageSize) || 100;
+
+        const userSkip = (page - 1) * pageSize;
+
+        const [groups, users, allPermissions, usersCount] = await Promise.all([
             prisma.group.findMany({ where: { botId }, include: { permissions: { include: { permission: true } } }, orderBy: { name: 'asc' } }),
-            prisma.user.findMany({ where: { botId }, include: { groups: { include: { group: true } } }, orderBy: { username: 'asc' } }),
-            prisma.permission.findMany({ where: { botId }, orderBy: { name: 'asc' } })
+            prisma.user.findMany({
+                where: { botId },
+                include: { groups: { include: { group: true } } },
+                orderBy: { username: 'asc' },
+                take: pageSize,
+                skip: userSkip,
+            }),
+            prisma.permission.findMany({ where: { botId }, orderBy: { name: 'asc' } }),
+            prisma.user.count({ where: { botId } })
         ]);
 
-        res.json({ groups, permissions: allPermissions, users, commands: finalCommands });
+        res.json({
+            groups,
+            permissions: allPermissions,
+            users: {
+                items: users,
+                total: usersCount,
+                page,
+                pageSize,
+                totalPages: Math.ceil(usersCount / pageSize),
+            },
+            commands: finalCommands
+        });
         
     } catch (error) {
         console.error(`[API Error] /management-data for bot ${req.params.botId}:`, error);
@@ -558,7 +581,7 @@ router.put('/:botId/commands/:commandId', authorize('management:edit'), async (r
             data: dataToUpdate,
         });
 
-        BotManager.invalidateConfigCache(botId);
+        BotManager.reloadBotConfigInRealTime(botId);
 
         res.json(updatedCommand);
     } catch (error) {
@@ -582,7 +605,7 @@ router.post('/:botId/groups', authorize('management:edit'), async (req, res) =>
             }
         });
 
-        BotManager.invalidateConfigCache(botId);
+        BotManager.reloadBotConfigInRealTime(botId);
 
 
         res.status(201).json(newGroup);
@@ -618,7 +641,7 @@ router.put('/:botId/groups/:groupId', authorize('management:edit'), async (req,
             BotManager.invalidateUserCache(botId, user.username);
         }
 
-        BotManager.invalidateConfigCache(botId);
+        BotManager.reloadBotConfigInRealTime(botId);
 
         res.status(200).send();
     } catch (error) {
@@ -636,7 +659,7 @@ router.delete('/:botId/groups/:groupId', authorize('management:edit'), async (re
             return res.status(403).json({ error: `Нельзя удалить группу с источником "${group.owner}".` });
         }
         await prisma.group.delete({ where: { id: groupId } });
-        BotManager.invalidateConfigCache(botId);
+        BotManager.reloadBotConfigInRealTime(botId);
 
 
         res.status(204).send();
@@ -652,7 +675,7 @@ router.post('/:botId/permissions', authorize('management:edit'), async (req, res
             data: { name, description, botId, owner: 'admin' }
         });
 
-        BotManager.invalidateConfigCache(botId);
+        BotManager.reloadBotConfigInRealTime(botId);
         
         res.status(201).json(newPermission);
     } catch (error) {

package/backend/src/api/routes/search.js

@@ -0,0 +1,55 @@
+const express = require('express');
+const router = express.Router();
+const { PrismaClient } = require('@prisma/client');
+const prisma = new PrismaClient();
+
+router.get('/', async (req, res) => {
+  const { query } = req.query;
+
+  if (!query) {
+    return res.status(400).json({ error: 'Query parameter is required' });
+  }
+
+  try {
+    const bots = await prisma.bot.findMany({
+      where: {
+        OR: [
+          { username: { contains: query } },
+          { 
+            AND: [
+              { note: { not: null } },
+              { note: { contains: query } }
+            ]
+          },
+        ],
+      },
+    });
+
+    const users = await prisma.user.findMany({
+      where: {
+        username: {
+          contains: query,
+        },
+      },
+    });
+
+    const plugins = await prisma.installedPlugin.findMany({
+      where: {
+        name: {
+          contains: query,
+        },
+      },
+    });
+
+    res.json({
+      bots,
+      users,
+      plugins,
+    });
+  } catch (error) {
+    console.error('Search error:', error);
+    res.status(500).json({ error: 'Internal server error' });
+  }
+});
+
+module.exports = router;

package/backend/src/core/BotManager.js

@@ -96,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) {
@@ -560,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/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));