From 89e146d856f6c6620c6cd701726f62ecd9a654b8 Mon Sep 17 00:00:00 2001 From: Nathan Flurry Date: Sat, 28 Sep 2024 17:20:46 -0700 Subject: [PATCH] chore(lobbies): rename region id -> region slug --- modules/lobbies/actors/lobby_manager.ts | 2 +- .../utils/lobby/backend/local_development.ts | 2 +- modules/lobbies/utils/lobby/backend/server.ts | 20 +++--- modules/lobbies/utils/lobby/backend/test.ts | 2 +- modules/lobbies/utils/region.ts | 2 +- sandbox/client/index.html | 39 +++--------- sandbox/client/index.js | 62 ++++++++----------- 7 files changed, 51 insertions(+), 78 deletions(-) diff --git a/modules/lobbies/actors/lobby_manager.ts b/modules/lobbies/actors/lobby_manager.ts index cf5f3d1b..f4aaed1d 100644 --- a/modules/lobbies/actors/lobby_manager.ts +++ b/modules/lobbies/actors/lobby_manager.ts @@ -237,7 +237,7 @@ export class Actor extends ActorBase { // Valiadte region const validRegions = regionsForBackend(lobbyConfig.backend); - if (validRegions.findIndex((x) => x.id == req.lobby.region) == -1) { + if (validRegions.findIndex((x) => x.slug == req.lobby.region) == -1) { throw new RuntimeError("region_not_found", { meta: { region: req.lobby.region }, }); diff --git a/modules/lobbies/utils/lobby/backend/local_development.ts b/modules/lobbies/utils/lobby/backend/local_development.ts index f341e823..14396ec9 100644 --- a/modules/lobbies/utils/lobby/backend/local_development.ts +++ b/modules/lobbies/utils/lobby/backend/local_development.ts @@ -25,7 +25,7 @@ export interface LobbyBackendLocalDevelopmentResponse { export const REGIONS: Region[] = [ { - id: "local", + slug: "local", name: "Local", latitude: 32.232330, longitude: -110.961670, diff --git a/modules/lobbies/utils/lobby/backend/server.ts b/modules/lobbies/utils/lobby/backend/server.ts index edc5bd6d..0a7ba5ef 100644 --- a/modules/lobbies/utils/lobby/backend/server.ts +++ b/modules/lobbies/utils/lobby/backend/server.ts @@ -34,62 +34,62 @@ export interface LobbyBackendServerPortResponse { // TODO: Return dynamic regions instead of hardcoded export const REGIONS: Region[] = [ { - id: "atl", + slug: "atl", name: "Atlanta", latitude: 33.7490, longitude: -84.3880, }, { - id: "lax", + slug: "lax", name: "Los Angeles", latitude: 34.0522, longitude: -118.2437, }, { - id: "fra", + slug: "fra", name: "Frankfurt", latitude: 50.1109, longitude: 8.6821, }, { - id: "syd", + slug: "syd", name: "Sydney", latitude: -33.8688, longitude: 151.2093, }, { - id: "osa", + slug: "osa", name: "Osaka", latitude: 34.6937, longitude: 135.5023, }, { - id: "gru", + slug: "gru", name: "São Paulo", latitude: -23.5505, longitude: -46.6333, }, { - id: "bom", + slug: "bom", name: "Mumbai", latitude: 19.0760, longitude: 72.8777, }, { - id: "sin", + slug: "sin", name: "Singapore", latitude: 1.3521, longitude: 103.8198, }, { - id: "lnd-atl", + slug: "lnd-atl", name: "Atlanta", latitude: 33.7490, longitude: -84.3880, }, { - id: "lnd-fra", + slug: "lnd-fra", name: "Frankfurt", latitude: 50.1109, longitude: 8.6821, diff --git a/modules/lobbies/utils/lobby/backend/test.ts b/modules/lobbies/utils/lobby/backend/test.ts index 165a551e..4be4e287 100644 --- a/modules/lobbies/utils/lobby/backend/test.ts +++ b/modules/lobbies/utils/lobby/backend/test.ts @@ -8,7 +8,7 @@ export type LobbyBackendTestResponse = Record; export const REGIONS: Region[] = [ { - id: "test", + slug: "test", name: "Test", latitude: 33.67727501667558, longitude: -106.47527637325621, diff --git a/modules/lobbies/utils/region.ts b/modules/lobbies/utils/region.ts index eda10bef..33ef047b 100644 --- a/modules/lobbies/utils/region.ts +++ b/modules/lobbies/utils/region.ts @@ -9,7 +9,7 @@ import { UnreachableError } from "../module.gen.ts"; import { LobbyBackend } from "../config.ts"; export interface Region { - id: string; + slug: string; name: string; latitude: number; longitude: number; diff --git a/sandbox/client/index.html b/sandbox/client/index.html index 02e0a07c..7ce9087a 100644 --- a/sandbox/client/index.html +++ b/sandbox/client/index.html @@ -8,36 +8,17 @@

Rivet Modules E2E Test

-
- - -
- - - - - - - +
+ + + +
+
+ + + +
diff --git a/sandbox/client/index.js b/sandbox/client/index.js index e205c957..d50853ff 100644 --- a/sandbox/client/index.js +++ b/sandbox/client/index.js @@ -2,10 +2,9 @@ import { Rivet } from './sdk/index.mjs'; const urlParams = new URLSearchParams(window.location.search); -const environment = urlParams.get('env') || 'local'; function getBackend() { - return new Rivet({ endpoint: localStorage.apiEndpoint ?? "http://localhost:6420" }); + return new Rivet({ endpoint: localStorage.endpoint }); } window.fetchState = async function() { @@ -21,44 +20,37 @@ window.resetState = async function() { }); }; +window.setEndpoint = function() { + localStorage.endpoint = prompt("Endpoint", localStorage.endpoint); +}; + window.setAdminToken = function() { - let token = prompt("Admin token"); - localStorage.adminToken = token; + localStorage.adminToken = prompt("Admin token", localStorage.adminToken); +}; + +window.setGameVersion = function() { + localStorage.gameVersion = prompt("Game version", localStorage.gameVersion); }; window.findOrCreateLobby = async function() { - let res; - if (environment == 'local') { - res = await getBackend().lobbies.findOrCreate({ - version: "default", - regions: ["local"], - tags: {}, - players: [{}], - - createConfig: { - region: "local", - tags: {}, - maxPlayers: 8, - maxPlayersDirect: 8, - }, - }); - } else { - const region = "lnd-atl"; - const tags = {"foo": "bar"}; - res = await getBackend().lobbies.findOrCreate({ - version: "2024.09.18-2", - regions: [region], + const regions = await getBackend().lobbies.listRegions({}); + + // const region = regions.regions[0].slug; + const region = 'lnd-atl'; + const tags = {}; + let res = await getBackend().lobbies.findOrCreate({ + version: localStorage.gameVersion ?? "default", + regions: [region], + tags, + players: [{}], + + createConfig: { + region, tags, - players: [{}], - - createConfig: { - region, - tags, - maxPlayers: 8, - maxPlayersDirect: 8, - }, - }); - } + maxPlayers: 8, + maxPlayersDirect: 8, + }, + }); let { lobby, players } = res;