fix frontend invoke result handling

This commit is contained in:
2026-07-19 13:08:00 -03:00
parent 6368473005
commit 961302bb3a
2 changed files with 26 additions and 7 deletions

View File

@@ -1,5 +1,11 @@
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 = {}) {
const response = await fetch(url, { credentials: "same-origin", ...init });
const text = await response.text();
@@ -19,14 +25,20 @@ export async function loadSession(config) {
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) {
const session = await loadSession(config);
if (!session?.authenticated) {
const loginUrl = config.auth?.loginUrl;
if (loginUrl) {
const next = encodeURIComponent(window.location.href);
window.location.assign(`${loginUrl}${loginUrl.includes("?") ? "&" : "?"}next=${next}`);
}
const target = signInUrl(config);
if (target) window.location.assign(target);
throw new Error("sign in required");
}
return session;
@@ -34,9 +46,10 @@ export async function requireSession(config) {
export async function callSkill(config, skillName, args) {
if (config.auth?.invokeRequiresSession) await requireSession(config);
return requestJson(`${config.endpoints.invoke}/${encodeURIComponent(skillName)}`, {
const payload = await requestJson(`${config.endpoints.invoke}/${encodeURIComponent(skillName)}`, {
method: "POST",
headers: { "content-type": "application/json" },
body: JSON.stringify({ arguments: args }),
});
return unwrapInvokeResponse(payload);
}

View File

@@ -95,6 +95,11 @@
if (!response.ok) throw new Error((data && (data.detail || data.message)) || `request failed: ${response.status}`);
return data;
}
function unwrapInvokeResponse(payload) {
return payload && typeof payload === 'object' && 'result' in payload
? payload.result
: payload;
}
function renderSkill() {
const skill = (config.skills || []).find((item) => item.name === selected);
skillNameEl.textContent = selected;
@@ -125,9 +130,10 @@
resultEl.textContent = 'Running…';
try {
const args = JSON.parse(argsEl.value || '{}');
const data = await requestJson(`${config.endpoints.invoke}/${encodeURIComponent(selected)}`, {
const payload = await requestJson(`${config.endpoints.invoke}/${encodeURIComponent(selected)}`, {
method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ arguments: args })
});
const data = unwrapInvokeResponse(payload);
resultEl.textContent = JSON.stringify(data, null, 2);
} catch (err) {
resultEl.textContent = err.message || String(err);