Merge branch '4.0.0-DEV' into build-spawn

.github/workflows/run-types.yaml

@@ -38,5 +38,5 @@ jobs:
         working-directory: ./project
 
       - name: Run Type Check
-        run: npm run lint:types
+        run: npm run type-check
         working-directory: ./project

project/assets/database/locales/server/cs.json

@@ -591,7 +591,7 @@
     "watermark-discord_url": "https://discord.sp-tarkov.com",
     "watermark-do_not_report": "NENAHLAŠUJ TO",
     "watermark-free_of_charge": "Tento produkt je zdarma",
-    "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues",
+    "watermark-issue_tracker_url": "https://github.com/sp-tarkov/server/",
     "watermark-modding_disabled": "TATO VERZE MÁ ZÁKÁZÁNO MÓDOVÁNÍ SERVERU",
     "watermark-no_support": "ŽÁDNÁ PODPORA NEBUDE POSKYTNUTA",
     "watermark-not_an_issue": "TOTO NENÍ CHYBA",

project/assets/database/locales/server/de.json

@@ -708,7 +708,7 @@
     "watermark-discord_url": "https://discord.sp-tarkov.com",
     "watermark-do_not_report": "MELDEN UNTERSAGT",
     "watermark-free_of_charge": "Diese Arbeit ist kostenfrei",
-    "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues",
+    "watermark-issue_tracker_url": "https://github.com/sp-tarkov/server/",
     "watermark-modding_disabled": "BEI DIESEM BUILD IST DAS SERVER-MODDING DEAKTIVIERT",
     "watermark-no_support": "ES WIRD KEIN SUPPORT GEWÄHRT",
     "watermark-not_an_issue": "DAS IST KEIN PROBLEM",

project/assets/database/locales/server/el.json

@@ -708,7 +708,7 @@
     "watermark-discord_url": "https://discord.sp-tarkov.com",
     "watermark-do_not_report": "ΜΗΝ ΤΟ ΑΝΑΦΕΡΕΤΕ",
     "watermark-free_of_charge": "Αυτή η εργασία είναι χωρίς χρέωση",
-    "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues",
+    "watermark-issue_tracker_url": "https://github.com/sp-tarkov/server/",
     "watermark-modding_disabled": "ΑΥΤΗ Η ΕΚΔΟΣΗ ΕΧΕΙ ΑΠΕΝΕΡΓΟΠΟΙΗΜΈΝΕΣ ΤΙΣ ΤΡΟΠΟΠΟΙΗΣΕΙΣ ΑΠΟ ΤΟΝ ΔΙΑΚΟΜΙΣΤΗ",
     "watermark-no_support": "ΔΕΝ ΘΑ ΔΩΘΕΙ ΥΠΟΣΤΗΡΙΞΗ",
     "watermark-not_an_issue": "ΑΥΤΟ ΔΕΝ ΕΙΝΑΙ ΠΡΟΒΛΗΜΑ",

project/assets/database/locales/server/en.json

@@ -628,7 +628,7 @@
     "ragfair-unable_to_remove_offer_doesnt_exist": "Unable to remove offer with id: %s as it cannot be found in flea market",
     "ragfair-unable_to_remove_offer_not_found_in_profile": "Unable to find offer: {{offerId}} in profile: {{profileId}} as offer is undefined, creating",
     "ragfair-generating_offers": "Generating flea offers...",
-	"release-beta-disclaimer": "By pressing OK you agree that no support is offered and that this is for bug testing only. NOT actual gameplay. Mods are disabled. New profiles may be required frequently. Report all bugs in the reports channel in discord, or on the issues page on the website. If you don't press OK by the time specified, the game will close.",
+    "release-beta-disclaimer": "By pressing OK you agree that no support is offered and that this is for bug testing only. NOT actual gameplay. Mods are disabled. New profiles may be required frequently. Report all bugs in the reports channel in discord, or on the issues page on the website. If you don't press OK by the time specified, the game will close.",
     "release-beta-disclaimer-accept": "User accepted the beta disclaimer",
     "release-beta-disclaimer-mods-enabled": "By pressing OK you agree that no support is offered and that this is for bug testing only. NOT actual gameplay. Mods are enabled, do NOT report issues with mods. Do NOT ask mod authors for updated mods. Report all bugs in the reports channel in discord, or on the issues page on the website. If you dont press OK by the time specificed, the game will close.",
     "release-illegal-plugins-exception": "Client mods detected. Mods are not enabled for BleedingEdge/testing builds of SPT - please remove them before playing!",
