Complete player stats inventory and Control content editors

This commit is contained in:
dingo
2026-09-08 06:02:13 -04:00
parent 2df1f6ab38
commit b6ce3bc292
27 changed files with 960 additions and 267 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
<html lang="en">
<head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width, initial-scale=1"/><meta name="theme-color" content="#122b24"/><title>Aeternalis | Control</title><link rel="icon" href="data:,"/></head>
<body class="control-site">
<aside class="control-sidebar"><a class="wordmark" href="/">AETERNALIS<span>Control</span></a><nav aria-label="Control navigation"><button class="nav-item active" data-tab="worlds"><i data-lucide="globe-2"></i>Worlds</button><button class="nav-item" data-tab="characters"><i data-lucide="users"></i>Characters</button><button class="nav-item" data-tab="audit"><i data-lucide="scroll-text"></i>Audit log</button></nav><div class="sidebar-bottom"><a href="/"><i data-lucide="arrow-up-right"></i>Public site</a><a href="/game"><i data-lucide="play"></i>Game</a></div></aside>
<aside class="control-sidebar"><a class="wordmark" href="/">AETERNALIS<span>Control</span></a><nav aria-label="Control navigation"><button class="nav-item active" data-tab="worlds"><i data-lucide="globe-2"></i>Worlds</button><button class="nav-item" data-tab="characters"><i data-lucide="users"></i>Characters</button><button class="nav-item" data-tab="audit"><i data-lucide="scroll-text"></i>Audit log</button><button class="nav-item" data-tab="content"><i data-lucide="scroll-text"></i>Content</button></nav><div class="sidebar-bottom"><a href="/"><i data-lucide="arrow-up-right"></i>Public site</a><a href="/game"><i data-lucide="play"></i>Game</a></div></aside>
<main class="control-main"><header class="control-header"><div><p class="eyebrow">OPERATIONS</p><h1 id="view-title">Worlds</h1></div><div class="heading-tools"><span id="updated" class="muted"></span><button id="refresh" class="icon-button" title="Refresh" aria-label="Refresh"><i data-lucide="refresh-cw"></i></button><button id="create-world" class="button" disabled><i data-lucide="plus"></i>New world</button><button id="admin-signout" class="icon-button" title="Sign out" aria-label="Sign out" hidden><i data-lucide="log-out"></i></button></div></header>
<div id="access" class="access-state"><i data-lucide="shield-check"></i><h2 id="access-title">Checking access</h2><p id="access-message"></p><a id="admin-login" class="button" href="/auth/login?return=%2Fcontrol" hidden>Sign in<i data-lucide="log-in"></i></a></div>
<div id="workspace" hidden><section class="metrics" aria-label="World summary"><div><span>Worlds online</span><strong id="metric-worlds">0</strong></div><div><span>Living characters</span><strong id="metric-living">0</strong></div><div><span>Fallen characters</span><strong id="metric-dead">0</strong></div><div><span>Pending actions</span><strong id="metric-pending">0</strong></div></section>
+1 -1
View File
@@ -18,7 +18,7 @@
<section id="season" class="season"><div><span id="phase-label">THE GATHERING</span><strong id="season-clock">7d 00h</strong></div><span id="season-detail">Until the Harbinger</span><div class="thin-track"><i id="season-progress"></i></div></section>
<section id="boss-bar" class="boss-bar" hidden><button id="target-boss" title="Target Harbinger" aria-label="Target Harbinger"><i data-lucide="crosshair"></i> THE HARBINGER</button><div class="bar"><i id="boss-health"></i></div><small id="boss-count"></small></section>
<aside id="settings" class="panel settings" hidden><div class="panel-title"><h2>Display</h2><button data-close="settings" class="icon" title="Close" aria-label="Close display settings"><i data-lucide="x"></i></button></div><label>Detail <select id="quality"><option value="high">High</option><option value="low">Low</option></select></label><label>Camera distance <input id="zoom" type="range" min="30" max="100" value="62" /></label><button id="dev-boss" hidden><i data-lucide="flame"></i> Awaken Harbinger</button><button id="logout"><i data-lucide="log-out"></i> Sign out</button></aside>
<aside id="inventory" class="panel inventory" hidden><div class="panel-title"><h2>Inventory</h2><button data-close="inventory" class="icon" title="Close" aria-label="Close inventory"><i data-lucide="x"></i></button></div><div id="inventory-items" class="inventory-items"></div><h3>Stat points</h3><p id="saved-stat-points"></p><p class="progression-note">Stat allocation is coming later.</p><h3>Permanent titles</h3><div id="earned-titles"></div><h3>Crafting</h3><div id="recipes"></div><h3>Skills</h3><div id="skills" class="skills"></div></aside>
<aside id="inventory" class="panel inventory" hidden><div class="panel-title"><h2>Inventory</h2><button data-close="inventory" class="icon" title="Close" aria-label="Close inventory"><i data-lucide="x"></i></button></div><div id="inventory-items"></div><h3>Permanent titles</h3><div id="earned-titles"></div><h3>Crafting</h3><div id="recipes"></div><h3>Skills</h3><div id="skills" class="skills"></div></aside>
<div id="target" class="target" hidden><span id="target-name"></span><span id="target-health"></span></div>
<div id="notice" role="status" class="notice" hidden></div>
<footer class="bottom" id="game-controls" hidden>
+1
View File
@@ -0,0 +1 @@
.character-panel{min-width:0}.character-resources,.gear-requirements{font-size:11px;line-height:1.7;color:var(--progression-muted,#66736d)}.character-sections,.gear-actions{display:flex;gap:8px;flex-wrap:wrap;margin:12px 0}.character-sections button{flex:1;padding:8px 5px;font-size:12px}.character-sections button[aria-pressed=true]{background:#b9ca91;color:#17251c}.allocated-stat{display:grid;grid-template-columns:minmax(0,1fr) auto auto;gap:12px;align-items:center;border-bottom:1px solid var(--progression-border,#cfdad3);padding:12px 0;font-size:12px}.allocated-stat small{display:block;margin-top:5px}.allocated-stat button{min-width:42px;min-height:42px}.vital-choice{padding:12px;border:1px solid var(--progression-border,#cfdad3);margin:14px 0}.vital-choice button{margin:8px 8px 0 0}.equipment-grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px}.equipment-slot,.gear-card,.stack-card{padding:12px;border:1px solid var(--progression-border,#cfdad3);border-radius:4px;min-width:0;overflow-wrap:anywhere;font-size:12px}.equipment-slot>small,.equipment-slot>strong{display:block;margin-bottom:8px}.equipment-slot button{width:100%;margin-top:8px}.gear-list{display:grid;gap:10px}.gear-card p{margin:8px 0}.gear-actions label{flex-basis:100%}.gear-actions button{flex:1}.stack-card{display:flex;align-items:center;justify-content:space-between;gap:10px}.stack-card button{font-size:11px}.stat-inspection{margin-top:18px}.stat-inspection summary{cursor:pointer;padding:10px 0}.stat-table-wrap{width:100%;overflow-x:auto;margin-top:14px}.stat-table{width:100%;border-collapse:collapse;font-size:11px;white-space:nowrap}.stat-table caption{white-space:normal;text-align:left;line-height:1.6;padding:0 0 12px;color:var(--progression-muted,#66736d)}.stat-table th,.stat-table td{padding:10px 7px;border-bottom:1px solid var(--progression-border,#cfdad3);text-align:right;min-width:0}.stat-table th:first-child{text-align:left}.stat-table tbody th{font-weight:500}.stat-table thead th,.stat-table tbody tr:hover{background:transparent}.inventory{width:360px}@media(max-width:800px){.inventory{width:min(360px,calc(100vw - 36px))}}
+41
View File
@@ -0,0 +1,41 @@
import type { Character } from './generated';
import { equipmentSlots, itemDetails, modifiersView, node, numberText, primaryStats, statLabel, statsBreakdown } from './character-stats';
type Send = (op:string,target?:string,x?:number,z?:number,slot?:string)=>void;
const root=node('section','','character-panel'),resources=node('p','','character-resources'),nav=node('div','','character-sections'),body=node('div');
root.append(resources,nav,body);
let selected='bag',latest:Character,sendIntent:Send,signature='';
const rings=new Map<string,string>();
for(const [key,label] of [['character','Character'],['equipment','Equipment'],['bag','Bag']]){const b=node('button',label);b.type='button';b.dataset.section=key;b.onclick=()=>{selected=key;signature='';render()};nav.append(b);}
function active(){return latest.entity.state==='alive'&&latest.remainingSeconds>0;}
function button(label:string,key:string,fn:()=>void,disabled=false){const b=node('button',label);b.type='button';b.dataset.focusKey=key;b.disabled=disabled;b.onclick=fn;return b;}
function request(op:string,target:string,slot=''){sendIntent(op,target,0,0,slot);}
function render(){
for(const b of nav.querySelectorAll('button'))b.setAttribute('aria-pressed',String(b.dataset.section===selected));
const next=JSON.stringify([selected,latest.entity.state,latest.remainingSeconds>0,latest.statPoints,latest.pendingVitalChoices,latest.allocatedStats,latest.stats,latest.items,latest.equipment,latest.inventory,latest.carryWeight]);
if(next===signature)return;signature=next;
const focus=root.contains(document.activeElement)?(document.activeElement as HTMLElement).dataset.focusKey:undefined;
const opened=new Set(Array.from(body.querySelectorAll<HTMLDetailsElement>('details[open]')).map(d=>d.dataset.key));body.replaceChildren();
const c=latest;
if(selected==='character'){
body.append(node('p',`${c.statPoints??0} stat points available`,'stat-bank'),node('p','Each level adds 10 stat points, 5 stamina, and a choice of 5 maximum health or mana.','progression-note'));
if(c.pendingVitalChoices>0){const choices=node('div','','vital-choice');choices.append(node('p',`${c.pendingVitalChoices} level reward choice(s) remaining`),button('+5 health','choose-health',()=>request('choose-vital','health'),!active()),button('+5 mana','choose-mana',()=>request('choose-vital','mana'),!active()));body.append(choices);}
for(const key of primaryStats){const row=node('div','','allocated-stat'),label=node('div');label.append(node('strong',statLabel(key)),node('small',`${c.allocatedStats?.[key]??0} points allocated`,'progression-note'));const add=button('+1',`allocate-${key}`,()=>request('allocate-stat',key),!active()||!(c.statPoints>0));add.setAttribute('aria-label',`Allocate one point to ${statLabel(key)}`);row.append(label,node('b',numberText(c.stats?.[key]?.final)),add);body.append(row);}
const details=node('details','','stat-inspection');details.dataset.key='stats';details.append(node('summary','Inspect all stats'),statsBreakdown(c));body.append(details);
} else if(selected==='equipment'){
const grid=node('div','','equipment-grid');
for(const slot of equipmentSlots){const item=c.items?.find(i=>i.id===c.equipment?.[slot]),card=node('article','','equipment-slot');card.append(node('small',statLabel(slot)),node('strong',item?.name??'Empty'));if(item)card.append(modifiersView(item.modifiers),button('Unequip',`unequip-${slot}`,()=>request('unequip',slot),!active()));grid.append(card);}body.append(grid);
} else {
body.append(node('p',`Carry weight ${numberText(c.carryWeight)} / ${numberText(c.stats?.carryCapacity?.final)} (advisory)`,'progression-note'));
const held=new Set(Object.values(c.equipment??{})),grid=node('div','','gear-list');
for(const item of c.items??[])if(!held.has(item.id)){
const card=itemDetails(item,c),actions=node('div','','gear-actions');let slot=item.slot;
if(slot==='ring'){const label=node('label','Ring slot'),select=node('select');select.dataset.focusKey=`ring-${item.id}`;select.setAttribute('aria-label',`Ring slot for ${item.name}`);for(let n=1;n<=8;n++)select.append(new Option(`Ring ${n}${c.equipment?.[`ring${n}`]?' · Occupied':' · Empty'}`,`ring${n}`));select.value=rings.get(item.id)??equipmentSlots.find(s=>s.startsWith('ring')&&!c.equipment?.[s])??'ring1';slot=select.value;select.onchange=()=>{slot=select.value;rings.set(item.id,slot)};label.append(select);actions.append(label);}
actions.append(button('Equip',`equip-${item.id}`,()=>request('equip',item.id,slot),!active()||!item.equippable),button('Drop',`drop-${item.id}`,()=>request('drop',item.id),!active()));card.append(actions);grid.append(card);
}
for(const [key,count] of Object.entries(c.inventory??{}))if(count>0){const card=node('article','','stack-card');card.append(node('span',`${statLabel(key)} × ${count}`),button('Drop one',`drop-stack-${key}`,()=>request('drop',key),!active()));grid.append(card);}
if(!grid.children.length)grid.append(node('p','Your bag is empty.'));body.append(grid);
}
for(const d of body.querySelectorAll<HTMLDetailsElement>('details'))d.open=opened.has(d.dataset.key);
if(focus)Array.from(body.querySelectorAll<HTMLElement>('[data-focus-key]')).find(e=>e.dataset.focusKey===focus)?.focus({preventScroll:true});
}
export function characterPanel(c:Character,send:Send){latest=c;sendIntent=send;resources.textContent=`Health ${numberText(c.entity.hp)} / ${numberText(c.entity.maxHp)} · Mana ${numberText(c.mana)} / ${numberText(c.stats?.manaPoints?.final)} · Stamina ${numberText(c.stamina)} / ${numberText(c.stats?.stamina?.final)}`;render();return root;}
+39
View File
@@ -0,0 +1,39 @@
import './character-panel.css';
import type { Character, ItemInstance, StatModifier } from './generated';
export const primaryStats = ['constitution','intelligence','dexterity','strength','wisdom','charisma','luck'];
export const derivedStats = ['healthPoints','endurance','resistance','healthRecovery','magicDamage','knowledge','spellPoints','manaPoints','moveSpeed','rangedDamage','criticalChance','dodgeChance','staminaRecovery','meleeDamage','heavyDamage','carryCapacity','defence','skillPoints','xpGain','manaRecovery','buffEffectiveness','dropRate','gatherRate','stamina'];
export const itemSlots = ['helmet','mask','chest','shoulders','pants','boots','gloves','earrings','necklace','ring','weapon','offhand','cape','bag'];
export const equipmentSlots = itemSlots.flatMap(s => s === 'ring' ? Array.from({length:8},(_,i)=>`ring${i+1}`) : [s]);
const labels: Record<string,string> = { meleeDamage:'Close combat weapons damage', heavyDamage:'Heavy weapons damage', moveSpeed:'Movement speed', healthRecovery:'Health point recovery', manaRecovery:'Mana point recovery', criticalChance:'Critical hit chance', dropRate:'Drop rate', gatherRate:'Resource gathering rate', offhand:'Shield / offhand weapon' };
export const statLabel = (key:string) => labels[key] ?? key.replace(/([a-z])([A-Z0-9])/g,'$1 $2').replaceAll('_',' ').replace(/^./,c=>c.toUpperCase());
export const numberText = (value:number|undefined) => Number.isFinite(value) ? new Intl.NumberFormat(undefined,{maximumFractionDigits:2}).format(value!) : '—';
export const signed = (value:number) => `${value>0?'+':''}${numberText(value)}`;
export function node<K extends keyof HTMLElementTagNameMap>(tag:K,text='',className='') { const e=document.createElement(tag);e.textContent=text;e.className=className;return e; }
export function modifiersView(modifiers:StatModifier[] = []) {
const list=node('div','','title-effects');
for(const m of modifiers??[]) for(const [value,suffix] of [[m.flat,''],[m.percent,'%']] as const) if(value) list.append(node('span',`${signed(value)}${suffix} ${statLabel(m.stat)}`,value>0?'effect-positive':'effect-negative'));
return list;
}
export function statsBreakdown(c:Character) {
const wrapper=node('div','','stat-table-wrap'),table=node('table','','stat-table'),head=table.createTHead().insertRow();
table.append(node('caption','Server-calculated values. Flat changes apply before combined percentages; modified primaries feed derived stats.'));
for(const label of ['Stat','Base','Flat','%','Final']) { const th=node('th',label);th.scope='col';head.append(th); }
const body=table.createTBody();
for(const key of [...primaryStats,...derivedStats]) { const v=c.stats?.[key];if(!v)continue;const row=body.insertRow(),heading=node('th',statLabel(key));heading.scope='row';row.append(heading);for(const text of [numberText(v.base),signed(v.flat),`${signed(v.percent)}%`,numberText(v.final)])row.insertCell().textContent=text; }
wrapper.append(table);return wrapper;
}
export function itemDetails(item:ItemInstance,c:Character) {
const card=node('article','','gear-card');
const requirements=[`Level ${item.requirements.level}`,...Object.entries(item.requirements.stats??{}).map(([s,v])=>`${statLabel(s)} ${numberText(v)}`),...(item.requirements.titles??[]).map(id=>`Title: ${c.titles?.find(t=>t.id===id)?.name??id}`)];
card.append(node('strong',item.name),node('p',item.description,'progression-note'),node('p',`${statLabel(item.slot)} · Weight ${numberText(item.weight)}`,'progression-note'),node('p',`Requires ${requirements.join(' / ')}`,'gear-requirements'),modifiersView(item.modifiers));
if(item.requirementMessage)card.append(node('p',item.requirementMessage,'gear-requirements'));
return card;
}
export function equipmentDetails(c:Character) {
const root=node('div','','gear-list');
root.append(node('p',`Mana ${numberText(c.mana)} / ${numberText(c.stats?.manaPoints?.final)} · Stamina ${numberText(c.stamina)} / ${numberText(c.stats?.stamina?.final)} · Carry weight ${numberText(c.carryWeight)} / ${numberText(c.stats?.carryCapacity?.final)} (advisory)`));
for(const slot of equipmentSlots){const item=c.items?.find(i=>i.id===c.equipment?.[slot]);root.append(node('p',`${statLabel(slot)}: ${item?.name??'Empty'}`));}
for(const item of c.items??[]){const card=itemDetails(item,c);card.append(node('small',`Instance ${item.id}`));root.append(card);}
return root;
}
+1
View File
@@ -0,0 +1 @@
.catalog-editor{padding:20px;min-width:0}.catalog-heading,.catalog-tabs{display:flex;align-items:center;gap:12px;flex-wrap:wrap;margin-bottom:20px}.catalog-heading h2{font-size:20px;margin-right:auto}.catalog-tabs button[aria-pressed=true]{background:#215944;color:white}.catalog-list{display:grid;gap:12px}.catalog-list>.button{justify-self:start}.catalog-definition{padding:14px;border:1px solid var(--line);border-radius:5px;min-width:0;overflow-wrap:anywhere;font-size:12px;line-height:1.7}.catalog-definition summary{cursor:pointer;font-size:13px;font-weight:600}.catalog-definition p{margin-top:10px}.catalog-form{margin-top:24px;padding-top:20px;border-top:1px solid var(--line);max-width:900px}.catalog-form>h3{margin-bottom:12px}.catalog-form label{display:flex;flex-direction:column;gap:8px;font-size:12px;margin:14px 0;min-width:0}.catalog-form input,.catalog-form select,.catalog-form textarea{width:100%;min-width:0}.catalog-fields{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:0 14px}.catalog-fields label:has(textarea){grid-column:1/-1}.catalog-repeatable,.catalog-title-choices{padding:14px;min-width:0;border:1px solid var(--line);margin:20px 0}.catalog-repeatable legend,.catalog-title-choices legend{font-size:13px;padding:0 8px}.catalog-row{display:flex;align-items:center;gap:12px;border-bottom:1px solid var(--line);margin-bottom:12px}.catalog-row>.catalog-fields{flex:1}.catalog-row>.button{font-size:11px;padding:8px}.catalog-title-choices{max-height:260px;overflow:auto}.catalog-title-choices label{flex-direction:row-reverse;justify-content:flex-end;align-items:center}.catalog-title-choices input{width:18px;height:18px}.catalog-form footer{display:flex;justify-content:flex-end;gap:12px;margin-top:20px}.catalog-form>.muted{line-height:1.7}.catalog-form details{margin:14px 0}.catalog-form .error{margin-top:14px}.table-tools[hidden]{display:none}@media(max-width:720px){.control-sidebar nav{grid-template-columns:repeat(4,minmax(0,1fr))}.catalog-editor{padding:12px}.catalog-fields{grid-template-columns:1fr}.catalog-row{align-items:flex-end}.catalog-tabs{gap:6px}.catalog-tabs button{padding:9px;font-size:11px}}
+76
View File
@@ -0,0 +1,76 @@
import './content-editor.css';
import { api } from './portal-shared';
import { derivedStats, itemSlots, modifiersView, node, primaryStats, statLabel } from './character-stats';
import type { ItemRequirements, StatModifier, TitleEffects } from './generated';
type Requirement={metric:string;atLeast:number};
type Title={id:string;name:string;description:string;scope:string;requirements:Requirement[];effects:TitleEffects};
type Item={id:string;name:string;description:string;slot:string;weight:number;dropChance:number;requirements:ItemRequirements;modifiers:StatModifier[]};
type Rules={version:number;base:Record<string,number>;coefficients:Record<string,Record<string,number>>};
type Catalog={version:number;titles:Title[];items:Item[];stats:Rules};
type Audit={id:string;actor:string;op:string;target:string;reason:string;version:number;createdAt:number};
const statKeys=[...primaryStats,...derivedStats],metrics=['level','kills','worldKills','bossKills','worldsSurvived','gathering','crafting','combat','deaths',...statKeys];
const root=node('section','','catalog-editor'),header=node('div','','catalog-heading'),version=node('p'),tabs=node('div','','catalog-tabs'),list=node('div','','catalog-list'),forms=node('div'),message=node('p','','message');
const refresh=button('Refresh catalog',()=>void load());header.append(node('h2','Game content'),version,refresh);message.hidden=true;message.setAttribute('role','status');root.append(header,message,tabs,list,forms);
let catalog:Catalog,changes:Audit[]=[],section='titles',editing=false,loading=false,saving=false;
for(const [key,label] of [['titles','Titles'],['items','Equipment'],['stats','Stat formulas'],['audit','Content audit']]){const b=button(label,()=>{if(editing){show('Finish or cancel the open draft first.');return;}section=key;render()});b.dataset.section=key;tabs.append(b);}
function button(text:string,fn:()=>void){const b=node('button',text,'button secondary');b.type='button';b.onclick=fn;return b;}
function show(text:string){message.textContent=text;message.hidden=false;}
function field(label:string,input:HTMLElement){const wrap=node('label',label);wrap.append(input);return wrap;}
function text(value='',max=80){const i=node('input');i.value=value;i.maxLength=max;i.required=true;return i;}
function number(value:number,min=0,max=1000000,step='any'){const i=text(String(value));i.type='number';i.min=String(min);i.max=String(max);i.step=step;return i;}
function select(keys:string[],value=''){const i=node('select');for(const key of keys)i.append(new Option(statLabel(key),key));i.value=keys.includes(value)?value:keys[0];return i;}
function identity(){const group=node('div','','catalog-fields'),id=text('',64),name=text(),description=node('textarea');id.pattern='[a-z][a-z0-9_\\-]{0,63}';description.maxLength=500;description.rows=3;group.append(field('Permanent ID',id),field('Name',name),field('Description',description));return {node:group,read:()=>({id:id.value.trim(),name:name.value.trim(),description:description.value.trim()})};}
function repeat<T>(title:string,addLabel:string,make:(value?:T)=>{node:HTMLElement;read:()=>T},initial:T[]=[],max=64){
const group=node('fieldset','','catalog-repeatable'),rows=node('div'),entries:{node:HTMLElement;read:()=>T}[]=[];group.append(node('legend',title),rows);
const add=button(addLabel,()=>append());group.append(add);
function append(value?:T){if(entries.length>=max)return;const entry=make(value),row=node('div','','catalog-row');entries.push(entry);row.append(entry.node,button('Remove',()=>{entries.splice(entries.indexOf(entry),1);row.remove();add.disabled=false}));rows.append(row);add.disabled=entries.length>=max;}
for(const value of initial)append(value);return {node:group,read:()=>entries.map(e=>e.read())};
}
function modifiers(){return repeat<StatModifier>('Modifiers','Add modifier',value=>{const group=node('div','','catalog-fields'),stat=select(statKeys,value?.stat),flat=number(value?.flat??0,-1000000),percent=number(value?.percent??0,-100,10000);group.append(field('Stat',stat),field('Flat change',flat),field('Percent change (%)',percent));return {node:group,read:()=>({stat:stat.value,flat:Number(flat.value),percent:Number(percent.value)})}});}
function form(title:string,op:string,payload:()=>object){
editing=true;refresh.disabled=true;const expectedVersion=catalog.version,form=node('form','','catalog-form'),error=node('p','','error'),fields=node('div'),reason=node('textarea');
let requestID=crypto.randomUUID(),lastRequest='';
reason.required=true;reason.minLength=5;reason.maxLength=240;reason.rows=2;error.setAttribute('role','alert');
const save=node('button','Publish changes','button');save.type='submit';const cancel=button('Cancel',()=>{if(saving)return;editing=false;refresh.disabled=false;forms.replaceChildren()});const footer=node('footer');footer.append(cancel,save);
form.append(node('h3',title),node('p',`Based on catalog version ${expectedVersion}. Published title and item IDs cannot be edited or removed.`,'muted'),fields,field('Reason for change',reason),error,footer);forms.replaceChildren(form);
form.onsubmit=async event=>{event.preventDefault();if(saving)return;error.textContent='';let body:object;try{body={expectedVersion,op,reason:reason.value.trim(),...payload()}}catch(e){error.textContent=(e as Error).message;return;}
const serialized=JSON.stringify(body);if(lastRequest&&lastRequest!==serialized)requestID=crypto.randomUUID();lastRequest=serialized;saving=true;save.disabled=true;cancel.disabled=true;
try{await api('/api/control/catalog',{id:requestID,...body});editing=false;forms.replaceChildren();show('Content published. Running world owners will apply the catalog.');await load();}catch(e){error.textContent=(e as Error).message;}finally{saving=false;save.disabled=false;cancel.disabled=false;refresh.disabled=editing;}
};return fields;
}
function titleForm(){
if(editing){show('Finish or cancel the open draft first.');return;}
const values=identity(),scope=select(['personal','world','global'],'personal');scope.options[0].text='Every qualifying player';scope.options[1].text='First in each world';scope.options[2].text='First ever';
const requirements=repeat<Requirement>('Requirements','Add requirement',value=>{const group=node('div','','catalog-fields'),metric=select(metrics,value?.metric),minimum=number(value?.atLeast??1,1,1000000000,'1');group.append(field('Metric',metric),field('At least',minimum));return {node:group,read:()=>({metric:metric.value,atLeast:Number(minimum.value)})}},[{metric:'level',atLeast:2}],8),effects=modifiers();
const fields=form('Create title','create-title',()=>{const req=requirements.read();if(!req.length)throw new Error('Add at least one requirement.');return {title:{...values.read(),scope:scope.value,requirements:req,effects:{damage:0,moveSpeed:0,modifiers:effects.read()}}}});
fields.append(values.node,field('Award scope',scope),node('p','All requirements must be met. Earned titles and their positive or negative effects are permanent.','muted'),requirements.node,effects.node);
}
function itemForm(){
if(editing){show('Finish or cancel the open draft first.');return;}
const values=identity(),slot=select(itemSlots,'weapon'),weight=number(1,0,10000),drop=number(0,0,100),level=number(1,1,10000,'1'),effects=modifiers();
const requirements=repeat<{stat:string;value:number}>('Required stats','Add required stat',value=>{const group=node('div','','catalog-fields'),stat=select(statKeys,value?.stat),minimum=number(value?.value??1);group.append(field('Stat',stat),field('Minimum value',minimum));return {node:group,read:()=>({stat:stat.value,value:Number(minimum.value)})}},[],statKeys.length);
const titles=node('fieldset','','catalog-title-choices');titles.append(node('legend','Required titles'));const checks=(catalog.titles??[]).map(t=>{const input=node('input');input.type='checkbox';titles.append(field(t.name,input));return {id:t.id,input}});
const fields=form('Create equipment','create-item',()=>{const req=requirements.read();if(new Set(req.map(r=>r.stat)).size!==req.length)throw new Error('Each required stat can appear once.');return {item:{...values.read(),slot:slot.value,weight:Number(weight.value),dropChance:Number(drop.value),requirements:{level:Number(level.value),stats:Object.fromEntries(req.map(r=>[r.stat,r.value])),titles:checks.filter(c=>c.input.checked).map(c=>c.id)},modifiers:effects.read()}}});
fields.append(values.node,field('Equipment slot',slot),field('Weight',weight),field('Sentinel drop chance (%)',drop),node('p','Zero disables sentinel drops. Drop-rate bonuses apply. Requirements are checked without equipment bonuses.','muted'),field('Required level',level),requirements.node,titles,effects.node);
}
function statsForm(){
if(editing){show('Finish or cancel the open draft first.');return;}
const source=catalog.stats,base=new Map<string,HTMLInputElement>(),coefficients=new Map<string,Map<string,HTMLInputElement>>();
const fields=form('Edit stat formulas','update-stats',()=>({stats:{version:source.version,base:Object.fromEntries([...base].map(([key,i])=>[key,Number(i.value)])),coefficients:Object.fromEntries([...coefficients].map(([key,inputs])=>[key,Object.fromEntries([...inputs].map(([stat,i])=>[stat,Number(i.value)]))]))}}));
const bases=node('details','','catalog-definition');bases.open=true;bases.append(node('summary','Base values'));const grid=node('div','','catalog-fields');for(const key of statKeys){const i=number(source.base[key],key==='healthPoints'?50:key==='stamina'?1:0);base.set(key,i);grid.append(field(`${statLabel(key)} base`,i));}bases.append(grid);fields.append(bases);
for(const primary of primaryStats){const detail=node('details','','catalog-definition'),grid=node('div','','catalog-fields'),inputs=new Map<string,HTMLInputElement>();detail.append(node('summary',`${statLabel(primary)} contributions`));for(const [stat,value] of Object.entries(source.coefficients[primary])){const i=number(value,0,1000);inputs.set(stat,i);grid.append(field(`${statLabel(stat)} per point`,i));}coefficients.set(primary,inputs);detail.append(grid);fields.append(detail);}
}
function render(){
version.textContent=`Catalog version ${catalog.version}`;for(const b of tabs.querySelectorAll('button'))b.setAttribute('aria-pressed',String(b.dataset.section===section));list.replaceChildren();
if(section==='titles'){
list.append(button('Create title',titleForm));for(const t of catalog.titles??[]){const d=node('details','','catalog-definition');d.append(node('summary',t.name),node('p',`${t.id} · ${t.scope} · ${t.description}`),node('p',(t.requirements??[]).map(r=>`${statLabel(r.metric)} ≥ ${r.atLeast}`).join(' / ')),modifiersView(t.effects.modifiers));if(t.effects.damage||t.effects.moveSpeed)d.append(node('p',`Damage ${t.effects.damage}; movement ${t.effects.moveSpeed}`));list.append(d);}
}else if(section==='items'){
list.append(button('Create equipment',itemForm));for(const i of catalog.items??[]){const d=node('details','','catalog-definition');d.append(node('summary',i.name),node('p',`${i.id} · ${statLabel(i.slot)} · Weight ${i.weight} · Drop chance ${i.dropChance??0}%`),node('p',i.description),node('p',`Requires level ${i.requirements.level}; ${Object.entries(i.requirements.stats??{}).map(([k,v])=>`${statLabel(k)} ${v}`).join(', ')} ${(i.requirements.titles??[]).map(id=>`Title: ${catalog.titles.find(t=>t.id===id)?.name??id}`).join(', ')}`),modifiersView(i.modifiers));list.append(d);}
}else if(section==='stats'){
list.append(button('Edit stat formulas',statsForm),node('p','Provisional coefficients. Modified primary values feed derived stats; flat changes apply before combined percentages.','muted'));
for(const primary of primaryStats){const d=node('details','','catalog-definition');d.append(node('summary',statLabel(primary)),node('p',`Base ${catalog.stats.base[primary]}`));for(const [stat,value] of Object.entries(catalog.stats.coefficients[primary]))d.append(node('p',`${statLabel(stat)}: ${value} per point (base ${catalog.stats.base[stat]})`));list.append(d);}
}else{for(const c of changes){const entry=node('article','','catalog-definition');entry.append(node('strong',`Version ${c.version} · ${c.op} · ${c.target}`),node('p',c.reason),node('small',`${c.actor} · ${new Date(c.createdAt*1000).toLocaleString()} · ${c.id}`));list.append(entry);}if(!changes.length)list.append(node('p','No content changes yet.'));}
}
async function load(){if(loading||editing)return;loading=true;refresh.disabled=true;try{const data=await api<{catalog:Catalog;changes:Audit[]}>('/api/control/catalog');catalog=data.catalog;changes=data.changes;render();}catch(e){show((e as Error).message)}finally{loading=false;refresh.disabled=editing;}}
export function showCatalog(parent:HTMLElement){if(root.parentElement!==parent)parent.replaceChildren(root);if(!catalog&&!loading)void load();}
export function hasCatalogDraft(){return editing;}
+11 -4
View File
@@ -1,5 +1,7 @@
import './portal.css';
import { permanentTitles, progressionSummary } from './progression';
import { statsBreakdown, equipmentDetails } from './character-stats';
import { showCatalog, hasCatalogDraft } from './content-editor';
import { $, api, APIError, badge, cell, date, el, gameURL, icons, icon, table, type Command, type RecordCharacter, type World } from './portal-shared';
type Data = { worlds: World[]; characters: RecordCharacter[]; commands: Command[]; provisioningEnabled: boolean; characterLimit: number; auditLimit: number };
@@ -45,6 +47,7 @@ function detail(r: RecordCharacter) {
const pairs: [string, string][] = [['Character ID', r.id], ['Account ID', r.account], ['World', r.worldId], ['State', r.state], ['Health', `${v.entity.hp} / ${v.entity.maxHp}`], ['Position', `${Math.round(v.entity.position.x)}, ${Math.round(v.entity.position.y)}, ${Math.round(v.entity.position.z)}`], ['Played today', `${Math.floor(r.character.dailySeconds / 60)} min`], ['Born', date(r.character.bornAt)], ['Died', r.character.diedAt ? date(r.character.diedAt) : '-'], ['Cause', r.character.deathReason || '-']];
for (const [key,value] of pairs) list.append(el('dt', key), el('dd', value)); parent.append(list);
parent.append(el('h3', 'Progression'), progressionSummary(v), el('h3', 'Permanent titles'), permanentTitles(v.titles));
parent.append(el('h3','Full stats'),statsBreakdown(v),el('h3','Equipment'),equipmentDetails(v));
for (const [heading, items] of [['Inventory', v.inventory], ['Skills', v.skills]] as const) { parent.append(el('h3', heading)); const section = el('div', '', 'item-list'); for (const [key,value] of Object.entries(items)) { const item = el('span', key.replaceAll('_', ' ')); item.append(el('b', String(value))); section.append(item); } if (!section.children.length) section.append(el('span', 'None', 'muted')); parent.append(section); }
$<HTMLDialogElement>('character-dialog').showModal();
}
@@ -52,12 +55,15 @@ function render() {
if (!data) return;
const search = $<HTMLInputElement>('search').value.trim().toLowerCase(), world = $<HTMLSelectElement>('world-filter').value, state = $<HTMLSelectElement>('state-filter').value;
const matches = (fields: string[], recordWorld: string, recordState: string) => (!world || world === recordWorld) && (!state || state === recordState) && fields.join(' ').toLowerCase().includes(search);
const parent = $('records'); parent.replaceChildren();
const parent = $('records');
document.querySelector<HTMLElement>('.table-tools')!.hidden = tab === 'content';
if (tab === 'content') { showCatalog(parent); $('record-count').textContent = ''; $('table-note').textContent = 'Content changes are versioned and audited.'; return; }
parent.replaceChildren();
let count = 0;
if (tab === 'worlds') {
const { node, body } = table(['World', 'Status', 'Living / capacity', 'Fallen', 'Harbinger arrives', 'Actions']);
for (const w of data.worlds.filter(w => matches([w.id,w.phase], w.id, w.phase))) {
const row = body.insertRow(); const link = el('a', w.id, 'record-link'); link.href = gameURL(w.id); cell(row, link);
const row = body.insertRow(); const link = el('a', w.id, 'record-link'); link.href = gameURL(w.id); const worldName = el('div'); worldName.append(link, el('small', `Catalog ${w.catalogVersion ?? 0}`, 'muted block')); cell(row, worldName);
const status = el('div', '', 'badge-group'); status.append(badge(w.phase)); if (!w.available) status.append(badge('offline')); else if (w.closed) status.append(badge('closed'));
cell(row, status); cell(row, `${w.living} / ${w.capacity}`); cell(row, String(w.dead)); cell(row, date(w.bossAt));
const options = [w.closed ? 'open-admissions' : 'close-admissions']; if (w.phase === 'gathering') options.push('awaken-boss'); options.push('end-world');
@@ -107,8 +113,9 @@ async function refresh() {
} finally { busy = false; icons(); }
}
document.querySelectorAll<HTMLButtonElement>('[data-tab]').forEach(button => button.onclick = () => {
if (hasCatalogDraft()) { notify('Finish or cancel the open content draft before leaving.'); return; }
tab = button.dataset.tab!; document.querySelectorAll('[data-tab]').forEach(b => b.classList.toggle('active', b === button));
$('view-title').textContent = tab === 'audit' ? 'Audit log' : tab === 'characters' ? 'Characters' : 'Worlds';
$('view-title').textContent = tab === 'content' ? 'Game content' : tab === 'audit' ? 'Audit log' : tab === 'characters' ? 'Characters' : 'Worlds';
$<HTMLInputElement>('search').placeholder = `Search ${tab}`; $<HTMLSelectElement>('state-filter').value = ''; void refresh();
});
$('search').oninput = render; $('state-filter').onchange = render; $('world-filter').onchange = () => void refresh(); $('refresh').onclick = () => void refresh(); $('create-world').onclick = () => openCommand('create-world');
@@ -122,4 +129,4 @@ $<HTMLFormElement>('command-form').onsubmit = async event => {
finally { submit.disabled = false; }
};
$('admin-signout').onclick = async () => { try { await api('/auth/logout', {}); location.href = '/'; } catch(e) { notify((e as Error).message); } };
icons(); void refresh(); setInterval(() => { if (!document.hidden && !$<HTMLDialogElement>('command-dialog').open && !$<HTMLDialogElement>('character-dialog').open) void refresh(); }, 5000);
icons(); void refresh(); setInterval(() => { if (!document.hidden && !hasCatalogDraft() && !$<HTMLDialogElement>('command-dialog').open && !$<HTMLDialogElement>('character-dialog').open) void refresh(); }, 5000);
+6 -11
View File
@@ -3,6 +3,7 @@ import { createIcons, Crosshair, Settings2, X, Flame, LogOut, Hourglass, Swords,
import { WorldView } from './world-view';
import type { Character, Chunk, Entity, Intent, Snapshot } from './generated';
import { experienceText, permanentTitles, statPointsText, updateExperienceMeter } from './progression';
import { characterPanel } from './character-panel';
type Recipe = { Inputs: Record<string, number>; Outputs: Record<string, number> };
type Config = { worldId: string; development: boolean; worlds: { id: string; url: string }[]; recipes: Record<string, Recipe>; playerSpeed: number; gatherRange: number; attackRange: number };
@@ -38,7 +39,7 @@ function progressSignature(): number | undefined {
if (pendingAction.target === 'boss') return snapshot.world.bossHp;
return snapshot.entities.find(e => e.id === pendingAction!.target)?.hp;
}
return Object.values(snapshot.self.inventory).reduce((a: number, b: number) => a + b, 0);
return Object.values(snapshot.self.inventory).reduce((a: number, b: number) => a + b, 0) + (snapshot.self.items?.length ?? 0);
}
const avoidUntil = new Map<string, number>();
let requestedClose = false;
@@ -54,9 +55,9 @@ async function api<T>(path: string, body?: unknown): Promise<T> {
return result as T;
}
function notice(message: string) { $('notice').textContent = message; visible('notice', true); clearTimeout(noticeTimer); noticeTimer = setTimeout(() => visible('notice', false), 3500); }
function send(op: string, target = '', x = 0, z = 0) {
function send(op: string, target = '', x = 0, z = 0, slot = '') {
if (ws?.readyState !== WebSocket.OPEN || !snapshot || snapshot.self.entity.state !== 'alive') return;
const intent: Intent = { op, target, x, z, seq: ++sequence };
const intent: Intent = { op, target, x, z, slot, seq: ++sequence };
ws.send(JSON.stringify(intent));
}
function selection(entity?: Entity) {
@@ -115,15 +116,9 @@ function showEnding(title: string, detail: string, survivor: boolean) {
$<HTMLDialogElement>('ending').show();
}
function inventory(c: Character) {
$('saved-stat-points').textContent = statPointsText(c);
$('earned-titles').replaceChildren(permanentTitles(c.titles));
const parent = $('inventory-items'); parent.replaceChildren();
for (const [item, count] of Object.entries(c.inventory).filter(([, n]) => n > 0)) {
const div = document.createElement('div'); div.className = 'item';
const text = document.createElement('span'); text.textContent = pretty(item);
const quantity = document.createElement('b'); quantity.textContent = String(count);
div.append(text, quantity); parent.append(div);
}
const parent = $('inventory-items'), panel = characterPanel(c, send);
if (panel.parentElement !== parent) parent.replaceChildren(panel);
const recipes = $('recipes'); recipes.replaceChildren();
for (const [name, recipe] of Object.entries(config.recipes)) {
const row = document.createElement('div'); row.className = 'recipe';
+1 -1
View File
@@ -2,7 +2,7 @@ import { createIcons, ArrowDown, ArrowRight, ArrowUpRight, Check, Globe2, HeartP
import type { Character } from './generated';
export type RecordCharacter = { id: string; account: string; worldId: string; name: string; state: string; character: { view: Character; bornAt: string; diedAt?: string; deathReason?: string; dailySeconds: number } };
export type World = { id: string; phase: string; living: number; dead: number; capacity: number; createdAt: string; bossAt: string; closed: boolean; available: boolean; revision: number };
export type World = { id: string; phase: string; living: number; dead: number; capacity: number; createdAt: string; bossAt: string; closed: boolean; available: boolean; revision: number; catalogVersion: number };
export type Command = { id: string; worldId: string; actor: string; op: string; target: string; value: string; reason: string; status: string; result: string; createdAt: number; completedAt: number };
export const $ = <T extends HTMLElement = HTMLElement>(id: string) => document.getElementById(id) as T;
export const el = <K extends keyof HTMLElementTagNameMap>(tag: K, text = '', className = '') => { const node = document.createElement(tag); node.textContent = text; node.className = className; return node; };
+3 -1
View File
@@ -1,5 +1,6 @@
import './progression.css';
import type { Character, TitleAward } from './generated';
import { modifiersView } from './character-stats';
function element<K extends keyof HTMLElementTagNameMap>(tag: K, text = '', className = '') {
const node = document.createElement(tag); node.textContent = text; node.className = className; return node;
@@ -22,7 +23,7 @@ export function progressionSummary(character: Character) {
const line = element('div', '', 'progression-line');
line.append(element('strong', `Level ${character.level || 1}`), element('span', experienceText(character)));
const meter = element('progress', '', 'experience-meter'); meter.setAttribute('aria-label', 'Level experience'); updateExperienceMeter(meter, character);
parent.append(line, meter, element('p', statPointsText(character), 'progression-note'), element('p', 'Stat allocation is coming later.', 'progression-note'));
parent.append(line, meter, element('p', statPointsText(character), 'progression-note'), element('p', `${character.pendingVitalChoices ?? 0} health / mana choices available. Allocate points in the character panel.`, 'progression-note'));
return parent;
}
export function permanentTitles(titles: TitleAward[] = []) {
@@ -38,6 +39,7 @@ export function permanentTitles(titles: TitleAward[] = []) {
for (const [value, label] of [[title.effects.damage, 'damage'], [title.effects.moveSpeed, 'movement speed']] as const) {
if (value) effects.append(element('span', `${value > 0 ? '+' : ''}${value} ${label}`, value > 0 ? 'effect-positive' : 'effect-negative'));
}
effects.append(...modifiersView(title.effects.modifiers ?? []).childNodes);
if (!effects.children.length) effects.append(element('span', 'No attribute effects.', 'progression-note'));
card.append(effects); parent.append(card);
}
+3 -1
View File
@@ -107,7 +107,9 @@ func (b Balance) Validate() error {
if b.TickHz > 60 || b.SnapshotHz > b.TickHz || b.TickHz%b.SnapshotHz != 0 || b.TerrainResolution > 64 || b.ResourcesPerChunk > 128 || b.MaxPlayers > 2000 || b.WorldRadius < b.ChunkSize*2 {
return fmt.Errorf("invalid capacity, terrain, or tick configuration")
}
if b.MaxYieldPerAction > 1000 || b.CriticalMultiplier > 100 { return fmt.Errorf("invalid yield or critical damage tuning") }
if b.MaxYieldPerAction > 1000 || b.CriticalMultiplier > 100 {
return fmt.Errorf("invalid yield or critical damage tuning")
}
known := map[string]bool{"knife": true, "axe": true, "flint_and_steel": true, "fishing_pole": true, "wood": true, "ore": true, "herb": true, "spear": true, "bandage": true}
check := func(items map[string]int64) error {
if len(items) == 0 {
+185 -68
View File
@@ -1,76 +1,193 @@
package game
import (
"encoding/json"
"math"
"testing"
"time"
"aeternalis/server/content"
p "aeternalis/server/internal/protocol"
"aeternalis/server/content"
p "aeternalis/server/internal/protocol"
"encoding/json"
"math"
"testing"
"time"
)
func gearCount(items []p.ItemInstance,definition string)int{n:=0;for _,item:=range items{if item.DefinitionID==definition{n++}};return n}
func testGear(id,slot string,modifiers ...p.StatModifier)p.ItemInstance{return p.ItemInstance{ID:id,DefinitionID:"test_"+id,Name:"Test "+id,Slot:slot,Weight:2,Requirements:p.ItemRequirements{Level:1,Stats:map[string]float64{},Titles:[]string{}},Modifiers:append([]p.StatModifier{},modifiers...)}}
func TestEquipmentSlotsAndRequirements(t *testing.T){
w,c:=fixture(t);w.grantXP(c,100)
for n:=0;n<5;n++{if err:=w.allocateStat(c,"strength");err!=nil{t.Fatal(err)}}
for _,slot:=range equipmentSlots{
category:=slot;if len(slot)==5&&slot[:4]=="ring"{category="ring"}
item:=testGear("slot_"+slot,category,p.StatModifier{Stat:"strength",Flat:1,Percent:10});c.View.Items=append(c.View.Items,item)
if err:=w.equip(c,item.ID,slot);err!=nil{t.Fatal(slot,err)}
}
if len(c.View.Equipment)!=21{t.Fatal("missing equipment slots")}
if w.equip(c,"missing","weapon")==nil||w.equip(c,"slot_ring1","ring9")==nil{t.Fatal("invalid ownership/slot accepted")}
if w.equip(c,"slot_ring1","ring2")==nil{t.Fatal("same instance equipped twice")}
if err:=w.unequip(c,"helmet");err!=nil{t.Fatal(err)}
gated:=testGear("gated","helmet",p.StatModifier{Stat:"strength",Flat:100});gated.Requirements.Stats["strength"]=6;c.View.Items=append(c.View.Items,gated)
if w.equip(c,gated.ID,"helmet")==nil{t.Fatal("equipment satisfied its own prerequisite")}
item:=ownedItem(c,gated.ID);item.Requirements.Stats["strength"]=5;item.Requirements.Level=3;item.Requirements.Titles=[]string{"trial"}
if w.equip(c,item.ID,"helmet")==nil{t.Fatal("missing level accepted")};item.Requirements.Level=2
if w.equip(c,item.ID,"helmet")==nil{t.Fatal("missing title accepted")}
c.View.Titles=append(c.View.Titles,p.TitleAward{ID:"trial"})
if err:=w.equip(c,item.ID,"helmet");err!=nil{t.Fatal(err)}
c.View.Titles=append(c.View.Titles,p.TitleAward{ID:"curse",Effects:p.TitleEffects{Modifiers:[]p.StatModifier{{Stat:"strength",Flat:-1}}}});w.RefreshStats(c)
if c.View.Equipment["helmet"]!=""||ownedItem(c,gated.ID)==nil{t.Fatal("invalidated gear stayed active or was lost")}
func gearCount(items []p.ItemInstance, definition string) int {
n := 0
for _, item := range items {
if item.DefinitionID == definition {
n++
}
}
return n
}
func TestEquipmentDeathDropLootAndRestart(t *testing.T){
w,c:=fixture(t);ring:=testGear("unique_ring","ring",p.StatModifier{Stat:"luck",Flat:2});c.View.Items=append(c.View.Items,ring)
if err:=w.equip(c,ring.ID,"ring8");err!=nil{t.Fatal(err)}
if err:=w.dropItem(c,ring.ID);err!=nil{t.Fatal(err)}
if ownedItem(c,ring.ID)!=nil||c.View.Equipment["ring8"]!=""{t.Fatal("drop retained ownership")}
var pile string;for id:=range w.Corpses{pile=id}
if err:=w.lootCorpse(c,pile);err!=nil{t.Fatal(err)};if w.lootCorpse(c,pile)==nil{t.Fatal("looted twice")}
if err:=w.equip(c,ring.ID,"ring8");err!=nil{t.Fatal(err)}
c.DailySeconds=123;raw,_:=json.Marshal(w);var restored World
if err:=json.Unmarshal(raw,&restored);err!=nil{t.Fatal(err)};if err:=restored.Restore(w.now);err!=nil{t.Fatal(err)}
survivor:=restored.Characters[c.View.Entity.ID];survivor.View.Entity.State="eligible"
next:=New("gear-next",345,w.now,w.Balance);if err:=next.Import(survivor);err!=nil{t.Fatal(err)}
if survivor.DailySeconds!=123||survivor.View.Equipment["ring8"]!=ring.ID||ownedItem(survivor,ring.ID)==nil{t.Fatal("passage changed item or daily usage")}
count:=len(survivor.View.Items);next.kill(survivor,"test death")
corpse:=next.Corpses["corpse:"+survivor.View.Entity.ID]
if len(corpse.Items)!=count||len(survivor.View.Items)!=0||len(survivor.View.Equipment)!=0{t.Fatal("death duplicated/lost items")}
replacement,err:=next.Join(c.Account,"Replacement");if err!=nil{t.Fatal(err)};replacement.View.Entity.Position=corpse.Entity.Position
if err=next.lootCorpse(replacement,corpse.Entity.ID);err!=nil{t.Fatal(err)}
if ownedItem(replacement,ring.ID)==nil||next.Connect(survivor.View.Entity.ID)==nil{t.Fatal("loot changed identity or resurrected life")}
func testGear(id, slot string, modifiers ...p.StatModifier) p.ItemInstance {
return p.ItemInstance{ID: id, DefinitionID: "test_" + id, Name: "Test " + id, Slot: slot, Weight: 2, Requirements: p.ItemRequirements{Level: 1, Stats: map[string]float64{}, Titles: []string{}}, Modifiers: append([]p.StatModifier{}, modifiers...)}
}
func TestLegacyEquipmentMigrationAndAtomicFailures(t *testing.T){
w,c:=fixture(t);original:=len(c.View.Items);c.View.Inventory["spear"]=2
w.Corpses["legacy"]=&Corpse{Entity:p.Entity{ID:"legacy",Position:c.View.Entity.Position},Inventory:map[string]int64{"spear":1,"ore":3}}
for n:=0;n<2;n++{if err:=w.Restore(w.now);err!=nil{t.Fatal(err)};if len(c.View.Items)!=original+2||len(w.Corpses["legacy"].Items)!=1||c.View.Inventory["spear"]!=0{t.Fatal("migration duplicated/lost gear")}}
corpse:=w.Corpses["legacy"];corpse.Items=append(corpse.Items,c.View.Items[0]);before:=c.View.Inventory["ore"]
if w.lootCorpse(c,"legacy")==nil||c.View.Inventory["ore"]!=before||w.Corpses["legacy"]==nil{t.Fatal("failed loot changed inventory")}
if w.Restore(w.now)==nil{t.Fatal("duplicate ID restored")}
delete(w.Corpses,"legacy")
c.View.Inventory["wood"]=3;c.View.Inventory["ore"]=2
w.Balance.Recipes["spear"]=content.Recipe{Inputs:map[string]int64{"wood":3,"ore":2},Outputs:map[string]int64{"spear":100001}}
if w.craft(c,"spear")==nil||c.View.Inventory["wood"]!=3||c.View.Inventory["ore"]!=2{t.Fatal("failed craft consumed materials")}
c.View.Inventory["wood"]=math.MaxInt64
w.Corpses["overflow"]=&Corpse{Entity:p.Entity{ID:"overflow",Position:c.View.Entity.Position},Inventory:map[string]int64{"wood":1}}
if w.lootCorpse(c,"overflow")==nil||c.View.Inventory["wood"]!=math.MaxInt64{t.Fatal("overflow loot changed inventory")}
func TestEquipmentSlotsAndRequirements(t *testing.T) {
w, c := fixture(t)
w.grantXP(c, 100)
for n := 0; n < 5; n++ {
if err := w.allocateStat(c, "strength"); err != nil {
t.Fatal(err)
}
}
for _, slot := range equipmentSlots {
category := slot
if len(slot) == 5 && slot[:4] == "ring" {
category = "ring"
}
item := testGear("slot_"+slot, category, p.StatModifier{Stat: "strength", Flat: 1, Percent: 10})
c.View.Items = append(c.View.Items, item)
if err := w.equip(c, item.ID, slot); err != nil {
t.Fatal(slot, err)
}
}
if len(c.View.Equipment) != 21 {
t.Fatal("missing equipment slots")
}
if w.equip(c, "missing", "weapon") == nil || w.equip(c, "slot_ring1", "ring9") == nil {
t.Fatal("invalid ownership/slot accepted")
}
if w.equip(c, "slot_ring1", "ring2") == nil {
t.Fatal("same instance equipped twice")
}
if err := w.unequip(c, "helmet"); err != nil {
t.Fatal(err)
}
gated := testGear("gated", "helmet", p.StatModifier{Stat: "strength", Flat: 100})
gated.Requirements.Stats["strength"] = 6
c.View.Items = append(c.View.Items, gated)
if w.equip(c, gated.ID, "helmet") == nil {
t.Fatal("equipment satisfied its own prerequisite")
}
item := ownedItem(c, gated.ID)
item.Requirements.Stats["strength"] = 5
item.Requirements.Level = 3
item.Requirements.Titles = []string{"trial"}
if w.equip(c, item.ID, "helmet") == nil {
t.Fatal("missing level accepted")
}
item.Requirements.Level = 2
if w.equip(c, item.ID, "helmet") == nil {
t.Fatal("missing title accepted")
}
c.View.Titles = append(c.View.Titles, p.TitleAward{ID: "trial"})
if err := w.equip(c, item.ID, "helmet"); err != nil {
t.Fatal(err)
}
c.View.Titles = append(c.View.Titles, p.TitleAward{ID: "curse", Effects: p.TitleEffects{Modifiers: []p.StatModifier{{Stat: "strength", Flat: -1}}}})
w.RefreshStats(c)
if c.View.Equipment["helmet"] != "" || ownedItem(c, gated.ID) == nil {
t.Fatal("invalidated gear stayed active or was lost")
}
}
func TestCatalogEquipmentCanDropFromSentinels(t *testing.T){
w,c:=fixture(t);w.Balance.Items=append(w.Balance.Items,content.ItemDefinition{ID:"drop_ring",Name:"Dropped Ring",Slot:"ring",Weight:1,DropChance:100,Requirements:content.ItemRequirements{Level:1}})
w.now=w.now.Add(time.Second);w.Mobs["test"]=&Mob{Entity:p.Entity{ID:"test",HP:1,Position:c.View.Entity.Position}}
if err:=w.attack(c,"test");err!=nil{t.Fatal(err)}
if gearCount(c.View.Items,"drop_ring")!=1{t.Fatal("authored gear never dropped")}
if w.attack(c,"test")==nil||gearCount(c.View.Items,"drop_ring")!=1{t.Fatal("repeated kill duplicated gear")}
func TestEquipmentDeathDropLootAndRestart(t *testing.T) {
w, c := fixture(t)
ring := testGear("unique_ring", "ring", p.StatModifier{Stat: "luck", Flat: 2})
c.View.Items = append(c.View.Items, ring)
if err := w.equip(c, ring.ID, "ring8"); err != nil {
t.Fatal(err)
}
if err := w.dropItem(c, ring.ID); err != nil {
t.Fatal(err)
}
if ownedItem(c, ring.ID) != nil || c.View.Equipment["ring8"] != "" {
t.Fatal("drop retained ownership")
}
var pile string
for id := range w.Corpses {
pile = id
}
if err := w.lootCorpse(c, pile); err != nil {
t.Fatal(err)
}
if w.lootCorpse(c, pile) == nil {
t.Fatal("looted twice")
}
if err := w.equip(c, ring.ID, "ring8"); err != nil {
t.Fatal(err)
}
c.DailySeconds = 123
raw, _ := json.Marshal(w)
var restored World
if err := json.Unmarshal(raw, &restored); err != nil {
t.Fatal(err)
}
if err := restored.Restore(w.now); err != nil {
t.Fatal(err)
}
survivor := restored.Characters[c.View.Entity.ID]
survivor.View.Entity.State = "eligible"
next := New("gear-next", 345, w.now, w.Balance)
if err := next.Import(survivor); err != nil {
t.Fatal(err)
}
if survivor.DailySeconds != 123 || survivor.View.Equipment["ring8"] != ring.ID || ownedItem(survivor, ring.ID) == nil {
t.Fatal("passage changed item or daily usage")
}
count := len(survivor.View.Items)
next.kill(survivor, "test death")
corpse := next.Corpses["corpse:"+survivor.View.Entity.ID]
if len(corpse.Items) != count || len(survivor.View.Items) != 0 || len(survivor.View.Equipment) != 0 {
t.Fatal("death duplicated/lost items")
}
replacement, err := next.Join(c.Account, "Replacement")
if err != nil {
t.Fatal(err)
}
replacement.View.Entity.Position = corpse.Entity.Position
if err = next.lootCorpse(replacement, corpse.Entity.ID); err != nil {
t.Fatal(err)
}
if ownedItem(replacement, ring.ID) == nil || next.Connect(survivor.View.Entity.ID) == nil {
t.Fatal("loot changed identity or resurrected life")
}
}
func TestLegacyEquipmentMigrationAndAtomicFailures(t *testing.T) {
w, c := fixture(t)
original := len(c.View.Items)
c.View.Inventory["spear"] = 2
w.Corpses["legacy"] = &Corpse{Entity: p.Entity{ID: "legacy", Position: c.View.Entity.Position}, Inventory: map[string]int64{"spear": 1, "ore": 3}}
for n := 0; n < 2; n++ {
if err := w.Restore(w.now); err != nil {
t.Fatal(err)
}
if len(c.View.Items) != original+2 || len(w.Corpses["legacy"].Items) != 1 || c.View.Inventory["spear"] != 0 {
t.Fatal("migration duplicated/lost gear")
}
}
corpse := w.Corpses["legacy"]
corpse.Items = append(corpse.Items, c.View.Items[0])
before := c.View.Inventory["ore"]
if w.lootCorpse(c, "legacy") == nil || c.View.Inventory["ore"] != before || w.Corpses["legacy"] == nil {
t.Fatal("failed loot changed inventory")
}
if w.Restore(w.now) == nil {
t.Fatal("duplicate ID restored")
}
delete(w.Corpses, "legacy")
c.View.Inventory["wood"] = 3
c.View.Inventory["ore"] = 2
w.Balance.Recipes["spear"] = content.Recipe{Inputs: map[string]int64{"wood": 3, "ore": 2}, Outputs: map[string]int64{"spear": 100001}}
if w.craft(c, "spear") == nil || c.View.Inventory["wood"] != 3 || c.View.Inventory["ore"] != 2 {
t.Fatal("failed craft consumed materials")
}
c.View.Inventory["wood"] = math.MaxInt64
w.Corpses["overflow"] = &Corpse{Entity: p.Entity{ID: "overflow", Position: c.View.Entity.Position}, Inventory: map[string]int64{"wood": 1}}
if w.lootCorpse(c, "overflow") == nil || c.View.Inventory["wood"] != math.MaxInt64 {
t.Fatal("overflow loot changed inventory")
}
}
func TestCatalogEquipmentCanDropFromSentinels(t *testing.T) {
w, c := fixture(t)
w.Balance.Items = append(w.Balance.Items, content.ItemDefinition{ID: "drop_ring", Name: "Dropped Ring", Slot: "ring", Weight: 1, DropChance: 100, Requirements: content.ItemRequirements{Level: 1}})
w.now = w.now.Add(time.Second)
w.Mobs["test"] = &Mob{Entity: p.Entity{ID: "test", HP: 1, Position: c.View.Entity.Position}}
if err := w.attack(c, "test"); err != nil {
t.Fatal(err)
}
if gearCount(c.View.Items, "drop_ring") != 1 {
t.Fatal("authored gear never dropped")
}
if w.attack(c, "test") == nil || gearCount(c.View.Items, "drop_ring") != 1 {
t.Fatal("repeated kill duplicated gear")
}
}
+11 -2
View File
@@ -31,7 +31,9 @@ func (w *World) orderedCharacters() []*Character {
}
func (w *World) restoreProgression(c *Character) error {
if c.StatsVersion < 0 || c.StatsVersion > 1 { return errors.New("unsupported character stats version") }
if c.StatsVersion < 0 || c.StatsVersion > 1 {
return errors.New("unsupported character stats version")
}
if c.View.Level == 0 {
c.View.Level = 1
}
@@ -45,7 +47,9 @@ func (w *World) restoreProgression(c *Character) error {
c.View.StatPoints += (c.View.Level - 1) * (w.Balance.Progression.StatPointsPerLevel - rules.StatPointsPerLevel)
}
// Preserve any older, more generous grant curve rather than deleting points.
if rules.StatPointsPerLevel < w.Balance.Progression.StatPointsPerLevel { rules.StatPointsPerLevel = w.Balance.Progression.StatPointsPerLevel }
if rules.StatPointsPerLevel < w.Balance.Progression.StatPointsPerLevel {
rules.StatPointsPerLevel = w.Balance.Progression.StatPointsPerLevel
}
rules.StaminaPerLevel = w.Balance.Progression.StaminaPerLevel
rules.VitalPointsPerChoice = w.Balance.Progression.VitalPointsPerChoice
c.Progression = &rules
@@ -69,6 +73,11 @@ func (w *World) restoreProgression(c *Character) error {
if c.View.Titles == nil {
c.View.Titles = []p.TitleAward{}
}
for i := range c.View.Titles {
if c.View.Titles[i].Effects.Modifiers == nil {
c.View.Titles[i].Effects.Modifiers = []p.StatModifier{}
}
}
return nil
}
+1 -1
View File
@@ -95,7 +95,7 @@ func TestOnlySuccessfulActionsGrantXP(t *testing.T) {
func TestProgressionSurvivesRestartDeathAndTransfer(t *testing.T) {
w, c := fixture(t)
w.grantXP(c, 275)
c.View.Titles = []p.TitleAward{{ID: "bound", Name: "Bound", Scope: "personal", Effects: p.TitleEffects{Damage: 2}}}
c.View.Titles = []p.TitleAward{{ID: "bound", Name: "Bound", Scope: "personal", Effects: p.TitleEffects{Damage: 2, Modifiers: []p.StatModifier{}}}}
c.DailySeconds = 123
c.WorldKills = 7
raw, err := json.Marshal(w)
+8 -2
View File
@@ -126,8 +126,12 @@ func (w *World) Restore(now time.Time) error {
w.dirty = true
}
if w.Balance.MaxYieldPerAction == 0 {
defaults, err := content.Load(); if err != nil { return err }
w.Balance.MaxYieldPerAction = defaults.MaxYieldPerAction; w.dirty = true
defaults, err := content.Load()
if err != nil {
return err
}
w.Balance.MaxYieldPerAction = defaults.MaxYieldPerAction
w.dirty = true
}
if err := w.Balance.Validate(); err != nil {
return err
@@ -441,6 +445,7 @@ func (w *World) gather(c *Character, target string) error {
w.Depleted[target] = w.Age() + w.Balance.ResourceRespawnSeconds
w.dirty = true
c.Message = "Gathered " + item
w.RefreshStats(c)
w.grantXP(c, w.Balance.Progression.GatherXP)
w.evaluateTitles(c)
return nil
@@ -531,6 +536,7 @@ func (w *World) attack(c *Character, target string) error {
}
}
}
w.RefreshStats(c)
w.grantXP(c, w.Balance.Progression.MobKillXP)
}
}
+3 -3
View File
@@ -122,7 +122,7 @@ func TestGatherCraftAndPermanentDeath(t *testing.T) {
if err := w.Intent(id, p.Intent{Op: "craft", Seq: 5, Target: "spear"}); err != nil {
t.Fatal(err)
}
if gearCount(c.View.Items,"spear") != 1 || c.View.Inventory["wood"] != 0 || c.View.Inventory["ore"] != 0 {
if gearCount(c.View.Items, "spear") != 1 || c.View.Inventory["wood"] != 0 || c.View.Inventory["ore"] != 0 {
t.Fatal("recipe not atomic")
}
w.kill(c, "test death")
@@ -143,7 +143,7 @@ func TestGatherCraftAndPermanentDeath(t *testing.T) {
if c.DiedAt == nil || c.DeathReason != "test death" {
t.Fatal("missing durable death record")
}
if len(c.View.Inventory) != 0 || gearCount(w.Corpses["corpse:"+id].Items,"spear") != 1 {
if len(c.View.Inventory) != 0 || gearCount(w.Corpses["corpse:"+id].Items, "spear") != 1 {
t.Fatal("corpse inventory")
}
raw, _ := json.Marshal(w)
@@ -283,7 +283,7 @@ func TestSpawnAndTransferPreserveBudget(t *testing.T) {
if err := next.Import(c); err != nil {
t.Fatal(err)
}
if c.DailySeconds != 123 || c.View.PlayedSeconds != 456 || c.View.Skills["combat"] != 9 || gearCount(c.View.Items,"spear") != 1 {
if c.DailySeconds != 123 || c.View.PlayedSeconds != 456 || c.View.Skills["combat"] != 9 || gearCount(c.View.Items, "spear") != 1 {
t.Fatal("transfer changed progress or budget")
}
if err := next.Import(c); err == nil {
+203 -92
View File
@@ -1,113 +1,224 @@
package store
import (
"context"
"database/sql"
"encoding/json"
"errors"
"fmt"
"regexp"
"strings"
"aeternalis/server/content"
"aeternalis/server/content"
"context"
"database/sql"
"encoding/json"
"errors"
"fmt"
"regexp"
"strings"
)
var ErrCatalogConflict = errors.New("catalog changed; refresh before publishing")
var ErrCatalogRequest = errors.New("request ID already used for a different catalog change")
var ErrCatalogInvalid = errors.New("invalid catalog change")
var catalogRequestID = regexp.MustCompile(`^[a-f0-9-]{32,36}$`)
type CatalogChange struct {
ID string `json:"id"`
ExpectedVersion int64 `json:"expectedVersion"`
Op string `json:"op"`
Reason string `json:"reason"`
Title *content.Title `json:"title,omitempty"`
Item *content.ItemDefinition `json:"item,omitempty"`
Stats *content.StatsRules `json:"stats,omitempty"`
ID string `json:"id"`
ExpectedVersion int64 `json:"expectedVersion"`
Op string `json:"op"`
Reason string `json:"reason"`
Title *content.Title `json:"title,omitempty"`
Item *content.ItemDefinition `json:"item,omitempty"`
Stats *content.StatsRules `json:"stats,omitempty"`
}
type CatalogResult struct {
Version int64 `json:"version"`
}
type CatalogResult struct { Version int64 `json:"version"` }
type CatalogAudit struct {
ID string `json:"id"`
Actor string `json:"actor"`
Op string `json:"op"`
Target string `json:"target"`
Reason string `json:"reason"`
Version int64 `json:"version"`
CreatedAt int64 `json:"createdAt"`
ID string `json:"id"`
Actor string `json:"actor"`
Op string `json:"op"`
Target string `json:"target"`
Reason string `json:"reason"`
Version int64 `json:"version"`
CreatedAt int64 `json:"createdAt"`
}
func (d *DB) ensureCatalog(ctx context.Context) error {
defaults,err:=content.DefaultCatalog();if err!=nil{return err}
if err=defaults.Validate();err!=nil{return err}
raw,err:=json.Marshal(defaults);if err!=nil{return err}
tx,err:=d.sql.BeginTx(ctx,nil);if err!=nil{return err};defer tx.Rollback()
if d.postgres { if _,err=tx.ExecContext(ctx,`SELECT pg_advisory_xact_lock(7362771)`);err!=nil{return err} }
for _,stmt:=range []string{
`CREATE TABLE IF NOT EXISTS control_catalog(id INTEGER PRIMARY KEY CHECK(id=1),version BIGINT NOT NULL,document TEXT NOT NULL)`,
`CREATE TABLE IF NOT EXISTS catalog_changes(id TEXT PRIMARY KEY,actor TEXT NOT NULL,op TEXT NOT NULL,target TEXT NOT NULL,reason TEXT NOT NULL,expected_version BIGINT NOT NULL,result_version BIGINT NOT NULL,request_json TEXT NOT NULL,created_at BIGINT NOT NULL)`,
`CREATE INDEX IF NOT EXISTS catalog_changes_version ON catalog_changes(result_version)`,
}{if _,err=tx.ExecContext(ctx,stmt);err!=nil{return err}}
if _,err=tx.ExecContext(ctx,d.q(`INSERT INTO control_catalog(id,version,document) VALUES(1,1,?) ON CONFLICT(id) DO NOTHING`),string(raw));err!=nil{return err}
return tx.Commit()
defaults, err := content.DefaultCatalog()
if err != nil {
return err
}
if err = defaults.Validate(); err != nil {
return err
}
raw, err := json.Marshal(defaults)
if err != nil {
return err
}
tx, err := d.sql.BeginTx(ctx, nil)
if err != nil {
return err
}
defer tx.Rollback()
if d.postgres {
if _, err = tx.ExecContext(ctx, `SELECT pg_advisory_xact_lock(7362771)`); err != nil {
return err
}
}
for _, stmt := range []string{
`CREATE TABLE IF NOT EXISTS control_catalog(id INTEGER PRIMARY KEY CHECK(id=1),version BIGINT NOT NULL,document TEXT NOT NULL)`,
`CREATE TABLE IF NOT EXISTS catalog_changes(id TEXT PRIMARY KEY,actor TEXT NOT NULL,op TEXT NOT NULL,target TEXT NOT NULL,reason TEXT NOT NULL,expected_version BIGINT NOT NULL,result_version BIGINT NOT NULL,request_json TEXT NOT NULL,created_at BIGINT NOT NULL)`,
`CREATE INDEX IF NOT EXISTS catalog_changes_version ON catalog_changes(result_version)`,
} {
if _, err = tx.ExecContext(ctx, stmt); err != nil {
return err
}
}
if _, err = tx.ExecContext(ctx, d.q(`INSERT INTO control_catalog(id,version,document) VALUES(1,1,?) ON CONFLICT(id) DO NOTHING`), string(raw)); err != nil {
return err
}
return tx.Commit()
}
func decodeCatalog(version int64,raw string)(content.Catalog,error){
var catalog content.Catalog
if err:=json.Unmarshal([]byte(raw),&catalog);err!=nil{return catalog,err}
if catalog.Version!=version{return catalog,errors.New("catalog version mismatch")}
return catalog,catalog.Validate()
func decodeCatalog(version int64, raw string) (content.Catalog, error) {
var catalog content.Catalog
if err := json.Unmarshal([]byte(raw), &catalog); err != nil {
return catalog, err
}
if catalog.Version != version {
return catalog, errors.New("catalog version mismatch")
}
return catalog, catalog.Validate()
}
func(d *DB) Catalog(ctx context.Context)(content.Catalog,error){
var version int64;var raw string
if err:=d.sql.QueryRowContext(ctx,`SELECT version,document FROM control_catalog WHERE id=1`).Scan(&version,&raw);err!=nil{return content.Catalog{},err}
return decodeCatalog(version,raw)
func (d *DB) Catalog(ctx context.Context) (content.Catalog, error) {
var version int64
var raw string
if err := d.sql.QueryRowContext(ctx, `SELECT version,document FROM control_catalog WHERE id=1`).Scan(&version, &raw); err != nil {
return content.Catalog{}, err
}
return decodeCatalog(version, raw)
}
func(d *DB) CatalogAfter(ctx context.Context,after int64)(*content.Catalog,error){
var version int64;var raw string
err:=d.sql.QueryRowContext(ctx,d.q(`SELECT version,document FROM control_catalog WHERE id=1 AND version>?`),after).Scan(&version,&raw)
if errors.Is(err,sql.ErrNoRows){return nil,nil};if err!=nil{return nil,err}
catalog,err:=decodeCatalog(version,raw);return &catalog,err
func (d *DB) CatalogAfter(ctx context.Context, after int64) (*content.Catalog, error) {
var version int64
var raw string
err := d.sql.QueryRowContext(ctx, d.q(`SELECT version,document FROM control_catalog WHERE id=1 AND version>?`), after).Scan(&version, &raw)
if errors.Is(err, sql.ErrNoRows) {
return nil, nil
}
if err != nil {
return nil, err
}
catalog, err := decodeCatalog(version, raw)
return &catalog, err
}
func(c CatalogChange) validate()error{
if !catalogRequestID.MatchString(c.ID)||c.ExpectedVersion<1||len(c.Reason)<5||len(c.Reason)>240{return fmt.Errorf("%w: request ID, current version and 5-240 character reason required",ErrCatalogInvalid)}
valid:=false
switch c.Op{
case "create-title":valid=c.Title!=nil&&c.Item==nil&&c.Stats==nil
case "create-item":valid=c.Item!=nil&&c.Title==nil&&c.Stats==nil
case "update-stats":valid=c.Stats!=nil&&c.Title==nil&&c.Item==nil
}
if !valid{return fmt.Errorf("%w: operation must have exactly its matching payload",ErrCatalogInvalid)};return nil
func (c CatalogChange) validate() error {
if !catalogRequestID.MatchString(c.ID) || c.ExpectedVersion < 1 || len(c.Reason) < 5 || len(c.Reason) > 240 {
return fmt.Errorf("%w: request ID, current version and 5-240 character reason required", ErrCatalogInvalid)
}
valid := false
switch c.Op {
case "create-title":
valid = c.Title != nil && c.Item == nil && c.Stats == nil
case "create-item":
valid = c.Item != nil && c.Title == nil && c.Stats == nil
case "update-stats":
valid = c.Stats != nil && c.Title == nil && c.Item == nil
}
if !valid {
return fmt.Errorf("%w: operation must have exactly its matching payload", ErrCatalogInvalid)
}
return nil
}
func(d *DB) PublishCatalog(ctx context.Context,actor string,change CatalogChange)(CatalogResult,error){
change.Reason=strings.TrimSpace(change.Reason)
if actor==""{return CatalogResult{},fmt.Errorf("%w: actor required",ErrCatalogInvalid)}
if err:=change.validate();err!=nil{return CatalogResult{},err}
request,err:=json.Marshal(change);if err!=nil{return CatalogResult{},fmt.Errorf("%w: %v",ErrCatalogInvalid,err)}
tx,err:=d.sql.BeginTx(ctx,nil);if err!=nil{return CatalogResult{},err};defer tx.Rollback()
// Serialize editors without locking world/character/passage/award rows.
locked,err:=tx.ExecContext(ctx,`UPDATE control_catalog SET version=version WHERE id=1`);if err!=nil{return CatalogResult{},err}
n,err:=locked.RowsAffected();if err!=nil{return CatalogResult{},err};if n!=1{return CatalogResult{},errors.New("catalog unavailable")}
var previousActor,previousRequest string;var result CatalogResult
err=tx.QueryRowContext(ctx,d.q(`SELECT actor,request_json,result_version FROM catalog_changes WHERE id=?`),change.ID).Scan(&previousActor,&previousRequest,&result.Version)
if err==nil{if previousActor!=actor||previousRequest!=string(request){return CatalogResult{},ErrCatalogRequest};return result,tx.Commit()}
if !errors.Is(err,sql.ErrNoRows){return CatalogResult{},err}
var version int64;var raw string
if err=tx.QueryRowContext(ctx,`SELECT version,document FROM control_catalog WHERE id=1`).Scan(&version,&raw);err!=nil{return CatalogResult{},err}
if version!=change.ExpectedVersion{return CatalogResult{},ErrCatalogConflict}
catalog,err:=decodeCatalog(version,raw);if err!=nil{return CatalogResult{},err}
target:="stats"
switch change.Op{
case "create-title":catalog.Titles=append(catalog.Titles,*change.Title);target=change.Title.ID
case "create-item":catalog.Items=append(catalog.Items,*change.Item);target=change.Item.ID
case "update-stats":catalog.Stats=*change.Stats
}
catalog.Version=version+1
if err=catalog.Validate();err!=nil{return CatalogResult{},fmt.Errorf("%w: %v",ErrCatalogInvalid,err)}
encoded,err:=json.Marshal(catalog);if err!=nil{return CatalogResult{},err}
if _,err=tx.ExecContext(ctx,d.q(`UPDATE control_catalog SET version=?,document=? WHERE id=1`),catalog.Version,string(encoded));err!=nil{return CatalogResult{},err}
if _,err=tx.ExecContext(ctx,d.q(`INSERT INTO catalog_changes(id,actor,op,target,reason,expected_version,result_version,request_json,created_at) VALUES(?,?,?,?,?,?,?,?,`+d.now()+`)`),change.ID,actor,change.Op,target,change.Reason,change.ExpectedVersion,catalog.Version,string(request));err!=nil{return CatalogResult{},err}
if err=tx.Commit();err!=nil{return CatalogResult{},err};return CatalogResult{Version:catalog.Version},nil
func (d *DB) PublishCatalog(ctx context.Context, actor string, change CatalogChange) (CatalogResult, error) {
change.Reason = strings.TrimSpace(change.Reason)
if actor == "" {
return CatalogResult{}, fmt.Errorf("%w: actor required", ErrCatalogInvalid)
}
if err := change.validate(); err != nil {
return CatalogResult{}, err
}
request, err := json.Marshal(change)
if err != nil {
return CatalogResult{}, fmt.Errorf("%w: %v", ErrCatalogInvalid, err)
}
tx, err := d.sql.BeginTx(ctx, nil)
if err != nil {
return CatalogResult{}, err
}
defer tx.Rollback()
// Serialize editors without locking world/character/passage/award rows.
locked, err := tx.ExecContext(ctx, `UPDATE control_catalog SET version=version WHERE id=1`)
if err != nil {
return CatalogResult{}, err
}
n, err := locked.RowsAffected()
if err != nil {
return CatalogResult{}, err
}
if n != 1 {
return CatalogResult{}, errors.New("catalog unavailable")
}
var previousActor, previousRequest string
var result CatalogResult
err = tx.QueryRowContext(ctx, d.q(`SELECT actor,request_json,result_version FROM catalog_changes WHERE id=?`), change.ID).Scan(&previousActor, &previousRequest, &result.Version)
if err == nil {
if previousActor != actor || previousRequest != string(request) {
return CatalogResult{}, ErrCatalogRequest
}
return result, tx.Commit()
}
if !errors.Is(err, sql.ErrNoRows) {
return CatalogResult{}, err
}
var version int64
var raw string
if err = tx.QueryRowContext(ctx, `SELECT version,document FROM control_catalog WHERE id=1`).Scan(&version, &raw); err != nil {
return CatalogResult{}, err
}
if version != change.ExpectedVersion {
return CatalogResult{}, ErrCatalogConflict
}
catalog, err := decodeCatalog(version, raw)
if err != nil {
return CatalogResult{}, err
}
target := "stats"
switch change.Op {
case "create-title":
catalog.Titles = append(catalog.Titles, *change.Title)
target = change.Title.ID
case "create-item":
catalog.Items = append(catalog.Items, *change.Item)
target = change.Item.ID
case "update-stats":
catalog.Stats = *change.Stats
}
catalog.Version = version + 1
if err = catalog.Validate(); err != nil {
return CatalogResult{}, fmt.Errorf("%w: %v", ErrCatalogInvalid, err)
}
encoded, err := json.Marshal(catalog)
if err != nil {
return CatalogResult{}, err
}
if _, err = tx.ExecContext(ctx, d.q(`UPDATE control_catalog SET version=?,document=? WHERE id=1`), catalog.Version, string(encoded)); err != nil {
return CatalogResult{}, err
}
if _, err = tx.ExecContext(ctx, d.q(`INSERT INTO catalog_changes(id,actor,op,target,reason,expected_version,result_version,request_json,created_at) VALUES(?,?,?,?,?,?,?,?,`+d.now()+`)`), change.ID, actor, change.Op, target, change.Reason, change.ExpectedVersion, catalog.Version, string(request)); err != nil {
return CatalogResult{}, err
}
if err = tx.Commit(); err != nil {
return CatalogResult{}, err
}
return CatalogResult{Version: catalog.Version}, nil
}
func(d *DB) CatalogChanges(ctx context.Context)([]CatalogAudit,error){
rows,err:=d.sql.QueryContext(ctx,`SELECT id,actor,op,target,reason,result_version,created_at FROM catalog_changes ORDER BY result_version DESC LIMIT 100`);if err!=nil{return nil,err};defer rows.Close()
changes:=[]CatalogAudit{}
for rows.Next(){var c CatalogAudit;if err=rows.Scan(&c.ID,&c.Actor,&c.Op,&c.Target,&c.Reason,&c.Version,&c.CreatedAt);err!=nil{return nil,err};changes=append(changes,c)}
return changes,rows.Err()
func (d *DB) CatalogChanges(ctx context.Context) ([]CatalogAudit, error) {
rows, err := d.sql.QueryContext(ctx, `SELECT id,actor,op,target,reason,result_version,created_at FROM catalog_changes ORDER BY result_version DESC LIMIT 100`)
if err != nil {
return nil, err
}
defer rows.Close()
changes := []CatalogAudit{}
for rows.Next() {
var c CatalogAudit
if err = rows.Scan(&c.ID, &c.Actor, &c.Op, &c.Target, &c.Reason, &c.Version, &c.CreatedAt); err != nil {
return nil, err
}
changes = append(changes, c)
}
return changes, rows.Err()
}
+95
View File
@@ -0,0 +1,95 @@
package store
import (
"aeternalis/server/content"
"aeternalis/server/internal/game"
"context"
"errors"
"os"
"path/filepath"
"sync"
"testing"
)
func TestCatalogEditorsAndDurability(t *testing.T) {
testCatalogEditors(t, "file:"+filepath.ToSlash(filepath.Join(t.TempDir(), "catalog.db")))
}
func TestPostgresCatalogEditors(t *testing.T) {
dsn := os.Getenv("TEST_DATABASE_URL")
if dsn == "" {
t.Skip("TEST_DATABASE_URL not configured")
}
testCatalogEditors(t, dsn)
}
func testCatalogEditors(t *testing.T, dsn string) {
ctx := context.Background()
db, err := Open(ctx, dsn)
if err != nil {
t.Fatal(err)
}
defer func() {
if db != nil {
db.Close()
}
}()
initial, err := db.Catalog(ctx)
if err != nil {
t.Fatal(err)
}
requests := make([]CatalogChange, 2)
for i := range requests {
title := content.Title{ID: "editor_" + game.ID(), Name: "Editor trial", Scope: "personal", Requirements: []content.TitleRequirement{{Metric: "level", AtLeast: 2}}}
requests[i] = CatalogChange{ID: game.ID(), ExpectedVersion: initial.Version, Op: "create-title", Reason: "Concurrent editors", Title: &title}
}
var wg sync.WaitGroup
start := make(chan struct{})
results := make([]error, 2)
for i := range requests {
wg.Add(1)
go func(i int) { defer wg.Done(); <-start; _, results[i] = db.PublishCatalog(ctx, "operator", requests[i]) }(i)
}
close(start)
wg.Wait()
winner := -1
for i, err := range results {
if err == nil {
if winner >= 0 {
t.Fatal("both stale edits committed")
}
winner = i
} else if !errors.Is(err, ErrCatalogConflict) {
t.Fatal(err)
}
}
if winner < 0 {
t.Fatal("no editor committed")
}
request := requests[winner]
result, err := db.PublishCatalog(ctx, "operator", request)
if err != nil || result.Version != initial.Version+1 {
t.Fatal("replay failed", err)
}
if _, err = db.PublishCatalog(ctx, "other", request); !errors.Is(err, ErrCatalogRequest) {
t.Fatal("actor collision accepted", err)
}
request.ID = game.ID()
request.ExpectedVersion = result.Version
if _, err = db.PublishCatalog(ctx, "operator", request); !errors.Is(err, ErrCatalogInvalid) {
t.Fatal("overwrote published ID", err)
}
audits, err := db.CatalogChanges(ctx)
if err != nil || len(audits) < 1 || audits[0].ID != requests[winner].ID {
t.Fatal("audit missing", err)
}
if err = db.Close(); err != nil {
t.Fatal(err)
}
db, err = Open(ctx, dsn)
if err != nil {
t.Fatal(err)
}
restored, err := db.Catalog(ctx)
if err != nil || restored.Version != result.Version || len(restored.Titles) != len(initial.Titles)+1 {
t.Fatal("bootstrap overwrote catalog", err)
}
}
+1 -1
View File
@@ -175,7 +175,7 @@ func runStoreTests(t *testing.T, dsn string) {
t.Fatal(err)
}
loaded := restored.Characters[c.View.Entity.ID]
if loaded == nil || loaded.DailySeconds != 123 || !slices.ContainsFunc(loaded.View.Items,func(item p.ItemInstance)bool{return item.DefinitionID=="spear"}) {
if loaded == nil || loaded.DailySeconds != 123 || !slices.ContainsFunc(loaded.View.Items, func(item p.ItemInstance) bool { return item.DefinitionID == "spear" }) {
t.Fatal("transfer not durable")
}
if err = targetLease.Save(ctx, target, ""); err == nil {
+3
View File
@@ -139,6 +139,9 @@ func (d *DB) accountTitles(ctx context.Context, tx *sql.Tx, account string) ([]p
if err = json.Unmarshal([]byte(raw), &award); err != nil {
return nil, err
}
if award.Effects.Modifiers == nil {
award.Effects.Modifiers = []p.StatModifier{}
}
awards = append(awards, award)
}
return awards, rows.Err()
+74 -35
View File
@@ -1,42 +1,81 @@
package transport
import (
"context"
"encoding/json"
"errors"
"io"
"net/http"
"time"
"aeternalis/server/internal/store"
"aeternalis/server/internal/store"
"context"
"encoding/json"
"errors"
"io"
"net/http"
"time"
)
func(h *HTTP) catalogRoutes(mux *http.ServeMux){
mux.HandleFunc("GET /api/control/catalog",func(w http.ResponseWriter,r *http.Request){
if _,ok:=h.admin(w,r);!ok{return}
ctx,cancel:=context.WithTimeout(r.Context(),5*time.Second);defer cancel()
catalog,err:=h.auth.db.Catalog(ctx);if err!=nil{fail(w,503,"catalog unavailable");return}
changes,err:=h.auth.db.CatalogChanges(ctx);if err!=nil{fail(w,503,"catalog audit unavailable");return}
respond(w,200,map[string]any{"catalog":catalog,"changes":changes})
})
mux.HandleFunc("POST /api/control/catalog",func(w http.ResponseWriter,r *http.Request){
actor,ok:=h.admin(w,r);if !ok{return}
var change store.CatalogChange
r.Body=http.MaxBytesReader(w,r.Body,32768)
decoder:=json.NewDecoder(r.Body);decoder.DisallowUnknownFields()
if err:=decoder.Decode(&change);err!=nil{fail(w,400,"invalid catalog change");return}
var extra any;if err:=decoder.Decode(&extra);err!=io.EOF{fail(w,400,"invalid catalog change");return}
ctx,cancel:=context.WithTimeout(r.Context(),5*time.Second);defer cancel()
result,err:=h.auth.db.PublishCatalog(ctx,actor,change)
switch{
case errors.Is(err,store.ErrCatalogConflict),errors.Is(err,store.ErrCatalogRequest):fail(w,409,err.Error())
case errors.Is(err,store.ErrCatalogInvalid):fail(w,400,err.Error())
case err!=nil:fail(w,503,"catalog publication unavailable")
default:respond(w,200,result)
}
})
func (h *HTTP) catalogRoutes(mux *http.ServeMux) {
mux.HandleFunc("GET /api/control/catalog", func(w http.ResponseWriter, r *http.Request) {
if _, ok := h.admin(w, r); !ok {
return
}
ctx, cancel := context.WithTimeout(r.Context(), 5*time.Second)
defer cancel()
catalog, err := h.auth.db.Catalog(ctx)
if err != nil {
fail(w, 503, "catalog unavailable")
return
}
changes, err := h.auth.db.CatalogChanges(ctx)
if err != nil {
fail(w, 503, "catalog audit unavailable")
return
}
respond(w, 200, map[string]any{"catalog": catalog, "changes": changes})
})
mux.HandleFunc("POST /api/control/catalog", func(w http.ResponseWriter, r *http.Request) {
actor, ok := h.admin(w, r)
if !ok {
return
}
var change store.CatalogChange
r.Body = http.MaxBytesReader(w, r.Body, 32768)
decoder := json.NewDecoder(r.Body)
decoder.DisallowUnknownFields()
if err := decoder.Decode(&change); err != nil {
fail(w, 400, "invalid catalog change")
return
}
var extra any
if err := decoder.Decode(&extra); err != io.EOF {
fail(w, 400, "invalid catalog change")
return
}
ctx, cancel := context.WithTimeout(r.Context(), 5*time.Second)
defer cancel()
result, err := h.auth.db.PublishCatalog(ctx, actor, change)
switch {
case errors.Is(err, store.ErrCatalogConflict), errors.Is(err, store.ErrCatalogRequest):
fail(w, 409, err.Error())
case errors.Is(err, store.ErrCatalogInvalid):
fail(w, 400, err.Error())
case err != nil:
fail(w, 503, "catalog publication unavailable")
default:
respond(w, 200, result)
}
})
}
// Caller holds s.mu. Checkpoint a catalog before it can reach a snapshot.
func(s *Service) refreshCatalog(ctx context.Context)error{
ctx,cancel:=context.WithTimeout(ctx,5*time.Second);defer cancel()
catalog,err:=s.lease.DB.CatalogAfter(ctx,s.world.CatalogVersion);if err!=nil{return err};if catalog==nil{return nil}
if err=s.world.ApplyCatalog(*catalog);err!=nil{return err};return s.persist(ctx,"")
func (s *Service) refreshCatalog(ctx context.Context) error {
ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
defer cancel()
catalog, err := s.lease.DB.CatalogAfter(ctx, s.world.CatalogVersion)
if err != nil {
return err
}
if catalog == nil {
return nil
}
if err = s.world.ApplyCatalog(*catalog); err != nil {
return err
}
return s.persist(ctx, "")
}
@@ -1,44 +1,103 @@
package transport
import (
"context"
"encoding/json"
"path/filepath"
"testing"
"time"
"aeternalis/server/content"
"aeternalis/server/internal/game"
"aeternalis/server/internal/store"
"aeternalis/server/content"
"aeternalis/server/internal/game"
"aeternalis/server/internal/store"
"context"
"encoding/json"
"path/filepath"
"testing"
"time"
)
func TestPublishedTitlesAndStatsReachDurableCharacterViews(t *testing.T) {
ctx:=context.Background()
db,err:=store.Open(ctx,"file:"+filepath.ToSlash(filepath.Join(t.TempDir(),"catalog-owner.db")));if err!=nil{t.Fatal(err)};defer db.Close()
b,err:=content.Load();if err!=nil{t.Fatal(err)}
w:=game.New("catalog-owner",23,time.Now(),b)
lease,_,err:=db.Acquire(ctx,w);if err!=nil{t.Fatal(err)}
svc:=NewService(w,lease)
initial,err:=db.Catalog(ctx);if err!=nil{t.Fatal(err)}
title:=content.Title{ID:"published_strength",Name:"Published Strength",Scope:"personal",Requirements:[]content.TitleRequirement{{Metric:"level",AtLeast:1}},Effects:content.TitleEffects{Modifiers:[]content.StatModifier{{Stat:"strength",Flat:4,Percent:50}}}}
result,err:=db.PublishCatalog(ctx,"operator",store.CatalogChange{ID:game.ID(),ExpectedVersion:initial.Version,Op:"create-title",Reason:"Integration title",Title:&title});if err!=nil{t.Fatal(err)}
view,err:=svc.join(ctx,"catalog-player","Catalog Player","");if err!=nil{t.Fatal(err)}
if len(view.Titles)!=1||view.Titles[0].ID!=title.ID||view.Stats["strength"].Final!=6||view.Stats["meleeDamage"].Final!=24{t.Fatal("published title missing from committed join",view)}
c:=w.Characters[view.Entity.ID];c.View.Entity.HP=20;c.DailySeconds=321
rules:=initial.Stats;rules.Base["healthPoints"]=150
result,err=db.PublishCatalog(ctx,"operator",store.CatalogChange{ID:game.ID(),ExpectedVersion:result.Version,Op:"update-stats",Reason:"Integration formula",Stats:&rules});if err!=nil{t.Fatal(err)}
if err=svc.controls(ctx);err!=nil{t.Fatal(err)}
record,err:=db.ActiveCharacter(ctx,c.Account);if err!=nil{t.Fatal(err)}
if record.Character.View.Entity.MaxHP!=150||record.Character.View.Entity.HP!=20||record.Character.DailySeconds!=321||record.Character.View.Titles[0].Effects.Modifiers[0].Flat!=4{t.Fatal("catalog changed health, budget or earned title")}
worlds,err:=db.Worlds(ctx);if err!=nil||worlds[0].CatalogVersion!=result.Version{t.Fatal("applied version not checkpointed",err)}
if err=lease.Release(ctx);err!=nil{t.Fatal(err)}
nextLease,raw,err:=db.Acquire(ctx,game.New(w.ID,23,time.Now(),b));if err!=nil{t.Fatal(err)};defer nextLease.Release(ctx)
var restored game.World;if err=json.Unmarshal(raw,&restored);err!=nil{t.Fatal(err)}
if err=restored.Restore(time.Now());err!=nil{t.Fatal(err)}
if restored.CatalogVersion!=result.Version||restored.Characters[c.View.Entity.ID].View.Stats["healthPoints"].Final!=150{t.Fatal("restart lost published stats")}
// Old ownership may no longer expose a speculative formula revision.
rules.Base["healthPoints"]=200
if _,err=db.PublishCatalog(ctx,"operator",store.CatalogChange{ID:game.ID(),ExpectedVersion:result.Version,Op:"update-stats",Reason:"Stale owner test",Stats:&rules});err!=nil{t.Fatal(err)}
if err=svc.refreshCatalog(ctx);err==nil||svc.ready.Load(){t.Fatal("stale owner continued after failed catalog checkpoint")}
record,err=db.ActiveCharacter(ctx,c.Account);if err!=nil{t.Fatal(err)}
if record.Character.View.Entity.MaxHP!=150{t.Fatal("failed checkpoint published speculative stats")}
ctx := context.Background()
db, err := store.Open(ctx, "file:"+filepath.ToSlash(filepath.Join(t.TempDir(), "catalog-owner.db")))
if err != nil {
t.Fatal(err)
}
defer db.Close()
b, err := content.Load()
if err != nil {
t.Fatal(err)
}
w := game.New("catalog-owner", 23, time.Now(), b)
lease, _, err := db.Acquire(ctx, w)
if err != nil {
t.Fatal(err)
}
svc := NewService(w, lease)
initial, err := db.Catalog(ctx)
if err != nil {
t.Fatal(err)
}
title := content.Title{ID: "published_strength", Name: "Published Strength", Scope: "personal", Requirements: []content.TitleRequirement{{Metric: "level", AtLeast: 1}}, Effects: content.TitleEffects{Modifiers: []content.StatModifier{{Stat: "strength", Flat: 4, Percent: 50}}}}
result, err := db.PublishCatalog(ctx, "operator", store.CatalogChange{ID: game.ID(), ExpectedVersion: initial.Version, Op: "create-title", Reason: "Integration title", Title: &title})
if err != nil {
t.Fatal(err)
}
view, err := svc.join(ctx, "catalog-player", "Catalog Player", "")
if err != nil {
t.Fatal(err)
}
if len(view.Titles) != 1 || view.Titles[0].ID != title.ID || view.Stats["strength"].Final != 6 || view.Stats["meleeDamage"].Final != 24 {
t.Fatal("published title missing from committed join", view)
}
c := w.Characters[view.Entity.ID]
c.View.Entity.HP = 20
c.DailySeconds = 321
rules := initial.Stats
rules.Base["healthPoints"] = 150
result, err = db.PublishCatalog(ctx, "operator", store.CatalogChange{ID: game.ID(), ExpectedVersion: result.Version, Op: "update-stats", Reason: "Integration formula", Stats: &rules})
if err != nil {
t.Fatal(err)
}
if err = svc.controls(ctx); err != nil {
t.Fatal(err)
}
record, err := db.ActiveCharacter(ctx, c.Account)
if err != nil {
t.Fatal(err)
}
if record.Character.View.Entity.MaxHP != 150 || record.Character.View.Entity.HP != 20 || record.Character.DailySeconds != 321 || record.Character.View.Titles[0].Effects.Modifiers[0].Flat != 4 {
t.Fatal("catalog changed health, budget or earned title")
}
worlds, err := db.Worlds(ctx)
if err != nil || worlds[0].CatalogVersion != result.Version {
t.Fatal("applied version not checkpointed", err)
}
if err = lease.Release(ctx); err != nil {
t.Fatal(err)
}
nextLease, raw, err := db.Acquire(ctx, game.New(w.ID, 23, time.Now(), b))
if err != nil {
t.Fatal(err)
}
defer nextLease.Release(ctx)
var restored game.World
if err = json.Unmarshal(raw, &restored); err != nil {
t.Fatal(err)
}
if err = restored.Restore(time.Now()); err != nil {
t.Fatal(err)
}
if restored.CatalogVersion != result.Version || restored.Characters[c.View.Entity.ID].View.Stats["healthPoints"].Final != 150 {
t.Fatal("restart lost published stats")
}
// Old ownership may no longer expose a speculative formula revision.
rules.Base["healthPoints"] = 200
if _, err = db.PublishCatalog(ctx, "operator", store.CatalogChange{ID: game.ID(), ExpectedVersion: result.Version, Op: "update-stats", Reason: "Stale owner test", Stats: &rules}); err != nil {
t.Fatal(err)
}
if err = svc.refreshCatalog(ctx); err == nil || svc.ready.Load() {
t.Fatal("stale owner continued after failed catalog checkpoint")
}
record, err = db.ActiveCharacter(ctx, c.Account)
if err != nil {
t.Fatal(err)
}
if record.Character.View.Entity.MaxHP != 150 {
t.Fatal("failed checkpoint published speculative stats")
}
}
+4 -1
View File
@@ -176,7 +176,10 @@ func (h *HTTP) Handler() http.Handler {
h.s.mu.Lock()
defer h.s.mu.Unlock()
if c := h.s.world.ForAccount(account); c != nil && active != nil && active.WorldID == h.s.world.ID && active.ID == c.View.Entity.ID {
if !h.s.ready.Load() { fail(w, 503, "world unavailable"); return }
if !h.s.ready.Load() {
fail(w, 503, "world unavailable")
return
}
respond(w, 200, map[string]any{"character": c.View, "world": h.s.world.Info()})
return
}
+63
View File
@@ -0,0 +1,63 @@
import { test, expect } from '@playwright/test';
test('Control publishes title and equipment requirements, formulas and audit', async ({ page }) => {
const errors:string[]=[];page.on('pageerror',e=>errors.push(e.message));
const origin='http://127.0.0.1:18089';
expect((await page.request.get('/api/control/catalog')).status()).toBe(401);
await page.request.post('/auth/dev',{data:{},headers:{Origin:origin}});
const initial=(await (await page.request.get('/api/control/catalog')).json()).catalog.version;
await page.goto('/control');await page.getByRole('button',{name:'Content',exact:true}).click();
await page.getByRole('button',{name:'Create title',exact:true}).click();
const form=page.locator('.catalog-form');
await form.getByLabel('Permanent ID',{exact:true}).fill('control_trial');
await form.getByLabel('Name',{exact:true}).fill('Control Trial');
await form.getByLabel('Description',{exact:true}).fill('A test of authored requirements and effects.');
await form.getByLabel('Award scope').selectOption('global');
await form.getByLabel('At least').fill('9999');
await form.getByRole('button',{name:'Add modifier',exact:true}).click();
await form.getByRole('combobox',{name:'Stat',exact:true}).selectOption('strength');
await form.getByLabel('Flat change',{exact:true}).fill('3');
await form.getByLabel('Percent change (%)',{exact:true}).fill('-10');
await form.getByLabel('Reason for change').fill('Browser authoring verification');
await page.setViewportSize({width:390,height:844});
expect(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth)).toBe(true);
await page.screenshot({path:'test-results/content-title-mobile.png',fullPage:true});
await form.getByRole('button',{name:'Publish changes'}).click();
await expect(page.locator('.catalog-heading')).toContainText(`Catalog version ${initial+1}`);
let catalog=(await (await page.request.get('/api/control/catalog')).json()).catalog;
expect(catalog.titles.find(t=>t.id==='control_trial')).toMatchObject({scope:'global',requirements:[{metric:'level',atLeast:9999}],effects:{modifiers:[{stat:'strength',flat:3,percent:-10}]}});
await page.locator('.catalog-tabs').getByRole('button',{name:'Equipment',exact:true}).click();
await page.getByRole('button',{name:'Create equipment',exact:true}).click();
await form.getByLabel('Permanent ID',{exact:true}).fill('control_ring');
await form.getByLabel('Name',{exact:true}).fill('Control Ring');
await form.getByLabel('Equipment slot').selectOption('ring');
await form.getByLabel('Required level').fill('2');
await form.getByRole('button',{name:'Add required stat'}).click();
await form.getByRole('combobox',{name:'Stat',exact:true}).selectOption('strength');
await form.getByLabel('Minimum value').fill('3');
await form.getByLabel('Control Trial',{exact:true}).check();
await form.getByRole('button',{name:'Add modifier',exact:true}).click();
const modifier=form.locator('fieldset').filter({has:page.locator('legend',{hasText:'Modifiers'})});
await modifier.getByRole('combobox',{name:'Stat',exact:true}).selectOption('luck');
await modifier.getByLabel('Flat change').fill('2');
await modifier.getByLabel('Percent change (%)').fill('25');
await form.getByLabel('Reason for change').fill('Equipment authoring verification');
await form.getByRole('button',{name:'Publish changes'}).click();
await expect(page.locator('.catalog-heading')).toContainText(`Catalog version ${initial+2}`);
catalog=(await (await page.request.get('/api/control/catalog')).json()).catalog;
expect(catalog.items.find(i=>i.id==='control_ring')).toMatchObject({slot:'ring',requirements:{level:2,stats:{strength:3},titles:['control_trial']},modifiers:[{stat:'luck',flat:2,percent:25}]});
await page.locator('.catalog-tabs').getByRole('button',{name:'Stat formulas',exact:true}).click();
await page.getByRole('button',{name:'Edit stat formulas',exact:true}).click();
await form.getByLabel('Charisma base',{exact:true}).fill('1');
await form.getByLabel('Reason for change').fill('Formula editor verification');
await form.getByRole('button',{name:'Publish changes'}).click();
await expect(page.locator('.catalog-heading')).toContainText(`Catalog version ${initial+3}`);
await page.locator('.catalog-tabs').getByRole('button',{name:'Content audit',exact:true}).click();
await expect(page.locator('.catalog-list')).toContainText('Formula editor verification');
await expect(page.locator('.catalog-list')).toContainText('control_ring');
await page.setViewportSize({width:1440,height:1000});
await page.screenshot({path:'test-results/content-audit-desktop.png',fullPage:true});
await expect.poll(async()=>((await (await page.request.get('/api/control')).json()).worlds[0].catalogVersion)).toBe(initial+3);
expect((await page.request.post('/api/control/catalog',{data:{},headers:{Origin:'https://evil.example'}})).status()).toBe(403);
expect(errors).toEqual([]);
});
+3 -3
View File
@@ -28,7 +28,7 @@ test('admin actions are audited and death permits a distinct replacement', async
await page.getByRole('button', { name: 'Characters', exact: true }).click();
await expect(page.locator('#view-title')).toHaveText('Characters');
await page.getByRole('searchbox', { name: 'Search records' }).fill('Portal life');
await expect(page.locator('tbody tr')).toHaveCount(1);
await expect(page.locator('#records tbody tr')).toHaveCount(1);
await page.getByRole('button', { name: 'Portal life', exact: true }).click();
await expect(page.locator('#character-dialog')).toBeVisible();
await expect(page.locator('#character-detail')).toContainText(old.entity.id);
@@ -40,7 +40,7 @@ test('admin actions are audited and death permits a distinct replacement', async
await expect.poll(async () => (await (await page.request.get('/api/account')).json()).active?.name).toBe('Portal renamed');
await page.getByRole('searchbox', { name: 'Search records' }).fill('Portal renamed');
await page.getByRole('button', { name: 'Refresh', exact: true }).click();
await expect(page.locator('tbody tr')).toHaveCount(1);
await expect(page.locator('#records tbody tr')).toHaveCount(1);
await page.screenshot({ path: 'test-results/control-desktop.png', fullPage: true });
await page.getByLabel(`Action for ${old.entity.id}`).selectOption('retire');
await page.getByLabel('Reason', { exact: true }).fill('Permanent death verification');
@@ -60,7 +60,7 @@ test('admin actions are audited and death permits a distinct replacement', async
expect(account.characters.find(c => c.id === old.entity.id).state).toBe('dead');
expect(account.characters.find(c => c.id === old.entity.id).character.deathReason).toContain('Permanent death verification');
await page.goto('/control'); await page.getByRole('button', { name: 'Audit log', exact: true }).click();
await expect(page.locator('tbody')).toContainText('Permanent death verification');
await expect(page.locator('#records tbody')).toContainText('Permanent death verification');
await page.setViewportSize({ width: 390, height: 844 });
expect(await page.evaluate(() => document.documentElement.scrollWidth <= innerWidth)).toBe(true);
await page.screenshot({ path: 'test-results/control-mobile.png', fullPage: true });
+26 -2
View File
@@ -5,9 +5,12 @@ test('progression and signed permanent titles render in game, account, and admin
const errors: string[] = []; page.on('pageerror', error => errors.push(error.message));
const character: Character = {
entity: { id: 'progression-fixture', kind: 'player', name: 'Title bearer', state: 'alive', hp: 100, maxHp: 100, position: { x: 0, y: 0, z: 0 } },
inventory: { knife: 1 }, skills: { combat: 2 }, kills: 2, ack: 0, hasKeystone: false,
inventory: { wood: 1 }, skills: { combat: 2 }, kills: 2, ack: 0, hasKeystone: false,
allocatedStats: {}, pendingVitalChoices: 1, healthChoices: 0, manaChoices: 0, mana: 50, stamina: 105, carryWeight: 3,
stats: { strength: { base: 2, flat: 2, percent: 50, final: 6 }, healthPoints: { base: 100, flat: 0, percent: 0, final: 100 }, manaPoints: { base: 50, flat: 0, percent: 0, final: 50 }, stamina: { base: 105, flat: 0, percent: 0, final: 105 }, carryCapacity: { base: 130, flat: 0, percent: 0, final: 130 } },
equipment: {}, items: [{ id: 'ring-fixture', definitionId: 'ring-trial', name: 'Trial Ring', description: 'An earned tool.', slot: 'ring', weight: 2, requirements: { level: 1, stats: {}, titles: [] }, modifiers: [{ stat: 'luck', flat: 2, percent: -5 }], equippable: true, requirementMessage: '' }],
playedSeconds: 120, remainingSeconds: 7080, level: 2, experience: 40, experienceToNextLevel: 150, statPoints: 5,
titles: [{ id: 'first-hunter-fixture', name: 'The First Hunter', description: 'Power comes with a heavier step.', scope: 'global', worldId: 'e2e', earnedAt: '2026-09-06T12:00:00Z', effects: { damage: 3, moveSpeed: -0.5 } }],
titles: [{ id: 'first-hunter-fixture', name: 'The First Hunter', description: 'Power comes with a heavier step.', scope: 'global', worldId: 'e2e', earnedAt: '2026-09-06T12:00:00Z', effects: { damage: 3, moveSpeed: -0.5, modifiers: [{ stat: 'strength', flat: 2, percent: 50 }] } }],
};
const record = { id: character.entity.id, account: 'fixture-account', worldId: 'e2e', name: character.entity.name, state: 'alive', character: { view: character, bornAt: '2026-09-06T11:00:00Z', dailySeconds: 120 } };
const worlds = await (await request.get('/api/worlds')).json();
@@ -16,7 +19,9 @@ test('progression and signed permanent titles render in game, account, and admin
await page.route('**/api/account', route => route.fulfill({ json: { active: record, characters: [record], admin: true } }));
await page.route('**/api/control?*', route => route.fulfill({ json: { worlds, characters: [record], commands: [], provisioningEnabled: false, characterLimit: 500, auditLimit: 100 } }));
let sendSnapshot: () => void = () => {};
const intents: { op: string; target: string; slot: string }[] = [];
await page.routeWebSocket('**/ws', socket => {
socket.onMessage(raw => { const intent = JSON.parse(String(raw)); if (intent.op !== 'move') intents.push(intent); });
sendSnapshot = () => {
const snapshot: Snapshot = { type: 'snapshot', version: 1, tick: 1, self: character, chunks, chunkKeys: chunks.map(c => c.key), entities: [], unavailableResources: [], message: '',
world: { id: 'e2e', seed: 1, phase: 'gathering', ageSeconds: 120, bossInSeconds: 3600, collapseInSeconds: 5400, safeRadius: 1024, radius: 1024, online: 1, capacity: 100, bossHp: 1200, bossMaxHp: 1200 } };
@@ -30,6 +35,23 @@ test('progression and signed permanent titles render in game, account, and admin
await expect(page.locator('#character-experience')).toHaveText('40 / 150 XP');
await expect(page.locator('#stat-point-bank')).toHaveText('5 stat points saved');
await page.getByRole('button', { name: 'Inventory and crafting' }).click();
await page.getByLabel('Ring slot for Trial Ring').selectOption('ring8');
sendSnapshot();
await expect(page.getByLabel('Ring slot for Trial Ring')).toHaveValue('ring8');
await page.locator('[data-focus-key="equip-ring-fixture"]').click();
await expect.poll(() => intents.at(-1)).toMatchObject({ op: 'equip', target: 'ring-fixture', slot: 'ring8' });
character.equipment.ring8 = 'ring-fixture'; sendSnapshot();
await page.locator('.character-sections').getByRole('button', { name: 'Equipment', exact: true }).click();
await expect(page.locator('.equipment-slot')).toHaveCount(21);
await page.locator('[data-focus-key="unequip-ring8"]').click();
await expect.poll(() => intents.at(-1)).toMatchObject({ op: 'unequip', target: 'ring8' });
await page.locator('.character-sections').getByRole('button', { name: 'Character', exact: true }).click();
await page.getByRole('button', { name: 'Allocate one point to Constitution' }).click();
await expect.poll(() => intents.at(-1)).toMatchObject({ op: 'allocate-stat', target: 'constitution' });
await page.getByRole('button', { name: '+5 mana', exact: true }).click();
await expect.poll(() => intents.at(-1)).toMatchObject({ op: 'choose-vital', target: 'mana' });
await page.getByText('Inspect all stats', { exact: true }).click();
await expect(page.locator('.stat-table tbody tr').filter({ hasText: 'Strength' })).toContainText('50%');
await expect(page.locator('#earned-titles')).toContainText('+3 damage');
await expect(page.locator('#earned-titles')).toContainText('-0.5 movement speed');
await expect(page.locator('#earned-titles')).toContainText('First ever');
@@ -53,6 +75,8 @@ test('progression and signed permanent titles render in game, account, and admin
await expect(page.locator('#character-detail')).toContainText('Level 1000');
await expect(page.locator('#character-detail')).toContainText('+3 damage');
await expect(page.locator('#character-detail')).toContainText('-0.5 movement speed');
await expect(page.locator('#character-detail .stat-table tbody tr').filter({ hasText: 'Strength' })).toHaveText('Strength2+2+50%6');
await expect(page.locator('#character-detail')).toContainText('Trial Ring');
await page.screenshot({ path: 'test-results/progression-control.png' });
expect(errors).toEqual([]);
});