diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cb683f..8f40c93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ All notable changes to this project are documented here. The project follows ## [Unreleased] -- Utilities join route servers and request eligible peers across every joined IX, and install missing PoP redundancy hardware in one purchase. +- Utilities join route servers and request eligible peers across every joined IX, install missing PoP redundancy hardware and balance caches between sites, and request a cache from each eligible provider at each site. ## [1.36.0] — 2026-10-28 diff --git a/site/i18n/es.js b/site/i18n/es.js index 7235f4c..c94e3b2 100644 --- a/site/i18n/es.js +++ b/site/i18n/es.js @@ -3064,19 +3064,25 @@ "tutorial.your_customers_want_the_whole":"Tus clientes quieren todo internet. Abre la pestaña Tránsito y compra un puerto a un operador.", "tutorial.your_router_is_live_press_launch":"Tu router está activo. Pulsa «Lanzar banda ancha» para vender internet a la gente de tu ciudad.", "ui.n_d_left":"quedan {n} d", -"utilities.hardware_note":"Solo hardware: reparte los servicios entre ambas ubicaciones y comprueba enlaces diversos y la capacidad del router restante para una protección completa ante fallos.", -"utilities.install_missing":"Instalar el hardware que falta", +"utilities.apply_kit":"Aplicar kit de redundancia", +"utilities.cache_moves":"Cachés que mover: {n} (equilibradas por proveedor)", +"utilities.cache_note":"Solicita una caché por proveedor elegible en cada ubicación existente. Se conservan las cachés actuales; los proveedores siguen exigiendo tráfico suficiente.", +"utilities.cache_ports":"Se necesitan {need} puertos libres de router; disponibles: {free}. No se solicita nada hasta que haya espacio para todas.", +"utilities.cache_quote":"{n} cachés nuevas · Hardware gratuito · Coste mensual adicional: {mo}", +"utilities.caches_requested":"Se han instalado {n} cachés en {city}.", "utilities.ix_peering":"Peering IX en toda la red", "utilities.join_route_servers":"Unirse a todos los route servers ({n})", -"utilities.kit_complete":"Todos los componentes del kit están instalados.", +"utilities.kit_applied":"Redundancia actualizada en {city}.", +"utilities.kit_balanced":"Hardware instalado y cachés equilibradas.", "utilities.kit_cost":"Pago único: {cost} · Coste mensual adicional: {mo}", -"utilities.kit_installed":"Kit de redundancia instalado en {city}.", "utilities.peer_counts":"{ready} elegibles · {existing} existentes · {blocked} no disponibles", "utilities.peering_note":"Solicita peers elegibles en cada IX al que te hayas unido. Se omiten las sesiones existentes, incluidos los peers del route server. Los rechazos y umbrales de tráfico siguen vigentes. No se compran puertos ni PNI de pago.", "utilities.peers_requested":"Se han establecido {n} nuevas sesiones de peering IX.", "utilities.quote_changed":"El presupuesto ha cambiado. Revisa el nuevo precio e inténtalo de nuevo.", "utilities.redundancy_kit":"Kit de redundancia del POP", +"utilities.redundancy_note":"Las cachés existentes se equilibran por proveedor. Reparte por separado las conexiones IX, PNI y transit entre ubicaciones y comprueba enlaces diversos y capacidad de reserva de los routers.", "utilities.request_all":"Solicitar todos los peers elegibles ({n})", +"utilities.request_caches":"Solicitar las cachés que faltan ({n})", "utilities.route_server_note":"Los peers de los route servers requieren una política de peering abierta. Las sesiones existentes siguen activas; no se compran puertos.", "utilities.route_servers_joined":"Te has unido a {n} route servers.", "utilities.second_site":"Segunda ubicación", diff --git a/site/i18n/fr.js b/site/i18n/fr.js index d4b87c0..8410879 100644 --- a/site/i18n/fr.js +++ b/site/i18n/fr.js @@ -3064,19 +3064,25 @@ "tutorial.your_customers_want_the_whole":"Tes clients veulent tout Internet. Ouvre l’onglet Transit et achète un port chez un opérateur.", "tutorial.your_router_is_live_press_launch":"Ton routeur est en ligne. Appuie sur « Lancer le haut débit » pour vendre Internet aux habitants de ta ville.", "ui.n_d_left":"encore {n} j", -"utilities.hardware_note":"Matériel uniquement : répartis les services entre les deux sites et vérifie la diversité des liaisons et la capacité du routeur restant pour une protection complète contre les pannes.", -"utilities.install_missing":"Installer le matériel manquant", +"utilities.apply_kit":"Appliquer le kit de redondance", +"utilities.cache_moves":"Caches à déplacer : {n} (équilibrés par fournisseur)", +"utilities.cache_note":"Demande un cache par fournisseur éligible sur chaque site existant. Les caches existants sont conservés ; les fournisseurs exigent toujours un trafic suffisant.", +"utilities.cache_ports":"Il faut {need} ports de routeur libres ; {free} disponibles. Aucune demande tant que tous les caches ne peuvent pas être installés.", +"utilities.cache_quote":"{n} nouveaux caches · Matériel gratuit · Coût mensuel supplémentaire : {mo}", +"utilities.caches_requested":"{n} caches installés à {city}.", "utilities.ix_peering":"Peering IX sur tout le réseau", "utilities.join_route_servers":"Rejoindre tous les route servers ({n})", -"utilities.kit_complete":"Tous les composants du kit sont installés.", +"utilities.kit_applied":"Redondance mise à jour à {city}.", +"utilities.kit_balanced":"Matériel installé et caches équilibrés.", "utilities.kit_cost":"Coût initial : {cost} · Coût mensuel supplémentaire : {mo}", -"utilities.kit_installed":"Kit de redondance installé à {city}.", "utilities.peer_counts":"{ready} éligibles · {existing} existants · {blocked} indisponibles", "utilities.peering_note":"Demande les peers éligibles sur chaque IX rejoint. Les sessions existantes, y compris via le route server, sont ignorées. Les refus et seuils de trafic restent applicables. Aucun port ni PNI payant ne sera acheté.", "utilities.peers_requested":"{n} nouvelles sessions de peering IX établies.", "utilities.quote_changed":"Le devis a changé. Vérifie le nouveau prix et réessaie.", "utilities.redundancy_kit":"Kit de redondance du POP", +"utilities.redundancy_note":"Les caches existants sont équilibrés par fournisseur. Répartis séparément les connexions IX, PNI et transit entre les sites et vérifie la diversité des liaisons et la capacité de réserve des routeurs.", "utilities.request_all":"Demander tous les peers éligibles ({n})", +"utilities.request_caches":"Demander les caches manquants ({n})", "utilities.route_server_note":"Les peers des route servers nécessitent une politique de peering ouverte. Les sessions existantes restent activées ; aucun port ne sera acheté.", "utilities.route_servers_joined":"{n} route servers rejoints.", "utilities.second_site":"Deuxième site", diff --git a/site/i18n/it.js b/site/i18n/it.js index c6beb8c..6121288 100644 --- a/site/i18n/it.js +++ b/site/i18n/it.js @@ -3064,19 +3064,25 @@ "tutorial.your_customers_want_the_whole":"I tuoi clienti vogliono tutta internet. Apri la scheda Transit e compra una porta da un carrier.", "tutorial.your_router_is_live_press_launch":"Il tuo router è acceso. Premi “Lancia la banda larga” per vendere internet alla gente della tua città.", "ui.n_d_left":"ancora {n}g", -"utilities.hardware_note":"Solo hardware: distribuisci i servizi tra le due sedi e verifica percorsi diversi e capacità del router superstite per una protezione completa dai guasti.", -"utilities.install_missing":"Installa l’hardware mancante", +"utilities.apply_kit":"Applica il kit di ridondanza", +"utilities.cache_moves":"Cache da spostare: {n} (bilanciate per fornitore)", +"utilities.cache_note":"Richiedi una cache per ogni fornitore idoneo in ciascuna sede esistente. Le cache esistenti restano; i fornitori richiedono comunque traffico sufficiente.", +"utilities.cache_ports":"Servono {need} porte router libere; disponibili: {free}. Nessuna richiesta finché non ci sarà spazio per tutte le cache.", +"utilities.cache_quote":"{n} nuove cache · Hardware gratuito · Costo mensile aggiuntivo: {mo}", +"utilities.caches_requested":"Installate {n} cache a {city}.", "utilities.ix_peering":"Peering IX su tutta la rete", "utilities.join_route_servers":"Unisciti a tutti i route server ({n})", -"utilities.kit_complete":"Tutti i componenti del kit sono installati.", +"utilities.kit_applied":"Ridondanza aggiornata a {city}.", +"utilities.kit_balanced":"Hardware installato e cache bilanciate.", "utilities.kit_cost":"Una tantum: {cost} · Costo mensile aggiuntivo: {mo}", -"utilities.kit_installed":"Kit di ridondanza installato a {city}.", "utilities.peer_counts":"{ready} idonei · {existing} esistenti · {blocked} non disponibili", "utilities.peering_note":"Richiedi i peer idonei in ogni IX a cui partecipi. Le sessioni esistenti, inclusi i peer del route server, vengono saltate. Rifiuti e soglie di traffico restano validi. Non vengono acquistate porte o PNI a pagamento.", "utilities.peers_requested":"Stabilite {n} nuove sessioni di peering IX.", "utilities.quote_changed":"Il preventivo è cambiato. Controlla il nuovo prezzo e riprova.", "utilities.redundancy_kit":"Kit di ridondanza del POP", +"utilities.redundancy_note":"Le cache esistenti vengono bilanciate per fornitore. Distribuisci separatamente le connessioni IX, PNI e transit tra le sedi e verifica percorsi diversi e capacità di riserva dei router.", "utilities.request_all":"Richiedi tutti i peer idonei ({n})", +"utilities.request_caches":"Richiedi le cache mancanti ({n})", "utilities.route_server_note":"I peer dei route server richiedono una politica di peering aperta. Le sessioni esistenti restano attive; non vengono acquistate porte.", "utilities.route_servers_joined":"Collegati {n} route server.", "utilities.second_site":"Seconda sede", diff --git a/site/i18n/pt.js b/site/i18n/pt.js index cb05f6d..f9407d4 100644 --- a/site/i18n/pt.js +++ b/site/i18n/pt.js @@ -3064,19 +3064,25 @@ "tutorial.your_customers_want_the_whole":"Seus clientes querem a internet inteira. Abra a aba Transit e compre uma porta de uma operadora.", "tutorial.your_router_is_live_press_launch":"Seu router está no ar. Aperte “Lançar banda larga” para vender internet ao pessoal da sua cidade.", "ui.n_d_left":"faltam {n}d", -"utilities.hardware_note":"Apenas hardware: distribui os serviços pelos dois locais e verifica ligações diversas e capacidade do router restante para proteção completa contra falhas.", -"utilities.install_missing":"Instalar hardware em falta", +"utilities.apply_kit":"Aplicar kit de redundância", +"utilities.cache_moves":"Caches a mover: {n} (equilibradas por fornecedor)", +"utilities.cache_note":"Solicita uma cache por fornecedor elegível em cada local existente. As caches existentes são mantidas; os fornecedores continuam a exigir tráfego suficiente.", +"utilities.cache_ports":"São necessárias {need} portas livres no router; disponíveis: {free}. Nada é solicitado até haver espaço para todas.", +"utilities.cache_quote":"{n} novas caches · Hardware gratuito · Custo mensal adicional: {mo}", +"utilities.caches_requested":"Instaladas {n} caches em {city}.", "utilities.ix_peering":"Peering IX em toda a rede", "utilities.join_route_servers":"Aderir a todos os route servers ({n})", -"utilities.kit_complete":"Todos os componentes do kit estão instalados.", +"utilities.kit_applied":"Redundância atualizada em {city}.", +"utilities.kit_balanced":"Hardware instalado e caches equilibradas.", "utilities.kit_cost":"Custo único: {cost} · Custo mensal adicional: {mo}", -"utilities.kit_installed":"Kit de redundância instalado em {city}.", "utilities.peer_counts":"{ready} elegíveis · {existing} existentes · {blocked} indisponíveis", "utilities.peering_note":"Solicita peers elegíveis em todos os IX a que aderiste. As sessões existentes, incluindo peers do route server, são ignoradas. Recusas e limites de tráfego continuam a aplicar-se. Não são compradas portas nem PNI pagos.", "utilities.peers_requested":"Estabelecidas {n} novas sessões de peering IX.", "utilities.quote_changed":"O orçamento mudou. Verifica o novo preço e tenta novamente.", "utilities.redundancy_kit":"Kit de redundância do POP", +"utilities.redundancy_note":"As caches existentes são equilibradas por fornecedor. Distribui separadamente as ligações IX, PNI e transit pelos locais e verifica ligações diversas e capacidade de reserva dos routers.", "utilities.request_all":"Solicitar todos os peers elegíveis ({n})", +"utilities.request_caches":"Solicitar caches em falta ({n})", "utilities.route_server_note":"Os peers dos route servers exigem uma política de peering aberta. As sessões existentes continuam ativas; não são compradas portas.", "utilities.route_servers_joined":"Adesão a {n} route servers concluída.", "utilities.second_site":"Segundo local", diff --git a/src/game/70-rules/95-utilities.js b/src/game/70-rules/95-utilities.js index 3d99f22..646f760 100644 --- a/src/game/70-rules/95-utilities.js +++ b/src/game/70-rules/95-utilities.js @@ -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; diff --git a/src/game/90-actions/88-utilities.js b/src/game/90-actions/88-utilities.js index 05b6615..57f818d 100644 --- a/src/game/90-actions/88-utilities.js +++ b/src/game/90-actions/88-utilities.js @@ -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}));}, diff --git a/src/game/93-ui/55-utilities.js b/src/game/93-ui/55-utilities.js index 3ed1e15..2d50105 100644 --- a/src/game/93-ui/55-utilities.js +++ b/src/game/93-ui/55-utilities.js @@ -2,8 +2,14 @@ function utilityKitHtml(city,modal=false){const q=utilityKit(city);if(!q)return const row=(label,have)=>`
${tr('utilities.hardware_note')}
`;} + + ${q.cost||q.moves.length?`${tr('utilities.redundancy_note')}
${utilityCachesHtml(city,modal)}`;} +function utilityCachesHtml(city,modal=false){const q=utilityCaches(city);if(!q)return ''; + return `${tr('utilities.cache_note')}
+ + ${q.free