refactor: 统一 expect 断言体系,引入共享 ValueMatcher/ContentRules/KeyValueExpect 模型
- 引入共享 ValueMatcher(equals/contains/regex/exists/empty/gt/gte/lt/lte) - 引入共享 ContentRules 数组(direct/json/css/xpath 提取器) - 引入共享 KeyValueExpect(动态键值断言,字面量等价 equals) - maxDurationMs → durationMs: ValueMatcher(所有 checker) - match → regex(固定无 flags) - Ping max* → packetLossPercent/avgLatencyMs/maxLatencyMs(ValueMatcher) - LLM finishReason/rawFinishReason → ValueMatcher - DB 新增 result: ContentRules - TCP banner → ContentRules 数组 - 删除旧模块:operator.ts、validate-operator.ts、duration.ts、body.ts、text.ts、output.ts - 更新全部 checker schema/validate/expect/execute - 更新 probe-config.schema.json、probes.example.yaml - 更新 README.md、DEVELOPMENT.md(含 expect 字段选择规范) - 同步 10 个 delta specs 到主 specs,归档 change
This commit is contained in:
@@ -250,7 +250,7 @@ describe("UdpChecker execute", () => {
|
||||
}
|
||||
});
|
||||
|
||||
it("should fail when duration exceeds maxDurationMs", async () => {
|
||||
it("should fail when duration exceeds durationMs", async () => {
|
||||
const server = await Bun.udpSocket({
|
||||
socket: {
|
||||
data() {
|
||||
@@ -266,7 +266,7 @@ describe("UdpChecker execute", () => {
|
||||
});
|
||||
try {
|
||||
const checker = new UdpChecker();
|
||||
const target = makeTarget({ port: server.port }, { maxDurationMs: 1, responded: false });
|
||||
const target = makeTarget({ port: server.port }, { durationMs: { lte: 1 }, responded: false });
|
||||
const controller = new AbortController();
|
||||
const timer = setTimeout(() => controller.abort(), 200);
|
||||
const result = await checker.execute(target, { signal: controller.signal });
|
||||
|
||||
@@ -76,13 +76,13 @@ describe("checkResponseText", () => {
|
||||
});
|
||||
|
||||
it("多条规则全部匹配", () => {
|
||||
const result = checkResponseText("hello world", [{ contains: "hello" }, { match: "^hello" }]);
|
||||
const result = checkResponseText("hello world", [{ contains: "hello" }, { regex: "^hello" }]);
|
||||
expect(result.matched).toBe(true);
|
||||
expect(result.failure).toBeNull();
|
||||
});
|
||||
|
||||
it("多条规则第二条失败 → 不匹配", () => {
|
||||
const result = checkResponseText("hello world", [{ contains: "hello" }, { match: "^world" }]);
|
||||
const result = checkResponseText("hello world", [{ contains: "hello" }, { regex: "^world" }]);
|
||||
expect(result.matched).toBe(false);
|
||||
expect(result.failure!.phase).toBe("response");
|
||||
expect(result.failure!.path).toBe("response[1]");
|
||||
|
||||
@@ -213,12 +213,12 @@ describe("validateUdpConfig", () => {
|
||||
expect(issues.some((i) => i.path.includes("responded") && i.message.includes("响应来源"))).toBe(true);
|
||||
});
|
||||
|
||||
it("reports invalid-type for negative expect.maxDurationMs", () => {
|
||||
it("reports invalid-type for non-matcher expect.durationMs", () => {
|
||||
const issues = validateUdpConfig(
|
||||
makeInput({
|
||||
targets: [
|
||||
{
|
||||
expect: { maxDurationMs: -100 },
|
||||
expect: { durationMs: -100 },
|
||||
id: "test",
|
||||
type: "udp",
|
||||
udp: { host: "127.0.0.1", port: 53 },
|
||||
@@ -226,7 +226,7 @@ describe("validateUdpConfig", () => {
|
||||
],
|
||||
}),
|
||||
);
|
||||
expect(issues.some((i) => i.code === "invalid-type" && i.path.includes("maxDurationMs"))).toBe(true);
|
||||
expect(issues.some((i) => i.code === "invalid-type" && i.path.includes("durationMs"))).toBe(true);
|
||||
});
|
||||
|
||||
it("reports invalid-type for non-boolean expect.responded", () => {
|
||||
|
||||
Reference in New Issue
Block a user