@goodandready/dsh-cron 0.3.32 → 0.3.33
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/README.md +8 -0
- package/README.ru.md +8 -0
- package/README.zh.md +8 -0
- package/lib/client-src/10-locales.js +18 -0
- package/lib/client-src/50-cron-screen-state.js +4 -0
- package/lib/client-src/53-cron-screen-modal-actions.js +14 -0
- package/lib/client-src/62-modal-task-form-tail.js +40 -0
- package/lib/client.js +76 -0
- package/lib/cron-tool.js +5 -0
- package/lib/locales.json +11 -2
- package/lib/prompt-interpolation.js +15 -0
- package/lib/scheduler/scheduler.js +17 -0
- package/lib/store/task-schema.js +1 -0
- package/lib/store/task-transfer.js +1 -0
- package/lib/task-create.js +2 -0
- package/lib/task-patch.js +4 -0
- package/lib/wake-triggers.js +362 -0
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -691,3 +691,11 @@ node scripts/ci-preflight.mjs
|
|
|
691
691
|
## 📄 License
|
|
692
692
|
|
|
693
693
|
MIT © [GooDAnDReaDY](https://github.com/GooDAnDReaDY)
|
|
694
|
+
|
|
695
|
+
### Event-Driven Wake Triggers (v0.3.33)
|
|
696
|
+
|
|
697
|
+
Wake agent tasks reactively based on local events:
|
|
698
|
+
- **File Count Threshold**: trigger when `>= N` matching files appear in a directory (batch processing).
|
|
699
|
+
- **Marker / Flag File**: trigger when a flag file (e.g., `build.ready`) appears, with automatic consumption.
|
|
700
|
+
- **Process Exit**: monitor a PID or `.pid` file and trigger post-processing as soon as the background job completes.
|
|
701
|
+
Context is automatically injected into prompts (`{{trigger.type}}`, `{{trigger.fileCount}}`) and process environment variables (`DSH_CRON_WAKE_TYPE`, `DSH_CRON_WAKE_PATH`).
|
package/README.ru.md
CHANGED
|
@@ -645,3 +645,11 @@ MIT © [GooDAnDReaDY](https://github.com/GooDAnDReaDY)
|
|
|
645
645
|
- **Единый безопасный лимит maxConcurrent**: Схема Config и планировщик TaskScheduler теперь согласованно используют лимит по умолчанию `2` (0 остаётся явным выбором безлимитного режима).
|
|
646
646
|
- **Изоляция пулов через concurrencyGroup**: Поле `concurrencyGroup` теперь строго контролируется при допуске задач и опустошении очереди (по умолчанию 1 параллельный запуск на именованную группу). Задачи из разных групп исполняются параллельно в пределах общего `maxConcurrent`, а задачи с политикой `queue` стартуют сразу при освобождении слота своей группы.
|
|
647
647
|
|
|
648
|
+
|
|
649
|
+
### Событийные триггеры пробуждения (v0.3.33)
|
|
650
|
+
|
|
651
|
+
Реактивный запуск задач агента по системным событиям:
|
|
652
|
+
- **Порог количества файлов (`file_count`)**: запуск при накоплении `>= N` файлов в целевой директории.
|
|
653
|
+
- **Файл-флаг / маркер (`marker_file`)**: запуск при появлении файла готовности (например, `ready.flag`) с автоматическим удалением (`consumeMarker`).
|
|
654
|
+
- **Завершение процесса (`process_exit`)**: отслеживание PID или файла `.pid` и запуск постобработки сразу после завершения фонового процесса.
|
|
655
|
+
Контекст передается в переменные промпта (`{{trigger.type}}`, `{{trigger.fileCount}}`) и окружения (`DSH_CRON_WAKE_TYPE`).
|
package/README.zh.md
CHANGED
|
@@ -639,3 +639,11 @@ MIT © [GooDAnDReaDY](https://github.com/GooDAnDReaDY)
|
|
|
639
639
|
- **统一安全并发默认值**:配置规范(Config)与调度器(TaskScheduler)全面对齐默认并发上限 `maxConcurrent = 2`(0 仅作为显式无限制选项)。
|
|
640
640
|
- **并发分组隔离调度**:任务的 `concurrencyGroup` 属性全面接入调度仲裁与队列排队(同名分组默认限流 1 个并发执行),不同分组可并发运行直至 `maxConcurrent`,队列任务随所属分组资源释放立即触发。
|
|
641
641
|
|
|
642
|
+
|
|
643
|
+
### 事件驱动唤醒触发器 (v0.3.33)
|
|
644
|
+
|
|
645
|
+
基于本地系统事件响应式唤醒智能体任务:
|
|
646
|
+
- **文件数量阈值 (`file_count`)**: 目标目录下积累 `>= N` 个匹配文件时自动触发批量处理。
|
|
647
|
+
- **标记/Flag文件到达 (`marker_file`)**: 标志文件出现时触发并自动删除标记文件。
|
|
648
|
+
- **进程退出监听 (`process_exit`)**: 监听 PID 或 `.pid` 文件,后台任务退出后立即唤醒任务进行后续处理。
|
|
649
|
+
上下文自动注入到提示词变量 (`{{trigger.type}}`, `{{trigger.fileCount}}`) 及环境变量中。
|
|
@@ -215,6 +215,15 @@
|
|
|
215
215
|
'form.gracePeriodLabel': 'Heartbeat grace period (seconds)',
|
|
216
216
|
'form.priorityLabel': 'Queue priority (1-10, higher runs first)',
|
|
217
217
|
'form.concurrencyGroupLabel': 'Concurrency group',
|
|
218
|
+
'form.wakeTriggerTypeLabel': 'Event wake trigger',
|
|
219
|
+
'form.wakeTriggerTypeNone': 'None (Schedule / Cron only)',
|
|
220
|
+
'form.wakeTriggerTypeFileCount': 'File count threshold (batch run)',
|
|
221
|
+
'form.wakeTriggerTypeMarkerFile': 'Marker file receipt (flag file)',
|
|
222
|
+
'form.wakeTriggerTypeProcessExit': 'Process exit watcher (PID / pidFile)',
|
|
223
|
+
'form.wakeTriggerPathLabel': 'Trigger target path (dir / marker / pidfile)',
|
|
224
|
+
'form.wakeTriggerPathPlaceholder': 'e.g. incoming/ or build.ready or run.pid',
|
|
225
|
+
'form.wakeTriggerMinCountLabel': 'Min file count',
|
|
226
|
+
'form.wakeTriggerConsumeLabel': 'Consume / delete marker after trigger',
|
|
218
227
|
'form.writeScopesLabel': 'Write scopes (Scope Locks, relative paths per line or comma)',
|
|
219
228
|
'form.writeScopesPlaceholder': 'e.g. src/, docs/ (prevents concurrent writes on overlapping scopes)',
|
|
220
229
|
'form.inputHashPathsLabel': 'Input hash paths (inputHashPaths)',
|
|
@@ -426,6 +435,15 @@
|
|
|
426
435
|
'form.preflightTargetLabel': '预检目标参数', 'form.preflightTargetPlaceholder': 'https://example.com/healthz 或 ls /data 或 /:10%',
|
|
427
436
|
'form.heartbeatIntervalLabel': '心跳打卡时限 (秒, 0 = 禁用)', 'form.gracePeriodLabel': '心跳宽限期 (秒)',
|
|
428
437
|
'form.priorityLabel': '队列优先级 (1-10,数值越大越先执行)', 'form.concurrencyGroupLabel': '并发分组名称',
|
|
438
|
+
'form.wakeTriggerTypeLabel': '事件唤醒触发器 (Wake Triggers)',
|
|
439
|
+
'form.wakeTriggerTypeNone': '无 (仅定时/间隔)',
|
|
440
|
+
'form.wakeTriggerTypeFileCount': '文件数量阈值 (批量触发)',
|
|
441
|
+
'form.wakeTriggerTypeMarkerFile': '标记/Flag文件到达',
|
|
442
|
+
'form.wakeTriggerTypeProcessExit': '进程退出监听 (PID / pidfile)',
|
|
443
|
+
'form.wakeTriggerPathLabel': '触发目标路径 (目录 / markerPath / pidFile)',
|
|
444
|
+
'form.wakeTriggerPathPlaceholder': '例如: incoming/ 或 build.ready 或 run.pid',
|
|
445
|
+
'form.wakeTriggerMinCountLabel': '最小文件阈值 (minCount)',
|
|
446
|
+
'form.wakeTriggerConsumeLabel': '触发后自动删除标记/PID文件',
|
|
429
447
|
'form.writeScopesLabel': '文件写入范围锁 (writeScopes, 相对路径)', 'form.writeScopesPlaceholder': '例如: src/, docs/ (阻止与同工作区重叠任务并发执行)',
|
|
430
448
|
'form.inputHashPathsLabel': '输入文件哈希变动监控 (inputHashPaths)', 'form.inputHashPathsPlaceholder': '例如: src/, package.json (无变动时跳过执行)',
|
|
431
449
|
'form.skipIfUnchangedLabel': '输入文件无变动时跳过执行 (节省 Token 与预算)',
|
|
@@ -100,6 +100,10 @@
|
|
|
100
100
|
const [formPreflightTarget, setFormPreflightTarget] = React.useState('');
|
|
101
101
|
const [formPriority, setFormPriority] = React.useState(5);
|
|
102
102
|
const [formConcurrencyGroup, setFormConcurrencyGroup] = React.useState('default');
|
|
103
|
+
const [formWakeTriggerType, setFormWakeTriggerType] = React.useState('none');
|
|
104
|
+
const [formWakeTriggerPath, setFormWakeTriggerPath] = React.useState('');
|
|
105
|
+
const [formWakeTriggerMinCount, setFormWakeTriggerMinCount] = React.useState(1);
|
|
106
|
+
const [formWakeTriggerConsume, setFormWakeTriggerConsume] = React.useState(true);
|
|
103
107
|
const [formWriteScopes, setFormWriteScopes] = React.useState('');
|
|
104
108
|
const [formInputHashPaths, setFormInputHashPaths] = React.useState('');
|
|
105
109
|
const [formSkipIfUnchanged, setFormSkipIfUnchanged] = React.useState(false);
|
|
@@ -333,6 +333,11 @@
|
|
|
333
333
|
setFormPreflightTarget(task.preflightTarget || '');
|
|
334
334
|
setFormPriority(task.priority !== undefined ? task.priority : 5);
|
|
335
335
|
setFormConcurrencyGroup(task.concurrencyGroup || 'default');
|
|
336
|
+
const _wt = task.wakeTrigger || {};
|
|
337
|
+
setFormWakeTriggerType(_wt.enabled && _wt.type ? _wt.type : 'none');
|
|
338
|
+
setFormWakeTriggerPath(_wt.markerPath || _wt.path || _wt.pidFile || '');
|
|
339
|
+
setFormWakeTriggerMinCount(_wt.minCount || 1);
|
|
340
|
+
setFormWakeTriggerConsume(_wt.consumeMarker !== false);
|
|
336
341
|
setFormWriteScopes(Array.isArray(task.writeScopes) ? task.writeScopes.join('\n') : (task.writeScopes || ''));
|
|
337
342
|
setFormInputHashPaths(Array.isArray(task.inputHashPaths) ? task.inputHashPaths.join('\n') : (task.inputHashPaths || ''));
|
|
338
343
|
setFormSkipIfUnchanged(Boolean(task.skipIfUnchanged));
|
|
@@ -421,6 +426,15 @@
|
|
|
421
426
|
preflightTarget: formPreflightTarget.trim() || undefined,
|
|
422
427
|
priority: Number(formPriority) || 5,
|
|
423
428
|
concurrencyGroup: formConcurrencyGroup.trim() || 'default',
|
|
429
|
+
wakeTrigger: formWakeTriggerType && formWakeTriggerType !== 'none' ? {
|
|
430
|
+
enabled: true,
|
|
431
|
+
type: formWakeTriggerType,
|
|
432
|
+
path: formWakeTriggerType === 'file_count' ? formWakeTriggerPath.trim() : undefined,
|
|
433
|
+
minCount: formWakeTriggerType === 'file_count' ? (Number(formWakeTriggerMinCount) || 1) : undefined,
|
|
434
|
+
markerPath: formWakeTriggerType === 'marker_file' ? formWakeTriggerPath.trim() : undefined,
|
|
435
|
+
pidFile: formWakeTriggerType === 'process_exit' ? formWakeTriggerPath.trim() : undefined,
|
|
436
|
+
consumeMarker: Boolean(formWakeTriggerConsume),
|
|
437
|
+
} : null,
|
|
424
438
|
writeScopes: formWriteScopes ? formWriteScopes.split(/[\n,]+/).map((s) => s.trim()).filter(Boolean) : [],
|
|
425
439
|
inputHashPaths: formInputHashPaths ? formInputHashPaths.split(/[\n,]+/).map((s) => s.trim()).filter(Boolean) : [],
|
|
426
440
|
skipIfUnchanged: Boolean(formSkipIfUnchanged),
|
|
@@ -293,6 +293,46 @@
|
|
|
293
293
|
onChange: (e) => setFormConcurrencyGroup(e.target.value)
|
|
294
294
|
})
|
|
295
295
|
)
|
|
296
|
+
),
|
|
297
|
+
React.createElement('div', { className: 'dsh-cron-form-group' },
|
|
298
|
+
React.createElement('label', null, T_KEY(t, 'form.wakeTriggerTypeLabel')),
|
|
299
|
+
React.createElement('select', {
|
|
300
|
+
value: formWakeTriggerType,
|
|
301
|
+
onChange: (e) => setFormWakeTriggerType(e.target.value)
|
|
302
|
+
},
|
|
303
|
+
React.createElement('option', { value: 'none' }, T_KEY(t, 'form.wakeTriggerTypeNone')),
|
|
304
|
+
React.createElement('option', { value: 'file_count' }, T_KEY(t, 'form.wakeTriggerTypeFileCount')),
|
|
305
|
+
React.createElement('option', { value: 'marker_file' }, T_KEY(t, 'form.wakeTriggerTypeMarkerFile')),
|
|
306
|
+
React.createElement('option', { value: 'process_exit' }, T_KEY(t, 'form.wakeTriggerTypeProcessExit'))
|
|
307
|
+
)
|
|
308
|
+
),
|
|
309
|
+
formWakeTriggerType !== 'none' && React.createElement('div', { className: 'dsh-cron-form-group' },
|
|
310
|
+
React.createElement('label', null, T_KEY(t, 'form.wakeTriggerPathLabel')),
|
|
311
|
+
React.createElement('input', {
|
|
312
|
+
type: 'text',
|
|
313
|
+
value: formWakeTriggerPath,
|
|
314
|
+
placeholder: T_KEY(t, 'form.wakeTriggerPathPlaceholder'),
|
|
315
|
+
onChange: (e) => setFormWakeTriggerPath(e.target.value)
|
|
316
|
+
})
|
|
317
|
+
),
|
|
318
|
+
formWakeTriggerType === 'file_count' && React.createElement('div', { className: 'dsh-cron-form-group' },
|
|
319
|
+
React.createElement('label', null, T_KEY(t, 'form.wakeTriggerMinCountLabel')),
|
|
320
|
+
React.createElement('input', {
|
|
321
|
+
type: 'number',
|
|
322
|
+
min: 1,
|
|
323
|
+
value: formWakeTriggerMinCount,
|
|
324
|
+
onChange: (e) => setFormWakeTriggerMinCount(parseInt(e.target.value, 10) || 1)
|
|
325
|
+
})
|
|
326
|
+
),
|
|
327
|
+
(formWakeTriggerType === 'marker_file' || formWakeTriggerType === 'process_exit') && React.createElement('div', { className: 'dsh-cron-form-group dsh-cron-form-checkbox' },
|
|
328
|
+
React.createElement('label', null,
|
|
329
|
+
React.createElement('input', {
|
|
330
|
+
type: 'checkbox',
|
|
331
|
+
checked: formWakeTriggerConsume,
|
|
332
|
+
onChange: (e) => setFormWakeTriggerConsume(e.target.checked)
|
|
333
|
+
}),
|
|
334
|
+
React.createElement('span', null, T_KEY(t, 'form.wakeTriggerConsumeLabel'))
|
|
335
|
+
)
|
|
296
336
|
),
|
|
297
337
|
React.createElement('div', { className: 'dsh-cron-form-group' },
|
|
298
338
|
React.createElement('label', null, T_KEY(t, 'form.writeScopesLabel')),
|
package/lib/client.js
CHANGED
|
@@ -261,6 +261,15 @@ en: {
|
|
|
261
261
|
'form.gracePeriodLabel': 'Heartbeat grace period (seconds)',
|
|
262
262
|
'form.priorityLabel': 'Queue priority (1-10, higher runs first)',
|
|
263
263
|
'form.concurrencyGroupLabel': 'Concurrency group',
|
|
264
|
+
'form.wakeTriggerTypeLabel': 'Event wake trigger',
|
|
265
|
+
'form.wakeTriggerTypeNone': 'None (Schedule / Cron only)',
|
|
266
|
+
'form.wakeTriggerTypeFileCount': 'File count threshold (batch run)',
|
|
267
|
+
'form.wakeTriggerTypeMarkerFile': 'Marker file receipt (flag file)',
|
|
268
|
+
'form.wakeTriggerTypeProcessExit': 'Process exit watcher (PID / pidFile)',
|
|
269
|
+
'form.wakeTriggerPathLabel': 'Trigger target path (dir / marker / pidfile)',
|
|
270
|
+
'form.wakeTriggerPathPlaceholder': 'e.g. incoming/ or build.ready or run.pid',
|
|
271
|
+
'form.wakeTriggerMinCountLabel': 'Min file count',
|
|
272
|
+
'form.wakeTriggerConsumeLabel': 'Consume / delete marker after trigger',
|
|
264
273
|
'form.writeScopesLabel': 'Write scopes (Scope Locks, relative paths per line or comma)',
|
|
265
274
|
'form.writeScopesPlaceholder': 'e.g. src/, docs/ (prevents concurrent writes on overlapping scopes)',
|
|
266
275
|
'form.inputHashPathsLabel': 'Input hash paths (inputHashPaths)',
|
|
@@ -471,6 +480,15 @@ zh: {
|
|
|
471
480
|
'form.preflightTargetLabel': '预检目标参数', 'form.preflightTargetPlaceholder': 'https://example.com/healthz 或 ls /data 或 /:10%',
|
|
472
481
|
'form.heartbeatIntervalLabel': '心跳打卡时限 (秒, 0 = 禁用)', 'form.gracePeriodLabel': '心跳宽限期 (秒)',
|
|
473
482
|
'form.priorityLabel': '队列优先级 (1-10,数值越大越先执行)', 'form.concurrencyGroupLabel': '并发分组名称',
|
|
483
|
+
'form.wakeTriggerTypeLabel': '事件唤醒触发器 (Wake Triggers)',
|
|
484
|
+
'form.wakeTriggerTypeNone': '无 (仅定时/间隔)',
|
|
485
|
+
'form.wakeTriggerTypeFileCount': '文件数量阈值 (批量触发)',
|
|
486
|
+
'form.wakeTriggerTypeMarkerFile': '标记/Flag文件到达',
|
|
487
|
+
'form.wakeTriggerTypeProcessExit': '进程退出监听 (PID / pidfile)',
|
|
488
|
+
'form.wakeTriggerPathLabel': '触发目标路径 (目录 / markerPath / pidFile)',
|
|
489
|
+
'form.wakeTriggerPathPlaceholder': '例如: incoming/ 或 build.ready 或 run.pid',
|
|
490
|
+
'form.wakeTriggerMinCountLabel': '最小文件阈值 (minCount)',
|
|
491
|
+
'form.wakeTriggerConsumeLabel': '触发后自动删除标记/PID文件',
|
|
474
492
|
'form.writeScopesLabel': '文件写入范围锁 (writeScopes, 相对路径)', 'form.writeScopesPlaceholder': '例如: src/, docs/ (阻止与同工作区重叠任务并发执行)',
|
|
475
493
|
'form.inputHashPathsLabel': '输入文件哈希变动监控 (inputHashPaths)', 'form.inputHashPathsPlaceholder': '例如: src/, package.json (无变动时跳过执行)',
|
|
476
494
|
'form.skipIfUnchangedLabel': '输入文件无变动时跳过执行 (节省 Token 与预算)',
|
|
@@ -1638,6 +1656,10 @@ const [formPreflightType, setFormPreflightType] = React.useState('none');
|
|
|
1638
1656
|
const [formPreflightTarget, setFormPreflightTarget] = React.useState('');
|
|
1639
1657
|
const [formPriority, setFormPriority] = React.useState(5);
|
|
1640
1658
|
const [formConcurrencyGroup, setFormConcurrencyGroup] = React.useState('default');
|
|
1659
|
+
const [formWakeTriggerType, setFormWakeTriggerType] = React.useState('none');
|
|
1660
|
+
const [formWakeTriggerPath, setFormWakeTriggerPath] = React.useState('');
|
|
1661
|
+
const [formWakeTriggerMinCount, setFormWakeTriggerMinCount] = React.useState(1);
|
|
1662
|
+
const [formWakeTriggerConsume, setFormWakeTriggerConsume] = React.useState(true);
|
|
1641
1663
|
const [formWriteScopes, setFormWriteScopes] = React.useState('');
|
|
1642
1664
|
const [formInputHashPaths, setFormInputHashPaths] = React.useState('');
|
|
1643
1665
|
const [formSkipIfUnchanged, setFormSkipIfUnchanged] = React.useState(false);
|
|
@@ -2563,6 +2585,11 @@ setFormPreflightType(task.preflightType || 'none');
|
|
|
2563
2585
|
setFormPreflightTarget(task.preflightTarget || '');
|
|
2564
2586
|
setFormPriority(task.priority !== undefined ? task.priority : 5);
|
|
2565
2587
|
setFormConcurrencyGroup(task.concurrencyGroup || 'default');
|
|
2588
|
+
const _wt = task.wakeTrigger || {};
|
|
2589
|
+
setFormWakeTriggerType(_wt.enabled && _wt.type ? _wt.type : 'none');
|
|
2590
|
+
setFormWakeTriggerPath(_wt.markerPath || _wt.path || _wt.pidFile || '');
|
|
2591
|
+
setFormWakeTriggerMinCount(_wt.minCount || 1);
|
|
2592
|
+
setFormWakeTriggerConsume(_wt.consumeMarker !== false);
|
|
2566
2593
|
setFormWriteScopes(Array.isArray(task.writeScopes) ? task.writeScopes.join('\n') : (task.writeScopes || ''));
|
|
2567
2594
|
setFormInputHashPaths(Array.isArray(task.inputHashPaths) ? task.inputHashPaths.join('\n') : (task.inputHashPaths || ''));
|
|
2568
2595
|
setFormSkipIfUnchanged(Boolean(task.skipIfUnchanged));
|
|
@@ -2649,6 +2676,15 @@ preflightType: formPreflightType || 'none',
|
|
|
2649
2676
|
preflightTarget: formPreflightTarget.trim() || undefined,
|
|
2650
2677
|
priority: Number(formPriority) || 5,
|
|
2651
2678
|
concurrencyGroup: formConcurrencyGroup.trim() || 'default',
|
|
2679
|
+
wakeTrigger: formWakeTriggerType && formWakeTriggerType !== 'none' ? {
|
|
2680
|
+
enabled: true,
|
|
2681
|
+
type: formWakeTriggerType,
|
|
2682
|
+
path: formWakeTriggerType === 'file_count' ? formWakeTriggerPath.trim() : undefined,
|
|
2683
|
+
minCount: formWakeTriggerType === 'file_count' ? (Number(formWakeTriggerMinCount) || 1) : undefined,
|
|
2684
|
+
markerPath: formWakeTriggerType === 'marker_file' ? formWakeTriggerPath.trim() : undefined,
|
|
2685
|
+
pidFile: formWakeTriggerType === 'process_exit' ? formWakeTriggerPath.trim() : undefined,
|
|
2686
|
+
consumeMarker: Boolean(formWakeTriggerConsume),
|
|
2687
|
+
} : null,
|
|
2652
2688
|
writeScopes: formWriteScopes ? formWriteScopes.split(/[\n,]+/).map((s) => s.trim()).filter(Boolean) : [],
|
|
2653
2689
|
inputHashPaths: formInputHashPaths ? formInputHashPaths.split(/[\n,]+/).map((s) => s.trim()).filter(Boolean) : [],
|
|
2654
2690
|
skipIfUnchanged: Boolean(formSkipIfUnchanged),
|
|
@@ -4155,6 +4191,46 @@ onChange: (e) => setFormConcurrencyGroup(e.target.value)
|
|
|
4155
4191
|
)
|
|
4156
4192
|
),
|
|
4157
4193
|
_h('div', { className: 'dsh-cron-form-group' },
|
|
4194
|
+
_h('label', null, T_KEY(t, 'form.wakeTriggerTypeLabel')),
|
|
4195
|
+
_h('select', {
|
|
4196
|
+
value: formWakeTriggerType,
|
|
4197
|
+
onChange: (e) => setFormWakeTriggerType(e.target.value)
|
|
4198
|
+
},
|
|
4199
|
+
_h('option', { value: 'none' }, T_KEY(t, 'form.wakeTriggerTypeNone')),
|
|
4200
|
+
_h('option', { value: 'file_count' }, T_KEY(t, 'form.wakeTriggerTypeFileCount')),
|
|
4201
|
+
_h('option', { value: 'marker_file' }, T_KEY(t, 'form.wakeTriggerTypeMarkerFile')),
|
|
4202
|
+
_h('option', { value: 'process_exit' }, T_KEY(t, 'form.wakeTriggerTypeProcessExit'))
|
|
4203
|
+
)
|
|
4204
|
+
),
|
|
4205
|
+
formWakeTriggerType !== 'none' && _h('div', { className: 'dsh-cron-form-group' },
|
|
4206
|
+
_h('label', null, T_KEY(t, 'form.wakeTriggerPathLabel')),
|
|
4207
|
+
_h('input', {
|
|
4208
|
+
type: 'text',
|
|
4209
|
+
value: formWakeTriggerPath,
|
|
4210
|
+
placeholder: T_KEY(t, 'form.wakeTriggerPathPlaceholder'),
|
|
4211
|
+
onChange: (e) => setFormWakeTriggerPath(e.target.value)
|
|
4212
|
+
})
|
|
4213
|
+
),
|
|
4214
|
+
formWakeTriggerType === 'file_count' && _h('div', { className: 'dsh-cron-form-group' },
|
|
4215
|
+
_h('label', null, T_KEY(t, 'form.wakeTriggerMinCountLabel')),
|
|
4216
|
+
_h('input', {
|
|
4217
|
+
type: 'number',
|
|
4218
|
+
min: 1,
|
|
4219
|
+
value: formWakeTriggerMinCount,
|
|
4220
|
+
onChange: (e) => setFormWakeTriggerMinCount(parseInt(e.target.value, 10) || 1)
|
|
4221
|
+
})
|
|
4222
|
+
),
|
|
4223
|
+
(formWakeTriggerType === 'marker_file' || formWakeTriggerType === 'process_exit') && _h('div', { className: 'dsh-cron-form-group dsh-cron-form-checkbox' },
|
|
4224
|
+
_h('label', null,
|
|
4225
|
+
_h('input', {
|
|
4226
|
+
type: 'checkbox',
|
|
4227
|
+
checked: formWakeTriggerConsume,
|
|
4228
|
+
onChange: (e) => setFormWakeTriggerConsume(e.target.checked)
|
|
4229
|
+
}),
|
|
4230
|
+
_h('span', null, T_KEY(t, 'form.wakeTriggerConsumeLabel'))
|
|
4231
|
+
)
|
|
4232
|
+
),
|
|
4233
|
+
_h('div', { className: 'dsh-cron-form-group' },
|
|
4158
4234
|
_h('label', null, T_KEY(t, 'form.writeScopesLabel')),
|
|
4159
4235
|
_h('input', {
|
|
4160
4236
|
type: 'text',
|
package/lib/cron-tool.js
CHANGED
|
@@ -326,6 +326,11 @@ export const cronToolParameters = {
|
|
|
326
326
|
type: 'string',
|
|
327
327
|
description: 'Named concurrency group to serialize related tasks',
|
|
328
328
|
},
|
|
329
|
+
wakeTrigger: {
|
|
330
|
+
type: 'object',
|
|
331
|
+
additionalProperties: true,
|
|
332
|
+
description: 'Event-driven wake trigger (file_count, marker_file, or process_exit)',
|
|
333
|
+
},
|
|
329
334
|
writeScopes: {
|
|
330
335
|
type: 'array',
|
|
331
336
|
description: 'Relative directory/file scopes to lock to prevent conflicting concurrent writes',
|
package/lib/locales.json
CHANGED
|
@@ -410,6 +410,15 @@
|
|
|
410
410
|
"form.writeScopesPlaceholder": "例如: src/, docs/ (阻止与同工作区重叠任务并发执行)",
|
|
411
411
|
"form.inputHashPathsLabel": "输入文件哈希变动监控 (inputHashPaths)",
|
|
412
412
|
"form.inputHashPathsPlaceholder": "例如: src/, package.json (无变动时跳过执行)",
|
|
413
|
-
"form.skipIfUnchangedLabel": "输入文件无变动时跳过执行 (节省 Token 与预算)"
|
|
413
|
+
"form.skipIfUnchangedLabel": "输入文件无变动时跳过执行 (节省 Token 与预算)",
|
|
414
|
+
"form.wakeTriggerTypeLabel": "事件唤醒触发器 (Wake Triggers)",
|
|
415
|
+
"form.wakeTriggerTypeNone": "无 (仅定时/间隔)",
|
|
416
|
+
"form.wakeTriggerTypeFileCount": "文件数量阈值 (批量触发)",
|
|
417
|
+
"form.wakeTriggerTypeMarkerFile": "标记/Flag文件到达",
|
|
418
|
+
"form.wakeTriggerTypeProcessExit": "进程退出监听 (PID / pidfile)",
|
|
419
|
+
"form.wakeTriggerPathLabel": "触发目标路径 (目录 / markerPath / pidFile)",
|
|
420
|
+
"form.wakeTriggerPathPlaceholder": "例如: incoming/ 或 build.ready 或 run.pid",
|
|
421
|
+
"form.wakeTriggerMinCountLabel": "最小文件阈值 (minCount)",
|
|
422
|
+
"form.wakeTriggerConsumeLabel": "触发后自动删除标记/PID文件"
|
|
414
423
|
}
|
|
415
|
-
}
|
|
424
|
+
}
|
|
@@ -125,6 +125,12 @@ export function buildPromptContext(task = {}, options = {}) {
|
|
|
125
125
|
}
|
|
126
126
|
}
|
|
127
127
|
|
|
128
|
+
if (options.wakeTrigger && typeof options.wakeTrigger === 'object') {
|
|
129
|
+
ctx['trigger.type'] = options.wakeTrigger.type || '';
|
|
130
|
+
ctx['trigger.markerPath'] = options.wakeTrigger.markerPath || '';
|
|
131
|
+
ctx['trigger.fileCount'] = String(options.wakeTrigger.fileCount ?? '');
|
|
132
|
+
ctx['trigger.pid'] = String(options.wakeTrigger.pid ?? '');
|
|
133
|
+
}
|
|
128
134
|
return ctx;
|
|
129
135
|
}
|
|
130
136
|
|
|
@@ -215,5 +221,14 @@ export function resolveTaskForExecution(task, options = {}) {
|
|
|
215
221
|
resolved.env = env;
|
|
216
222
|
}
|
|
217
223
|
|
|
224
|
+
if (options.wakeTrigger && typeof options.wakeTrigger === 'object') {
|
|
225
|
+
const env = { ...(resolved.env || {}) };
|
|
226
|
+
env.DSH_CRON_WAKE_TYPE = String(options.wakeTrigger.type || '');
|
|
227
|
+
if (options.wakeTrigger.markerPath) env.DSH_CRON_WAKE_MARKER = String(options.wakeTrigger.markerPath);
|
|
228
|
+
if (options.wakeTrigger.path) env.DSH_CRON_WAKE_PATH = String(options.wakeTrigger.path);
|
|
229
|
+
if (options.wakeTrigger.fileCount !== undefined) env.DSH_CRON_WAKE_FILE_COUNT = String(options.wakeTrigger.fileCount);
|
|
230
|
+
if (options.wakeTrigger.pid !== undefined) env.DSH_CRON_WAKE_PID = String(options.wakeTrigger.pid);
|
|
231
|
+
resolved.env = env;
|
|
232
|
+
}
|
|
218
233
|
return resolved;
|
|
219
234
|
}
|
|
@@ -4,6 +4,7 @@ import { Cron } from 'croner';
|
|
|
4
4
|
import { FileSystemWatcherManager } from '../watcher.js';
|
|
5
5
|
import { parseNaturalSchedule } from '../nl-schedule.js';
|
|
6
6
|
import { ScopeLockManager } from '../scope-locks.js';
|
|
7
|
+
import { WakeTriggerManager } from '../wake-triggers.js';
|
|
7
8
|
|
|
8
9
|
const MAX_TIMEOUT_MS = 2147483647; // 2^31 - 1 ms (~24.85 days)
|
|
9
10
|
import {
|
|
@@ -339,6 +340,7 @@ export class TaskScheduler {
|
|
|
339
340
|
this.heartbeatTimer = null;
|
|
340
341
|
this.watcherManager = new FileSystemWatcherManager(this);
|
|
341
342
|
this.scopeLocks = new ScopeLockManager();
|
|
343
|
+
this.wakeTriggerManager = new WakeTriggerManager(this);
|
|
342
344
|
this.logger = opts.logger || null;
|
|
343
345
|
this.isStopped = false;
|
|
344
346
|
this.generation = 0;
|
|
@@ -375,6 +377,9 @@ export class TaskScheduler {
|
|
|
375
377
|
|
|
376
378
|
armAdaptiveTimer(taskId, delayMs) {
|
|
377
379
|
this.clearAdaptiveTimer(taskId);
|
|
380
|
+
if (this.wakeTriggerManager) {
|
|
381
|
+
this.wakeTriggerManager.unregisterTask(taskId);
|
|
382
|
+
}
|
|
378
383
|
if (this.jobs.has(taskId)) {
|
|
379
384
|
this.jobs.get(taskId).stop();
|
|
380
385
|
this.jobs.delete(taskId);
|
|
@@ -469,6 +474,9 @@ export class TaskScheduler {
|
|
|
469
474
|
if (this.watcherManager) {
|
|
470
475
|
this.watcherManager.syncAll(tasks);
|
|
471
476
|
}
|
|
477
|
+
if (this.wakeTriggerManager) {
|
|
478
|
+
this.wakeTriggerManager.syncTasks(tasks);
|
|
479
|
+
}
|
|
472
480
|
}
|
|
473
481
|
|
|
474
482
|
stopAll() {
|
|
@@ -478,6 +486,9 @@ export class TaskScheduler {
|
|
|
478
486
|
if (this.watcherManager) {
|
|
479
487
|
this.watcherManager.stopAll();
|
|
480
488
|
}
|
|
489
|
+
if (this.wakeTriggerManager) {
|
|
490
|
+
this.wakeTriggerManager.stopAll();
|
|
491
|
+
}
|
|
481
492
|
|
|
482
493
|
// Clear concurrency queue (#217)
|
|
483
494
|
this.queue = [];
|
|
@@ -514,6 +525,9 @@ export class TaskScheduler {
|
|
|
514
525
|
|
|
515
526
|
clearScheduled(taskId) {
|
|
516
527
|
this.clearAdaptiveTimer(taskId);
|
|
528
|
+
if (this.wakeTriggerManager) {
|
|
529
|
+
this.wakeTriggerManager.unregisterTask(taskId);
|
|
530
|
+
}
|
|
517
531
|
if (this.watcherManager) {
|
|
518
532
|
this.watcherManager.unwatchTask(taskId);
|
|
519
533
|
}
|
|
@@ -584,6 +598,9 @@ export class TaskScheduler {
|
|
|
584
598
|
if (this.watcherManager) {
|
|
585
599
|
this.watcherManager.watchTask(task);
|
|
586
600
|
}
|
|
601
|
+
if (this.wakeTriggerManager) {
|
|
602
|
+
this.wakeTriggerManager.registerTask(task);
|
|
603
|
+
}
|
|
587
604
|
|
|
588
605
|
try {
|
|
589
606
|
const parsed = parseScheduleExpression(task.schedule);
|
package/lib/store/task-schema.js
CHANGED
|
@@ -99,6 +99,7 @@ export const TaskSchema = z.object({
|
|
|
99
99
|
inputHashPaths: z.any(),
|
|
100
100
|
skipIfUnchanged: z.boolean().default(false),
|
|
101
101
|
lastInputHash: z.string().default(''),
|
|
102
|
+
wakeTrigger: z.any(),
|
|
102
103
|
maxMemoryMb: z.number().min(0).default(0),
|
|
103
104
|
executionTimeoutMs: z.number().min(0).default(900000),
|
|
104
105
|
maxLogBytesPerRun: z.number().min(0).default(5 * 1024 * 1024),
|
package/lib/task-create.js
CHANGED
|
@@ -10,6 +10,7 @@ import { parseScheduleExpression } from './scheduler.js';
|
|
|
10
10
|
import { CHANNEL_IDS } from './channels.js';
|
|
11
11
|
import { redactTaskSecrets } from './http-utils.js';
|
|
12
12
|
import { normalizeScopes } from './scope-locks.js';
|
|
13
|
+
import { normalizeWakeTrigger } from './wake-triggers.js';
|
|
13
14
|
import { normalizeInputHashPaths } from './input-hash.js';
|
|
14
15
|
import { sanitizeDependsOn, sanitizeJoinPolicy, validateDAG } from './dag.js';
|
|
15
16
|
|
|
@@ -64,6 +65,7 @@ export function executeCreateTask(store, scheduler, args) {
|
|
|
64
65
|
swarm: args.swarm !== undefined ? sanitizeSwarmConfig(args.swarm) : undefined,
|
|
65
66
|
elseTask: args.elseTask ? String(args.elseTask).trim() : undefined,
|
|
66
67
|
autoHeal: args.autoHeal !== undefined ? Boolean(args.autoHeal) : undefined,
|
|
68
|
+
wakeTrigger: args.wakeTrigger !== undefined ? normalizeWakeTrigger(args.wakeTrigger) : undefined,
|
|
67
69
|
writeScopes: args.writeScopes !== undefined ? normalizeScopes(args.writeScopes) : undefined,
|
|
68
70
|
inputHashPaths: args.inputHashPaths !== undefined ? normalizeInputHashPaths(args.inputHashPaths) : undefined,
|
|
69
71
|
skipIfUnchanged: args.skipIfUnchanged !== undefined ? Boolean(args.skipIfUnchanged) : undefined,
|
package/lib/task-patch.js
CHANGED
|
@@ -21,6 +21,7 @@ import { PATCHABLE_TASK_FIELDS, validateTaskType } from './task-transfer.js';
|
|
|
21
21
|
import { pickPatchableFields, restoreTaskSecrets } from './http-utils.js';
|
|
22
22
|
import { unknownChannelIds } from './channels.js';
|
|
23
23
|
import { normalizeScopes } from './scope-locks.js';
|
|
24
|
+
import { normalizeWakeTrigger } from './wake-triggers.js';
|
|
24
25
|
import { normalizeInputHashPaths } from './input-hash.js';
|
|
25
26
|
import { isConfigOwned, configOwnedMessage } from './config-jobs.js';
|
|
26
27
|
|
|
@@ -134,6 +135,9 @@ export function buildTaskPatch(current, body) {
|
|
|
134
135
|
if (patch.autoHeal !== undefined) {
|
|
135
136
|
patch.autoHeal = Boolean(patch.autoHeal);
|
|
136
137
|
}
|
|
138
|
+
if (patch.wakeTrigger !== undefined) {
|
|
139
|
+
patch.wakeTrigger = normalizeWakeTrigger(patch.wakeTrigger);
|
|
140
|
+
}
|
|
137
141
|
if (patch.writeScopes !== undefined) {
|
|
138
142
|
patch.writeScopes = normalizeScopes(patch.writeScopes);
|
|
139
143
|
}
|
|
@@ -0,0 +1,362 @@
|
|
|
1
|
+
import fs from 'node:fs';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { logger } from './logger.js';
|
|
4
|
+
import { bestEffort } from './best-effort.js';
|
|
5
|
+
|
|
6
|
+
const DISALLOWED_ROOTS = [
|
|
7
|
+
'/',
|
|
8
|
+
'/proc',
|
|
9
|
+
'/sys',
|
|
10
|
+
'/dev',
|
|
11
|
+
'/etc',
|
|
12
|
+
'/boot',
|
|
13
|
+
'/run',
|
|
14
|
+
'/var/run',
|
|
15
|
+
'c:\\',
|
|
16
|
+
'c:\\windows',
|
|
17
|
+
'c:\\windows\\system32',
|
|
18
|
+
'c:\\program files',
|
|
19
|
+
'c:\\program files (x86)',
|
|
20
|
+
];
|
|
21
|
+
|
|
22
|
+
/**
|
|
23
|
+
* Validates that a path does not target sensitive system locations or escape root.
|
|
24
|
+
*/
|
|
25
|
+
export function isSafeWakePath(targetPath) {
|
|
26
|
+
if (!targetPath || typeof targetPath !== 'string') {
|
|
27
|
+
return { safe: false, error: 'Path must be a non-empty string' };
|
|
28
|
+
}
|
|
29
|
+
const trimmed = targetPath.trim();
|
|
30
|
+
if (trimmed.includes('\0')) {
|
|
31
|
+
return { safe: false, error: 'Path must not contain null bytes' };
|
|
32
|
+
}
|
|
33
|
+
const resolved = path.resolve(trimmed);
|
|
34
|
+
const lower = resolved.toLowerCase();
|
|
35
|
+
|
|
36
|
+
for (const root of DISALLOWED_ROOTS) {
|
|
37
|
+
if (lower === root || lower === root.replace(/\\/g, '/')) {
|
|
38
|
+
return { safe: false, error: `Path "${resolved}" targets a disallowed system root directory` };
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
if (resolved === path.parse(resolved).root) {
|
|
43
|
+
return { safe: false, error: `Path "${resolved}" is a filesystem root` };
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
return { safe: true, resolved };
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
/**
|
|
50
|
+
* Normalizes wake trigger configuration. Returns null if invalid or disabled.
|
|
51
|
+
*/
|
|
52
|
+
export function normalizeWakeTrigger(cfg) {
|
|
53
|
+
if (!cfg || typeof cfg !== 'object') return null;
|
|
54
|
+
const enabled = cfg.enabled !== false;
|
|
55
|
+
const type = String(cfg.type || '').trim().toLowerCase();
|
|
56
|
+
|
|
57
|
+
if (!['file_count', 'marker_file', 'process_exit'].includes(type)) {
|
|
58
|
+
return null;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
const normalized = {
|
|
62
|
+
enabled,
|
|
63
|
+
type,
|
|
64
|
+
pollIntervalMs: Math.max(20, Number(cfg.pollIntervalMs) || 3000),
|
|
65
|
+
};
|
|
66
|
+
|
|
67
|
+
if (type === 'file_count') {
|
|
68
|
+
normalized.path = String(cfg.path || '').trim();
|
|
69
|
+
normalized.minCount = Math.max(1, parseInt(cfg.minCount, 10) || 1);
|
|
70
|
+
normalized.pattern = String(cfg.pattern || '*').trim() || '*';
|
|
71
|
+
} else if (type === 'marker_file') {
|
|
72
|
+
normalized.markerPath = String(cfg.markerPath || cfg.path || '').trim();
|
|
73
|
+
normalized.consumeMarker = cfg.consumeMarker !== false;
|
|
74
|
+
} else if (type === 'process_exit') {
|
|
75
|
+
if (cfg.pid !== undefined && cfg.pid !== null && cfg.pid !== '') {
|
|
76
|
+
const pidNum = parseInt(cfg.pid, 10);
|
|
77
|
+
if (Number.isInteger(pidNum) && pidNum > 1) {
|
|
78
|
+
normalized.pid = pidNum;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
normalized.pidFile = String(cfg.pidFile || '').trim();
|
|
82
|
+
normalized.consumeMarker = Boolean(cfg.consumeMarker);
|
|
83
|
+
if (!normalized.pid && !normalized.pidFile) {
|
|
84
|
+
return null;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
return normalized;
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
/**
|
|
92
|
+
* Checks if an OS process is currently running.
|
|
93
|
+
*/
|
|
94
|
+
export function isProcessAlive(pid) {
|
|
95
|
+
if (!Number.isInteger(pid) || pid <= 1) return false;
|
|
96
|
+
try {
|
|
97
|
+
process.kill(pid, 0);
|
|
98
|
+
return true;
|
|
99
|
+
} catch (err) {
|
|
100
|
+
return err.code === 'EPERM';
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
/**
|
|
105
|
+
* Matches a filename against a glob pattern (wildcards * and ?, comma-separated).
|
|
106
|
+
*/
|
|
107
|
+
export function matchPattern(filename, pattern) {
|
|
108
|
+
if (!pattern || pattern.trim() === '' || pattern === '*') return true;
|
|
109
|
+
const parts = pattern.split(',').map((p) => p.trim()).filter(Boolean);
|
|
110
|
+
if (!parts.length) return true;
|
|
111
|
+
|
|
112
|
+
return parts.some((p) => {
|
|
113
|
+
const regexStr = '^' + p.replace(/[.+^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*').replace(/\?/g, '.') + '$';
|
|
114
|
+
try {
|
|
115
|
+
return new RegExp(regexStr, 'i').test(filename);
|
|
116
|
+
} catch (_err) {
|
|
117
|
+
void _err;
|
|
118
|
+
return false;
|
|
119
|
+
}
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
/**
|
|
124
|
+
* Counts non-directory files in a directory matching pattern.
|
|
125
|
+
*/
|
|
126
|
+
export function countMatchingFiles(dir, pattern = '*') {
|
|
127
|
+
try {
|
|
128
|
+
const entries = fs.readdirSync(dir, { withFileTypes: true });
|
|
129
|
+
const matched = [];
|
|
130
|
+
for (const entry of entries) {
|
|
131
|
+
if (entry.isFile() || entry.isSymbolicLink()) {
|
|
132
|
+
if (matchPattern(entry.name, pattern)) {
|
|
133
|
+
matched.push(entry.name);
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
return { count: matched.length, files: matched };
|
|
138
|
+
} catch (_err) {
|
|
139
|
+
void _err;
|
|
140
|
+
return { count: 0, files: [] };
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
/**
|
|
145
|
+
* WakeTriggerManager manages background observation and event-driven waking of tasks (#410).
|
|
146
|
+
*/
|
|
147
|
+
export class WakeTriggerManager {
|
|
148
|
+
constructor(scheduler) {
|
|
149
|
+
this.scheduler = scheduler;
|
|
150
|
+
this.watchers = new Map(); // taskId -> { timer, config, state }
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
syncTasks(tasks) {
|
|
154
|
+
if (!Array.isArray(tasks)) return;
|
|
155
|
+
const activeTaskIds = new Set();
|
|
156
|
+
for (const task of tasks) {
|
|
157
|
+
if (task && task.id && task.status === 'active' && task.wakeTrigger) {
|
|
158
|
+
const norm = normalizeWakeTrigger(task.wakeTrigger);
|
|
159
|
+
if (norm && norm.enabled) {
|
|
160
|
+
activeTaskIds.add(task.id);
|
|
161
|
+
this.registerTask(task);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
// Stop watchers for tasks that are no longer active or have no wake trigger
|
|
167
|
+
for (const taskId of this.watchers.keys()) {
|
|
168
|
+
if (!activeTaskIds.has(taskId)) {
|
|
169
|
+
this.unregisterTask(taskId);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
registerTask(task) {
|
|
175
|
+
if (!task || !task.id) return;
|
|
176
|
+
const norm = normalizeWakeTrigger(task.wakeTrigger);
|
|
177
|
+
|
|
178
|
+
if (!norm || !norm.enabled || task.status !== 'active') {
|
|
179
|
+
this.unregisterTask(task.id);
|
|
180
|
+
return;
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
const current = this.watchers.get(task.id);
|
|
184
|
+
const configSig = JSON.stringify(norm);
|
|
185
|
+
|
|
186
|
+
if (current && current.sig === configSig) {
|
|
187
|
+
return; // Already registered with same config
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
this.unregisterTask(task.id);
|
|
191
|
+
|
|
192
|
+
const state = {
|
|
193
|
+
triggered: false,
|
|
194
|
+
lastCount: 0,
|
|
195
|
+
processSeenAlive: false,
|
|
196
|
+
monitoredPid: norm.pid || null,
|
|
197
|
+
};
|
|
198
|
+
|
|
199
|
+
const runCheck = async () => {
|
|
200
|
+
if (!this.scheduler || this.scheduler.isStopped) return;
|
|
201
|
+
try {
|
|
202
|
+
if (norm.type === 'file_count') {
|
|
203
|
+
await this._checkFileCount(task, norm, state);
|
|
204
|
+
} else if (norm.type === 'marker_file') {
|
|
205
|
+
await this._checkMarkerFile(task, norm, state);
|
|
206
|
+
} else if (norm.type === 'process_exit') {
|
|
207
|
+
await this._checkProcessExit(task, norm, state);
|
|
208
|
+
}
|
|
209
|
+
} catch (err) {
|
|
210
|
+
logger.error(`[dsh-cron] Wake trigger check failed for task "${task.title}" (${task.id}): ${err.message}`);
|
|
211
|
+
}
|
|
212
|
+
};
|
|
213
|
+
|
|
214
|
+
const timer = setInterval(runCheck, norm.pollIntervalMs);
|
|
215
|
+
if (timer.unref) timer.unref();
|
|
216
|
+
|
|
217
|
+
this.watchers.set(task.id, {
|
|
218
|
+
timer,
|
|
219
|
+
sig: configSig,
|
|
220
|
+
config: norm,
|
|
221
|
+
state,
|
|
222
|
+
});
|
|
223
|
+
|
|
224
|
+
// Run first check promptly
|
|
225
|
+
setImmediate(runCheck);
|
|
226
|
+
logger.info(`[dsh-cron] Wake trigger (${norm.type}) registered for task "${task.title}" (${task.id})`);
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
unregisterTask(taskId) {
|
|
230
|
+
const entry = this.watchers.get(taskId);
|
|
231
|
+
if (entry) {
|
|
232
|
+
if (entry.timer) clearInterval(entry.timer);
|
|
233
|
+
this.watchers.delete(taskId);
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
stopAll() {
|
|
238
|
+
for (const entry of this.watchers.values()) {
|
|
239
|
+
if (entry.timer) clearInterval(entry.timer);
|
|
240
|
+
}
|
|
241
|
+
this.watchers.clear();
|
|
242
|
+
}
|
|
243
|
+
|
|
244
|
+
async _checkFileCount(task, cfg, state) {
|
|
245
|
+
const check = isSafeWakePath(cfg.path);
|
|
246
|
+
if (!check.safe) return;
|
|
247
|
+
if (!fs.existsSync(check.resolved)) return;
|
|
248
|
+
|
|
249
|
+
const { count, files } = countMatchingFiles(check.resolved, cfg.pattern);
|
|
250
|
+
|
|
251
|
+
if (count >= cfg.minCount) {
|
|
252
|
+
// Trigger if not triggered yet, or if new files arrived since last trigger
|
|
253
|
+
if (!state.triggered || count > state.lastCount) {
|
|
254
|
+
state.triggered = true;
|
|
255
|
+
state.lastCount = count;
|
|
256
|
+
logger.info(`[dsh-cron] Wake trigger file_count (${count} >= ${cfg.minCount}) fired for task "${task.title}" (${task.id})`);
|
|
257
|
+
await this._triggerTask(task, {
|
|
258
|
+
type: 'file_count',
|
|
259
|
+
path: check.resolved,
|
|
260
|
+
fileCount: count,
|
|
261
|
+
minCount: cfg.minCount,
|
|
262
|
+
pattern: cfg.pattern,
|
|
263
|
+
matchedFiles: files,
|
|
264
|
+
});
|
|
265
|
+
}
|
|
266
|
+
} else {
|
|
267
|
+
// Reset trigger state when file count drops below threshold
|
|
268
|
+
state.triggered = false;
|
|
269
|
+
state.lastCount = count;
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
|
|
273
|
+
async _checkMarkerFile(task, cfg, state) {
|
|
274
|
+
const check = isSafeWakePath(cfg.markerPath);
|
|
275
|
+
if (!check.safe) return;
|
|
276
|
+
if (!fs.existsSync(check.resolved)) {
|
|
277
|
+
state.triggered = false;
|
|
278
|
+
return;
|
|
279
|
+
}
|
|
280
|
+
|
|
281
|
+
if (state.triggered) return; // Wait for marker to disappear / re-appear
|
|
282
|
+
|
|
283
|
+
state.triggered = true;
|
|
284
|
+
|
|
285
|
+
if (cfg.consumeMarker) {
|
|
286
|
+
try {
|
|
287
|
+
fs.unlinkSync(check.resolved);
|
|
288
|
+
} catch (_err) {
|
|
289
|
+
void _err;
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
|
|
293
|
+
logger.info(`[dsh-cron] Wake trigger marker_file (${check.resolved}) fired for task "${task.title}" (${task.id})`);
|
|
294
|
+
await this._triggerTask(task, {
|
|
295
|
+
type: 'marker_file',
|
|
296
|
+
markerPath: check.resolved,
|
|
297
|
+
consumed: Boolean(cfg.consumeMarker),
|
|
298
|
+
triggeredAt: Date.now(),
|
|
299
|
+
});
|
|
300
|
+
}
|
|
301
|
+
|
|
302
|
+
async _checkProcessExit(task, cfg, state) {
|
|
303
|
+
// If tracking via pidFile, attempt to read PID
|
|
304
|
+
if (cfg.pidFile) {
|
|
305
|
+
const check = isSafeWakePath(cfg.pidFile);
|
|
306
|
+
if (check.safe && fs.existsSync(check.resolved)) {
|
|
307
|
+
try {
|
|
308
|
+
const content = fs.readFileSync(check.resolved, 'utf8').trim();
|
|
309
|
+
const parsed = parseInt(content, 10);
|
|
310
|
+
if (Number.isInteger(parsed) && parsed > 1) {
|
|
311
|
+
state.monitoredPid = parsed;
|
|
312
|
+
}
|
|
313
|
+
} catch (_err) {
|
|
314
|
+
void _err;
|
|
315
|
+
}
|
|
316
|
+
} else {
|
|
317
|
+
// pidFile does not exist yet or was removed
|
|
318
|
+
if (!state.monitoredPid) return;
|
|
319
|
+
}
|
|
320
|
+
}
|
|
321
|
+
|
|
322
|
+
if (!state.monitoredPid) return;
|
|
323
|
+
|
|
324
|
+
const alive = isProcessAlive(state.monitoredPid);
|
|
325
|
+
|
|
326
|
+
if (alive) {
|
|
327
|
+
state.processSeenAlive = true;
|
|
328
|
+
} else if (state.processSeenAlive && !alive) {
|
|
329
|
+
// Process was alive and has now exited!
|
|
330
|
+
const exitedPid = state.monitoredPid;
|
|
331
|
+
state.processSeenAlive = false;
|
|
332
|
+
state.monitoredPid = null;
|
|
333
|
+
|
|
334
|
+
if (cfg.consumeMarker && cfg.pidFile) {
|
|
335
|
+
const check = isSafeWakePath(cfg.pidFile);
|
|
336
|
+
if (check.safe && fs.existsSync(check.resolved)) {
|
|
337
|
+
bestEffort('unlink-pid-file', () => fs.unlinkSync(check.resolved));
|
|
338
|
+
}
|
|
339
|
+
}
|
|
340
|
+
|
|
341
|
+
logger.info(`[dsh-cron] Wake trigger process_exit (PID ${exitedPid}) fired for task "${task.title}" (${task.id})`);
|
|
342
|
+
await this._triggerTask(task, {
|
|
343
|
+
type: 'process_exit',
|
|
344
|
+
pid: exitedPid,
|
|
345
|
+
pidFile: cfg.pidFile || '',
|
|
346
|
+
exitTime: Date.now(),
|
|
347
|
+
});
|
|
348
|
+
}
|
|
349
|
+
}
|
|
350
|
+
|
|
351
|
+
async _triggerTask(task, wakeContext) {
|
|
352
|
+
if (!this.scheduler || this.scheduler.isStopped) return;
|
|
353
|
+
try {
|
|
354
|
+
await this.scheduler.runTask(task.id, {
|
|
355
|
+
wakeTrigger: wakeContext,
|
|
356
|
+
trigger: `wakeTrigger:${wakeContext.type}`,
|
|
357
|
+
});
|
|
358
|
+
} catch (err) {
|
|
359
|
+
logger.error(`[dsh-cron] Wake trigger execution failed for task ${task.id}: ${err.message}`);
|
|
360
|
+
}
|
|
361
|
+
}
|
|
362
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@goodandready/dsh-cron",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.33",
|
|
4
4
|
"description": "Background automation runner for DSH: isolated agent runs, script/HTTP/SSH/Docker runtimes, cost guard, notifications, heartbeats.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "lib/index.js",
|