@h-ai/scheduler 0.1.0-alpha.73 → 0.1.0-alpha.75
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 +2 -0
- package/README.ja.md +2 -0
- package/README.md +2 -0
- package/dist/index.js +66 -30
- package/dist/index.js.map +1 -1
- package/package.json +3 -3
package/README.en.md
CHANGED
|
@@ -256,6 +256,8 @@ When a scheduled task sends Reach notifications, a scheduler lock or task comple
|
|
|
256
256
|
|
|
257
257
|
## Legacy database upgrades
|
|
258
258
|
|
|
259
|
+
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.
|
|
260
|
+
|
|
259
261
|
After RelDB init, `migrateScheduler({ dryRun: true })` previews changes; scheduler.init applies supported migrations before repositories. Existing tasks retain data with idempotent=false. Legacy logs are archived as hai_scheduler_logs_alpha65 and copied with stable legacy:<id> keys, preserving complete snapshots without re-executing tasks or duplicating history after interruption. SQLite/PostgreSQL roll back transactions; MySQL resumes from actual structure with old writers stopped. Back up first and restore matching database/binaries for rollback.
|
|
260
262
|
|
|
261
263
|
## Development and testing
|
package/README.ja.md
CHANGED
|
@@ -256,6 +256,8 @@ Reach 通知を実行するタスクでは、調度ロックやタスク完了
|
|
|
256
256
|
|
|
257
257
|
## 旧データベースの更新
|
|
258
258
|
|
|
259
|
+
定義の更新読込、登録、変更、削除は、変更に必要な読込と保存を含めプロセス内で受付順に調整します。正当な並行登録はスナップショットの交錯だけでは失敗せず、実際の DB 障害は失敗として返します。close は入口と runner を停止し、読取待機と未着手の書込を中止して、開始済みの永続書込を待ってから状態を解放します。遅延スナップショットは反映しません。業務コールバックはこのキューを占有しません。ノード間の整合性は引き続き共有 DB、バージョンとリースで保証し、この調整を分散ロックの代替にしません。
|
|
260
|
+
|
|
259
261
|
RelDB 初期化後に `migrateScheduler({ dryRun: true })` で確認し、scheduler.init がリポジトリー前に対応する移行を実行します。旧タスクを保持し idempotent=false を追加します。旧ログを hai_scheduler_logs_alpha65 に保存し、安定した legacy:<id> で完全なスナップショットを冪等コピーします。中断後も履歴を重複せず旧タスクを実行しません。SQLite/PostgreSQL はロールバック、MySQL は旧書込停止下で実構造から再開します。事前バックアップと互換 DB/コードによる復旧が必要です。
|
|
260
262
|
|
|
261
263
|
## 開発とテスト
|
package/README.md
CHANGED
|
@@ -256,6 +256,8 @@ API 任务的 `timeout`(默认 30000 毫秒)覆盖请求和完整响应体
|
|
|
256
256
|
|
|
257
257
|
## 旧库升级
|
|
258
258
|
|
|
259
|
+
任务定义的刷新、注册、更新和删除在同一进程内按接收顺序协调,包含写操作所需的刷新与提交。合法并发注册不会仅因快照交错而失败;真实数据库故障仍返回失败。close 先停止入口和 runner,取消只读等待和尚未开始写入的操作,再等待已开始的持久写入;迟到快照不发布,避免关闭后旧操作重新填充任务表。执行回调不占用这条队列;跨节点仍依靠共享数据库、版本与租约,不把进程内协调当分布式锁。
|
|
260
|
+
|
|
259
261
|
RelDB 初始化后调用 `migrateScheduler({ dryRun: true })` 查看变化,scheduler.init 在创建仓库前执行支持的版本迁移。旧任务保留,补 idempotent=false;旧日志表归档为 hai_scheduler_logs_alpha65,按稳定 legacy:<id> 幂等复制完整快照,超过一批和中断重试不重复历史,也不执行旧任务。SQLite/PostgreSQL 事务回滚;MySQL 按真实结构继续,需保持旧写入停止。升级前备份,回退恢复匹配数据库与代码,执行账本与旧历史不混为同一发生记录。
|
|
260
262
|
|
|
261
263
|
## 开发测试
|
package/dist/index.js
CHANGED
|
@@ -850,7 +850,20 @@ var taskRegistry = /* @__PURE__ */ new Map();
|
|
|
850
850
|
var cronCache = /* @__PURE__ */ new Map();
|
|
851
851
|
var persistedTaskIds = /* @__PURE__ */ new Set();
|
|
852
852
|
var definitionEpoch = 0;
|
|
853
|
-
var
|
|
853
|
+
var definitionTail = Promise.resolve();
|
|
854
|
+
var definitionLifetime = new AbortController();
|
|
855
|
+
function withTaskDefinitions(operation) {
|
|
856
|
+
const signal = definitionLifetime.signal;
|
|
857
|
+
const result = definitionTail.then(() => signal.aborted ? err(HaiSchedulerError.EXECUTION_FAILED, schedulerM("scheduler_closing")) : operation(signal));
|
|
858
|
+
definitionTail = result.then(() => void 0, () => void 0);
|
|
859
|
+
return result;
|
|
860
|
+
}
|
|
861
|
+
async function drainTaskDefinitions() {
|
|
862
|
+
await definitionTail;
|
|
863
|
+
}
|
|
864
|
+
function cancelTaskDefinitionReads() {
|
|
865
|
+
definitionLifetime.abort();
|
|
866
|
+
}
|
|
854
867
|
var currentHooks = {};
|
|
855
868
|
function getTaskRegistry() {
|
|
856
869
|
return taskRegistry;
|
|
@@ -888,8 +901,8 @@ function getHooks() {
|
|
|
888
901
|
return currentHooks;
|
|
889
902
|
}
|
|
890
903
|
function resetTaskState() {
|
|
904
|
+
definitionLifetime = new AbortController();
|
|
891
905
|
definitionEpoch++;
|
|
892
|
-
activeRefresh = void 0;
|
|
893
906
|
persistedTaskIds.clear();
|
|
894
907
|
taskRegistry.clear();
|
|
895
908
|
cronCache.clear();
|
|
@@ -923,24 +936,33 @@ function validateRetryPolicy(taskId, retry) {
|
|
|
923
936
|
});
|
|
924
937
|
}
|
|
925
938
|
async function loadPersistedTasks(taskRepo2) {
|
|
939
|
+
return withTaskDefinitions((signal) => refreshTaskDefinitions(taskRepo2, signal));
|
|
940
|
+
}
|
|
941
|
+
async function refreshTaskDefinitions(taskRepo2, signal) {
|
|
926
942
|
if (!taskRepo2)
|
|
927
943
|
return ok(void 0);
|
|
928
944
|
const epoch = definitionEpoch;
|
|
929
|
-
|
|
930
|
-
|
|
931
|
-
|
|
932
|
-
|
|
945
|
+
return refreshPersistedTasks(taskRepo2, epoch, signal);
|
|
946
|
+
}
|
|
947
|
+
async function refreshPersistedTasks(taskRepo2, epoch, signal) {
|
|
948
|
+
let cancel = () => {
|
|
949
|
+
};
|
|
950
|
+
const cancelled = new Promise((resolve) => {
|
|
951
|
+
cancel = () => resolve(err(HaiSchedulerError.EXECUTION_FAILED, schedulerM("scheduler_closing")));
|
|
952
|
+
signal.addEventListener("abort", cancel, { once: true });
|
|
953
|
+
if (signal.aborted)
|
|
954
|
+
cancel();
|
|
955
|
+
});
|
|
956
|
+
let loadResult;
|
|
933
957
|
try {
|
|
934
|
-
|
|
958
|
+
loadResult = await Promise.race([taskRepo2.loadTasks(), cancelled]);
|
|
935
959
|
} finally {
|
|
936
|
-
|
|
937
|
-
activeRefresh = void 0;
|
|
960
|
+
signal.removeEventListener("abort", cancel);
|
|
938
961
|
}
|
|
939
|
-
}
|
|
940
|
-
async function refreshPersistedTasks(taskRepo2, epoch) {
|
|
941
|
-
const loadResult = await taskRepo2.loadTasks();
|
|
942
962
|
if (!loadResult.success)
|
|
943
963
|
return loadResult;
|
|
964
|
+
if (signal.aborted)
|
|
965
|
+
return err(HaiSchedulerError.EXECUTION_FAILED, schedulerM("scheduler_closing"));
|
|
944
966
|
if (epoch !== definitionEpoch)
|
|
945
967
|
return err(HaiSchedulerError.EXECUTION_FAILED, schedulerM("scheduler_definitionsChanged"));
|
|
946
968
|
const nextTasks = new Map([...taskRegistry].filter(([id]) => !persistedTaskIds.has(id)));
|
|
@@ -977,6 +999,16 @@ async function loadConfigTasks(tasks) {
|
|
|
977
999
|
return ok(void 0);
|
|
978
1000
|
}
|
|
979
1001
|
async function registerTask(task, taskRepo2) {
|
|
1002
|
+
return withTaskDefinitions(async (signal) => {
|
|
1003
|
+
const refreshed = await refreshTaskDefinitions(taskRepo2 ?? null, signal);
|
|
1004
|
+
if (!refreshed.success)
|
|
1005
|
+
return refreshed;
|
|
1006
|
+
if (signal.aborted)
|
|
1007
|
+
return err(HaiSchedulerError.EXECUTION_FAILED, schedulerM("scheduler_closing"));
|
|
1008
|
+
return registerTaskDefinition(task, taskRepo2);
|
|
1009
|
+
});
|
|
1010
|
+
}
|
|
1011
|
+
async function registerTaskDefinition(task, taskRepo2) {
|
|
980
1012
|
if (task.handler && !TaskHandlerConfigSchema.safeParse(task.handler).success || task.idempotent !== void 0 && typeof task.idempotent !== "boolean") {
|
|
981
1013
|
return err(HaiSchedulerError.CONFIG_ERROR, schedulerM("scheduler_invalidHandlerConfig", { params: { taskId: task.id } }));
|
|
982
1014
|
}
|
|
@@ -1025,6 +1057,16 @@ async function registerTask(task, taskRepo2) {
|
|
|
1025
1057
|
return ok(void 0);
|
|
1026
1058
|
}
|
|
1027
1059
|
async function unregisterTask(taskId, taskRepo2, expected) {
|
|
1060
|
+
return withTaskDefinitions(async (signal) => {
|
|
1061
|
+
const refreshed = await refreshTaskDefinitions(taskRepo2 ?? null, signal);
|
|
1062
|
+
if (!refreshed.success)
|
|
1063
|
+
return refreshed;
|
|
1064
|
+
if (signal.aborted)
|
|
1065
|
+
return err(HaiSchedulerError.EXECUTION_FAILED, schedulerM("scheduler_closing"));
|
|
1066
|
+
return unregisterTaskDefinition(taskId, taskRepo2, expected);
|
|
1067
|
+
});
|
|
1068
|
+
}
|
|
1069
|
+
async function unregisterTaskDefinition(taskId, taskRepo2, expected) {
|
|
1028
1070
|
if (!hasTask(taskId)) {
|
|
1029
1071
|
return err(
|
|
1030
1072
|
HaiSchedulerError.TASK_NOT_FOUND,
|
|
@@ -1050,6 +1092,16 @@ async function unregisterTask(taskId, taskRepo2, expected) {
|
|
|
1050
1092
|
return ok(void 0);
|
|
1051
1093
|
}
|
|
1052
1094
|
async function updateRegisteredTask(taskId, updates, taskRepo2) {
|
|
1095
|
+
return withTaskDefinitions(async (signal) => {
|
|
1096
|
+
const refreshed = await refreshTaskDefinitions(taskRepo2 ?? null, signal);
|
|
1097
|
+
if (!refreshed.success)
|
|
1098
|
+
return refreshed;
|
|
1099
|
+
if (signal.aborted)
|
|
1100
|
+
return err(HaiSchedulerError.EXECUTION_FAILED, schedulerM("scheduler_closing"));
|
|
1101
|
+
return updateTaskDefinition(taskId, updates, taskRepo2);
|
|
1102
|
+
});
|
|
1103
|
+
}
|
|
1104
|
+
async function updateTaskDefinition(taskId, updates, taskRepo2) {
|
|
1053
1105
|
const existingTask = getTask(taskId);
|
|
1054
1106
|
if (!existingTask) {
|
|
1055
1107
|
return err(
|
|
@@ -2015,12 +2067,6 @@ var scheduler = {
|
|
|
2015
2067
|
async register(task) {
|
|
2016
2068
|
if (!currentConfig)
|
|
2017
2069
|
return notInitialized.result();
|
|
2018
|
-
const config = currentConfig;
|
|
2019
|
-
const refreshed = await loadPersistedTasks(taskRepo);
|
|
2020
|
-
if (!refreshed.success)
|
|
2021
|
-
return refreshed;
|
|
2022
|
-
if (currentConfig !== config)
|
|
2023
|
-
return notInitialized.result();
|
|
2024
2070
|
const registerResult = await registerTask(task, taskRepo);
|
|
2025
2071
|
if (registerResult.success) {
|
|
2026
2072
|
logger6.info("Task registered", { taskId: task.id, taskName: task.name, cron: task.cron });
|
|
@@ -2030,12 +2076,6 @@ var scheduler = {
|
|
|
2030
2076
|
async unregister(taskId) {
|
|
2031
2077
|
if (!currentConfig)
|
|
2032
2078
|
return notInitialized.result();
|
|
2033
|
-
const config = currentConfig;
|
|
2034
|
-
const refreshed = await loadPersistedTasks(taskRepo);
|
|
2035
|
-
if (!refreshed.success)
|
|
2036
|
-
return refreshed;
|
|
2037
|
-
if (currentConfig !== config)
|
|
2038
|
-
return notInitialized.result();
|
|
2039
2079
|
const unregisterResult = await unregisterTask(taskId, taskRepo);
|
|
2040
2080
|
if (unregisterResult.success)
|
|
2041
2081
|
logger6.info("Task unregistered", { taskId });
|
|
@@ -2044,12 +2084,6 @@ var scheduler = {
|
|
|
2044
2084
|
async updateTask(taskId, updates) {
|
|
2045
2085
|
if (!currentConfig)
|
|
2046
2086
|
return notInitialized.result();
|
|
2047
|
-
const config = currentConfig;
|
|
2048
|
-
const refreshed = await loadPersistedTasks(taskRepo);
|
|
2049
|
-
if (!refreshed.success)
|
|
2050
|
-
return refreshed;
|
|
2051
|
-
if (currentConfig !== config)
|
|
2052
|
-
return notInitialized.result();
|
|
2053
2087
|
const updateResult = await updateRegisteredTask(taskId, updates, taskRepo);
|
|
2054
2088
|
if (updateResult.success)
|
|
2055
2089
|
logger6.info("Task updated", { taskId, updates: Object.keys(updates) });
|
|
@@ -2141,8 +2175,10 @@ var scheduler = {
|
|
|
2141
2175
|
logger6.info("Closing scheduler module");
|
|
2142
2176
|
currentConfig = null;
|
|
2143
2177
|
stopTimer();
|
|
2178
|
+
cancelTaskDefinitionReads();
|
|
2144
2179
|
closeInProgress = (async () => {
|
|
2145
2180
|
await drainRunner();
|
|
2181
|
+
await drainTaskDefinitions();
|
|
2146
2182
|
clearJsTaskHandlerCache();
|
|
2147
2183
|
resetTaskState();
|
|
2148
2184
|
resetRunner();
|