agent-steward 0.0.2 → 0.0.4
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 +45 -2
- package/CROSS_PLATFORM.md +11 -9
- package/README.md +11 -10
- package/ROADMAP-STRATEGY.md +93 -44
- package/ROADMAP.md +148 -1017
- package/dist/core/cron-to-schtasks.d.ts +0 -8
- package/dist/core/cron-to-schtasks.d.ts.map +1 -1
- package/dist/core/cron-to-schtasks.js +11 -86
- package/dist/core/dlq-api.d.ts +44 -0
- package/dist/core/dlq-api.d.ts.map +1 -0
- package/dist/core/dlq-api.js +68 -0
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +19 -2
- package/dist/core/file-watcher.js +9 -9
- package/dist/core/git-trigger.js +4 -4
- package/dist/core/lock.d.ts +20 -4
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +99 -26
- package/dist/core/one-shot.d.ts +31 -5
- package/dist/core/one-shot.d.ts.map +1 -1
- package/dist/core/one-shot.js +78 -10
- package/dist/core/opencode-cli.d.ts +28 -0
- package/dist/core/opencode-cli.d.ts.map +1 -0
- package/dist/core/opencode-cli.js +74 -0
- package/dist/core/opencode-models.d.ts +62 -0
- package/dist/core/opencode-models.d.ts.map +1 -0
- package/dist/core/opencode-models.js +277 -0
- package/dist/core/otel.js +2 -2
- package/dist/core/ps-wrapper.d.ts +1 -1
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +66 -36
- package/dist/core/record-history.d.ts +15 -0
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +78 -54
- package/dist/core/router/dispatch.d.ts +36 -0
- package/dist/core/router/dispatch.d.ts.map +1 -0
- package/dist/core/router/dispatch.js +59 -0
- package/dist/core/router/escalation.d.ts +47 -0
- package/dist/core/router/escalation.d.ts.map +1 -0
- package/dist/core/router/escalation.js +87 -0
- package/dist/core/router/planner.d.ts +53 -0
- package/dist/core/router/planner.d.ts.map +1 -0
- package/dist/core/router/planner.js +113 -0
- package/dist/core/router/rules.d.ts +46 -0
- package/dist/core/router/rules.d.ts.map +1 -0
- package/dist/core/router/rules.js +85 -0
- package/dist/core/run-panel-api.d.ts +94 -0
- package/dist/core/run-panel-api.d.ts.map +1 -0
- package/dist/core/run-panel-api.js +169 -0
- package/dist/core/schedule-gate.js +5 -1
- package/dist/core/schedule-v2.d.ts +36 -2
- package/dist/core/schedule-v2.d.ts.map +1 -1
- package/dist/core/schedule-v2.js +98 -12
- package/dist/core/scheduler/at-fallback.d.ts +95 -0
- package/dist/core/scheduler/at-fallback.d.ts.map +1 -0
- package/dist/core/scheduler/at-fallback.js +200 -0
- package/dist/core/scheduler/linux.d.ts +13 -2
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +67 -13
- package/dist/core/scheduler/mac.d.ts +14 -8
- package/dist/core/scheduler/mac.d.ts.map +1 -1
- package/dist/core/scheduler/mac.js +71 -22
- package/dist/core/scheduler/posix.d.ts.map +1 -1
- package/dist/core/scheduler/posix.js +37 -2
- package/dist/core/scheduler/registry.d.ts +13 -0
- package/dist/core/scheduler/registry.d.ts.map +1 -1
- package/dist/core/scheduler/registry.js +83 -21
- package/dist/core/scheduler/run-now.d.ts +16 -0
- package/dist/core/scheduler/run-now.d.ts.map +1 -0
- package/dist/core/scheduler/run-now.js +28 -0
- package/dist/core/scheduler/windows.d.ts +16 -3
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +249 -96
- package/dist/core/secrets.d.ts.map +1 -1
- package/dist/core/secrets.js +127 -30
- package/dist/core/self-analysis.js +55 -55
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +18 -11
- package/dist/core/summary.js +1 -1
- package/dist/core/task-name.d.ts +24 -0
- package/dist/core/task-name.d.ts.map +1 -0
- package/dist/core/task-name.js +40 -0
- package/dist/core/triage-chain.js +1 -1
- package/dist/core/triage-worker.js +2 -2
- package/dist/core/triage.js +1 -1
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +82 -37
- package/dist/db/capability-repo.d.ts +83 -0
- package/dist/db/capability-repo.d.ts.map +1 -0
- package/dist/db/capability-repo.js +182 -0
- 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 +19 -0
- package/dist/db/index.d.ts +6 -0
- package/dist/db/index.d.ts.map +1 -1
- package/dist/db/index.js +48 -2
- package/dist/db/migrate.d.ts.map +1 -1
- package/dist/db/migrate.js +3 -1
- package/dist/db/run-context.d.ts +103 -0
- package/dist/db/run-context.d.ts.map +1 -0
- package/dist/db/run-context.js +224 -0
- package/dist/db/run-dlq.d.ts +100 -0
- package/dist/db/run-dlq.d.ts.map +1 -0
- package/dist/db/run-dlq.js +191 -0
- package/dist/db/run-journal.d.ts +60 -0
- package/dist/db/run-journal.d.ts.map +1 -0
- package/dist/db/run-journal.js +143 -0
- package/dist/db/run-resume.d.ts +51 -0
- package/dist/db/run-resume.d.ts.map +1 -0
- package/dist/db/run-resume.js +156 -0
- package/dist/db/runs-repo.d.ts +128 -0
- package/dist/db/runs-repo.d.ts.map +1 -0
- package/dist/db/runs-repo.js +342 -0
- package/dist/db/schema.d.ts +16 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +342 -35
- package/dist/db/settings-repo.d.ts +11 -0
- package/dist/db/settings-repo.d.ts.map +1 -1
- package/dist/db/settings-repo.js +25 -0
- package/dist/db/step-idempotency.d.ts +51 -0
- package/dist/db/step-idempotency.d.ts.map +1 -0
- package/dist/db/step-idempotency.js +136 -0
- package/dist/index.d.ts +5 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +168 -40
- package/dist/notifications.js +18 -18
- package/dist/profiles.d.ts +7 -3
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +85 -7
- package/dist/rpc.d.ts +787 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +324 -0
- package/dist/server.d.ts +33 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +115 -54
- package/dist/shared/jobs-view.d.ts.map +1 -1
- package/dist/skill.js +1 -1
- package/dist/task-transfer.d.ts +1 -1
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +14 -10
- package/dist/types.d.ts +20 -4
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +44 -9
- package/dist/workspaces.d.ts +25 -3
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +44 -9
- package/docs/ARCHITECTURE.md +335 -9
- package/docs/COMPATIBILITY.md +10 -6
- package/docs/CONCEPT.md +183 -91
- package/docs/CROSS_PLATFORM.ru.md +11 -9
- package/docs/CROSS_PLATFORM.zh.md +11 -9
- package/docs/EXECUTION-LOOP.md +196 -0
- package/docs/FAQ.md +2 -2
- package/docs/FAQ.ru.md +2 -2
- package/docs/FAQ.zh.md +2 -2
- package/docs/FEATURES.md +5 -4
- package/docs/FEATURES.zh.md +5 -4
- package/docs/MIGRATION.md +34 -26
- package/docs/README.ru.md +27 -8
- package/docs/README.zh.md +11 -10
- package/docs/SAFETY.md +122 -0
- package/docs/SAVINGS.md +29 -0
- package/docs/SAVINGS.ru.md +29 -0
- package/docs/SAVINGS.zh.md +18 -0
- package/docs/V1-V2-COMPATIBILITY-PLAN.md +6 -6
- package/gui-experimental.cjs +8 -8
- package/index.js +1 -0
- package/locales/en.json +68 -0
- package/locales/ru.json +68 -0
- package/locales/zh.json +68 -0
- package/package.json +57 -11
- package/scripts/audit-bundle.mjs +215 -0
- package/src/core/analytics.ts +2 -2
- package/src/core/audit.ts +17 -17
- package/src/core/cron-to-schtasks.ts +14 -93
- package/src/core/dlq-api.ts +98 -0
- package/src/core/dry-run.ts +51 -27
- package/src/core/file-watcher.ts +17 -17
- package/src/core/git-trigger.ts +9 -9
- package/src/core/glob.ts +1 -1
- package/src/core/local-ai.ts +2 -2
- package/src/core/lock.ts +104 -31
- package/src/core/matrix.ts +31 -31
- package/src/core/native-notify.ts +2 -2
- package/src/core/one-shot.ts +91 -13
- package/src/core/opencode-cli.ts +103 -0
- package/src/core/opencode-models.ts +315 -0
- package/src/core/otel.ts +4 -4
- package/src/core/permissions.ts +5 -5
- package/src/core/prometheus.ts +17 -17
- package/src/core/ps-wrapper.ts +68 -38
- package/src/core/record-history.ts +114 -76
- package/src/core/retention.ts +3 -3
- package/src/core/router/dispatch.ts +94 -0
- package/src/core/router/escalation.ts +129 -0
- package/src/core/router/planner.ts +166 -0
- package/src/core/router/rules.ts +109 -0
- package/src/core/run-panel-api.ts +262 -0
- package/src/core/savings.ts +1 -1
- package/src/core/schedule-gate.ts +17 -13
- package/src/core/schedule-v2.ts +138 -29
- package/src/core/scheduler/at-fallback.ts +298 -0
- package/src/core/scheduler/index.ts +3 -3
- package/src/core/scheduler/linux.ts +92 -19
- package/src/core/scheduler/logs.ts +1 -1
- package/src/core/scheduler/mac.ts +112 -60
- package/src/core/scheduler/posix.ts +35 -2
- package/src/core/scheduler/registry.ts +109 -26
- package/src/core/scheduler/run-now.ts +32 -0
- package/src/core/scheduler/windows.ts +295 -125
- package/src/core/secrets.ts +139 -39
- package/src/core/self-analysis.ts +61 -61
- package/src/core/session.ts +26 -13
- package/src/core/structured-log.ts +3 -3
- package/src/core/summary.ts +25 -25
- package/src/core/task-name.ts +67 -0
- package/src/core/telegram.ts +16 -16
- package/src/core/triage-chain.ts +4 -4
- package/src/core/triage-compare.ts +8 -8
- package/src/core/triage-rules.ts +4 -4
- package/src/core/triage-shadow.ts +7 -7
- package/src/core/triage-worker.ts +6 -6
- package/src/core/triage.ts +23 -23
- package/src/core/watch-paths.ts +1 -1
- package/src/core/wrappers/bash.ts +90 -45
- package/src/db/capability-repo.ts +285 -0
- package/src/db/git-state-repo.ts +1 -1
- package/src/db/history-repo.ts +44 -22
- package/src/db/index.ts +53 -7
- package/src/db/metrics-repo.ts +10 -10
- package/src/db/migrate.ts +13 -11
- package/src/db/recovery.ts +3 -3
- package/src/db/run-context.ts +370 -0
- package/src/db/run-dlq.ts +310 -0
- package/src/db/run-journal.ts +212 -0
- package/src/db/run-resume.ts +256 -0
- package/src/db/runs-repo.ts +504 -0
- package/src/db/schema.ts +357 -44
- package/src/db/settings-repo.ts +33 -2
- package/src/db/step-idempotency.ts +185 -0
- package/src/db/tasks-repo.ts +10 -10
- package/src/db/templates-repo.ts +7 -7
- package/src/gui.tsx +516 -1
- package/src/history.ts +4 -4
- package/src/i18n.ts +7 -7
- package/src/index.ts +465 -308
- package/src/integrations.ts +6 -6
- package/src/notifications.ts +76 -76
- package/src/profiles.ts +98 -7
- package/src/rpc.ts +347 -1
- package/src/schtasks.ts +2 -2
- package/src/server.ts +155 -78
- package/src/settings.ts +44 -44
- package/src/shared/jobs-view.ts +60 -60
- package/src/skill.ts +1 -1
- package/src/task-transfer.ts +58 -56
- package/src/templates.ts +1 -1
- package/src/types.ts +54 -10
- package/src/workspaces.ts +73 -24
- package/dist/core/self-analysis.test.d.ts +0 -2
- package/dist/core/self-analysis.test.d.ts.map +0 -1
- package/dist/core/self-analysis.test.js +0 -219
- package/dist/gui-experimental.cjs +0 -1
package/src/core/schedule-v2.ts
CHANGED
|
@@ -2,11 +2,13 @@
|
|
|
2
2
|
* Расширенный cron и окна запуска (Спринт 19).
|
|
3
3
|
*
|
|
4
4
|
* Два режима регистрации в ОС:
|
|
5
|
-
* - «родной»
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
5
|
+
* - «родной» — системная таймзона и выражение, понятное адаптеру ОС:
|
|
6
|
+
* для Windows — подмножество флагов schtasks, для POSIX (crontab) —
|
|
7
|
+
* Vixie-совместимый cron (списки, диапазоны, шаги, имена месяцев/дней);
|
|
8
|
+
* - «опрос раз в минуту» (MINUTE /mo 1 или "* * * * *" + node-gate во
|
|
9
|
+
* враппере) — для чужой таймзоны, Quartz-расширений L/# и прочего, что
|
|
10
|
+
* адаптер ОС не понимает. Обёртка вызывает dist/core/schedule-gate.js,
|
|
11
|
+
* который сам решает, пора ли запускать.
|
|
10
12
|
*
|
|
11
13
|
* Здесь живёт только чистая математика: парсинг, совпадение, ближайший запуск.
|
|
12
14
|
* Никакого I/O и обращения к ОС.
|
|
@@ -114,7 +116,7 @@ export function wallToUtc(y: number, m: number, d: number, h: number, mi: number
|
|
|
114
116
|
// «следующего запуска» берём ПЕРВОЕ (более раннее) вхождение, а не то, к
|
|
115
117
|
// которому сошлась итерация. Обычно совпадение одно, тогда результат тот же.
|
|
116
118
|
const probes = [0, -30, 30, -60, 60, -90, 90, -120, 120].map(
|
|
117
|
-
(minutes) => guess + minutes * 60_000
|
|
119
|
+
(minutes) => guess + minutes * 60_000,
|
|
118
120
|
);
|
|
119
121
|
let best: number | null = null;
|
|
120
122
|
for (const ms of probes) {
|
|
@@ -142,9 +144,9 @@ function expandField(token: string, min: number, max: number, names?: Record<str
|
|
|
142
144
|
let item = raw.trim().toUpperCase();
|
|
143
145
|
if (!item)
|
|
144
146
|
throw new Error(t("schedule.error.cronEmptyItem", { token }));
|
|
145
|
-
if (names
|
|
147
|
+
if (names?.[item] !== undefined) item = String(names[item]);
|
|
146
148
|
// шаг: a-b/n или */n
|
|
147
|
-
const stepMatch =
|
|
149
|
+
const stepMatch = /^(.*)\/([0-9]+)$/.exec(item);
|
|
148
150
|
let step = 1;
|
|
149
151
|
if (stepMatch) {
|
|
150
152
|
item = (stepMatch[1] ?? "").trim();
|
|
@@ -154,7 +156,7 @@ function expandField(token: string, min: number, max: number, names?: Record<str
|
|
|
154
156
|
t("schedule.error.cronStepInvalid", {
|
|
155
157
|
step: stepMatch[2],
|
|
156
158
|
raw,
|
|
157
|
-
})
|
|
159
|
+
}),
|
|
158
160
|
);
|
|
159
161
|
}
|
|
160
162
|
if (item === "")
|
|
@@ -164,12 +166,12 @@ function expandField(token: string, min: number, max: number, names?: Record<str
|
|
|
164
166
|
for (let v = min; v <= max; v += step) result.add(v);
|
|
165
167
|
continue;
|
|
166
168
|
}
|
|
167
|
-
const rangeMatch =
|
|
169
|
+
const rangeMatch = /^([0-9A-Z]+)-([0-9A-Z]+)$/.exec(item);
|
|
168
170
|
if (rangeMatch) {
|
|
169
171
|
let aToken = rangeMatch[1];
|
|
170
172
|
let bToken = rangeMatch[2];
|
|
171
|
-
if (names
|
|
172
|
-
if (names
|
|
173
|
+
if (names?.[aToken] !== undefined) aToken = String(names[aToken]);
|
|
174
|
+
if (names?.[bToken] !== undefined) bToken = String(names[bToken]);
|
|
173
175
|
const a = Number(aToken);
|
|
174
176
|
const b = Number(bToken);
|
|
175
177
|
if (!Number.isFinite(a) || !Number.isFinite(b)) {
|
|
@@ -177,16 +179,27 @@ function expandField(token: string, min: number, max: number, names?: Record<str
|
|
|
177
179
|
}
|
|
178
180
|
if (a < min || b > max || a > b) {
|
|
179
181
|
throw new Error(
|
|
180
|
-
t("schedule.error.cronRangeBounds", { item, min, max })
|
|
182
|
+
t("schedule.error.cronRangeBounds", { item, min, max }),
|
|
181
183
|
);
|
|
182
184
|
}
|
|
183
185
|
for (let v = a; v <= b; v += step) result.add(v);
|
|
184
186
|
continue;
|
|
185
187
|
}
|
|
188
|
+
if (stepMatch) {
|
|
189
|
+
// Шаг для одиночного значения Vixie-совместимый cron не поддерживает:
|
|
190
|
+
// раньше «5/15» молча превращалось в «только минута 5». Лучше явная
|
|
191
|
+
// ошибка, чем тихо другая семантика.
|
|
192
|
+
throw new Error(
|
|
193
|
+
t("schedule.error.cronStepNeedsRange", {
|
|
194
|
+
raw,
|
|
195
|
+
step: stepMatch[2],
|
|
196
|
+
}),
|
|
197
|
+
);
|
|
198
|
+
}
|
|
186
199
|
const num = Number(item);
|
|
187
200
|
if (!Number.isInteger(num) || num < min || num > max) {
|
|
188
201
|
throw new Error(
|
|
189
|
-
t("schedule.error.cronValueBounds", { raw, min, max })
|
|
202
|
+
t("schedule.error.cronValueBounds", { raw, min, max }),
|
|
190
203
|
);
|
|
191
204
|
}
|
|
192
205
|
result.add(num);
|
|
@@ -207,13 +220,13 @@ export interface ParsedCron {
|
|
|
207
220
|
/** День недели 0(Вс)..6(Сб) или null, если поле = «*» и не содержит «#». */
|
|
208
221
|
dayOfWeek: Set<number> | null;
|
|
209
222
|
/** Пары {weekday, n} для «#». */
|
|
210
|
-
nthWeekday:
|
|
223
|
+
nthWeekday: { weekday: number; n: number }[];
|
|
211
224
|
}
|
|
212
225
|
|
|
213
226
|
/** Разворачивает «@every 15m|2h|1d» в обычный cron. */
|
|
214
227
|
export function normalizeCron(expr: string): string {
|
|
215
228
|
const trimmed = expr.trim();
|
|
216
|
-
const match =
|
|
229
|
+
const match = /^@every\s+(\d+)([mhd])$/i.exec(trimmed);
|
|
217
230
|
if (!match) return trimmed;
|
|
218
231
|
const n = Number(match[1]);
|
|
219
232
|
const unit = match[2].toLowerCase();
|
|
@@ -221,7 +234,7 @@ export function normalizeCron(expr: string): string {
|
|
|
221
234
|
if (unit === "h" && n >= 1 && n <= 23) return `0 */${n} * * *`;
|
|
222
235
|
if (unit === "d" && n >= 1 && n <= 31) return `0 0 */${n} * *`;
|
|
223
236
|
throw new Error(
|
|
224
|
-
t("schedule.error.everyInterval", { value: `${n}${unit}` })
|
|
237
|
+
t("schedule.error.everyInterval", { value: `${n}${unit}` }),
|
|
225
238
|
);
|
|
226
239
|
}
|
|
227
240
|
|
|
@@ -231,7 +244,7 @@ export function parseCron(expr: string): ParsedCron {
|
|
|
231
244
|
const fields = raw.split(/\s+/);
|
|
232
245
|
if (fields.length !== 5) {
|
|
233
246
|
throw new Error(
|
|
234
|
-
t("schedule.error.cronFields", { count: fields.length, raw })
|
|
247
|
+
t("schedule.error.cronFields", { count: fields.length, raw }),
|
|
235
248
|
);
|
|
236
249
|
}
|
|
237
250
|
const [minF, hourF, domF, monthF, dowF] = fields;
|
|
@@ -257,12 +270,12 @@ export function parseCron(expr: string): ParsedCron {
|
|
|
257
270
|
|
|
258
271
|
// dow: «*» + имена + «d#n».
|
|
259
272
|
let dayOfWeek: Set<number> | null = null;
|
|
260
|
-
const nthWeekday:
|
|
273
|
+
const nthWeekday: { weekday: number; n: number }[] = [];
|
|
261
274
|
{
|
|
262
275
|
const tokens = dowF.trim().toUpperCase().split(",").map((s) => s.trim());
|
|
263
276
|
const kept: string[] = [];
|
|
264
277
|
for (const token of tokens) {
|
|
265
|
-
const hash =
|
|
278
|
+
const hash = /^([0-9A-Z]+)#([1-5])$/.exec(token);
|
|
266
279
|
if (hash) {
|
|
267
280
|
let dToken = hash[1];
|
|
268
281
|
if (DOW_NAMES[dToken] !== undefined) dToken = String(DOW_NAMES[dToken]);
|
|
@@ -272,7 +285,7 @@ export function parseCron(expr: string): ParsedCron {
|
|
|
272
285
|
t("schedule.error.weekdayBounds", {
|
|
273
286
|
value: hash[1],
|
|
274
287
|
field: dowF,
|
|
275
|
-
})
|
|
288
|
+
}),
|
|
276
289
|
);
|
|
277
290
|
}
|
|
278
291
|
nthWeekday.push({ weekday: weekday % 7, n: Number(hash[2]) });
|
|
@@ -340,10 +353,10 @@ function candidatesOnDay(
|
|
|
340
353
|
d: number,
|
|
341
354
|
notBefore: { hour: number; minute: number } | null,
|
|
342
355
|
notAfter: { hour: number; minute: number } | null,
|
|
343
|
-
):
|
|
356
|
+
): { hour: number; minute: number }[] {
|
|
344
357
|
const hours = [...spec.hour].sort((a, b) => a - b);
|
|
345
358
|
const minutes = [...spec.minute].sort((a, b) => a - b);
|
|
346
|
-
const result:
|
|
359
|
+
const result: { hour: number; minute: number }[] = [];
|
|
347
360
|
for (const hour of hours) {
|
|
348
361
|
for (const minute of minutes) {
|
|
349
362
|
if (notBefore) {
|
|
@@ -470,8 +483,8 @@ function wallMinutes(date: Date, timeZone?: string): { minutes: number; seconds:
|
|
|
470
483
|
export function isInWindow(now: Date, notBefore?: string | null, notAfter?: string | null, timeZone?: string): boolean {
|
|
471
484
|
if (validateLaunchWindow(notBefore, notAfter) !== null) return true; // невалидное окно не должно блокировать
|
|
472
485
|
if (!notBefore?.trim() && !notAfter?.trim()) return true;
|
|
473
|
-
const start = dailyTimeToMinutes(notBefore
|
|
474
|
-
const end = dailyTimeToMinutes(notAfter
|
|
486
|
+
const start = dailyTimeToMinutes(notBefore!);
|
|
487
|
+
const end = dailyTimeToMinutes(notAfter!);
|
|
475
488
|
const { minutes } = wallMinutes(now, timeZone);
|
|
476
489
|
if (start < end) return minutes >= start && minutes < end;
|
|
477
490
|
return minutes >= start || minutes < end; // через полночь
|
|
@@ -482,7 +495,7 @@ export function windowDelayMs(now: Date, notBefore?: string | null, notAfter?: s
|
|
|
482
495
|
if (validateLaunchWindow(notBefore, notAfter) !== null) return 0;
|
|
483
496
|
if (!notBefore?.trim() && !notAfter?.trim()) return 0;
|
|
484
497
|
if (isInWindow(now, notBefore, notAfter, timeZone)) return 0;
|
|
485
|
-
const start = dailyTimeToMinutes(notBefore
|
|
498
|
+
const start = dailyTimeToMinutes(notBefore!);
|
|
486
499
|
const { minutes, seconds, ms } = wallMinutes(now, timeZone);
|
|
487
500
|
const deltaMin = (start - minutes + 1440) % 1440;
|
|
488
501
|
const deltaSec = deltaMin * 60 - seconds;
|
|
@@ -499,7 +512,7 @@ export function normalizeActiveDays(days?: number[] | null): number[] | undefine
|
|
|
499
512
|
...new Set(
|
|
500
513
|
days
|
|
501
514
|
.map((value) => Math.floor(Number(value)))
|
|
502
|
-
.filter((value) => Number.isInteger(value) && value >= 0 && value <= 6)
|
|
515
|
+
.filter((value) => Number.isInteger(value) && value >= 0 && value <= 6),
|
|
503
516
|
),
|
|
504
517
|
].sort((a, b) => a - b);
|
|
505
518
|
if (unique.length === 0 || unique.length === 7) return undefined;
|
|
@@ -569,7 +582,7 @@ export function activeWindowState(now: Date, options: ActiveWindowOptions = {}):
|
|
|
569
582
|
t("schedule.reason.outsideWindow", {
|
|
570
583
|
notBefore: options.notBefore,
|
|
571
584
|
notAfter: options.notAfter,
|
|
572
|
-
})
|
|
585
|
+
}),
|
|
573
586
|
);
|
|
574
587
|
}
|
|
575
588
|
return {
|
|
@@ -586,6 +599,75 @@ export function nextWindowOpenDelayMs(now: Date, options: ActiveWindowOptions =
|
|
|
586
599
|
return state.nextOpenAt ? Math.max(0, state.nextOpenAt.getTime() - now.getTime()) : 0;
|
|
587
600
|
}
|
|
588
601
|
|
|
602
|
+
export interface CronWindowFeasibility {
|
|
603
|
+
/** Будет ли хотя бы один запуск пропущен не из-за окна. */
|
|
604
|
+
feasible: boolean;
|
|
605
|
+
/** Сколько вхождений cron проверено. */
|
|
606
|
+
checked: number;
|
|
607
|
+
/** Ближайшее вхождение, которое окно/политика пропустят (ISO). */
|
|
608
|
+
firstRun?: string;
|
|
609
|
+
reason?: "never-fires" | "never-in-window" | "postpone-too-far";
|
|
610
|
+
}
|
|
611
|
+
|
|
612
|
+
/** Человекочитаемая причина недостижимости окна (P2-24). */
|
|
613
|
+
export function windowFeasibilityReasonText(
|
|
614
|
+
reason: CronWindowFeasibility["reason"],
|
|
615
|
+
): string {
|
|
616
|
+
switch (reason) {
|
|
617
|
+
case "never-fires":
|
|
618
|
+
return t("dryRun.window.reason.neverFires");
|
|
619
|
+
case "never-in-window":
|
|
620
|
+
return t("dryRun.window.reason.neverInWindow");
|
|
621
|
+
case "postpone-too-far":
|
|
622
|
+
return t("dryRun.window.reason.postponeTooFar");
|
|
623
|
+
default:
|
|
624
|
+
return "";
|
|
625
|
+
}
|
|
626
|
+
}
|
|
627
|
+
|
|
628
|
+
/**
|
|
629
|
+
* P2-24: проверяет, не окажется ли cron навсегда отрезан окном запуска.
|
|
630
|
+
*
|
|
631
|
+
* `schedule-gate` откладывает запуск максимум на 12 ч. Если cron срабатывает
|
|
632
|
+
* только в 09:00, а окно 22:00–06:00, то до открытия всегда ~13 ч → каждый тик
|
|
633
|
+
* молча пропускается. Здесь это выявляется заранее (для предупреждения при
|
|
634
|
+
* создании задачи и в dry_run).
|
|
635
|
+
*/
|
|
636
|
+
export function assessCronWindowFeasibility(
|
|
637
|
+
expr: string,
|
|
638
|
+
options: ActiveWindowOptions = {},
|
|
639
|
+
policy: "skip" | "postpone" | "run" = "postpone",
|
|
640
|
+
from: Date = new Date(),
|
|
641
|
+
maxPostponeMs = 12 * 60 * 60 * 1000,
|
|
642
|
+
maxOccurrences = 120,
|
|
643
|
+
): CronWindowFeasibility {
|
|
644
|
+
if (policy === "run") return { feasible: true, checked: 0 };
|
|
645
|
+
|
|
646
|
+
let cursor = from;
|
|
647
|
+
for (let i = 0; i < maxOccurrences; i += 1) {
|
|
648
|
+
const at = nextRun(expr, cursor, options.timeZone);
|
|
649
|
+
if (!at) {
|
|
650
|
+
return { feasible: false, checked: i, reason: "never-fires" };
|
|
651
|
+
}
|
|
652
|
+
const state = activeWindowState(at, options);
|
|
653
|
+
if (state.active) {
|
|
654
|
+
return { feasible: true, checked: i + 1, firstRun: at.toISOString() };
|
|
655
|
+
}
|
|
656
|
+
if (policy === "postpone" && state.nextOpenAt) {
|
|
657
|
+
const waitMs = state.nextOpenAt.getTime() - at.getTime();
|
|
658
|
+
if (waitMs <= maxPostponeMs) {
|
|
659
|
+
return { feasible: true, checked: i + 1, firstRun: at.toISOString() };
|
|
660
|
+
}
|
|
661
|
+
}
|
|
662
|
+
cursor = at;
|
|
663
|
+
}
|
|
664
|
+
return {
|
|
665
|
+
feasible: false,
|
|
666
|
+
checked: maxOccurrences,
|
|
667
|
+
reason: policy === "skip" ? "never-in-window" : "postpone-too-far",
|
|
668
|
+
};
|
|
669
|
+
}
|
|
670
|
+
|
|
589
671
|
// ---------------------------------------------------------------------------
|
|
590
672
|
// Проверка совместимости с schtasks (родной режим).
|
|
591
673
|
|
|
@@ -608,6 +690,22 @@ export function convertForSchtasks(expr: string): CronConversion {
|
|
|
608
690
|
return convertCronToSchTasks(normalizeCron(expr));
|
|
609
691
|
}
|
|
610
692
|
|
|
693
|
+
/**
|
|
694
|
+
* true, если выражение можно записать в crontab как есть (Vixie-совместимый
|
|
695
|
+
* 5-полевой cron). В отличие от schtasks, crontab понимает списки, диапазоны,
|
|
696
|
+
* шаги и имена месяцев/дней недели — их не нужно загонять в минутный опрос.
|
|
697
|
+
* Quartz-расширения `L` / `d#n` и макросы вроде `@daily` (не 5 полей) crontab
|
|
698
|
+
* не понимает: для них нужен poll-режим с gate во враппере.
|
|
699
|
+
*/
|
|
700
|
+
export function isNativePosixCronExpr(expr: string): boolean {
|
|
701
|
+
try {
|
|
702
|
+
const spec = parseCron(expr);
|
|
703
|
+
return !spec.lastDom && spec.nthWeekday.length === 0;
|
|
704
|
+
} catch {
|
|
705
|
+
return false;
|
|
706
|
+
}
|
|
707
|
+
}
|
|
708
|
+
|
|
611
709
|
// ---------------------------------------------------------------------------
|
|
612
710
|
// Политика планирования одной задачи (общий код для Windows-бека и index.ts).
|
|
613
711
|
|
|
@@ -638,6 +736,17 @@ export function needsPollMode(expr: string, timezone?: string | null): boolean {
|
|
|
638
736
|
return !isNativeSchtasksExpr(expr);
|
|
639
737
|
}
|
|
640
738
|
|
|
739
|
+
/**
|
|
740
|
+
* Аналог needsPollMode для POSIX-бэков (crontab): чужой IANA-таймзона или
|
|
741
|
+
* не-Vixie-синтаксис заставляет опрашивать каждую минуту, остальное crontab
|
|
742
|
+
* выполняет сам. Списки/диапазоны/шаги/имена здесь родные.
|
|
743
|
+
*/
|
|
744
|
+
export function needsPosixPollMode(expr: string, timezone?: string | null): boolean {
|
|
745
|
+
const tz = (timezone || "").trim();
|
|
746
|
+
if (tz && tz !== systemTimeZone()) return true;
|
|
747
|
+
return !isNativePosixCronExpr(expr);
|
|
748
|
+
}
|
|
749
|
+
|
|
641
750
|
/**
|
|
642
751
|
* Аргументы schedule-gate для враппера, либо undefined — если врапперу гейт
|
|
643
752
|
* не нужен (нативный cron + системный таймзона + окно не задано).
|
|
@@ -649,7 +758,7 @@ export function buildScheduleGate(
|
|
|
649
758
|
notBefore?: string,
|
|
650
759
|
notAfter?: string,
|
|
651
760
|
days?: number[] | null,
|
|
652
|
-
windowPolicy?: string | null
|
|
761
|
+
windowPolicy?: string | null,
|
|
653
762
|
): ScheduleGateSpec | undefined {
|
|
654
763
|
const tz = (timezone || "").trim() || undefined;
|
|
655
764
|
const poll = needsPollMode(expr, tz);
|
|
@@ -0,0 +1,298 @@
|
|
|
1
|
+
import { spawn } from "node:child_process";
|
|
2
|
+
import fs from "node:fs";
|
|
3
|
+
import type { RegistryEntry } from "./registry.js";
|
|
4
|
+
import { shellQuote } from "./posix.js";
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Fallback для one-shot задач, когда утилита `at` не установлена.
|
|
8
|
+
*
|
|
9
|
+
* Запускает отвязанный (detached) `/bin/bash`, который спит до `runAt` и
|
|
10
|
+
* затем выполняет команду задачи. Это не полноценная замена `atd`:
|
|
11
|
+
* - процесс не переживает перезагрузку машины;
|
|
12
|
+
* - не переживает ручной kill;
|
|
13
|
+
* - не виден в `atq`.
|
|
14
|
+
* Поэтому fallback используется только как последнее средство и пишет
|
|
15
|
+
* предупреждение в лог. Если `at` доступен — вызывается он.
|
|
16
|
+
*/
|
|
17
|
+
|
|
18
|
+
export interface DetachedOneShotSpawn {
|
|
19
|
+
once(event: "error", listener: (err: Error) => void): unknown;
|
|
20
|
+
once(event: "spawn", listener: () => void): unknown;
|
|
21
|
+
unref(): unknown;
|
|
22
|
+
pid?: number;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
export type DetachedOneShotSpawnFn = (
|
|
26
|
+
file: string,
|
|
27
|
+
args: string[],
|
|
28
|
+
options: { detached: boolean; stdio: "ignore" },
|
|
29
|
+
) => DetachedOneShotSpawn;
|
|
30
|
+
|
|
31
|
+
export interface ScheduleAtFallbackDeps {
|
|
32
|
+
spawnFn?: DetachedOneShotSpawnFn;
|
|
33
|
+
now?: () => number;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
export interface CancelAtFallbackDeps {
|
|
37
|
+
isAlive?: (pid: number, taskName: string) => boolean;
|
|
38
|
+
kill?: (pid: number, signal: NodeJS.Signals) => void;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
export interface PruneAtFallbackDeps {
|
|
42
|
+
now?: () => number;
|
|
43
|
+
isAlive?: (pid: number, taskName: string) => boolean;
|
|
44
|
+
schedule?: (
|
|
45
|
+
entry: RegistryEntry,
|
|
46
|
+
command: string,
|
|
47
|
+
nowMs: number,
|
|
48
|
+
) => Promise<string>;
|
|
49
|
+
warn?: (message: string) => void;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
export interface PruneAtFallbackReport {
|
|
53
|
+
kept: number;
|
|
54
|
+
removed: number;
|
|
55
|
+
rescheduled: number;
|
|
56
|
+
missed: number;
|
|
57
|
+
skipped: boolean;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/** Минимальный интерфейс реестра — чтобы prune можно было тестировать без FS. */
|
|
61
|
+
export interface FallbackRegistry {
|
|
62
|
+
load(): Promise<RegistryEntry[]>;
|
|
63
|
+
save(entries: RegistryEntry[]): Promise<void>;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
const PID_JOB_PREFIX = "pid:";
|
|
67
|
+
const FALLBACK_MARKER_PREFIX = "opencode-scheduler-at-fallback:";
|
|
68
|
+
|
|
69
|
+
/** Ошибка `spawn("at")`, означающая, что бинарник не найден. */
|
|
70
|
+
export function isAtMissingError(err: unknown): boolean {
|
|
71
|
+
if (!err || typeof err !== "object") return false;
|
|
72
|
+
const code = (err as { code?: unknown }).code;
|
|
73
|
+
if (code === "ENOENT") return true;
|
|
74
|
+
const message = (err as { message?: unknown }).message;
|
|
75
|
+
return typeof message === "string" && /ENOENT|not found|no such file/i.test(message);
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
/** Сколько секунд осталось до `runAt` (0, если момент уже прошёл). */
|
|
79
|
+
export function computeDelaySeconds(runAt: string, nowMs: number): number {
|
|
80
|
+
const target = Date.parse(runAt);
|
|
81
|
+
if (!Number.isFinite(target)) {
|
|
82
|
+
throw new Error(`Некорректное время one-shot: «${runAt}».`);
|
|
83
|
+
}
|
|
84
|
+
return Math.max(0, Math.ceil((target - nowMs) / 1000));
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
/**
|
|
88
|
+
* Маркер fallback-процесса конкретной задачи.
|
|
89
|
+
*
|
|
90
|
+
* Лежит в командной строке (`/proc/<pid>/cmdline`), поэтому позволяет
|
|
91
|
+
* проверить, что pid всё ещё принадлежит нашей задаче, а не переиспользован
|
|
92
|
+
* другим процессом после перезагрузки/завершения.
|
|
93
|
+
*/
|
|
94
|
+
export function fallbackMarker(taskName: string): string {
|
|
95
|
+
return `${FALLBACK_MARKER_PREFIX}${Buffer.from(taskName, "utf8").toString(
|
|
96
|
+
"base64url",
|
|
97
|
+
)}`;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
/** Скрипт для `/bin/bash -c`: подождать и выполнить команду задачи. */
|
|
101
|
+
export function buildDetachedOneShotScript(
|
|
102
|
+
entry: RegistryEntry,
|
|
103
|
+
command: string,
|
|
104
|
+
nowMs: number,
|
|
105
|
+
): string {
|
|
106
|
+
if (!entry.runAt) {
|
|
107
|
+
throw new Error(`Задача "${entry.name}": не задано runAt для one-shot.`);
|
|
108
|
+
}
|
|
109
|
+
const delay = computeDelaySeconds(entry.runAt, nowMs);
|
|
110
|
+
// Маркер — обычный shell-комментарий в конце, поэтому на выполнение не влияет.
|
|
111
|
+
return `sleep ${delay}; ${command} # ${fallbackMarker(entry.name)}`;
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
/** Является ли сохранённый id задания pid-ом fallback-процесса. */
|
|
115
|
+
export function isPidJobId(jobId: string | undefined): boolean {
|
|
116
|
+
return typeof jobId === "string" && jobId.startsWith(PID_JOB_PREFIX);
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
function pidFromJobId(jobId: string): number {
|
|
120
|
+
return Number.parseInt(jobId.slice(PID_JOB_PREFIX.length), 10);
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
/** Читает командную строку процесса из /proc; null, если процесс недоступен. */
|
|
124
|
+
export function readProcessCmdline(pid: number): string | null {
|
|
125
|
+
if (!Number.isFinite(pid) || pid <= 0) return null;
|
|
126
|
+
try {
|
|
127
|
+
return fs
|
|
128
|
+
.readFileSync(`/proc/${pid}/cmdline`, "utf8")
|
|
129
|
+
.split("\0")
|
|
130
|
+
.join(" ")
|
|
131
|
+
.trim();
|
|
132
|
+
} catch {
|
|
133
|
+
return null;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
/**
|
|
138
|
+
* Живой ли это fallback-процесс именно этой задачи.
|
|
139
|
+
*
|
|
140
|
+
* Без проверки маркера `pid:` из персистентного реестра после перезагрузки
|
|
141
|
+
* может указывать на совершенно другой процесс.
|
|
142
|
+
*/
|
|
143
|
+
export function isFallbackProcessAlive(pid: number, taskName: string): boolean {
|
|
144
|
+
const cmdline = readProcessCmdline(pid);
|
|
145
|
+
return cmdline !== null && cmdline.includes(fallbackMarker(taskName));
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
function hasProcfs(): boolean {
|
|
149
|
+
try {
|
|
150
|
+
return fs.existsSync("/proc/self/cmdline");
|
|
151
|
+
} catch {
|
|
152
|
+
return false;
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
/**
|
|
157
|
+
* Запускает отвязанный one-shot и возвращает `pid:<pid>` для `cancelAt`.
|
|
158
|
+
* Промис резолвится сразу после успешного `spawn`, не дожидаясь выполнения.
|
|
159
|
+
*/
|
|
160
|
+
export async function scheduleAtFallback(
|
|
161
|
+
entry: RegistryEntry,
|
|
162
|
+
command: string,
|
|
163
|
+
deps: ScheduleAtFallbackDeps = {},
|
|
164
|
+
): Promise<string> {
|
|
165
|
+
const spawnFn = deps.spawnFn ?? spawn;
|
|
166
|
+
const now = deps.now ? deps.now() : Date.now();
|
|
167
|
+
const script = buildDetachedOneShotScript(entry, command, now);
|
|
168
|
+
|
|
169
|
+
return new Promise<string>((resolve, reject) => {
|
|
170
|
+
const child = spawnFn("/bin/bash", ["-c", script], {
|
|
171
|
+
detached: true,
|
|
172
|
+
stdio: "ignore",
|
|
173
|
+
});
|
|
174
|
+
child.once("error", reject);
|
|
175
|
+
child.once("spawn", () => {
|
|
176
|
+
child.unref();
|
|
177
|
+
resolve(`${PID_JOB_PREFIX}${child.pid ?? 0}`);
|
|
178
|
+
});
|
|
179
|
+
});
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
/**
|
|
183
|
+
* Снимает fallback-процесс.
|
|
184
|
+
*
|
|
185
|
+
* Требует имя задачи и сверяет маркер в `/proc/<pid>/cmdline`: голый pid из
|
|
186
|
+
* реестра после перезагрузки может принадлежать чужому процессу. Убивает
|
|
187
|
+
* группу процессов (fallback запущен detached и является её лидером).
|
|
188
|
+
*/
|
|
189
|
+
export function cancelAtFallback(
|
|
190
|
+
jobId: string,
|
|
191
|
+
taskName?: string,
|
|
192
|
+
deps: CancelAtFallbackDeps = {},
|
|
193
|
+
): boolean {
|
|
194
|
+
if (!isPidJobId(jobId)) return false;
|
|
195
|
+
const pid = pidFromJobId(jobId);
|
|
196
|
+
if (!Number.isFinite(pid) || pid <= 0) return false;
|
|
197
|
+
if (!taskName) return false;
|
|
198
|
+
|
|
199
|
+
const isAlive = deps.isAlive ?? isFallbackProcessAlive;
|
|
200
|
+
if (!isAlive(pid, taskName)) return false;
|
|
201
|
+
|
|
202
|
+
const kill =
|
|
203
|
+
deps.kill ??
|
|
204
|
+
((target: number, signal: NodeJS.Signals) => process.kill(target, signal));
|
|
205
|
+
try {
|
|
206
|
+
kill(-pid, "SIGTERM");
|
|
207
|
+
return true;
|
|
208
|
+
} catch {
|
|
209
|
+
try {
|
|
210
|
+
kill(pid, "SIGTERM");
|
|
211
|
+
return true;
|
|
212
|
+
} catch {
|
|
213
|
+
return false;
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
|
|
218
|
+
/** Команда, которую выполняет fallback: обёртка задачи + перенаправление лога. */
|
|
219
|
+
function buildFallbackCommand(entry: RegistryEntry): string {
|
|
220
|
+
const log = entry.logFile ? ` >> ${shellQuote(entry.logFile)} 2>&1` : "";
|
|
221
|
+
return `/bin/bash ${shellQuote(entry.command)}${log}`;
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
/**
|
|
225
|
+
* Чистит `pid:`-записи, пережившие перезагрузку.
|
|
226
|
+
*
|
|
227
|
+
* Вызывается один раз при старте плагина. Живые процессы с совпадающим
|
|
228
|
+
* маркером сохраняются; мёртвые — удаляются. Будущие one-shot пересоздаются,
|
|
229
|
+
* прошедшие — помечаются пропущенными с предупреждением.
|
|
230
|
+
*/
|
|
231
|
+
export async function pruneStaleFallbackEntries(
|
|
232
|
+
registry: FallbackRegistry,
|
|
233
|
+
deps: PruneAtFallbackDeps = {},
|
|
234
|
+
): Promise<PruneAtFallbackReport> {
|
|
235
|
+
const nowMs = deps.now ? deps.now() : Date.now();
|
|
236
|
+
const isAlive = deps.isAlive ?? isFallbackProcessAlive;
|
|
237
|
+
const warn = deps.warn ?? ((message: string) => console.warn(message));
|
|
238
|
+
const schedule =
|
|
239
|
+
deps.schedule ??
|
|
240
|
+
((entry, command, at) =>
|
|
241
|
+
scheduleAtFallback(entry, command, { now: () => at }));
|
|
242
|
+
|
|
243
|
+
// В системах без /proc проверить личность pid нельзя. Без инъекции
|
|
244
|
+
// isAlive ничего не трогаем, чтобы не убить чужой процесс.
|
|
245
|
+
if (!deps.isAlive && !hasProcfs()) {
|
|
246
|
+
return { kept: 0, removed: 0, rescheduled: 0, missed: 0, skipped: true };
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
const entries = await registry.load();
|
|
250
|
+
const report: PruneAtFallbackReport = {
|
|
251
|
+
kept: 0,
|
|
252
|
+
removed: 0,
|
|
253
|
+
rescheduled: 0,
|
|
254
|
+
missed: 0,
|
|
255
|
+
skipped: false,
|
|
256
|
+
};
|
|
257
|
+
|
|
258
|
+
let changed = false;
|
|
259
|
+
for (const entry of entries) {
|
|
260
|
+
if (!isPidJobId(entry.atJobId)) continue;
|
|
261
|
+
const pid = pidFromJobId(entry.atJobId!);
|
|
262
|
+
|
|
263
|
+
if (isAlive(pid, entry.name)) {
|
|
264
|
+
report.kept += 1;
|
|
265
|
+
continue;
|
|
266
|
+
}
|
|
267
|
+
|
|
268
|
+
delete entry.atJobId;
|
|
269
|
+
changed = true;
|
|
270
|
+
report.removed += 1;
|
|
271
|
+
|
|
272
|
+
if (entry.triggerType !== "once" || entry.paused) continue;
|
|
273
|
+
|
|
274
|
+
const target = entry.runAt ? Date.parse(entry.runAt) : Number.NaN;
|
|
275
|
+
if (Number.isFinite(target) && target > nowMs) {
|
|
276
|
+
try {
|
|
277
|
+
entry.atJobId = await schedule(entry, buildFallbackCommand(entry), nowMs);
|
|
278
|
+
report.rescheduled += 1;
|
|
279
|
+
} catch (err: any) {
|
|
280
|
+
warn(
|
|
281
|
+
`[scheduler] Не удалось пересоздать fallback для "${entry.name}": ${
|
|
282
|
+
err instanceof Error ? err.message : String(err)
|
|
283
|
+
}`,
|
|
284
|
+
);
|
|
285
|
+
}
|
|
286
|
+
continue;
|
|
287
|
+
}
|
|
288
|
+
|
|
289
|
+
report.missed += 1;
|
|
290
|
+
warn(
|
|
291
|
+
`[scheduler] One-shot "${entry.name}" не будет запущена: fallback-процесс потерян, ` +
|
|
292
|
+
`время запуска уже прошло (${entry.runAt ?? "runAt не задан"}).`,
|
|
293
|
+
);
|
|
294
|
+
}
|
|
295
|
+
|
|
296
|
+
if (changed) await registry.save(entries);
|
|
297
|
+
return report;
|
|
298
|
+
}
|
|
@@ -24,7 +24,7 @@ export type { RegistryEntry } from "./registry.js";
|
|
|
24
24
|
*/
|
|
25
25
|
export function createSchedulerBackend(
|
|
26
26
|
platform: NodeJS.Platform = process.platform,
|
|
27
|
-
profile?: string
|
|
27
|
+
profile?: string,
|
|
28
28
|
): SchedulerBackend {
|
|
29
29
|
if (platform === "win32") return new WindowsScheduler(profile);
|
|
30
30
|
if (platform === "darwin") return new MacScheduler(profile);
|
|
@@ -38,7 +38,7 @@ export function createSchedulerBackend(
|
|
|
38
38
|
*/
|
|
39
39
|
export function createSchedulerBackendForProfile(
|
|
40
40
|
profile: string,
|
|
41
|
-
platform: NodeJS.Platform = process.platform
|
|
41
|
+
platform: NodeJS.Platform = process.platform,
|
|
42
42
|
): SchedulerBackend {
|
|
43
43
|
return createSchedulerBackend(platform, profile);
|
|
44
44
|
}
|
|
@@ -50,7 +50,7 @@ export function createSchedulerBackendForProfile(
|
|
|
50
50
|
*/
|
|
51
51
|
export async function removeScheduledTasksForProfile(
|
|
52
52
|
profile: string,
|
|
53
|
-
platform: NodeJS.Platform = process.platform
|
|
53
|
+
platform: NodeJS.Platform = process.platform,
|
|
54
54
|
): Promise<number> {
|
|
55
55
|
const scheduler = createSchedulerBackendForProfile(profile, platform);
|
|
56
56
|
const tasks = await scheduler.listTasks();
|