blockmine 1.2.13 → 1.3.0

package/backend/cli.js

@@ -11,8 +11,6 @@ if (!fs.existsSync(DATA_DIR)) {
 }
 process.env.DATABASE_URL = `file:${path.join(DATA_DIR, 'blockmine.db')}`;
 
-const schemaPath = path.resolve(__dirname, 'prisma', 'schema.prisma');
-
 function runCommand(command) {
     try {
         console.log(`> ${command}`);
@@ -26,19 +24,16 @@ function runCommand(command) {
 async function main() {
     console.log('Запуск панели управления BlockMine...');
 
-    const migrateCommand = `npx prisma migrate deploy --schema="${schemaPath}"`;
-    const seedCommand = `npx prisma db seed --schema="${schemaPath}"`;
-
     const dbPath = path.join(DATA_DIR, 'blockmine.db');
     if (!fs.existsSync(dbPath)) {
         console.log('База данных не найдена. Создаем и применяем все миграции...');
-        runCommand(migrateCommand);
+        runCommand(`npx prisma migrate deploy`);
         console.log('Заполнение базы данных начальными данными (серверами)...');
-        runCommand(seedCommand);
+        runCommand(`npx prisma db seed`);
         console.log('Первоначальная настройка базы данных завершена.');
     } else {
         console.log('Проверка и применение обновлений базы данных...');
-        runCommand(migrateCommand);
+        runCommand(`npx prisma migrate deploy`);
         console.log('База данных в актуальном состоянии.');
     }
 

package/backend/package.json

@@ -14,8 +14,24 @@
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "dependencies": {},
+  "dependencies": {
+    "@prisma/client": "^5.14.0",
+    "adm-zip": "^0.5.16",
+    "archiver": "^7.0.1",
+    "cron-parser": "^5.3.0",
+    "express": "^4.19.2",
+    "fs-extra": "^11.3.0",
+    "mineflayer": "^4.20.1",
+    "multer": "^2.0.1",
+    "node-cron": "^4.1.0",
+    "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"
+    "nodemon": "^3.1.2",
+    "prisma": "^5.14.0"
   }
 }

package/backend/prisma/schema.prisma

@@ -1,6 +1,5 @@
 generator client {
   provider = "prisma-client-js"
-  output   = "./generated/client"
 }
 
 datasource db {

package/backend/prisma/seed.js

@@ -1,12 +1,37 @@
-const { PrismaClient } = require('../prisma/generated/client');
+const { PrismaClient } = require('@prisma/client');
 const prisma = new PrismaClient();
 
 const initialServers = [
-    { name: 'Local Test Server', host: '127.0.0.1', port: 25565, version: '1.20.4' },
-    { name: 'MineBlaze', host: 'mc.mineblaze.net', port: 25565, version: '1.20.1' },
-    { name: 'MasedWorld', host: 'mc.masedworld.net', port: 25565, version: '1.20.1' },
-    { name: 'DexLand', host: 'mc.dexland.org', port: 25565, version: '1.20.1' },
-    { name: 'CheatMine', host: 'mc.cheatmine.net', port: 25565, version: '1.20.1' }
+    {
+        name: 'Local Test Server',
+        host: '127.0.0.1',
+        port: 25565,
+        version: '1.20.4'
+    },
+    {
+        name: 'MineBlaze',
+        host: 'mc.mineblaze.net',
+        port: 25565,
+        version: '1.20.1'
+    },
+    {
+        name: 'MasedWorld',
+        host: 'mc.masedworld.net',
+        port: 25565,
+        version: '1.20.1'
+    },
+    {
+        name: 'DexLand',
+        host: 'mc.dexland.org',
+        port: 25565,
+        version: '1.20.1'
+    },
+    {
+        name: 'CheatMine',
+        host: 'mc.cheatmine.net',
+        port: 25565,
+        version: '1.20.1'
+    }
 ];
 
 async function main() {
@@ -25,15 +50,11 @@ async function main() {
     console.log(`${initialServers.length} серверов были успешно созданы или уже существовали.`);
 }
 
-if (require.main === module) {
-    main()
-        .catch((e) => {
-            console.error('Error during seeding:', e);
-            process.exit(1);
-        })
-        .finally(async () => {
-            await prisma.$disconnect();
-        });
-}
-
-module.exports = { main };
+main()
+    .catch((e) => {
+        console.error('Error during seeding:', e);
+        process.exit(1);
+    })
+    .finally(async () => {
+        await prisma.$disconnect();
+    });

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

@@ -1,6 +1,6 @@
 const express = require('express');
 const router = express.Router();
-const { PrismaClient } = require('../../../prisma/generated/client');
+const { PrismaClient } = require('@prisma/client');
 const path = require('path');
 const fs = require('fs/promises');
 const BotManager = require('../../core/BotManager');

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

@@ -1,6 +1,6 @@
 const express = require('express');
 const router = express.Router();
-const { PrismaClient } = require('../../../prisma/generated/client');
+const { PrismaClient } = require('@prisma/client');
 const prisma = new PrismaClient();
 
 

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

@@ -1,6 +1,6 @@
 const express = require('express');
 const router = express.Router();
-const { PrismaClient } = require('../../../prisma/generated/client');
+const { PrismaClient } = require('@prisma/client');
 const prisma = new PrismaClient();
 
 router.get('/', async (req, res) => {

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

@@ -1,6 +1,6 @@
 const express = require('express');
 const router = express.Router();
-const { PrismaClient } = require('../prisma/generated/client');
+const { PrismaClient } = require('@prisma/client');
 const PluginService = require('../../core/PluginService');
 
 const prisma = new PrismaClient();

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

@@ -1,6 +1,6 @@
 const express = require('express');
 const router = express.Router();
-const { PrismaClient } = require('../../../prisma/generated/client');
+const { PrismaClient } = require('@prisma/client');
 const TaskScheduler = require('../../core/TaskScheduler');
 
 const { CronExpressionParser } = require('cron-parser');

package/backend/src/core/BotManager.js

@@ -2,7 +2,7 @@
 const { fork } = require('child_process');
 const path = require('path');
 const { getIO } = require('../real-time/socketHandler');
-const { PrismaClient } = require('../../prisma/generated/client');
+const { PrismaClient } = require('@prisma/client');
 const pidusage = require('pidusage');
 const DependencyService = require('./DependencyService');
 

package/backend/src/core/PermissionManager.js

@@ -1,4 +1,4 @@
-const { PrismaClient } = require('../../prisma/generated/client');
+const { PrismaClient } = require('@prisma/client');
 const prisma = new PrismaClient();
 
 class PermissionManager {

package/backend/src/core/PluginManager.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const fse = require('fs-extra');
 const os = require('os');
-const { PrismaClient } = require('../../prisma/generated/client');
+const { PrismaClient } = require('@prisma/client');
 const AdmZip = require('adm-zip');
 const semver = require('semver');
 
@@ -207,7 +207,7 @@ class PluginManager {
                 console.error(`Не удалось удалить папку плагина ${plugin.path}:`, fileError);
             }
         }
-    }   
+    }
 
     async checkForUpdates(botId, catalog) {
         const githubPlugins = await prisma.installedPlugin.findMany({

package/backend/src/core/PluginService.js

@@ -1,7 +1,7 @@
 
 const fs = require('fs/promises');
 const path = require('path');
-const { PrismaClient } = require('../prisma/generated/client');
+const { PrismaClient } = require('@prisma/client');
 const prisma = new PrismaClient();
 
 class PluginService {

package/backend/src/core/TaskScheduler.js

@@ -1,5 +1,5 @@
 const cron = require('node-cron');
-const { PrismaClient } = require('../../prisma/generated/client');
+const { PrismaClient } = require('@prisma/client');
 const BotManager = require('./BotManager');
 
 const prisma = new PrismaClient();

package/backend/src/core/UserService.js

@@ -1,4 +1,4 @@
-const { PrismaClient } = require('../../prisma/generated/client');
+const { PrismaClient } = require('@prisma/client');
 const prisma = new PrismaClient();
 
 class User {

package/package.json

@@ -1,41 +1,37 @@
+
 {
   "name": "blockmine",
-  "version": "1.2.13",
+  "version": "1.3.0",
   "description": "Мощная панель управления ботами для Майнкрафта.",
   "author": "merka",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/blockmineJS/blockmine.git"
+    "url": "https://github.com/blockmineJS/blockmine.git"
   },
   "bin": {
     "blockmine": "backend/cli.js"
   },
+  "keywords": [
+    "minecraft",
+    "bot",
+    "mineflayer",
+    "dashboard",
+    "panel",
+    "automation"
+  ],
   "workspaces": [
     "backend",
     "frontend"
   ],
   "scripts": {
     "dev": "concurrently \"npm run dev --workspace=backend\" \"npm run dev --workspace=frontend\"",
-    "postinstall": "npm install --workspaces && npx prisma generate --schema=./backend/prisma/schema.prisma",
+    "postinstall": "npm install --workspaces --ignore-scripts && prisma generate --schema=./backend/prisma/schema.prisma",
     "build": "npm run build --workspace=frontend",
-    "prepublishOnly": "npm run build && npx prisma generate --schema=./backend/prisma/schema.prisma"
+    "prepublishOnly": "npm run build && prisma generate --schema=./backend/prisma/schema.prisma"
   },
   "dependencies": {
-    "@prisma/client": "^5.14.0",
-    "adm-zip": "^0.5.16",
-    "archiver": "^7.0.1",
-    "cron-parser": "^5.3.0",
-    "express": "^4.19.2",
-    "fs-extra": "^11.3.0",
-    "mineflayer": "^4.20.1",
-    "multer": "^2.0.1",
-    "node-cron": "^4.1.0",
-    "pidusage": "^3.0.2",
-    "prisma": "^5.14.0",
-    "semver": "^7.6.2",
-    "socket.io": "^4.7.5",
-    "socks": "^2.8.5"
+    "prisma": "^5.14.0"
   },
   "devDependencies": {
     "concurrently": "^8.2.2"