diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f9916e..0c39909 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ All notable changes to this project are documented here. The project follows ## [Unreleased] +- A network the game once failed to load is no longer stuck as damaged: the next version of the game tries it again, and its menu has a Try again button. Before, it could only be exported or deleted, even after the cause was fixed. +- Save files of very large networks import again: the limit went from 8 MB to 64 MB. +- The Networks tab and the zoomed-in map draw faster on big networks. - 400G cache boxes: a POP whose routers have 400G or faster ports now gets 400G boxes, at $1,000 a month instead of $400 for 100G, so big caches need fewer boxes and cost less per Gbps. Boxes you already have stay as they are. - Pick a standard POP: in any POP's Infra tab, make its routers the standard, and every new POP gets that model and number of routers right away, while it is still empty (#240). - Clarovision now peers only over paid PNIs, like the real carrier, and free only with networks at customer level 11 or above (#213). A PNI you already have with it starts paying the fee. diff --git a/site/i18n/de.js b/site/i18n/de.js index 715f557..f3559e4 100644 --- a/site/i18n/de.js +++ b/site/i18n/de.js @@ -3690,7 +3690,7 @@ "sites_peering_caches.your_ticket_was_merged_into_another":"Dein Ticket wurde mit einem anderen Ticket zusammengeführt.
Das wurde als Duplikat von deinem geschlossen.", "slots.continue":"Weiterspielen", "slots.continue_this_network":"Dieses Netz weiterspielen", -"slots.damaged_export_or_delete":"Beschädigt: exportieren oder löschen", +"slots.damaged_export_or_delete":"Beschädigt: nochmal versuchen, exportieren oder löschen", "slots.delete":"Löschen", "slots.delete_forever":"Für immer löschen", "slots.delete_name":"{name} löschen?", @@ -3726,6 +3726,7 @@ "slots.that_network_is_gone":"Dieses Netz gibt es nicht mehr.
Es wurde gelöscht, vielleicht in einem anderen Fenster.", "slots.this_window_stepped_aside_so_the":"Du hast es in einem anderen Fenster übernommen, also hat dieses Platz gemacht und speichert nicht mehr. Nichts ist verloren.", "slots.this_window_stopped_saving_so_it":"In einem anderen Fenster wurde eine neuere Version gespeichert, also speichert dieses nicht mehr, statt sie zu überschreiben.", +"slots.try_again":"Nochmal versuchen", "slots.two_windows_one_network":"Zwei Fenster, ein Netz", "slots.your_networks":"Deine Netze", "slots.your_other_networks_share_this_browser":"Deine anderen Netze teilen sich den Speicher dieses Browsers. Exportiere die, die du behalten willst, und lösche sie dann hier, um Platz zu schaffen.", diff --git a/site/i18n/es.js b/site/i18n/es.js index cf37ec3..aaf3b49 100644 --- a/site/i18n/es.js +++ b/site/i18n/es.js @@ -3688,7 +3688,7 @@ "sites_peering_caches.your_ticket_was_merged_into_another":"Tu ticket se fusionó con otro ticket.
Ese ticket se cerró como duplicado del tuyo.", "slots.continue":"Continuar", "slots.continue_this_network":"Continuar esta red", -"slots.damaged_export_or_delete":"Dañada: expórtala o bórrala", +"slots.damaged_export_or_delete":"Dañado: inténtalo de nuevo, expórtalo o bórralo", "slots.delete":"Borrar", "slots.delete_forever":"Borrar para siempre", "slots.delete_name":"¿Borrar {name}?", @@ -3724,6 +3724,7 @@ "slots.that_network_is_gone":"Esa red ya no existe.
Se borró, quizá en otra ventana.", "slots.this_window_stepped_aside_so_the":"La abriste en otra ventana, así que esta se hizo a un lado y dejó de guardar. No se perdió nada.", "slots.this_window_stopped_saving_so_it":"Se guardó una versión más nueva en otra ventana, así que esta dejó de guardar en vez de sobrescribirla.", +"slots.try_again":"Intentar de nuevo", "slots.two_windows_one_network":"Dos ventanas, una red", "slots.your_networks":"Tus redes", "slots.your_other_networks_share_this_browser":"Tus otras redes comparten el almacenamiento de este navegador. Exporta las que quieras conservar y bórralas aquí para hacer sitio.", diff --git a/site/i18n/fr.js b/site/i18n/fr.js index e8b929a..bae82e8 100644 --- a/site/i18n/fr.js +++ b/site/i18n/fr.js @@ -3688,7 +3688,7 @@ "sites_peering_caches.your_ticket_was_merged_into_another":"Votre ticket a été fusionné avec un autre ticket.
Ce ticket a été fermé comme doublon du vôtre.", "slots.continue":"Continuer", "slots.continue_this_network":"Continuer ce réseau", -"slots.damaged_export_or_delete":"Endommagé : exporte-le ou supprime-le", +"slots.damaged_export_or_delete":"Endommagé : réessayez, exportez-le ou supprimez-le", "slots.delete":"Supprimer", "slots.delete_forever":"Supprimer pour de bon", "slots.delete_name":"Supprimer {name} ?", @@ -3724,6 +3724,7 @@ "slots.that_network_is_gone":"Ce réseau n'existe plus.
Il a été supprimé, peut-être dans une autre fenêtre.", "slots.this_window_stepped_aside_so_the":"Tu l'as repris dans une autre fenêtre, alors celle-ci s'est effacée et ne sauvegarde plus. Rien n'est perdu.", "slots.this_window_stopped_saving_so_it":"Une version plus récente a été sauvegardée dans une autre fenêtre, alors celle-ci a arrêté de sauvegarder au lieu de l'écraser.", +"slots.try_again":"Réessayer", "slots.two_windows_one_network":"Deux fenêtres, un réseau", "slots.your_networks":"Tes réseaux", "slots.your_other_networks_share_this_browser":"Tes autres réseaux partagent le stockage de ce navigateur. Exporte ceux que tu veux garder, puis supprime-les ici pour faire de la place.", diff --git a/site/i18n/it.js b/site/i18n/it.js index 28cbefc..7c0ee68 100644 --- a/site/i18n/it.js +++ b/site/i18n/it.js @@ -3688,7 +3688,7 @@ "sites_peering_caches.your_ticket_was_merged_into_another":"Il tuo ticket è stato unito a un altro ticket.
Quel ticket è stato chiuso come duplicato del tuo.", "slots.continue":"Continua", "slots.continue_this_network":"Continua questa rete", -"slots.damaged_export_or_delete":"Danneggiata: esportala o eliminala", +"slots.damaged_export_or_delete":"Danneggiato: riprova, esportalo o eliminalo", "slots.delete":"Elimina", "slots.delete_forever":"Elimina per sempre", "slots.delete_name":"Eliminare {name}?", @@ -3724,6 +3724,7 @@ "slots.that_network_is_gone":"Quella rete non c'è più.
È stata eliminata, forse in un'altra finestra.", "slots.this_window_stepped_aside_so_the":"L'hai presa in un'altra finestra, quindi questa si è fatta da parte e ha smesso di salvare. Non si è perso nulla.", "slots.this_window_stopped_saving_so_it":"In un'altra finestra è stata salvata una versione più recente, quindi questa ha smesso di salvare invece di sovrascriverla.", +"slots.try_again":"Riprova", "slots.two_windows_one_network":"Due finestre, una rete", "slots.your_networks":"Le tue reti", "slots.your_other_networks_share_this_browser":"Le tue altre reti condividono lo spazio di questo browser. Esporta quelle che vuoi tenere, poi eliminale qui per fare posto.", diff --git a/site/i18n/pt.js b/site/i18n/pt.js index 45b50fb..329bcc3 100644 --- a/site/i18n/pt.js +++ b/site/i18n/pt.js @@ -3688,7 +3688,7 @@ "sites_peering_caches.your_ticket_was_merged_into_another":"Seu chamado foi juntado a outro chamado.
Esse chamado foi fechado como duplicado do seu.", "slots.continue":"Continuar", "slots.continue_this_network":"Continuar esta rede", -"slots.damaged_export_or_delete":"Danificada: exporte ou apague", +"slots.damaged_export_or_delete":"Danificado: tente de novo, exporte ou apague", "slots.delete":"Apagar", "slots.delete_forever":"Apagar para sempre", "slots.delete_name":"Apagar {name}?", @@ -3724,6 +3724,7 @@ "slots.that_network_is_gone":"Essa rede não existe mais.
Ela foi apagada, talvez em outra janela.", "slots.this_window_stepped_aside_so_the":"Você assumiu em outra janela, então esta saiu da frente e parou de salvar. Nada foi perdido.", "slots.this_window_stopped_saving_so_it":"Uma versão mais nova foi salva em outra janela, então esta parou de salvar em vez de sobrescrevê-la.", +"slots.try_again":"Tentar de novo", "slots.two_windows_one_network":"Duas janelas, uma rede", "slots.your_networks":"Suas redes", "slots.your_other_networks_share_this_browser":"Suas outras redes dividem o armazenamento deste navegador. Exporte as que quiser manter e apague-as aqui para abrir espaço.", diff --git a/src/game/90-actions/91-slots.js b/src/game/90-actions/91-slots.js index 09d9671..f97105b 100644 --- a/src/game/90-actions/91-slots.js +++ b/src/game/90-actions/91-slots.js @@ -6,6 +6,8 @@ Object.assign(ACT,{ // Back to the title with this network kept and saved. toTitle:()=>{if(pzOn()){pzLeave();}slotLeave();gameClear();showTitle();}, slotBack:()=>{if(S&&UI.started)closeModal();else showTitle();}, + // A damaged save, opened once more: if it loads, it is no longer damaged; if not, it is marked again. + slotRetry:({id})=>{const l=slotIdx(),e=l.find(x=>x.id===id);if(!e)return;e.broken=false;slotIdxPut(l);closeModal();ACT.cont({id});}, slotMenu:({id})=>{const h=slotMenuHtml(id);if(h)openModal(h);}, slotExport:({id})=>exportSlot(id), slotDel:({id,back})=>{const e=slotIdx().find(x=>x.id===id);if(!e)return; diff --git a/src/game/91-save.js b/src/game/91-save.js index 63979aa..9737d78 100644 --- a/src/game/91-save.js +++ b/src/game/91-save.js @@ -68,7 +68,7 @@ function parseSave(txt){if(typeof txt!=='string')return {err:tr('save.that_file_ if(s.lost)return {err:tr('save.that_network_went_bankrupt_it_cannot')}; for(const c of Object.keys(s.pops))if(!isCity(c))return {err:tr('save.that_save_has_a_pop_in',{city:esc(String(c).slice(0,12))})}; return {s,ver:j.version||'?',name:String(s.name||tr('common.unnamed_network'))};} -function importFile(file){if(!file)return;if(file.size>8e6){toast(tr('save.that_file_is_too_big_to'),'bad');return;} +function importFile(file){if(!file)return;if(file.size>64e6){toast(tr('save.that_file_is_too_big_to'),'bad');return;} const rd=new FileReader();rd.onload=()=>{const r=parseSave(String(rd.result));if(r.err){toast(tr('save.import_failed_err',{err:esc(r.err)}),'bad');sfx('err');return;} UI.importing=r.s;openModal(`
${tr('common.import_a_save')}

