Merge upstream: Lambda Bazaar, traffic badges, moving customers and faster routing (3.3.0)
Some checks are pending
CI / plan (push) Waiting to run
CI / part (push) Blocked by required conditions
CI / build (push) Waiting to run
CI / translations (push) Waiting to run
CI / test (push) Blocked by required conditions
CI / timings (push) Blocked by required conditions
Container image / gate (push) Waiting to run
Container image / test (push) Blocked by required conditions
Container image / publish (push) Blocked by required conditions

CHANGELOG.md: upstream's released sections as they are; main's 11 Unreleased bullets kept under Unreleased.
scripts/lib/route-fuzz.js: upstream's skip of dashboard tabs the base lacks, plus main's trimming of args the base's buttons lack.
src/game/10-catalog/40-ports.js: upstream's one-pass portsAt(); an express still takes ports per channel at its ends.
src/game/10-catalog/60-reach-and-subsea.js: upstream's dfLit/dfCap0/dfOn (managed waves carved out); capOf() keeps xp and sat.
src/game/60-features/80-new-game.js: upstream's vol and cm in a new game, with main's ip4, rgen, mp and saved-shape fields.
src/game/60-features/95-standing-orders.js: upstream's portsAt, cachePlan and promiseCheck, inside main's build-standard routers order, optup marks, opsDarkPre and decom gone list; opsPairs still leaves satellites out.
src/game/80-simulation/30-compute.js: upstream's routing core; main's satellite edges (SATN) pass into it, express risks and sat/ip4 money stay.
src/game/80-simulation/29-route-core.js: main's satellite latency note moved into the core, where upstream moved the flow loop.
src/game/80-simulation/40-billing.js: main's linkCut() and xp/sat in linkDown(), with upstream's dfOn().
src/game/80-simulation/50-sanitize.js: upstream's cmClean listings and cmFix/volFix; main keeps the xp/sat kinds, mpSanitize, ip4Fix and satSanitize.
src/game/80-simulation/60-requirements.js: upstream's shared diversity graph; an express link carries the list of trenches it rides.
src/game/91-save.js: upstream's saves in the worker, except a multiplayer session network, whose text is made on the page (mpSave) so the server gets the very save the slot holds; bootNotes() kept.
src/game/91-slots.js: upstream's slot text and day, with main's mp badge on a slot.
src/game/93-ui/70-link-panels.js: a fiber says both its managed waves and the expresses it carries.
src/game/94-dashboard/60-dashboard.js: upstream's carried tile, main's themed demand line.
src/game/95-modals/70-link-modal.js: main's Express tab, then upstream's hint for a coast no cable lands on (#321).

After the merge:
- Moving a circuit: a path over an express shares the trenches of the fibers it rides, so it is never called fully diverse from a path along them (test in express-fiber).
- The capacity market and moving customers leave the slots expresses hold (test in express-fiber; no code change needed).
- The NOC log keeps only the kinds a reload keeps: the market's info/warn news is a plain line, live as after a reload.
- New acts classified for server-run play: market and path moves sent, marketOpen and pathOpen local; pathPin's path may be longer than 64 characters.
- Server-play fixtures written again (new cm and vol fields); the dark-mode test reads mapStill()'s three states.
- A big multiplayer network that moved on still pushes its save to the server (test in multiplayer).
- The full suite ran on jsdom 31.0.0 and playwright-core 1.65.0, the versions the merged lockfile pins.
This commit is contained in:
jvanvik 2026-11-09 18:32:15 +01:00
commit 61e31c53d3
105 changed files with 3281 additions and 664 deletions

View file

@ -175,6 +175,31 @@ test('slots: lit channels, sold alien waves and express channels share every lin
assert.deepEqual(errors, []);
});
test('the capacity market and moving customers leave the slots expresses hold; a path over an express shares its fibers\' trenches', (t) => {
const { ev, errors } = game(t);
ev("L(s1).ch=Array(61).fill('zr4');for(const c of ['fra','bru','par'])S.pops[c].routers=4;compute()");
ev(BUILD);
assert.equal(ev('xpSlots(L(s1))'), 1);
assert.equal(ev('freeCh(L(s1))'), 2, '64 slots: 61 lit, 1 express');
// Spectrum the broker can sell (Lambda Bazaar) is what is free after the express, never the express's own slot.
assert.equal(ev("cmCan(L(s1),'spec')"), 2);
assert.equal(ev("cmSpare(L(s1),'spec',0)"), 2);
ev("ACT.listFiber({id:s1,w:3})");
assert.equal(ev('(L(s1).list||{}).w||0'), 2, 'a listing stops at the free slots');
// A carrier with three alien waves on a parallel fiber cannot move onto s1: the express holds the slot it would need.
ev("window.s3=df('fra','bru');S.biz.push({id:'aw',city:'fra',city2:'bru',link:s3,slots:3,type:'wwave',name:'Alien Co',bw:1,rate:1000,reqs:[],mood:100,since:S.day,day:S.day,route:'normal',what:'x'});compute()");
assert.match(ev("(fiberTargets(S.biz.find(b=>b.id==='aw')).find(o=>o.l.id===s1)||{}).no||''"), /2/, 'only 2 free channels there');
ev("ACT.pathMove({id:'aw',link:s1})");
assert.equal(ev("S.biz.find(b=>b.id==='aw').link"), ev('s3'), 'refused');
// A circuit pinned through Brussels' router rides s1 and s2; the express to Paris runs in those very trenches.
ev("L(s2).ch=['zr4'];compute();S.biz.push({id:'k',type:'l2vpn',name:'Big Circuit',city:'fra',city2:'par',bw:1,rate:10,reqs:[],mood:80,since:0,day:0,route:'normal',pin:['fra','bru','par']});compute()");
const alts = JSON.parse(ev("JSON.stringify(circuitTargets(S.biz.find(b=>b.id==='k')).alts.map(a=>[a.p.join('>'),a.shared]))"));
assert.deepEqual(alts, [['fra>par', 1]], 'the express is offered, sharing its one span with the path through Brussels');
ev("ACT.pathOpen({id:'k'})");
assert.doesNotMatch(ev("document.getElementById('modal').textContent"), /Fully diverse/);
assert.deepEqual(errors, []);
});
test('saves: an express survives a round trip; one whose fibers are gone is dropped and its optics go on the shelf', (t) => {
const { ev, errors } = game(t);
// A save from before expresses existed loads as it always did.