Link save data to account

src/account.ts

@@ -1,12 +1,17 @@
 import { bypassLogin } from "./battle-scene";
 import * as Utils from "./utils";
 
-export let loggedInUser = null;
+export interface UserInfo {
+  username: string;
+  hasGameSession: boolean;
+}
+
+export let loggedInUser: UserInfo = null;
 
 export function updateUserInfo(): Promise<boolean> {
   return new Promise<boolean>(resolve => {
     if (bypassLogin) {
-      loggedInUser = { username: 'Guest' };
+      loggedInUser = { username: 'Guest', hasGameSession: !!localStorage.getItem('sessionData') };
       return resolve(true);
     }
     Utils.apiFetch('account/info').then(response => {

src/battle-phases.ts

@@ -36,7 +36,8 @@ import { TrainerType, trainerConfigs } from "./data/trainer-type";
 import { EggHatchPhase } from "./egg-hatch-phase";
 import { Egg } from "./data/egg";
 import { vouchers } from "./system/voucher";
-import { updateUserInfo } from "./account";
+import { loggedInUser, updateUserInfo } from "./account";
+import { GameDataType } from "./system/game-data";
 
 export class LoginPhase extends BattlePhase {
   private showText: boolean;
@@ -71,7 +72,7 @@ export class LoginPhase extends BattlePhase {
                     this.scene.ui.playSelect();
                     this.end();
                   }, () => {
-                    this.scene.unshiftPhase(new LoginPhase(this.scene, false))
+                    this.scene.unshiftPhase(new LoginPhase(this.scene, false));
                     this.end();
                   }
                 ]
@@ -86,6 +87,53 @@ export class LoginPhase extends BattlePhase {
   }
 }
 
+// TODO: Remove
+export class ConsolidateDataPhase extends BattlePhase {
+  start(): void {
+    super.start();
+    
+    Utils.apiFetch(`savedata/get?datatype=${GameDataType.SYSTEM}`)
+      .then(response => response.text())
+      .then(response => {
+        if (!response.length || response[0] !== '{') {
+          console.log('System data not found: Loading legacy local system data');
+
+          const systemDataStr = atob(localStorage.getItem('data'));
+
+          Utils.apiPost(`savedata/update?datatype=${GameDataType.SYSTEM}`, systemDataStr)
+            .then(response => response.text())
+            .then(error => {
+              if (error) {
+                console.error(error);
+                return this.end();
+              }
+
+              Utils.apiFetch(`savedata/get?datatype=${GameDataType.SESSION}`)
+                .then(response => response.text())
+                .then(response => {
+                  if (!response.length || response[0] !== '{') {
+                    console.log('System data not found: Loading legacy local session data');
+
+                    const sessionDataStr = atob(localStorage.getItem('sessionData'));
+
+                    Utils.apiPost(`savedata/update?datatype=${GameDataType.SESSION}`, sessionDataStr)
+                      .then(response => response.text())
+                      .then(error => {
+                        if (error)
+                          console.error(error);
+
+                        this.end();
+                      });
+                  } else
+                    this.end();
+                });
+            });
+          } else
+            this.end();
+      });
+  }
+}
+
 export class CheckLoadPhase extends BattlePhase {
   private loaded: boolean;
 
@@ -98,7 +146,7 @@ export class CheckLoadPhase extends BattlePhase {
   start(): void {
     super.start();
     
-    if (!this.scene.gameData.hasSession())
+    if (!loggedInUser?.hasGameSession)
       return this.end();
     
     this.scene.ui.setMode(Mode.MESSAGE);

src/battle-scene.ts

@@ -1,7 +1,7 @@
 import Phaser from 'phaser';
 import { Biome } from './data/biome';
 import UI, { Mode } from './ui/ui';
-import { EncounterPhase, SummonPhase, NextEncounterPhase, NewBiomeEncounterPhase, SelectBiomePhase, MessagePhase, CheckLoadPhase, TurnInitPhase, ReturnPhase, LevelCapPhase, TestMessagePhase, ShowTrainerPhase, TrainerMessageTestPhase, LoginPhase } from './battle-phases';
+import { EncounterPhase, SummonPhase, NextEncounterPhase, NewBiomeEncounterPhase, SelectBiomePhase, MessagePhase, CheckLoadPhase, TurnInitPhase, ReturnPhase, LevelCapPhase, TestMessagePhase, ShowTrainerPhase, TrainerMessageTestPhase, LoginPhase, ConsolidateDataPhase } from './battle-phases';
 import Pokemon, { PlayerPokemon, EnemyPokemon } from './pokemon';
 import PokemonSpecies, { PokemonSpeciesFilter, allSpecies, getPokemonSpecies, initSpecies } from './data/pokemon-species';
 import * as Utils from './utils';
@@ -549,6 +549,8 @@ export default class BattleScene extends Phaser.Scene {
 
 			if (!this.quickStart) {
 				this.pushPhase(new LoginPhase(this));
+				if (!bypassLogin)
+					this.pushPhase(new ConsolidateDataPhase(this)); // TODO: Remove
 				this.pushPhase(new CheckLoadPhase(this));
 			} else
 				this.pushPhase(new EncounterPhase(this));

src/system/game-data.ts

@@ -1,4 +1,4 @@
-import BattleScene, { PokeballCounts } from "../battle-scene";
+import BattleScene, { PokeballCounts, bypassLogin } from "../battle-scene";
 import Pokemon, { EnemyPokemon, PlayerPokemon } from "../pokemon";
 import { pokemonPrevolutions } from "../data/pokemon-evolutions";
 import PokemonSpecies, { allSpecies, getPokemonSpecies, speciesStarters } from "../data/pokemon-species";
@@ -186,23 +186,37 @@ export class GameData {
           timestamp: new Date().getTime()
         };
 
+        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);
+
+        if (!bypassLogin) {
+          Utils.apiPost(`savedata/update?datatype=${GameDataType.SYSTEM}`, systemData)
+            .then(response => response.text())
+            .then(error => {
+              if (error) {
+                console.error(error);
+                return resolve(false);
+              }
+              resolve(true);
+            });
+        } else {
           localStorage.setItem('data_bak', localStorage.getItem('data'));
 
-        const maxIntAttrValue = Math.pow(2, 31);
+          localStorage.setItem('data', btoa(systemData));
-        localStorage.setItem('data', btoa(JSON.stringify(data, (k: any, v: any) => typeof v === 'bigint' ? v <= maxIntAttrValue ? Number(v) : v.toString() : v)));
+        }
-  
-        resolve(true);
       });
     });
   }
 
-  private loadSystem(): boolean {
+  private loadSystem(): Promise<boolean> {
-    if (!localStorage.hasOwnProperty('data'))
+    return new Promise<boolean>(resolve => {
+      if (bypassLogin && !localStorage.hasOwnProperty('data'))
         return false;
 
-    const data = this.parseSystemData(atob(localStorage.getItem('data')));
+      const handleSystemData = (systemDataStr: string) => {
+        const systemData = this.parseSystemData(systemDataStr);
 
-    console.debug(data);
+        console.debug(systemData);
 
         /*const versions = [ this.scene.game.config.gameVersion, data.gameVersion || '0.0.0' ];
         
@@ -210,45 +224,61 @@ export class GameData {
           const [ versionNumbers, oldVersionNumbers ] = versions.map(ver => ver.split('.').map(v => parseInt(v)));
         }*/
 
-    this.trainerId = data.trainerId;
+        this.trainerId = systemData.trainerId;
-    this.secretId = data.secretId;
+        this.secretId = systemData.secretId;
 
-    if (data.unlocks) {
+        if (systemData.unlocks) {
-      for (let key of Object.keys(data.unlocks)) {
+          for (let key of Object.keys(systemData.unlocks)) {
             if (this.unlocks.hasOwnProperty(key))
-          this.unlocks[key] = data.unlocks[key];
+              this.unlocks[key] = systemData.unlocks[key];
           }
         }
 
-    if (data.achvUnlocks) {
+        if (systemData.achvUnlocks) {
-      for (let a of Object.keys(data.achvUnlocks)) {
+          for (let a of Object.keys(systemData.achvUnlocks)) {
             if (achvs.hasOwnProperty(a))
-          this.achvUnlocks[a] = data.achvUnlocks[a];
+              this.achvUnlocks[a] = systemData.achvUnlocks[a];
           } 
         }
 
-    if (data.voucherUnlocks) {
+        if (systemData.voucherUnlocks) {
-      for (let v of Object.keys(data.voucherUnlocks)) {
+          for (let v of Object.keys(systemData.voucherUnlocks)) {
             if (vouchers.hasOwnProperty(v))
-          this.voucherUnlocks[v] = data.voucherUnlocks[v];
+              this.voucherUnlocks[v] = systemData.voucherUnlocks[v];
           }
         }
 
-    if (data.voucherCounts) {
+        if (systemData.voucherCounts) {
           Utils.getEnumKeys(VoucherType).forEach(key => {
             const index = VoucherType[key];
-        this.voucherCounts[index] = data.voucherCounts[index] || 0;
+            this.voucherCounts[index] = systemData.voucherCounts[index] || 0;
           });
         }
 
-    this.eggs = data.eggs
+        this.eggs = systemData.eggs
-      ? data.eggs.map(e => e.toEgg())
+          ? systemData.eggs.map(e => e.toEgg())
           : [];
 
-    this.dexData = Object.assign(this.dexData, data.dexData);
+        this.dexData = Object.assign(this.dexData, systemData.dexData);
         this.consolidateDexData(this.dexData);
 
-    return true;
+        resolve(true);
+      }
+
+      if (!bypassLogin) {
+        Utils.apiFetch(`savedata/get?datatype=${GameDataType.SYSTEM}`)
+          .then(response => response.text())
+          .then(response => {
+            if (!response.length || response[0] !== '{') {
+              console.error(response);
+              return resolve(false);
+            }
+
+            handleSystemData(response);
+          });
+      } else
+        handleSystemData(atob(localStorage.getItem('data')));
+    });
   }
 
   private parseSystemData(dataStr: string): SystemSaveData {
@@ -325,26 +355,34 @@ export class GameData {
           timestamp: new Date().getTime()
         } as SessionSaveData;
 
+        console.log(JSON.stringify(sessionData));
+
+        if (!bypassLogin) {
+          Utils.apiPost(`savedata/update?datatype=${GameDataType.SESSION}`, JSON.stringify(sessionData))
+            .then(response => response.text())
+            .then(error => {
+              if (error) {
+                console.error(error);
+                return resolve(false);
+              }
+              console.debug('Session data saved');
+              resolve(true);
+            });
+        } else {
           localStorage.setItem('sessionData', btoa(JSON.stringify(sessionData)));
 
           console.debug('Session data saved');
 
           resolve(true);
-      });
-    });
         }
-
+      });
-  hasSession() {
+    });
-    return !!localStorage.getItem('sessionData');
   }
 
   loadSession(scene: BattleScene): Promise<boolean> {
     return new Promise(async (resolve, reject) => {
-      if (!this.hasSession())
+      const handleSessionData = async (sessionDataStr: string) => {
-        return resolve(false);
-
         try {
-        const sessionDataStr = atob(localStorage.getItem('sessionData'));
           const sessionData = this.parseSessionData(sessionDataStr);
 
           console.debug(sessionData);
@@ -414,6 +452,23 @@ export class GameData {
           reject(err);
           return;
         }
+      };
+
+      if (!bypassLogin) {
+        Utils.apiFetch(`savedata/get?datatype=${GameDataType.SESSION}`)
+          .then(response => response.text())
+          .then(async response => {
+            if (!response.length || response[0] !== '{') {
+              console.error(response);
+              return resolve(false);
+            }
+
+            console.log(JSON.parse(response));
+
+            await handleSessionData(response);
+          });
+      } else
+        await handleSessionData(atob(localStorage.getItem('sessionData')));
     });
   }
 
@@ -431,6 +486,8 @@ export class GameData {
 
       if (k === 'party' || k === 'enemyParty' || k === 'enemyField') {
         const ret: PokemonData[] = [];
+        if (v === null)
+          v = [];
         for (let pd of v)
           ret.push(new PokemonData(pd));
         return ret;
@@ -442,6 +499,8 @@ export class GameData {
       if (k === 'modifiers' || k === 'enemyModifiers') {
         const player = k === 'modifiers';
         const ret: PersistentModifierData[] = [];
+        if (v === null)
+          v = [];
         for (let md of v)
           ret.push(new PersistentModifierData(md, player));
         return ret;
@@ -456,7 +515,7 @@ export class GameData {
 
   public exportData(dataType: GameDataType): void {
     const dataKey: string = getDataTypeKey(dataType);
-    let dataStr = atob(localStorage.getItem(dataKey));
+    const handleData = (dataStr: string) => {
       switch (dataType) {
         case GameDataType.SYSTEM:
           dataStr = this.convertSystemDataStr(dataStr, true);
@@ -469,6 +528,20 @@ export class GameData {
       link.download = `${dataKey}.prsv`;
       link.click();
       link.remove();
+    };
+    if (!bypassLogin && dataType !== GameDataType.SETTINGS) {
+      Utils.apiFetch(`savedata/get?datatype=${dataType}`)
+        .then(response => response.text())
+        .then(response => {
+          if (!response.length || response[0] !== '{') {
+            console.error(response);
+            return;
+          }
+
+          handleData(response);
+        });
+    } else
+      handleData(atob(localStorage.getItem(dataKey)));
   }
 
   public importData(dataType: GameDataType): void {
@@ -523,12 +596,30 @@ export class GameData {
                   break;
               }
 
+              const displayError = (error: string) => this.scene.ui.showText(error, null, () => this.scene.ui.showText(null, 0), Utils.fixedInt(1500));
+
               if (!valid)
                 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.setOverlayMode(Mode.CONFIRM, () => {
+                  if (!bypassLogin && dataType !== GameDataType.SETTINGS) {
+                    updateUserInfo().then(success => {
+                      if (!success)
+                        return displayError(`Could not contact the server. Your ${dataName} data could not be imported.`);
+                      Utils.apiPost(`savedata/update?datatype=${dataType}`, dataStr)
+                        .then(response => response.text())
+                        .then(error => {
+                          if (error) {
+                            console.error(error);
+                            return displayError(`An error occurred while updating ${dataName} data. Please contact the administrator.`);
+                          }
+                          window.location = window.location;
+                        });
+                    });
+                  } else {
                     localStorage.setItem(dataKey, btoa(dataStr));
                     window.location = window.location;
+                  }
                 }, () => {
                   this.scene.ui.revertMode();
                   this.scene.ui.showText(null, 0);

src/ui/menu-ui-handler.ts

@@ -1,11 +1,10 @@
-import BattleScene, { Button } from "../battle-scene";
+import BattleScene, { Button, bypassLogin } from "../battle-scene";
 import { TextStyle, addTextObject } from "./text";
 import { Mode } from "./ui";
 import * as Utils from "../utils";
 import { addWindow } from "./window";
 import MessageUiHandler from "./message-ui-handler";
 import { GameDataType } from "../system/game-data";
-import { CheckLoadPhase, LoginPhase } from "../battle-phases";
 
 export enum MenuOptions {
   GAME_SETTINGS,
@@ -29,8 +28,16 @@ export default class MenuUiHandler extends MessageUiHandler {
 
   private cursorObj: Phaser.GameObjects.Image;
 
+  protected ignoredMenuOptions: MenuOptions[];
+  protected menuOptions: MenuOptions[];
+
   constructor(scene: BattleScene, mode?: Mode) {
     super(scene, mode);
+
+    this.ignoredMenuOptions = /*!bypassLogin */ false
+      ? [ MenuOptions.IMPORT_SESSION, MenuOptions.IMPORT_DATA ]
+      : [];
+    this.menuOptions = Utils.getEnumKeys(MenuOptions).map(m => parseInt(MenuOptions[m]) as MenuOptions).filter(m => this.ignoredMenuOptions.indexOf(m) === -1);
   }
 
   setup() {
@@ -45,7 +52,7 @@ export default class MenuUiHandler extends MessageUiHandler {
 
     this.menuContainer.add(this.menuBg);
 
-    this.optionSelectText = addTextObject(this.scene, 0, 0, Utils.getEnumKeys(MenuOptions).map(o => Utils.toReadableString(o)).join('\n'), TextStyle.WINDOW, { maxLines: Utils.getEnumKeys(MenuOptions).length });
+    this.optionSelectText = addTextObject(this.scene, 0, 0, this.menuOptions.map(o => Utils.toReadableString(MenuOptions[o])).join('\n'), TextStyle.WINDOW, { maxLines: this.menuOptions.length });
     this.optionSelectText.setPositionRelative(this.menuBg, 14, 6);
     this.optionSelectText.setLineSpacing(12);
     this.menuContainer.add(this.optionSelectText);
@@ -96,7 +103,14 @@ export default class MenuUiHandler extends MessageUiHandler {
     let error = false;
 
     if (button === Button.ACTION) {
-      switch (this.cursor as MenuOptions) {
+      let adjustedCursor = this.cursor;
+      for (let imo of this.ignoredMenuOptions) {
+        if (adjustedCursor >= imo)
+          adjustedCursor++;
+        else
+          break;
+      }
+      switch (adjustedCursor) {
         case MenuOptions.GAME_SETTINGS:
           this.scene.ui.setOverlayMode(Mode.SETTINGS);
           success = true;
@@ -164,7 +178,7 @@ export default class MenuUiHandler extends MessageUiHandler {
             success = this.setCursor(this.cursor - 1);
           break;
         case Button.DOWN:
-          if (this.cursor + 1 < Utils.getEnumKeys(MenuOptions).length)
+          if (this.cursor + 1 < this.menuOptions.length)
             success = this.setCursor(this.cursor + 1);
           break;
       }