From b4bded2ffb66d1bfbb93eb4cbba99e992065a270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=D1=81=20=D0=A1=D1=83=D0=BB=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= <si@op16.ru>
Date: Fri, 24 Jul 2026 13:52:03 +0300
Subject: [PATCH] =?UTF-8?q?feat:=20=D1=82=D1=80=D0=B8=D0=B3=D0=B3=D0=B5?=
 =?UTF-8?q?=D1=80=20schedule=20=D0=B4=D0=BB=D1=8F=20=D0=B0=D0=B2=D1=82?=
 =?UTF-8?q?=D0=BE=D0=BC=D0=B0=D1=82=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B9=20?=
 =?UTF-8?q?=E2=80=94=20=D0=B5=D0=B6=D0=B5=D0=B4=D0=BD=D0=B5=D0=B2=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B9=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=20=D0=BF?=
 =?UTF-8?q?=D0=BE=20=D0=9C=D0=A1=D0=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- планировщик server/workers/automation-scheduler.ts (тик 60 сек, все организации)
- защита от дублей: automations.last_scheduled_run_at (миграция 0065), catch-up в пределах суток
- UI: выбор триггера 'По расписанию' и времени запуска в Automations.tsx
- MCP: create_automation/update_automation принимают trigger 'schedule'
- triggerData: { trigger: 'schedule', scheduledAt }
---
 client/src/pages/Automations.tsx              | 27 ++++++-
 .../0065_automations_last_scheduled_run.sql   |  2 +
 server/index.ts                               |  5 ++
 server/mcp.ts                                 | 10 ++-
 server/routes/automation.routes.ts            |  2 +-
 server/storage/content.storage.ts             | 13 ++++
 server/workers/automation-scheduler.ts        | 77 +++++++++++++++++++
 shared/schema.ts                              |  1 +
 8 files changed, 130 insertions(+), 7 deletions(-)
 create mode 100644 migrations/0065_automations_last_scheduled_run.sql
 create mode 100644 server/workers/automation-scheduler.ts

diff --git a/client/src/pages/Automations.tsx b/client/src/pages/Automations.tsx
index eb1f5d1..d61b0b7 100644
--- a/client/src/pages/Automations.tsx
+++ b/client/src/pages/Automations.tsx
@@ -38,6 +38,7 @@ const TRIGGER_LABELS: Record<string, string> = {
   'task.created': 'Задача создана',
   'task.status_changed': 'Статус изменён',
   'qr.scan': 'Сканирование QR',
+  schedule: 'По расписанию',
 };
 
 const CODE_TEMPLATE = `// ============================================================
@@ -54,6 +55,7 @@ const CODE_TEMPLATE = `// ======================================================
 //   • task.created:       { formId, taskId, task: { ... } }
 //   • task.status_changed:{ formId, taskId, oldStatusId, newStatusId, task: { ... } }
 //   • qr.scan:            { template, objectId, scannedByUserId }
+//   • schedule:           { trigger: 'schedule', scheduledAt }
 //
 // Логирование:
 //   ctx.log(msg) — запись в лог выполнения
