fix: fixes

tosuapp · Feb 19, 2024 · 5a5301b · 5a5301b
1 parent fb06ca6
commit 5a5301b
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 38 deletions.
diff --git a/packages/common/utils/config.ts b/packages/common/utils/config.ts
@@ -23,8 +23,6 @@ ENABLE_KEY_OVERLAY=true
 POLL_RATE=150
 # Once per value, the programme should read the values of keys K1/K2/M1/M2 (in milliseconds)
 KEYOVERLAY_POLL_RATE=150
-# Once in what value, the programme should send information about values to the websocket (overlay) (in milliseconds)
-WS_SEND_INTERVAL=150
 
 # Enables/disables the in-game gosumemory overlay (!!!I AM NOT RESPONSIBLE FOR USING IT!!!).
 ENABLE_GOSU_OVERLAY=false
@@ -52,7 +50,6 @@ export const config = {
     debugLogging: (process.env.DEBUG_LOG || '') === 'true',
     calculatePP: (process.env.CALCULATE_PP || '') === 'true',
     enableKeyOverlay: (process.env.ENABLE_KEY_OVERLAY || '') === 'true',
-    // wsSendInterval: Number(process.env.WS_SEND_INTERVAL || '500'),
     pollRate: Number(process.env.POLL_RATE || '500'),
     keyOverlayPollRate: Number(process.env.KEYOVERLAY_POLL_RATE || '100'),
     serverIP: process.env.SERVER_IP || '127.0.0.1',
@@ -79,11 +76,6 @@ export const updateConfig = () => {
         fs.appendFileSync(configPath, '\nENABLE_KEY_OVERLAY=true', 'utf8');
     }
 
-    // if (!process.env.WS_SEND_INTERVAL) {
-    //     newOptions += 'WS_SEND_INTERVAL, ';
-    //     fs.appendFileSync(configPath, '\nWS_SEND_INTERVAL=150', 'utf8');
-    // }
-
     if (!process.env.POLL_RATE) {
         newOptions += 'POLL_RATE, ';
         fs.appendFileSync(configPath, '\nPOLL_RATE=150', 'utf8');

diff --git a/packages/server/http/index.ts b/packages/server/http/index.ts
@@ -28,12 +28,10 @@ export class HttpServer {
     private middlewares: RequestHandler[] = [];
     server: http.Server;
     private routes: {
-        [method: string]: [
-            {
-                path: string | RegExp;
-                handler: RouteHandler;
-            }
-        ];
+        [method: string]: {
+            path: string | RegExp;
+            handler: RouteHandler;
+        }[];
     } = {};
 
     constructor() {
@@ -59,10 +57,8 @@ export class HttpServer {
             | 'PATCH',
         handler: RouteHandler
     ) {
-        // @ts-ignore
         if (this.routes[method] == null) this.routes[method] = [];
 
-        // @ts-ignore
         const find = this.routes[method].find((r) => r.path == path);
         if (!find) this.routes[method].push({ path, handler });
     }

diff --git a/packages/tosu/src/api/handlers/songs.ts b/packages/tosu/src/api/handlers/songs.ts
@@ -9,8 +9,6 @@ import path from 'path';
 
 import { readDirectory } from '../utils/reader';
 
-const currentVersion = require(process.cwd() + '/_version.js');
-
 export const readSongsFolder = (
     req: ExtendedIncomingMessage,
     res: http.ServerResponse
@@ -21,7 +19,7 @@ export const readSongsFolder = (
     );
     if (osuInstances.length < 1) {
         res.statusCode = 500;
-        return res.end('nothing');
+        return sendJson(res, { error: 'not_ready' });
     }
 
     const { settings } = osuInstances[0].entities.getServices(['settings']);
@@ -48,12 +46,12 @@ export const readSongsFolder = (
         if (err) {
             if (err.code === 'ENOENT') {
                 res.writeHead(404, { 'Content-Type': 'text/html' });
-                res.end(`[${currentVersion}] 404 Not Found`);
+                res.end(`404 Not Found`);
                 return;
             }
 
             res.writeHead(500);
-            res.end(`[${currentVersion}] Server Error: ${err.code}`);
+            res.end(`Server Error: ${err.code}`);
             return;
         }
 

diff --git a/packages/tosu/src/api/router/base.ts b/packages/tosu/src/api/router/base.ts
@@ -5,16 +5,14 @@ import path from 'path';
 
 import { readDirectory } from '../utils/reader';
 
-const currentVersion = require(process.cwd() + '/_version.js');
-
 export const baseApi = (app: HttpServer) => {
     app.route('/json', 'GET', (req, res) => {
         const osuInstances: any = Object.values(
             req.instanceManager.osuInstances || {}
         );
         if (osuInstances.length < 1) {
             res.statusCode = 500;
-            return res.end('nothing');
+            return sendJson(res, { error: 'not_ready' });
         }
 
         const json = osuInstances[0].getState(req.instanceManager);
@@ -75,7 +73,7 @@ export const baseApi = (app: HttpServer) => {
             }
 
             res.writeHead(500);
-            res.end(`[${currentVersion}] Server Error: ${err.code}`);
+            res.end(`Server Error: ${err.code}`);
         });
     });
 };
diff --git a/packages/tosu/src/api/router/v2.ts b/packages/tosu/src/api/router/v2.ts
@@ -6,8 +6,6 @@ import path from 'path';
 import { readSongsFolder } from '../handlers/songs';
 import { readDirectory } from '../utils/reader';
 
-const currentVersion = require(process.cwd() + '/_version.js');
-
 export const ApiV2 = ({
     app,
     webSocket,
@@ -38,7 +36,7 @@ export const ApiV2 = ({
         );
         if (osuInstances.length < 1) {
             res.statusCode = 500;
-            return res.end('nothing');
+            return sendJson(res, { error: 'not_ready' });
         }
 
         const json = osuInstances[0].getStateV2(req.instanceManager);
@@ -55,7 +53,7 @@ export const ApiV2 = ({
         );
         if (osuInstances.length < 1) {
             res.statusCode = 500;
-            return res.end('nothing');
+            return sendJson(res, { error: 'not_ready' });
         }
 
         const { settings } = osuInstances[0].entities.getServices(['settings']);
@@ -90,12 +88,12 @@ export const ApiV2 = ({
             if (err) {
                 if (err.code === 'ENOENT') {
                     res.writeHead(404, { 'Content-Type': 'text/html' });
-                    res.end(`[${currentVersion}] 404 Not Found`);
+                    res.end(`404 Not Found`);
                     return;
                 }
 
                 res.writeHead(500);
-                res.end(`[${currentVersion}] Server Error: ${err.code}`);
+                res.end(`Server Error: ${err.code}`);
                 return;
             }
 

diff --git a/packages/tosu/src/api/types/v2.ts b/packages/tosu/src/api/types/v2.ts
@@ -313,7 +313,6 @@ export interface Hits3 {
     '300': number;
     geki: number;
     katu: number;
-    unstableRate: string;
 }
 
 export interface Mods3 {

diff --git a/packages/tosu/src/api/utils/accuracy.ts b/packages/tosu/src/api/utils/accuracy.ts
@@ -1,4 +1,4 @@
-export interface types {
+export interface IRankCalculate {
     (
         hits: {
             300: any;
@@ -12,7 +12,10 @@ export interface types {
     ): number;
 }
 
-const accuracyCalculator: types = (hits, mode = 'osu') => {
+/**
+ * Used to calculate accuracy out of hits (mainly for leaderboards)
+ */
+const accuracyCalculator: IRankCalculate = (hits, mode = 'osu') => {
     const h300 = parseInt(hits[300]);
     const h100 = parseInt(hits[100]);
     const h50 = parseInt(hits[50]);

diff --git a/packages/tosu/src/api/utils/buildResultV2.ts b/packages/tosu/src/api/utils/buildResultV2.ts
@@ -119,8 +119,6 @@ export const buildResult = (
             }
         },
         profile: {
-            // profile: {
-
             id: userProfile.id,
             name: userProfile.name,
             mode: {
@@ -334,8 +332,7 @@ export const buildResult = (
                 100: resultsScreenData.Hit100,
                 katu: resultsScreenData.HitKatu,
                 50: resultsScreenData.Hit50,
-                0: resultsScreenData.HitMiss,
-                unstableRate: '' // dont have
+                0: resultsScreenData.HitMiss
             },
             mods: {
                 number: resultsScreenData.Mods,