hypixel-api-reborn 10.0.0 → 11.0.1

package/src/Errors.js

@@ -1,39 +1,44 @@
-/* eslint-disable max-len */
-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_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!',
-  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_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.',
-  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.',
-  UPDATER_REQUEST_NOT_OK: '[hypixel-api-reborn] An error occured 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.',
-  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'
-};
+/* eslint-disable max-len */
+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_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!',
+  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_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.',
+  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.",
+  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.',
+  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',
+  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"
+};

package/src/Private/defaultCache.js

@@ -1,78 +1,77 @@
-/**
- * This is the default cache implementation, using a Map.
- * All cache implementations must have these methods below, they can be async :
- * set(key, value) : Sets key to value
- * has(key) : Whether there is an entry to this key. (can be an alias to get)
- * get(key) : Gets by key (nullish value if not found)
- * delete(key) : Deletes by key
- * keys() : Array of keys, ordered by time of creation. To help you, the key will be deleted and set in case of an update
- * size(): Size of cache (number of keys)
- * clear(): Deletes all cache entries
- * See JSDoc for more info
- */
-class Cache {
-  /**
-   * Constructor
-   */
-  constructor() {
-    this.storage = new Map();
-  }
-  /**
-   * Sets an entry
-   * @param {string} key String key
-   * @param {*} value Any value
-   * @return {boolean}
-   */
-  set(key, value) {
-    return this.storage.set(key, value);
-  }
-  /**
-   * Check if there's an entry in the cache that has this key
-   * This doesn't have to return boolean, just a truthy/falsy value
-   * @param {string} key String key
-   * @return {boolean} Whether this key exists
-   */
-  has(key) {
-    return this.storage.has(key);
-  }
-  /**
-   * Gets an entry, return a nullish value if not found
-   * @param {string} key String key
-   * @return {*}
-   */
-  get(key) {
-    return this.storage.get(key);
-  }
-  /**
-   * Deletes an entry
-   * @param {string} key String key
-   * @return {boolean} Preferably, returns a boolean to check if the deletion is actually successful
-   */
-  delete(key) {
-    return this.storage.delete(key);
-  }
-  /**
-   * Returns Array of string (not an iterator preferably, it can break)
-   * @return {string[]}
-   */
-  keys() {
-    return Array.from(this.storage.keys());
-  }
-  /**
-   * Returns size of cache
-   * @return {number}
-   */
-  size() {
-    return this.storage.size;
-  }
-  /**
-   * Clears cache
-   * @return {void}
-   */
-  clear() {
-    this.storage.clear();
-  }
-}
-
-module.exports = Cache;
-
+/**
+ * This is the default cache implementation, using a Map.
+ * All cache implementations must have these methods below, they can be async :
+ * set(key, value) : Sets key to value
+ * has(key) : Whether there is an entry to this key. (can be an alias to get)
+ * get(key) : Gets by key (nullish value if not found)
+ * delete(key) : Deletes by key
+ * keys() : Array of keys, ordered by time of creation. To help you, the key will be deleted and set in case of an update
+ * size(): Size of cache (number of keys)
+ * clear(): Deletes all cache entries
+ * See JSDoc for more info
+ */
+class Cache {
+  /**
+   * Constructor
+   */
+  constructor() {
+    this.storage = new Map();
+  }
+  /**
+   * Sets an entry
+   * @param {string} key String key
+   * @param {*} value Any value
+   * @return {boolean}
+   */
+  set(key, value) {
+    return this.storage.set(key, value);
+  }
+  /**
+   * Check if there's an entry in the cache that has this key
+   * This doesn't have to return boolean, just a truthy/falsy value
+   * @param {string} key String key
+   * @return {boolean} Whether this key exists
+   */
+  has(key) {
+    return this.storage.has(key);
+  }
+  /**
+   * Gets an entry, return a nullish value if not found
+   * @param {string} key String key
+   * @return {*}
+   */
+  get(key) {
+    return this.storage.get(key);
+  }
+  /**
+   * Deletes an entry
+   * @param {string} key String key
+   * @return {boolean} Preferably, returns a boolean to check if the deletion is actually successful
+   */
+  delete(key) {
+    return this.storage.delete(key);
+  }
+  /**
+   * Returns Array of string (not an iterator preferably, it can break)
+   * @return {string[]}
+   */
+  keys() {
+    return Array.from(this.storage.keys());
+  }
+  /**
+   * Returns size of cache
+   * @return {number}
+   */
+  size() {
+    return this.storage.size;
+  }
+  /**
+   * Clears cache
+   * @return {void}
+   */
+  clear() {
+    this.storage.clear();
+  }
+}
+
+module.exports = Cache;

