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:
@@ -68,7 +68,7 @@ describe("validateTcpConfig", () => {
|
||||
const issues = validateTcpConfig(
|
||||
makeInput([
|
||||
{
|
||||
expect: { banner: { contains: "ESMTP" } },
|
||||
expect: { banner: [{ contains: "ESMTP" }] },
|
||||
id: "t1",
|
||||
tcp: { host: "127.0.0.1", port: 25 },
|
||||
type: "tcp",
|
||||
@@ -82,7 +82,7 @@ describe("validateTcpConfig", () => {
|
||||
const issues = validateTcpConfig(
|
||||
makeInput([
|
||||
{
|
||||
expect: { banner: { contains: "ESMTP" } },
|
||||
expect: { banner: [{ contains: "ESMTP" }] },
|
||||
id: "t1",
|
||||
tcp: { host: "127.0.0.1", port: 25, readBanner: true },
|
||||
type: "tcp",
|
||||
@@ -106,18 +106,18 @@ describe("validateTcpConfig", () => {
|
||||
expect(issues.some((i) => i.path.includes("connected"))).toBe(true);
|
||||
});
|
||||
|
||||
test("expect maxDurationMs 非数字", () => {
|
||||
test("expect durationMs 非 matcher", () => {
|
||||
const issues = validateTcpConfig(
|
||||
makeInput([
|
||||
{
|
||||
expect: { maxDurationMs: "slow" },
|
||||
expect: { durationMs: "slow" },
|
||||
id: "t1",
|
||||
tcp: { host: "127.0.0.1", port: 80 },
|
||||
type: "tcp",
|
||||
},
|
||||
]),
|
||||
);
|
||||
expect(issues.some((i) => i.path.includes("maxDurationMs"))).toBe(true);
|
||||
expect(issues.some((i) => i.path.includes("durationMs"))).toBe(true);
|
||||
});
|
||||
|
||||
test("expect 未知字段", () => {
|
||||
@@ -134,11 +134,11 @@ describe("validateTcpConfig", () => {
|
||||
expect(issues.some((i) => i.message.includes("未知字段"))).toBe(true);
|
||||
});
|
||||
|
||||
test("expect.banner match 正则非法", () => {
|
||||
test("expect.banner regex 正则非法", () => {
|
||||
const issues = validateTcpConfig(
|
||||
makeInput([
|
||||
{
|
||||
expect: { banner: { match: "[invalid" } },
|
||||
expect: { banner: [{ regex: "[invalid" }] },
|
||||
id: "t1",
|
||||
tcp: { host: "127.0.0.1", port: 25, readBanner: true },
|
||||
type: "tcp",
|
||||
|
||||
Reference in New Issue
Block a user