blockmine 1.4.7 → 1.5.0

package/backend/package.json

@@ -16,5 +16,10 @@
   "license": "ISC",
   "devDependencies": {
     "nodemon": "^3.1.2"
+  },
+  "dependencies": {
+    "express-validator": "^7.2.1",
+    "pino": "^9.7.0",
+    "pino-pretty": "^13.0.0"
   }
 }

package/backend/prisma/migrations/20250627144030_add_visual_editor_fields/migration.sql

@@ -0,0 +1,26 @@
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_Command" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "botId" INTEGER NOT NULL,
+    "name" TEXT NOT NULL,
+    "isEnabled" BOOLEAN NOT NULL DEFAULT true,
+    "cooldown" INTEGER NOT NULL DEFAULT 0,
+    "aliases" TEXT NOT NULL DEFAULT '[]',
+    "description" TEXT,
+    "owner" TEXT,
+    "permissionId" INTEGER,
+    "allowedChatTypes" TEXT NOT NULL DEFAULT '["chat", "private"]',
+    "isVisual" BOOLEAN NOT NULL DEFAULT false,
+    "argumentsJson" TEXT DEFAULT '[]',
+    "graphJson" TEXT DEFAULT 'null',
+    CONSTRAINT "Command_botId_fkey" FOREIGN KEY ("botId") REFERENCES "Bot" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT "Command_permissionId_fkey" FOREIGN KEY ("permissionId") REFERENCES "Permission" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+INSERT INTO "new_Command" ("aliases", "allowedChatTypes", "botId", "cooldown", "description", "id", "isEnabled", "name", "owner", "permissionId") SELECT "aliases", "allowedChatTypes", "botId", "cooldown", "description", "id", "isEnabled", "name", "owner", "permissionId" FROM "Command";
+DROP TABLE "Command";
+ALTER TABLE "new_Command" RENAME TO "Command";
+CREATE UNIQUE INDEX "Command_botId_name_key" ON "Command"("botId", "name");
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;

package/backend/prisma/migrations/20250628113254_add_event_graphs/migration.sql

@@ -0,0 +1,14 @@
+-- CreateTable
+CREATE TABLE "EventGraph" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "botId" INTEGER NOT NULL,
+    "eventType" TEXT NOT NULL,
+    "isEnabled" BOOLEAN NOT NULL DEFAULT true,
+    "graphJson" TEXT DEFAULT 'null',
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "EventGraph_botId_fkey" FOREIGN KEY ("botId") REFERENCES "Bot" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "EventGraph_botId_eventType_key" ON "EventGraph"("botId", "eventType");

package/backend/prisma/migrations/20250628122517_added_eventgraph_name/migration.sql

@@ -0,0 +1,26 @@
+/*
+  Warnings:
+
+  - Added the required column `name` to the `EventGraph` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_EventGraph" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "botId" INTEGER NOT NULL,
+    "name" TEXT NOT NULL,
+    "eventType" TEXT NOT NULL,
+    "isEnabled" BOOLEAN NOT NULL DEFAULT true,
+    "graphJson" TEXT DEFAULT 'null',
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "EventGraph_botId_fkey" FOREIGN KEY ("botId") REFERENCES "Bot" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+INSERT INTO "new_EventGraph" ("botId", "createdAt", "eventType", "graphJson", "id", "isEnabled", "updatedAt", "name") SELECT "botId", "createdAt", "eventType", "graphJson", "id", "isEnabled", "updatedAt", "eventType" FROM "EventGraph";
+DROP TABLE "EventGraph";
+ALTER TABLE "new_EventGraph" RENAME TO "EventGraph";
+CREATE UNIQUE INDEX "EventGraph_botId_name_key" ON "EventGraph"("botId", "name");
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;

package/backend/prisma/migrations/20250628122710_complex_events/migration.sql

@@ -0,0 +1,36 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `eventType` on the `EventGraph` table. All the data in the column will be lost.
+
+*/
+-- CreateTable
+CREATE TABLE "EventTrigger" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "graphId" INTEGER NOT NULL,
+    "eventType" TEXT NOT NULL,
+    CONSTRAINT "EventTrigger_graphId_fkey" FOREIGN KEY ("graphId") REFERENCES "EventGraph" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_EventGraph" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "botId" INTEGER NOT NULL,
+    "name" TEXT NOT NULL,
+    "isEnabled" BOOLEAN NOT NULL DEFAULT true,
+    "graphJson" TEXT DEFAULT 'null',
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "EventGraph_botId_fkey" FOREIGN KEY ("botId") REFERENCES "Bot" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+INSERT INTO "new_EventGraph" ("botId", "createdAt", "graphJson", "id", "isEnabled", "name", "updatedAt") SELECT "botId", "createdAt", "graphJson", "id", "isEnabled", "name", "updatedAt" FROM "EventGraph";
+DROP TABLE "EventGraph";
+ALTER TABLE "new_EventGraph" RENAME TO "EventGraph";
+CREATE UNIQUE INDEX "EventGraph_botId_name_key" ON "EventGraph"("botId", "name");
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;
+
+-- CreateIndex
+CREATE UNIQUE INDEX "EventTrigger_graphId_eventType_key" ON "EventTrigger"("graphId", "eventType");