package/src/Private/rateLimit.js

@@ -1,98 +1,79 @@
-/* eslint-disable @typescript-eslint/no-empty-function */
-/* eslint-disable camelcase */
-const Errors = require('../Errors');
-
-/* eslint-disable require-jsdoc */
-module.exports = class RateLimit {
-  constructor () {
-    this.initialized = 0;
-  }
-
-  async rateLimitManager () {
-    if (!this.initialized) return;
-    this.requests++;
-    this.requestQueue.unshift(Date.now());
-    if (this.options.rateLimit === 'NONE' || !this.requestQueue.length) return;
-    if (this.options.rateLimit === 'AUTO' && this.requests <= this.options.keyLimit / 2) return;
-    const cooldown = this.computeCooldownTime();
-    this.requestQueue[0] = Date.now() + cooldown;
-    await new Promise((r) => setTimeout(r, cooldown), true);
-    return;
-  }
-
-  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) - (60 - 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);
-    }
-  }
-
-  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() + 60000 * multiplier + this.lastResetHappenedAt) / (this.options.keyLimit * multiplier - this.requests);
-  }
-
-  reset () {
-    this.requests = this.requests - this.options.keyLimit;
-    if (this.requests < 0) this.requests = 0;
-    this.lastResetHappenedAt = Date.now();
-    this.resetTimer = setTimeout(this.reset.bind(this), 60000);
-    this.requestQueue = this.requestQueue.filter((x) => x >= Date.now());
-  }
-
-  rateLimitMonitor () {
-    this.resetTimer = setTimeout(this.reset.bind(this), 1000 * 60);
-  }
-
-  init (keyInfo, options, client) {
-    /**
-     * Rate limit Options
-     * @type {RLOptions}
-     */
-    this.options = options;
-    /**
-     * Requests in past min
-     * @type {number}
-     */
-    this.requests = 0;
-    /**
-     * Cooldown
-     * @type {number}
-     */
-    this.cooldownTime = 60000 / this.options.keyLimit; // Initial value
-    /**
-     * Request Queue ( Array of timestamps )
-     * @type {number[]}
-     */
-    this.requestQueue = [];
-    /**
-     * Client
-     * @type {Client}
-     */
-    this.client = client;
-    return keyInfo
-      .then((info) => {
-        this.requests = info.requestsInPastMin;
-        this.lastResetHappenedAt = Date.now() - (60 - info.resetsAfter) * 1000; // Computed reset time
-        this.resetTimer = setTimeout(this.rateLimitMonitor.bind(this), 1000 * info.resetsAfter);
-        this.initialized = 1;
-      })
-      .catch(() => {
-        client.emit('warn', Errors.RATE_LIMIT_INIT_ERROR);
-        this.requests = 0;
-        this.lastResetHappenedAt = Date.now();
-        this.rateLimitMonitor();
-        this.initialized = 1;
-      });
-    // Still make the requests per min possible
-  }
-};
-/**
- * @typedef {Object} RLOptions
- * @property {number} keyLimit Max request of key per min
- * @property {NONE|AUTO|HARD} rateLimit rate limit mode
- * @property {boolean} syncWithHeaders Sync rate limits with headers
- */
+/* eslint-disable @typescript-eslint/no-empty-function */
+/* eslint-disable camelcase */
+const Errors = require('../Errors');
+
+/* eslint-disable require-jsdoc */
+class RateLimit {
+  constructor() {
+    this.initialized = 0;
+  }
+
+  async rateLimitManager() {
+    if (!this.initialized) return;
+    this.requests++;
+    this.requestQueue.unshift(Date.now());
+    if (this.options.rateLimit === 'NONE' || !this.requestQueue.length) return;
+    if (this.options.rateLimit === 'AUTO' && this.requests <= this.options.keyLimit / 2) return;
+    const cooldown = this.computeCooldownTime();
+    this.requestQueue[0] = Date.now() + cooldown;
+    await new Promise((r) => setTimeout(r, cooldown), true);
+    return;
+  }
+
+  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)) {
+      clearTimeout(this.resetTimer);
+      this.resetTimer = setTimeout(this.reset.bind(this), parseInt(data.get('ratelimit-reset'), 10) * 1000);
+    }
+  }
+
+  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);
+  }
+
+  reset() {
+    this.requests = this.requests - this.options.keyLimit;
+    if (this.requests < 0) this.requests = 0;
+    this.lastResetHappenedAt = Date.now();
+    this.resetTimer = setTimeout(this.reset.bind(this), 300000);
+    this.requestQueue = this.requestQueue.filter((x) => x >= Date.now());
+  }
+
+  rateLimitMonitor() {
+    this.resetTimer = setTimeout(this.reset.bind(this), 1000 * 300);
+  }
+
+  init(keyInfo, options, client) {
+    this.options = options;
+    this.requests = 0;
+    this.cooldownTime = 300000 / this.options.keyLimit; // Initial value
+    this.requestQueue = [];
+    this.client = client;
+    return keyInfo
+      .then((info) => {
+        this.requests = info.requestsInPastMin;
+        this.lastResetHappenedAt = Date.now() - (300 - info.resetsAfter) * 1000; // Computed reset time
+        this.resetTimer = setTimeout(this.rateLimitMonitor.bind(this), 1000 * info.resetsAfter);
+        this.initialized = 1;
+      })
+      .catch(() => {
+        client.emit('warn', Errors.RATE_LIMIT_INIT_ERROR);
+        this.requests = 0;
+        this.lastResetHappenedAt = Date.now();
+        this.rateLimitMonitor();
+        this.initialized = 1;
+      });
+    // Still make the requests per min possible
+  }
+}
+module.exports = RateLimit;
+/**
+ * @typedef {Object} RLOptions
+ * @property {number} keyLimit Max request of key per min
+ * @property {NONE|AUTO|HARD} rateLimit rate limit mode
+ * @property {boolean} syncWithHeaders Sync rate limits with headers
+ */

