Include ctx in writeJson.

Not used yet.
Gugatec · Jan 25, 2025 · e22f453 · e22f453
1 parent 12f85f2
commit e22f453
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 19 deletions.
diff --git a/src/server/routes/ApiCloneableGame.ts b/src/server/routes/ApiCloneableGame.ts
@@ -24,7 +24,7 @@ export class ApiCloneableGame extends Handler {
     }
     await Database.getInstance().getPlayerCount(gameId)
       .then((playerCount) => {
-        responses.writeJson(res, {gameId, playerCount});
+        responses.writeJson(res, ctx, {gameId, playerCount});
       })
       .catch((err) => {
         console.warn('Could not load cloneable game: ', err);

diff --git a/src/server/routes/ApiGame.ts b/src/server/routes/ApiGame.ts
@@ -29,6 +29,6 @@ export class ApiGame extends Handler {
       return;
     }
     const model = Server.getSimpleGameModel(game);
-    responses.writeJson(res, model);
+    responses.writeJson(res, ctx, model);
   }
 }
diff --git a/src/server/routes/ApiGameHistory.ts b/src/server/routes/ApiGameHistory.ts
@@ -25,7 +25,7 @@ export class ApiGameHistory extends Handler {
     }
     try {
       const saveIds = await Database.getInstance().getSaveIds(gameId);
-      responses.writeJson(res, [...saveIds].sort());
+      responses.writeJson(res, ctx, [...saveIds].sort());
     } catch (err) {
       console.error(err);
       responses.badRequest(req, res, 'could not load admin stats');

diff --git a/src/server/routes/ApiGameLogs.ts b/src/server/routes/ApiGameLogs.ts
@@ -42,7 +42,7 @@ export class ApiGameLogs extends Handler {
     } else {
       const generation = searchParams.get('generation');
       const logs = this.gameLogs.getLogsForGameView(id, game, generation);
-      responses.writeJson(res, logs);
+      responses.writeJson(res, ctx, logs);
     }
   }
 }

diff --git a/src/server/routes/ApiGames.ts b/src/server/routes/ApiGames.ts
@@ -16,6 +16,6 @@ export class ApiGames extends Handler {
       responses.notFound(req, res, 'could not load game list');
       return;
     }
-    responses.writeJson(res, list);
+    responses.writeJson(res, ctx, list);
   }
 }
diff --git a/src/server/routes/ApiIPs.ts b/src/server/routes/ApiIPs.ts
@@ -11,7 +11,7 @@ export class ApiIPs extends Handler {
   }
 
   public override get(_req: Request, res: Response, ctx: Context): Promise<void> {
-    responses.writeJson(res, ctx.ipTracker.toJSON(), 2);
+    responses.writeJson(res, ctx, ctx.ipTracker.toJSON(), 2);
     return Promise.resolve();
   }
 }
diff --git a/src/server/routes/ApiPlayer.ts b/src/server/routes/ApiPlayer.ts
@@ -31,7 +31,7 @@ export class ApiPlayer extends Handler {
     try {
       ctx.ipTracker.addParticipant(playerId, ctx.ip);
       const player = game.getPlayerById(playerId);
-      responses.writeJson(res, Server.getPlayerModel(player));
+      responses.writeJson(res, ctx, Server.getPlayerModel(player));
     } catch (err) {
       console.warn(`unable to find player ${playerId}`, err);
       responses.notFound(req, res);

diff --git a/src/server/routes/ApiSpectator.ts b/src/server/routes/ApiSpectator.ts
@@ -28,6 +28,6 @@ export class ApiSpectator extends Handler {
       responses.notFound(req, res);
       return;
     }
-    responses.writeJson(res, Server.getSpectatorModel(game));
+    responses.writeJson(res, ctx, Server.getSpectatorModel(game));
   }
 }
diff --git a/src/server/routes/ApiStats.ts b/src/server/routes/ApiStats.ts
@@ -11,10 +11,10 @@ export class ApiStats extends Handler {
     super({validateStatsId: true});
   }
 
