@rian8337/osu-droid-replay-analyzer 4.0.0-beta.97 → 4.0.0-beta.99

package/dist/index.js

@@ -2338,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;
         }
@@ -2348,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];
@@ -2392,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.
      *
@@ -2404,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;
                 }
             }
         }
@@ -2574,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;
@@ -2913,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.97",
+    "version": "4.0.0-beta.99",
     "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.97",
-        "@rian8337/osu-difficulty-calculator": "4.0.0-beta.97",
-        "@rian8337/osu-rebalance-difficulty-calculator": "4.0.0-beta.97",
+        "@rian8337/osu-base": "4.0.0-beta.98",
+        "@rian8337/osu-difficulty-calculator": "4.0.0-beta.99",
+        "@rian8337/osu-rebalance-difficulty-calculator": "4.0.0-beta.99",
         "java-deserialization": "^0.1.0",
         "unzipper": "^0.10.11"
     },
@@ -46,5 +46,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "0d77ee41c1b0eca8e46c118e942417483c4a9452"
+    "gitHead": "8db713bd3e23b065f26d65f4d312e3d55c384a1c"
 }

package/typings/index.d.ts

@@ -1003,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.
      */
@@ -1023,7 +1031,7 @@ interface SliderNestedHitObjectInformation {
     /**
      * The amount of the nested hit objects in the beatmap.
      */
-    readonly total: number;
+    total: number;
 }
 
 interface HitErrorInformation {
@@ -1126,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.
      *
@@ -1185,6 +1193,7 @@ declare class ReplayAnalyzer {
     private parseOldReplayInformation;
     private calculateRank;
     private constructPlayableBeatmap;
+    private getBeatmapHitWindow;
     private readByte;
     private readShort;
     private readInt;