Compare commits

...
8 Commits
Author SHA1 Message Date
Gitea Actions 89d5588cd6 Release 0.1.78 [auto-version-bump] 2026-10-24 03:45:45 +02:00
Ein Anderssono 29c5abe355 Add visual graph map to admin
Build and publish frontend / publish (push) Successful in 1m15s
2026-10-24 03:45:07 +02:00
Gitea Actions 6680dd88d6 Release 0.1.77 [auto-version-bump] 2026-10-24 03:38:12 +02:00
Ein Anderssono 652afb7673 Pretty print fenced JSON in admin AI replies
Build and publish frontend / publish (push) Successful in 1m14s
2026-10-24 03:37:36 +02:00
Gitea Actions 1ba98b998d Release 0.1.76 [auto-version-bump] 2026-10-24 03:34:07 +02:00
Ein Anderssono 23d7527e4f Decode escaped text in admin JSON views
Build and publish frontend / publish (push) Successful in 53s
2026-10-24 03:33:38 +02:00
Gitea Actions 47466f4176 Release 0.1.75 [auto-version-bump] 2026-10-24 03:30:21 +02:00
Ein Anderssono 06dea70ed1 Add collapsible JSON tree to admin views
Build and publish frontend / publish (push) Successful in 54s
2026-10-24 03:29:54 +02:00
5 changed files with 592 additions and 70 deletions
+1 -1
View File
@@ -1 +1 @@
0.1.74 0.1.78
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: ai-spel-frontend name: ai-spel-frontend
description: Static web frontend for the Swedish life simulator description: Static web frontend for the Swedish life simulator
type: application type: application
version: 0.1.74 version: 0.1.78
appVersion: "0.1.74" appVersion: "0.1.78"
+507 -53
View File
@@ -36,21 +36,74 @@
#admin-content .admin-simple-conversation article > .admin-story-reply { display: block; margin-block: .85rem; white-space: pre-wrap; } #admin-content .admin-simple-conversation article > .admin-story-reply { display: block; margin-block: .85rem; white-space: pre-wrap; }
#admin-content .admin-simple-conversation article > .admin-story-player { font-weight: 650; } #admin-content .admin-simple-conversation article > .admin-story-player { font-weight: 650; }
#admin-content pre, #debug-trace pre { white-space: pre-wrap; overflow-wrap: anywhere; max-height: 32rem; overflow: auto; } #admin-content pre, #debug-trace pre { white-space: pre-wrap; overflow-wrap: anywhere; max-height: 32rem; overflow: auto; }
.json-view { box-sizing: border-box; margin-block: .65rem; padding: .8rem; border: 1px solid #cbd5e1; border-radius: .4rem; background: #f8fafc; color: #1e293b; tab-size: 2; font: .84rem/1.55 ui-monospace, SFMono-Regular, Menlo, monospace; } .json-view { box-sizing: border-box; margin-block: .65rem; padding: .65rem; border: 1px solid #cbd5e1; border-radius: .4rem; background: #f8fafc; color: #1e293b; font: .88rem/1.55 ui-monospace, SFMono-Regular, Menlo, monospace; }
.json-token-key { color: #075985; font-weight: 700; } .json-tree-tools { display: flex; flex-wrap: wrap; gap: .4rem; margin-block-end: .6rem; }
.json-token-string { color: #166534; } .json-tree-tools button { font-size: .88rem; padding: .3rem .55rem; }
.json-token-number { color: #6d28d9; font-weight: 650; } .json-tree, .json-children { display: grid; gap: .3rem; }
.json-token-boolean { color: #b45309; font-weight: 750; } .json-children { margin-inline-start: .7rem; padding-inline-start: .65rem; border-inline-start: 2px solid #cbd5e1; }
.json-token-null { color: #be123c; font-style: italic; } .json-node { min-width: 0; }
.json-token-punctuation { color: #64748b; } .json-node > summary { cursor: pointer; padding: .3rem .45rem; border-radius: .25rem; background: #e2e8f0; overflow-wrap: anywhere; }
.json-node > summary:focus-visible, .json-tree-tools button:focus-visible { outline: 3px solid #2563eb; outline-offset: 2px; }
.json-label { color: #075985; font-weight: 750; }
.json-kind { color: #475569; font-size: .86em; }
.json-entry { display: grid; grid-template-columns: minmax(8rem, .35fr) minmax(0, 1fr); gap: .5rem; padding: .2rem .45rem; border-radius: .2rem; overflow-wrap: anywhere; }
.json-entry:nth-child(even) { background: #f1f5f9; }
.json-key { color: #075985; font-weight: 700; }
.json-value-string { color: #166534; white-space: pre-wrap; }
.json-value-number { color: #6d28d9; font-weight: 650; }
.json-value-boolean { color: #b45309; font-weight: 750; }
.json-value-null { color: #be123c; font-style: italic; }
.json-empty { padding: .25rem .65rem; color: #475569; font-style: italic; }
.json-long-value { border-inline-start: 2px solid #94a3b8; margin-inline-start: .5rem; }
.json-long-value > summary, .json-raw-value > summary { cursor: pointer; padding: .3rem .45rem; overflow-wrap: anywhere; }
.json-long-text { margin: .2rem .5rem .5rem; padding: .5rem; max-height: 24rem; overflow: auto; background: #e2e8f0; white-space: pre-wrap; overflow-wrap: anywhere; }
.json-raw-value { margin-inline-start: .5rem; color: #475569; font-size: .9em; }
.json-raw-value > .json-long-text { border-inline-start: 2px solid #94a3b8; }
.admin-ai-response { margin: .35rem 0 .75rem; }
.admin-ai-response-text { white-space: pre-wrap; overflow-wrap: anywhere; }
.admin-ai-response-code { max-width: 100%; overflow: auto; padding: .65rem; border-inline-start: 2px solid #94a3b8; white-space: pre-wrap; overflow-wrap: anywhere; }
.world-map-controls { display: flex; flex-wrap: wrap; align-items: end; gap: .75rem; }
.world-map-scroll { max-width: 100%; overflow: auto; border: 1px solid #94a3b8; border-radius: .4rem; background: #f8fafc; }
.world-map-svg { display: block; color: #0f172a; font: 14px/1.4 system-ui, sans-serif; }
.world-map-location-frame { fill: #eff6ff; stroke: #64748b; stroke-dasharray: 5 4; }
.world-map-edge { stroke: #64748b; stroke-width: 2.5; marker-end: url(#world-map-arrow); }
.world-map-edge.is-closed { stroke: #b91c1c; stroke-dasharray: 6 4; }
.world-map-edge.is-structural { stroke: #94a3b8; stroke-dasharray: 4 5; marker-end: none; }
.world-map-node rect { fill: #fff; stroke: #334155; stroke-width: 2; rx: 9; }
.world-map-node.is-location rect { fill: #dbeafe; stroke: #1d4ed8; }
.world-map-node.is-blocked rect { fill: #fee2e2; stroke: #b91c1c; }
.world-map-node a { color: inherit; text-decoration: none; }
.world-map-node a:focus rect, .world-map-node a:hover rect { stroke: #7c3aed; stroke-width: 4; }
.world-map-node-title { fill: currentColor; font-weight: 750; }
.world-map-node-kind, .world-map-node-description { fill: #334155; font-size: 12px; }
.world-map-legend { display: flex; flex-wrap: wrap; gap: .75rem; }
.world-map-legend span { border-inline-start: 1rem solid #64748b; padding-inline-start: .35rem; }
.world-map-legend .route { border-color: #15803d; }
.world-map-legend .closed { border-color: #b91c1c; }
.world-map-legend .structural { border-color: #94a3b8; border-inline-start-style: dashed; }
.world-map-destinations { padding-inline-start: 1.5rem; }
@media (prefers-color-scheme: dark) {
.world-map-scroll { background: #111827; }
.world-map-svg { color: #f8fafc; }
.world-map-location-frame { fill: #172033; stroke: #64748b; }
.world-map-node rect { fill: #1f2937; stroke: #94a3b8; }
.world-map-node.is-location rect { fill: #172554; stroke: #60a5fa; }
.world-map-node.is-blocked rect { fill: #450a0a; stroke: #f87171; }
.world-map-node-kind, .world-map-node-description { fill: #cbd5e1; }
}
@media (max-width: 42rem) { .json-entry { grid-template-columns: 1fr; gap: .05rem; } }
@media (prefers-color-scheme: dark) { @media (prefers-color-scheme: dark) {
.json-view { border-color: #475569; background: #111827; color: #e5e7eb; } .json-view { border-color: #475569; background: #111827; color: #e5e7eb; }
.json-token-key { color: #7dd3fc; } .json-children { border-inline-start-color: #475569; }
.json-token-string { color: #86efac; } .json-node > summary { background: #263244; }
.json-token-number { color: #c4b5fd; } .json-label, .json-key { color: #7dd3fc; }
.json-token-boolean { color: #fcd34d; } .json-kind, .json-empty { color: #cbd5e1; }
.json-token-null { color: #fda4af; } .json-entry:nth-child(even), .json-long-text { background: #1f2937; }
.json-token-punctuation { color: #94a3b8; } .json-value-string { color: #86efac; }
.json-value-number { color: #c4b5fd; }
.json-value-boolean { color: #fcd34d; }
.json-value-null { color: #fda4af; }
.json-raw-value { color: #cbd5e1; }
} }
#admin-toolbar { display: flex; flex-wrap: wrap; gap: .5rem; margin-block: 1rem; } #admin-toolbar { display: flex; flex-wrap: wrap; gap: .5rem; margin-block: 1rem; }
#player-search { display: flex; flex-wrap: wrap; align-items: end; gap: .5rem; } #player-search { display: flex; flex-wrap: wrap; align-items: end; gap: .5rem; }
@@ -128,6 +181,7 @@
<p>Privilegierad läsning loggas. Känsligt spelarinnehåll visas bara här för administratörer.</p> <p>Privilegierad läsning loggas. Känsligt spelarinnehåll visas bara här för administratörer.</p>
<nav id="admin-toolbar" aria-label="Administrationsvyer"> <nav id="admin-toolbar" aria-label="Administrationsvyer">
<button type="button" data-admin-view="players">Spelare</button> <button type="button" data-admin-view="players">Spelare</button>
<button type="button" data-admin-view="world-map">Världskarta</button>
<button type="button" data-admin-view="npcs">NPC:er</button> <button type="button" data-admin-view="npcs">NPC:er</button>
<button type="button" data-admin-view="prompts">Prompter</button> <button type="button" data-admin-view="prompts">Prompter</button>
<button type="button" data-admin-view="rules">Luau-regler</button> <button type="button" data-admin-view="rules">Luau-regler</button>
@@ -638,45 +692,441 @@
parent.append(element); parent.append(element);
return element; return element;
} }
function appendFormattedJson(pre, value, stringAsText = false) { function decodeEscapedSequences(text) {
pre.className = 'json-view'; const source = String(text).replace(/\\(?:\r\n|\n|\r)[ \t]*/g, '');
pre.setAttribute('aria-label', 'Formaterat JSON-svar'); const escapes = {
const code = document.createElement('code'); '0': '\0', a: '\x07', b: '\b', t: '\t', n: '\n', v: '\x0b',
if (stringAsText && typeof value === 'string') { f: '\f', r: '\r', e: '\x1b', ' ': ' ', '"': '"', "'": "'",
code.textContent = value; '/': '/', '\\': '\\', N: '\u0085', _: '\u00a0', L: '\u2028', P: '\u2029',
pre.replaceChildren(code); };
return pre; return source.replace(/\\(U[0-9a-fA-F]{8}|u[0-9a-fA-F]{4}|x[0-9a-fA-F]{2}|[\s\S])/g, (sequence, escape) => {
} if (Object.hasOwn(escapes, escape)) return escapes[escape];
const source = JSON.stringify(value, null, '\t') ?? 'null'; if (/^x[0-9a-fA-F]{2}$/.test(escape)) return String.fromCharCode(Number.parseInt(escape.slice(1), 16));
const tokens = /(\"(?:\\.|[^\"\\])*\"(?=\s*:))|(\"(?:\\.|[^\"\\])*\")|(-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?)|(\btrue\b|\bfalse\b)|(\bnull\b)|([{}\[\],:])|(\s+)/g; if (/^u[0-9a-fA-F]{4}$/.test(escape)) return String.fromCharCode(Number.parseInt(escape.slice(1), 16));
let offset = 0; if (/^U[0-9a-fA-F]{8}$/.test(escape)) {
for (const match of source.matchAll(tokens)) { const point = Number.parseInt(escape.slice(1), 16);
if (match.index > offset) code.append(document.createTextNode(source.slice(offset, match.index))); if (point <= 0x10ffff && !(point >= 0xd800 && point <= 0xdfff)) return String.fromCodePoint(point);
const token = match[0];
if (match[7]) {
code.append(document.createTextNode(token));
} else {
const span = document.createElement('span');
span.className = match[1] ? 'json-token-key'
: match[2] ? 'json-token-string'
: match[3] ? 'json-token-number'
: match[4] ? 'json-token-boolean'
: match[5] ? 'json-token-null' : 'json-token-punctuation';
span.textContent = token;
code.append(span);
} }
offset = match.index + token.length; return sequence;
});
}
function renderJsonTree(container, value) {
container.className = 'json-view';
container.setAttribute('aria-label', 'Utfällbart JSON-svar');
const tree = document.createElement('div');
tree.className = 'json-tree';
const nodeValues = new WeakMap();
const controls = document.createElement('div');
controls.className = 'json-tree-tools';
const expand = document.createElement('button');
expand.type = 'button';
expand.textContent = 'Öppna alla block';
const collapse = document.createElement('button');
collapse.type = 'button';
collapse.textContent = 'Fäll ihop nästlade block';
controls.append(expand, collapse);
container.replaceChildren(controls, tree);
const isGroup = item => item !== null && typeof item === 'object';
const groupSummary = item => Array.isArray(item)
? `Lista · ${item.length} ${item.length === 1 ? 'post' : 'poster'}`
: `Objekt · ${Object.keys(item).length} fält`;
const addRawText = (parent, value) => {
const raw = document.createElement('details');
raw.className = 'json-raw-value';
const rawSummary = document.createElement('summary');
rawSummary.textContent = 'Visa lagrad text med escape-tecken';
const rawText = document.createElement('div');
rawText.className = 'json-long-text';
rawText.textContent = value;
raw.append(rawSummary, rawText);
parent.append(raw);
};
const addLeaf = (parent, label, item) => {
const readable = typeof item === 'string' ? decodeEscapedSequences(item) : item;
if (typeof item === 'string' && item.length > 180) {
const details = document.createElement('details');
details.className = 'json-long-value';
const summary = document.createElement('summary');
summary.append(document.createTextNode(`${label ? `${label} · ` : ''}Text · ${item.length} tecken · `));
const preview = document.createElement('span');
preview.className = 'json-value-string';
const previewText = readable.slice(0, 100);
preview.textContent = `${previewText}${readable.length > 100 ? '…' : ''}`;
summary.append(preview);
const fullText = document.createElement('div');
fullText.className = 'json-long-text';
fullText.textContent = readable;
details.append(summary, fullText);
parent.append(details);
if (readable !== item) addRawText(parent, item);
return;
}
const row = document.createElement('div');
row.className = 'json-entry';
if (label) {
const key = document.createElement('span');
key.className = 'json-key';
key.textContent = label;
row.append(key);
}
const valueNode = document.createElement('span');
const type = item === null ? 'null' : typeof item;
valueNode.className = `json-value-${type === 'boolean' ? 'boolean' : type}`;
valueNode.textContent = typeof readable === 'string' ? readable : String(readable);
row.append(valueNode);
parent.append(row);
if (typeof item === 'string' && readable !== item) addRawText(parent, item);
};
const populate = (details, item, depth) => {
if (details.dataset.loaded === 'true') return;
details.dataset.loaded = 'true';
const children = document.createElement('div');
children.className = 'json-children';
if (depth >= 64) {
const note = document.createElement('div');
note.className = 'json-empty';
note.textContent = 'Ytterligare nästling döljs efter 64 nivåer.';
children.append(note);
} else {
const entries = Array.isArray(item)
? item.map((child, index) => [`[${index}]`, child])
: Object.entries(item);
if (entries.length === 0) {
const empty = document.createElement('div');
empty.className = 'json-empty';
empty.textContent = Array.isArray(item) ? 'Listan är tom.' : 'Objektet saknar fält.';
children.append(empty);
}
for (const [key, child] of entries) {
if (isGroup(child)) {
const nested = document.createElement('details');
nested.className = 'json-node';
nodeValues.set(nested, child);
nested.dataset.depth = String(depth + 1);
const nestedSummary = document.createElement('summary');
const label = document.createElement('span');
label.className = 'json-label';
label.textContent = key;
const kind = document.createElement('span');
kind.className = 'json-kind';
kind.textContent = ` · ${groupSummary(child)}`;
nestedSummary.append(label, kind);
nested.append(nestedSummary);
nested.addEventListener('toggle', () => {
if (nested.open) populate(nested, child, depth + 1);
});
children.append(nested);
} else {
addLeaf(children, key, child);
}
}
}
details.append(children);
};
if (isGroup(value)) {
const root = document.createElement('details');
root.className = 'json-node json-root';
root.open = true;
const summary = document.createElement('summary');
const label = document.createElement('span');
label.className = 'json-label';
label.textContent = 'Innehåll';
const kind = document.createElement('span');
kind.className = 'json-kind';
kind.textContent = ` · ${groupSummary(value)}`;
summary.append(label, kind);
root.append(summary);
root.addEventListener('toggle', () => {
if (root.open) populate(root, value, 0);
});
populate(root, value, 0);
tree.append(root);
expand.addEventListener('click', () => {
const openAll = details => {
details.open = true;
if (details === root || details.dataset.loaded === 'true') {
const childGroups = [...details.querySelectorAll(':scope > .json-children > details.json-node')];
for (const child of childGroups) {
if (child.dataset.loaded !== 'true') {
if (nodeValues.has(child)) populate(child, nodeValues.get(child), Number(child.dataset.depth || 1));
}
openAll(child);
}
}
};
openAll(root);
});
collapse.addEventListener('click', () => {
for (const nested of tree.querySelectorAll('details.json-node:not(.json-root)')) nested.open = false;
root.open = true;
});
} else {
addLeaf(tree, '', value);
expand.disabled = true;
collapse.disabled = true;
} }
if (offset < source.length) code.append(document.createTextNode(source.slice(offset))); return container;
pre.replaceChildren(code);
return pre;
} }
function adminJson(title, value, parent = adminContent) { function adminJson(title, value, parent = adminContent) {
const details = adminElement('details', undefined, parent); const details = adminElement('details', undefined, parent);
adminElement('summary', title, details); adminElement('summary', title, details);
appendFormattedJson(adminElement('pre', undefined, details), value); renderJsonTree(adminElement('div', undefined, details), value);
return details; return details;
} }
async function loadAdminWorldMap() {
adminContent.replaceChildren();
adminElement('h2', 'Världskarta');
adminElement('p', 'Kartan visar lagrade platser, scener, beskrivningar och relationer. Heldragna gröna linjer är etablerade passager; streckade linjer visar struktur eller andra relationer. Rutnätet ordnar noderna och anger inte exakta avstånd.');
const map = await request('/api/admin/world-map');
const worlds = map.worlds || [];
if (worlds.length === 0) {
adminElement('p', 'Det finns inga världar att visa.');
return;
}
const controls = adminElement('div');
controls.className = 'world-map-controls';
const worldSelect = document.createElement('select');
worldSelect.setAttribute('aria-label', 'Välj värld att visa');
for (const world of worlds) {
const option = document.createElement('option');
option.value = world.id;
option.textContent = `${world.name || 'Namnlös värld'} · version ${world.version}`;
worldSelect.append(option);
}
if (worlds.length > 1) {
const label = adminElement('label', 'Värld', controls);
label.append(worldSelect);
} else {
adminElement('p', `${worlds[0].name || 'Namnlös värld'} · version ${worlds[0].version}`, controls);
}
const mapContent = adminElement('div');
worldSelect.addEventListener('change', () => renderWorld(worldSelect.value));
function renderWorld(worldId) {
mapContent.replaceChildren();
const world = worlds.find(item => item.id === worldId);
if (!world) return;
const locations = (map.locations || []).filter(item => item.world_id === worldId);
const locationIds = new Set(locations.map(item => item.id));
const nodes = (map.nodes || []).filter(item => item.world_id === worldId && locationIds.has(item.location_id));
const locationConnections = (map.location_connections || []).filter(item => item.world_id === worldId && locationIds.has(item.from_location_id) && locationIds.has(item.to_location_id));
const sceneRelations = (map.scene_relations || []).filter(item => item.world_id === worldId && locationIds.has(item.location_id));
adminElement('h3', `${world.name || 'Namnlös värld'} · ${locations.length} platser · ${nodes.length} scennoder`, mapContent);
adminElement('p', `Världstid ${world.world_time}. Noderna nedan har stabila ID:n. En passage visas som framkomlig bara om en etablerad rutt finns och dess ändpunkter inte är markerade som låsta eller blockerade.`, mapContent);
const entities = new Map();
const nodesById = new Map(nodes.map(item => [item.id, item]));
const nodesByLocation = new Map();
for (const node of nodes) {
if (!nodesByLocation.has(node.location_id)) nodesByLocation.set(node.location_id, []);
nodesByLocation.get(node.location_id).push(node);
}
locations.forEach((location, column) => {
const centerX = 190 + column * 350;
const locationAnchor = `world-map-location-${location.id}`;
entities.set(`location:${location.id}`, {
id: `location:${location.id}`, anchor: locationAnchor, name: location.name,
kind: 'Plats', description: location.description, x: centerX - 140, y: 54, width: 280, height: 76,
location, isLocation: true,
});
(nodesByLocation.get(location.id) || []).forEach((node, index) => {
entities.set(`scene:${node.id}`, {
id: `scene:${node.id}`, anchor: `world-map-node-${node.id}`, name: node.name,
kind: `${node.kind} · ${node.node_key}`, description: node.description,
x: centerX - 140, y: 164 + index * 112, width: 280, height: 88, node,
isBlocked: node.state?.locked === true || node.state?.blocked === true || node.state?.traversable === false,
});
});
});
const edges = [];
for (const connection of locationConnections) {
edges.push({
from: `location:${connection.from_location_id}`, to: `location:${connection.to_location_id}`,
label: connection.route_description, relation: 'platsförbindelse', traversable: true,
});
}
for (const location of locations) {
const area = (nodesByLocation.get(location.id) || []).find(node => node.node_key === 'area');
if (area) edges.push({from: `location:${location.id}`, to: `scene:${area.id}`, label: 'innehåller startscen', relation: 'structure'});
}
for (const node of nodes) {
if (node.parent_node_id && nodesById.has(node.parent_node_id)) {
edges.push({from: `scene:${node.parent_node_id}`, to: `scene:${node.id}`, label: 'ligger i', relation: 'structure'});
}
}
for (const relation of sceneRelations) {
const from = nodesById.get(relation.from_node_id);
const to = nodesById.get(relation.to_node_id);
if (!from || !to) continue;
const endpointsBlocked = [from, to].some(node => node.state?.locked === true || node.state?.blocked === true || node.state?.traversable === false);
edges.push({
from: `scene:${from.id}`, to: `scene:${to.id}`,
label: relation.route_description, relation: relation.relation,
traversable: relation.traversable === true,
blocked: relation.traversable === true && endpointsBlocked,
});
}
const maxSceneCount = Math.max(0, ...locations.map(location => (nodesByLocation.get(location.id) || []).length));
const width = Math.max(640, 380 + Math.max(0, locations.length - 1) * 350);
const height = Math.max(300, 184 + maxSceneCount * 112);
const scroll = adminElement('div', undefined, mapContent);
scroll.className = 'world-map-scroll';
const svgNs = 'http://www.w3.org/2000/svg';
const svg = document.createElementNS(svgNs, 'svg');
svg.classList.add('world-map-svg');
svg.setAttribute('width', String(width));
svg.setAttribute('height', String(height));
svg.setAttribute('viewBox', `0 0 ${width} ${height}`);
svg.setAttribute('role', 'group');
svg.setAttribute('aria-label', `Karta över ${world.name || 'världen'} med ${locations.length} platser och ${nodes.length} scennoder`);
const defs = document.createElementNS(svgNs, 'defs');
const marker = document.createElementNS(svgNs, 'marker');
marker.setAttribute('id', 'world-map-arrow'); marker.setAttribute('markerWidth', '8'); marker.setAttribute('markerHeight', '8');
marker.setAttribute('refX', '7'); marker.setAttribute('refY', '3'); marker.setAttribute('orient', 'auto');
const arrow = document.createElementNS(svgNs, 'path');
arrow.setAttribute('d', 'M0,0 L0,6 L8,3 z'); arrow.setAttribute('fill', '#64748b');
marker.append(arrow); defs.append(marker); svg.append(defs);
for (const location of locations) {
const frame = document.createElementNS(svgNs, 'rect');
const entity = entities.get(`location:${location.id}`);
const count = (nodesByLocation.get(location.id) || []).length;
frame.setAttribute('x', String(entity.x - 15)); frame.setAttribute('y', '144');
frame.setAttribute('width', '310'); frame.setAttribute('height', String(Math.max(130, 36 + count * 112)));
frame.setAttribute('rx', '14'); frame.classList.add('world-map-location-frame');
svg.append(frame);
}
const center = entity => ({x: entity.x + entity.width / 2, y: entity.y + entity.height / 2});
for (const edge of edges) {
const from = entities.get(edge.from); const to = entities.get(edge.to);
if (!from || !to) continue;
const start = center(from); const end = center(to);
const line = document.createElementNS(svgNs, 'line');
line.setAttribute('x1', String(start.x)); line.setAttribute('y1', String(start.y));
line.setAttribute('x2', String(end.x)); line.setAttribute('y2', String(end.y));
line.classList.add('world-map-edge');
if (edge.relation === 'structure' || !edge.traversable) line.classList.add('is-structural');
else if (edge.blocked) line.classList.add('is-closed');
const title = document.createElementNS(svgNs, 'title');
title.textContent = `${edge.relation}: ${from.name} → ${to.name}. ${edge.label || ''}`;
line.append(title); svg.append(line);
}
for (const entity of entities.values()) {
const group = document.createElementNS(svgNs, 'g');
group.classList.add('world-map-node');
if (entity.isLocation) group.classList.add('is-location');
if (entity.isBlocked) group.classList.add('is-blocked');
const anchor = document.createElementNS(svgNs, 'a');
anchor.setAttribute('href', `#${entity.anchor}`);
anchor.setAttribute('aria-label', `${entity.kind}: ${entity.name}. ${entity.description}`);
const rect = document.createElementNS(svgNs, 'rect');
rect.setAttribute('x', String(entity.x)); rect.setAttribute('y', String(entity.y));
rect.setAttribute('width', String(entity.width)); rect.setAttribute('height', String(entity.height));
const kind = document.createElementNS(svgNs, 'text');
kind.setAttribute('x', String(entity.x + 12)); kind.setAttribute('y', String(entity.y + 20));
kind.classList.add('world-map-node-kind'); kind.textContent = entity.kind;
const name = document.createElementNS(svgNs, 'text');
name.setAttribute('x', String(entity.x + 12)); name.setAttribute('y', String(entity.y + 42));
name.classList.add('world-map-node-title'); name.textContent = entity.name;
const description = document.createElementNS(svgNs, 'text');
description.setAttribute('x', String(entity.x + 12)); description.setAttribute('y', String(entity.y + 63));
description.classList.add('world-map-node-description');
const descriptionText = entity.description || '';
description.textContent = descriptionText.length > 38 ? `${descriptionText.slice(0, 35)}…` : descriptionText;
anchor.append(rect, kind, name, description); group.append(anchor); svg.append(group);
}
scroll.append(svg);
const legend = adminElement('div', undefined, mapContent);
legend.className = 'world-map-legend';
for (const [className, label] of [['route', 'Framkomlig passage'], ['closed', 'Passage spärrad av nodens tillstånd'], ['structural', 'Struktur eller ej passerbar relation']]) {
const item = adminElement('span', label, legend); item.className = className;
}
const destinationLinks = (parent, originId, candidates) => {
const list = adminElement('ul', undefined, parent); list.className = 'world-map-destinations';
let count = 0;
for (const edge of candidates) {
if (edge.from !== originId || edge.relation === 'structure') continue;
const destination = entities.get(edge.to);
if (!destination) continue;
count += 1;
const item = adminElement('li', undefined, list);
if (edge.traversable && !edge.blocked) {
const link = document.createElement('a'); link.href = `#${destination.anchor}`; link.textContent = destination.name;
item.append(link, document.createTextNode(` · ${edge.label || edge.relation}`));
} else {
item.textContent = `${destination.name} · ${edge.label || edge.relation}${edge.blocked ? ' · spärrad just nu' : ' · relationen är inte en passage'}`;
}
}
if (count === 0) list.replaceChildren(adminElement('li', 'Ingen lagrad utgående passage från den här noden.', list));
};
const detailList = adminElement('section', undefined, mapContent);
adminElement('h3', 'Noder och beskrivningar', detailList);
adminElement('p', 'Välj en nod i kartan eller följ en destinationslänk. Bara sparade passager presenteras som möjliga vägar.', detailList);
for (const location of locations) {
const locationArticle = adminElement('article', undefined, detailList);
locationArticle.id = `world-map-location-${location.id}`;
adminElement('h4', `Plats · ${location.name}`, locationArticle);
adminElement('p', location.description, locationArticle);
adminJson('Platsens sinnesbeskrivning', location.sensory_description, locationArticle);
const locationEdges = locationConnections.map(item => ({
from: `location:${item.from_location_id}`, to: `location:${item.to_location_id}`,
label: `${item.route_description} · ${item.travel_minutes} min`, relation: 'platsförbindelse', traversable: true,
}));
destinationLinks(locationArticle, `location:${location.id}`, locationEdges);
for (const node of nodesByLocation.get(location.id) || []) {
const article = adminElement('article', undefined, locationArticle);
article.id = `world-map-node-${node.id}`;
adminElement('h5', `${node.kind} · ${node.name}`, article);
adminElement('p', node.description, article);
adminElement('p', `Nyckel ${node.node_key} · ID ${node.id}${node.parent_node_id ? ` · överordnad nod ${nodesById.get(node.parent_node_id)?.name || node.parent_node_id}` : ''} · lokal position ${node.position_m.join(', ')} m`, article);
adminJson('Sinnesbeskrivning', node.sensory_description, article);
const relationEdges = sceneRelations.filter(item => item.location_id === location.id).map(item => {
const from = nodesById.get(item.from_node_id); const to = nodesById.get(item.to_node_id);
const endpointsBlocked = [from, to].some(candidate => candidate?.state?.locked === true || candidate?.state?.blocked === true || candidate?.state?.traversable === false);
return {from: `scene:${item.from_node_id}`, to: `scene:${item.to_node_id}`, label: `${item.route_description} · ${item.travel_minutes} min`, relation: item.relation, traversable: item.traversable === true, blocked: item.traversable === true && endpointsBlocked};
});
destinationLinks(article, `scene:${node.id}`, relationEdges);
}
}
}
renderWorld(worlds[0].id);
}
function parseAiResponseSegments(response) {
const text = String(response ?? '');
const fencedJson = /```json\s*([\s\S]*?)```/gi;
const segments = [];
let cursor = 0;
for (const match of text.matchAll(fencedJson)) {
const index = match.index ?? cursor;
if (index > cursor) segments.push({type: 'text', value: text.slice(cursor, index)});
const source = match[1].trim();
try {
segments.push({type: 'json', value: JSON.parse(source)});
} catch (_) {
segments.push({type: 'code', value: source});
}
cursor = index + match[0].length;
}
if (cursor < text.length || segments.length === 0) segments.push({type: 'text', value: text.slice(cursor)});
return segments;
}
function renderAdminAiResponse(parent, response) {
const segments = parseAiResponseSegments(response);
if (!segments.some(segment => segment.type === 'json' || segment.type === 'code')) return false;
const output = adminElement('section', undefined, parent);
output.className = 'admin-ai-response';
for (const segment of segments) {
if (segment.type === 'json') {
adminJson('JSON-svar · formaterat', segment.value, output);
} else if (segment.type === 'code') {
const code = adminElement('pre', segment.value, output);
code.className = 'admin-ai-response-code';
} else if (segment.value.trim()) {
const text = adminElement('p', decodeEscapedSequences(segment.value.trim()), output);
text.className = 'admin-ai-response-text';
}
}
return true;
}
async function loadAdminPlayers(query = '', offset = 0) { async function loadAdminPlayers(query = '', offset = 0) {
adminOffset = offset; adminOffset = offset;
adminContent.replaceChildren(); adminContent.replaceChildren();
@@ -804,8 +1254,11 @@
} }
for (const interaction of group.interactions) { for (const interaction of group.interactions) {
if (!interaction.response) continue; if (!interaction.response) continue;
const button = adminElement('button', `AI-svar · ${interaction.prompt_id} · ${interaction.outcome}: ${interaction.response}`, card); const responseHasJson = parseAiResponseSegments(interaction.response).some(segment => segment.type === 'json' || segment.type === 'code');
const responseButtonLabel = `AI-svar · ${interaction.prompt_id} · ${interaction.outcome}${responseHasJson ? ' · JSON' : `: ${interaction.response}`}`;
const button = adminElement('button', responseButtonLabel, card);
button.type = 'button'; button.setAttribute('aria-expanded', 'false'); button.type = 'button'; button.setAttribute('aria-expanded', 'false');
if (responseHasJson) renderAdminAiResponse(card, interaction.response);
const detail = adminElement('section', undefined, card); detail.hidden = true; const detail = adminElement('section', undefined, card); detail.hidden = true;
button.addEventListener('click', () => { button.addEventListener('click', () => {
detail.hidden = !detail.hidden; button.setAttribute('aria-expanded', String(!detail.hidden)); detail.hidden = !detail.hidden; button.setAttribute('aria-expanded', String(!detail.hidden));
@@ -914,7 +1367,7 @@
adminElement('p', 'Redigera profilens JSON. Kända spelvärden valideras av Rust; okända framtida egenskaper bevaras som JSON. Värld och position visas som referens och ändras inte här.'); adminElement('p', 'Redigera profilens JSON. Kända spelvärden valideras av Rust; okända framtida egenskaper bevaras som JSON. Värld och position visas som referens och ändras inte här.');
const profileForm = adminElement('form'); const profileForm = adminElement('form');
const profileLabel = adminElement('label', 'NPC-profil i JSON', profileForm); const profileLabel = adminElement('label', 'NPC-profil i JSON', profileForm);
const profileInput = document.createElement('textarea'); profileInput.rows = 18; profileInput.cols = 80; profileInput.required = true; profileInput.value = JSON.stringify(npc.profile, null, 2); profileLabel.append(profileInput); const profileInput = document.createElement('textarea'); profileInput.rows = 18; profileInput.cols = 80; profileInput.required = true; profileInput.value = JSON.stringify(npc.profile, null, '\t'); profileLabel.append(profileInput);
const profileSave = adminElement('button', 'Spara egenskaper', profileForm); profileSave.type = 'submit'; const profileSave = adminElement('button', 'Spara egenskaper', profileForm); profileSave.type = 'submit';
const profileStatus = adminElement('p'); profileStatus.setAttribute('role', 'status'); const profileStatus = adminElement('p'); profileStatus.setAttribute('role', 'status');
profileForm.addEventListener('submit', async event => { profileForm.addEventListener('submit', async event => {
@@ -1211,9 +1664,9 @@
const addValue = (name, value) => { const addValue = (name, value) => {
const valueHeading = document.createElement('strong'); const valueHeading = document.createElement('strong');
valueHeading.textContent = name; valueHeading.textContent = name;
const pre = document.createElement('pre'); const json = document.createElement('div');
appendFormattedJson(pre, value ?? 'Ingen uppgift sparad', true); renderJsonTree(json, value === undefined ? 'Ingen uppgift sparad' : value);
card.append(valueHeading, pre); card.append(valueHeading, json);
}; };
addValue('Indata', input); addValue('Indata', input);
addValue('Utdata', output); addValue('Utdata', output);
@@ -1271,10 +1724,10 @@
const raw = document.createElement('details'); const raw = document.createElement('details');
raw.className = 'trace-raw'; raw.className = 'trace-raw';
const rawSummary = document.createElement('summary'); const rawSummary = document.createElement('summary');
rawSummary.textContent = 'Visa all rå spårdata'; rawSummary.textContent = 'Visa hela spårdata';
const pre = document.createElement('pre'); const json = document.createElement('div');
appendFormattedJson(pre, group); renderJsonTree(json, group);
raw.append(rawSummary, pre); raw.append(rawSummary, json);
details.append(summary, chain, raw); details.append(summary, chain, raw);
debugTrace.append(details); debugTrace.append(details);
} }
@@ -1611,6 +2064,7 @@
adminContent.setAttribute('aria-busy', 'true'); adminContent.setAttribute('aria-busy', 'true');
try { try {
if (button.dataset.adminView === 'players') await loadAdminPlayers(); if (button.dataset.adminView === 'players') await loadAdminPlayers();
else if (button.dataset.adminView === 'world-map') await loadAdminWorldMap();
else if (button.dataset.adminView === 'npcs') await loadAdminNpcs(); else if (button.dataset.adminView === 'npcs') await loadAdminNpcs();
else if (button.dataset.adminView === 'prompts') await loadAdminPrompts(); else if (button.dataset.adminView === 'prompts') await loadAdminPrompts();
else if (button.dataset.adminView === 'rules') await loadAdminRules(); else if (button.dataset.adminView === 'rules') await loadAdminRules();
+18 -4
View File
@@ -99,10 +99,24 @@ grep -q 'id="debug-panel"' index.html
grep -q "query AdminPlayerTrace" index.html grep -q "query AdminPlayerTrace" index.html
grep -q 'adminPlayerTrace(accountId: \$accountId, limit: \$limit, offset: \$offset)' index.html grep -q 'adminPlayerTrace(accountId: \$accountId, limit: \$limit, offset: \$offset)' index.html
grep -q 'function renderDecisionTrace' index.html grep -q 'function renderDecisionTrace' index.html
grep -q 'appendFormattedJson(pre, group)' index.html grep -q 'function renderJsonTree' index.html
grep -Fq "JSON.stringify(value, null, '\\t')" index.html grep -q 'function decodeEscapedSequences' index.html
grep -q 'json-token-key' index.html grep -q 'decodeEscapedSequences(item)' index.html
grep -q 'json-token-string' index.html grep -q "Visa lagrad text med escape-tecken" index.html
grep -q 'function parseAiResponseSegments' index.html
grep -q 'function renderAdminAiResponse' index.html
grep -q "JSON-svar · formaterat" index.html
grep -q 'admin-ai-response-code' index.html
grep -q 'function loadAdminWorldMap' index.html
grep -q "request('/api/admin/world-map')" index.html
grep -q 'data-admin-view="world-map"' index.html
grep -q 'world-map-edge' index.html
grep -q 'Noder och beskrivningar' index.html
grep -q "'Öppna alla block'" index.html
grep -q "'Fäll ihop nästlade block'" index.html
grep -q "nested.className = 'json-node'" index.html
grep -q 'json-value-string' index.html
grep -q "setAttribute('aria-label', 'Utfällbart JSON-svar')" index.html
grep -q 'debug-enabled' index.html grep -q 'debug-enabled' index.html
grep -q '/api/admin/players?' index.html grep -q '/api/admin/players?' index.html
grep -q 'Välj konto att följa' index.html grep -q 'Välj konto att följa' index.html
+64 -10
View File
@@ -44,14 +44,68 @@ test('admin can switch to a storyteller-only reading view and return to diagnost
}); });
test('admin JSON responses use tab-indented syntax-colored accessible output', () => { test('admin JSON responses are readable as accessible collapsible trees', () => {
assert.match(page, /function appendFormattedJson/); assert.match(page, /function renderJsonTree/);
assert.match(page, /JSON\.stringify\(value, null, '\\t'\)/); assert.match(page, /nested\.className = 'json-node'/);
assert.match(page, /json-token-key/); assert.match(page, /const nodeValues = new WeakMap\(\)/);
assert.match(page, /json-token-string/); assert.match(page, /nodeValues\.set\(nested, child\)/);
assert.match(page, /json-token-number/); assert.match(page, /groupSummary/);
assert.match(page, /json-token-boolean/); assert.match(page, /Lista · \$\{item\.length\}/);
assert.match(page, /json-token-null/); assert.match(page, /Objekt · \$\{Object\.keys\(item\)\.length\} fält/);
assert.match(page, /setAttribute\('aria-label', 'Formaterat JSON-svar'\)/); assert.match(page, /Öppna alla block/);
assert.match(page, /appendFormattedJson\(pre, group\)/); assert.match(page, /Fäll ihop nästlade block/);
assert.match(page, /setAttribute\('aria-label', 'Utfällbart JSON-svar'\)/);
assert.match(page, /json-value-string/);
assert.match(page, /json-value-number/);
assert.match(page, /json-value-boolean/);
assert.match(page, /json-value-null/);
assert.match(page, /renderJsonTree\(json, group\)/);
assert.match(page, /rawSummary\.textContent = 'Visa hela spårdata'/);
assert.match(page, /JSON\.stringify\(npc\.profile, null, '\\t'\)/);
assert.doesNotMatch(page, /jsnview|cdn\.jsdelivr/);
});
test('admin JSON text decodes common JSON and YAML escapes while retaining the stored form', () => {
const decoder = page.match(/function decodeEscapedSequences\(text\) \{[\s\S]*?\n \}/);
assert.ok(decoder, 'escape decoder should be present');
assert.match(page, /Visa lagrad text med escape-tecken/);
assert.match(page, /decodeEscapedSequences\(item\)/);
const decode = new Function(`${decoder[0]}; return decodeEscapedSequences;`)();
assert.equal(decode(String.raw`Rad 1\nRad 2`), 'Rad 1\nRad 2');
assert.equal(decode(String.raw`Kolumn 1\tKolumn 2`), 'Kolumn 1\tKolumn 2');
assert.equal(decode(String.raw`citat: \'hej\'`), "citat: 'hej'");
assert.equal(decode(String.raw`\u00E5\x21`), 'å!');
assert.equal(decode(String.raw`\U0001F642`), '🙂');
assert.equal(decode(String.raw`okänt: \q`), String.raw`okänt: \q`);
});
test('fenced JSON in AI replies is parsed for readable formatting', () => {
const parser = page.match(/function parseAiResponseSegments\(response\) \{[\s\S]*?\n \}/);
assert.ok(parser, 'AI response segment parser should be present');
assert.match(page, /renderAdminAiResponse\(card, interaction\.response\)/);
assert.match(page, /JSON-svar · formaterat/);
assert.match(page, /admin-ai-response-code/);
const parseSegments = new Function(`${parser[0]}; return parseAiResponseSegments;`)();
const segments = parseSegments('dialogue-turn · completed: ```json { "intent": "speak", "reply": "Rad 1\\nRad 2" }```');
assert.equal(segments[0].type, 'text');
assert.equal(segments[0].value, 'dialogue-turn · completed: ');
assert.equal(segments[1].type, 'json');
assert.deepEqual(segments[1].value, {intent: 'speak', reply: 'Rad 1\nRad 2'});
});
test('admin world map draws stored nodes and exposes only established routes as links', () => {
assert.match(page, /data-admin-view="world-map">Världskarta/);
assert.match(page, /function loadAdminWorldMap/);
assert.match(page, /request\('\/api\/admin\/world-map'\)/);
assert.match(page, /function renderWorld\(worldId\)/);
assert.match(page, /world-map-edge/);
assert.match(page, /world-map-node-\$\{node\.id\}/);
assert.match(page, /edge\.traversable && !edge\.blocked/);
assert.match(page, /location_connections/);
assert.match(page, /scene_relations/);
assert.match(page, /Noder och beskrivningar/);
assert.match(page, /Välj en nod i kartan eller följ en destinationslänk/);
assert.match(page, /button\.dataset\.adminView === 'world-map'/);
}); });