diff --git a/CHANGELOG.md b/CHANGELOG.md index ab025b7..69dd2a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to this project are documented here. The project follows ## [Unreleased] +- Traceroute no longer shows an "embedded cache in your rack" hop on paths that leave over transit, an exchange or a PNI. Only traffic that really ends at one of your cache boxes shows it now. - Networks you reach through an exchange's route server now stay "via RS" (#265). With an Open peering policy, the peering desk used to turn some of them into separate sessions of their own. - The intern's "Light more fiber" order has a new Optics setting: light new fiber with the biggest optic it can afford, to save channels for later (#262). Once a fiber is lit, the intern still adds more of the same optic and never swaps what is in there. - The Build POP button now shows the whole price of a new POP, including the routers of your standard POP (#261). Before, it showed only the site, although the standard routers were paid for on top; a note under the button now lists them, and the intern's one-tap template prices them in as well. POPs that come with a new wave, dark fiber, your own subsea cable or a consortium seat now get the standard routers too, and those offers show the price with them. diff --git a/src/game/60-features/50-traceroute.js b/src/game/60-features/50-traceroute.js index ce195c1..cb35437 100644 --- a/src/game/60-features/50-traceroute.js +++ b/src/game/60-features/50-traceroute.js @@ -40,7 +40,7 @@ function traceroute(src,to){const P=trPaths(src),me=slug(S.name)+'.net',lines=[] else if(e.k==='p'){hop(`pni-${slug(NET[e.via||N.id].name)}.${e.city}.${me}`,ip(hstr(N.id),3),0.2,tr('traceroute.private_cross_connect'));} // Down the cone one customer at a time: the shortest chain of upstreams from the peer to the network, each AS on the path. if(e.via){const ch=coneChain(e.via,N.id);for(let i=0;iS.day?35:20}):''; diff --git a/tests/traceroute.test.js b/tests/traceroute.test.js new file mode 100644 index 0000000..a0caf05 --- /dev/null +++ b/tests/traceroute.test.js @@ -0,0 +1,21 @@ +const test = require('node:test'); +const assert = require('node:assert/strict'); +const { load } = require('./harness'); + +test('traceroute shows an embedded cache hop only when a cache is the exit', () => { + const { ev, errors } = load(); + ev("ACT.start({});S.cash=1e8;for(const g of GOALS)S.done[g.id]=0"); + ev("S.pops.fra.bb={d:20/NSH.cfl};ACT.buyTransit({city:'fra',net:'cog',tier:1});compute()"); + // The hops, without the "traceroute to …" header line. + const trace = () => { const r = ev("traceroute('fra',{net:'cfl'})"); return { ...r, hops: r.text.split('\n').slice(1).join('\n') }; }; + const before = trace(); + assert.match(before.why, /Cogentle/, 'over transit'); + assert.doesNotMatch(before.hops, /cache-|embedded cache/, 'no cache hop without a cache'); + assert.match(before.hops, /www\.crowdflare\.example/, 'ends at the network itself'); + ev("ACT.cache({city:'fra',net:'cfl'});compute()"); + assert.equal(ev('S.caches.length'), 1); + const after = trace(); + assert.match(after.hops, /cache-crowdflare\.fra\..*embedded cache in your rack$/, 'the cache is the last hop'); + assert.doesNotMatch(after.hops, /cogentle|www\.crowdflare/, 'nothing leaves the network'); + assert.deepEqual(errors, []); +});