Skip to content

Commit 7e48c97

Browse files
committed
fix(dream): 错峰 helper 抽独立模块 peak-hours.js,消除 dream↔summarize 循环
review #320:#316 之后 summarize.js 反向依赖 dream.js(withEffortFallback 复用),dream 镜像错峰再 import summarize 会成真循环。把 parsePeakSpec / isInPeakWindow / nextOffPeakAt 抽到零依赖模块 src/peak-hours.js(纯搬移), summarize.js import + re-export 兼容既有调用方与测试,dream.js 改从新模块 import。顺带修正原注释里「summarize 不反向依赖 dream」的过时事实。
1 parent deee4bd commit 7e48c97

6 files changed

Lines changed: 262 additions & 232 deletions

File tree

‎dsh-mneme/lib/dream.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ import { validateDecisions, applyDecisions } from "./dream/decisions.js";
22
import { clusterMemories, findPotentialConflicts, cosineSimilarity } from "./dream/clustering.js";
33
import { clusterByTag, intersectEvidence } from "./dream/narratives.js";
44
import { scopeKeyOf } from "./scope.js";
5-
// Issue #239(第 4 项)镜像到巩固:错峰时段解析与「最近的高峰结束时刻」直接复用
6-
// 蒸馏侧已导出的纯函数,不另写一份解析器——两份实现漂移会让「同一个时段串在两处
7-
// 行为不同」,那比没有这个功能更糟。summarize.js 只依赖 dsh-llm 与 lang.js,
8-
// 不反向依赖 dream.js,无循环引用。
9-
import { isInPeakWindow, nextOffPeakAt } from "./summarize.js";
5+
// Issue #239(第 4 项)镜像到巩固:错峰时段解析与「最近的高峰结束时刻」从独立的
6+
// 零依赖模块 peak-hours.js 取(该模块从 summarize.js 抽出,PR #320 review)——
7+
// 不另写一份解析器,两份实现漂移会让「同一个时段串在两处行为不同」,那比没有
8+
// 这个功能更糟。此前直接 import summarize.js,#316 后 summarize 反向依赖 dream
9+
// (withEffortFallback 复用),会成真循环,故抽模块。
10+
import { isInPeakWindow, nextOffPeakAt } from "./peak-hours.js";
1011
import { createHash, randomUUID } from "node:crypto";
1112
import { STR, langOf } from "./lang.js";
1213
export { validateDecisions, applyDecisions, withEffortFallback, describeStreamFailure, resolveDreamEffort, resolveRoute };