@@ -86,6 +88,7 @@ const CODE_TEMPLATE = `// ======================================================
 //   task.created        — после создания задачи
 //   task.status_changed — при изменении статуса задачи
 //   qr.scan             — при сканировании QR-кода в PWA (только офлайн-автоматизации)
+//   schedule            — ежедневно в заданное время по МСК (triggerConfig: { time: 'HH:MM' })
 //
 // Результат автоматизации (ctx.result):
 //   { allow: false, error: '...' }                    — отменить действие (task.before_create)
@@ -123,6 +126,7 @@ export function AutomationsContent() {
   const [formCode, setFormCode] = useState(CODE_TEMPLATE);
   const [formTrigger, setFormTrigger] = useState('manual');
   const [formTriggerFormId, setFormTriggerFormId] = useState('');
+  const [formTriggerTime, setFormTriggerTime] = useState('08:00');
   const [formActive, setFormActive] = useState(true);
   const [formRunOffline, setFormRunOffline] = useState(false);
   const [formClientCompatible, setFormClientCompatible] = useState(false);
@@ -186,6 +190,7 @@ export function AutomationsContent() {
     setFormCode(CODE_TEMPLATE);
     setFormTrigger('manual');
     setFormTriggerFormId('all');
+    setFormTriggerTime('08:00');
     setFormActive(true);
     setFormRunOffline(false);
     setFormClientCompatible(false);
@@ -199,6 +204,7 @@ export function AutomationsContent() {
     setFormCode(item.code);
     setFormTrigger(item.trigger);
     setFormTriggerFormId(String((item.triggerConfig as any)?.formId ?? 'all'));
+    setFormTriggerTime(String((item.triggerConfig as any)?.time ?? '08:00'));
     setFormActive(item.isActive);
     setFormRunOffline(item.runOffline ?? false);
     setFormClientCompatible(item.clientCompatible ?? false);
@@ -212,7 +218,9 @@ export function AutomationsContent() {
   function handleSave() {
     if (!formName.trim()) return;
     const triggerConfig: Record<string, unknown> = {};
-    if (formTrigger !== 'manual' && formTriggerFormId && formTriggerFormId !== 'all') {
+    if (formTrigger === 'schedule') {
+      triggerConfig.time = formTriggerTime || '08:00';
+    } else if (formTrigger !== 'manual' && formTriggerFormId && formTriggerFormId !== 'all') {
       triggerConfig.formId = parseInt(formTriggerFormId);
     }
     // For qr.scan trigger, object matching uses triggerConfig.templateKey
@@ -282,6 +290,7 @@ export function AutomationsContent() {
   task.created:       { formId, taskId, task: { ... } }
   task.status_changed:{ formId, taskId, oldStatusId, newStatusId, task: { ... } }
   qr.scan:            { template, objectId, scannedByUserId }
+  schedule:           { trigger: 'schedule', scheduledAt }
 
 Формы:
   ctx.forms.list() / ctx.forms.get(formId) / ctx.forms.getFields(formId) / ctx.forms.getStatuses(formId)
@@ -305,6 +314,7 @@ export function AutomationsContent() {
   task.created        — после создания задачи
   task.status_changed — при изменении статуса задачи
   qr.scan             — при сканировании QR-кода в PWA
+  schedule            — ежедневно в заданное время по МСК (настройка: время запуска)
 
 Результат автоматизации (ctx.result):
   { allow: false, error: '...' }                     — отменить действие (task.before_create)
@@ -444,12 +454,25 @@ export function AutomationsContent() {
                     <SelectItem value="task.created">При создании задачи</SelectItem>
                     <SelectItem value="task.status_changed">При изменении статуса</SelectItem>
                     <SelectItem value="qr.scan">Сканирование QR</SelectItem>
+                    <SelectItem value="schedule">По расписанию (ежедневно, МСК)</SelectItem>
                   </SelectContent>
                 </Select>
               </div>
             </div>
 
-            {formTrigger !== 'manual' && (
+            {formTrigger === 'schedule' && (
+              <div className="space-y-1">
+                <Label className="text-xs">Время запуска (МСК)</Label>
+                <Input
+                  type="time"
+                  className="h-7 text-xs w-auto"
+                  value={formTriggerTime}
+                  onChange={e => setFormTriggerTime(e.target.value)}
+                />
+              </div>
+            )}
+
+            {formTrigger !== 'manual' && formTrigger !== 'schedule' && (
               <div className="space-y-1">
                 <Label className="text-xs">Форма (опционально)</Label>
                 <Select value={formTriggerFormId} onValueChange={setFormTriggerFormId}>
diff --git a/migrations/0065_automations_last_scheduled_run.sql b/migrations/0065_automations_last_scheduled_run.sql
new file mode 100644
index 0000000..f4e7eb4
--- /dev/null
+++ b/migrations/0065_automations_last_scheduled_run.sql
@@ -0,0 +1,2 @@
+-- Защита от повторного запуска schedule-автоматизаций в течение суток
+ALTER TABLE automations ADD COLUMN IF NOT EXISTS last_scheduled_run_at timestamp;
diff --git a/server/index.ts b/server/index.ts
index 2c8146e..4e4e10d 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -7,6 +7,7 @@ import { pushService } from "./services/push.service";
 import { notificationService } from "./services/notification.service";
 import { webPushService } from "./services/web-push.service";
 import { startMedScheduleWorker } from "./medschedule/worker";
+import { startAutomationScheduler } from "./workers/automation-scheduler";
 import { storage } from "./storage";
 import type { ReminderRecipient } from "@shared/schema";
 import { db, withSuperAdmin } from "./db"; // lazy proxy — safe at module load; throws on first use if DATABASE_URL missing
@@ -1028,6 +1029,10 @@ async function runStartupDataPatches() {
   startMedScheduleWorker();
   log('MedSchedule worker started');
 
+  // Start automation scheduler (schedule-trigger automations, daily at configured MSK time)
+  startAutomationScheduler();
+  log('Automation scheduler started');
+
   // Clean up duplicate subscriptions then backfill defaults for existing users
   (async () => {
     try {
diff --git a/server/mcp.ts b/server/mcp.ts
index 7781092..b362ac4 100644
--- a/server/mcp.ts
+++ b/server/mcp.ts
@@ -2383,6 +2383,7 @@ Trigger data shapes (ctx.triggerData):
 - task.created: { formId, taskId, task: { ... } }
 - task.status_changed: { formId, taskId, oldStatusId, newStatusId, task: { ... } }
 - qr.scan: { template, objectId, scannedByUserId }
+- schedule: { trigger: 'schedule', scheduledAt }
 
 Logging:
 - ctx.log(msg) — append message to execution log
@@ -2409,9 +2410,10 @@ Users:
 - ctx.users.update(userId, updates) — update user fields (firstName, lastName, position, statusId, etc.)
 - ctx.users.updateStatus(userId, statusId) — change user status
 
-Trigger types: 'manual', 'task.before_create', 'task.created', 'task.status_changed', 'qr.scan'
+Trigger types: 'manual', 'task.before_create', 'task.created', 'task.status_changed', 'qr.scan', 'schedule'
 TriggerConfig for task.before_create / task.created / task.status_changed: { formId: number, statusId?: number }
 TriggerConfig for qr.scan: { templateKey: string }
+TriggerConfig for schedule: { time: "HH:MM" } — daily run at this Moscow time (MSK, UTC+3); reruns within the same day are prevented via last_scheduled_run_at
 
 Result object ctx.result:
 - { allow: false, error: '...' } — block task creation (task.before_create)
@@ -2432,9 +2434,9 @@ To block task creation from task.before_create, set: ctx.result = { allow: false
       inputSchema: {
         name: z.string().describe("Automation display name"),
         code: z.string().describe("JavaScript code to execute"),
-        trigger: z.enum(["manual", "task.before_create", "task.created", "task.status_changed", "qr.scan"]).default("manual").describe("When this automation fires"),
+        trigger: z.enum(["manual", "task.before_create", "task.created", "task.status_changed", "qr.scan", "schedule"]).default("manual").describe("When this automation fires"),
         description: z.string().optional().describe("Optional description"),
-        trigger_config: z.record(z.unknown()).optional().describe("Trigger configuration JSON, e.g. { formId: 5 } or { templateKey: 'equipment-scan' }"),
+        trigger_config: z.record(z.unknown()).optional().describe("Trigger configuration JSON, e.g. { formId: 5 }, { templateKey: 'equipment-scan' } or { time: '08:00' } for schedule (daily, MSK)"),
         is_active: z.boolean().optional().describe("Whether the automation is active"),
         run_offline: z.boolean().optional().describe("Allow execution in PWA without internet"),
         client_compatible: z.boolean().optional().describe("Code is safe to run on client device (required for run_offline)"),
@@ -2469,7 +2471,7 @@ To block task creation from task.before_create, set: ctx.result = { allow: false
         name: z.string().optional().describe("New name"),
         code: z.string().optional().describe("New JavaScript code"),
         description: z.string().optional().describe("New description"),
-        trigger: z.enum(["manual", "task.before_create", "task.created", "task.status_changed", "qr.scan"]).optional().describe("New trigger type"),
+        trigger: z.enum(["manual", "task.before_create", "task.created", "task.status_changed", "qr.scan", "schedule"]).optional().describe("New trigger type ('schedule' = daily at trigger_config.time HH:MM MSK)"),
         trigger_config: z.record(z.unknown()).optional().describe("New trigger config JSON"),
         is_active: z.boolean().optional().describe("Enable or disable"),
         run_offline: z.boolean().optional().describe("Allow execution in PWA without internet"),
diff --git a/server/routes/automation.routes.ts b/server/routes/automation.routes.ts
index 7fbedeb..330bd56 100644
--- a/server/routes/automation.routes.ts
+++ b/server/routes/automation.routes.ts
@@ -47,7 +47,7 @@ interface WorkerDone {
 
 type WorkerMessage = WorkerStorageCall | WorkerDone;
 
-function runAutomationInWorker(
+export function runAutomationInWorker(
   code: string,
   organizationId: number,
   triggerData: unknown,
diff --git a/server/storage/content.storage.ts b/server/storage/content.storage.ts
index 6356a5a..fe6a175 100644
--- a/server/storage/content.storage.ts
+++ b/server/storage/content.storage.ts
@@ -689,4 +689,17 @@ export class ContentStorage extends DataTablesStorage {
       .where(and(eq(automations.id, id), eq(automations.organizationId, organizationId)));
   }
 
+  // Все активные schedule-автоматизации всех организаций (для планировщика, вызывать в withSuperAdmin)
+  async getActiveScheduleAutomations(): Promise<Automation[]> {
+    return db.select().from(automations)
+      .where(and(eq(automations.trigger, 'schedule'), eq(automations.isActive, true)))
+      .orderBy(asc(automations.id));
+  }
+
+  async markAutomationScheduledRun(id: number): Promise<void> {
+    await db.update(automations)
+      .set({ lastScheduledRunAt: new Date() })
+      .where(eq(automations.id, id));
+  }
+
 }
diff --git a/server/workers/automation-scheduler.ts b/server/workers/automation-scheduler.ts
new file mode 100644
index 0000000..593703d
--- /dev/null
+++ b/server/workers/automation-scheduler.ts
@@ -0,0 +1,77 @@
+import { storage } from "../storage";
+import { withSuperAdmin } from "../db";
+import { runAutomationInWorker } from "../routes/automation.routes";
+
+/**
+ * Планировщик schedule-автоматизаций.
+ *
+ * Раз в минуту проверяет активные автоматизации с trigger = 'schedule' всех
+ * организаций и запускает те, у которых время из triggerConfig.time (HH:MM, МСК)
+ * уже наступило сегодня, а запуска сегодня ещё не было. Отметка о запуске
+ * хранится в automations.last_scheduled_run_at, поэтому переживает рестарт
+ * контейнера; при даунтайме в момент HH:MM автоматизация запустится
+ * при первой возможности в тот же день (catch-up в пределах суток).
+ */
+
+const TICK_MS = 60_000;
+const MSK_OFFSET_MS = 3 * 60 * 60 * 1000; // МСК = UTC+3, перехода на летнее время нет
+
+function mskNow(): { today: string; minutesOfDay: number } {
+  const msk = new Date(Date.now() + MSK_OFFSET_MS);
+  return {
+    today: msk.toISOString().slice(0, 10),
+    minutesOfDay: msk.getUTCHours() * 60 + msk.getUTCMinutes(),
+  };
+}
+
+function parseTime(value: unknown): number | null {
+  if (typeof value !== "string") return null;
+  const m = /^(\d{1,2}):(\d{2})$/.exec(value.trim());
+  if (!m) return null;
+  const h = Number(m[1]);
+  const min = Number(m[2]);
+  if (h > 23 || min > 59) return null;
+  return h * 60 + min;
+}
+
+async function tick(): Promise<void> {
+  const { today, minutesOfDay } = mskNow();
+  const list = await withSuperAdmin(() => storage.getActiveScheduleAutomations());
+
+  for (const automation of list) {
+    try {
+      const config = (automation.triggerConfig as Record<string, unknown>) || {};
+      const target = parseTime(config.time);
+      if (target === null || target > minutesOfDay) continue;
+
+      if (automation.lastScheduledRunAt) {
+        const lastMskDay = new Date(automation.lastScheduledRunAt.getTime() + MSK_OFFSET_MS)
+          .toISOString()
+          .slice(0, 10);
+        if (lastMskDay >= today) continue; // сегодня уже запускалась
+      }
+
+      const { logs, error } = await withSuperAdmin(() =>
+        runAutomationInWorker(automation.code, automation.organizationId, {
+          trigger: "schedule",
+          scheduledAt: new Date().toISOString(),
+        })
+      );
+      await withSuperAdmin(() => storage.markAutomationScheduledRun(automation.id));
+
+      console.log(
+        `[Automation Scheduler] '${automation.name}' (id ${automation.id}, org ${automation.organizationId}): ${error ? "ERROR " + error : "ok"}`
+      );
+      for (const line of logs) console.log(`[Automation Scheduler]   ${line}`);
+    } catch (err) {
+      console.error(`[Automation Scheduler] Failed automation ${automation.id}:`, err);
+    }
+  }
+}
+
+export function startAutomationScheduler(): void {
+  setInterval(() => {
+    tick().catch((err) => console.error("[Automation Scheduler] Tick error:", err));
+  }, TICK_MS);
+  console.log("[Automation Scheduler] started");
+}
diff --git a/shared/schema.ts b/shared/schema.ts
index 4cc5f7b..2b43ee0 100644
--- a/shared/schema.ts
+++ b/shared/schema.ts
@@ -2655,6 +2655,7 @@ export const automations = pgTable("automations", {
   runOffline: boolean("run_offline").default(false), // автоматизация может выполняться на клиенте без интернета
   clientCompatible: boolean("client_compatible").default(false), // код совместим с browser VM / Web Worker
   createdBy: integer("created_by").notNull().references(() => users.id),
+  lastScheduledRunAt: timestamp("last_scheduled_run_at"), // последний запуск по расписанию (защита от дублей)
   createdAt: timestamp("created_at").defaultNow(),
   updatedAt: timestamp("updated_at").defaultNow(),
 }, (table) => ({