feat: bump version, fix that gameplayData can't be updated, add dumb …

…page for static, add configuration file creation
tosuapp · Apr 16, 2023 · 3734b39 · 3734b39
1 parent 6139d7f
commit 3734b39
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .env
+tsosu.env
 dist/
 node_modules
 yarn-error.log

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "author": "Mikhail Babynichev",
   "name": "osumemory-ts",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "dist/index.js",
   "bin": "dist/index.js",
   "license": "GPL-3.0",

diff --git a/src/Instances/Osu.ts b/src/Instances/Osu.ts
@@ -110,7 +110,7 @@ export class OsuInstance {
             }
 
             try {
-                for (const baseKey of Object.keys(SCAN_PATTERNS)) {
+                for (const baseKey in SCAN_PATTERNS) {
                     basesRepo.setBase(
                         baseKey as never,
                         this.process.scanSync(SCAN_PATTERNS[baseKey], true)
@@ -173,7 +173,7 @@ export class OsuInstance {
             ]);
 
             // osu! calculates audioTrack length a little bit after updating menuData, sooo.. lets this thing run regardless of menuData updating
-            menuData.updateMP3Length();
+            await menuData.updateMP3Length();
 
             if (!settings.gameFolder) {
                 settings.setGameFolder(path.join(this.path, '../'));
@@ -201,7 +201,7 @@ export class OsuInstance {
                     break;
                 case 2:
                     if (allTimesData.PlayTime < 150) {
-                        return;
+                        continue;
                     }
                     await gamePlayData.updateState();
                     if (retriesTemp > gamePlayData.Retries) {
@@ -216,7 +216,9 @@ export class OsuInstance {
                     await resultsScreenData.updateState();
                     break;
                 case 22:
-                    this.isTourneyManager = true;
+                    if (!this.isTourneyManager) {
+                        this.isTourneyManager = true;
+                    }
                     await tourneyManagerData.updateState();
                     break;
                 default:
@@ -243,7 +245,7 @@ export class OsuInstance {
             switch (allTimesData.Status) {
                 case 2:
                     if (allTimesData.PlayTime < 150) {
-                        return;
+                        continue;
                     }
 
                     await gamePlayData.updateKeyOverlay();

diff --git a/src/Utils/calculateGrade.ts b/src/Utils/calculateGrade.ts
@@ -36,7 +36,9 @@ export const calculateGrade = (
         }
 
         return 'D';
-    } else if (mode === 2) {
+    }
+
+    if (mode === 2) {
         if (acc == 100) {
             return SSGrade;
         }
@@ -54,7 +56,9 @@ export const calculateGrade = (
         }
 
         return 'D';
-    } else if (mode === 3) {
+    }
+
+    if (mode === 3) {
         if (acc == 100) {
             return SSGrade;
         }

diff --git a/src/config.ts b/src/config.ts
@@ -1,6 +1,22 @@
 import * as dotenv from 'dotenv';
+import fs from 'fs';
 
-dotenv.config();
+const curDir = fs.readdirSync('./');
+if (!curDir.includes('tsosu.env')) {
+    fs.writeFileSync(
+        './tsosu.env',
+        `DEBUG_LOG=false
+CALCULATE_PP=true
+ENABLE_KEY_OVERLAY=true
+WS_SEND_INTERVAL=150
+POLL_RATE=150
+KEYOVERLAY_POLL_RATE=150`
+    );
+}
+
+dotenv.config({
+    path: 'tsosu.env'
+});
 
 export const config = {
     debugLogging: (process.env.DEBUG_LOG || '') === 'true',

diff --git a/src/constants/overlaysStatic.ts b/src/constants/overlaysStatic.ts
@@ -0,0 +1,33 @@
+export const OVERLAYS_STATIC = `<html>
+<head>
+    <title>ts osu overlays list</title>
+</head>
+<body>
+    <ul id="overlays-list">
+
+    </ul>
+</body>
+<script lang="text/javascript" defer>
+    (async () => {
+        const overlaysList = document.getElementById("overlays-list")
+
+        try {
+            const res = await fetch("/api/getOverlays")
+            const overlayList = await res.json()
+            overlayList.innerHTML = ''
+            for (const overlay of overlayList) {
+                const newLi = document.createElement("li")
+                newLi.innerHTML = \`<a href="/\${overlay}/index.html">\${overlay}</a>\`
+
+                overlaysList.appendChild(newLi)
+            }
+            console.log(overlayList);
+        } catch (e) {
+            console.error(e)
+            overlaysList.innerHTML = \`
+                <li>failed to get overlays</li>
+            \`
+        }
+    })();
+</script>
+</html>`;
diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,5 @@
 import Router from '@koa/router';
+import fs from 'fs';
 import Koa from 'koa';
 import send from 'koa-send';
 import serve from 'koa-static';
@@ -8,6 +9,7 @@ import { InstancesManager } from './Instances/InstancesManager';
 import { OsuInstance } from './Instances/Osu';
 import { sleep } from './Utils/sleep';
 import { config } from './config';
+import { OVERLAYS_STATIC } from './constants/overlaysStatic';
 import { wLogger } from './logger';
 
 interface CustomContext extends Koa.Context {
@@ -50,8 +52,8 @@ interface CustomContext extends Koa.Context {
     router.get('/(.*)', async (ctx, next) => {
         const staticPath = ctx.request.path.replace(/^\/static/g, '');
         if (staticPath === '/') {
-            ctx.body =
-                'please enter correct static path, you can find needed folder in your static folder';
+            ctx.type = 'html';
+            ctx.body = OVERLAYS_STATIC;
             return;
         }
 
@@ -92,6 +94,11 @@ interface CustomContext extends Koa.Context {
         ).getState(ctx.instancesManager);
     });
 
+    router.get('/api/getOverlays', async (ctx) => {
+        ctx.body = await fs.promises.readdir('./static');
+        return;
+    });
+
     const wsRouter = new Router();
     wsRouter.use(async (ctx, next) => {
         ctx.instancesManager = instancesManager;