WebsiteProjects/ToneGuessr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix audio not playing

Browse Source
This commit is contained in:
Mathias Wagner
2025-03-01 00:32:03 +01:00
parent 7d7dd263fe
commit 87fc9a2f39
4 changed files with 372 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

222
server/handler/connection.js
View File

@ -4,7 +4,6 @@ const gameController = require("../controller/game");
module.exports = (io) => (socket) => {
let currentRoomId = null;
let currentUser = null;
let phaseTimers = {};
const clearRoomTimers = (roomId) => {
@ -18,62 +17,75 @@ module.exports = (io) => (socket) => {
clearRoomTimers(roomId);
const timeRemaining = gameController.getTimeRemaining(roomId) * 1000;
phaseTimers[roomId] = setTimeout(() => {
const advanced = gameController.advancePhase(roomId);
if (advanced) {
if (!advanced) return;
if (typeof advanced === 'boolean') {
handleRoundStart(roomId);
} else {
const currentPhase = advanced.phase || 'results';
if (currentPhase === 'guessing') {
const roles = gameController.getRoles(roomId);
const songOptions = gameController.getSongOptions(roomId);
const timeLeft = gameController.getTimeRemaining(roomId);
Object.entries(roles).forEach(([userId, role]) => {
if (role === 'guesser') {
io.to(userId).emit('guessing-phase-started', {
timeRemaining: timeLeft,
songOptions
});
}
});
startPhaseTimer(roomId);
}
else if (currentPhase === 'results') {
const results = gameController.getRoundResults(roomId);
io.to(roomId).emit('round-results', results);
}
else if (typeof advanced === 'boolean' && advanced) {
const roles = gameController.getRoles(roomId);
const selectedSong = gameController.getSelectedSong(roomId);
const timeLeft = gameController.getTimeRemaining(roomId);
io.to(roomId).emit('roles-assigned', roles);
Object.entries(roles).forEach(([userId, role]) => {
if (role === 'composer') {
io.to(userId).emit('song-selected', selectedSong);
}
});
io.to(roomId).emit('round-started', {
round: gameController.getRoundResults(roomId).round,
timeRemaining: timeLeft
});
startPhaseTimer(roomId);
handleGuessingPhaseStart(roomId);
} else if (currentPhase === 'results') {
handleResultsPhaseStart(roomId);
}
}
}, timeRemaining);
};
const handleRoundStart = (roomId) => {
const roles = gameController.getRoles(roomId);
const selectedSong = gameController.getSelectedSong(roomId);
const timeLeft = gameController.getTimeRemaining(roomId);
io.to(roomId).emit('roles-assigned', roles);
Object.entries(roles).forEach(([userId, role]) => {
if (role === 'composer') {
io.to(userId).emit('song-selected', selectedSong);
}
});
io.to(roomId).emit('round-started', {
round: gameController.getRoundResults(roomId).round,
timeRemaining: timeLeft
});
startPhaseTimer(roomId);
};
const handleGuessingPhaseStart = (roomId) => {
const roles = gameController.getRoles(roomId);
const songOptions = gameController.getSongOptions(roomId);
const timeLeft = gameController.getTimeRemaining(roomId);
Object.entries(roles).forEach(([userId, role]) => {
if (role === 'guesser') {
io.to(userId).emit('guessing-phase-started', {
timeRemaining: timeLeft,
songOptions
});
}
});
startPhaseTimer(roomId);
};
const handleResultsPhaseStart = (roomId) => {
const results = gameController.getRoundResults(roomId);
io.to(roomId).emit('round-results', results);
};
socket.on("disconnect", () => {
const roomId = roomController.getUserRoom(socket.id);
if (roomId) socket.to(roomId).emit("user-disconnected", socket.id);
roomController.disconnectUser(socket.id);
if (roomId) {
socket.to(roomId).emit("user-disconnected", socket.id);
roomController.disconnectUser(socket.id);
}
});
socket.on("join-room", ({roomId, name}) => {
@ -92,7 +104,6 @@ module.exports = (io) => (socket) => {
const users = roomController.getRoomUsers(roomId);
io.to(roomId).emit("room-users-update", users);
socket.to(roomId).emit("user-connected", currentUser);
socket.emit("room-joined", roomId);
@ -104,6 +115,7 @@ module.exports = (io) => (socket) => {
socket.on("create-room", ({name}) => {
if (!name) return socket.emit("room-name-required");
const roomId = Math.random().toString(36).substring(7).toUpperCase();
currentUser = {id: socket.id, name: name?.toString(), creator: true};
roomController.connectUserToRoom(roomId, currentUser);
@ -114,51 +126,32 @@ module.exports = (io) => (socket) => {
socket.on("start-game", () => {
const roomId = roomController.getUserRoom(socket.id);
if (roomId && roomController.isUserHost(socket.id)) {
roomController.validateRoomMembers(io, roomId);
const roomUsers = roomController.getRoomUsers(roomId);
if (roomController.startGame(roomId)) {
gameController.initializeGameState(roomId);
if (gameController.startNewRound(roomId)) {
const roles = gameController.getRoles(roomId);
const selectedSong = gameController.getSelectedSong(roomId);
io.to(roomId).emit("game-started");
io.to(roomId).emit("roles-assigned", roles);
Object.entries(roles).forEach(([userId, role]) => {
if (role === 'composer') {
io.to(userId).emit("song-selected", selectedSong);
}
});
io.to(roomId).emit("round-started", {
round: 1,
timeRemaining: gameController.getTimeRemaining(roomId)
});
startPhaseTimer(roomId);
}
} else {
socket.emit("not-authorized");
}
if (!roomId || !roomController.isUserHost(socket.id)) {
return socket.emit("not-authorized");
}
roomController.validateRoomMembers(io, roomId);
const users = roomController.getRoomUsers(roomId);
if (users.length < 2) {
return socket.emit("error", { message: "At least 2 players are required" });
}
if (!roomController.startGame(roomId)) return;
gameController.initializeGameState(roomId);
if (!gameController.startNewRound(roomId)) return;
io.to(roomId).emit("game-started");
handleRoundStart(roomId);
});
socket.on("send-message", (messageData) => {
const roomId = roomController.getUserRoom(socket.id);
if (roomId) {
socket.to(roomId).emit("chat-message", messageData);
}
if (roomId) socket.to(roomId).emit("chat-message", messageData);
});
socket.on("get-user-info", () => {
if (currentUser) {
socket.emit("user-info", currentUser);
}
if (currentUser) socket.emit("user-info", currentUser);
});
socket.on("get-room-users", () => {
@ -170,72 +163,55 @@ module.exports = (io) => (socket) => {
});
socket.on("check-host-status", () => {
const isHost = roomController.isUserHost(socket.id);
socket.emit("host-status", { isHost });
socket.emit("host-status", { isHost: roomController.isUserHost(socket.id) });
});
socket.on("get-room-code", () => {
if (currentRoomId) {
socket.emit("room-code", currentRoomId);
}
if (currentRoomId) socket.emit("room-code", currentRoomId);
});
socket.on("submit-frequency", ({ frequency }) => {
const roomId = roomController.getUserRoom(socket.id);
if (!roomId) return;
const userRole = gameController.getUserRole(roomId, socket.id);
if (userRole === 'composer') {
if (gameController.updateFrequency(roomId, frequency)) {
socket.to(roomId).emit("frequency-update", { frequency });
}
if (userRole !== 'composer') return;
if (gameController.updateFrequency(roomId, frequency)) {
socket.to(roomId).emit("frequency-update", { frequency });
}
});
socket.on("submit-guess", ({ songId }) => {
const roomId = roomController.getUserRoom(socket.id);
if (!roomId) return;
const result = gameController.submitGuess(roomId, socket.id, songId);
if (result) {
socket.emit("guess-result", result);
}
if (result) socket.emit("guess-result", result);
});
socket.on("next-round", () => {
const roomId = roomController.getUserRoom(socket.id);
if (!roomId || !roomController.isUserHost(socket.id)) return;
roomController.validateRoomMembers(io, roomId);
const roomUsers = roomController.getRoomUsers(roomId);
const users = roomController.getRoomUsers(roomId);
if (users.length < 2) {
return socket.emit("error", { message: "At least 2 players are required" });
}
if (gameController.startNewRound(roomId)) {
const roles = gameController.getRoles(roomId);
const selectedSong = gameController.getSelectedSong(roomId);
const timeLeft = gameController.getTimeRemaining(roomId);
io.to(roomId).emit("roles-assigned", roles);
Object.entries(roles).forEach(([userId, role]) => {
if (role === 'composer') {
io.to(userId).emit("song-selected", selectedSong);
}
});
io.to(roomId).emit("round-started", {
round: gameController.getRoundResults(roomId).round,
timeRemaining: timeLeft
});
startPhaseTimer(roomId);
handleRoundStart(roomId);
}
});
socket.on("get-current-frequency", () => {
const roomId = roomController.getUserRoom(socket.id);
if (!roomId) return;
const frequency = gameController.getCurrentFrequency(roomId);
socket.emit("current-frequency", { frequency });
if (roomId) {
socket.emit("current-frequency", {
frequency: gameController.getCurrentFrequency(roomId)
});
}
});
};