${tr('save.load_name',{name:esc(r.name)})}

${esc(dateStr(r.s.day))} · ${tr('save.cash_in_the_bank',{cash:fmt$(r.s.cash)})} · ${trn('save.n_pop',Object.keys(r.s.pops).length)} · ${tr('save.saved_by_v_ver',{ver:esc(r.ver)})}

${tr('slots.it_joins_your_networks_on_this')}

${btn(tr('save.load_this_network'),'importGo',{},'pink big')}${btn(tr('common.cancel'),UI.started?'closeModal':'helpClose',{},'ghost big')}
`);}; rd.readAsText(file);} diff --git a/src/game/91-slots.js b/src/game/91-slots.js index d3b1e30..c647112 100644 --- a/src/game/91-slots.js +++ b/src/game/91-slots.js @@ -19,13 +19,16 @@ const slotRaw=id=>slotOkId(id)?lsGet(SLOT_K+id)??(id===SLOT_MAIN?lsGet(SLOT_OLD) function slotClean(e){if(!e||typeof e!=='object'||!slotOkId(e.id))return null; return {id:e.id,name:String(e.name==null?'':e.name).slice(0,24),asn:int(e.asn,0,4294967294,0),mode:['normal','sandbox','scenario'].includes(e.mode)?e.mode:'normal', preset:typeof e.preset==='string'&&own(PRESETS,e.preset)?e.preset:'oncall',scn:typeof e.scn==='string'?e.scn.slice(0,60):null,day:int(e.day,0,1e7,0), - tier:['Tier 1','Tier 2','Tier 3'].includes(e.tier)?e.tier:null,cash:num(e.cash,0),at:num(e.at,0),size:int(e.size,0,1e10,0),seq:int(e.seq,0,1e15,0),gz:!!e.gz,broken:!!e.broken};} + tier:['Tier 1','Tier 2','Tier 3'].includes(e.tier)?e.tier:null,cash:num(e.cash,0),at:num(e.at,0),size:int(e.size,0,1e10,0),seq:int(e.seq,0,1e15,0),gz:!!e.gz, + // A save marked damaged (bv: the game version that could not load it) is tried again by the next version: the fault is + // usually in the game, and the save itself is fine once it is fixed. + ...(e.broken&&e.bv===APP_VERSION?{broken:true,bv:e.bv}:{broken:false})};} const slotMeta=(s,tier)=>({name:s.name,asn:s.asn,mode:s.mode,preset:s.rules&&s.rules.preset,scn:s.scn&&s.scn.name||null,day:s.day,cash:s.cash,tier}); function slotKeys(){const out=[];try{for(let i=0;i({...e}));return true;}catch(e){SLOT.ixRaw=null;return false;}} function slotFix(list){for(const e of list)if(e.gz&&!e.name&&!e.broken&&!SLOT['fix'+e.id]){SLOT['fix'+e.id]=1;const raw=slotRaw(e.id); gunzip(raw).then(t=>{const s=JSON.parse(t);return s&&s.v===1?slotMeta(s,null):null;},()=>null).then(m=>{const l=slotIdx(),x=l.find(y=>y.id===e.id);if(!x)return; - if(m)Object.assign(x,slotClean({...x,...m}));else x.broken=true;slotIdxPut(l);slotRefresh();});}} + if(m)Object.assign(x,slotClean({...x,...m}));else{x.broken=true;x.bv=APP_VERSION;}slotIdxPut(l);slotRefresh();});}} const slotByAt=l=>l.slice().sort((a,b)=>b.at-a.at); // ---------- one writer per slot ---------- // The heartbeat: who has a slot open, refreshed every few seconds. A hidden tab's timers can be slowed to once a @@ -104,7 +107,7 @@ function slotOpen(id,steal,done){if(!slotIdx(true).some(e=>e.id===id)){showTitle slotIn(id,sv);gameResume();if(done)done();}; const raw=slotRaw(id);if(raw==null){slotFree(id);slotDrop(id);showTitle();toast(tr('slots.that_network_is_gone'),'bad');return;} if(raw.startsWith(GZ)){if(raw===UI.gzRaw)go(UI.gzText);else gunzip(raw).then(go,()=>slotBroke(id));}else go(raw);});} -function slotBroke(id){const l=slotIdx(),e=l.find(x=>x.id===id);if(e){e.broken=true;slotIdxPut(l);} +function slotBroke(id){const l=slotIdx(),e=l.find(x=>x.id===id);if(e){e.broken=true;e.bv=APP_VERSION;slotIdxPut(l);} if(UI.slot===id){UI.slot=null;ssSet(SLOT_SS,null);}slotFree(id); S=null;R=emptyR();UI.started=false;UI.sel=null;$('dash').hidden=true;$('bankBox').hidden=true;renderAll();showTitle();toast(tr('loop.your_saved_game_could_not_be'),'bad');} function slotDrop(id){if(!slotOkId(id))return;SLOT.no.add(id);lsDel(SLOT_K+id);if(id===SLOT_MAIN)lsDel(SLOT_OLD);slotUnbeat(id); @@ -123,7 +126,7 @@ function slotMigrate(cb){const raw=lsGet(SLOT_OLD); const done=s=>{if(s&&s.lost){cb();return;} let ok=false;try{localStorage.setItem(SLOT_K+SLOT_MAIN,raw);ok=localStorage.getItem(SLOT_K+SLOT_MAIN)===raw;}catch(e){} if(!ok)lsDel(SLOT_K+SLOT_MAIN); - const l=slotIdx();l.push(slotClean({id:SLOT_MAIN,...(s?slotMeta(s,null):{}),seq:0,at:Date.now(),size:raw.length,gz:raw.startsWith(GZ),broken:!s}));slotIdxPut(l);if(!s)UI.bootBroken=true;cb();}; + const l=slotIdx();l.push(slotClean({id:SLOT_MAIN,...(s?slotMeta(s,null):{}),seq:0,at:Date.now(),size:raw.length,gz:raw.startsWith(GZ),broken:!s,bv:APP_VERSION}));slotIdxPut(l);if(!s)UI.bootBroken=true;cb();}; if(!raw.startsWith(GZ)){let s=null;try{s=JSON.parse(raw);}catch(e){}done(s&&s.v===1?s:null);return;} if(!gzOk()){done(null);return;} gunzip(raw).then(t=>{UI.gzRaw=raw;UI.gzText=t;let s=null;try{s=JSON.parse(t);}catch(e){}done(s&&s.v===1?s:null);},()=>done(null));} diff --git a/src/game/95-modals/45-slots.js b/src/game/95-modals/45-slots.js index 0e060c0..047c54d 100644 --- a/src/game/95-modals/45-slots.js +++ b/src/game/95-modals/45-slots.js @@ -19,7 +19,7 @@ function slotRefresh(){const el=$('slotList');if(!el||UI.started)return;const h= function slotMenuHtml(id){const e=slotIdx().find(x=>x.id===id);if(!e)return '';const nm=esc(e.name||tr('common.unnamed_network')); return `
${slotIcon(e)} ${slotLine(e)}

