agent-steward 0.0.3 → 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 +20 -0
- package/README.md +3 -3
- package/ROADMAP-STRATEGY.md +9 -9
- package/ROADMAP.md +50 -34
- 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 +18 -1
- package/dist/core/lock.d.ts +20 -4
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +97 -22
- package/dist/core/one-shot.d.ts +5 -1
- package/dist/core/one-shot.d.ts.map +1 -1
- package/dist/core/one-shot.js +33 -8
- 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/ps-wrapper.d.ts +1 -1
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +11 -1
- 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 +56 -32
- 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 +34 -0
- package/dist/core/schedule-v2.d.ts.map +1 -1
- package/dist/core/schedule-v2.js +91 -5
- package/dist/core/scheduler/at-fallback.d.ts +55 -2
- package/dist/core/scheduler/at-fallback.d.ts.map +1 -1
- package/dist/core/scheduler/at-fallback.js +135 -5
- package/dist/core/scheduler/linux.d.ts +10 -1
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +29 -11
- package/dist/core/scheduler/posix.d.ts.map +1 -1
- package/dist/core/scheduler/posix.js +25 -1
- package/dist/core/scheduler/registry.d.ts +11 -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/secrets.d.ts.map +1 -1
- package/dist/core/secrets.js +125 -28
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +18 -11
- 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/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +49 -4
- 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 +4 -0
- package/dist/db/index.d.ts.map +1 -1
- package/dist/db/index.js +39 -1
- 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-resume.d.ts +5 -2
- package/dist/db/run-resume.d.ts.map +1 -1
- package/dist/db/run-resume.js +30 -11
- package/dist/db/runs-repo.d.ts +13 -5
- package/dist/db/runs-repo.d.ts.map +1 -1
- package/dist/db/runs-repo.js +28 -5
- package/dist/db/schema.d.ts +2 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +154 -2
- 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 +4 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +102 -4
- package/dist/rpc.d.ts +678 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +235 -0
- package/dist/server.d.ts +31 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +95 -35
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +7 -0
- package/dist/workspaces.d.ts +25 -3
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +43 -8
- package/docs/ARCHITECTURE.md +229 -5
- package/docs/CONCEPT.md +171 -91
- package/docs/EXECUTION-LOOP.md +196 -0
- package/docs/README.ru.md +2 -2
- package/docs/README.zh.md +3 -3
- 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/gui-experimental.cjs +8 -8
- package/locales/en.json +67 -0
- package/locales/ru.json +67 -0
- package/locales/zh.json +67 -0
- package/package.json +28 -3
- package/scripts/audit-bundle.mjs +215 -0
- package/src/core/dlq-api.ts +98 -0
- package/src/core/dry-run.ts +25 -1
- package/src/core/lock.ts +95 -22
- package/src/core/one-shot.ts +36 -8
- package/src/core/opencode-cli.ts +103 -0
- package/src/core/opencode-models.ts +315 -0
- package/src/core/ps-wrapper.ts +11 -1
- package/src/core/record-history.ts +75 -37
- 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/schedule-gate.ts +6 -2
- package/src/core/schedule-v2.ts +114 -5
- package/src/core/scheduler/at-fallback.ts +190 -5
- package/src/core/scheduler/linux.ts +32 -10
- package/src/core/scheduler/posix.ts +20 -1
- package/src/core/scheduler/registry.ts +107 -26
- package/src/core/scheduler/run-now.ts +32 -0
- package/src/core/secrets.ts +127 -27
- package/src/core/session.ts +23 -10
- package/src/core/task-name.ts +67 -0
- package/src/core/wrappers/bash.ts +49 -4
- package/src/db/capability-repo.ts +285 -0
- package/src/db/history-repo.ts +22 -0
- package/src/db/index.ts +37 -1
- package/src/db/migrate.ts +3 -1
- package/src/db/run-context.ts +370 -0
- package/src/db/run-dlq.ts +310 -0
- package/src/db/run-resume.ts +48 -12
- package/src/db/runs-repo.ts +30 -7
- package/src/db/schema.ts +154 -2
- package/src/db/settings-repo.ts +31 -0
- package/src/db/step-idempotency.ts +185 -0
- package/src/gui.tsx +515 -0
- package/src/index.ts +124 -4
- package/src/rpc.ts +251 -0
- package/src/server.ts +112 -36
- package/src/types.ts +9 -0
- package/src/workspaces.ts +58 -9
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"at-fallback.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/at-fallback.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"at-fallback.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/at-fallback.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
|
+
import fs from "node:fs";
|
|
3
|
+
import { shellQuote } from "./posix.js";
|
|
2
4
|
const PID_JOB_PREFIX = "pid:";
|
|
5
|
+
const FALLBACK_MARKER_PREFIX = "opencode-scheduler-at-fallback:";
|
|
3
6
|
/** Ошибка `spawn("at")`, означающая, что бинарник не найден. */
|
|
4
7
|
export function isAtMissingError(err) {
|
|
5
8
|
if (!err || typeof err !== "object")
|
|
@@ -18,13 +21,24 @@ export function computeDelaySeconds(runAt, nowMs) {
|
|
|
18
21
|
}
|
|
19
22
|
return Math.max(0, Math.ceil((target - nowMs) / 1000));
|
|
20
23
|
}
|
|
24
|
+
/**
|
|
25
|
+
* Маркер fallback-процесса конкретной задачи.
|
|
26
|
+
*
|
|
27
|
+
* Лежит в командной строке (`/proc/<pid>/cmdline`), поэтому позволяет
|
|
28
|
+
* проверить, что pid всё ещё принадлежит нашей задаче, а не переиспользован
|
|
29
|
+
* другим процессом после перезагрузки/завершения.
|
|
30
|
+
*/
|
|
31
|
+
export function fallbackMarker(taskName) {
|
|
32
|
+
return `${FALLBACK_MARKER_PREFIX}${Buffer.from(taskName, "utf8").toString("base64url")}`;
|
|
33
|
+
}
|
|
21
34
|
/** Скрипт для `/bin/bash -c`: подождать и выполнить команду задачи. */
|
|
22
35
|
export function buildDetachedOneShotScript(entry, command, nowMs) {
|
|
23
36
|
if (!entry.runAt) {
|
|
24
37
|
throw new Error(`Задача "${entry.name}": не задано runAt для one-shot.`);
|
|
25
38
|
}
|
|
26
39
|
const delay = computeDelaySeconds(entry.runAt, nowMs);
|
|
27
|
-
|
|
40
|
+
// Маркер — обычный shell-комментарий в конце, поэтому на выполнение не влияет.
|
|
41
|
+
return `sleep ${delay}; ${command} # ${fallbackMarker(entry.name)}`;
|
|
28
42
|
}
|
|
29
43
|
/** Является ли сохранённый id задания pid-ом fallback-процесса. */
|
|
30
44
|
export function isPidJobId(jobId) {
|
|
@@ -33,6 +47,39 @@ export function isPidJobId(jobId) {
|
|
|
33
47
|
function pidFromJobId(jobId) {
|
|
34
48
|
return Number.parseInt(jobId.slice(PID_JOB_PREFIX.length), 10);
|
|
35
49
|
}
|
|
50
|
+
/** Читает командную строку процесса из /proc; null, если процесс недоступен. */
|
|
51
|
+
export function readProcessCmdline(pid) {
|
|
52
|
+
if (!Number.isFinite(pid) || pid <= 0)
|
|
53
|
+
return null;
|
|
54
|
+
try {
|
|
55
|
+
return fs
|
|
56
|
+
.readFileSync(`/proc/${pid}/cmdline`, "utf8")
|
|
57
|
+
.split("\0")
|
|
58
|
+
.join(" ")
|
|
59
|
+
.trim();
|
|
60
|
+
}
|
|
61
|
+
catch {
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* Живой ли это fallback-процесс именно этой задачи.
|
|
67
|
+
*
|
|
68
|
+
* Без проверки маркера `pid:` из персистентного реестра после перезагрузки
|
|
69
|
+
* может указывать на совершенно другой процесс.
|
|
70
|
+
*/
|
|
71
|
+
export function isFallbackProcessAlive(pid, taskName) {
|
|
72
|
+
const cmdline = readProcessCmdline(pid);
|
|
73
|
+
return cmdline !== null && cmdline.includes(fallbackMarker(taskName));
|
|
74
|
+
}
|
|
75
|
+
function hasProcfs() {
|
|
76
|
+
try {
|
|
77
|
+
return fs.existsSync("/proc/self/cmdline");
|
|
78
|
+
}
|
|
79
|
+
catch {
|
|
80
|
+
return false;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
36
83
|
/**
|
|
37
84
|
* Запускает отвязанный one-shot и возвращает `pid:<pid>` для `cancelAt`.
|
|
38
85
|
* Промис резолвится сразу после успешного `spawn`, не дожидаясь выполнения.
|
|
@@ -53,18 +100,101 @@ export async function scheduleAtFallback(entry, command, deps = {}) {
|
|
|
53
100
|
});
|
|
54
101
|
});
|
|
55
102
|
}
|
|
56
|
-
/**
|
|
57
|
-
|
|
103
|
+
/**
|
|
104
|
+
* Снимает fallback-процесс.
|
|
105
|
+
*
|
|
106
|
+
* Требует имя задачи и сверяет маркер в `/proc/<pid>/cmdline`: голый pid из
|
|
107
|
+
* реестра после перезагрузки может принадлежать чужому процессу. Убивает
|
|
108
|
+
* группу процессов (fallback запущен detached и является её лидером).
|
|
109
|
+
*/
|
|
110
|
+
export function cancelAtFallback(jobId, taskName, deps = {}) {
|
|
58
111
|
if (!isPidJobId(jobId))
|
|
59
112
|
return false;
|
|
60
113
|
const pid = pidFromJobId(jobId);
|
|
61
114
|
if (!Number.isFinite(pid) || pid <= 0)
|
|
62
115
|
return false;
|
|
116
|
+
if (!taskName)
|
|
117
|
+
return false;
|
|
118
|
+
const isAlive = deps.isAlive ?? isFallbackProcessAlive;
|
|
119
|
+
if (!isAlive(pid, taskName))
|
|
120
|
+
return false;
|
|
121
|
+
const kill = deps.kill ??
|
|
122
|
+
((target, signal) => process.kill(target, signal));
|
|
63
123
|
try {
|
|
64
|
-
|
|
124
|
+
kill(-pid, "SIGTERM");
|
|
65
125
|
return true;
|
|
66
126
|
}
|
|
67
127
|
catch {
|
|
68
|
-
|
|
128
|
+
try {
|
|
129
|
+
kill(pid, "SIGTERM");
|
|
130
|
+
return true;
|
|
131
|
+
}
|
|
132
|
+
catch {
|
|
133
|
+
return false;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
/** Команда, которую выполняет fallback: обёртка задачи + перенаправление лога. */
|
|
138
|
+
function buildFallbackCommand(entry) {
|
|
139
|
+
const log = entry.logFile ? ` >> ${shellQuote(entry.logFile)} 2>&1` : "";
|
|
140
|
+
return `/bin/bash ${shellQuote(entry.command)}${log}`;
|
|
141
|
+
}
|
|
142
|
+
/**
|
|
143
|
+
* Чистит `pid:`-записи, пережившие перезагрузку.
|
|
144
|
+
*
|
|
145
|
+
* Вызывается один раз при старте плагина. Живые процессы с совпадающим
|
|
146
|
+
* маркером сохраняются; мёртвые — удаляются. Будущие one-shot пересоздаются,
|
|
147
|
+
* прошедшие — помечаются пропущенными с предупреждением.
|
|
148
|
+
*/
|
|
149
|
+
export async function pruneStaleFallbackEntries(registry, deps = {}) {
|
|
150
|
+
const nowMs = deps.now ? deps.now() : Date.now();
|
|
151
|
+
const isAlive = deps.isAlive ?? isFallbackProcessAlive;
|
|
152
|
+
const warn = deps.warn ?? ((message) => console.warn(message));
|
|
153
|
+
const schedule = deps.schedule ??
|
|
154
|
+
((entry, command, at) => scheduleAtFallback(entry, command, { now: () => at }));
|
|
155
|
+
// В системах без /proc проверить личность pid нельзя. Без инъекции
|
|
156
|
+
// isAlive ничего не трогаем, чтобы не убить чужой процесс.
|
|
157
|
+
if (!deps.isAlive && !hasProcfs()) {
|
|
158
|
+
return { kept: 0, removed: 0, rescheduled: 0, missed: 0, skipped: true };
|
|
159
|
+
}
|
|
160
|
+
const entries = await registry.load();
|
|
161
|
+
const report = {
|
|
162
|
+
kept: 0,
|
|
163
|
+
removed: 0,
|
|
164
|
+
rescheduled: 0,
|
|
165
|
+
missed: 0,
|
|
166
|
+
skipped: false,
|
|
167
|
+
};
|
|
168
|
+
let changed = false;
|
|
169
|
+
for (const entry of entries) {
|
|
170
|
+
if (!isPidJobId(entry.atJobId))
|
|
171
|
+
continue;
|
|
172
|
+
const pid = pidFromJobId(entry.atJobId);
|
|
173
|
+
if (isAlive(pid, entry.name)) {
|
|
174
|
+
report.kept += 1;
|
|
175
|
+
continue;
|
|
176
|
+
}
|
|
177
|
+
delete entry.atJobId;
|
|
178
|
+
changed = true;
|
|
179
|
+
report.removed += 1;
|
|
180
|
+
if (entry.triggerType !== "once" || entry.paused)
|
|
181
|
+
continue;
|
|
182
|
+
const target = entry.runAt ? Date.parse(entry.runAt) : Number.NaN;
|
|
183
|
+
if (Number.isFinite(target) && target > nowMs) {
|
|
184
|
+
try {
|
|
185
|
+
entry.atJobId = await schedule(entry, buildFallbackCommand(entry), nowMs);
|
|
186
|
+
report.rescheduled += 1;
|
|
187
|
+
}
|
|
188
|
+
catch (err) {
|
|
189
|
+
warn(`[scheduler] Не удалось пересоздать fallback для "${entry.name}": ${err instanceof Error ? err.message : String(err)}`);
|
|
190
|
+
}
|
|
191
|
+
continue;
|
|
192
|
+
}
|
|
193
|
+
report.missed += 1;
|
|
194
|
+
warn(`[scheduler] One-shot "${entry.name}" не будет запущена: fallback-процесс потерян, ` +
|
|
195
|
+
`время запуска уже прошло (${entry.runAt ?? "runAt не задан"}).`);
|
|
69
196
|
}
|
|
197
|
+
if (changed)
|
|
198
|
+
await registry.save(entries);
|
|
199
|
+
return report;
|
|
70
200
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type PruneAtFallbackReport } from "./at-fallback.js";
|
|
1
2
|
import { PosixSchedulerBase } from "./posix.js";
|
|
2
3
|
import type { RegistryEntry } from "./registry.js";
|
|
3
4
|
/**
|
|
@@ -30,7 +31,10 @@ export declare class LinuxScheduler extends PosixSchedulerBase {
|
|
|
30
31
|
private writeCrontab;
|
|
31
32
|
/** Перегенерирует блок плагина из реестра. */
|
|
32
33
|
private rebuildCrontab;
|
|
33
|
-
/** Строка команды one-shot для stdin `at`.
|
|
34
|
+
/** Строка команды one-shot для stdin `at`.
|
|
35
|
+
* P1-7.T1.3: без `-c` bash трактует аргумент как ИМЯ ФАЙЛА скрипта
|
|
36
|
+
* (exit 127 «No such file or directory»), поэтому at «выполнял» задание,
|
|
37
|
+
* но команда на самом деле не запускалась. */
|
|
34
38
|
private atCommand;
|
|
35
39
|
/**
|
|
36
40
|
* Ставит one-shot в `at` и возвращает id задания.
|
|
@@ -39,6 +43,11 @@ export declare class LinuxScheduler extends PosixSchedulerBase {
|
|
|
39
43
|
private scheduleAt;
|
|
40
44
|
/** Отменяет задание at, если оно ещё существует. */
|
|
41
45
|
private cancelAt;
|
|
46
|
+
/**
|
|
47
|
+
* P1-14: чистит `pid:`-записи fallback'а, пережившие перезагрузку.
|
|
48
|
+
* Вызывается из старта плагина; на других платформах не используется.
|
|
49
|
+
*/
|
|
50
|
+
pruneStaleFallbacks(): Promise<PruneAtFallbackReport>;
|
|
42
51
|
protected installEntry(entry: RegistryEntry): Promise<void>;
|
|
43
52
|
protected uninstallEntry(entry: RegistryEntry): Promise<void>;
|
|
44
53
|
protected applyPause(entry: RegistryEntry, paused: boolean): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linux.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/linux.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"linux.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/linux.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,KAAK,qBAAqB,EAC3B,MAAM,kBAAkB,CAAC;AAK1B,OAAO,EAAE,kBAAkB,EAAc,MAAM,YAAY,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAInD;;;;;;;;;;GAUG;AACH,qBAAa,cAAe,SAAQ,kBAAkB;IACpD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAW;IAC7C,QAAQ,CAAC,KAAK,8BAA8B;IAE5C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;gBAE9B,OAAO,GAAE,MAAyB;IAY9C,OAAO,CAAC,QAAQ;IAkBhB,OAAO,CAAC,WAAW;IAYnB,0EAA0E;YAC5D,WAAW;IAkBzB,0DAA0D;IAC1D,OAAO,CAAC,UAAU;IA+BlB,mDAAmD;YACrC,YAAY;IAgB1B,8CAA8C;YAChC,cAAc;IA4B5B;;;mDAG+C;IAC/C,OAAO,CAAC,SAAS;IAKjB;;;OAGG;YACW,UAAU;IAuExB,oDAAoD;YACtC,QAAQ;IAiBtB;;;OAGG;IACG,mBAAmB,IAAI,OAAO,CAAC,qBAAqB,CAAC;cAI3C,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAUjD,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAQnD,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAoBjF"}
|
|
@@ -2,8 +2,8 @@ import { execFile, spawn } from "node:child_process";
|
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { promisify } from "node:util";
|
|
4
4
|
import { buildAtTimestamp } from "../one-shot.js";
|
|
5
|
-
import { cancelAtFallback, isAtMissingError, isPidJobId, scheduleAtFallback, } from "./at-fallback.js";
|
|
6
|
-
import {
|
|
5
|
+
import { cancelAtFallback, isAtMissingError, isPidJobId, pruneStaleFallbackEntries, scheduleAtFallback, } from "./at-fallback.js";
|
|
6
|
+
import { needsPosixPollMode } from "../schedule-v2.js";
|
|
7
7
|
import { LockManager, withLockWait } from "../lock.js";
|
|
8
8
|
import { getBasePluginDir, getProfileName } from "../../profiles.js";
|
|
9
9
|
import { taskFolderNameForProfile, legacyTaskFolderNameForProfile } from "../../types.js";
|
|
@@ -41,12 +41,12 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
41
41
|
}
|
|
42
42
|
const log = entry.logFile ? ` >> ${shellQuote(entry.logFile)} 2>&1` : "";
|
|
43
43
|
const cmd = `/bin/bash ${shellQuote(entry.command)}${log}`;
|
|
44
|
-
//
|
|
45
|
-
//
|
|
46
|
-
//
|
|
47
|
-
//
|
|
48
|
-
// иначе crontab сработает по системному
|
|
49
|
-
const schedule =
|
|
44
|
+
// Vixie-совместимый 5-полевой cron crontab выполняет сам: списки,
|
|
45
|
+
// диапазоны, шаги и имена месяцев/дней недели писать как есть можно.
|
|
46
|
+
// Quartz-расширения (L, d#n) и @-макросы (не 5 полей) crontab не понимает —
|
|
47
|
+
// для них "* * * * *" + gate во враппере. Чужая IANA-таймзона тоже уходит
|
|
48
|
+
// в poll: иначе crontab сработает по системному времени задачи.
|
|
49
|
+
const schedule = needsPosixPollMode(entry.schedule, entry.timezone)
|
|
50
50
|
? "* * * * *"
|
|
51
51
|
: entry.schedule;
|
|
52
52
|
return `${schedule} ${cmd}`;
|
|
@@ -150,10 +150,13 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
150
150
|
await this.writeCrontab(next);
|
|
151
151
|
}, { timeoutMs: 15000, staleMs: 60000 });
|
|
152
152
|
}
|
|
153
|
-
/** Строка команды one-shot для stdin `at`.
|
|
153
|
+
/** Строка команды one-shot для stdin `at`.
|
|
154
|
+
* P1-7.T1.3: без `-c` bash трактует аргумент как ИМЯ ФАЙЛА скрипта
|
|
155
|
+
* (exit 127 «No such file or directory»), поэтому at «выполнял» задание,
|
|
156
|
+
* но команда на самом деле не запускалась. */
|
|
154
157
|
atCommand(entry) {
|
|
155
158
|
const log = entry.logFile ? ` >> ${shellQuote(entry.logFile)} 2>&1` : "";
|
|
156
|
-
return `/bin/bash ${shellQuote(entry.command)}${log}`;
|
|
159
|
+
return `/bin/bash -c ${shellQuote(entry.command)}${log}`;
|
|
157
160
|
}
|
|
158
161
|
/**
|
|
159
162
|
* Ставит one-shot в `at` и возвращает id задания.
|
|
@@ -217,7 +220,8 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
217
220
|
return;
|
|
218
221
|
if (isPidJobId(entry.atJobId)) {
|
|
219
222
|
// P1-7.T1.2: снимаем fallback-процесс, а не at-задание.
|
|
220
|
-
|
|
223
|
+
// P1-14: передаём имя — без сверки маркера pid мог быть переиспользован.
|
|
224
|
+
cancelAtFallback(entry.atJobId, entry.name);
|
|
221
225
|
delete entry.atJobId;
|
|
222
226
|
return;
|
|
223
227
|
}
|
|
@@ -229,6 +233,13 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
229
233
|
}
|
|
230
234
|
delete entry.atJobId;
|
|
231
235
|
}
|
|
236
|
+
/**
|
|
237
|
+
* P1-14: чистит `pid:`-записи fallback'а, пережившие перезагрузку.
|
|
238
|
+
* Вызывается из старта плагина; на других платформах не используется.
|
|
239
|
+
*/
|
|
240
|
+
async pruneStaleFallbacks() {
|
|
241
|
+
return pruneStaleFallbackEntries(this.registry);
|
|
242
|
+
}
|
|
232
243
|
async installEntry(entry) {
|
|
233
244
|
if (entry.triggerType === "once") {
|
|
234
245
|
if (!entry.paused) {
|
|
@@ -246,6 +257,10 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
246
257
|
await this.rebuildCrontab();
|
|
247
258
|
}
|
|
248
259
|
async applyPause(entry, paused) {
|
|
260
|
+
// P1-12: entry получен из find() ДО setPaused(), поэтому без этой строки
|
|
261
|
+
// upsert ниже возвращал в реестр paused:false, и listTasks() показывал
|
|
262
|
+
// приостановленную one-shot задачу как Ready.
|
|
263
|
+
entry.paused = paused;
|
|
249
264
|
if (entry.triggerType === "once") {
|
|
250
265
|
if (paused) {
|
|
251
266
|
await this.cancelAt(entry);
|
|
@@ -253,6 +268,9 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
253
268
|
else if (entry.runAt && Date.parse(entry.runAt) > Date.now()) {
|
|
254
269
|
entry.atJobId = await this.scheduleAt(entry);
|
|
255
270
|
}
|
|
271
|
+
else {
|
|
272
|
+
console.warn(`[scheduler] Задача "${entry.name}" не будет перезапущена: время one-shot запуска уже прошло (${entry.runAt ?? "runAt не задан"}). Создайте новую задачу.`);
|
|
273
|
+
}
|
|
256
274
|
await this.registry.upsert(entry);
|
|
257
275
|
return;
|
|
258
276
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"posix.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/posix.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,KAAK,EACV,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAEpB;;;;;;;GAOG;AACH,8BAAsB,kBAAmB,YAAW,gBAAgB;IAClE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC5C,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEhC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC;gBAE9B,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAI/C,wEAAwE;IACxE,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IACpE,yCAAyC;IACzC,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IACtE,4DAA4D;IAC5D,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAE7E,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"posix.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/posix.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,KAAK,EACV,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAEpB;;;;;;;GAOG;AACH,8BAAsB,kBAAmB,YAAW,gBAAgB;IAClE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC5C,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEhC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC;gBAE9B,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAI/C,wEAAwE;IACxE,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IACpE,yCAAyC;IACzC,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IACtE,4DAA4D;IAC5D,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAE7E,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyCrD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQvC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOvC,SAAS,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAS/C;;;;OAIG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;CA0BpD;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGhD"}
|
|
@@ -27,8 +27,32 @@ export class PosixSchedulerBase {
|
|
|
27
27
|
...(options.priority !== undefined ? { priority: options.priority } : {}),
|
|
28
28
|
...(options.timezone ? { timezone: options.timezone } : {}),
|
|
29
29
|
};
|
|
30
|
+
// P2-17: запись нужна в реестре ДО installEntry — Linux пересобирает crontab
|
|
31
|
+
// из реестра. Но если установка упала, запись-призрак останется навсегда,
|
|
32
|
+
// поэтому откатываем реестр к предыдущему состоянию.
|
|
33
|
+
const previous = await this.registry.find(entry.name);
|
|
30
34
|
await this.registry.upsert(entry);
|
|
31
|
-
|
|
35
|
+
try {
|
|
36
|
+
await this.installEntry(entry);
|
|
37
|
+
}
|
|
38
|
+
catch (err) {
|
|
39
|
+
try {
|
|
40
|
+
if (previous)
|
|
41
|
+
await this.registry.upsert(previous);
|
|
42
|
+
else
|
|
43
|
+
await this.registry.remove(entry.name);
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
// Не маскируем исходную ошибку установки ошибкой отката.
|
|
47
|
+
}
|
|
48
|
+
try {
|
|
49
|
+
await this.uninstallEntry(entry);
|
|
50
|
+
}
|
|
51
|
+
catch {
|
|
52
|
+
// Частичная установка могла не создать запись — это не ошибка отката.
|
|
53
|
+
}
|
|
54
|
+
throw err;
|
|
55
|
+
}
|
|
32
56
|
// installEntry может записать atJobId для Linux one-shot.
|
|
33
57
|
await this.registry.upsert(entry);
|
|
34
58
|
}
|
|
@@ -30,11 +30,22 @@ export interface RegistryEntry {
|
|
|
30
30
|
export declare class TaskRegistry {
|
|
31
31
|
private readonly file;
|
|
32
32
|
private readonly dir;
|
|
33
|
+
private readonly backendId;
|
|
34
|
+
private readonly lock;
|
|
33
35
|
constructor(backendId: string, profile?: string);
|
|
34
36
|
/** Путь к файлу реестра (для диагностики). */
|
|
35
37
|
get path(): string;
|
|
38
|
+
/** Маркер того, что реестр был повреждён и перемещён в карантин. */
|
|
39
|
+
private get blockedPath();
|
|
36
40
|
load(): Promise<RegistryEntry[]>;
|
|
41
|
+
/** Перемещает повреждённый файл в карантин и блокирует дальнейшие записи. */
|
|
42
|
+
private quarantineCorrupt;
|
|
37
43
|
save(entries: RegistryEntry[]): Promise<void>;
|
|
44
|
+
/**
|
|
45
|
+
* Read-modify-write под межпроцессной блокировкой: два процесса на одном
|
|
46
|
+
* профиле не должны терять чужие записи (P2-16).
|
|
47
|
+
*/
|
|
48
|
+
private mutate;
|
|
38
49
|
find(name: string): Promise<RegistryEntry | undefined>;
|
|
39
50
|
upsert(entry: RegistryEntry): Promise<void>;
|
|
40
51
|
remove(name: string): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/registry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/registry.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,WAAW,CAAC;IACzB,yEAAyE;IACzE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iEAAiE;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,uCAAuC;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4CAA4C;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iEAAiE;IACjE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,8EAA8E;AAC9E,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAc;gBAEvB,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,MAAyB;IASjE,8CAA8C;IAC9C,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,oEAAoE;IACpE,OAAO,KAAK,WAAW,GAEtB;IAEK,IAAI,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAmCtC,6EAA6E;YAC/D,iBAAiB;IAwBzB,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnD;;;OAGG;YACW,MAAM;IAed,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAKtD,MAAM,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3C,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASnC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAQ9D"}
|
|
@@ -1,57 +1,119 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { getProfileDir, getProfileName } from "../../profiles.js";
|
|
4
|
+
import { LockManager, withLockWait } from "../lock.js";
|
|
4
5
|
/** Реестр задач конкретного бэкенда: <pluginDir>/scheduler-<backend>.json. */
|
|
5
6
|
export class TaskRegistry {
|
|
6
7
|
constructor(backendId, profile = getProfileName()) {
|
|
8
|
+
this.backendId = backendId;
|
|
7
9
|
this.dir = getProfileDir(profile);
|
|
8
10
|
this.file = path.join(this.dir, `scheduler-${backendId}.json`);
|
|
11
|
+
// P2-16: мутации реестра — read-modify-write. Лок сериализует их между
|
|
12
|
+
// процессами (хост OpenCode, CLI, detached record-history).
|
|
13
|
+
this.lock = new LockManager(path.join(this.dir, "locks"));
|
|
9
14
|
}
|
|
10
15
|
/** Путь к файлу реестра (для диагностики). */
|
|
11
16
|
get path() {
|
|
12
17
|
return this.file;
|
|
13
18
|
}
|
|
19
|
+
/** Маркер того, что реестр был повреждён и перемещён в карантин. */
|
|
20
|
+
get blockedPath() {
|
|
21
|
+
return `${this.file}.blocked`;
|
|
22
|
+
}
|
|
14
23
|
async load() {
|
|
24
|
+
let raw;
|
|
15
25
|
try {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
26
|
+
raw = await fs.readFile(this.file, "utf8");
|
|
27
|
+
}
|
|
28
|
+
catch (err) {
|
|
29
|
+
if (err?.code === "ENOENT") {
|
|
30
|
+
// Карантин уже переместил файл. Пустой реестр нельзя выдавать за
|
|
31
|
+
// «задач нет»: rebuildCrontab вычистил бы все cron-строки плагина.
|
|
32
|
+
const blocked = await fs.readFile(this.blockedPath, "utf8").catch(() => null);
|
|
33
|
+
if (blocked) {
|
|
34
|
+
throw new Error(`Реестр задач повреждён (карантин: ${blocked.trim()}). ` +
|
|
35
|
+
`Восстановите ${this.file} вручную или удалите маркер ${this.blockedPath}.`);
|
|
36
|
+
}
|
|
19
37
|
return [];
|
|
20
|
-
|
|
38
|
+
}
|
|
39
|
+
throw err;
|
|
40
|
+
}
|
|
41
|
+
let parsed;
|
|
42
|
+
try {
|
|
43
|
+
parsed = JSON.parse(raw);
|
|
21
44
|
}
|
|
22
|
-
catch {
|
|
23
|
-
return
|
|
45
|
+
catch (err) {
|
|
46
|
+
return this.quarantineCorrupt(err);
|
|
24
47
|
}
|
|
48
|
+
if (!Array.isArray(parsed)) {
|
|
49
|
+
return this.quarantineCorrupt(new Error("expected an array of registry entries"));
|
|
50
|
+
}
|
|
51
|
+
return parsed.filter((entry) => entry && typeof entry.name === "string" && typeof entry.command === "string");
|
|
52
|
+
}
|
|
53
|
+
/** Перемещает повреждённый файл в карантин и блокирует дальнейшие записи. */
|
|
54
|
+
async quarantineCorrupt(err) {
|
|
55
|
+
const stamp = new Date().toISOString().replace(/[:.]/g, "-");
|
|
56
|
+
const target = `${this.file}.corrupt-${stamp}`;
|
|
57
|
+
let moved = "";
|
|
58
|
+
try {
|
|
59
|
+
await fs.rename(this.file, target);
|
|
60
|
+
await fs.writeFile(this.blockedPath, target, "utf8");
|
|
61
|
+
moved = ` Файл перемещён в ${target}.`;
|
|
62
|
+
console.warn(`[scheduler] Реестр ${path.basename(this.file)} повреждён и перемещён в ${target}. ` +
|
|
63
|
+
`Запись заблокирована маркером ${this.blockedPath}.`, err);
|
|
64
|
+
}
|
|
65
|
+
catch (renameErr) {
|
|
66
|
+
console.error(`[scheduler] Не удалось переместить повреждённый реестр ${this.file} в ${target}.`, renameErr);
|
|
67
|
+
}
|
|
68
|
+
throw new Error(`Реестр задач повреждён.${moved} Восстановите ${this.file} вручную или удалите маркер ${this.blockedPath}.`);
|
|
25
69
|
}
|
|
26
70
|
async save(entries) {
|
|
27
71
|
await fs.mkdir(this.dir, { recursive: true });
|
|
28
72
|
const tmp = `${this.file}.tmp`;
|
|
29
73
|
await fs.writeFile(tmp, JSON.stringify(entries, null, 2), "utf8");
|
|
30
74
|
await fs.rename(tmp, this.file);
|
|
75
|
+
await fs.rm(this.blockedPath, { force: true }).catch(() => {
|
|
76
|
+
/* маркера могло не быть */
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Read-modify-write под межпроцессной блокировкой: два процесса на одном
|
|
81
|
+
* профиле не должны терять чужие записи (P2-16).
|
|
82
|
+
*/
|
|
83
|
+
async mutate(fn) {
|
|
84
|
+
await this.lock.initialize();
|
|
85
|
+
return withLockWait(this.lock, `registry-${this.backendId}`, async () => {
|
|
86
|
+
const entries = await this.load();
|
|
87
|
+
const result = await fn(entries);
|
|
88
|
+
await this.save(entries);
|
|
89
|
+
return result;
|
|
90
|
+
}, { timeoutMs: 15000, staleMs: 60000 });
|
|
31
91
|
}
|
|
32
92
|
async find(name) {
|
|
33
93
|
const entries = await this.load();
|
|
34
94
|
return entries.find((e) => e.name.toLowerCase() === name.toLowerCase());
|
|
35
95
|
}
|
|
36
96
|
async upsert(entry) {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
97
|
+
await this.mutate((entries) => {
|
|
98
|
+
const index = entries.findIndex((e) => e.name.toLowerCase() === entry.name.toLowerCase());
|
|
99
|
+
if (index === -1)
|
|
100
|
+
entries.push(entry);
|
|
101
|
+
else
|
|
102
|
+
entries[index] = entry;
|
|
103
|
+
});
|
|
44
104
|
}
|
|
45
105
|
async remove(name) {
|
|
46
|
-
|
|
47
|
-
|
|
106
|
+
await this.mutate((entries) => {
|
|
107
|
+
const index = entries.findIndex((e) => e.name.toLowerCase() === name.toLowerCase());
|
|
108
|
+
if (index !== -1)
|
|
109
|
+
entries.splice(index, 1);
|
|
110
|
+
});
|
|
48
111
|
}
|
|
49
112
|
async setPaused(name, paused) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
await this.save(entries);
|
|
113
|
+
await this.mutate((entries) => {
|
|
114
|
+
const entry = entries.find((e) => e.name.toLowerCase() === name.toLowerCase());
|
|
115
|
+
if (entry)
|
|
116
|
+
entry.paused = paused;
|
|
117
|
+
});
|
|
56
118
|
}
|
|
57
119
|
}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { RunTaskResult, SchedulerBackend } from "./types.js";
|
|
2
|
+
/**
|
|
3
|
+
* Немедленный запуск задачи в обход schedule-gate.
|
|
4
|
+
*
|
|
5
|
+
* Зачем: для poll-режима (расширенный cron / чужая IANA-таймзона / окно
|
|
6
|
+
* запуска) обёртка всегда прогоняет schedule-gate, и запуск вне cron-окна
|
|
7
|
+
* молча завершается с exit 3. Это касается не только `run_task_now`, но и
|
|
8
|
+
* цепочек (nextTaskOnSuccess / nextTaskOnError), DAG-зависимостей и retry:
|
|
9
|
+
* они тоже запускают задачу «сейчас», а не «по расписанию».
|
|
10
|
+
*
|
|
11
|
+
* Маркер `requestImmediateRun` снимает проверку расписания внутри обёртки.
|
|
12
|
+
* Если планировщик не принял запуск, маркер удаляется, чтобы он не «разрешил»
|
|
13
|
+
* следующий плановый тик в обход расписания.
|
|
14
|
+
*/
|
|
15
|
+
export declare function runTaskNow(taskName: string, backend?: SchedulerBackend): Promise<RunTaskResult>;
|
|
16
|
+
//# sourceMappingURL=run-now.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-now.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/run-now.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAElE;;;;;;;;;;;;GAYG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,gBAA2C,GACnD,OAAO,CAAC,aAAa,CAAC,CAUxB"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import fs from "node:fs/promises";
|
|
2
|
+
import { requestImmediateRun } from "../ps-wrapper.js";
|
|
3
|
+
import { createSchedulerBackend } from "./index.js";
|
|
4
|
+
/**
|
|
5
|
+
* Немедленный запуск задачи в обход schedule-gate.
|
|
6
|
+
*
|
|
7
|
+
* Зачем: для poll-режима (расширенный cron / чужая IANA-таймзона / окно
|
|
8
|
+
* запуска) обёртка всегда прогоняет schedule-gate, и запуск вне cron-окна
|
|
9
|
+
* молча завершается с exit 3. Это касается не только `run_task_now`, но и
|
|
10
|
+
* цепочек (nextTaskOnSuccess / nextTaskOnError), DAG-зависимостей и retry:
|
|
11
|
+
* они тоже запускают задачу «сейчас», а не «по расписанию».
|
|
12
|
+
*
|
|
13
|
+
* Маркер `requestImmediateRun` снимает проверку расписания внутри обёртки.
|
|
14
|
+
* Если планировщик не принял запуск, маркер удаляется, чтобы он не «разрешил»
|
|
15
|
+
* следующий плановый тик в обход расписания.
|
|
16
|
+
*/
|
|
17
|
+
export async function runTaskNow(taskName, backend = createSchedulerBackend()) {
|
|
18
|
+
const forceFile = await requestImmediateRun(taskName);
|
|
19
|
+
try {
|
|
20
|
+
return await backend.runTask(taskName);
|
|
21
|
+
}
|
|
22
|
+
catch (err) {
|
|
23
|
+
await fs.unlink(forceFile).catch(() => {
|
|
24
|
+
/* маркер мог быть уже поглощён gate'ом или удалён по TTL */
|
|
25
|
+
});
|
|
26
|
+
throw err;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../../src/core/secrets.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../../src/core/secrets.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;GAaG;AAEH,eAAO,MAAM,YAAY,QAAwC,CAAC;AAClE,eAAO,MAAM,gBAAgB,QAAuC,CAAC;AACrE,eAAO,MAAM,aAAa,QAAyC,CAAC;AAkGpE,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,qEAAqE;IACrE,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB;AAoBD,0DAA0D;AAC1D,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQvD;AAED,wEAAwE;AACxE,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAIpD;AAoOD,qEAAqE;AACrE,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,cAAc,CAoBrE;AAED,yEAAyE;AACzE,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW1D;AAED,uDAAuD;AACvD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED,0CAA0C;AAC1C,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CASlD;AASD,6EAA6E;AAC7E,wBAAgB,WAAW,IAAI,cAAc,EAAE,CAc9C;AAED,kMAAkM;AAClM,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,MAAM,EACb,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAC5B;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAkBtC;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAC5B;IAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CASpD;AA8BD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CA+BzD;AAED,qEAAqE;AACrE,wBAAgB,iBAAiB,IAAI,IAAI,CAIxC;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,MAAM,EAAE,CAW9E"}
|