gj-boomlings-api 1.0.0 → 1.0.1

package/README.md

@@ -3,6 +3,7 @@
   <a href="https://www.npmjs.com/package/gj-boomlings-api"><img src="https://img.shields.io/npm/v/gj-boomlings-api.svg?maxAge=3600" alt="npm version" /></a>
   <a href="https://www.npmjs.com/package/gj-boomlings-api"><img src="https://img.shields.io/npm/dt/gj-boomlings-api.svg?maxAge=3600" alt="npm downloads" /></a>
   <a href="https://snyk.io/test/github/shikoshib/gj-boomlings-api"><img src="https://snyk.io/test/github/shikoshib/gj-boomlings-api/badge.svg" alt="Known Vulnerabilities" /></a>
+  <a href="https://packagequality.com/#?package=gj-boomlings-api"><img src="https://packagequality.com/shield/gj-boomlings-api.svg"/></a>
 </div>
 
 This package gets info from RobTop's servers (boomlings.com) and converts it into pure and beautiful JSON.

package/functions/blockUser.js

@@ -6,14 +6,6 @@ module.exports = {
             if(!password || password == "") throw new Error("Please provide your password!");
             const axios = require("axios");
             const {headers, server} = require("../config.json");
-
-            const userData = {
-                gameVersion: 21,
-                binaryVersion: 35,
-                gdw: 0,
-                str: target,
-                secret: "Wmfd2893gb7"
-            }
             
             let resp = await axios.post(server + "getGJUsers20.php", {
                 gameVersion: 21,
@@ -23,17 +15,27 @@ module.exports = {
                 secret: "Wmfd2893gb7"
             }, {
                 headers: headers
+            }).catch(e => {
+                if(e.response.data == -1) throw new Error(`Couldn't find a "${username}" user.`)
+                throw new Error(e.response.data)
             })
-            if(resp.data == -1) throw new Error(`Couldn't find a "${username}" user.`)
-            if(resp.data.toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
+
             let accID = resp.data.split(":16:")[1].split(":3:")[0];
 
+            const userData = {
+                gameVersion: 21,
+                binaryVersion: 35,
+                gdw: 0,
+                str: target,
+                secret: "Wmfd2893gb7"
+            }
 
             let r = await axios.post(server + "getGJUsers20.php", userData, {
                 headers: headers
+            }).catch(e => {
+                if(e.response.data == -1) throw new Error(`Couldn't find a "${username}" user.`)
+                throw new Error(e.response.data)
             })
-            if(r.data == -1) throw new Error(`Couldn't find a "${username}" user.`)
-            if(r.data.toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
             let targetId = r.data.split(":16:")[1].split(":3:")[0];
 
             const {gjp} = require("../misc/gjp.js");
@@ -51,8 +53,8 @@ module.exports = {
             let res = await axios.post(server + "blockGJUser20.php", blockData, {
                 headers: headers
             }).catch(e => {
-                if(res.data.toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
-                throw new Error(`${e}`)
+                if(res.data.toString().toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
+                throw new Error(e)
             })
 
             return 1;

package/functions/deleteAccountPost.js

@@ -20,11 +20,10 @@ module.exports = {
             let r = await axios.post(server + "getGJUsers20.php", data, {
                 headers: headers
             }).catch(e => {
+                if(e.response.data == -1) throw new Error("-1 This user is not found.");
                 throw new Error(e.response.data);
             })
 
-            if(r.data == -1) throw new Error("-1 This user is not found.")
-
             let accId = r.data.split(":16:")[1].split(":3:")[0];
             if(Number(accId) < 71 || accId.includes(":")) accId = r.data.split(":16:")[2].split(":3:")[0];
 

package/functions/getAccountPosts.js

@@ -16,12 +16,11 @@ module.exports = {
 
             let r = await axios.post(server + "getGJUsers20.php", data, {
                 headers: headers
+            }).catch(e => {
+                if(e.response.data == -1) throw new Error("-1 This user is not found.");
+                throw new Error(e.response.data);
             })
 
-            if(r.data == -1) throw new Error("-1 This user is not found.")
-            if(r.data.toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
-            if(r.data.toLowerCase() == "error code: 1005") throw new Error("1005 error: Your IP address has been blocked from sending requests to a server. It's recommended to use locally (directly from a PC).")
-            
             let id = r.data.split(":16:")[1].split(":3:")[0];
             if(Number(id) < 71 || id.includes(":")) id = r.data.split(":16:")[2].split(":3:")[0];
 
@@ -36,12 +35,11 @@ module.exports = {
 
             let res = await axios.post(server + "getGJAccountComments20.php", ACdata, {
                 headers: headers
+            }).catch(e => {
+                if(e.response.data == -1) throw new Error("-1 Not found.");
+                if(e.response.data.startsWith("#")) throw new Error("Whoops! Couldn't find anything!");
+                throw new Error(e.response.data);
             })
-            
-            if(res.data == -1) throw new Error("-1 Not found.")
-            if(res.data.toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
-            if(res.data.toLowerCase() == "error code: 1005") throw new Error("1005 error: Your IP address has been blocked from sending requests to a server. It's recommended to use locally (directly from a PC).")
-            if(res.data.startsWith("#")) throw new Error("Whoops! Couldn't find anything!");
 
             let firstPost = res.data;
             let secondPost;

package/functions/getCommentHistory.js

@@ -17,12 +17,11 @@ module.exports = {
 
             let r = await axios.post(server + "getGJUsers20.php", userData, {
                 headers: headers
+            }).catch(e => {
+                if(e.response.data == -1) throw new Error("-1 This user is not found.");
+                throw new Error(e.response.data);
             })
 
-            if(r.data == -1) throw new Error("-1 Not found.");
-            if(r.data.toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
-            if(r.data.toLowerCase() == "error code: 1005") throw new Error("1005 error: Your IP address has been blocked from sending requests to a server. It's recommended to use locally (directly from a PC).")
-            
             let id = r.data.split(":2:")[1].split(":13:")[0];
 
             const user = await getProfile(id);
@@ -40,12 +39,10 @@ module.exports = {
 
             let res = await axios.post(server + "getGJCommentHistory.php", CHData, {
                 headers: headers
+            }).catch(e => {
+                if(e.response.data == -1) throw new Error("-1 Not found.");
+                throw new Error(e.response.data);
             })
-            
-            if(res.data == -1) throw new Error("-1 Not found.");
-            if(res.data.toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
-            if(res.data.toLowerCase() == "error code: 1005") throw new Error("1005 error: Your IP address has been blocked from sending requests to a server. It's recommended to use locally (directly from a PC).")
-            
 
             let firstComment = res.data;
             let secondComment;

package/functions/getComments.js

@@ -19,12 +19,11 @@ module.exports = {
 
             let res = await axios.post(server + "getGJComments21.php", data, {
                 headers: headers
+            }).catch(e => {
+                if(e.response.data == -1) throw new Error("-1 This user is not found.");
+                throw new Error(e.response.data);
             })
             
-            if(res.data == -1) throw new Error("-1 Not found.");
-            if(res.data.toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
-            if(res.data.toLowerCase() == "error code: 1005") throw new Error("1005 error: Your IP address has been blocked from sending requests to a server. It's recommended to use locally (directly from a PC).")
-
             let firstComment = res.data;
             let secondComment;
             let thirdComment;

package/functions/getGauntlets.js

@@ -14,10 +14,9 @@ module.exports = {
 
             let res = await axios.post(server + "getGJGauntlets21.php", data, {
                 headers: headers
+            }).catch(e => {
+                throw new Error(e.response.data);
             })
-            
-            if(res.data.toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
-            if(res.data.toLowerCase() == "error code: 1005") throw new Error("1005 error: Your IP address has been blocked from sending requests to a server. It's recommended to use locally (directly from a PC).")
 
             let first = res.data.split("|")[0];
             let second = res.data.split("|")[1].split("|")[0];

package/functions/getLevelByID.js

@@ -19,11 +19,10 @@ module.exports = {
 
             let res = await axios.post(server + "getGJLevels21.php", data, {
                 headers: headers
+            }).catch(e => {
+                if(e.response.data == -1) throw new Error("-1 Not found.");
+                throw new Error(e.response.data);
             })
-            
-            if(res.data == -1) throw new Error("-1 Not found.");
-            if(res.data.toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
-            if(res.data.toLowerCase() == "error code: 1005") throw new Error("1005 error: Your IP address has been blocked from sending requests to a server. It's recommended to use locally (directly from a PC).")
 
             return decodeLevel(res.data);
         }

package/functions/getMapPacks.js

@@ -11,10 +11,10 @@ module.exports = {
 
             let res = await axios.post(server + "getGJMapPacks21.php", data, {
                 headers: headers
+            }).catch(e => {
+                if(e.response.data == -1) throw new Error("-1 Not found.");
+                throw new Error(e.response.data);
             })
-            
-            if(res.data.toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
-            if(res.data.toLowerCase() == "error code: 1005") throw new Error("1005 error: Your IP address has been blocked from sending requests to a server. It's recommended to use locally (directly from a PC).")
 
             let firstMapPack = res.data.split("|")[0];
             let secondMapPack = res.data.split("|")[1].split("|")[0];

package/functions/getSongInfo.js

@@ -13,20 +13,20 @@ module.exports = {
 
             let res = await axios.post(server + 'getGJSongInfo.php', data, {
                 headers: headers
+            }).catch(e => {
+                if(e.response.data == -2) throw new Error(`-2. Couldn't find a song with ID ${song}.`)
+                throw new Error(e.response.data);
             })
 
-                if(res.data == -2) throw new Error(`-2. Couldn't find a song with ID ${song}.`)
-                if(res.data.toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
-                if(res.data.toLowerCase() == "error code: 1005") throw new Error("1005 error: Your IP address has been blocked from sending requests to a server. It's recommended to use locally (directly from a PC).")
-    
-                const result = {
-                    "name": res.data.split("|~2~|~")[1].split("~|~3~|~")[0],
-                    "id": Number(res.data.split("1~|~")[1].split("~|~2~|")[0]),
-                    "artist": res.data.split("~|~4~|~")[1].split("~|~5~|~")[0],
-                    "artistId": Number(res.data.split("~|~3~|~")[1].split("~|~4~|~")[0]),
-                    "fileSize": `${res.data.split("~|~5~|~")[1].split("~|~6~|~")[0]} MB`,
-                    "link": decodeURIComponent(res.data.split("~|~10~|~")[1].split("~|~7~|~")[0])
-                }
-                return result;
+            const result = {
+                "name": res.data.split("|~2~|~")[1].split("~|~3~|~")[0],
+                "id": Number(res.data.split("1~|~")[1].split("~|~2~|")[0]),
+                "artist": res.data.split("~|~4~|~")[1].split("~|~5~|~")[0],
+                "artistId": Number(res.data.split("~|~3~|~")[1].split("~|~4~|~")[0]),
+                "fileSize": `${res.data.split("~|~5~|~")[1].split("~|~6~|~")[0]} MB`,
+                "link": decodeURIComponent(res.data.split("~|~10~|~")[1].split("~|~7~|~")[0])
+            }
+
+            return result;
         }
 }

package/functions/reportLevel.js

@@ -14,12 +14,9 @@ module.exports = {
 
             let res = await axios.post(server + "reportGJLevel.php", data, {
                 headers: headers
+            }).catch(e => {
+                throw new Error(e.response.data)
             })
-
-            if(res.data == -1) throw new Error("-1 Request denied.");
-            if(res.data.toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
-            if(res.data.toString().toLowerCase() == "error code: 1005") throw new Error("1005 error: Your IP address has been blocked from sending requests to a server. It's recommended to use locally (directly from a PC).")
-
             return res.data;
         }
 }

package/functions/updateLevelDesc.js

@@ -22,12 +22,10 @@ module.exports = {
 
             let r = await axios.post(server + "getGJUsers20.php", data, {
                 headers: headers
+            }).catch(e => {
+                throw new Error(e.response.data);
             })
 
-            if(r.data == -1) throw new Error("-1 This user is not found.")
-            if(r.data.toString().toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
-            if(r.data.toString().toLowerCase() == "error code: 1005") throw new Error("1005 error: Your IP address has been blocked from sending requests to a server. It's recommended to use locally (directly from a PC).")
-
             let id = r.data.split(":16:")[1].split(":3:")[0];
             if(Number(id) < 71 || id.includes(":")) id = r.data.split(":16:")[2].split(":3:")[0];
 
@@ -44,12 +42,11 @@ module.exports = {
 
             let res = await axios.post(server + "updateGJDesc20.php", uLDdata, {
                 headers: headers
+            }).catch(e => {
+                if(e.response.data == -1) throw new Error("-1 Failed to update the description.")
+                throw new Error(e.response.data);
             })
-
-            if(res.data == -1) throw new Error("-1 Failed to update the description.")
-            if(res.data.toString().toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
-            if(res.data.toString().toLowerCase() == "error code: 1005") throw new Error("1005 error: Your IP address has been blocked from sending requests to a server. It's recommended to use locally (directly from a PC).")
-
+            
             return 1;
         }
 }

package/functions/uploadAccountPost.js

@@ -18,9 +18,11 @@ module.exports = {
 
             let r = await axios.post(server + "getGJUsers20.php", data, {
                 headers: headers
+            }).catch(e => {
+                if(e.response.data == -1) throw new Error("-1 This user is not found.");
+                throw new Error(e.response.data);
             })
 
-            if(r.data == -1) throw new Error("-1 This user is not found.")
             let id = r.data.split(":16:")[1].split(":3:")[0];
             if(Number(id) < 71 || id.includes(":")) id = r.data.split(":16:")[2].split(":3:")[0];
 
@@ -44,10 +46,8 @@ module.exports = {
                 headers: headers
             }).catch(e => {
                 if(e.response.status == 500) throw new Error("500 Error: couldn't post!");
+                throw new Error(e.response.data);
             })
-            
-            if(res.data.toLowerCase() == "error code: 1020") throw new Error("1020 error: Request denied.");
-            if(res.data.toString().toLowerCase() == "error code: 1005") throw new Error("1005 error: Your IP address has been blocked from sending requests to a server. It's recommended to use locally (directly from a PC).")
 
             return 1;
         }

package/functions/uploadComment.js

@@ -27,9 +27,11 @@ module.exports = {
 
             let r = await axios.post(server + "getGJUsers20.php", data, {
                 headers: headers
+            }).catch(e => {
+                if(r.data == -1) throw new Error("-1 This user is not found.")
+                throw new Error(e.response.data)
             })
 
-            if(r.data == -1) throw new Error("-1 This user is not found.")
             let username = r.data.split("1:")[1].split(":2:")[0];
             let accID = r.data.split(":16:")[1].split(":3:")[0];
             if(Number(accID) < 71 || accID.includes(":")) accID = r.data.split(":16:")[2].split(":3:")[0];

package/index.js

@@ -23,14 +23,14 @@ const { deleteAccountPost } = require("./functions/deleteAccountPost.js");
 const { getUserLevels } = require("./functions/getUserLevels.js");
 const { searchLevels } = require("./functions/searchLevels.js");
 
-module.exports.dlLevel = dlLevel;
+module.exports.dlLevel = dlLevel; // to fix
 module.exports.getSongInfo = getSongInfo;
 module.exports.getOfficialSongInfo = getOfficialSongInfo;
 module.exports.decURLSafeBase64 = decURLSafeBase64;
 module.exports.encURLSafeBase64 = encURLSafeBase64;
 module.exports.getDailyLevel = getDailyLevel;
 module.exports.getWeeklyDemon = getWeeklyDemon;
-module.exports.getProfile = getProfile;
+module.exports.getProfile = getProfile; // to fix
 module.exports.reportLevel = reportLevel;
 module.exports.getComments = getComments;
 module.exports.getCommentHistory = getCommentHistory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gj-boomlings-api",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A Node.js module that allows you to fetch boomlings.com easily",
   "main": "index.js",
   "scripts": {