blockmine 1.5.5 → 1.5.9

package/backend/src/core/BotProcess.js

@@ -160,6 +160,7 @@ process.on('message', async (message) => {
                 version: config.server.version,
                 auth: 'offline',
                 hideErrors: false,
+                chat: 'enabled',
             };
 
             if (config.proxyHost && config.proxyPort) {
@@ -484,6 +485,10 @@ process.on('message', async (message) => {
                 }
             });
 
+            bot.on('death', () => {
+                sendEvent('botDied', { user: { username: bot.username } });
+            });
+
             bot.on('kicked', (reason) => {
                 let reasonText;
                 try { reasonText = JSON.parse(reason).text || reason; } catch (e) { reasonText = reason; }

package/backend/src/core/EventGraphManager.js

@@ -149,6 +149,9 @@ class EventGraphManager {
             case 'playerLeft':
                 context.user = args.user;
                 break;
+            case 'botDied':
+                context.user = args.user;
+                break;
             case 'tick':
                 break;
             case 'entitySpawn':

package/backend/src/core/GraphExecutionEngine.js

@@ -536,18 +536,27 @@ class GraphExecutionEngine {
           }
 
           case 'string:contains': {
-              const haystack = String(await this.resolvePinValue(node, 'haystack', ''));
-              const needle = String(await this.resolvePinValue(node, 'needle', ''));
-              const caseSensitive = await this.resolvePinValue(node, 'case_sensitive', true);
-              result = caseSensitive ? haystack.includes(needle) : haystack.toLowerCase().includes(needle.toLowerCase());
+              if (pinId === 'result') {
+                  const haystack = String(await this.resolvePinValue(node, 'haystack', ''));
+                  const needle = String(await this.resolvePinValue(node, 'needle', ''));
+                  const caseSensitive = await this.resolvePinValue(node, 'case_sensitive', false);
+
+                  if (caseSensitive) {
+                      return haystack.includes(needle);
+                  } else {
+                      return haystack.toLowerCase().includes(needle.toLowerCase());
+                  }
+              }
               break;
           }
           case 'string:matches': {
-              const str = String(await this.resolvePinValue(node, 'input', ''));
-              const regexStr = String(await this.resolvePinValue(node, 'regex', ''));
-              try {
-                  result = new RegExp(regexStr).test(str);
-              } catch (e) { result = false; }
+              if (pinId === 'result') {
+                  const str = String(await this.resolvePinValue(node, 'string', ''));
+                  const regexStr = String(await this.resolvePinValue(node, 'regex', ''));
+                  try {
+                      result = new RegExp(regexStr).test(str);
+                  } catch (e) { result = false; }
+              }
               break;
           }
           case 'data:string_literal':

package/backend/src/core/NodeRegistry.js

@@ -876,6 +876,20 @@ class NodeRegistry {
       }
     });
 
+    this.registerNodeType({
+      type: 'event:botDied',
+      label: '💀 Бот умер',
+      category: 'События',
+      description: 'Срабатывает, когда бот умирает.',
+      graphType: event,
+      pins: {
+        inputs: [],
+        outputs: [
+          { id: 'exec', name: 'Выполнить', type: 'Exec' },
+        ]
+      }
+    });
+
     console.log(`NodeRegistry: Registered ${this.nodes.size} base nodes`);
   }
 

package/backend/src/core/PluginManager.js

@@ -209,10 +209,14 @@ class PluginManager {
              throw new Error('Ошибка при удалении данных плагина из БД. Файлы не были удалены.');
         }
 
-        if (plugin.sourceType === 'GITHUB' || plugin.sourceType === 'IMPORTED') {
+        if (plugin.path && plugin.path.startsWith(PLUGINS_BASE_DIR)) {
             try {
-                await fse.remove(plugin.path);
-                console.log(`[PluginManager] Папка плагина ${plugin.path} успешно удалена.`);
+                if (await fse.pathExists(plugin.path)) {
+                    await fse.remove(plugin.path);
+                    console.log(`[PluginManager] Папка плагина ${plugin.path} успешно удалена.`);
+                } else {
+                    console.log(`[PluginManager] Папка плагина ${plugin.path} не найдена, удаление не требуется.`);
+                }
             } catch (fileError) {
                 console.error(`Не удалось удалить папку плагина ${plugin.path}:`, fileError);
             }

package/backend/src/core/TaskScheduler.js

@@ -1,9 +1,7 @@
 const cron = require('node-cron');
-const { PrismaClient } = require('@prisma/client');
+const prisma = require('../lib/prisma');
 const BotManager = require('./BotManager');
 
-const prisma = new PrismaClient();
-
 class TaskScheduler {
     constructor() {
         this.scheduledJobs = new Map();
@@ -112,6 +110,13 @@ class TaskScheduler {
             this.scheduleTask(updatedTask);
         }
     }
+
+    shutdown() {
+        console.log('[TaskScheduler] Остановка всех запланированных задач...');
+        this.scheduledJobs.forEach(job => job.stop());
+        this.scheduledJobs.clear();
+        console.log('[TaskScheduler] Все задачи остановлены.');
+    }
 }
 
 module.exports = new TaskScheduler();

package/backend/src/lib/prisma.js

@@ -0,0 +1,5 @@
+const { PrismaClient } = require('@prisma/client');
+
+const prisma = new PrismaClient();
+
+module.exports = prisma; 

package/backend/src/real-time/socketHandler.js

@@ -5,27 +5,25 @@ let io;
 
 function initializeSocket(httpServer) {
     const corsOptions = {
-        methods: ["GET", "POST"]
+        origin: true,
+        methods: ["GET", "POST"],
+        credentials: true
     };
 
-    if (config.server.allowExternalAccess) {
-        corsOptions.origin = "*";
-    } else {
-        corsOptions.origin = "http://localhost:5173";
-    }
-
     io = new Server(httpServer, {
-        cors: corsOptions
+        cors: corsOptions,
+        transports: ['websocket', 'polling']
     });
 
     io.on('connection', (socket) => {
-        console.log('Socket.IO: Пользователь подключен -', socket.id);
+        // console.log(`[Socket.IO] Пользователь подключен: ${socket.id}. Всего клиентов: ${io.engine.clientsCount}`);
+        
         socket.on('disconnect', () => {
-            console.log('Socket.IO: Пользователь отключен -', socket.id);
+            // console.log(`[Socket.IO] Пользователь отключен: ${socket.id}. Всего клиентов: ${io.engine.clientsCount}`);
         });
     });
     
-    console.log('Socket.IO инициализирован с CORS для:', corsOptions.origin);
+    // console.log('Socket.IO инициализирован с динамическим CORS.');
     return io;
 }
 

package/backend/src/server.js

@@ -3,25 +3,23 @@ const http = require('http');
 const path = require('path');
 const fs = require('fs');
 const os = require('os');
+const prisma = require('./lib/prisma');
 
-const config = require('./config'); 
+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');
 const permissionsRoutes = require('./api/routes/permissions');
 const taskRoutes = require('./api/routes/tasks');
-const authRoutes = require('./api/routes/auth');
+const { router: authRoutes, ALL_PERMISSIONS } = require('./api/routes/auth');
 const searchRoutes = require('./api/routes/search');
 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);
 
@@ -59,6 +57,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));
@@ -76,7 +75,43 @@ app.get(/^(?!\/api).*/, (req, res) => {
     }
 });
 
