fix: switch to new rosu-pp version

tosuapp · Jun 29, 2024 · 7870d53 · 7870d53
1 parent e799ebe
commit 7870d53
Show file tree

Hide file tree

Showing 8 changed files with 189 additions and 135 deletions.
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -10,10 +10,10 @@
     "build": "tsc"
   },
   "dependencies": {
-    "semver": "^7.5.4",
-    "@kotrikd/rosu-pp": "^0.10.0",
-    "@tosu/updater": "workspace:*",
     "@tosu/common": "workspace:*",
+    "@tosu/updater": "workspace:*",
+    "rosu-pp-js": "^1.0.2",
+    "semver": "^7.5.4",
     "ws": "^8.16.0"
   },
   "devDependencies": {

diff --git a/packages/server/router/index.ts b/packages/server/router/index.ts
@@ -1,4 +1,3 @@
-import { Beatmap, Calculator } from '@kotrikd/rosu-pp';
 import {
     downloadFile,
     getCachePath,
@@ -11,6 +10,7 @@ import { autoUpdater } from '@tosu/updater';
 import { exec } from 'child_process';
 import fs from 'fs';
 import path from 'path';
+import rosu from 'rosu-pp-js';
 
 import { Server, sendJson } from '../index';
 import {
@@ -397,29 +397,44 @@ export default function buildBaseApi(server: Server) {
                     menuData.Path
                 );
 
-            const parseBeatmap = new Beatmap({ path: beatmapFilePath });
-            const calculator = new Calculator();
-
-            const array = Object.keys(query || {});
-            for (let i = 0; i < array.length; i++) {
-                const key = array[i];
-                const value = query[key];
-
-                if (key in calculator && isFinite(+value)) {
-                    calculator[key](+value);
-                }
-            }
-
-            return sendJson(res, {
-                attributes: calculator.mapAttributes(parseBeatmap),
-                performance: calculator.performance(parseBeatmap)
-            });
+            const beatmapContent = fs.readFileSync(beatmapFilePath, 'utf8');
+            const beatmap = new rosu.Beatmap(beatmapContent);
+            if (query.mode !== undefined) beatmap.convert(query.mode);
+
+            const params: { [key: string]: any } = {
+                // ar: ,
+                // arWithMods: ,
+                // cs: ,
+                // csWithMods: ,
+                // hardrockOffsets: ,
+                // hitresultPriority: ,
+                // hp: ,
+                // hpWithMods: ,
+                // od: ,
+                // odWithMods: ,
+            };
+
+            if (query.clockRate) params.clockRate = +query.clockRate;
+            if (query.passedObjects)
+                params.passedObjects = +query.passedObjects;
+            if (query.combo) params.combo = +query.combo;
+            if (query.nMisses) params.misses = +query.nMisses;
+            if (query.n100) params.n100 = +query.n100;
+            if (query.n300) params.n300 = +query.n300;
+            if (query.n50) params.n50 = +query.n50;
+            if (query.nGeki) params.nGeki = +query.nGeki;
+            if (query.nKatu) params.nKatu = +query.nKatu;
+            if (query.mods) params.mods = +query.mods;
+            if (query.accuracy) params.accuracy = +query.acc;
+
+            const calculate = new rosu.Performance(params).calculate(beatmap);
+            return sendJson(res, calculate);
         } catch (exc) {
             wLogger.error('calculate/pp', (exc as any).message);
             wLogger.debug('calculate/pp', exc);
 
             return sendJson(res, {
-                error: (exc as any).message
+                error: typeof exc === 'string' ? exc : (exc as any).message
             });
         }
     });

diff --git a/packages/tosu/package.json b/packages/tosu/package.json
@@ -12,7 +12,6 @@
         "compile": "pnpm run genver && pnpm run ts:compile && pnpm run compile:prepare-htmls && pkg --output dist/tosu.exe --debug --config pkg.json --compress brotli dist/index.js && pnpm run ts:run src/postBuild.ts"
     },
     "dependencies": {
-        "@kotrikd/rosu-pp": "^0.10.0",
         "@tosu/common": "workspace:*",
         "@tosu/game-overlay": "workspace:*",
         "@tosu/server": "workspace:*",
@@ -24,6 +23,7 @@
         "osu-standard-stable": "^5.0.0",
         "osu-taiko-stable": "^5.0.0",
         "resedit": "^2.0.0",
+        "rosu-pp-js": "^1.0.2",
         "semver": "^7.5.4",
         "tsprocess": "workspace:*"
     },

diff --git a/packages/tosu/pkg.json b/packages/tosu/pkg.json
@@ -2,6 +2,7 @@
     "scripts": "dist/**/*.js",
     "assets": [
       "dist/**/*.node",
+      "dist/**/*.wasm",
       "dist/target/**/*",
       "dist/_version.js",
       "dist/assets/**/*"