blockmine 1.6.1 → 1.6.3

package/README.md

@@ -131,6 +131,7 @@
 git clone https://github.com/blockmineJS/blockmine.git
 cd blockmine
 npm install
+npm run build
 ```
 
 ### 2. Запуск в режиме разработки

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

@@ -402,6 +402,33 @@ router.post('/:pluginName/fs', resolvePluginPath, async (req, res) => {
                 res.status(200).json({ message: 'Renamed successfully.' });
                 break;
 
+            case 'move':
+                if (!newPath) return res.status(400).json({ error: 'New path is required for move operation.' });
+                const safeMoveNewPath = path.resolve(req.pluginPath, newPath);
+                if (!safeMoveNewPath.startsWith(req.pluginPath)) return res.status(403).json({ error: 'Access denied: New path is outside of plugin directory.' });
+                if (!await fse.pathExists(safePath)) return res.status(404).json({ error: 'Source file or folder not found.' });
+                
+                if (safeMoveNewPath.startsWith(safePath + path.sep)) {
+                    return res.status(400).json({ error: 'Cannot move folder into itself.' });
+                }
+
+                let finalPath = safeMoveNewPath;
+                let counter = 1;
+                while (await fse.pathExists(finalPath)) {
+                    const ext = path.extname(safeMoveNewPath);
+                    const base = path.basename(safeMoveNewPath, ext);
+                    const dir = path.dirname(safeMoveNewPath);
+                    finalPath = path.join(dir, `${base} (${counter})${ext}`);
+                    counter++;
+                }
+                
+                await fse.move(safePath, finalPath);
+                res.status(200).json({ 
+                    message: 'Moved successfully.',
+                    newPath: path.relative(req.pluginPath, finalPath)
+                });
+                break;
+
             default:
                 res.status(400).json({ error: 'Invalid operation specified.' });
         }
@@ -608,18 +635,23 @@ router.post('/:pluginName/create-pr', resolvePluginPath, async (req, res) => {
             
             let branchExists = false;
             try {
-                cp.execSync(`git ls-remote --heads origin ${branch}`, { stdio: 'pipe' });
-                branchExists = true;
-                console.log(`[Plugin IDE] Ветка ${branch} уже существует, переключаемся на неё`);
+                cp.execSync(`git checkout -b ${branch}`, { stdio: 'pipe' });
+                console.log(`[Plugin IDE] Создана новая ветка ${branch}`);
             } catch (e) {
-                console.log(`[Plugin IDE] Ветка ${branch} не существует, создаём новую`);
-            }
-            
-            if (branchExists) {
-                cp.execSync(`git checkout -b ${branch} origin/${branch}`);
-                cp.execSync(`git pull origin ${branch}`);
-            } else {
-                cp.execSync(`git checkout -b ${branch}`);
+                try {
+                    cp.execSync(`git checkout ${branch}`, { stdio: 'pipe' });
+                    console.log(`[Plugin IDE] Переключились на существующую ветку ${branch}`);
+                } catch (e2) {
+                    try {
+                        cp.execSync(`git fetch origin ${branch}`, { stdio: 'pipe' });
+                        cp.execSync(`git checkout -b ${branch} origin/${branch}`, { stdio: 'pipe' });
+                        branchExists = true;
+                        console.log(`[Plugin IDE] Создана ветка ${branch} из удаленной`);
+                    } catch (e3) {
+                        cp.execSync(`git checkout -B ${branch}`, { stdio: 'pipe' });
+                        console.log(`[Plugin IDE] Принудительно создана ветка ${branch}`);
+                    }
+                }
             }
             
             const files = await fse.readdir(req.pluginPath);

package/backend/src/core/BotProcess.js

@@ -420,6 +420,10 @@ process.on('message', async (message) => {
                 messageHandledByCustomParser = false;
                 const rawMessageText = jsonMsg.toString();
                 bot.events.emit('core:raw_message', rawMessageText, jsonMsg);
+                
+                sendEvent('raw_message', {
+                    rawText: rawMessageText
+                });
             });
 
             bot.events.on('chat:message', (data) => {

package/backend/src/core/EventGraphManager.js

@@ -145,6 +145,9 @@ class EventGraphManager {
                 context.message = args.message;
                 context.chat_type = args.chatType;
                 break;
+            case 'raw_message':
+                context.rawText = args.rawText;
+                break;
             case 'playerJoined':
             case 'playerLeft':
                 context.user = args.user;

package/backend/src/core/GraphExecutionEngine.js

@@ -379,7 +379,13 @@ class GraphExecutionEngine {
               else result = this.context[pinId];
               break;
           case 'event:chat':
-              if (pinId === 'user') result = { username: this.context.username };
+              if (pinId === 'username') result = this.context.username;
+              else if (pinId === 'message') result = this.context.message;
+              else if (pinId === 'chatType') result = this.context.chat_type;
+              else result = this.context[pinId];
+              break;
+          case 'event:raw_message':
+              if (pinId === 'rawText') result = this.context.rawText;
               else result = this.context[pinId];
               break;
           case 'event:playerJoined':

package/backend/src/core/NodeRegistry.js

@@ -129,7 +129,23 @@ class NodeRegistry {
                 { id: 'username', type: 'String', name: 'Игрок' },
                 { id: 'message', type: 'String', name: 'Сообщение' },
                 { id: 'chatType', type: 'String', name: 'Тип чата' },
-                { id: 'raw', type: 'String', name: 'Raw JSON' },
+            ]
+        }
+    });
+
+    this.registerNodeType({
+        type: 'event:raw_message',
+        name: 'Событие: Сырое сообщение',
+        label: '📝 Сырое сообщение',
+        description: 'Срабатывает при получении любого сообщения в сыром виде (до парсинга).',
+        category: 'События',
+        graphType: event,
+        isEvent: true,
+        pins: {
+            inputs: [],
+            outputs: [
+                { id: 'exec', type: 'Exec', name: 'Выполнить' },
+                { id: 'rawText', type: 'String', name: 'Сырой текст' },
             ]
         }
     });