blockmine 1.22.0 → 1.23.1

package/backend/package.json

@@ -27,13 +27,21 @@
     "ts-jest": "^29.4.5"
   },
   "dependencies": {
+    "@octokit/rest": "^22.0.1",
     "awilix": "^12.0.5",
     "date-fns": "^4.1.0",
+    "diff": "^8.0.2",
     "express-rate-limit": "^8.2.1",
     "express-validator": "^7.2.1",
+    "google-ai-kit": "^1.1.3",
     "lru-cache": "^10.4.3",
+    "mineflayer": "^4.33.0",
+    "mineflayer-pathfinder": "^2.4.5",
+    "openrouter-kit": "^0.1.81",
     "pino": "^9.7.0",
     "pino-pretty": "^13.0.0",
+    "prismarine-viewer": "^1.33.0",
+    "vec3": "^0.1.10",
     "zod": "^4.1.12"
   }
 }

package/backend/prisma/migrations/20251116111851_add_execution_trace/migration.sql

@@ -0,0 +1,22 @@
+-- CreateTable
+CREATE TABLE "execution_traces" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "graphId" INTEGER NOT NULL,
+    "botId" INTEGER NOT NULL,
+    "eventType" TEXT NOT NULL,
+    "eventArgs" TEXT NOT NULL,
+    "startTime" DATETIME NOT NULL,
+    "endTime" DATETIME,
+    "status" TEXT NOT NULL,
+    "error" TEXT,
+    "steps" TEXT NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT "execution_traces_botId_fkey" FOREIGN KEY ("botId") REFERENCES "Bot" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT "execution_traces_graphId_fkey" FOREIGN KEY ("graphId") REFERENCES "EventGraph" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE INDEX "execution_traces_botId_graphId_idx" ON "execution_traces"("botId", "graphId");
+
+-- CreateIndex
+CREATE INDEX "execution_traces_createdAt_idx" ON "execution_traces"("createdAt");

package/backend/prisma/migrations/20251120154914_add_panel_api_keys/migration.sql

@@ -0,0 +1,21 @@
+-- CreateTable
+CREATE TABLE "PanelApiKey" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "userId" INTEGER NOT NULL,
+    "name" TEXT NOT NULL,
+    "keyHash" TEXT NOT NULL,
+    "prefix" TEXT NOT NULL,
+    "customScopes" TEXT,
+    "lastUsedAt" DATETIME,
+    "expiresAt" DATETIME,
+    "isActive" BOOLEAN NOT NULL DEFAULT true,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "PanelApiKey_userId_fkey" FOREIGN KEY ("userId") REFERENCES "PanelUser" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE INDEX "PanelApiKey_userId_idx" ON "PanelApiKey"("userId");
+
+-- CreateIndex
+CREATE INDEX "PanelApiKey_keyHash_idx" ON "PanelApiKey"("keyHash");

package/backend/prisma/migrations/20251121110241_add_proxy_table/migration.sql

@@ -0,0 +1,45 @@
+-- CreateTable
+CREATE TABLE "Proxy" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "name" TEXT NOT NULL,
+    "type" TEXT NOT NULL DEFAULT 'socks5',
+    "host" TEXT NOT NULL,
+    "port" INTEGER NOT NULL,
+    "username" TEXT,
+    "password" TEXT,
+    "note" TEXT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL
+);
+
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_Bot" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "username" TEXT NOT NULL,
+    "password" TEXT,
+    "prefix" TEXT DEFAULT '@',
+    "note" TEXT,
+    "owners" TEXT DEFAULT '',
+    "sortOrder" INTEGER,
+    "serverId" INTEGER NOT NULL,
+    "proxyId" INTEGER,
+    "proxyHost" TEXT,
+    "proxyPort" INTEGER,
+    "proxyUsername" TEXT,
+    "proxyPassword" TEXT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "Bot_serverId_fkey" FOREIGN KEY ("serverId") REFERENCES "Server" ("id") ON DELETE RESTRICT ON UPDATE CASCADE,
+    CONSTRAINT "Bot_proxyId_fkey" FOREIGN KEY ("proxyId") REFERENCES "Proxy" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+INSERT INTO "new_Bot" ("createdAt", "id", "note", "owners", "password", "prefix", "proxyHost", "proxyPassword", "proxyPort", "proxyUsername", "serverId", "sortOrder", "updatedAt", "username") SELECT "createdAt", "id", "note", "owners", "password", "prefix", "proxyHost", "proxyPassword", "proxyPort", "proxyUsername", "serverId", "sortOrder", "updatedAt", "username" FROM "Bot";
+DROP TABLE "Bot";
+ALTER TABLE "new_Bot" RENAME TO "Bot";
+CREATE UNIQUE INDEX "Bot_username_key" ON "Bot"("username");
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Proxy_name_key" ON "Proxy"("name");

