ZB-Server/EscapeFromTeacher
Private
Public Access
1
0
Fork 0
Code Activity

Add cache-busting for JS/WASM assets, WASM readiness signaling to JS, and robust fetch with cache control. Improve lobby updates and refine WebSocket logic.
Some checks failed
Dynamic Branch Deploy / build-and-deploy (push) Failing after 46s

Browse Source
This commit is contained in:
Sebastian Unterschütz
2026-01-04 20:13:56 +01:00
parent 98e955aad9
commit 24e21387d9
6 changed files with 93 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/client/connection_wasm.go
View File

@@ -81,8 +81,15 @@ func (g *Game) connectToServer() {
}
g.stateMutex.Lock()
oldPlayerCount := len(g.gameState.Players)
g.gameState = state
newPlayerCount := len(g.gameState.Players)
g.stateMutex.Unlock()
// Lobby-UI aktualisieren wenn sich Spieleranzahl geändert hat
if oldPlayerCount != newPlayerCount {
g.sendLobbyUpdateToJS()
}
}
case "leaderboard_response":
@@ -192,7 +199,8 @@ func (g *Game) sendInput(input game.ClientInput) {
// startGame sendet den Start-Befehl über WebSocket
func (g *Game) startGame() {
myID := g.getMyPlayerID()
// PlayerID ist der playerName (Server verwendet req.Name als PlayerID)
myID := g.playerName
msg := WebSocketMessage{
Type: "start",
Payload: game.StartRequest{

3
cmd/client/main_wasm.go
View File

@@ -18,6 +18,9 @@ func main() {
// JavaScript Bridge registrieren (für HTML-Menü Kommunikation)
game.setupJavaScriptBridge()
// Signal an JavaScript dass WASM vollständig geladen ist
game.notifyWasmReady()
// Spiel ohne eigenes Menü starten - HTML übernimmt das Menü
// Das Spiel wartet im Hintergrund bis startGame() von JavaScript aufgerufen wird
log.Println("⏳ Warte auf Start-Signal vom HTML-Menü...")

10
cmd/client/wasm_bridge.go
View File

@@ -10,6 +10,14 @@ import (
"time"
)
// notifyWasmReady signalisiert JavaScript dass WASM vollständig geladen ist
func (g *Game) notifyWasmReady() {
if readyFunc := js.Global().Get("onWasmReady"); !readyFunc.IsUndefined() {
readyFunc.Invoke()
log.Println("✅ WASM Ready-Signal an JavaScript gesendet")
}
}
// setupJavaScriptBridge registriert JavaScript-Funktionen für HTML-Menü Interaktion
func (g *Game) setupJavaScriptBridge() {
// startGame(mode, playerName, roomID, teamName, isHost)
@@ -107,6 +115,8 @@ func (g *Game) setupJavaScriptBridge() {
js.Global().Set("setTeamName_WASM", setTeamNameFunc)
log.Println("✅ JavaScript Bridge registriert")
log.Printf("🔍 window.startGame defined: %v", !js.Global().Get("startGame").IsUndefined())
log.Printf("🔍 window.startGameFromLobby_WASM defined: %v", !js.Global().Get("startGameFromLobby_WASM").IsUndefined())
}
// Leaderboard an JavaScript senden

74
cmd/client/web/game.js
View File

@@ -216,27 +216,65 @@ function requestLeaderboardDirect() {
setTimeout(() => clearInterval(checkAndRequest), 3000);
}
// Callback von WASM wenn vollständig geladen
window.onWasmReady = function() {
console.log('✅ WASM fully initialized');
wasmReady = true;
// Switch to menu state
setUIState(UIState.MENU);
// Enable all start buttons
enableStartButtons();
// Load initial leaderboard via direct WebSocket
setTimeout(() => {
requestLeaderboardDirect();
}, 500);
};
// Cache Management - Version wird bei jedem Build aktualisiert
const CACHE_VERSION = 1767553871926; // Wird durch Build-Prozess ersetzt
// Fetch mit Cache-Busting
async function fetchWithCache(url) {
const cacheBustedUrl = `${url}?v=${CACHE_VERSION}`;
console.log(`📦 Loading: ${cacheBustedUrl}`);
try {
const response = await fetch(cacheBustedUrl, {
cache: 'no-cache', // Immer vom Server holen wenn Version neu ist
headers: {
'Cache-Control': 'no-cache, no-store, must-revalidate',
'Pragma': 'no-cache'
}
});
if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${response.statusText}`);
}
return response;
} catch (err) {
console.error(`❌ Failed to fetch ${url}:`, err);
throw err;
}
}
// Initialize WASM
async function initWASM() {
const go = new Go();
try {
const result = await WebAssembly.instantiateStreaming(fetch("main.wasm"), go.importObject);
console.log(`🚀 Loading WASM (Cache Version: ${CACHE_VERSION})...`);
// WASM mit Cache-Busting laden
const response = await fetchWithCache("main.wasm");
const result = await WebAssembly.instantiateStreaming(response, go.importObject);
go.run(result.instance);
wasmReady = true;
// Switch to menu state
setUIState(UIState.MENU);
// Enable all start buttons
enableStartButtons();
console.log('✅ WASM loaded successfully');
// Load initial leaderboard via direct WebSocket
setTimeout(() => {
requestLeaderboardDirect();
}, 500);
// WICHTIG: wasmReady wird erst in onWasmReady() gesetzt, nicht hier!
console.log('✅ WASM runtime started, waiting for full initialization...');
} catch (err) {
console.error('❌ Failed to load WASM:', err);
document.getElementById('loading').innerHTML = '<div class="spinner"></div><p>Fehler beim Laden: ' + err.message + '</p>';
@@ -322,7 +360,10 @@ function createRoom() {
// Trigger WASM game start (im Hintergrund)
if (window.startGame) {
console.log('🎮 Calling window.startGame with:', 'coop', playerName, roomID, teamName, true);
window.startGame('coop', playerName, roomID, teamName, true);
} else {
console.error('❌ window.startGame is not defined!');
}
console.log('🎮 Room created:', roomID);
@@ -358,7 +399,10 @@ function joinRoom() {
// Trigger WASM game start (im Hintergrund)
if (window.startGame) {
console.log('🎮 Calling window.startGame with:', 'coop', playerName, roomID, teamName, false);
window.startGame('coop', playerName, roomID, teamName, false);
} else {
console.error('❌ window.startGame is not defined!');
}
console.log('🎮 Joining room:', roomID);

8
cmd/client/web/index.html
View File

@@ -289,8 +289,12 @@
</div>
<!-- WASM Execution -->
<script src="wasm_exec.js"></script>
<script src="game.js"></script>
<script>
// Cache-Busting für JavaScript-Dateien (wird beim Build aktualisiert)
const BUILD_VERSION = 1767553871926;
document.write('<script src="wasm_exec.js?v=' + BUILD_VERSION + '"><\/script>');
document.write('<script src="game.js?v=' + BUILD_VERSION + '"><\/script>');
</script>
</body>
</html>