scheduler: 定时任务核心——scheduled_tasks 表(会话主键+CASCADE)+ 30s 轮询调度器(触发前存档历史,postUserMessage 投递即复活,最小间隔 1h,cron-parser@5.10.1 锁版)
This commit is contained in:
Generated
+22
@@ -9,6 +9,7 @@
|
||||
"version": "2.0.0",
|
||||
"dependencies": {
|
||||
"better-sqlite3": "11.3.0",
|
||||
"cron-parser": "5.10.1",
|
||||
"express": "4.21.2",
|
||||
"minimatch": "9.0.5",
|
||||
"multer": "1.4.5-lts.1",
|
||||
@@ -795,6 +796,18 @@
|
||||
"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/cron-parser": {
|
||||
"version": "5.10.1",
|
||||
"resolved": "http://mirrors.tencentyun.com/npm/cron-parser/-/cron-parser-5.10.1.tgz",
|
||||
"integrity": "sha512-pKRrRagItwk9rGIStcUyMxFX34x56zoX3KDf9HJ4ttwkXIK1qxK63EvXvEDmlxI9AdPJ+Y7TEKRftRlW5eSS7A==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"luxon": "^3.7.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/debug": {
|
||||
"version": "2.6.9",
|
||||
"resolved": "http://mirrors.tencentyun.com/npm/debug/-/debug-2.6.9.tgz",
|
||||
@@ -1204,6 +1217,15 @@
|
||||
"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/luxon": {
|
||||
"version": "3.7.2",
|
||||
"resolved": "http://mirrors.tencentyun.com/npm/luxon/-/luxon-3.7.2.tgz",
|
||||
"integrity": "sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
}
|
||||
},
|
||||
"node_modules/math-intrinsics": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "http://mirrors.tencentyun.com/npm/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"better-sqlite3": "11.3.0",
|
||||
"cron-parser": "5.10.1",
|
||||
"express": "4.21.2",
|
||||
"minimatch": "9.0.5",
|
||||
"multer": "1.4.5-lts.1",
|
||||
|
||||
@@ -80,6 +80,24 @@ function initDb(dbPath) {
|
||||
value TEXT
|
||||
);
|
||||
|
||||
-- 定时任务:AI 通过 schedule_task 工具为会话创建周期任务(每会话至多一个),
|
||||
-- 由 scheduler.js 轮询投递。session_id 作主键:一行代码同时实现「1 会话 1 任务」
|
||||
-- 与「防重复插入」(重复 INSERT 直接撞主键);REFERENCES ... ON DELETE CASCADE
|
||||
-- 让删会话时任务自动消失(db 已开 foreign_keys)。next_run_at 创建时即算好,
|
||||
-- 调度器只做 <= now 比较;last_note 存给人看的中文说明,UI 原样展示。
|
||||
CREATE TABLE IF NOT EXISTS scheduled_tasks (
|
||||
session_id TEXT PRIMARY KEY REFERENCES sessions(id) ON DELETE CASCADE,
|
||||
cron_expr TEXT NOT NULL,
|
||||
prompt TEXT NOT NULL,
|
||||
next_run_at INTEGER NOT NULL,
|
||||
last_run_at INTEGER,
|
||||
last_status TEXT, -- ok | error | skipped | running
|
||||
last_note TEXT,
|
||||
created_at INTEGER NOT NULL
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_sched_next ON scheduled_tasks(next_run_at);
|
||||
|
||||
-- 模型 token 用量流水(每次模型回合一条)。故意不建会话外键:
|
||||
-- 删会话后累计统计仍需保留
|
||||
CREATE TABLE IF NOT EXISTS model_usage (
|
||||
|
||||
@@ -0,0 +1,146 @@
|
||||
// 定时任务调度器:AI 通过 schedule_task 工具为所在会话创建一个周期性任务
|
||||
// (scheduled_tasks 表,生命周期绑定会话,CASCADE 随删),本模块常驻轮询到期任务:
|
||||
// 先把会话历史整体存档(type='archived',llm.buildMessages 会跳过 → AI 只看到本次
|
||||
// prompt,等价全新会话),再经 engine.postUserMessage 投递任务 prompt 自动开跑,
|
||||
// 结果留在会话里供用户次日查看。
|
||||
// 形态照抄 engine.js 的 startHoldSweeper:模块级 timer + setInterval + unref,
|
||||
// 单次异常只记日志,绝不中断定时器。
|
||||
// 启动时序:必须在 engine.init() 之后调 start(engine)(见 server.js)——
|
||||
// engine.init() 先把 active 退回队列 / held 结版归位,首轮 tick 才不会看到脏状态。
|
||||
// 依赖注入 engine 而非 require('./engine'):engine→executor→scheduler 已有引用链,
|
||||
// 顶层反向 require 会成环拿到半成品 exports。
|
||||
const { CronExpressionParser } = require('cron-parser'); // 锁定 v5.10.1:API 是 CronExpressionParser.parse(v4 的 parseExpression 已不存在)
|
||||
const log = require('./log');
|
||||
|
||||
const TZ = 'Asia/Shanghai'; // 与容器 TZ(docker-compose)一致;显式传入,不依赖进程隐式时区
|
||||
const TICK_MS = 30000; // 轮询周期:相对 1h 最小间隔足够密,无调优需求,不进 config.yml
|
||||
const MIN_INTERVAL_MS = 3600000; // cron 最小间隔 1 小时:防 AI 排出分钟级任务反复烧模型池
|
||||
|
||||
let eng = null; // engine 引用(start 注入)
|
||||
let timer = null;
|
||||
|
||||
function fmtTime(t) {
|
||||
return new Date(t).toLocaleString('zh-CN', { timeZone: TZ, hour12: false });
|
||||
}
|
||||
|
||||
// 下次到期时间。一律以当前时刻为基准(而非上次 next_run_at):
|
||||
// 服务器停机跨过若干触发点后重启,算出的自然是「未来最近一次」,天然跳过补跑。
|
||||
function computeNext(cronExpr) {
|
||||
return CronExpressionParser.parse(cronExpr, { tz: TZ }).next().getTime();
|
||||
}
|
||||
|
||||
// ---------- schedule_task 工具实现(tools/executor.js 调) ----------
|
||||
// sessionId 由调用方从工具 ctx 取(AI 无法指定别的会话)。校验顺序:
|
||||
// cron 可解析 → 连续两次 next() 间隔 ≥ 1h → 本会话尚无任务 → INSERT(主键冲突兜底)。
|
||||
// 失败抛中文 Error,由 engine 工具执行路径转成 'Error: ...' 回执原样回给 AI。
|
||||
function createTask(db, sessionId, cronExpr, prompt) {
|
||||
let first;
|
||||
let second;
|
||||
try {
|
||||
const it = CronExpressionParser.parse(cronExpr, { tz: TZ });
|
||||
first = it.next().getTime();
|
||||
second = it.next().getTime();
|
||||
} catch (e) {
|
||||
throw new Error('cron 表达式无效: ' + (e && e.message || e));
|
||||
}
|
||||
if (second - first < MIN_INTERVAL_MS) throw new Error('定时任务间隔不能小于 1 小时');
|
||||
const exist = db.prepare('SELECT cron_expr FROM scheduled_tasks WHERE session_id = ?').get(sessionId);
|
||||
if (exist) throw new Error('本会话已有定时任务(' + exist.cron_expr + '),请先在会话页删除');
|
||||
try {
|
||||
db.prepare(
|
||||
'INSERT INTO scheduled_tasks (session_id, cron_expr, prompt, next_run_at, created_at) VALUES (?,?,?,?,?)'
|
||||
).run(sessionId, cronExpr, prompt, first, Date.now());
|
||||
} catch (_) {
|
||||
// 单进程同步 API 下正常到不了这里(上一步已查重),仅作主键约束重复报错的兜底
|
||||
const ex = db.prepare('SELECT cron_expr FROM scheduled_tasks WHERE session_id = ?').get(sessionId);
|
||||
throw new Error('本会话已有定时任务(' + (ex ? ex.cron_expr : cronExpr) + '),请先在会话页删除');
|
||||
}
|
||||
log.info('scheduler', sessionId + ' 创建定时任务 ' + cronExpr);
|
||||
return { cron_expr: cronExpr, next_run_at: first, next_text: fmtTime(first) };
|
||||
}
|
||||
|
||||
// ---------- 投递 ----------
|
||||
// 触发前把会话全部消息标为 archived:buildMessages 遇 type='archived' 直接跳过(llm.js),
|
||||
// UI 照常展示全量(历次执行记录用户仍可见),AI 侧等价全新会话。
|
||||
// 本库没有 session_context 这类 type 为空的常驻行,无需排除项;
|
||||
// 旧摘要行(type='summary')一并存档——跳过即回到零上下文,行为正确。
|
||||
function archiveHistory(db, sessionId) {
|
||||
db.prepare("UPDATE messages SET type='archived' WHERE session_id = ?").run(sessionId);
|
||||
}
|
||||
|
||||
// 投递 + 复活一体:postUserMessage 已按会话当时状态全量流转,无需单独复活步骤——
|
||||
// held → 转 active 立即开跑(注意:会抢占保持中的模型);
|
||||
// queued / completed / cancelled → 重新入队并尝试派发:有空闲模型当轮即跑,
|
||||
// 没有则留在队列等 dispatchQueued(正是「半夜无人值守排队执行」场景,不是异常)。
|
||||
function deliver(sessionId, prompt) {
|
||||
return eng.postUserMessage(sessionId, prompt);
|
||||
}
|
||||
|
||||
// ---------- tick ----------
|
||||
function drop(db, sessionId) {
|
||||
db.prepare('DELETE FROM scheduled_tasks WHERE session_id = ?').run(sessionId);
|
||||
log.info('scheduler', sessionId + ' 删除定时任务(会话不存在)');
|
||||
}
|
||||
|
||||
function tick() {
|
||||
const db = eng.getDb();
|
||||
const now = Date.now();
|
||||
|
||||
// 阶段 A:收尾上一轮标记 running 的任务。runLoop 结束没有回调可挂,改为轮询推断:
|
||||
// 会话已转非 active = 回合结束 → ok(局限:异常结束的回合也会被标 ok)。
|
||||
// 会话仍 active → AI 还在跑,保持 running 等下轮再看。
|
||||
for (const t of db.prepare("SELECT session_id FROM scheduled_tasks WHERE last_status='running'").all()) {
|
||||
const s = eng.getSession(t.session_id);
|
||||
if (!s) { drop(db, t.session_id); continue; }
|
||||
if (s.status !== 'active') {
|
||||
db.prepare("UPDATE scheduled_tasks SET last_status='ok' WHERE session_id=?").run(t.session_id);
|
||||
}
|
||||
}
|
||||
|
||||
// 阶段 B:投递到期任务。上一轮还 running 的不取(等阶段 A 收尾);
|
||||
// 会话本身 active 直接跳过本次——防堆积以会话状态为准,不依赖 DB 标记的时序,更可靠。
|
||||
const due = db.prepare(
|
||||
"SELECT * FROM scheduled_tasks WHERE next_run_at <= ? AND (last_status IS NULL OR last_status != 'running')"
|
||||
).all(now);
|
||||
for (const t of due) {
|
||||
const s = eng.getSession(t.session_id);
|
||||
if (!s) { drop(db, t.session_id); continue; } // CASCADE 正常已清行;手工删 sessions 行的兜底
|
||||
if (s.status === 'active') {
|
||||
db.prepare(
|
||||
"UPDATE scheduled_tasks SET last_run_at=?, last_status='skipped', last_note='上一次仍在执行,跳过本次', next_run_at=? WHERE session_id=?"
|
||||
).run(now, computeNext(t.cron_expr), t.session_id);
|
||||
log.info('scheduler', t.session_id + ' 跳过本次(上一次仍在执行)');
|
||||
continue;
|
||||
}
|
||||
try {
|
||||
// 顺序不可调换:先存档、后投递。postUserMessage 的 held/空闲分支会同步起 runLoop,
|
||||
// 存档晚一步,回合就会带着旧上下文开跑。
|
||||
archiveHistory(db, t.session_id);
|
||||
const r = deliver(t.session_id, t.prompt);
|
||||
db.prepare(
|
||||
"UPDATE scheduled_tasks SET last_run_at=?, last_status='running', last_note=NULL, next_run_at=? WHERE session_id=?"
|
||||
).run(now, computeNext(t.cron_expr), t.session_id);
|
||||
log.info('scheduler', t.session_id + ' 触发定时任务,投递 ' + (r && r.delivered || '?'));
|
||||
} catch (err) {
|
||||
db.prepare(
|
||||
"UPDATE scheduled_tasks SET last_run_at=?, last_status='error', last_note=?, next_run_at=? WHERE session_id=?"
|
||||
).run(now, String(err && err.message || err).slice(0, 200), computeNext(t.cron_expr), t.session_id);
|
||||
log.error('scheduler', t.session_id + ' 定时任务失败: ' + (err && err.message || err));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function start(engine) {
|
||||
if (timer) return;
|
||||
eng = engine;
|
||||
timer = setInterval(() => {
|
||||
try {
|
||||
tick();
|
||||
} catch (e) {
|
||||
log.error('scheduler', 'tick 异常: ' + (e && e.stack || e));
|
||||
}
|
||||
}, TICK_MS);
|
||||
if (timer.unref) timer.unref(); // 不阻止进程退出
|
||||
}
|
||||
|
||||
module.exports = { start, createTask, computeNext };
|
||||
@@ -9,6 +9,7 @@ const { initDb } = require('./db');
|
||||
const { createBus } = require('./sse');
|
||||
const { createAuth } = require('./auth');
|
||||
const engine = require('./engine');
|
||||
const scheduler = require('./scheduler');
|
||||
const llm = require('./llm');
|
||||
const mcp = require('./mcp');
|
||||
const skills = require('./tools/skills');
|
||||
@@ -21,6 +22,9 @@ const bus = createBus();
|
||||
|
||||
engine.setModelPool(cfg, db, bus);
|
||||
engine.init();
|
||||
// 定时任务调度器(scheduler.js):必须在 engine.init() 之后启动——init 先把 active
|
||||
// 退回队列 / held 结版归位,首轮 tick 才不会看到脏状态。
|
||||
scheduler.start(engine);
|
||||
|
||||
const app = express();
|
||||
const server = http.createServer(app);
|
||||
|
||||
Reference in New Issue
Block a user