package/backend/prisma/schema.prisma

@@ -16,6 +16,22 @@ model Server {
   bots    Bot[]
 }
 
+model Proxy {
+  id       Int    @id @default(autoincrement())
+  name     String @unique
+  type     String @default("socks5") // "socks5" or "http"
+  host     String
+  port     Int
+  username String?
+  password String?
+  note     String?
+
+  bots     Bot[]
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+}
+
 model Bot {
   id       Int    @id @default(autoincrement())
   username String @unique
@@ -28,6 +44,9 @@ model Bot {
   server   Server @relation(fields: [serverId], references: [id])
   serverId Int
 
+  proxy    Proxy? @relation(fields: [proxyId], references: [id])
+  proxyId  Int?
+
   proxyHost     String?
   proxyPort     Int?
   proxyUsername String?
@@ -44,6 +63,7 @@ model Bot {
   panelUserAccess  PanelUserBotAccess[]
   apiKeys          BotApiKey[]
   apiConnectionLogs ApiConnectionLog[]
+  executionTraces  ExecutionTrace[]
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
@@ -107,6 +127,7 @@ model EventGraph {
   variables   String? @default("[]")
 
   triggers    EventTrigger[]
+  executionTraces ExecutionTrace[]
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
@@ -201,7 +222,7 @@ model PanelUser {
   id           Int      @id @default(autoincrement())
   uuid         String   @unique @default(uuid())
   username     String   @unique
-  passwordHash String  
+  passwordHash String
   role         PanelRole @relation(fields: [roleId], references: [id])
   roleId       Int
   createdAt    DateTime @default(now())
@@ -209,6 +230,7 @@ model PanelUser {
   allBots      Boolean  @default(true)
 
   botAccess    PanelUserBotAccess[]
+  apiKeys      PanelApiKey[]
 }
 
 // Роли пользователей (Admin, Moderator, Viewer)
@@ -231,6 +253,31 @@ model PanelUserBotAccess {
   @@id([userId, botId])
 }
 
+// API ключи для панели (для доступа к REST API и управления ботами)
+model PanelApiKey {
+  id          Int       @id @default(autoincrement())
+  userId      Int
+  user        PanelUser @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  name        String    // "My Production Key", "Development Key"
+  keyHash     String    // bcrypt hash полного ключа
+  prefix      String    // "pk_abc123" для отображения в UI (первые 10 символов)
+
+  // Если NULL - наследует все права пользователя
+  // Если задано - ограниченный набор прав (JSON массив)
+  customScopes String?
+
+  lastUsedAt  DateTime?
+  expiresAt   DateTime? // Опционально: срок действия ключа
+  isActive    Boolean   @default(true)
+
+  createdAt   DateTime  @default(now())
+  updatedAt   DateTime  @updatedAt
+
+  @@index([userId])
+  @@index([keyHash])
+}
+
 model PluginDataStore {
   id         Int      @id @default(autoincrement())
   pluginName String
@@ -275,3 +322,25 @@ model ApiConnectionLog {
 
   @@index([botId, createdAt])
 }
+
+model ExecutionTrace {
+  id          String   @id @default(uuid())
+  graphId     Int
+  botId       Int
+  eventType   String
+  eventArgs   String   // JSON
+  startTime   DateTime
+  endTime     DateTime?
+  status      String   // running, completed, error
+  error       String?
+  steps       String   // JSON array of ExecutionStep
+
+  bot         Bot      @relation(fields: [botId], references: [id], onDelete: Cascade)
+  graph       EventGraph @relation(fields: [graphId], references: [id], onDelete: Cascade)
+
+  createdAt   DateTime @default(now())
+
+  @@index([botId, graphId])
+  @@index([createdAt])
+  @@map("execution_traces")
+}

package/backend/src/__tests__/services/BotLifecycleService.test.js

@@ -10,11 +10,16 @@ jest.mock('../../core/utils/crypto', () => ({
 }));
 
 // Mock Socket.IO
+const mockIO = {
+    emit: jest.fn(),
+    to: jest.fn().mockReturnValue({ emit: jest.fn() })
+};
+
 jest.mock('../../real-time/socketHandler', () => ({
-    getIO: jest.fn().mockReturnValue({
-        emit: jest.fn(),
-        to: jest.fn().mockReturnValue({ emit: jest.fn() })
-    })
+    getIO: jest.fn(() => mockIO),
+    getIOSafe: jest.fn(() => mockIO),
+    addPluginLogToBuffer: jest.fn(),
+    broadcastToPanelNamespace: jest.fn()
 }));
 
 jest.mock('../../real-time/botApi', () => ({