package/backend/prisma/migrations/migration_lock.toml

@@ -1,3 +1,3 @@
-# Please do not edit this file manually
-# It should be added in your version-control system (i.e. Git)
+# Please do not edit this file manually
+# It should be added in your version-control system (i.e. Git)
 provider = "sqlite"

package/backend/prisma/schema.prisma

@@ -36,7 +36,8 @@ model Bot {
   users            User[]
   groups           Group[]
   permissions      Permission[]
-  commands         Command[] 
+  commands         Command[]
+  eventGraphs      EventGraph[]
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
@@ -64,22 +65,52 @@ model InstalledPlugin {
 }
 
 model Command {
-  id        Int     @id @default(autoincrement())
-  botId     Int
-  bot       Bot     @relation(fields: [botId], references: [id], onDelete: Cascade)
-  name      String
-  isEnabled Boolean @default(true)
-  cooldown  Int     @default(0)
-  aliases   String  @default("[]") // Храним как джсон строку
-  description String?
-  owner     String?
-  permissionId Int? 
-  permission   Permission? @relation(fields: [permissionId], references: [id], onDelete: SetNull)
-  allowedChatTypes String  @default("[\"chat\", \"private\"]") 
+  id               Int     @id @default(autoincrement())
+  botId            Int
+  bot              Bot     @relation(fields: [botId], references: [id], onDelete: Cascade)
+  name             String
+  isEnabled        Boolean @default(true)
+  cooldown         Int     @default(0)
+  aliases          String  @default("[]")
+  description      String?
+  owner            String?
+  permissionId     Int?
+  permission       Permission? @relation(fields: [permissionId], references: [id], onDelete: SetNull)
+  allowedChatTypes String  @default("[\"chat\", \"private\"]")
+
+  isVisual         Boolean @default(false)
+  argumentsJson    String? @default("[]")
+  graphJson        String? @default("null")
 
   @@unique([botId, name])
 }
 
+model EventGraph {
+  id          Int     @id @default(autoincrement())
+  botId       Int
+  bot         Bot     @relation(fields: [botId], references: [id], onDelete: Cascade)
+  name        String
+  isEnabled   Boolean @default(true)
+  graphJson   String? @default("null")
+  variables   String? @default("[]")
+
+  triggers    EventTrigger[]
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@unique([botId, name])
+}
+
+model EventTrigger {
+  id        Int      @id @default(autoincrement())
+  graphId   Int
+  graph     EventGraph @relation(fields: [graphId], references: [id], onDelete: Cascade)
+  eventType String   // e.g., "entitySpawn", "chat"
+
+  @@unique([graphId, eventType])
+}
+
 model User {
   id            Int       @id @default(autoincrement())
   username      String
@@ -163,7 +194,7 @@ model PanelUser {
 // Роли пользователей (Admin, Moderator, Viewer)
 model PanelRole {
   id          Int      @id @default(autoincrement())
-  name        String   @unique // Например, "Admin", "Moderator", "Viewer"
+  name        String   @unique 
   
   // Храним права как джсон строку.  SQLite не поддерживает массивы.
   // Пример: '["bot:create", "bot:delete", "user:manage"]'