{
+ try {
+ const response = await fetch('/private_lobby', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ // body: JSON.stringify(data), // Include this if you need to send data
+ });
+
+ if (!response.ok) {
+ throw new Error(`HTTP error! status: ${response.status}`);
+ }
+
+ const data = await response.json();
+ console.log('Success:', data);
+
+ // Assuming the server returns an object with an 'id' property
+ const lobby: Lobby = {
+ id: data.id,
+ // Add other properties as needed
+ };
+
+ return lobby;
+ } catch (error) {
+ console.error('Error creating lobby:', error);
+ throw error; // Re-throw the error so the caller can handle it
+ }
+}
\ No newline at end of file
diff --git a/src/client/JoinPrivateLobbyModal.ts b/src/client/JoinPrivateLobbyModal.ts
new file mode 100644
index 000000000..4d81396b4
--- /dev/null
+++ b/src/client/JoinPrivateLobbyModal.ts
@@ -0,0 +1,128 @@
+import {LitElement, html, css} from 'lit';
+import {customElement, property, state, query} from 'lit/decorators.js';
+import {GameMap} from '../core/game/Game';
+
+@customElement('join-private-lobby-modal')
+export class JoinPrivateLobbyModal extends LitElement {
+ @state() private isModalOpen = false;
+ @query('#lobbyIdInput') private lobbyIdInput!: HTMLInputElement;
+
+ static styles = css`
+ .modal-overlay {
+ display: none;
+ position: fixed;
+ z-index: 1000;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.5);
+ }
+ .modal-content {
+ background-color: white;
+ margin: 15% auto;
+ padding: 20px;
+ border-radius: 8px;
+ width: 80%;
+ max-width: 500px;
+ text-align: center;
+ }
+ .close {
+ color: #aaa;
+ float: right;
+ font-size: 28px;
+ font-weight: bold;
+ cursor: pointer;
+ }
+ .close:hover,
+ .close:focus {
+ color: black;
+ text-decoration: none;
+ cursor: pointer;
+ }
+ button {
+ padding: 10px 20px;
+ font-size: 16px;
+ cursor: pointer;
+ background-color: #007bff;
+ color: white;
+ border: none;
+ border-radius: 4px;
+ transition: background-color 0.3s;
+ }
+ button:hover {
+ background-color: #0056b3;
+ }
+ .lobby-id-container {
+ display: flex;
+ align-items: stretch;
+ justify-content: center;
+ gap: 10px;
+ margin: 20px 0;
+ }
+ .lobby-id-container input {
+ flex-grow: 1;
+ max-width: 200px;
+ padding: 10px;
+ font-size: 16px;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ }
+ .lobby-id-container button {
+ padding: 10px 15px;
+ }
+ .join-button {
+ margin-top: 10px;
+ }
+ `;
+
+ render() {
+ return html`
+
+
+
×
+
Join Private Lobby
+
+
+
+
+
+
+
-
-
@@ -68,6 +68,8 @@
+
+
diff --git a/src/core/Schemas.ts b/src/core/Schemas.ts
index 575c4b197..75cd84eab 100644
--- a/src/core/Schemas.ts
+++ b/src/core/Schemas.ts
@@ -45,8 +45,8 @@ const PlayerTypeSchema = z.nativeEnum(PlayerType);
export interface Lobby {
id: string;
- msUntilStart: number;
- numClients: number;
+ msUntilStart?: number;
+ numClients?: number;
}
const EmojiSchema = z.string().refine(
diff --git a/src/server/GameManager.ts b/src/server/GameManager.ts
index b9fee3eb4..ed39b5093 100644
--- a/src/server/GameManager.ts
+++ b/src/server/GameManager.ts
@@ -1,6 +1,4 @@
import {Config} from "../core/configuration/Config";
-import {PseudoRandom} from "../core/PseudoRandom";
-import WebSocket from 'ws';
import {ClientID, GameID} from "../core/Schemas";
import {v4 as uuidv4} from 'uuid';
import {Client} from "./Client";
@@ -14,8 +12,6 @@ export class GameManager {
private games: GameServer[] = []
- private random = new PseudoRandom(123)
-
constructor(private config: Config) { }
gamesByPhase(phase: GamePhase): GameServer[] {
@@ -31,6 +27,23 @@ export class GameManager {
game.addClient(client, lastTurn)
}
+ createPrivateGame(): string {
+ const id = genSmallGameID()
+ this.games.push(new GameServer(id, Date.now(), false, this.config))
+ return id
+ }
+
+ // TODO: stop private games to prevent memory leak.
+ startPrivateGame(gameID: GameID) {
+ const game = this.games.find(g => g.id == gameID)
+ console.log(`found game ${game}`)
+ if (game) {
+ game.start()
+ } else {
+ throw new Error(`cannot start private game, game ${gameID} not found`)
+ }
+ }
+
tick() {
const lobbies = this.gamesByPhase(GamePhase.Lobby)
const active = this.gamesByPhase(GamePhase.Active)
@@ -40,10 +53,10 @@ export class GameManager {
if (now > this.lastNewLobby + this.config.gameCreationRate()) {
this.lastNewLobby = now
const id = uuidv4()
- lobbies.push(new GameServer(id, now, this.config))
+ lobbies.push(new GameServer(id, now, true, this.config))
}
- active.filter(g => !g.hasStarted()).forEach(g => {
+ active.filter(g => !g.hasStarted() && g.isPublic).forEach(g => {
g.start()
})
finished.forEach(g => {
@@ -51,4 +64,15 @@ export class GameManager {
})
this.games = [...lobbies, ...active]
}
+}
+
+function genSmallGameID(): string {
+ // Generate a UUID
+ const uuid: string = uuidv4();
+
+ // Convert UUID to base64
+ const base64: string = btoa(uuid);
+
+ // Take the first 4 characters of the base64 string
+ return base64.slice(0, 4);
}
\ No newline at end of file
diff --git a/src/server/GameServer.ts b/src/server/GameServer.ts
index bc3f9b528..d915cbf54 100644
--- a/src/server/GameServer.ts
+++ b/src/server/GameServer.ts
@@ -26,6 +26,7 @@ export class GameServer {
constructor(
public readonly id: string,
public readonly createdAt: number,
+ public readonly isPublic: boolean,
private config: Config,
) { }
@@ -129,6 +130,22 @@ export class GameServer {
}
phase(): GamePhase {
+ if (Date.now() > this.createdAt + this.config.lobbyLifetime() + this.maxGameDuration) {
+ console.warn(`game past max duration ${this.id}`)
+ return GamePhase.Finished
+ }
+ if (!this.isPublic) {
+ if (this._hasStarted) {
+ if (this.clients.length == 0) {
+ return GamePhase.Finished
+ } else {
+ return GamePhase.Active
+ }
+ } else {
+ return GamePhase.Lobby
+ }
+ }
+
if (Date.now() - this.createdAt < this.config.lobbyLifetime()) {
return GamePhase.Lobby
}
@@ -137,11 +154,6 @@ export class GameServer {
return GamePhase.Finished
}
- if (Date.now() > this.createdAt + this.config.lobbyLifetime() + this.maxGameDuration) {
- console.warn(`game past max duration ${this.id}`)
- return GamePhase.Finished
- }
-
return GamePhase.Active
}
diff --git a/src/server/Server.ts b/src/server/Server.ts
index 8a6267d7d..b4b3818d6 100644
--- a/src/server/Server.ts
+++ b/src/server/Server.ts
@@ -8,7 +8,8 @@ import {ClientMessage, ClientMessageSchema} from '../core/Schemas';
import {getConfig} from '../core/configuration/Config';
import {LogSeverity, slog} from './StructuredLog';
import {Client} from './Client';
-import {GamePhase} from './GameServer';
+import {GamePhase, GameServer} from './GameServer';
+import {v4 as uuidv4} from 'uuid';
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
@@ -22,6 +23,8 @@ app.use(express.static(path.join(__dirname, '../../out')));
app.use(express.json())
const gm = new GameManager(getConfig())
+const privateGames = new Map()
+
// New GET endpoint to list lobbies
app.get('/lobbies', (req, res) => {
const now = Date.now()
@@ -32,6 +35,30 @@ app.get('/lobbies', (req, res) => {
});
});
+app.post('/private_lobby', (req, res) => {
+ const id = gm.createPrivateGame()
+ console.log('creating private lobby with id ${id}')
+ res.json({
+ id: id
+ });
+});
+
+app.post('/start_private_lobby/:id', (req, res) => {
+ console.log(`starting private lobby with id ${req.params.id}`)
+ gm.startPrivateGame(req.params.id)
+});
+
+
+app.put('/private_lobby/:id', (req, res) => {
+
+});
+
+app.get('/private_lobby/:id', (req, res) => {
+ res.json({
+ hi: '5'
+ });
+});
+
wss.on('connection', (ws) => {
ws.on('message', (message: string) => {
@@ -61,4 +88,3 @@ server.listen(PORT, () => {
});
runGame()
-
diff --git a/webpack.config.js b/webpack.config.js
index 8deef9255..38c06bdb0 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -95,7 +95,7 @@ export default (env, argv) => {
ws: true,
},
{
- context: ['/lobbies', '/join_game', '/join_lobby'],
+ context: ['/lobbies', '/join_game', '/join_lobby', '/private_lobby', '/start_private_lobby'],
target: 'http://localhost:3000',
secure: false,
changeOrigin: true,