${nm}

${e.at?tr('slots.last_played_ago',{ago:slotAgo(e.at)}):''}${e.size?' · '+tr('slots.size_on_this_device',{size:slotSize(e.size)}):''}

- `;} + `;} const slotSize=n=>n>=1e6?(n/1e6).toFixed(1)+' MB':Math.max(1,Math.round(n/1e3))+' kB'; function slotBusyModal(id){const e=slotIdx().find(x=>x.id===id),nm=esc(e&&e.name||tr('common.unnamed_network')); openModal(`
🪟 ${tr('slots.two_windows_one_network')}

${tr('slots.name_is_open_in_another_window',{name:nm})}

diff --git a/src/i18n/en.js b/src/i18n/en.js index 50ef3ca..d84d13c 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -3689,7 +3689,7 @@ "sites_peering_caches.your_ticket_was_merged_into_another":"Your ticket was merged into another ticket.
That ticket was closed as a duplicate of yours.", "slots.continue":"Continue", "slots.continue_this_network":"Continue this network", -"slots.damaged_export_or_delete":"Damaged: export it or delete it", +"slots.damaged_export_or_delete":"Damaged: try again, export it or delete it", "slots.delete":"Delete", "slots.delete_forever":"Delete forever", "slots.delete_name":"Delete {name}?", @@ -3725,6 +3725,7 @@ "slots.that_network_is_gone":"That network is gone.
It was deleted, maybe in another window.", "slots.this_window_stepped_aside_so_the":"You took it over in another window, so this one stepped aside and stopped saving. Nothing was lost.", "slots.this_window_stopped_saving_so_it":"A newer version was saved in another window, so this one stopped saving instead of overwriting it.", +"slots.try_again":"Try again", "slots.two_windows_one_network":"Two windows, one network", "slots.your_networks":"Your networks", "slots.your_other_networks_share_this_browser":"Your other networks share this browser's storage. Export the ones you want to keep, then delete them here to make room.", diff --git a/tests/save-slots.test.js b/tests/save-slots.test.js index 1f7a183..74fbdcf 100644 --- a/tests/save-slots.test.js +++ b/tests/save-slots.test.js @@ -433,3 +433,32 @@ test('the networks list fits a 360 px phone and has a tap target and a ⋯ menu assert.deepEqual(a.errors, [], lang); } }); + +test('a save the game could not load is tried again: by the next version, or with Try again', async () => { + const b = browser(); + const a = load({ browser: b }); + play(a.ev, 'Phoenix'); + const id = a.ev('UI.slot'), q = JSON.stringify(id); + a.ev('save(true)'); + await flush(); + // This version cannot load it (a bug, not the save): it is marked damaged, with the version that failed. + a.ev('ACT.toTitle()'); + await flush(); + a.ev(`window.__m=migrate;migrate=s=>{throw new Error('bug')};ACT.cont({id:${q}})`); + await flush(); + a.ev('migrate=__m'); + assert.equal(idx(a.ev)[0].broken, true); + assert.equal(JSON.parse(b.ls.get('sot-slots')).slots[0].bv, a.ev('APP_VERSION')); + a.ev(`ACT.slotMenu({id:${q}})`); + assert.match(card(a.ev), /Try again/); + // Try again, with the bug gone: it opens, and is no longer damaged. + a.ev(`ACT.slotRetry({id:${q}})`); + await flush(); + assert.equal(a.ev('!!UI.started&&S.name'), 'Phoenix'); + assert.equal(idx(a.ev)[0].broken, false); + // Marked damaged by an older version: the index reads it as worth another try. + const ix = JSON.parse(b.ls.get('sot-slots'));ix.slots[0].broken = true;ix.slots[0].bv = '0.0.1'; + b.ls.set('sot-slots', JSON.stringify(ix)); + assert.equal(JSON.parse(a.ev('JSON.stringify(slotIdx(true))'))[0].broken, false); + assert.deepEqual(a.errors, []); +});