blockmine 1.2.0 → 1.3.0

package/backend/prisma/generated/client/wasm.js

@@ -0,0 +1,272 @@
+
+Object.defineProperty(exports, "__esModule", { value: true });
+
+const {
+  Decimal,
+  objectEnumValues,
+  makeStrictEnum,
+  Public,
+  getRuntime,
+  skip
+} = require('./runtime/index-browser.js')
+
+
+const Prisma = {}
+
+exports.Prisma = Prisma
+exports.$Enums = {}
+
+/**
+ * Prisma Client JS version: 5.22.0
+ * Query Engine version: 605197351a3c8bdd595af2d2a9bc3025bca48ea2
+ */
+Prisma.prismaVersion = {
+  client: "5.22.0",
+  engine: "605197351a3c8bdd595af2d2a9bc3025bca48ea2"
+}
+
+Prisma.PrismaClientKnownRequestError = () => {
+  const runtimeName = getRuntime().prettyName;
+  throw new Error(`PrismaClientKnownRequestError is unable to run in this browser environment, or has been bundled for the browser (running in ${runtimeName}).
+In case this error is unexpected for you, please report it in https://pris.ly/prisma-prisma-bug-report`,
+)};
+Prisma.PrismaClientUnknownRequestError = () => {
+  const runtimeName = getRuntime().prettyName;
+  throw new Error(`PrismaClientUnknownRequestError is unable to run in this browser environment, or has been bundled for the browser (running in ${runtimeName}).
+In case this error is unexpected for you, please report it in https://pris.ly/prisma-prisma-bug-report`,
+)}
+Prisma.PrismaClientRustPanicError = () => {
+  const runtimeName = getRuntime().prettyName;
+  throw new Error(`PrismaClientRustPanicError is unable to run in this browser environment, or has been bundled for the browser (running in ${runtimeName}).
+In case this error is unexpected for you, please report it in https://pris.ly/prisma-prisma-bug-report`,
+)}
+Prisma.PrismaClientInitializationError = () => {
+  const runtimeName = getRuntime().prettyName;
+  throw new Error(`PrismaClientInitializationError is unable to run in this browser environment, or has been bundled for the browser (running in ${runtimeName}).
+In case this error is unexpected for you, please report it in https://pris.ly/prisma-prisma-bug-report`,
+)}
+Prisma.PrismaClientValidationError = () => {
+  const runtimeName = getRuntime().prettyName;
+  throw new Error(`PrismaClientValidationError is unable to run in this browser environment, or has been bundled for the browser (running in ${runtimeName}).
+In case this error is unexpected for you, please report it in https://pris.ly/prisma-prisma-bug-report`,
+)}
+Prisma.NotFoundError = () => {
+  const runtimeName = getRuntime().prettyName;
+  throw new Error(`NotFoundError is unable to run in this browser environment, or has been bundled for the browser (running in ${runtimeName}).
+In case this error is unexpected for you, please report it in https://pris.ly/prisma-prisma-bug-report`,
+)}
+Prisma.Decimal = Decimal
+
+/**
+ * Re-export of sql-template-tag
+ */
+Prisma.sql = () => {
+  const runtimeName = getRuntime().prettyName;
+  throw new Error(`sqltag is unable to run in this browser environment, or has been bundled for the browser (running in ${runtimeName}).
+In case this error is unexpected for you, please report it in https://pris.ly/prisma-prisma-bug-report`,
+)}
+Prisma.empty = () => {
+  const runtimeName = getRuntime().prettyName;
+  throw new Error(`empty is unable to run in this browser environment, or has been bundled for the browser (running in ${runtimeName}).
+In case this error is unexpected for you, please report it in https://pris.ly/prisma-prisma-bug-report`,
+)}
+Prisma.join = () => {
+  const runtimeName = getRuntime().prettyName;
+  throw new Error(`join is unable to run in this browser environment, or has been bundled for the browser (running in ${runtimeName}).
+In case this error is unexpected for you, please report it in https://pris.ly/prisma-prisma-bug-report`,
+)}
+Prisma.raw = () => {
+  const runtimeName = getRuntime().prettyName;
+  throw new Error(`raw is unable to run in this browser environment, or has been bundled for the browser (running in ${runtimeName}).
+In case this error is unexpected for you, please report it in https://pris.ly/prisma-prisma-bug-report`,
+)}
+Prisma.validator = Public.validator
+
+/**
+* Extensions
+*/
+Prisma.getExtensionContext = () => {
+  const runtimeName = getRuntime().prettyName;
+  throw new Error(`Extensions.getExtensionContext is unable to run in this browser environment, or has been bundled for the browser (running in ${runtimeName}).
+In case this error is unexpected for you, please report it in https://pris.ly/prisma-prisma-bug-report`,
+)}
+Prisma.defineExtension = () => {
+  const runtimeName = getRuntime().prettyName;
+  throw new Error(`Extensions.defineExtension is unable to run in this browser environment, or has been bundled for the browser (running in ${runtimeName}).
+In case this error is unexpected for you, please report it in https://pris.ly/prisma-prisma-bug-report`,
+)}
+
+/**
+ * Shorthand utilities for JSON filtering
+ */
+Prisma.DbNull = objectEnumValues.instances.DbNull
+Prisma.JsonNull = objectEnumValues.instances.JsonNull
+Prisma.AnyNull = objectEnumValues.instances.AnyNull
+
+Prisma.NullTypes = {
+  DbNull: objectEnumValues.classes.DbNull,
+  JsonNull: objectEnumValues.classes.JsonNull,
+  AnyNull: objectEnumValues.classes.AnyNull
+}
+
+
+
+/**
+ * Enums
+ */
+
+exports.Prisma.TransactionIsolationLevel = makeStrictEnum({
+  Serializable: 'Serializable'
+});
+
+exports.Prisma.ServerScalarFieldEnum = {
+  id: 'id',
+  name: 'name',
+  host: 'host',
+  port: 'port',
+  version: 'version'
+};
+
+exports.Prisma.BotScalarFieldEnum = {
+  id: 'id',
+  username: 'username',
+  password: 'password',
+  prefix: 'prefix',
+  note: 'note',
+  owners: 'owners',
+  serverId: 'serverId',
+  proxyHost: 'proxyHost',
+  proxyPort: 'proxyPort',
+  proxyUsername: 'proxyUsername',
+  proxyPassword: 'proxyPassword',
+  createdAt: 'createdAt',
+  updatedAt: 'updatedAt'
+};
+
+exports.Prisma.InstalledPluginScalarFieldEnum = {
+  id: 'id',
+  botId: 'botId',
+  name: 'name',
+  version: 'version',
+  description: 'description',
+  sourceType: 'sourceType',
+  sourceUri: 'sourceUri',
+  path: 'path',
+  isEnabled: 'isEnabled',
+  manifest: 'manifest',
+  settings: 'settings',
+  createdAt: 'createdAt'
+};
+
+exports.Prisma.CommandScalarFieldEnum = {
+  id: 'id',
+  botId: 'botId',
+  name: 'name',
+  isEnabled: 'isEnabled',
+  cooldown: 'cooldown',
+  aliases: 'aliases',
+  description: 'description',
+  owner: 'owner',
+  permissionId: 'permissionId',
+  allowedChatTypes: 'allowedChatTypes'
+};
+
+exports.Prisma.UserScalarFieldEnum = {
+  id: 'id',
+  username: 'username',
+  isBlacklisted: 'isBlacklisted',
+  botId: 'botId'
+};
+
+exports.Prisma.GroupScalarFieldEnum = {
+  id: 'id',
+  name: 'name',
+  owner: 'owner',
+  botId: 'botId'
+};
+
+exports.Prisma.PermissionScalarFieldEnum = {
+  id: 'id',
+  name: 'name',
+  description: 'description',
+  owner: 'owner',
+  botId: 'botId'
+};
+
+exports.Prisma.UserGroupScalarFieldEnum = {
+  userId: 'userId',
+  groupId: 'groupId'
+};
+
+exports.Prisma.GroupPermissionScalarFieldEnum = {
+  groupId: 'groupId',
+  permissionId: 'permissionId'
+};
+
+exports.Prisma.ScheduledTaskScalarFieldEnum = {
+  id: 'id',
+  name: 'name',
+  cronPattern: 'cronPattern',
+  action: 'action',
+  targetBotIds: 'targetBotIds',
+  payload: 'payload',
+  isEnabled: 'isEnabled',
+  lastRun: 'lastRun',
+  createdAt: 'createdAt',
+  updatedAt: 'updatedAt'
+};
+
+exports.Prisma.SortOrder = {
+  asc: 'asc',
+  desc: 'desc'
+};
+
+exports.Prisma.NullsOrder = {
+  first: 'first',
+  last: 'last'
+};
+
+
+exports.Prisma.ModelName = {
+  Server: 'Server',
+  Bot: 'Bot',
+  InstalledPlugin: 'InstalledPlugin',
+  Command: 'Command',
+  User: 'User',
+  Group: 'Group',
+  Permission: 'Permission',
+  UserGroup: 'UserGroup',
+  GroupPermission: 'GroupPermission',
+  ScheduledTask: 'ScheduledTask'
+};
+
+/**
+ * This is a stub Prisma Client that will error at runtime if called.
+ */
+class PrismaClient {
+  constructor() {
+    return new Proxy(this, {
+      get(target, prop) {
+        let message
+        const runtime = getRuntime()
+        if (runtime.isEdge) {
+          message = `PrismaClient is not configured to run in ${runtime.prettyName}. In order to run Prisma Client on edge runtime, either:
+- Use Prisma Accelerate: https://pris.ly/d/accelerate
+- Use Driver Adapters: https://pris.ly/d/driver-adapters
+`;
+        } else {
+          message = 'PrismaClient is unable to run in this browser environment, or has been bundled for the browser (running in `' + runtime.prettyName + '`).'
+        }
+        
+        message += `
+If this is unexpected, please open an issue: https://pris.ly/prisma-prisma-bug-report`
+
+        throw new Error(message)
+      }
+    })
+  }
+}
+
+exports.PrismaClient = PrismaClient
+
+Object.assign(exports, Prisma)