‎dsh-mneme/lib/peak-hours.js‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
// 高峰时段(peak hours)解析与判定——纯函数模块,零依赖。
2+
//
3+
// 从 summarize.js 抽出(PR #320 review):#316 之后 summarize.js 反向依赖
4+
// dream.js(withEffortFallback 复用),dream 镜像错峰时再 import summarize
5+
// 会成真循环。时段调度本来就不是蒸馏的私有语义,独立成模块后两侧都从这里
6+
// import,循环消失。re-export 兼容留在 summarize.js,调用方零改动。
7+
//
8+
// Issue #239(第 4 项,错峰队列):高峰时段解析与判定。纯函数、可单测——排程
9+
// 判断不绑死真实时钟,测试才能确定性地覆盖跨零点、多段、星期过滤与非法写法。
10+
// spec 语法:`[<星期> ]<时段>[,<时段>...]`,星期前缀可省(省 = 每天):
11+
// "09:00-18:00" 每天 09:00-18:00
12+
// "mon-fri 08:00-12:00,14:00-18:00" 工作日两段(ISO 1=周一…7=周日,也认 mon..sun)
13+
// "sat,sun 23:00-06:00" 周末跨零点段
14+
// 时间取宿主本地时区。任一写法非法 → 整串视为未配置(返回 null):排程是省钱手段,
15+
// 绝不该因为写错格式把蒸馏/巩固停掉。
16+
const DAY_NAMES = { mon: 1, tue: 2, wed: 3, thu: 4, fri: 5, sat: 6, sun: 7 };
17+
18+
function parseDayToken(token) {
19+
const days = new Set();
20+
const normalize = (value) => (/^\d$/.test(value) ? Number(value) : DAY_NAMES[value] ?? null);
21+
for (const piece of token.split(",")) {
22+
const matched = /^([a-z]{3}|\d)(?:-([a-z]{3}|\d))?$/.exec(piece.trim().toLowerCase());
23+
if (!matched) return null;
24+
const from = normalize(matched[1]);
25+
const to = matched[2] === undefined ? from : normalize(matched[2]);
26+
if (from === null || to === null || from < 1 || from > 7 || to < 1 || to > 7) return null;
27+
// 支持跨周环绕(fri-mon):从 from 起逐天推进到 to,最多绕一圈。
28+
for (let day = from; ; day = (day % 7) + 1) {
29+
days.add(day);
30+
if (day === to) break;
31+
}
32+
}
33+
return days.size > 0 ? [...days].sort((a, b) => a - b) : null;
34+
}
35+
36+
/** JS 的 getDay() 是 0=周日…6=周六;这里统一成 ISO(1=周一…7=周日)。 */
37+
function isoDay(date) {
38+
const day = date.getDay();
39+
return day === 0 ? 7 : day;
40+
}
41+
42+
export function parsePeakSpec(spec) {
43+
if (typeof spec !== "string" || spec.trim() === "") return null;
44+
let rest = spec.trim();
45+
let days = null;
46+
// 星期前缀 = 第一个空白之前的部分,但**头段含冒号就不是前缀**(那是时段本身,
47+
// 例如 "09:00-12:00, 14:00-18:00" 里的逗号空格)。前缀解析失败一律按未配置处理,
48+
// 不做猜测——宁可不省,也不能误停。
49+
const sep = rest.search(/\s/);
50+
if (sep > 0) {
51+
const head = rest.slice(0, sep);
52+
if (!head.includes(":")) {
53+
days = parseDayToken(head);
54+
if (days === null) return null;
55+
rest = rest.slice(sep).trim();
56+
}
57+
}
58+
const windows = [];
59+
for (const part of rest.split(",")) {
60+
const matched = /^\s*(\d{1,2}):(\d{2})\s*-\s*(\d{1,2}):(\d{2})\s*$/.exec(part);
61+
if (!matched) return null;
62+
const [sh, sm, eh, em] = [Number(matched[1]), Number(matched[2]), Number(matched[3]), Number(matched[4])];
63+
if (sh > 23 || eh > 23 || sm > 59 || em > 59) return null;
64+
const start = sh * 60 + sm;
65+
const end = eh * 60 + em;
66+
if (start === end) return null;
67+
windows.push({ start, end });
68+
}
69+
return windows.length > 0 ? { days, windows } : null;
70+
}
71+
72+
/**
73+
* 该时刻是否落在高峰内。跨零点段(start > end)按「窗口所属的那一天」认星期:
74+
* `mon-fri 23:00-06:00` 的周六 02:00 属于周五开的那个窗口,仍算高峰。
75+
*/
76+
export function isInPeakWindow(date, spec) {
77+
const parsed = parsePeakSpec(spec);
78+
if (!parsed) return false;
79+
const minutes = date.getHours() * 60 + date.getMinutes();
80+
const today = isoDay(date);
81+
const yesterday = today === 1 ? 7 : today - 1;
82+
const allowed = (day) => !parsed.days || parsed.days.includes(day);
83+
return parsed.windows.some(({ start, end }) => {
84+
if (start < end) return minutes >= start && minutes < end && allowed(today);
85+
return (minutes >= start && allowed(today)) || (minutes < end && allowed(yesterday));
86+
});
87+
}
88+
89+
/**
90+
* 高峰内则返回「距当前最近的一个高峰结束时刻」(择时补跑用),否则 null。
91+
* 落在多个时段重叠处时取最早结束的那个——早跑不亏,晚跑才亏。
92+
*/
93+
export function nextOffPeakAt(date, spec) {
94+
const parsed = parsePeakSpec(spec);
95+
if (!parsed) return null;
96+
const minutes = date.getHours() * 60 + date.getMinutes();
97+
const today = isoDay(date);
98+
const yesterday = today === 1 ? 7 : today - 1;
99+
const allowed = (day) => !parsed.days || parsed.days.includes(day);
100+
let bestDelta = null;
101+
const consider = (delta) => {
102+
if (bestDelta === null || delta < bestDelta) bestDelta = delta;
103+
};
104+
for (const { start, end } of parsed.windows) {
105+
if (start < end) {
106+
if (minutes >= start && minutes < end && allowed(today)) consider(end - minutes);
107+
continue;
108+
}
109+
if (minutes >= start && allowed(today)) consider((1440 - minutes) + end);
110+
else if (minutes < end && allowed(yesterday)) consider(end - minutes);
111+
}
112+
if (bestDelta === null) return null;
113+
const at = new Date(date.getTime());
114+
at.setSeconds(0, 0);
115+
at.setMinutes(at.getMinutes() + bestDelta);
116+
return at;
117+
}