package/src/Private/requests.js

@@ -1,54 +1,65 @@
-/* eslint-disable require-jsdoc */
-const fetch = require('node-fetch');
-const BASE_URL = 'https://api.hypixel.net';
-const Errors = require('../Errors');
-const Cache = require('./defaultCache');
-
-module.exports = class Requests {
-  constructor(client, cache) {
-    if (cache && !this.validateCustomCache()) throw new Error(Errors.INVALID_CACHE_HANDLER);
-    /**
-     * @type {Cache}
-     */
-    this.cached = cache || new Cache();
-    this.client = client;
-  }
-  async request (endpoint, options = {}) {
-    options.headers = {'API-Key': this.client.key, ...options.headers};
-    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 === 403) throw new Error(Errors.INVALID_API_KEY);
-    if (res.status !== 200) throw new Error(Errors.ERROR_STATUSTEXT.replace(/{statustext}/, res.statusText));
-    if (!parsedRes.success) {
-      throw new Error(Errors.SOMETHING_WENT_WRONG.replace(/{cause}/, res.cause));
-    }
-    parsedRes._headers = res.headers;
-    parsedRes.raw = !!options.raw;
-    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]);
-      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);
-    }
-    return parsedRes;
-  }
-
-  get cache () {
-    return this.cached;
-  }
-
-  async sweepCache (amount) {
-    if (!amount || amount >= await this.cached.size()) return await this.cached.clear();
-    return await Promise.all(Array.from(await this.cached.keys()).slice(await this.cached.size() - amount).map((x) => this.cached.delete(x)));
-  }
-
-  validateCustomCache(cache) {
-    return !!(cache.set && cache.get && cache.delete && cache.keys);
-  }
-};
+/* eslint-disable require-jsdoc */
+const requireFetch = !globalThis.fetch;
+const externalFetch = require('node-fetch');
+const BASE_URL = 'https://api.hypixel.net';
+const Errors = require('../Errors');
+const Cache = require('./defaultCache');
+const Client = require('../Client.js');
+
+class Requests {
+  constructor(client, cache) {
+    if (cache && !this.validateCustomCache()) throw new Error(Errors.INVALID_CACHE_HANDLER);
+    this.cached = cache || new Cache();
+    this.client = client;
+  }
+  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 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 === 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);
+    if (res.status !== 200) throw new Error(Errors.ERROR_STATUSTEXT.replace(/{statustext}/, res.statusText));
+    if (!parsedRes.success) {
+      throw new Error(Errors.SOMETHING_WENT_WRONG.replace(/{cause}/, res.cause));
+    }
+    parsedRes._headers = res.headers;
+    parsedRes.raw = !!options.raw;
+    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]);
+      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);
+    }
+    return parsedRes;
+  }
+
+  get cache() {
+    return this.cached;
+  }
+
+  async sweepCache(amount) {
+    if (!amount || amount >= (await this.cached.size())) return await this.cached.clear();
+    return await Promise.all(
+      Array.from(await this.cached.keys())
+        .slice((await this.cached.size()) - amount)
+        .map((x) => this.cached.delete(x))
+    );
+  }
+
+  validateCustomCache(cache) {
+    return !!(cache.set && cache.get && cache.delete && cache.keys);
+  }
+}
+
+module.exports = Requests;

