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
137
test/client-ws.test.js
Normal file
137
test/client-ws.test.js
Normal file
|
|
@ -0,0 +1,137 @@
|
|||
'use strict';
|
||||
const test = require('node:test');
|
||||
const assert = require('node:assert');
|
||||
const { createSocketClient } = require('../public/js/ws.js');
|
||||
|
||||
// A fake WebSocket and a manual clock: no real timers, no network.
|
||||
function rig(over) {
|
||||
const socks = [];
|
||||
class FakeWS {
|
||||
constructor(url) { this.url = url; this.sent = []; this.closed = false; socks.push(this); }
|
||||
send(s) { this.sent.push(JSON.parse(s)); }
|
||||
close() { this.closed = true; }
|
||||
// test helpers
|
||||
open() { this.onopen(); }
|
||||
recv(o) { this.onmessage({ data: JSON.stringify(o) }); }
|
||||
drop() { this.onclose(); }
|
||||
}
|
||||
const timers = []; let t = 0, seq = 0;
|
||||
const setTimeout_ = (fn, ms) => { const id = ++seq; timers.push({ id, at: t + ms, fn }); return id; };
|
||||
const clearTimeout_ = (id) => { const i = timers.findIndex((x) => x.id === id); if (i >= 0) timers.splice(i, 1); };
|
||||
const advance = (ms) => {
|
||||
const end = t + ms;
|
||||
for (;;) {
|
||||
timers.sort((a, b) => a.at - b.at);
|
||||
if (!timers.length || timers[0].at > end) break;
|
||||
const x = timers.shift(); t = x.at; x.fn();
|
||||
}
|
||||
t = end;
|
||||
};
|
||||
const got = [], states = [];
|
||||
const client = createSocketClient(Object.assign({
|
||||
WebSocket: FakeWS, url: () => 'ws://x/ws', token: () => 'tok', random: () => 0.5,
|
||||
setTimeout: setTimeout_, clearTimeout: clearTimeout_, onMessage: (m) => got.push(m), onState: (s) => states.push(s),
|
||||
}, over || {}));
|
||||
return { client, socks, advance, got, states };
|
||||
}
|
||||
|
||||
test('auth is the first message, ready opens the client, hints are passed on', () => {
|
||||
const r = rig();
|
||||
r.client.start();
|
||||
assert.strictEqual(r.socks.length, 1);
|
||||
r.socks[0].open();
|
||||
assert.deepStrictEqual(r.socks[0].sent, [{ type: 'auth', token: 'tok' }]);
|
||||
assert.strictEqual(r.client.open, false);
|
||||
r.socks[0].recv({ type: 'ready', serverTime: 5 });
|
||||
assert.strictEqual(r.client.open, true);
|
||||
r.socks[0].recv({ type: 'town', townId: 3 });
|
||||
r.socks[0].recv({ type: 'pong' }); // pong is plumbing, not a hint
|
||||
r.socks[0].onmessage({ data: 'not json' }); // garbage is ignored
|
||||
assert.deepStrictEqual(r.got, [{ type: 'town', townId: 3 }]);
|
||||
assert.ok(!JSON.stringify(r.socks[0].url).includes('tok'), 'the token never goes into the URL');
|
||||
});
|
||||
|
||||
test('pings every 25 s; a missing pong drops the socket and reconnects with backoff', () => {
|
||||
const r = rig();
|
||||
r.client.start(); r.socks[0].open(); r.socks[0].recv({ type: 'ready' });
|
||||
r.advance(25000);
|
||||
assert.deepStrictEqual(r.socks[0].sent.slice(-1), [{ type: 'ping' }]);
|
||||
r.socks[0].recv({ type: 'pong' });
|
||||
r.advance(25000);
|
||||
assert.strictEqual(r.socks[0].sent.filter((m) => m.type === 'ping').length, 2);
|
||||
r.advance(8000); // no pong for the second ping
|
||||
assert.strictEqual(r.socks[0].closed, true);
|
||||
assert.strictEqual(r.client.open, false);
|
||||
assert.strictEqual(r.socks.length, 1);
|
||||
r.advance(1000); // backoff for attempt 0 = 1 s at jitter 0.5
|
||||
assert.strictEqual(r.socks.length, 2);
|
||||
});
|
||||
|
||||
test('reconnect backoff grows while the server is down and resets after ready', () => {
|
||||
const r = rig();
|
||||
r.client.start();
|
||||
r.socks[0].drop(); // never got ready
|
||||
r.advance(999); assert.strictEqual(r.socks.length, 1);
|
||||
r.advance(1); assert.strictEqual(r.socks.length, 2);
|
||||
r.socks[1].drop();
|
||||
r.advance(1999); assert.strictEqual(r.socks.length, 2);
|
||||
r.advance(1); assert.strictEqual(r.socks.length, 3);
|
||||
r.socks[2].open(); r.socks[2].recv({ type: 'ready' });
|
||||
assert.strictEqual(r.client.attempts, 0);
|
||||
r.socks[2].drop();
|
||||
r.advance(1000); assert.strictEqual(r.socks.length, 4);
|
||||
});
|
||||
|
||||
test('stop() closes for good; kick() connects now; no token means no socket', () => {
|
||||
const r = rig();
|
||||
r.client.start(); r.socks[0].open(); r.socks[0].recv({ type: 'ready' });
|
||||
r.client.stop();
|
||||
assert.strictEqual(r.socks[0].closed, true);
|
||||
r.advance(120000); assert.strictEqual(r.socks.length, 1);
|
||||
assert.strictEqual(r.client.state, 'idle');
|
||||
|
||||
const r2 = rig();
|
||||
r2.client.start(); r2.socks[0].drop();
|
||||
r2.client.kick();
|
||||
assert.strictEqual(r2.socks.length, 2);
|
||||
|
||||
const r3 = rig({ token: () => null });
|
||||
r3.client.start();
|
||||
assert.strictEqual(r3.socks.length, 0);
|
||||
});
|
||||
|
||||
test('a throwing WebSocket constructor degrades silently and retries', () => {
|
||||
let n = 0;
|
||||
const r = rig({ WebSocket: class { constructor() { n++; throw new Error('blocked'); } } });
|
||||
r.client.start();
|
||||
assert.strictEqual(n, 1);
|
||||
r.advance(1000);
|
||||
assert.strictEqual(n, 2);
|
||||
});
|
||||
|
||||
test('close codes: 4401/4400/1009 stop for good, 4429 waits 30 s, others reconnect', () => {
|
||||
const fatal = [];
|
||||
const r = rig({ onFatal: (c) => fatal.push(c) });
|
||||
r.client.start(); r.socks[0].open(); r.socks[0].recv({ type: 'ready' });
|
||||
r.socks[0].onclose({ code: 4401 });
|
||||
r.advance(300000);
|
||||
assert.strictEqual(r.socks.length, 1, 'no reconnect after 4401');
|
||||
assert.deepStrictEqual(fatal, [4401]);
|
||||
assert.strictEqual(r.client.state, 'idle');
|
||||
r.client.start(); // a fresh session starts again
|
||||
assert.strictEqual(r.socks.length, 2);
|
||||
r.socks[1].onclose({ code: 4429 });
|
||||
r.advance(29000); assert.strictEqual(r.socks.length, 2);
|
||||
r.advance(2000); assert.strictEqual(r.socks.length, 3);
|
||||
r.socks[2].onclose({ code: 1006 });
|
||||
r.advance(3000); assert.strictEqual(r.socks.length, 4);
|
||||
});
|
||||
|
||||
test('onReady tells a re-connect from the first connect', () => {
|
||||
const seen = [];
|
||||
const r = rig({ onReady: (m, again) => seen.push(again) });
|
||||
r.client.start(); r.socks[0].open(); r.socks[0].recv({ type: 'ready' });
|
||||
r.socks[0].onclose({ code: 1006 });
|
||||
r.advance(1000); r.socks[1].open(); r.socks[1].recv({ type: 'ready' });
|
||||
assert.deepStrictEqual(seen, [false, true]);
|
||||
});
|
||||
Loading…
Add table
Add a link
Reference in a new issue