@@ -660,7 +660,7 @@
     "scheduled_event_failed_to_run": "Scheduled event: '%s' failed to run successfully.",
     "season-no_matching_season_found_for_date": "Unable to find a season using the current date, defaulting to Summer",
     "season-event_is_active": "Event: %s is active",
-	"seasonal-missing_equipment_slot_on_bot": "Unable to remove christmas equipment from slot: {{equipmentSlot}} as it cannot be found on bot: {{botRole}}",
+    "seasonal-missing_equipment_slot_on_bot": "Unable to remove christmas equipment from slot: {{equipmentSlot}} as it cannot be found on bot: {{botRole}}",
     "seasonal-missing_loot_container_slot_on_bot": "Unable to remove christmas loot from slot: {{lootContainer}} as it cannot be found on bot: {{botRole}}",
     "server_running": "Server is running, do not close while playing SPT",
     "server_start_meme_1": "Live laugh love",
@@ -711,7 +711,7 @@
     "watermark-discord_url": "https://discord.sp-tarkov.com",
     "watermark-do_not_report": "DO NOT REPORT IT",
     "watermark-free_of_charge": "This work is free of charge",
-    "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues",
+    "watermark-issue_tracker_url": "https://github.com/sp-tarkov/server/",
     "watermark-modding_disabled": "THIS BUILD HAS SERVER MODDING DISABLED",
     "watermark-no_support": "NO SUPPORT WILL BE GIVEN",
     "watermark-not_an_issue": "THIS IS NOT AN ISSUE",
@@ -727,9 +727,9 @@
     "websocket-received_message": "[WS] Received message from user %s ",
     "websocket-socket_lost_deleting_handle": "[WS] Socket lost, deleting handle",
     "websocket-started": "Started websocket at %s",
-	"chatbot-cannot_accept_any_more_of_gift": "You cannot accept any more of this gift",
-	"chatbot-forced_event_enabled": "%s event has been enabled, restart your game client before starting a raid",
-	"chatbot-added_stash_rows_please_restart": "Added 2 rows to stash, please restart your game to see them",
-	"chatbot-snow_enabled": "Snow is enabled for all subsequent raids until the server is restarted",
-	"chatbot-summer_enabled": "Summer has been enabled for all subsequent raids until the server is restarted"
+    "chatbot-cannot_accept_any_more_of_gift": "You cannot accept any more of this gift",
+    "chatbot-forced_event_enabled": "%s event has been enabled, restart your game client before starting a raid",
+    "chatbot-added_stash_rows_please_restart": "Added 2 rows to stash, please restart your game to see them",
+    "chatbot-snow_enabled": "Snow is enabled for all subsequent raids until the server is restarted",
+    "chatbot-summer_enabled": "Summer has been enabled for all subsequent raids until the server is restarted"
 }

project/assets/database/locales/server/es-es.json

@@ -708,7 +708,7 @@
     "watermark-discord_url": "https://discord.sp-tarkov.com",
     "watermark-do_not_report": "NO LO REPORTES",
     "watermark-free_of_charge": "Este trabajo es libre de cargo.",
-    "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues",
+    "watermark-issue_tracker_url": "https://github.com/sp-tarkov/server/",
     "watermark-modding_disabled": "ESTA VERSIÓN TIENE LAS MODIFICACIONES DESACTIVADAS",
     "watermark-no_support": "NO SE DARÁ NINGÚN TIPO DE SOPORTE",
     "watermark-not_an_issue": "ESTO NO ES UN PROBLEMA",

project/assets/database/locales/server/fr.json

@@ -708,7 +708,7 @@
     "watermark-discord_url": "https://discord.sp-tarkov.com",
     "watermark-do_not_report": "NE PAS SIGNALER !",
     "watermark-free_of_charge": "Ce travail est gratuit",
-    "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues",
+    "watermark-issue_tracker_url": "https://github.com/sp-tarkov/server/",
     "watermark-modding_disabled": "CE BUILD A LE MODDING DESACTIVE",
     "watermark-no_support": "AUCUN SUPPORT NE SERA FOURNI",
     "watermark-not_an_issue": "CECI N'EST PAS UNE ERREUR",

project/assets/database/locales/server/it.json

@@ -708,7 +708,7 @@
     "watermark-discord_url": "https://discord.sp-tarkov.com",
     "watermark-do_not_report": "NON SEGNALARLO",
     "watermark-free_of_charge": "Questo lavoro è gratuito",
