Phase 2: client military/social screens, WebSocket push, trade + endgame, review findings pending
Built: units/movements/reports/send/expansion screens, alliance/messages/rankings screens, ws client + server /ws push (docs/PROTOCOL.md), Internet exchange trade, backbone endgame + world end, shared reports, buildDone relative levels. Tested: npm test 175/175. Two adversarial reviews found issues (trade-leg recall exploit, __proto__ via validate.js, rankings DoS, static headers, ...): fixes follow in the next commit. NOT done: bots/balance, e2e suite, real-device checks. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Q2MJaQ5LXAHzGnTDgceT14
This commit is contained in:
parent
249818a7aa
commit
b18645dca1
87 changed files with 10201 additions and 71 deletions
56
test/push-helpers.js
Normal file
56
test/push-helpers.js
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
'use strict';
|
||||
/* Shared helpers of the push tests (no tests in here): a recording WebSocket client around the real `ws` package. */
|
||||
const WebSocket = require('ws');
|
||||
|
||||
const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
|
||||
|
||||
// Opens ws://127.0.0.1:port/ws. Resolves { ws, msgs, closed, open, waitFor(pred, ms), expectNone(ms), send(obj), auth(token) }.
|
||||
// `closed` resolves { code, reason } when the socket closes. Rejects with { status } when the upgrade is refused.
|
||||
function connect(srv, o) {
|
||||
o = o || {};
|
||||
return new Promise((resolve, reject) => {
|
||||
const ws = new WebSocket('ws://127.0.0.1:' + srv.port + (o.path || '/ws'), Object.assign({ headers: o.headers || {} }, o.wsOptions || {}));
|
||||
const msgs = [];
|
||||
const waiters = [];
|
||||
let closedResolve;
|
||||
const closed = new Promise((r) => { closedResolve = r; });
|
||||
const c = {
|
||||
ws, msgs, closed,
|
||||
send: (obj) => ws.send(typeof obj === 'string' ? obj : JSON.stringify(obj)),
|
||||
auth: (token) => c.send({ type: 'auth', token }),
|
||||
// first message (already received or still to come) matching pred, within ms
|
||||
waitFor(pred, ms) {
|
||||
const hit = msgs.find(pred);
|
||||
if (hit) return Promise.resolve(hit);
|
||||
return new Promise((res, rej) => {
|
||||
const t = setTimeout(() => { const i = waiters.indexOf(w); if (i >= 0) waiters.splice(i, 1); rej(new Error('no matching message in ' + (ms || 2000) + ' ms; got ' + JSON.stringify(msgs))); }, ms || 2000);
|
||||
const w = { pred, res: (m) => { clearTimeout(t); res(m); } };
|
||||
waiters.push(w);
|
||||
});
|
||||
},
|
||||
// wait ms, then return everything received so far
|
||||
async settle(ms) { await sleep(ms === undefined ? 80 : ms); return msgs.slice(); },
|
||||
async connectAndAuth(token) { c.auth(token); return c.waitFor((m) => m.type === 'ready'); },
|
||||
};
|
||||
ws.on('message', (d) => {
|
||||
let m; try { m = JSON.parse(d.toString()); } catch (e) { m = { raw: d.toString() }; }
|
||||
msgs.push(m);
|
||||
for (let i = waiters.length - 1; i >= 0; i--) if (waiters[i].pred(m)) { const w = waiters.splice(i, 1)[0]; w.res(m); }
|
||||
});
|
||||
ws.on('close', (code, reason) => closedResolve({ code, reason: reason.toString() }));
|
||||
ws.on('unexpected-response', (req, res) => { res.resume(); reject({ status: res.statusCode }); });
|
||||
ws.on('error', (err) => { if (!/Unexpected server response/.test(err.message)) { /* closed or reset: `closed` reports it */ } });
|
||||
ws.on('open', () => resolve(c));
|
||||
});
|
||||
}
|
||||
|
||||
// Connect and authenticate in one go.
|
||||
async function login(srv, token, o) {
|
||||
const c = await connect(srv, o);
|
||||
await c.connectAndAuth(token);
|
||||
return c;
|
||||
}
|
||||
|
||||
const within = (p, ms, label) => Promise.race([p, new Promise((_, rej) => setTimeout(() => rej(new Error('timeout after ' + ms + ' ms: ' + (label || ''))), ms))]);
|
||||
|
||||
module.exports = { connect, login, sleep, within };
|
||||
Loading…
Add table
Add a link
Reference in a new issue