david raistrick
2569cc4497
feat(combat): add first-class undo and redo controls Add undo and redo controls to the combat UI so the DM can recover from recent actions without leaving the encounter view. Undo and redo operate on the current encounter's combat history. Empty stacks produce clear feedback instead of failing silently. Redo order follows normal stack behavior after multiple undos. This makes combat history actionable during play, not just visible in the log. feat(logs): make combat logs replayable Replace plain combat log messages with structured combat events that can be used by the UI, exported as JSON, replayed, and verified. Each new log entry records the action type, encounter identity, participant identity, a small action delta, undo intent, and a turn snapshot. Download and copy now export the event stream as JSON so a saved combat log is useful for offline analysis and debugging. Legacy logs remain viewable, but new logs use the structured event format. feat(logs): make undo and redo transactional Apply undo and redo as single storage operations so the encounter state and log state cannot drift apart. Server storage applies the encounter update and the log undone flag inside one SQLite transaction. Firebase storage uses a batch write for the same behavior. The storage contract now includes undo/redo semantics. This replaces fragile multi-write undo behavior where a failure could update the encounter without marking the log, or mark the log without updating the encounter. feat(combat): add unified replay and verification tool Add one combat CLI for replaying live combat and verifying combat logs. Replay drives the live backend through the same shared combat logic used by the app, writes a JSON event log to an explicit output path, and automatically verifies the result. Verification checks for DM-visible combat problems such as skipped turns, double actions, bad round changes, and unexpected turn order changes. The tool uses the same JSON event stream produced by log downloads, supports verbose turn output, and handles Ctrl-C by ending the encounter, writing the partial log, and verifying what was captured. fix(perf): keep long combat logging fast Remove the combat-time log query bottleneck that made long replays slow as log volume grew. Combat controls no longer subscribe to the log collection just to keep undo and redo state warm. Undo and redo now query the latest matching encounter log only when clicked. Server collection queries support exact filters, ordering, limits, and offsets, and SQLite indexes keep latest-log and per-encounter log lookups fast. Also fix duplicate WebSocket handler registration so realtime updates do not double-fire under write load. fix(turns): make toggle active a status change Make toggle active a roster/status edit instead of a turn advance. Deactivating the current participant no longer passes the turn or increments the round. The current turn stays where it is until the DM explicitly clicks Next Turn, and Next Turn skips inactive participants during normal rotation. This matches the initiative design: slot order is stable, toggle active does not move participants, and round changes only come from explicit turn advance. chore(ci): make warnings and hangs fail fast Tighten test and build checks so failures are visible instead of noisy or silent. Builds run with CI enabled so warnings fail production builds. The full test command runs app, shared, and server suites with hard timeouts so hangs fail quickly. Static eslint coverage fails on warnings as well as errors. Tests were updated around the new async combat logging flow, structured log events, transactional undo, replay verification, and toggle-active semantics.
78 lines
3.2 KiB
JavaScript
78 lines
3.2 KiB
JavaScript
// Characterization for reorderParticipants correct usage.
|
|
// replay-combat.js calls it with wrong signature (swallowed by try/catch),
|
|
// so real behavior untested. Lock what it actually does.
|
|
//
|
|
// New API: reorderParticipants is async, takes ctx last, writes encounter +
|
|
// log internally, returns newEnc. A blocked move (cross-init / same id /
|
|
// cross-pointer) returns the SAME enc ref (no write). Missing id rejects.
|
|
|
|
const shared = require('@ttrpg/shared');
|
|
const { makeParticipant, startEncounter, nextTurn, reorderParticipants } = shared;
|
|
const { mockCtx } = require('./_helpers');
|
|
|
|
function p(id, init, extra = {}) {
|
|
return makeParticipant({
|
|
id, name: id, type: 'monster',
|
|
initiative: init, maxHp: 100, currentHp: 100,
|
|
...extra,
|
|
});
|
|
}
|
|
function enc(ps) {
|
|
return { name:'t', participants:ps, isStarted:false, isPaused:false,
|
|
round:0, currentTurnParticipantId:null, turnOrderIds:[] };
|
|
}
|
|
|
|
describe('reorderParticipants', () => {
|
|
test('drag before target (1-list model, pre-combat)', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10), p('b', 20), p('c', 20)]; // b,c tie
|
|
let e = enc(ps); // pre-combat, no pointer
|
|
const newEnc = await reorderParticipants(e, 'c', 'b', ctx);
|
|
// drag c before b: remove c → [a,b], insert before b → [a,c,b]
|
|
expect(newEnc.participants.map(p => p.id)).toEqual(['a', 'c', 'b']);
|
|
});
|
|
|
|
test('cross-init drag blocked (no-op)', async () => {
|
|
const { storage, ctx } = mockCtx();
|
|
const ps = [p('a', 10), p('b', 20)];
|
|
let e = enc(ps);
|
|
e = await startEncounter(e, ctx); // [b,a]
|
|
const before = storage.calls.filter(c => c.fn === 'updateDoc').length;
|
|
const newEnc = await reorderParticipants(e, 'a', 'b', ctx);
|
|
expect(newEnc).toBe(e); // same ref = no write
|
|
expect(storage.calls.filter(c => c.fn === 'updateDoc')).toHaveLength(before); // no new write
|
|
});
|
|
|
|
test('throws if id not found', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10), p('b', 20)];
|
|
let e = enc(ps);
|
|
e = await startEncounter(e, ctx);
|
|
await expect(reorderParticipants(e, 'a', 'zzz', ctx)).rejects.toThrow();
|
|
});
|
|
|
|
test('syncs turnOrderIds = participants order (1-list, fixes BUG-6)', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10), p('b', 20), p('c', 20)];
|
|
let e = enc(ps);
|
|
e = await startEncounter(e, ctx); // started, but reorder pre-pointer advance
|
|
// startEncounter sets current=b (idx0). reorder c before b crosses pointer.
|
|
// Use pre-combat to test syncTurnOrder.
|
|
let pre = enc(ps);
|
|
pre = await reorderParticipants(pre, 'c', 'b', ctx);
|
|
expect(pre.turnOrderIds).toEqual(['a','c','b']);
|
|
expect(pre.turnOrderIds).toEqual(pre.participants.map(p => p.id));
|
|
});
|
|
|
|
// BUG-6 candidate: reorder should affect turnOrderIds so mid-combat
|
|
// drag-drop changes who goes next within same-initiative tie.
|
|
// Currently RED (turnOrderIds not in patch).
|
|
test('reorder updates turnOrderIds to reflect new participant order (pre-combat)', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10), p('b', 20), p('c', 20)];
|
|
let e = enc(ps); // pre-combat, no pointer
|
|
e = await reorderParticipants(e, 'c', 'b', ctx);
|
|
expect(e.turnOrderIds).toEqual(['a', 'c', 'b']);
|
|
});
|
|
});
|