From 93a0a0f61c1e7d797ee87d54a25e8dfba7e22be2 Mon Sep 17 00:00:00 2001
From: Mia <49593536+mia-pi-git@users.noreply.github.com>
Date: Sun, 4 Dec 2022 11:45:31 -0600
Subject: [PATCH] Rooms: Only lockdown after restarts when battles crash
 (#9110)

---
 lib/crashlogger.ts    |  6 ------
 server/room-battle.ts | 15 ++++++++++++++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/crashlogger.ts b/lib/crashlogger.ts
index da4f18fbfb..6699087c81 100644
--- a/lib/crashlogger.ts
+++ b/lib/crashlogger.ts
@@ -12,7 +12,6 @@ import * as fs from 'fs';
 import * as path from 'path';
 
 const CRASH_EMAIL_THROTTLE = 5 * 60 * 1000; // 5 minutes
-const LOCKDOWN_PERIOD = 30 * 60 * 1000; // 30 minutes
 
 const logPath = path.resolve(__dirname, '../logs/errors.txt');
 let lastCrashLog = 0;
@@ -85,10 +84,5 @@ export function crashlogger(
 		});
 	}
 
-	if (process.uptime() * 1000 < LOCKDOWN_PERIOD) {
-		// lock down the server
-		return 'lockdown';
-	}
-
 	return null;
 }
diff --git a/server/room-battle.ts b/server/room-battle.ts
index 72ba1b56b2..bb384cd6dc 100644
--- a/server/room-battle.ts
+++ b/server/room-battle.ts
@@ -50,6 +50,7 @@ const DISCONNECTION_BANK_TIME = 300;
 
 // time after a player disabling the timer before they can re-enable it
 const TIMER_COOLDOWN = 20 * SECONDS;
+const LOCKDOWN_PERIOD = 30 * 60 * 1000; // 30 minutes
 
 export class RoomBattlePlayer extends RoomGames.RoomGamePlayer<RoomBattle> {
 	readonly slot: SideID;
@@ -841,6 +842,16 @@ export class RoomBattle extends RoomGames.RoomGame<RoomBattlePlayer> {
 			break;
 		}
 
+		case 'error': {
+			if (process.uptime() * 1000 < LOCKDOWN_PERIOD) {
+				const error = new Error();
+				error.stack = lines.slice(1).join('\n');
+				// lock down the server
+				Rooms.global.startLockdown(error);
+			}
+			break;
+		}
+
 		case 'end':
 			this.logData = JSON.parse(lines[1]);
 			this.score = this.logData!.score;
@@ -1338,7 +1349,7 @@ export class RoomBattleStream extends BattleStream {
 		}
 		try {
 			this._writeLines(chunk);
-		} catch (err) {
+		} catch (err: any) {
 			const battle = this.battle;
 			Monitor.crashlog(err, 'A battle', {
 				chunk,
@@ -1354,6 +1365,8 @@ export class RoomBattleStream extends BattleStream {
 					}
 				}
 			}
+			// public crashlogs only have the stack anyways
+			this.push(`error\n${err.stack}`);
 		}
 		if (this.battle) this.battle.sendUpdates();
 		const deltaTime = Date.now() - startTime;