From 7e8b7a02d41dbd5fa6da5d0e8dcc3dea19036c06 Mon Sep 17 00:00:00 2001
From: Mia <49593536+mia-pi-git@users.noreply.github.com>
Date: Tue, 24 Dec 2024 02:01:51 -0600
Subject: [PATCH] Artemis: Stop throwing 429 errors

We already throttle requests when we get 429s. We don't need to log it constantly too.
---
 server/artemis/remote.ts | 8 ++++----
 server/room-battle.ts    | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/artemis/remote.ts b/server/artemis/remote.ts
index 23bbc73008e3..2e0246f2fe6e 100644
--- a/server/artemis/remote.ts
+++ b/server/artemis/remote.ts
@@ -57,7 +57,7 @@ let throttleTime: number | null = null;
 export const limiter = new Limiter(800);
 export const PM = new ProcessManager.QueryProcessManager<string, Record<string, number> | null>(module, async text => {
 	if (isCommon(text) || !limiter.shouldRequest()) return null;
-	if (throttleTime && (Date.now() - throttleTime < 10000)) {
+	if (throttleTime && ((Date.now() - throttleTime) < 10000)) {
 		return null;
 	}
 	if (throttleTime) throttleTime = null;
@@ -90,9 +90,9 @@ export const PM = new ProcessManager.QueryProcessManager<string, Record<string,
 		return result;
 	} catch (e: any) {
 		throttleTime = Date.now();
-		if (e.message.startsWith('Request timeout')) {
-			// just ignore this. error on their end not ours.
-			// todo maybe stop sending requests for a bit?
+		if (e.message.startsWith('Request timeout') || e.code === 429) {
+			// request timeout: just ignore this. error on their end not ours.
+			// 429: too many requests, we already freeze for 10s above so. not much more we can do
 			return null;
 		}
 		Monitor.crashlog(e, 'A Perspective API request', {request: JSON.stringify(requestData)});
diff --git a/server/room-battle.ts b/server/room-battle.ts
index 8cefa75275c7..c5c2b7e13021 100644
--- a/server/room-battle.ts
+++ b/server/room-battle.ts
@@ -442,6 +442,8 @@ export class RoomBattleTimer {
 		let didSomething = false;
 		for (const player of players) {
 			if (!player.id) continue; // already eliminated, relevant for FFA gamesif it
+			// https://play.pokemonshowdown.com/battle-gen9unratedrandombattle-2255606027-5a6bcd9zlb93e6id5pp7juvhcg5w41spw
+			// why is this line here?
 			if (player.turnSecondsLeft > 0) continue;
 			if (this.settings.timeoutAutoChoose && player.secondsLeft > 0 && player.knownActive) {
 				void this.battle.stream.write(`>${player.slot} default`);