go-bds/Maneger
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Releases 71 Wiki Activity

Axios request #180

Closed
Sirherobrine23 wants to merge 5 commits from Axios into main
pull from: Axios
merge into: go-bds:main
Conversation 0 Commits 5 Files Changed 4 +90 -8294
4 changed files with 90 additions and 8294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Requests.js
View File

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

8350
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@ -55,6 +55,7 @@
"dependencies": { "dependencies": {
"@azure/storage-blob": "^12.6.0", "@azure/storage-blob": "^12.6.0",
"adm-zip": "^0.5.1", "adm-zip": "^0.5.1",
"axios": "^0.21.3",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"cli-color": "^2.0.0", "cli-color": "^2.0.0",
"cors": "^2.8.5", "cors": "^2.8.5",
@ -67,7 +68,6 @@
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
"minimist": "^1.2.5", "minimist": "^1.2.5",
"node-cron": "^3.0.0", "node-cron": "^3.0.0",
"node-fetch": "2.6.1",
"oci-sdk": "^2.0.0", "oci-sdk": "^2.0.0",
"open": "^8.0.0", "open": "^8.0.0",
"properties-to-json": "^0.2.1", "properties-to-json": "^0.2.1",
@ -76,7 +76,7 @@
"uuid": "^8.3.2" "uuid": "^8.3.2"
}, },
"devDependencies": { "devDependencies": {
"docker-run_build": "github:Sirherobrine23/Docker-Run_Build#main", "docker-run_build": "github:Sirherobrine23/Docker-Run_Build",
"eslint": "^7.19.0", "eslint": "^7.19.0",
"husky": "^7.0.0", "husky": "^7.0.0",
"nexe": "*", "nexe": "*",

20
src/BdsServersDownload.js
View File

@ -46,7 +46,7 @@ module.exports = function (version = true, force_install = false, callback = (er
if (existsSync(join(bds_dir_bedrock, "server.properties"))) server_configs = readFileSync(join(bds_dir_bedrock, "server.properties"), "utf8"); if (existsSync(join(bds_dir_bedrock, "server.properties"))) server_configs = readFileSync(join(bds_dir_bedrock, "server.properties"), "utf8");
if (existsSync(join(bds_dir_bedrock, "permissions.json"))) permissions = readFileSync(join(bds_dir_bedrock, "permissions.json"), "utf8"); if (existsSync(join(bds_dir_bedrock, "permissions.json"))) permissions = readFileSync(join(bds_dir_bedrock, "permissions.json"), "utf8");
if (existsSync(join(bds_dir_bedrock, "whitelist.json"))) whitelist = readFileSync(join(bds_dir_bedrock, "whitelist.json"), "utf8"); if (existsSync(join(bds_dir_bedrock, "whitelist.json"))) whitelist = readFileSync(join(bds_dir_bedrock, "whitelist.json"), "utf8");
// Download and Add to Adm_Zip // Download and Add to Adm_Zip
Request.BUFFER(BedrockUrlDownload).then(ResBuffer => { Request.BUFFER(BedrockUrlDownload).then(ResBuffer => {
// Extract Zip // Extract Zip
@ -54,12 +54,12 @@ module.exports = function (version = true, force_install = false, callback = (er
console.log("Download Sucess") console.log("Download Sucess")
zip.extractAllTo(bds_dir_bedrock, true) zip.extractAllTo(bds_dir_bedrock, true)
console.log("Extract Sucess") console.log("Extract Sucess")
// Reeplace Server Configs // Reeplace Server Configs
if (server_configs) writeFileSync(join(bds_dir_bedrock, "server.properties"), server_configs); if (server_configs) writeFileSync(join(bds_dir_bedrock, "server.properties"), server_configs);
if (permissions) writeFileSync(join(bds_dir_bedrock, "permissions.json"), permissions); if (permissions) writeFileSync(join(bds_dir_bedrock, "permissions.json"), permissions);
if (whitelist) writeFileSync(join(bds_dir_bedrock, "whitelist.json"), whitelist); if (whitelist) writeFileSync(join(bds_dir_bedrock, "whitelist.json"), whitelist);
// Update Server Version // Update Server Version
UpdateServerVersion(version); UpdateServerVersion(version);
@ -90,10 +90,10 @@ module.exports = function (version = true, force_install = false, callback = (er
// Save Jar file // Save Jar file
writeFileSync(join(bds_dir_java, "MinecraftServerJava.jar"), ResBuffer, "binary") writeFileSync(join(bds_dir_java, "MinecraftServerJava.jar"), ResBuffer, "binary")
console.log("Success when downloading and saving Minecraft Server java"); console.log("Success when downloading and saving Minecraft Server java");
// Update Server Version // Update Server Version
UpdateServerVersion(version); UpdateServerVersion(version);
// Resolve // Resolve
promise_resolve(); promise_resolve();
if (typeof callback === "function") callback(undefined); if (typeof callback === "function") callback(undefined);
@ -120,7 +120,7 @@ module.exports = function (version = true, force_install = false, callback = (er
} else { } else {
const PocketMineJson = Servers.pocketmine[version] const PocketMineJson = Servers.pocketmine[version]
console.log(`Server data publish: ${PocketMineJson.data}`); console.log(`Server data publish: ${PocketMineJson.data}`);
Request.BUFFER(PocketMineJson.url).then(ResBuffer => { Request.BUFFER(PocketMineJson.url).then(ResBuffer => {
writeFileSync(join(bds_dir_pocketmine, "PocketMine-MP.phar"), ResBuffer, "binary") writeFileSync(join(bds_dir_pocketmine, "PocketMine-MP.phar"), ResBuffer, "binary")
console.log("Success downloading and saving PocketMine-MP php"); console.log("Success downloading and saving PocketMine-MP php");
@ -213,7 +213,7 @@ async function php_download() {
const PHPBin = (await (await fetch(Extra.Fetchs.php)).json()); const PHPBin = (await (await fetch(Extra.Fetchs.php)).json());
const phpFolder = resolve(bds_dir_pocketmine, "bin"); const phpFolder = resolve(bds_dir_pocketmine, "bin");
const phpExtensiosnsDir = resolve(bds_dir_pocketmine, "bin/php7/lib/php/extensions"); const phpExtensiosnsDir = resolve(bds_dir_pocketmine, "bin/php7/lib/php/extensions");
// Check Php Binary // Check Php Binary
let urlPHPBin = PHPBin[process.platform] let urlPHPBin = PHPBin[process.platform]
if (!(urlPHPBin)) throw new Error("unsupported system") if (!(urlPHPBin)) throw new Error("unsupported system")
@ -224,11 +224,11 @@ async function php_download() {
if (existsSync(phpFolder)) { if (existsSync(phpFolder)) {
console.log("Removing old PHP files."); console.log("Removing old PHP files.");
rmSync(phpFolder, { recursive: true }); rmSync(phpFolder, { recursive: true });
} }
console.log(`Downloading ${urlPHPBin}`); console.log(`Downloading ${urlPHPBin}`);
const ZipBuffer = Buffer.from((await (await fetch(urlPHPBin)).arrayBuffer())); const ZipBuffer = Buffer.from((await (await fetch(urlPHPBin)).arrayBuffer()));
console.log(`${basename(urlPHPBin)} downloaded`); console.log(`${basename(urlPHPBin)} downloaded`);
console.log(`Extracting ${basename(urlPHPBin)}`); console.log(`Extracting ${basename(urlPHPBin)}`);
const zipExtractBin = new AdmZip(ZipBuffer); const zipExtractBin = new AdmZip(ZipBuffer);
zipExtractBin.extractAllTo(bds_dir_pocketmine, false) zipExtractBin.extractAllTo(bds_dir_pocketmine, false)
@ -248,4 +248,4 @@ async function php_download() {
writeFileSync(join(phpFolder, "php7", "bin", "php.ini"), phpConfigInit); writeFileSync(join(phpFolder, "php7", "bin", "php.ini"), phpConfigInit);
} }
return true; return true;
} }