@hellacardgames/speed 0.14.1 → 0.14.2

package/dist/manager/index.cjs

@@ -1,3 +1,3 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_manager = require("../manager-DdpdgNfz.cjs");
+const require_manager = require("../manager-Sw5jTzl2.cjs");
 exports.createManager = require_manager.createManager;

package/dist/manager/index.mjs

@@ -1,2 +1,2 @@
-import { t as createManager } from "../manager-C8wqbmrE.mjs";
+import { t as createManager } from "../manager-BNAk0ZFh.mjs";
 export { createManager };

package/dist/{manager-C8wqbmrE.mjs → manager-BNAk0ZFh.mjs}

@@ -1,4 +1,4 @@
-import { createManagerFactory, getClientStateAndClearEventsFactory, getEventsAndClearAcknowledged, sendChat } from "@hellacardgames/lib";
+import { addItemToCollection, createManagerFactory, emitEvent, emitEventToPlayer, getClientStateAndClearEventsFactory, getEventsAndClearAcknowledged, removeItemFromCollection, requirePlayer, sendChat, shuffle, takeLastItemFromCollection, updatePlayer } from "@hellacardgames/lib";
 //#region src/game/constants.ts
 const EXPIRY_EXTENSION_MS = 3e5;
 const CAN_PLAY_AT_DELAY_MS = 3e3;
@@ -286,29 +286,13 @@ function createGame(userId, username) {
 			createdAt,
 			expiresAt: createdAt + EXPIRY_EXTENSION_MS,
 			chatMessages: [],
-			players: [player]
+			players: [player],
+			canPlayAt: 0
 		},
 		playerId: player.id
 	};
 }
 //#endregion
