lanyuanxiaoyao/DiAL
1
0
Fork 0
Code Activity

refactor: ICMP checker type 从 ping 统一改为 icmp，修复前端 UI 细节

Browse Source 
- ICMP checker 的 type/configKey/YAML 配置键/接口属性名从 ping 改为 icmp
- IcmpChecker 添加 platform 构造函数注入，修复 Windows 测试兼容性
- 前端 target 表格延迟列优化：标题简化为「延迟」，单位下移到单元格，宽度 80px
- Drawer 概览页 Descriptions 添加 tableLayout=auto 收窄 label 宽度
- 同步更新 README.md、DEVELOPMENT.md、probes.example.yaml、JSON Schema 和全部测试
This commit is contained in:
兰缘小妖
2026-05-20 00:02:23 +08:00
parent 375dd3492b
commit 9b53c746f6
23 changed files with 239 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
tests/server/checker/config-loader.test.ts
View File

@@ -2009,14 +2009,14 @@ targets:
expect(t.expect?.durationMs).toEqual({ lte: 5000 });
});
test("解析最简 ping 配置", async () => {
const configPath = join(tempDir, "minimal-ping.yaml");
test("解析最简 icmp 配置", async () => {
const configPath = join(tempDir, "minimal-icmp.yaml");
await writeFile(
configPath,
`targets:
- id: "gateway"
type: ping
ping:
type: icmp
icmp:
host: "10.0.0.1"
`,
);
@@ -2024,21 +2024,21 @@ targets:
const config = await loadConfig(configPath);
expect(config.targets).toHaveLength(1);
const t = config.targets[0]! as ResolvedPingTarget;
expect(t.type).toBe("ping");
expect(t.ping).toEqual({ count: 3, host: "10.0.0.1", packetSize: 56 });
expect(t.type).toBe("icmp");
expect(t.icmp).toEqual({ count: 3, host: "10.0.0.1", packetSize: 56 });
expect(t.group).toBe("default");
expect(t.intervalMs).toBe(30000);
expect(t.timeoutMs).toBe(10000);
});
test("解析 ping expect 配置", async () => {
const configPath = join(tempDir, "ping-expect.yaml");
test("解析 icmp expect 配置", async () => {
const configPath = join(tempDir, "icmp-expect.yaml");
await writeFile(
configPath,
`targets:
- id: "gateway"
type: ping
ping:
type: icmp
icmp:
host: "10.0.0.1"
count: 5
packetSize: 1472
@@ -2057,7 +2057,7 @@ targets:
const config = await loadConfig(configPath);
const t = config.targets[0]! as ResolvedPingTarget;
expect(t.ping).toEqual({ count: 5, host: "10.0.0.1", packetSize: 1472 });
expect(t.icmp).toEqual({ count: 5, host: "10.0.0.1", packetSize: 1472 });
expect(t.expect).toEqual({
alive: true,
avgLatencyMs: { lte: 200 },
@@ -2067,39 +2067,39 @@ targets:
});
});
test("ping 缺少 host 抛出错误", async () => {
test("icmp 缺少 host 抛出错误", async () => {
await expectConfigError(
"ping-no-host.yaml",
"icmp-no-host.yaml",
`targets:
- id: "gateway"
type: ping
ping: {}
type: icmp
icmp: {}
`,
"ping.host",
"icmp.host",
);
});
test("ping count 非法抛出错误", async () => {
test("icmp count 非法抛出错误", async () => {
await expectConfigError(
"ping-bad-count.yaml",
"icmp-bad-count.yaml",
`targets:
- id: "gateway"
type: ping
ping:
type: icmp
icmp:
host: "10.0.0.1"
count: 0
`,
"ping.count",
"icmp.count",
);
});
test("ping expect 未知字段抛出错误", async () => {
test("icmp expect 未知字段抛出错误", async () => {
await expectConfigError(
"ping-unknown-expect.yaml",
"icmp-unknown-expect.yaml",
`targets:
- id: "gateway"
type: ping
ping:
type: icmp
icmp:
host: "10.0.0.1"
expect:
status: [200]

6
tests/server/checker/runner/icmp/command.test.ts
View File

@@ -8,12 +8,12 @@ function makeTarget(overrides?: Partial<ResolvedPingTarget>): ResolvedPingTarget
return {
description: null,
group: "default",
icmp: { count: 3, host: "10.0.0.1", packetSize: 56 },
id: "test",
intervalMs: 30000,
name: null,
ping: { count: 3, host: "10.0.0.1", packetSize: 56 },
timeoutMs: 10000,
type: "ping",
type: "icmp",
...overrides,
};
}
@@ -46,7 +46,7 @@ describe("buildPingCommand", () => {
test("自定义 count 和 packetSize", () => {
const cmd = buildPingCommand(
makeTarget({ ping: { count: 5, host: "10.0.0.1", packetSize: 1472 }, timeoutMs: 5000 }),
makeTarget({ icmp: { count: 5, host: "10.0.0.1", packetSize: 1472 }, timeoutMs: 5000 }),
"linux",
);
expect(cmd).toEqual(["ping", "-c", "5", "-s", "1472", "-W", "5", "10.0.0.1"]);

22
tests/server/checker/runner/icmp/execute.test.ts
View File

@@ -5,7 +5,7 @@ import type { CheckerContext } from "../../../../../src/server/checker/runner/ty
import { IcmpChecker } from "../../../../../src/server/checker/runner/icmp/execute";
const checker = new IcmpChecker();
const checker = new IcmpChecker("linux");
const originalSpawn = Bun.spawn;
afterEach(() => {
@@ -21,12 +21,12 @@ function makeTarget(overrides?: Partial<ResolvedPingTarget>): ResolvedPingTarget
return {
description: null,
group: "default",
icmp: { count: 3, host: "127.0.0.1", packetSize: 56 },
id: "ping-local",
intervalMs: 30000,
name: null,
ping: { count: 3, host: "127.0.0.1", packetSize: 56 },
timeoutMs: 10000,
type: "ping",
type: "icmp",
...overrides,
};
}
@@ -94,16 +94,16 @@ rtt min/avg/max/mdev = 1.234/156.000/340.000/0.567 ms`);
mockSpawn("unexpected output");
const result = await checker.execute(makeTarget(), makeCtx());
expect(result.matched).toBe(false);
expect(result.failure).toMatchObject({ kind: "error", path: "parse", phase: "ping" });
expect(result.failure).toMatchObject({ kind: "error", path: "parse", phase: "icmp" });
});
test("spawn 失败返回 ping 命令不可用", async () => {
test("spawn 失败返回 icmp 命令不可用", async () => {
Bun.spawn = mock(() => {
throw new Error("ENOENT");
});
const result = await checker.execute(makeTarget(), makeCtx());
expect(result.matched).toBe(false);
expect(result.failure?.message).toContain("ping 命令不可用");
expect(result.failure?.message).toContain("icmp 命令不可用");
expect(result.observation).toBeNull();
});
@@ -113,23 +113,23 @@ rtt min/avg/max/mdev = 1.234/156.000/340.000/0.567 ms`);
controller.abort();
const result = await checker.execute(makeTarget(), { signal: controller.signal });
expect(result.matched).toBe(false);
expect(result.failure).toMatchObject({ path: "timeout", phase: "ping" });
expect(result.failure).toMatchObject({ path: "timeout", phase: "icmp" });
});
});
describe("IcmpChecker resolve", () => {
test("解析默认值", () => {
const target = checker.resolve(
{ id: "ping", ping: { host: "10.0.0.1" }, type: "ping" },
{ icmp: { host: "10.0.0.1" }, id: "ping", type: "icmp" },
{ configDir: "/tmp", defaultIntervalMs: 30000, defaults: {}, defaultTimeoutMs: 10000 },
);
expect(target.ping).toEqual({ count: 3, host: "10.0.0.1", packetSize: 56 });
expect(target.icmp).toEqual({ count: 3, host: "10.0.0.1", packetSize: 56 });
expect(target.group).toBe("default");
});
test("serialize 返回摘要和配置", () => {
const serialized = checker.serialize(makeTarget({ ping: { count: 5, host: "10.0.0.1", packetSize: 1472 } }));
expect(serialized.target).toBe("ping 10.0.0.1");
const serialized = checker.serialize(makeTarget({ icmp: { count: 5, host: "10.0.0.1", packetSize: 1472 } }));
expect(serialized.target).toBe("icmp 10.0.0.1");
expect(JSON.parse(serialized.config)).toEqual({ count: 5, host: "10.0.0.1", packetSize: 1472 });
});
});

40
tests/server/checker/runner/icmp/validate.test.ts
View File

@@ -10,61 +10,61 @@ function validate(target: RawTargetConfig) {
describe("validatePingConfig", () => {
test("有效配置无错误", () => {
expect(validate({ id: "ping", ping: { count: 3, host: "127.0.0.1", packetSize: 56 }, type: "ping" })).toEqual([]);
expect(validate({ icmp: { count: 3, host: "127.0.0.1", packetSize: 56 }, id: "icmp", type: "icmp" })).toEqual([]);
});
test("host 缺失", () => {
const issues = validate({ id: "ping", ping: {}, type: "ping" });
expect(issues.some((item) => item.path.endsWith("ping.host"))).toBe(true);
const issues = validate({ icmp: {}, id: "icmp", type: "icmp" });
expect(issues.some((item) => item.path.endsWith("icmp.host"))).toBe(true);
});
test("host 类型非法", () => {
const issues = validate({ id: "ping", ping: { host: 123 }, type: "ping" });
expect(issues.some((item) => item.path.endsWith("ping.host"))).toBe(true);
const issues = validate({ icmp: { host: 123 }, id: "icmp", type: "icmp" });
expect(issues.some((item) => item.path.endsWith("icmp.host"))).toBe(true);
});
test("count 非法", () => {
const issues = validate({ id: "ping", ping: { count: 0, host: "127.0.0.1" }, type: "ping" });
expect(issues.some((item) => item.path.endsWith("ping.count"))).toBe(true);
const issues = validate({ icmp: { count: 0, host: "127.0.0.1" }, id: "icmp", type: "icmp" });
expect(issues.some((item) => item.path.endsWith("icmp.count"))).toBe(true);
});
test("packetSize 非法", () => {
const issues = validate({ id: "ping", ping: { host: "127.0.0.1", packetSize: 65501 }, type: "ping" });
expect(issues.some((item) => item.path.endsWith("ping.packetSize"))).toBe(true);
const issues = validate({ icmp: { host: "127.0.0.1", packetSize: 65501 }, id: "icmp", type: "icmp" });
expect(issues.some((item) => item.path.endsWith("icmp.packetSize"))).toBe(true);
});
test("ping 未知字段", () => {
const issues = validate({ id: "ping", ping: { host: "127.0.0.1", timeout: 5 }, type: "ping" });
expect(issues.some((item) => item.code === "unknown-field" && item.path.endsWith("ping.timeout"))).toBe(true);
test("icmp 未知字段", () => {
const issues = validate({ icmp: { host: "127.0.0.1", timeout: 5 }, id: "icmp", type: "icmp" });
expect(issues.some((item) => item.code === "unknown-field" && item.path.endsWith("icmp.timeout"))).toBe(true);
});
test("expect 未知字段", () => {
const issues = validate({ expect: { status: [200] }, id: "ping", ping: { host: "127.0.0.1" }, type: "ping" });
const issues = validate({ expect: { status: [200] }, icmp: { host: "127.0.0.1" }, id: "icmp", type: "icmp" });
expect(issues.some((item) => item.path.endsWith("expect.status"))).toBe(true);
});
test("expect 数值旧字段非法", () => {
const issues = validate({ expect: { maxPacketLoss: 101 }, id: "ping", ping: { host: "127.0.0.1" }, type: "ping" });
const issues = validate({ expect: { maxPacketLoss: 101 }, icmp: { host: "127.0.0.1" }, id: "icmp", type: "icmp" });
expect(issues.some((item) => item.path.endsWith("expect.maxPacketLoss"))).toBe(true);
});
test("durationMs 数组简写非法", () => {
const issues = validate({ expect: { durationMs: [1, 2] }, id: "ping", ping: { host: "127.0.0.1" }, type: "ping" });
const issues = validate({ expect: { durationMs: [1, 2] }, icmp: { host: "127.0.0.1" }, id: "icmp", type: "icmp" });
expect(issues.some((item) => item.path.endsWith("expect.durationMs"))).toBe(true);
});
test("avgLatencyMs 对象简写非法", () => {
const issues = validate({
expect: { avgLatencyMs: { foo: "bar" } },
id: "ping",
ping: { host: "127.0.0.1" },
type: "ping",
icmp: { host: "127.0.0.1" },
id: "icmp",
type: "icmp",
});
expect(issues.some((item) => item.path.endsWith("expect.avgLatencyMs.foo"))).toBe(true);
});
test("host 为空字符串", () => {
const issues = validate({ id: "ping", ping: { host: " " }, type: "ping" });
expect(issues.some((item) => item.path.endsWith("ping.host"))).toBe(true);
const issues = validate({ icmp: { host: " " }, id: "icmp", type: "icmp" });
expect(issues.some((item) => item.path.endsWith("icmp.host"))).toBe(true);
});
});

10
tests/server/checker/runner/registry.test.ts
View File

@@ -67,8 +67,8 @@ describe("CheckerRegistry", () => {
const second = createDefaultCheckerRegistry();
first.register(createChecker("custom"));
expect(first.supportedTypes).toEqual(["http", "cmd", "db", "tcp", "ping", "udp", "llm", "custom"]);
expect(second.supportedTypes).toEqual(["http", "cmd", "db", "tcp", "ping", "udp", "llm"]);
expect(first.supportedTypes).toEqual(["http", "cmd", "db", "tcp", "icmp", "udp", "llm", "custom"]);
expect(second.supportedTypes).toEqual(["http", "cmd", "db", "tcp", "icmp", "udp", "llm"]);
expect(
first.definitions.every(
(checker) => checker.schemas.config && checker.schemas.defaults && checker.schemas.expect,
@@ -76,9 +76,9 @@ describe("CheckerRegistry", () => {
).toBe(true);
});
test("默认 registry 注册 ping type", () => {
test("默认 registry 注册 icmp type", () => {
const registry = createDefaultCheckerRegistry();
expect(registry.supportedTypes).toContain("ping");
expect(registry.get("ping").configKey).toBe("ping");
expect(registry.supportedTypes).toContain("icmp");
expect(registry.get("icmp").configKey).toBe("icmp");
});
});

6
tests/server/checker/runner/shared/value-matcher-shorthand.test.ts
View File

@@ -40,9 +40,9 @@ describe("ValueMatcher primitive shorthand in checker validators", () => {
},
{
expect: { avgLatencyMs: 1, durationMs: 100, maxLatencyMs: 2, packetLossPercent: 0 },
id: "ping",
ping: { host: "127.0.0.1" },
type: "ping",
icmp: { host: "127.0.0.1" },
id: "icmp",
type: "icmp",
validate: validatePingConfig,
},
{

10
tests/web/constants/target-table-columns.test.ts
View File

@@ -121,16 +121,16 @@ describe("createTargetTableColumns", () => {
rowIndex: 0,
});
expect(element.props.children).toBe("9999+");
expect(element.props.children).toEqual(["9999+", " ms"]);
expect(element.props.className).toContain("latency-value");
});
test("延迟列标题为 延迟(ms)", () => {
test("延迟列标题为 延迟", () => {
const latencyColumn = getColumn(createTargetTableColumns(["http"]), "latestCheck.durationMs");
expect(latencyColumn.title).toBe("延迟(ms)");
expect(latencyColumn.title).toBe("延迟");
});
test("延迟列正常值不包含 ms 单位", () => {
test("延迟列正常值包含 ms 单位", () => {
const latencyColumn = getColumn(createTargetTableColumns(["http"]), "latestCheck.durationMs");
const renderCell = latencyColumn.cell as (params: PrimaryTableCellParams<TargetStatus>) => {
props: { children: string; className: string };
@@ -150,7 +150,7 @@ describe("createTargetTableColumns", () => {
}),
rowIndex: 0,
});
expect(element.props.children).toBe("123");
expect(element.props.children).toEqual(["123", " ms"]);
});
test("名称列无排序配置", () => {