fix frontend invoke result handling

This commit is contained in:
2026-07-19 13:08:00 -03:00
parent f37f1212ee
commit 4442536d31

View File

@@ -1,5 +1,11 @@
export const CONFIG_URL = import.meta.env.DEV ? "/config.json" : "./config.json"; export const CONFIG_URL = import.meta.env.DEV ? "/config.json" : "./config.json";
export function unwrapInvokeResponse(payload) {
return payload && typeof payload === "object" && "result" in payload
? payload.result
: payload;
}
export async function requestJson(url, init = {}) { export async function requestJson(url, init = {}) {
const response = await fetch(url, { credentials: "same-origin", ...init }); const response = await fetch(url, { credentials: "same-origin", ...init });
const text = await response.text(); const text = await response.text();
@@ -19,14 +25,20 @@ export async function loadSession(config) {
return requestJson(config.endpoints.session); return requestJson(config.endpoints.session);
} }
export function signInUrl(config) {
const target = config.auth?.authorizeUrl || config.auth?.loginUrl;
if (!target) return null;
const next = encodeURIComponent(
window.location.pathname + window.location.search + window.location.hash,
);
return `${target}${target.includes("?") ? "&" : "?"}next=${next}`;
}
export async function requireSession(config) { export async function requireSession(config) {
const session = await loadSession(config); const session = await loadSession(config);
if (!session?.authenticated) { if (!session?.authenticated) {
const loginUrl = config.auth?.loginUrl; const target = signInUrl(config);
if (loginUrl) { if (target) window.location.assign(target);
const next = encodeURIComponent(window.location.href);
window.location.assign(`${loginUrl}${loginUrl.includes("?") ? "&" : "?"}next=${next}`);
}
throw new Error("sign in required"); throw new Error("sign in required");
} }
return session; return session;
@@ -36,7 +48,7 @@ export async function callSkill(config, skillName, args) {
if (config.auth?.invokeRequiresSession) { if (config.auth?.invokeRequiresSession) {
await requireSession(config); await requireSession(config);
} }
return requestJson( const payload = await requestJson(
`${config.endpoints.invoke}/${encodeURIComponent(skillName)}`, `${config.endpoints.invoke}/${encodeURIComponent(skillName)}`,
{ {
method: "POST", method: "POST",
@@ -44,6 +56,7 @@ export async function callSkill(config, skillName, args) {
body: JSON.stringify({ arguments: args }), body: JSON.stringify({ arguments: args }),
}, },
); );
return unwrapInvokeResponse(payload);
} }
export function sampleValue(schema) { export function sampleValue(schema) {