diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/database.ts | 20 | ||||
| -rw-r--r-- | src/hypixelApi.ts | 2 | ||||
| -rw-r--r-- | src/hypixelCached.ts | 14 |
3 files changed, 31 insertions, 5 deletions
diff --git a/src/database.ts b/src/database.ts index 08a8114..27bc7ec 100644 --- a/src/database.ts +++ b/src/database.ts @@ -3,7 +3,7 @@ */ import { categorizeStat, getStatUnit } from './cleaners/skyblock/stats' -import { CleanFullProfile } from './cleaners/skyblock/profile' +import { CleanFullProfile, CleanProfile } from './cleaners/skyblock/profile' import { CleanMember } from './cleaners/skyblock/member' import { Collection, Db, MongoClient } from 'mongodb' import { CleanPlayer } from './cleaners/player' @@ -175,6 +175,7 @@ export async function fetchAllMemberLeaderboardAttributes(): Promise<string[]> { 'first_join', 'purse', 'visited_zones', + 'leaderboards_count' ] } @@ -247,7 +248,7 @@ export async function fetchMemberLeaderboardSpots(player: string, profile: strin // update the leaderboard positions for the member await updateDatabaseMember(fullMember, fullProfile) - const applicableAttributes = await getApplicableAttributes(fullMember) + const applicableAttributes = await getApplicableAttributes(fullMember, fullProfile) const memberLeaderboardSpots = [] @@ -276,7 +277,7 @@ async function getMemberLeaderboardRequirement(name: string): Promise<number> { } /** Get the attributes for the member, but only ones that would put them on the top 100 for leaderboards */ -async function getApplicableAttributes(member: CleanMember): Promise<StringNumber> { +async function getApplicableAttributes(member: CleanMember, profile: CleanProfile): Promise<StringNumber> { const leaderboardAttributes = getMemberLeaderboardAttributes(member) const applicableAttributes = {} for (const [ leaderboard, attributeValue ] of Object.entries(leaderboardAttributes)) { @@ -289,6 +290,17 @@ async function getApplicableAttributes(member: CleanMember): Promise<StringNumbe applicableAttributes[leaderboard] = attributeValue } } + + let leaderboardsCount: number = Object.keys(applicableAttributes).length + const leaderboardsCountRequirement: number = await getMemberLeaderboardRequirement('leaderboards_count') + if ( + (leaderboardsCountRequirement === null) + || (leaderboardsCount > leaderboardsCountRequirement) + ) { + // add 1 extra because this attribute also counts :) + applicableAttributes['leaderboards_count'] = leaderboardsCount + 1 + } + return applicableAttributes } @@ -312,7 +324,7 @@ export async function updateDatabaseMember(member: CleanMember, profile: CleanFu if (debug) console.log('done constants..') - const leaderboardAttributes = await getApplicableAttributes(member) + const leaderboardAttributes = await getApplicableAttributes(member, profile) if (debug) console.log('done getApplicableAttributes..', leaderboardAttributes) diff --git a/src/hypixelApi.ts b/src/hypixelApi.ts index 8541089..7ee7eca 100644 --- a/src/hypixelApi.ts +++ b/src/hypixelApi.ts @@ -125,7 +125,6 @@ export interface HypixelPlayer { socialMedia?: HypixelPlayerSocialMedia } - /** Send an HTTP request to the Hypixel API */ export async function sendApiRequest({ path, key, args }): Promise<HypixelResponse> { // Send a raw http request to api.hypixel.net, and return the parsed json @@ -145,6 +144,7 @@ export async function sendApiRequest({ path, key, args }): Promise<HypixelRespon { agent: () => httpsAgent } ) } catch { + console.log('error in fetch :/') // if there's an error, wait a second and try again await new Promise((resolve) => setTimeout(resolve, 1000)) return await sendApiRequest({ path, key, args }) diff --git a/src/hypixelCached.ts b/src/hypixelCached.ts index c347a1a..3dc89a3 100644 --- a/src/hypixelCached.ts +++ b/src/hypixelCached.ts @@ -143,18 +143,32 @@ export async function usernameFromUser(user: string): Promise<string> { return username } +let fetchingPlayers: Set<string> = new Set() export async function fetchPlayer(user: string): Promise<CleanPlayer> { const playerUuid = await uuidFromUser(user) + 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)) { + await new Promise(resolve => setTimeout(resolve, 100)) + } + return await fetchPlayer(user) + } + + fetchingPlayers.add(playerUuid) + const cleanPlayer: CleanPlayer = await hypixel.sendCleanApiRequest({ path: 'player', args: { uuid: playerUuid } }) + fetchingPlayers.delete(playerUuid) + if (!cleanPlayer) return // clone in case it gets modified somehow later |