diff options
Diffstat (limited to 'build/hypixelCached.js')
| -rw-r--r-- | build/hypixelCached.js | 204 |
1 files changed, 83 insertions, 121 deletions
diff --git a/build/hypixelCached.js b/build/hypixelCached.js index b03361f..69bcc62 100644 --- a/build/hypixelCached.js +++ b/build/hypixelCached.js @@ -1,72 +1,47 @@ -"use strict"; /** * Fetch the clean and cached Hypixel API */ -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { - Object.defineProperty(o, "default", { enumerable: true, value: v }); -}) : function(o, v) { - o["default"] = v; -}); -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); - __setModuleDefault(result, mod); - return result; -}; -var __importDefault = (this && this.__importDefault) || function (mod) { - return (mod && mod.__esModule) ? mod : { "default": mod }; -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.fetchProfileName = exports.fetchBasicProfileFromUuid = exports.fetchProfile = exports.fetchProfileUuid = exports.fetchSkyblockProfiles = exports.fetchBasicPlayer = exports.fetchPlayer = exports.usernameFromUser = exports.uuidFromUser = exports.profileNameCache = exports.profilesCache = exports.profileCache = exports.basicPlayerCache = exports.playerCache = exports.basicProfilesCache = exports.usernameCache = void 0; -const node_cache_1 = __importDefault(require("node-cache")); -const lru_cache_1 = __importDefault(require("lru-cache")); -const mojang = __importStar(require("./mojang")); -const hypixel = __importStar(require("./hypixel")); -const util_1 = require("./util"); -const _1 = require("."); +import { isUuid, undashUuid } from './util.js'; +import * as hypixel from './hypixel.js'; +import * as mojang from './mojang.js'; +import NodeCache from 'node-cache'; +import { debug } from './index.js'; +import LRUCache from 'lru-cache'; // cache usernames for 30 minutes /** uuid: username */ -exports.usernameCache = new node_cache_1.default({ +export const usernameCache = new NodeCache({ // stdTTL: 60 * 60 * 4, stdTTL: 60 * 30, checkperiod: 60, useClones: false, }); -exports.usernameCache.setMaxListeners(50); -exports.basicProfilesCache = new node_cache_1.default({ +usernameCache.setMaxListeners(50); +export const basicProfilesCache = new NodeCache({ stdTTL: 60 * 10, checkperiod: 60, useClones: true, }); -exports.playerCache = new node_cache_1.default({ +export const playerCache = new NodeCache({ stdTTL: 60, checkperiod: 10, useClones: true, }); // cache "basic players" (players without profiles) for 20 minutes -exports.basicPlayerCache = new lru_cache_1.default({ +export const basicPlayerCache = new LRUCache({ max: 10000, maxAge: 60 * 20 * 1000, }); -exports.profileCache = new node_cache_1.default({ +export const profileCache = new NodeCache({ stdTTL: 30, checkperiod: 10, useClones: true, }); -exports.profilesCache = new node_cache_1.default({ +export const profilesCache = new NodeCache({ stdTTL: 60 * 3, checkperiod: 10, useClones: false, }); -exports.profileNameCache = new node_cache_1.default({ +export const profileNameCache = new NodeCache({ stdTTL: 60 * 60, checkperiod: 60, useClones: false, @@ -86,77 +61,74 @@ function waitForCacheSet(cache, key, value) { * Fetch the uuid from a user * @param user A user can be either a uuid or a username */ -async function uuidFromUser(user) { +export async function uuidFromUser(user) { // if the user is 32 characters long, it has to be a uuid - if (util_1.isUuid(user)) - return util_1.undashUuid(user); - if (exports.usernameCache.has(util_1.undashUuid(user))) { + if (isUuid(user)) + return undashUuid(user); + if (usernameCache.has(undashUuid(user))) { // check if the uuid is a key - const username = exports.usernameCache.get(util_1.undashUuid(user)); + const username = usernameCache.get(undashUuid(user)); // sometimes the username will be null, return that if (username === null) return undefined; // if it has .then, then that means its a waitForCacheSet promise. This is done to prevent requests made while it is already requesting if (username.then) { const { key: uuid, value: _username } = await username; - exports.usernameCache.set(uuid, _username); + usernameCache.set(uuid, _username); return uuid; } else - return util_1.undashUuid(user); + return undashUuid(user); } // check if the username is a value - const uuidToUsername = exports.usernameCache.mget(exports.usernameCache.keys()); + const uuidToUsername = usernameCache.mget(usernameCache.keys()); for (const [uuid, username] of Object.entries(uuidToUsername)) { if (username && username.toLowerCase && user.toLowerCase() === username.toLowerCase()) return uuid; } - if (_1.debug) + if (debug) console.debug('Cache miss: uuidFromUser', user); - const undashedUser = util_1.undashUuid(user); + const undashedUser = undashUuid(user); // set it as waitForCacheSet (a promise) in case uuidFromUser gets called while its fetching mojang - exports.usernameCache.set(undashedUser, waitForCacheSet(exports.usernameCache, user, user)); + usernameCache.set(undashedUser, waitForCacheSet(usernameCache, user, user)); // not cached, actually fetch mojang api now let { uuid, username } = await mojang.profileFromUser(user); if (!uuid) { - exports.usernameCache.set(user, null); + usernameCache.set(user, null); return; } // remove dashes from the uuid so its more normal - uuid = util_1.undashUuid(uuid); - exports.usernameCache.del(undashedUser); - exports.usernameCache.set(uuid, username); + uuid = undashUuid(uuid); + usernameCache.del(undashedUser); + usernameCache.set(uuid, username); return uuid; } -exports.uuidFromUser = uuidFromUser; /** * Fetch the username from a user * @param user A user can be either a uuid or a username */ -async function usernameFromUser(user) { - var _a; - if (exports.usernameCache.has(util_1.undashUuid(user))) { - if (_1.debug) +export async function usernameFromUser(user) { + if (usernameCache.has(undashUuid(user))) { + if (debug) console.debug('Cache hit! usernameFromUser', user); - return (_a = exports.usernameCache.get(util_1.undashUuid(user))) !== null && _a !== void 0 ? _a : null; + return usernameCache.get(undashUuid(user)) ?? null; } - if (_1.debug) + if (debug) console.debug('Cache miss: usernameFromUser', user); let { uuid, username } = await mojang.profileFromUser(user); if (!uuid) return null; - uuid = util_1.undashUuid(uuid); - exports.usernameCache.set(uuid, username); + uuid = undashUuid(uuid); + usernameCache.set(uuid, username); return username; } -exports.usernameFromUser = usernameFromUser; let fetchingPlayers = new Set(); -async function fetchPlayer(user) { +export async function fetchPlayer(user) { const playerUuid = await uuidFromUser(user); if (!playerUuid) return null; - if (exports.playerCache.has(playerUuid)) - return exports.playerCache.get(playerUuid); + if (playerCache.has(playerUuid)) + return playerCache.get(playerUuid); // if it's already in the process of fetching, check every 100ms until it's not fetching the player anymore and fetch it again, since it'll be cached now if (fetchingPlayers.has(playerUuid)) { while (fetchingPlayers.has(playerUuid)) { @@ -173,21 +145,20 @@ async function fetchPlayer(user) { if (!cleanPlayer) return null; // clone in case it gets modified somehow later - exports.playerCache.set(playerUuid, cleanPlayer); - exports.usernameCache.set(playerUuid, cleanPlayer.username); + playerCache.set(playerUuid, cleanPlayer); + usernameCache.set(playerUuid, cleanPlayer.username); const cleanBasicPlayer = Object.assign({}, cleanPlayer); delete cleanBasicPlayer.profiles; - exports.basicPlayerCache.set(playerUuid, cleanBasicPlayer); + basicPlayerCache.set(playerUuid, cleanBasicPlayer); return cleanPlayer; } -exports.fetchPlayer = fetchPlayer; /** Fetch a player without their profiles. This is heavily cached. */ -async function fetchBasicPlayer(user) { +export async function fetchBasicPlayer(user) { const playerUuid = await uuidFromUser(user); if (!playerUuid) return null; - if (exports.basicPlayerCache.has(playerUuid)) - return exports.basicPlayerCache.get(playerUuid); + if (basicPlayerCache.has(playerUuid)) + return basicPlayerCache.get(playerUuid); const player = await fetchPlayer(playerUuid); if (!player) { console.debug('no player? this should never happen, perhaps the uuid is invalid or the player hasn\'t played hypixel', playerUuid); @@ -196,15 +167,13 @@ async function fetchBasicPlayer(user) { delete player.profiles; return player; } -exports.fetchBasicPlayer = fetchBasicPlayer; -async function fetchSkyblockProfiles(playerUuid) { - var _a; - if (exports.profilesCache.has(playerUuid)) { - if (_1.debug) +export async function fetchSkyblockProfiles(playerUuid) { + if (profilesCache.has(playerUuid)) { + if (debug) console.debug('Cache hit! fetchSkyblockProfiles', playerUuid); - return exports.profilesCache.get(playerUuid); + return profilesCache.get(playerUuid); } - if (_1.debug) + if (debug) console.debug('Cache miss: fetchSkyblockProfiles', playerUuid); const profiles = await hypixel.fetchMemberProfilesUncached(playerUuid); const basicProfiles = []; @@ -213,7 +182,7 @@ async function fetchSkyblockProfiles(playerUuid) { const basicProfile = { name: profile.name, uuid: profile.uuid, - members: (_a = profile.members) === null || _a === void 0 ? void 0 : _a.map(m => { + members: profile.members?.map(m => { return { uuid: m.uuid, username: m.username, @@ -226,21 +195,20 @@ async function fetchSkyblockProfiles(playerUuid) { basicProfiles.push(basicProfile); } // cache the profiles - exports.profilesCache.set(playerUuid, basicProfiles); + profilesCache.set(playerUuid, basicProfiles); return basicProfiles; } -exports.fetchSkyblockProfiles = fetchSkyblockProfiles; /** Fetch an array of `BasicProfile`s */ async function fetchBasicProfiles(user) { const playerUuid = await uuidFromUser(user); if (!playerUuid) return null; // invalid player, just return - if (exports.basicProfilesCache.has(playerUuid)) { - if (_1.debug) + if (basicProfilesCache.has(playerUuid)) { + if (debug) console.debug('Cache hit! fetchBasicProfiles', playerUuid); - return exports.basicProfilesCache.get(playerUuid); + return basicProfilesCache.get(playerUuid); } - if (_1.debug) + if (debug) console.debug('Cache miss: fetchBasicProfiles', user); const player = await fetchPlayer(playerUuid); if (!player) { @@ -248,12 +216,12 @@ async function fetchBasicProfiles(user) { return []; } const profiles = player.profiles; - exports.basicProfilesCache.set(playerUuid, profiles); + basicProfilesCache.set(playerUuid, profiles); if (!profiles) return null; // cache the profile names and uuids to profileNameCache because we can for (const profile of profiles) - exports.profileNameCache.set(`${playerUuid}.${profile.uuid}`, profile.name); + profileNameCache.set(`${playerUuid}.${profile.uuid}`, profile.name); return profiles; } /** @@ -261,48 +229,46 @@ async function fetchBasicProfiles(user) { * @param user A username or uuid * @param profile A profile name or profile uuid */ -async function fetchProfileUuid(user, profile) { - var _a; +export async function fetchProfileUuid(user, profile) { // if a profile wasn't provided, return if (!profile) { - if (_1.debug) + if (debug) console.debug('no profile provided?', user, profile); return null; } - if (_1.debug) + if (debug) console.debug('Cache miss: fetchProfileUuid', user, profile); const profiles = await fetchBasicProfiles(user); if (!profiles) return null; // user probably doesnt exist - const profileUuid = util_1.undashUuid(profile); + const profileUuid = undashUuid(profile); for (const p of profiles) { - if (((_a = p.name) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === profileUuid.toLowerCase()) - return util_1.undashUuid(p.uuid); - else if (util_1.undashUuid(p.uuid) === util_1.undashUuid(profileUuid)) - return util_1.undashUuid(p.uuid); + if (p.name?.toLowerCase() === profileUuid.toLowerCase()) + return undashUuid(p.uuid); + else if (undashUuid(p.uuid) === undashUuid(profileUuid)) + return undashUuid(p.uuid); } return null; } -exports.fetchProfileUuid = fetchProfileUuid; /** * Fetch an entire profile from the user and profile data * @param user A username or uuid * @param profile A profile name or profile uuid */ -async function fetchProfile(user, profile) { +export async function fetchProfile(user, profile) { const playerUuid = await uuidFromUser(user); if (!playerUuid) return null; const profileUuid = await fetchProfileUuid(playerUuid, profile); if (!profileUuid) return null; - if (exports.profileCache.has(profileUuid)) { + if (profileCache.has(profileUuid)) { // we have the profile cached, return it :) - if (_1.debug) + if (debug) console.debug('Cache hit! fetchProfile', profileUuid); - return exports.profileCache.get(profileUuid); + return profileCache.get(profileUuid); } - if (_1.debug) + if (debug) console.debug('Cache miss: fetchProfile', user, profile); const profileName = await fetchProfileName(user, profile); if (!profileName) @@ -310,20 +276,19 @@ async function fetchProfile(user, profile) { const cleanProfile = await hypixel.fetchMemberProfileUncached(playerUuid, profileUuid); // we know the name from fetchProfileName, so set it here cleanProfile.name = profileName; - exports.profileCache.set(profileUuid, cleanProfile); + profileCache.set(profileUuid, cleanProfile); return cleanProfile; } -exports.fetchProfile = fetchProfile; /** * Fetch a CleanProfile from the uuid * @param profileUuid A profile name or profile uuid */ -async function fetchBasicProfileFromUuid(profileUuid) { - if (exports.profileCache.has(profileUuid)) { +export async function fetchBasicProfileFromUuid(profileUuid) { + if (profileCache.has(profileUuid)) { // we have the profile cached, return it :) - if (_1.debug) + if (debug) console.debug('Cache hit! fetchBasicProfileFromUuid', profileUuid); - const profile = exports.profileCache.get(profileUuid); + const profile = profileCache.get(profileUuid); if (!profile) return undefined; return { @@ -341,14 +306,12 @@ async function fetchBasicProfileFromUuid(profileUuid) { // TODO: cache this return await hypixel.fetchBasicProfileFromUuidUncached(profileUuid); } -exports.fetchBasicProfileFromUuid = fetchBasicProfileFromUuid; /** * Fetch the name of a profile from the user and profile uuid * @param user A player uuid or username * @param profile A profile uuid or name */ -async function fetchProfileName(user, profile) { - var _a, _b; +export async function fetchProfileName(user, profile) { // we're fetching the profile and player uuid again in case we were given a name, but it's cached so it's not much of a problem const profileUuid = await fetchProfileUuid(user, profile); if (!profileUuid) @@ -356,13 +319,13 @@ async function fetchProfileName(user, profile) { const playerUuid = await uuidFromUser(user); if (!playerUuid) return null; - if (exports.profileNameCache.has(`${playerUuid}.${profileUuid}`)) { + if (profileNameCache.has(`${playerUuid}.${profileUuid}`)) { // Return the profile name if it's cached - if (_1.debug) + if (debug) console.debug('Cache hit! fetchProfileName', profileUuid); - return (_a = exports.profileNameCache.get(`${playerUuid}.${profileUuid}`)) !== null && _a !== void 0 ? _a : null; + return profileNameCache.get(`${playerUuid}.${profileUuid}`) ?? null; } - if (_1.debug) + if (debug) console.debug('Cache miss: fetchProfileName', user, profile); const basicProfiles = await fetchBasicProfiles(playerUuid); if (!basicProfiles) @@ -370,8 +333,7 @@ async function fetchProfileName(user, profile) { let profileName = null; for (const basicProfile of basicProfiles) if (basicProfile.uuid === playerUuid) - profileName = (_b = basicProfile.name) !== null && _b !== void 0 ? _b : null; - exports.profileNameCache.set(`${playerUuid}.${profileUuid}`, profileName); + profileName = basicProfile.name ?? null; + profileNameCache.set(`${playerUuid}.${profileUuid}`, profileName); return profileName; } -exports.fetchProfileName = fetchProfileName; |