From b640ab98148c93a279b91ee6a8171c62b903ef31 Mon Sep 17 00:00:00 2001 From: Frederic Jung Date: Thu, 29 Oct 2026 10:50:04 +0100 Subject: [PATCH] Weekly puzzle: schema 2 with traffic, sized references, regenerated weeks The generator gives every week content in its first city and eyeballs in the others (a latency sprint adds a circuit with a cap), sizes both references with the game's routing, and keeps the per-week rev refresh working with it. --- scripts/weekly-puzzle.js | 6 ++++-- tests/weekly-puzzle.test.js | 27 ++++++++++++++++++--------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/scripts/weekly-puzzle.js b/scripts/weekly-puzzle.js index 64092ae..5a9a0a1 100644 --- a/scripts/weekly-puzzle.js +++ b/scripts/weekly-puzzle.js @@ -279,7 +279,9 @@ function sized(g, W, P, def) { const sol = solve(W, P); if (!sol.one || !sol.three) return null; const one = size(g.ev, def, sol.one.links, false), three = size(g.ev, def, sol.three.links, true); if (!one || !three) return null; - return { one: { cost: Math.round(one.spend), b: one }, three: { cost: Math.round(three.spend), b: three } }; + // The three-star build delivers too: when it is the cheaper one (a ring, sized down), it is the one-star reference. + const o = one.spend <= three.spend ? one : three; + return { one: { cost: Math.round(o.spend), b: o }, three: { cost: Math.round(three.spend), b: three } }; } // The game's own validator decides what a puzzle is; then both references must earn their stars. function verify(g, W, j, key, known) { @@ -384,7 +386,7 @@ function refresh(g, dir, now = Date.now()) { const writeIndex = (dir) => fs.writeFileSync(path.join(dir, 'index.json'), JSON.stringify({ v: SCHEMA, weeks: list(dir) }) + '\n'); const writeWeek = (dir, j) => { fs.mkdirSync(dir, { recursive: true }); fs.writeFileSync(path.join(dir, j.key + '.json'), JSON.stringify(j) + '\n'); writeIndex(dir); }; -module.exports = { game, generate, check, refresh, solve, world, writeWeek, writeIndex, list }; +module.exports = { game, generate, check, refresh, solve, sized, shape, world, writeWeek, writeIndex, list }; if (require.main === module) { const args = process.argv.slice(2), opt = (n, d) => { const i = args.indexOf(n); return i >= 0 ? args[i + 1] : d; }; diff --git a/tests/weekly-puzzle.test.js b/tests/weekly-puzzle.test.js index e41c26e..8c3c118 100644 --- a/tests/weekly-puzzle.test.js +++ b/tests/weekly-puzzle.test.js @@ -88,8 +88,9 @@ test('generator: a quarter of weeks, all verified, varied, small and in the sche for (const j of out) { assert.ok(j.cities.length >= 3 && j.cities.length <= 6); assert.ok(j.ref.one <= j.ref.three && j.ref.three <= j.budget && j.budget <= j.ref.three * 1.06 + 10000, `${j.key}: budget ${j.budget} just above the N-1 build ${j.ref.three}`); - assert.ok(JSON.stringify(j).length < 600, 'small file'); - assert.deepEqual(Object.keys(j), ['v', 'key', 'theme', 'cities', 'via', 'avoid', 'budget', 'twist', 'name', 'joke', 'ref']); + assert.ok(JSON.stringify(j).length < 900, 'small file'); + assert.ok(j.dem.length >= 2 && j.src.length === 1 && j.dem.every((f) => f.g > 0), `${j.key}: it carries traffic`); + assert.deepEqual(Object.keys(j), ['v', 'key', 'theme', 'cities', 'src', 'dem', 'via', 'avoid', 'budget', 'twist', 'name', 'joke', 'ref']); } assert.deepEqual(JSON.parse(fs.readFileSync(path.join(d, 'index.json'), 'utf8')).weeks, out.map((j) => j.key)); }); @@ -113,7 +114,8 @@ test('--check passes on the committed files and rejects tampered ones', () => { bad((j) => { j.joke.p = { hub: 'fra' }; }, 'parameters the label does not take'); bad((j) => { j.extra = ''; }, 'an unknown field'); bad((j) => { j.key = '2030-W01'; }, 'a file under another week\'s name'); - bad((j) => { j.twist = { lat: [j.cities[0], j.cities[1], 0.5] }; }, 'an impossible latency target'); + bad((j) => { j.dem.push({ t: 'l2', a: j.cities[0], b: j.cities[1], g: 10, ms: 1 }); }, 'an impossible latency target'); + bad((j) => { j.dem[0].g = 5000; }, 'more traffic than a puzzle carries'); bad(() => '{nope', 'not JSON'); bad((j, d) => { fs.writeFileSync(path.join(d, 'index.json'), '{"v":1,"weeks":[]}'); }, 'an index that misses weeks'); }); @@ -221,11 +223,12 @@ test('the published puzzle is played when it is good, the seeded one when it is assert.equal(ev('S.pz.budget'), good.budget); assert.match(ev("document.getElementById('pzBox').textContent"), new RegExp(ev('pzTxt(S.pz.wj)').replace(/[.*+?^${}()|[\]\\]/g, '\\$&'))); // Solve it with three stars: the share line and the streak use the published key. - const sol = G.solve(G.world(ev), { cities: good.cities, via: good.via, avoid: good.avoid, ring: !!good.twist.ring, noSub: false, lat: good.twist.lat || null }).three; - for (const l of sol.links) { - if (!ev(`!!S.pops['${l.a}']`)) ev(`ACT.pzPop({city:'${l.a}'})`); - ev(`ACT.pzLinkTo({a:'${l.a}',b:'${l.b}'});ACT.pzVia({v:'${l.via}'});ACT.pzDiv({v:1});ACT.pzLink({tier:0})`); - } + // The generator's sized 3-star reference, played into this puzzle (links, routers, routes). + const SV = require('../scripts/lib/puzzle-solver');SV.install(ev); + const def = JSON.parse(ev('JSON.stringify(pzWkDef())')), sol = G.sized({ ev }, G.world(ev), G.shape(def), def).three.b; + ev('pzBegin(pzWkDef())'); + SV.judge(ev, sol.links); + ev(`pzsApplyRt(${JSON.stringify(sol.rt)});pzAfter()`); assert.equal(ev('pzEval().stars'), 3); assert.match(ev('pzShareText(pzEval())'), new RegExp(`^Series of Tubes puzzle ${key} ⭐⭐⭐ \\$[\\d.]+[kM] · seriesoftub\\.es$`)); const p = JSON.parse(ev("localStorage.getItem('sot-puzzles')")); @@ -242,7 +245,13 @@ test('the file is checked field by field', () => { const j = committed()[0], k = j.key, ok = (o) => ev(`!!pzWkValid(${JSON.stringify(o)},'${k}')`); assert.ok(ok(j)); const no = (edit, why) => { const o = JSON.parse(JSON.stringify(j)); edit(o); assert.equal(ok(o), false, why); }; - no((o) => { o.v = 2; }, 'a newer schema'); + no((o) => { o.v = 3; }, 'a newer schema'); + no((o) => { o.v = 1; }, 'an old file without traffic'); + no((o) => { o.dem = []; }, 'no traffic'); + no((o) => { o.dem = [{ t: 'warp', a: o.cities[0], g: 1 }]; }, 'an unknown kind of flow'); + no((o) => { o.dem = [{ ...o.dem[0], g: 1.5 }, ...o.dem.slice(1)]; }, 'fractional gigabits'); + no((o) => { o.src = []; }, 'eyeballs with nowhere to pull from'); + no((o) => { o.cities = o.cities.slice(0, -1); }, 'cities that do not match the traffic'); no((o) => { o.theme = 'constructor'; }, 'an unknown theme'); no((o) => { o.cities = ['fra']; }, 'too few cities'); no((o) => { o.cities = [...o.cities, o.cities[0]]; }, 'a city twice');