Added early GAC stuff that isn't fully tested because CORS

Author: Lego-Fan9

site/account-viewer/index.html

@@ -79,6 +79,13 @@ <h3>Profile Stats</h3>
 				<ul id="profileStatList"></ul>
 			</div>
 		</section>
+
+		<section class="gac-info hidden">
+			<div class="card">
+				<h3>GAC Stats (ALPHA)</h3>
+				<ul id="gacInfo"></ul>
+			</div>
+		</section>
 	</main>
 
 	<script type="module" src="/src/account-viewer/main.ts"></script>

site/src/account-viewer/grand-arena/getRecentRounds.ts

@@ -0,0 +1,25 @@
+export interface EventInstance {
+  eventInstanceId: string;
+  startTime: number;
+  endTime: number;
+  season: number;
+  instanceId: string;
+  mode: "3v3" | "5v5";
+}
+
+export async function getInstanceIds(roundType: "5v5" | "3v3"): Promise<EventInstance | null> {
+    try {
+        const resp = await fetch(`https://gahistory.c3po.wtf/${roundType}/info.json`);
+
+        if (!resp.ok) {
+            console.error("HTTP error", resp.status, resp.statusText);
+            return null;
+        }
+
+        const data: EventInstance = await resp.json();
+        return data;
+    } catch (err) {
+        console.error("Fetch failed:", err);
+        return null;
+    }
+}

site/src/account-viewer/grand-arena/main.ts

@@ -0,0 +1,76 @@
+import { getRound } from "./request.ts"
+import type { GACResp } from "./request.ts"
+import { getPlayerPlayerId } from "../requestMaker.ts"
+import type { PlayerResp } from "../requestMaker.ts"
+import { galacticPowerMappings } from "../listBuilderMappings.ts"
+
+export let round5v5: GACResp | null = null;
+export let round3v3: GACResp | null = null;
+
+async function getData(playerId: string): Promise<void> {
+    if (!round5v5 || round5v5.playerId !== playerId) {
+        const tempRound5v5 = await getRound(playerId, "5v5");
+        if (!tempRound5v5) {
+            return;
+        }
+        round5v5 = tempRound5v5;
+    }
+
+    if (!round3v3 || round3v3.playerId !== playerId) {
+        const tempRound3v3 = await getRound(playerId, "3v3");
+        if (!tempRound3v3) {
+            return;
+        }
+        round3v3 = tempRound3v3;
+    }
+}
+
+export async function getWins(playerId: string, gp: number): Promise<number | null> {
+    await getData(playerId);
+
+    if ((!round5v5 || !round3v3) || (round5v5.playerId !== playerId || round3v3.playerId !== playerId)) {
+        console.error("Could not find round 5v5 or round 3v3, exiting")
+        return null;
+    }
+
+    let winCounter = 0;
+
+    for (const round of round5v5.matchResult) {
+        const homeScore = round.home.score;
+        const awayScore = round.away.score;
+
+        if (homeScore > awayScore) {
+            winCounter++;
+            continue;
+        }
+        if (homeScore === awayScore) {
+            let won = await getTieWinner(round.away.playerId, gp);
+            if (won) {
+                winCounter++;
+                continue;
+            }
+        }
+    }
+
+    return winCounter;
+}
+
+async function getTieWinner(awayPlayerId: string, homeGP: number): Promise<boolean> {
+    const awayProfile: PlayerResp = await getPlayerPlayerId(awayPlayerId);
+    let awayGP = 0;
+    galacticPowerMappings.forEach(stat => {
+        const playerStat = awayProfile.profileStat.find(ps => ps.index === stat.index)
+        if (playerStat) {
+            awayGP = Number(playerStat.value);
+        }
+    });
+    if (awayGP === 0) {
+        console.error("Found a player with 0 GP...");
+        return true;
+    }
+
+    if (homeGP > awayGP) {
+        return true
+    }
+    return false
+}

site/src/account-viewer/grand-arena/request.ts

@@ -0,0 +1,89 @@
+export interface GACResp {
+  matchResult: MatchResult[];
+  territoryMapId: string;
+  eventInstanceId: string;
+  league: string;
+  startTime: number;
+  endTime: number;
+  date: string;
+  mode: string;
+  season: number;
+  playerId: string;
+}
+
+export interface MatchResult {
+  attackResult: AttackResult[];
+  matchId: number;
+  home: PlayerSummary;
+  away: PlayerSummary;
+  matchState: number;
+}
+
+export interface PlayerSummary {
+  playerName: string;
+  playerId: string;
+  score: string;
+}
+
+export interface AttackResult {
+  duelResult: DuelResult[];
+  zoneId: string;
+}
+
+export interface DuelResult {
+  defenderUnit: Unit[];
+  attackerUnit: Unit[];
+  startTime: string;
+  endTime: string;
+  battleOutcome: number;
+  defenderDatacron: Datacron;
+  attackerDatacron: Datacron;
+}
+
+export interface Unit {
+  definitionId: string;
+  healthPercent: number;
+  shieldPercent: number;
+  squadUnitType: number;
+  relicTier: number;
+  tier: number;
+  rarity: number;
+  level: number;
+}
+
+export interface Datacron {
+  tag: string[];
+  affix: Affix[];
+  id: string;
+  setId: number;
+  templateId: string;
+  highestTierApplied: number;
+}
+
+export interface Affix {
+  tag: string[];
+  targetRule: string;
+  abilityId: string;
+  statType: number;
+  statValue: string;
+  requiredUnitTier: number;
+  requiredRelicTier: number;
+  scopeIcon: string;
+}
+
+export async function getRound(playerId: string, roundType: "5v5" | "3v3"): Promise<GACResp | null> {
+    try {
+        const resp = await fetch(`https://gahistory.c3po.wtf/${roundType}/${playerId}.json`);
+
+        if (!resp.ok) {
+            console.error("HTTP error", resp.status, resp.statusText);
+            return null;
+        }
+
+        const data: GACResp = await resp.json();
+        return data;
+    } catch (err) {
+        console.error("Fetch failed:", err);
+        return null;
+    }
+}

