470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.10.0-DEV' of https://dev.sp-tarkov.com/SPT/Server into 3.10.0-DEV

Browse Source
This commit is contained in:
Dev 2024-11-03 23:26:27 +00:00
commit df5019dec7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
project/src/callbacks/MatchCallbacks.ts
View File

@ -1,5 +1,6 @@
import { MatchController } from "@spt/controllers/MatchController"; import { MatchController } from "@spt/controllers/MatchController";
import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
import { IMetrics } from "@spt/models/eft/common/tables/IMatch";
import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
import { IEndLocalRaidRequestData } from "@spt/models/eft/match/IEndLocalRaidRequestData"; import { IEndLocalRaidRequestData } from "@spt/models/eft/match/IEndLocalRaidRequestData";
@ -137,8 +138,8 @@ export class MatchCallbacks {
} }
/** Handle client/getMetricsConfig */ /** Handle client/getMetricsConfig */
public getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData<string> { public getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData<IMetrics> {
return this.httpResponse.getBody(this.jsonUtil.serialize(this.databaseService.getMatch().metrics)); return this.httpResponse.getBody(this.databaseService.getMatch().metrics);
} }
/** /**

3
project/src/routers/static/MatchStaticRouter.ts
View File

@ -1,6 +1,7 @@
import { MatchCallbacks } from "@spt/callbacks/MatchCallbacks"; import { MatchCallbacks } from "@spt/callbacks/MatchCallbacks";
import { RouteAction, StaticRouter } from "@spt/di/Router"; import { RouteAction, StaticRouter } from "@spt/di/Router";
import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData"; import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
import { IMetrics } from "@spt/models/eft/common/tables/IMatch";
import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData"; import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData"; import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
import { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter"; import { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter";
@ -228,7 +229,7 @@ export class MatchStaticRouter extends StaticRouter {
info: any, info: any,
sessionID: string, sessionID: string,
output: string, output: string,
): Promise<IGetBodyResponseData<string>> => { ): Promise<IGetBodyResponseData<IMetrics>> => {
return this.matchCallbacks.getMetrics(url, info, sessionID); return this.matchCallbacks.getMetrics(url, info, sessionID);
}, },
), ),