-//#region src/game/lib/emitEvent.ts
-function emitEvent(game, data) {
-	const event = {
-		...data,
-		id: crypto.randomUUID()
-	};
-	for (const p of game.players) p.events.push(event);
-}
-//#endregion
-//#region src/game/lib/emitEventToPlayer.ts
-function emitEventToPlayer(player, data) {
-	player.events.push({
-		...data,
-		id: crypto.randomUUID()
-	});
-}
-//#endregion
 //#region src/game/actions/drawCard.ts
 function drawCard(game, playerId) {
 	const player = game.players.find((p) => p.id === playerId);
@@ -332,18 +316,25 @@ function drawCard(game, playerId) {
 		success: false,
 		error: "drawPileEmpty"
 	};
-	game.expiresAt = Date.now() + EXPIRY_EXTENSION_MS;
-	emitEvent(game, {
+	game = {
+		...game,
+		expiresAt: Date.now() + EXPIRY_EXTENSION_MS
+	};
+	game = emitEvent(game, {
 		type: "expirationUpdated",
 		expiresAt: game.expiresAt
 	});
-	const card = player.drawPile.pop();
-	player.hand.push(card);
-	emitEventToPlayer(player, {
+	const { collection: newDrawPile, item: card } = takeLastItemFromCollection(player.drawPile);
+	game = updatePlayer(game, player.id, (p) => ({
+		...p,
+		drawPile: newDrawPile,
+		hand: addItemToCollection(p.hand, card)
+	}));
+	game = emitEventToPlayer(game, player.id, {
 		type: "drewCard",
 		card
 	});
-	emitEvent(game, {
+	game = emitEvent(game, {
 		type: "playerDrewCard",
 		username: player.username
 	});
@@ -397,8 +388,11 @@ function joinGame(game, userId, username) {
 		centerPile: [],
 		hasNoPlayableCards: false
 	};
-	game.players.push(player);
-	emitEvent(game, {
+	game = {
+		...game,
+		players: addItemToCollection(game.players, player)
+	};
+	game = emitEvent(game, {
 		type: "playerJoined",
 		username
 	});
@@ -409,34 +403,47 @@ function joinGame(game, userId, username) {
 	};
 }
 //#endregion
+//#region src/game/lib/removePlayerFromGame.ts
+function removePlayerFromGame(game, playerId) {
+	const { player } = requirePlayer(game, playerId);
+	game = {
+		...game,
+		players: removeItemFromCollection(game.players, player)
+	};
+	return game;
+}
+//#endregion
+//#region src/game/lib/transitionGameToForfeited.ts
+function transitionGameToForfeited(game) {
+	return {
+		...game,
+		status: "forfeited"
+	};
+}
+//#endregion
 //#region src/game/actions/leaveGame.ts
 function leaveGame(game, playerId) {
-	const playerIndex = game.players.findIndex((p) => p.id === playerId);
-	if (playerIndex === -1) return {
+	const player = game.players.find((p) => p.id === playerId);
+	if (!player) return {
 		success: false,
 		error: "playerNotFound"
 	};
-	const player = game.players[playerIndex];
-	emitEvent(game, {
+	game = emitEvent(game, {
 		type: "playerLeft",
 		username: player.username
 	});
-	game.players.splice(playerIndex, 1);
+	game = removePlayerFromGame(game, player.id);
 	if (game.status === "started" && game.players.length < 2) {
-		const forfeitedGame = {
+		game = transitionGameToForfeited(game);
+		game = {
 			...game,
-			status: "forfeited",
 			expiresAt: Date.now() + EXPIRY_EXTENSION_MS
 		};
-		emitEvent(forfeitedGame, { type: "gameForfeited" });
-		emitEvent(forfeitedGame, {
+		game = emitEvent(game, { type: "gameForfeited" });
+		game = emitEvent(game, {
 			type: "expirationUpdated",
-			expiresAt: forfeitedGame.expiresAt
+			expiresAt: game.expiresAt
 		});
-		return {
-			success: true,
-			game: forfeitedGame
-		};
 	}
 	return {
 		success: true,
@@ -450,15 +457,47 @@ function isCardPlayable(card, targetPile) {
 	return Math.abs(card.rank - targetCard.rank) % 11 === 1;
 }
 //#endregion
+//#region src/game/lib/requireOtherPlayer.ts
+function requireOtherPlayer(game, playerId) {
+	const otherPlayer = game.players.find((p) => p.id !== playerId);
+	if (!otherPlayer) throw new Error("Other player not found.");
+	return otherPlayer;
+}
+//#endregion
 //#region src/game/lib/hasPlayableCard.ts
-function hasPlayableCard(player, game) {
-	const otherPlayer = game.players.find((p) => p !== player);
+function hasPlayableCard(game, playerId) {
+	const { player } = requirePlayer(game, playerId);
+	const otherPlayer = requireOtherPlayer(game, player.id);
 	const targetPile1 = player.centerPile;
 	const targetPile2 = otherPlayer.centerPile;
 	for (const card of player.hand) if (isCardPlayable(card, targetPile1) || isCardPlayable(card, targetPile2)) return true;
 	return false;
 }
 //#endregion
+//#region src/game/lib/clearHasNoPlayableCardsIfNotApplicable.ts
+function clearHasNoPlayableCardsIfNotApplicable(game, playerId) {
+	const { player } = requirePlayer(game, playerId);
+	if (player.hasNoPlayableCards && hasPlayableCard(game, player.id)) game = updatePlayer(game, player.id, (p) => ({
+		...p,
+		hasNoPlayableCards: false
+	}));
+	return game;
+}
+//#endregion
+//#region src/game/lib/isOutOfCards.ts
+function isOutOfCards(game, playerId) {
+	const { player } = requirePlayer(game, playerId);
+	return player.hand.length === 0 && player.drawPile.length === 0;
+}
+//#endregion
+//#region src/game/lib/transitionGameToCompleted.ts
+function transitionGameToCompleted(game) {
+	return {
+		...game,
+		status: "completed"
+	};
+}
+//#endregion
 //#region src/game/actions/playCard.ts
 function playCard(game, playerId, cardId, isForOtherPlayerPile) {
 	const player = game.players.find((p) => p.id === playerId);
@@ -474,41 +513,43 @@ function playCard(game, playerId, cardId, isForOtherPlayerPile) {
 		success: false,
 		error: "canPlayAtNotReached"
 	};
-	const cardIndex = player.hand.findIndex((c) => c.id === cardId);
-	if (cardIndex === -1) return {
+	const card = player.hand.find((c) => c.id === cardId);
+	if (!card) return {
 		success: false,
 		error: "cardNotFound"
 	};
-	const otherPlayer = game.players.find((p) => p !== player);
-	const targetPile = isForOtherPlayerPile ? otherPlayer.centerPile : player.centerPile;
-	const card = player.hand[cardIndex];
-	if (!isCardPlayable(card, targetPile)) return {
+	const otherPlayer = requireOtherPlayer(game, player.id);
+	const targetPlayer = isForOtherPlayerPile ? otherPlayer : player;
+	if (!isCardPlayable(card, targetPlayer.centerPile)) return {
 		success: false,
 		error: "cardNotPlayable"
 	};
-	game.expiresAt = Date.now() + EXPIRY_EXTENSION_MS;
-	emitEvent(game, {
+	game = {
+		...game,
+		expiresAt: Date.now() + EXPIRY_EXTENSION_MS
+	};
+	game = emitEvent(game, {
 		type: "expirationUpdated",
 		expiresAt: game.expiresAt
 	});
-	player.hand.splice(cardIndex, 1);
-	targetPile.push(card);
-	emitEvent(game, {
+	game = updatePlayer(game, player.id, (p) => ({
+		...p,
+		hand: removeItemFromCollection(p.hand, card)
+	}));
+	game = updatePlayer(game, targetPlayer.id, (p) => ({
+		...p,
+		centerPile: addItemToCollection(p.centerPile, card)
+	}));
+	game = emitEvent(game, {
 		type: "cardPlayed",
 		username: player.username,
 		card,
 		isForOtherPlayerPile
 	});
-	if (otherPlayer.hasNoPlayableCards && hasPlayableCard(otherPlayer, game)) otherPlayer.hasNoPlayableCards = false;
-	if (player.hand.length === 0 && player.drawPile.length === 0) {
-		emitEvent(game, { type: "gameCompleted" });
-		return {
-			success: true,
-			game: {
-				...game,
-				status: "completed"
-			}
-		};
+	game = clearHasNoPlayableCardsIfNotApplicable(game, otherPlayer.id);
+	if (isOutOfCards(game, player.id)) {
+		game = transitionGameToCompleted(game);
+		game = emitEvent(game, { type: "gameCompleted" });
 	}
 	return {
 		success: true,
@@ -516,12 +557,63 @@ function playCard(game, playerId, cardId, isForOtherPlayerPile) {
 	};
 }
 //#endregion
-//#region src/game/lib/shuffleCards.ts
-function shuffleCards(cards) {
-	for (let i = cards.length - 1; i > 0; i--) {
-		const j = Math.floor(Math.random() * (i + 1));
-		[cards[i], cards[j]] = [cards[j], cards[i]];
-	}
+//#region src/game/lib/drawCardFromSidePileToCenterPile.ts
+function drawCardFromSidePileToCenterPile(game, playerId) {
+	const { player } = requirePlayer(game, playerId);
+	const { collection: newSidePile, item: card } = takeLastItemFromCollection(player.sidePile);
+	game = updatePlayer(game, player.id, (p) => ({
+		...p,
+		sidePile: newSidePile,
+		centerPile: addItemToCollection(p.centerPile, card)
+	}));
+	game = emitEvent(game, {
+		type: "cardDrawnFromSidePileToCenterPile",
+		username: player.username,
+		card
+	});
+	return game;
+}
+//#endregion
+//#region src/game/lib/initializeCenterPile.ts
+function initializeCenterPile(game, playerId, cards) {
+	const { player } = requirePlayer(game, playerId);
+	const card = cards[0];
+	if (!card) throw new Error("Not enough cards.");
+	cards = cards.slice(1);
+	game = updatePlayer(game, player.id, (p) => ({
+		...p,
+		centerPile: [card]
+	}));
+	game = emitEvent(game, {
+		type: "playerCenterPileInitialized",
+		username: player.username,
+		card
+	});
+	return {
+		game,
+		cards
+	};
+}
+//#endregion
+//#region src/game/lib/initializeSidePile.ts
+function initializeSidePile(game, playerId, cards) {
+	if (cards.length < 5) throw new Error("Not enough cards.");
+	const { player } = requirePlayer(game, playerId);
+	const sidePile = cards.slice(0, 5);
+	cards = cards.slice(5);
+	game = updatePlayer(game, player.id, (p) => ({
+		...p,
+		sidePile
+	}));
+	game = emitEvent(game, {
+		type: "playerSidePileInitialized",
+		username: player.username,
+		numCards: sidePile.length
+	});
+	return {
+		game,
+		cards
+	};
 }
 //#endregion
 //#region src/game/actions/reportNoPlayableCards.ts
@@ -543,7 +635,7 @@ function reportNoPlayableCards(game, playerId) {
 		success: false,
 		error: "alreadyReported"
 	};
-	if (hasPlayableCard(player, game)) return {
+	if (hasPlayableCard(game, player.id)) return {
 		success: false,
 		error: "hasPlayableCard"
 	};
@@ -551,61 +643,44 @@ function reportNoPlayableCards(game, playerId) {
 		success: false,
 		error: "canDraw"
 	};
-	game.expiresAt = Date.now() + EXPIRY_EXTENSION_MS;
-	emitEvent(game, {
+	game = {
+		...game,
+		expiresAt: Date.now() + EXPIRY_EXTENSION_MS
+	};
+	game = emitEvent(game, {
 		type: "expirationUpdated",
 		expiresAt: game.expiresAt
 	});
-	player.hasNoPlayableCards = true;
-	const otherPlayer = game.players.find((p) => p !== player);
+	game = updatePlayer(game, player.id, (p) => ({
+		...p,
+		hasNoPlayableCards: true
+	}));
+	const otherPlayer = requireOtherPlayer(game, player.id);
 	if (otherPlayer.hasNoPlayableCards) {
 		if (player.sidePile.length === 0 && otherPlayer.sidePile.length === 0) {
-			const cards = [...player.centerPile, ...otherPlayer.centerPile];
-			shuffleCards(cards);
-			player.sidePile.push(...cards.splice(0, 5));
-			emitEvent(game, {
-				type: "playerSidePileInitialized",
-				username: player.username,
-				numCards: player.sidePile.length
-			});
-			player.centerPile.push(...cards.splice(0, 1));
-			emitEvent(game, {
-				type: "playerCenterPileInitialized",
-				username: player.username,
-				card: player.centerPile[player.centerPile.length - 1]
-			});
-			otherPlayer.centerPile.push(...cards.splice(0, 1));
-			emitEvent(game, {
-				type: "playerCenterPileInitialized",
-				username: otherPlayer.username,
-				card: otherPlayer.centerPile[otherPlayer.centerPile.length - 1]
-			});
-			otherPlayer.sidePile.push(...cards.splice(0, 5));
-			emitEvent(game, {
-				type: "playerSidePileInitialized",
-				username: otherPlayer.username,
-				numCards: otherPlayer.sidePile.length
-			});
+			let cards = [...player.centerPile, ...otherPlayer.centerPile];
+			cards = shuffle(cards);
+			({game, cards} = initializeSidePile(game, player.id, cards));
+			({game, cards} = initializeCenterPile(game, player.id, cards));
+			({game, cards} = initializeCenterPile(game, otherPlayer.id, cards));
+			({game} = initializeSidePile(game, otherPlayer.id, cards));
 		} else {
-			const playerSidePileCard = player.sidePile.pop();
-			player.centerPile.push(playerSidePileCard);
-			emitEvent(game, {
-				type: "cardDrawnFromSidePileToCenterPile",
-				username: player.username,
-				card: playerSidePileCard
-			});
-			const otherPlayerSidePileCard = otherPlayer.sidePile.pop();
-			otherPlayer.centerPile.push(otherPlayerSidePileCard);
-			emitEvent(game, {
-				type: "cardDrawnFromSidePileToCenterPile",
-				username: otherPlayer.username,
-				card: otherPlayerSidePileCard
-			});
+			game = drawCardFromSidePileToCenterPile(game, player.id);
+			game = drawCardFromSidePileToCenterPile(game, otherPlayer.id);
 		}
-		player.hasNoPlayableCards = false;
-		otherPlayer.hasNoPlayableCards = false;
-		game.canPlayAt = Date.now() + CAN_PLAY_AT_DELAY_MS;
-		emitEvent(game, {
+		game = updatePlayer(game, player.id, (p) => ({
+			...p,
+			hasNoPlayableCards: false
+		}));
+		game = updatePlayer(game, otherPlayer.id, (p) => ({
+			...p,
+			hasNoPlayableCards: false
+		}));
+		game = {
+			...game,
+			canPlayAt: Date.now() + CAN_PLAY_AT_DELAY_MS
+		};
+		game = emitEvent(game, {
 			type: "canPlayAtUpdated",
 			canPlayAt: game.canPlayAt
 		});
@@ -616,6 +691,60 @@ function reportNoPlayableCards(game, playerId) {
 	};
 }
 //#endregion
+//#region src/game/lib/initializeDrawPile.ts
+function initializeDrawPile(game, playerId, cards) {
+	if (cards.length < 15) throw new Error("Not enough cards.");
+	const { player } = requirePlayer(game, playerId);
+	const drawPile = cards.slice(0, 15);
+	cards = cards.slice(15);
+	game = updatePlayer(game, player.id, (p) => ({
+		...p,
+		drawPile
+	}));
+	game = emitEvent(game, {
+		type: "playerDrawPileInitialized",
+		username: player.username,
+		numCards: drawPile.length
+	});
+	return {
+		game,
+		cards
+	};
+}
+//#endregion
+//#region src/game/lib/initializeHand.ts
+function initializeHand(game, playerId, cards) {
+	if (cards.length < 5) throw new Error("Not enough cards.");
+	const { player } = requirePlayer(game, playerId);
+	const hand = cards.slice(0, 5);
+	cards = cards.slice(5);
+	game = updatePlayer(game, player.id, (p) => ({
+		...p,
+		hand
+	}));
+	game = emitEventToPlayer(game, player.id, {
+		type: "handInitialized",
+		cards: hand
+	});
+	game = emitEvent(game, {
+		type: "playerHandInitialized",
+		username: player.username,
+		numCards: hand.length
+	});
+	return {
+		game,
+		cards
+	};
+}
+//#endregion
+//#region src/game/lib/transitionGameToStarted.ts
+function transitionGameToStarted(game) {
+	return {
+		...game,
+		status: "started"
+	};
+}
+//#endregion
 //#region src/game/actions/startGame.ts
 function startGame(game, playerId) {
 	const player = game.players.find((p) => p.id === playerId);
@@ -635,83 +764,38 @@ function startGame(game, playerId) {
 		success: false,
 		error: "minPlayersNotReached"
 	};
-	const otherPlayer = game.players[1];
-	const cards = [...CARDS];
-	shuffleCards(cards);
-	player.sidePile.push(...cards.splice(0, 5));
-	emitEvent(game, {
-		type: "playerSidePileInitialized",
-		username: player.username,
-		numCards: player.sidePile.length
-	});
-	player.centerPile.push(...cards.splice(0, 1));
-	emitEvent(game, {
-		type: "playerCenterPileInitialized",
-		username: player.username,
-		card: player.centerPile[player.centerPile.length - 1]
-	});
-	otherPlayer.centerPile.push(...cards.splice(0, 1));
-	emitEvent(game, {
-		type: "playerCenterPileInitialized",
-		username: otherPlayer.username,
-		card: otherPlayer.centerPile[otherPlayer.centerPile.length - 1]
-	});
-	otherPlayer.sidePile.push(...cards.splice(0, 5));
-	emitEvent(game, {
-		type: "playerSidePileInitialized",
-		username: otherPlayer.username,
-		numCards: otherPlayer.sidePile.length
-	});
-	player.drawPile.push(...cards.splice(0, 15));
-	emitEvent(game, {
-		type: "playerDrawPileInitialized",
-		username: player.username,
-		numCards: player.drawPile.length
-	});
-	player.hand.push(...cards.splice(0, 5));
-	emitEventToPlayer(player, {
-		type: "handInitialized",
-		cards: player.hand
-	});
-	emitEvent(game, {
-		type: "playerHandInitialized",
-		username: player.username,
-		numCards: player.hand.length
-	});
-	otherPlayer.drawPile.push(...cards.splice(0, 15));
-	emitEvent(game, {
-		type: "playerDrawPileInitialized",
-		username: otherPlayer.username,
-		numCards: otherPlayer.drawPile.length
-	});
-	otherPlayer.hand.push(...cards.splice(0, 5));
-	emitEventToPlayer(otherPlayer, {
-		type: "handInitialized",
-		cards: otherPlayer.hand
-	});
-	emitEvent(game, {
-		type: "playerHandInitialized",
-		username: otherPlayer.username,
-		numCards: otherPlayer.hand.length
-	});
-	const startedGame = {
+	game = transitionGameToStarted(game);
+	const otherPlayer = requireOtherPlayer(game, player.id);
+	let cards = [...CARDS];
+	cards = shuffle(cards);
+	({game, cards} = initializeSidePile(game, player.id, cards));
+	({game, cards} = initializeCenterPile(game, player.id, cards));
+	({game, cards} = initializeCenterPile(game, otherPlayer.id, cards));
+	({game, cards} = initializeSidePile(game, otherPlayer.id, cards));
+	({game, cards} = initializeDrawPile(game, player.id, cards));
+	({game, cards} = initializeHand(game, player.id, cards));
+	({game, cards} = initializeDrawPile(game, otherPlayer.id, cards));
+	({game} = initializeHand(game, otherPlayer.id, cards));
+	game = {
 		...game,
-		status: "started",
-		expiresAt: Date.now() + EXPIRY_EXTENSION_MS,
-		canPlayAt: Date.now() + CAN_PLAY_AT_DELAY_MS
+		expiresAt: Date.now() + EXPIRY_EXTENSION_MS
 	};
-	emitEvent(startedGame, { type: "gameStarted" });
-	emitEvent(startedGame, {
+	game = emitEvent(game, {
 		type: "expirationUpdated",
-		expiresAt: startedGame.expiresAt
+		expiresAt: game.expiresAt
 	});
-	emitEvent(startedGame, {
+	game = {
+		...game,
+		canPlayAt: Date.now() + CAN_PLAY_AT_DELAY_MS
+	};
+	game = emitEvent(game, {
 		type: "canPlayAtUpdated",
-		canPlayAt: startedGame.canPlayAt
+		canPlayAt: game.canPlayAt
 	});
+	game = emitEvent(game, { type: "gameStarted" });
 	return {
 		success: true,
-		game: startedGame
+		game
 	};
 }
 //#endregion
@@ -734,4 +818,4 @@ const createManager = createManagerFactory({
 //#endregion
 export { createManager as t };
 
-//# sourceMappingURL=manager-C8wqbmrE.mjs.map
+//# sourceMappingURL=manager-BNAk0ZFh.mjs.map