random-mirrors/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-05-04 07:23:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Bug] API / Save data hotfix (#5716)

Browse Source 
* Loading data now checks statusCode not error string

* Bump version to 1.8.5

---------

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
This commit is contained in:
NightKev 2025-04-26 15:01:46 -07:00 committed by GitHub
parent ab7d010a17
commit 6460d46a5d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "pokemon-rogue-battle",
"private": true,
"version": "1.8.4",
"version": "1.8.5",
"type": "module",
"scripts": {
"start": "vite",

9
src/plugins/api/pokerogue-system-savedata-api.ts
View File

@ -15,14 +15,17 @@ export class PokerogueSystemSavedataApi extends ApiBase {
/**
* Get a system savedata.
* @param params The {@linkcode GetSystemSavedataRequest} to send
* @returns The system savedata as `string` or `null` on error
* @returns The system savedata as `string` or either the status code or `null` on error
*/
public async get(params: GetSystemSavedataRequest) {
public async get(params: GetSystemSavedataRequest): Promise<string | number | null> {
try {
const urlSearchParams = this.toUrlSearchParams(params);
const response = await this.doGet(`/savedata/system/get?${urlSearchParams}`);
const rawSavedata = await response.text();
if (!response.ok) {
console.warn("Could not get system savedata!", response.status, rawSavedata);
return response.status;
}
return rawSavedata;
} catch (err) {
console.warn("Could not get system savedata!", err);

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

@ -462,8 +462,13 @@ export class GameData {
if (!bypassLogin) {
pokerogueApi.savedata.system.get({ clientSessionId }).then(saveDataOrErr => {
if (!saveDataOrErr || saveDataOrErr.length === 0 || saveDataOrErr[0] !== "{") {
if (saveDataOrErr?.startsWith("sql: no rows in result set")) {
if (
typeof saveDataOrErr === "number" ||
!saveDataOrErr ||
saveDataOrErr.length === 0 ||
saveDataOrErr[0] !== "{"
) {
if (saveDataOrErr === 404) {
globalScene.queueMessage(
"Save data could not be found. If this is a new account, you can safely ignore this message.",
null,
@ -471,7 +476,7 @@ export class GameData {
);
return resolve(true);
}
if (saveDataOrErr?.includes("Too many connections")) {
if (typeof saveDataOrErr === "string" && saveDataOrErr?.includes("Too many connections")) {
globalScene.queueMessage(
"Too many people are trying to connect and the server is overloaded. Please try again later.",
null,
@ -479,7 +484,6 @@ export class GameData {
);
return resolve(false);
}
console.error(saveDataOrErr);
return resolve(false);
}
@ -1500,7 +1504,7 @@ export class GameData {
link.remove();
};
if (!bypassLogin && dataType < GameDataType.SETTINGS) {
let promise: Promise<string | null> = Promise.resolve(null);
let promise: Promise<string | null | number> = Promise.resolve(null);
if (dataType === GameDataType.SYSTEM) {
promise = pokerogueApi.savedata.system.get({ clientSessionId });
@ -1512,7 +1516,7 @@ export class GameData {
}
promise.then(response => {
if (!response?.length || response[0] !== "{") {
if (typeof response === "number" || !response?.length || response[0] !== "{") {
console.error(response);
resolve(false);
return;