@rian8337/osu-droid-utilities 4.0.0-beta.9 → 4.0.0-beta.91

package/dist/index.js

@@ -1,224 +1,137 @@
 'use strict';
 
 var osuBase = require('@rian8337/osu-base');
-var osuDroidReplayAnalyzer = require('@rian8337/osu-droid-replay-analyzer');
+
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
+
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
 
 /**
  * Represents an osu!droid score.
  */
 class Score {
     /**
-     * The uid of the player.
-     */
-    uid;
-    /**
-     * The ID of the score.
-     */
-    scoreID;
-    /**
-     * The player's name.
-     */
-    username;
-    /**
-     * The title of the beatmap.
-     */
-    title;
-    /**
-     * The maximum combo achieved in the play.
-     */
-    combo;
-    /**
-     * The score achieved in the play.
-     */
-    score;
-    /**
-     * The rank achieved in the play.
-     */
-    rank;
-    /**
-     * The date of which the play was set.
-     */
-    date;
-    /**
-     * The accuracy achieved in the play.
-     */
-    accuracy;
-    /**
-     * Enabled modifications in the score.
-     */
-    mods;
-    /**
-     * MD5 hash of the play.
+     * The amount of 300s in the play.
      */
-    hash;
-    /**
-     * The speed multiplier of the play.
-     */
-    speedMultiplier = 1;
+    get perfect() {
+        return this.accuracy.n300;
+    }
     /**
-     * Whether to use old statistics for this score when calculating with `MapStats`.
-     *
-     * Otherwise, this denotes whether the score was set in version 1.6.7 or lower.
+     * The amount of 100s in the play.
      */
-    oldStatistics;
+    get good() {
+        return this.accuracy.n100;
+    }
     /**
-     * The forced AR of the play.
+     * The amount of 50s in the play.
      */
-    forcedAR;
+    get bad() {
+        return this.accuracy.n50;
+    }
     /**
-     * The replay of the score.
+     * The amount of misses in the play.
      */
-    replay;
+    get miss() {
+        return this.accuracy.nmiss;
+    }
     /**
-     * The complete mod string of this score (mods, speed multiplier, and force AR combined).
+     * The complete mod string of this score.
      */
     get completeModString() {
-        let finalString = `+${this.mods.length > 0 ? this.mods.map((v) => v.acronym) : "No Mod"}`;
-        if (this.forcedAR !== undefined || this.speedMultiplier !== 1) {
-            finalString += " (";
-            if (this.forcedAR !== undefined) {
-                finalString += `AR${this.forcedAR}`;
-            }
-            if (this.speedMultiplier !== 1) {
-                if (this.forcedAR !== undefined) {
-                    finalString += ", ";
-                }
-                finalString += `${this.speedMultiplier}x`;
-            }
-            finalString += ")";
+        if (this.mods.isEmpty) {
+            return `+No Mod`;
         }
-        return finalString;
+        return `+${osuBase.ModUtil.modsToOrderedString(this.mods)}`;
     }
-    constructor(values) {
-        this.uid = values?.uid ?? 0;
-        this.scoreID = values?.scoreID ?? 0;
-        this.username = values?.username ?? "";
-        this.title = values?.title ?? "";
-        this.combo = values?.combo ?? 0;
-        this.score = values?.score ?? 0;
-        this.rank = values?.rank ?? "";
-        this.date = new Date(values?.date ?? 0);
-        this.accuracy = values?.accuracy ?? new osuBase.Accuracy({});
-        this.hash = values?.hash ?? "";
-        const modstrings = (values?.mods ?? "").split("|");
-        let actualMods = "";
-        for (const str of modstrings) {
-            if (!str) {
-                continue;
-            }
-            if (str.startsWith("AR")) {
-                this.forcedAR = parseFloat(str.replace("AR", ""));
-            }
-            else if (str.startsWith("x")) {
-                this.speedMultiplier = parseFloat(str.replace("x", ""));
-            }
-            else {
-                actualMods += str;
-            }
-        }
-        this.mods = osuBase.ModUtil.droidStringToMods(actualMods);
-        // The pipe was added in 1.6.8 first pre-release (https://github.com/osudroid/osu-droid/commit/c08c406f4b2e535ed1ec43607a72fd8f70f8e316),
-        // so we can use that information to infer whether the score was set on version 1.6.7 or lower.
-        this.oldStatistics = !(values?.mods ?? "").includes("|");
+    constructor(apiScore) {
+        this.id = apiScore.id;
+        this.uid = apiScore.uid;
+        this.username = apiScore.username;
+        this.title = apiScore.filename;
+        this.combo = apiScore.combo;
+        this.score = apiScore.score;
+        this.rank = apiScore.mark;
+        this.date = new Date(apiScore.date * 1000);
+        this.mods = osuBase.ModUtil.deserializeMods(apiScore.mods);
+        this.accuracy = new osuBase.Accuracy({
+            n300: apiScore.perfect,
+            n100: apiScore.good,
+            n50: apiScore.bad,
+            nmiss: apiScore.miss,
+        });
+        this.sliderTickHits = apiScore.sliderTickHit;
+        this.sliderEndHits = apiScore.sliderEndHit;
+        this.hash = apiScore.hash;
+        this.pp = apiScore.pp;
+        this.ppMultiplier = apiScore.ppMultiplier;
     }
     /**
      * Retrieves score information on a beatmap from a player.
      *
      * @param uid The uid of the player.
      * @param hash The MD5 hash of the beatmap.
+     * @param fetchBestPP Whether to retrieve the score in terms of the best performance points rather than best score. Defaults to `false`.
      * @returns The score, `null` if the score is not found.
      */
-    static async getFromHash(uid, hash) {
-        const score = new Score();
-        const apiRequestBuilder = new osuBase.DroidAPIRequestBuilder()
-            .setEndpoint("scoresearchv2.php")
-            .addParameter("uid", uid)
-            .addParameter("hash", hash);
-        const result = await apiRequestBuilder.sendRequest();
-        if (result.statusCode !== 200) {
-            throw new Error("Error retrieving score data");
-        }
-        const entry = result.data.toString("utf-8").split("<br>");
-        entry.shift();
-        if (entry.length === 0) {
-            return null;
-        }
-        score.fillInformation(entry[0]);
-        return score;
-    }
-    /**
-     * Fills this instance with score information.
-     *
-     * @param info The score information from API response to fill with.
-     */
-    fillInformation(info) {
-        const play = info.split(" ");
-        this.scoreID = parseInt(play[0]);
-        this.uid = parseInt(play[1]);
-        this.username = play[2];
-        this.score = parseInt(play[3]);
-        this.combo = parseInt(play[4]);
-        this.rank = play[5];
-        const modstrings = play[6].split("|");
-        let actualMods = "";
-        for (const str of modstrings) {
-            if (!str) {
-                continue;
+    static getFromHash(uid_1, hash_1) {
+        return __awaiter(this, arguments, void 0, function* (uid, hash, fetchBestPP = false) {
+            const apiRequestBuilder = new osuBase.DroidAPIRequestBuilder()
+                .setEndpoint("scoresearchv2.php")
+                .addParameter("uid", uid)
+                .addParameter("hash", hash);
+            if (fetchBestPP) {
+                apiRequestBuilder.addParameter("order", "pp");
             }
-            if (str.startsWith("AR")) {
-                this.forcedAR = parseFloat(str.replace("AR", ""));
+            const result = yield apiRequestBuilder.sendRequest();
+            if (result.statusCode !== 200) {
+                throw new Error("Error retrieving score data");
             }
-            else if (str.startsWith("x")) {
-                this.speedMultiplier = parseFloat(str.replace("x", ""));
+            let response;
+            try {
+                response = JSON.parse(result.data.toString("utf-8"));
             }
-            else {
-                actualMods += str;
+            catch (_a) {
+                return null;
             }
-        }
-        this.mods = osuBase.ModUtil.droidStringToMods(actualMods);
-        this.oldStatistics = !play[6].includes("|");
-        this.accuracy = new osuBase.Accuracy({
-            n300: parseInt(play[8]),
-            n100: parseInt(play[9]),
-            n50: parseInt(play[10]),
-            nmiss: parseInt(play[11]),
+            if (response.length === 0) {
+                return null;
+            }
+            return new Score(response[0]);
         });
-        const date = new Date(parseInt(play[12]) * 1000);
-        date.setUTCHours(date.getUTCHours() + 8);
-        // https://stackoverflow.com/a/63199512
-        const tz = date
-            .toLocaleString("en", {
-            timeZone: "Europe/Berlin",
-            timeStyle: "long",
-        })
-            .split(" ")
-            .slice(-1)[0];
-        const dateString = date.toString();
-        const msOffset = Date.parse(`${dateString} UTC`) - Date.parse(`${dateString} ${tz}`);
-        date.setUTCMilliseconds(date.getUTCMilliseconds() - msOffset);
-        this.date = date;
-        this.title = play[13]
-            .substring(0, play[13].length - 4)
-            .replace(/_/g, " ");
-        this.hash = play[14];
-        return this;
-    }
-    /**
-     * Downloads the replay of this score.
-     */
-    async downloadReplay() {
-        if (!this.scoreID || this.replay) {
-            return;
-        }
-        this.replay = await new osuDroidReplayAnalyzer.ReplayAnalyzer({
-            scoreID: this.scoreID,
-        }).analyze();
     }
     /**
      * Returns a string representative of the class.
      */
     toString() {
-        return `Player: ${this.username}, uid: ${this.uid}, title: ${this.title}, score: ${this.score}, combo: ${this.combo}, rank: ${this.rank}, acc: ${this.accuracy}%, date: ${this.date}, mods: ${this.mods}, hash: ${this.hash}`;
+        return `Player: ${this.username}, uid: ${this.uid.toString()}, title: ${this.title}, score: ${this.score.toString()}, combo: ${this.combo.toString()}, rank: ${this.rank}, acc: ${(this.accuracy.value() * 100).toFixed(2)}%, date: ${this.date.toString()}, mods: ${osuBase.ModUtil.modsToOrderedString(this.mods)}, hash: ${this.hash}`;
     }
 }
 
@@ -226,131 +139,94 @@ class Score {
  * Represents an osu!droid player.
  */
 class Player {
-    /**
-     * The uid of the player.
-     */
-    uid = 0;
-    /**
-     * The username of the player.
-     */
-    username = "";
     /**
      * The avatar URL of the player.
      */
-    avatarURL = "";
-    /**
-     * The location of the player based on ISO 3166-1 country codes. See {@link https://en.wikipedia.org/wiki/ISO_3166-1 this} Wikipedia page for more information.
-     */
-    location = "";
-    /**
-     * The email that is attached to the player's account.
-     */
-    email = "";
-    /**
-     * The overall rank of the player.
-     */
-    rank = 0;
-    /**
-     * The total score of the player.
-     */
-    score = 0;
-    /**
-     * The overall accuracy of the player.
-     */
-    accuracy = 0;
-    /**
-     * The amount of times the player has played.
-     */
-    playCount = 0;
-    /**
-     * Recent plays of the player.
-     */
-    recentPlays = [];
+    get avatarUrl() {
+        return `https://osudroid.moe/user/avatar?id=${this.id.toString()}`;
+    }
+    constructor(apiPlayer) {
+        /**
+         * The user ID of the player.
+         */
+        this.id = 0;
+        /**
+         * The username of the player.
+         */
+        this.username = "";
+        /**
+         * The location of the player based on ISO 3166-1 country codes. See {@link https://en.wikipedia.org/wiki/ISO_3166-1 this} Wikipedia page for more information.
+         */
+        this.location = "";
+        /**
+         * The overall rank of the player.
+         */
+        this.rank = 0;
+        /**
+         * The total score of the player.
+         */
+        this.score = 0;
+        /**
+         * The total performance points of the player.
+         */
+        this.pp = 0;
+        /**
+         * The overall accuracy of the player.
+         */
+        this.accuracy = 0;
+        /**
+         * The amount of times the player has played.
+         */
+        this.playCount = 0;
+        /**
+         * Recent plays of the player.
+         */
+        this.recentPlays = [];
+        this.id = apiPlayer.id;
+        this.username = apiPlayer.username;
+        this.score = apiPlayer.score;
+        this.playCount = apiPlayer.playcount;
+        this.accuracy = apiPlayer.accuracy * 100;
+        this.location = apiPlayer.region;
+        this.rank = apiPlayer.rank;
+        this.pp = apiPlayer.pp;
+        for (const score of apiPlayer.recent) {
+            this.recentPlays.push(new Score(Object.assign(Object.assign({}, score), { uid: this.id, username: this.username })));
+        }
+    }
     /**
      * Retrieves a player's info based on their username.
      *
      * @param uidOrUsername The uid or username of the player.
      * @returns The player, `null` if the player is not found.
      */
-    static async getInformation(uidOrUsername) {
-        const player = new Player();
-        const apiRequestBuilder = new osuBase.DroidAPIRequestBuilder()
-            .setEndpoint("getuserinfo.php")
-            .addParameter(typeof uidOrUsername === "number" ? "uid" : "username", uidOrUsername);
-        const result = await apiRequestBuilder.sendRequest();
-        if (result.statusCode !== 200) {
-            throw new Error("Error retrieving player data");
-        }
-        const data = result.data.toString("utf-8");
-        const resArr = data.split("<br>");
-        const headerRes = resArr[0].split(" ");
-        if (headerRes[0] === "FAILED") {
-            return null;
-        }
-        player.fillInformation(data);
-        return player;
-    }
-    /**
-     * Fills this instance with player information.
-     *
-     * @param info The player information from API response to fill with.
-     */
-    fillInformation(info) {
-        const resArr = info.split("<br>");
-        const headerRes = resArr[0].split(" ");
-        if (headerRes[0] === "FAILED") {
-            return this;
-        }
-        const obj = JSON.parse(resArr[1]);
-        this.uid = parseInt(headerRes[1]);
-        this.username = headerRes[2];
-        this.score = parseInt(headerRes[3]);
-        this.playCount = parseInt(headerRes[4]);
-        this.accuracy = parseFloat((parseFloat(headerRes[5]) * 100).toFixed(2));
-        this.email = headerRes[6];
-        this.location = headerRes[7];
-        this.avatarURL = `https://osudroid.moe/user/avatar?id=${this.uid}&s=200`;
-        this.rank = obj.rank;
-        const recent = obj.recent;
-        for (const play of recent) {
-            // https://stackoverflow.com/a/63199512
-            const date = new Date((play.date + 3600 * 8) * 1000);
-            const tz = date
-                .toLocaleString("en", {
-                timeZone: "Europe/Berlin",
-                timeStyle: "long",
-            })
-                .split(" ")
-                .slice(-1)[0];
-            const dateString = date.toString();
-            const msOffset = Date.parse(`${dateString} UTC`) -
-                Date.parse(`${dateString} ${tz}`);
-            this.recentPlays.push(new Score({
-                uid: this.uid,
-                username: this.username,
-                scoreID: play.scoreid,
-                score: play.score,
-                accuracy: new osuBase.Accuracy({
-                    n300: play.perfect,
-                    n100: play.good,
-                    n50: play.bad,
-                    nmiss: play.miss,
-                }),
-                rank: play.mark,
-                combo: play.combo,
-                title: play.filename,
-                date: date.getTime() - msOffset,
-                mods: play.mode,
-                hash: play.hash,
-            }));
-        }
-        return this;
+    static getInformation(uidOrUsername) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const apiRequestBuilder = new osuBase.DroidAPIRequestBuilder()
+                .setEndpoint("getuserinfo.php")
+                .addParameter(typeof uidOrUsername === "number" ? "uid" : "username", uidOrUsername);
+            const result = yield apiRequestBuilder.sendRequest();
+            if (result.statusCode !== 200) {
+                throw new Error("Error retrieving player data");
+            }
+            let response;
+            try {
+                response = JSON.parse(result.data.toString("utf-8"));
+            }
+            catch (_a) {
+                return null;
+            }
+            if (!response.id) {
+                return null;
+            }
+            return new Player(response);
+        });
     }
     /**
      * Returns a string representative of the class.
      */
     toString() {
-        return `Username: ${this.username}\nUID: ${this.uid}\nRank: ${this.rank}\nScore: ${this.score}\nPlay count: ${this.playCount}`;
+        return `Username: ${this.username}\nUID: ${this.id.toString()}\nRank: ${this.rank.toString()}\nScore: ${this.score.toString()}\nPlay count: ${this.playCount.toString()}`;
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rian8337/osu-droid-utilities",
-    "version": "4.0.0-beta.9",
+    "version": "4.0.0-beta.91",
     "description": "A module containing utilities for osu!droid.",
     "keywords": [
         "osu",
@@ -12,9 +12,12 @@
     "main": "dist/index.js",
     "typings": "typings/index.d.ts",
     "typedocMain": "src/index.ts",
+    "engines": {
+        "node": ">=18"
+    },
     "files": [
-        "dist/**",
-        "typings/**"
+        "dist/index.js",
+        "typings/index.d.ts"
     ],
     "repository": {
         "type": "git",
@@ -22,19 +25,18 @@
     },
     "scripts": {
         "build": "rollup -c ../../rollup.config.mjs",
-        "lint": "eslint --ext ts",
-        "prepare": "npm run build",
-        "test": "jest"
+        "lint": "eslint 'src/**/*.ts'",
+        "prepublishOnly": "pnpm build",
+        "test": "jest --silent"
     },
     "bugs": {
         "url": "https://github.com/Rian8337/osu-droid-module/issues"
     },
     "dependencies": {
-        "@rian8337/osu-base": "^4.0.0-beta.9",
-        "@rian8337/osu-droid-replay-analyzer": "^4.0.0-beta.9"
+        "@rian8337/osu-base": "4.0.0-beta.91"
     },
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "35702aa327055e3d8edb13c038b9d9ae00eadf48"
+    "gitHead": "21fc1a8f1ddf89952521bf670a84dcfdd0495ed7"
 }

package/typings/index.d.ts

@@ -1,15 +1,51 @@
-import { Accuracy, Mod, IModApplicableToDroid } from '@rian8337/osu-base';
-import { ReplayAnalyzer } from '@rian8337/osu-droid-replay-analyzer';
+import { ScoreRank, SerializedMod, Accuracy, ModMap } from '@rian8337/osu-base';
 
-interface ScoreInformation {
+interface APIScore {
+    readonly id: number;
+    readonly uid: number;
+    readonly username: string;
+    readonly filename: string;
+    readonly score: number;
+    readonly combo: number;
+    readonly mark: ScoreRank;
+    readonly mods: SerializedMod[];
+    readonly accuracy: number;
+    readonly perfect: number;
+    readonly good: number;
+    readonly bad: number;
+    readonly miss: number;
+    readonly sliderTickHit: number | null;
+    readonly sliderEndHit: number | null;
+    readonly date: number;
+    readonly hash: string;
+    readonly pp: number | null;
+    readonly ppMultiplier: number | null;
+}
+
+interface APIPlayer {
+    readonly id: number;
+    readonly username: string;
+    readonly score: number;
+    readonly playcount: number;
+    readonly accuracy: number;
+    readonly region: string;
+    readonly rank: number;
+    readonly pp: number;
+    readonly recent: Omit<APIScore, "uid" | "username">[];
+}
+
+/**
+ * Represents an osu!droid score.
+ */
+declare class Score {
     /**
-     * The uid of the player.
+     * The ID of the score.
      */
-    uid?: number;
+    id: number;
     /**
-     * The ID of the score.
+     * The uid of the player.
      */
-    scoreID?: number;
+    uid: number;
     /**
      * The player's name.
      */
@@ -29,113 +65,73 @@ interface ScoreInformation {
     /**
      * The rank achieved in the play.
      */
-    rank: string;
+    rank: ScoreRank;
     /**
      * The date of which the play was set.
      */
-    date: Date | number;
+    date: Date;
     /**
      * The accuracy achieved in the play.
      */
     accuracy: Accuracy;
     /**
-     * Enabled modifications in the score, including force AR and custom speed multiplier.
-     */
-    mods: string;
-    /**
-     * MD5 hash of the play.
-     */
-    hash: string;
-}
-/**
- * Represents an osu!droid score.
- */
-declare class Score {
-    /**
-     * The uid of the player.
-     */
-    uid: number;
-    /**
-     * The ID of the score.
-     */
-    scoreID: number;
-    /**
-     * The player's name.
-     */
-    username: string;
-    /**
-     * The title of the beatmap.
+     * The amount of 300s in the play.
      */
-    title: string;
+    get perfect(): number;
     /**
-     * The maximum combo achieved in the play.
+     * The amount of 100s in the play.
      */
-    combo: number;
+    get good(): number;
     /**
-     * The score achieved in the play.
+     * The amount of 50s in the play.
      */
-    score: number;
+    get bad(): number;
     /**
-     * The rank achieved in the play.
+     * The amount of misses in the play.
      */
-    rank: string;
-    /**
-     * The date of which the play was set.
-     */
-    date: Date;
-    /**
-     * The accuracy achieved in the play.
-     */
-    accuracy: Accuracy;
+    get miss(): number;
     /**
      * Enabled modifications in the score.
      */
-    mods: (Mod & IModApplicableToDroid)[];
+    mods: ModMap;
     /**
      * MD5 hash of the play.
      */
     hash: string;
     /**
-     * The speed multiplier of the play.
+     * The amount of slider ticks hit in the play.
      */
-    speedMultiplier: number;
+    sliderTickHits: number | null;
     /**
-     * Whether to use old statistics for this score when calculating with `MapStats`.
-     *
-     * Otherwise, this denotes whether the score was set in version 1.6.7 or lower.
+     * The amount of slider ends hit in the play.
      */
-    oldStatistics: boolean;
+    sliderEndHits: number | null;
     /**
-     * The forced AR of the play.
+     * The performance points value of the play.
+     *
+     * This is the final value, affected by {@link ppMultiplier}. To get the raw pp value, divide by said multiplier.
      */
-    forcedAR?: number;
+    pp: number | null;
     /**
-     * The replay of the score.
+     * The pp multiplier of the play.
+     *
+     * This is applied directly to {@link pp} during calculation.
      */
-    replay?: ReplayAnalyzer;
+    ppMultiplier: number | null;
     /**
-     * The complete mod string of this score (mods, speed multiplier, and force AR combined).
+     * The complete mod string of this score.
      */
     get completeModString(): string;
-    constructor(values?: ScoreInformation);
+    constructor(apiScore: APIScore);
     /**
      * Retrieves score information on a beatmap from a player.
      *
      * @param uid The uid of the player.
      * @param hash The MD5 hash of the beatmap.
+     * @param fetchBestPP Whether to retrieve the score in terms of the best performance points rather than best score. Defaults to `false`.
      * @returns The score, `null` if the score is not found.
      */
-    static getFromHash(uid: number, hash: string): Promise<Score | null>;
-    /**
-     * Fills this instance with score information.
-     *
-     * @param info The score information from API response to fill with.
-     */
-    fillInformation(info: string): Score;
-    /**
-     * Downloads the replay of this score.
-     */
-    downloadReplay(): Promise<void>;
+    static getFromHash(uid: number, hash: string, fetchBestPP?: boolean): Promise<Score | null>;
     /**
      * Returns a string representative of the class.
      */
@@ -147,9 +143,9 @@ declare class Score {
  */
 declare class Player {
     /**
-     * The uid of the player.
+     * The user ID of the player.
      */
-    uid: number;
+    id: number;
     /**
      * The username of the player.
      */
@@ -157,15 +153,11 @@ declare class Player {
     /**
      * The avatar URL of the player.
      */
-    avatarURL: string;
+    get avatarUrl(): string;
     /**
      * The location of the player based on ISO 3166-1 country codes. See {@link https://en.wikipedia.org/wiki/ISO_3166-1 this} Wikipedia page for more information.
      */
     location: string;
-    /**
-     * The email that is attached to the player's account.
-     */
-    email: string;
     /**
      * The overall rank of the player.
      */
@@ -174,6 +166,10 @@ declare class Player {
      * The total score of the player.
      */
     score: number;
+    /**
+     * The total performance points of the player.
+     */
+    pp: number;
     /**
      * The overall accuracy of the player.
      */
@@ -186,6 +182,7 @@ declare class Player {
      * Recent plays of the player.
      */
     readonly recentPlays: Score[];
+    constructor(apiPlayer: APIPlayer);
     /**
      * Retrieves a player's info based on their username.
      *
@@ -193,12 +190,6 @@ declare class Player {
      * @returns The player, `null` if the player is not found.
      */
     static getInformation(uidOrUsername: string | number): Promise<Player | null>;
-    /**
-     * Fills this instance with player information.
-     *
-     * @param info The player information from API response to fill with.
-     */
-    fillInformation(info: string): Player;
     /**
      * Returns a string representative of the class.
      */
@@ -206,3 +197,4 @@ declare class Player {
 }
 
 export { Player, Score };
+export type { APIPlayer, APIScore };

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sources":["../src/Score.ts","../src/Player.ts"],"sourcesContent":[null,null],"names":["Accuracy","ModUtil","DroidAPIRequestBuilder","ReplayAnalyzer"],"mappings":"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"}