Refactor SaveServer and the things that interact with it to be async

project/src/callbacks/GameCallbacks.ts

@@ -69,12 +69,12 @@ export class GameCallbacks implements OnLoad {
      * Save profiles on game close
      * @returns IGameLogoutResponseData
      */
-    public gameLogout(
+    public async gameLogout(
         url: string,
         info: IEmptyRequestData,
         sessionID: string,
-    ): IGetBodyResponseData<IGameLogoutResponseData> {
-        this.saveServer.save();
+    ): Promise<IGetBodyResponseData<IGameLogoutResponseData>> {
+        await this.saveServer.saveProfile(sessionID);
         return this.httpResponse.getBody({ status: "ok" });
     }
 

project/src/callbacks/LauncherCallbacks.ts

@@ -27,8 +27,8 @@ export class LauncherCallbacks {
         return !output ? "FAILED" : output;
     }
 
-    public register(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK" {
-        const output = this.launcherController.register(info);
+    public async register(url: string, info: IRegisterData, sessionID: string): Promise<"FAILED" | "OK"> {
+        const output = await this.launcherController.register(info);
         return !output ? "FAILED" : "OK";
     }
 
@@ -60,8 +60,8 @@ export class LauncherCallbacks {
         return this.httpResponse.noBody("pong!");
     }
 
-    public removeProfile(url: string, info: IRemoveProfileData, sessionID: string): string {
-        return this.httpResponse.noBody(this.saveServer.removeProfile(sessionID));
+    public async removeProfile(url: string, info: IRemoveProfileData, sessionID: string): Promise<string> {
+        return this.httpResponse.noBody(await this.saveServer.removeProfile(sessionID));
     }
 
     public getCompatibleTarkovVersion(): string {

project/src/callbacks/ProfileCallbacks.ts

@@ -33,13 +33,12 @@ export class ProfileCallbacks {
     /**
      * Handle client/game/profile/create
      */
-    public createProfile(
+    public async createProfile(
         url: string,
         info: IProfileCreateRequestData,
         sessionID: string,
-    ): IGetBodyResponseData<ICreateProfileResponse> {
-        const id = this.profileController.createProfile(info, sessionID);
-        return this.httpResponse.getBody({ uid: id });
+    ): Promise<IGetBodyResponseData<ICreateProfileResponse>> {
+        return this.httpResponse.getBody({ uid: await this.profileController.createProfile(info, sessionID) });
     }
 
     /**

project/src/callbacks/SaveCallbacks.ts

@@ -20,8 +20,8 @@ export class SaveCallbacks implements OnLoad, OnUpdate {
     }
 
     public async onLoad(): Promise<void> {
-        this.backupService.init();
-        this.saveServer.load();
+        await this.backupService.init();
+        await this.saveServer.load();
     }
 
     public getRoute(): string {
@@ -31,7 +31,7 @@ export class SaveCallbacks implements OnLoad, OnUpdate {
     public async onUpdate(secondsSinceLastRun: number): Promise<boolean> {
         // run every 15 seconds
         if (secondsSinceLastRun > this.coreConfig.profileSaveIntervalSeconds) {
-            this.saveServer.save();
+            await this.saveServer.save();
             return true;
         }
         return false;

project/src/controllers/LauncherController.ts

@@ -88,17 +88,17 @@ export class LauncherController {
         return "";
     }
 
-    public register(info: IRegisterData): string {
+    public async register(info: IRegisterData): Promise<string> {
         for (const sessionID in this.saveServer.getProfiles()) {
             if (info.username === this.saveServer.getProfile(sessionID).info.username) {
                 return "";
             }
         }
 
-        return this.createAccount(info);
+        return await this.createAccount(info);
     }
 
-    protected createAccount(info: IRegisterData): string {
+    protected async createAccount(info: IRegisterData): Promise<string> {
         const profileId = this.generateProfileId();
         const scavId = this.generateProfileId();
         const newProfileDetails: Info = {
@@ -112,8 +112,8 @@ export class LauncherController {
         };
         this.saveServer.createProfile(newProfileDetails);
 
-        this.saveServer.loadProfile(profileId);
-        this.saveServer.saveProfile(profileId);
+        await this.saveServer.loadProfile(profileId);
+        await this.saveServer.saveProfile(profileId);
 
         return profileId;
     }

project/src/controllers/ProfileController.ts

@@ -99,8 +99,8 @@ export class ProfileController {
      * @param sessionID Player id
      * @returns Profiles _id value
      */
-    public createProfile(info: IProfileCreateRequestData, sessionID: string): string {
-        return this.createProfileService.createProfile(sessionID, info);
+    public async createProfile(info: IProfileCreateRequestData, sessionID: string): Promise<string> {
+        return await this.createProfileService.createProfile(sessionID, info);
     }
 
     /**

project/src/di/Router.ts

@@ -75,7 +75,7 @@ export class ItemEventRouterDefinition extends Router {
 }
 
 export class SaveLoadRouter extends Router {
-    public handleLoad(profile: ISptProfile): ISptProfile {
+    public async handleLoad(profile: ISptProfile): Promise<ISptProfile> {
         throw new Error("This method needs to be overrode by the router classes");
     }
 }

project/src/routers/save_load/HealthSaveLoadRouter.ts

@@ -8,7 +8,7 @@ export class HealthSaveLoadRouter extends SaveLoadRouter {
         return [new HandledRoute("spt-health", false)];
     }
 
-    public override handleLoad(profile: ISptProfile): ISptProfile {
+    public override async handleLoad(profile: ISptProfile): Promise<ISptProfile> {
         if (!profile.vitality) {
             // Occurs on newly created profiles
             profile.vitality = { health: undefined, effects: undefined };

project/src/routers/save_load/InraidSaveLoadRouter.ts

@@ -8,7 +8,7 @@ export class InraidSaveLoadRouter extends SaveLoadRouter {
         return [new HandledRoute("spt-inraid", false)];
     }
 
-    public override handleLoad(profile: ISptProfile): ISptProfile {
+    public override async handleLoad(profile: ISptProfile): Promise<ISptProfile> {
         if (profile.inraid === undefined) {
             profile.inraid = { location: "none", character: "none" };
         }

project/src/routers/save_load/InsuranceSaveLoadRouter.ts

@@ -8,7 +8,7 @@ export class InsuranceSaveLoadRouter extends SaveLoadRouter {
         return [new HandledRoute("spt-insurance", false)];
     }
 
-    public override handleLoad(profile: ISptProfile): ISptProfile {
+    public override async handleLoad(profile: ISptProfile): Promise<ISptProfile> {
         if (profile.insurance === undefined) {
             profile.insurance = [];
         }

project/src/routers/save_load/ProfileSaveLoadRouter.ts

@@ -9,7 +9,7 @@ export class ProfileSaveLoadRouter extends SaveLoadRouter {
         return [new HandledRoute("spt-profile", false)];
     }
 
-    public override handleLoad(profile: ISptProfile): ISptProfile {
+    public override async handleLoad(profile: ISptProfile): Promise<ISptProfile> {
         if (!profile.characters) {
             profile.characters = { pmc: {} as IPmcData, scav: {} as IPmcData };
         }

project/src/routers/static/GameStaticRouter.ts

@@ -92,7 +92,7 @@ export class GameStaticRouter extends StaticRouter {
                     sessionID: string,
                     output: string,
                 ): Promise<IGetBodyResponseData<IGameLogoutResponseData>> => {
-                    return this.gameCallbacks.gameLogout(url, info, sessionID);
+                    return await this.gameCallbacks.gameLogout(url, info, sessionID);
                 },
             ),
             new RouteAction(

project/src/routers/static/LauncherStaticRouter.ts

@@ -27,7 +27,7 @@ export class LauncherStaticRouter extends StaticRouter {
             new RouteAction(
                 "/launcher/profile/register",
                 async (url: string, info: any, sessionID: string, output: string): Promise<string> => {
-                    return this.launcherCallbacks.register(url, info, sessionID);
+                    return await this.launcherCallbacks.register(url, info, sessionID);
                 },
             ),
             new RouteAction(
@@ -57,7 +57,7 @@ export class LauncherStaticRouter extends StaticRouter {
             new RouteAction(
                 "/launcher/profile/remove",
                 async (url: string, info: any, sessionID: string, output: string): Promise<string> => {
-                    return this.launcherCallbacks.removeProfile(url, info, sessionID);
+                    return await this.launcherCallbacks.removeProfile(url, info, sessionID);
                 },
             ),
             new RouteAction(