-    "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues",
+    "watermark-issue_tracker_url": "https://github.com/sp-tarkov/server/",
     "watermark-modding_disabled": "QUESTA BUILD HA LE MOD SERVER DISATTIVATE",
     "watermark-no_support": "NESSUN SUPPORTO SARA' FORNITO",
     "watermark-not_an_issue": "QUESTO NON É UN ERRORE",

project/assets/database/locales/server/ko.json

@@ -708,7 +708,7 @@
     "watermark-discord_url": "https://discord.sp-tarkov.com",
     "watermark-do_not_report": "리포트 하지마세요",
     "watermark-free_of_charge": "이 소프트웨어는 무료입니다",
-    "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues",
+    "watermark-issue_tracker_url": "https://github.com/sp-tarkov/server/",
     "watermark-modding_disabled": "이 버전은 모드가 비활성화된 빌드입니다",
     "watermark-no_support": "문의 및 지원은 없습니다",
     "watermark-not_an_issue": "이 메시지는 오류 또는 문제가 아닙니다",

project/assets/database/locales/server/nl.json

@@ -708,7 +708,7 @@
     "watermark-discord_url": "https://discord.sp-tarkov.com",
     "watermark-do_not_report": "RAPPORTEER HET NIET",
     "watermark-free_of_charge": "Dit werk is gratis",
-    "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues",
+    "watermark-issue_tracker_url": "https://github.com/sp-tarkov/server/",
     "watermark-modding_disabled": "DEZE BUILD HEEFT SERVER MODDEN UITGESCHAKELD",
     "watermark-no_support": "ER WORDT GEEN SUPPORT GEGEVEN",
     "watermark-not_an_issue": "DIT IS GEEN PROBLEEM",

project/assets/database/locales/server/pl.json

@@ -701,7 +701,7 @@
     "watermark-discord_url": "https://discord.sp-tarkov.com",
     "watermark-do_not_report": "NIE ZGŁASZAJ TEGO",
     "watermark-free_of_charge": "Ta praca jest darmowa",
-    "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues",
+    "watermark-issue_tracker_url": "https://github.com/sp-tarkov/server/",
     "watermark-modding_disabled": "TA WERSJA MA WYŁĄCZONE MODYFIKACJE SERWERA",
     "watermark-no_support": "NIE UDZIELAMY WSPARCIA",
     "watermark-not_an_issue": "TO NIE JEST PROBLEM",

project/assets/database/locales/server/pt-br.json

@@ -708,7 +708,7 @@
     "watermark-discord_url": "https://discord.sp-tarkov.com",
     "watermark-do_not_report": "NÃO RELATE ISSO",
     "watermark-free_of_charge": "Esse trabalho é gratuito",
-    "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues",
+    "watermark-issue_tracker_url": "https://github.com/sp-tarkov/server/",
     "watermark-modding_disabled": "ESTA VERSÃO TEM OS MODS DO SERVIDOR DESATIVADO",
     "watermark-no_support": "NÃO SERÁ FORNECIDO NENHUM SUPORTE",
     "watermark-not_an_issue": "ISSO NÃO É UM PROBLEMA",

project/assets/database/locales/server/ru.json

@@ -708,7 +708,7 @@
     "watermark-discord_url": "https://discord.sp-tarkov.com",
     "watermark-do_not_report": "НЕ ОТПРАВЛЯЙТЕ БАГ-РЕПОРТ НАСЧЕТ ЭТОГО",
     "watermark-free_of_charge": "Данный проект является бесплатным",
-    "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues",
+    "watermark-issue_tracker_url": "https://github.com/sp-tarkov/server/",
     "watermark-modding_disabled": "В ЭТОЙ СБОРКЕ ОТСУТСТВУЮТ ВОЗМОЖНОСТИ МОДИФИКАЦИИ",
     "watermark-no_support": "ПОДДЕРЖКА НЕ БУДЕТ ОКАЗЫВАТЬСЯ",
     "watermark-not_an_issue": "ЭТО НЕ ОШИБКА",

project/assets/database/locales/server/tr.json

@@ -708,7 +708,7 @@
     "watermark-discord_url": "https://discord.sp-tarkov.com",
     "watermark-do_not_report": "SAKIN BİLDİRMEYİN",
     "watermark-free_of_charge": "Bu çalışma ücretsizdir",
-    "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues",
+    "watermark-issue_tracker_url": "https://github.com/sp-tarkov/server/",
     "watermark-modding_disabled": "BU YAPIDA SUNUCU MODLAMASI DEVRE DIŞI BIRAKILMIŞTIR",
     "watermark-no_support": "HİÇBİR DESTEK VERİLMEYECEK",
     "watermark-not_an_issue": "BU BİR HATA DEĞİL",

