cdnutter
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Implement hybrid saving for optimization" 

This reverts commit b45cd2f7e7.
pull/844/head
Flashfyre 2024-05-13 20:56:28 -04:00
parent ab92bc61ba
commit 7943633481
2 changed files with 58 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/phases.ts
View File

@ -775,7 +775,7 @@ export class EncounterPhase extends BattlePhase {
this.scene.ui.setMode(Mode.MESSAGE).then(() => { this.scene.ui.setMode(Mode.MESSAGE).then(() => {
if (!this.loaded) { if (!this.loaded) {
this.scene.gameData.saveAll(this.scene, true, battle.waveIndex % 5 === 1).then(success => { this.scene.gameData.saveAll(this.scene, true).then(success => {
this.scene.disableMenu = false; this.scene.disableMenu = false;
if (!success) if (!success)
return this.scene.reset(true); return this.scene.reset(true);

104
src/system/game-data.ts
View File

@ -277,7 +277,7 @@ export class GameData {
const maxIntAttrValue = Math.pow(2, 31); const maxIntAttrValue = Math.pow(2, 31);
const systemData = JSON.stringify(data, (k: any, v: any) => typeof v === 'bigint' ? v <= maxIntAttrValue ? Number(v) : v.toString() : v); const systemData = JSON.stringify(data, (k: any, v: any) => typeof v === 'bigint' ? v <= maxIntAttrValue ? Number(v) : v.toString() : v);
if (!bypassLogin && !localStorage.getItem('data')) { if (!bypassLogin) {
Utils.apiPost(`savedata/update?datatype=${GameDataType.SYSTEM}`, systemData, undefined, true) Utils.apiPost(`savedata/update?datatype=${GameDataType.SYSTEM}`, systemData, undefined, true)
.then(response => response.text()) .then(response => response.text())
.then(error => { .then(error => {
@ -293,15 +293,12 @@ export class GameData {
console.error(error); console.error(error);
return resolve(false); return resolve(false);
} }
localStorage.removeItem('data');
resolve(true); resolve(true);
}); });
} else { } else {
const encFunc = bypassLogin localStorage.setItem('data_bak', localStorage.getItem('data'));
? (data: string) => btoa(data)
: (data: string) => AES.encrypt(data, saveKey);
localStorage.setItem('data', encFunc(systemData)); localStorage.setItem('data', btoa(systemData));
this.scene.ui.savingIcon.hide(); this.scene.ui.savingIcon.hide();
@ -312,7 +309,7 @@ export class GameData {
public loadSystem(): Promise<boolean> { public loadSystem(): Promise<boolean> {
return new Promise<boolean>(resolve => { return new Promise<boolean>(resolve => {
if (bypassLogin && !localStorage.getItem('data')) if (bypassLogin && !localStorage.hasOwnProperty('data'))
return resolve(false); return resolve(false);
const handleSystemData = (systemDataStr: string) => { const handleSystemData = (systemDataStr: string) => {
@ -424,7 +421,7 @@ export class GameData {
} }
} }
if (!bypassLogin && !localStorage.getItem('data')) { if (!bypassLogin) {
Utils.apiFetch(`savedata/get?datatype=${GameDataType.SYSTEM}`, true) Utils.apiFetch(`savedata/get?datatype=${GameDataType.SYSTEM}`, true)
.then(response => response.text()) .then(response => response.text())
.then(response => { .then(response => {
@ -442,12 +439,8 @@ export class GameData {
handleSystemData(response); handleSystemData(response);
}); });
} else { } else
const decFunc = bypassLogin handleSystemData(atob(localStorage.getItem('data')));
? (data: string) => atob(data)
: (data: string) => AES.decrypt(data, saveKey).toString(enc.Utf8);
handleSystemData(decFunc(localStorage.getItem('data')));
}
}); });
} }
@ -564,6 +557,40 @@ export class GameData {
} as SessionSaveData; } as SessionSaveData;
} }
saveSession(scene: BattleScene, skipVerification?: boolean): Promise<boolean> {
return new Promise<boolean>(resolve => {
Utils.executeIf(!skipVerification, updateUserInfo).then(success => {
if (success !== null && !success)
return resolve(false);
const sessionData = this.getSessionSaveData(scene);
if (!bypassLogin) {
Utils.apiPost(`savedata/update?datatype=${GameDataType.SESSION}&slot=${scene.sessionSlotId}&trainerId=${this.trainerId}&secretId=${this.secretId}`, JSON.stringify(sessionData), undefined, true)
.then(response => response.text())
.then(error => {
if (error) {
if (error.startsWith('session out of date')) {
this.scene.clearPhaseQueue();
this.scene.unshiftPhase(new ReloadSessionPhase(this.scene));
}
console.error(error);
return resolve(false);
}
console.debug('Session data saved');
resolve(true);
});
} else {
localStorage.setItem(`sessionData${scene.sessionSlotId ? scene.sessionSlotId : ''}`, btoa(JSON.stringify(sessionData)));
console.debug('Session data saved');
resolve(true);
}
});
});
}
getSession(slotId: integer): Promise<SessionSaveData> { getSession(slotId: integer): Promise<SessionSaveData> {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
if (slotId < 0) if (slotId < 0)
@ -578,7 +605,7 @@ export class GameData {
} }
}; };
if (!bypassLogin && !localStorage.getItem(`sessionData${slotId ? slotId : ''}`)) { if (!bypassLogin) {
Utils.apiFetch(`savedata/get?datatype=${GameDataType.SESSION}&slot=${slotId}`, true) Utils.apiFetch(`savedata/get?datatype=${GameDataType.SESSION}&slot=${slotId}`, true)
.then(response => response.text()) .then(response => response.text())
.then(async response => { .then(async response => {
@ -591,12 +618,9 @@ export class GameData {
}); });
} else { } else {
const sessionData = localStorage.getItem(`sessionData${slotId ? slotId : ''}`); const sessionData = localStorage.getItem(`sessionData${slotId ? slotId : ''}`);
if (sessionData) { if (sessionData)
const decFunc = bypassLogin await handleSessionData(atob(sessionData));
? (data: string) => atob(data) else
: (data: string) => AES.decrypt(data, saveKey).toString(enc.Utf8);
await handleSessionData(decFunc(sessionData));
} else
return resolve(null); return resolve(null);
} }
}); });
@ -707,7 +731,7 @@ export class GameData {
deleteSession(slotId: integer): Promise<boolean> { deleteSession(slotId: integer): Promise<boolean> {
return new Promise<boolean>(resolve => { return new Promise<boolean>(resolve => {
if (bypassLogin) { if (bypassLogin) {
localStorage.removeItem(`sessionData${this.scene.sessionSlotId ? this.scene.sessionSlotId : ''}`); localStorage.removeItem('sessionData');
return resolve(true); return resolve(true);
} }
@ -717,7 +741,6 @@ export class GameData {
Utils.apiFetch(`savedata/delete?datatype=${GameDataType.SESSION}&slot=${slotId}`, true).then(response => { Utils.apiFetch(`savedata/delete?datatype=${GameDataType.SESSION}&slot=${slotId}`, true).then(response => {
if (response.ok) { if (response.ok) {
loggedInUser.lastSessionSlot = -1; loggedInUser.lastSessionSlot = -1;
localStorage.removeItem(`sessionData${this.scene.sessionSlotId ? this.scene.sessionSlotId : ''}`);
resolve(true); resolve(true);
} }
return response.text(); return response.text();
@ -748,10 +771,8 @@ export class GameData {
return resolve([false, false]); return resolve([false, false]);
const sessionData = this.getSessionSaveData(scene); const sessionData = this.getSessionSaveData(scene);
Utils.apiPost(`savedata/clear?slot=${slotId}&trainerId=${this.trainerId}&secretId=${this.secretId}`, JSON.stringify(sessionData), undefined, true).then(response => { Utils.apiPost(`savedata/clear?slot=${slotId}&trainerId=${this.trainerId}&secretId=${this.secretId}`, JSON.stringify(sessionData), undefined, true).then(response => {
if (response.ok) { if (response.ok)
loggedInUser.lastSessionSlot = -1; loggedInUser.lastSessionSlot = -1;
localStorage.removeItem(`sessionData${this.scene.sessionSlotId ? this.scene.sessionSlotId : ''}`);
}
return response.json(); return response.json();
}).then(jsonResponse => { }).then(jsonResponse => {
if (!jsonResponse.error) if (!jsonResponse.error)
@ -804,12 +825,13 @@ export class GameData {
}) as SessionSaveData; }) as SessionSaveData;
} }
saveAll(scene: BattleScene, skipVerification: boolean = false, sync: boolean = false): Promise<boolean> { saveAll(scene: BattleScene, skipVerification?: boolean): Promise<boolean> {
return new Promise<boolean>(resolve => { return new Promise<boolean>(resolve => {
Utils.executeIf(!skipVerification, updateUserInfo).then(success => { Utils.executeIf(!skipVerification, updateUserInfo).then(success => {
if (success !== null && !success) if (success !== null && !success)
return resolve(false); return resolve(false);
this.scene.ui.savingIcon.show(); this.scene.ui.savingIcon.show();
const data = this.getSystemSaveData();
const sessionData = this.getSessionSaveData(scene); const sessionData = this.getSessionSaveData(scene);
const maxIntAttrValue = Math.pow(2, 31); const maxIntAttrValue = Math.pow(2, 31);
@ -821,7 +843,7 @@ export class GameData {
sessionSlotId: scene.sessionSlotId sessionSlotId: scene.sessionSlotId
}; };
if (!bypassLogin && sync) { if (!bypassLogin) {
Utils.apiPost('savedata/updateall', JSON.stringify(request, (k: any, v: any) => typeof v === 'bigint' ? v <= maxIntAttrValue ? Number(v) : v.toString() : v), undefined, true) Utils.apiPost('savedata/updateall', JSON.stringify(request, (k: any, v: any) => typeof v === 'bigint' ? v <= maxIntAttrValue ? Number(v) : v.toString() : v), undefined, true)
.then(response => response.text()) .then(response => response.text())
.then(error => { .then(error => {
@ -837,18 +859,14 @@ export class GameData {
console.error(error); console.error(error);
return resolve(false); return resolve(false);
} }
localStorage.removeItem('data');
localStorage.removeItem(`sessionData${scene.sessionSlotId ? scene.sessionSlotId : ''}`);
resolve(true); resolve(true);
}); });
} else { } else {
const encFunc = bypassLogin localStorage.setItem('data_bak', localStorage.getItem('data'));
? (data: string) => btoa(data)
: (data: string) => AES.encrypt(data, saveKey);
localStorage.setItem('data', encFunc(JSON.stringify(systemData, (k: any, v: any) => typeof v === 'bigint' ? v <= maxIntAttrValue ? Number(v) : v.toString() : v))); localStorage.setItem('data', btoa(JSON.stringify(systemData, (k: any, v: any) => typeof v === 'bigint' ? v <= maxIntAttrValue ? Number(v) : v.toString() : v)));
localStorage.setItem(`sessionData${scene.sessionSlotId ? scene.sessionSlotId : ''}`, encFunc(JSON.stringify(sessionData))); localStorage.setItem(`sessionData${scene.sessionSlotId ? scene.sessionSlotId : ''}`, btoa(JSON.stringify(sessionData)));
console.debug('Session data saved'); console.debug('Session data saved');
@ -892,12 +910,8 @@ export class GameData {
}); });
} else { } else {
const data = localStorage.getItem(dataKey); const data = localStorage.getItem(dataKey);
if (data) { if (data)
const decFunc = bypassLogin handleData(atob(data));
? (data: string) => atob(data)
: (data: string) => AES.decrypt(data, saveKey).toString(enc.Utf8);
handleData(decFunc(data));
}
resolve(!!data); resolve(!!data);
} }
}); });
@ -965,7 +979,7 @@ export class GameData {
return this.scene.ui.showText(`Your ${dataName} data could not be loaded. It may be corrupted.`, null, () => this.scene.ui.showText(null, 0), Utils.fixedInt(1500)); return this.scene.ui.showText(`Your ${dataName} data could not be loaded. It may be corrupted.`, null, () => this.scene.ui.showText(null, 0), Utils.fixedInt(1500));
this.scene.ui.showText(`Your ${dataName} data will be overridden and the page will reload. Proceed?`, null, () => { this.scene.ui.showText(`Your ${dataName} data will be overridden and the page will reload. Proceed?`, null, () => {
this.scene.ui.setOverlayMode(Mode.CONFIRM, () => { this.scene.ui.setOverlayMode(Mode.CONFIRM, () => {
if (!bypassLogin && dataType < GameDataType.SETTINGS && localStorage.getItem(dataKey)) { if (!bypassLogin && dataType < GameDataType.SETTINGS) {
updateUserInfo().then(success => { updateUserInfo().then(success => {
if (!success) if (!success)
return displayError(`Could not contact the server. Your ${dataName} data could not be imported.`); return displayError(`Could not contact the server. Your ${dataName} data could not be imported.`);
@ -976,15 +990,11 @@ export class GameData {
console.error(error); console.error(error);
return displayError(`An error occurred while updating ${dataName} data. Please contact the administrator.`); return displayError(`An error occurred while updating ${dataName} data. Please contact the administrator.`);
} }
localStorage.removeItem(dataKey);
window.location = window.location; window.location = window.location;
}); });
}); });
} else { } else {
const encFunc = bypassLogin || dataType === GameDataType.SETTINGS localStorage.setItem(dataKey, btoa(dataStr));
? (data: string) => btoa(data)
: (data: string) => AES.encrypt(data, saveKey);
localStorage.setItem(dataKey, encFunc(dataStr));
window.location = window.location; window.location = window.location;
} }
}, () => { }, () => {