@h-ai/scheduler 0.1.0-alpha.55 → 0.1.0-alpha.57

package/dist/index.js

@@ -2,10 +2,11 @@ import { z } from 'zod';
 import { cache } from '@h-ai/cache';
 import { core, ok, err } from '@h-ai/core';
 import { reldb, BaseReldbCrudRepository } from '@h-ai/reldb';
-import { createHash } from 'crypto';
+import { randomUUID, createHash } from 'crypto';
 import { Script } from 'vm';
 import { Worker } from 'worker_threads';
 import { Cron } from 'croner';
+import { isDeepStrictEqual } from 'util';
 
 // src/scheduler-config.ts
 var SchedulerConfigSchema = z.object({
@@ -133,8 +134,8 @@ var SchedulerLogRepository = class extends BaseReldbCrudRepository {
         { fieldName: "status", columnName: "status", def: { type: "TEXT", notNull: true }, select: true, create: true, update: false },
         { fieldName: "result", columnName: "result", def: { type: "TEXT" }, select: true, create: true, update: false },
         { fieldName: "error", columnName: "error", def: { type: "TEXT" }, select: true, create: true, update: false },
-        { fieldName: "startedAt", columnName: "started_at", def: { type: "INTEGER", notNull: true }, select: true, create: true, update: false },
-        { fieldName: "finishedAt", columnName: "finished_at", def: { type: "INTEGER", notNull: true }, select: true, create: true, update: false },
+        { fieldName: "startedAt", columnName: "started_at", def: { type: "BIGINT", notNull: true }, select: true, create: true, update: false },
+        { fieldName: "finishedAt", columnName: "finished_at", def: { type: "BIGINT", notNull: true }, select: true, create: true, update: false },
         { fieldName: "duration", columnName: "duration", def: { type: "INTEGER", notNull: true }, select: true, create: true, update: false }
       ]
     });
@@ -215,8 +216,8 @@ var SchedulerLogRepository = class extends BaseReldbCrudRepository {
           status: row.status,
           result: row.result ?? null,
           error: row.error ?? null,
-          startedAt: row.startedAt,
-          finishedAt: row.finishedAt,
+          startedAt: Number(row.startedAt),
+          finishedAt: Number(row.finishedAt),
           duration: row.duration
         }))
       });
@@ -417,8 +418,29 @@ var SchedulerTaskRepository = class extends BaseReldbCrudRepository {
       );
     }
   }
