mirrors/pikasTech-unidesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: unify sentinel monitor checks

Browse Source
This commit is contained in:
Codex
2026-06-28 06:14:05 +00:00
parent 0840bf392c
commit e2890bac64
6 changed files with 734 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/src/hwlab-node-web-sentinel-service.ts
+156 -34
View File
@@ -92,7 +92,7 @@ export function loadWebProbeSentinelServiceConfig(spec: HwlabRuntimeLaneSpec, op
const plan = webProbeSentinelConfigPlan(spec, "status", sentinel.id);
const runtime = recordTarget(readSentinelConfigRefTarget(sentinel.configRefs.runtime));
const scenarios = scenarioArrayTarget(readSentinelConfigRefTarget(sentinel.configRefs.scenarios));
const reportViews = recordTarget(readSentinelConfigRefTarget(sentinel.configRefs.reportViews));
const reportViews = resolveReportViewsWithCheckCatalog(recordTarget(readSentinelConfigRefTarget(sentinel.configRefs.reportViews)));
const rawPublicExposure = recordTarget(readSentinelConfigRefTarget(sentinel.configRefs.publicExposure));
const publicExposure = effectiveWebProbeSentinelPublicExposure(spec, sentinel.id, rawPublicExposure);
const cicd = recordTarget(readSentinelConfigRefTarget(sentinel.configRefs.cicd));
@@ -268,6 +268,15 @@ export function createWebProbeSentinelService(options: WebProbeSentinelServiceOp
return service;
}
function resolveReportViewsWithCheckCatalog(reportViews: Record<string, unknown>): Record<string, unknown> {
const ref = stringOrNull(reportViews.checkCatalogRef);
if (ref === null) return reportViews;
return {
...reportViews,
checkCatalog: recordTarget(readSentinelConfigRefTarget(ref)),
};
}
export function startWebProbeSentinelHttpService(service: WebProbeSentinelService): { readonly url: string; readonly stop: () => void } {
const server = Bun.serve({
hostname: service.config.listenHost,
@@ -664,7 +673,7 @@ function runCounts(db: Database): Record<string, number> {
function dashboardOverview(config: WebProbeSentinelServiceConfig, db: Database, health: Record<string, unknown>, maintenance: MaintenanceState): Record<string, unknown> {
const latestRow = db.query("SELECT * FROM runs ORDER BY updated_at DESC LIMIT 1").get() as Record<string, unknown> | null;
const latestRun = latestRow === null ? null : dashboardRunSummary(config, db, latestRow);
const severityCounts = globalSeverityCounts(db);
const severityCounts = globalSeverityCounts(config, db);
const latestUpdatedAt = latestRow === null ? null : stringOrNull(latestRow.updated_at);
const latestRunAgeSeconds = latestUpdatedAt === null ? null : ageSeconds(latestUpdatedAt);
return {
@@ -744,7 +753,7 @@ function dashboardRunDetail(config: WebProbeSentinelServiceConfig, db: Database,
const row = readRunRow(db, runId);
if (row === null) return { ok: false, error: "run-not-found", runId, valuesRedacted: true };
const stored = readMetadata(db, `run.report.${runId}`) ?? {};
const findings = findingsForRun(db, runId, dashboardPageSize(config));
const findings = findingsForRun(config, db, runId, dashboardPageSize(config));
const views = record(stored.views);
return {
ok: true,
@@ -775,20 +784,24 @@ function dashboardFindings(config: WebProbeSentinelServiceConfig, db: Database,
const limit = dashboardPage(url, config).limit;
const filters = dashboardFindingFilters(url);
const where = findingWhereClause(filters);
const queryLimit = Math.min(dashboardMaxPageSize(config), Math.max(limit + 1, limit * 4));
const rows = db.query(`
SELECT f.finding_id, f.severity, r.scenario_id, SUM(f.count) AS count, COUNT(DISTINCT f.run_id) AS run_count,
SELECT f.finding_id,
(SELECT f2.severity FROM findings f2 JOIN runs r2 ON r2.id = f2.run_id WHERE f2.finding_id = f.finding_id AND r2.scenario_id = r.scenario_id ORDER BY f2.created_at DESC LIMIT 1) AS severity,
r.scenario_id, SUM(f.count) AS count, COUNT(DISTINCT f.run_id) AS run_count,
MAX(f.created_at) AS latest_at, MAX(f.summary) AS summary
FROM findings f
JOIN runs r ON r.id = f.run_id
${where.sql}
GROUP BY f.finding_id, f.severity, r.scenario_id
ORDER BY ${severityRankSql("f.severity")} DESC, latest_at DESC
GROUP BY f.finding_id, r.scenario_id
ORDER BY latest_at DESC
LIMIT ?
`).all(...where.params, limit) as Record<string, unknown>[];
`).all(...where.params, queryLimit) as Record<string, unknown>[];
const severityFilter = stringOrNull(filters.severity);
const items = rows.map((row) => {
const latestRun = latestRunForFinding(db, row);
const latestDetail = latestRun === null ? null : storedFindingDetailForRow(db, row, stringOrNull(latestRun.id));
return {
return enrichFindingWithCheck(config, {
code: stringOrNull(row.finding_id),
findingId: stringOrNull(row.finding_id),
severity: stringOrNull(row.severity),
@@ -806,8 +819,10 @@ function dashboardFindings(config: WebProbeSentinelServiceConfig, db: Database,
evidenceSummary: stringOrNull(latestDetail?.evidenceSummary),
traceability: latestRun === null ? null : runTraceability(config, latestRun),
valuesRedacted: true,
};
});
});
}).filter((item) => severityFilter === null || stringOrNull(item.checkLevel) === severityFilter || stringOrNull(item.severity) === severityFilter)
.sort(compareCheckFindingRows)
.slice(0, limit);
return {
ok: true,
contractVersion: DASHBOARD_CONTRACT_VERSION,
@@ -817,7 +832,7 @@ function dashboardFindings(config: WebProbeSentinelServiceConfig, db: Database,
filters,
page: {
limit,
hasMore: items.length === limit,
hasMore: rows.length === queryLimit,
sort: "severity",
direction: "desc",
},
@@ -871,7 +886,7 @@ function dashboardReportView(config: WebProbeSentinelServiceConfig, db: Database
function dashboardRunSummary(config: WebProbeSentinelServiceConfig, db: Database, row: Record<string, unknown>): Record<string, unknown> {
const id = stringOrNull(row.id);
const severityCounts = id === null ? {} : severityCountsForRun(db, id);
const severityCounts = id === null ? {} : severityCountsForRun(config, db, id);
const maxSeverity = maxSeverityFromCounts(severityCounts);
return {
id,
@@ -989,11 +1004,6 @@ function runWhereClause(filters: Record<string, unknown>): { readonly sql: strin
function findingWhereClause(filters: Record<string, unknown>): { readonly sql: string; readonly params: readonly (string | number)[] } {
const clauses: string[] = [];
const params: (string | number)[] = [];
const severity = stringOrNull(filters.severity);
if (severity !== null) {
clauses.push("f.severity = ?");
params.push(severity);
}
const code = stringOrNull(filters.code);
if (code !== null) {
clauses.push("f.finding_id = ?");
@@ -1052,15 +1062,15 @@ function readRunRow(db: Database, runId: string): Record<string, unknown> | null
return db.query("SELECT * FROM runs WHERE id = ?").get(runId) as Record<string, unknown> | null;
}
function findingsForRun(db: Database, runId: string, limit: number): readonly Record<string, unknown>[] {
function findingsForRun(config: WebProbeSentinelServiceConfig, db: Database, runId: string, limit: number): readonly Record<string, unknown>[] {
const rows = db.query("SELECT finding_id, severity, count, summary, report_json_sha256, created_at FROM findings WHERE run_id = ? ORDER BY created_at DESC LIMIT ?")
.all(runId, limit) as Record<string, unknown>[];
return rows.map((row) => enrichFindingRowWithStoredDetail(db, runId, row));
return rows.map((row) => enrichFindingRowWithStoredDetail(config, db, runId, row));
}
function enrichFindingRowWithStoredDetail(db: Database, runId: string, row: Record<string, unknown>): Record<string, unknown> {
function enrichFindingRowWithStoredDetail(config: WebProbeSentinelServiceConfig, db: Database, runId: string, row: Record<string, unknown>): Record<string, unknown> {
const detail = storedFindingDetailForRow(db, row, runId);
return {
return enrichFindingWithCheck(config, {
...row,
code: stringOrNull(row.finding_id),
findingId: stringOrNull(row.finding_id),
@@ -1070,7 +1080,7 @@ function enrichFindingRowWithStoredDetail(db: Database, runId: string, row: Reco
nextAction: stringOrNull(detail?.nextAction),
evidenceSummary: stringOrNull(detail?.evidenceSummary),
valuesRedacted: true,
};
});
}
function storedFindingDetailForRow(db: Database, row: Record<string, unknown>, runId: string | null): Record<string, unknown> | null {
@@ -1137,14 +1147,110 @@ function compactFindingEvidenceSummary(value: unknown): string | null {
return text.length > 240 ? `${text.slice(0, 239)}…` : text;
}
function globalSeverityCounts(db: Database): Record<string, number> {
const rows = db.query("SELECT severity, SUM(count) AS count FROM findings GROUP BY severity").all() as { severity: string; count: number }[];
return Object.fromEntries(rows.map((row) => [row.severity, Number(row.count)]));
function enrichFindingWithCheck(config: WebProbeSentinelServiceConfig, value: Record<string, unknown>): Record<string, unknown> {
const rawSeverity = stringOrNull(value.severity) ?? stringOrNull(value.level);
const check = checkForFinding(config, value);
const checkLevel = stringOrNull(check.level) ?? normalizeCheckLevel(rawSeverity) ?? "unknown";
return {
...value,
rawSeverity,
severity: checkLevel,
level: checkLevel,
check,
checkId: stringOrNull(check.id),
checkCode: stringOrNull(check.code),
checkLevel,
checkTitleZh: stringOrNull(check.titleZh),
checkSummaryZh: stringOrNull(check.summaryZh),
checkRegistered: check.registered === true,
blocking: value.blocking === true || check.blocking === true,
valuesRedacted: true,
};
}
function severityCountsForRun(db: Database, runId: string): Record<string, number> {
const rows = db.query("SELECT severity, SUM(count) AS count FROM findings WHERE run_id = ? GROUP BY severity").all(runId) as { severity: string; count: number }[];
return Object.fromEntries(rows.map((row) => [row.severity, Number(row.count)]));
function checkForFinding(config: WebProbeSentinelServiceConfig, value: Record<string, unknown>): Record<string, unknown> {
const findingId = stringOrNull(value.finding_id) ?? stringOrNull(value.findingId) ?? stringOrNull(value.id) ?? stringOrNull(value.kind) ?? stringOrNull(value.code) ?? "unknown-check";
const entry = checkCatalogById(config).get(findingId) ?? null;
const rawLevel = normalizeCheckLevel(stringOrNull(value.severity) ?? stringOrNull(value.level));
if (entry === null) {
const summary = stringOrNull(value.summary) ?? stringOrNull(value.message) ?? findingId;
return {
id: findingId,
code: null,
level: rawLevel ?? "unknown",
titleZh: findingId,
summaryZh: summary.slice(0, 160),
blocking: value.blocking === true,
order: 10000,
registered: false,
valuesRedacted: true,
};
}
return {
id: stringOrNull(entry.id) ?? findingId,
code: stringOrNull(entry.code),
level: normalizeCheckLevel(stringOrNull(entry.level)) ?? rawLevel ?? "unknown",
titleZh: stringOrNull(entry.titleZh) ?? findingId,
summaryZh: stringOrNull(entry.summaryZh) ?? stringOrNull(value.summary) ?? stringOrNull(value.message) ?? findingId,
blocking: entry.blocking === true,
order: numberOr(entry.order, 10000),
registered: true,
valuesRedacted: true,
};
}
function checkCatalogById(config: WebProbeSentinelServiceConfig): Map<string, Record<string, unknown>> {
const catalog = record(config.reportViews.checkCatalog);
const items = arrayRecords(catalog.items);
const result = new Map<string, Record<string, unknown>>();
for (const item of items) {
const id = stringOrNull(item.id);
if (id !== null) result.set(id, item);
const aliases = Array.isArray(item.aliases) ? item.aliases : [];
for (const alias of aliases) {
if (typeof alias === "string" && alias.length > 0) result.set(alias, item);
}
}
return result;
}
function checkLevelCounts(config: WebProbeSentinelServiceConfig, rows: readonly Record<string, unknown>[]): Record<string, number> {
const counts: Record<string, number> = {};
for (const row of rows) {
const check = checkForFinding(config, row);
const level = stringOrNull(check.level) ?? normalizeCheckLevel(stringOrNull(row.severity)) ?? "unknown";
counts[level] = (counts[level] ?? 0) + numberOr(row.count, 1);
}
return counts;
}
function compareCheckFindingRows(left: Record<string, unknown>, right: Record<string, unknown>): number {
const severity = severityRank(stringOrNull(right.checkLevel) ?? stringOrNull(right.severity)) - severityRank(stringOrNull(left.checkLevel) ?? stringOrNull(left.severity));
if (severity !== 0) return severity;
const order = numberOr(record(left.check).order, 10000) - numberOr(record(right.check).order, 10000);
if (order !== 0) return order;
const rightTime = Date.parse(stringOrNull(right.latestAt) ?? "");
const leftTime = Date.parse(stringOrNull(left.latestAt) ?? "");
return (Number.isFinite(rightTime) ? rightTime : 0) - (Number.isFinite(leftTime) ? leftTime : 0);
}
function normalizeCheckLevel(value: string | null): string | null {
const normalized = (value ?? "").toLowerCase();
if (["critical", "fatal"].includes(normalized)) return "critical";
if (["red", "error", "failed", "blocked"].includes(normalized)) return "error";
if (["warning", "warn", "amber", "yellow"].includes(normalized)) return "warning";
if (["info", "notice"].includes(normalized)) return "info";
return null;
}
function globalSeverityCounts(config: WebProbeSentinelServiceConfig, db: Database): Record<string, number> {
const rows = db.query("SELECT finding_id, severity, count FROM findings").all() as Record<string, unknown>[];
return checkLevelCounts(config, rows);
}
function severityCountsForRun(config: WebProbeSentinelServiceConfig, db: Database, runId: string): Record<string, number> {
const rows = db.query("SELECT finding_id, severity, count FROM findings WHERE run_id = ?").all(runId) as Record<string, unknown>[];
return checkLevelCounts(config, rows);
}
function latestRunForFinding(db: Database, row: Record<string, unknown>): Record<string, unknown> | null {
@@ -1152,10 +1258,10 @@ function latestRunForFinding(db: Database, row: Record<string, unknown>): Record
SELECT r.*
FROM findings f
JOIN runs r ON r.id = f.run_id
WHERE f.finding_id = ? AND f.severity = ? AND r.scenario_id = ?
WHERE f.finding_id = ? AND r.scenario_id = ?
ORDER BY f.created_at DESC
LIMIT 1
`).get(stringOrNull(row.finding_id), stringOrNull(row.severity), stringOrNull(row.scenario_id)) as Record<string, unknown> | null;
`).get(stringOrNull(row.finding_id), stringOrNull(row.scenario_id)) as Record<string, unknown> | null;
}
function runTraceability(config: WebProbeSentinelServiceConfig, row: Record<string, unknown>): Record<string, unknown> {
@@ -1323,7 +1429,8 @@ function recordRunResult(config: WebProbeSentinelServiceConfig, db: Database, in
db.query("DELETE FROM findings WHERE run_id = ?").run(runId);
for (const item of findings) {
const findingId = stringOrNull(item.id) ?? stringOrNull(item.kind) ?? stringOrNull(item.code) ?? "finding";
const severity = stringOrNull(item.severity) ?? stringOrNull(item.level) ?? "unknown";
const check = checkForFinding(config, { ...item, id: findingId });
const severity = stringOrNull(check.level) ?? normalizeCheckLevel(stringOrNull(item.severity) ?? stringOrNull(item.level)) ?? "unknown";
const summary = stringOrNull(item.summary) ?? stringOrNull(item.message) ?? findingId;
db.query("INSERT INTO findings (run_id, finding_id, severity, count, summary, report_json_sha256, created_at) VALUES (?, ?, ?, ?, ?, ?, ?)")
.run(runId, findingId.slice(0, 160), severity.slice(0, 40), numberOr(item.count, 1), summary.slice(0, 500), reportJsonSha256, now);
@@ -1357,7 +1464,7 @@ function reportRunView(config: WebProbeSentinelServiceConfig, db: Database, view
const selectedRunId = stringOrNull(row.id);
if (selectedRunId === null) return { ok: false, error: "report-run-id-missing", view, valuesRedacted: true };
const stored = readMetadata(db, `run.report.${selectedRunId}`) ?? {};
const findings = findingsForRun(db, selectedRunId, 50);
const findings = findingsForRun(config, db, selectedRunId, 50);
const views = record(stored.views);
const storedView = record(views[view]);
const renderedText = typeof storedView.renderedText === "string" ? storedView.renderedText : view === "summary" ? renderStoredSummary(row, stored, findings) : view === "findings" ? renderStoredFindings(row, findings) : null;
@@ -1376,12 +1483,16 @@ function reportRunView(config: WebProbeSentinelServiceConfig, db: Database, view
}
function formatStoredFindingLine(item: Record<string, unknown>): string {
const check = record(item.check);
const code = stringOrNull(item.checkCode) ?? stringOrNull(check.code) ?? stringOrNull(item.finding_id) ?? stringOrNull(item.findingId) ?? stringOrNull(item.code) ?? "-";
const title = stringOrNull(item.checkTitleZh) ?? stringOrNull(check.titleZh) ?? stringOrNull(item.summary) ?? "";
const summary = stringOrNull(item.checkSummaryZh) ?? stringOrNull(check.summaryZh) ?? stringOrNull(item.summary) ?? "";
const rootCause = stringOrNull(item.rootCause);
const status = stringOrNull(item.rootCauseStatus);
const nextAction = stringOrNull(item.nextAction);
const evidence = stringOrNull(item.evidenceSummary);
return [
`${item.severity ?? "-"} ${item.finding_id ?? item.findingId ?? item.code ?? "-"} count=${item.count ?? "-"} ${item.summary ?? ""}`,
`${item.severity ?? "-"} ${code} ${title} count=${item.count ?? "-"} ${summary}`,
rootCause === null ? null : `rootCause=${rootCause}${status === null ? "" : ` status=${status}`}`,
evidence === null ? null : `evidence=${evidence}`,
nextAction === null ? null : `next=${nextAction}`,
@@ -1397,7 +1508,7 @@ function renderStoredSummary(row: Record<string, unknown>, stored: Record<string
`observer=${stringOrNull(row.observer_id) ?? "-"} stateDir=${stringOrNull(row.state_dir) ?? "-"}`,
`report=${stringOrNull(row.report_json_sha256) ?? "-"} artifacts=${String(row.artifact_count ?? 0)} findings=${String(row.finding_count ?? findings.length)}`,
`publicOrigin=${stringOrNull(stored.publicOrigin) ?? "-"}`,
`analysisWindow=${JSON.stringify(record(summary.analysisWindow))}`,
`analysisWindow=${formatStoredAnalysisWindow(summary.analysisWindow)}`,
"",
"Findings",
findings.length === 0 ? "-" : findings.slice(0, 12).map(formatStoredFindingLine).join("\n"),
@@ -1413,6 +1524,17 @@ function renderStoredFindings(row: Record<string, unknown>, findings: readonly R
].join("\n");
}
function formatStoredAnalysisWindow(value: unknown): string {
const window = record(value);
const fields = [
["start", stringOrNull(window.start)],
["end", stringOrNull(window.end)],
["samples", numberOr(window.sampleCount, numberOr(window.samples, -1)) >= 0 ? String(numberOr(window.sampleCount, numberOr(window.samples, 0))) : null],
["durationMs", numberOr(window.durationMs, -1) >= 0 ? String(numberOr(window.durationMs, 0)) : null],
].filter((entry): entry is [string, string] => entry[1] !== null);
return fields.length === 0 ? "-" : fields.map(([key, item]) => `${key}=${item}`).join(" ");
}
function thisMaintenanceFlag(input: Record<string, unknown>): number {
return input.maintenance === true ? 1 : 0;
}