package/src/Private/updater.js

@@ -1,45 +1,45 @@
-/* eslint-disable no-console */
-/* eslint-disable require-jsdoc */
-const fetch = require('node-fetch');
-const Errors = require('../Errors');
-class Updater {
-  async checkForUpdates () {
-    const currentVersion = 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);
-    if (compare === -1) {
-      this.notify(latestVersion);
-    }
-  }
-  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('.');
-    for (let i = 0; i < 3; i++) {
-      const na = Number(pa[i]);
-      const nb = Number(pb[i]);
-      if (na > nb) return 1;
-      if (nb > na) return -1;
-      if (!isNaN(na) && isNaN(nb)) return 1;
-      if (isNaN(na) && !isNaN(nb)) return -1;
-    }
-    return 0;
-  }
-}
-module.exports = Updater;
+/* eslint-disable no-console */
+/* eslint-disable require-jsdoc */
+const fetch = require('node-fetch');
+const Errors = require('../Errors');
+class Updater {
+  async checkForUpdates() {
+    const currentVersion = 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);
+    if (compare === -1) {
+      this.notify(latestVersion);
+    }
+  }
+  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('.');
+    for (let i = 0; i < 3; i++) {
+      const na = Number(pa[i]);
+      const nb = Number(pb[i]);
+      if (na > nb) return 1;
+      if (nb > na) return -1;
+      if (!isNaN(na) && isNaN(nb)) return 1;
+      if (isNaN(na) && !isNaN(nb)) return -1;
+    }
+    return 0;
+  }
+}
+module.exports = Updater;