persistentclientID per session

Author: ryanbarlow97

src/client/Auth.ts

@@ -2,12 +2,14 @@ import { decodeJwt } from "jose";
 import { z } from "zod";
 import { TokenPayload, TokenPayloadSchema } from "../core/ApiSchemas";
 import { base64urlToUuid } from "../core/Base64";
+import { generateID } from "../core/Util";
 import { getApiBase, getAudience } from "./Api";
 import { generateCryptoRandomUUID } from "./Utils";
 
 export type UserAuth = { jwt: string; claims: TokenPayload } | false;
 
 const PERSISTENT_ID_KEY = "player_persistent_id";
+const CLIENT_ID_KEY = "client_join_id";
 
 let __jwt: string | null = null;
 
@@ -209,6 +211,16 @@ export function getPersistentID(): string {
   return base64urlToUuid(sub);
 }
 
+export function getPersistentClientID(): string {
+  const value = sessionStorage.getItem(CLIENT_ID_KEY);
+  if (value && /^[A-Za-z0-9]{8}$/.test(value)) {
+    return value;
+  }
+  const newID = generateID();
+  sessionStorage.setItem(CLIENT_ID_KEY, newID);
+  return newID;
+}
+
 // WARNING: DO NOT EXPOSE THIS ID
 function getPersistentIDFromLocalStorage(): string {
   // Try to get existing localStorage

src/client/HostLobbyModal.ts

@@ -22,6 +22,7 @@ import {
   isValidGameID,
 } from "../core/Schemas";
 import { generateID } from "../core/Util";
+import { getPersistentClientID } from "./Auth";
 import "./components/baseComponents/Modal";
 import { BaseModal } from "./components/BaseModal";
 import "./components/CopyButton";
@@ -694,7 +695,7 @@ export class HostLobbyModal extends BaseModal {
   }
 
   protected onOpen(): void {
-    this.lobbyCreatorClientID = generateID();
+    this.lobbyCreatorClientID = getPersistentClientID();
 
     createLobby(this.lobbyCreatorClientID)
       .then(async (lobby) => {

src/client/JoinPrivateLobbyModal.ts

@@ -8,10 +8,10 @@ import {
   GameInfo,
   GameRecordSchema,
 } from "../core/Schemas";
-import { generateID } from "../core/Util";
 import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
 import { GameMapSize, GameMode } from "../core/game/Game";
 import { getApiBase } from "./Api";
+import { getPersistentClientID } from "./Auth";
 import { JoinLobbyEvent } from "./Main";
 import { terrainMapFileLoader } from "./TerrainMapFileLoader";
 import { BaseModal } from "./components/BaseModal";
@@ -426,7 +426,7 @@ export class JoinPrivateLobbyModal extends BaseModal {
         new CustomEvent("join-lobby", {
           detail: {
             gameID: lobbyId,
-            clientID: generateID(),
+            clientID: getPersistentClientID(),
           } as JoinLobbyEvent,
           bubbles: true,
           composed: true,
@@ -482,7 +482,7 @@ export class JoinPrivateLobbyModal extends BaseModal {
         detail: {
           gameID: lobbyId,
           gameRecord: parsed.data,
-          clientID: generateID(),
+          clientID: getPersistentClientID(),
         } as JoinLobbyEvent,
         bubbles: true,
         composed: true,

src/client/LocalServer.ts

@@ -17,7 +17,6 @@ import {
   getClanTag,
   replacer,
 } from "../core/Util";
-import { getPersistentID } from "./Auth";
 import { LobbyConfig } from "./ClientGameRunner";
 import { ReplaySpeedChangeEvent } from "./InputHandler";
 import { defaultReplaySpeedMultiplier } from "./utilities/ReplaySpeedMultiplier";
@@ -209,7 +208,7 @@ export class LocalServer {
     }
     const players: PlayerRecord[] = [
       {
-        persistentID: getPersistentID(),
+        persistentID: null,
         username: this.lobbyConfig.playerName,
         clientID: this.lobbyConfig.clientID,
         stats: this.allPlayersStats[this.lobbyConfig.clientID],

src/client/Matchmaking.ts

@@ -2,9 +2,8 @@ import { html, LitElement } from "lit";
 import { customElement, query, state } from "lit/decorators.js";
 import { UserMeResponse } from "../core/ApiSchemas";
 import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
-import { generateID } from "../core/Util";
 import { getUserMe } from "./Api";
-import { getPlayToken } from "./Auth";
+import { getPersistentClientID, getPlayToken } from "./Auth";
 import { BaseModal } from "./components/BaseModal";
 import "./components/Difficulties";
 import "./components/PatternButton";
@@ -228,7 +227,7 @@ export class MatchmakingModal extends BaseModal {
       new CustomEvent("join-lobby", {
         detail: {
           gameID: this.gameID,
-          clientID: generateID(),
+          clientID: getPersistentClientID(),
         } as JoinLobbyEvent,
         bubbles: true,
         composed: true,

src/client/PublicLobby.ts

@@ -11,7 +11,7 @@ import {
   Trios,
 } from "../core/game/Game";
 import { GameID, GameInfo } from "../core/Schemas";
-import { generateID } from "../core/Util";
+import { getPersistentClientID } from "./Auth";
 import { PublicLobbySocket } from "./LobbySocket";
 import { JoinLobbyEvent } from "./Main";
 import { terrainMapFileLoader } from "./TerrainMapFileLoader";
@@ -362,7 +362,7 @@ export class PublicLobby extends LitElement {
       new CustomEvent("join-lobby", {
         detail: {
           gameID: lobby.gameID,
-          clientID: generateID(),
+          clientID: getPersistentClientID(),
           source: "public",
           publicLobbyInfo: lobby,
         } as JoinLobbyEvent,

src/client/SinglePlayerModal.ts

@@ -19,6 +19,7 @@ import { UserSettings } from "../core/game/UserSettings";
 import { TeamCountConfig } from "../core/Schemas";
 import { generateID } from "../core/Util";
 import { hasLinkedAccount } from "./Api";
+import { getPersistentClientID } from "./Auth";
 import "./components/baseComponents/Button";
 import "./components/baseComponents/Modal";
 import { BaseModal } from "./components/BaseModal";
@@ -899,7 +900,7 @@ export class SinglePlayerModal extends BaseModal {
     console.log(
       `Starting single player game with map: ${GameMapType[this.selectedMap as keyof typeof GameMapType]}${this.useRandomMap ? " (Randomly selected)" : ""}`,
     );
-    const clientID = generateID();
+    const clientID = getPersistentClientID();
     const gameID = generateID();
 
     const usernameInput = document.querySelector(