feat: Make enabling ingame overlay a little bit better

packages/common/utils/config.ts

@@ -62,6 +62,8 @@ export const config = {
     enableGosuOverlay: (process.env.ENABLE_GOSU_OVERLAY || '') === 'true'
 };
 
+let HTTPServer: any;
+
 export const updateConfigFile = () => {
     let newOptions = '';
 
@@ -115,15 +117,17 @@ export const updateConfigFile = () => {
 };
 
 export const watchConfigFile = ({ httpServer }: { httpServer: any }) => {
-    refreshConfig(httpServer, false);
+    HTTPServer = httpServer;
+
+    refreshConfig(false);
     updateConfigFile();
 
-    fs.watchFile(configPath, (current, previous) => {
-        refreshConfig(httpServer, true);
+    fs.watchFile(configPath, () => {
+        refreshConfig(true);
     });
 };
 
-export const refreshConfig = (httpServer: any, refresh: boolean) => {
+export const refreshConfig = (refresh: boolean) => {
     let updated = false;
     const status = refresh == true ? 'reload' : 'load';
 
@@ -159,7 +163,18 @@ export const refreshConfig = (httpServer: any, refresh: boolean) => {
         config.serverIP = serverIP;
         config.serverPort = serverPort;
 
-        httpServer.restart();
+        HTTPServer.restart();
+    }
+
+    const osuInstances: any = Object.values(
+        HTTPServer.instanceManager.osuInstances || {}
+    );
+    if (
+        osuInstances.length == 1 &&
+        enableGosuOverlay == true &&
+        updated == true
+    ) {
+        osuInstances[0].injectGameOverlay();
     }
 
     config.debugLogging = debugLogging;
@@ -181,7 +196,7 @@ export const refreshConfig = (httpServer: any, refresh: boolean) => {
     if (updated) wLogger.info(`Config ${status}ed`);
 };
 
-export const writeConfig = (httpServer: any, text: string) => {
+export const writeConfig = (text: string) => {
     fs.writeFileSync(configPath, text, 'utf8');
-    refreshConfig(httpServer, true);
+    refreshConfig(true);
 };

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,20 @@
-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
+enabled = true
 gameWidth = 1920
 gameHeight = 1080
-overlayURL = http://127.0.0.1:24050/InGame2/index.html
+overlayURL = 
 overlayWidth = 380
 overlayHeight = 110
 overlayOffsetX = 0
@@ -25,11 +24,28 @@ overlayScale = 10`
     }
 };
 
+const checkGosuConfig = (p: Process, checking?: boolean) => {
+    if (!existsSync(configPath)) return null;
+
+    const read = readFileSync(configPath, 'utf8');
+    const parseURL = /overlayURL[ ]*=[ ]*(.*)/.exec(read);
+    if (!parseURL || !parseURL?.[1]) {
+        setTimeout(() => {
+            checkGosuConfig(p, true);
+        }, 1000);
+        return 'empty';
+    }
+
+    if (checking == true) injectGameOverlay(p);
+    return 'specified';
+};
+
 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 +60,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 +70,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 == 'empty') {
+        wLogger.warn(
+            `[gosu-overlay] Specify overlayURL for gameOverlay in config.ini`
+        );
+        return;
     }
 
     return await new Promise((resolve, reject) => {

packages/server/router/index.ts

@@ -215,7 +215,7 @@ export default function buildBaseApi(app: HttpServer) {
             });
         }
 
-        writeConfig(app.Server, body);
+        writeConfig(body);
 
         sendJson(res, {
             status: 'updated'

packages/tosu/src/entities/AllTimesData/index.ts

@@ -389,9 +389,9 @@ export class AllTimesData extends AbstractEntity {
 
             if (this.configStateErrorAttempts > 5) {
                 wLogger.error(
-                "ATD(updateConfigState) Can't update config state",
+                    "ATD(updateConfigState) Can't update config state",
                     exc
-            );
+                );
             }
         }
     }
@@ -421,9 +421,9 @@ export class AllTimesData extends AbstractEntity {
 
             if (this.bindingStateErrorAttempts > 5) {
                 wLogger.error(
-                "ATD(updateBindingState) Can't update binding state",
+                    "ATD(updateBindingState) Can't update binding state",
                     exc
-            );
+                );
             }
         }
     }

packages/tosu/src/index.ts

@@ -10,6 +10,7 @@ import { InstanceManager } from './objects/instanceManager/instanceManager';
     const instanceManager = new InstanceManager();
     const httpServer = new Server({ instanceManager });
 
+    httpServer.start();
     watchConfigFile({ httpServer });
 
     const { update } = argumetsParser(process.argv);
@@ -23,5 +24,4 @@ import { InstanceManager } from './objects/instanceManager/instanceManager';
     wLogger.info('Searching for osu!');
 
     instanceManager.runWatcher();
-    httpServer.start();
 })();

packages/tosu/src/objects/instanceManager/osuInstance.ts

@@ -154,7 +154,7 @@ export class OsuInstance {
         this.isTourneySpectator = newVal;
     }
 
-    async start() {
+    start() {
         wLogger.info(
             `Running memory chimera... RESOLVING PATTERNS FOR ${this.pid}`
         );
@@ -205,7 +205,7 @@ export class OsuInstance {
          * ENABLING GOSU OVERLAY
          */
         if (config.enableGosuOverlay) {
-            await injectGameOverlay(this.process);
+            this.injectGameOverlay();
         }
 
         this.update();
@@ -216,6 +216,10 @@ export class OsuInstance {
         this.watchProcessHealth();
     }
 
+    async injectGameOverlay() {
+        await injectGameOverlay(this.process);
+    }
+
     async update() {
         wLogger.debug('OI(update) starting');
 
@@ -429,9 +433,9 @@ export class OsuInstance {
                 beatmapPpData.updateMapMetadata(currentMods);
             } catch (exc) {
                 wLogger.error(
-                        "OI(updateMapMetadata) Can't update beatmap metadata",
+                    "OI(updateMapMetadata) Can't update beatmap metadata",
                     exc
-                    );
+                );
             }
         }
 
@@ -452,8 +456,8 @@ export class OsuInstance {
         if (!Process.isProcessExist(this.process.handle)) {
             this.isDestroyed = true;
             wLogger.info(
-                    `OI(watchProcessHealth) osu!.exe at ${this.pid} got destroyed`
-                );
+                `OI(watchProcessHealth) osu!.exe at ${this.pid} got destroyed`
+            );
             this.emitter.emit('onDestroy', this.pid);
         }