diff --git a/index.js b/index.js index b8cd1ef..5c039ae 100644 --- a/index.js +++ b/index.js @@ -19,7 +19,7 @@ module.exports.BdsSystemInfo = require("./src/lib/BdsSystemInfo"); if (process.env.ShowLoadTime) console.timeEnd("Bds Maneger Core: System Info"); if (process.env.ShowLoadTime) console.time("Bds Maneger Core: Network"); -module.exports.BdsNetwork = require("./src/BdsNetwork") +module.exports.BdsNetwork = require("./src/BdsNetwork"); if (process.env.ShowLoadTime) console.timeEnd("Bds Maneger Core: Network"); if (process.env.ShowLoadTime) console.time("Bds Maneger Core: Backups"); diff --git a/package-lock.json b/package-lock.json index 60e4cd0..58487dd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -47,6 +47,7 @@ "@actions/core": "^1.5.0", "chai": "^4.3.4", "eslint": "^8.0.0", + "json-schema": ">=0.4.0", "mocha": "^9.1.3", "nodemon": "^2.0.12" }, @@ -2936,9 +2937,10 @@ "dev": true }, "node_modules/json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", + "dev": true }, "node_modules/json-schema-traverse": { "version": "0.4.1", @@ -3019,6 +3021,11 @@ "verror": "1.10.0" } }, + "node_modules/jsprim/node_modules/json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + }, "node_modules/jssha": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/jssha/-/jssha-2.4.1.tgz", @@ -8298,9 +8305,10 @@ "dev": true }, "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", + "dev": true }, "json-schema-traverse": { "version": "0.4.1", @@ -8371,6 +8379,13 @@ "extsprintf": "1.3.0", "json-schema": "0.2.3", "verror": "1.10.0" + }, + "dependencies": { + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + } } }, "jssha": { diff --git a/package.json b/package.json index 64aab94..6312546 100644 --- a/package.json +++ b/package.json @@ -82,6 +82,7 @@ "chai": "^4.3.4", "eslint": "^8.0.0", "mocha": "^9.1.3", - "nodemon": "^2.0.12" + "nodemon": "^2.0.12", + "json-schema": ">=0.4.0" } } diff --git a/src/BdsManegerServer.js b/src/BdsManegerServer.js index 93c361d..2a4f1a8 100644 --- a/src/BdsManegerServer.js +++ b/src/BdsManegerServer.js @@ -99,7 +99,7 @@ module.exports.StartServer = function start() { else throw Error("Bds Config Error") // Setup commands - let __ServerExec = child_process.exec("exit 0"); + let __ServerExec = child_process.exec("exit 0"); // lgtm [js/useless-assignment-to-local] if (SetupCommands.RunInCroot) throw new Error("RunInCroot is not supported yet"); else __ServerExec = child_process.execFile(SetupCommands.command, SetupCommands.args, { cwd: SetupCommands.cwd, diff --git a/src/BdsServersDownload.js b/src/BdsServersDownload.js index b30945b..deca8b0 100644 --- a/src/BdsServersDownload.js +++ b/src/BdsServersDownload.js @@ -39,6 +39,7 @@ async function PlatformVersionsV2(SelectPlatform = "") { } } } + // lgtm [js/useless-assignment-to-local] ResToRetuen = await Request.json(`https://raw.githubusercontent.com/The-Bds-Maneger/ServerVersions/main/${CurrentPlatform}/server.json`); return ResToRetuen; } diff --git a/src/api.js b/src/api.js index 8578712..0b03dd0 100644 --- a/src/api.js +++ b/src/api.js @@ -2,7 +2,7 @@ const os = require("os"); const fs = require("fs"); const path = require("path"); -const { randomUUID } = require("crypto") +const { randomUUID } = require("crypto"); // Bds Maneger Core const BdsManegerCore = require("../index"); const BdsSystemInfo = require("../src/lib/BdsSystemInfo"); @@ -225,7 +225,7 @@ app.get("/bds/info/server/whitelist", (req, res) => { }); } } else { - res.json(WgiteList) + res.json(WgiteList); } } else { res.status(400).json({ @@ -368,7 +368,7 @@ app.get("/players/kick", (req, res) => { if (!BdsChecks.token_verify(Token)) return res.status(400).json({ error: "Token is invalid" }); // Kick player - const RunnerServer = require("../../../BdsManegerServer").BdsRun; + const RunnerServer = require("./BdsManegerServer").BdsRun; try { RunnerServer.kick(Player, Text); res.json({ success: true }); @@ -387,7 +387,7 @@ app.get("/players/ban", (req, res) => { if (!BdsChecks.token_verify(Token)) return res.status(400).json({ error: "Token is invalid" }); // Ban player - const RunnerServer = require("../../../BdsManegerServer").BdsRun; + const RunnerServer = require("./BdsManegerServer").BdsRun; try { RunnerServer.ban(Player); res.json({ success: true }); @@ -406,7 +406,7 @@ app.get("/players/op", (req, res) => { if (!BdsChecks.token_verify(Token)) return res.status(400).json({ error: "Token is invalid" }); // Op player - const RunnerServer = require("../../../BdsManegerServer").BdsRun; + const RunnerServer = require("./BdsManegerServer").BdsRun; try { RunnerServer.op(Player); res.json({ success: true }); @@ -425,7 +425,7 @@ app.get("/players/deop", (req, res) => { if (!BdsChecks.token_verify(Token)) return res.status(400).json({ error: "Token is invalid" }); // Deop player - const RunnerServer = require("../../../BdsManegerServer").BdsRun; + const RunnerServer = require("./BdsManegerServer").BdsRun; try { RunnerServer.deop(Player); res.json({ success: true }); @@ -444,7 +444,7 @@ app.get("/players/say", (req, res) => { if (!BdsChecks.token_verify(Token)) return res.status(400).json({ error: "Token is invalid" }); // Say to Server - const RunnerServer = require("../../../BdsManegerServer").BdsRun; + const RunnerServer = require("./BdsManegerServer").BdsRun; try { RunnerServer.say(Text); res.json({ success: true }); @@ -463,7 +463,7 @@ app.get("/players/tp", (req, res) => { if (!BdsChecks.token_verify(Token)) return res.status(400).json({ error: "Token is invalid" }); // Tp player - const RunnerServer = require("../../../BdsManegerServer").BdsRun; + const RunnerServer = require("./BdsManegerServer").BdsRun; try { RunnerServer.tp(Player, { x: X,