bin/bds_maneger.js

@@ -89,9 +89,9 @@ async function StartServer(){
         process.exit(2)
     }
 }
-
+(async () => {
-// Bds Maneger CLI Help
+    // Bds Maneger CLI Help
-if (help) {
+    if (help) {
         let help = [
             "usage: bds_maneger [options]",
             "",
@@ -107,10 +107,10 @@ if (help) {
         ]
         console.log(cli_color.yellow(help.join("\n")));
         process.exit();
-}
+    }
 
-// Get Bds Core Version
+    // Get Bds Core Version
-if (version) {
+    if (version) {
         const Info = [
             `Bds Maneger Core version: ${bds.package_json.version}`,
             "",
@@ -126,9 +126,10 @@ if (version) {
         }
         console.log(Info.join("\n"));
         process.exit();
-}
+    }
 
-if (SystemCheck) {
+    if (SystemCheck) {
+        const { valid_platform } = await SystemInfo();
         var checkothearch = "";
         if (process.platform === "linux" && bds.arch !== "x64"){checkothearch = `qemu-x86_64-static is installed to emulate an x64 system: ${commandExits("qemu-x86_64-static")}\n`}
         if (process.platform === "android" && bds.arch !== "x64"){checkothearch = `qemu-x86_64 is installed to emulate an x64 system: ${commandExits("qemu-x86_64")}\n`}
@@ -150,11 +151,11 @@ if (SystemCheck) {
             "*",
             "**************************************************************",
             "* Servers currently available:",
-        `*   - Bedrock:          ${SystemInfo.valid_platform.bedrock}`,
+            `*   - Bedrock:          ${valid_platform.bedrock}`,
-        `*   - Pocketmine-MP:    ${SystemInfo.valid_platform.pocketmine}`,
+            `*   - Pocketmine-MP:    ${valid_platform.pocketmine}`,
-        `*   - Dragonfly:        ${SystemInfo.valid_platform.dragonfly}`,
+            `*   - Dragonfly:        ${valid_platform.dragonfly}`,
-        `*   - Java:             ${SystemInfo.valid_platform.java}`,
+            `*   - Java:             ${valid_platform.java}`,
-        `*   - Spigot:           ${SystemInfo.valid_platform.java}`,
+            `*   - Spigot:           ${valid_platform.java}`,
             "*",
             "**************************************************************"
         ];
@@ -165,10 +166,10 @@ if (SystemCheck) {
                 .replace(/undefined/gi, cli_color.red("undefined"))
             ));
         process.exit(0)
-}
+    }
 
-// Download server
+    // Download server
-if (bds_version){
+    if (bds_version){
         (async () => {
             try {
                 if (argv.interactive) {
@@ -202,7 +203,9 @@ if (bds_version){
                 })
             } catch (error) {console.error(error);process.exit(165);}
         })();
-}
+    }
 
-// Start server
+    // Start server
-if (start && !(server || version || SystemCheck || bds_version || help)) StartServer();
+    if (start && !(server || version || SystemCheck || bds_version || help)) StartServer();
+
+})()

index.js

@@ -47,7 +47,7 @@ module.exports.telegram_token_save = UpdateTelegramToken
  * 
  * @param {function} callback - The callback function after start API
  */
-module.exports.api = require("./src/rest/api");
+module.exports.api = require("./src/api/api");
 
 function token_register(Admin_Scoper = ["web_admin", "admin"]) {
     Admin_Scoper = Array.from(Admin_Scoper).filter(scoper => /admin/.test(scoper));

lib/BdsSettings.js

@@ -1,7 +1,7 @@
 const { join, resolve, basename } = require("path");
 const { existsSync, writeFileSync, mkdirSync, readFileSync } = require("fs");
 const { homedir } = require("os");
-const { valid_platform } = require("./BdsSystemInfo");
+const BdsInfo = require("./BdsSystemInfo");
 const yaml = require("js-yaml");
 
 // PATHs
@@ -9,12 +9,19 @@ const home = homedir();
 const bds_dir = join(home, "bds_core");
 if (!(existsSync(bds_dir))) mkdirSync(bds_dir, {recursive: true})
 
-// Set default platform for bds maneger
+BdsInfo().then(validation => {
-var default_platformConfig;
+    const { valid_platform } = validation;
-if (valid_platform["bedrock"]) default_platformConfig = "bedrock";
+    // Set default platform for bds maneger
-else if (valid_platform["java"]) default_platformConfig = "java";
+    var default_platformConfig;
-else if (valid_platform["pocketmine"]) default_platformConfig = "pocketmine";
+    if (valid_platform["bedrock"]) default_platformConfig = "bedrock";
-else throw new Error("We cannot run any platforms on this system/device");
+    else if (valid_platform["java"]) default_platformConfig = "java";
+    else if (valid_platform["pocketmine"]) default_platformConfig = "pocketmine";
+    else throw new Error("We cannot run any platforms on this system/device");
+    UpdatePlatform(default_platformConfig);
+}).catch(err => {
+    console.log(err);
+    process.exit(1);
+});
 
 // Config Base to Bds Maneger Core and others Projects
 var Config = {
@@ -28,7 +35,7 @@ var Config = {
         enable_tmp_host: false
     },
     server: {
-        platform: default_platformConfig,
+        platform: "bedrock",
         BackupCron: [
             {
                 enabled: false,

lib/BdsSystemInfo.js

@@ -1,36 +1,30 @@
-const { execSync } = require("child_process");
 const { release } = require("os");
 const { readdirSync } = require("fs");
+const { execSync } = require("child_process");
 const commadExist = require("./commandExist");
-const fetchSync = require("@the-bds-maneger/fetchsync");
+const Request = require("./Requests");
 
-// Load JSON for Server and PHP Zip files
+async function CheckSystemAsync() {
-const PHPBin = fetchSync("https://raw.githubusercontent.com/The-Bds-Maneger/Php_Static_Binary/main/binarys.json").json(),
+    const
-    Servers = fetchSync("https://raw.githubusercontent.com/The-Bds-Maneger/external_files/main/Server.json").json();
+        PHPBin = await Request.JSON("https://raw.githubusercontent.com/The-Bds-Maneger/Php_Static_Binary/main/binarys.json"),
+        Servers = await Request.JSON("https://raw.githubusercontent.com/The-Bds-Maneger/external_files/main/Server.json");
     
-// System Architect (x64, aarch64 and others)
+    let system, require_qemu = false;
-var arch;
+    const valid_platform = {
-if (process.arch === "arm64") arch = "aarch64";
-else arch = process.arch
-module.exports.arch = arch
-
-var system,
-    require_qemu = false,
-    valid_platform = {
         bedrock: true,
         pocketmine: true,
         java: commadExist("java"),
         dragonfly: commadExist("go"),
-    }
+    };
 
-// check php bin
+    // check php bin
-if ((PHPBin[process.platform] || {})[arch]) valid_platform["pocketmine"] = true;
+    if ((PHPBin[process.platform] || {})[arch]) valid_platform["pocketmine"] = true;
         else valid_platform["pocketmine"] = false;
 
-// SoSystem X
+    // SoSystem X
-if (process.platform == "win32") {
+    if (process.platform == "win32") {
         system = "Windows";
-} else if (process.platform == "linux") {
+    } else if (process.platform == "linux") {
         system = "Linux";
         
         // Bedrock Check
@@ -46,17 +40,34 @@ if (process.platform == "win32") {
                 require_qemu = true
             }
         }
-} else if (process.platform == "darwin") {
+    } else if (process.platform == "darwin") {
         system = "MacOS";
         valid_platform["bedrock"] = false
-} else if (process.platform === "android") {
+    } else if (process.platform === "android") {
         system = "Android";
         valid_platform["bedrock"] = false
-} else {
+    } else {
-    console.log(`The Bds Maneger Core does not support ${process.platform} systems, as no tests have been done.`);
+        throw new Error(`The Bds Maneger Core does not support ${process.platform} systems, as no tests have been done.`);
-    process.exit(127);
+    }
+
+    return {
+        system,
+        require_qemu,
+        valid_platform,
+    };
 }
 
+module.exports = CheckSystemAsync;
+
+// System Architect (x64, aarch64 and others)
+let arch;
+if (process.arch === "arm64") arch = "aarch64";
+else arch = process.arch
+module.exports.arch = arch
+
+/**
+ * Platforms valid from deferents systems
+ */
 function GetKernel() {
     if (process.platform === "win32") {
         const kernelVersion = parseFloat(release());
@@ -93,11 +104,4 @@ function GetKernel() {
         else return str.replace(/\n|\t|\r/gi, "");
     } else return "Not identified";
 }
-
-/**
- * Platforms valid from deferents systems
- */
-module.exports.valid_platform = valid_platform
-module.exports.require_qemu = require_qemu
-module.exports.system = system
 module.exports.GetKernel = GetKernel;

lib/Requests.js

@@ -0,0 +1,6 @@
+if (typeof fetch === "undefined") global.fetch = require("node-fetch");
+module.exports = {
+    JSON: async (url = "", options) => await (await fetch(url, options)).json(),
+    TEXT: async (url = "", options) => await (await fetch(url, options)).text(),
+    BUFFER: async (url = "", options) => Buffer.from(await (await fetch(url, options)).arrayBuffer()),
+}

src/api/routes/players.js

@@ -1,7 +1,6 @@
 const express = require("express");
 const app = express.Router();
 const { GetPlatform, GetPaths } = require("../../../lib/BdsSettings")
-const bds = require("../../../index");
 const { token_verify, CheckPlayer } = require("../../UsersAndtokenChecks");
 const { readFileSync } = require("fs");
 const docs = require("../../../BdsManegerInfo.json").docs;