diff --git a/CHANGELOG.md b/CHANGELOG.md index fb42726..6cb683f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ 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. + ## [1.36.0] — 2026-10-28 - You can put a link on standby, so one of two links between the same cities sits idle as a backup (#122). It carries traffic only when the other links are full or down, so its capacity is never wasted, and the map draws it dashed while it waits. The routing metric still applies to every link between the two cities. diff --git a/site/i18n/es.js b/site/i18n/es.js index 0c9a6df..7235f4c 100644 --- a/site/i18n/es.js +++ b/site/i18n/es.js @@ -3064,4 +3064,23 @@ "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.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_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.request_all":"Solicitar todos los peers elegibles ({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", +"utilities.title":"Utilidades", +"utilities.two_routers":"Al menos dos routers", +"utilities.view_pop":"Ver POP", }; diff --git a/site/i18n/fr.js b/site/i18n/fr.js index 05ae35c..d4b87c0 100644 --- a/site/i18n/fr.js +++ b/site/i18n/fr.js @@ -3064,4 +3064,23 @@ "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.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_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.request_all":"Demander tous les peers éligibles ({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", +"utilities.title":"Utilitaires", +"utilities.two_routers":"Au moins deux routeurs", +"utilities.view_pop":"Voir le POP", }; diff --git a/site/i18n/it.js b/site/i18n/it.js index 92ca041..c6beb8c 100644 --- a/site/i18n/it.js +++ b/site/i18n/it.js @@ -3064,4 +3064,23 @@ "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.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_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.request_all":"Richiedi tutti i peer idonei ({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", +"utilities.title":"Utilità", +"utilities.two_routers":"Almeno due router", +"utilities.view_pop":"Mostra POP", }; diff --git a/site/i18n/pt.js b/site/i18n/pt.js index 6e219ea..cb05f6d 100644 --- a/site/i18n/pt.js +++ b/site/i18n/pt.js @@ -3064,4 +3064,23 @@ "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.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_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.request_all":"Solicitar todos os peers elegíveis ({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", +"utilities.title":"Utilitários", +"utilities.two_routers":"Pelo menos dois routers", +"utilities.view_pop":"Ver POP", }; diff --git a/src/game/70-rules/95-utilities.js b/src/game/70-rules/95-utilities.js new file mode 100644 index 0000000..3d99f22 --- /dev/null +++ b/src/game/70-rules/95-utilities.js @@ -0,0 +1,15 @@ +/* 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 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), + 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; + for(const id of ixMembers(ix)){ + // Existing but temporarily down sessions must not be repeatedly requested. + if(sessions.has(id)||S.peers[id+'@'+ix]){existing++;continue;} + const chk=peerOk(id,'ix',ix);if(chk.ok)requests.push(id);else blocked.push({id,why:chk.why}); + } + return {ix,requests,blocked,existing}; +});} diff --git a/src/game/90-actions/88-utilities.js b/src/game/90-actions/88-utilities.js new file mode 100644 index 0000000..05b6615 --- /dev/null +++ b/src/game/90-actions/88-utilities.js @@ -0,0 +1,15 @@ +Object.assign(ACT,{ + utilities:({city}={})=>{if(S)utilitiesModal(city);}, + 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; + // 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.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');}, + 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/90-actions/89-game-and-settings.js b/src/game/90-actions/89-game-and-settings.js index 3ec2894..4774cf6 100644 --- a/src/game/90-actions/89-game-and-settings.js +++ b/src/game/90-actions/89-game-and-settings.js @@ -23,6 +23,7 @@ Object.assign(ACT,{ ${btn(tr('game_and_settings.scenarios_amp_weekly_challenge'),'scenarios',{},'ghost')} ${btn(tr('common.how_to_play'),'help',{},'ghost')} ${RELEASE_NOTES.length?btn(tr('common.what_s_new_in_v',{v:esc(APP_VERSION)}),'whatsNewShow',{},'ghost'):''} + ${btn(tr('utilities.title'),'utilities',{},'')} ${btn(tr('common.settings'),'settings',{},'ghost')} ${btn(tr('common.start_a_new_network'),'resetAsk',{},'red')} ${chatHtml()}${issueHtml()}`);}, diff --git a/src/game/93-ui/50-city-panel.js b/src/game/93-ui/50-city-panel.js index 853d518..71360d8 100644 --- a/src/game/93-ui/50-city-panel.js +++ b/src/game/93-ui/50-city-panel.js @@ -67,6 +67,7 @@ function cityPanel(c){ ${have.length?btn(tr('common.remove'),'rmCache',{id:(have.find(x=>x.site==='b')||have[0]).id},'ghost sm'):''}${btn(have.length?tr('common.box'):tr('common.request'),'cache',{city:c,net:n.id},'sm',!ok)}${S.pops[c].site2&&have.length?(()=>{const nb=have.filter(x=>x.site==='b').length,na=have.length-nb;return `
${tr('city_panel.the_model_sets_your_fastest')}
diff --git a/src/game/93-ui/55-utilities.js b/src/game/93-ui/55-utilities.js new file mode 100644 index 0000000..3ed1e15 --- /dev/null +++ b/src/game/93-ui/55-utilities.js @@ -0,0 +1,19 @@ +function utilityKitHtml(city,modal=false){const q=utilityKit(city);if(!q)return '';const p=S.pops[city]; + const row=(label,have)=>`${tr('utilities.hardware_note')}
`;} +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; + openModal(`${esc(message)}
`:''} +${tr('utilities.peering_note')}
+${tr('link_panels.off_while_your_peering_policy_is',{pol:tr(PPOL_N[ppol()])})}
${btn(tr('common.peering_policy'),'inbox',{},'ghost sm')}`:''} + ${rows.map(r=>`