+ +
+ + + `); + }); + app.listen(2212); +} \ No newline at end of file diff --git a/API/remote_access.js b/API/remote_access.js new file mode 100644 index 0000000..e2b1d17 --- /dev/null +++ b/API/remote_access.js @@ -0,0 +1,114 @@ +module.exports = () => { + global.bds_api_post_start = true + const express = require("express"); + const bds = require("../index"); + const fs = require("fs"); + const app = express(); + var cors = require('cors'); + const path = require("path") + const bodyParser = require("body-parser"); + const rateLimit = require("express-rate-limit"); + + // Enable if you're behind a reverse proxy (Heroku, Bluemix, AWS ELB, Nginx, etc) + // see https://expressjs.com/en/guide/behind-proxies.html + // app.set('trust proxy', 1); + + const limiter = rateLimit({ + windowMs: 15 * 60 * 1000, // 15 minutes + max: 100 // limit each IP to 100 requests per windowMs + }); + app.use(cors()); + app.use(limiter); + app.use(bodyParser.urlencoded({ extended: true })); + app.use(require("body-parser").json()); /* https://github.com/github/fetch/issues/323#issuecomment-331477498 */ + app.post("/info", (req, res) => { + const body = req.body + const tokens = JSON.parse(fs.readFileSync(path.join(bds.bds_dir, "bds_tokens.json"), "utf-8")) + var pass = false; + var teste = 'Sucess' + for (let token_verify in tokens) {const element = tokens[token_verify].token;if (body.token == element){pass = true} else {token_verify++}} + if (pass){ + if (fs.existsSync(process.cwd()+"/package.json")){ + var api_v = require(process.cwd()+"/package.json").version + var name = bds.get_config().level_name + } else { + var api_v = null + var name = 'Bds_Maneger_api' + } + res.send({ + "status": 200, + "api_version": api_v, + "name": name + }) + } else { + res.send({ + "status": 401, + "message": `Not authorized: ${body.token}` + }) + } + }); + app.get("/bds/:command", (req, res) => { + const body = req.body + const command_bds = ''; + const tokens = JSON.parse(fs.readFileSync(path.join(bds.bds_dir, "bds_tokens.json"), "utf-8")) + var pass = false; + res.send({ + "command": req.params.command + }) + // for (let token_verify in tokens) {const element = tokens[token_verify].token;if (body.token == element){pass = true} else {token_verify++}} + // if (pass){ + // if (command_bds === 'start'){ + // var bds_init = bds.start() + // var command_status = `Bds Started` + // } else if (command_bds === 'stop'){ + // bds.stop() + // var command_status = `Stopping the bds server` + // } else if (command_bds === 'reload'){ + // const bds_status = bds.detect() + // if (bds_detect){ + // bds.stop() + // } + // var bds_init = bds.start() + // var command_status = `Reloading` + // } else { + // var command_status = `no command identified` + // } + // res.send({ + // "status": 200, + // "bds_status": command_status + // }) + // } else { + // res.send({ + // "status": 401, + // "message": `Not authorized: ${body.token}` + // }) + // } + }); + app.post("/bds_command", (req, res) => { + const body = req.body + const tokens = JSON.parse(fs.readFileSync(path.join(bds.bds_dir, "bds_tokens.json"), "utf-8")) + var pass = false; + for (let token_verify in tokens) { + const element = tokens[token_verify].token; + // req.connection.remoteAddress + if (body.token == element){pass = true} else {token_verify++} + } + if (pass){ + const command = body.command + const teste = bds.command(command) + res.send({ + "status": 200, + "command": body.command, + "log": teste, + "message": `authorized to ${body.token}` + }) + } else { + res.send({ + "status": 401, + "message": "not authorized" + }) + } + }); + const http_port = "28574" + app.listen(http_port); +} \ No newline at end of file diff --git a/API/teste.js b/API/teste.js new file mode 100644 index 0000000..0a97de1 --- /dev/null +++ b/API/teste.js @@ -0,0 +1,12 @@ +var qr = require('qr-image'); +var express = require('express'); + +var app = express(); + +app.get('/', function(req, res) { + var code = qr.image(`list: ${Math.random()}`, { type: 'svg' }); + res.type('svg'); + code.pipe(res); +}); + +app.listen(3000); \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 8afb36a..4230638 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +<<<<<<< HEAD +======= # 1.5.0 All scripts have been rewritten some features are still under maintenance @@ -6,6 +8,7 @@ The Docker image has returned to work in the new version. Some functions will be modified or removed from the next version in the Stable branch +>>>>>>> main # 1.4.2 Docker test fix diff --git a/global/auth.js b/global/auth.js index c4a3037..61f9046 100644 --- a/global/auth.js +++ b/global/auth.js @@ -45,12 +45,24 @@ function getAccessToken(oAuth2Client, callback) { } module.exports.drive_backup = () => { +<<<<<<< HEAD + const file_json = require("../new_script/backups").Drive_backup() +======= const file_json = require("../scripts/backups").Drive_backup() +>>>>>>> main console.log(file_json) const parent_id = file_json.id const path_file = file_json.file_path const name_d = file_json.file_name; +<<<<<<< HEAD + const gd_secret = ''; + console.log(gd_secret) + function upload_backup(auth) { + const drive = google.drive({version: "v3", auth}); + if (parent_id === undefined){ + var fileMetadata = { +======= const gd_secret = ""; console.log(gd_secret) function upload_backup(auth) { @@ -58,15 +70,24 @@ module.exports.drive_backup = () => { var fileMetadata; if (parent_id === undefined){ fileMetadata = { +>>>>>>> main name: name_d } console.log("Your backup will be saved to My Drive") } else { +<<<<<<< HEAD + var fileMetadata = { + name: name_d, + parents: [parent_id] + } + }; +======= fileMetadata = { name: name_d, parents: [parent_id] } } +>>>>>>> main var media = { mimeType: "application/octet-stream", body: fs.createReadStream(path_file) @@ -102,6 +123,10 @@ module.exports.mcpe = () => { progress += d.length / 1024 / 1024; if (process.stdout.isTTY) {process.stdout.clearLine();process.stdout.cursorTo(0);process.stdout.write(`Downloaded ${Math.trunc(progress)} Mbytes`);} }).pipe(dest)}); +<<<<<<< HEAD + }; +======= } +>>>>>>> main return authorize(gd_secret, download_mcpe); } diff --git a/global/check.js b/global/check.js index 4c45b49..ff8470f 100644 --- a/global/check.js +++ b/global/check.js @@ -6,6 +6,11 @@ module.exports.checkUser = (USERNAME) => { if (fs.existsSync(telegram_admin)) { var admins = fs.readFileSync(telegram_admin, "utf8"); } else { +<<<<<<< HEAD + var admins = `{"sh23_bot_not_config": {"allow": true}}`; + console.warn("All allowed") + console.log(`Create file in with name: ${require("../index").bds_dir}/telegram_admin.json`) +======= const config = { "sh23_bot_not_config": { "allow": true @@ -13,12 +18,17 @@ module.exports.checkUser = (USERNAME) => { } fs.writeFileSync(telegram_admin, JSON.stringify(config)) throw new console.error(`we just created the telegram authorization, edit before using: ${config}`); +>>>>>>> main } var adm = JSON.parse(admins); for(let check_ in adm){ if (USERNAME == check_){ return true +<<<<<<< HEAD + } else if (index == "sh23_bot_not_config"){ +======= } else if (check_ == "sh23_bot_not_config"){ +>>>>>>> main console.warn("Allow all") return true } check_++; diff --git a/global/system_monitor.js b/global/system_monitor.js index aac076a..a706bdc 100644 --- a/global/system_monitor.js +++ b/global/system_monitor.js @@ -1,41 +1,41 @@ -const si = require("systeminformation"); -module.exports.current_cpu = undefined -module.exports.ram_free = undefined -module.exports.ram_total = undefined -module.exports.cpu_speed = undefined -module.exports.bds_cpu = undefined -// module.exports.system = si +const bds_monitor = process.env.BDS_MONI.includes("true") +if (bds_monitor){ + const si = require("systeminformation"); + setInterval(() => { + // si.cpu().then(data => {module.exports.cpu_speed = Math.trunc(data.speed)}) + si.mem().then(data => { + module.exports.ram_free = Math.trunc(data.free / 1024 / 1024 / 1024); + module.exports.ram_total = Math.trunc(data.total / 1024 / 1024 / 1024); + }) + si.currentLoad().then(data => { + module.exports.current_cpu = Math.trunc(data.currentload) + }) -function init_1(){ - si.cpu().then(data => { - module.exports.cpu_speed = Math.trunc(data.speed) - }) - si.mem().then(data => { - module.exports.ram_free = Math.trunc(data.free / 1024 / 1024 / 1024) - module.exports.ram_total = Math.trunc(data.total / 1024 / 1024 / 1024) - }) - si.currentLoad().then(data => { - module.exports.current_cpu = Math.trunc(data.currentLoad) - }) -} - -function init_2(){ + }, 1000); si.processes().then(data => { const list = data.list for (let pid in list) { var pids = list[pid].command - if (pids.includes("server.")){ - module.exports.bds_cpu = Math.trunc(list[pid].cpu) + if (pids.includes("bedrock_server")){ + module.exports.bds_cpu = Math.trunc(list[pid].pcpu) } else { pid++ } } }) -} - -init_1() -init_2() -setInterval(() => { - init_1() - init_2() -}, 3000); + setInterval(() => { + si.processes().then(data => { + const list = data.list + for (let pid in list) { + var pids = list[pid].command + if (pids.includes("bedrock_server")){ + module.exports.bds_cpu = Math.trunc(list[pid].pcpu) + } else { + pid++ + } + } + }) + }, 3000); +}else { + console.warn(`the use of cpu is disabled, for more information, visit https://docs.srherobrine23.com/enable_bds_requests.html`) +} \ No newline at end of file diff --git a/global/telegram_bot.js b/global/telegram_bot.js index c66b97a..c4f0489 100644 --- a/global/telegram_bot.js +++ b/global/telegram_bot.js @@ -76,7 +76,11 @@ bot.command("list", (ctx) =>{ bds_command("list") var old = bds_log_string; setTimeout(() => { +<<<<<<< HEAD + var name = bds_log_string.replace(old, ""); +======= var name = bds_log_string.replace(old, "End\n\n"); +>>>>>>> main ctx.reply(name) }, 1000); } else { @@ -87,6 +91,10 @@ bot.command("mcpe", (ctx) =>{ ctx.replyWithMarkdown(`[Minecraft for Android 1.16.201.01](https://files.sh33.org/mcpe/latest.sonic) Iphone users are not privileged +<<<<<<< HEAD +` +ctx.replyWithMarkdown(text) +======= `)}); bot.command("status", (ctx) =>{ const {bds_cpu, current_cpu, ram_total, ram_free} = require("./system_monitor") @@ -94,7 +102,39 @@ const text = `Bds CPU usage: ${bds_cpu}%, Total CPU utilization: ${current_cpu}% Total ram memory: ${ram_total} GB, Total free ram memory: ${ram_free} GB` ctx.replyWithMarkdown(text); +>>>>>>> main }); +// bot.command("status", (ctx) =>{ +// const si = require("systeminformation"); +// // si.cpu().then(data => {module.exports.cpu_speed = Math.trunc(data.speed)}) +// si.mem().then(data => { +// global.ram_free = Math.trunc(data.free / 1024 / 1024 / 1024); +// global.ram_total = Math.trunc(data.total / 1024 / 1024 / 1024); +// si.currentLoad().then(data => { +// global.current_cpu = Math.trunc(data.currentload) +// si.processes().then(data => { +// const list = data.list +// for (let pid in list) { +// var pids = list[pid].command +// if (pids.includes("bedrock_server")){global.bds_cpu = Math.trunc(list[pid].pcpu)} else if (pids.includes("server.jar")){global.bds_cpu = Math.trunc(list[pid].pcpu)} else {pid++} +// } +// si.processes().then(data => { +// const list = data.list +// for (let pid in list) { +// var pids = list[pid].command +// if (pids.includes("bedrock_server")){global.bds_cpu = Math.trunc(list[pid].pcpu)} else {pid++} +// } +// const text = `Bds CPU usage: ${bds_cpu}%, Total CPU utilization: ${current_cpu}%\n\n\nTotal ram memory: ${ram_total} GB, Total free ram memory: ${ram_free} GB` +// ctx.replyWithMarkdown(text); +// delete(bds_cpu); +// delete(current_cpu); +// delete(ram_total); +// delete(ram_free); +// }) +// }) +// }) +// }) +// }); bot.command("log", (ctx) => { const file_log_path = require("../index").log_file; const fs = require("fs") diff --git a/index.js b/index.js index d054e66..9f37026 100644 --- a/index.js +++ b/index.js @@ -41,6 +41,31 @@ const package_root = path.join(process.cwd(), "package.json") const package_root_builder = path.resolve(".", "resources", "app", "package.json") var cache_dir,home,desktop,tmp,system if (process.platform == "win32") { +<<<<<<< HEAD + var home = process.env.USERPROFILE; + var desktop = path.join(home, "Desktop") + if (fs.existsSync(package_root)){ + var cache_dir = path.join(home, "AppData", "Roaming", require(package_root).name) + } else { + console.warn(`Temporary Storages, some functions will be lost after restarting the system`); + var cache_dir = path.join(process.env.TMP, `bds_tmp_configs`); + } + var tmp = process.env.TMP + var system = `windows`; +} else if (process.platform == "linux") { + var home = process.env.HOME; + if (fs.existsSync(package_root)){ + var cache_dir = path.join(home, ".config", require(package_root).name); + } else { + console.warn(`Temporary Storages, some functions will be lost after restarting the system`); + var cache_dir = `/tmp/bds_tmp_configs`; + } + var file = path.join(home, ".config", "user-dirs.dirs");var data = {}; + if (fs.existsSync(file)){let content = fs.readFileSync(file,"utf8");let lines = content.split(/\r?\n/g).filter((a)=> !a.startsWith("#"));for(let line of lines){let i = line.indexOf("=");if(i >= 0){try{data[line.substring(0,i)] = JSON.parse(line.substring(i + 1))}catch(e){}}}};if(data["XDG_DESKTOP_DIR"]){var desktop = data["XDG_DESKTOP_DIR"];desktop = desktop.replace(/\$([A-Za-z\-\_]+)|\$\{([^\{^\}]+)\}/g, (_, a, b) => (process.env[a || b] || ""))}else{var desktop = "/tmp"} + + var tmp = `/tmp`; + var system = `linux`; +======= home = process.env.USERPROFILE; desktop = path.join(home, "Desktop") if (fs.existsSync(package_root)){ @@ -84,6 +109,7 @@ if (process.platform == "win32") { tmp = "/tmp"; system = "linux"; +>>>>>>> main } else if (process.platform == "darwin") { require("open")("https://github.com/Bds-Maneger/Bds_Maneger/wiki/systems-support#a-message-for-mac-os-users") console.error("Please use Windows or Linux MacOS Not yet supported") @@ -91,6 +117,53 @@ if (process.platform == "win32") { } else { console.log(`Please use an operating system (OS) compatible with Minecraft Bedrock Server ${process.platform} is not supported`); process.exit(2021) +<<<<<<< HEAD +}; +// --------- +// --------- +var bds_dir = path.join(home, "bds_Server"); +var bds_dir_bedrock = path.join(bds_dir, 'bedrock'); +var bds_dir_java = path.join(bds_dir, 'java'); +var bds_dir_backup = path.join(bds_dir, 'backups'); +module.exports.backup_folder = bds_dir_backup + +if (!(fs.existsSync(bds_dir))){ + console.log("Creating the bds directory") + fs.mkdirSync(bds_dir) + if (!(fs.existsSync(bds_dir))) shell.mkdir("-p", bds_dir); +} + +// Configs +const bds_config_file = path.join(bds_dir, "bds_config.json") +if (fs.existsSync(bds_config_file)){ + var bds_config = JSON.parse(fs.readFileSync(bds_config_file, "utf-8")) +} else { + const _config = `{ + "bds_platform": "bedrock", + "telegram_token": null + }` + var bds_config = JSON.parse(_config) + fs.writeFileSync(bds_config_file, _config) +} +module.exports.platform = bds_config.bds_platform +console.log(`Running on the \"${bds_config.bds_platform}\" platform`) +// Configs + +var log_dir = path.join(bds_dir, "log"); +var log_file = path.join(log_dir, `${date()}_${bds_config.bds_platform}_Bds_log.log`); +var log_date = date(); + +// --------- +// --------- + + + +if (!(fs.existsSync(cache_dir))){ + console.log(`Creating a folder for Storage in ${cache_dir}`); + fs.mkdirSync(cache_dir) + if (!(fs.existsSync(cache_dir))) shell.mkdir("-p", cache_dir); +} +======= } // --------- // --------- @@ -142,6 +215,7 @@ if (!(fs.existsSync(cache_dir))){ fs.mkdirSync(cache_dir) if (!(fs.existsSync(cache_dir))) shell.mkdir("-p", cache_dir); } +>>>>>>> main // e if (!(fs.existsSync(bds_dir_java))){ console.log("Creating the bds directory to Java") @@ -159,6 +233,33 @@ if (!(fs.existsSync(log_dir))){ console.log(`Creating the bds log dir (${log_dir})`) fs.mkdirSync(log_dir) if (!(fs.existsSync(log_dir))) shell.mkdir("-p", log_dir) +<<<<<<< HEAD + }; +}; +// e +if (require("fs").existsSync(`${bds_dir}/telegram_token.txt`)){ + module.exports.token = fs.readFileSync(`${bds_dir}/telegram_token.txt`, "utf8").replaceAll("\n", ""); +} else { + module.exports.token = undefined; +} + +module.exports.telegram_token_save = (token) =>{ + fs.writeFileSync(`${bds_dir}/telegram_token.txt`, token); + return "OK" +} +if (typeof fetch === "undefined"){global.fetch = require("node-fetch")} + +if (typeof localStorage === "undefined"){ + var localStorageS = require("node-localstorage").LocalStorage; + global.localStorage = new localStorageS(`${cache_dir}/Local_Storage`); +} + +// Java or Bedrock +if (process.env.JAVA_ENABLE !== undefined){ + localStorage.setItem('bds_edititon', 'java'); +}else{ + localStorage.setItem('bds_edititon', 'bedrock'); +======= } } // e @@ -216,6 +317,7 @@ if (require("fs").existsSync(path.join(bds_dir, "telegram_token.txt"))){ } catch { throw new error("It was not possible to move the old telegram token file to the new bds maneger api file") } +>>>>>>> main } if (process.env.BDS_MONI == blanks){process.env.BDS_MONI = "false"} @@ -228,6 +330,9 @@ fetch("https://raw.githubusercontent.com/Bds-Maneger/Raw_files/main/credentials. * backup credentials and an interesting design feature, plus privacy is important */ module.exports.google_drive_credential = gd_cre +<<<<<<< HEAD + module.exports.mcpe_file = require("./global/auth").mcpe +======= /** * download the latest version of minecraft bedrock for android available, remember to use if you want ✌ * @@ -241,15 +346,22 @@ fetch("https://raw.githubusercontent.com/Bds-Maneger/Raw_files/main/credentials. * * on the java platform the map selected in the server configuration will be backed up, any other map will have to change in the server settings to perform the backup */ +>>>>>>> main module.exports.drive_backup= require("./global/auth").drive_backup }); fetch("https://raw.githubusercontent.com/Bds-Maneger/Raw_files/main/Server.json").then(response => response.json()).then(rawOUT => { const versions = Object.getOwnPropertyNames(rawOUT.bedrock); for (let v in versions){ var html = `${versions[v]}`; +<<<<<<< HEAD + module.exports.version_select += `\n`; + v++; + }; +======= module.exports.version_select += `\n`; v++; } +>>>>>>> main module.exports.bedrock_all_versions = Object.getOwnPropertyNames(rawOUT.bedrock); module.exports.java_all_versions = Object.getOwnPropertyNames(rawOUT.java); module.exports.bds_latest = rawOUT.bedrock_lateste; @@ -260,9 +372,16 @@ fetch("https://raw.githubusercontent.com/Bds-Maneger/Raw_files/main/Server.json" if (typeof bds_api_start === "undefined"){ require("./API/api")(); require("./API/log")(); +<<<<<<< HEAD + require("./API/remote_access")(); + } + } else { + console.warn(`The API via http is disabled, for more information, visit https://docs.srherobrine23.com/enable_bds_requests.html`) +======= } } else { console.warn("The API via http is disabled, for more information, visit https://docs.srherobrine23.com/enable_bds_requests.html") +>>>>>>> main } module.exports.get_version = (type) => { if (type == "raw") @@ -353,6 +472,22 @@ module.exports.date = date * @example bds.command("say hello from Bds Maneger") */ module.exports.command = require("./global/command").command +<<<<<<< HEAD +// module.exports.stop = require("./global/stop").Server_stop + +// New management method +module.exports.start = require("./new_script/basic_server").start +module.exports.stop = require("./new_script/basic_server").stop +module.exports.backup = require("./new_script/backups").World_BAckup +module.exports.detect = require("./new_script/detect") +module.exports.bds_detect = require("./new_script/detect") +module.exports.version_Download = require("./new_script/bds_download") +module.exports.download = require("./new_script/bds_download") +module.exports.kill = require("./new_script/kill_server") +module.exports.config_example = require("./new_script/bds_settings").config_example +module.exports.set_config = require("./new_script/bds_settings").config +module.exports.get_config = require("./new_script/bds_settings").get_config +======= // New management method /** @@ -424,3 +559,4 @@ module.exports.set_config = require("./scripts/bds_settings").config * takes the server settings in JSON format */ module.exports.get_config = require("./scripts/bds_settings").get_config +>>>>>>> main diff --git a/new_script/backups.js b/new_script/backups.js new file mode 100644 index 0000000..0d604bd --- /dev/null +++ b/new_script/backups.js @@ -0,0 +1,81 @@ +module.exports.World_BAckup = () => { + const bds = require('../index') + const path = require("path") + const java_pro = require("properties-to-json") + const fs = require("fs") + var AdmZip = require("adm-zip"); + + var today = bds.date() + const name = path.join(bds.backup_folder ,`bds_backup_World_${today}.zip`) + if (bds.platform === "bedrock"){ + var dir_zip = path.join(bds_dir_bedrock, "worlds") //`${require("../index").}/worlds/` + } else { + const world_name = JSON.parse(java_pro(fs.readFileSync(path.join(bds.bds_dir_java, "server.properties"), "utf-8").replaceAll("-", "_"))).level_name + var dir_zip = path.join(bds.bds_dir_java, world_name) //`${require("../index").bds_dir_bedrock}/${world_name}/` + } + /** + * Before we can start it is good for the server not to have a Corrupted Backup + * this is only necessary once after the server has started manually + */ + if (bds.bds_detect()){bds.stop()} + var zip = new AdmZip(); + zip.addLocalFolder(dir_zip); + zip.addZipComment(`Backup zip file in ${today}. \nBackup made to ${process.platform}, Free and open content for all\n\nSirherobrine23© By Bds Maneger.`); + var zipEntries = zip.getEntries(); + zipEntries.forEach(function (zipEntry) { + console.log(zipEntry.entryName.toString()); + }); + zip.writeZip(name); + return { + path: name, + world_path: dir_zip + } +}; + +module.exports.Drive_backup = () => { + const bds = require('../index') + const path = require("path") + const java_pro = require("properties-to-json") + const fs = require("fs") + var AdmZip = require("adm-zip"); + + var today = bds.date() + const name = path.join(bds.backup_folder ,`bds_backup_World_${today}.zip`) + if (bds.platform === "bedrock"){ + var dir_zip = path.join(bds.bds_dir_bedrock, "worlds") //`${require("../index").}/worlds/` + } else { + const world_name = JSON.parse(java_pro(fs.readFileSync(path.join(bds.bds_dir_java, "server.properties"), "utf-8").replaceAll("-", "_"))).level_name + var dir_zip = path.join(bds.bds_dir_java, world_name) //`${require("../index").bds_dir_bedrock}/${world_name}/` + } + /** + * Before we can start it is good for the server not to have a Corrupted Backup + * this is only necessary once after the server has started manually + */ + if (bds.bds_detect()){bds.stop()} + global.status_b = true + var zip = new AdmZip(); + zip.addLocalFolder(dir_zip); + zip.addZipComment(`Backup zip file in ${today}. \nBackup made to ${process.platform}, Free and open content for all\n\nSirherobrine23© By Bds Maneger.`); + var zipEntries = zip.getEntries(); + var totalfiles = zipEntries.length + zipEntries.forEach(function(zipEntry) { + totalfiles-- + console.log(totalfiles) + if (totalfiles === 0){ + status_b = false + } + }); + zip.writeZip(name); + let es = 0; + for(es == "-0";es++;){ + if (!(status_b)) break + } + delete(status_b) + const js_ = { + "file_path": name, + "file_name": `bds_backup_World_${today}.zip`, + "id": undefined + } + return js_ +}; + diff --git a/new_script/basic_server.js b/new_script/basic_server.js new file mode 100644 index 0000000..ff254ad --- /dev/null +++ b/new_script/basic_server.js @@ -0,0 +1,79 @@ +module.exports.start = () => { + const bds = require("../index") + const Storage = localStorage; + const exec = require("child_process").exec; + const fs = require('fs') + + + if (!(bds.detect())){ + const plat = bds.platform + if (plat === "bedrock"){ + if (process.platform == "win32"){ + var start_server = exec(`bedrock_server.exe`, {cwd: bds.bds_dir_bedrock}); + } else if (process.platform == "linux"){ + var start_server = exec(`chmod 777 bedrock_server && ./bedrock_server`, {env: {PATH: process.env.PATH, LD_LIBRARY_PATH: bds.bds_dir_bedrock}, cwd: bds.bds_dir_bedrock}); + } else { + process.exit(210) + } + } else { + if (require('command-exists').sync('java')){ + var start_server = exec(`java -jar server.jar nogui`, {cwd: bds.bds_dir_java}); + } else { + if (bds.system == 'windows'){ + require('open')("http://docs.sirherobrine23.com/bds_maneger_api_java#Windows"); + console.log("http://docs.sirherobrine23.com/bds_maneger_api_java#Windows") + } else if (bds.system === 'linux'){ + require('open')("http://docs.sirherobrine23.com/bds_maneger_api_java#Linux"); + console.log("http://docs.sirherobrine23.com/bds_maneger_api_java#Linux") + } else { + require('open')("http://docs.sirherobrine23.com/bds_maneger_api_java"); + console.log("http://docs.sirherobrine23.com/bds_maneger_api_java") + } + } + } + + + Storage.setItem("old_log_file", bds.log_file) + var logConsoleStream = require("fs").createWriteStream(bds.log_file, {flags: "a"}); + start_server.stdout.pipe(logConsoleStream); + start_server.stdout.on("data", function(data){ + if (data.includes("agree", "EULA")){ + const path = require('path'); + require('open')("https://account.mojang.com/documents/minecraft_eula"); + const eula_file = path.join(bds.bds_dir_java, "eula.txt") + const eula_make_true = fs.readFileSync(eula_file, "utf-8").replace("eula=false", "eula=true") + fs.writeFileSync(eula_file, eula_make_true) + const node_detect = process.argv[0] + if (node_detect.includes('node')){ + console.warn(`Ending the process`) + setTimeout(() => { + process.exit(0) + }, 1000); + } + } + }) + if (typeof bds_log_string !== "undefined"){delete(bds_log_string)} + start_server.stdout.on("data", function(data){global.bds_log_string += data}) + Storage.setItem("bds_status", true); + global.bds_server_string = start_server; + return start_server; + } else { + console.warn(`You already have a server running`); + return `You already have a server running`; + } +} +module.exports.stop = () => { + if (typeof bds_server_string == "undefined"){ + const detect = process.argv[0]; + if (detect.includes('electron')) alert("The server is stopped!"); + else console.log("The server is stopped!"); + } else { + bds_server_string.stdin.write("stop\n"); + bds_server_string.stdout.on("data", function (data){ + if (data.includes("Quit correctly")){ + localStorage.setItem("bds_status", false) + }; + }); + }; + return +} \ No newline at end of file diff --git a/new_script/bds_download.js b/new_script/bds_download.js new file mode 100644 index 0000000..cf149b5 --- /dev/null +++ b/new_script/bds_download.js @@ -0,0 +1,88 @@ +module.exports = (Vdown) => { + console.warn("Do not exit BDS Manager") + const bds = require('../index') + + fetch("https://raw.githubusercontent.com/Bds-Maneger/Raw_files/main/Server.json").then(response => response.json()).then(versions => { + if (bds.platform === "bedrock"){ + const system = bds.system + var mine_name = `bedrock.zip` + var server_DIR = bds.bds_dir_bedrock; + if (system === 'linux'){ + var versions_get = versions.bedrock[Vdown].url_linux; + } else { + var versions_get = versions.bedrock[Vdown].url_windows; + } + + console.log("Starting download") + const exec = require("child_process").exec + localStorage.setItem("bds_server_version", Vdown); + var downloadBDSchild = exec(`curl ${versions_get} --output ${mine_name}`, { + cwd: `${bds.tmp_dir}` + }); + var ZIP_FILE_PATH = `${bds.tmp_dir}/${mine_name}`; + downloadBDSchild.stdout.on("data", function(data){ + console.log(data) + }) + downloadBDSchild.on("exit", function (code) { + if (code === 0) { + console.log(`Download zip file success`); + + var AdmZip = require("adm-zip"); + const fs = require("fs") + if (fs.existsSync(`${server_DIR}/server.properties`)){var _old = true;var old1 = fs.readFileSync(`${server_DIR}/server.properties`, "utf-8");} + if (fs.existsSync(`${server_DIR}/permissions.json`)){var _old2 = true;var old2 = fs.readFileSync(`${server_DIR}/permissions.json`, "utf-8");} + if (fs.existsSync(`${server_DIR}/whitelist.json`)) {var _old3 = true;var old3 = fs.readFileSync(`${server_DIR}/whitelist.json`, "utf-8");} + if (fs.existsSync(`${server_DIR}/valid_known_packs.json`)){var _old4 = true;var old4 = fs.readFileSync(`${server_DIR}/valid_known_packs.json`, "utf-8");}; + // Unzip + var zip = new AdmZip(ZIP_FILE_PATH); + var zipEntries = zip.getEntries(); + var totalfiles = zipEntries.length + zipEntries.forEach(function(zipEntry) { + totalfiles-- + if (totalfiles === 0){ + if (_old){fs.writeFileSync(`${server_DIR}/server.properties`, old1);} + if (_old2){fs.writeFileSync(`${server_DIR}/permissions.json`, old2);} + if (_old3){fs.writeFileSync(`${server_DIR}/whitelist.json`, old3);} + if (_old4){fs.writeFileSync(`${server_DIR}/valid_known_packs.json`, old4);}; + const docker_exit = process.env.BDS_DOCKER_IMAGE + console.log(docker_exit) + if (docker_exit == "true"){ + console.log(`going out`) + process.exit(0) + } + } + }); + zip.extractAllTo(server_DIR, true); + console.log("Downlod Sucess"); // End Unzip + localStorage.setItem("Downlaod_sucess", "yes") + } else { + localStorage.setItem("Download_sucess", "no") + throw new error(`Could not download`); + } + }) + } else { + var versions_get = versions.java[Vdown].url + var mine_name = `server.jar` + + console.log("Starting download") + const exec = require("child_process").exec + localStorage.setItem("bds_server_version", Vdown); + var downloadBDSchild = exec(`curl ${versions_get} --output ${mine_name}`, { + cwd: `${bds.bds_dir_java}` + }); + downloadBDSchild.stdout.on("data", function(data){ + console.log(data) + }) + downloadBDSchild.on("exit", function (code) { + if (code === 0) { + console.log(`Download zip file success`); + localStorage.setItem("Downlaod_sucess", "yes") + } else { + localStorage.setItem("Download_sucess", "no") + throw new error(`Could not download`); + } + }) + } + // --------------------------------------------------------- + }) +} \ No newline at end of file diff --git a/new_script/bds_settings.js b/new_script/bds_settings.js new file mode 100644 index 0000000..b68e02e --- /dev/null +++ b/new_script/bds_settings.js @@ -0,0 +1,178 @@ +function bds_config(json_config){ + const bds = require("../index") + const path = require("path") + var fs = require("fs") + + if (bds.platform === 'java') var Server_Config = path.join(bds.bds_dir_java, "server.properties"); + else var Server_Config = path.join(bds.bds_dir_bedrock, "server.properties"); + + const cpuCount = require("os").cpus().length; + + if (2 < cpuCount - 2) var CPU = cpuCount - 2; + else var CPU = cpuCount; + + if (json_config.includes(".json")){ + var config = JSON.parse(fs.readFileSync(json_config, "utf8")) + } else var config = JSON.parse(json_config) + + if (config.description == undefined) var description_name = `Dedicated Server`; + else var description_name = config.description; + + // Level Name + if (config.name == undefined) var level_name = `Bedrock level`; + else var level_name = config.name; + + // gamemode + if (config.gamemode == undefined) var gamemode = `survival`; + else var gamemode = config.gamemode; + + // Difficulty + if (config.difficulty == undefined) var difficulty = `easy`; + else var difficulty = config.difficulty; + + // cheats + if (config.cheats == undefined) var allow_cheats = false; + else var allow_cheats = config.cheats; + + // Maximo de Jogadores + if (config.players == undefined) var max_players = 10; + else var max_players = config.players; + + // Xbox authentication outside the internal network + if (config.xbox == undefined) var online_mode = true; + else var online_mode = config.xbox; + + // Whitelist + if (config.white_list == undefined){var white_list = false;} else {var white_list = config.white_list;}; + + // Server Port IPv4 + if (config.port == undefined){var server_port = 19132;} else {var server_port = config.port;}; + + // Server Port IPv6 + if (config.port6 == undefined){var server_portv6 = 19133;} else {var server_portv6 = config.port6;}; + + // Default player permission + if (config.player_permission == undefined) var player_permission = `member`; + else var player_permission = config.player_permission; + + if (2 >= cpuCount) var tick = 2 ; + else if (4 >= cpuCount) var tick = 4; + else if (6 >= cpuCount) var tick = 6; + else if (8 >= cpuCount) var tick = 8; + else if (10 >= cpuCount) var tick = 10; + else var tick = 12 + +/*Save Files*/ +if (bds.platform === 'bedrock'){ + var config_file_content = `server-name=${description_name} +gamemode=${gamemode} +difficulty=${difficulty} +allow-cheats=${allow_cheats} +max-players=${max_players} +online-mode=${online_mode} +white-list=${white_list} +server-port=${server_port} +server-portv6=${server_portv6} +view-distance=32 +tick-distance=${tick} +player-idle-timeout=0 +max-threads=${CPU} +level-name=${level_name} +level-seed= +default-player-permission-level=${player_permission} +texturepack-required=true +content-log-file-enabled=false +compression-threshold=1 +server-authoritative-movement=server-auth +player-movement-score-threshold=20 +player-movement-distance-threshold=0.3 +player-movement-duration-threshold-in-ms=500 +correct-player-movement=false + +# Created on Bds-Manager by Sirherobrine23` + +} else { + var config_file_content = `enable-jmx-monitoring=false +rcon.port=25575 +level-seed= +gamemode=${gamemode} +enable-command-block=${allow_cheats} +enable-query=true +generator-settings= +level-name=${level_name} +motd=${description_name} +query.port=${server_port} +pvp=true +generate-structures=true +difficulty=${difficulty} +network-compression-threshold=256 +max-tick-time=60000 +max-players=${max_players} +use-native-transport=true +online-mode=${online_mode} +enable-status=true +allow-flight=false +broadcast-rcon-to-ops=true +view-distance=32 +max-build-height=256 +server-ip= +allow-nether=true +server-port=${server_port} +enable-rcon=${allow_cheats} +sync-chunk-writes=true +op-permission-level=4 +prevent-proxy-connections=false +resource-pack= +entity-broadcast-range-percentage=100 +rcon.password=25as65d3 +player-idle-timeout=0 +force-gamemode=false +rate-limit=0 +hardcore=false +white-list=${white_list} +broadcast-console-to-ops=true +spawn-npcs=true +spawn-animals=true +snooper-enabled=true +function-permission-level=2 +level-type=default +text-filtering-config= +spawn-monsters=true +enforce-whitelist=false +resource-pack-sha1= +spawn-protection=16 +max-world-size=29999984 +# +# Created on Bds-Manager by Sirherobrine23` +} +// console.log(config_file_content); +fs.writeFileSync(Server_Config, config_file_content); +return `success` +}; +function bds_get_config(){ + var fs = require("fs"); + const path = require("path") + const bds = require("../index") + const propertiesToJSON = require("properties-to-json"); + + if (bds.platform === "bedrock") var config_path = path.join(bds.bds_dir_bedrock, "server.properties") + else var config_path = path.join(bds.bds_dir_java, "server.properties") + return propertiesToJSON(fs.readFileSync(config_path, "utf8").replaceAll("-","_")); +} +module.exports.config_example = () =>{ +return { + name: "Bedrock our Java", + description: "BDS Maneger", + gamemode: "survival", + difficulty: "normal", + player_permission: "member", + xbox: true, + white_list: false, + cheats: false, + players: 100, + port: 19132, + port6: 19133 + } +} +module.exports.config = bds_config +module.exports.get_config = bds_get_config \ No newline at end of file diff --git a/new_script/detect.js b/new_script/detect.js new file mode 100644 index 0000000..572f171 --- /dev/null +++ b/new_script/detect.js @@ -0,0 +1,20 @@ +module.exports = () => { + var spawn = require("child_process").execSync; + const bds = require("../index") + + if (bds.platform === "bedrock"){ + if (process.platform == "win32") { + var killbds = spawn(`tasklist /fi "imagename eq server.jar" | find /i "server.jar" > nul & if not errorlevel 1 (echo 0) else (echo 1)`); + } else if (process.platform == "linux") { + var killbds = spawn(`ps aux|grep "jar server.jar"|grep -v 'grep'|grep -q "jar server.jar";echo $?`, {shell: true}); + } + } else { + if (process.platform == "win32") { + var killbds = spawn(`tasklist /fi "imagename eq bedrock_server.exe" | find /i "bedrock_server.exe" > nul & if not errorlevel 1 (echo 0) else (echo 1)`); + } else if (process.platform == "linux") { + var killbds = spawn(`ps aux|grep -v "grep"|grep "bedrock_server"|grep -q "bedrock_server";echo $?`, {shell: true}); + } + } + // + if (killbds == 0){return true} else {return false}; +}; \ No newline at end of file diff --git a/new_script/kill_server.js b/new_script/kill_server.js new file mode 100644 index 0000000..ae14937 --- /dev/null +++ b/new_script/kill_server.js @@ -0,0 +1,25 @@ +module.exports = () => { + const bds = require("../index") + var spawn = require("child_process").exec; + const Storage = localStorage + if (bds.bds_detect()){ + if (bds.platform === "bedrock"){ + if (process.platform == "win32") var killbds = spawn(`tasklist /fi "imagename eq bedrock_server.exe" | find /i "bedrock_server.exe" > nul & if not errorlevel 1 (taskkill /f /im "bedrock_server.exe" > nul && exit 0) else (exit 1)`); + else if (process.platform == "linux") var killbds = spawn(`kill $(ps aux|grep -v "grep"|grep "bedrock_server"|awk '{print $2}')`, {shell: true}); + } else { + if (process.platform == "win32") { + var killbds = spawn(`tasklist /fi "imagename eq server.jar" | find /i "server.jar" > nul & if not errorlevel 1 (taskkill /f /im "server.jar" > nul && exit 0) else (exit 1)`); + } else if (process.platform == "linux") { + var killbds = spawn(`kill $(ps aux|grep -v "grep"|grep "server.jar"|awk '{print $2}')`, {shell: true}); + } + } + killbds.on("exit", function () { + killbds.stdin.end(); + }); + Storage.setItem("bds_status", false); + return true + } else { + Storage.setItem("bds_status", false); + return false + }; +}; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index e330c02..6effd59 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,21 @@ { +<<<<<<< HEAD + "name": "bds_maneger_api", + "version": "1.3.0", +======= "name": "@the-bds-maneger/bds_maneger_api", "version": "1.5.4", +>>>>>>> main "lockfileVersion": 2, "requires": true, "packages": { "": { +<<<<<<< HEAD + "version": "1.3.0", +======= "name": "@the-bds-maneger/bds_maneger_api", "version": "1.5.4", +>>>>>>> main "license": "AGPL-3.0-or-later", "dependencies": { "adm-zip": "^0.5.1", @@ -23,6 +32,13 @@ "properties-to-json": "^0.1.7", "qr-image": "^3.2.0", "qrcode": "^1.4.4", +<<<<<<< HEAD + "shelljs": "^0.8.4", + "systeminformation": "^5.0.2", + "telegraf": "^4.0.0" + } + }, +======= "request-ip": "^2.1.3", "shelljs": "^0.8.4", "systeminformation": "^5.0.10", @@ -167,6 +183,7 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, +>>>>>>> main "node_modules/abort-controller": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", @@ -190,6 +207,8 @@ "node": ">= 0.6" } }, +<<<<<<< HEAD +======= "node_modules/acorn": { "version": "7.4.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", @@ -211,6 +230,7 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, +>>>>>>> main "node_modules/adm-zip": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.2.tgz", @@ -239,11 +259,14 @@ }, "engines": { "node": ">=6.0" +<<<<<<< HEAD +======= }, "peerDependenciesMeta": { "supports-color": { "optional": true } +>>>>>>> main } }, "node_modules/agent-base/node_modules/ms": { @@ -251,6 +274,12 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, +<<<<<<< HEAD + "node_modules/ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", +======= "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -272,10 +301,22 @@ "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", "dev": true, +>>>>>>> main "engines": { "node": ">=6" } }, +<<<<<<< HEAD + "node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" +======= "node_modules/ansi-regex": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", @@ -307,6 +348,7 @@ "dev": true, "dependencies": { "sprintf-js": "~1.0.2" +>>>>>>> main } }, "node_modules/array-flatten": { @@ -322,6 +364,8 @@ "node": ">=8" } }, +<<<<<<< HEAD +======= "node_modules/astral-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", @@ -331,6 +375,7 @@ "node": ">=8" } }, +>>>>>>> main "node_modules/balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -339,6 +384,9 @@ "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", +<<<<<<< HEAD + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" +======= "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", "funding": [ { @@ -354,6 +402,7 @@ "url": "https://feross.org/support" } ] +>>>>>>> main }, "node_modules/bignumber.js": { "version": "9.0.1", @@ -396,6 +445,8 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", +<<<<<<< HEAD +======= "funding": [ { "type": "github", @@ -410,6 +461,7 @@ "url": "https://feross.org/support" } ], +>>>>>>> main "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -452,6 +504,8 @@ "node": ">= 0.8" } }, +<<<<<<< HEAD +======= "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -461,6 +515,7 @@ "node": ">=6" } }, +>>>>>>> main "node_modules/camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", @@ -469,6 +524,8 @@ "node": ">=6" } }, +<<<<<<< HEAD +======= "node_modules/chalk": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", @@ -485,6 +542,7 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, +>>>>>>> main "node_modules/cliui": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", @@ -495,6 +553,20 @@ "wrap-ansi": "^5.1.0" } }, +<<<<<<< HEAD + "node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" +======= "node_modules/cliui/node_modules/ansi-regex": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", @@ -557,6 +629,7 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true +>>>>>>> main }, "node_modules/command-exists": { "version": "1.2.9", @@ -612,6 +685,12 @@ "node": ">= 0.10" } }, +<<<<<<< HEAD + "node_modules/crypto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/crypto/-/crypto-1.0.1.tgz", + "integrity": "sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig==" +======= "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -631,6 +710,7 @@ "resolved": "https://registry.npmjs.org/crypto/-/crypto-1.0.1.tgz", "integrity": "sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig==", "deprecated": "This package is no longer supported. It's now a built-in Node module. If you've depended on crypto, you should switch to the one that's built-in." +>>>>>>> main }, "node_modules/debug": { "version": "2.6.9", @@ -648,12 +728,15 @@ "node": ">=0.10.0" } }, +<<<<<<< HEAD +======= "node_modules/deep-is": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", "dev": true }, +>>>>>>> main "node_modules/depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -672,6 +755,8 @@ "resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.1.tgz", "integrity": "sha1-082BIh4+pAdCz83lVtTpnpjdxxs=" }, +<<<<<<< HEAD +======= "node_modules/doctrine": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", @@ -684,6 +769,7 @@ "node": ">=6.0.0" } }, +>>>>>>> main "node_modules/ecdsa-sig-formatter": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", @@ -698,10 +784,16 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "node_modules/emoji-regex": { +<<<<<<< HEAD + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" +======= "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true +>>>>>>> main }, "node_modules/encodeurl": { "version": "1.0.2", @@ -711,6 +803,8 @@ "node": ">= 0.8" } }, +<<<<<<< HEAD +======= "node_modules/enquirer": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", @@ -723,11 +817,14 @@ "node": ">=8.6" } }, +>>>>>>> main "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" }, +<<<<<<< HEAD +======= "node_modules/escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -956,6 +1053,7 @@ "node": ">=0.10.0" } }, +>>>>>>> main "node_modules/etag": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", @@ -1013,15 +1111,23 @@ } }, "node_modules/express-rate-limit": { +<<<<<<< HEAD + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-5.2.3.tgz", + "integrity": "sha512-cjQH+oDrEPXxc569XvxhHC6QXqJiuBT6BhZ70X3bdAImcnHnTNMVuMAJaT0TXPoRiEErUrVPRcOTpZpM36VbOQ==" +======= "version": "5.2.5", "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-5.2.5.tgz", "integrity": "sha512-fv9mf4hWRKZHVlY8ChVNYnGxa49m0zQ6CrJxNiXe2IjJPqicrqoA/JOyBbvs4ufSSLZ6NTzhtgEyLcdfbe+Q6Q==" +>>>>>>> main }, "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, +<<<<<<< HEAD +======= "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -1040,11 +1146,14 @@ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "dev": true }, +>>>>>>> main "node_modules/fast-text-encoding": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz", "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==" }, +<<<<<<< HEAD +======= "node_modules/file-entry-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz", @@ -1057,6 +1166,7 @@ "node": "^10.12.0 || >=12.0.0" } }, +>>>>>>> main "node_modules/finalhandler": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", @@ -1085,6 +1195,8 @@ "node": ">=6" } }, +<<<<<<< HEAD +======= "node_modules/flat-cache": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", @@ -1104,6 +1216,7 @@ "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==", "dev": true }, +>>>>>>> main "node_modules/forwarded": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", @@ -1130,12 +1243,15 @@ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, +<<<<<<< HEAD +======= "node_modules/functional-red-black-tree": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, +>>>>>>> main "node_modules/gaxios": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.1.0.tgz", @@ -1185,6 +1301,14 @@ }, "engines": { "node": "*" +<<<<<<< HEAD + } + }, + "node_modules/google-auth-library": { + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.1.4.tgz", + "integrity": "sha512-q0kYtGWnDd9XquwiQGAZeI2Jnglk7NDi0cChE4tWp6Kpo/kbqnt9scJb0HP+/xqt03Beqw/xQah1OPrci+pOxw==", +======= }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -1221,6 +1345,7 @@ "version": "6.1.6", "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.1.6.tgz", "integrity": "sha512-Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ==", +>>>>>>> main "dependencies": { "arrify": "^2.0.0", "base64-js": "^1.3.0", @@ -1279,6 +1404,21 @@ } }, "node_modules/graceful-fs": { +<<<<<<< HEAD + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" + }, + "node_modules/gtoken": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.2.0.tgz", + "integrity": "sha512-qbf6JWEYFMj3WMAluvYXl8GAiji6w8d9OmAGCbBg0xF4xD/yu6ZaO6BhoXNddRjKcOUpZD81iea1H5B45gAo1g==", + "dependencies": { + "gaxios": "^4.0.0", + "google-p12-pem": "^3.0.3", + "jws": "^4.0.0", + "mime": "^2.2.0" +======= "version": "4.2.6", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==" @@ -1291,6 +1431,7 @@ "gaxios": "^4.0.0", "google-p12-pem": "^3.0.3", "jws": "^4.0.0" +>>>>>>> main }, "engines": { "node": ">=10" @@ -1307,6 +1448,8 @@ "node": ">= 0.4.0" } }, +<<<<<<< HEAD +======= "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -1316,6 +1459,7 @@ "node": ">=8" } }, +>>>>>>> main "node_modules/http-errors": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", @@ -1352,11 +1496,14 @@ }, "engines": { "node": ">=6.0" +<<<<<<< HEAD +======= }, "peerDependenciesMeta": { "supports-color": { "optional": true } +>>>>>>> main } }, "node_modules/https-proxy-agent/node_modules/ms": { @@ -1378,6 +1525,9 @@ "node_modules/ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", +<<<<<<< HEAD + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" +======= "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", "funding": [ { @@ -1418,6 +1568,7 @@ "funding": { "url": "https://github.com/sponsors/sindresorhus" } +>>>>>>> main }, "node_modules/imurmurhash": { "version": "0.1.4", @@ -1457,20 +1608,26 @@ "node": ">= 0.10" } }, +<<<<<<< HEAD +======= "node_modules/is_js": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/is_js/-/is_js-0.9.0.tgz", "integrity": "sha1-CrlFQFArp6+iTIVqqYVWFmnpxS0=" }, +>>>>>>> main "node_modules/is-core-module": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz", "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==", "dependencies": { "has": "^1.0.3" +<<<<<<< HEAD +======= }, "funding": { "url": "https://github.com/sponsors/ljharb" +>>>>>>> main } }, "node_modules/is-docker": { @@ -1482,6 +1639,16 @@ }, "engines": { "node": ">=8" +<<<<<<< HEAD + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "engines": { + "node": ">=4" +======= }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -1515,6 +1682,7 @@ }, "engines": { "node": ">=0.10.0" +>>>>>>> main } }, "node_modules/is-stream": { @@ -1541,6 +1709,8 @@ "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" }, +<<<<<<< HEAD +======= "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -1566,6 +1736,7 @@ "js-yaml": "bin/js-yaml.js" } }, +>>>>>>> main "node_modules/json-bigint": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz", @@ -1574,6 +1745,8 @@ "bignumber.js": "^9.0.0" } }, +<<<<<<< HEAD +======= "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -1586,6 +1759,7 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, +>>>>>>> main "node_modules/jwa": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", @@ -1605,6 +1779,8 @@ "safe-buffer": "^5.0.1" } }, +<<<<<<< HEAD +======= "node_modules/levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", @@ -1618,6 +1794,7 @@ "node": ">= 0.8.0" } }, +>>>>>>> main "node_modules/locate-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", @@ -1630,12 +1807,15 @@ "node": ">=6" } }, +<<<<<<< HEAD +======= "node_modules/lodash": { "version": "4.17.20", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true }, +>>>>>>> main "node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -1669,14 +1849,24 @@ } }, "node_modules/mime": { +<<<<<<< HEAD + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz", + "integrity": "sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==", +======= "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", +>>>>>>> main "bin": { "mime": "cli.js" }, "engines": { +<<<<<<< HEAD + "node": ">=4.0.0" +======= "node": ">=4" +>>>>>>> main } }, "node_modules/mime-db": { @@ -1724,12 +1914,15 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, +<<<<<<< HEAD +======= "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, +>>>>>>> main "node_modules/negotiator": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", @@ -1793,15 +1986,23 @@ } }, "node_modules/open": { +<<<<<<< HEAD + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/open/-/open-7.3.1.tgz", + "integrity": "sha512-f2wt9DCBKKjlFbjzGb8MOAW8LH8F0mrs1zc7KTjAJ9PZNQbfenzWbNP1VZJvw6ICMG9r14Ah6yfwPn7T7i646A==", +======= "version": "7.4.0", "resolved": "https://registry.npmjs.org/open/-/open-7.4.0.tgz", "integrity": "sha512-PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA==", +>>>>>>> main "dependencies": { "is-docker": "^2.0.0", "is-wsl": "^2.1.1" }, "engines": { "node": ">=8" +<<<<<<< HEAD +======= }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -1822,6 +2023,7 @@ }, "engines": { "node": ">= 0.8.0" +>>>>>>> main } }, "node_modules/p-limit": { @@ -1833,9 +2035,12 @@ }, "engines": { "node": ">=6" +<<<<<<< HEAD +======= }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +>>>>>>> main } }, "node_modules/p-locate": { @@ -1865,6 +2070,8 @@ "node": ">=6" } }, +<<<<<<< HEAD +======= "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -1877,6 +2084,7 @@ "node": ">=6" } }, +>>>>>>> main "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -1898,6 +2106,9 @@ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "engines": { +<<<<<<< HEAD + "node": ">=0.10.0" +======= "node": ">=0.10.0" } }, @@ -1908,6 +2119,7 @@ "dev": true, "engines": { "node": ">=8" +>>>>>>> main } }, "node_modules/path-parse": { @@ -1928,6 +2140,8 @@ "node": ">=4.0.0" } }, +<<<<<<< HEAD +======= "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -1946,6 +2160,7 @@ "node": ">=0.4.0" } }, +>>>>>>> main "node_modules/properties-to-json": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/properties-to-json/-/properties-to-json-0.1.7.tgz", @@ -1963,6 +2178,8 @@ "node": ">= 0.10" } }, +<<<<<<< HEAD +======= "node_modules/punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", @@ -1972,6 +2189,7 @@ "node": ">=6" } }, +>>>>>>> main "node_modules/qr-image": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/qr-image/-/qr-image-3.2.0.tgz", @@ -2038,6 +2256,8 @@ "node": ">= 0.10" } }, +<<<<<<< HEAD +======= "node_modules/regexpp": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", @@ -2058,6 +2278,7 @@ "is_js": "^0.9.0" } }, +>>>>>>> main "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -2066,6 +2287,8 @@ "node": ">=0.10.0" } }, +<<<<<<< HEAD +======= "node_modules/require-from-string": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", @@ -2075,12 +2298,21 @@ "node": ">=0.10.0" } }, +>>>>>>> main "node_modules/require-main-filename": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" }, "node_modules/resolve": { +<<<<<<< HEAD + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", + "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", + "dependencies": { + "is-core-module": "^2.1.0", + "path-parse": "^1.0.6" +======= "version": "1.20.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", @@ -2114,6 +2346,7 @@ }, "funding": { "url": "https://github.com/sponsors/isaacs" +>>>>>>> main } }, "node_modules/safe-buffer": { @@ -2134,6 +2367,8 @@ "node": ">= 0.10" } }, +<<<<<<< HEAD +======= "node_modules/semver": { "version": "7.3.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", @@ -2149,6 +2384,7 @@ "node": ">=10" } }, +>>>>>>> main "node_modules/send": { "version": "0.17.1", "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", @@ -2172,6 +2408,20 @@ "node": ">= 0.8.0" } }, +<<<<<<< HEAD + "node_modules/send/node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, +======= +>>>>>>> main "node_modules/send/node_modules/ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", @@ -2201,6 +2451,8 @@ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, +<<<<<<< HEAD +======= "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -2222,6 +2474,7 @@ "node": ">=8" } }, +>>>>>>> main "node_modules/shelljs": { "version": "0.8.4", "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz", @@ -2238,6 +2491,8 @@ "node": ">=4" } }, +<<<<<<< HEAD +======= "node_modules/slice-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", @@ -2255,6 +2510,7 @@ "url": "https://github.com/chalk/slice-ansi?sponsor=1" } }, +>>>>>>> main "node_modules/slide": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", @@ -2263,12 +2519,15 @@ "node": "*" } }, +<<<<<<< HEAD +======= "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, +>>>>>>> main "node_modules/statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", @@ -2278,6 +2537,35 @@ } }, "node_modules/string-width": { +<<<<<<< HEAD + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/systeminformation": { + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.0.6.tgz", + "integrity": "sha512-sX8I5SPunheS99VYBk1UGzavNMBGTizccaKcYo6TrjPaHF98iFeirexNX99zyGujlNWTVCHiVxzoNdix77hkVw==", +======= "version": "4.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", @@ -2331,6 +2619,7 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.3.0.tgz", "integrity": "sha512-pNvwU7Oray7xNkS+WOH+FE8Aks8BQ2sV8zwUiZQq97C3Co7oJVnOrgvAJwSwRlIdQTIBbe+0HZLaRrY8pdXsVw==", +>>>>>>> main "os": [ "darwin", "linux", @@ -2345,6 +2634,14 @@ }, "engines": { "node": ">=4.0.0" +<<<<<<< HEAD + } + }, + "node_modules/telegraf": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/telegraf/-/telegraf-4.0.2.tgz", + "integrity": "sha512-MTo8b6P/MMb6RbqDGXNWpCXESTihxRpTThOIPAfVBJohYQtywYl/vldjqUCdIYdg+ge8Sn/gk+OXfqHg4LewnA==", +======= }, "funding": { "type": "Buy me a coffee", @@ -2392,6 +2689,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/telegraf/-/telegraf-4.0.3.tgz", "integrity": "sha512-QWn9r7IAX4C0kHiP2skieI4pry1SO3YGe2n34a3ymqENeu6bJposut6uR1zLNzOhSPvAxqdlO59bJWGXnADqHQ==", +>>>>>>> main "dependencies": { "abort-controller": "^3.0.0", "debug": "^4.3.1", @@ -2418,11 +2716,14 @@ }, "engines": { "node": ">=6.0" +<<<<<<< HEAD +======= }, "peerDependenciesMeta": { "supports-color": { "optional": true } +>>>>>>> main } }, "node_modules/telegraf/node_modules/ms": { @@ -2430,12 +2731,15 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, +<<<<<<< HEAD +======= "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, +>>>>>>> main "node_modules/toidentifier": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", @@ -2444,6 +2748,8 @@ "node": ">=0.6" } }, +<<<<<<< HEAD +======= "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -2465,6 +2771,7 @@ "node": ">=8" } }, +>>>>>>> main "node_modules/type-is": { "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", @@ -2478,9 +2785,15 @@ } }, "node_modules/typegram": { +<<<<<<< HEAD + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/typegram/-/typegram-3.1.8.tgz", + "integrity": "sha512-2JiSSpgRjpVUMVFvU+hSs6++HvPiR5FJg91L4a62OGeo/hPv0ecAYMAmcnIsKjVJFzOK26qkkKaACVm9Fd+B4g==" +======= "version": "3.1.9", "resolved": "https://registry.npmjs.org/typegram/-/typegram-3.1.9.tgz", "integrity": "sha512-qF1cR8W7pm9oohLYPwH8jPZY3dRgA3/jjx0O83sKYHg1RYxIO90oEKH5FmnMq0lhGtX75pH0XOtyIU5e7hve4Q==" +>>>>>>> main }, "node_modules/unpipe": { "version": "1.0.0", @@ -2490,6 +2803,8 @@ "node": ">= 0.8" } }, +<<<<<<< HEAD +======= "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -2499,6 +2814,7 @@ "punycode": "^2.1.0" } }, +>>>>>>> main "node_modules/url-template": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz", @@ -2520,12 +2836,15 @@ "uuid": "dist/bin/uuid" } }, +<<<<<<< HEAD +======= "node_modules/v8-compile-cache": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz", "integrity": "sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==", "dev": true }, +>>>>>>> main "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -2534,6 +2853,8 @@ "node": ">= 0.8" } }, +<<<<<<< HEAD +======= "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -2549,11 +2870,14 @@ "node": ">= 8" } }, +>>>>>>> main "node_modules/which-module": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, +<<<<<<< HEAD +======= "node_modules/word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", @@ -2563,6 +2887,7 @@ "node": ">=0.10.0" } }, +>>>>>>> main "node_modules/wrap-ansi": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", @@ -2576,6 +2901,8 @@ "node": ">=6" } }, +<<<<<<< HEAD +======= "node_modules/wrap-ansi/node_modules/ansi-regex": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", @@ -2645,6 +2972,7 @@ "node": ">=6" } }, +>>>>>>> main "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -2695,6 +3023,8 @@ "camelcase": "^5.0.0", "decamelize": "^1.2.0" } +<<<<<<< HEAD +======= }, "node_modules/yargs/node_modules/ansi-regex": { "version": "4.1.0", @@ -2740,6 +3070,7 @@ "engines": { "node": ">=6" } +>>>>>>> main } }, "dependencies": { @@ -4204,12 +4535,15 @@ "ipaddr.js": "1.9.1" } }, +<<<<<<< HEAD +======= "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true }, +>>>>>>> main "qr-image": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/qr-image/-/qr-image-3.2.0.tgz", @@ -4472,6 +4806,16 @@ } }, "systeminformation": { +<<<<<<< HEAD + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.0.6.tgz", + "integrity": "sha512-sX8I5SPunheS99VYBk1UGzavNMBGTizccaKcYo6TrjPaHF98iFeirexNX99zyGujlNWTVCHiVxzoNdix77hkVw==" + }, + "telegraf": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/telegraf/-/telegraf-4.0.2.tgz", + "integrity": "sha512-MTo8b6P/MMb6RbqDGXNWpCXESTihxRpTThOIPAfVBJohYQtywYl/vldjqUCdIYdg+ge8Sn/gk+OXfqHg4LewnA==", +======= "version": "5.3.0", "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.3.0.tgz", "integrity": "sha512-pNvwU7Oray7xNkS+WOH+FE8Aks8BQ2sV8zwUiZQq97C3Co7oJVnOrgvAJwSwRlIdQTIBbe+0HZLaRrY8pdXsVw==" @@ -4512,6 +4856,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/telegraf/-/telegraf-4.0.3.tgz", "integrity": "sha512-QWn9r7IAX4C0kHiP2skieI4pry1SO3YGe2n34a3ymqENeu6bJposut6uR1zLNzOhSPvAxqdlO59bJWGXnADqHQ==", +>>>>>>> main "requires": { "abort-controller": "^3.0.0", "debug": "^4.3.1", @@ -4574,9 +4919,15 @@ } }, "typegram": { +<<<<<<< HEAD + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/typegram/-/typegram-3.1.8.tgz", + "integrity": "sha512-2JiSSpgRjpVUMVFvU+hSs6++HvPiR5FJg91L4a62OGeo/hPv0ecAYMAmcnIsKjVJFzOK26qkkKaACVm9Fd+B4g==" +======= "version": "3.1.9", "resolved": "https://registry.npmjs.org/typegram/-/typegram-3.1.9.tgz", "integrity": "sha512-qF1cR8W7pm9oohLYPwH8jPZY3dRgA3/jjx0O83sKYHg1RYxIO90oEKH5FmnMq0lhGtX75pH0XOtyIU5e7hve4Q==" +>>>>>>> main }, "unpipe": { "version": "1.0.0", diff --git a/package.json b/package.json index 391d015..2993d92 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,14 @@ { +<<<<<<< HEAD + "name": "bds_maneger_api", + "version": "1.4.2", +======= "name": "@the-bds-maneger/bds_maneger_api", "publishConfig": { "access": "public" }, "version": "1.5.4", +>>>>>>> main "description": "scripts to manage minecraft bedrock server", "private": false, "main": "index.js", @@ -47,7 +52,11 @@ "qrcode": "^1.4.4", "request-ip": "^2.1.3", "shelljs": "^0.8.4", +<<<<<<< HEAD + "systeminformation": "^5.0.2", +======= "systeminformation": "^5.0.10", +>>>>>>> main "telegraf": "^4.0.0" }, "engines": {