@mzzsfy/dsh-cron-board 0.1.0 → 0.1.1

package/README.md

@@ -42,7 +42,7 @@
 ## 依赖
 
 - `croner`:cron 表达式解析与触发点计算
-- 宿主服务:settings / timer(软依赖)、webServer、sessionController(硬依赖,cordis 门控——缺失时插件整体不激活,含脚本任务)
+- 宿主服务:settings / timer(软依赖)、webServer;sessionController 在 apply 内探测(缺失时打日志干净禁用,插件整体不激活,含脚本任务;0.1.1-rc.2 及更早版本无此服务)
 
 ## 开发
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mzzsfy/dsh-cron-board",
   "description": "轻量级青龙面板:环境变量集中管理与定时任务调度,执行体支持本地脚本与 dsh 会话任务",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "type": "module",
   "main": "src/index.js",
   "exports": {

package/src/index.js

@@ -18,15 +18,18 @@ import { createStore } from './store.mjs'
 
 export const name = 'dsh-cron-board'
 
-// 会话任务与路由/定时同为本体能力:sessionController 硬依赖声明交 cordis 门控,
-// 服务未就绪/缺失时 fiber 不激活即整体干净禁用(apply 内同步软探测会撞异步挂载时序,mce 同款事故)
-export const inject = ['webServer', 'sessionController']
+// 会话任务依赖的 sessionController 由 dsh-web-app 的 session-controller 条目挂载
+// (0.1.1-rc.2 无此服务,inject 声明会让 fiber 永久 pending,旧版 boot 对 pending
+// 条目抛错杀掉整个进程,连带已监听的 web 一起退出);host 服务为同步注册,apply 内
+// 探测无时序竞态:缺失即打日志干净禁用,整体不激活(含脚本任务)的语义不变
+export const inject = ['webServer']
 
 // 数据目录 env 覆盖:测试注入临时目录(对齐 dsh-usage-panel 先例)
 const DATA_DIR_ENV = 'DSH_CRON_BOARD_DATA_DIR'
 const API_PREFIX = '/api/cron-board'
 const SETTINGS_NS = 'cron-board'
 const TIMER_UNAVAILABLE_REASON = '宿主定时服务不可用,自动调度已停用'
+const SESSION_UNAVAILABLE_REASON = '宿主会话服务 sessionController 不可用(需 dsh-web-app 挂载 session-controller,0.1.1-rc.2 及更早版本缺失),插件整体禁用'
 const DEFAULT_LOG_KEEP_PER_JOB = 200
 
 // 设置 schema(schemastery 声明式):tick 周期 / 全局并发 / 日志与运行元数据保留份数 / 会话投递变量掩码
@@ -44,7 +47,12 @@ export function resolveDataDir(env = process.env) {
 }
 
 export function apply(ctx, config) {
-  const sessionController = ctx.sessionController
+  // ctx.get 不受 inject 门控(cordis 明文契约:缺失返回 undefined),属性访问会被拦截抛错
+  const sessionController = ctx.get('sessionController')
+  if (!sessionController) {
+    if (ctx.logger && ctx.logger.warn) ctx.logger.warn('[cron-board] ' + SESSION_UNAVAILABLE_REASON)
+    return
+  }
   const dataDir = resolveDataDir()
   // 装配惰性单例:首个请求 / timer 激活触发初始化,各组件只建一次
   let runtimePromise = null

package/src/store.mjs

@@ -181,6 +181,8 @@ export async function createStore({ dir }) {
   return {
     envs,
     jobs,
+    // 写链排空:等待已提交 mutate 全部结束(不报告写失败);测试清理数据目录前调用以缩小与删除的竞态面
+    flush: () => link.chain.catch(() => {}),
     runs: {
       get rows() {
         return runs.rows

package/test/index.test.mjs

@@ -19,15 +19,18 @@ test('index:数据目录默认 ~/.dsh/cron-board,env 可覆盖', () => {
 })
 
 test('index:apply 注册 prefix 路由且请求走通(列表接口)', async () => {
-  // Given webServer 桩:收集注册路由(sessionController 属性桩满足 inject 门控后环境)
+  // Given webServer 桩:收集注册路由(sessionController 经 get 桩供给,对齐 ctx.get 探测路径)
   const routes = new Map()
+  const sessionController = { create: async () => ({ sessionId: 's-x' }), prompt: async () => ({ accepted: true }) }
   const ctx = {
     effect(fn) {
       fn()
     },
     inject() {},
-    sessionController: { create: async () => ({ sessionId: 's-x' }), prompt: async () => ({ accepted: true }) },
-    get: () => undefined,
+    get(name) {
+      if (name === 'sessionController') return sessionController
+      return undefined
+    },
     webServer: {
       register(route) {
         routes.set(route.path, route.handler)
@@ -114,10 +117,39 @@ function makeFullCtx({ timerAvailable = true } = {}) {
   return { ctx, routes, registered, intervals, settingsService, sessions }
 }
 
-test('index:inject 声明 webServer+sessionController(cordis 门控整体禁用的唯一形态)', async () => {
-  // Given 宿主会话服务走 cordis 硬依赖门控:缺失时 fiber 不激活,apply 不执行
-  // Then 静态锁定 inject 声明(修复 mce 同款「apply 内同步探测误判缺失」事故形态)
-  assert.deepEqual(mod.inject, ['webServer', 'sessionController'])
+test('index:inject 仅声明 webServer(sessionController 走 apply 内探测)', async () => {
+  // Given sessionController 在旧版宿主(0.1.1-rc.2)不存在,inject 声明会让 fiber 永久
+  // pending,旧版 boot 对 pending 条目抛错杀掉整个进程;host 服务同步注册,探测无竞态
+  // Then 静态锁定 inject 声明
+  assert.deepEqual(mod.inject, ['webServer'])
+})
+
+test('index:sessionController 缺失时干净禁用(不注册路由与设置)', async () => {
+  // Given 无 sessionController 的宿主上下文
+  const routes = new Map()
+  const registered = []
+  const warnings = []
+  const ctx = {
+    effect(fn) {
+      fn()
+    },
+    inject() {},
+    logger: { warn: (line) => warnings.push(line) },
+    get: () => undefined,
+    webServer: {
+      register(route) {
+        routes.set(route.path, route.handler)
+        return () => {}
+      },
+    },
+  }
+  // When apply
+  apply(ctx)
+  // Then 无路由注册、无设置注册,且打日志说明原因
+  assert.equal(routes.size, 0)
+  assert.deepEqual(registered, [])
+  assert.equal(warnings.length, 1)
+  assert.ok(warnings[0].includes('sessionController'))
 })
 
 test('index:settings 注册 cron-board 命名空间且 timer 承载默认周期 tick', async () => {

package/test/routes.test.mjs

@@ -15,8 +15,13 @@ import { createApi } from '../src/api.mjs'
 
 async function makeApi(t, overrides = {}) {
   const dir = await mkdtemp(join(tmpdir(), 'cron-board-api-'))
-  t.after(() => rm(dir, { recursive: true, force: true }))
   const store = await createStore({ dir: join(dir, 'data') })
+  // 清理前等写链排空:终态只保证内存可见,收尾写(任务卡回填、日志裁剪)提交晚于 flush,
+  // rmdir 与其赛跑会 ENOTEMPTY;retries 吸收(镜像 executor/scheduler 测试同款参数)
+  t.after(async () => {
+    await store.flush()
+    await rm(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 })
+  })
   const logger = createLogger({ rootDir: join(dir, 'logs') })
   const executor = createExecutor({ store, logger, readMaxConcurrent: () => 2 })
   const api = createApi({ store, logger, executor, ...overrides })
@@ -239,6 +244,27 @@ test('jobs 路由:同名多值展开为多条 RunRecord 与多次运行', async
   assert.deepEqual([...logs].sort(), ['one', 'two'])
 })
 
+test('jobs 路由:慢盘下运行终态后清理不与收尾写赛跑(ENOTEMPTY 回归)', async (t) => {
+  // Given 持久化注入慢盘延迟(放大终态内存可见与收尾写落盘的窗口)
+  const { store, api } = await makeApi(t)
+  const rawUpdate = store.runs.update.bind(store.runs)
+  store.runs.update = (runId, patch) => new Promise((resolve) => {
+    setTimeout(() => rawUpdate(runId, patch).then(resolve, resolve), 25)
+  })
+  const job = await store.jobs.create({
+    name: 'slowdisk', kind: 'shell',
+    command: `${process.execPath} -e ""`,
+    schedule: '* * * * *', enabled: true, timeoutMs: 10 * 1000,
+  })
+  // When 手动运行到终态后测试即结束(清理走 makeApi 的 flush+retries)
+  const runRes = await call(api, 'POST', '/api/cron-board/jobs/' + job.id + '/run')
+  const { runIds } = runRes.payload
+  await waitFor(() => {
+    const row = store.runs.get(runIds[0])
+    return row && row.status !== 'queued' && row.status !== 'running' ? row : null
+  })
+})
+
 test('status 路由:报告调度器与 timer 可用性', async (t) => {
   // Given scheduler 桩与 timer 运行标记
   const { api } = await makeApi(t, {