chore: use window size & refresh counter list

tosuapp · Oct 26, 2024 · 7c6d9cf · 7c6d9cf
1 parent be7dabc
commit 7c6d9cf
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 31 deletions.
diff --git a/packages/server/assets/ingame.css b/packages/server/assets/ingame.css
@@ -88,14 +88,13 @@ body.-editing {
     background-size: cover;
     pointer-events: none;
     opacity: 0;
-    translate: -5px -5px;
     z-index: 10000;
     transition: opacity 0.5s ease;
 }
 
 main.main {
-    width: var(--w);
-    height: var(--h);
+    width: 100vw;
+    height: 100vh;
     z-index: 1;
 
     &::before {
@@ -118,8 +117,8 @@ main.main {
     color: #46515e;
     top: 0;
     left: 0;
-    width: var(--w);
-    height: var(--h);
+    width: 100vw;
+    height: 100vh;
     padding: 3em;
     opacity: 0;
     background: hsl(from #2a323b h s l / 75%);

diff --git a/packages/server/assets/ingame.js b/packages/server/assets/ingame.js
@@ -534,8 +534,8 @@ const app = createApp({
 
 
     window.addEventListener('resize', (event) => {
-      max_width.value = max_width.value;
-      max_height.value = max_height.value;
+      max_width.value = window.innerWidth;
+      max_height.value = window.innerHeight;
     });
 
 
@@ -704,6 +704,7 @@ const app = createApp({
     };
 
     socket.sendCommand('getSettings', encodeURI('__ingame__'));
+    socket.sendCommand('getCounters', encodeURI('__ingame__'));
     socket.commands((data) => {
       try {
 
@@ -713,36 +714,15 @@ const app = createApp({
             overlays.value = message.overlays;
           };
         };
-      } catch (error) {
-        console.log(error);
-      };
-    });
-
 
-    socket.api_v2((data) => {
-      try {
-        if (data.settings.resolution.fullscreen) {
-          if (max_width.value != data.settings.resolution.widthFullscreen)
-            max_width.value = data.settings.resolution.widthFullscreen;
-          if (max_height.value != data.settings.resolution.heightFullscreen)
-            max_height.value = data.settings.resolution.heightFullscreen;
 
-          return;
+        if (command == 'getCounters' && Array.isArray(message)) {
+          available_overlays.value = message;
         }
-
-        if (max_width.value != data.settings.resolution.width)
-          max_width.value = data.settings.resolution.width;
-        if (max_height.value != data.settings.resolution.height)
-          max_height.value = data.settings.resolution.height;
       } catch (error) {
         console.log(error);
       };
-    }, [
-      {
-        field: 'settings',
-        keys: ['resolution']
-      }
-    ]);
+    });
 
 
     return {

diff --git a/packages/server/router/index.ts b/packages/server/router/index.ts
@@ -104,6 +104,11 @@ export default function buildBaseApi(server: Server) {
                             );
                             fs.unlinkSync(tempPath);
 
+                            server.WS_COMMANDS.socket.emit(
+                                'message',
+                                `getCounters:__ingame__`
+                            );
+
                             sendJson(res, {
                                 status: 'Finished',
                                 path: result
@@ -219,6 +224,12 @@ export default function buildBaseApi(server: Server) {
                 );
 
                 fs.rmSync(folderPath, { recursive: true, force: true });
+
+                server.WS_COMMANDS.socket.emit(
+                    'message',
+                    `getCounters:__ingame__`
+                );
+
                 return sendJson(res, {
                     status: 'deleted'
                 });

diff --git a/packages/server/utils/commands.ts b/packages/server/utils/commands.ts
@@ -1,5 +1,6 @@
 import { JsonSafeParse, wLogger } from '@tosu/common';
 
+import { getLocalCounters } from './counters';
 import { parseCounterSettings } from './parseSettings';
 import { ModifiedWebsocket } from './socket';
 
@@ -18,6 +19,21 @@ export function handleSocketCommands(data: string, socket: ModifiedWebsocket) {
     const requestedFrom = decodeURI(socket.query?.l || '');
     const requestedName = decodeURI(payload || '');
     switch (command) {
+        case 'getCounters': {
+            if (
+                requestedFrom !== '__ingame__' ||
+                requestedName !== requestedFrom
+            ) {
+                message = {
+                    error: 'Wrong overlay'
+                };
+                break;
+            }
+
+            message = getLocalCounters();
+            break;
+        }
+
         case 'getSettings': {
             if (requestedName !== requestedFrom) {
                 message = {