-  public override async get(req: Request, res: Response, _ctx: Context): Promise<void> {
+  public override async get(req: Request, res: Response, ctx: Context): Promise<void> {
     try {
       const stats = await Database.getInstance().stats();
-      responses.writeJson(res, stats, 2);
+      responses.writeJson(res, ctx, stats, 2);
     } catch (err) {
       console.error(err);
       responses.badRequest(req, res, 'could not load admin stats');

diff --git a/src/server/routes/ApiWaitingFor.ts b/src/server/routes/ApiWaitingFor.ts
@@ -58,9 +58,9 @@ export class ApiWaitingFor extends Handler {
     try {
       if (isPlayerId(id)) {
         ctx.ipTracker.addParticipant(id, ctx.ip);
-        responses.writeJson(res, this.getPlayerWaitingForModel(game.getPlayerById(id), game, gameAge, undoCount));
+        responses.writeJson(res, ctx, this.getPlayerWaitingForModel(game.getPlayerById(id), game, gameAge, undoCount));
       } else if (isSpectatorId(id)) {
-        responses.writeJson(res, this.getSpectatorWaitingForModel(game, gameAge, undoCount));
+        responses.writeJson(res, ctx, this.getSpectatorWaitingForModel(game, gameAge, undoCount));
       } else {
         responses.internalServerError(req, res, 'id not found');
       }

diff --git a/src/server/routes/Game.ts b/src/server/routes/Game.ts
@@ -185,7 +185,7 @@ export class GameHandler extends Handler {
             game = Game.newInstance(gameId, players, players[firstPlayerIdx], gameOptions, seed, spectatorId);
           }
           GameLoader.getInstance().add(game);
-          responses.writeJson(res, Server.getSimpleGameModel(game));
+          responses.writeJson(res, ctx, Server.getSimpleGameModel(game));
         } catch (error) {
           responses.internalServerError(req, res, error);
         }

diff --git a/src/server/routes/LoadGame.ts b/src/server/routes/LoadGame.ts
@@ -26,7 +26,7 @@ export class LoadGame extends Handler {
     return undefined;
   }
 
-  public override put(req: Request, res: Response, _ctx: Context): Promise<void> {
+  public override put(req: Request, res: Response, ctx: Context): Promise<void> {
     return new Promise((resolve) => {
       let body = '';
       req.on('data', function(data) {
@@ -51,7 +51,7 @@ export class LoadGame extends Handler {
             console.warn(`unable to find ${gameId} in database`);
             responses.notFound(req, res, 'game_id not found');
           } else {
-            responses.writeJson(res, Server.getSimpleGameModel(game));
+            responses.writeJson(res, ctx, Server.getSimpleGameModel(game));
           }
         } catch (error) {
           responses.internalServerError(req, res, error);

diff --git a/src/server/routes/PlayerInput.ts b/src/server/routes/PlayerInput.ts
@@ -77,7 +77,7 @@ export class PlayerInput extends Handler {
     } catch (err) {
       console.error(err);
     }
-    responses.writeJson(res, Server.getPlayerModel(player));
+    responses.writeJson(res, ctx, Server.getPlayerModel(player));
   }
 
   private processInput(req: Request, res: Response, ctx: Context, player: IPlayer): Promise<void> {
@@ -96,7 +96,7 @@ export class PlayerInput extends Handler {
             await this.performUndo(req, res, ctx, player);
           } else {
             player.process(entity);
-            responses.writeJson(res, Server.getPlayerModel(player));
+            responses.writeJson(res, ctx, Server.getPlayerModel(player));
           }
           resolve();
         } catch (e) {

diff --git a/src/server/routes/Reset.ts b/src/server/routes/Reset.ts
@@ -67,7 +67,7 @@ export class Reset extends Handler {
       if (game !== undefined) {
         const reloadedPlayer = game.getPlayerById(player.id);
         game.inputsThisRound = 0;
-        responses.writeJson(res, Server.getPlayerModel(reloadedPlayer));
+        responses.writeJson(res, ctx, Server.getPlayerModel(reloadedPlayer));
         return;
       }
     } catch (err) {

diff --git a/src/server/server/responses.ts b/src/server/server/responses.ts
@@ -67,7 +67,7 @@ export function downgradeRedirect(_req: Request, res: Response, ctx: Context): v
   res.end();
 }
 
-export function writeJson(res: Response, json: any, space?: string | number | undefined) {
+export function writeJson(res: Response, _ctx: Context, json: any, space?: string | number | undefined) {
   res.setHeader('Content-Type', 'application/json');
   const s = JSON.stringify(json, undefined, space);
   res.end(s);