fix: ajout de protection anti-mauvais chargement de voix
This commit is contained in:
@@ -1,12 +1,69 @@
|
|||||||
/*
|
/*
|
||||||
guideVoice.js
|
guideVoice.js
|
||||||
|
|
||||||
vocalise les instructions recue du serveur via la synthese vocal du navigateur
|
Vocalise les instructions recues du serveur via la synthese vocale du navigateur
|
||||||
*/
|
*/
|
||||||
|
|
||||||
export function speakInstruction(texte) {
|
let currentUtterance = null;
|
||||||
speechSynthesis.cancel();
|
let voixChoisie = null;
|
||||||
const enonce = new SpeechSynthesisUtterance(texte);
|
let voixPretes = false;
|
||||||
enonce.lang = "fr-FR";
|
let texteEnAttente = null;
|
||||||
speechSynthesis.speak(enonce);
|
|
||||||
|
const NOM_VOIX_PREFERE = "French (France)+female1";
|
||||||
|
|
||||||
|
function resoudreVoix() {
|
||||||
|
if (voixPretes) return; // deja fait, evite le travail en double
|
||||||
|
|
||||||
|
const voix = speechSynthesis.getVoices();
|
||||||
|
if (voix.length === 0) return; // toujours pas chargees
|
||||||
|
|
||||||
|
voixChoisie =
|
||||||
|
voix.find(v => v.name === NOM_VOIX_PREFERE) ||
|
||||||
|
voix.find(v => v.lang.startsWith("fr")) ||
|
||||||
|
voix[0];
|
||||||
|
|
||||||
|
voixPretes = true;
|
||||||
|
console.log("Voix sélectionnée:", voixChoisie?.name);
|
||||||
|
|
||||||
|
if (texteEnAttente) {
|
||||||
|
const texte = texteEnAttente;
|
||||||
|
texteEnAttente = null;
|
||||||
|
jouer(texte);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Piste 1 : l'event, au cas ou il se declenche sur d'autres navigateurs
|
||||||
|
speechSynthesis.onvoiceschanged = resoudreVoix;
|
||||||
|
|
||||||
|
// Piste 2 : sondage en secours, car onvoiceschanged n'est pas fiable sur Firefox/LibreWolf
|
||||||
|
const intervalleSondage = setInterval(() => {
|
||||||
|
resoudreVoix();
|
||||||
|
if (voixPretes) clearInterval(intervalleSondage);
|
||||||
|
}, 200);
|
||||||
|
|
||||||
|
resoudreVoix(); // au cas ou les voix sont deja dispo au chargement du module
|
||||||
|
|
||||||
|
function jouer(texte) {
|
||||||
|
if (speechSynthesis.speaking) {
|
||||||
|
speechSynthesis.cancel();
|
||||||
|
}
|
||||||
|
|
||||||
|
currentUtterance = new SpeechSynthesisUtterance(texte);
|
||||||
|
currentUtterance.voice = voixChoisie;
|
||||||
|
currentUtterance.lang = "fr-FR";
|
||||||
|
currentUtterance.onstart = () => console.log("Lecture démarrée");
|
||||||
|
currentUtterance.onend = () => console.log("Lecture terminée");
|
||||||
|
currentUtterance.onerror = (e) => console.error("Erreur synthèse:", e.error, e);
|
||||||
|
|
||||||
|
speechSynthesis.speak(currentUtterance);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function speakInstruction(texte) {
|
||||||
|
if (!voixPretes) {
|
||||||
|
console.log("Voix pas encore prêtes, mise en attente:", texte);
|
||||||
|
texteEnAttente = texte;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
jouer(texte);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { roleState } from "./role.js";
|
|||||||
import { render, drawBlind } from "./canvas.js";
|
import { render, drawBlind } from "./canvas.js";
|
||||||
import { setupMovement } from "./movement.js";
|
import { setupMovement } from "./movement.js";
|
||||||
import { showGameOver, showVictory, updateTimerDisplay } from "./ui.js";
|
import { showGameOver, showVictory, updateTimerDisplay } from "./ui.js";
|
||||||
import { speakInstruction} from "guideVoice.js";
|
import { speakInstruction} from "./guideVoice.js";
|
||||||
|
|
||||||
setupMovement();
|
setupMovement();
|
||||||
|
|
||||||
@@ -51,5 +51,6 @@ socket.on("timer", (timeLeft) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
socket.on("instruction", (data) => {
|
socket.on("instruction", (data) => {
|
||||||
|
console.log("Payload recu", data);
|
||||||
speakInstruction(data.texte);
|
speakInstruction(data.texte);
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ const INSTRUCTION_GUIDE = "instruction";
|
|||||||
const INSTRUCTION_INTERVAL_MS = 5000;
|
const INSTRUCTION_INTERVAL_MS = 5000;
|
||||||
|
|
||||||
|
|
||||||
function startInstructionLoop(wSS, socket, partnerSocket, pairState, getInstructionTexte) {
|
function startInstructionLoop(wSS, socket, partnerSocket, pairState, getInstructionText) {
|
||||||
const interval = setInterval(() => {
|
const interval = setInterval(() => {
|
||||||
if (pairState.gameOver) {
|
if (pairState.gameOver) {
|
||||||
clearInterval(interval);
|
clearInterval(interval);
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ const gameState = require("./gameState");
|
|||||||
const { GAME_DURATION } = require("./config");
|
const { GAME_DURATION } = require("./config");
|
||||||
const { handleDoorReached } = require("./doorLogic");
|
const { handleDoorReached } = require("./doorLogic");
|
||||||
const { startTimer } = require("./timer");
|
const { startTimer } = require("./timer");
|
||||||
const { startInstruction } = require("./guideInstruction");
|
const { startInstructionLoop } = require("./guideInstruction");
|
||||||
|
|
||||||
function registerSocketHandlers(wSS, socket) {
|
function registerSocketHandlers(wSS, socket) {
|
||||||
console.log(`Un client s'est connecté : ${socket.id}`);
|
console.log(`Un client s'est connecté : ${socket.id}`);
|
||||||
@@ -39,7 +39,7 @@ function registerSocketHandlers(wSS, socket) {
|
|||||||
partner.emit("status", "Partie prête !");
|
partner.emit("status", "Partie prête !");
|
||||||
|
|
||||||
startTimer(socket, partner, pairState);
|
startTimer(socket, partner, pairState);
|
||||||
startInstructionLoop(io, socket , partner, pairState, () => {
|
startInstructionLoop(wSS, socket , partner, pairState, () => {
|
||||||
return "Descendre de quatre cases, aller a droite de une case, descendre de 1 case";
|
return "Descendre de quatre cases, aller a droite de une case, descendre de 1 case";
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user