feat(tourney): sort clients by ipc id

tosuapp · Feb 28, 2024 · 1d08d0d · 1d08d0d
1 parent d259f0d
commit 1d08d0d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/packages/tosu/src/api/utils/buildResult.ts b/packages/tosu/src/api/utils/buildResult.ts
@@ -280,8 +280,9 @@ const buildTourneyData = (
         instanceManager.osuInstances
     ).filter((instance) => instance.isTourneySpectator);
 
-    const mappedOsuTourneyClients = osuTourneyClients.map<TourneyIpcClient>(
-        (instance, iterator) => {
+    const mappedOsuTourneyClients = osuTourneyClients
+        .sort((a, b) => a.ipcId - b.ipcId)
+        .map<TourneyIpcClient>((instance, iterator) => {
             const { allTimesData, gamePlayData, tourneyUserProfileData } =
                 instance.entities.getServices([
                     'allTimesData',
@@ -343,8 +344,7 @@ const buildTourneyData = (
                     }
                 }
             };
-        }
-    );
+        });
 
     const { tourneyManagerData } = osuTourneyManager[0].entities.getServices([
         'tourneyManagerData'

diff --git a/packages/tosu/src/api/utils/buildResultV2.ts b/packages/tosu/src/api/utils/buildResultV2.ts
@@ -440,8 +440,9 @@ const buildTourneyData = (
         instanceManager.osuInstances
     ).filter((instance) => instance.isTourneySpectator);
 
-    const mappedOsuTourneyClients = osuTourneyClients.map(
-        (instance, iterator): TourneyClients => {
+    const mappedOsuTourneyClients = osuTourneyClients
+        .sort((a, b) => a.ipcId - b.ipcId)
+        .map((instance, iterator): TourneyClients => {
             const {
                 allTimesData,
                 gamePlayData,
@@ -524,8 +525,7 @@ const buildTourneyData = (
                     unstableRate: gamePlayData.UnstableRate
                 }
             };
-        }
-    );
+        });
 
     const { tourneyManagerData } = osuTourneyManager[0].entities.getServices([
         'tourneyManagerData'

diff --git a/packages/tosu/src/objects/instanceManager/instanceManager.ts b/packages/tosu/src/objects/instanceManager/instanceManager.ts
@@ -32,6 +32,9 @@ export class InstanceManager {
 
                 const osuInstance = new OsuInstance(process.pid);
                 if (process.cmd.includes('-spectateclient')) {
+                    const [_, ipcId] = process.cmd.split(' ');
+
+                    osuInstance.setTourneyIpcId(Number(ipcId));
                     osuInstance.setIsTourneySpectator(true);
                 }
 

diff --git a/packages/tosu/src/objects/instanceManager/osuInstance.ts b/packages/tosu/src/objects/instanceManager/osuInstance.ts
@@ -96,6 +96,8 @@ export class OsuInstance {
     isTourneyManager: boolean = false;
     isTourneySpectator: boolean = false;
 
+    ipcId: number = 0;
+
     emitter: EventEmitter;
 
     constructor(pid: number) {
@@ -133,6 +135,10 @@ export class OsuInstance {
         this.entities.set('userProfile', new UserProfile(this.entities));
     }
 
+    setTourneyIpcId(ipcId: number) {
+        this.ipcId = ipcId;
+    }
+
     setIsTourneySpectator(newVal: boolean) {
         this.isTourneySpectator = newVal;
     }