blockmine 1.0.1 → 1.0.7

package/backend/cli.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 const fs = require('fs');
 const path = require('path');
 const { execSync } = require('child_process');

package/backend/package.json

@@ -14,6 +14,19 @@
   "keywords": [],
   "author": "",
   "license": "ISC",
+  "dependencies": {
+    "@prisma/client": "^5.14.0",
+    "adm-zip": "^0.5.16",
+    "archiver": "^7.0.1",
+    "express": "^4.19.2",
+    "mineflayer": "^4.20.1",
+    "multer": "^2.0.1",
+    "pidusage": "^3.0.2",
+    "prisma": "^5.14.0",
+    "semver": "^7.6.2",
+    "socket.io": "^4.7.5",
+    "socks": "^2.8.5"
+  },
   "devDependencies": {
     "nodemon": "^3.1.2",
     "prisma": "^5.14.0"

package/backend/src/core/PluginManager.js

@@ -1,16 +1,15 @@
 
-const { simpleGit } = require('simple-git');
 const path = require('path');
 const fs = require('fs/promises');
 const { PrismaClient } = require('@prisma/client');
-const prisma = new PrismaClient();
+const AdmZip = require('adm-zip');
 const semver = require('semver');
 
+const prisma = new PrismaClient();
 const PLUGINS_BASE_DIR = path.resolve(__dirname, '../../storage/plugins');
 
 class PluginManager {
     constructor() {
-        this.git = simpleGit();
         this.ensureBaseDirExists();
     }
 
@@ -25,34 +24,61 @@ class PluginManager {
     async installFromGithub(botId, repoUrl, prismaClient = prisma) {
         const botPluginsDir = path.join(PLUGINS_BASE_DIR, `bot_${botId}`);
         await fs.mkdir(botPluginsDir, { recursive: true });
-        const repoName = path.basename(repoUrl, '.git');
-        const localPath = path.join(botPluginsDir, repoName);
-        
+
         const existing = await prismaClient.installedPlugin.findFirst({ where: { botId, sourceUri: repoUrl } });
         if (existing) throw new Error(`Плагин из ${repoUrl} уже установлен.`);
 
         try {
-            await this.git.clone(repoUrl, localPath);
-            const git = simpleGit(localPath);
-            const response = await fetch("https://raw.githubusercontent.com/blockmineJS/official-plugins-list/main/index.json");
-            const catalog = await response.json();
-            const catalogInfo = catalog.find(p => p.repoUrl === repoUrl);
-            if (catalogInfo && catalogInfo.latestTag) {
-                await git.fetch(['--tags', '--force']);
-                await git.checkout(catalogInfo.latestTag, ['-f']);
+            const url = new URL(repoUrl);
+            const repoPath = url.pathname.replace(/^\/|\.git$/g, '');
+            const archiveUrlMain = `https://github.com/${repoPath}/archive/refs/heads/main.zip`;
+            const archiveUrlMaster = `https://github.com/${repoPath}/archive/refs/heads/master.zip`;
+
+            let response = await fetch(archiveUrlMain);
+            if (!response.ok) {
+                console.log(`[PluginManager] Ветка 'main' не найдена для ${repoUrl}, пробую 'master'...`);
+                response = await fetch(archiveUrlMaster);
+                if (!response.ok) {
+                    throw new Error(`Не удалось скачать архив плагина. Статус: ${response.status}`);
+                }
+            }
+            const buffer = await response.arrayBuffer();
+
+            const zip = new AdmZip(Buffer.from(buffer));
+            const zipEntries = zip.getEntries();
+            if (zipEntries.length === 0) {
+                throw new Error('Скачанный архив плагина пуст.');
             }
+            const rootFolderName = zipEntries[0].entryName.split('/')[0];
+            const repoName = path.basename(repoPath);
+            const localPath = path.join(botPluginsDir, repoName);
+            
+            zip.extractAllTo(botPluginsDir, true);
+            
+            await fs.rename(path.join(botPluginsDir, rootFolderName), localPath);
+
             return await this.registerPlugin(botId, localPath, 'GITHUB', repoUrl, prismaClient);
+
         } catch (error) {
-            await fs.rm(localPath, { recursive: true, force: true }).catch(() => {});
+            console.error(`[PluginManager] Ошибка установки с GitHub: ${error.message}`);
+            if (error.message.includes('fetch')) {
+                 throw new Error(`Не удалось подключиться к GitHub или репозиторий не найден. Проверьте ссылку и ваше интернет-соединение.`);
+            }
             throw error;
         }
     }
 
     async registerPlugin(botId, directoryPath, sourceType, sourceUri, prismaClient = prisma) {
         const packageJsonPath = path.join(directoryPath, 'package.json');
-        const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf-8'));
+        let packageJson;
+        try {
+            packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf-8'));
+        } catch (e) {
+            throw new Error(`Не удалось прочитать или распарсить package.json в плагине по пути: ${directoryPath}`);
+        }
+        
         if (!packageJson.name || !packageJson.version) {
-            throw new Error('package.json не содержит name и version');
+            throw new Error('package.json не содержит обязательных полей name и version');
         }
         
         const pluginData = {
@@ -77,6 +103,8 @@ class PluginManager {
             const mainFile = manifest.main || 'index.js';
             const entryPointPath = path.join(plugin.path, mainFile);
             
+            await fs.access(entryPointPath);
+            
             const pluginModule = require(entryPointPath);
 
             if (pluginModule && typeof pluginModule.onUnload === 'function') {
@@ -89,7 +117,9 @@ class PluginManager {
         }
 
         if (plugin.sourceType === 'GITHUB' || plugin.sourceType === 'IMPORTED') {
-            await fs.rm(plugin.path, { recursive: true, force: true });
+            await fs.rm(plugin.path, { recursive: true, force: true }).catch(err => {
+                console.error(`Не удалось удалить папку плагина ${plugin.path}:`, err);
+            });
         }
         await prisma.installedPlugin.delete({ where: { id: pluginId } });
     }
@@ -106,8 +136,8 @@ class PluginManager {
                 const catalogInfo = catalogMap.get(plugin.sourceUri);
                 if (!catalogInfo || !catalogInfo.latestTag) continue;
                 
-                const localVersion = plugin.version;
-                const recommendedVersion = semver.clean(catalogInfo.latestTag);
+                const localVersion = semver.coerce(plugin.version)?.version || plugin.version;
+                const recommendedVersion = semver.coerce(catalogInfo.latestTag)?.version || catalogInfo.latestTag;
 
                 if (semver.gt(recommendedVersion, localVersion)) {
                     updatesAvailable.push({
@@ -131,30 +161,15 @@ class PluginManager {
             throw new Error('Плагин не найден или не является GitHub-плагином.');
         }
 
-        const pluginDirectory = plugin.path;
-        try {
-            const git = simpleGit(pluginDirectory);
-            const response = await fetch("https://raw.githubusercontent.com/blockmineJS/official-plugins-list/main/index.json");
-            const catalog = await response.json();
-            const catalogInfo = catalog.find(p => p.repoUrl === plugin.sourceUri);
-
-            if (!catalogInfo || !catalogInfo.latestTag) {
-                throw new Error('Не найдена информация о проверенной версии в каталоге.');
-            }
-            const recommendedTag = catalogInfo.latestTag;
-            await git.fetch(['--tags', '--force']);
-            await git.checkout(recommendedTag, ['-f']);
-            
-            console.log(`[PluginManager] Плагин ${plugin.name} успешно обновлен до версии ${recommendedTag}.`);
-            
-            await prisma.installedPlugin.delete({ where: { id: plugin.id } });
-            return await this.registerPlugin(plugin.botId, pluginDirectory, 'GITHUB', plugin.sourceUri);
-
-        } catch (error) {
-            console.error(`[PluginManager] Ошибка обновления плагина ${plugin.name}:`, error.message);
-            try { await simpleGit(pluginDirectory).checkout('main', ['-f']); } catch(e) { }
-            throw new Error(`Не удалось обновить плагин: ${error.message}`);
-        }
+        console.log(`[PluginManager] Начало обновления плагина ${plugin.name}...`);
+        
+        const repoUrl = plugin.sourceUri;
+        const botId = plugin.botId;
+        
+        await this.deletePlugin(pluginId);
+        console.log(`[PluginManager] Старая версия ${plugin.name} удалена, устанавливаем новую...`);
+        
+        return await this.installFromGithub(botId, repoUrl);
     }
 }
 

package/backend/src/server.js

@@ -1,3 +1,4 @@
+
 const express = require('express');
 const http = require('http');
 const path = require('path');
@@ -8,7 +9,6 @@ const pluginRoutes = require('./api/routes/plugins');
 const serverRoutes = require('./api/routes/servers');
 const permissionsRoutes = require('./api/routes/permissions');
 
-
 const app = express();
 const server = http.createServer(app);
 
@@ -18,10 +18,12 @@ const PORT = process.env.PORT || 3001;
 
 app.use(express.json());
 
+const frontendPath = path.join(__dirname, '..', '..', 'frontend', 'dist');
+const rootPath = path.join(__dirname, '..', '..');
 
 app.get('/api/version', async (req, res) => {
     try {
-        const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
+        const packageJsonPath = path.join(rootPath, 'package.json');
         const packageJsonData = await fs.readFile(packageJsonPath, 'utf-8');
         const { version } = JSON.parse(packageJsonData);
         res.json({ version });
@@ -37,13 +39,13 @@ app.use('/api/servers', serverRoutes);
 app.use('/api/permissions', permissionsRoutes);
 
 
-const frontendPath = path.join(__dirname, '..', '..', 'frontend', 'dist');
 app.use(express.static(frontendPath));
 
 app.get(/^(?!\/api).*/, (req, res) => {
     res.sendFile(path.join(frontendPath, 'index.html'), (err) => {
         if (err) {
-            res.status(500).send(err);
+            console.error(`Ошибка при отправке index.html:`, err);
+            res.status(500).send("Не удалось загрузить приложение.");
         }
     });
 });