@h-ai/scheduler 1.0.0-beta.20 → 1.0.0-beta.22
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/dist/index.js +40 -37
- package/dist/index.js.map +1 -1
- package/package.json +3 -3
package/dist/index.js
CHANGED
|
@@ -1007,7 +1007,7 @@ var SchedulerTaskRepository = class extends BaseReldbCrudRepository {
|
|
|
1007
1007
|
createdAt: /* @__PURE__ */ new Date()
|
|
1008
1008
|
});
|
|
1009
1009
|
if (!createResult.success) {
|
|
1010
|
-
logger2.error("Failed to save task definition", { taskId: task.id, error: createResult.error.
|
|
1010
|
+
logger2.error("Failed to save task definition", { taskId: task.id, errorCode: createResult.error.code, traceId: createResult.error.traceId });
|
|
1011
1011
|
return err(
|
|
1012
1012
|
HaiSchedulerError.DB_SAVE_FAILED,
|
|
1013
1013
|
schedulerM("scheduler_dbSaveFailed", {
|
|
@@ -1038,6 +1038,7 @@ var SchedulerTaskRepository = class extends BaseReldbCrudRepository {
|
|
|
1038
1038
|
limit: 1
|
|
1039
1039
|
});
|
|
1040
1040
|
if (!rows.success) {
|
|
1041
|
+
logger2.error("Failed to load task definition for update", { taskId, errorCode: rows.error.code, traceId: rows.error.traceId });
|
|
1041
1042
|
return err(
|
|
1042
1043
|
HaiSchedulerError.DB_SAVE_FAILED,
|
|
1043
1044
|
schedulerM("scheduler_dbSaveFailed", {
|
|
@@ -1074,7 +1075,7 @@ var SchedulerTaskRepository = class extends BaseReldbCrudRepository {
|
|
|
1074
1075
|
return ok(void 0);
|
|
1075
1076
|
const updateResult = await this.updateById(rows.data[0].id, data);
|
|
1076
1077
|
if (!updateResult.success) {
|
|
1077
|
-
logger2.error("Failed to update task definition", { taskId, error: updateResult.error.
|
|
1078
|
+
logger2.error("Failed to update task definition", { taskId, errorCode: updateResult.error.code, traceId: updateResult.error.traceId });
|
|
1078
1079
|
return err(
|
|
1079
1080
|
HaiSchedulerError.DB_SAVE_FAILED,
|
|
1080
1081
|
schedulerM("scheduler_dbSaveFailed", {
|
|
@@ -1140,7 +1141,11 @@ var SchedulerTaskRepository = class extends BaseReldbCrudRepository {
|
|
|
1140
1141
|
}
|
|
1141
1142
|
}
|
|
1142
1143
|
const deleted = await this.db.sql.execute(`DELETE FROM ${SCHEDULER_TASK_TABLE} WHERE ${conditions.join(" AND ")}`, params);
|
|
1143
|
-
|
|
1144
|
+
if (!deleted.success) {
|
|
1145
|
+
logger2.error("Failed to delete task definition", { taskId, errorCode: deleted.error.code, traceId: deleted.error.traceId });
|
|
1146
|
+
return deleted;
|
|
1147
|
+
}
|
|
1148
|
+
return ok(deleted.data.changes > 0);
|
|
1144
1149
|
}
|
|
1145
1150
|
const rows = await this.findAll({
|
|
1146
1151
|
where: "task_id = ?",
|
|
@@ -1148,6 +1153,7 @@ var SchedulerTaskRepository = class extends BaseReldbCrudRepository {
|
|
|
1148
1153
|
limit: 1
|
|
1149
1154
|
});
|
|
1150
1155
|
if (!rows.success) {
|
|
1156
|
+
logger2.error("Failed to load task definition for deletion", { taskId, errorCode: rows.error.code, traceId: rows.error.traceId });
|
|
1151
1157
|
return err(
|
|
1152
1158
|
HaiSchedulerError.DB_SAVE_FAILED,
|
|
1153
1159
|
schedulerM("scheduler_dbSaveFailed", {
|
|
@@ -1160,7 +1166,7 @@ var SchedulerTaskRepository = class extends BaseReldbCrudRepository {
|
|
|
1160
1166
|
return ok(false);
|
|
1161
1167
|
const deleteResult = await this.deleteById(rows.data[0].id);
|
|
1162
1168
|
if (!deleteResult.success) {
|
|
1163
|
-
logger2.error("Failed to delete task definition", { taskId, error: deleteResult.error.
|
|
1169
|
+
logger2.error("Failed to delete task definition", { taskId, errorCode: deleteResult.error.code, traceId: deleteResult.error.traceId });
|
|
1164
1170
|
return err(
|
|
1165
1171
|
HaiSchedulerError.DB_SAVE_FAILED,
|
|
1166
1172
|
schedulerM("scheduler_dbSaveFailed", {
|
|
@@ -1187,6 +1193,7 @@ var SchedulerTaskRepository = class extends BaseReldbCrudRepository {
|
|
|
1187
1193
|
try {
|
|
1188
1194
|
const rows = await this.findAll({ orderBy: "id ASC" });
|
|
1189
1195
|
if (!rows.success) {
|
|
1196
|
+
logger2.error("Failed to load task definitions", { errorCode: rows.error.code, traceId: rows.error.traceId });
|
|
1190
1197
|
return err(
|
|
1191
1198
|
HaiSchedulerError.DB_SAVE_FAILED,
|
|
1192
1199
|
schedulerM("scheduler_dbSaveFailed", {
|
|
@@ -1259,7 +1266,6 @@ function parseCronExpression(expression, timezone) {
|
|
|
1259
1266
|
}
|
|
1260
1267
|
|
|
1261
1268
|
// src/scheduler-functions.ts
|
|
1262
|
-
var logger3 = core.logger.child({ module: "scheduler", scope: "functions" });
|
|
1263
1269
|
var taskRegistry = /* @__PURE__ */ new Map();
|
|
1264
1270
|
var cronCache = /* @__PURE__ */ new Map();
|
|
1265
1271
|
var persistedTaskIds = /* @__PURE__ */ new Set();
|
|
@@ -1473,7 +1479,6 @@ async function registerTaskDefinition(task, taskRepo2) {
|
|
|
1473
1479
|
if (taskRepo2) {
|
|
1474
1480
|
const saveResult = await taskRepo2.saveTask(normalizedTask);
|
|
1475
1481
|
if (!saveResult.success) {
|
|
1476
|
-
logger3.warn("Failed to persist task definition", { taskId: task.id, error: saveResult.error.message });
|
|
1477
1482
|
return err(
|
|
1478
1483
|
HaiSchedulerError.DB_SAVE_FAILED,
|
|
1479
1484
|
schedulerM("scheduler_dbSaveFailed", {
|
|
@@ -1510,7 +1515,6 @@ async function unregisterTaskDefinition(taskId, taskRepo2, expected) {
|
|
|
1510
1515
|
if (taskRepo2) {
|
|
1511
1516
|
const deleteResult = await taskRepo2.deleteTask(taskId, expected);
|
|
1512
1517
|
if (!deleteResult.success) {
|
|
1513
|
-
logger3.warn("Failed to delete persisted task definition", { taskId, error: deleteResult.error.message });
|
|
1514
1518
|
return err(
|
|
1515
1519
|
HaiSchedulerError.DB_SAVE_FAILED,
|
|
1516
1520
|
schedulerM("scheduler_dbSaveFailed", {
|
|
@@ -1594,7 +1598,6 @@ async function updateTaskDefinition(taskId, updates, taskRepo2) {
|
|
|
1594
1598
|
if (taskRepo2) {
|
|
1595
1599
|
const updateResult = await taskRepo2.updateTask(taskId, normalizedUpdates);
|
|
1596
1600
|
if (!updateResult.success) {
|
|
1597
|
-
logger3.warn("Failed to update persisted task definition", { taskId, error: updateResult.error.message });
|
|
1598
1601
|
return err(
|
|
1599
1602
|
HaiSchedulerError.DB_SAVE_FAILED,
|
|
1600
1603
|
schedulerM("scheduler_dbSaveFailed", {
|
|
@@ -1796,7 +1799,7 @@ async function waitWithSignal(operation, signal) {
|
|
|
1796
1799
|
}
|
|
1797
1800
|
|
|
1798
1801
|
// src/scheduler-executor.ts
|
|
1799
|
-
var
|
|
1802
|
+
var logger3 = core.logger.child({ module: "scheduler", scope: "executor" });
|
|
1800
1803
|
function resolveTaskType(task, hooks) {
|
|
1801
1804
|
if (task.handler)
|
|
1802
1805
|
return task.handler.kind;
|
|
@@ -1819,7 +1822,7 @@ async function notifyTaskStart(hooks, event) {
|
|
|
1819
1822
|
try {
|
|
1820
1823
|
await waitWithSignal(() => hooks.onTaskStart(event), event.signal);
|
|
1821
1824
|
} catch (error) {
|
|
1822
|
-
|
|
1825
|
+
logger3.warn("Task start hook failed", { taskId: event.task.id, error });
|
|
1823
1826
|
}
|
|
1824
1827
|
}
|
|
1825
1828
|
async function notifyTaskInterrupted(hooks, event) {
|
|
@@ -1828,7 +1831,7 @@ async function notifyTaskInterrupted(hooks, event) {
|
|
|
1828
1831
|
try {
|
|
1829
1832
|
await waitWithSignal(() => hooks.onTaskInterrupted(event), event.signal);
|
|
1830
1833
|
} catch (error) {
|
|
1831
|
-
|
|
1834
|
+
logger3.warn("Task interrupted hook failed", { taskId: event.task.id, error });
|
|
1832
1835
|
}
|
|
1833
1836
|
}
|
|
1834
1837
|
async function notifyTaskFinish(hooks, event) {
|
|
@@ -1837,7 +1840,7 @@ async function notifyTaskFinish(hooks, event) {
|
|
|
1837
1840
|
try {
|
|
1838
1841
|
await waitWithSignal(() => hooks.onTaskFinish(event), event.signal);
|
|
1839
1842
|
} catch (error) {
|
|
1840
|
-
|
|
1843
|
+
logger3.warn("Task finish hook failed", { taskId: event.task.id, error });
|
|
1841
1844
|
}
|
|
1842
1845
|
}
|
|
1843
1846
|
function createExecutionLog(task, trigger, taskType, status, startedAt, finishedAt, result, error, occurrenceId) {
|
|
@@ -1896,7 +1899,7 @@ async function executeJsTask(task, context, signal = new AbortController().signa
|
|
|
1896
1899
|
return ok(result !== void 0 ? JSON.stringify(result) : null);
|
|
1897
1900
|
} catch (error) {
|
|
1898
1901
|
const message = error instanceof Error ? error.message : String(error);
|
|
1899
|
-
|
|
1902
|
+
logger3.error("JS task execution failed", { taskId: task.id, error: message });
|
|
1900
1903
|
return err(
|
|
1901
1904
|
HaiSchedulerError.JS_EXECUTION_FAILED,
|
|
1902
1905
|
schedulerM("scheduler_jsExecutionFailed", {
|
|
@@ -1967,7 +1970,7 @@ async function executeApiTask(task, context, signal = new AbortController().sign
|
|
|
1967
1970
|
}
|
|
1968
1971
|
}
|
|
1969
1972
|
if (!response.ok) {
|
|
1970
|
-
|
|
1973
|
+
logger3.error("API task returned non-OK status", {
|
|
1971
1974
|
taskId: context.taskId,
|
|
1972
1975
|
status: response.status,
|
|
1973
1976
|
url: core.sanitize.sanitizeUrl(url)
|
|
@@ -1982,7 +1985,7 @@ async function executeApiTask(task, context, signal = new AbortController().sign
|
|
|
1982
1985
|
return ok(responseText || null);
|
|
1983
1986
|
} catch (error) {
|
|
1984
1987
|
const message = error instanceof Error ? error.message : String(error);
|
|
1985
|
-
|
|
1988
|
+
logger3.error("API task execution failed", {
|
|
1986
1989
|
taskId: context.taskId,
|
|
1987
1990
|
error: message,
|
|
1988
1991
|
url: core.sanitize.sanitizeUrl(url)
|
|
@@ -2019,7 +2022,7 @@ async function executeHookTask(task, context, hooks, startedAt, signal) {
|
|
|
2019
2022
|
return ok(result !== void 0 ? JSON.stringify(result) : null);
|
|
2020
2023
|
} catch (error) {
|
|
2021
2024
|
const message = error instanceof Error ? error.message : String(error);
|
|
2022
|
-
|
|
2025
|
+
logger3.error("Task execute hook failed", { taskId: task.id, error: message });
|
|
2023
2026
|
return err(
|
|
2024
2027
|
HaiSchedulerError.HOOK_EXECUTION_FAILED,
|
|
2025
2028
|
schedulerM("scheduler_hookExecutionFailed", {
|
|
@@ -2095,7 +2098,7 @@ async function executeTask(task, trigger, hooks, signal = new AbortController().
|
|
|
2095
2098
|
}
|
|
2096
2099
|
|
|
2097
2100
|
// src/scheduler-runner.ts
|
|
2098
|
-
var
|
|
2101
|
+
var logger4 = core.logger.child({ module: "scheduler", scope: "runner" });
|
|
2099
2102
|
var runningTasks = /* @__PURE__ */ new Set();
|
|
2100
2103
|
var activeRuns = /* @__PURE__ */ new Map();
|
|
2101
2104
|
var activeRepairs = /* @__PURE__ */ new Set();
|
|
@@ -2172,7 +2175,7 @@ async function projectExecutionLogs(id) {
|
|
|
2172
2175
|
return err(HaiSchedulerError.LOG_PERSIST_FAILED, schedulerM("scheduler_logPersistFailed"));
|
|
2173
2176
|
const cleanup = await logs.cleanupLogs(cleanupPolicy);
|
|
2174
2177
|
if (!cleanup.success)
|
|
2175
|
-
|
|
2178
|
+
logger4.warn("Execution logs persisted but retention cleanup failed", { occurrenceId: id, errorCode: cleanup.error.code });
|
|
2176
2179
|
return ok(void 0);
|
|
2177
2180
|
} catch {
|
|
2178
2181
|
return err(HaiSchedulerError.LOG_PERSIST_FAILED, schedulerM("scheduler_logPersistFailed"));
|
|
@@ -2253,7 +2256,7 @@ async function tick() {
|
|
|
2253
2256
|
return;
|
|
2254
2257
|
continue;
|
|
2255
2258
|
}
|
|
2256
|
-
void runTask(task, trigger.minute, trigger, void 0, row).catch((error) =>
|
|
2259
|
+
void runTask(task, trigger.minute, trigger, void 0, row).catch((error) => logger4.warn("Execution recovery failed", { taskId: task.id, error }));
|
|
2257
2260
|
}
|
|
2258
2261
|
}
|
|
2259
2262
|
}
|
|
@@ -2275,7 +2278,7 @@ function scheduleDueTasks(databaseNow) {
|
|
|
2275
2278
|
continue;
|
|
2276
2279
|
if (!getCron(taskId)?.match(new Date(currentMinute * 6e4)))
|
|
2277
2280
|
continue;
|
|
2278
|
-
void runTask(task, currentMinute, { type: "scheduled", source: null }).catch((error) =>
|
|
2281
|
+
void runTask(task, currentMinute, { type: "scheduled", source: null }).catch((error) => logger4.error("Unhandled task execution error", { taskId, error }));
|
|
2279
2282
|
}
|
|
2280
2283
|
}
|
|
2281
2284
|
function runTask(task, minuteTimestamp, trigger = { type: "manual", source: null }, options, recovery) {
|
|
@@ -2479,7 +2482,7 @@ async function runTaskExecution(task, minute, trigger, controller, options, reco
|
|
|
2479
2482
|
}
|
|
2480
2483
|
};
|
|
2481
2484
|
if (!projected.success)
|
|
2482
|
-
|
|
2485
|
+
logger4.warn("Execution completed with pending log persistence", { taskId: task.id, occurrenceId, errorCode: projected.error.code });
|
|
2483
2486
|
if (task.deleteAfterRun && log.status === "success") {
|
|
2484
2487
|
const refreshed = await loadPersistedTasks(repository);
|
|
2485
2488
|
if (refreshed.success && isDeepStrictEqual(getTask(task.id), task))
|
|
@@ -2504,7 +2507,7 @@ function stopTimer() {
|
|
|
2504
2507
|
}
|
|
2505
2508
|
|
|
2506
2509
|
// src/scheduler-main.ts
|
|
2507
|
-
var
|
|
2510
|
+
var logger5 = core.logger.child({ module: "scheduler", scope: "main" });
|
|
2508
2511
|
var currentConfig = null;
|
|
2509
2512
|
var initInProgress = false;
|
|
2510
2513
|
var closeInProgress = null;
|
|
@@ -2522,7 +2525,7 @@ var notInitialized = core.module.createNotInitializedKit(
|
|
|
2522
2525
|
);
|
|
2523
2526
|
async function initDatabase(parsed) {
|
|
2524
2527
|
if (!reldb.isInitialized) {
|
|
2525
|
-
|
|
2528
|
+
logger5.error("enableDb is true but @h-ai/reldb is not initialized");
|
|
2526
2529
|
throw new Error(schedulerM("scheduler_reldbNotInitialized"));
|
|
2527
2530
|
}
|
|
2528
2531
|
const migration = await migrateScheduler();
|
|
@@ -2541,7 +2544,7 @@ async function initDatabase(parsed) {
|
|
|
2541
2544
|
});
|
|
2542
2545
|
const nodeId = parsed.nodeId ?? crypto.randomUUID();
|
|
2543
2546
|
configureExecution(executionRepo, nodeId, parsed.leaseMs);
|
|
2544
|
-
|
|
2547
|
+
logger5.info("Shared execution repository configured", { nodeId, leaseMs: parsed.leaseMs });
|
|
2545
2548
|
return { ...parsed, nodeId };
|
|
2546
2549
|
}
|
|
2547
2550
|
function normalizeTriggerInput(options) {
|
|
@@ -2596,7 +2599,7 @@ var scheduler = {
|
|
|
2596
2599
|
},
|
|
2597
2600
|
async init(config) {
|
|
2598
2601
|
if (initInProgress) {
|
|
2599
|
-
|
|
2602
|
+
logger5.warn("Scheduler init already in progress, skipping concurrent call");
|
|
2600
2603
|
return err(
|
|
2601
2604
|
HaiSchedulerError.INIT_FAILED,
|
|
2602
2605
|
schedulerM("scheduler_initFailed", {
|
|
@@ -2609,14 +2612,14 @@ var scheduler = {
|
|
|
2609
2612
|
if (closeInProgress)
|
|
2610
2613
|
await closeInProgress;
|
|
2611
2614
|
if (currentConfig) {
|
|
2612
|
-
|
|
2615
|
+
logger5.warn("Scheduler module is already initialized, reinitializing");
|
|
2613
2616
|
await scheduler.close();
|
|
2614
2617
|
}
|
|
2615
|
-
|
|
2618
|
+
logger5.info("Initializing scheduler module");
|
|
2616
2619
|
const { tasks = [], hooks = {}, ...configOptions } = config ?? {};
|
|
2617
2620
|
const parseResult = SchedulerConfigSchema.safeParse(configOptions);
|
|
2618
2621
|
if (!parseResult.success) {
|
|
2619
|
-
|
|
2622
|
+
logger5.error("Scheduler config validation failed", { error: parseResult.error.message });
|
|
2620
2623
|
return err(
|
|
2621
2624
|
HaiSchedulerError.CONFIG_ERROR,
|
|
2622
2625
|
schedulerM("scheduler_configError", {
|
|
@@ -2638,10 +2641,10 @@ var scheduler = {
|
|
|
2638
2641
|
await scheduler.close();
|
|
2639
2642
|
return configResult;
|
|
2640
2643
|
}
|
|
2641
|
-
|
|
2644
|
+
logger5.info("Scheduler module initialized", { enableDb: currentConfig.enableDb, taskCount: getTaskRegistry().size });
|
|
2642
2645
|
return ok(void 0);
|
|
2643
2646
|
} catch (error) {
|
|
2644
|
-
|
|
2647
|
+
logger5.error("Scheduler initialization failed", { error });
|
|
2645
2648
|
await scheduler.close();
|
|
2646
2649
|
return err(
|
|
2647
2650
|
HaiSchedulerError.INIT_FAILED,
|
|
@@ -2668,7 +2671,7 @@ var scheduler = {
|
|
|
2668
2671
|
return notInitialized.result();
|
|
2669
2672
|
const registerResult = await registerTask(task, taskRepo);
|
|
2670
2673
|
if (registerResult.success) {
|
|
2671
|
-
|
|
2674
|
+
logger5.info("Task registered", { taskId: task.id, taskName: task.name, cron: task.cron });
|
|
2672
2675
|
}
|
|
2673
2676
|
return registerResult;
|
|
2674
2677
|
},
|
|
@@ -2677,7 +2680,7 @@ var scheduler = {
|
|
|
2677
2680
|
return notInitialized.result();
|
|
2678
2681
|
const unregisterResult = await unregisterTask(taskId, taskRepo);
|
|
2679
2682
|
if (unregisterResult.success)
|
|
2680
|
-
|
|
2683
|
+
logger5.info("Task unregistered", { taskId });
|
|
2681
2684
|
return unregisterResult;
|
|
2682
2685
|
},
|
|
2683
2686
|
async updateTask(taskId, updates) {
|
|
@@ -2685,7 +2688,7 @@ var scheduler = {
|
|
|
2685
2688
|
return notInitialized.result();
|
|
2686
2689
|
const updateResult = await updateRegisteredTask(taskId, updates, taskRepo);
|
|
2687
2690
|
if (updateResult.success) {
|
|
2688
|
-
|
|
2691
|
+
logger5.info("Task updated", {
|
|
2689
2692
|
taskId,
|
|
2690
2693
|
updates: Object.keys(updates)
|
|
2691
2694
|
});
|
|
@@ -2702,7 +2705,7 @@ var scheduler = {
|
|
|
2702
2705
|
);
|
|
2703
2706
|
}
|
|
2704
2707
|
startTimer(currentConfig.tickInterval);
|
|
2705
|
-
|
|
2708
|
+
logger5.info("Scheduler started", { tickInterval: currentConfig.tickInterval });
|
|
2706
2709
|
return ok(void 0);
|
|
2707
2710
|
},
|
|
2708
2711
|
stop() {
|
|
@@ -2715,7 +2718,7 @@ var scheduler = {
|
|
|
2715
2718
|
);
|
|
2716
2719
|
}
|
|
2717
2720
|
stopTimer();
|
|
2718
|
-
|
|
2721
|
+
logger5.info("Scheduler stopped");
|
|
2719
2722
|
return ok(void 0);
|
|
2720
2723
|
},
|
|
2721
2724
|
async trigger(taskId, options) {
|
|
@@ -2777,7 +2780,7 @@ var scheduler = {
|
|
|
2777
2780
|
async close() {
|
|
2778
2781
|
if (closeInProgress)
|
|
2779
2782
|
return closeInProgress;
|
|
2780
|
-
|
|
2783
|
+
logger5.info("Closing scheduler module");
|
|
2781
2784
|
currentConfig = null;
|
|
2782
2785
|
stopTimer();
|
|
2783
2786
|
cancelTaskDefinitionReads();
|
|
@@ -2792,7 +2795,7 @@ var scheduler = {
|
|
|
2792
2795
|
taskRepo = null;
|
|
2793
2796
|
logRepo = null;
|
|
2794
2797
|
executionRepo = null;
|
|
2795
|
-
|
|
2798
|
+
logger5.info("Scheduler module closed");
|
|
2796
2799
|
})();
|
|
2797
2800
|
try {
|
|
2798
2801
|
await closeInProgress;
|