@rian8337/osu-droid-replay-analyzer 4.0.0-beta.96 → 4.0.0-beta.98

package/dist/index.js

@@ -1327,7 +1327,7 @@ class TwoHandChecker {
         // this.csvString = `Mods,${
         //     data.convertedMods.reduce((a, m) => a + m.acronym, "") || "NM"
         // }\nCombo,${data.maxCombo}\nAccuracy,"${(
-        //     data.accuracy.value() * 100
+        //     data.accuracy.value * 100
         // ).toFixed(2)}% [${data.accuracy.n300}/${data.accuracy.n100}/${
         //     data.accuracy.n50
         // }/${
@@ -2195,15 +2195,22 @@ class ReplayData {
  */
 class ReplayV3Data extends ReplayData {
     /**
-     * The total score achieved in the play, after applying score multiplier from mods.
+     * Obtains the total score achieved in the play, after applying score multiplier from mods.
+     *
+     * @param difficulty The `BeatmapDifficulty` of the beatmap that was played. Required to correctly compute
+     * the score multiplier of difficulty-dependent mods. If not provided, those mods fall back to their
+     * difficulty-independent multiplier.
      */
-    get totalScore() {
-        var _a;
+    getTotalScore(difficulty = null) {
+        let baseScore = this.score;
         if (this.replayVersion < 8) {
-            return this.score;
+            // Replay versions 3 to 7 store the score after applying score multiplier
+            // from mods, so we need to reverse it to get the base score.
+            const legacyScoreMultiplier = new osuBase.DroidLegacyScoreMultiplierCalculator(difficulty).calculateFor(this.convertedMods.values());
+            baseScore = Math.round(this.score / legacyScoreMultiplier);
         }
-        (_a = this.scoreMultiplier) !== null && _a !== void 0 ? _a : (this.scoreMultiplier = osuBase.ModUtil.calculateScoreMultiplier(this.convertedMods.values(), osuBase.Modes.Droid));
-        return Math.round(Math.fround(this.score * this.scoreMultiplier));
+        const scoreMultiplier = new osuBase.DroidScoreMultiplierCalculator(difficulty).calculateFor(this.convertedMods.values());
+        return Math.round(baseScore * scoreMultiplier);
     }
     constructor(values) {
         super(values);
@@ -2331,7 +2338,6 @@ class ReplayAnalyzer {
      * `analyze()` must be called before calling this, and `beatmap` must be defined.
      */
     calculateHitError() {
-        var _a, _b;
         if (!this.data || !this.beatmap) {
             return null;
         }
@@ -2341,14 +2347,7 @@ class ReplayAnalyzer {
         let positiveTotal = 0;
         let negativeTotal = 0;
         const { objects } = this.beatmap.hitObjects;
-        const mods = this.data.isReplayV3()
-            ? this.data.convertedMods
-            : ((_b = (_a = this.difficultyAttributes) === null || _a === void 0 ? void 0 : _a.mods) !== null && _b !== void 0 ? _b : new osuBase.ModMap());
-        const adjustedDifficulty = new osuBase.BeatmapDifficulty(this.beatmap.difficulty);
-        osuBase.ModUtil.applyModsToBeatmapDifficulty(adjustedDifficulty, osuBase.Modes.Droid, mods);
-        const mehWindow = mods.has(osuBase.ModPrecise)
-            ? new osuBase.PreciseDroidHitWindow(adjustedDifficulty.od).mehWindow
-            : new osuBase.DroidHitWindow(adjustedDifficulty.od).mehWindow;
+        const { mehWindow } = this.getBeatmapHitWindow();
         const accuracies = [];
         for (let i = 0; i < hitObjectData.length; ++i) {
             const v = hitObjectData[i];
@@ -2385,7 +2384,7 @@ class ReplayAnalyzer {
         };
     }
     /**
-     * Obtains the amount of slider ticks and ends hit in the replay.
+     * Obtains the amount of slider nested objects hit in the replay.
      *
      * This requires `analyze()` to be called first and `beatmap` to be defined.
      *
@@ -2397,27 +2396,46 @@ class ReplayAnalyzer {
             return null;
         }
         const sliderInformation = {
-            tick: { obtained: 0, total: beatmap.hitObjects.sliderTicks },
-            end: { obtained: 0, total: beatmap.hitObjects.sliders },
+            head: { obtained: 0, total: beatmap.hitObjects.sliders },
+            tick: { obtained: 0, total: 0 },
+            repeat: { obtained: 0, total: 0 },
+            end: { obtained: 0, total: 0 },
         };
+        const hitWindow = this.getBeatmapHitWindow();
         for (let i = 0; i < data.hitObjectData.length; ++i) {
             const object = beatmap.hitObjects.objects[i];
             const objectData = data.hitObjectData[i];
-            if (objectData.result === osuBase.HitResult.Miss ||
-                !(object instanceof osuBase.Slider)) {
+            if (!(object instanceof osuBase.Slider)) {
                 continue;
             }
-            // Exclude the head circle.
+            let lateHitThreshold = hitWindow.mehWindow;
+            // Before replay version 8, the slider head's hit window is capped to the duration of the slider.
+            if (data.replayVersion < 8) {
+                lateHitThreshold = Math.min(lateHitThreshold, object.duration);
+            }
+            if (-hitWindow.mehWindow <= objectData.accuracy &&
+                objectData.accuracy <= lateHitThreshold) {
+                ++sliderInformation.head.obtained;
+            }
             for (let j = 1; j < object.nestedHitObjects.length; ++j) {
                 const nested = object.nestedHitObjects[j];
-                if (!objectData.tickset[j - 1]) {
-                    continue;
-                }
-                if (nested instanceof osuBase.SliderTick) {
-                    ++sliderInformation.tick.obtained;
+                let tickInformation;
+                switch (true) {
+                    case nested instanceof osuBase.SliderTick:
+                        tickInformation = sliderInformation.tick;
+                        break;
+                    case nested instanceof osuBase.SliderRepeat:
+                        tickInformation = sliderInformation.repeat;
+                        break;
+                    case nested instanceof osuBase.SliderTail:
+                        tickInformation = sliderInformation.end;
+                        break;
+                    default:
+                        continue;
                 }
-                else if (nested instanceof osuBase.SliderTail) {
-                    ++sliderInformation.end.obtained;
+                ++tickInformation.total;
+                if (objectData.tickset[j - 1]) {
+                    ++tickInformation.obtained;
                 }
             }
         }
@@ -2567,8 +2585,16 @@ class ReplayAnalyzer {
                 .setRequireAPIkey(false)
                 .setEndpoint("upload")
                 .addParameter("", `${this.scoreID.toString()}.odr`);
-            const result = yield apiRequestBuilder.sendRequest();
+            let result;
+            try {
+                result = yield apiRequestBuilder.sendRequest();
+            }
+            catch (e) {
+                console.error(`Error retrieving replay for score ID ${this.scoreID.toString()}: ${e.message}`);
+                return null;
+            }
             if (result.statusCode !== 200) {
+                console.error(`Error retrieving replay for score ID ${this.scoreID.toString()}: ${result.describeFailure()}`);
                 return null;
             }
             return result.data;
@@ -2646,9 +2672,16 @@ class ReplayAnalyzer {
             resultObject.accuracy.n100 = buf.readInt32BE(20);
             resultObject.accuracy.n50 = buf.readInt32BE(24);
             resultObject.accuracy.nmiss = buf.readInt32BE(28);
-            resultObject.score = buf.readInt32BE(32);
-            resultObject.maxCombo = buf.readInt32BE(36);
-            resultObject.isFullCombo = resultObject.accuracy.value() === 1;
+            if (resultObject.replayVersion >= 9) {
+                // From replay version 9 onwards, the score is stored as a long (8 bytes) instead of an int (4 bytes).
+                resultObject.score = Number(buf.readBigInt64BE(32));
+                resultObject.maxCombo = buf.readInt32BE(40);
+            }
+            else {
+                resultObject.score = buf.readInt32BE(32);
+                resultObject.maxCombo = buf.readInt32BE(36);
+            }
+            resultObject.isFullCombo = resultObject.accuracy.value === 1;
             resultObject.playerName = rawObject[5];
             if (resultObject.replayVersion >= 7) {
                 resultObject.convertedMods = osuBase.ModUtil.deserializeMods(JSON.parse(rawObject[6]));
@@ -2674,6 +2707,7 @@ class ReplayAnalyzer {
             case 3:
             case 7:
             case 8:
+            case 9:
                 bufferIndex = 7;
                 break;
             case 4:
@@ -2867,7 +2901,7 @@ class ReplayAnalyzer {
             resultObject.convertedMods.has(osuBase.ModFlashlight);
         const hit300Ratio = resultObject.accuracy.n300 / totalHits;
         switch (true) {
-            case resultObject.accuracy.value() === 1:
+            case resultObject.accuracy.value === 1:
                 return isHidden ? "XH" : "X";
             case hit300Ratio > 0.9 &&
                 resultObject.accuracy.n50 / totalHits < 0.01 &&
@@ -2898,6 +2932,20 @@ class ReplayAnalyzer {
             : (_a = this.difficultyAttributes) === null || _a === void 0 ? void 0 : _a.mods;
         return this.beatmap.createDroidPlayableBeatmap(mods);
     }
+    getBeatmapHitWindow() {
+        var _a, _b;
+        if (!this.data || !this.beatmap) {
+            return null;
+        }
+        const mods = this.data.isReplayV3()
+            ? this.data.convertedMods
+            : ((_b = (_a = this.difficultyAttributes) === null || _a === void 0 ? void 0 : _a.mods) !== null && _b !== void 0 ? _b : new osuBase.ModMap());
+        const adjustedDifficulty = new osuBase.BeatmapDifficulty(this.beatmap.difficulty);
+        osuBase.ModUtil.applyModsToBeatmapDifficulty(adjustedDifficulty, osuBase.Modes.Droid, mods);
+        return mods.has(osuBase.ModPrecise)
+            ? new osuBase.PreciseDroidHitWindow(adjustedDifficulty.od)
+            : new osuBase.DroidHitWindow(adjustedDifficulty.od);
+    }
     readByte(buffer) {
         const num = buffer.readInt8(this.bufferOffset);
         this.bufferOffset += 1;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rian8337/osu-droid-replay-analyzer",
-    "version": "4.0.0-beta.96",
+    "version": "4.0.0-beta.98",
     "description": "A replay analyzer for analyzing osu!droid replay files.",
     "keywords": [
         "osu",
@@ -34,9 +34,9 @@
         "url": "https://github.com/Rian8337/osu-droid-module/issues"
     },
     "dependencies": {
-        "@rian8337/osu-base": "4.0.0-beta.96",
-        "@rian8337/osu-difficulty-calculator": "4.0.0-beta.96",
-        "@rian8337/osu-rebalance-difficulty-calculator": "4.0.0-beta.96",
+        "@rian8337/osu-base": "4.0.0-beta.98",
+        "@rian8337/osu-difficulty-calculator": "4.0.0-beta.98",
+        "@rian8337/osu-rebalance-difficulty-calculator": "4.0.0-beta.98",
         "java-deserialization": "^0.1.0",
         "unzipper": "^0.10.11"
     },
@@ -46,5 +46,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "13af8d35ad74141c270c6b985941b5f2a14e248b"
+    "gitHead": "0d1f9256f0caee5123379cf5a8b3c92d1dcfa7bf"
 }

package/typings/index.d.ts

@@ -1,4 +1,4 @@
-import { Vector2, HitResult, Accuracy, ScoreRank, ModMap, DroidPlayableBeatmap, Beatmap, HitWindow } from '@rian8337/osu-base';
+import { Vector2, HitResult, Accuracy, ScoreRank, ModMap, BeatmapDifficulty, DroidPlayableBeatmap, Beatmap, HitWindow } from '@rian8337/osu-base';
 import { IExtendedDroidDifficultyAttributes } from '@rian8337/osu-rebalance-difficulty-calculator';
 import { IExtendedDroidDifficultyAttributes as IExtendedDroidDifficultyAttributes$1 } from '@rian8337/osu-difficulty-calculator';
 
@@ -340,7 +340,7 @@ declare class ReplayV3Data extends ReplayData {
      * Between replay version 3 and 7, this is the final score after applying score multiplier from mods.
      * From replay version 8 onwards, this is the score before applying score multiplier from mods.
      *
-     * The {@link totalScore} getter can be used to get the total score across all replay versions.
+     * The {@link getTotalScore} method can be used to get the total score across all replay versions.
      */
     readonly score: number;
     /**
@@ -360,10 +360,13 @@ declare class ReplayV3Data extends ReplayData {
      */
     readonly convertedMods: ModMap;
     /**
-     * The total score achieved in the play, after applying score multiplier from mods.
+     * Obtains the total score achieved in the play, after applying score multiplier from mods.
+     *
+     * @param difficulty The `BeatmapDifficulty` of the beatmap that was played. Required to correctly compute
+     * the score multiplier of difficulty-dependent mods. If not provided, those mods fall back to their
+     * difficulty-independent multiplier.
      */
-    get totalScore(): number;
-    private scoreMultiplier?;
+    getTotalScore(difficulty?: BeatmapDifficulty | null): number;
     constructor(values: ReplayInformation);
 }
 
@@ -1000,10 +1003,18 @@ type ExportedReplayJSONV4 = ExportedReplayJSON<4, ExportedReplayJSONDataV4>;
  * Represents hit information about sliders in a beatmap.
  */
 interface SliderHitInformation {
+    /**
+     * Hit information of slider heads.
+     */
+    readonly head: SliderNestedHitObjectInformation;
     /**
      * Hit information of slider ticks.
      */
     readonly tick: SliderNestedHitObjectInformation;
+    /**
+     * Hit information of slider repeats.
+     */
+    readonly repeat: SliderNestedHitObjectInformation;
     /**
      * hit information of slider ends.
      */
@@ -1020,7 +1031,7 @@ interface SliderNestedHitObjectInformation {
     /**
      * The amount of the nested hit objects in the beatmap.
      */
-    readonly total: number;
+    total: number;
 }
 
 interface HitErrorInformation {
@@ -1123,7 +1134,7 @@ declare class ReplayAnalyzer {
      */
     calculateHitError(): HitErrorInformation | null;
     /**
-     * Obtains the amount of slider ticks and ends hit in the replay.
+     * Obtains the amount of slider nested objects hit in the replay.
      *
      * This requires `analyze()` to be called first and `beatmap` to be defined.
      *
@@ -1182,6 +1193,7 @@ declare class ReplayAnalyzer {
     private parseOldReplayInformation;
     private calculateRank;
     private constructPlayableBeatmap;
+    private getBeatmapHitWindow;
     private readByte;
     private readShort;
     private readInt;