mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-06 08:22:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Loading data now checks statusCode not error string

Browse Source
This commit is contained in:
Sirz Benjie 2025-04-26 16:15:14 -05:00 committed by NightKev
parent ab7d010a17
commit 611b5ca16a
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,14 +15,17 @@ export class PokerogueSystemSavedataApi extends ApiBase {
/** /**
* Get a system savedata. * Get a system savedata.
* @param params The {@linkcode GetSystemSavedataRequest} to send * @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 { try {
const urlSearchParams = this.toUrlSearchParams(params); const urlSearchParams = this.toUrlSearchParams(params);
const response = await this.doGet(`/savedata/system/get?${urlSearchParams}`); const response = await this.doGet(`/savedata/system/get?${urlSearchParams}`);
const rawSavedata = await response.text(); const rawSavedata = await response.text();
if (!response.ok) {
console.warn("Could not get system savedata!", response.status, rawSavedata);
return response.status;
}
return rawSavedata; return rawSavedata;
} catch (err) { } catch (err) {
console.warn("Could not get system savedata!", 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) { if (!bypassLogin) {
pokerogueApi.savedata.system.get({ clientSessionId }).then(saveDataOrErr => { pokerogueApi.savedata.system.get({ clientSessionId }).then(saveDataOrErr => {
if (!saveDataOrErr || saveDataOrErr.length === 0 || saveDataOrErr[0] !== "{") { if (
if (saveDataOrErr?.startsWith("sql: no rows in result set")) { typeof saveDataOrErr === "number" ||
!saveDataOrErr ||
saveDataOrErr.length === 0 ||
saveDataOrErr[0] !== "{"
) {
if (saveDataOrErr === 404) {
globalScene.queueMessage( globalScene.queueMessage(
"Save data could not be found. If this is a new account, you can safely ignore this message.", "Save data could not be found. If this is a new account, you can safely ignore this message.",
null, null,
@ -471,7 +476,7 @@ export class GameData {
); );
return resolve(true); return resolve(true);
} }
if (saveDataOrErr?.includes("Too many connections")) { if (typeof saveDataOrErr === "string" && saveDataOrErr?.includes("Too many connections")) {
globalScene.queueMessage( globalScene.queueMessage(
"Too many people are trying to connect and the server is overloaded. Please try again later.", "Too many people are trying to connect and the server is overloaded. Please try again later.",
null, null,
@ -479,7 +484,6 @@ export class GameData {
); );
return resolve(false); return resolve(false);
} }
console.error(saveDataOrErr);
return resolve(false); return resolve(false);
} }
@ -1500,7 +1504,7 @@ export class GameData {
link.remove(); link.remove();
}; };
if (!bypassLogin && dataType < GameDataType.SETTINGS) { 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) { if (dataType === GameDataType.SYSTEM) {
promise = pokerogueApi.savedata.system.get({ clientSessionId }); promise = pokerogueApi.savedata.system.get({ clientSessionId });
@ -1512,7 +1516,7 @@ export class GameData {
} }
promise.then(response => { promise.then(response => {
if (!response?.length || response[0] !== "{") { if (typeof response === "number" || !response?.length || response[0] !== "{") {
console.error(response); console.error(response);
resolve(false); resolve(false);
return; return;