From 4d167568fb98a14658512be63520170801e408ed Mon Sep 17 00:00:00 2001
From: Dev <dev@dev.sp-tarkov.com>
Date: Sat, 6 Jul 2024 16:42:47 +0100
Subject: [PATCH] Added bot cache count when generating. Will only add more
 bots to cache when below desired amount

---
 project/src/controllers/BotController.ts      | 46 +++++++++++--------
 .../src/services/BotGenerationCacheService.ts | 10 ++++
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/project/src/controllers/BotController.ts b/project/src/controllers/BotController.ts
index 6dcf84be..73d4e61d 100644
--- a/project/src/controllers/BotController.ts
+++ b/project/src/controllers/BotController.ts
@@ -185,13 +185,12 @@ export class BotController
     {
         const pmcProfile = this.profileHelper.getPmcProfile(sessionId);
 
-        // If there's more than 1 condition, this is the first time client has requested bots
-        // Client sends every bot type it will need in raid
         // Use this opportunity to create and cache bots for later retreval
-        const isFirstGen = info.conditions.length > 1;
-        if (isFirstGen)
+        const multipleBotTypesRequested = info.conditions.length > 1;
+        if (multipleBotTypesRequested)
         {
-            return this.generateBotsFirstTime(info, pmcProfile, sessionId);
+            this.logger.warning(`${JSON.stringify(info)}`);
+            return this.generateMultipleBotsAndCache(info, pmcProfile, sessionId);
         }
 
         return this.returnSingleBotFromCache(sessionId, info);
@@ -204,7 +203,7 @@ export class BotController
      * @param sessionId Session id
      * @returns
      */
-    protected async generateBotsFirstTime(
+    protected async generateMultipleBotsAndCache(
         request: IGenerateBotsRequestData,
         pmcProfile: IPmcData,
         sessionId: string,
@@ -216,10 +215,10 @@ export class BotController
 
         if (raidSettings === undefined)
         {
-            throw new Error(this.localisationService.getText("bot-unable_to_load_raid_settings_from_appcontext"));
+            //   throw new Error(this.localisationService.getText("bot-unable_to_load_raid_settings_from_appcontext"));
         }
         const pmcLevelRangeForMap
-            = this.pmcConfig.locationSpecificPmcLevelOverride[raidSettings.location.toLowerCase()];
+            = this.pmcConfig.locationSpecificPmcLevelOverride[raidSettings?.location.toLowerCase()];
 
         const allPmcsHaveSameNameAsPlayer = this.randomUtil.getChance100(
             this.pmcConfig.allPMCsHavePlayerNameWithRandomPrefixChance,
@@ -321,16 +320,25 @@ export class BotController
             botGenerationDetails.side = this.botHelper.getPmcSideByRole(condition.Role);
         }
 
-        // Loop over and make x bots for this bot wave
-        const cacheKey = `${
-            botGenerationDetails.eventRole ?? botGenerationDetails.role
-        }${botGenerationDetails.botDifficulty}`;
+        // Create a compound key to store bots in cache against
+        const cacheKey = this.botGenerationCacheService.createCacheKey(
+            botGenerationDetails.eventRole ?? botGenerationDetails.role,
+            botGenerationDetails.botDifficulty,
+        );
+
+        // Get number of bots we have in cache
+        const botCacheCount = this.botGenerationCacheService.getCachedBotCount(cacheKey);
         const botPromises: Promise<void>[] = [];
-        for (let i = 0; i < botGenerationDetails.botCountToGenerate; i++)
+        if (botCacheCount < botGenerationDetails.botCountToGenerate)
         {
-            const detailsClone = this.cloner.clone(botGenerationDetails);
-            botPromises.push(this.generateSingleBotAndStoreInCache(detailsClone, sessionId, cacheKey));
+            // We're below desired count, add bots to cache
+            for (let i = 0; i < botGenerationDetails.botCountToGenerate; i++)
+            {
+                const detailsClone = this.cloner.clone(botGenerationDetails);
+                botPromises.push(this.generateSingleBotAndStoreInCache(detailsClone, sessionId, cacheKey));
+            }
         }
+
         return Promise.all(botPromises).then(() =>
         {
             this.logger.debug(
@@ -454,10 +462,10 @@ export class BotController
             }
         }
 
-        // Construct cache key
-        const cacheKey = `${
-            botGenerationDetails.eventRole ?? botGenerationDetails.role
-        }${botGenerationDetails.botDifficulty}`;
+        // Create a compound key to store bots in cache against
+        const cacheKey = this.botGenerationCacheService.createCacheKey(
+            botGenerationDetails.eventRole ?? botGenerationDetails.role,
+            botGenerationDetails.botDifficulty);
 
         // Check cache for bot using above key
         if (!this.botGenerationCacheService.cacheHasBotOfRole(cacheKey))
diff --git a/project/src/services/BotGenerationCacheService.ts b/project/src/services/BotGenerationCacheService.ts
index d38fb877..cb277cf0 100644
--- a/project/src/services/BotGenerationCacheService.ts
+++ b/project/src/services/BotGenerationCacheService.ts
@@ -99,4 +99,14 @@ export class BotGenerationCacheService
     {
         return this.storedBots.has(key) && this.storedBots.get(key).length > 0;
     }
+
+    public getCachedBotCount(key: string): number
+    {
+        return this.storedBots.get(key)?.length ?? 0;
+    }
+
+    public createCacheKey(role: string, difficulty: string): string
+    {
+        return `${role.toLowerCase()}${difficulty.toLowerCase()}`;
+    }
 }