mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-08-24 08:02:14 +03:00
13e15e9cfe
`kieExecutor.createTask()` returns `JsonObject` (`Record<string, unknown>`), so `createData.data` is `unknown` and the `createData?.data?.taskId` read that image, video and music generation each duplicated could not compile. The same three-line expression appeared verbatim in all three handlers. `open-sse/utils/kieTask.ts` already holds two helpers with exactly this shape — `normalizeKieTaskState()` and `parseKieResultJson()` both take `unknown`, guard with `isJsonObject()` and return a declared type. `getKieTaskId()` follows them, so the three handlers now share one guarded read instead of three unguarded ones. `getKieCallbackUrl()` took `KieCallbackBody`, a weak type (all properties optional). Passing a request body whose declared keys are `prompt` / `timeout_ms` / `poll_interval_ms` tripped TS2559 "no properties in common" at both music call sites. It receives arbitrary upstream request bodies, so it now takes `unknown` and guards the same way its neighbours do; `KieCallbackBody` had no other reference and is gone. Behaviour is unchanged. `isJsonObject()` rejects arrays and null exactly where optional chaining already yielded `undefined`, and the callers' `String(taskId)` coercion moved inside the helper, so a numeric id still reaches `pollTask()` as a string and a falsy id still takes the 502 branch. Fixes 5 of the 208 `tsc -p open-sse/tsconfig.json` diagnostics with no new ones: 3 x TS2339 `taskId` on `unknown`, 2 x TS2559 on `KieCallbackBody`. Refs #8484
74 lines
3.4 KiB
TypeScript
74 lines
3.4 KiB
TypeScript
import test from "node:test";
|
|
import assert from "node:assert/strict";
|
|
|
|
import { getKieCallbackUrl, getKieTaskId } from "../../open-sse/utils/kieTask.ts";
|
|
|
|
// getKieTaskId replaces the expression `createData?.data?.taskId || createData?.taskId`
|
|
// that image/video/music generation each duplicated. Every arm below is one the three
|
|
// handlers could hit, since `createTask()` returns whatever the KIE upstream sent.
|
|
|
|
test("getKieTaskId reads the nested data.taskId first", () => {
|
|
assert.equal(getKieTaskId({ data: { taskId: "abc123" } }), "abc123");
|
|
});
|
|
|
|
test("getKieTaskId falls back to a top-level taskId", () => {
|
|
assert.equal(getKieTaskId({ taskId: "top-level" }), "top-level");
|
|
});
|
|
|
|
test("getKieTaskId prefers the nested id when both are present", () => {
|
|
assert.equal(getKieTaskId({ taskId: "top", data: { taskId: "nested" } }), "nested");
|
|
});
|
|
|
|
test("getKieTaskId coerces a non-string id, as the pollTask callers did with String()", () => {
|
|
assert.equal(getKieTaskId({ data: { taskId: 42 } }), "42");
|
|
});
|
|
|
|
test("getKieTaskId ignores a non-object data envelope and still checks the top level", () => {
|
|
// KIE has returned `data` as a string, an array and null on error responses.
|
|
assert.equal(getKieTaskId({ data: "not-an-object", taskId: "fallback" }), "fallback");
|
|
assert.equal(getKieTaskId({ data: ["nope"], taskId: "fallback" }), "fallback");
|
|
assert.equal(getKieTaskId({ data: null, taskId: "fallback" }), "fallback");
|
|
assert.equal(getKieTaskId({ data: "not-an-object" }), null);
|
|
});
|
|
|
|
test("getKieTaskId returns null when no id is present, keeping the handlers' 502 branch", () => {
|
|
assert.equal(getKieTaskId({}), null);
|
|
assert.equal(getKieTaskId({ data: {} }), null);
|
|
assert.equal(getKieTaskId({ msg: "createTask failed" }), null);
|
|
});
|
|
|
|
test("getKieTaskId treats falsy ids as absent, matching the previous `!taskId` guard", () => {
|
|
assert.equal(getKieTaskId({ data: { taskId: "" } }), null);
|
|
assert.equal(getKieTaskId({ data: { taskId: 0 } }), null);
|
|
});
|
|
|
|
test("getKieTaskId tolerates a non-object response", () => {
|
|
assert.equal(getKieTaskId(null), null);
|
|
assert.equal(getKieTaskId(undefined), null);
|
|
assert.equal(getKieTaskId("boom"), null);
|
|
});
|
|
|
|
test("getKieCallbackUrl accepts all three casings the handlers forward", () => {
|
|
assert.equal(getKieCallbackUrl({ callBackUrl: "https://a.test/cb" }), "https://a.test/cb");
|
|
assert.equal(getKieCallbackUrl({ callback_url: "https://b.test/cb" }), "https://b.test/cb");
|
|
assert.equal(getKieCallbackUrl({ callbackUrl: "https://c.test/cb" }), "https://c.test/cb");
|
|
});
|
|
|
|
test("getKieCallbackUrl falls back for blank, absent and non-object bodies", () => {
|
|
const previous = process.env.KIE_CALLBACK_URL;
|
|
process.env.KIE_CALLBACK_URL = "https://configured.test/api/kie/callback";
|
|
try {
|
|
const configured = "https://configured.test/api/kie/callback";
|
|
assert.equal(getKieCallbackUrl({ callBackUrl: " " }), configured);
|
|
assert.equal(getKieCallbackUrl({}), configured);
|
|
assert.equal(getKieCallbackUrl(), configured);
|
|
// The music handler passes an untyped request body straight through.
|
|
assert.equal(getKieCallbackUrl({ prompt: "a song" }), configured);
|
|
assert.equal(getKieCallbackUrl(null), configured);
|
|
assert.equal(getKieCallbackUrl("not-an-object"), configured);
|
|
} finally {
|
|
if (previous === undefined) delete process.env.KIE_CALLBACK_URL;
|
|
else process.env.KIE_CALLBACK_URL = previous;
|
|
}
|
|
});
|