project/assets/database/locales/server/uk.json

@@ -163,7 +163,7 @@
     "watermark-discord_url": "https://discord.sp-tarkov.com",
     "watermark-do_not_report": "НЕ ПОВІДОМЛЯЙТЕ ПРО ЦЕ",
     "watermark-free_of_charge": "Ця робота бескоштовна ",
-    "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues",
+    "watermark-issue_tracker_url": "https://github.com/sp-tarkov/server/",
     "watermark-modding_disabled": "У ЦОМУ БІЛДІ ВИМКНЕНО МОДИНГ СЕРВЕРА",
     "watermark-no_support": "ЖОДНОЇ ПІДТРИМКИ НЕ БУДЕ НАДАНО",
     "watermark-not_an_issue": "ЦЕ НЕ ПРОБЛЕМА",

project/assets/database/locales/server/zh-cn.json

@@ -708,7 +708,7 @@
     "watermark-discord_url": "https://discord.sp-tarkov.com",
     "watermark-do_not_report": "不 要 报 告",
     "watermark-free_of_charge": "该软件免费",
-    "watermark-issue_tracker_url": "https://dev.sp-tarkov.com/SPT/Server/issues",
+    "watermark-issue_tracker_url": "https://github.com/sp-tarkov/server/",
     "watermark-modding_disabled": "该 编 译 不 启 用 服 务 端 模 改",
     "watermark-no_support": "不 会 提 供 支 持",
     "watermark-not_an_issue": "这 不 是 个 问 题",

project/biome.jsonc

@@ -60,7 +60,14 @@
     },
     "overrides": [
         {
-            "include": ["tests/*"]
+            "include": ["tests/*"],
+            "linter": {
+                "rules": {
+                    "suspicious": {
+                        "noExplicitAny": "off"
+                    }
+                }
+            }
         }
     ]
 }

project/src/controllers/DialogueController.ts

