mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-22 13:59:48 +00:00
32fd6a83d0
## Description: Main.ts wasn't handling the join properly. ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced ## Please put your Discord username so you can be contacted if a bug or regression is found: evan
654 lines
20 KiB
TypeScript
654 lines
20 KiB
TypeScript
import version from "../../resources/version.txt";
|
|
import { UserMeResponse } from "../core/ApiSchemas";
|
|
import { EventBus } from "../core/EventBus";
|
|
import { GameRecord, GameStartInfo, ID } from "../core/Schemas";
|
|
import { ServerConfig } from "../core/configuration/Config";
|
|
import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
|
|
import { GameType } from "../core/game/Game";
|
|
import { UserSettings } from "../core/game/UserSettings";
|
|
import "./AccountModal";
|
|
import { joinLobby } from "./ClientGameRunner";
|
|
import "./DarkModeButton";
|
|
import { DarkModeButton } from "./DarkModeButton";
|
|
import "./FlagInput";
|
|
import { FlagInput } from "./FlagInput";
|
|
import { FlagInputModal } from "./FlagInputModal";
|
|
import { GameStartingModal } from "./GameStartingModal";
|
|
import "./GoogleAdElement";
|
|
import { HelpModal } from "./HelpModal";
|
|
import { HostLobbyModal as HostPrivateLobbyModal } from "./HostLobbyModal";
|
|
import { JoinPrivateLobbyModal } from "./JoinPrivateLobbyModal";
|
|
import "./LangSelector";
|
|
import { LangSelector } from "./LangSelector";
|
|
import { LanguageModal } from "./LanguageModal";
|
|
import { NewsModal } from "./NewsModal";
|
|
import "./PublicLobby";
|
|
import { PublicLobby } from "./PublicLobby";
|
|
import { SinglePlayerModal } from "./SinglePlayerModal";
|
|
import { TerritoryPatternsModal } from "./TerritoryPatternsModal";
|
|
import { TokenLoginModal } from "./TokenLoginModal";
|
|
import { SendKickPlayerIntentEvent } from "./Transport";
|
|
import { UserSettingModal } from "./UserSettingModal";
|
|
import "./UsernameInput";
|
|
import { UsernameInput } from "./UsernameInput";
|
|
import {
|
|
generateCryptoRandomUUID,
|
|
incrementGamesPlayed,
|
|
translateText,
|
|
} from "./Utils";
|
|
import "./components/NewsButton";
|
|
import { NewsButton } from "./components/NewsButton";
|
|
import "./components/baseComponents/Button";
|
|
import "./components/baseComponents/Modal";
|
|
import { discordLogin, getUserMe, isLoggedIn } from "./jwt";
|
|
import "./styles.css";
|
|
|
|
declare global {
|
|
interface Window {
|
|
PageOS: {
|
|
session: {
|
|
newPageView: () => void;
|
|
};
|
|
};
|
|
ramp: {
|
|
que: Array<() => void>;
|
|
passiveMode: boolean;
|
|
spaAddAds: (ads: Array<{ type: string; selectorId: string }>) => void;
|
|
destroyUnits: (adType: string) => void;
|
|
settings?: {
|
|
slots?: any;
|
|
};
|
|
spaNewPage: (url: string) => void;
|
|
};
|
|
}
|
|
|
|
// Extend the global interfaces to include your custom events
|
|
interface DocumentEventMap {
|
|
"join-lobby": CustomEvent<JoinLobbyEvent>;
|
|
"kick-player": CustomEvent;
|
|
}
|
|
}
|
|
|
|
export interface JoinLobbyEvent {
|
|
clientID: string;
|
|
// Multiplayer games only have gameID, gameConfig is not known until game starts.
|
|
gameID: string;
|
|
// GameConfig only exists when playing a singleplayer game.
|
|
gameStartInfo?: GameStartInfo;
|
|
// GameRecord exists when replaying an archived game.
|
|
gameRecord?: GameRecord;
|
|
}
|
|
|
|
class Client {
|
|
private gameStop: (() => void) | null = null;
|
|
private eventBus: EventBus = new EventBus();
|
|
|
|
private usernameInput: UsernameInput | null = null;
|
|
private flagInput: FlagInput | null = null;
|
|
private darkModeButton: DarkModeButton | null = null;
|
|
|
|
private joinModal: JoinPrivateLobbyModal;
|
|
private publicLobby: PublicLobby;
|
|
private userSettings: UserSettings = new UserSettings();
|
|
private patternsModal: TerritoryPatternsModal;
|
|
private tokenLoginModal: TokenLoginModal;
|
|
|
|
constructor() {}
|
|
|
|
initialize(): void {
|
|
const gameVersion = document.getElementById(
|
|
"game-version",
|
|
) as HTMLDivElement;
|
|
if (!gameVersion) {
|
|
console.warn("Game version element not found");
|
|
}
|
|
gameVersion.innerText = version;
|
|
|
|
const newsModal = document.querySelector("news-modal") as NewsModal;
|
|
if (!newsModal) {
|
|
console.warn("News modal element not found");
|
|
}
|
|
newsModal instanceof NewsModal;
|
|
const newsButton = document.querySelector("news-button") as NewsButton;
|
|
if (!newsButton) {
|
|
console.warn("News button element not found");
|
|
} else {
|
|
console.log("News button element found");
|
|
}
|
|
|
|
// Comment out to show news button.
|
|
// newsButton.hidden = true;
|
|
|
|
const langSelector = document.querySelector(
|
|
"lang-selector",
|
|
) as LangSelector;
|
|
const languageModal = document.querySelector(
|
|
"language-modal",
|
|
) as LanguageModal;
|
|
if (!langSelector) {
|
|
console.warn("Lang selector element not found");
|
|
}
|
|
if (!languageModal) {
|
|
console.warn("Language modal element not found");
|
|
}
|
|
|
|
this.flagInput = document.querySelector("flag-input") as FlagInput;
|
|
if (!this.flagInput) {
|
|
console.warn("Flag input element not found");
|
|
}
|
|
|
|
this.darkModeButton = document.querySelector(
|
|
"dark-mode-button",
|
|
) as DarkModeButton;
|
|
if (!this.darkModeButton) {
|
|
console.warn("Dark mode button element not found");
|
|
}
|
|
|
|
this.usernameInput = document.querySelector(
|
|
"username-input",
|
|
) as UsernameInput;
|
|
if (!this.usernameInput) {
|
|
console.warn("Username input element not found");
|
|
}
|
|
|
|
this.publicLobby = document.querySelector("public-lobby") as PublicLobby;
|
|
|
|
window.addEventListener("beforeunload", () => {
|
|
console.log("Browser is closing");
|
|
if (this.gameStop !== null) {
|
|
this.gameStop();
|
|
}
|
|
});
|
|
|
|
document.addEventListener("join-lobby", this.handleJoinLobby.bind(this));
|
|
document.addEventListener("leave-lobby", this.handleLeaveLobby.bind(this));
|
|
document.addEventListener("kick-player", this.handleKickPlayer.bind(this));
|
|
|
|
const spModal = document.querySelector(
|
|
"single-player-modal",
|
|
) as SinglePlayerModal;
|
|
spModal instanceof SinglePlayerModal;
|
|
|
|
const singlePlayer = document.getElementById("single-player");
|
|
if (singlePlayer === null) throw new Error("Missing single-player");
|
|
singlePlayer.addEventListener("click", () => {
|
|
if (this.usernameInput?.isValid()) {
|
|
spModal.open();
|
|
}
|
|
});
|
|
|
|
// const ctModal = document.querySelector("chat-modal") as ChatModal;
|
|
// ctModal instanceof ChatModal;
|
|
// document.getElementById("chat-button").addEventListener("click", () => {
|
|
// ctModal.open();
|
|
// });
|
|
|
|
const hlpModal = document.querySelector("help-modal") as HelpModal;
|
|
hlpModal instanceof HelpModal;
|
|
const helpButton = document.getElementById("help-button");
|
|
if (helpButton === null) throw new Error("Missing help-button");
|
|
helpButton.addEventListener("click", () => {
|
|
hlpModal.open();
|
|
});
|
|
|
|
const flagInputModal = document.querySelector(
|
|
"flag-input-modal",
|
|
) as FlagInputModal;
|
|
flagInputModal instanceof FlagInputModal;
|
|
const flgInput = document.getElementById("flag-input_");
|
|
if (flgInput === null) throw new Error("Missing flag-input_");
|
|
flgInput.addEventListener("click", () => {
|
|
flagInputModal.open();
|
|
});
|
|
|
|
this.patternsModal = document.querySelector(
|
|
"territory-patterns-modal",
|
|
) as TerritoryPatternsModal;
|
|
const patternButton = document.getElementById(
|
|
"territory-patterns-input-preview-button",
|
|
);
|
|
this.patternsModal instanceof TerritoryPatternsModal;
|
|
if (patternButton === null)
|
|
throw new Error("territory-patterns-input-preview-button");
|
|
this.patternsModal.previewButton = patternButton;
|
|
this.patternsModal.refresh();
|
|
patternButton.addEventListener("click", () => {
|
|
this.patternsModal.open();
|
|
});
|
|
|
|
this.tokenLoginModal = document.querySelector(
|
|
"token-login",
|
|
) as TokenLoginModal;
|
|
this.tokenLoginModal instanceof TokenLoginModal;
|
|
|
|
const onUserMe = async (userMeResponse: UserMeResponse | false) => {
|
|
document.dispatchEvent(
|
|
new CustomEvent("userMeResponse", {
|
|
detail: userMeResponse,
|
|
bubbles: true,
|
|
cancelable: true,
|
|
}),
|
|
);
|
|
|
|
const config = await getServerConfigFromClient();
|
|
if (!hasAllowedFlare(userMeResponse, config)) {
|
|
if (userMeResponse === false) {
|
|
// Login is required
|
|
document.body.innerHTML = `
|
|
<div style="
|
|
display: flex;
|
|
justify-content: center;
|
|
align-items: center;
|
|
height: 100vh;
|
|
margin: 0;
|
|
font-family: sans-serif;
|
|
background-size: cover;
|
|
background-position: center;
|
|
">
|
|
<div style="
|
|
background-color: rgba(0, 0, 0, 0.7);
|
|
color: white;
|
|
padding: 2em;
|
|
margin: 5em;
|
|
border-radius: 12px;
|
|
text-align: center;
|
|
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.5);
|
|
">
|
|
<p style="margin-bottom: 1em;">${translateText("auth.login_required")}</p>
|
|
<p style="margin-bottom: 1.5em;">${translateText("auth.redirecting")}</p>
|
|
<div style="width: 100%; height: 8px; background-color: #444; border-radius: 4px; overflow: hidden;">
|
|
<div style="
|
|
height: 100%;
|
|
width: 0%;
|
|
background-color: #4caf50;
|
|
animation: fillBar 5s linear forwards;
|
|
"></div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="bg-image"></div>
|
|
<style>
|
|
@keyframes fillBar {
|
|
from { width: 0%; }
|
|
to { width: 100%; }
|
|
}
|
|
</style>
|
|
`;
|
|
setTimeout(discordLogin, 5000);
|
|
} else {
|
|
// Unauthorized
|
|
document.body.innerHTML = `
|
|
<div style="
|
|
display: flex;
|
|
justify-content: center;
|
|
align-items: center;
|
|
height: 100vh;
|
|
margin: 0;
|
|
font-family: sans-serif;
|
|
background-size: cover;
|
|
background-position: center;
|
|
">
|
|
<div style="
|
|
background-color: rgba(0, 0, 0, 0.7);
|
|
color: white;
|
|
padding: 2em;
|
|
margin: 5em;
|
|
border-radius: 12px;
|
|
text-align: center;
|
|
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.5);
|
|
">
|
|
<p style="margin-bottom: 1em;">${translateText("auth.not_authorized")}</p>
|
|
<p>${translateText("auth.contact_admin")}</p>
|
|
</div>
|
|
</div>
|
|
<div class="bg-image"></div>
|
|
`;
|
|
}
|
|
return;
|
|
} else if (userMeResponse === false) {
|
|
// Not logged in
|
|
this.patternsModal.onUserMe(null);
|
|
} else {
|
|
// Authorized
|
|
console.log(
|
|
`Your player ID is ${userMeResponse.player.publicId}\n` +
|
|
"Sharing this ID will allow others to view your game history and stats.",
|
|
);
|
|
this.patternsModal.onUserMe(userMeResponse);
|
|
}
|
|
};
|
|
|
|
if (isLoggedIn() === false) {
|
|
// Not logged in
|
|
onUserMe(false);
|
|
} else {
|
|
// JWT appears to be valid
|
|
// TODO: Add caching
|
|
getUserMe().then(onUserMe);
|
|
}
|
|
|
|
const settingsModal = document.querySelector(
|
|
"user-setting",
|
|
) as UserSettingModal;
|
|
settingsModal instanceof UserSettingModal;
|
|
document
|
|
.getElementById("settings-button")
|
|
?.addEventListener("click", () => {
|
|
settingsModal.open();
|
|
});
|
|
|
|
const hostModal = document.querySelector(
|
|
"host-lobby-modal",
|
|
) as HostPrivateLobbyModal;
|
|
hostModal instanceof HostPrivateLobbyModal;
|
|
const hostLobbyButton = document.getElementById("host-lobby-button");
|
|
if (hostLobbyButton === null) throw new Error("Missing host-lobby-button");
|
|
hostLobbyButton.addEventListener("click", () => {
|
|
if (this.usernameInput?.isValid()) {
|
|
hostModal.open();
|
|
this.publicLobby.leaveLobby();
|
|
}
|
|
});
|
|
|
|
this.joinModal = document.querySelector(
|
|
"join-private-lobby-modal",
|
|
) as JoinPrivateLobbyModal;
|
|
this.joinModal instanceof JoinPrivateLobbyModal;
|
|
const joinPrivateLobbyButton = document.getElementById(
|
|
"join-private-lobby-button",
|
|
);
|
|
if (joinPrivateLobbyButton === null)
|
|
throw new Error("Missing join-private-lobby-button");
|
|
joinPrivateLobbyButton.addEventListener("click", () => {
|
|
if (this.usernameInput?.isValid()) {
|
|
this.joinModal.open();
|
|
}
|
|
});
|
|
|
|
if (this.userSettings.darkMode()) {
|
|
document.documentElement.classList.add("dark");
|
|
} else {
|
|
document.documentElement.classList.remove("dark");
|
|
}
|
|
|
|
// Attempt to join lobby
|
|
this.handleHash();
|
|
|
|
const onHashUpdate = () => {
|
|
// Reset the UI to its initial state
|
|
this.joinModal.close();
|
|
if (this.gameStop !== null) {
|
|
this.handleLeaveLobby();
|
|
}
|
|
|
|
// Attempt to join lobby
|
|
this.handleHash();
|
|
};
|
|
|
|
// Handle browser navigation & manual hash edits
|
|
window.addEventListener("popstate", onHashUpdate);
|
|
window.addEventListener("hashchange", onHashUpdate);
|
|
|
|
function updateSliderProgress(slider: HTMLInputElement) {
|
|
const percent =
|
|
((Number(slider.value) - Number(slider.min)) /
|
|
(Number(slider.max) - Number(slider.min))) *
|
|
100;
|
|
slider.style.setProperty("--progress", `${percent}%`);
|
|
}
|
|
|
|
document
|
|
.querySelectorAll<HTMLInputElement>(
|
|
"#bots-count, #private-lobby-bots-count",
|
|
)
|
|
.forEach((slider) => {
|
|
updateSliderProgress(slider);
|
|
slider.addEventListener("input", () => updateSliderProgress(slider));
|
|
});
|
|
}
|
|
|
|
private handleHash() {
|
|
const strip = () =>
|
|
history.replaceState(
|
|
null,
|
|
"",
|
|
window.location.pathname + window.location.search,
|
|
);
|
|
|
|
const alertAndStrip = (message: string) => {
|
|
alert(message);
|
|
strip();
|
|
};
|
|
|
|
const hash = window.location.hash;
|
|
|
|
// Decode the hash first to handle encoded characters
|
|
const decodedHash = decodeURIComponent(hash);
|
|
const params = new URLSearchParams(decodedHash.split("?")[1] || "");
|
|
|
|
// Handle different hash sections
|
|
if (decodedHash.startsWith("#purchase-completed")) {
|
|
// Parse params after the ?
|
|
const status = params.get("status");
|
|
|
|
if (status !== "true") {
|
|
alertAndStrip("purchase failed");
|
|
return;
|
|
}
|
|
|
|
const patternName = params.get("pattern");
|
|
if (!patternName) {
|
|
alert("Something went wrong. Please contact support.");
|
|
console.error("purchase-completed but no pattern name");
|
|
return;
|
|
}
|
|
|
|
this.userSettings.setSelectedPatternName(patternName);
|
|
const token = params.get("login-token");
|
|
|
|
if (token) {
|
|
strip();
|
|
window.addEventListener("beforeunload", () => {
|
|
// The page reloads after token login, so we need to save the pattern name
|
|
// in case it is unset during reload.
|
|
this.userSettings.setSelectedPatternName(patternName);
|
|
});
|
|
this.tokenLoginModal.open(token);
|
|
} else {
|
|
alertAndStrip(`purchase succeeded: ${patternName}`);
|
|
this.patternsModal.refresh();
|
|
}
|
|
return;
|
|
}
|
|
|
|
if (decodedHash.startsWith("#token-login")) {
|
|
const token = params.get("token-login");
|
|
|
|
if (!token) {
|
|
alertAndStrip(
|
|
`login failed! Please try again later or contact support.`,
|
|
);
|
|
return;
|
|
}
|
|
|
|
strip();
|
|
this.tokenLoginModal.open(token);
|
|
return;
|
|
}
|
|
|
|
if (decodedHash.startsWith("#join=")) {
|
|
const lobbyId = decodedHash.substring(6); // Remove "#join="
|
|
if (lobbyId && ID.safeParse(lobbyId).success) {
|
|
this.joinModal.open(lobbyId);
|
|
console.log(`joining lobby ${lobbyId}`);
|
|
}
|
|
}
|
|
}
|
|
|
|
private async handleJoinLobby(event: CustomEvent<JoinLobbyEvent>) {
|
|
const lobby = event.detail;
|
|
console.log(`joining lobby ${lobby.gameID}`);
|
|
if (this.gameStop !== null) {
|
|
console.log("joining lobby, stopping existing game");
|
|
this.gameStop();
|
|
}
|
|
const config = await getServerConfigFromClient();
|
|
|
|
this.gameStop = joinLobby(
|
|
this.eventBus,
|
|
{
|
|
gameID: lobby.gameID,
|
|
serverConfig: config,
|
|
patternName: this.userSettings.getSelectedPatternName(),
|
|
flag:
|
|
this.flagInput === null || this.flagInput.getCurrentFlag() === "xx"
|
|
? ""
|
|
: this.flagInput.getCurrentFlag(),
|
|
playerName: this.usernameInput?.getCurrentUsername() ?? "",
|
|
token: getPlayToken(),
|
|
clientID: lobby.clientID,
|
|
gameStartInfo: lobby.gameStartInfo ?? lobby.gameRecord?.info,
|
|
gameRecord: lobby.gameRecord,
|
|
},
|
|
() => {
|
|
console.log("Closing modals");
|
|
document.getElementById("settings-button")?.classList.add("hidden");
|
|
document
|
|
.getElementById("username-validation-error")
|
|
?.classList.add("hidden");
|
|
[
|
|
"single-player-modal",
|
|
"host-lobby-modal",
|
|
"join-private-lobby-modal",
|
|
"game-starting-modal",
|
|
"game-top-bar",
|
|
"help-modal",
|
|
"user-setting",
|
|
"territory-patterns-modal",
|
|
"language-modal",
|
|
"news-modal",
|
|
"flag-input-modal",
|
|
"account-button",
|
|
"token-login",
|
|
].forEach((tag) => {
|
|
const modal = document.querySelector(tag) as HTMLElement & {
|
|
close?: () => void;
|
|
isModalOpen?: boolean;
|
|
};
|
|
if (modal?.close) {
|
|
modal.close();
|
|
} else if ("isModalOpen" in modal) {
|
|
modal.isModalOpen = false;
|
|
}
|
|
});
|
|
this.publicLobby.stop();
|
|
document.querySelectorAll(".ad").forEach((ad) => {
|
|
(ad as HTMLElement).style.display = "none";
|
|
});
|
|
|
|
// show when the game loads
|
|
const startingModal = document.querySelector(
|
|
"game-starting-modal",
|
|
) as GameStartingModal;
|
|
startingModal instanceof GameStartingModal;
|
|
startingModal.show();
|
|
},
|
|
() => {
|
|
this.joinModal.close();
|
|
this.publicLobby.stop();
|
|
incrementGamesPlayed();
|
|
|
|
try {
|
|
window.PageOS.session.newPageView();
|
|
} catch (e) {
|
|
console.error("Error calling newPageView", e);
|
|
}
|
|
|
|
document.querySelectorAll(".ad").forEach((ad) => {
|
|
(ad as HTMLElement).style.display = "none";
|
|
});
|
|
|
|
if (lobby.gameStartInfo?.config.gameType !== GameType.Singleplayer) {
|
|
history.pushState(null, "", `#join=${lobby.gameID}`);
|
|
}
|
|
},
|
|
);
|
|
}
|
|
|
|
private async handleLeaveLobby(/* event: CustomEvent */) {
|
|
if (this.gameStop === null) {
|
|
return;
|
|
}
|
|
console.log("leaving lobby, cancelling game");
|
|
this.gameStop();
|
|
this.gameStop = null;
|
|
this.publicLobby.leaveLobby();
|
|
}
|
|
|
|
private handleKickPlayer(event: CustomEvent) {
|
|
const { target } = event.detail;
|
|
|
|
// Forward to eventBus if available
|
|
if (this.eventBus) {
|
|
this.eventBus.emit(new SendKickPlayerIntentEvent(target));
|
|
}
|
|
}
|
|
}
|
|
|
|
// Initialize the client when the DOM is loaded
|
|
document.addEventListener("DOMContentLoaded", () => {
|
|
new Client().initialize();
|
|
});
|
|
|
|
// WARNING: DO NOT EXPOSE THIS ID
|
|
function getPlayToken(): string {
|
|
const result = isLoggedIn();
|
|
if (result !== false) return result.token;
|
|
return getPersistentIDFromCookie();
|
|
}
|
|
|
|
// WARNING: DO NOT EXPOSE THIS ID
|
|
export function getPersistentID(): string {
|
|
const result = isLoggedIn();
|
|
if (result !== false) return result.claims.sub;
|
|
return getPersistentIDFromCookie();
|
|
}
|
|
|
|
// WARNING: DO NOT EXPOSE THIS ID
|
|
function getPersistentIDFromCookie(): string {
|
|
const COOKIE_NAME = "player_persistent_id";
|
|
|
|
// Try to get existing cookie
|
|
const cookies = document.cookie.split(";");
|
|
for (const cookie of cookies) {
|
|
const [cookieName, cookieValue] = cookie.split("=").map((c) => c.trim());
|
|
if (cookieName === COOKIE_NAME) {
|
|
return cookieValue;
|
|
}
|
|
}
|
|
|
|
// If no cookie exists, create new ID and set cookie
|
|
const newID = generateCryptoRandomUUID();
|
|
document.cookie = [
|
|
`${COOKIE_NAME}=${newID}`,
|
|
`max-age=${5 * 365 * 24 * 60 * 60}`, // 5 years
|
|
"path=/",
|
|
"SameSite=Strict",
|
|
"Secure",
|
|
].join(";");
|
|
|
|
return newID;
|
|
}
|
|
|
|
function hasAllowedFlare(
|
|
userMeResponse: UserMeResponse | false,
|
|
config: ServerConfig,
|
|
) {
|
|
const allowed = config.allowedFlares();
|
|
if (allowed === undefined) return true;
|
|
if (userMeResponse === false) return false;
|
|
const flares = userMeResponse.player.flares;
|
|
if (flares === undefined) return false;
|
|
return allowed.length === 0 || allowed.some((f) => flares.includes(f));
|
|
}
|