blockmine 1.16.3 → 1.17.0

package/CHANGELOG.md

@@ -1,6 +1,23 @@
 # История версий
 
 
+## [1.17.0](https://github.com/blockmineJS/blockmine/compare/v1.16.3...v1.17.0) (2025-07-24)
+
+
+### 🐛 Исправления
+
+* импорт ботов был улучшен. изменен, переделан, доделан, исправлен ([1a0983b](https://github.com/blockmineJS/blockmine/commit/1a0983bae10953edf1bf695a2451d21529642ce8))
+* прокси теперь подключение теперь работает ([f2ed2b2](https://github.com/blockmineJS/blockmine/commit/f2ed2b2728860aabbed35cd6fc63473fd011550f))
+
+
+### ✨ Новые возможности
+
+* добавлена функция скопировать полный код плагина в редакторе плагина ([91f7a21](https://github.com/blockmineJS/blockmine/commit/91f7a2171826eb59ca933005eaf48581469c0092))
+* плагины теперь могут изменять обработчики при проблемах (нет прав, не тот тип чата и др) ([eeda006](https://github.com/blockmineJS/blockmine/commit/eeda00648e3319aee72995452364d33c1b41b77a))
+* теперь ботов в левом сайдбар меню можно перемещать по позициям ([95ca8dc](https://github.com/blockmineJS/blockmine/commit/95ca8dcd11872e411bb6a5a74bcf981581e9cb51))
+* теперь при большом кол ве ботов, слева появится прокрутка ботов ([4e3c05d](https://github.com/blockmineJS/blockmine/commit/4e3c05dfdcb354e90b42226bf6c4af84ef328612))
+* улучшена обработка настроек плагинов с поддержкой группировки ([cfc24c6](https://github.com/blockmineJS/blockmine/commit/cfc24c60d92cac3a69098f16bacdf3fbbbee2e38))
+
 ### [1.16.3](https://github.com/blockmineJS/blockmine/compare/v1.16.2...v1.16.3) (2025-07-22)
 
 

package/backend/prisma/migrations/20250723160648_add_bot_sort_order/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Bot" ADD COLUMN "sortOrder" INTEGER;

package/backend/prisma/schema.prisma

@@ -1,228 +1,229 @@
-generator client {
-  provider = "prisma-client-js"
-}
-
-datasource db {
-  provider = "sqlite"
-  url      = env("DATABASE_URL")
-}
-
-model Server {
-  id      Int    @id @default(autoincrement())
-  name    String @unique
-  host    String
-  port    Int    @default(25565)
-  version String
-  bots    Bot[]
-}
-
-model Bot {
-  id       Int    @id @default(autoincrement())
-  username String @unique
-  password String?
-  prefix   String? @default("@")
-  note     String?
-  owners   String? @default("")
-
-  server   Server @relation(fields: [serverId], references: [id])
-  serverId Int
-
-  proxyHost     String?
-  proxyPort     Int?
-  proxyUsername String?
-  proxyPassword String?
-
-  installedPlugins InstalledPlugin[]
-  users            User[]
-  groups           Group[]
-  permissions      Permission[]
-  commands         Command[]
-  eventGraphs      EventGraph[]
-  pluginData       PluginDataStore[]
-
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-}
-
-
-model InstalledPlugin {
-  id          Int     @id @default(autoincrement())
-  botId       Int
-  bot         Bot     @relation(fields: [botId], references: [id], onDelete: Cascade)
-  name        String
-  version     String
-  description String?
-  sourceType  String
-  sourceUri   String?
-  path        String
-  isEnabled   Boolean @default(true)
-
-  manifest String?
-  settings String? @default("{}")
-
-  createdAt DateTime @default(now())
-
-  commands    Command[]
-  eventGraphs EventGraph[]
-
-  @@unique([botId, name])
-}
-
-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\"]")
-
-  isVisual         Boolean @default(false)
-  argumentsJson    String? @default("[]")
-  graphJson        String? @default("null")
-  
-  pluginOwnerId    Int?
-  pluginOwner      InstalledPlugin? @relation(fields: [pluginOwnerId], references: [id], onDelete: SetNull)
-
-  @@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
-  
-  pluginOwnerId    Int?
-  pluginOwner      InstalledPlugin? @relation(fields: [pluginOwnerId], references: [id], onDelete: SetNull)
-
-  @@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
-  isBlacklisted Boolean   @default(false)
-  botId         Int
-  bot           Bot       @relation(fields: [botId], references: [id], onDelete: Cascade)
-  groups        UserGroup[]
-
-  @@unique([botId, username])
-}
-
-model Group {
-  id          Int             @id @default(autoincrement())
-  name        String
-  owner       String          @default("system")
-  botId       Int
-  bot         Bot             @relation(fields: [botId], references: [id], onDelete: Cascade)
-  permissions GroupPermission[]
-  users       UserGroup[]
-
-  @@unique([botId, name])
-}
-
-model Permission {
-  id          Int             @id @default(autoincrement())
-  name        String
-  description String?
-  owner       String          @default("system")
-  botId       Int
-  bot         Bot             @relation(fields: [botId], references: [id], onDelete: Cascade)
-  groups      GroupPermission[]
-  commands    Command[] 
-
-  @@unique([botId, name])
-}
-
-
-model UserGroup {
-  user    User  @relation(fields: [userId], references: [id], onDelete: Cascade)
-  userId  Int
-  group   Group @relation(fields: [groupId], references: [id], onDelete: Cascade)
-  groupId Int
-
-  @@id([userId, groupId])
-}
-
-model GroupPermission {
-  group        Group      @relation(fields: [groupId], references: [id], onDelete: Cascade)
-  groupId      Int
-  permission   Permission @relation(fields: [permissionId], references: [id], onDelete: Cascade)
-  permissionId Int
-
-  @@id([groupId, permissionId])
-}
-
-
-
-model ScheduledTask {
-  id           Int        @id @default(autoincrement())
-  name         String
-  cronPattern  String?
-  action       String
-  targetBotIds String // джсон массив ID ботов или "ALL"
-  payload      String?    @default("{}") // джсон для доп данных, например, команды
-  isEnabled    Boolean    @default(true)
-  runOnStartup Boolean    @default(false)
-  lastRun      DateTime?
-  createdAt    DateTime   @default(now())
-  updatedAt    DateTime   @updatedAt
-}
-
-model PanelUser {
-  id           Int      @id @default(autoincrement())
-  uuid         String   @unique @default(uuid())
-  username     String   @unique
-  passwordHash String  
-  role         PanelRole @relation(fields: [roleId], references: [id])
-  roleId       Int
-  createdAt    DateTime @default(now())
-}
-
-// Роли пользователей (Admin, Moderator, Viewer)
-model PanelRole {
-  id          Int      @id @default(autoincrement())
-  name        String   @unique 
-  
-  // Храним права как джсон строку.  SQLite не поддерживает массивы.
-  // Пример: '[\"bot:create\", \"bot:delete\", \"user:manage\"]'
-  permissions String   @default("[]") 
-  users       PanelUser[]
-}
-
-model PluginDataStore {
-  id         Int      @id @default(autoincrement())
-  pluginName String
-  botId      Int
-  key        String
-  value      String // в виде json
-  createdAt  DateTime @default(now())
-  updatedAt  DateTime @updatedAt
-
-  bot Bot @relation(fields: [botId], references: [id], onDelete: Cascade)
-
-  @@unique([pluginName, botId, key])
-}
+generator client {
+  provider = "prisma-client-js"
+}
+
+datasource db {
+  provider = "sqlite"
+  url      = env("DATABASE_URL")
+}
+
+model Server {
+  id      Int    @id @default(autoincrement())
+  name    String @unique
+  host    String
+  port    Int    @default(25565)
+  version String
+  bots    Bot[]
+}
+
+model Bot {
+  id       Int    @id @default(autoincrement())
+  username String @unique
+  password String?
+  prefix   String? @default("@")
+  note     String?
+  owners   String? @default("")
+  sortOrder Int?
+
+  server   Server @relation(fields: [serverId], references: [id])
+  serverId Int
+
+  proxyHost     String?
+  proxyPort     Int?
+  proxyUsername String?
+  proxyPassword String?
+
+  installedPlugins InstalledPlugin[]
+  users            User[]
+  groups           Group[]
+  permissions      Permission[]
+  commands         Command[]
+  eventGraphs      EventGraph[]
+  pluginData       PluginDataStore[]
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+}
+
+
+model InstalledPlugin {
+  id          Int     @id @default(autoincrement())
+  botId       Int
+  bot         Bot     @relation(fields: [botId], references: [id], onDelete: Cascade)
+  name        String
+  version     String
+  description String?
+  sourceType  String
+  sourceUri   String?
+  path        String
+  isEnabled   Boolean @default(true)
+
+  manifest String?
+  settings String? @default("{}")
+
+  createdAt DateTime @default(now())
+
+  commands    Command[]
+  eventGraphs EventGraph[]
+
+  @@unique([botId, name])
+}
+
+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\"]")
+
+  isVisual         Boolean @default(false)
+  argumentsJson    String? @default("[]")
+  graphJson        String? @default("null")
+  
+  pluginOwnerId    Int?
+  pluginOwner      InstalledPlugin? @relation(fields: [pluginOwnerId], references: [id], onDelete: SetNull)
+
+  @@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
+  
+  pluginOwnerId    Int?
+  pluginOwner      InstalledPlugin? @relation(fields: [pluginOwnerId], references: [id], onDelete: SetNull)
+
+  @@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
+  isBlacklisted Boolean   @default(false)
+  botId         Int
+  bot           Bot       @relation(fields: [botId], references: [id], onDelete: Cascade)
+  groups        UserGroup[]
+
+  @@unique([botId, username])
+}
+
+model Group {
+  id          Int             @id @default(autoincrement())
+  name        String
+  owner       String          @default("system")
+  botId       Int
+  bot         Bot             @relation(fields: [botId], references: [id], onDelete: Cascade)
+  permissions GroupPermission[]
+  users       UserGroup[]
+
+  @@unique([botId, name])
+}
+
+model Permission {
+  id          Int             @id @default(autoincrement())
+  name        String
+  description String?
+  owner       String          @default("system")
+  botId       Int
+  bot         Bot             @relation(fields: [botId], references: [id], onDelete: Cascade)
+  groups      GroupPermission[]
+  commands    Command[] 
+
+  @@unique([botId, name])
+}
+
+
+model UserGroup {
+  user    User  @relation(fields: [userId], references: [id], onDelete: Cascade)
+  userId  Int
+  group   Group @relation(fields: [groupId], references: [id], onDelete: Cascade)
+  groupId Int
+
+  @@id([userId, groupId])
+}
+
+model GroupPermission {
+  group        Group      @relation(fields: [groupId], references: [id], onDelete: Cascade)
+  groupId      Int
+  permission   Permission @relation(fields: [permissionId], references: [id], onDelete: Cascade)
+  permissionId Int
+
+  @@id([groupId, permissionId])
+}
+
+
+
+model ScheduledTask {
+  id           Int        @id @default(autoincrement())
+  name         String
+  cronPattern  String?
+  action       String
+  targetBotIds String // джсон массив ID ботов или "ALL"
+  payload      String?    @default("{}") // джсон для доп данных, например, команды
+  isEnabled    Boolean    @default(true)
+  runOnStartup Boolean    @default(false)
+  lastRun      DateTime?
+  createdAt    DateTime   @default(now())
+  updatedAt    DateTime   @updatedAt
+}
+
+model PanelUser {
+  id           Int      @id @default(autoincrement())
+  uuid         String   @unique @default(uuid())
+  username     String   @unique
+  passwordHash String  
+  role         PanelRole @relation(fields: [roleId], references: [id])
+  roleId       Int
+  createdAt    DateTime @default(now())
+}
+
+// Роли пользователей (Admin, Moderator, Viewer)
+model PanelRole {
+  id          Int      @id @default(autoincrement())
+  name        String   @unique 
+  
+  // Храним права как джсон строку.  SQLite не поддерживает массивы.
+  // Пример: '[\"bot:create\", \"bot:delete\", \"user:manage\"]'
+  permissions String   @default("[]") 
+  users       PanelUser[]
+}
+
+model PluginDataStore {
+  id         Int      @id @default(autoincrement())
+  pluginName String
+  botId      Int
+  key        String
+  value      String // в виде json
+  createdAt  DateTime @default(now())
+  updatedAt  DateTime @updatedAt
+
+  bot Bot @relation(fields: [botId], references: [id], onDelete: Cascade)
+
+  @@unique([pluginName, botId, key])
+}