From 5e5ef4361ab387a360443ecc1f9af92b9a9bfaf9 Mon Sep 17 00:00:00 2001 From: bymyself Date: Fri, 18 Sep 2026 10:41:31 -0700 Subject: [PATCH 1/3] test: reproduce strict draft-07 schema failure --- package-lock.json | 26 ++++++++++++++++++ package.json | 1 + test/event-schema.regression.test.ts | 41 ++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 test/event-schema.regression.test.ts diff --git a/package-lock.json b/package-lock.json index a474b24..4d0c7da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "@stryker-mutator/vitest-runner": "^10.0.0", "@types/node": "^26.3.0", "@typescript-eslint/parser": "^8.68.0", + "ajv6": "npm:ajv@6.15.0", "dependency-cruiser": "^18.2.0", "eslint": "^9.39.5", "eslint-plugin-sonarjs": "^3.0.7", @@ -2081,6 +2082,31 @@ "url": "https://github.com/sponsors/epoberezkin" } }, + "node_modules/ajv6": { + "name": "ajv", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz", + "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ajv6/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, "node_modules/angular-html-parser": { "version": "10.11.0", "resolved": "https://registry.npmjs.org/angular-html-parser/-/angular-html-parser-10.11.0.tgz", diff --git a/package.json b/package.json index a18f5a7..24551a7 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ "@stryker-mutator/vitest-runner": "^10.0.0", "@types/node": "^26.3.0", "@typescript-eslint/parser": "^8.68.0", + "ajv6": "npm:ajv@6.15.0", "dependency-cruiser": "^18.2.0", "eslint": "^9.39.5", "eslint-plugin-sonarjs": "^3.0.7", diff --git a/test/event-schema.regression.test.ts b/test/event-schema.regression.test.ts new file mode 100644 index 0000000..50ac4e4 --- /dev/null +++ b/test/event-schema.regression.test.ts @@ -0,0 +1,41 @@ +/** + * Regression: the draft-07 export used the post-draft-07 `$defs` keyword, so + * Ajv 6.15 rejected it when strict keyword checking was enabled. + * Source: PASS36-R102 / https://github.com/Comfy-Org/ComfyUI_frontend/pull/16644#discussion_r3926225065 + */ +import { readFileSync } from "node:fs"; +import { join } from "node:path"; +import Ajv from "ajv6"; +import { describe, expect, it } from "vitest"; +import { AGENT_EVENT_JSON_SCHEMA } from "../src/event-schema.js"; + +// This exact test-only alias preserves Ajv 6's strict draft-07 compatibility +// check without constraining newer validator tooling or adding a runtime dep. +const ajv = new Ajv({ strictKeywords: true }); + +describe("draft-07 event schema regression", () => { + it("regression: compiles with strict draft-07 keyword checking", () => { + expect(() => ajv.compile(AGENT_EVENT_JSON_SCHEMA)).not.toThrow(); + }); + + it("accepts every pinned golden event", () => { + const validate = ajv.compile(AGENT_EVENT_JSON_SCHEMA); + const events = readFileSync(join(process.cwd(), "fixtures/go-agent-events/golden.jsonl"), "utf8") + .trim() + .split("\n") + .map((line) => JSON.parse(line) as unknown); + + expect(events).toHaveLength(9); + for (const event of events) expect(validate(event), JSON.stringify(validate.errors)).toBe(true); + }); + + it.each([ + ["wrong field type", { type: "draft_version", data: { workflow_id: "workflow", version: "1" } }], + ["forbidden extra field", { type: "draft_version", data: { workflow_id: "workflow", version: 1, extra: true } }], + ["unknown event type", { type: "not_an_agent_event", data: {} }], + ])("rejects %s", (_label, event) => { + const validate = ajv.compile(AGENT_EVENT_JSON_SCHEMA); + expect(validate(event)).toBe(false); + expect(validate.errors?.length).toBeGreaterThan(0); + }); +}); From 3b28b0fcd7ccb23d3a069e87bbebe0f4197a4e5a Mon Sep 17 00:00:00 2001 From: bymyself Date: Fri, 18 Sep 2026 10:42:52 -0700 Subject: [PATCH 2/3] fix: use draft-07 event schema definitions --- src/event-schema.ts | 4 ++-- test/event-schema-drift.test.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/event-schema.ts b/src/event-schema.ts index 2714c68..89295bb 100644 --- a/src/event-schema.ts +++ b/src/event-schema.ts @@ -62,6 +62,6 @@ export const AGENT_EVENT_JSON_SCHEMA = { $schema: "http://json-schema.org/draft-07/schema#", $id: "https://github.com/Comfy-Org/comfy-multi-player/src/event-schema.ts", title: "Comfy in-app agent broadcast events", - oneOf: Object.keys(defs).map((name) => ({ $ref: `#/$defs/${name}` })), - $defs: defs, + oneOf: Object.keys(defs).map((name) => ({ $ref: `#/definitions/${name}` })), + definitions: defs, } as const; diff --git a/test/event-schema-drift.test.ts b/test/event-schema-drift.test.ts index b231529..a18f77c 100644 --- a/test/event-schema-drift.test.ts +++ b/test/event-schema-drift.test.ts @@ -32,7 +32,7 @@ function shape(schema: Schema): string { } function projectedContract() { - const defs = AGENT_EVENT_JSON_SCHEMA.$defs as Record; + const defs = AGENT_EVENT_JSON_SCHEMA.definitions as Record; return Object.fromEntries(Object.entries(defs).map(([event, envelope]) => { const data = envelope.properties?.data; if (!data?.properties) throw new Error(`${event}: missing data object schema`); From a408f3eb4be209086076703305fd1b6a791e82bf Mon Sep 17 00:00:00 2001 From: bymyself Date: Fri, 18 Sep 2026 10:45:30 -0700 Subject: [PATCH 3/3] test: resolve schema fixture relative to the test module --- test/event-schema.regression.test.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/event-schema.regression.test.ts b/test/event-schema.regression.test.ts index 50ac4e4..21549f4 100644 --- a/test/event-schema.regression.test.ts +++ b/test/event-schema.regression.test.ts @@ -4,7 +4,6 @@ * Source: PASS36-R102 / https://github.com/Comfy-Org/ComfyUI_frontend/pull/16644#discussion_r3926225065 */ import { readFileSync } from "node:fs"; -import { join } from "node:path"; import Ajv from "ajv6"; import { describe, expect, it } from "vitest"; import { AGENT_EVENT_JSON_SCHEMA } from "../src/event-schema.js"; @@ -20,7 +19,7 @@ describe("draft-07 event schema regression", () => { it("accepts every pinned golden event", () => { const validate = ajv.compile(AGENT_EVENT_JSON_SCHEMA); - const events = readFileSync(join(process.cwd(), "fixtures/go-agent-events/golden.jsonl"), "utf8") + const events = readFileSync(new URL("../fixtures/go-agent-events/golden.jsonl", import.meta.url), "utf8") .trim() .split("\n") .map((line) => JSON.parse(line) as unknown);