@h-ai/scheduler 1.0.0-beta.21 → 1.0.0-beta.23
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.en.md +1 -1
- package/README.ja.md +1 -1
- package/README.md +1 -1
- package/dist/index.d.ts +1 -14
- package/dist/index.js +60 -147
- package/dist/index.js.map +1 -1
- package/package.json +3 -3
package/README.en.md
CHANGED
|
@@ -279,7 +279,7 @@ When a scheduled task sends Reach notifications, a scheduler lock or task comple
|
|
|
279
279
|
|
|
280
280
|
Definition refresh, registration, update and deletion are coordinated in arrival order within each process, including a mutation's refresh and commit. Valid concurrent registrations no longer fail merely because snapshots interleave; actual database failures still return errors. close stops entry points and the runner, cancels read waits and operations that have not started writing, then drains active persistent writes. Late snapshots cannot publish or repopulate state afterward. Business callbacks do not hold this queue. Nodes still rely on the shared database, versions and leases; local coordination is not a distributed lock.
|
|
281
281
|
|
|
282
|
-
|
|
282
|
+
Initialize RelDB before calling `scheduler.init()` to create and validate the task, execution and log tables. Incompatible tables cause initialization to fail. Manage execution records and observation logs according to their distinct purposes.
|
|
283
283
|
|
|
284
284
|
## Configuration
|
|
285
285
|
|
package/README.ja.md
CHANGED
|
@@ -279,7 +279,7 @@ Reach 通知を実行するタスクでは、調度ロックやタスク完了
|
|
|
279
279
|
|
|
280
280
|
定義の更新読込、登録、変更、削除は、変更に必要な読込と保存を含めプロセス内で受付順に調整します。正当な並行登録はスナップショットの交錯だけでは失敗せず、実際の DB 障害は失敗として返します。close は入口と runner を停止し、読取待機と未着手の書込を中止して、開始済みの永続書込を待ってから状態を解放します。遅延スナップショットは反映しません。業務コールバックはこのキューを占有しません。ノード間の整合性は引き続き共有 DB、バージョンとリースで保証し、この調整を分散ロックの代替にしません。
|
|
281
281
|
|
|
282
|
-
RelDB
|
|
282
|
+
RelDB の初期化後に `scheduler.init()` でタスク、実行、ログの各テーブルを作成・検証します。構造が一致しない場合は初期化に失敗します。実行台帳と観測ログは用途に応じて管理してください。
|
|
283
283
|
|
|
284
284
|
## 設定
|
|
285
285
|
|
package/README.md
CHANGED
|
@@ -279,7 +279,7 @@ API 任务的 `timeout`(默认 30000 毫秒)覆盖请求和完整响应体
|
|
|
279
279
|
|
|
280
280
|
任务定义的刷新、注册、更新和删除在同一进程内按接收顺序协调,包含写操作所需的刷新与提交。合法并发注册不会仅因快照交错而失败;真实数据库故障仍返回失败。close 先停止入口和 runner,取消只读等待和尚未开始写入的操作,再等待已开始的持久写入;迟到快照不发布,避免关闭后旧操作重新填充任务表。执行回调不占用这条队列;跨节点仍依靠共享数据库、版本与租约,不把进程内协调当分布式锁。
|
|
281
281
|
|
|
282
|
-
RelDB
|
|
282
|
+
先初始化 RelDB,再调用 `scheduler.init()` 创建和校验任务、执行及日志表。结构不符时返回初始化失败。执行账本与观测日志各有用途,应分别管理。
|
|
283
283
|
|
|
284
284
|
## 配置
|
|
285
285
|
|
package/dist/index.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
import * as _h_ai_core from '@h-ai/core';
|
|
3
3
|
import { PaginationOptionsInput, HaiResult, PaginatedResult } from '@h-ai/core';
|
|
4
|
-
import * as _h_ai_reldb from '@h-ai/reldb';
|
|
5
4
|
|
|
6
5
|
/**
|
|
7
6
|
* @h-ai/scheduler — 配置 Schema
|
|
@@ -855,17 +854,5 @@ interface SchedulerFunctions {
|
|
|
855
854
|
*/
|
|
856
855
|
declare const scheduler: SchedulerFunctions;
|
|
857
856
|
|
|
858
|
-
|
|
859
|
-
* 预检或升级调度器表;旧日志归档并幂等复制,新版执行账本与旧历史隔离。
|
|
860
|
-
* @example
|
|
861
|
-
* ```ts
|
|
862
|
-
* import { migrateScheduler } from '@h-ai/scheduler'
|
|
863
|
-
* const plan = await migrateScheduler({ dryRun: true })
|
|
864
|
-
* ```
|
|
865
|
-
*/
|
|
866
|
-
declare function migrateScheduler(options?: {
|
|
867
|
-
dryRun?: boolean;
|
|
868
|
-
}): Promise<_h_ai_core.HaiResult<_h_ai_reldb.SchemaMigrationPlan>>;
|
|
869
|
-
|
|
870
|
-
export { ExecutionResolutionSchema, HaiSchedulerError, SchedulerConfigSchema, TriggerTaskSchema, migrateScheduler, scheduler };
|
|
857
|
+
export { ExecutionResolutionSchema, HaiSchedulerError, SchedulerConfigSchema, TriggerTaskSchema, scheduler };
|
|
871
858
|
export type { ApiTaskConfig, ExecutionStatus, JsTaskConfig, JsTaskHandler, LogQueryOptions, SchedulerConfig, SchedulerConfigInput, SchedulerExecutionEntry, SchedulerExecutionOperations, SchedulerExecutionState, SchedulerFunctions, SchedulerInitInput, SchedulerLogCleanupPolicy, SchedulerTaskContext, SchedulerTaskExecuteEvent, SchedulerTaskFinishEvent, SchedulerTaskHooks, SchedulerTaskInterruptedEvent, SchedulerTaskStartEvent, TaskDefinition, TaskExecutionLog, TaskExecutionTargetType, TaskHandlerConfig, TaskHandlerKind, TaskLogPersistence, TaskParams, TaskRetryPolicy, TaskTriggerInfo, TaskTriggerType, TaskUpdateInput, TriggerTaskInput };
|
package/dist/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
import { core, ok, err
|
|
2
|
+
import { core, ok, err } from '@h-ai/core';
|
|
3
3
|
import { reldb, BaseReldbCrudRepository } from '@h-ai/reldb';
|
|
4
4
|
import { randomUUID, createHash } from 'crypto';
|
|
5
5
|
import { isDeepStrictEqual } from 'util';
|
|
@@ -277,6 +277,10 @@ var SchedulerExecutionRepository = class extends BaseReldbCrudRepository {
|
|
|
277
277
|
]
|
|
278
278
|
});
|
|
279
279
|
}
|
|
280
|
+
/** 等待执行表就绪并验证当前字段定义。 */
|
|
281
|
+
ready() {
|
|
282
|
+
return this.ensureSchema();
|
|
283
|
+
}
|
|
280
284
|
/**
|
|
281
285
|
* 只按已初始化的数据库类型选择存储端毫秒时钟。
|
|
282
286
|
* PostgreSQL/MySQL 使用执行时钟,不能使用固定在事务/语句开始处的时间快照。
|
|
@@ -577,6 +581,9 @@ var SchedulerExecutionRepository = class extends BaseReldbCrudRepository {
|
|
|
577
581
|
var logger = core.logger.child({ module: "scheduler", scope: "log-repository" });
|
|
578
582
|
var SCHEDULER_LOG_TABLE = "hai_scheduler_logs";
|
|
579
583
|
var SchedulerLogRepository = class extends BaseReldbCrudRepository {
|
|
584
|
+
ready() {
|
|
585
|
+
return this.ensureSchema();
|
|
586
|
+
}
|
|
580
587
|
constructor(db) {
|
|
581
588
|
super(db, {
|
|
582
589
|
table: SCHEDULER_LOG_TABLE,
|
|
@@ -870,6 +877,9 @@ var JsTaskConfigSchema = z.object({
|
|
|
870
877
|
});
|
|
871
878
|
var TaskHandlerConfigSchema = z.discriminatedUnion("kind", [ApiTaskConfigSchema, JsTaskConfigSchema]);
|
|
872
879
|
var SchedulerTaskRepository = class extends BaseReldbCrudRepository {
|
|
880
|
+
ready() {
|
|
881
|
+
return this.ensureSchema();
|
|
882
|
+
}
|
|
873
883
|
constructor(db) {
|
|
874
884
|
super(db, {
|
|
875
885
|
table: SCHEDULER_TASK_TABLE,
|
|
@@ -1007,7 +1017,7 @@ var SchedulerTaskRepository = class extends BaseReldbCrudRepository {
|
|
|
1007
1017
|
createdAt: /* @__PURE__ */ new Date()
|
|
1008
1018
|
});
|
|
1009
1019
|
if (!createResult.success) {
|
|
1010
|
-
logger2.error("Failed to save task definition", { taskId: task.id, error: createResult.error.
|
|
1020
|
+
logger2.error("Failed to save task definition", { taskId: task.id, errorCode: createResult.error.code, traceId: createResult.error.traceId });
|
|
1011
1021
|
return err(
|
|
1012
1022
|
HaiSchedulerError.DB_SAVE_FAILED,
|
|
1013
1023
|
schedulerM("scheduler_dbSaveFailed", {
|
|
@@ -1038,6 +1048,7 @@ var SchedulerTaskRepository = class extends BaseReldbCrudRepository {
|
|
|
1038
1048
|
limit: 1
|
|
1039
1049
|
});
|
|
1040
1050
|
if (!rows.success) {
|
|
1051
|
+
logger2.error("Failed to load task definition for update", { taskId, errorCode: rows.error.code, traceId: rows.error.traceId });
|
|
1041
1052
|
return err(
|
|
1042
1053
|
HaiSchedulerError.DB_SAVE_FAILED,
|
|
1043
1054
|
schedulerM("scheduler_dbSaveFailed", {
|
|
@@ -1074,7 +1085,7 @@ var SchedulerTaskRepository = class extends BaseReldbCrudRepository {
|
|
|
1074
1085
|
return ok(void 0);
|
|
1075
1086
|
const updateResult = await this.updateById(rows.data[0].id, data);
|
|
1076
1087
|
if (!updateResult.success) {
|
|
1077
|
-
logger2.error("Failed to update task definition", { taskId, error: updateResult.error.
|
|
1088
|
+
logger2.error("Failed to update task definition", { taskId, errorCode: updateResult.error.code, traceId: updateResult.error.traceId });
|
|
1078
1089
|
return err(
|
|
1079
1090
|
HaiSchedulerError.DB_SAVE_FAILED,
|
|
1080
1091
|
schedulerM("scheduler_dbSaveFailed", {
|
|
@@ -1140,7 +1151,11 @@ var SchedulerTaskRepository = class extends BaseReldbCrudRepository {
|
|
|
1140
1151
|
}
|
|
1141
1152
|
}
|
|
1142
1153
|
const deleted = await this.db.sql.execute(`DELETE FROM ${SCHEDULER_TASK_TABLE} WHERE ${conditions.join(" AND ")}`, params);
|
|
1143
|
-
|
|
1154
|
+
if (!deleted.success) {
|
|
1155
|
+
logger2.error("Failed to delete task definition", { taskId, errorCode: deleted.error.code, traceId: deleted.error.traceId });
|
|
1156
|
+
return deleted;
|
|
1157
|
+
}
|
|
1158
|
+
return ok(deleted.data.changes > 0);
|
|
1144
1159
|
}
|
|
1145
1160
|
const rows = await this.findAll({
|
|
1146
1161
|
where: "task_id = ?",
|
|
@@ -1148,6 +1163,7 @@ var SchedulerTaskRepository = class extends BaseReldbCrudRepository {
|
|
|
1148
1163
|
limit: 1
|
|
1149
1164
|
});
|
|
1150
1165
|
if (!rows.success) {
|
|
1166
|
+
logger2.error("Failed to load task definition for deletion", { taskId, errorCode: rows.error.code, traceId: rows.error.traceId });
|
|
1151
1167
|
return err(
|
|
1152
1168
|
HaiSchedulerError.DB_SAVE_FAILED,
|
|
1153
1169
|
schedulerM("scheduler_dbSaveFailed", {
|
|
@@ -1160,7 +1176,7 @@ var SchedulerTaskRepository = class extends BaseReldbCrudRepository {
|
|
|
1160
1176
|
return ok(false);
|
|
1161
1177
|
const deleteResult = await this.deleteById(rows.data[0].id);
|
|
1162
1178
|
if (!deleteResult.success) {
|
|
1163
|
-
logger2.error("Failed to delete task definition", { taskId, error: deleteResult.error.
|
|
1179
|
+
logger2.error("Failed to delete task definition", { taskId, errorCode: deleteResult.error.code, traceId: deleteResult.error.traceId });
|
|
1164
1180
|
return err(
|
|
1165
1181
|
HaiSchedulerError.DB_SAVE_FAILED,
|
|
1166
1182
|
schedulerM("scheduler_dbSaveFailed", {
|
|
@@ -1187,6 +1203,7 @@ var SchedulerTaskRepository = class extends BaseReldbCrudRepository {
|
|
|
1187
1203
|
try {
|
|
1188
1204
|
const rows = await this.findAll({ orderBy: "id ASC" });
|
|
1189
1205
|
if (!rows.success) {
|
|
1206
|
+
logger2.error("Failed to load task definitions", { errorCode: rows.error.code, traceId: rows.error.traceId });
|
|
1190
1207
|
return err(
|
|
1191
1208
|
HaiSchedulerError.DB_SAVE_FAILED,
|
|
1192
1209
|
schedulerM("scheduler_dbSaveFailed", {
|
|
@@ -1259,7 +1276,6 @@ function parseCronExpression(expression, timezone) {
|
|
|
1259
1276
|
}
|
|
1260
1277
|
|
|
1261
1278
|
// src/scheduler-functions.ts
|
|
1262
|
-
var logger3 = core.logger.child({ module: "scheduler", scope: "functions" });
|
|
1263
1279
|
var taskRegistry = /* @__PURE__ */ new Map();
|
|
1264
1280
|
var cronCache = /* @__PURE__ */ new Map();
|
|
1265
1281
|
var persistedTaskIds = /* @__PURE__ */ new Set();
|
|
@@ -1473,7 +1489,6 @@ async function registerTaskDefinition(task, taskRepo2) {
|
|
|
1473
1489
|
if (taskRepo2) {
|
|
1474
1490
|
const saveResult = await taskRepo2.saveTask(normalizedTask);
|
|
1475
1491
|
if (!saveResult.success) {
|
|
1476
|
-
logger3.warn("Failed to persist task definition", { taskId: task.id, error: saveResult.error.message });
|
|
1477
1492
|
return err(
|
|
1478
1493
|
HaiSchedulerError.DB_SAVE_FAILED,
|
|
1479
1494
|
schedulerM("scheduler_dbSaveFailed", {
|
|
@@ -1510,7 +1525,6 @@ async function unregisterTaskDefinition(taskId, taskRepo2, expected) {
|
|
|
1510
1525
|
if (taskRepo2) {
|
|
1511
1526
|
const deleteResult = await taskRepo2.deleteTask(taskId, expected);
|
|
1512
1527
|
if (!deleteResult.success) {
|
|
1513
|
-
logger3.warn("Failed to delete persisted task definition", { taskId, error: deleteResult.error.message });
|
|
1514
1528
|
return err(
|
|
1515
1529
|
HaiSchedulerError.DB_SAVE_FAILED,
|
|
1516
1530
|
schedulerM("scheduler_dbSaveFailed", {
|
|
@@ -1594,7 +1608,6 @@ async function updateTaskDefinition(taskId, updates, taskRepo2) {
|
|
|
1594
1608
|
if (taskRepo2) {
|
|
1595
1609
|
const updateResult = await taskRepo2.updateTask(taskId, normalizedUpdates);
|
|
1596
1610
|
if (!updateResult.success) {
|
|
1597
|
-
logger3.warn("Failed to update persisted task definition", { taskId, error: updateResult.error.message });
|
|
1598
1611
|
return err(
|
|
1599
1612
|
HaiSchedulerError.DB_SAVE_FAILED,
|
|
1600
1613
|
schedulerM("scheduler_dbSaveFailed", {
|
|
@@ -1680,108 +1693,6 @@ function compileJsTaskHandler(config) {
|
|
|
1680
1693
|
);
|
|
1681
1694
|
}
|
|
1682
1695
|
}
|
|
1683
|
-
function migrateScheduler(options = {}) {
|
|
1684
|
-
const steps = [
|
|
1685
|
-
{
|
|
1686
|
-
version: 1,
|
|
1687
|
-
name: "explicit-task-idempotency",
|
|
1688
|
-
async needed(sql) {
|
|
1689
|
-
const columns = await reldb.schemaColumns("hai_scheduler_tasks", sql);
|
|
1690
|
-
return columns.success ? ok(columns.data.length > 0 && !columns.data.includes("idempotent")) : columns;
|
|
1691
|
-
},
|
|
1692
|
-
async apply(sql) {
|
|
1693
|
-
return sql.execute("ALTER TABLE hai_scheduler_tasks ADD COLUMN idempotent BOOLEAN NOT NULL DEFAULT FALSE");
|
|
1694
|
-
}
|
|
1695
|
-
},
|
|
1696
|
-
{
|
|
1697
|
-
version: 2,
|
|
1698
|
-
name: "execution-history-snapshots",
|
|
1699
|
-
async needed(sql) {
|
|
1700
|
-
const columns = await reldb.schemaColumns("hai_scheduler_logs", sql);
|
|
1701
|
-
if (!columns.success)
|
|
1702
|
-
return columns;
|
|
1703
|
-
if (columns.data.length && !columns.data.includes("payload"))
|
|
1704
|
-
return ok(true);
|
|
1705
|
-
const archive = await reldb.schemaColumns("hai_scheduler_logs_alpha65", sql);
|
|
1706
|
-
if (!archive.success)
|
|
1707
|
-
return archive;
|
|
1708
|
-
if (!archive.data.length)
|
|
1709
|
-
return ok(false);
|
|
1710
|
-
if (!columns.data.length)
|
|
1711
|
-
return ok(true);
|
|
1712
|
-
const identity = reldb.config?.type === "mysql" ? "CAST(n.id AS BINARY)=CAST(CONCAT('legacy:',CAST(a.id AS CHAR)) AS BINARY)" : "n.id='legacy:' || CAST(a.id AS TEXT)";
|
|
1713
|
-
const missing = await sql.get(`SELECT id FROM hai_scheduler_logs_alpha65 a WHERE NOT EXISTS (SELECT 1 FROM hai_scheduler_logs n WHERE ${identity}) LIMIT 1`);
|
|
1714
|
-
return missing.success ? ok(Boolean(missing.data)) : missing;
|
|
1715
|
-
},
|
|
1716
|
-
async apply(sql) {
|
|
1717
|
-
const columns = await reldb.schemaColumns("hai_scheduler_logs", sql);
|
|
1718
|
-
if (!columns.success)
|
|
1719
|
-
return columns;
|
|
1720
|
-
if (columns.data.length && !columns.data.includes("payload")) {
|
|
1721
|
-
const archive = await reldb.schemaColumns("hai_scheduler_logs_alpha65", sql);
|
|
1722
|
-
if (!archive.success)
|
|
1723
|
-
return archive;
|
|
1724
|
-
if (archive.data.length)
|
|
1725
|
-
return err(HaiCommonError.INIT_FAILED, "Scheduler archive already exists");
|
|
1726
|
-
const renamed = await sql.execute("ALTER TABLE hai_scheduler_logs RENAME TO hai_scheduler_logs_alpha65");
|
|
1727
|
-
if (!renamed.success)
|
|
1728
|
-
return renamed;
|
|
1729
|
-
}
|
|
1730
|
-
const text = reldb.config?.type === "mysql" ? "VARCHAR(255)" : "TEXT";
|
|
1731
|
-
const json = reldb.config?.type === "postgresql" ? "JSONB" : reldb.config?.type === "mysql" ? "JSON" : "TEXT";
|
|
1732
|
-
const created = await sql.execute(`CREATE TABLE IF NOT EXISTS hai_scheduler_logs (id ${text} NOT NULL,occurrence_id ${text},task_id ${text} NOT NULL,task_name ${text} NOT NULL,task_type ${text} NOT NULL,trigger_type ${text} NOT NULL,trigger_source ${text},status ${text} NOT NULL,payload ${json} NOT NULL,started_at BIGINT NOT NULL,finished_at BIGINT NOT NULL,duration INTEGER NOT NULL,CONSTRAINT pk_hai_scheduler_log_v2 PRIMARY KEY(id))`);
|
|
1733
|
-
if (!created.success)
|
|
1734
|
-
return created;
|
|
1735
|
-
for (let offset = 0; ; offset += 100) {
|
|
1736
|
-
const rows = await sql.query(`SELECT CAST(id AS ${reldb.config?.type === "mysql" ? "CHAR" : "TEXT"}) AS id,task_id,task_name,task_type,trigger_type,trigger_source,status,result,error,started_at,finished_at,duration FROM hai_scheduler_logs_alpha65 ORDER BY id LIMIT 100 OFFSET ?`, [offset]);
|
|
1737
|
-
if (!rows.success)
|
|
1738
|
-
return rows;
|
|
1739
|
-
for (const row of rows.data) {
|
|
1740
|
-
const id = `legacy:${row.id}`;
|
|
1741
|
-
const existing = await sql.get("SELECT id FROM hai_scheduler_logs WHERE id=?", [id]);
|
|
1742
|
-
if (!existing.success)
|
|
1743
|
-
return existing;
|
|
1744
|
-
if (existing.data)
|
|
1745
|
-
continue;
|
|
1746
|
-
const payload = {
|
|
1747
|
-
id,
|
|
1748
|
-
taskId: row.task_id,
|
|
1749
|
-
taskName: row.task_name,
|
|
1750
|
-
taskType: row.task_type,
|
|
1751
|
-
triggerType: row.trigger_type,
|
|
1752
|
-
triggerSource: row.trigger_source,
|
|
1753
|
-
status: row.status,
|
|
1754
|
-
result: row.result,
|
|
1755
|
-
error: row.error,
|
|
1756
|
-
startedAt: Number(row.started_at),
|
|
1757
|
-
finishedAt: Number(row.finished_at),
|
|
1758
|
-
duration: Number(row.duration),
|
|
1759
|
-
persistence: { status: "persisted" }
|
|
1760
|
-
};
|
|
1761
|
-
const copied = await sql.execute("INSERT INTO hai_scheduler_logs(id,task_id,task_name,task_type,trigger_type,trigger_source,status,payload,started_at,finished_at,duration) VALUES(?,?,?,?,?,?,?,?,?,?,?)", [
|
|
1762
|
-
id,
|
|
1763
|
-
row.task_id,
|
|
1764
|
-
row.task_name,
|
|
1765
|
-
row.task_type,
|
|
1766
|
-
row.trigger_type,
|
|
1767
|
-
row.trigger_source,
|
|
1768
|
-
row.status,
|
|
1769
|
-
JSON.stringify(payload),
|
|
1770
|
-
row.started_at,
|
|
1771
|
-
row.finished_at,
|
|
1772
|
-
row.duration
|
|
1773
|
-
]);
|
|
1774
|
-
if (!copied.success)
|
|
1775
|
-
return copied;
|
|
1776
|
-
}
|
|
1777
|
-
if (rows.data.length < 100)
|
|
1778
|
-
return ok(void 0);
|
|
1779
|
-
}
|
|
1780
|
-
}
|
|
1781
|
-
}
|
|
1782
|
-
];
|
|
1783
|
-
return reldb.migrateSchema("scheduler", steps, options);
|
|
1784
|
-
}
|
|
1785
1696
|
|
|
1786
1697
|
// src/scheduler-cancellation.ts
|
|
1787
1698
|
async function waitWithSignal(operation, signal) {
|
|
@@ -1796,7 +1707,7 @@ async function waitWithSignal(operation, signal) {
|
|
|
1796
1707
|
}
|
|
1797
1708
|
|
|
1798
1709
|
// src/scheduler-executor.ts
|
|
1799
|
-
var
|
|
1710
|
+
var logger3 = core.logger.child({ module: "scheduler", scope: "executor" });
|
|
1800
1711
|
function resolveTaskType(task, hooks) {
|
|
1801
1712
|
if (task.handler)
|
|
1802
1713
|
return task.handler.kind;
|
|
@@ -1819,7 +1730,7 @@ async function notifyTaskStart(hooks, event) {
|
|
|
1819
1730
|
try {
|
|
1820
1731
|
await waitWithSignal(() => hooks.onTaskStart(event), event.signal);
|
|
1821
1732
|
} catch (error) {
|
|
1822
|
-
|
|
1733
|
+
logger3.warn("Task start hook failed", { taskId: event.task.id, error });
|
|
1823
1734
|
}
|
|
1824
1735
|
}
|
|
1825
1736
|
async function notifyTaskInterrupted(hooks, event) {
|
|
@@ -1828,7 +1739,7 @@ async function notifyTaskInterrupted(hooks, event) {
|
|
|
1828
1739
|
try {
|
|
1829
1740
|
await waitWithSignal(() => hooks.onTaskInterrupted(event), event.signal);
|
|
1830
1741
|
} catch (error) {
|
|
1831
|
-
|
|
1742
|
+
logger3.warn("Task interrupted hook failed", { taskId: event.task.id, error });
|
|
1832
1743
|
}
|
|
1833
1744
|
}
|
|
1834
1745
|
async function notifyTaskFinish(hooks, event) {
|
|
@@ -1837,7 +1748,7 @@ async function notifyTaskFinish(hooks, event) {
|
|
|
1837
1748
|
try {
|
|
1838
1749
|
await waitWithSignal(() => hooks.onTaskFinish(event), event.signal);
|
|
1839
1750
|
} catch (error) {
|
|
1840
|
-
|
|
1751
|
+
logger3.warn("Task finish hook failed", { taskId: event.task.id, error });
|
|
1841
1752
|
}
|
|
1842
1753
|
}
|
|
1843
1754
|
function createExecutionLog(task, trigger, taskType, status, startedAt, finishedAt, result, error, occurrenceId) {
|
|
@@ -1896,7 +1807,7 @@ async function executeJsTask(task, context, signal = new AbortController().signa
|
|
|
1896
1807
|
return ok(result !== void 0 ? JSON.stringify(result) : null);
|
|
1897
1808
|
} catch (error) {
|
|
1898
1809
|
const message = error instanceof Error ? error.message : String(error);
|
|
1899
|
-
|
|
1810
|
+
logger3.error("JS task execution failed", { taskId: task.id, error: message });
|
|
1900
1811
|
return err(
|
|
1901
1812
|
HaiSchedulerError.JS_EXECUTION_FAILED,
|
|
1902
1813
|
schedulerM("scheduler_jsExecutionFailed", {
|
|
@@ -1967,7 +1878,7 @@ async function executeApiTask(task, context, signal = new AbortController().sign
|
|
|
1967
1878
|
}
|
|
1968
1879
|
}
|
|
1969
1880
|
if (!response.ok) {
|
|
1970
|
-
|
|
1881
|
+
logger3.error("API task returned non-OK status", {
|
|
1971
1882
|
taskId: context.taskId,
|
|
1972
1883
|
status: response.status,
|
|
1973
1884
|
url: core.sanitize.sanitizeUrl(url)
|
|
@@ -1982,7 +1893,7 @@ async function executeApiTask(task, context, signal = new AbortController().sign
|
|
|
1982
1893
|
return ok(responseText || null);
|
|
1983
1894
|
} catch (error) {
|
|
1984
1895
|
const message = error instanceof Error ? error.message : String(error);
|
|
1985
|
-
|
|
1896
|
+
logger3.error("API task execution failed", {
|
|
1986
1897
|
taskId: context.taskId,
|
|
1987
1898
|
error: message,
|
|
1988
1899
|
url: core.sanitize.sanitizeUrl(url)
|
|
@@ -2019,7 +1930,7 @@ async function executeHookTask(task, context, hooks, startedAt, signal) {
|
|
|
2019
1930
|
return ok(result !== void 0 ? JSON.stringify(result) : null);
|
|
2020
1931
|
} catch (error) {
|
|
2021
1932
|
const message = error instanceof Error ? error.message : String(error);
|
|
2022
|
-
|
|
1933
|
+
logger3.error("Task execute hook failed", { taskId: task.id, error: message });
|
|
2023
1934
|
return err(
|
|
2024
1935
|
HaiSchedulerError.HOOK_EXECUTION_FAILED,
|
|
2025
1936
|
schedulerM("scheduler_hookExecutionFailed", {
|
|
@@ -2095,7 +2006,7 @@ async function executeTask(task, trigger, hooks, signal = new AbortController().
|
|
|
2095
2006
|
}
|
|
2096
2007
|
|
|
2097
2008
|
// src/scheduler-runner.ts
|
|
2098
|
-
var
|
|
2009
|
+
var logger4 = core.logger.child({ module: "scheduler", scope: "runner" });
|
|
2099
2010
|
var runningTasks = /* @__PURE__ */ new Set();
|
|
2100
2011
|
var activeRuns = /* @__PURE__ */ new Map();
|
|
2101
2012
|
var activeRepairs = /* @__PURE__ */ new Set();
|
|
@@ -2172,7 +2083,7 @@ async function projectExecutionLogs(id) {
|
|
|
2172
2083
|
return err(HaiSchedulerError.LOG_PERSIST_FAILED, schedulerM("scheduler_logPersistFailed"));
|
|
2173
2084
|
const cleanup = await logs.cleanupLogs(cleanupPolicy);
|
|
2174
2085
|
if (!cleanup.success)
|
|
2175
|
-
|
|
2086
|
+
logger4.warn("Execution logs persisted but retention cleanup failed", { occurrenceId: id, errorCode: cleanup.error.code });
|
|
2176
2087
|
return ok(void 0);
|
|
2177
2088
|
} catch {
|
|
2178
2089
|
return err(HaiSchedulerError.LOG_PERSIST_FAILED, schedulerM("scheduler_logPersistFailed"));
|
|
@@ -2253,7 +2164,7 @@ async function tick() {
|
|
|
2253
2164
|
return;
|
|
2254
2165
|
continue;
|
|
2255
2166
|
}
|
|
2256
|
-
void runTask(task, trigger.minute, trigger, void 0, row).catch((error) =>
|
|
2167
|
+
void runTask(task, trigger.minute, trigger, void 0, row).catch((error) => logger4.warn("Execution recovery failed", { taskId: task.id, error }));
|
|
2257
2168
|
}
|
|
2258
2169
|
}
|
|
2259
2170
|
}
|
|
@@ -2275,7 +2186,7 @@ function scheduleDueTasks(databaseNow) {
|
|
|
2275
2186
|
continue;
|
|
2276
2187
|
if (!getCron(taskId)?.match(new Date(currentMinute * 6e4)))
|
|
2277
2188
|
continue;
|
|
2278
|
-
void runTask(task, currentMinute, { type: "scheduled", source: null }).catch((error) =>
|
|
2189
|
+
void runTask(task, currentMinute, { type: "scheduled", source: null }).catch((error) => logger4.error("Unhandled task execution error", { taskId, error }));
|
|
2279
2190
|
}
|
|
2280
2191
|
}
|
|
2281
2192
|
function runTask(task, minuteTimestamp, trigger = { type: "manual", source: null }, options, recovery) {
|
|
@@ -2479,7 +2390,7 @@ async function runTaskExecution(task, minute, trigger, controller, options, reco
|
|
|
2479
2390
|
}
|
|
2480
2391
|
};
|
|
2481
2392
|
if (!projected.success)
|
|
2482
|
-
|
|
2393
|
+
logger4.warn("Execution completed with pending log persistence", { taskId: task.id, occurrenceId, errorCode: projected.error.code });
|
|
2483
2394
|
if (task.deleteAfterRun && log.status === "success") {
|
|
2484
2395
|
const refreshed = await loadPersistedTasks(repository);
|
|
2485
2396
|
if (refreshed.success && isDeepStrictEqual(getTask(task.id), task))
|
|
@@ -2504,7 +2415,7 @@ function stopTimer() {
|
|
|
2504
2415
|
}
|
|
2505
2416
|
|
|
2506
2417
|
// src/scheduler-main.ts
|
|
2507
|
-
var
|
|
2418
|
+
var logger5 = core.logger.child({ module: "scheduler", scope: "main" });
|
|
2508
2419
|
var currentConfig = null;
|
|
2509
2420
|
var initInProgress = false;
|
|
2510
2421
|
var closeInProgress = null;
|
|
@@ -2522,18 +2433,20 @@ var notInitialized = core.module.createNotInitializedKit(
|
|
|
2522
2433
|
);
|
|
2523
2434
|
async function initDatabase(parsed) {
|
|
2524
2435
|
if (!reldb.isInitialized) {
|
|
2525
|
-
|
|
2436
|
+
logger5.error("enableDb is true but @h-ai/reldb is not initialized");
|
|
2526
2437
|
throw new Error(schedulerM("scheduler_reldbNotInitialized"));
|
|
2527
2438
|
}
|
|
2528
|
-
const migration = await migrateScheduler();
|
|
2529
|
-
if (!migration.success)
|
|
2530
|
-
throw migration.error;
|
|
2531
2439
|
taskRepo = new SchedulerTaskRepository(reldb);
|
|
2532
2440
|
logRepo = new SchedulerLogRepository(reldb);
|
|
2533
2441
|
executionRepo = new SchedulerExecutionRepository(reldb);
|
|
2534
|
-
const ready
|
|
2535
|
-
|
|
2536
|
-
|
|
2442
|
+
for (const ready of await Promise.all([
|
|
2443
|
+
taskRepo.ready(),
|
|
2444
|
+
logRepo.ready(),
|
|
2445
|
+
executionRepo.ready()
|
|
2446
|
+
])) {
|
|
2447
|
+
if (!ready.success)
|
|
2448
|
+
throw ready.error;
|
|
2449
|
+
}
|
|
2537
2450
|
setTaskRepository(taskRepo);
|
|
2538
2451
|
setLogRepository(logRepo, {
|
|
2539
2452
|
maxLogs: parsed.maxLogs,
|
|
@@ -2541,7 +2454,7 @@ async function initDatabase(parsed) {
|
|
|
2541
2454
|
});
|
|
2542
2455
|
const nodeId = parsed.nodeId ?? crypto.randomUUID();
|
|
2543
2456
|
configureExecution(executionRepo, nodeId, parsed.leaseMs);
|
|
2544
|
-
|
|
2457
|
+
logger5.info("Shared execution repository configured", { nodeId, leaseMs: parsed.leaseMs });
|
|
2545
2458
|
return { ...parsed, nodeId };
|
|
2546
2459
|
}
|
|
2547
2460
|
function normalizeTriggerInput(options) {
|
|
@@ -2596,7 +2509,7 @@ var scheduler = {
|
|
|
2596
2509
|
},
|
|
2597
2510
|
async init(config) {
|
|
2598
2511
|
if (initInProgress) {
|
|
2599
|
-
|
|
2512
|
+
logger5.warn("Scheduler init already in progress, skipping concurrent call");
|
|
2600
2513
|
return err(
|
|
2601
2514
|
HaiSchedulerError.INIT_FAILED,
|
|
2602
2515
|
schedulerM("scheduler_initFailed", {
|
|
@@ -2609,14 +2522,14 @@ var scheduler = {
|
|
|
2609
2522
|
if (closeInProgress)
|
|
2610
2523
|
await closeInProgress;
|
|
2611
2524
|
if (currentConfig) {
|
|
2612
|
-
|
|
2525
|
+
logger5.warn("Scheduler module is already initialized, reinitializing");
|
|
2613
2526
|
await scheduler.close();
|
|
2614
2527
|
}
|
|
2615
|
-
|
|
2528
|
+
logger5.info("Initializing scheduler module");
|
|
2616
2529
|
const { tasks = [], hooks = {}, ...configOptions } = config ?? {};
|
|
2617
2530
|
const parseResult = SchedulerConfigSchema.safeParse(configOptions);
|
|
2618
2531
|
if (!parseResult.success) {
|
|
2619
|
-
|
|
2532
|
+
logger5.error("Scheduler config validation failed", { error: parseResult.error.message });
|
|
2620
2533
|
return err(
|
|
2621
2534
|
HaiSchedulerError.CONFIG_ERROR,
|
|
2622
2535
|
schedulerM("scheduler_configError", {
|
|
@@ -2638,10 +2551,10 @@ var scheduler = {
|
|
|
2638
2551
|
await scheduler.close();
|
|
2639
2552
|
return configResult;
|
|
2640
2553
|
}
|
|
2641
|
-
|
|
2554
|
+
logger5.info("Scheduler module initialized", { enableDb: currentConfig.enableDb, taskCount: getTaskRegistry().size });
|
|
2642
2555
|
return ok(void 0);
|
|
2643
2556
|
} catch (error) {
|
|
2644
|
-
|
|
2557
|
+
logger5.error("Scheduler initialization failed", { error });
|
|
2645
2558
|
await scheduler.close();
|
|
2646
2559
|
return err(
|
|
2647
2560
|
HaiSchedulerError.INIT_FAILED,
|
|
@@ -2668,7 +2581,7 @@ var scheduler = {
|
|
|
2668
2581
|
return notInitialized.result();
|
|
2669
2582
|
const registerResult = await registerTask(task, taskRepo);
|
|
2670
2583
|
if (registerResult.success) {
|
|
2671
|
-
|
|
2584
|
+
logger5.info("Task registered", { taskId: task.id, taskName: task.name, cron: task.cron });
|
|
2672
2585
|
}
|
|
2673
2586
|
return registerResult;
|
|
2674
2587
|
},
|
|
@@ -2677,7 +2590,7 @@ var scheduler = {
|
|
|
2677
2590
|
return notInitialized.result();
|
|
2678
2591
|
const unregisterResult = await unregisterTask(taskId, taskRepo);
|
|
2679
2592
|
if (unregisterResult.success)
|
|
2680
|
-
|
|
2593
|
+
logger5.info("Task unregistered", { taskId });
|
|
2681
2594
|
return unregisterResult;
|
|
2682
2595
|
},
|
|
2683
2596
|
async updateTask(taskId, updates) {
|
|
@@ -2685,7 +2598,7 @@ var scheduler = {
|
|
|
2685
2598
|
return notInitialized.result();
|
|
2686
2599
|
const updateResult = await updateRegisteredTask(taskId, updates, taskRepo);
|
|
2687
2600
|
if (updateResult.success) {
|
|
2688
|
-
|
|
2601
|
+
logger5.info("Task updated", {
|
|
2689
2602
|
taskId,
|
|
2690
2603
|
updates: Object.keys(updates)
|
|
2691
2604
|
});
|
|
@@ -2702,7 +2615,7 @@ var scheduler = {
|
|
|
2702
2615
|
);
|
|
2703
2616
|
}
|
|
2704
2617
|
startTimer(currentConfig.tickInterval);
|
|
2705
|
-
|
|
2618
|
+
logger5.info("Scheduler started", { tickInterval: currentConfig.tickInterval });
|
|
2706
2619
|
return ok(void 0);
|
|
2707
2620
|
},
|
|
2708
2621
|
stop() {
|
|
@@ -2715,7 +2628,7 @@ var scheduler = {
|
|
|
2715
2628
|
);
|
|
2716
2629
|
}
|
|
2717
2630
|
stopTimer();
|
|
2718
|
-
|
|
2631
|
+
logger5.info("Scheduler stopped");
|
|
2719
2632
|
return ok(void 0);
|
|
2720
2633
|
},
|
|
2721
2634
|
async trigger(taskId, options) {
|
|
@@ -2777,7 +2690,7 @@ var scheduler = {
|
|
|
2777
2690
|
async close() {
|
|
2778
2691
|
if (closeInProgress)
|
|
2779
2692
|
return closeInProgress;
|
|
2780
|
-
|
|
2693
|
+
logger5.info("Closing scheduler module");
|
|
2781
2694
|
currentConfig = null;
|
|
2782
2695
|
stopTimer();
|
|
2783
2696
|
cancelTaskDefinitionReads();
|
|
@@ -2792,7 +2705,7 @@ var scheduler = {
|
|
|
2792
2705
|
taskRepo = null;
|
|
2793
2706
|
logRepo = null;
|
|
2794
2707
|
executionRepo = null;
|
|
2795
|
-
|
|
2708
|
+
logger5.info("Scheduler module closed");
|
|
2796
2709
|
})();
|
|
2797
2710
|
try {
|
|
2798
2711
|
await closeInProgress;
|
|
@@ -2802,6 +2715,6 @@ var scheduler = {
|
|
|
2802
2715
|
}
|
|
2803
2716
|
};
|
|
2804
2717
|
|
|
2805
|
-
export { ExecutionResolutionSchema, HaiSchedulerError, SchedulerConfigSchema, TriggerTaskSchema,
|
|
2718
|
+
export { ExecutionResolutionSchema, HaiSchedulerError, SchedulerConfigSchema, TriggerTaskSchema, scheduler };
|
|
2806
2719
|
//# sourceMappingURL=index.js.map
|
|
2807
2720
|
//# sourceMappingURL=index.js.map
|