@@ -256,16 +256,136 @@ function enqueueDistill(task, intervalMs = 0) {
256256 return run ;
257257}
258258
259- export function createSummarizer ( ctx , service , config ) {
259+ // Issue #239(第 4 项,错峰队列):高峰时段解析与判定。纯函数、可单测——排程判断
260+ // 不绑死真实时钟,测试才能确定性地覆盖跨零点、多段、星期过滤与非法写法。
261+ // spec 语法:`[<星期> ]<时段>[,<时段>...]`,星期前缀可省(省 = 每天):
262+ // "09:00-18:00" 每天 09:00-18:00
263+ // "mon-fri 08:00-12:00,14:00-18:00" 工作日两段(ISO 1=周一…7=周日,也认 mon..sun)
264+ // "sat,sun 23:00-06:00" 周末跨零点段
265+ // 时间取宿主本地时区。任一写法非法 → 整串视为未配置(返回 null):排程是省钱手段,
266+ // 绝不该因为写错格式把蒸馏停掉。
267+ const DAY_NAMES = { mon : 1 , tue : 2 , wed : 3 , thu : 4 , fri : 5 , sat : 6 , sun : 7 } ;
268+
269+ function parseDayToken ( token ) {
270+ const days = new Set ( ) ;
271+ const normalize = ( value ) => ( / ^ \d $ / . test ( value ) ? Number ( value ) : DAY_NAMES [ value ] ?? null ) ;
272+ for ( const piece of token . split ( "," ) ) {
273+ const matched = / ^ ( [ a - z ] { 3 } | \d ) (?: - ( [ a - z ] { 3 } | \d ) ) ? $ / . exec ( piece . trim ( ) . toLowerCase ( ) ) ;
274+ if ( ! matched ) return null ;
275+ const from = normalize ( matched [ 1 ] ) ;
276+ const to = matched [ 2 ] === undefined ? from : normalize ( matched [ 2 ] ) ;
277+ if ( from === null || to === null || from < 1 || from > 7 || to < 1 || to > 7 ) return null ;
278+ // 支持跨周环绕(fri-mon):从 from 起逐天推进到 to,最多绕一圈。
279+ for ( let day = from ; ; day = ( day % 7 ) + 1 ) {
280+ days . add ( day ) ;
281+ if ( day === to ) break ;
282+ }
283+ }
284+ return days . size > 0 ? [ ...days ] . sort ( ( a , b ) => a - b ) : null ;
285+ }
286+
287+ /** JS 的 getDay() 是 0=周日…6=周六;这里统一成 ISO(1=周一…7=周日)。 */
288+ function isoDay ( date ) {
289+ const day = date . getDay ( ) ;
290+ return day === 0 ? 7 : day ;
291+ }
292+
293+ export function parsePeakSpec ( spec ) {
294+ if ( typeof spec !== "string" || spec . trim ( ) === "" ) return null ;
295+ let rest = spec . trim ( ) ;
296+ let days = null ;
297+ // 星期前缀 = 第一个空白之前的部分,但**头段含冒号就不是前缀**(那是时段本身,
298+ // 例如 "09:00-12:00, 14:00-18:00" 里的逗号空格)。前缀解析失败一律按未配置处理,
299+ // 不做猜测——宁可不省,也不能误停。
300+ const sep = rest . search ( / \s / ) ;
301+ if ( sep > 0 ) {
302+ const head = rest . slice ( 0 , sep ) ;
303+ if ( ! head . includes ( ":" ) ) {
304+ days = parseDayToken ( head ) ;
305+ if ( days === null ) return null ;
306+ rest = rest . slice ( sep ) . trim ( ) ;
307+ }
308+ }
309+ const windows = [ ] ;
310+ for ( const part of rest . split ( "," ) ) {
311+ const matched = / ^ \s * ( \d { 1 , 2 } ) : ( \d { 2 } ) \s * - \s * ( \d { 1 , 2 } ) : ( \d { 2 } ) \s * $ / . exec ( part ) ;
312+ if ( ! matched ) return null ;
313+ const [ sh , sm , eh , em ] = [ Number ( matched [ 1 ] ) , Number ( matched [ 2 ] ) , Number ( matched [ 3 ] ) , Number ( matched [ 4 ] ) ] ;
314+ if ( sh > 23 || eh > 23 || sm > 59 || em > 59 ) return null ;
315+ const start = sh * 60 + sm ;
316+ const end = eh * 60 + em ;
317+ if ( start === end ) return null ;
318+ windows . push ( { start, end } ) ;
319+ }
320+ return windows . length > 0 ? { days, windows } : null ;
321+ }
322+
323+ /**
324+ * 该时刻是否落在高峰内。跨零点段(start > end)按「窗口所属的那一天」认星期:
325+ * `mon-fri 23:00-06:00` 的周六 02:00 属于周五开的那个窗口,仍算高峰。
326+ */
327+ export function isInPeakWindow ( date , spec ) {
328+ const parsed = parsePeakSpec ( spec ) ;
329+ if ( ! parsed ) return false ;
330+ const minutes = date . getHours ( ) * 60 + date . getMinutes ( ) ;
331+ const today = isoDay ( date ) ;
332+ const yesterday = today === 1 ? 7 : today - 1 ;
333+ const allowed = ( day ) => ! parsed . days || parsed . days . includes ( day ) ;
334+ return parsed . windows . some ( ( { start, end } ) => {
335+ if ( start < end ) return minutes >= start && minutes < end && allowed ( today ) ;
336+ return ( minutes >= start && allowed ( today ) ) || ( minutes < end && allowed ( yesterday ) ) ;
337+ } ) ;
338+ }
339+
340+ /**
341+ * 高峰内则返回「距当前最近的一个高峰结束时刻」(择时补跑用),否则 null。
342+ * 落在多个时段重叠处时取最早结束的那个——早跑不亏,晚跑才亏。
343+ */
344+ export function nextOffPeakAt ( date , spec ) {
345+ const parsed = parsePeakSpec ( spec ) ;
346+ if ( ! parsed ) return null ;
347+ const minutes = date . getHours ( ) * 60 + date . getMinutes ( ) ;
348+ const today = isoDay ( date ) ;
349+ const yesterday = today === 1 ? 7 : today - 1 ;
350+ const allowed = ( day ) => ! parsed . days || parsed . days . includes ( day ) ;
351+ let bestDelta = null ;
352+ const consider = ( delta ) => {
353+ if ( bestDelta === null || delta < bestDelta ) bestDelta = delta ;
354+ } ;
355+ for ( const { start, end } of parsed . windows ) {
356+ if ( start < end ) {
357+ if ( minutes >= start && minutes < end && allowed ( today ) ) consider ( end - minutes ) ;
358+ continue ;
359+ }
360+ if ( minutes >= start && allowed ( today ) ) consider ( ( 1440 - minutes ) + end ) ;
361+ else if ( minutes < end && allowed ( yesterday ) ) consider ( end - minutes ) ;
362+ }
363+ if ( bestDelta === null ) return null ;
364+ const at = new Date ( date . getTime ( ) ) ;
365+ at . setSeconds ( 0 , 0 ) ;
366+ at . setMinutes ( at . getMinutes ( ) + bestDelta ) ;
367+ return at ;
368+ }
369+
370+ export function createSummarizer ( ctx , service , config , deps = { } ) {
260371 if ( ! config . autoSummarize ) return { dispose : ( ) => { } } ;
261372
373+ // Issue #239(第 4 项):时钟与定时器可注入——排程不绑死真实时钟,测试才能确定性
374+ // 覆盖「高峰顺延 → 非高峰补跑」。房型同 dream/sleep.js 的注入参数。
375+ const now = typeof deps . now === "function" ? deps . now : ( ) => Date . now ( ) ;
376+ const setTimer = typeof deps . setTimeoutFn === "function" ? deps . setTimeoutFn : setTimeout ;
377+ const clearTimer = typeof deps . clearTimeoutFn === "function" ? deps . clearTimeoutFn : clearTimeout ;
378+
262379 const inFlight = new Map ( ) ;
263380 // Issue #127:per-session 上一次实际开跑时刻(最小间隔闸门用)。与 inFlight
264381 // 同生命周期,dispose 时一并清空。
265382 const lastRunAt = new Map ( ) ;
266383 // Issue #239:per-session 已发起的蒸馏次数(有界检查点用)。只在实际发起 LLM
267384 // 调用时自增,因此被零 LLM 预判挡下的窗口不消耗预算。
268385 const runsUsed = new Map ( ) ;
386+ // Issue #239(第 4 项):每会话最多挂一个待补跑定时器(错峰队列用);dispose 时
387+ // 一并清理,避免插件卸载后还留着一个会调模型的定时器。
388+ const deferredRuns = new Map ( ) ;
269389 // Issue #210:只在一次蒸馏完整成功后记录已消费的最后事件 seq。
270390 const lastDistilledSeq = new Map ( ) ;
271391 let disposed = false ;
@@ -285,7 +405,34 @@ export function createSummarizer(ctx, service, config) {
285405 }
286406 }
287407
288- async function summarize ( session , triggerEvent ) {
408+ /**
409+ * Issue #239(第 4 项):把这一轮蒸馏推迟到最近的「高峰结束」时刻。每会话只挂
410+ * 一个定时器(重复触发不叠加);被 summarizePeakMaxDeferMinutes 截断时到点照跑
411+ * (bypassPeak),长高峰不会把蒸馏饿死。定时器 unref——不阻止宿主退出。
412+ */
413+ function scheduleDeferredRun ( session ) {
414+ if ( disposed || deferredRuns . has ( session . id ) ) return ;
415+ const at = nextOffPeakAt ( new Date ( now ( ) ) , config . summarizePeakHours ?? "" ) ;
416+ if ( ! at ) return ;
417+ const maxDeferMs = ( config . summarizePeakMaxDeferMinutes ?? 0 ) * 60000 ;
418+ let delay = Math . max ( 0 , at . getTime ( ) - now ( ) ) ;
419+ const capped = maxDeferMs > 0 && delay > maxDeferMs ;
420+ if ( capped ) delay = maxDeferMs ;
421+ const timer = setTimer ( ( ) => {
422+ deferredRuns . delete ( session . id ) ;
423+ if ( disposed ) return ;
424+ // 不传触发事件:补跑要蒸的是「累积后的整窗」(从上次成功游标到最新事件),
425+ // 拿老 triggerEvent 反而会把窗口卡在它那个 seq 上。
426+ summarize ( session , undefined , { bypassPeak : capped } ) . catch ( ( error ) => {
427+ if ( disposed || error ?. name === "AbortError" ) return ;
428+ ctx . logger ?. warn ?. ( `dsh-mneme: deferred summarization failed: ${ String ( error ) } ` ) ;
429+ } ) ;
430+ } , delay ) ;
431+ timer ?. unref ?. ( ) ;
432+ deferredRuns . set ( session . id , timer ) ;
433+ }
434+
435+ async function summarize ( session , triggerEvent , opts = { } ) {
289436 if ( disposed || inFlight . has ( session . id ) ) return ;
290437
291438 const header = session . requestHeader ?. ( ) ?. config ;
@@ -318,6 +465,19 @@ export function createSummarizer(ctx, service, config) {
318465 // 游标刻意不消费:预算是「这个会话先不再蒸馏了」,把窗口留在原地,日后调高
319466 // 额度(或宿主重启)仍能蒸馏到它;这与 window-too-small 主动消费游标相反——
320467 // 后者是「这些事件不值得蒸馏」,留着只会每个 turn/end 重评一次。
468+ // Issue #239(第 4 项,错峰队列):高峰期不调模型——只登记一行 skip 审计并择时
469+ // 补跑。游标刻意不消费:窗口继续累积,留到非高峰一次性蒸馏(批量比逐轮碎蒸更
470+ // 省)。被 maxDefer 截断后到点仍处高峰时,由 opts.bypassPeak 放行。
471+ if ( ! opts . bypassPeak && isInPeakWindow ( new Date ( now ( ) ) , config . summarizePeakHours ?? "" ) ) {
472+ writeAudit ( {
473+ timestamp : new Date ( now ( ) ) . toISOString ( ) ,
474+ model_id : route ? `${ route . provider } :${ route . model } ` : "unknown" ,
475+ status : "skipped" ,
476+ error_message : "peak-hours"
477+ } ) ;
478+ scheduleDeferredRun ( session ) ;
479+ return ;
480+ }
321481 const prevRuns = runsUsed . get ( session . id ) ;
322482 const maxRuns = config . summarizeMaxRunsPerSession ?? 0 ;
323483 if ( maxRuns > 0 && ( prevRuns ?? 0 ) >= maxRuns ) {
@@ -618,6 +778,8 @@ export function createSummarizer(ctx, service, config) {
618778 if ( disposed ) return ;
619779 disposed = true ;
620780 unsubscribe ?. ( ) ;
781+ for ( const timer of deferredRuns . values ( ) ) clearTimer ( timer ) ;
782+ deferredRuns . clear ( ) ;
621783 for ( const controller of inFlight . values ( ) ) controller . abort ( ) ;
622784 inFlight . clear ( ) ;
623785 lastRunAt . clear ( ) ;
0 commit comments