‎dsh-mneme/lib/summarize.js‎

Lines changed: 8 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -260,117 +260,14 @@ function enqueueDistill(task, intervalMs = 0) {
260260
return run;
261261
}
262262

263-
// Issue #239(第 4 项,错峰队列):高峰时段解析与判定。纯函数、可单测——排程判断
264-
// 不绑死真实时钟,测试才能确定性地覆盖跨零点、多段、星期过滤与非法写法。
265-
// spec 语法:`[<星期> ]<时段>[,<时段>...]`,星期前缀可省(省 = 每天):
266-
// "09:00-18:00" 每天 09:00-18:00
267-
// "mon-fri 08:00-12:00,14:00-18:00" 工作日两段(ISO 1=周一…7=周日,也认 mon..sun)
268-
// "sat,sun 23:00-06:00" 周末跨零点段
269-
// 时间取宿主本地时区。任一写法非法 → 整串视为未配置(返回 null):排程是省钱手段,
270-
// 绝不该因为写错格式把蒸馏停掉。
271-
const DAY_NAMES = { mon: 1, tue: 2, wed: 3, thu: 4, fri: 5, sat: 6, sun: 7 };
272-
273-
function parseDayToken(token) {
274-
const days = new Set();
275-
const normalize = (value) => (/^\d$/.test(value) ? Number(value) : DAY_NAMES[value] ?? null);
276-
for (const piece of token.split(",")) {
277-
const matched = /^([a-z]{3}|\d)(?:-([a-z]{3}|\d))?$/.exec(piece.trim().toLowerCase());
278-
if (!matched) return null;
279-
const from = normalize(matched[1]);
280-
const to = matched[2] === undefined ? from : normalize(matched[2]);
281-
if (from === null || to === null || from < 1 || from > 7 || to < 1 || to > 7) return null;
282-
// 支持跨周环绕(fri-mon):从 from 起逐天推进到 to,最多绕一圈。
283-
for (let day = from; ; day = (day % 7) + 1) {
284-
days.add(day);
285-
if (day === to) break;
286-
}
287-
}
288-
return days.size > 0 ? [...days].sort((a, b) => a - b) : null;
289-
}
290-
291-
/** JS 的 getDay() 是 0=周日…6=周六;这里统一成 ISO(1=周一…7=周日)。 */
292-
function isoDay(date) {
293-
const day = date.getDay();
294-
return day === 0 ? 7 : day;
295-
}
296-
297-
export function parsePeakSpec(spec) {
298-
if (typeof spec !== "string" || spec.trim() === "") return null;
299-
let rest = spec.trim();
300-
let days = null;
301-
// 星期前缀 = 第一个空白之前的部分,但**头段含冒号就不是前缀**(那是时段本身,
302-
// 例如 "09:00-12:00, 14:00-18:00" 里的逗号空格)。前缀解析失败一律按未配置处理,
303-
// 不做猜测——宁可不省,也不能误停。
304-
const sep = rest.search(/\s/);
305-
if (sep > 0) {
306-
const head = rest.slice(0, sep);
307-
if (!head.includes(":")) {
308-
days = parseDayToken(head);
309-
if (days === null) return null;
310-
rest = rest.slice(sep).trim();
311-
}
312-
}
313-
const windows = [];
314-
for (const part of rest.split(",")) {
315-
const matched = /^\s*(\d{1,2}):(\d{2})\s*-\s*(\d{1,2}):(\d{2})\s*$/.exec(part);
316-
if (!matched) return null;
317-
const [sh, sm, eh, em] = [Number(matched[1]), Number(matched[2]), Number(matched[3]), Number(matched[4])];
318-
if (sh > 23 || eh > 23 || sm > 59 || em > 59) return null;
319-
const start = sh * 60 + sm;
320-
const end = eh * 60 + em;
321-
if (start === end) return null;
322-
windows.push({ start, end });
323-
}
324-
return windows.length > 0 ? { days, windows } : null;
325-
}
326-
327-
/**
328-
* 该时刻是否落在高峰内。跨零点段(start > end)按「窗口所属的那一天」认星期:
329-
* `mon-fri 23:00-06:00` 的周六 02:00 属于周五开的那个窗口,仍算高峰。
330-
*/
331-
export function isInPeakWindow(date, spec) {
332-
const parsed = parsePeakSpec(spec);
333-
if (!parsed) return false;
334-
const minutes = date.getHours() * 60 + date.getMinutes();
335-
const today = isoDay(date);
336-
const yesterday = today === 1 ? 7 : today - 1;
337-
const allowed = (day) => !parsed.days || parsed.days.includes(day);
338-
return parsed.windows.some(({ start, end }) => {
339-
if (start < end) return minutes >= start && minutes < end && allowed(today);
340-
return (minutes >= start && allowed(today)) || (minutes < end && allowed(yesterday));
341-
});
342-
}
343-
344-
/**
345-
* 高峰内则返回「距当前最近的一个高峰结束时刻」(择时补跑用),否则 null。
346-
* 落在多个时段重叠处时取最早结束的那个——早跑不亏,晚跑才亏。
347-
*/
348-
export function nextOffPeakAt(date, spec) {
349-
const parsed = parsePeakSpec(spec);
350-
if (!parsed) return null;
351-
const minutes = date.getHours() * 60 + date.getMinutes();
352-
const today = isoDay(date);
353-
const yesterday = today === 1 ? 7 : today - 1;
354-
const allowed = (day) => !parsed.days || parsed.days.includes(day);
355-
let bestDelta = null;
356-
const consider = (delta) => {
357-
if (bestDelta === null || delta < bestDelta) bestDelta = delta;
358-
};
359-
for (const { start, end } of parsed.windows) {
360-
if (start < end) {
361-
if (minutes >= start && minutes < end && allowed(today)) consider(end - minutes);
362-
continue;
363-
}
364-
if (minutes >= start && allowed(today)) consider((1440 - minutes) + end);
365-
else if (minutes < end && allowed(yesterday)) consider(end - minutes);
366-
}
367-
if (bestDelta === null) return null;
368-
const at = new Date(date.getTime());
369-
at.setSeconds(0, 0);
370-
at.setMinutes(at.getMinutes() + bestDelta);
371-
return at;
372-
}
373-
263+
// Issue #239(第 4 项,错峰队列):高峰时段解析与判定已抽到独立零依赖模块
264+
// src/peak-hours.js(PR #320 review:#316 后 summarize 反向依赖 dream,dream 镜像
265+
// 错峰再 import 本文件会成真循环;时段调度本就不是蒸馏私有语义)。这里 re-export
266+
// 兼容既有调用方与测试(test/summarize.test.js 从本文件 import),零改动。
267+
// 注意 re-export 不引入本地作用域——本文件 331/387 行仍调用这两个函数,
268+
// import + re-export 两行都要。
269+
import { parsePeakSpec, isInPeakWindow, nextOffPeakAt } from "./peak-hours.js";
270+
export { parsePeakSpec, isInPeakWindow, nextOffPeakAt };
374271
export function createSummarizer(ctx, service, config, deps = {}) {
375272
if (!config.autoSummarize) return { dispose: () => {} };
376273

‎dsh-mneme/src/dream.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ import { validateDecisions, applyDecisions } from "./dream/decisions.js";
22
import { clusterMemories, findPotentialConflicts, cosineSimilarity } from "./dream/clustering.js";
33
import { clusterByTag, intersectEvidence } from "./dream/narratives.js";
44
import { scopeKeyOf } from "./scope.js";
5-
// Issue #239(第 4 项)镜像到巩固:错峰时段解析与「最近的高峰结束时刻」直接复用
6-
// 蒸馏侧已导出的纯函数,不另写一份解析器——两份实现漂移会让「同一个时段串在两处
7-
// 行为不同」,那比没有这个功能更糟。summarize.js 只依赖 dsh-llm 与 lang.js,
8-
// 不反向依赖 dream.js,无循环引用。
9-
import { isInPeakWindow, nextOffPeakAt } from "./summarize.js";
5+
// Issue #239(第 4 项)镜像到巩固:错峰时段解析与「最近的高峰结束时刻」从独立的
6+
// 零依赖模块 peak-hours.js 取(该模块从 summarize.js 抽出,PR #320 review)——
7+
// 不另写一份解析器,两份实现漂移会让「同一个时段串在两处行为不同」,那比没有
8+
// 这个功能更糟。此前直接 import summarize.js,#316 后 summarize 反向依赖 dream
9+
// (withEffortFallback 复用),会成真循环,故抽模块。
10+
import { isInPeakWindow, nextOffPeakAt } from "./peak-hours.js";
1011
import { createHash, randomUUID } from "node:crypto";
1112
import { STR, langOf } from "./lang.js";
1213
export { validateDecisions, applyDecisions, withEffortFallback, describeStreamFailure, resolveDreamEffort, resolveRoute };

‎dsh-mneme/src/peak-hours.js‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
// 高峰时段(peak hours)解析与判定——纯函数模块,零依赖。
2+
//
3+
// 从 summarize.js 抽出(PR #320 review):#316 之后 summarize.js 反向依赖
4+
// dream.js(withEffortFallback 复用),dream 镜像错峰时再 import summarize
5+
// 会成真循环。时段调度本来就不是蒸馏的私有语义,独立成模块后两侧都从这里
6+
// import,循环消失。re-export 兼容留在 summarize.js,调用方零改动。
7+
//
8+
// Issue #239(第 4 项,错峰队列):高峰时段解析与判定。纯函数、可单测——排程
9+
// 判断不绑死真实时钟,测试才能确定性地覆盖跨零点、多段、星期过滤与非法写法。
10+
// spec 语法:`[<星期> ]<时段>[,<时段>...]`,星期前缀可省(省 = 每天):
11+
// "09:00-18:00" 每天 09:00-18:00
12+
// "mon-fri 08:00-12:00,14:00-18:00" 工作日两段(ISO 1=周一…7=周日,也认 mon..sun)
13+
// "sat,sun 23:00-06:00" 周末跨零点段
14+
// 时间取宿主本地时区。任一写法非法 → 整串视为未配置(返回 null):排程是省钱手段,
15+
// 绝不该因为写错格式把蒸馏/巩固停掉。
16+
const DAY_NAMES = { mon: 1, tue: 2, wed: 3, thu: 4, fri: 5, sat: 6, sun: 7 };
17+
18+
function parseDayToken(token) {
19+
const days = new Set();
20+
const normalize = (value) => (/^\d$/.test(value) ? Number(value) : DAY_NAMES[value] ?? null);
21+
for (const piece of token.split(",")) {
22+
const matched = /^([a-z]{3}|\d)(?:-([a-z]{3}|\d))?$/.exec(piece.trim().toLowerCase());
23+
if (!matched) return null;
24+
const from = normalize(matched[1]);
25+
const to = matched[2] === undefined ? from : normalize(matched[2]);
26+
if (from === null || to === null || from < 1 || from > 7 || to < 1 || to > 7) return null;
27+
// 支持跨周环绕(fri-mon):从 from 起逐天推进到 to,最多绕一圈。
28+
for (let day = from; ; day = (day % 7) + 1) {
29+
days.add(day);
30+
if (day === to) break;
31+
}
32+
}
33+
return days.size > 0 ? [...days].sort((a, b) => a - b) : null;
34+
}
35+
36+
/** JS 的 getDay() 是 0=周日…6=周六;这里统一成 ISO(1=周一…7=周日)。 */
37+
function isoDay(date) {
38+
const day = date.getDay();
39+
return day === 0 ? 7 : day;
40+
}
41+
42+
export function parsePeakSpec(spec) {
43+
if (typeof spec !== "string" || spec.trim() === "") return null;
44+
let rest = spec.trim();
45+
let days = null;
46+
// 星期前缀 = 第一个空白之前的部分,但**头段含冒号就不是前缀**(那是时段本身,
47+
// 例如 "09:00-12:00, 14:00-18:00" 里的逗号空格)。前缀解析失败一律按未配置处理,
48+
// 不做猜测——宁可不省,也不能误停。
49+
const sep = rest.search(/\s/);
50+
if (sep > 0) {
51+
const head = rest.slice(0, sep);
52+
if (!head.includes(":")) {
53+
days = parseDayToken(head);
54+
if (days === null) return null;
55+
rest = rest.slice(sep).trim();
56+
}
57+
}
58+
const windows = [];
59+
for (const part of rest.split(",")) {
60+
const matched = /^\s*(\d{1,2}):(\d{2})\s*-\s*(\d{1,2}):(\d{2})\s*$/.exec(part);
61+
if (!matched) return null;
62+
const [sh, sm, eh, em] = [Number(matched[1]), Number(matched[2]), Number(matched[3]), Number(matched[4])];
63+
if (sh > 23 || eh > 23 || sm > 59 || em > 59) return null;
64+
const start = sh * 60 + sm;
65+
const end = eh * 60 + em;
66+
if (start === end) return null;
67+
windows.push({ start, end });
68+
}
69+
return windows.length > 0 ? { days, windows } : null;
70+
}
71+
72+
/**
73+
* 该时刻是否落在高峰内。跨零点段(start > end)按「窗口所属的那一天」认星期:
74+
* `mon-fri 23:00-06:00` 的周六 02:00 属于周五开的那个窗口,仍算高峰。
75+
*/
76+
export function isInPeakWindow(date, spec) {
77+
const parsed = parsePeakSpec(spec);
78+
if (!parsed) return false;
79+
const minutes = date.getHours() * 60 + date.getMinutes();
80+
const today = isoDay(date);
81+
const yesterday = today === 1 ? 7 : today - 1;
82+
const allowed = (day) => !parsed.days || parsed.days.includes(day);
83+
return parsed.windows.some(({ start, end }) => {
84+
if (start < end) return minutes >= start && minutes < end && allowed(today);
85+
return (minutes >= start && allowed(today)) || (minutes < end && allowed(yesterday));
86+
});
87+
}
88+
89+
/**
90+
* 高峰内则返回「距当前最近的一个高峰结束时刻」(择时补跑用),否则 null。
91+
* 落在多个时段重叠处时取最早结束的那个——早跑不亏,晚跑才亏。
92+
*/
93+
export function nextOffPeakAt(date, spec) {
94+
const parsed = parsePeakSpec(spec);
95+
if (!parsed) return null;
96+
const minutes = date.getHours() * 60 + date.getMinutes();
97+
const today = isoDay(date);
98+
const yesterday = today === 1 ? 7 : today - 1;
99+
const allowed = (day) => !parsed.days || parsed.days.includes(day);
100+
let bestDelta = null;
101+
const consider = (delta) => {
102+
if (bestDelta === null || delta < bestDelta) bestDelta = delta;
103+
};
104+
for (const { start, end } of parsed.windows) {
105+
if (start < end) {
106+
if (minutes >= start && minutes < end && allowed(today)) consider(end - minutes);
107+
continue;
108+
}
109+
if (minutes >= start && allowed(today)) consider((1440 - minutes) + end);
110+
else if (minutes < end && allowed(yesterday)) consider(end - minutes);
111+
}
112+
if (bestDelta === null) return null;
113+
const at = new Date(date.getTime());
114+
at.setSeconds(0, 0);
115+
at.setMinutes(at.getMinutes() + bestDelta);
116+
return at;
117+
}

0 commit comments

Comments
 (0)