Remove some Async & While loops + editor pp

package.json

@@ -10,17 +10,15 @@
     "prettier:fix": "prettier --write \"**/*.{js,jsx,ts,tsx,css}\"",
     "prettier:ci": "prettier --check \"**/*.{js,jsx,ts,tsx,css}\""
   },
-  "dependencies": {
-    "@types/node": "^18.14.6",
-    "standard-version": "^9.5.0",
-    "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.3.3"
-  },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^4.1.1",
+    "@types/node": "^18.18.11",
     "husky": "^8.0.3",
     "lint-staged": "^13.2.0",
-    "prettier": "^2.8.5"
+    "prettier": "^2.8.5",
+    "standard-version": "^9.5.0",
+    "tsconfig-paths": "^4.2.0",
+    "typescript": "^5.3.3"
   },
   "lint-staged": {
     "**/*.{js,ts}": [

packages/common/utils/config.ts

@@ -118,7 +118,7 @@ export const watchConfigFile = ({ httpServer }: { httpServer: any }) => {
     refreshConfig(httpServer, false);
     updateConfigFile();
 
-    fs.watchFile(configPath, (current, previous) => {
+    fs.watchFile(configPath, () => {
         refreshConfig(httpServer, true);
     });
 };
@@ -162,6 +162,17 @@ export const refreshConfig = (httpServer: any, refresh: boolean) => {
         httpServer.restart();
     }
 
+    const osuInstances: any = Object.values(
+        httpServer.instanceManager.osuInstances || {}
+    );
+    if (
+        osuInstances.length == 1 &&
+        enableGosuOverlay == true &&
+        updated == true
+    ) {
+        osuInstances[0].injectGameOverlay();
+    }
+
     config.debugLogging = debugLogging;
     config.calculatePP = calculatePP;
     config.enableKeyOverlay = enableKeyOverlay;

packages/common/utils/downloader.ts

@@ -1,14 +1,26 @@
 import fs from 'fs';
 import https from 'https';
 
+import { colorText } from './logger';
+
 const progressBarWidth = 40;
 
-const updateProgressBar = (progress: number): void => {
+export const updateProgressBar = (
+    title: string,
+    progress: number,
+    message: string = ''
+): void => {
+    const colored_text = colorText('info');
+    if (message) message = ` - ${message}`;
+
     const filledWidth = Math.round(progressBarWidth * progress);
     const emptyWidth = progressBarWidth - filledWidth;
     const progressBar = '█'.repeat(filledWidth) + '░'.repeat(emptyWidth);
+
     process.stdout.write(
-        `Downloading: [${progressBar}] ${(progress * 100).toFixed(2)}%\r`
+        `${colored_text} ${title}: [${progressBar}] ${(progress * 100).toFixed(
+            2
+        )}%${message}\r`
     );
 
     if (progress === 1) {
@@ -66,7 +78,7 @@ export const downloadFile = (
                 response.on('data', (data) => {
                     downloadedSize += data.length;
                     const progress = downloadedSize / totalSize;
-                    updateProgressBar(progress);
+                    updateProgressBar('Downloading', progress);
                 });
 
                 response.pipe(file);

packages/common/utils/logger.ts

@@ -9,25 +9,31 @@ const colors = {
     grey: '\x1b[90m'
 };
 
-function colorText(status: string, ...anything: any) {
+export function colorText(status: string) {
     const colorCode = colors[status] || colors.reset;
     const timestamp = new Date().toISOString().split('T')[1].replace('Z', '');
 
     const time = `${colors.grey}${timestamp}${colors.reset}`;
-    console.log(
-        time,
-        `${colorCode} ${status.toUpperCase()} ${colors.reset}`,
-        ...anything
-    );
+    return `${time} ${colorCode} ${status.toUpperCase()} ${colors.reset}`;
 }
 
 export const wLogger = {
-    info: (...args: any) => colorText('info', ...args),
+    info: (...args: any) => {
+        const colored_text = colorText('info');
+        console.log(colored_text, ...args);
+    },
     debug: (...args: any) => {
         if (config.debugLogging != true) return;
 
-        colorText('debug', ...args);
+        const colored_text = colorText('debug');
+        console.log(colored_text, ...args);
+    },
+    error: (...args: any) => {
+        const colored_text = colorText('error');
+        console.log(colored_text, ...args);
     },
-    error: (...args: any) => colorText('error', ...args),
-    warn: (...args: any) => colorText('warn', ...args)
+    warn: (...args: any) => {
+        const colored_text = colorText('warn');
+        console.log(colored_text, ...args);
+    }
 };

packages/game-overlay/package.json

@@ -9,7 +9,6 @@
         "build": "tsc"
     },
     "dependencies": {
-        "decompress": "^4.2.1",
         "tsprocess": "workspace:*",
         "@tosu/common": "workspace:*"
     }

packages/game-overlay/src/index.ts

@@ -1,21 +1,19 @@
-import { downloadFile, wLogger } from '@tosu/common';
-import decompress from 'decompress';
+import { downloadFile, unzip, wLogger } from '@tosu/common';
 import { execFile } from 'node:child_process';
-import { existsSync, writeFileSync } from 'node:fs';
+import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { mkdir, rm } from 'node:fs/promises';
 import path from 'node:path';
 import { Process } from 'tsprocess/dist/process';
 
+const configPath = path.join(process.cwd(), 'config.ini');
 const checkGameOverlayConfig = () => {
-    const configPath = path.join(process.cwd(), 'config.ini');
     if (!existsSync(configPath)) {
         writeFileSync(
             configPath,
             `[GameOverlay]; https://github.com/l3lackShark/gosumemory/wiki/GameOverlay
-enabled = false
 gameWidth = 1920
 gameHeight = 1080
-overlayURL = http://127.0.0.1:24050/InGame2/index.html
+overlayURL = 
 overlayWidth = 380
 overlayHeight = 110
 overlayOffsetX = 0
@@ -25,11 +23,28 @@ overlayScale = 10`
     }
 };
 
+const checkGosuConfig = (p: Process, checking?: boolean) => {
+    if (!existsSync(configPath)) return null;
+
+    const read = readFileSync(configPath, 'utf8');
+    const parseURL = /^overlayURL[ ]*=[ ]*(.*)$/m.exec(read);
+    if (!parseURL || !parseURL?.[1]) {
+        setTimeout(() => {
+            checkGosuConfig(p, true);
+        }, 1000);
+        return false;
+    }
+
+    if (checking == true) injectGameOverlay(p);
+    return true;
+};
+
 export const injectGameOverlay = async (p: Process) => {
     if (process.platform !== 'win32') {
-        throw new Error(
-            'Gameoverlay can run only under windows, sorry linux/darwin user!'
+        wLogger.error(
+            `[gosu-overlay] Ingame overlay can run only under windows, sorry linux/darwin user!`
         );
+        return;
     }
 
     // Check for DEPRECATED GOSU CONFIG, due its needed to read [GameOverlay] section from original configuration
@@ -44,7 +59,8 @@ export const injectGameOverlay = async (p: Process) => {
             'https://dl.kotworks.cyou/gosu-gameoverlay.zip',
             archivePath
         );
-        await decompress(archivePath, gameOverlayPath);
+
+        await unzip(archivePath, gameOverlayPath);
         await rm(archivePath);
     }
 
@@ -53,8 +69,18 @@ export const injectGameOverlay = async (p: Process) => {
             path.join(process.cwd(), 'gameOverlay', 'gosumemoryoverlay.dll')
         )
     ) {
-        wLogger.info('Please delete gameOverlay folder, and restart program!');
-        process.exit(1);
+        wLogger.info(
+            '[gosu-overlay] Please delete gameOverlay folder, and restart program!'
+        );
+        return;
+    }
+
+    const overlayURLstatus = checkGosuConfig(p);
+    if (!overlayURLstatus) {
+        wLogger.warn(
+            `[gosu-overlay] Specify overlayURL for gameOverlay in config.ini`
+        );
+        return;
     }
 
     return await new Promise((resolve, reject) => {

packages/server/router/index.ts

@@ -149,7 +149,7 @@ export default function buildBaseApi(app: HttpServer) {
 
             exec(`start "" "${folderPath}"`, (err, stdout, stderr) => {
                 if (err) {
-                    wLogger.error('Error opening file explorer:', err);
+                    wLogger.error('Error opening file explorer:');
                     return sendJson(res, {
                         error: `Error opening file explorer: ${err.message}`
                     });
@@ -236,7 +236,6 @@ export default function buildBaseApi(app: HttpServer) {
     });
 
     app.route('/homepage.min.css', 'GET', (req, res) => {
-        // FIXME: REMOVE THAT SHIT
         fs.readFile(
             path.join(pkgAssetsPath, 'homepage.min.css'),
             'utf8',
@@ -304,8 +303,6 @@ export default function buildBaseApi(app: HttpServer) {
                 performance: calculator.performance(parseBeatmap)
             });
         } catch (error) {
-            wLogger.error(error);
-
             return sendJson(res, {
                 error: (error as any).message
             });

packages/server/utils/counters.ts

@@ -1,4 +1,4 @@
-import { config, recursiveFilesSearch } from '@tosu/common';
+import { config, recursiveFilesSearch, wLogger } from '@tosu/common';
 import fs from 'fs';
 import http from 'http';
 import path from 'path';
@@ -217,37 +217,43 @@ function rebuildJSON({
 }
 
 function getLocalCounters() {
-    const staticPath =
-        config.staticFolderPath || path.join(pkgRunningFolder, 'static');
-
-    const countersListTXT = recursiveFilesSearch({
-        dir: staticPath,
-        fileList: [],
-        filename: 'metadata.txt'
-    });
+    try {
+        const staticPath =
+            config.staticFolderPath || path.join(pkgRunningFolder, 'static');
+
+        const countersListTXT = recursiveFilesSearch({
+            dir: staticPath,
+            fileList: [],
+            filename: 'metadata.txt'
+        });
 
-    const countersListHTML = recursiveFilesSearch({
-        dir: staticPath,
-        fileList: [],
-        filename: 'index.html'
-    });
+        const countersListHTML = recursiveFilesSearch({
+            dir: staticPath,
+            fileList: [],
+            filename: 'index.html'
+        });
 
-    const arrayOfLocal = countersListHTML
-        .filter((r) => {
-            const folder = path.dirname(r);
-            return (
-                countersListTXT.find((s) => path.dirname(s) == folder) == null
-            );
-        })
-        .map((r) => ({
-            name: path.basename(path.dirname(r)),
-            author: 'local',
-            resolution: [-2, '400'],
-            authorlinks: []
-        }));
-
-    const array = countersListTXT.map((r) => parseTXT(r));
-    return array.concat(arrayOfLocal).filter((r) => r.name != '');
+        const arrayOfLocal = countersListHTML
+            .filter((r) => {
+                const folder = path.dirname(r);
+                return (
+                    countersListTXT.find((s) => path.dirname(s) == folder) ==
+                    null
+                );
+            })
+            .map((r) => ({
+                name: path.basename(path.dirname(r)),
+                author: 'local',
+                resolution: [-2, '400'],
+                authorlinks: []
+            }));
+
+        const array = countersListTXT.map((r) => parseTXT(r));
+        return array.concat(arrayOfLocal).filter((r) => r.name != '');
+    } catch (error) {
+        wLogger.error((error as any).message);
+        return [];
+    }
 }
 
 export function buildLocalCounters(res: http.ServerResponse, query?: string) {