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.
A new NOC tab sells spectrum, managed 100G, 400G, 800G and 1.6T waves, and dark pair IRUs on every route you hold
fiber on. Demand per route moves every day (its own cycle, noise, and news: fiber cuts, hyperscalers, AI clusters,
rivals lighting glass, mergers) and grows about 15% a year, with buyers moving to bigger waves over the years and
carriers on your glass asking to move up a size. You choose what to keep back for your own traffic, from what demand
the broker lists, and the price it never sells below. Managed waves come out of capacity you lit; prices follow the
fiber's cost, how hot and how full the route is, and its latency (400G at 2.7x 100G on land, 3.8x subsea). A Cable
broker pays 3% instead of 10% and sees each route's forecast and routes worth building.
Rule F5 now bounds sales by the moving market; new rule F8 covers managed waves. The route fuzz skips dashboard tabs
main does not have yet.
connUp offered the next PORT tier for a fabric (NNI) port, but fabric ports
stop at 400G: NNI[3] was undefined and renderDash threw. Upstream code
(85701db); the city panel already maps over NNI and is fine.
Perf (jsdom, big network, vs 4b922ab): no slowdowns beyond noise, routing
identical.
Conflicts with main resolved: the intern's chosen router model, optical upgrades and personas are generators like the
other orders, with a rest after each job. The optical upgrade's fiber test is a step the day answers, in the route
worker in play (opsDark(), {dark}), like the sales desk's trial; the renewal desk's reroute is a step too (slRenRun()).
The day split of #312 on its own, from 3.0.0, without its routing core, save or map changes. On a big network at
x8 the game stopped whenever a day rerouted: after a failure, an event, the NOC intern's shift or the sales desk's
signing, dayPost() routed on the page.
* The day is a generator (dayRun(), dayPreRun(), dayPost()): each yield is a compute() it needs. dayTick() answers
them on the spot (tests, fallback); in play rwGo() posts each one to the route worker. A failure (failureRun()), a
DDoS and Auto-RTBH (ddosNewsRun()), the chaos monkey's snip (mkSnipRun()), an event's cut (eventRun()), the
intern's shift (opsRun()) and the sales desk (slAutoRun(), its trials answered by the worker with offerTrial())
are steps of the day. fireFailure(), opsDay() and slAutoDay() still play them in one go.
* yield DAY_REST lets a long day draw a frame between two steps (half a frame, 3 to 8 ms, RW.budget). One day in
flight at a time, resting or routing: the clock waits for the day, and a half day is never saved.
* UI.tick is set around every step (dayStep()), so quiet notifications hold in play, not only in dayTick().
* The daily mood check works out the land islands once per pass over the customers (TERR), instead of walking
every land link for each customer afraid of sharks. This fix is thesysadmindev's, from #310; here the islands are
worked out again if something routed meanwhile (RW.gen), since the mood loop can now rest between customers.
Same game either way: tests/day-steps.test.js plays a second page as the worker and compares each day with
dayTick(), the intern on every order, failures, events, DDoS and the monkey forced.
Thanks to thesysadmindev for the profiling in #310 that pointed at the reroutes, and for the sharks fix.
A new Normal game now asks what it is building before anything else, in
a popup that holds the clock and cannot be closed without an answer;
the tutorial waits for it. A save still in its first month that never
picked is asked on load. Sandbox, puzzles and scenarios never ask.
The Cable broker builds and lights glass from day one at the prices
everyone pays at the top level: dark fiber, every line system and optic,
digging without the pioneer markup, own subsea cables and their
upgrades, eight pairs, and every router those optics need. Everything
else unlocks by level as before. Its offers lean to carriers buying
waves and pairs, capacity conferences are open to it at any level, and
carriers call about three times a year with a capacity deal. It runs its
own ten-goal ladder and wins Glass Baron (own cables on five continents,
$1M a month of capacity sales), with a badge; Tier 1 stays its own win.
Classic and boutique networks may lay their own subsea cable from
customer level 9 as well as after Tier 1.
Rule M6 (gameplay-rules): a charter changes what you set out to do,
never what things cost. Closes#300.
A fabric (NNI) port comes in 10G, 100G or 400G, as fast as the router
takes and no faster than 400G, and bundles into a LAG of up to eight
members like transit, IX and PNIs. Each member takes a router port (10G
on a breakout, a quarter of one) and pays the monthly price; upgrading
moves and pays for every member. 10G and 100G keep their prices, 400G is
$3,000/mo. A model change that would strand a 400G fabric port is refused,
and saves drop fabric ports that make no sense.
The NNI requirement counted what the port already carried but not the
offer's own bandwidth, so an offer passed as long as the port was not
already over and auto-accept took customers that did not fit. It now
counts the offer too.
Closes#140, closes#307.
- Values pasted into eval'd or inline-script code go through lit() (scripts/lib/js-literal.js), which escapes <, >, /, U+2028 and U+2029 after JSON.stringify
- build test and i18n-check read script tags with a DOM parser or a plain search, not HTML regexes
- mcp.js parses the Authorization header without a backtracking regex
An alien wave rented for about as much as leasing the whole fiber, so a
route sold out to its market earned 11 to 35 times its lease and the
gear paid back in one to three months. A wave now rents for 30% of the
fiber's monthly cost (lease plus amplifiers), and each one sold between
the same two cities goes cheaper, down to 40% of the first: a full
route earns 2 to 6 times its lease. Signed contracts keep their price.
Gameplay rule F6.
Extra crews could bring any land build to the next day. They now cut it
to half its planned time at most, and the button says when it would be
done. Gameplay rule F7.
A typed order (the agent API) could end a wave, dark fiber or cable in a
city the map does not show, and opened a POP there.
The map only drags a link from a POP, but buildLink, orderDf and orderCable
read both ends from UI.pending, which the agent API fills from its
arguments. An agent could sign a dark fiber IRU from a city with no POP
(Aracaju got three of them). The three orders now refuse that with a toast,
and their dry-run quotes report it as blocked.
Three tests ordered from a city with no POP (ACT.start ignores city, so the
only POP was Frankfurt); they now open the POP they assumed.
The left panel's four tabs overflowed its 272px width on tablets and small
laptops: Goals wrapped its count, Networks ran off the edge. Counts now sit
on the tab's corner, labels stay on one line and shrink last.
Backbone, Auto-TE and DDoS settings sat below every notification in the NOC
tab. A Routing & DDoS button at the top opens them in a modal that redraws
in place after each action, with a red dot when Auto-TE is paused.
Both are typed t1 and count for the Tier 1 goal in new games only (t1v 4);
older saves keep the Tier 1s they were playing for. Doitsche sells transit
at 12/Gbps, the dearest in Europe outside the China crossing, and keeps its
paid peering and 1G PNIs. Tangerine keeps its selective policy, sells at 6,
and gains a Frankfurt PoP like every other Tier 1.
W2 now counts Tier 1 incumbents with home markets; the N3 exceptions for
both are gone, since Tier 1s are not checked there.
A seat bought at level 2 or 3 could not be lit: early optics do not reach across an
ocean. Seats can now regenerate in the landing stations along their cable.
A capacity broker listing is now standing: list some alien waves or the spare pair
and they sell over time as carriers on that route want capacity. Each route's market
is sized by the eyeballs at both ends (a landing town counts the city it serves), and
rented capacity, from the broker or a random offer, never outgrows it. Gameplay
rule F5.
Each router is classed by the highest backbone it runs and has a vendor. Upgrades
are paid one step at a time and any level paid for can run. Higher levels use
less router CPU, label switching makes pass-through traffic cheaper, Auto-TE and
RouteScript need RSVP-TE or above, and POPs whose routers can't run the backbone
stay outside it. Mixed vendors at the top of what their routers can do get
interop failures. Saves with Auto-TE keep the old rules; puzzles, Architect and
scenarios are unaffected.
The reference loop now states the rule #225 adds to compute(): without Auto-TE an exit whose shortest path is already full fits nothing, like a full exit. With the same rule both match bit for bit; before, only float rounding differed (at most 3.6e-14 relative), because the ECMP split no longer counts a dead exit's room.
A PNI's second member is an augment that arrives months later, so siteSet returned before setting the site and the new member joined the first building. The augment now carries site 'ab' (kept by sanitize), applies it on delivery if the POP still has two sites, and the panel shows Both as chosen while it is on order. Choosing A or B meanwhile drops the intent.
Earned on the monkey's first visit instead of any fiber cut; the badge keeps its id,
so ones already earned carry over. Monkey-proof gets a shield. The monkey's cheer
also cancels a spray still pending from its last hop.
Eight Pacific pairs added in 1.35.0 had waypoints that jumped from +180 to
-180 longitude, so the renderer drew them across the whole map. Waypoint
longitudes are now continuous, as the hand-drawn routes always were.
A scan of all 475 cable pairs found 147 that cut across land with sea on both
sides (the Horn of Africa, Arabia, India, Brazil, Newfoundland, ...). Those
now follow the game's own sea router, simplified only as far as the line
stays off land; inland endpoints route between the coastal ends and keep
their overland leg. 27 more pairs into inland cities now come ashore at the
nearest coast. Hibernia Express is traced by hand south of Ireland to Brean
so it stays the straightest Atlantic crossing. Left alone on purpose: the
Suez Canal and Dardanelles crossings, Quintillion's overland Alaska leg and
Celtix's Welsh landing.
Tests: no pair jumps the seam and none crosses more than 160 km of land
mid-route. EIG is now 8,613 km, so overland is 9.97x subsea instead of
10x+; Lisbon-Lagos fits 1.6T directly at 5,914 km.
Thanks to mindolo for the report and the analysis in #183.
North Sea and Baltic: Kristiansand, Esbjerg and Riga as new landings.
Havfrue's Danish and Norwegian landings, HAVSIL, Skagenfiber, Norfest and
NorSea Com (Tampnet, past the Draupner and Ekofisk platforms to
Lowestoft), CeltixConnect-2 and North Sea Connect, C-Lion1's real
Rostock landing, GlobalConnect's Digital E4, Eastern Light, the Elisa
cables, Latvia-Sweden and BCS. Baltic cables carry an anchor flag that
makes them cut more often (it used to be a list of two ids).
Indian Ocean and Asia-Pacific: Muscat, Malé and Fukuoka as new landings.
SJC2, ADC, ASE, APCN-2, EAC-C2C, FLAG and its North Asia loop, SEA-ME-WE 5,
Unity, TGN-IA, TPE, Hong Kong-Guam, MIST, IAX, TIC, TW1, MCT and KJCN as
puns; the missing real landings on SEA-ME-WE 4 and 6, AAE-1, PEACE, APG,
SJC, PLCN, NCP, FASTER, JUPITER, Indigo, Bifrost, 2Africa Pearls and the
Oman Australia cable. Existing pairs are untouched so saved links keep
their cable. Routes come from the game's own sea router.
Tests that relied on Colombo having one cable and Oslo having none now use
St Helena and Zurich.
A small city (P < 60) may not sit within 300 km of a bigger city in the
same country unless it is a cable landing or a capital (Canberra gets a
capital flag); a test enforces it everywhere. The 15 Brazilian cities
that broke it get off:true: still in the data so saves keep their POPs,
routing and links there, but new games do not draw them, offer them to
customers, list them in network presence, or let you build a POP there.
Brazil goes from 40 to 25 cities (Europe has 44). Order and Progress now
needs 15 IX.brrr ports.
IX.brrr Campinas, Equinox Ashburn IX and friends already say where they
are, so peering tips, IX LAG labels, the max-prefix leak incident, the
de-peering toast and the route server hint drop "in {city}" for them.
Each transit flow's backhaul round trip over your own links (2× the path
latency to the exit) now affects service: free up to 20 ms (~1,500 km),
up to 20% worse at 50 ms, and half the service value past 50 ms. sfOf()
multiplies delivery by it, so revenue, broadband growth and business
customers all feel it. Peering, PNIs and caches are exempt.
City panel chip and Transit-tab warning name the far exit and the round
trip; the NOC lists slow cities. Two tests updated: Moscow on Frankfurt
transit is still fully delivered but now slow, and the Red Sea test pins
Asian demand that would otherwise churn away on Marseille transit.
Peering inbox (Networks tab): requests from small and made-up networks
arrive with every IX port, max-prefix alerts take bilateral sessions
down for a few weeks unless answered (raise the limit for growth, keep
it down for a leak; raising it on a full table is a route leak).
Unanswered mail costs reputation, which makes selective networks up to
10% pickier. The Large Peering Model agent costs $20M a year and gets
about a third of its decisions wrong, with a log to prove it.
PNIs are ordered, not instant: 2 to 6 weeks for small networks, 6 to 12
months for big content networks, Tier 1s and big eyeballs, for new PNIs
and augments alike (halved during a conference). Content networks and
Tier 1s start at 100G; Doitsche Telekomm sells 1G. Microsnoft refuses
PNIs and IX sessions in Ashburn, New York, Boston, Atlanta and Miami.
Only delivered PNIs carry traffic, bill, or count for goals and Tier 1.
After #133 the coastline router treated Egypt and Panama as solid land, so
Marseille–Singapore sailed round Africa (21,440 km instead of 12,175) and
Miami–Lima round Cape Horn (17,700 km for a 4,220 km hop). Real systems
cross both by land: Port Said to Suez beside the canal, and Panama
(PAN AM). These are now overland edges in the sea graph, priced as the
distance they cover. The Red Sea Crisis shuts Suez, and routes are cached
per set of open passages, also in the survey worker.
Long open-water legs follow the great circle where it stays at sea,
instead of a straight line on the map. The low-latency design may land
further off and backhaul overland, and may follow the corridor of the
fastest in-service cable on the pair when that is shorter, so it matches
Hibernia again (London–New York 25.3 ms, Halifax–London 20.9 ms) and
beats cables that take detours (Lagos–Bude 32.2 against 37.6 ms).
Tests: main's expectations restored where #133 had loosened them
(Marseille–Singapore needs no upgrades, New York–Sydney needs terminals,
express equals the fastest cable); the marine check knows the passages;
new checks for Suez, Panama, the crisis and the corridor rule.
Porto Alegre and Florianopolis are 65 px apart at the old maximum zoom,
and each city grabbed taps within 38 px, so the link between them could
not be selected at all. The maximum zoom goes from 6x to 16x (city icons
stop growing at 1.35x, so dense regions spread out), and a city now wins
a tap outright only on its icon; in the rest of its tap circle a link
right under the pointer wins. The hover cursor follows the same rule.
Dragging from a POP still draws a new link.
Wholesale alien waves and spare-pair leases already existed, but only as
random offers, and the fiber only said how many channels were sold. Each
dark fiber in service now has a 'Selling spare capacity' section: free
channels, who rents what and for how much, a pending offer with Accept,
and 'List it with a capacity broker', which creates an offer for that
fiber at once at the usual price minus a 10% broker cut (alien waves on
free channels first, then a spare pair in your own trench). One listing
per fiber at a time. Random offers use the same helpers and draw the same
random numbers in the same order, so seeded games are unchanged.
- #113: the goal was a Marseille-Singapore path and 300 Gbps served
anywhere, which broadband with local transit reached on day 0. It is now
the path plus 80 Gbps on your links between Asia and the rest of your
network for 30 days in a row (S.stats.asiaRun). A 100G route around Africa
gets there in about two months and costs about 590k a month against 2.5M
of starting cash, so it is a real challenge. The scenario card shows
today's traffic and the streak.
- #84: Poste Restante, Luxembourg's eyeball network, at LU-SICK in
Bettembourg (selective, buys transit from Tier 1s, so Tier 1 reach holds).
Citrus Belgium's blurb now says it is Tangerine's Belgian daughter.
- The wave seller and wholesale customer 'GTT (Got Tangled Twice)' used a
real company name; it is now 'G&T (Gin and Transit)'.
- The scenario start toast puts a full stop after the goal.
Goals gets a Tier 1 card once it is the current goal (or the title was
lost): transit ports left, Tier 1 PNIs with the missing ones named, the
club requirements they wait for, and reach without transit with the
networks you would lose. The Networks tab gains an 'out of reach without
transit' filter and a single-network view with every PNI city and
exchange, your POPs first, then nearest. The NOC transit to-do list names
the nearest city and links to the network.
Routing counts reach without transit in the same pass. Places and
distances are cached until the POP set changes, and exchange membership
once per routing pass, so the Networks tab costs what it did.
- Upgrades take effect: the optic speed cache from #89 is now kept per cable
state (subsea, terminals in service, engineering in service), so a cable
no longer stays at 400G after both upgrades are commissioned.
- Refunds: a cable remembers what was paid for it, design and upgrades
included. Calling off a 7x low-latency cable returned 10% of its price.
'Unusable' now means no optic lights it even with both upgrades.
- Length limit: #88 counts the shortest design and both upgrades. The order
screen says which upgrade a route needs and will not order without it;
the order action checks the same. New York to Sydney needs terminals.
No leased-wave payback hint where no leased wave reaches.
- Choices start fresh when you open the own-cable view and after ordering.
- The 'consider terminals or engineering' hint only on cables you own.
- Low-latency builds take 1.7x as long (London-New York ~2.9 years), not
3.5x; optimized 1.3x. Each design is one tappable card.
- The low-latency factor is worked out once per route instead of on every
latency lookup. 'Number.isFinite' alone, no repeated guard in seaQuote,
the express factor folded into seaLatencyFactor, '+{n} days' as one
translatable string.
- Portuguese and French for the new strings; one CHANGELOG bullet (#65).
Big network vs main: no slowdowns, identical routing.
After #115: upgrading an existing PNI, in the Peering tab and in the NOC's
connection list, also showed only the one-off cost. Both now read
'Upgrade 100G $2.3k + $350/mo', like transit. The two old labels without a
monthly part are no longer used and leave it.js and pt.js.
Networks follow PeeringDB's 14 Düsseldorf facilities: NTT, Tell-Ya,
Cogentle, Drizzle, Voda-Phony, Doitsche Telekomm and the Crowdflare,
Amazin', Microsnoft and BiteDance clouds (NetChill and Akamaybe are
everywhere already). No nudge needed: 27+ map units from Frankfurt,
Amsterdam and Brussels.
The #16 shark test compared .land, which ignores Cairo's land2, so a
valid overland Mumbai-Cairo ask counted as crossing an ocean once the
extra city shifted the seeded draws. It now uses isSub like the game.
The buy buttons only showed the one-off setup (1500 + setup/2), so a
$1.8k cross-connect read like a monthly bill, while the real monthly
fee (PORT[i].pni) was shown nowhere. Reuse the existing translated
'{port} <small>{cost} + {mo}/mo</small>' label, like transit and IX.