@@ -83,10 +83,12 @@ export class DialogueController {
 
         // Add any friends the user has after the chatbots
         const profile = this.profileHelper.getFullProfile(sessionID);
-        for (const friendId of profile?.friends) {
-            const friendProfile = this.profileHelper.getChatRoomMemberFromSessionId(friendId);
-            if (friendProfile) {
-                friends.push(friendProfile);
+        if (profile?.friends) {
+            for (const friendId of profile.friends) {
+                const friendProfile = this.profileHelper.getChatRoomMemberFromSessionId(friendId);
+                if (friendProfile) {
+                    friends.push(friendProfile);
+                }
             }
         }
 

project/src/controllers/GameController.ts

@@ -256,6 +256,7 @@ export class GameController {
         // Hideout Improvement property changed name
         if ((fullProfile.characters.pmc.Hideout as any).Improvement) {
             fullProfile.characters.pmc.Hideout.Improvements = (fullProfile.characters.pmc.Hideout as any).Improvement;
+            // biome-ignore lint/performance/noDelete: Delete is fine here, as we're seeking to remove these entirely
             delete (fullProfile.characters.pmc.Hideout as any).Improvement;
             this.logger.warning(`Migration: Moved Hideout Improvement data to new property 'Improvements'`);
         }
@@ -273,12 +274,14 @@ export class GameController {
         // Remove PMC 'ragfair' from trader list
         if (fullProfile.characters.pmc.TradersInfo.ragfair) {
             this.logger.warning("Migration: deleting: ragfair traderinfo object from PMC");
+            // biome-ignore lint/performance/noDelete: Delete is fine here, as we're seeking to remove these entirely
             delete fullProfile.characters.pmc.TradersInfo.ragfair;
         }
 
         // Remove SCAV 'ragfair' from trader list
         if (fullProfile.characters.scav.TradersInfo.ragfair) {
             this.logger.warning("Migration: deleting: ragfair traderinfo object from PMC");
+            // biome-ignore lint/performance/noDelete: Delete is fine here, as we're seeking to remove these entirely
             delete fullProfile.characters.scav.TradersInfo.ragfair;
         }
 
@@ -561,6 +564,7 @@ export class GameController {
     protected checkForAndRemoveUndefinedDialogs(fullProfile: ISptProfile): void {
         const undefinedDialog = fullProfile.dialogues.undefined;
         if (undefinedDialog) {
+            // biome-ignore lint/performance/noDelete: Delete is fine here, as we're seeking to delete undefined dialogs.
             delete fullProfile.dialogues.undefined;
         }
     }

project/src/controllers/HealthController.ts

@@ -250,6 +250,7 @@ export class HealthController {
 
                 // Remove empty effect object
                 if (Object.keys(pmcData.Health.BodyParts[bodyPartKey].Effects).length === 0) {
+                    // biome-ignore lint/performance/noDelete: Delete is fine here as we entirely want to get rid of the effect.
                     delete pmcData.Health.BodyParts[bodyPartKey].Effects;
                 }
             }

project/src/controllers/HideoutController.ts

@@ -1229,6 +1229,7 @@ export class HideoutController {
 
         if (hasMildPain) {
             // Already has mild pain, remove mild and add severe
+            // biome-ignore lint/performance/noDelete: Deleting is fine here, we're removing the effect to replace it with another.
             delete pmcData.Health.BodyParts.Chest.Effects.MildMusclePain;
 
             pmcData.Health.BodyParts.Chest.Effects.SevereMusclePain = {

project/src/controllers/InventoryController.ts

@@ -282,7 +282,7 @@ export class InventoryController {
 
         // Remove FiR status from destination stack when source stack has no FiR but destination does
         if (!sourceItem.upd.SpawnedInSession && destinationItem.upd.SpawnedInSession) {
-            delete destinationItem.upd.SpawnedInSession;
+            destinationItem.upd.SpawnedInSession = false;
         }
 
         destinationItem.upd.StackObjectsCount += sourceItem.upd.StackObjectsCount; // Add source stackcount to destination
@@ -408,6 +408,7 @@ export class InventoryController {
         if (request.to.location) {
             itemOne.location = request.to.location;
         } else {
+            // biome-ignore lint/performance/noDelete: Delete is fine here as we entirely want to get rid of the location.
             delete itemOne.location;
         }
 
@@ -416,6 +417,7 @@ export class InventoryController {
         if (request.to2.location) {
             itemTwo.location = request.to2.location;
         } else {
+            // biome-ignore lint/performance/noDelete: Delete is fine here as we entirely want to get rid of the location.
             delete itemTwo.location;
         }
 
@@ -721,6 +723,7 @@ export class InventoryController {
             if (change.location) {
                 inventoryItem.location = change.location;
             } else {
+                // biome-ignore lint/performance/noDelete: Delete is fine here as we entirely want to get rid of the location.
                 delete inventoryItem.location;
             }
         }

project/src/generators/BotWeaponGenerator.ts

@@ -571,9 +571,12 @@ export class BotWeaponGenerator {
         }
 
         // Inner join the weapons allowed + passed in cartridge pool to get compatible cartridges
-        const compatibleCartridges = Object.keys(cartridgePoolForWeapon)
-            .filter((cartridge) => compatibleCartridgesInTemplate.includes(cartridge))
-            .reduce((acc, key) => ({ ...acc, [key]: cartridgePoolForWeapon[key] }), {});
+        const compatibleCartridges = {};
+        for (const cartridge of Object.keys(cartridgePoolForWeapon)) {
+            if (compatibleCartridgesInTemplate.includes(cartridge)) {
+                compatibleCartridges[cartridge] = cartridgePoolForWeapon[cartridge];
+            }
+        }
 
         if (!compatibleCartridges) {
             // No compatible cartridges, use default

project/src/generators/LootGenerator.ts

@@ -397,9 +397,9 @@ export class LootGenerator {
         const presetAndMods: IItem[] = this.itemHelper.replaceIDs(chosenPreset._items);
         this.itemHelper.remapRootItemId(presetAndMods);
         // Add chosen preset tpl to result array
-        presetAndMods.forEach((item) => {
+        for (const item of presetAndMods) {
             result.push(item);
-        });
+        }
 
         if (itemLimitCount) {
             // Increment item count as item has been chosen and its inside itemLimitCount dictionary

project/src/generators/RagfairOfferGenerator.ts

@@ -403,7 +403,9 @@ export class RagfairOfferGenerator {
             this.itemHelper.reparentItemAndChildren(clonedAssort[0], clonedAssort);
 
             // Clear unnecessary properties
+            // biome-ignore lint/performance/noDelete: Deleting is fine here, we're getting rid of unecessary properties.
             delete clonedAssort[0].parentId;
+            // biome-ignore lint/performance/noDelete: Deleting is fine here, we're getting rid of unecessary properties.
             delete clonedAssort[0].slotId;
 
             assortSingleOfferProcesses.push(