opencode-windows-scheduler 1.4.0 → 1.5.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 +61 -1
- package/LICENSE +21 -21
- package/README.md +26 -4
- package/ROADMAP-STRATEGY.md +43 -24
- package/ROADMAP.md +549 -31
- package/dist/core/dry-run.d.ts +41 -0
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +165 -16
- package/dist/core/file-watcher.d.ts.map +1 -1
- package/dist/core/file-watcher.js +53 -10
- package/dist/core/git-trigger.d.ts +80 -0
- package/dist/core/git-trigger.d.ts.map +1 -0
- package/dist/core/git-trigger.js +294 -0
- package/dist/core/glob.d.ts +38 -0
- package/dist/core/glob.d.ts.map +1 -0
- package/dist/core/glob.js +233 -0
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +48 -22
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +7 -0
- package/dist/core/schedule-gate.js +55 -30
- package/dist/core/schedule-v2.d.ts +29 -1
- package/dist/core/schedule-v2.d.ts.map +1 -1
- package/dist/core/schedule-v2.js +107 -17
- package/dist/core/scheduler/types.d.ts +7 -1
- package/dist/core/scheduler/types.d.ts.map +1 -1
- package/dist/core/scheduler/windows.d.ts +6 -2
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +25 -10
- package/dist/core/telegram.d.ts.map +1 -1
- package/dist/core/telegram.js +13 -10
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +4 -0
- package/dist/db/git-state-repo.d.ts +16 -0
- package/dist/db/git-state-repo.d.ts.map +1 -0
- package/dist/db/git-state-repo.js +38 -0
- package/dist/db/schema.d.ts +1 -1
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +8 -0
- package/dist/i18n.d.ts +52 -0
- package/dist/i18n.d.ts.map +1 -0
- package/dist/i18n.js +292 -0
- package/dist/index.d.ts +50 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1020 -197
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +74 -40
- package/dist/rpc.d.ts +238 -2
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +79 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +89 -48
- package/dist/settings.d.ts +3 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +20 -8
- package/dist/task-transfer.d.ts +43 -3
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +94 -6
- package/dist/templates.d.ts +1 -1
- package/dist/templates.d.ts.map +1 -1
- package/dist/types.d.ts +11 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +32 -0
- package/docs/ARCHITECTURE.md +37 -1
- package/docs/FEATURES.md +70 -0
- package/docs/README.ru.md +19 -3
- package/gui-experimental.cjs +9 -4
- package/locales/en.json +695 -0
- package/locales/ru.json +695 -0
- package/package.json +9 -3
- package/scripts/test-locale.mjs +44 -0
- package/src/core/dry-run.ts +244 -19
- package/src/core/file-watcher.ts +65 -10
- package/src/core/git-trigger.ts +373 -0
- package/src/core/glob.ts +226 -0
- package/src/core/matrix.ts +52 -26
- package/src/core/ps-wrapper.ts +7 -0
- package/src/core/schedule-gate.ts +67 -33
- package/src/core/schedule-v2.ts +152 -17
- package/src/core/scheduler/types.ts +7 -1
- package/src/core/scheduler/windows.ts +25 -10
- package/src/core/telegram.ts +16 -10
- package/src/core/wrappers/bash.ts +4 -0
- package/src/db/git-state-repo.ts +62 -0
- package/src/db/schema.ts +8 -0
- package/src/gui.tsx +772 -456
- package/src/i18n.ts +339 -0
- package/src/index.ts +1274 -212
- package/src/notifications.ts +83 -42
- package/src/rpc.ts +79 -2
- package/src/server.ts +89 -48
- package/src/settings.ts +38 -10
- package/src/task-transfer.ts +148 -5
- package/src/templates.ts +1 -1
- package/src/types.ts +37 -0
package/dist/core/matrix.js
CHANGED
|
@@ -15,13 +15,18 @@ import { getHistory, recordRun } from "../db/history-repo.js";
|
|
|
15
15
|
import { notifyMatrixCompletion } from "../notifications.js";
|
|
16
16
|
import { getWorkspace } from "../workspaces.js";
|
|
17
17
|
import { createSchedulerBackend } from "./scheduler/index.js";
|
|
18
|
+
import { t } from "../i18n.js";
|
|
18
19
|
/** Суффикс агрегирующей задачи, запускаемой после всех клонов. */
|
|
19
20
|
export const MATRIX_COMPLETE_SUFFIX = "-matrix-complete";
|
|
20
21
|
/** Имя клона: <родитель>-matrix-<workspace>. */
|
|
21
22
|
export function matrixCloneName(parentName, workspaceName) {
|
|
22
23
|
const parent = parentName.trim();
|
|
23
24
|
const ws = workspaceName.trim() || "workspace";
|
|
24
|
-
const safeWs = ws
|
|
25
|
+
const safeWs = ws
|
|
26
|
+
// Спринт 27.5: метасимволы оболочки и недопустимые для имени задачи
|
|
27
|
+
// символы заменяем на дефис, чтобы имя клона проходило validateTaskName.
|
|
28
|
+
.replace(/[\\/:*?"<>|&^%'`;()]+/g, "-")
|
|
29
|
+
.replace(/\s+/g, "-");
|
|
25
30
|
return `${parent}-matrix-${safeWs}`;
|
|
26
31
|
}
|
|
27
32
|
/** Имя агрегирующей задачи matrix-complete. */
|
|
@@ -39,14 +44,17 @@ export function isMatrixCompleteName(name) {
|
|
|
39
44
|
export function expandMatrixTask(task) {
|
|
40
45
|
const matrix = task.matrix;
|
|
41
46
|
if (!matrix || !Array.isArray(matrix.workspaceIds) || matrix.workspaceIds.length === 0) {
|
|
42
|
-
throw new Error(
|
|
47
|
+
throw new Error(t("matrix.error.workspaceIdsEmpty", { task: task.name }));
|
|
43
48
|
}
|
|
44
49
|
const clones = [];
|
|
45
50
|
const usedNames = new Set();
|
|
46
51
|
for (const workspaceId of matrix.workspaceIds) {
|
|
47
52
|
const workspace = getWorkspace(workspaceId);
|
|
48
53
|
if (!workspace) {
|
|
49
|
-
throw new Error(
|
|
54
|
+
throw new Error(t("matrix.error.workspaceMissing", {
|
|
55
|
+
task: task.name,
|
|
56
|
+
workspace: workspaceId,
|
|
57
|
+
}));
|
|
50
58
|
}
|
|
51
59
|
const name = matrixCloneName(task.name, workspace.name);
|
|
52
60
|
if (usedNames.has(name.toLowerCase()))
|
|
@@ -95,7 +103,7 @@ export function expandMatrixTask(task) {
|
|
|
95
103
|
clones.push(cloneDefinition);
|
|
96
104
|
}
|
|
97
105
|
if (clones.length === 0) {
|
|
98
|
-
throw new Error(
|
|
106
|
+
throw new Error(t("matrix.error.cloneCreation", { task: task.name }));
|
|
99
107
|
}
|
|
100
108
|
return clones;
|
|
101
109
|
}
|
|
@@ -136,26 +144,41 @@ export function aggregateMatrixResults(parentId) {
|
|
|
136
144
|
let message;
|
|
137
145
|
if (totalCount === 0) {
|
|
138
146
|
status = "empty";
|
|
139
|
-
message =
|
|
147
|
+
message = t("matrix.aggregate.empty", { parent: parentId });
|
|
140
148
|
}
|
|
141
149
|
else if (pendingCount > 0) {
|
|
142
150
|
status = "running";
|
|
143
|
-
message =
|
|
151
|
+
message = t("matrix.aggregate.running", {
|
|
152
|
+
done: totalCount - pendingCount,
|
|
153
|
+
total: totalCount,
|
|
154
|
+
});
|
|
144
155
|
}
|
|
145
156
|
else if (errorCount === 0) {
|
|
146
157
|
status = "success";
|
|
147
|
-
message =
|
|
158
|
+
message = t("matrix.aggregate.success", { total: totalCount });
|
|
148
159
|
}
|
|
149
160
|
else if (failureMode === "stop") {
|
|
150
161
|
const firstError = results.find((r) => r.status === "error");
|
|
151
162
|
status = "error";
|
|
152
163
|
message =
|
|
153
|
-
|
|
154
|
-
|
|
164
|
+
t("matrix.aggregate.stopped", {
|
|
165
|
+
errors: errorCount,
|
|
166
|
+
total: totalCount,
|
|
167
|
+
}) +
|
|
168
|
+
(firstError?.error
|
|
169
|
+
? t("matrix.aggregate.stoppedFirst", {
|
|
170
|
+
name: firstError.name,
|
|
171
|
+
error: firstError.error,
|
|
172
|
+
})
|
|
173
|
+
: "");
|
|
155
174
|
}
|
|
156
175
|
else {
|
|
157
176
|
status = "partial";
|
|
158
|
-
message =
|
|
177
|
+
message = t("matrix.aggregate.partial", {
|
|
178
|
+
success: successCount,
|
|
179
|
+
total: totalCount,
|
|
180
|
+
errors: errorCount,
|
|
181
|
+
});
|
|
159
182
|
}
|
|
160
183
|
return {
|
|
161
184
|
parentId,
|
|
@@ -192,11 +215,11 @@ export function resolveMatrixConcurrency(matrix, totalClones) {
|
|
|
192
215
|
export async function runMatrix(task) {
|
|
193
216
|
const matrix = task.matrix;
|
|
194
217
|
if (!matrix) {
|
|
195
|
-
throw new Error(
|
|
218
|
+
throw new Error(t("matrix.error.notMatrix", { task: task.name }));
|
|
196
219
|
}
|
|
197
220
|
const clones = listMatrixClones(task.name);
|
|
198
221
|
if (clones.length === 0) {
|
|
199
|
-
throw new Error(
|
|
222
|
+
throw new Error(t("matrix.error.noClones", { task: task.name }));
|
|
200
223
|
}
|
|
201
224
|
const strategy = matrix.strategy === "sequential" ? "sequential" : "parallel";
|
|
202
225
|
const failureMode = matrix.failureMode === "stop" ? "stop" : "continue";
|
|
@@ -385,8 +408,10 @@ export function ensureMatrixCompleteTask(parent) {
|
|
|
385
408
|
name,
|
|
386
409
|
schedule: parent.schedule,
|
|
387
410
|
prompt: existing?.prompt ??
|
|
388
|
-
|
|
389
|
-
|
|
411
|
+
t("matrix.aggregator.prompt", {
|
|
412
|
+
parent: parent.name,
|
|
413
|
+
clones: clones.map((c) => c.name).join(", "),
|
|
414
|
+
}),
|
|
390
415
|
triggerType: "file",
|
|
391
416
|
watchPath: undefined,
|
|
392
417
|
mcpEvent: undefined,
|
|
@@ -443,7 +468,7 @@ function cloneSignature(definition) {
|
|
|
443
468
|
*/
|
|
444
469
|
export function planMatrixSync(parent) {
|
|
445
470
|
if (!parent.matrix) {
|
|
446
|
-
throw new Error(
|
|
471
|
+
throw new Error(t("matrix.error.notMatrix", { task: parent.name }));
|
|
447
472
|
}
|
|
448
473
|
const desired = expandMatrixTask(parent);
|
|
449
474
|
const existing = listMatrixClones(parent.name);
|
|
@@ -465,7 +490,7 @@ export function planMatrixSync(parent) {
|
|
|
465
490
|
// Выполняющийся клон не трогаем: не обновляем, не удаляем.
|
|
466
491
|
running.push(current.name);
|
|
467
492
|
if (cloneSignature(current) !== cloneSignature(wanted)) {
|
|
468
|
-
warnings.push(
|
|
493
|
+
warnings.push(t("matrix.clone.runningChanges", { name: current.name }));
|
|
469
494
|
}
|
|
470
495
|
continue;
|
|
471
496
|
}
|
|
@@ -479,7 +504,7 @@ export function planMatrixSync(parent) {
|
|
|
479
504
|
const latest = latestCloneStatus(current.name);
|
|
480
505
|
if (latest.status === "running") {
|
|
481
506
|
running.push(current.name);
|
|
482
|
-
warnings.push(
|
|
507
|
+
warnings.push(t("matrix.clone.runningDeletion", { name: current.name }));
|
|
483
508
|
continue;
|
|
484
509
|
}
|
|
485
510
|
remove.push(current.name);
|
|
@@ -540,9 +565,10 @@ export function getMatrixDeletionGuard(taskName) {
|
|
|
540
565
|
const parentId = definition?.matrixParentId?.trim();
|
|
541
566
|
if (!parentId)
|
|
542
567
|
return undefined;
|
|
543
|
-
return (
|
|
544
|
-
|
|
545
|
-
|
|
568
|
+
return t("matrix.deletionGuard", {
|
|
569
|
+
name: definition?.name ?? taskName,
|
|
570
|
+
parent: parentId,
|
|
571
|
+
});
|
|
546
572
|
}
|
|
547
573
|
/**
|
|
548
574
|
* Осиротевшие задачи матриц: клоны, чей родитель уже удалён, и агрегаторы,
|
|
@@ -575,10 +601,10 @@ export function findOrphanedMatrixTasks() {
|
|
|
575
601
|
* агрегированный итог. Реальные процессы клонов останавливает вызывающая
|
|
576
602
|
* сторона (index.ts), т.к. для этого нужен бэкенд планировщика ОС.
|
|
577
603
|
*/
|
|
578
|
-
export async function cancelPendingMatrixClones(parentName, reason = "
|
|
604
|
+
export async function cancelPendingMatrixClones(parentName, reason = t("matrix.cancel.defaultReason")) {
|
|
579
605
|
const parent = getTask(parentName);
|
|
580
606
|
if (!parent?.matrix) {
|
|
581
|
-
throw new Error(
|
|
607
|
+
throw new Error(t("matrix.error.notMatrix", { task: parentName }));
|
|
582
608
|
}
|
|
583
609
|
const clones = listMatrixClones(parent.name);
|
|
584
610
|
const cancelled = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ps-wrapper.d.ts","sourceRoot":"","sources":["../../src/core/ps-wrapper.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAQzD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,cAAc,8yyBAmZ1B,CAAC;AAEF;;;GAGG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CAOrD;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CASvF;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAErD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAsB,eAAe,CACnC,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,MAAM,EACpB,aAAa,CAAC,EAAE,MAAM,EACtB,YAAY,CAAC,EAAE,MAAM,EAAE,EACvB,WAAW,CAAC,EAAE,MAAM,EAAE,EACtB,YAAY,CAAC,EAAE,gBAAgB,GAAG;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EACD,OAAO,CAAC,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,KAAK,GAAG,OAAO,GAAG,MAAM,EACtC,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"ps-wrapper.d.ts","sourceRoot":"","sources":["../../src/core/ps-wrapper.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAQzD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,cAAc,8yyBAmZ1B,CAAC;AAEF;;;GAGG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CAOrD;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CASvF;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAErD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAsB,eAAe,CACnC,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,MAAM,EACpB,aAAa,CAAC,EAAE,MAAM,EACtB,YAAY,CAAC,EAAE,MAAM,EAAE,EACvB,WAAW,CAAC,EAAE,MAAM,EAAE,EACtB,YAAY,CAAC,EAAE,gBAAgB,GAAG;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EACD,OAAO,CAAC,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,KAAK,GAAG,OAAO,GAAG,MAAM,EACtC,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAoJjB;AAKD,kFAAkF;AAClF,eAAO,MAAM,iBAAiB,QAAgB,CAAC;AAE/C;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAc3E"}
|
package/dist/core/ps-wrapper.js
CHANGED
|
@@ -597,6 +597,13 @@ export async function writeWrapperCmd(sanitizedName, taskName, promptFile, timeo
|
|
|
597
597
|
if (scheduleGate.notAfter?.trim()) {
|
|
598
598
|
gateArgs.push(`--not-after ${scheduleGate.notAfter.trim()}`);
|
|
599
599
|
}
|
|
600
|
+
// Спринт 27: дни недели и политика окна.
|
|
601
|
+
if (Array.isArray(scheduleGate.days) && scheduleGate.days.length > 0) {
|
|
602
|
+
gateArgs.push(`--days ${scheduleGate.days.join(",")}`);
|
|
603
|
+
}
|
|
604
|
+
if (scheduleGate.windowPolicy) {
|
|
605
|
+
gateArgs.push(`--window-policy ${scheduleGate.windowPolicy}`);
|
|
606
|
+
}
|
|
600
607
|
if (scheduleGate.deferFile?.trim()) {
|
|
601
608
|
gateArgs.push(`--defer-file "${scheduleGate.deferFile.trim()}"`);
|
|
602
609
|
}
|
|
@@ -28,10 +28,12 @@
|
|
|
28
28
|
* перезаписывается.
|
|
29
29
|
*/
|
|
30
30
|
import fs from "node:fs";
|
|
31
|
-
import { cronMatches, isValidIanaTimeZone,
|
|
31
|
+
import { activeWindowState, cronMatches, isValidIanaTimeZone, normalizeActiveDays, parseCron, validateLaunchWindow, } from "./schedule-v2.js";
|
|
32
32
|
const STALE_DEFER_MS = 25 * 60 * 60 * 1000;
|
|
33
33
|
/** Сколько живёт маркер ручного запуска. */
|
|
34
34
|
const FORCE_TTL_MS = 2 * 60 * 1000;
|
|
35
|
+
/** Дольше 12 часов перенос не ждём — тик просто пропускается. */
|
|
36
|
+
const MAX_POSTPONE_MS = 12 * 60 * 60 * 1000;
|
|
35
37
|
function argValue(args, name) {
|
|
36
38
|
const idx = args.indexOf(name);
|
|
37
39
|
if (idx === -1 || idx + 1 >= args.length)
|
|
@@ -103,9 +105,18 @@ async function main() {
|
|
|
103
105
|
const tz = argValue(args, "--tz");
|
|
104
106
|
const notBefore = argValue(args, "--not-before");
|
|
105
107
|
const notAfter = argValue(args, "--not-after");
|
|
108
|
+
const daysArg = argValue(args, "--days");
|
|
109
|
+
const policyArg = argValue(args, "--window-policy");
|
|
106
110
|
const deferFile = argValue(args, "--defer-file");
|
|
107
111
|
const forceFile = argValue(args, "--force-file");
|
|
108
112
|
const nowArg = argValue(args, "--now");
|
|
113
|
+
const days = daysArg
|
|
114
|
+
? normalizeActiveDays(daysArg
|
|
115
|
+
.split(",")
|
|
116
|
+
.map((value) => Number(value.trim()))
|
|
117
|
+
.filter((value) => Number.isFinite(value)))
|
|
118
|
+
: undefined;
|
|
119
|
+
const policy = policyArg === "skip" || policyArg === "run" ? policyArg : "postpone";
|
|
109
120
|
const now = nowArg ? new Date(nowArg) : new Date();
|
|
110
121
|
if (Number.isNaN(now.getTime())) {
|
|
111
122
|
console.error(`[schedule-gate] Некорректное значение --now: ${nowArg}`);
|
|
@@ -126,7 +137,6 @@ async function main() {
|
|
|
126
137
|
if (windowError) {
|
|
127
138
|
console.error(`[schedule-gate] Окно запуска игнорируется: ${windowError}`);
|
|
128
139
|
}
|
|
129
|
-
const windowOk = !windowError && !!notBefore && !!notAfter;
|
|
130
140
|
let spec = null;
|
|
131
141
|
if (cronExpr) {
|
|
132
142
|
try {
|
|
@@ -140,38 +150,53 @@ async function main() {
|
|
|
140
150
|
// По расширенному cron сейчас не время.
|
|
141
151
|
return 3;
|
|
142
152
|
}
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
153
|
+
// Дни недели и окно запуска (Спринт 27). Политика вне окна:
|
|
154
|
+
// postpone (по умолчанию) — ждём открытия окна;
|
|
155
|
+
// skip — тихо пропускаем тик;
|
|
156
|
+
// run — выполняем, несмотря на окно.
|
|
157
|
+
const windowOptions = { notBefore, notAfter, days, timeZone: zone };
|
|
158
|
+
if (policy !== "run") {
|
|
159
|
+
const state = activeWindowState(now, windowOptions);
|
|
160
|
+
if (!state.active) {
|
|
161
|
+
if (policy === "skip") {
|
|
162
|
+
console.error(`[schedule-gate] Пропуск: ${state.reason ?? "вне окна"}.`);
|
|
152
163
|
return 3;
|
|
153
164
|
}
|
|
154
|
-
|
|
155
|
-
|
|
165
|
+
const wait = state.nextOpenAt
|
|
166
|
+
? Math.max(0, state.nextOpenAt.getTime() - now.getTime())
|
|
167
|
+
: 0;
|
|
168
|
+
if (wait <= 0)
|
|
169
|
+
return 0;
|
|
170
|
+
if (wait > MAX_POSTPONE_MS) {
|
|
171
|
+
console.error(`[schedule-gate] ${state.reason ?? "вне окна"} — до открытия больше 12 часов, тик пропущен.`);
|
|
172
|
+
return 3;
|
|
173
|
+
}
|
|
174
|
+
// ПЕРЕНОС: ждём открытия окна. Откладываем один запуск, остальные тики
|
|
175
|
+
// отсекаются по defer-файлу.
|
|
176
|
+
if (deferFile) {
|
|
177
|
+
if (deferFileBusy(deferFile, now.getTime())) {
|
|
178
|
+
console.error("[schedule-gate] Отложенный запуск уже ожидает открытия окна.");
|
|
179
|
+
return 3;
|
|
180
|
+
}
|
|
181
|
+
if (!acquireDefer(deferFile, now.getTime())) {
|
|
182
|
+
console.error("[schedule-gate] Не удалось захватить defer-файл — пропускаем.");
|
|
183
|
+
return 3;
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
console.error(`[schedule-gate] ${state.reason ?? "Вне окна"} — запуск перенесён на ~${Math.round(wait / 60000)} мин.`);
|
|
187
|
+
let remaining = wait;
|
|
188
|
+
while (remaining > 0) {
|
|
189
|
+
const chunk = Math.min(remaining, 60000);
|
|
190
|
+
await sleepMs(chunk);
|
|
191
|
+
remaining -= chunk;
|
|
192
|
+
}
|
|
193
|
+
const woke = new Date();
|
|
194
|
+
if (deferFile)
|
|
195
|
+
releaseDefer(deferFile);
|
|
196
|
+
if (!activeWindowState(woke, windowOptions).active) {
|
|
197
|
+
console.error("[schedule-gate] Окно не открылось за отведённое время — не запускаем.");
|
|
156
198
|
return 3;
|
|
157
199
|
}
|
|
158
|
-
}
|
|
159
|
-
console.error(`[schedule-gate] Вне окна ${notBefore}–${notAfter} — запуск перенесён на ~${Math.round(wait / 60000)} мин.`);
|
|
160
|
-
let remaining = wait;
|
|
161
|
-
let woke = now;
|
|
162
|
-
while (remaining > 0) {
|
|
163
|
-
const chunk = Math.min(remaining, 60000);
|
|
164
|
-
await sleepMs(chunk);
|
|
165
|
-
remaining -= chunk;
|
|
166
|
-
woke = new Date();
|
|
167
|
-
if (isInWindow(woke, notBefore, notAfter, zone))
|
|
168
|
-
break;
|
|
169
|
-
}
|
|
170
|
-
if (deferFile)
|
|
171
|
-
releaseDefer(deferFile);
|
|
172
|
-
if (!isInWindow(woke, notBefore, notAfter, zone)) {
|
|
173
|
-
console.error("[schedule-gate] Окно не открылось за отведённое время — не запускаем.");
|
|
174
|
-
return 3;
|
|
175
200
|
}
|
|
176
201
|
}
|
|
177
202
|
return 0;
|
|
@@ -54,6 +54,30 @@ export declare function validateLaunchWindow(notBefore?: string | null, notAfter
|
|
|
54
54
|
export declare function isInWindow(now: Date, notBefore?: string | null, notAfter?: string | null, timeZone?: string): boolean;
|
|
55
55
|
/** Сколько мс ждать до открытия окна (0 — уже открыто / окно не задано). */
|
|
56
56
|
export declare function windowDelayMs(now: Date, notBefore?: string | null, notAfter?: string | null, timeZone?: string): number;
|
|
57
|
+
/** 0=Вс..6=Сб. Пустой/полный список трактуется как «все дни» (undefined). */
|
|
58
|
+
export declare function normalizeActiveDays(days?: number[] | null): number[] | undefined;
|
|
59
|
+
/** Разрешён ли день недели (в поясе задачи). */
|
|
60
|
+
export declare function isActiveDay(now: Date, days?: number[] | null, timeZone?: string): boolean;
|
|
61
|
+
export interface ActiveWindowOptions {
|
|
62
|
+
notBefore?: string | null;
|
|
63
|
+
notAfter?: string | null;
|
|
64
|
+
days?: number[] | null;
|
|
65
|
+
timeZone?: string;
|
|
66
|
+
}
|
|
67
|
+
export interface ActiveWindowState {
|
|
68
|
+
/** Можно запускать сейчас. */
|
|
69
|
+
active: boolean;
|
|
70
|
+
/** Почему нельзя (человекочитаемо, для dry-run и логов). */
|
|
71
|
+
reason?: string;
|
|
72
|
+
/** Ближайшее открытие окна; null — не требуется или не найдено. */
|
|
73
|
+
nextOpenAt: Date | null;
|
|
74
|
+
}
|
|
75
|
+
/** Ближайшая минута, когда и день, и окно разрешают запуск. */
|
|
76
|
+
export declare function nextWindowOpenAt(now: Date, options: ActiveWindowOptions): Date | null;
|
|
77
|
+
/** Состояние окна с учётом дней недели. */
|
|
78
|
+
export declare function activeWindowState(now: Date, options?: ActiveWindowOptions): ActiveWindowState;
|
|
79
|
+
/** Сколько мс до следующего разрешённого окна (0 — можно запускать). */
|
|
80
|
+
export declare function nextWindowOpenDelayMs(now: Date, options?: ActiveWindowOptions): number;
|
|
57
81
|
/**
|
|
58
82
|
* true, если выражение умеет оформить Windows Task Scheduler «родными»
|
|
59
83
|
* флагами (MINUTE/HOURLY/DAILY/WEEKLY) и парсится строгим конвертером.
|
|
@@ -73,6 +97,10 @@ export interface ScheduleGateSpec {
|
|
|
73
97
|
tz?: string;
|
|
74
98
|
notBefore?: string;
|
|
75
99
|
notAfter?: string;
|
|
100
|
+
/** Разрешённые дни недели (0=Вс..6=Сб); пусто — все дни. */
|
|
101
|
+
days?: number[];
|
|
102
|
+
/** Поведение вне окна: skip — пропустить, run — выполнить всё равно. */
|
|
103
|
+
windowPolicy?: "skip" | "run";
|
|
76
104
|
}
|
|
77
105
|
/**
|
|
78
106
|
* true, если ОС-триггер не выражает расписание (чужой IANA-таймзона или
|
|
@@ -84,5 +112,5 @@ export declare function needsPollMode(expr: string, timezone?: string | null): b
|
|
|
84
112
|
* не нужен (нативный cron + системный таймзона + окно не задано).
|
|
85
113
|
* Окно запуска всегда требует gate (перенос реализует враппер).
|
|
86
114
|
*/
|
|
87
|
-
export declare function buildScheduleGate(expr: string, timezone?: string | null, notBefore?: string, notAfter?: string): ScheduleGateSpec | undefined;
|
|
115
|
+
export declare function buildScheduleGate(expr: string, timezone?: string | null, notBefore?: string, notAfter?: string, days?: number[] | null, windowPolicy?: string | null): ScheduleGateSpec | undefined;
|
|
88
116
|
//# sourceMappingURL=schedule-v2.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schedule-v2.d.ts","sourceRoot":"","sources":["../../src/core/schedule-v2.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schedule-v2.d.ts","sourceRoot":"","sources":["../../src/core/schedule-v2.ts"],"names":[],"mappings":"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"}
|
package/dist/core/schedule-v2.js
CHANGED
|
@@ -12,6 +12,7 @@
|
|
|
12
12
|
* Никакого I/O и обращения к ОС.
|
|
13
13
|
*/
|
|
14
14
|
import { convertCronToSchTasks } from "./cron-to-schtasks.js";
|
|
15
|
+
import { t } from "../i18n.js";
|
|
15
16
|
/** Ограничение на поиск ближайшего запуска. */
|
|
16
17
|
const MAX_SEARCH_DAYS = 5 * 366;
|
|
17
18
|
const MONTH_NAMES = {
|
|
@@ -127,7 +128,7 @@ function expandField(token, min, max, names) {
|
|
|
127
128
|
for (const raw of items) {
|
|
128
129
|
let item = raw.trim().toUpperCase();
|
|
129
130
|
if (!item)
|
|
130
|
-
throw new Error(
|
|
131
|
+
throw new Error(t("schedule.error.cronEmptyItem", { token }));
|
|
131
132
|
if (names && names[item] !== undefined)
|
|
132
133
|
item = String(names[item]);
|
|
133
134
|
// шаг: a-b/n или */n
|
|
@@ -137,10 +138,13 @@ function expandField(token, min, max, names) {
|
|
|
137
138
|
item = (stepMatch[1] ?? "").trim();
|
|
138
139
|
step = Number(stepMatch[2]);
|
|
139
140
|
if (!Number.isInteger(step) || step < 1) {
|
|
140
|
-
throw new Error(
|
|
141
|
+
throw new Error(t("schedule.error.cronStepInvalid", {
|
|
142
|
+
step: stepMatch[2],
|
|
143
|
+
raw,
|
|
144
|
+
}));
|
|
141
145
|
}
|
|
142
146
|
if (item === "")
|
|
143
|
-
throw new Error(
|
|
147
|
+
throw new Error(t("schedule.error.cronStepMissing", { raw }));
|
|
144
148
|
}
|
|
145
149
|
if (item === "*" || item === "") {
|
|
146
150
|
for (let v = min; v <= max; v += step)
|
|
@@ -158,10 +162,10 @@ function expandField(token, min, max, names) {
|
|
|
158
162
|
const a = Number(aToken);
|
|
159
163
|
const b = Number(bToken);
|
|
160
164
|
if (!Number.isFinite(a) || !Number.isFinite(b)) {
|
|
161
|
-
throw new Error(
|
|
165
|
+
throw new Error(t("schedule.error.cronRangeInvalid", { item }));
|
|
162
166
|
}
|
|
163
167
|
if (a < min || b > max || a > b) {
|
|
164
|
-
throw new Error(
|
|
168
|
+
throw new Error(t("schedule.error.cronRangeBounds", { item, min, max }));
|
|
165
169
|
}
|
|
166
170
|
for (let v = a; v <= b; v += step)
|
|
167
171
|
result.add(v);
|
|
@@ -169,7 +173,7 @@ function expandField(token, min, max, names) {
|
|
|
169
173
|
}
|
|
170
174
|
const num = Number(item);
|
|
171
175
|
if (!Number.isInteger(num) || num < min || num > max) {
|
|
172
|
-
throw new Error(
|
|
176
|
+
throw new Error(t("schedule.error.cronValueBounds", { raw, min, max }));
|
|
173
177
|
}
|
|
174
178
|
result.add(num);
|
|
175
179
|
}
|
|
@@ -189,14 +193,14 @@ export function normalizeCron(expr) {
|
|
|
189
193
|
return `0 */${n} * * *`;
|
|
190
194
|
if (unit === "d" && n >= 1 && n <= 31)
|
|
191
195
|
return `0 0 */${n} * *`;
|
|
192
|
-
throw new Error(
|
|
196
|
+
throw new Error(t("schedule.error.everyInterval", { value: `${n}${unit}` }));
|
|
193
197
|
}
|
|
194
198
|
/** Парсит cron-выражение; бросает Error с понятным сообщением. */
|
|
195
199
|
export function parseCron(expr) {
|
|
196
200
|
const raw = normalizeCron(expr);
|
|
197
201
|
const fields = raw.split(/\s+/);
|
|
198
202
|
if (fields.length !== 5) {
|
|
199
|
-
throw new Error(
|
|
203
|
+
throw new Error(t("schedule.error.cronFields", { count: fields.length, raw }));
|
|
200
204
|
}
|
|
201
205
|
const [minF, hourF, domF, monthF, dowF] = fields;
|
|
202
206
|
const minute = expandField(minF, 0, 59);
|
|
@@ -233,13 +237,16 @@ export function parseCron(expr) {
|
|
|
233
237
|
dToken = String(DOW_NAMES[dToken]);
|
|
234
238
|
const weekday = Number(dToken);
|
|
235
239
|
if (!Number.isInteger(weekday) || weekday < 0 || weekday > 7) {
|
|
236
|
-
throw new Error(
|
|
240
|
+
throw new Error(t("schedule.error.weekdayBounds", {
|
|
241
|
+
value: hash[1],
|
|
242
|
+
field: dowF,
|
|
243
|
+
}));
|
|
237
244
|
}
|
|
238
245
|
nthWeekday.push({ weekday: weekday % 7, n: Number(hash[2]) });
|
|
239
246
|
continue;
|
|
240
247
|
}
|
|
241
248
|
if (token === "L") {
|
|
242
|
-
throw new Error("
|
|
249
|
+
throw new Error(t("schedule.error.lastDomOnly"));
|
|
243
250
|
}
|
|
244
251
|
kept.push(token);
|
|
245
252
|
}
|
|
@@ -411,13 +418,13 @@ export function validateLaunchWindow(notBefore, notAfter) {
|
|
|
411
418
|
if (!nb && !na)
|
|
412
419
|
return null;
|
|
413
420
|
if (nb && !isValidDailyTime(nb))
|
|
414
|
-
return
|
|
421
|
+
return t("schedule.error.notBeforeFormat", { value: nb });
|
|
415
422
|
if (na && !isValidDailyTime(na))
|
|
416
|
-
return
|
|
423
|
+
return t("schedule.error.notAfterFormat", { value: na });
|
|
417
424
|
if (!nb || !na)
|
|
418
|
-
return "
|
|
425
|
+
return t("schedule.error.windowTogether");
|
|
419
426
|
if (nb === na)
|
|
420
|
-
return "
|
|
427
|
+
return t("schedule.error.windowEmpty");
|
|
421
428
|
return null;
|
|
422
429
|
}
|
|
423
430
|
function wallMinutes(date, timeZone) {
|
|
@@ -452,6 +459,80 @@ export function windowDelayMs(now, notBefore, notAfter, timeZone) {
|
|
|
452
459
|
return Math.max(0, deltaSec * 1000 - ms);
|
|
453
460
|
}
|
|
454
461
|
// ---------------------------------------------------------------------------
|
|
462
|
+
// Дни недели и политика вне окна (Спринт 27).
|
|
463
|
+
/** 0=Вс..6=Сб. Пустой/полный список трактуется как «все дни» (undefined). */
|
|
464
|
+
export function normalizeActiveDays(days) {
|
|
465
|
+
if (!Array.isArray(days))
|
|
466
|
+
return undefined;
|
|
467
|
+
const unique = [
|
|
468
|
+
...new Set(days
|
|
469
|
+
.map((value) => Math.floor(Number(value)))
|
|
470
|
+
.filter((value) => Number.isInteger(value) && value >= 0 && value <= 6)),
|
|
471
|
+
].sort((a, b) => a - b);
|
|
472
|
+
if (unique.length === 0 || unique.length === 7)
|
|
473
|
+
return undefined;
|
|
474
|
+
return unique;
|
|
475
|
+
}
|
|
476
|
+
/** Разрешён ли день недели (в поясе задачи). */
|
|
477
|
+
export function isActiveDay(now, days, timeZone) {
|
|
478
|
+
const normalized = normalizeActiveDays(days);
|
|
479
|
+
if (!normalized)
|
|
480
|
+
return true;
|
|
481
|
+
return normalized.includes(zonedParts(now, timeZone).weekday);
|
|
482
|
+
}
|
|
483
|
+
const WINDOW_SCAN_MINUTES = 8 * 24 * 60;
|
|
484
|
+
/** Ближайшая минута, когда и день, и окно разрешают запуск. */
|
|
485
|
+
export function nextWindowOpenAt(now, options) {
|
|
486
|
+
const { notBefore, notAfter, timeZone } = options;
|
|
487
|
+
const normalizedDays = normalizeActiveDays(options.days);
|
|
488
|
+
const hasWindow = Boolean((notBefore || "").trim() || (notAfter || "").trim());
|
|
489
|
+
if (!hasWindow && !normalizedDays)
|
|
490
|
+
return null;
|
|
491
|
+
const invalidWindow = validateLaunchWindow(notBefore, notAfter) !== null;
|
|
492
|
+
for (let i = 1; i <= WINDOW_SCAN_MINUTES; i++) {
|
|
493
|
+
const candidate = new Date(now.getTime() + i * 60000);
|
|
494
|
+
const dayOk = !normalizedDays || normalizedDays.includes(zonedParts(candidate, timeZone).weekday);
|
|
495
|
+
const windowOk = invalidWindow || isInWindow(candidate, notBefore, notAfter, timeZone);
|
|
496
|
+
if (dayOk && windowOk)
|
|
497
|
+
return candidate;
|
|
498
|
+
}
|
|
499
|
+
return null;
|
|
500
|
+
}
|
|
501
|
+
/** Состояние окна с учётом дней недели. */
|
|
502
|
+
export function activeWindowState(now, options = {}) {
|
|
503
|
+
const normalizedDays = normalizeActiveDays(options.days);
|
|
504
|
+
const dayOk = !normalizedDays ||
|
|
505
|
+
normalizedDays.includes(zonedParts(now, options.timeZone).weekday);
|
|
506
|
+
const windowOk = isInWindow(now, options.notBefore, options.notAfter, options.timeZone);
|
|
507
|
+
if (dayOk && windowOk)
|
|
508
|
+
return { active: true, nextOpenAt: null };
|
|
509
|
+
const reasons = [];
|
|
510
|
+
if (!dayOk) {
|
|
511
|
+
const days = (normalizedDays ?? [])
|
|
512
|
+
.map((d) => t(`schedule.weekday.${d}`))
|
|
513
|
+
.join(", ");
|
|
514
|
+
reasons.push(t("schedule.reason.dayNotAllowed", { days }));
|
|
515
|
+
}
|
|
516
|
+
if (!windowOk) {
|
|
517
|
+
reasons.push(t("schedule.reason.outsideWindow", {
|
|
518
|
+
notBefore: options.notBefore,
|
|
519
|
+
notAfter: options.notAfter,
|
|
520
|
+
}));
|
|
521
|
+
}
|
|
522
|
+
return {
|
|
523
|
+
active: false,
|
|
524
|
+
reason: reasons.join("; "),
|
|
525
|
+
nextOpenAt: nextWindowOpenAt(now, options),
|
|
526
|
+
};
|
|
527
|
+
}
|
|
528
|
+
/** Сколько мс до следующего разрешённого окна (0 — можно запускать). */
|
|
529
|
+
export function nextWindowOpenDelayMs(now, options = {}) {
|
|
530
|
+
const state = activeWindowState(now, options);
|
|
531
|
+
if (state.active)
|
|
532
|
+
return 0;
|
|
533
|
+
return state.nextOpenAt ? Math.max(0, state.nextOpenAt.getTime() - now.getTime()) : 0;
|
|
534
|
+
}
|
|
535
|
+
// ---------------------------------------------------------------------------
|
|
455
536
|
// Проверка совместимости с schtasks (родной режим).
|
|
456
537
|
/**
|
|
457
538
|
* true, если выражение умеет оформить Windows Task Scheduler «родными»
|
|
@@ -486,11 +567,20 @@ export function needsPollMode(expr, timezone) {
|
|
|
486
567
|
* не нужен (нативный cron + системный таймзона + окно не задано).
|
|
487
568
|
* Окно запуска всегда требует gate (перенос реализует враппер).
|
|
488
569
|
*/
|
|
489
|
-
export function buildScheduleGate(expr, timezone, notBefore, notAfter) {
|
|
570
|
+
export function buildScheduleGate(expr, timezone, notBefore, notAfter, days, windowPolicy) {
|
|
490
571
|
const tz = (timezone || "").trim() || undefined;
|
|
491
572
|
const poll = needsPollMode(expr, tz);
|
|
492
|
-
|
|
573
|
+
const normalizedDays = normalizeActiveDays(days);
|
|
574
|
+
const policy = windowPolicy === "skip" || windowPolicy === "run" ? windowPolicy : undefined;
|
|
575
|
+
if (!poll && !(notBefore && notAfter) && !normalizedDays)
|
|
493
576
|
return undefined;
|
|
494
577
|
// cron проверяем только в poll-режиме (см. комментарий у ScheduleGateSpec).
|
|
495
|
-
return {
|
|
578
|
+
return {
|
|
579
|
+
...(poll ? { cron: expr } : {}),
|
|
580
|
+
tz,
|
|
581
|
+
notBefore,
|
|
582
|
+
notAfter,
|
|
583
|
+
...(normalizedDays ? { days: normalizedDays } : {}),
|
|
584
|
+
...(policy ? { windowPolicy: policy } : {}),
|
|
585
|
+
};
|
|
496
586
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ScheduledTaskInfo } from "../../types.js";
|
|
2
2
|
/** Чем запускается задача. */
|
|
3
|
-
export type TriggerType = "cron" | "file" | "mcp-event" | "once";
|
|
3
|
+
export type TriggerType = "cron" | "file" | "git" | "mcp-event" | "once";
|
|
4
4
|
/**
|
|
5
5
|
* Параметры создания задачи. Бэкенд сам решает, как преобразовать cron
|
|
6
6
|
* в родное расписание ОС и как зарегистрировать команду запуска.
|
|
@@ -36,6 +36,12 @@ export interface CreateTaskOptions {
|
|
|
36
36
|
notBefore?: string;
|
|
37
37
|
/** Окно запуска «не позже» (HH:MM, 24ч). Парно с notBefore. */
|
|
38
38
|
notAfter?: string;
|
|
39
|
+
/**
|
|
40
|
+
* Windows: запускать задачу и без входа пользователя (/ru SYSTEM).
|
|
41
|
+
* По умолчанию задача интерактивная — выполняется только при активном входе.
|
|
42
|
+
* На Linux/macOS не используется: cron и так работает без входа, launchd-агент — только при входе.
|
|
43
|
+
*/
|
|
44
|
+
runWhenLoggedOff?: boolean;
|
|
39
45
|
/** Аргументы schedule-gate для обёртки (расширенный cron / окно). */
|
|
40
46
|
scheduleGate?: {
|
|
41
47
|
cron?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,8BAA8B;AAC9B,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,8BAA8B;AAC9B,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,WAAW,GAAG,MAAM,CAAC;AAEzE;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,sDAAsD;IACtD,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,gFAAgF;IAChF,QAAQ,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,6DAA6D;IAC7D,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,yEAAyE;IACzE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uEAAuE;IACvE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,qEAAqE;IACrE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mEAAmE;IACnE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,+DAA+D;IAC/D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,+DAA+D;IAC/D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,qEAAqE;IACrE,YAAY,CAAC,EAAE;QACb,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,oEAAoE;QACpE,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAED,sCAAsC;AACtC,MAAM,WAAW,aAAa;IAC5B,uEAAuE;IACvE,cAAc,EAAE,OAAO,CAAC;CACzB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,gBAAgB;IAC/B,0DAA0D;IAC1D,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IACnC,gEAAgE;IAChE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEvB,wCAAwC;IACxC,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,+DAA+D;IAC/D,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,mCAAmC;IACnC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC9C,wDAAwD;IACxD,SAAS,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAC1C,wCAAwC;IACxC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,uCAAuC;IACvC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzC"}
|