hypixel-api-reborn 11.0.1 → 11.2.0

package/src/Client.js

@@ -13,7 +13,7 @@ const clients = [];
  */
 class Client extends EventEmitter {
   /**
-   * @param {string} key API key [(?)](https://stavzdev.is-inside.me/cCMiZdoy.gif)
+   * @param {string} key API key
    * @param {ClientOptions} [options={}] Client options
    */
   constructor(key, options = {}) {
@@ -32,20 +32,23 @@ class Client extends EventEmitter {
     validate.validateOptions(this.options);
     // eslint-disable-next-line guard-for-in
     for (const func in API) {
-      Client.prototype[func] = function (...args) {
+      Client.prototype[func] = (...args) => {
         const lastArg = args[args.length - 1];
         return API[func].apply(
           {
-            _makeRequest: this._makeRequest.bind(this, { ...(validate.cacheSuboptions(lastArg) ? lastArg : {}) }),
+            _makeRequest: this._makeRequest.bind(this, validate.cacheSuboptions(lastArg) ? lastArg : {}),
             ...this
           },
           args
         );
       };
+    }
 
-      if (this.options.checkForUpdates) {
-        updater.checkForUpdates();
-      }
+    if (this.options.checkForUpdates) {
+      updater.checkForUpdates().catch(() => {
+        // eslint-disable-next-line no-console
+        if (!this.options.silent) console.warn('[hypixel-api-reborn] Error whilst checking for updates!');
+      });
     }
     /**
      * All cache entries
@@ -53,7 +56,7 @@ class Client extends EventEmitter {
      */
     this.cache = this.requests.cache;
     clients.push(this);
-    rateLimit.init(this.getPlayer('52d9a36f66ce4cdf9a56ad9724ae9fb4'), this.options, this).then(() => this.emit('ready'));
+    rateLimit.init(this.getGameCounts(), this.options, this).then(() => this.emit('ready'));
   }
   /**
    * Private function - make request
@@ -65,10 +68,15 @@ class Client extends EventEmitter {
    */
   async _makeRequest(options, url, useRateLimitManager = true) {
     if (!url) return;
-    if (url !== '/key' && !options.noCacheCheck && (await this.requests.cache.has(url))) return Object.assign(await this.requests.cache.get(url), { raw: !!options.raw });
+    if (url !== '/key' && !options.noCacheCheck && (await this.requests.cache.has(url))) {
+      return Object.assign(await this.requests.cache.get(url), { raw: !!options.raw });
+    }
     if (useRateLimitManager) await rateLimit.rateLimitManager();
     this.emit('outgoingRequest', url, { ...options, headers: { ...options.headers, ...this.options.headers } });
-    const result = await this.requests.request.call(this.requests, url, { ...options, headers: { ...options.headers, ...this.options.headers } });
+    const result = await this.requests.request.call(this.requests, url, {
+      ...options,
+      headers: { ...options.headers, ...this.options.headers }
+    });
     if (this.options.syncWithHeaders) rateLimit.sync(result._headers);
     return result;
   }
@@ -143,6 +151,11 @@ class Client extends EventEmitter {
    * }).catch(e => {
    *   console.log(e);
    * })
+   * @example
+   * // async/await
+   * const guild = await hypixel.getGuild('name', 'The Foundation').catch(console.log);
+   * console.log(guild.level); // 111
+   * console.log(guild.id); // '52e5719284ae51ed0c716c69'
    */
   /**
    * Allows you to get statistics of watchdog, the server anticheat
@@ -156,6 +169,10 @@ class Client extends EventEmitter {
    * }).catch(e => {
    *   console.log(e);
    * })
+   * @example
+   * // async/await
+   * const watchdog = await hypixel.getWatchdogStats().catch(console.log);
+   * console.log(watchdog.byWatchdogTotal); // 5931897
    */
   /**
    * Allows you to get all active boosters
@@ -169,6 +186,10 @@ class Client extends EventEmitter {
    * }).catch(e => {
    *   console.log(e);
    * })
+   * @example
+   * // async/await
+   * const boosters = await hypixel.getBoosters().catch(console.log);
+   * console.log(boosters[0].purchaser); // '978ddb705a8e43618e41749178c020b0'
    */
   /**
    * Allows you to get all skyblock profiles of player
@@ -183,13 +204,16 @@ class Client extends EventEmitter {
    * }).catch(e => {
    *   console.log(e);
    * })
+   * @example
+   * const profiles = await hypixel.getSkyblockProfiles('StavZDev').catch(console.log);
+   * console.log(profiles[0].members[0].uuid); // '52d9a36f66ce4cdf9a56ad9724ae9fb4'
    */
   /**
    * Allows you to get a player's skyblock member data from all their profiles
    * @method
    * @name Client#getSkyblockMember
    * @param {string} query Player nickname or UUID
-   * @param {MethodOptions} [options={}] Method options
+   * @param {SkyblockMethodOptions} [options={}] Method options
    * @return {Promise<Map<string,SkyblockMember>>}
    * @example
    * hypixel.getSkyblockMember('StavZDev').then(member => {
@@ -198,6 +222,17 @@ class Client extends EventEmitter {
    * }).catch(e => {
    *   console.log(e);
    * })
+   * @example
+   * const member = await hypixel.getSkyblockMember('StavZDev').catch(console.log);
+   * console.log(member.get('Cucumber').uuid); // '52d9a36f66ce4cdf9a56ad9724ae9fb4'
+   */
+  /**
+   * Allows you to get a player's skyblock profile museum
+   * @method
+   * @name Client#getSkyblockMuseum
+   * @param {string} query Player nickname or UUID
+   * @param {string} profileId Profile ID
+   * @return {Promise<SkyblockMuseum>}
    */
   /**
    * Allows you to get the Hypixel API's Status and past Incidents, no key needed.
@@ -312,6 +347,34 @@ class Client extends EventEmitter {
    *   console.log(products[0].productId); // INK_SACK:3
    * })
    * .catch(console.log);
+   */ /**
+   * Allows you to get bingo data
+   * @method
+   * @name Client#getSkyblockBingo
+   * @param {MethodOptions} [options={}] Options
+   * @return {Promise<BingoData>}
+   */
+  /**
+   * Allows you to get bingo data of a player
+   * @method
+   * @name Client#getSkyblockBingoByPlayer
+   * @param {string} query UUID / IGN of player
+   * @param {PlayerBingoOptions} [options={}] Options
+   * @return {Promise<PlayerBingo>}
+   */
+  /**
+   * Allows you to get SB government
+   * @method
+   * @name Client#getSkyblockGovernment
+   * @param {MethodOptions} [options={}] Options
+   * @return {Promise<GovernmentData>}
+   */
+  /**
+   * Allows you to get SB government
+   * @method
+   * @name Client#getSkyblockFireSale
+   * @param {MethodOptions} [options={}] Options
+   * @return {Promise<FireSale[]>}
    */
   /**
    * Allows you to get skyblock news
@@ -348,16 +411,18 @@ class Client extends EventEmitter {
 }
 /**
  * @typedef {object} ClientOptions
- * @prop {boolean} [cache=false] Enable/Disable request caching.
- * @prop {number} [cacheTime=60] Amount of time in seconds to cache the requests.
+ * @prop {boolean} [cache=true] Enable/Disable request caching.
+ * @prop {number} [hypixelCacheTime=60] Amount of time in seconds to cache the hypixel api requests.
+ * @prop {number} [mojangCacheTime=600] Amount of time in seconds to cache the mojang api requests.
  * @prop {CacheHandler} [cacheHandler] Custom Cache Handler
  * @prop {AUTO|HARD|NONE} [rateLimit='AUTO'] Rate limit mode.
  * @prop {boolean} [syncWithHeaders=false] Sync with headers rate limit information. Usually not necessary nor recommended ( because of latency )
- * @prop {number} [keyLimit=120] Key limit of your key.
+ * @prop {number} [keyLimit=60] Key limit of your key.
  * @prop {number} [cacheSize=-1] The amount how many results will be cached. (`-1` for infinity)
  * @prop {boolean} [silent=false] Don't automatically put warnings into console.
  * @prop {object} [headers={}] Extra Headers ( like User-Agent ) to add to request.
- * @prop {boolean} [checkForUpdates=false] Enable/Disable check for new version of hypixel-api-reborn.
+ * @prop {boolean} [checkForUpdates=true] Enable/Disable check for new version of hypixel-api-reborn.
+ * @prop {boolean|string} [useThirdPartyAPI=false] Enable/Disable Mojang Third Party API
  */
 const defaultCache = require('./Private/defaultCache.js');
 /**
@@ -384,9 +449,10 @@ const defaultCache = require('./Private/defaultCache.js');
  */
 /**
  * @typedef {object} SkyblockMethodOptions
- * @property {boolean} [raw=false] Raw data
- * @property {?boolean} [noCacheCheck=false] Disable/Enable cache checking
- * @property {?boolean} [noCaching=false] Disable/Enable writing to cache
+ * @property {boolean} [fetchPlayer=false] Raw data
+ * @property {boolean} [getMuseum=false] Raw data
+ * @property {boolean} [noCacheCheck=false] Disable/Enable cache checking
+ * @property {boolean} [noCaching=false] Disable/Enable writing to cache
  * @property {?boolean} [fetchPlayer=false] Disable/Enable player profile request for each member
  * @prop {object} [headers={}] Extra Headers ( like User-Agent ) to add to request. Overrides the headers globally provided.
  */
@@ -403,4 +469,12 @@ const defaultCache = require('./Private/defaultCache.js');
  * @property {boolean} [includeItemBytes=false] Whether to include item bytes in the result
  * @prop {object} [headers={}] Extra Headers ( like User-Agent ) to add to request. Overrides the headers globally provided.
  */
+/**
+ * @typedef {object} PlayerBingoOptions
+ * @property {boolean} [raw=false] Raw data
+ * @property {boolean} [noCacheCheck=false] Disable/Enable cache checking
+ * @property {boolean} [noCaching=false] Disable/Enable writing to cache
+ * @property {boolean} [fetchBingoData=false] Fetches bingo data to give more information
+ * @prop {object} [headers={}] Extra Headers ( like User-Agent ) to add to request. Overrides the headers globally provided.
+ */
 module.exports = Client;

package/src/Errors.js

@@ -2,43 +2,65 @@
 module.exports = {
   INVALID_API_KEY: '[hypixel-api-reborn] Invalid API Key! For help join our Discord Server https://discord.gg/NSEBNMM',
   NO_API_KEY: '[hypixel-api-reborn] No API Key specified! For help join our Discord Server https://discord.gg/NSEBNMM',
-  ERROR_CODE_CAUSE: '[hypixel-api-reborn] Code: {code} - {cause}! For help join our Discord Server https://discord.gg/NSEBNMM',
+  ERROR_CODE_CAUSE:
+    '[hypixel-api-reborn] Code: {code} - {cause}! For help join our Discord Server https://discord.gg/NSEBNMM',
   ERROR_STATUSTEXT: '[hypixel-api-reborn] {statustext}! For help join our Discord Server https://discord.gg/NSEBNMM',
-  KEY_MUST_BE_A_STRING: '[hypixel-api-reborn] Specified API Key must be a string! For help join our Discord Server https://discord.gg/NSEBNMM',
-  OPTIONS_MUST_BE_AN_OBJECT: '[hypixel-api-reborn] Options must be an object! For help join our Discord Server https://discord.gg/NSEBNMM',
-  CACHE_TIME_MUST_BE_A_NUMBER: '[hypixel-api-reborn] Cache Time must be a number! For help join our Discord Server https://discord.gg/NSEBNMM',
-  CACHE_LIMIT_MUST_BE_A_NUMBER: '[hypixel-api-reborn] Cache Limit must be a number! For help join our Discord Server https://discord.gg/NSEBNMM',
-  CACHE_FILTER_INVALID: '[hypixel-api-reborn] Cache Filter must be a function returning a boolean, an object, an array, or a string!',
+  KEY_MUST_BE_A_STRING:
+    '[hypixel-api-reborn] Specified API Key must be a string! For help join our Discord Server https://discord.gg/NSEBNMM',
+  OPTIONS_MUST_BE_AN_OBJECT:
+    '[hypixel-api-reborn] Options must be an object! For help join our Discord Server https://discord.gg/NSEBNMM',
+  CACHE_TIME_MUST_BE_A_NUMBER:
+    '[hypixel-api-reborn] Cache Time must be a number! For help join our Discord Server https://discord.gg/NSEBNMM',
+  CACHE_LIMIT_MUST_BE_A_NUMBER:
+    '[hypixel-api-reborn] Cache Limit must be a number! For help join our Discord Server https://discord.gg/NSEBNMM',
+  CACHE_FILTER_INVALID:
+    '[hypixel-api-reborn] Cache Filter must be a function returning a boolean, an object, an array, or a string!',
   NO_NICKNAME_UUID: '[hypixel-api-reborn] No nickname or uuid specified.',
   NO_UUID: '[hypixel-api-reborn] No uuid specified.',
   UUID_NICKNAME_MUST_BE_A_STRING: '[hypixel-api-reborn] Nickname or uuid must be a string.',
   MALFORMED_UUID: '[hypixel-api-reborn] Malformed UUID!',
   PLAYER_DOES_NOT_EXIST: '[hypixel-api-reborn] Player does not exist.',
   PLAYER_HAS_NEVER_LOGGED: '[hypixel-api-reborn] Player has never logged into Hypixel.',
-  PLAYER_IS_INACTIVE: "[hypixel-api-reborn] No records of recent games because player hasn't been online for more than 3 days or is lacking data to determine the cause of an empty response",
+  PLAYER_IS_INACTIVE:
+    "[hypixel-api-reborn] No records of recent games because player hasn't been online for more than 3 days or is lacking data to determine the cause of an empty response",
   PLAYER_DISABLED_ENDPOINT: '[hypixel-api-reborn] Player has disabled this endpoint.',
   NO_GUILD_QUERY: '[hypixel-api-reborn] No guild search query specified.',
   INVALID_GUILD_ID: '[hypixel-api-reborn] Specified Guild ID is invalid.',
   INVALID_GUILD_SEARCH_PARAMETER: "[hypixel-api-reborn] getGuild() searchParameter must be 'id', 'guild' or 'player'.",
   SOMETHING_WENT_WRONG: '[hypixel-api-reborn] Something went wrong. {cause}',
   GUILD_DOES_NOT_EXIST: '[hypixel-api-reborn] Guild does not exist.',
-  PAGE_INDEX_ERROR: '[hypixel-api-reborn] Invalid page index. Must be an integer, an array of 2 integers, or a keyword. For help join our Discord Server https://discord.gg/NSEBNMM',
-  INVALID_OPTION_VALUE: '[hypixel-api-reborn] Invalid option value! For help join our Discord Server https://discord.gg/NSEBNMM',
-  INVALID_RESPONSE_BODY: '[hypixel-api-reborn] An error occurred while converting to JSON. Perhaps this is due to an update or maintenance. For help join our Discord Server https://discord.gg/NSEBNMM',
-  INVALID_RATE_LIMIT_OPTION: "[hypixel-api-reborn] Rate Limit provided in Client options must be 'HARD', 'AUTO', or 'NONE'. For help join our Discord Server https://discord.gg/NSEBNMM",
-  INVALID_KEY_LIMIT_OPTION: '[hypixel-api-reborn] Key Limit provided in Client options must be an integer representing the amount of requests possible in one minute with your key.',
+  PAGE_INDEX_ERROR:
+    '[hypixel-api-reborn] Invalid page index. Must be an integer, an array of 2 integers, or a keyword. For help join our Discord Server https://discord.gg/NSEBNMM',
+  INVALID_OPTION_VALUE:
+    '[hypixel-api-reborn] Invalid option value! For help join our Discord Server https://discord.gg/NSEBNMM',
+  INVALID_RESPONSE_BODY:
+    '[hypixel-api-reborn] An error occurred while converting to JSON. Perhaps this is due to an update or maintenance. For help join our Discord Server https://discord.gg/NSEBNMM',
+  INVALID_RATE_LIMIT_OPTION:
+    "[hypixel-api-reborn] Rate Limit provided in Client options must be 'HARD', 'AUTO', or 'NONE'. For help join our Discord Server https://discord.gg/NSEBNMM",
+  INVALID_KEY_LIMIT_OPTION:
+    '[hypixel-api-reborn] Key Limit provided in Client options must be an integer representing the amount of requests possible in one minute with your key.',
   INVALID_HEADER_SYNC_OPTION: '[hypixel-api-reborn] Invalid Value for maxSyncHeaders : must be a boolean',
   INVALID_BURST_OPTION: '[hypixel-api-reborn] maxBurstRequests provided in Client options must be a number',
-  NODE_VERSION_ERR: "[hypixel-api-reborn] You are using a version of Nodejs that doesn't support certain features we use. Please upgrade to version 14 or above.",
+  NODE_VERSION_ERR:
+    "[hypixel-api-reborn] You are using a version of Nodejs that doesn't support certain features we use. Please upgrade to version 14 or above.",
   UPDATER_REQUEST_NOT_OK: '[hypixel-api-reborn] An error occurred checking for updates.',
   CONNECTION_ERROR: '[hypixel-api-reborn] Failed to connect.',
-  RATE_LIMIT_INIT_ERROR: '[hypixel-api-reborn] An error happened whilst initializing rate limit. We strongly recommend restarting the code as this can lead to desynchronization.',
+  RATE_LIMIT_INIT_ERROR:
+    '[hypixel-api-reborn] An error happened whilst initializing rate limit. We strongly recommend restarting the code as this can lead to desynchronization.',
   MULTIPLE_INSTANCES:
     '[hypixel-api-reborn] Multiple instances of hypixel-api-reborn are found so we merged them for you. Please refrain from spawning multiple instances in the future. For more information, join our Discord Server https://discord.gg/NSEBNMM.',
-  INVALID_HEADERS: '[hypixel-api-reborn] Invalid Headers are provided in ClientOptions. For help join our Discord Server https://discord.gg/NSEBNMM',
-  INVALID_CACHE_HANDLER: '[hypixel-api-reborn] An invalid cache handler is provideed. For help join our Discord Server https://discord.gg/NSEBNMM',
+  INVALID_HEADERS:
+    '[hypixel-api-reborn] Invalid Headers are provided in ClientOptions. For help join our Discord Server https://discord.gg/NSEBNMM',
+  INVALID_CACHE_HANDLER:
+    '[hypixel-api-reborn] An invalid cache handler is provideed. For help join our Discord Server https://discord.gg/NSEBNMM',
   UNEXPECTED_ERROR:
     "[hypixel-api-reborn] The data provided to hypixel API is malformed and thus not recognized by hypixel, but this shouldn't be your fault. Please report this error in our Discord Server https://discord.gg/NSEBNMM or GitHub. ",
   RATE_LIMIT_EXCEEDED:
-    "[hypixel-api-reborn] The rate limitations on your API Key has been exceeded. There might be an outage (Check Hypixel's status page), or you simply did too many requests in a short time. Hint: Enable rate limit options! They can help you avoid this error! For help join our Discord Server https://discord.gg/NSEBNMM"
+    "[hypixel-api-reborn] The rate limitations on your API Key has been exceeded. There might be an outage (Check Hypixel's status page), or you simply did too many requests in a short time. Hint: Enable rate limit options! They can help you avoid this error! For help join our Discord Server https://discord.gg/NSEBNMM",
+  NO_SKYBLOCK_PROFILES: '[hypixel-api-reborn] The player has no skyblock profiles.',
+  INVALID_SILENT_OPTION: '[hypixel-api-reborn] Invalid Value for silent : must be a boolean',
+  INVALID_UPDATE_OPTION: '[hypixel-api-reborn] Invalid Value for update : must be a boolean',
+  INVALID_THIRD_PARTY_API_OPTION: '[hypixel-api-reborn] Invalid Third Party API option : must be a boolean or string',
+  BAD_AUCTION_FILTER:
+    '[hypixel-api-reborn] Unexpected filter for Client#getSkyblockAuction. Expected one of "PLAYER", "AUCTION", "PROFILE", but got something else.'
 };

package/src/Private/rateLimit.js

@@ -23,7 +23,11 @@ class RateLimit {
   sync(data) {
     this.options.keyLimit = parseInt(data.get('ratelimit-limit'), 10) || this.options.keyLimit;
     this.requests = parseInt(data.get('ratelimit-remaining'), 10) || this.requests;
-    if (data.get('ratelimit-reset') && Math.round(Date.now() / 1000) - (300 - parseInt(data.get('ratelimit-reset'), 10)) !== Math.round(this.lastResetHappenedAt / 1000)) {
+    if (
+      data.get('ratelimit-reset') &&
+      Math.round(Date.now() / 1000) - (300 - parseInt(data.get('ratelimit-reset'), 10)) !==
+        Math.round(this.lastResetHappenedAt / 1000)
+    ) {
       clearTimeout(this.resetTimer);
       this.resetTimer = setTimeout(this.reset.bind(this), parseInt(data.get('ratelimit-reset'), 10) * 1000);
     }
@@ -32,7 +36,11 @@ class RateLimit {
   computeCooldownTime() {
     const overhead = this.requestQueue[1] <= Date.now() ? 0 : this.requestQueue[1] - Date.now();
     const multiplier = Math.floor(this.requests / this.options.keyLimit) + 1;
-    return overhead + (-overhead - Date.now() + 300000 * multiplier + this.lastResetHappenedAt) / (this.options.keyLimit * multiplier - this.requests);
+    return (
+      overhead +
+      (-overhead - Date.now() + 300000 * multiplier + this.lastResetHappenedAt) /
+        (this.options.keyLimit * multiplier - this.requests)
+    );
   }
 
   reset() {

package/src/Private/requests.js

@@ -1,7 +1,8 @@
 /* eslint-disable require-jsdoc */
 const requireFetch = !globalThis.fetch;
-const externalFetch = require('node-fetch');
-const BASE_URL = 'https://api.hypixel.net';
+const externalFetch = (...args) => import('node-fetch').then(({ default: fetch }) => fetch(...args));
+const fetch = requireFetch ? externalFetch : globalThis.fetch;
+const BASE_URL = 'https://api.hypixel.net/v2';
 const Errors = require('../Errors');
 const Cache = require('./defaultCache');
 const Client = require('../Client.js');
@@ -14,16 +15,23 @@ class Requests {
   }
   async request(endpoint, options = {}) {
     options.headers = { 'API-Key': this.client.key, ...options.headers };
-    const fetchMethod = requireFetch ? externalFetch : fetch;
     /**
      * @type {externalFetch.Response|Response}
      */
-    const res = await fetchMethod(BASE_URL + endpoint, options);
-    if (res.status >= 500 && res.status < 528) throw new Error(Errors.ERROR_STATUSTEXT.replace(/{statustext}/, `Server Error : ${res.status} ${res.statusText}`));
+    const res = await fetch(BASE_URL + endpoint, options);
+    if (res.status >= 500 && res.status < 528) {
+      throw new Error(
+        Errors.ERROR_STATUSTEXT.replace(/{statustext}/, `Server Error : ${res.status} ${res.statusText}`)
+      );
+    }
     const parsedRes = await res.json().catch(() => {
       throw new Error(Errors.INVALID_RESPONSE_BODY);
     });
-    if (res.status === 400) throw new Error(Errors.ERROR_CODE_CAUSE.replace(/{code}/, '400 Bad Request').replace(/{cause}/, parsedRes.cause || ''));
+    if (res.status === 400) {
+      throw new Error(
+        Errors.ERROR_CODE_CAUSE.replace(/{code}/, '400 Bad Request').replace(/{cause}/, parsedRes.cause || '')
+      );
+    }
     if (res.status === 403) throw new Error(Errors.INVALID_API_KEY);
     if (res.status === 422) throw new Error(Errors.UNEXPECTED_ERROR);
     if (res.status === 429) throw new Error(Errors.RATE_LIMIT_EXCEEDED);
@@ -36,10 +44,14 @@ class Requests {
     if (options.noCaching) return parsedRes;
     // split by question mark : first part is /path, remove /
     if (this.client.options.cache && this.client.options.cacheFilter(endpoint.split('?')[0].slice(1))) {
-      if (this.client.options.cacheSize < (await this.cached.size())) await this.cached.delete(Array.from(await this.cached.keys())[0]);
+      if (this.client.options.cacheSize < (await this.cached.size())) {
+        await this.cached.delete(Array.from(await this.cached.keys())[0]);
+      }
       await this.cached.delete(endpoint);
       await this.cached.set(endpoint, parsedRes);
-      if (this.client.options.cacheTime >= 0) setTimeout(() => this.cached.delete(endpoint), 1000 * this.client.options.cacheTime);
+      if (this.client.options.hypixelCacheTime >= 0) {
+        setTimeout(() => this.cached.delete(endpoint), 1000 * this.client.options.hypixelCacheTime);
+      }
     }
     return parsedRes;
   }

package/src/Private/updater.js

@@ -1,33 +1,23 @@
-/* eslint-disable no-console */
 /* eslint-disable require-jsdoc */
-const fetch = require('node-fetch');
+/* eslint-disable no-console */
+const requireFetch = !globalThis.fetch;
+const externalFetch = (...args) => import('node-fetch').then(({ default: fetch }) => fetch(...args));
+const fetch = requireFetch ? externalFetch : globalThis.fetch;
 const Errors = require('../Errors');
 class Updater {
   async checkForUpdates() {
-    const currentVersion = require('../../package.json').version;
+    const version = require('../../package.json').version;
     const request = await fetch('https://registry.npmjs.org/hypixel-api-reborn');
     if (!request.ok) return console.log(Errors.UPDATER_REQUEST_NOT_OK);
     const metadata = await request.json();
-    const latestVersion = metadata['dist-tags'].latest;
-    const compare = this.compare(currentVersion, latestVersion);
+    const latest = metadata['dist-tags'].latest;
+    const compare = this.compare(version, latest);
     if (compare === -1) {
-      this.notify(latestVersion);
+      console.log(
+        `New version of hypixel-api-reborn is available! Current version: ${version}, Latest version: ${latest}`
+      );
     }
   }
-  notify(newVersion) {
-    console.log(`
-
-    New version of hypixel-api-reborn is available!
-    
-    v${newVersion}
-    Changelog: https://github.com/Hypixel-API-Reborn/hypixel-api-reborn/releases/tag/${newVersion}
-
-    \x1b[33mnpm i hypixel-api-reborn@${newVersion}\x1b[0m
-    or
-    \x1b[33myarn add hypixel-api-reborn@${newVersion}\x1b[0m
-    
-    `);
-  }
   compare(a, b) {
     const pa = a.split('.');
     const pb = b.split('.');

package/src/Private/uuidCache.js

@@ -1,37 +1,31 @@
 /* eslint-disable require-jsdoc */
 const requireFetch = !globalThis.fetch;
-const externalFetch = require('node-fetch');
+const externalFetch = (...args) => import('node-fetch').then(({ default: fetch }) => fetch(...args));
 const fetch = requireFetch ? externalFetch : globalThis.fetch;
-const cachedUuids = new Map();
+const NodeCache = require('node-cache');
+const cache = new NodeCache();
 
 // TODO - use this for all cache models
 
-async function putCache(response) {
-  try {
-    response = await response.json();
-    cachedUuids.set(response.id, response.name);
-    setTimeout(deleteCache, 1000 * 60 * 10, response.id);
-  } catch (e) {
-    // F
-  }
-}
-function deleteCache(id) {
-  return cachedUuids.delete(id);
-}
-function response(obj) {
-  return new fetch.Response(JSON.stringify(obj));
-}
-function checkHit(query) {
-  if (cachedUuids.has(query)) return response({ id: query, name: cachedUuids.get(query) });
-  const reverseSearch = Array.from(cachedUuids.entries()).find((pair) => pair[1].toLowerCase() === query.toLowerCase());
-  if (reverseSearch) return response({ id: reverseSearch[0], name: query });
-  return null;
-}
-module.exports = async (url, query) => {
-  if (checkHit(query || url)) return checkHit(query || url);
+module.exports = async (url, query, cacheTime) => {
+  if (cache.has(query.toLowerCase())) return cache.get(query.toLowerCase());
   const res = await fetch(url);
-  const response = await res.clone().json();
-  // Don't cache 5xx
-  if (response.error !== 'Internal Server Error' && response.status < 500) setTimeout(putCache, 0, res.clone());
-  return res;
+  const data = await res.json();
+  // Don't cache 4xx
+  if (res.status >= 400) {
+    return {
+      status: res.status,
+      id: null,
+      name: null
+    };
+  }
+
+  cache.set(query.toLowerCase(), { status: res.status, id: data.id, name: data.name }, cacheTime);
+  cache.set(data.id.toLowerCase(), { status: res.status, id: data.id, name: data.name }, cacheTime);
+
+  return {
+    status: res.status,
+    id: data.id,
+    name: data.name
+  };
 };

package/src/Private/validate.js

@@ -12,12 +12,20 @@ class Validation {
    * @private
    */
   validateOptions(options) {
-    if (typeof options.cacheTime !== 'number') throw new Error(Errors.CACHE_TIME_MUST_BE_A_NUMBER);
+    if (typeof options.hypixelCacheTime !== 'number') throw new Error(Errors.CACHE_TIME_MUST_BE_A_NUMBER);
+    if (typeof options.mojangCacheTime !== 'number') throw new Error(Errors.CACHE_TIME_MUST_BE_A_NUMBER);
     if (typeof options.cacheSize !== 'number') throw new Error(Errors.CACHE_LIMIT_MUST_BE_A_NUMBER);
-    if (typeof options.rateLimit !== 'string' || !['AUTO', 'HARD', 'NONE'].includes(options.rateLimit)) throw new Error(Errors.INVALID_RATE_LIMIT_OPTION);
+    if (typeof options.rateLimit !== 'string' || !['AUTO', 'HARD', 'NONE'].includes(options.rateLimit)) {
+      throw new Error(Errors.INVALID_RATE_LIMIT_OPTION);
+    }
     if (typeof options.keyLimit !== 'number') throw new Error(Errors.INVALID_KEY_LIMIT_OPTION);
     if (typeof options.syncWithHeaders !== 'boolean') throw new Error(Errors.INVALID_HEADER_SYNC_OPTION);
     if (typeof options.headers !== 'object') throw new Error(Errors.INVALID_HEADERS);
+    if (typeof options.silent !== 'boolean') throw new Error(Errors.INVALID_SILENT_OPTION);
+    if (typeof options.checkForUpdates !== 'boolean') throw new Error(Errors.INVALID_UPDATE_OPTION);
+    if (!['boolean', 'string'].includes(typeof options.useThirdPartyAPI)) {
+      throw new Error(Errors.INVALID_THIRD_PARTY_API_OPTION);
+    }
   }
 
   /**
@@ -29,16 +37,19 @@ class Validation {
   parseOptions(options) {
     if (typeof options !== 'object' || options === null) throw new Error(Errors.OPTIONS_MUST_BE_AN_OBJECT);
     return {
-      cache: options.cache || false,
-      cacheTime: options.cacheTime || 60,
+      cache: options.cache ?? true,
+      hypixelCacheTime: options.hypixelCacheTime ?? 60,
+      mojangCacheTime: options.mojangCacheTime ?? 600,
       cacheSize: (options.cacheSize === -1 ? Infinity : options.cacheSize) || Infinity,
-      cacheFilter: typeof options.cacheFilter === 'function' ? options.cacheFilter : this._handleFilter(options.cacheFilter),
-      rateLimit: options.rateLimit || 'AUTO',
-      keyLimit: options.keyLimit || 120,
+      cacheFilter:
+        typeof options.cacheFilter === 'function' ? options.cacheFilter : this._handleFilter(options.cacheFilter),
+      rateLimit: options.rateLimit ?? 'AUTO',
+      keyLimit: options.keyLimit ?? 60,
       syncWithHeaders: !!options.syncWithHeaders,
-      headers: options.headers || {},
+      headers: options.headers ?? {},
       silent: !!options.silent,
-      checkForUpdates: options.checkForUpdates || false
+      checkForUpdates: options.checkForUpdates ?? true,
+      useThirdPartyAPI: options.useThirdPartyAPI ?? false
     };
   }
 

package/src/index.js

@@ -14,6 +14,10 @@ module.exports = {
   Pets: require('./structures/Pets'),
   PlayerCosmetics: require('./structures/PlayerCosmetics'),
 
+  /* Challenges */
+  Challenges: require('./structures/Static/Challenges.js'),
+  GameChallenges: require('./structures/Static/GameChallenges.js'),
+
   /* Watchdog */
   WatchdogStats: require('./structures/Watchdog/Stats.js'),
 
@@ -27,6 +31,10 @@ module.exports = {
   SkyblockMember: require('./structures/SkyBlock/SkyblockMember.js'),
   SkyblockInventoryItem: require('./structures/SkyBlock/SkyblockInventoryItem.js'),
   SkyblockPet: require('./structures/SkyBlock/SkyblockPet'),
+  GovernmentData: require('./structures/SkyBlock/Static/Government.js'),
+  Candidate: require('./structures/SkyBlock/Static/Candidate.js'),
+  BingoData: require('./structures/SkyBlock/Static/BingoData.js'),
+  Bingo: require('./structures/SkyBlock/Static/Bingo.js'),
 
   /* Skyblock Auctions */
   BaseAuction: require('./structures/SkyBlock/Auctions/BaseAuction.js'),
@@ -34,6 +42,7 @@ module.exports = {
   Auction: require('./structures/SkyBlock/Auctions/Auction.js'),
   AuctionInfo: require('./structures/SkyBlock/Auctions/AuctionInfo.js'),
   Bid: require('./structures/SkyBlock/Auctions/Bid.js'),
+  FireSale: require('./structures/SkyBlock/Static/FireSale.js'),
 
   /* Skyblock Bazaar */
   Product: require('./structures/SkyBlock/Bazzar/Product.js'),

package/src/structures/APIIncident.js

@@ -42,12 +42,6 @@ class APIIncident {
      * @type {string|null}
      */
     this.snippet = data.contentSnippet || null;
-    /**
-     * Content as plain text
-     * The parsing might be faulty!
-     * @type {string|null}
-     */
-    this.TextContent = (data.content || '').replace(/<[^>]+>/g, '') || null;
     /**
      * GUID
      * @type {string|null}
@@ -64,14 +58,14 @@ class APIIncident {
      * @type {boolean}
      * @version >6.0.1
      */
-    this.isResolved = this.TextContent.includes('Resolved -') || this.TextContent.includes('Completed -');
+    this.isResolved = this.HTMLContent.includes('Resolved -') || this.HTMLContent.includes('Completed -');
   }
   /**
-   * Text Content
+   * HTML Content
    * @return {string}
    */
   toString() {
-    return this.TextContent;
+    return this.HTMLContent;
   }
 }
 

package/src/structures/Boosters/Booster.js

@@ -9,27 +9,27 @@ class Booster {
   constructor(data) {
     /**
      * Booster's purchaser's UUID
-     * @type {String}
+     * @type {string}
      */
     this.purchaser = data.purchaserUuid;
     /**
      * Booster's multiplier
-     * @type {Number}
+     * @type {number}
      */
     this.amount = data.amount;
     /**
      * Booster's length in seconds
-     * @type {Number}
+     * @type {number}
      */
     this.originalLength = data.originalLength;
     /**
      * Length remaining in seconds
-     * @type {Number}
+     * @type {number}
      */
     this.remaining = data.length;
     /**
      * Date activated timestamp
-     * @type {Number}
+     * @type {number}
      */
     this.activatedTimestamp = data.dateActivated;
     /**