site/src/account-viewer/listBuilder.ts

@@ -3,6 +3,8 @@ import type { PlayerResp, UnitsResp } from "./requestMaker.ts";
 import { profileStatMappings, playerMappings, galacticPowerMappings, speedModMappings, pipMappings, relicMappings, gearMappings, rarityMappings } from "./listBuilderMappings.ts";
 import { getSpeedModCount, getPipCount, countOffensePercentRolls } from "./mods.ts";
 import { ULLocation, relicChart, gearChart, starChart, activeChart } from "./locations.ts"
+import { getWins } from "./grand-arena/main.ts"
+import { getInstanceIds } from "./grand-arena/getRecentRounds.ts"
 
 function handleLastSeen(player: PlayerResp): void {
     let lastSeen = new Date(Number(player.lastActivityTime)).toLocaleString();
@@ -136,6 +138,35 @@ function checkIfShip(units: UnitsResp[], defId: string): boolean {
     return false;
 }
 
+async function handleGACWins(player: PlayerResp): Promise<void> {
+    let gp = 0;
+    galacticPowerMappings.forEach(stat => {
+        const playerStat = player.profileStat.find(ps => ps.index === stat.index)
+        if (playerStat) {
+            gp = Number(playerStat.value);
+        }
+    });
+    if (gp === 0) {
+        console.error("Found a player with 0 GP...");
+        return;
+    }
+
+    const wins = await getWins(player.playerId, gp);
+    const recent3v3 = await getInstanceIds("3v3");
+    const recent5v5 = await getInstanceIds("5v5");
+    if (!wins || !recent3v3 || !recent5v5) {
+        console.error("Missing wins, recent3v3, or recent5v5 in handleGACWins()");
+        return;
+    }
+
+    let seasons: number[] = [];
+    seasons.push(recent3v3.season);
+    seasons.push(recent5v5.season);
+    seasons.sort((a, b) => a - b);
+
+    ULLocation("gacInfo", `Wins in seasons ${seasons[0]} and ${seasons[1]}: ${wins}`);
+}
+
 export async function FillList(allyCode: string) {
     const units = await getUnits();
     if (!units) {
@@ -190,6 +221,9 @@ export async function FillList(allyCode: string) {
             case 10:
                 handleLastSeen(player);
                 break;
+            case 11:
+                await handleGACWins(player);
+                break;
             default:
                 console.error(`Found unknown playerMappings key: ${key}`)
         }

site/src/account-viewer/listBuilderMappings.ts

@@ -230,5 +230,9 @@ export const playerMappings: Record<string, { displayType: number; displayName:
     "lastActive": {
         "displayType": 10,
         "displayName": "",
+    },
+    "GACWins": {
+        "displayType": 11,
+        "displayName": "",
     }
 };

site/src/account-viewer/main.ts

@@ -13,7 +13,7 @@ const loadingScreen = document.getElementById("loadingScreen") as HTMLElement;
 const backBtn = document.getElementById("backToInput") as HTMLButtonElement;
 
 const dashboardSections = document.querySelectorAll<HTMLElement>(
-    ".player-info, .stats-grid, .charts-grid, .stats-grid-2, .back"
+    ".player-info, .stats-grid, .charts-grid, .stats-grid-2, .back" //, .gac-info
 );
 
 submitBtn.addEventListener("click", async () => {

site/src/account-viewer/requestMaker.ts

@@ -167,6 +167,29 @@ export async function getPlayer(allyCode: string): Promise<any> {
 	}
 }
 
+export async function getPlayerPlayerId(playerId: string): Promise<any> {
+	const header = await makeAuthHeader("It96XCNbCtVhN7Hg+a2cPSJJ7WF7jG6YuBybI1lLS4XykNQwcWm+0fkk2ciKaeLy", "LegoFan9", "GET", "/player");
+	//console.log("Authorization:", header);
+
+	try {
+		const resp = await fetch(`${SERVER_URL}/player?playerId=${playerId}`, {
+			headers: { Authorization: header }
+		});
+
+		if (!resp.ok) {
+			console.error("HTTP error", resp.status, resp.statusText);
+			return null;
+		}
+
+		const data = await resp.json();
+		//console.log(`Response:\n${JSON.stringify(data, null, 2)}`);
+		return data;
+	} catch (err) {
+		console.error("Fetch failed:", err);
+		return null;
+	}
+}
+
 export function cleanAllyCode(input: string): string | null {
 	const digitsOnly = input.replace(/\D/g, "");