package/backend/prisma/migrations/20250615232848_add_scheduled_tasks/migration.sql

@@ -0,0 +1,13 @@
+-- CreateTable
+CREATE TABLE "ScheduledTask" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "name" TEXT NOT NULL,
+    "cronPattern" TEXT NOT NULL,
+    "action" TEXT NOT NULL,
+    "targetBotIds" TEXT NOT NULL,
+    "payload" TEXT DEFAULT '{}',
+    "isEnabled" BOOLEAN NOT NULL DEFAULT true,
+    "lastRun" DATETIME,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL
+);

package/backend/prisma/schema.prisma

@@ -1,138 +1,151 @@
-// backend/prisma/schema.prisma
-
-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[] 
-
-  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())
-
-  @@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\"]") 
-
-  @@unique([botId, name])
-}
-
-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])
+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[] 
+
+  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())
+
+  @@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\"]") 
+
+  @@unique([botId, name])
+}
+
+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)
+  lastRun      DateTime?
+  createdAt    DateTime   @default(now())
+  updatedAt    DateTime   @updatedAt
 }

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

@@ -0,0 +1,95 @@
+const express = require('express');
+const router = express.Router();
+const { PrismaClient } = require('@prisma/client');
+const TaskScheduler = require('../../core/TaskScheduler');
+
+const { CronExpressionParser } = require('cron-parser');
+
+const prisma = new PrismaClient();
+
+const normalizeCronPattern = (pattern) => {
+    if (typeof pattern !== 'string') return '* * * * *';
+    return pattern.replace(/\*\/1/g, '*').trim();
+};
+
+router.get('/', async (req, res) => {
+    try {
+        const tasks = await prisma.scheduledTask.findMany({ orderBy: { createdAt: 'desc' } });
+        const normalizedTasks = tasks.map(task => ({
+            ...task,
+            cronPattern: normalizeCronPattern(task.cronPattern),
+        }));
+        res.json(normalizedTasks);
+    } catch (error) {
+        console.error("[API /tasks] Ошибка получения списка задач:", error);
+        res.status(500).json({ error: 'Не удалось получить список задач' });
+    }
+});
+
+router.post('/', async (req, res) => {
+    try {
+        const taskData = { ...req.body, cronPattern: normalizeCronPattern(req.body.cronPattern) };
+        const newTask = await prisma.scheduledTask.create({ data: taskData });
+        TaskScheduler.scheduleTask(newTask);
+        res.status(201).json(newTask);
+    } catch (error) {
+        console.error("[API /tasks] Ошибка создания задачи:", error);
+        res.status(500).json({ error: 'Не удалось создать задачу' });
+    }
+});
+
+router.put('/:id', async (req, res) => {
+    const taskId = parseInt(req.params.id, 10);
+    try {
+        const { id, createdAt, updatedAt, lastRun, ...dataToUpdate } = req.body;
+        
+        if (dataToUpdate.cronPattern) {
+            dataToUpdate.cronPattern = normalizeCronPattern(dataToUpdate.cronPattern);
+        }
+
+        const updatedTask = await prisma.scheduledTask.update({
+            where: { id: taskId },
+            data: dataToUpdate,
+        });
+        await TaskScheduler.updateTask(updatedTask);
+        res.json(updatedTask);
+    } catch (error) {
+        console.error(`[API /tasks] Ошибка обновления задачи ${taskId}:`, error);
+        res.status(500).json({ error: 'Не удалось обновить задачу' });
+    }
+});
+
+router.delete('/:id', async (req, res) => {
+    const taskId = parseInt(req.params.id, 10);
+    try {
+        await prisma.scheduledTask.delete({ where: { id: taskId } });
+        TaskScheduler.unscheduleTask(taskId);
+        res.status(204).send();
+    } catch (error) {
+        console.error(`[API /tasks] Ошибка удаления задачи ${taskId}:`, error);
+        res.status(500).json({ error: 'Не удалось удалить задачу' });
+    }
+});
+
+
+router.post('/describe', (req, res) => {
+    const { pattern } = req.body;
+
+    if (!pattern) {
+        return res.status(400).json({ error: 'Невалидный cron-паттерн' });
+    }
+
+    try {
+        const interval = CronExpressionParser.parse(pattern);
+        
+        res.json({
+            human: interval.stringify(true),
+            next: interval.next().toDate().toLocaleString('ru-RU')
+        });
+    } catch (error) {
+        console.error(`[API /tasks/describe] Ошибка парсинга паттерна "${pattern}":`, error.message);
+        res.status(500).json({ error: 'Ошибка парсинга паттерна' });
+    }
+});
+
+module.exports = router;