Update types

TypeScript/1LogToConsole/types/Config.d.ts

@@ -1 +0,0 @@
-export {};

TypeScript/1LogToConsole/types/callbacks/BotCallbacks.d.ts

@@ -1,8 +1,8 @@
 import { BotController } from "../controllers/BotController";
 import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData";
 import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { IBotBase } from "../models/eft/common/tables/IBotBase";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class BotCallbacks {
     private botController;

TypeScript/1LogToConsole/types/callbacks/BundleCallbacks.d.ts

@@ -1,8 +1,8 @@
 import { BundleLoader } from "../loaders/BundleLoader";
+import { IHttpServer } from "../models/spt/server/IHttpServer";
+import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { IHttpServer } from "../models/spt/server/IHttpServer";
 export declare class BundleCallbacks {
     private logger;
     private httpResponse;

TypeScript/1LogToConsole/types/callbacks/CustomizationCallbacks.d.ts

@@ -1,22 +1,23 @@
-import { SaveServer } from "../servers/SaveServer";
 import { CustomizationController } from "../controllers/CustomizationController";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
 import { IPmcData } from "../models/eft/common/IPmcData";
+import { ISuit } from "../models/eft/common/tables/ITrader";
 import { IBuyClothingRequestData } from "../models/eft/customization/IBuyClothingRequestData";
 import { IWearClothingRequestData } from "../models/eft/customization/IWearClothingRequestData";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { ISuit } from "../models/eft/common/tables/ITrader";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
+import { SaveServer } from "../servers/SaveServer";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class CustomizationCallbacks {
     private customizationController;
     private saveServer;
     private httpResponse;
     constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil);
-    getSuits(url: string, info: any, sessionID: string): IGetBodyResponseData<{
+    getSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<{
         _id: string;
         suites: string[];
     }>;
-    getTraderSuits(url: string, info: any, sessionID: string): IGetBodyResponseData<ISuit[]>;
+    getTraderSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ISuit[]>;
     wearClothing(pmcData: IPmcData, body: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse;
     buyClothing(pmcData: IPmcData, body: IBuyClothingRequestData, sessionID: string): IItemEventRouterResponse;
 }

TypeScript/1LogToConsole/types/callbacks/DataCallbacks.d.ts

@@ -1,4 +1,3 @@
-import { DatabaseServer } from "../servers/DatabaseServer";
 import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
 import { IGlobals } from "../models/eft/common/IGlobals";
 import { ICustomizationItem } from "../models/eft/common/tables/ICustomizationItem";
@@ -10,6 +9,7 @@ import { IHideoutSettingsBase } from "../models/eft/hideout/IHideoutSettingsBase
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { ILanguageBase } from "../models/spt/server/ILocaleBase";
 import { ISettingsBase } from "../models/spt/server/ISettingsBase";
+import { DatabaseServer } from "../servers/DatabaseServer";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class DataCallbacks {
     private httpResponse;

TypeScript/1LogToConsole/types/callbacks/DialogueCallbacks.d.ts

@@ -1,25 +1,25 @@
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { HashUtil } from "../utils/HashUtil";
-import { TimeUtil } from "../utils/TimeUtil";
 import { DialogueController } from "../controllers/DialogueController";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
+import { OnUpdate } from "../di/OnUpdate";
-import { DialogueInfo } from "../models/eft/profile/IAkiProfile";
-import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
-import { IGetMailDialogViewRequestData } from "../models/eft/dialog/IGetMailDialogViewRequestData";
-import { IGetMailDialogInfoRequestData } from "../models/eft/dialog/IGetMailDialogInfoRequestData";
-import { IRemoveDialogRequestData } from "../models/eft/dialog/IRemoveDialogRequestData";
-import { IGetMailDialogListRequestData } from "../models/eft/dialog/IGetMailDialogListRequestData";
 import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
 import { IFriendRequestData } from "../models/eft/dialog/IFriendRequestData";
-import { IPinDialogRequestData } from "../models/eft/dialog/IPinDialogRequestData";
-import { ISetDialogReadRequestData } from "../models/eft/dialog/ISetDialogReadRequestData";
 import { IGetAllAttachmentsRequestData } from "../models/eft/dialog/IGetAllAttachmentsRequestData";
+import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse";
 import { IGetChatServerListRequestData } from "../models/eft/dialog/IGetChatServerListRequestData";
 import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse";
-import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest";
+import { IGetMailDialogInfoRequestData } from "../models/eft/dialog/IGetMailDialogInfoRequestData";
+import { IGetMailDialogListRequestData } from "../models/eft/dialog/IGetMailDialogListRequestData";
+import { IGetMailDialogViewRequestData } from "../models/eft/dialog/IGetMailDialogViewRequestData";
 import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData";
-import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachmentsResponse";
+import { IPinDialogRequestData } from "../models/eft/dialog/IPinDialogRequestData";
-import { OnUpdate } from "../di/OnUpdate";
+import { IRemoveDialogRequestData } from "../models/eft/dialog/IRemoveDialogRequestData";
+import { ISendMessageRequest } from "../models/eft/dialog/ISendMessageRequest";
+import { ISetDialogReadRequestData } from "../models/eft/dialog/ISetDialogReadRequestData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
+import { DialogueInfo } from "../models/eft/profile/IAkiProfile";
+import { HashUtil } from "../utils/HashUtil";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { TimeUtil } from "../utils/TimeUtil";
 export declare class DialogueCallbacks extends OnUpdate {
     private hashUtil;
     private timeUtil;

TypeScript/1LogToConsole/types/callbacks/GameCallbacks.d.ts

@@ -1,17 +1,17 @@
 import { GameController } from "../controllers/GameController";
 import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
+import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse";
 import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData";
 import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
-import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { IWatermark } from "../models/spt/utils/IWatermark";
+import { Watermark } from "../utils/Watermark";
 declare class GameCallbacks {
     private httpResponse;
     private watermark;
     private gameController;
-    constructor(httpResponse: HttpResponseUtil, watermark: IWatermark, gameController: GameController);
+    constructor(httpResponse: HttpResponseUtil, watermark: Watermark, gameController: GameController);
     versionValidate(url: string, info: IVersionValidateRequestData, sessionID: string): INullResponseData;
     gameStart(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
     gameLogout(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;

TypeScript/1LogToConsole/types/callbacks/HealthCallbacks.d.ts

@@ -1,13 +1,13 @@
 import { HealthController } from "../controllers/HealthController";
+import { ProfileHelper } from "../helpers/ProfileHelper";
 import { IPmcData } from "../models/eft/common/IPmcData";
-import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData";
+import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData";
 import { IOffraidEatRequestData } from "../models/eft/health/IOffraidEatRequestData";
 import { IOffraidHealRequestData } from "../models/eft/health/IOffraidHealRequestData";
-import { IHealthTreatmentRequestData } from "../models/eft/health/IHealthTreatmentRequestData";
+import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData";
-import { ProfileHelper } from "../helpers/ProfileHelper";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class HealthCallbacks {
     private httpResponse;
     private profileHelper;

TypeScript/1LogToConsole/types/callbacks/HideoutCallbacks.d.ts

@@ -1,22 +1,23 @@
 import { HideoutController } from "../controllers/HideoutController";
+import { OnUpdate } from "../di/OnUpdate";
 import { IPmcData } from "../models/eft/common/IPmcData";
-import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData";
-import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData";
-import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData";
-import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData";
-import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData";
-import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData";
-import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData";
 import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData";
+import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData";
+import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData";
+import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData";
+import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData";
 import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData";
+import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData";
+import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData";
+import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { ConfigServer } from "../servers/ConfigServer";
-import { OnUpdate } from "../di/OnUpdate";
 export declare class HideoutCallbacks extends OnUpdate {
     private hideoutController;
     private configServer;
     private hideoutConfig;
-    constructor(hideoutController: HideoutController, configServer: ConfigServer);
+    constructor(hideoutController: HideoutController, // TODO: delay needed
+    configServer: ConfigServer);
     upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse;
     upgradeComplete(pmcData: IPmcData, body: IHideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse;
     putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse;

TypeScript/1LogToConsole/types/callbacks/HttpCallbacks.d.ts

@@ -1,5 +1,5 @@
-import { IHttpServer } from "../models/spt/server/IHttpServer";
 import { OnLoad } from "../di/OnLoad";
+import { IHttpServer } from "../models/spt/server/IHttpServer";
 export declare class HttpCallbacks extends OnLoad {
     private httpServer;
     constructor(httpServer: IHttpServer);

TypeScript/1LogToConsole/types/callbacks/InraidCallbacks.d.ts

@@ -1,6 +1,6 @@
 import { InraidController } from "../controllers/InraidController";
-import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
 import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
+import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
 import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData";
 import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData";
 import { ConfigServer } from "../servers/ConfigServer";

TypeScript/1LogToConsole/types/callbacks/InsuranceCallbacks.d.ts

@@ -1,13 +1,13 @@
 import { InsuranceController } from "../controllers/InsuranceController";
+import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate";
 import { IPmcData } from "../models/eft/common/IPmcData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData";
 import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { ConfigServer } from "../servers/ConfigServer";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate";
-import { InsuranceService } from "../services/InsuranceService";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
+import { ConfigServer } from "../servers/ConfigServer";
+import { InsuranceService } from "../services/InsuranceService";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class InsuranceCallbacks extends OnLoadOnUpdate {
     private insuranceController;
     private insuranceService;

TypeScript/1LogToConsole/types/callbacks/InventoryCallbacks.d.ts

@@ -1,21 +1,21 @@
 import { InventoryController } from "../controllers/InventoryController";
 import { IPmcData } from "../models/eft/common/IPmcData";
-import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData";
-import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData";
-import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData";
-import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData";
-import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData";
-import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData";
-import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData";
-import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData";
-import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData";
 import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData";
-import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData";
-import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData";
-import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData";
 import { IInventoryCreateMarkerRequestData } from "../models/eft/inventory/IInventoryCreateMarkerRequestData";
 import { IInventoryDeleteMarkerRequestData } from "../models/eft/inventory/IInventoryDeleteMarkerRequestData";
 import { IInventoryEditMarkerRequestData } from "../models/eft/inventory/IInventoryEditMarkerRequestData";
+import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData";
+import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData";
+import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData";
+import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData";
+import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData";
+import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData";
+import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData";
+import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData";
+import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData";
+import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData";
+import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData";
+import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 export declare class InventoryCallbacks {
     private inventoryController;

TypeScript/1LogToConsole/types/callbacks/LauncherCallbacks.d.ts

@@ -1,17 +1,18 @@
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { SaveServer } from "../servers/SaveServer";
 import { LauncherController } from "../controllers/LauncherController";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
+import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData";
+import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData";
 import { IRegisterData } from "../models/eft/launcher/IRegisterData";
 import { IRemoveProfileData } from "../models/eft/launcher/IRemoveProfileData";
-import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData";
+import { SaveServer } from "../servers/SaveServer";
-import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { IWatermark } from "../models/spt/utils/IWatermark";
+import { Watermark } from "../utils/Watermark";
 declare class LauncherCallbacks {
     private httpResponse;
     private launcherController;
     private saveServer;
     private watermark;
-    constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: IWatermark);
+    constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: Watermark);
     connect(): string;
     login(url: string, info: ILoginRequestData, sessionID: string): string;
     register(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK";
@@ -20,7 +21,7 @@ declare class LauncherCallbacks {
     changePassword(url: string, info: IChangeRequestData, sessionID: string): "FAILED" | "OK";
     wipe(url: string, info: IRegisterData, sessionID: string): "FAILED" | "OK";
     getServerVersion(): string;
-    ping(url: string, info: any, sessionID: string): string;
+    ping(url: string, info: IEmptyRequestData, sessionID: string): string;
     removeProfile(url: string, info: IRemoveProfileData, sessionID: string): string;
     getCompatibleTarkovVersion(): string;
 }

TypeScript/1LogToConsole/types/callbacks/LocationCallbacks.d.ts

@@ -1,13 +1,14 @@
 import { LocationController } from "../controllers/LocationController";
-import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase";
 import { ILocationBase } from "../models/eft/common/ILocationBase";
+import { ILocationsGenerateAllResponse } from "../models/eft/common/ILocationsSourceDestinationBase";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
+import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class LocationCallbacks {
     private httpResponse;
     private locationController;
     constructor(httpResponse: HttpResponseUtil, locationController: LocationController);
-    getLocationData(url: string, info: any, sessionID: string): IGetBodyResponseData<ILocationsGenerateAllResponse>;
+    getLocationData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ILocationsGenerateAllResponse>;
     getLocation(url: string, info: IGetLocationRequestData, sessionID: string): IGetBodyResponseData<ILocationBase>;
 }

TypeScript/1LogToConsole/types/callbacks/MatchCallbacks.d.ts

@@ -1,10 +1,11 @@
 import { MatchController } from "../controllers/MatchController";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData";
-import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData";
-import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { IPmcData } from "../models/eft/common/IPmcData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
+import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData";
+import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData";
+import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData";
+import { DatabaseServer } from "../servers/DatabaseServer";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { JsonUtil } from "../utils/JsonUtil";
 export declare class MatchCallbacks {
@@ -22,7 +23,7 @@ export declare class MatchCallbacks {
     acceptGroupInvite(url: string, info: any, sessionID: string): INullResponseData;
     cancelGroupInvite(url: string, info: any, sessionID: string): INullResponseData;
     putMetrics(url: string, info: any, sessionID: string): INullResponseData;
-    getProfile(url: string, info: any, sessionID: string): IGetBodyResponseData<IPmcData[]>;
+    getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData<IPmcData[]>;
     serverAvailable(url: string, info: any, sessionID: string): IGetBodyResponseData<any> | IGetBodyResponseData<true>;
     joinMatch(url: string, info: any, sessionID: string): IGetBodyResponseData<any>;
     getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData<string>;

TypeScript/1LogToConsole/types/callbacks/ModCallbacks.d.ts

@@ -1,9 +1,9 @@
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { OnLoad } from "../di/OnLoad";
 import { DelayedModLoader } from "../loaders/DelayedModLoader";
+import { IHttpServer } from "../models/spt/server/IHttpServer";
+import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
-import { ILogger } from '../models/spt/utils/ILogger';
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { IHttpServer } from '../models/spt/server/IHttpServer';
 declare class ModCallbacks extends OnLoad {
     private logger;
     private httpResponse;

TypeScript/1LogToConsole/types/callbacks/NoteCallbacks.d.ts

@@ -1,7 +1,7 @@
 import { NoteController } from "../controllers/NoteController";
 import { IPmcData } from "../models/eft/common/IPmcData";
-import { INoteActionData } from "../models/eft/notes/INoteActionData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
+import { INoteActionData } from "../models/eft/notes/INoteActionData";
 export declare class NoteCallbacks {
     private noteController;
     constructor(noteController: NoteController);

TypeScript/1LogToConsole/types/callbacks/NotifierCallbacks.d.ts

@@ -1,10 +1,10 @@
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { NotifierController } from "../controllers/NotifierController";
 import { HttpServerHelper } from "../helpers/HttpServerHelper";
 import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { INotifierChannel } from "../models/eft/notifier/INotifier";
 import { ISelectProfileRequestData } from "../models/eft/notifier/ISelectProfileRequestData";
-import { NotifierController } from "../controllers/NotifierController";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class NotifierCallbacks {
     private httpServerHelper;
     private httpResponse;

TypeScript/1LogToConsole/types/callbacks/PresetBuildCallbacks.d.ts

@@ -1,8 +1,8 @@
 import { PresetBuildController } from "../controllers/PresetBuildController";
 import { IPmcData } from "../models/eft/common/IPmcData";
-import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
+import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPresetBuildActionRequestData";
 import { WeaponBuild } from "../models/eft/profile/IAkiProfile";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class PresetBuildCallbacks {

TypeScript/1LogToConsole/types/callbacks/ProfileCallbacks.d.ts

@@ -1,16 +1,16 @@
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { TimeUtil } from "../utils/TimeUtil";
 import { ProfileController } from "../controllers/ProfileController";
 import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { INullResponseData } from "../models/eft/httpResponse/INullResponseData";
+import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData";
 import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData";
 import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData";
 import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData";
-import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData";
 import { ISearchFriendRequestData } from "../models/eft/profile/ISearchFriendRequestData";
 import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendResponse";
-import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData";
+import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { TimeUtil } from "../utils/TimeUtil";
 export declare class ProfileCallbacks {
     private httpResponse;
     private timeUtil;

TypeScript/1LogToConsole/types/callbacks/QuestCallbacks.d.ts

@@ -1,15 +1,15 @@
 import { QuestController } from "../controllers/QuestController";
 import { RepeatableQuestController } from "../controllers/RepeatableQuestController";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestData";
 import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { IQuest } from "../models/eft/common/tables/IQuest";
 import { IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
+import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData";
+import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData";
+import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData";
+import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestData";
 import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class QuestCallbacks {

TypeScript/1LogToConsole/types/callbacks/RagfairCallbacks.d.ts

@@ -1,20 +1,20 @@
-import { RagfairServer } from "../servers/RagfairServer";
 import { RagfairController } from "../controllers/RagfairController";
+import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
 import { IPmcData } from "../models/eft/common/IPmcData";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData";
-import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData";
-import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData";
-import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
+import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData";
+import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData";
 import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult";
+import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData";
+import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData";
+import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData";
+import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
+import { RagfairServer } from "../servers/RagfairServer";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { JsonUtil } from "../utils/JsonUtil";
-import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate";
-import { ILogger } from "../models/spt/utils/ILogger";
 export declare class RagfairCallbacks extends OnLoadOnUpdate {
     private httpResponse;
     private logger;

TypeScript/1LogToConsole/types/callbacks/RepairCallbacks.d.ts

@@ -1,8 +1,8 @@
 import { RepairController } from "../controllers/RepairController";
 import { IPmcData } from "../models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest";
 import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 export declare class RepairCallbacks {
     private repairController;
     constructor(repairController: RepairController);

TypeScript/1LogToConsole/types/callbacks/SaveCallbacks.d.ts

@@ -1,5 +1,5 @@
-import { SaveServer } from "../servers/SaveServer";
 import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate";
+import { SaveServer } from "../servers/SaveServer";
 export declare class SaveCallbacks extends OnLoadOnUpdate {
     private saveServer;
     constructor(saveServer: SaveServer);

TypeScript/1LogToConsole/types/callbacks/TradeCallbacks.d.ts

@@ -1,8 +1,8 @@
 import { TradeController } from "../controllers/TradeController";
 import { IPmcData } from "../models/eft/common/IPmcData";
-import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData";
+import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData";
 export declare class TradeCallbacks {
     private tradeController;
     constructor(tradeController: TradeController);

TypeScript/1LogToConsole/types/callbacks/TraderCallbacks.d.ts

@@ -1,9 +1,9 @@
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { TraderController } from "../controllers/TraderController";
+import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate";
 import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
 import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader";
 import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
-import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class TraderCallbacks extends OnLoadOnUpdate {
     private httpResponse;
     private traderController;

TypeScript/1LogToConsole/types/callbacks/WeatherCallbacks.d.ts

@@ -1,6 +1,6 @@
 import { WeatherController } from "../controllers/WeatherController";
-import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
+import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class WeatherCallbacks {
     private httpResponse;

TypeScript/1LogToConsole/types/callbacks/WishlistCallbacks.d.ts

@@ -1,7 +1,7 @@
 import { WishlistController } from "../controllers/WishlistController";
 import { IPmcData } from "../models/eft/common/IPmcData";
-import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
+import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData";
 export declare class WishlistCallbacks {
     private wishlistController;
     constructor(wishlistController: WishlistController);

TypeScript/1LogToConsole/types/controllers/GameController.d.ts

@@ -1,10 +1,10 @@
+import { HttpServerHelper } from "../helpers/HttpServerHelper";
 import { ProfileHelper } from "../helpers/ProfileHelper";
 import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
 import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse";
-import { ConfigServer } from "../servers/ConfigServer";
 import { ILogger } from "../models/spt/utils/ILogger";
-import { IWatermark } from "../models/spt/utils/IWatermark";
+import { ConfigServer } from "../servers/ConfigServer";
-import { HttpServerHelper } from "../helpers/HttpServerHelper";
+import { Watermark } from "../utils/Watermark";
 export declare class GameController {
     private logger;
     private watermark;
@@ -12,7 +12,7 @@ export declare class GameController {
     private profileHelper;
     private configServer;
     private httpConfig;
-    constructor(logger: ILogger, watermark: IWatermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer);
+    constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer);
     gameStart(url: string, info: IEmptyRequestData, sessionID: string): void;
     getGameConfig(sessionID: string): IGameConfigResponse;
     getServer(): any[];

TypeScript/1LogToConsole/types/controllers/InsuranceController.d.ts

@@ -28,7 +28,8 @@ export declare class InsuranceController {
     private insuranceService;
     private configServer;
     private insuranceConfig;
-    constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, insuranceService: InsuranceService, configServer: ConfigServer);
+    constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, // TODO: delay required
+    insuranceService: InsuranceService, configServer: ConfigServer);
     processReturn(): void;
     insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse;
     cost(info: IGetInsuranceCostRequestData, sessionID: string): any;

TypeScript/1LogToConsole/types/controllers/InventoryController.d.ts

@@ -1,30 +1,31 @@
 import { InventoryHelper } from "../helpers/InventoryHelper";
-import { HashUtil } from "../utils/HashUtil";
+import { PaymentHelper } from "../helpers/PaymentHelper";
-import { JsonUtil } from "../utils/JsonUtil";
 import { PresetHelper } from "../helpers/PresetHelper";
 import { ProfileHelper } from "../helpers/ProfileHelper";
-import { PaymentHelper } from "../helpers/PaymentHelper";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
-import { DatabaseServer } from "../servers/DatabaseServer";
 import { IPmcData } from "../models/eft/common/IPmcData";
-import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData";
+import { IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData";
-import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData";
-import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData";
-import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData";
-import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData";
-import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData";
-import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData";
-import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData";
 import { IInventoryBindRequestData } from "../models/eft/inventory/IInventoryBindRequestData";
-import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData";
-import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData";
-import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData";
 import { IInventoryCreateMarkerRequestData } from "../models/eft/inventory/IInventoryCreateMarkerRequestData";
 import { IInventoryDeleteMarkerRequestData } from "../models/eft/inventory/IInventoryDeleteMarkerRequestData";
 import { IInventoryEditMarkerRequestData } from "../models/eft/inventory/IInventoryEditMarkerRequestData";
+import { IInventoryExamineRequestData } from "../models/eft/inventory/IInventoryExamineRequestData";
+import { IInventoryFoldRequestData } from "../models/eft/inventory/IInventoryFoldRequestData";
+import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData";
+import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData";
+import { IInventoryReadEncyclopediaRequestData } from "../models/eft/inventory/IInventoryReadEncyclopediaRequestData";
+import { IInventoryRemoveRequestData } from "../models/eft/inventory/IInventoryRemoveRequestData";
+import { IInventorySortRequestData } from "../models/eft/inventory/IInventorySortRequestData";
+import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData";
+import { IInventorySwapRequestData } from "../models/eft/inventory/IInventorySwapRequestData";
+import { IInventoryTagRequestData } from "../models/eft/inventory/IInventoryTagRequestData";
+import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryToggleRequestData";
+import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { ILogger } from "../models/spt/utils/ILogger";
+import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { DatabaseServer } from "../servers/DatabaseServer";
+import { HashUtil } from "../utils/HashUtil";
+import { JsonUtil } from "../utils/JsonUtil";
 export declare class InventoryController {
     private logger;
     private hashUtil;
@@ -77,7 +78,7 @@ export declare class InventoryController {
     * Give Item
     * its used for "add" item like gifts etc.
     */
-    addItem(pmcData: IPmcData, body: any, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse;
+    addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse;
     /**
      * Handles folding of Weapons
      */

TypeScript/1LogToConsole/types/controllers/MatchController.d.ts

@@ -1,8 +1,9 @@
-import { TraderHelper } from "../helpers/TraderHelper";
 import { ProfileHelper } from "../helpers/ProfileHelper";
-import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData";
+import { TraderHelper } from "../helpers/TraderHelper";
-import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData";
 import { IPmcData } from "../models/eft/common/IPmcData";
+import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData";
+import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData";
+import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData";
 import { ConfigServer } from "../servers/ConfigServer";
 import { SaveServer } from "../servers/SaveServer";
 import { MatchLocationService } from "../services/MatchLocationService";
@@ -16,7 +17,7 @@ export declare class MatchController {
     private inraidConfig;
     constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer);
     getEnabled(): boolean;
-    getProfile(info: any): IPmcData[];
+    getProfile(info: IGetProfileRequestData): IPmcData[];
     private getMatch;
     createGroup(sessionID: string, info: any): any;
     deleteGroup(info: any): void;

TypeScript/1LogToConsole/types/controllers/RagfairController.d.ts

@@ -1,37 +1,37 @@
-import { ItemEventRouter } from "../routers/ItemEventRouter";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { TimeUtil } from "../utils/TimeUtil";
-import { RagfairServer } from "../servers/RagfairServer";
-import { SaveServer } from "../servers/SaveServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { PaymentService } from "../services/PaymentService";
-import { RagfairPriceService } from "../services/RagfairPriceService";
-import { RagfairOfferService } from "../services/RagfairOfferService";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { HandbookHelper } from "../helpers/HandbookHelper";
-import { PaymentHelper } from "../helpers/PaymentHelper";
-import { InventoryHelper } from "../helpers/InventoryHelper";
-import { RagfairHelper } from "../helpers/RagfairHelper";
-import { RagfairSellHelper } from "../helpers/RagfairSellHelper";
-import { IPmcData } from "../models/eft/common/IPmcData";
-import { IAddOfferRequestData, Requirement } from "../models/eft/ragfair/IAddOfferRequestData";
-import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData";
-import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData";
-import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { Item } from "../models/eft/common/tables/IItem";
-import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult";
-import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult";
-import { ConfigServer } from "../servers/ConfigServer";
-import { IAkiProfile } from "../models/eft/profile/IAkiProfile";
-import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer";
 import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator";
+import { HandbookHelper } from "../helpers/HandbookHelper";
+import { InventoryHelper } from "../helpers/InventoryHelper";
+import { ItemHelper } from "../helpers/ItemHelper";
+import { PaymentHelper } from "../helpers/PaymentHelper";
+import { ProfileHelper } from "../helpers/ProfileHelper";
+import { RagfairHelper } from "../helpers/RagfairHelper";
+import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper";
+import { RagfairSellHelper } from "../helpers/RagfairSellHelper";
 import { RagfairSortHelper } from "../helpers/RagfairSortHelper";
 import { RagfairTaxHelper } from "../helpers/RagfairTaxHelper";
-import { RagfairOfferHelper } from "../helpers/RagfairOfferHelper";
+import { IPmcData } from "../models/eft/common/IPmcData";
-import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService";
+import { Item } from "../models/eft/common/tables/IItem";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
+import { IAkiProfile } from "../models/eft/profile/IAkiProfile";
+import { IAddOfferRequestData, Requirement } from "../models/eft/ragfair/IAddOfferRequestData";
+import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData";
+import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult";
+import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData";
+import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult";
+import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer";
+import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData";
 import { ILogger } from "../models/spt/utils/ILogger";
+import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { ConfigServer } from "../servers/ConfigServer";
+import { DatabaseServer } from "../servers/DatabaseServer";
+import { RagfairServer } from "../servers/RagfairServer";
+import { SaveServer } from "../servers/SaveServer";
+import { PaymentService } from "../services/PaymentService";
+import { RagfairOfferService } from "../services/RagfairOfferService";
+import { RagfairPriceService } from "../services/RagfairPriceService";
+import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { TimeUtil } from "../utils/TimeUtil";
 export declare class RagfairController {
     private logger;
     private timeUtil;

TypeScript/1LogToConsole/types/controllers/RepeatableQuestController.d.ts

@@ -1,24 +1,24 @@
-import { TimeUtil } from "../utils/TimeUtil";
-import { ObjectId } from "../utils/ObjectId";
-import { RandomUtil, ProbabilityObjectArray, ProbabilityObject } from "../utils/RandomUtil";
-import { JsonUtil } from "../utils/JsonUtil";
-import { MathUtil } from "../utils/MathUtil";
 import { ItemHelper } from "../helpers/ItemHelper";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
-import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData";
-import { IRepeatableQuestConfig, ELocationName } from "../models/spt/config/IQuestConfig";
-import { IExploration, IRepeatableQuest, IReward, IRewards, IExplorationCondition, ICompletionAvailableFor, IEliminationCondition, ICompletion, IElimination, IPmcDataRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests";
-import { Exit } from "../models/eft/common/ILocationBase";
-import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { PresetHelper } from "../helpers/PresetHelper";
 import { ProfileHelper } from "../helpers/ProfileHelper";
-import { PaymentService } from "../services/PaymentService";
-import { ConfigServer } from "../servers/ConfigServer";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
 import { RagfairServerHelper } from "../helpers/RagfairServerHelper";
+import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData";
+import { Exit } from "../models/eft/common/ILocationBase";
+import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData";
+import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
+import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest";
+import { ELocationName, IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig";
 import { ILogger } from "../models/spt/utils/ILogger";
+import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { ConfigServer } from "../servers/ConfigServer";
+import { DatabaseServer } from "../servers/DatabaseServer";
+import { PaymentService } from "../services/PaymentService";
+import { JsonUtil } from "../utils/JsonUtil";
+import { MathUtil } from "../utils/MathUtil";
+import { ObjectId } from "../utils/ObjectId";
+import { ProbabilityObject, ProbabilityObjectArray, RandomUtil } from "../utils/RandomUtil";
+import { TimeUtil } from "../utils/TimeUtil";
 export interface IQuestTypePool {
     types: string[];
     pool: IQuestPool;

TypeScript/1LogToConsole/types/controllers/TraderController.d.ts

@@ -1,13 +1,12 @@
-import { JsonUtil } from "../utils/JsonUtil";
+import { ProfileHelper } from "../helpers/ProfileHelper";
-import { TimeUtil } from "../utils/TimeUtil";
+import { TraderAssortHelper } from "../helpers/TraderAssortHelper";
+import { TraderHelper } from "../helpers/TraderHelper";
+import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader";
+import { ILogger } from "../models/spt/utils/ILogger";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { TraderAssortService } from "../services/TraderAssortService";
-import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/tables/ITrader";
+import { JsonUtil } from "../utils/JsonUtil";
-import { TraderHelper } from "../helpers/TraderHelper";
+import { TimeUtil } from "../utils/TimeUtil";
-import { ProfileHelper } from "../helpers/ProfileHelper";
-import { ConfigServer } from "../servers/ConfigServer";
-import { ILogger } from "../models/spt/utils/ILogger";
-import { TraderAssortHelper } from "../helpers/TraderAssortHelper";
 export declare class TraderController {
     private logger;
     private databaseServer;
@@ -17,9 +16,7 @@ export declare class TraderController {
     private timeUtil;
     private traderAssortService;
     private jsonUtil;
-    private configServer;
+    constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil);
-    private traderConfig;
-    constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil, configServer: ConfigServer);
     load(): void;
     getTrader(traderID: string, sessionID: string): ITraderBase;
     getAllTraders(sessionID: string): ITraderBase[];

TypeScript/1LogToConsole/types/di/Container.d.ts

@@ -1,6 +1,7 @@
 import { DependencyContainer } from "tsyringe";
 export declare class Container {
     static registerTypes(depContainer: DependencyContainer): void;
+    static registerListTypes(depContainer: DependencyContainer): void;
     private static registerUtils;
     private static registerRouters;
     private static registerGenerators;

TypeScript/1LogToConsole/types/di/Router.d.ts

@@ -3,18 +3,22 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout
 import { IAkiProfile } from "../models/eft/profile/IAkiProfile";
 export declare class Router {
     private handledRoutes;
-    constructor();
     getTopLevelRoute(): string;
     protected getHandledRoutes(): HandledRoute[];
+    private getInternalHandledRoutes;
     canHandle(url: string, partialMatch?: boolean): boolean;
 }
 export declare class StaticRouter extends Router {
-    constructor();
+    private routes;
+    constructor(routes: RouteAction[]);
     handleStatic(url: string, info: any, sessionID: string, output: string): any;
+    getHandledRoutes(): HandledRoute[];
 }
 export declare class DynamicRouter extends Router {
-    constructor();
+    private routes;
+    constructor(routes: RouteAction[]);
     handleDynamic(url: string, info: any, sessionID: string, output: string): any;
+    getHandledRoutes(): HandledRoute[];
 }
 export declare class ItemEventRouterDefinition extends Router {
     constructor();
@@ -29,3 +33,8 @@ export declare class HandledRoute {
     dynamic: boolean;
     constructor(route: string, dynamic: boolean);
 }
+export declare class RouteAction {
+    url: string;
+    action: (url: string, info: any, sessionID: string, output: string) => any;
+    constructor(url: string, action: (url: string, info: any, sessionID: string, output: string) => any);
+}

TypeScript/1LogToConsole/types/generators/BotInventoryGenerator.d.ts

@@ -17,7 +17,6 @@ export declare class BotInventoryGenerator {
     private botLootGenerator;
     private botGeneratorHelper;
     private weightedRandomHelper;
-    private botConfig;
     constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botWeaponGenerator: BotWeaponGenerator, botLootGenerator: BotLootGenerator, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper);
     generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory;
     private generateEquipment;

TypeScript/1LogToConsole/types/generators/BotWeaponGenerator.d.ts

@@ -1,11 +1,11 @@
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { Inventory as PmcInventory } from "../models/eft/common/IPmcData";
-import { MinMax, ModsChances, Mods } from "../models/eft/common/tables/IBotType";
-import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
 import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper";
-import { HashUtil } from "../utils/HashUtil";
+import { ItemHelper } from "../helpers/ItemHelper";
+import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
+import { Inventory as PmcInventory } from "../models/eft/common/IPmcData";
+import { MinMax, Mods, ModsChances } from "../models/eft/common/tables/IBotType";
 import { ILogger } from "../models/spt/utils/ILogger";
+import { DatabaseServer } from "../servers/DatabaseServer";
+import { HashUtil } from "../utils/HashUtil";
 import { RandomUtil } from "../utils/RandomUtil";
 export declare class BotWeaponGenerator {
     private logger;

TypeScript/1LogToConsole/types/helpers/BotGeneratorHelper.d.ts

@@ -1,17 +1,17 @@
-import { DatabaseServer } from "../servers/DatabaseServer";
+import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper";
-import { ConfigServer } from "../servers/ConfigServer";
 import { Inventory as PmcInventory } from "../models/eft/common/IPmcData";
-import { ModsChances, Mods } from "../models/eft/common/tables/IBotType";
+import { Mods, ModsChances } from "../models/eft/common/tables/IBotType";
 import { Item, Upd } from "../models/eft/common/tables/IItem";
 import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
-import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper";
+import { ILogger } from "../models/spt/utils/ILogger";
+import { ConfigServer } from "../servers/ConfigServer";
+import { DatabaseServer } from "../servers/DatabaseServer";
 import { HashUtil } from "../utils/HashUtil";
 import { JsonUtil } from "../utils/JsonUtil";
 import { RandomUtil } from "../utils/RandomUtil";
-import { InventoryHelper } from "./InventoryHelper";
 import { ContainerHelper } from "./ContainerHelper";
+import { InventoryHelper } from "./InventoryHelper";
 import { ItemHelper } from "./ItemHelper";
-import { ILogger } from "../models/spt/utils/ILogger";
 declare class BotGeneratorHelper {
     private logger;
     private jsonUtil;

TypeScript/1LogToConsole/types/helpers/ExtendedProfileHelper.d.ts

@@ -1,16 +1,16 @@
+import { BotGenerator } from "../generators/BotGenerator";
+import { IPmcData } from "../models/eft/common/IPmcData";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
 import { FenceService } from "../services/FenceService";
-import { IPmcData } from "../models/eft/common/IPmcData";
 import { JsonUtil } from "../utils/JsonUtil";
 import { TimeUtil } from "../utils/TimeUtil";
+import { Watermark } from "../utils/Watermark";
 import { ItemHelper } from "./ItemHelper";
-import { IWatermark } from "../models/spt/utils/IWatermark";
-import { BotGenerator } from "../generators/BotGenerator";
 import { ProfileHelper } from "./ProfileHelper";
 export declare class ExtendedProfileHelper extends ProfileHelper {
     private botGenerator;
-    constructor(jsonUtil: JsonUtil, watermark: IWatermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator);
+    constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator);
     generatePlayerScav(sessionID: string): IPmcData;
     private getScavSkills;
     private removeSecureContainer;

TypeScript/1LogToConsole/types/helpers/HideoutHelper.d.ts

@@ -1,21 +1,21 @@
-import { DatabaseServer } from "../servers/DatabaseServer";
 import { IPmcData, Production, Productive } from "../models/eft/common/IPmcData";
-import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData";
-import { StageBonus } from "../models/eft/hideout/IHideoutArea";
-import { TimeUtil } from "../utils/TimeUtil";
-import { RandomUtil } from "../utils/RandomUtil";
-import { HashUtil } from "../utils/HashUtil";
-import { ProfileHelper } from "./ProfileHelper";
-import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { ConfigServer } from "../servers/ConfigServer";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { PlayerService } from "../services/PlayerService";
-import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData";
-import { InventoryHelper } from "./InventoryHelper";
 import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
+import { StageBonus } from "../models/eft/hideout/IHideoutArea";
+import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData";
+import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData";
+import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { ILogger } from "../models/spt/utils/ILogger";
+import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { ConfigServer } from "../servers/ConfigServer";
+import { DatabaseServer } from "../servers/DatabaseServer";
+import { PlayerService } from "../services/PlayerService";
+import { HashUtil } from "../utils/HashUtil";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { RandomUtil } from "../utils/RandomUtil";
+import { TimeUtil } from "../utils/TimeUtil";
+import { InventoryHelper } from "./InventoryHelper";
+import { ProfileHelper } from "./ProfileHelper";
 export declare class HideoutHelper {
     private logger;
     private hashUtil;

TypeScript/1LogToConsole/types/helpers/InventoryHelper.d.ts

@@ -1,21 +1,22 @@
 import { IPmcData } from "../models/eft/common/IPmcData";
 import { Item } from "../models/eft/common/tables/IItem";
+import { IAddItemRequestData } from "../models/eft/inventory/IAddItemRequestData";
+import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData";
+import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData";
+import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
+import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { FenceService } from "../services/FenceService";
-import { ContainerHelper } from "./ContainerHelper";
-import { ItemHelper } from "./ItemHelper";
-import { PaymentHelper } from "./PaymentHelper";
-import { ProfileHelper } from "./ProfileHelper";
-import { DialogueHelper } from "./DialogueHelper";
 import { HashUtil } from "../utils/HashUtil";
 import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { JsonUtil } from "../utils/JsonUtil";
-import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData";
+import { ContainerHelper } from "./ContainerHelper";
-import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData";
+import { DialogueHelper } from "./DialogueHelper";
-import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMergeRequestData";
+import { ItemHelper } from "./ItemHelper";
-import { ILogger } from "../models/spt/utils/ILogger";
+import { PaymentHelper } from "./PaymentHelper";
+import { ProfileHelper } from "./ProfileHelper";
 import { TraderAssortHelper } from "./TraderAssortHelper";
 export interface OwnerInventoryItems {
     from: Item[];
@@ -39,7 +40,7 @@ export declare class InventoryHelper {
     private configServer;
     private inventoryConfig;
     constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, httpResponse: HttpResponseUtil, fenceService: FenceService, databaseServer: DatabaseServer, paymentHelper: PaymentHelper, traderAssortHelper: TraderAssortHelper, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, containerHelper: ContainerHelper, profileHelper: ProfileHelper, configServer: ConfigServer);
-    addItem(pmcData: IPmcData, body: any, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse;
+    addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse;
     removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse;
     getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record<number, number>;
     private getSizeByInventoryItemHash;

TypeScript/1LogToConsole/types/helpers/ProfileHelper.d.ts

@@ -1,22 +1,22 @@
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { SaveServer } from "../servers/SaveServer";
-import { FenceService } from "../services/FenceService";
 import { IPmcData, Stats } from "../models/eft/common/IPmcData";
 import { IAkiProfile } from "../models/eft/profile/IAkiProfile";
 import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData";
+import { DatabaseServer } from "../servers/DatabaseServer";
+import { SaveServer } from "../servers/SaveServer";
+import { FenceService } from "../services/FenceService";
 import { JsonUtil } from "../utils/JsonUtil";
 import { TimeUtil } from "../utils/TimeUtil";
+import { Watermark } from "../utils/Watermark";
 import { ItemHelper } from "./ItemHelper";
-import { IWatermark } from "../models/spt/utils/IWatermark";
 export declare class ProfileHelper {
     protected jsonUtil: JsonUtil;
-    protected watermark: IWatermark;
+    protected watermark: Watermark;
     protected timeUtil: TimeUtil;
     protected saveServer: SaveServer;
     protected databaseServer: DatabaseServer;
     protected itemHelper: ItemHelper;
     protected fenceService: FenceService;
-    constructor(jsonUtil: JsonUtil, watermark: IWatermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService);
+    constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService);
     resetProfileQuestCondition(sessionID: string, conditionId: string): void;
     getCompleteProfile(sessionID: string): IPmcData[];
     isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean;

TypeScript/1LogToConsole/types/helpers/QuestHelper.d.ts

@@ -1,21 +1,21 @@
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
-import { HashUtil } from "../utils/HashUtil";
-import { JsonUtil } from "../utils/JsonUtil";
-import { TimeUtil } from "../utils/TimeUtil";
-import { ItemHelper } from "./ItemHelper";
-import { ProfileHelper } from "./ProfileHelper";
-import { DialogueHelper } from "./DialogueHelper";
-import { PaymentHelper } from "./PaymentHelper";
-import { TraderHelper } from "./TraderHelper";
 import { IPmcData, Quest } from "../models/eft/common/IPmcData";
 import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../models/eft/common/tables/IQuest";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData";
 import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData";
-import { ConfigServer } from "../servers/ConfigServer";
-import { RagfairServerHelper } from "./RagfairServerHelper";
 import { ILogger } from "../models/spt/utils/ILogger";
+import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { ConfigServer } from "../servers/ConfigServer";
+import { DatabaseServer } from "../servers/DatabaseServer";
+import { HashUtil } from "../utils/HashUtil";
+import { JsonUtil } from "../utils/JsonUtil";
+import { TimeUtil } from "../utils/TimeUtil";
+import { DialogueHelper } from "./DialogueHelper";
+import { ItemHelper } from "./ItemHelper";
+import { PaymentHelper } from "./PaymentHelper";
+import { ProfileHelper } from "./ProfileHelper";
+import { RagfairServerHelper } from "./RagfairServerHelper";
+import { TraderHelper } from "./TraderHelper";
 export declare class QuestHelper {
     private logger;
     private jsonUtil;

TypeScript/1LogToConsole/types/helpers/RagfairHelper.d.ts

@@ -1,16 +1,16 @@
-import { JsonUtil } from "../utils/JsonUtil";
 import { Item } from "../models/eft/common/tables/IItem";
 import { ITraderAssort } from "../models/eft/common/tables/ITrader";
 import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult";
 import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData";
+import { ILogger } from "../models/spt/utils/ILogger";
+import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
+import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService";
+import { JsonUtil } from "../utils/JsonUtil";
 import { HandbookHelper } from "./HandbookHelper";
 import { ItemHelper } from "./ItemHelper";
-import { RagfairLinkedItemService } from "../services/RagfairLinkedItemService";
-import { UtilityHelper } from "./UtilityHelper";
-import { ConfigServer } from "../servers/ConfigServer";
-import { ILogger } from "../models/spt/utils/ILogger";
 import { TraderAssortHelper } from "./TraderAssortHelper";
+import { UtilityHelper } from "./UtilityHelper";
 export declare class RagfairHelper {
     private logger;
     private jsonUtil;

TypeScript/1LogToConsole/types/helpers/RagfairOfferHelper.d.ts

@@ -1,23 +1,23 @@
-import { HashUtil } from "../utils/HashUtil";
-import { TimeUtil } from "../utils/TimeUtil";
 import { IPmcData } from "../models/eft/common/IPmcData";
 import { ITraderAssort } from "../models/eft/common/tables/ITrader";
 import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer";
 import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData";
+import { ILogger } from "../models/spt/utils/ILogger";
+import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";
 import { RagfairOfferService } from "../services/RagfairOfferService";
+import { HashUtil } from "../utils/HashUtil";
+import { TimeUtil } from "../utils/TimeUtil";
 import { DialogueHelper } from "./DialogueHelper";
 import { ItemHelper } from "./ItemHelper";
 import { PaymentHelper } from "./PaymentHelper";
 import { PresetHelper } from "./PresetHelper";
 import { ProfileHelper } from "./ProfileHelper";
-import { RagfairServerHelper } from "./RagfairServerHelper";
-import { ConfigServer } from "../servers/ConfigServer";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
-import { RagfairSortHelper } from "./RagfairSortHelper";
 import { RagfairHelper } from "./RagfairHelper";
-import { ILogger } from "../models/spt/utils/ILogger";
+import { RagfairServerHelper } from "./RagfairServerHelper";
+import { RagfairSortHelper } from "./RagfairSortHelper";
 export declare class RagfairOfferHelper {
     private logger;
     private timeUtil;

TypeScript/1LogToConsole/types/helpers/RagfairServerHelper.d.ts

@@ -1,15 +1,15 @@
-import { SaveServer } from "../servers/SaveServer";
-import { DatabaseServer } from "../servers/DatabaseServer";
-import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
-import { ItemHelper } from "./ItemHelper";
-import { ProfileHelper } from "./ProfileHelper";
 import { MemberCategory } from "../models/eft/common/MemberCategory";
+import { Item } from "../models/eft/common/tables/IItem";
+import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
 import { ConfigServer } from "../servers/ConfigServer";
+import { DatabaseServer } from "../servers/DatabaseServer";
+import { SaveServer } from "../servers/SaveServer";
+import { HashUtil } from "../utils/HashUtil";
+import { JsonUtil } from "../utils/JsonUtil";
 import { RandomUtil } from "../utils/RandomUtil";
 import { DialogueHelper } from "./DialogueHelper";
-import { Item } from "../models/eft/common/tables/IItem";
+import { ItemHelper } from "./ItemHelper";
-import { JsonUtil } from "../utils/JsonUtil";
+import { ProfileHelper } from "./ProfileHelper";
-import { HashUtil } from "../utils/HashUtil";
 export declare class RagfairServerHelper {
     private randomUtil;
     private hashUtil;

TypeScript/1LogToConsole/types/helpers/TradeHelper.d.ts

@@ -1,16 +1,16 @@
-import { RagfairServer } from "../servers/RagfairServer";
 import { InventoryHelper } from "../helpers/InventoryHelper";
+import { ItemHelper } from "../helpers/ItemHelper";
 import { TraderHelper } from "../helpers/TraderHelper";
-import { FenceService } from "../services/FenceService";
-import { PaymentService } from "../services/PaymentService";
 import { IPmcData } from "../models/eft/common/IPmcData";
+import { Upd } from "../models/eft/common/tables/IItem";
+import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData";
 import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData";
-import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
-import { Upd } from "../models/eft/common/tables/IItem";
-import { ItemHelper } from "../helpers/ItemHelper";
-import { ItemEventRouter } from "../routers/ItemEventRouter";
 import { ILogger } from "../models/spt/utils/ILogger";
+import { ItemEventRouter } from "../routers/ItemEventRouter";
+import { RagfairServer } from "../servers/RagfairServer";
+import { FenceService } from "../services/FenceService";
+import { PaymentService } from "../services/PaymentService";
 export declare class TradeHelper {
     private logger;
     private itemEventRouter;

TypeScript/1LogToConsole/types/loaders/DelayedModLoader.d.ts

@@ -1,10 +1,10 @@
-import { DependencyContainer } from 'tsyringe';
+import { DependencyContainer } from "tsyringe";
-import { VFS } from "../utils/VFS";
-import { InitialModLoader } from "./InitialModLoader";
-import { BundleLoader } from "./BundleLoader";
 import { HandbookController } from "../controllers/HandbookController";
 import { IModLoader } from "../models/spt/mod/IModLoader";
 import { ModCompilerService } from "../services/ModCompilerService";
+import { VFS } from "../utils/VFS";
+import { BundleLoader } from "./BundleLoader";
+import { InitialModLoader } from "./InitialModLoader";
 export declare class DelayedModLoader implements IModLoader {
     private bundleLoader;
     private handbookController;

TypeScript/1LogToConsole/types/loaders/InitialModLoader.d.ts

@@ -1,23 +1,21 @@
 import { DependencyContainer } from "tsyringe";
-import { JsonUtil } from "../utils/JsonUtil";
+import { IModLoader } from "../models/spt/mod/IModLoader";
-import { VFS } from "../utils/VFS";
 import { ILogger } from "../models/spt/utils/ILogger";
 import { ConfigServer } from "../servers/ConfigServer";
 import { ModCompilerService } from "../services/ModCompilerService";
-import { HashCacheService } from "../services/HashCacheService";
+import { JsonUtil } from "../utils/JsonUtil";
-import { IModLoader } from "../models/spt/mod/IModLoader";
+import { VFS } from "../utils/VFS";
 export declare class InitialModLoader implements IModLoader {
     private logger;
     private vfs;
     private jsonUtil;
     private modCompilerService;
-    private hashCacheService;
     private configServer;
     private readonly basepath;
     private imported;
     private onLoad;
     private akiConfig;
-    constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, hashCacheService: HashCacheService, configServer: ConfigServer);
+    constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, configServer: ConfigServer);
     load(container: DependencyContainer): Promise<void>;
     getBundles(local: boolean): string;
     getBundle(key: string, local: boolean): void;
@@ -29,7 +27,6 @@ export declare class InitialModLoader implements IModLoader {
     private executeMods;
     private sortModsLoadOrder;
     private addMod;
-    private compileModIfNeeded;
     private areModDependenciesFulfilled;
     private isModCompatible;
     private validMod;

TypeScript/1LogToConsole/types/models/eft/common/tables/IBotType.d.ts

@@ -100,6 +100,7 @@ export interface Generation {
 export interface ItemMinMax {
     grenades: MinMax;
     healing: MinMax;
+    stims: MinMax;
     looseLoot: MinMax;
     magazines: MinMax;
     specialItems: MinMax;

TypeScript/1LogToConsole/types/models/eft/inventory/IAddItemRequestData.d.ts

@@ -0,0 +1,4 @@
+export interface IAddItemRequestData {
+    tid: string;
+    items: any[];
+}

TypeScript/1LogToConsole/types/models/eft/match/IGetProfileRequestData.d.ts

@@ -0,0 +1,3 @@
+export interface IGetProfileRequestData {
+    profileId: string;
+}

TypeScript/1LogToConsole/types/models/spt/utils/IWatermark.d.ts

@@ -1,22 +0,0 @@
-export interface IWatermarkLocale {
-    getLocale(): string;
-    getDescription(): string[];
-    getWarning(): string[];
-}
-export interface IWatermark {
-    initialize(): void;
-    getVersionTag(): string;
-    /**
-     * Set window title
-     */
-    setTitle(): void;
-    /**
-     * Reset console cursor to top
-     */
-    resetCursor(): void;
-    /**
-     * Draw the watermark
-     */
-    draw(): void;
-    getVersionLabel(): string;
-}

TypeScript/1LogToConsole/types/routers/dynamic/BotDynamicRouter.d.ts

@@ -1,9 +1,6 @@
 import { BotCallbacks } from "../../callbacks/BotCallbacks";
-import { DynamicRouter, HandledRoute } from "../../di/Router";
+import { DynamicRouter } from "../../di/Router";
 export declare class BotDynamicRouter extends DynamicRouter {
     private botCallbacks;
     constructor(botCallbacks: BotCallbacks);
-    private readonly _routes;
-    getHandledRoutes(): HandledRoute[];
-    handleDynamic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/dynamic/BundleDynamicRouter.d.ts

@@ -1,9 +1,6 @@
 import { BundleCallbacks } from "../../callbacks/BundleCallbacks";
-import { DynamicRouter, HandledRoute } from "../../di/Router";
+import { DynamicRouter } from "../../di/Router";
 export declare class BundleDynamicRouter extends DynamicRouter {
     private bundleCallbacks;
     constructor(bundleCallbacks: BundleCallbacks);
-    private readonly _routes;
-    getHandledRoutes(): HandledRoute[];
-    handleDynamic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/dynamic/CustomizationDynamicRouter.d.ts

@@ -1,9 +1,6 @@
 import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks";
-import { DynamicRouter, HandledRoute } from "../../di/Router";
+import { DynamicRouter } from "../../di/Router";
 export declare class CustomizationDynamicRouter extends DynamicRouter {
     private customizationCallbacks;
     constructor(customizationCallbacks: CustomizationCallbacks);
-    private readonly _routes;
-    getHandledRoutes(): HandledRoute[];
-    handleDynamic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/dynamic/DataDynamicRouter.d.ts

@@ -1,9 +1,6 @@
 import { DataCallbacks } from "../../callbacks/DataCallbacks";
-import { DynamicRouter, HandledRoute } from "../../di/Router";
+import { DynamicRouter } from "../../di/Router";
 export declare class DataDynamicRouter extends DynamicRouter {
     private dataCallbacks;
     constructor(dataCallbacks: DataCallbacks);
-    private readonly _routes;
-    getHandledRoutes(): HandledRoute[];
-    handleDynamic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/dynamic/HttpDynamicRouter.d.ts

@@ -1,9 +1,6 @@
-import { DynamicRouter, HandledRoute } from "../../di/Router";
+import { DynamicRouter } from "../../di/Router";
 import { ImageRouter } from "../ImageRouter";
 export declare class HttpDynamicRouter extends DynamicRouter {
     private imageRouter;
     constructor(imageRouter: ImageRouter);
-    private readonly _routes;
-    getHandledRoutes(): HandledRoute[];
-    handleDynamic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/dynamic/InraidDynamicRouter.d.ts

@@ -1,10 +1,7 @@
 import { InraidCallbacks } from "../../callbacks/InraidCallbacks";
-import { DynamicRouter, HandledRoute } from "../../di/Router";
+import { DynamicRouter } from "../../di/Router";
 export declare class InraidDynamicRouter extends DynamicRouter {
     private inraidCallbacks;
     constructor(inraidCallbacks: InraidCallbacks);
-    private readonly _routes;
     getTopLevelRoute(): string;
-    getHandledRoutes(): HandledRoute[];
-    handleDynamic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/dynamic/LocationDynamicRouter.d.ts

@@ -1,10 +1,7 @@
 import { LocationCallbacks } from "../../callbacks/LocationCallbacks";
-import { DynamicRouter, HandledRoute } from "../../di/Router";
+import { DynamicRouter } from "../../di/Router";
 export declare class LocationDynamicRouter extends DynamicRouter {
     private locationCallbacks;
     constructor(locationCallbacks: LocationCallbacks);
-    private readonly _routes;
     getTopLevelRoute(): string;
-    getHandledRoutes(): HandledRoute[];
-    handleDynamic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/dynamic/NotifierDynamicRouter.d.ts

@@ -1,9 +1,6 @@
 import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks";
-import { DynamicRouter, HandledRoute } from "../../di/Router";
+import { DynamicRouter } from "../../di/Router";
 export declare class NotifierDynamicRouter extends DynamicRouter {
     private notifierCallbacks;
     constructor(notifierCallbacks: NotifierCallbacks);
-    private readonly _routes;
-    getHandledRoutes(): HandledRoute[];
-    handleDynamic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/dynamic/TraderDynamicRouter.d.ts

@@ -1,9 +1,6 @@
 import { TraderCallbacks } from "../../callbacks/TraderCallbacks";
-import { DynamicRouter, HandledRoute } from "../../di/Router";
+import { DynamicRouter } from "../../di/Router";
 export declare class TraderDynamicRouter extends DynamicRouter {
     private traderCallbacks;
     constructor(traderCallbacks: TraderCallbacks);
-    private readonly _routes;
-    getHandledRoutes(): HandledRoute[];
-    handleDynamic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/serializers/NotifySerializer.d.ts

@@ -1,7 +1,7 @@
-import { IHttpServer } from "../../models/spt/server/IHttpServer";
 import { NotifierController } from "../../controllers/NotifierController";
 import { Serializer } from "../../di/Serializer";
 import { HttpServerHelper } from "../../helpers/HttpServerHelper";
+import { IHttpServer } from "../../models/spt/server/IHttpServer";
 export declare class NotifySerializer extends Serializer {
     private notifierController;
     private httpServerHelper;

TypeScript/1LogToConsole/types/routers/static/BotStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { BotCallbacks } from "../../callbacks/BotCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class BotStaticRouter extends StaticRouter {
     private botCallbacks;
     constructor(botCallbacks: BotCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/static/BundleStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { BundleCallbacks } from "../../callbacks/BundleCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class BundleStaticRouter extends StaticRouter {
     private bundleCallbacks;
     constructor(bundleCallbacks: BundleCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/static/CustomizationStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class CustomizationStaticRouter extends StaticRouter {
     private customizationCallbacks;
     constructor(customizationCallbacks: CustomizationCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/static/DataStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { DataCallbacks } from "../../callbacks/DataCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class DataStaticRouter extends StaticRouter {
     private dataCallbacks;
     constructor(dataCallbacks: DataCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/static/DialogStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { DialogueCallbacks } from "../../callbacks/DialogueCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class DialogStaticRouter extends StaticRouter {
     private dialogueCallbacks;
     constructor(dialogueCallbacks: DialogueCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/static/GameStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { GameCallbacks } from "../../callbacks/GameCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class GameStaticRouter extends StaticRouter {
     private gameCallbacks;
     constructor(gameCallbacks: GameCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/static/HealthStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { HealthCallbacks } from "../../callbacks/HealthCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class HealthStaticRouter extends StaticRouter {
     private healthCallbacks;
     constructor(healthCallbacks: HealthCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/static/InraidStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { InraidCallbacks } from "../../callbacks/InraidCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class InraidStaticRouter extends StaticRouter {
     private inraidCallbacks;
     constructor(inraidCallbacks: InraidCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/static/InsuranceStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class InsuranceStaticRouter extends StaticRouter {
     private insuranceCallbacks;
     constructor(insuranceCallbacks: InsuranceCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/static/ItemEventStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { ItemEventCallbacks } from "../../callbacks/ItemEventCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class ItemEventStaticRouter extends StaticRouter {
     private itemEventCallbacks;
     constructor(itemEventCallbacks: ItemEventCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/static/LauncherStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { LauncherCallbacks } from "../../callbacks/LauncherCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class LauncherStaticRouter extends StaticRouter {
     private launcherCallbacks;
     constructor(launcherCallbacks: LauncherCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): string;
 }

TypeScript/1LogToConsole/types/routers/static/LocationStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { LocationCallbacks } from "../../callbacks/LocationCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class LocationStaticRouter extends StaticRouter {
     private locationCallbacks;
     constructor(locationCallbacks: LocationCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/static/MatchStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { MatchCallbacks } from "../../callbacks/MatchCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class MatchStaticRouter extends StaticRouter {
     private matchCallbacks;
     constructor(matchCallbacks: MatchCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/static/NotifierStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class NotifierStaticRouter extends StaticRouter {
     private notifierCallbacks;
     constructor(notifierCallbacks: NotifierCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/static/PresetStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class PresetStaticRouter extends StaticRouter {
     private presetCallbacks;
     constructor(presetCallbacks: PresetBuildCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/static/ProfileStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { ProfileCallbacks } from "../../callbacks/ProfileCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class ProfileStaticRouter extends StaticRouter {
     private profileCallbacks;
     constructor(profileCallbacks: ProfileCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/static/QuestStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { QuestCallbacks } from "../../callbacks/QuestCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class QuestStaticRouter extends StaticRouter {
     private questCallbacks;
     constructor(questCallbacks: QuestCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/static/RagfairStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class RagfairStaticRouter extends StaticRouter {
     private ragfairCallbacks;
     constructor(ragfairCallbacks: RagfairCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/static/TraderStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { TraderCallbacks } from "../../callbacks/TraderCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class TraderStaticRouter extends StaticRouter {
     private traderCallbacks;
     constructor(traderCallbacks: TraderCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/routers/static/WeatherStaticRouter.d.ts

@@ -1,8 +1,6 @@
 import { WeatherCallbacks } from "../../callbacks/WeatherCallbacks";
-import { HandledRoute, StaticRouter } from "../../di/Router";
+import { StaticRouter } from "../../di/Router";
 export declare class WeatherStaticRouter extends StaticRouter {
     private weatherCallbacks;
     constructor(weatherCallbacks: WeatherCallbacks);
-    getHandledRoutes(): HandledRoute[];
-    handleStatic(url: string, info: any, sessionID: string, output: string): any;
 }

TypeScript/1LogToConsole/types/servers/HttpServer.d.ts

@@ -1,19 +1,21 @@
 /// <reference types="node" />
-import { HttpRouter } from "../routers/HttpRouter";
-import { JsonUtil } from "../utils/JsonUtil";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
-import { DatabaseServer } from "./DatabaseServer";
-import { Serializer } from "../di/Serializer";
 import http, { ServerResponse } from "http";
-import { INotification } from "../models/eft/notifier/INotifier";
+import { Serializer } from "../di/Serializer";
-import { NotifierHelper } from "../helpers/NotifierHelper";
-import { ConfigServer } from "./ConfigServer";
-import { ILogger } from "../models/spt/utils/ILogger";
 import { HttpServerHelper } from "../helpers/HttpServerHelper";
+import { NotifierHelper } from "../helpers/NotifierHelper";
+import { INotification } from "../models/eft/notifier/INotifier";
 import { IHttpServer } from "../models/spt/server/IHttpServer";
+import { ILogger } from "../models/spt/utils/ILogger";
+import { HttpRouter } from "../routers/HttpRouter";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
+import { JsonUtil } from "../utils/JsonUtil";
+import { RandomUtil } from "../utils/RandomUtil";
+import { ConfigServer } from "./ConfigServer";
+import { DatabaseServer } from "./DatabaseServer";
 export declare class HttpServer implements IHttpServer {
     private httpRouter;
     private logger;
+    private randomUtil;
     private jsonUtil;
     private httpResponse;
     private databaseServer;
@@ -21,7 +23,8 @@ export declare class HttpServer implements IHttpServer {
     private httpServerHelper;
     private serializers;
     private configServer;
-    constructor(httpRouter: HttpRouter, logger: ILogger, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer);
+    constructor(httpRouter: HttpRouter, // TODO: delay required
+    logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer);
     private buffers;
     private onReceive;
     private onRespond;
@@ -39,5 +42,6 @@ export declare class HttpServer implements IHttpServer {
     sendResponse(sessionID: string, req: any, resp: any, body: Buffer): void;
     handleRequest(req: http.IncomingMessage, resp: http.ServerResponse): void;
     load(): void;
+    private getRandomisedMessage;
     wsOnConnection(ws: any, req: any): void;
 }

TypeScript/1LogToConsole/types/services/InsuranceService.d.ts

@@ -1,10 +1,10 @@
+import { DialogueHelper } from "../helpers/DialogueHelper";
+import { SecureContainerHelper } from "../helpers/SecureContainerHelper";
+import { TraderHelper } from "../helpers/TraderHelper";
 import { IPmcData } from "../models/eft/common/IPmcData";
 import { Item } from "../models/eft/common/tables/IItem";
 import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData";
 import { ILogger } from "../models/spt/utils/ILogger";
-import { DialogueHelper } from "../helpers/DialogueHelper";
-import { SecureContainerHelper } from "../helpers/SecureContainerHelper";
-import { TraderHelper } from "../helpers/TraderHelper";
 import { ConfigServer } from "../servers/ConfigServer";
 import { DatabaseServer } from "../servers/DatabaseServer";
 import { SaveServer } from "../servers/SaveServer";

TypeScript/1LogToConsole/types/services/ModCompilerService.d.ts

@@ -1,10 +1,12 @@
 import { ILogger } from "../models/spt/utils/ILogger";
 import { VFS } from "../utils/VFS";
+import { HashCacheService } from "./HashCacheService";
 export declare class ModCompilerService {
     private logger;
+    private hashCacheService;
     private vfs;
-    constructor(logger: ILogger, vfs: VFS);
+    constructor(logger: ILogger, hashCacheService: HashCacheService, vfs: VFS);
-    compileMod(path: string, modTypeScriptFiles: string[]): Promise<void>;
+    compileMod(modName: string, path: string, modTypeScriptFiles: string[]): Promise<void>;
     private compile;
     private areFilesReady;
     private delay;

TypeScript/1LogToConsole/types/services/PaymentService.d.ts

@@ -1,15 +1,15 @@
+import { HandbookHelper } from "../helpers/HandbookHelper";
 import { InventoryHelper } from "../helpers/InventoryHelper";
 import { ItemHelper } from "../helpers/ItemHelper";
-import { DatabaseServer } from "../servers/DatabaseServer";
+import { PaymentHelper } from "../helpers/PaymentHelper";
+import { TraderHelper } from "../helpers/TraderHelper";
 import { IPmcData } from "../models/eft/common/IPmcData";
 import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse";
 import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData";
 import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData";
-import { TraderHelper } from "../helpers/TraderHelper";
-import { PaymentHelper } from "../helpers/PaymentHelper";
-import { HandbookHelper } from "../helpers/HandbookHelper";
-import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 import { ILogger } from "../models/spt/utils/ILogger";
+import { DatabaseServer } from "../servers/DatabaseServer";
+import { HttpResponseUtil } from "../utils/HttpResponseUtil";
 export declare class PaymentService {
     private logger;
     private httpResponse;

TypeScript/1LogToConsole/types/services/PlayerService.d.ts

@@ -1,7 +1,7 @@
-import { DatabaseServer } from "../servers/DatabaseServer";
 import { IPmcData } from "../models/eft/common/IPmcData";
 import { IPlayerIncrementSkillLevelRequestData } from "../models/eft/player/IPlayerIncrementSkillLevelRequestData";
 import { ILogger } from "../models/spt/utils/ILogger";
+import { DatabaseServer } from "../servers/DatabaseServer";
 export declare class PlayerService {
     private logger;
     private databaseServer;

TypeScript/1LogToConsole/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts

@@ -0,0 +1,6 @@
+import { DynamicRouter, RouteAction } from "../../../di/Router";
+export declare class DynamicRouterMod extends DynamicRouter {
+    private topLevelRoute;
+    constructor(routes: RouteAction[], topLevelRoute: string);
+    getTopLevelRoute(): string;
+}

TypeScript/1LogToConsole/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts

@@ -0,0 +1,7 @@
+import { DependencyContainer } from "tsyringe";
+import { RouteAction } from "../../../di/Router";
+export declare class DynamicRouterModService {
+    private container;
+    constructor(container: DependencyContainer);
+    registerDynamicRouter(name: string, routes: RouteAction[], topLevelRoute: string): void;
+}

TypeScript/1LogToConsole/types/services/mod/onLoad/OnLoadMod.d.ts

@@ -0,0 +1,8 @@
+import { OnLoad } from "../../../di/OnLoad";
+export declare class OnLoadMod extends OnLoad {
+    private onLoadOverride;
+    private getRouteOverride;
+    constructor(onLoadOverride: () => void, getRouteOverride: () => string);
+    onLoad(): void;
+    getRoute(): string;
+}

TypeScript/1LogToConsole/types/services/mod/onLoad/OnLoadModService.d.ts

@@ -0,0 +1,6 @@
+import { DependencyContainer } from "tsyringe";
+export declare class OnLoadModService {
+    private container;
+    constructor(container: DependencyContainer);
+    registerOnLoad(name: string, onLoad: () => void, getRoute: () => string): void;
+}

TypeScript/1LogToConsole/types/services/mod/onUpdate/OnUpdateMod.d.ts

@@ -0,0 +1,8 @@
+import { OnUpdate } from "../../../di/OnUpdate";
+export declare class OnUpdateMod extends OnUpdate {
+    private onUpdateOverride;
+    private getRouteOverride;
+    constructor(onUpdateOverride: (timeSinceLastRun: number) => boolean, getRouteOverride: () => string);
+    onUpdate(timeSinceLastRun: number): boolean;
+    getRoute(): string;
+}

TypeScript/1LogToConsole/types/services/mod/onUpdate/OnUpdateModService.d.ts

@@ -0,0 +1,6 @@
+import { DependencyContainer } from "tsyringe";
+export declare class OnUpdateModService {
+    private container;
+    constructor(container: DependencyContainer);
+    registerOnUpdate(name: string, onUpdate: (timeSinceLastRun: number) => boolean, getRoute: () => string): void;
+}

TypeScript/1LogToConsole/types/services/mod/staticRouter/StaticRouterMod.d.ts

@@ -0,0 +1,6 @@
+import { RouteAction, StaticRouter } from "../../../di/Router";
+export declare class StaticRouterMod extends StaticRouter {
+    private topLevelRoute;
+    constructor(routes: RouteAction[], topLevelRoute: string);
+    getTopLevelRoute(): string;
+}

TypeScript/1LogToConsole/types/services/mod/staticRouter/StaticRouterModService.d.ts

@@ -0,0 +1,7 @@
+import { DependencyContainer } from "tsyringe";
+import { RouteAction } from "../../../di/Router";
+export declare class StaticRouterModService {
+    private container;
+    constructor(container: DependencyContainer);
+    registerStaticRouter(name: string, routes: RouteAction[], topLevelRoute: string): void;
+}

TypeScript/1LogToConsole/types/utils/AyncQueue.d.ts

@@ -1,7 +1,7 @@
 import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue";
 import { ICommand } from "../models/spt/utils/ICommand";
 export declare class AsyncQueue implements IAsyncQueue {
-    commandsQueue: ICommand[];
+    private commandsQueue;
     constructor();
     waitFor(command: ICommand): Promise<any>;
 }