opencode-windows-scheduler 1.1.0 → 1.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +60 -1
- package/README.md +18 -8
- package/README.ru.md +13 -3
- package/ROADMAP-STRATEGY.md +2 -2
- package/ROADMAP.md +51 -18
- package/dist/core/analytics.d.ts +10 -0
- package/dist/core/analytics.d.ts.map +1 -1
- package/dist/core/analytics.js +21 -0
- package/dist/core/dry-run.d.ts +18 -1
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +49 -3
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +10 -0
- package/dist/core/one-shot.d.ts +62 -0
- package/dist/core/one-shot.d.ts.map +1 -0
- package/dist/core/one-shot.js +126 -0
- package/dist/core/otel.d.ts +4 -0
- package/dist/core/otel.d.ts.map +1 -0
- package/dist/core/otel.js +98 -0
- package/dist/core/prometheus.d.ts +23 -0
- package/dist/core/prometheus.d.ts.map +1 -0
- package/dist/core/prometheus.js +146 -0
- package/dist/core/ps-wrapper.d.ts +36 -2
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +124 -4
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +9 -0
- package/dist/core/schedule-gate.d.ts +2 -0
- package/dist/core/schedule-gate.d.ts.map +1 -0
- package/dist/core/schedule-gate.js +182 -0
- package/dist/core/schedule-v2.d.ts +88 -0
- package/dist/core/schedule-v2.d.ts.map +1 -0
- package/dist/core/schedule-v2.js +496 -0
- package/dist/core/scheduler/linux.d.ts +12 -3
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +80 -3
- package/dist/core/scheduler/mac.d.ts.map +1 -1
- package/dist/core/scheduler/mac.js +17 -3
- package/dist/core/scheduler/posix.d.ts.map +1 -1
- package/dist/core/scheduler/posix.js +3 -0
- package/dist/core/scheduler/registry.d.ts +4 -0
- package/dist/core/scheduler/registry.d.ts.map +1 -1
- package/dist/core/scheduler/types.d.ts +20 -3
- package/dist/core/scheduler/types.d.ts.map +1 -1
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +23 -2
- package/dist/core/session.d.ts +34 -0
- package/dist/core/session.d.ts.map +1 -0
- package/dist/core/session.js +105 -0
- package/dist/core/structured-log.d.ts +84 -0
- package/dist/core/structured-log.d.ts.map +1 -0
- package/dist/core/structured-log.js +137 -0
- package/dist/core/wrappers/bash.d.ts +24 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +70 -3
- package/dist/db/history-repo.d.ts +8 -0
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +76 -6
- package/dist/db/metrics-repo.d.ts +3 -0
- package/dist/db/metrics-repo.d.ts.map +1 -1
- package/dist/db/metrics-repo.js +16 -8
- package/dist/db/migrate.d.ts.map +1 -1
- package/dist/db/migrate.js +8 -1
- package/dist/db/schema.d.ts +1 -1
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +19 -0
- package/dist/gui-experimental.cjs +1 -0
- package/dist/history.d.ts +7 -0
- package/dist/history.d.ts.map +1 -1
- package/dist/history.js +13 -0
- package/dist/index.d.ts +137 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1323 -78
- package/dist/integrations.d.ts +64 -0
- package/dist/integrations.d.ts.map +1 -0
- package/dist/integrations.js +205 -0
- package/dist/notifications.d.ts +112 -6
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +396 -34
- package/dist/profiles.d.ts +60 -0
- package/dist/profiles.d.ts.map +1 -0
- package/dist/profiles.js +209 -0
- package/dist/rpc.d.ts +592 -4
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +233 -6
- package/dist/server.d.ts +2 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +473 -58
- package/dist/settings.d.ts +95 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +186 -8
- package/dist/shared/jobs-view.d.ts +43 -5
- package/dist/shared/jobs-view.d.ts.map +1 -1
- package/dist/shared/jobs-view.js +125 -7
- package/dist/task-transfer.d.ts +32 -3
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +101 -3
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +3 -11
- package/dist/workspaces.d.ts +43 -0
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +174 -8
- package/docs/ARCHITECTURE.md +32 -12
- package/docs/FEATURES.md +186 -10
- package/gui-experimental.cjs +4 -2
- package/package.json +15 -2
- package/scripts/demo-dashboard.mjs +12 -2
- package/src/core/analytics.ts +36 -0
- package/src/core/dry-run.ts +65 -4
- package/src/core/matrix.ts +10 -0
- package/src/core/one-shot.ts +173 -0
- package/src/core/otel.ts +128 -0
- package/src/core/prometheus.ts +215 -0
- package/src/core/ps-wrapper.ts +144 -4
- package/src/core/record-history.ts +13 -0
- package/src/core/schedule-gate.ts +213 -0
- package/src/core/schedule-v2.ts +533 -0
- package/src/core/scheduler/linux.ts +90 -3
- package/src/core/scheduler/mac.ts +35 -4
- package/src/core/scheduler/posix.ts +3 -0
- package/src/core/scheduler/registry.ts +4 -0
- package/src/core/scheduler/types.ts +20 -3
- package/src/core/scheduler/windows.ts +24 -2
- package/src/core/session.ts +115 -0
- package/src/core/structured-log.ts +205 -0
- package/src/core/wrappers/bash.ts +98 -2
- package/src/db/history-repo.ts +90 -7
- package/src/db/metrics-repo.ts +19 -7
- package/src/db/migrate.ts +7 -1
- package/src/db/schema.ts +25 -0
- package/src/gui.tsx +3832 -2868
- package/src/history.ts +17 -0
- package/src/index.ts +1670 -117
- package/src/integrations.ts +253 -0
- package/src/notifications.ts +516 -40
- package/src/profiles.ts +236 -0
- package/src/rpc.ts +244 -6
- package/src/server.ts +506 -58
- package/src/settings.ts +336 -9
- package/src/shared/jobs-view.ts +158 -8
- package/src/task-transfer.ts +151 -5
- package/src/tui.tsx +290 -14
- package/src/types.ts +3 -13
- package/src/workspaces.ts +214 -8
package/src/settings.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import crypto from "node:crypto";
|
|
1
2
|
import fs from "node:fs/promises";
|
|
2
3
|
import path from "node:path";
|
|
3
4
|
import { PLUGIN_DIR } from "./types.js";
|
|
@@ -8,6 +9,55 @@ export interface WebhookNotificationSettings {
|
|
|
8
9
|
enabled: boolean;
|
|
9
10
|
/** URL вебхука. */
|
|
10
11
|
url: string;
|
|
12
|
+
/** Таймаут запроса в мс (1000..120000). */
|
|
13
|
+
timeoutMs: number;
|
|
14
|
+
/** Сколько раз повторить при сетевой ошибке / 5xx / 429 (0..5). */
|
|
15
|
+
retryCount: number;
|
|
16
|
+
/** Базовая задержка backoff в мс; каждая следующая попытка ждёт вдвое дольше. */
|
|
17
|
+
retryDelayMs: number;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
/** Настраиваемые шаблоны сообщений о завершении задачи. */
|
|
21
|
+
export interface NotificationTemplates {
|
|
22
|
+
/** Шаблон успеха. Плейсхолдеры: {task} {status} {duration} {error} {emoji}. */
|
|
23
|
+
success: string;
|
|
24
|
+
/** Шаблон ошибки. {error} разворачивается в «: текст» или пустую строку. */
|
|
25
|
+
error: string;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/** Фильтры по задачам: include имеет приоритет, exclude сильнее include. */
|
|
29
|
+
export interface NotificationFilters {
|
|
30
|
+
/** Уведомлять только эти задачи (пусто — все). Поддерживает `*`. */
|
|
31
|
+
include: string[];
|
|
32
|
+
/** Никогда не уведомлять эти задачи. Поддерживает `*`. */
|
|
33
|
+
exclude: string[];
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
/** Уведомления о матрицах (Спринт 20). */
|
|
37
|
+
export interface MatrixNotificationSettings {
|
|
38
|
+
/** Включены ли уведомления о матрицах. */
|
|
39
|
+
enabled: boolean;
|
|
40
|
+
/** Сообщать о partial (часть клонов упала). */
|
|
41
|
+
onPartial: boolean;
|
|
42
|
+
/** Сообщать, когда упали все клоны. */
|
|
43
|
+
onAllFailed: boolean;
|
|
44
|
+
/** Порог «матрица зависла» в минутах (0 — детектор выключен). */
|
|
45
|
+
stuckAfterMinutes: number;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
/** Периодичность дайджеста. */
|
|
49
|
+
export type DigestFrequency = "daily" | "weekly";
|
|
50
|
+
|
|
51
|
+
/** Дайджест по истории запусков (Спринт 20). */
|
|
52
|
+
export interface DigestSettings {
|
|
53
|
+
/** Включён ли дайджест. */
|
|
54
|
+
enabled: boolean;
|
|
55
|
+
/** Ежедневно или еженедельно (по понедельникам). */
|
|
56
|
+
frequency: DigestFrequency;
|
|
57
|
+
/** Время отправки в формате HH:MM (локальное время сервера). */
|
|
58
|
+
time: string;
|
|
59
|
+
/** ISO-момент последней отправки — дедуп между перезапусками плагина. */
|
|
60
|
+
lastSentAt: string | null;
|
|
11
61
|
}
|
|
12
62
|
|
|
13
63
|
/**
|
|
@@ -23,6 +73,14 @@ export interface NotificationSettings {
|
|
|
23
73
|
onlyOnError: boolean;
|
|
24
74
|
/** Webhook-канал. */
|
|
25
75
|
webhook?: WebhookNotificationSettings;
|
|
76
|
+
/** Шаблоны сообщений. */
|
|
77
|
+
templates?: NotificationTemplates;
|
|
78
|
+
/** Фильтры по задачам. */
|
|
79
|
+
filters?: NotificationFilters;
|
|
80
|
+
/** Уведомления о матрицах. */
|
|
81
|
+
matrix?: MatrixNotificationSettings;
|
|
82
|
+
/** Периодический дайджест. */
|
|
83
|
+
digest?: DigestSettings;
|
|
26
84
|
}
|
|
27
85
|
|
|
28
86
|
/**
|
|
@@ -43,6 +101,34 @@ export interface HistorySettings {
|
|
|
43
101
|
lastCleanupDeleted: number;
|
|
44
102
|
}
|
|
45
103
|
|
|
104
|
+
/**
|
|
105
|
+
* Входящие webhook-триггеры (Спринт 22).
|
|
106
|
+
*
|
|
107
|
+
* Запрос: `POST /api/hooks/<task>?token=<token>` с заголовком
|
|
108
|
+
* `X-Scheduler-Signature: sha256=<hmac>` (совместим с `X-Hub-Signature-256`).
|
|
109
|
+
* Токен подтверждает, кто вызывает хук, HMAC — целостность тела запроса.
|
|
110
|
+
*/
|
|
111
|
+
export interface HookSettings {
|
|
112
|
+
/** Включены ли входящие webhook-триггеры. */
|
|
113
|
+
enabled: boolean;
|
|
114
|
+
/** Общий токен в query-параметре `token` (сравнивается timing-safe). */
|
|
115
|
+
token: string;
|
|
116
|
+
/** Секрет для HMAC-SHA256 по сырому телу запроса. */
|
|
117
|
+
secret: string;
|
|
118
|
+
/** Требовать HMAC-подпись. Выключение допустимо только для локальных тестов. */
|
|
119
|
+
requireSignature: boolean;
|
|
120
|
+
/** Максимальный размер тела запроса в байтах (1 KiB..5 MiB). */
|
|
121
|
+
maxBodyBytes: number;
|
|
122
|
+
/** Допустимое расхождение `X-Scheduler-Timestamp` с текущим временем, секунды. 0 — не проверять. */
|
|
123
|
+
timestampToleranceSeconds: number;
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
/** Настройки внешних интеграций (Спринт 22). */
|
|
127
|
+
export interface IntegrationSettings {
|
|
128
|
+
/** Входящие webhook-триггеры из CI/CD. */
|
|
129
|
+
hooks: HookSettings;
|
|
130
|
+
}
|
|
131
|
+
|
|
46
132
|
/**
|
|
47
133
|
* Глобальные настройки плагина, которые меняются из GUI.
|
|
48
134
|
* Хранятся в settings.json рядом с tasks.json / history.json.
|
|
@@ -56,6 +142,8 @@ export interface SchedulerSettings {
|
|
|
56
142
|
notifications: NotificationSettings;
|
|
57
143
|
/** Ретеншн истории запусков. */
|
|
58
144
|
history: HistorySettings;
|
|
145
|
+
/** Внешние интеграции: входящие webhook-триггеры. */
|
|
146
|
+
integrations: IntegrationSettings;
|
|
59
147
|
}
|
|
60
148
|
|
|
61
149
|
export const SETTINGS_FILE = path.join(PLUGIN_DIR, "settings.json");
|
|
@@ -64,6 +152,40 @@ export const DEFAULT_WINTER_MODE = false;
|
|
|
64
152
|
export const DEFAULT_RETENTION_DAYS = 30;
|
|
65
153
|
export const DEFAULT_MAX_RECORDS = 5000;
|
|
66
154
|
|
|
155
|
+
/** Уведомления (Спринт 20): таймаут webhook, повторы и порог «зависшей» матрицы. */
|
|
156
|
+
export const DEFAULT_WEBHOOK_TIMEOUT_MS = 10_000;
|
|
157
|
+
export const DEFAULT_WEBHOOK_RETRY_COUNT = 2;
|
|
158
|
+
export const DEFAULT_WEBHOOK_RETRY_DELAY_MS = 1_000;
|
|
159
|
+
export const DEFAULT_STUCK_AFTER_MINUTES = 60;
|
|
160
|
+
|
|
161
|
+
/** Входящие хуки (Спринт 22): тело до 256 KiB, timestamp ±5 минут. */
|
|
162
|
+
export const DEFAULT_HOOK_MAX_BODY_BYTES = 256 * 1024;
|
|
163
|
+
export const DEFAULT_HOOK_TIMESTAMP_TOLERANCE_SECONDS = 300;
|
|
164
|
+
const MAX_HOOK_BODY_BYTES = 5 * 1024 * 1024;
|
|
165
|
+
const MAX_HOOK_CREDENTIAL_LENGTH = 512;
|
|
166
|
+
|
|
167
|
+
/** Значения интеграций по умолчанию: хуки выключены, подпись обязательна. */
|
|
168
|
+
export function defaultIntegrations(): IntegrationSettings {
|
|
169
|
+
return {
|
|
170
|
+
hooks: {
|
|
171
|
+
enabled: false,
|
|
172
|
+
token: "",
|
|
173
|
+
secret: "",
|
|
174
|
+
requireSignature: true,
|
|
175
|
+
maxBodyBytes: DEFAULT_HOOK_MAX_BODY_BYTES,
|
|
176
|
+
timestampToleranceSeconds: DEFAULT_HOOK_TIMESTAMP_TOLERANCE_SECONDS,
|
|
177
|
+
},
|
|
178
|
+
};
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
/** Генерирует криптостойкие учётные данные для входящего хука. */
|
|
182
|
+
export function generateHookCredentials(): { token: string; secret: string } {
|
|
183
|
+
return {
|
|
184
|
+
token: crypto.randomBytes(24).toString("hex"),
|
|
185
|
+
secret: crypto.randomBytes(32).toString("hex"),
|
|
186
|
+
};
|
|
187
|
+
}
|
|
188
|
+
|
|
67
189
|
/** Ретеншн по умолчанию: 30 дней и не больше 5000 записей. */
|
|
68
190
|
export function defaultHistorySettings(): HistorySettings {
|
|
69
191
|
return {
|
|
@@ -111,7 +233,30 @@ export function defaultNotifications(): NotificationSettings {
|
|
|
111
233
|
return {
|
|
112
234
|
enabled: false,
|
|
113
235
|
onlyOnError: true,
|
|
114
|
-
webhook: {
|
|
236
|
+
webhook: {
|
|
237
|
+
enabled: false,
|
|
238
|
+
url: "",
|
|
239
|
+
timeoutMs: DEFAULT_WEBHOOK_TIMEOUT_MS,
|
|
240
|
+
retryCount: DEFAULT_WEBHOOK_RETRY_COUNT,
|
|
241
|
+
retryDelayMs: DEFAULT_WEBHOOK_RETRY_DELAY_MS,
|
|
242
|
+
},
|
|
243
|
+
templates: {
|
|
244
|
+
success: '✅ Задача "{task}" выполнена ({duration})',
|
|
245
|
+
error: '❌ Задача "{task}" упала ({duration}){error}',
|
|
246
|
+
},
|
|
247
|
+
filters: { include: [], exclude: [] },
|
|
248
|
+
matrix: {
|
|
249
|
+
enabled: true,
|
|
250
|
+
onPartial: true,
|
|
251
|
+
onAllFailed: true,
|
|
252
|
+
stuckAfterMinutes: DEFAULT_STUCK_AFTER_MINUTES,
|
|
253
|
+
},
|
|
254
|
+
digest: {
|
|
255
|
+
enabled: false,
|
|
256
|
+
frequency: "daily",
|
|
257
|
+
time: "09:00",
|
|
258
|
+
lastSentAt: null,
|
|
259
|
+
},
|
|
115
260
|
};
|
|
116
261
|
}
|
|
117
262
|
|
|
@@ -131,24 +276,82 @@ function normalizeWinterMode(value: unknown, fallback: boolean): boolean {
|
|
|
131
276
|
return fallback;
|
|
132
277
|
}
|
|
133
278
|
|
|
279
|
+
/** Приводит значение к конечному целому в диапазоне [min, max]. */
|
|
280
|
+
function normalizeIntInRange(
|
|
281
|
+
value: unknown,
|
|
282
|
+
fallback: number,
|
|
283
|
+
min: number,
|
|
284
|
+
max: number
|
|
285
|
+
): number {
|
|
286
|
+
const n = Number(value);
|
|
287
|
+
if (!Number.isFinite(n)) return fallback;
|
|
288
|
+
return Math.min(max, Math.max(min, Math.floor(n)));
|
|
289
|
+
}
|
|
290
|
+
|
|
291
|
+
/** Приводит время HH:MM к безопасному виду. */
|
|
292
|
+
function normalizeDailyTime(value: unknown, fallback: string): string {
|
|
293
|
+
if (typeof value === "string" && /^([01]\d|2[0-3]):[0-5]\d$/.test(value.trim())) {
|
|
294
|
+
return value.trim();
|
|
295
|
+
}
|
|
296
|
+
return fallback;
|
|
297
|
+
}
|
|
298
|
+
|
|
299
|
+
/** Список имён задач: массив строк, обрезанных и без пустых значений. */
|
|
300
|
+
function normalizeNameList(value: unknown, fallback: string[]): string[] {
|
|
301
|
+
if (!Array.isArray(value)) return [...fallback];
|
|
302
|
+
return value
|
|
303
|
+
.filter((item): item is string => typeof item === "string")
|
|
304
|
+
.map((item) => item.trim())
|
|
305
|
+
.filter((item) => item.length > 0);
|
|
306
|
+
}
|
|
307
|
+
|
|
308
|
+
function asRecord(value: unknown): Record<string, unknown> | undefined {
|
|
309
|
+
return value && typeof value === "object" && !Array.isArray(value)
|
|
310
|
+
? (value as Record<string, unknown>)
|
|
311
|
+
: undefined;
|
|
312
|
+
}
|
|
313
|
+
|
|
134
314
|
/** Приводит настройки уведомлений к безопасному виду. */
|
|
135
315
|
function normalizeNotifications(
|
|
136
316
|
value: unknown,
|
|
137
317
|
fallback: NotificationSettings
|
|
138
318
|
): NotificationSettings {
|
|
139
|
-
|
|
319
|
+
const fallbackWebhook = fallback.webhook ?? defaultNotifications().webhook!;
|
|
320
|
+
const fallbackTemplates = fallback.templates ?? defaultNotifications().templates!;
|
|
321
|
+
const fallbackFilters = fallback.filters ?? { include: [], exclude: [] };
|
|
322
|
+
const fallbackMatrix = fallback.matrix ?? defaultNotifications().matrix!;
|
|
323
|
+
const fallbackDigest = fallback.digest ?? defaultNotifications().digest!;
|
|
324
|
+
|
|
325
|
+
const raw = asRecord(value);
|
|
326
|
+
if (!raw) {
|
|
140
327
|
return {
|
|
141
328
|
...fallback,
|
|
142
|
-
webhook:
|
|
329
|
+
webhook: { ...fallbackWebhook },
|
|
330
|
+
templates: { ...fallbackTemplates },
|
|
331
|
+
filters: {
|
|
332
|
+
include: [...fallbackFilters.include],
|
|
333
|
+
exclude: [...fallbackFilters.exclude],
|
|
334
|
+
},
|
|
335
|
+
matrix: { ...fallbackMatrix },
|
|
336
|
+
digest: { ...fallbackDigest },
|
|
143
337
|
};
|
|
144
338
|
}
|
|
145
339
|
|
|
146
|
-
const
|
|
147
|
-
const
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
340
|
+
const rawWebhook = asRecord(raw.webhook);
|
|
341
|
+
const rawTemplates = asRecord(raw.templates);
|
|
342
|
+
const rawFilters = asRecord(raw.filters);
|
|
343
|
+
const rawMatrix = asRecord(raw.matrix);
|
|
344
|
+
const rawDigest = asRecord(raw.digest);
|
|
345
|
+
|
|
346
|
+
const frequency: DigestFrequency =
|
|
347
|
+
rawDigest?.frequency === "weekly" || rawDigest?.frequency === "daily"
|
|
348
|
+
? rawDigest.frequency
|
|
349
|
+
: fallbackDigest.frequency;
|
|
350
|
+
|
|
351
|
+
const lastSentAt =
|
|
352
|
+
typeof rawDigest?.lastSentAt === "string" && rawDigest.lastSentAt.trim()
|
|
353
|
+
? rawDigest.lastSentAt.trim()
|
|
354
|
+
: null;
|
|
152
355
|
|
|
153
356
|
return {
|
|
154
357
|
enabled: typeof raw.enabled === "boolean" ? raw.enabled : fallback.enabled,
|
|
@@ -163,6 +366,109 @@ function normalizeNotifications(
|
|
|
163
366
|
typeof rawWebhook?.url === "string"
|
|
164
367
|
? rawWebhook.url.trim()
|
|
165
368
|
: fallbackWebhook.url,
|
|
369
|
+
timeoutMs: normalizeIntInRange(
|
|
370
|
+
rawWebhook?.timeoutMs,
|
|
371
|
+
fallbackWebhook.timeoutMs,
|
|
372
|
+
1_000,
|
|
373
|
+
120_000
|
|
374
|
+
),
|
|
375
|
+
retryCount: normalizeIntInRange(
|
|
376
|
+
rawWebhook?.retryCount,
|
|
377
|
+
fallbackWebhook.retryCount,
|
|
378
|
+
0,
|
|
379
|
+
5
|
|
380
|
+
),
|
|
381
|
+
retryDelayMs: normalizeIntInRange(
|
|
382
|
+
rawWebhook?.retryDelayMs,
|
|
383
|
+
fallbackWebhook.retryDelayMs,
|
|
384
|
+
100,
|
|
385
|
+
60_000
|
|
386
|
+
),
|
|
387
|
+
},
|
|
388
|
+
templates: {
|
|
389
|
+
success:
|
|
390
|
+
typeof rawTemplates?.success === "string" && rawTemplates.success.trim()
|
|
391
|
+
? rawTemplates.success
|
|
392
|
+
: fallbackTemplates.success,
|
|
393
|
+
error:
|
|
394
|
+
typeof rawTemplates?.error === "string" && rawTemplates.error.trim()
|
|
395
|
+
? rawTemplates.error
|
|
396
|
+
: fallbackTemplates.error,
|
|
397
|
+
},
|
|
398
|
+
filters: {
|
|
399
|
+
include: normalizeNameList(rawFilters?.include, fallbackFilters.include),
|
|
400
|
+
exclude: normalizeNameList(rawFilters?.exclude, fallbackFilters.exclude),
|
|
401
|
+
},
|
|
402
|
+
matrix: {
|
|
403
|
+
enabled:
|
|
404
|
+
typeof rawMatrix?.enabled === "boolean"
|
|
405
|
+
? rawMatrix.enabled
|
|
406
|
+
: fallbackMatrix.enabled,
|
|
407
|
+
onPartial:
|
|
408
|
+
typeof rawMatrix?.onPartial === "boolean"
|
|
409
|
+
? rawMatrix.onPartial
|
|
410
|
+
: fallbackMatrix.onPartial,
|
|
411
|
+
onAllFailed:
|
|
412
|
+
typeof rawMatrix?.onAllFailed === "boolean"
|
|
413
|
+
? rawMatrix.onAllFailed
|
|
414
|
+
: fallbackMatrix.onAllFailed,
|
|
415
|
+
stuckAfterMinutes: normalizeIntInRange(
|
|
416
|
+
rawMatrix?.stuckAfterMinutes,
|
|
417
|
+
fallbackMatrix.stuckAfterMinutes,
|
|
418
|
+
0,
|
|
419
|
+
10_080
|
|
420
|
+
),
|
|
421
|
+
},
|
|
422
|
+
digest: {
|
|
423
|
+
enabled:
|
|
424
|
+
typeof rawDigest?.enabled === "boolean"
|
|
425
|
+
? rawDigest.enabled
|
|
426
|
+
: fallbackDigest.enabled,
|
|
427
|
+
frequency,
|
|
428
|
+
time: normalizeDailyTime(rawDigest?.time, fallbackDigest.time),
|
|
429
|
+
lastSentAt,
|
|
430
|
+
},
|
|
431
|
+
};
|
|
432
|
+
}
|
|
433
|
+
|
|
434
|
+
/** Приводит настройки интеграций к безопасному виду. */
|
|
435
|
+
function normalizeIntegrations(
|
|
436
|
+
value: unknown,
|
|
437
|
+
fallback: IntegrationSettings
|
|
438
|
+
): IntegrationSettings {
|
|
439
|
+
const fallbackHooks = fallback.hooks ?? defaultIntegrations().hooks;
|
|
440
|
+
const raw = asRecord(value);
|
|
441
|
+
const rawHooks = asRecord(raw?.hooks);
|
|
442
|
+
|
|
443
|
+
const readCredential = (input: unknown, previous: string): string => {
|
|
444
|
+
if (typeof input !== "string") return previous;
|
|
445
|
+
return input.trim().slice(0, MAX_HOOK_CREDENTIAL_LENGTH);
|
|
446
|
+
};
|
|
447
|
+
|
|
448
|
+
return {
|
|
449
|
+
hooks: {
|
|
450
|
+
enabled:
|
|
451
|
+
typeof rawHooks?.enabled === "boolean"
|
|
452
|
+
? rawHooks.enabled
|
|
453
|
+
: fallbackHooks.enabled,
|
|
454
|
+
token: readCredential(rawHooks?.token, fallbackHooks.token),
|
|
455
|
+
secret: readCredential(rawHooks?.secret, fallbackHooks.secret),
|
|
456
|
+
requireSignature:
|
|
457
|
+
typeof rawHooks?.requireSignature === "boolean"
|
|
458
|
+
? rawHooks.requireSignature
|
|
459
|
+
: fallbackHooks.requireSignature,
|
|
460
|
+
maxBodyBytes: normalizeIntInRange(
|
|
461
|
+
rawHooks?.maxBodyBytes,
|
|
462
|
+
fallbackHooks.maxBodyBytes,
|
|
463
|
+
1_024,
|
|
464
|
+
MAX_HOOK_BODY_BYTES
|
|
465
|
+
),
|
|
466
|
+
timestampToleranceSeconds: normalizeIntInRange(
|
|
467
|
+
rawHooks?.timestampToleranceSeconds,
|
|
468
|
+
fallbackHooks.timestampToleranceSeconds,
|
|
469
|
+
0,
|
|
470
|
+
86_400
|
|
471
|
+
),
|
|
166
472
|
},
|
|
167
473
|
};
|
|
168
474
|
}
|
|
@@ -171,6 +477,7 @@ function normalizeNotifications(
|
|
|
171
477
|
export async function loadSettings(): Promise<SchedulerSettings> {
|
|
172
478
|
const fallbackNotifications = defaultNotifications();
|
|
173
479
|
const fallbackHistory = defaultHistorySettings();
|
|
480
|
+
const fallbackIntegrations = defaultIntegrations();
|
|
174
481
|
try {
|
|
175
482
|
const raw = await fs.readFile(SETTINGS_FILE, "utf8");
|
|
176
483
|
const parsed = JSON.parse(raw) as Partial<SchedulerSettings> | null;
|
|
@@ -188,6 +495,10 @@ export async function loadSettings(): Promise<SchedulerSettings> {
|
|
|
188
495
|
fallbackNotifications
|
|
189
496
|
),
|
|
190
497
|
history: normalizeHistorySettings(parsed?.history, fallbackHistory),
|
|
498
|
+
integrations: normalizeIntegrations(
|
|
499
|
+
parsed?.integrations,
|
|
500
|
+
fallbackIntegrations
|
|
501
|
+
),
|
|
191
502
|
};
|
|
192
503
|
} catch {
|
|
193
504
|
return {
|
|
@@ -195,6 +506,7 @@ export async function loadSettings(): Promise<SchedulerSettings> {
|
|
|
195
506
|
winterMode: DEFAULT_WINTER_MODE,
|
|
196
507
|
notifications: fallbackNotifications,
|
|
197
508
|
history: fallbackHistory,
|
|
509
|
+
integrations: fallbackIntegrations,
|
|
198
510
|
};
|
|
199
511
|
}
|
|
200
512
|
}
|
|
@@ -221,7 +533,22 @@ export async function saveSettings(
|
|
|
221
533
|
patch.history !== undefined
|
|
222
534
|
? normalizeHistorySettings(patch.history, current.history)
|
|
223
535
|
: current.history,
|
|
536
|
+
integrations:
|
|
537
|
+
patch.integrations !== undefined
|
|
538
|
+
? normalizeIntegrations(patch.integrations, current.integrations)
|
|
539
|
+
: current.integrations,
|
|
224
540
|
};
|
|
541
|
+
|
|
542
|
+
// Удобство: при включении хуков без явных учётных данных генерируем их,
|
|
543
|
+
// чтобы функция сразу работала, а секреты не приходилось придумывать вручную.
|
|
544
|
+
if (next.integrations.hooks.enabled) {
|
|
545
|
+
if (!next.integrations.hooks.token || !next.integrations.hooks.secret) {
|
|
546
|
+
const generated = generateHookCredentials();
|
|
547
|
+
if (!next.integrations.hooks.token) next.integrations.hooks.token = generated.token;
|
|
548
|
+
if (!next.integrations.hooks.secret) next.integrations.hooks.secret = generated.secret;
|
|
549
|
+
}
|
|
550
|
+
}
|
|
551
|
+
|
|
225
552
|
await fs.mkdir(PLUGIN_DIR, { recursive: true });
|
|
226
553
|
await fs.writeFile(SETTINGS_FILE, JSON.stringify(next, null, 2), "utf8");
|
|
227
554
|
return next;
|
package/src/shared/jobs-view.ts
CHANGED
|
@@ -1,10 +1,106 @@
|
|
|
1
|
-
|
|
1
|
+
import { getSchedulerBackend } from "../core/scheduler/index.js"
|
|
2
|
+
import { latestHistoryByTask, loadHistory, type HistoryRecord } from "../history.js"
|
|
3
|
+
import {
|
|
4
|
+
loadTaskDefinitions,
|
|
5
|
+
type TaskDefinition,
|
|
6
|
+
} from "../task-transfer.js"
|
|
7
|
+
import type { ScheduledTaskInfo } from "../types.js"
|
|
8
|
+
|
|
9
|
+
export type JobStatus = "running" | "success" | "error" | "partial" | "idle" | "unknown"
|
|
2
10
|
|
|
3
11
|
export interface JobView {
|
|
4
12
|
name: string
|
|
5
13
|
status: JobStatus
|
|
14
|
+
/** Задача поставлена на паузу в планировщике ОС. */
|
|
15
|
+
paused?: boolean
|
|
6
16
|
nextRun?: string
|
|
7
17
|
lastRun?: string
|
|
18
|
+
/** Для клона матрицы — имя родительской задачи. */
|
|
19
|
+
matrixParentId?: string
|
|
20
|
+
/** true — задача является родителем матрицы (шаблоном fan-out). */
|
|
21
|
+
isMatrixParent?: boolean
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/** Строка панели: задача и её отступ в дереве матрицы. */
|
|
25
|
+
export interface JobDisplayRow {
|
|
26
|
+
job: JobView
|
|
27
|
+
/** 0 — корневая задача, 1 — клон матрицы. */
|
|
28
|
+
depth: number
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* Упорядочивает задачи для TUI: родитель матрицы идёт первым, сразу за ним —
|
|
33
|
+
* его клоны с отступом. Клоны без родителя (осиротевшие) остаются корневыми,
|
|
34
|
+
* чтобы задача не исчезла из панели.
|
|
35
|
+
*/
|
|
36
|
+
export function groupJobsForDisplay(jobs: readonly JobView[]): JobDisplayRow[] {
|
|
37
|
+
const byName = new Map<string, JobView[]>()
|
|
38
|
+
for (const job of jobs) {
|
|
39
|
+
const key = job.name.toLowerCase()
|
|
40
|
+
const list = byName.get(key) ?? []
|
|
41
|
+
list.push(job)
|
|
42
|
+
byName.set(key, list)
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
const children = new Map<string, JobView[]>()
|
|
46
|
+
const roots: JobView[] = []
|
|
47
|
+
for (const job of jobs) {
|
|
48
|
+
const parent = job.matrixParentId?.trim().toLowerCase()
|
|
49
|
+
if (parent && byName.has(parent) && parent !== job.name.toLowerCase()) {
|
|
50
|
+
const list = children.get(parent) ?? []
|
|
51
|
+
list.push(job)
|
|
52
|
+
children.set(parent, list)
|
|
53
|
+
} else {
|
|
54
|
+
roots.push(job)
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
const byNameAsc = (a: JobView, b: JobView) => a.name.localeCompare(b.name)
|
|
59
|
+
roots.sort(byNameAsc)
|
|
60
|
+
for (const list of children.values()) list.sort(byNameAsc)
|
|
61
|
+
|
|
62
|
+
const rows: JobDisplayRow[] = []
|
|
63
|
+
for (const root of roots) {
|
|
64
|
+
rows.push({ job: root, depth: 0 })
|
|
65
|
+
for (const child of children.get(root.name.toLowerCase()) ?? []) {
|
|
66
|
+
rows.push({ job: child, depth: 1 })
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return rows
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
/**
|
|
73
|
+
* Перемещает выбор по строкам панели с зацикливанием.
|
|
74
|
+
* Возвращает имя задачи, которое нужно выделить, либо undefined для пустого списка.
|
|
75
|
+
*/
|
|
76
|
+
export function nextJobSelection(
|
|
77
|
+
rows: readonly JobDisplayRow[],
|
|
78
|
+
currentName: string | undefined,
|
|
79
|
+
delta: number
|
|
80
|
+
): string | undefined {
|
|
81
|
+
if (rows.length === 0) return undefined
|
|
82
|
+
const current = currentName?.trim().toLowerCase()
|
|
83
|
+
let index = rows.findIndex((row) => row.job.name.toLowerCase() === current)
|
|
84
|
+
if (index === -1) index = delta > 0 ? -1 : 0
|
|
85
|
+
const step = delta === 0 ? 1 : delta
|
|
86
|
+
index = ((index + step) % rows.length + rows.length) % rows.length
|
|
87
|
+
return rows[index]?.job.name
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
/**
|
|
91
|
+
* Готовит текст лога для диалога TUI: оставляет последние строки и
|
|
92
|
+
* подставляет пояснение, если лога ещё нет.
|
|
93
|
+
*/
|
|
94
|
+
export function formatJobLog(
|
|
95
|
+
logs: string | undefined,
|
|
96
|
+
error: string | undefined,
|
|
97
|
+
maxLines = 40
|
|
98
|
+
): string {
|
|
99
|
+
const source = logs?.trim() ? logs : error?.trim()
|
|
100
|
+
if (!source) return "Лог пуст."
|
|
101
|
+
const limit = Math.max(1, Math.min(Math.floor(maxLines), 200))
|
|
102
|
+
const lines = source.replace(/\r\n/g, "\n").split("\n")
|
|
103
|
+
return lines.slice(-limit).join("\n")
|
|
8
104
|
}
|
|
9
105
|
|
|
10
106
|
/**
|
|
@@ -19,20 +115,74 @@ export function statusIcon(status: JobStatus): string {
|
|
|
19
115
|
return "✗"
|
|
20
116
|
case "success":
|
|
21
117
|
return "✓"
|
|
118
|
+
case "partial":
|
|
119
|
+
return "◐"
|
|
120
|
+
case "idle":
|
|
121
|
+
// Задача создана, но ещё ни разу не запускалась.
|
|
122
|
+
return "○"
|
|
22
123
|
default:
|
|
23
124
|
return "?"
|
|
24
125
|
}
|
|
25
126
|
}
|
|
26
127
|
|
|
128
|
+
/** Переводит запись истории в статус панели (timeout считаем ошибкой). */
|
|
129
|
+
function historyStatus(record: HistoryRecord | undefined): JobStatus {
|
|
130
|
+
if (!record) return "idle"
|
|
131
|
+
if (record.status === "timeout") return "error"
|
|
132
|
+
return record.status
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
/**
|
|
136
|
+
* Собирает панельное представление из уже прочитанных данных.
|
|
137
|
+
* Вынесено отдельно, чтобы логику статусов и матричных связей можно было
|
|
138
|
+
* проверить без реального планировщика.
|
|
139
|
+
*/
|
|
140
|
+
export function buildJobsView(
|
|
141
|
+
tasks: readonly ScheduledTaskInfo[],
|
|
142
|
+
history: readonly HistoryRecord[],
|
|
143
|
+
definitions: readonly TaskDefinition[]
|
|
144
|
+
): JobView[] {
|
|
145
|
+
const latest = latestHistoryByTask(history)
|
|
146
|
+
const defs = new Map(
|
|
147
|
+
definitions.map((definition) => [definition.name.toLowerCase(), definition])
|
|
148
|
+
)
|
|
149
|
+
return tasks.map((task) => {
|
|
150
|
+
const name = task.taskName
|
|
151
|
+
const record = latest.get(name.toLowerCase())
|
|
152
|
+
const definition = defs.get(name.toLowerCase())
|
|
153
|
+
const matrixParentId = definition?.matrixParentId?.trim()
|
|
154
|
+
return {
|
|
155
|
+
name,
|
|
156
|
+
status: historyStatus(record),
|
|
157
|
+
paused: Boolean(task.paused),
|
|
158
|
+
nextRun: task.nextRunTime,
|
|
159
|
+
lastRun: task.lastRunTime,
|
|
160
|
+
...(matrixParentId ? { matrixParentId } : {}),
|
|
161
|
+
...(definition?.matrix || definition?.isMatrixParent
|
|
162
|
+
? { isMatrixParent: true }
|
|
163
|
+
: {}),
|
|
164
|
+
}
|
|
165
|
+
})
|
|
166
|
+
}
|
|
167
|
+
|
|
27
168
|
/**
|
|
28
169
|
* Возвращает список задач планировщика в едином формате для TUI и GUI.
|
|
29
170
|
*
|
|
30
|
-
*
|
|
31
|
-
*
|
|
32
|
-
*
|
|
171
|
+
* Читает реальные задачи из бэкенда планировщика и последнюю запись истории
|
|
172
|
+
* по каждой задаче. Если бэкенд недоступен (например, нет прав на schtasks),
|
|
173
|
+
* возвращает пустой список — панель покажет честное «нет данных», а не
|
|
174
|
+
* выдуманные задачи.
|
|
33
175
|
*/
|
|
34
|
-
export async function getJobsView(
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
176
|
+
export async function getJobsView(_context: unknown): Promise<JobView[]> {
|
|
177
|
+
try {
|
|
178
|
+
const backend = getSchedulerBackend()
|
|
179
|
+
const [tasks, history, definitions] = await Promise.all([
|
|
180
|
+
backend.listTasks(),
|
|
181
|
+
loadHistory(),
|
|
182
|
+
loadTaskDefinitions(),
|
|
183
|
+
])
|
|
184
|
+
return buildJobsView(tasks, history, definitions)
|
|
185
|
+
} catch {
|
|
186
|
+
return []
|
|
187
|
+
}
|
|
38
188
|
}
|