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

Handle critical errors on mod load better - show player error in console instead of closing it on error

Browse Source
This commit is contained in:
Dev 2023-10-19 15:25:52 +01:00
parent 6589bcc0a2
commit 5af4abab91
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
project/src/loaders/ModLoadOrder.ts
View File

@ -1,5 +1,6 @@
import { inject, injectable } from "tsyringe"; import { inject, injectable } from "tsyringe";
import { ErrorHandler } from "../ErrorHandler";
import { IPackageJsonData } from "../models/spt/mod/IPackageJsonData"; import { IPackageJsonData } from "../models/spt/mod/IPackageJsonData";
import { ILogger } from "../models/spt/utils/ILogger"; import { ILogger } from "../models/spt/utils/ILogger";
import { LocalisationService } from "../services/LocalisationService"; import { LocalisationService } from "../services/LocalisationService";
@ -106,7 +107,7 @@ export class ModLoadOrder
protected getLoadOrderRecursive(mod: string, visited: Set<string>): void protected getLoadOrderRecursive(mod: string, visited: Set<string>): void
{ {
// validate package // Validate package
if (this.loadOrder.has(mod)) if (this.loadOrder.has(mod))
{ {
return; return;
@ -114,21 +115,23 @@ export class ModLoadOrder
if (visited.has(mod)) if (visited.has(mod))
{ {
// front: white, back: red // Front: white, back: red
this.logger.error(this.localisationService.getText("modloader-cyclic_dependency")); const errorMessage = this.localisationService.getText("modloader-cyclic_dependency");
this.logger.error(errorMessage);
// additional info // Additional info to help debug
this.logger.debug(this.localisationService.getText("modloader-checking_mod", mod)); this.logger.debug(this.localisationService.getText("modloader-checking_mod", mod));
this.logger.debug(`${this.localisationService.getText("modloader-checked")}:`); this.logger.debug(`${this.localisationService.getText("modloader-checked")}:`);
this.logger.debug(JSON.stringify(this.loadOrder, null, "\t")); this.logger.debug(JSON.stringify(this.loadOrder, null, "\t"));
this.logger.debug(`${this.localisationService.getText("modloader-visited")}:`); this.logger.debug(`${this.localisationService.getText("modloader-visited")}:`);
this.logger.debug(JSON.stringify(visited, null, "\t")); this.logger.debug(JSON.stringify(visited, null, "\t"));
// wait for input // Wait for input
process.exit(1); const errorHandler = new ErrorHandler();
errorHandler.handleCriticalError({errorMessage});
} }
// check dependencies // Check dependencies
if (!this.modsAvailable.has(mod)) if (!this.modsAvailable.has(mod))
{ {
this.logger.error(this.localisationService.getText("modloader-missing_dependency")); this.logger.error(this.localisationService.getText("modloader-missing_dependency"));
@ -148,8 +151,10 @@ export class ModLoadOrder
{ {
if (this.modsAvailable.get(modAfter)?.loadAfter?.includes(mod)) if (this.modsAvailable.get(modAfter)?.loadAfter?.includes(mod))
{ {
this.logger.error(this.localisationService.getText("modloader-load_order_conflict", {modOneName: mod, modTwoName: modAfter})); const errorMessage = this.localisationService.getText("modloader-load_order_conflict", {modOneName: mod, modTwoName: modAfter});
process.exit(1); this.logger.error(errorMessage);
const errorHandler = new ErrorHandler();
errorHandler.handleCriticalError(errorMessage);
} }
dependencies.add(modAfter); dependencies.add(modAfter);