-  async deleteTask(taskId) {
+  /** 删除任务；自动清理携带执行定义，在同一条 DELETE 内原子比较，保留并发编辑。 */
+  async deleteTask(taskId, expected) {
     try {
+      if (expected) {
+        const conditions = ["task_id = ?", "task_name = ?", "cron = ?", "COALESCE(timezone, '') = ?", "COALESCE(description, '') = ?", "enabled = ?", "delete_after_run = ?"];
+        const postgres = this.db.config?.type === "postgresql";
+        const enabled = expected.enabled !== false;
+        const deleteAfterRun = expected.deleteAfterRun === true;
+        const params = [taskId, expected.name, expected.cron, expected.timezone ?? "", expected.description ?? "", postgres ? enabled : Number(enabled), postgres ? deleteAfterRun : Number(deleteAfterRun)];
+        const jsonValue = this.db.config?.type === "mysql" ? "CAST(? AS JSON)" : this.db.config?.type === "postgresql" ? "CAST(? AS JSONB)" : "?";
+        const jsonFields = [["retry", expected.retry], ["params", expected.params ?? {}], ["handler", expected.handler]];
+        for (const [column, value] of jsonFields) {
+          if (value === void 0 || value === null) {
+            conditions.push(`(${column} IS NULL OR ${column} = ${jsonValue})`);
+            params.push("null");
+          } else {
+            conditions.push(`${column} = ${jsonValue}`);
+            params.push(JSON.stringify(value));
+          }
+        }
+        const deleted = await this.db.sql.execute(`DELETE FROM ${SCHEDULER_TASK_TABLE} WHERE ${conditions.join(" AND ")}`, params);
+        return deleted.success ? ok(deleted.data.changes > 0) : deleted;
+      }
       const rows = await this.findAll({ where: "task_id = ?", params: [taskId], limit: 1 });
       if (!rows.success) {
         return err(
@@ -428,7 +450,7 @@ var SchedulerTaskRepository = class extends BaseReldbCrudRepository {
         );
       }
       if (rows.data.length === 0)
-        return ok(void 0);
+        return ok(false);
       const deleteResult = await this.deleteById(rows.data[0].id);
       if (!deleteResult.success) {
         logger2.error("Failed to delete task definition", { taskId, error: deleteResult.error.message });
@@ -438,7 +460,7 @@ var SchedulerTaskRepository = class extends BaseReldbCrudRepository {
           deleteResult.error
         );
       }
-      return ok(void 0);
+      return ok(deleteResult.data.changes > 0);
     } catch (error) {
       logger2.error("Failed to delete task definition", { taskId, error });
       return err(
@@ -598,8 +620,9 @@ function resolveTaskType(task, hooks) {
     return "hook";
   return "hook";
 }
-function createTaskContext(task, trigger) {
+function createTaskContext(task, trigger, occurrenceId) {
   return {
+    ...occurrenceId ? { occurrenceId } : {},
     task,
     taskId: task.id,
     params: task.params ?? {},
@@ -803,10 +826,10 @@ async function executeHookTask(task, context, hooks, startedAt, signal) {
     );
   }
 }
-async function executeTask(task, trigger, hooks, signal = new AbortController().signal) {
+async function executeTask(task, trigger, hooks, signal = new AbortController().signal, occurrenceId) {
   const startedAt = Date.now();
   const taskType = resolveTaskType(task, hooks);
-  const context = createTaskContext(task, trigger);
+  const context = createTaskContext(task, trigger, occurrenceId);
   await notifyTaskStart(hooks, { task, trigger, startedAt, signal });
   let executionResult;
   let shouldNotifyInterrupted = false;
@@ -815,7 +838,7 @@ async function executeTask(task, trigger, hooks, signal = new AbortController().
     shouldNotifyInterrupted = true;
   } else if (!task.handler) {
     executionResult = await executeHookTask(task, context, hooks, startedAt, signal);
-    shouldNotifyInterrupted = !executionResult.success;
+    shouldNotifyInterrupted = !hooks.onTaskExecute || !executionResult.success && executionResult.error.cause instanceof Error && executionResult.error.cause.name === "SchedulerTaskSkippedError";
   } else if (task.handler.kind === "api") {
     executionResult = await executeApiTask(task, context, signal);
   } else {
@@ -866,6 +889,7 @@ var taskRegistry = /* @__PURE__ */ new Map();
 var cronCache = /* @__PURE__ */ new Map();
 var persistedTaskIds = /* @__PURE__ */ new Set();
 var definitionEpoch = 0;
+var activeRefresh;
 var currentHooks = {};
 function getTaskRegistry() {
   return taskRegistry;
@@ -904,6 +928,7 @@ function getHooks() {
 }
 function resetTaskState() {
   definitionEpoch++;
+  activeRefresh = void 0;
   persistedTaskIds.clear();
   taskRegistry.clear();
   cronCache.clear();
@@ -940,6 +965,18 @@ async function loadPersistedTasks(taskRepo2) {
   if (!taskRepo2)
     return ok(void 0);
   const epoch = definitionEpoch;
+  if (activeRefresh?.repository === taskRepo2 && activeRefresh.epoch === epoch)
+    return activeRefresh.promise;
+  const refresh = { repository: taskRepo2, epoch, promise: refreshPersistedTasks(taskRepo2, epoch) };
+  activeRefresh = refresh;
+  try {
+    return await refresh.promise;
+  } finally {
+    if (activeRefresh === refresh)
+      activeRefresh = void 0;
+  }
+}
+async function refreshPersistedTasks(taskRepo2, epoch) {
   const loadResult = await taskRepo2.loadTasks();
   if (!loadResult.success)
     return loadResult;
@@ -1006,14 +1043,10 @@ async function registerTask(task, taskRepo2) {
     retry: retryResult.data,
     params: task.params ?? {}
   };
-  setTask(task.id, normalizedTask);
-  setCron(task.id, cronResult.data);
   if (taskRepo2) {
     const saveResult = await taskRepo2.saveTask(normalizedTask);
     if (!saveResult.success) {
-      logger4.warn("Failed to persist task definition, rolling back in-memory registration", { taskId: task.id, error: saveResult.error.message });
-      deleteTask(task.id);
-      deleteCron(task.id);
+      logger4.warn("Failed to persist task definition", { taskId: task.id, error: saveResult.error.message });
       return err(
         HaiSchedulerError.DB_SAVE_FAILED,
         schedulerM("scheduler_dbSaveFailed", { params: { error: saveResult.error.message } }),
@@ -1022,19 +1055,19 @@ async function registerTask(task, taskRepo2) {
     }
     persistedTaskIds.add(task.id);
   }
+  setTask(task.id, normalizedTask);
+  setCron(task.id, cronResult.data);
   return ok(void 0);
 }
-async function unregisterTask(taskId, taskRepo2) {
+async function unregisterTask(taskId, taskRepo2, expected) {
   if (!hasTask(taskId)) {
     return err(
       HaiSchedulerError.TASK_NOT_FOUND,
       schedulerM("scheduler_taskNotFound", { params: { taskId } })
     );
   }
-  deleteTask(taskId);
-  deleteCron(taskId);
   if (taskRepo2) {
-    const deleteResult = await taskRepo2.deleteTask(taskId);
+    const deleteResult = await taskRepo2.deleteTask(taskId, expected);
     if (!deleteResult.success) {
       logger4.warn("Failed to delete persisted task definition", { taskId, error: deleteResult.error.message });
       return err(
@@ -1043,7 +1076,12 @@ async function unregisterTask(taskId, taskRepo2) {
         deleteResult.error
       );
     }
+    if (expected && !deleteResult.data)
+      return ok(void 0);
   }
+  deleteTask(taskId);
+  deleteCron(taskId);
+  persistedTaskIds.delete(taskId);
   return ok(void 0);
 }
 async function updateRegisteredTask(taskId, updates, taskRepo2) {
@@ -1054,14 +1092,14 @@ async function updateRegisteredTask(taskId, updates, taskRepo2) {
       schedulerM("scheduler_taskNotFound", { params: { taskId } })
     );
   }
-  const existingCron = getCron(taskId);
+  let updatedCron = getCron(taskId);
   if (updates.cron !== void 0 || updates.timezone !== void 0) {
     const cronExpression = updates.cron ?? existingTask.cron;
     const timezone = updates.timezone === null ? void 0 : updates.timezone ?? existingTask.timezone;
     const cronResult = parseCronExpression(cronExpression, timezone);
     if (!cronResult.success)
       return cronResult;
-    setCron(taskId, cronResult.data);
+    updatedCron = cronResult.data;
   }
   let normalizedRetry;
   if (updates.retry !== void 0) {
@@ -1074,7 +1112,7 @@ async function updateRegisteredTask(taskId, updates, taskRepo2) {
       normalizedRetry = retryResult.data;
     }
   }
-  const normalizedDescription = updates.description !== void 0 ? normalizeTaskDescription(updates.description) : void 0;
+  const normalizedDescription = updates.description !== void 0 ? normalizeTaskDescription(updates.description) ?? "" : void 0;
   const normalizedUpdates = {
     ...updates,
     ...updates.description !== void 0 ? { description: normalizedDescription } : {},
@@ -1083,7 +1121,7 @@ async function updateRegisteredTask(taskId, updates, taskRepo2) {
   const updatedTask = {
     ...existingTask,
     ...normalizedUpdates.name !== void 0 ? { name: normalizedUpdates.name } : {},
-    ...normalizedUpdates.description !== void 0 ? { description: normalizedUpdates.description } : {},
+    ...normalizedUpdates.description !== void 0 ? { description: normalizedUpdates.description || void 0 } : {},
     ...normalizedUpdates.cron !== void 0 ? { cron: normalizedUpdates.cron } : {},
     ...normalizedUpdates.timezone !== void 0 ? { timezone: normalizedUpdates.timezone ?? void 0 } : {},
     ...normalizedUpdates.enabled !== void 0 ? { enabled: normalizedUpdates.enabled } : {},
@@ -1092,14 +1130,10 @@ async function updateRegisteredTask(taskId, updates, taskRepo2) {
     ...normalizedUpdates.params !== void 0 ? { params: normalizedUpdates.params } : {},
     ...normalizedUpdates.handler !== void 0 ? { handler: normalizedUpdates.handler ?? void 0 } : {}
   };
-  setTask(taskId, updatedTask);
   if (taskRepo2) {
     const updateResult = await taskRepo2.updateTask(taskId, normalizedUpdates);
     if (!updateResult.success) {
-      logger4.warn("Failed to update persisted task definition, rolling back in-memory update", { taskId, error: updateResult.error.message });
-      setTask(taskId, existingTask);
-      if ((updates.cron !== void 0 || updates.timezone !== void 0) && existingCron)
-        setCron(taskId, existingCron);
+      logger4.warn("Failed to update persisted task definition", { taskId, error: updateResult.error.message });
       return err(
         HaiSchedulerError.DB_SAVE_FAILED,
         schedulerM("scheduler_dbSaveFailed", { params: { error: updateResult.error.message } }),
@@ -1107,6 +1141,9 @@ async function updateRegisteredTask(taskId, updates, taskRepo2) {
       );
     }
   }
+  setTask(taskId, updatedTask);
+  if (updatedCron)
+    setCron(taskId, updatedCron);
   return ok(void 0);
 }
 async function queryTaskLogs(logRepo2, options) {
@@ -1227,6 +1264,7 @@ function runTask(task, minuteTimestamp, trigger = { type: "manual", source: null
 async function runTaskExecution(task, minuteTimestamp, trigger, signal) {
   const hooks = getHooks();
   const repository = currentTaskRepo;
+  const occurrenceId = minuteTimestamp === void 0 ? `manual:${randomUUID()}` : `scheduled:${minuteTimestamp}`;
   const lockKey = minuteTimestamp !== void 0 ? `hai:scheduler:${task.id}:${minuteTimestamp}` : void 0;
   if (cache.isInitialized && lockKey) {
     const lockResult = await waitWithSignal(() => cache.lock.acquire(lockKey, { ttl: currentLockTtlSec, owner: currentNodeId }), signal).catch(() => null);
@@ -1264,7 +1302,7 @@ async function runTaskExecution(task, minuteTimestamp, trigger, signal) {
   }
   runningTasks.add(task.id);
   try {
-    const maxAttempts = Math.max(1, task.retry?.maxAttempts ?? 1);
+    let maxAttempts = Math.max(1, task.retry?.maxAttempts ?? 1);
     let log = null;
     for (let attempt = 1; attempt <= maxAttempts; attempt++) {
       if (signal.aborted) {
@@ -1278,12 +1316,14 @@ async function runTaskExecution(task, minuteTimestamp, trigger, signal) {
       }
       const latest = getTask(task.id);
       const stillDue = minuteTimestamp === void 0 || getCron(task.id)?.match(new Date(minuteTimestamp * 6e4));
-      if (!latest || latest.enabled === false || !stillDue) {
+      if (!latest || latest.enabled === false || !stillDue || attempt > 1 && !isDeepStrictEqual(latest, task)) {
         log = await interruptTask(task, trigger, schedulerM("scheduler_taskNoLongerDue", { params: { taskId: task.id } }), hooks, signal);
         break;
       }
       task = latest;
-      log = await executeTask(task, trigger, hooks, signal);
+      if (attempt === 1)
+        maxAttempts = Math.max(1, task.retry?.maxAttempts ?? 1);
+      log = await executeTask(task, trigger, hooks, signal, occurrenceId);
       if (log.status !== "failed")
         break;
       if (attempt >= maxAttempts)
@@ -1312,14 +1352,17 @@ async function runTaskExecution(task, minuteTimestamp, trigger, signal) {
       logger5.debug("Task execution interrupted", { taskId: task.id, error: log.error });
     else
       logger5.debug("Task execution succeeded", { taskId: task.id, duration: log.duration });
-    if (task.deleteAfterRun === true && !signal.aborted && log.status !== "interrupted") {
-      const unregisterResult = await unregisterTask(task.id, repository);
+    if (task.deleteAfterRun === true && !signal.aborted && log.status === "success") {
+      const refreshed = await loadPersistedTasks(repository);
+      if (!refreshed.success || !isDeepStrictEqual(getTask(task.id), task))
+        return log;
+      const unregisterResult = await unregisterTask(task.id, repository, task);
       if (!unregisterResult.success) {
         logger5.warn("Failed to auto-delete one-time task after run", {
           taskId: task.id,
           error: unregisterResult.error.message
         });
-      } else {
+      } else if (!getTask(task.id)) {
         logger5.info("Auto-deleted one-time task after run", { taskId: task.id });
       }
     }
@@ -1437,6 +1480,12 @@ var scheduler = {
       initInProgress = false;
     }
   },
+  /** 刷新数据库任务投影，不执行任何任务。 */
+  async refreshTasks() {
+    if (!currentConfig)
+      return notInitialized.result();
+    return loadPersistedTasks(taskRepo);
+  },
   async register(task) {
     if (!currentConfig)
       return notInitialized.result();