Balance PoP caches and request missing caches per site

This commit is contained in:
Charles Miller 2026-10-28 10:51:54 +00:00
parent 2f5a924d6a
commit 0f1db884c2
10 changed files with 187 additions and 27 deletions

View file

@ -1,8 +1,17 @@
/* Utilities: plan from live state, then apply a whole batch with one recompute. */
function utilityRouteServers(){return S?Object.keys(S.ixp).filter(ix=>isIx(ix)&&!S.myIx[ix]&&!S.rs[ix]):[];}
function utilityCacheMoves(city){if(!S||!S.pops[city])return [];const groups=new Map(),moves=[];
for(const c of S.caches)if(c.city===city){let g=groups.get(c.net);if(!g){g={a:[],b:[]};groups.set(c.net,g);}g[c.site==='b'?'b':'a'].push(c);}
for(const g of groups.values()){const from=g.a.length>g.b.length?'a':'b',to=from==='a'?'b':'a';
for(const c of g[from].slice(0,Math.floor(Math.abs(g.a.length-g.b.length)/2)))moves.push({id:c.id,site:to});}
return moves;}
function utilityCaches(city){const p=S&&S.pops[city];if(!p)return null;const sites=p.site2?['a','b']:['a'],add=[],have=new Set();
for(const c of S.caches)if(c.city===city)have.add(c.net+'@'+(c.site==='b'?'b':'a'));
for(const n of NETS)if(n.cache&&(R.demTo[n.id]||0)>=n.cache.min)for(const site of sites)if(!have.has(n.id+'@'+site))add.push({net:n.id,site});
return {add,key:add.map(c=>c.net+'@'+c.site).join(','),mo:add.length*CACHE_MO,free:Math.max(0,portsMax(city)-portsUsed(city))};}
function utilityKit(city){const p=S&&S.pops[city];if(!p)return null;
const gen=!p.gen,site=!p.site2,router=(p.routers||1)<2,g=p.rgen||0;
return {gen,site,router,cost:(gen?GEN_COST:0)+(site?SITE2_COST:0)+(router?routerCost(g,1):0),
return {gen,site,router,moves:utilityCacheMoves(city),cost:(gen?GEN_COST:0)+(site?SITE2_COST:0)+(router?routerCost(g,1):0),
mo:(gen?GEN_MO:0)+(site?SITE2_MO:0)+(router?routerMo(g):0)};}
function utilityPeers(){if(!S)return [];return Object.keys(S.ixp).filter(isIx).map(ix=>{
const sessions=ixSessions(ix),requests=[],blocked=[];let existing=0;

View file

@ -3,12 +3,18 @@ Object.assign(ACT,{
utilityPick:()=>{if(S&&$('utilityCity'))utilitiesModal($('utilityCity').value);},
utilityRouteServers:({city}={})=>{if(!S)return;const ids=utilityRouteServers();for(const ix of ids)S.rs[ix]=true;
if(ids.length){sfx('build');after();}utilitiesModal(city,tr('utilities.route_servers_joined',{n:ids.length}));},
utilityKit:({city,cost,modal})=>{const q=utilityKit(city);if(!q||!q.cost)return;
utilityKit:({city,cost,modal})=>{const q=utilityKit(city);if(!q||(!q.cost&&!q.moves.length))return;
// Prices can change while a modal is open. Refresh the quote before spending more.
if(q.cost!==+cost){if(modal)utilitiesModal(city,tr('utilities.quote_changed'));else{renderPanel();toast(tr('utilities.quote_changed'));}return;}
if(!spend(q.cost))return;const p=S.pops[city];
if(q.cost&&!spend(q.cost))return;const p=S.pops[city];
if(q.gen)p.gen=true;if(q.site){p.site2=true;p.site2Day=S.day;}if(q.router)p.routers=2;
after();const msg=tr('utilities.kit_installed',{city:CITY[city].name});if(modal)utilitiesModal(city,msg);else toast(esc(msg),'good');},
const moves=new Map(q.moves.map(m=>[m.id,m.site]));for(const c of S.caches)if(moves.has(c.id))c.site=moves.get(c.id);
after();const msg=tr('utilities.kit_applied',{city:CITY[city].name});if(modal)utilitiesModal(city,msg);else toast(esc(msg),'good');},
utilityCaches:({city,quote,modal})=>{const q=utilityCaches(city);if(!q||!q.add.length)return;
if(q.key!==quote){if(modal)utilitiesModal(city,tr('utilities.quote_changed'));else{renderPanel();toast(tr('utilities.quote_changed'));}return;}
if(!portGate(city,q.add.length))return;
for(const c of q.add)S.caches.push({id:uid(),city,net:c.net,site:c.site});
sfx('build');after();const msg=tr('utilities.caches_requested',{n:q.add.length,city:CITY[city].name});if(modal)utilitiesModal(city,msg);else toast(esc(msg),'good');},
utilityPeers:({city}={})=>{if(!S)return;const rows=utilityPeers();let n=0;
for(const row of rows)for(const id of row.requests){S.peers[id+'@'+row.ix]=true;n++;}
if(n){sfx('build');after();}utilitiesModal(city,tr('utilities.peers_requested',{n}));},

View file

@ -2,8 +2,14 @@ function utilityKitHtml(city,modal=false){const q=utilityKit(city);if(!q)return
const row=(label,have)=>`<div class="kv"><span>${label}</span><b>${have?tr('common.installed'):tr('common.none_304f')}</b></div>`;
return `<section><h3>${tr('utilities.redundancy_kit')}</h3>
${row(tr('common.backup_generator'),p.gen)}${row(tr('utilities.second_site'),p.site2)}${row(tr('utilities.two_routers'),(p.routers||1)>=2)}
${q.cost?`<p class="meta">${tr('utilities.kit_cost',{cost:fmt$(q.cost),mo:fmt$(q.mo)})}</p><div class="btns">${btn(tr('utilities.install_missing'),'utilityKit',{city,cost:q.cost,modal},'pink',S.cash<q.cost)}</div>`:`<p class="meta">${tr('utilities.kit_complete')}</p>`}
<p class="note">${tr('utilities.hardware_note')}</p></section>`;}
<p class="meta">${tr('utilities.cache_moves',{n:q.moves.length})}</p>
${q.cost||q.moves.length?`<p class="meta">${tr('utilities.kit_cost',{cost:fmt$(q.cost),mo:fmt$(q.mo)})}</p><div class="btns">${btn(tr('utilities.apply_kit'),'utilityKit',{city,cost:q.cost,modal},'pink',q.cost>0&&S.cash<q.cost)}</div>`:`<p class="meta">${tr('utilities.kit_balanced')}</p>`}
<p class="note">${tr('utilities.redundancy_note')}</p></section>${utilityCachesHtml(city,modal)}`;}
function utilityCachesHtml(city,modal=false){const q=utilityCaches(city);if(!q)return '';
return `<section><h3>${tr('common.embedded_caches')}</h3><p class="lead">${tr('utilities.cache_note')}</p>
<p class="meta">${tr('utilities.cache_quote',{n:q.add.length,mo:fmt$(q.mo)})}</p>
${q.free<q.add.length?`<p class="why">${tr('utilities.cache_ports',{need:q.add.length,free:fmtPorts(q.free)})}</p>`:''}
<div class="btns">${btn(tr('utilities.request_caches',{n:q.add.length}),'utilityCaches',{city,quote:q.key,modal},'pink',!q.add.length||q.free+1e-9<q.add.length)}</div></section>`;}
function utilitiesModal(city,message){if(!S)return;const cities=Object.keys(S.pops).sort((a,b)=>CITY[a].name.localeCompare(CITY[b].name));
city=S.pops[city]?city:UI.sel&&UI.sel.type==='city'&&S.pops[UI.sel.id]?UI.sel.id:S.pops[S.home]?S.home:cities[0];
const rows=utilityPeers(),n=rows.reduce((v,r)=>v+r.requests.length,0),rs=utilityRouteServers().length;

View file

@ -3065,19 +3065,25 @@
"tutorial.your_customers_want_the_whole":"Your customers want the whole internet. Open the Transit tab and buy a port from a carrier.",
"tutorial.your_router_is_live_press_launch":"Your router is live. Press “Launch broadband” to sell internet to the people of your city.",
"ui.n_d_left":"{n}d left",
"utilities.hardware_note":"Hardware only: assign services across both sites and check diverse links and surviving router capacity for full failover protection.",
"utilities.install_missing":"Install missing hardware",
"utilities.apply_kit":"Apply redundancy kit",
"utilities.cache_moves":"Cache boxes to move: {n} (balanced per provider)",
"utilities.cache_note":"Request one cache per eligible provider at each existing site. Existing boxes are kept; providers still require sufficient traffic.",
"utilities.cache_ports":"Requires {need} free router ports; {free} available. Nothing is requested until the whole batch fits.",
"utilities.cache_quote":"{n} new cache boxes · Free hardware · Additional monthly cost: {mo}",
"utilities.caches_requested":"Installed {n} cache boxes in {city}.",
"utilities.ix_peering":"Network-wide IX peering",
"utilities.join_route_servers":"Join all route servers ({n})",
"utilities.kit_complete":"All kit components are installed.",
"utilities.kit_applied":"Redundancy updated in {city}.",
"utilities.kit_balanced":"Hardware installed and caches balanced.",
"utilities.kit_cost":"One-off: {cost} · Additional monthly cost: {mo}",
"utilities.kit_installed":"Redundancy kit installed in {city}.",
"utilities.peer_counts":"{ready} eligible · {existing} existing · {blocked} unavailable",
"utilities.peering_note":"Request eligible peers at every IX you have joined. Existing sessions, including route-server peers, are skipped. Refusals and traffic thresholds still apply. No ports or paid PNIs are purchased.",
"utilities.peers_requested":"Established {n} new IX peering sessions.",
"utilities.quote_changed":"The quote changed. Review the new price and try again.",
"utilities.redundancy_kit":"PoP redundancy kit",
"utilities.redundancy_note":"Existing caches are balanced per provider. Split IX, PNI and transit connections across sites separately, and check diverse links and spare router capacity.",
"utilities.request_all":"Request all eligible peers ({n})",
"utilities.request_caches":"Request missing caches ({n})",
"utilities.route_server_note":"Route-server peers require an Open peering policy. Existing sessions stay enabled; no ports are bought.",
"utilities.route_servers_joined":"Joined {n} route servers.",
"utilities.second_site":"Second site",