gj-boomlings-api 1.0.0 → 1.0.2

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/docs/dlLevel.md

@@ -21,8 +21,8 @@ gd.dlLevel(58825144).then(console.log);
   level_version: 2,
   difficulty: 'Extreme Demon',
   stars: 10,
-  downloads: 2587512,
-  likes: 106611,
+  downloads: 2640560,
+  likes: 107918,
   disliked: false,
   length: 'XL',
   password: '000007',
@@ -30,8 +30,8 @@ gd.dlLevel(58825144).then(console.log);
   featured: false,
   epic: false,
   objects: 37838,
-  uploaded: '2 years',
-  updated: '2 years',
+  uploaded: '3 years',
+  updated: '3 years',
   stars_requested: 10,
   game_version: '2.1',
   ldm: false,

package/docs/objects/level.md

@@ -1,6 +1,6 @@
 # Level object
 
-Used by ```dlLevel()```.
+Used by `dlLevel()`, `getLevelByID()` and `getUserLevels()`.
 
 ## Example
 ```
@@ -12,8 +12,8 @@ Used by ```dlLevel()```.
   level_version: 2,
   difficulty: 'Extreme Demon',
   stars: 10,
-  downloads: 2587512,
-  likes: 106611,
+  downloads: 2640560,
+  likes: 107918,
   disliked: false,
   length: 'XL',
   password: '000007',
@@ -21,8 +21,8 @@ Used by ```dlLevel()```.
   featured: false,
   epic: false,
   objects: 37838,
-  uploaded: '2 years',
-  updated: '2 years',
+  uploaded: '3 years',
+  updated: '3 years',
   stars_requested: 10,
   game_version: '2.1',
   ldm: false,
@@ -60,11 +60,11 @@ Used by ```dlLevel()```.
 
 ```likes``` - the amount of level likes.
 
-```disliked``` - a boolean that shows if the level is disliked. Returns ```true``` if the like amount is negative, otherwise it's ```false```.
+```disliked``` - a boolean that shows if the level is disliked. Returns `true` if the like amount is negative, otherwise it's `false`.
 
 ```length``` - the level length.
 
-```password``` - the level password. It may return ```'Non-copyable'``` if the level is not copyable, or ```'1'``` if the level is free to copy.
+```password``` - the level password. It may return `''` (an empty string) if the level is not copyable, or `'1'` if the level is free to copy.
 
 ```demon``` - a boolean that shows if the level is demon.
 
@@ -78,13 +78,13 @@ Used by ```dlLevel()```.
 
 ```updated``` - when the level has been last updated.
 
-```stars_requested``` - basically how many stars the creator has requested. Returns ```0``` if no stars have been requested.
+```stars_requested``` - basically how many stars the creator has requested. Returns`0` if no stars have been requested.
 
 ```game_version``` - the version required to play the level. Returns `Pre-1.7` if the level has been uploaded or last updated earlier, than 1.7 came out.
 
 ```ldm``` - a boolean that shows if the level has a "Low Detail Mode" checkbox.
 
-```copied``` - the original level ID, that got copied. Returns ```0``` if the level is already original.
+```copied``` - the original level ID, that got copied. Returns `0` if the level is already original.
 
 ```two_p``` - a boolean that shows if the level is in the 2-player mode.
 

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/dlLevel.js

@@ -4,6 +4,7 @@ module.exports = {
             const bs = require("js-base64")
             if(!level || level == "") throw new Error("Please provide a level ID.");
             if(isNaN(level)) throw new Error("The level parameter should be a number.");
+
             const axios = require("axios");
             const { headers, server } = require("../config.json");
 
@@ -22,40 +23,63 @@ module.exports = {
                 headers: headers
             })
 
-            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 split1 = res.data.split("1:")[1];      // id
-            let split2 = res.data.split(":2:")[1];     // name
-            let split3 = res.data.split(":3:")[1];     // description
-            let split4 = res.data.split(":5:")[1];     // level version
-            let split5 = res.data.split(":9:")[1];     // difficulty
-            let split6 = res.data.split(":18:")[1];    // stars
-            let split7 = res.data.split("0:10:")[1];   // downloads
-            let split8 = res.data.split(":14:")[1];    // likes
-            let split9 = res.data.split(":15:")[1];    // length
-            let split10 = res.data.split(":27:")[1];   // password
-            let split11 = res.data.split(":17:")[1];   // demon or not
-            let split12 = res.data.split(":19:")[1];   // featured
-            let split13 = res.data.split(":42:")[1];   // epic
-            let split14 = res.data.split(":45:")[1];   // objects
-            let split15 = res.data.split(":28:")[1];   // uploaded
-            let split16 = res.data.split(":29:")[1];   // updated
-            let split17 = res.data.split(":39:")[1];   // stars requested
-            let split18 = res.data.split(":40:")[1];   // ldm
-            let split19 = res.data.split(":30:")[1];   // copied from
-            let split20 = res.data.split(":31:")[1];   // two player
-            let split21 = res.data.split(":37:")[1];   // coins
-            let split22 = res.data.split(":38:")[1];   // verified coins
-            let split23 = res.data.split(":6:")[1];    // player id
-            let split24 = res.data.split(":13:")[1];   // game version
-            let split25 = res.data.split(":12:")[1];   // official song id
-            let split26 = res.data.split(":35:")[1];   // custom song id
-
-            if(split25.split(":13:")[0].includes(":")) split25 = res.data.split(":12:")[2];
-            if(split26.split(":36:")[0].includes(":")) split26 = res.data.split(":35:")[2];
+            let spl = res.data.split(":");
+            let levelInfo = [];
+            for(let i =0;i<spl.length;i++) {
+              if(i%2!=0) {
+                levelInfo.push(spl[i-1]+`:`+spl[i]);
+              }
+            }
+
+            let id = levelInfo[0].split("1:")[1];
+            let name = levelInfo[1].split("2:")[1];
+            let description = bs.decode(levelInfo[2].split("3:")[1])
+            let version = levelInfo[4].split("5:")[1];
+            let difficulty = levelInfo[7].split("9:")[1];
+            let downloads = levelInfo[8].split("10:")[1];
+            let officialSong = levelInfo[9].split("12:")[1];
+            let gameVersion = levelInfo[10].split("13:")[1];
+            let likes = levelInfo[11].split("14:")[1];
+            let demonBool = levelInfo[12].split("17:")[1];
+            let stars = levelInfo[15].split("18:")[1];
+            let ftrd = levelInfo[16].split("19:")[1];
+            let epic = levelInfo[17].split("42:")[1];
+            let objects = levelInfo[18].split("45:")[1];
+            let length = levelInfo[19].split("15:")[1];
+            let copiedID = levelInfo[20].split("30:")[1];
+            let twoPlayer = levelInfo[21].split("31:")[1];
+            let uploaded = levelInfo[22].split("28:")[1];
+            let updated = levelInfo[23].split("29:")[1];
+            let customSong = levelInfo[24].split("35:")[1];
+            let coins = levelInfo[26].split("37:")[1];
+            let verifiedCoins = levelInfo[27].split("38:")[1];
+            let starsRequested = levelInfo[28].split("39:")[1];
+            let ldm = levelInfo[31].split("40:")[1];
+            let password = xor.decrypt(levelInfo[32].split("27:")[1].split("#")[0], 26364);
+
+            let disliked = false;
+            if(likes.includes("-")) disliked = true;
+
+            if(verifiedCoins == "0") verifiedCoins = false;
+            if(verifiedCoins == "1") verifiedCoins = true;
+
+            let demonBoolDecoding = {
+                '1': true,
+                '': false,
+                '0': false
+            }
+
+            let featuredDecoding = {
+                "0": false,
+                "1": true,
+                undefined: true
+            }
+
+            let featured = featuredDecoding[ftrd];
+            if(featured == undefined) featured = true;
 
             let difficultyDecoding = {
+                "-10": "Auto",
                 "0": "Unrated",
                 "10": "Easy",
                 "20": "Normal",
@@ -64,7 +88,7 @@ module.exports = {
                 "50": "Insane"
             }
 
-            if(split11.split(":43:")[0] == "1") {
+            if(demonBoolDecoding[demonBool] == true) {
                 difficultyDecoding = {
                     "10": "Easy Demon",
                     "20": "Medium Demon",
@@ -73,28 +97,7 @@ module.exports = {
                     "50": "Extreme Demon"
                 }
             }
-
-            const binaryBool = {
-                undefined: false,
-                "0": false,
-                "1": true
-            };
-
-            const featuredDecoding = {
-                undefined: true,
-                "0": false,
-                "1": true
-            }
-
-            let featured = featuredDecoding[split12.split(":42:")[0]];
-            if(featured == undefined) featured = true;
-
-            let demonBool = binaryBool[split11.split(":43:")[0]];
-            if(split11.split(":43:")[0] == "") demonBool = false;
-
-            let ldm = binaryBool[split18.split(":27")[0]]
-            if(ldm == undefined) ldm = false;
-
+            
             const lengthDecoding = {
                 "0": "Tiny",
                 "1": "Short",
@@ -102,59 +105,15 @@ module.exports = {
                 "3": "Long",
                 "4": "XL"
             }
-            if(lengthDecoding[split9.split(":30:")[0]] == undefined) split9 = res.data.split(":15:")[2];
-            
-            let desc = bs.decode(split3.split(":4:")[0].replace(/_/g, '/').replace(/-/g, '+'));
-            if(desc == "") desc = "(No description provided)"
-
-            let likes = split8.split(":17:")[0];
-            let dislikedBool;
-            if(likes.includes("-")) {
-                dislikedBool = true;
-            } else {
-                dislikedBool = false;
-            }
-
-            const decryptedPass = xor.decrypt(split10, 26364);
-            if (decryptedPass.length > 1) split10 = decryptedPass.slice(1);
-            else split10 = decryptedPass;
-            if (decryptedPass.length > 7) split10 = "Non-copyable";
-
-            const authData = {
-                gameVersion: 21,
-                binaryVersion: 35,
-                gdw: 0,
-                str: split23.split(":8:")[0],
-                secret: "Wmfd2893gb7"
-            }
-            let auth = await axios.post(server + "getGJUsers20.php", authData, {
-                headers: headers
-            })
-            let authname;
-            if(auth.data == "-1") {
-                authname = "-"
-            } else if(!auth.data.startsWith("-")) {
-                authname = auth.data.split("1:")[1].split(":2:")[0];
-            }
-
-            const { getSongInfo } = require("./getSongInfo.js");
-            const { getOfficialSongInfo } = require("./getOfficialSongInfo.js");
-            let song;
-
-            let copiedId = split19.split(":31:")[0];
-            if(copiedId.includes(":")) split19 = res.data.split(":30:")[2];
-
-            let starsCount = split6.split(":19:")[0];
-            if(starsCount.includes(":")) split6 = res.data.split(":18:")[2];
 
             const decodeGameVersion = {
-                "1": "1.0",
-                "2": "1.1",
-                "3": "1.2",
-                "4": "1.3",
-                "5": "1.4",
-                "6": "1.5",
-                "7": "1.6",
+                "1": "Pre-1.7",
+                "2": "Pre-1.7",
+                "3": "Pre-1.7",
+                "4": "Pre-1.7",
+                "5": "Pre-1.7",
+                "6": "Pre-1.7",
+                "7": "Pre-1.7",
                 "10": "1.7",
                 "18": "1.8",
                 "19": "1.9",
@@ -162,79 +121,40 @@ module.exports = {
                 "21": "2.1"
             }
 
-            let objs = split14.split(":15:")[0];
-            if(Number(objs) == NaN) objs = split14.split(":15:")[1];
-
-            let offSongID = Number(split25.split(":13:")[0]) + 1;
-            if(split25.split(":13:")[0] == "0" && split26.split(":36:")[0] != "0") {
-                try {
-                    song = await getSongInfo(split26.split(":36:")[0]);
-                } catch(err) {
-                    let songReq = await axios.post(server + 'getGJLevels21.php', {
-                        gameVersion: 21,
-                        binaryVersion: 35,
-                        gdw: 0,
-                        type: 0,
-                        str: level,
-                        secret: "Wmfd2893gb7"
-                    }, {
-                        headers: headers
-                    })
-                    if(!songReq.data.includes("~|~")) {
-                         song = {
-                            "name": "Unknown",
-                            "id": Number(split26.split(":36:")[0]),
-                            "artist": "Unknown",
-                            "artistId": null,
-                            "fileSize": "0MB",
-                            "link": null
-                         }
-                    } else {
-                        song = {
-                        "name": songReq.data.split("|~2~|~")[1].split("~|~3~|~")[0],
-                        "id": Number(songReq.data.split("1~|~")[1].split("~|~2~|")[0]),
-                        "artist": songReq.data.split("~|~4~|~")[1].split("~|~5~|~")[0],
-                        "artistId": Number(songReq.data.split("~|~3~|~")[1].split("~|~4~|~")[0]),
-                        "fileSize": `${songReq.data.split("~|~5~|~")[1].split("~|~6~|~")[0]} MB`,
-                        "link": decodeURIComponent(songReq.data.split("~|~10~|~")[1].split("~|~7~|~")[0])
-                        }
-                    }
-                }
-            } else if(split25.split(":13:")[0] != "0" && split26.split(":36:")[0] == "0") {
-                song = getOfficialSongInfo(offSongID);
-            } else if(split25.split(":13:")[0] == "0" && split26.split(":36:")[0] == "0") {
-                song = getOfficialSongInfo(1);
-            }
-                
-                const result = {
-                    "id": Number(split1.split(":2:")[0]),
-                    "name": split2.split(":3:")[0].toString(),
-                    "description": desc.trim(),
-                    "creator": authname,
-                    "level_version": Number(split4.split(":6:")[0]),
-                    "difficulty": difficultyDecoding[split5.split(":10:")[0]].toString(),
-                    "stars": Number(split6.split(":19:")[0]),
-                    "downloads": Number(split7.split(":12:")[0]),
-                    "likes": Number(likes),
-                    "disliked": dislikedBool,
-                    "length": lengthDecoding[split9.split(":30:")[0]],
-                    "password": split10,
-                    "demon": demonBool,
-                    "featured": featured,
-                    "epic": featuredDecoding[split13.split(":45:")[0]],
-                    "objects": Number(objs),
-                    "uploaded": split15.split(":29:")[0],
-                    "updated": split16.split(":35:")[0],
-                    "stars_requested": Number(split17.split(":46:")[0]),
-                    "game_version": decodeGameVersion[split24.split(":14:")[0]],
-                    "ldm": ldm,
-                    "copied": Number(split19.split(":31:")[0]),
-                    "two_p": binaryBool[split20.split(":28:")[0]],
-                    "coins": Number(split21.split(":38:")[0]),
-                    "verified_coins": binaryBool[split22.split(":39:")[0]],
-                    "song": song
-                }
-
-            return result;
+            if(description == '') description = "(No description provided)";
+
+            const { getLevelByID } = require("./getLevelByID.js");
+            let basicInfoAboutLevel = await getLevelByID(id);
+
+            const result = {
+              id: Number(id),
+              name: name,
+              description: description,
+              creator: basicInfoAboutLevel.creator,
+              level_version: Number(version),
+              difficulty: difficultyDecoding[difficulty],
+              stars: Number(stars),
+              downloads: Number(downloads),
+              likes: Number(likes),
+              disliked: disliked,
+              length: lengthDecoding[length],
+              password: password.replace("1", ""), 
+              demon: demonBoolDecoding[demonBool],
+              featured: featured,
+              epic: demonBoolDecoding[epic],
+              objects: Number(objects),
+              uploaded: uploaded,
+              updated: updated,
+              stars_requested: Number(starsRequested),
+              game_version: decodeGameVersion[gameVersion],
+              ldm: demonBoolDecoding[ldm],
+              copied: Number(copiedID),
+              two_p: demonBoolDecoding[twoPlayer],
+              coins: Number(coins),
+              verified_coins: verifiedCoins,
+              song: basicInfoAboutLevel.song,
+          }
+
+          return result;
         }
 }

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

@@ -1,3 +1,6 @@
+console.log('\x1b[32m%s\x1b[40m', 'Thanks for using gj-boomlings-api!\nhttps://github.com/shikoshib/gj-boomlings-api');
+console.log('\x1b[37m%s\x1b[0m', '');
+
 const { dlLevel } = require("./functions/dlLevel.js");
 const { getSongInfo } = require("./functions/getSongInfo.js");
 const { getOfficialSongInfo } = require("./functions/getOfficialSongInfo.js");
@@ -30,7 +33,7 @@ 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/misc/decodeLevel.js

@@ -87,8 +87,6 @@ module.exports = {
                 "4": "XL"
             }
 
-            if(lengthDecoding[length] == undefined) length = level.split(":15:")[2].split(":30")[0];
-
             const decodeGameVersion = {
                 "1": "Pre-1.7",
                 "2": "Pre-1.7",

package/misc/decodeMapPack.js

@@ -1,20 +1,28 @@
 module.exports = {
     decodeMapPack:
         function(mp) {
-            let name = mp.split(":2:")[1].split(":3:")[0];
-            let unarrayedList = mp.split(":3:")[1].split(":4:")[0].split(":4")[0];
-            let stars = mp.split(":4:")[1].split(":5:")[0];
-            let coins = mp.split(":5:")[1].split(":6:")[0];
-            let difficulty = mp.split(":6:")[1].split(":7:")[0];
 
-            if(unarrayedList.includes(":")) unarrayedList = mp.split(":3:")[2].split(":4:")[0]
+            let spl = mp.split(':');
+            let mpInfo = [];
+            for(let i =0;i<spl.length;i++) {
+                if(i%2!=0) {
+                    mpInfo.push(spl[i-1]+`:`+spl[i]);
+                }
+            }
 
+            let mappackID = mpInfo[0].split("1:")[1];
+            let name = mpInfo[1].split("2:")[1];
+            let unarrayedList = mpInfo[2].split("3:")[1];
+            let stars = mpInfo[3].split("4:")[1];
+            let coins = mpInfo[4].split("5:")[1];
+            let difficulty = mpInfo[5].split("6:")[1];
+            let txtCol = mpInfo[6].split("7:")[1];
+            let barCol = mpInfo[7].split("8:")[1];
+            
             let firstLvl = unarrayedList.split(",")[0];
             let secondLvl = unarrayedList.split(",")[1].split(",")[0];
             let thirdLvl = unarrayedList.split(",")[2].split(",")[0];
 
-            if(name.includes(":")) name = name.split("2:")[1]
-
             let difficultyDecoder = {
                 "0": "Auto",
                 "1": "Easy",
@@ -29,25 +37,29 @@ module.exports = {
                 "10": "Extreme Demon",
             }
 
-            if(coins.startsWith("5:")) {
-                coins = coins.split("5:")[1];
-            }
+            function rgbToHEX(color) {
+                let r = color.split(",")[0];
+                let g = color.split(",")[1].split(",")[0];
+                let b = color.split(",")[2];
 
-            if(mp.split(":5:")[2] !== undefined) {
-                if(coins.includes(":")) {
-                    coins = mp.split(":5:")[2].split(":6:")[0];
-                }
-            }
+                if(b.includes("#")) b = b.split("#")[0]
 
-            if(coins.startsWith("5:")) coins = coins.split("5:")[1];
-            if(coins.startsWith("7:")) coins = mp.split(":5:")[1].split(":6:")[0];
-            if(coins.endsWith(":6")) coins = coins.split(":6")[0];
+                let rHex = Number(r).toString(16);
+                let gHex = Number(g).toString(16);
+                let bHex = Number(b).toString(16); 
+
+                return `#${rHex.length == 1 ? "0" + rHex : rHex}${gHex.length == 1 ? "0" + gHex : gHex}${bHex.length == 1 ? "0" + bHex : bHex}`.toUpperCase();
+            }
 
             const result = {
                 name: name,
+                id: Number(mappackID),
                 levels: [Number(firstLvl),Number(secondLvl),Number(thirdLvl)],
                 stars: Number(stars),
-                coins: Number(coins)
+                coins: Number(coins),
+                difficulty: difficultyDecoder[difficulty],
+                textColor: rgbToHEX(txtCol),
+                barColor: rgbToHEX(barCol)
             }
 
             return result;

package/package.json

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