+async function runStartupMigrations() {
+    try {
+        const adminRole = await prisma.panelRole.findUnique({ where: { name: 'Admin' } });
+        if (adminRole) {
+            const permissions = JSON.parse(adminRole.permissions);
+            if (permissions.includes('*')) {
+                const newPermissions = ALL_PERMISSIONS
+                    .map(p => p.id)
+                    .filter(id => id !== '*' && id !== 'plugin:develop');
+                
+                await prisma.panelRole.update({
+                    where: { id: adminRole.id },
+                    data: { permissions: JSON.stringify(newPermissions) }
+                });
+            }
+        }
+
+        const rootUser = await prisma.panelUser.findUnique({ where: { id: 1 }, include: { role: true } });
+        if (rootUser && rootUser.role) {
+            const allPermissions = ALL_PERMISSIONS.map(p => p.id).filter(id => id !== '*');
+            const currentPermissions = JSON.parse(rootUser.role.permissions);
+
+            if (JSON.stringify(allPermissions.sort()) !== JSON.stringify(currentPermissions.sort())) {
+                 await prisma.panelRole.update({
+                    where: { id: rootUser.role.id },
+                    data: { permissions: JSON.stringify(allPermissions) }
+                });
+                console.log(`[Migration] Права для root-пользователя "${rootUser.username}" (ID: 1) были синхронизированы.`);
+            }
+        }
+    } catch (error) {
+        console.error('[Migration] Ошибка во время миграции прав:', error);
+    }
+}
+
 async function startServer() {
+    await runStartupMigrations();
     return new Promise((resolve) => {
         server.listen(PORT, HOST, async () => {
             console.log(`\nBackend сервер успешно запущен на http://${HOST}:${PORT}`);
@@ -106,26 +141,35 @@ async function startServer() {
     });
 }
 
-const gracefulShutdown = (signal) => {
-    console.log(`[Shutdown] Получен сигнал ${signal}. Начинаем завершение...`);
-    
+
+const gracefulShutdown = async (signal) => {
+    console.log(`[Shutdown] Получен сигнал ${signal}. Начинаем корректное завершение...`);
+
+    TaskScheduler.shutdown();
+
     const botIds = Array.from(botManager.bots.keys());
     if (botIds.length > 0) {
         console.log(`[Shutdown] Остановка ${botIds.length} активных ботов...`);
-        for (const botId of botIds) {
-            botManager.stopBot(botId);
-        }
+        await Promise.all(botIds.map(botId => botManager.stopBot(botId)));
+        console.log('[Shutdown] Все боты остановлены.');
     }
 
-    server.close(() => {
-        console.log('[Shutdown] HTTP сервер закрыт. Завершение процесса.');
-        process.exit(0);
-    });
+    const io = require('./real-time/socketHandler').getIO();
+    if (io) {
+        io.close(async () => {
+            console.log('[Shutdown] WebSocket сервер закрыт.');
+            
+            await new Promise(resolve => server.close(resolve));
+            console.log('[Shutdown] HTTP сервер закрыт.');
 
-    setTimeout(() => {
-        console.error('[Shutdown] Не удалось закрыть соединения вовремя, принудительное завершение.');
-        process.exit(1);
-    }, 5000);
+            const prisma = require('./lib/prisma');
+            await prisma.$disconnect();
+            console.log('[Shutdown] Соединение с БД закрыто.');
+
+            console.log('[Shutdown] Корректное завершение выполнено.');
+            process.exit(0);
+        });
+    }
 };
 
 process.on('SIGUSR2', () => gracefulShutdown('SIGUSR2 (nodemon)'));