Add manual triggering of game sounds to Field Testing page.

web/setup_field_testing.go

@@ -6,8 +6,12 @@
 package web
 
 import (
+	"fmt"
+	"github.com/Team254/cheesy-arena/game"
 	"github.com/Team254/cheesy-arena/model"
 	"github.com/Team254/cheesy-arena/websocket"
+	"io"
+	"log"
 	"net/http"
 )
 
@@ -25,10 +29,11 @@ func (web *Web) fieldTestingGetHandler(w http.ResponseWriter, r *http.Request) {
 	plc := web.arena.Plc
 	data := struct {
 		*model.EventSettings
+		MatchSounds   []*game.MatchSound
 		InputNames    []string
 		RegisterNames []string
 		CoilNames     []string
-	}{web.arena.EventSettings, plc.GetInputNames(), plc.GetRegisterNames(), plc.GetCoilNames()}
+	}{web.arena.EventSettings, game.MatchSounds, plc.GetInputNames(), plc.GetRegisterNames(), plc.GetCoilNames()}
 	err = template.ExecuteTemplate(w, "base", data)
 	if err != nil {
 		handleWebErr(w, err)
@@ -49,6 +54,32 @@ func (web *Web) fieldTestingWebsocketHandler(w http.ResponseWriter, r *http.Requ
 	}
 	defer ws.Close()
 
-	// Subscribe the websocket to the notifiers whose messages will be passed on to the client.
-	ws.HandleNotifiers(web.arena.Plc.IoChangeNotifier)
+	// Subscribe the websocket to the notifiers whose messages will be passed on to the client, in a separate goroutine.
+	go ws.HandleNotifiers(web.arena.Plc.IoChangeNotifier)
+
+	// Loop, waiting for commands and responding to them, until the client closes the connection.
+	for {
+		messageType, data, err := ws.Read()
+		if err != nil {
+			if err == io.EOF {
+				// Client has closed the connection; nothing to do here.
+				return
+			}
+			log.Println(err)
+			return
+		}
+
+		switch messageType {
+		case "playSound":
+			sound, ok := data.(string)
+			if !ok {
+				ws.WriteError(fmt.Sprintf("Failed to parse '%s' message.", messageType))
+				continue
+			}
+			web.arena.PlaySoundNotifier.NotifyWithMessage(sound)
+		default:
+			ws.WriteError(fmt.Sprintf("Invalid message type '%s'.", messageType))
+			continue
+		}
+	}
 }

web/setup_field_testing_test.go

@@ -4,12 +4,23 @@
 package web
 
 import (
+	"github.com/Team254/cheesy-arena/game"
 	"github.com/Team254/cheesy-arena/websocket"
 	gorillawebsocket "github.com/gorilla/websocket"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
+func TestSetupFieldTesting(t *testing.T) {
+	web := setupTestWeb(t)
+
+	recorder := web.getHttpResponse("/setup/field_testing")
+	assert.Equal(t, 200, recorder.Code)
+	for _, sound := range game.MatchSounds {
+		assert.Contains(t, recorder.Body.String(), sound.Name)
+	}
+}
+
 func TestSetupFieldTestingWebsocket(t *testing.T) {
 	web := setupTestWeb(t)
 
@@ -22,4 +33,14 @@ func TestSetupFieldTestingWebsocket(t *testing.T) {
 
 	// Should get a few status updates right after connection.
 	readWebsocketType(t, ws, "plcIoChange")
+
+	// Also create a websocket to the audience display to check that it plays the requested game sound.
+	audienceConn, _, err := gorillawebsocket.DefaultDialer.Dial(wsUrl+"/displays/audience/websocket?displayId=1", nil)
+	assert.Nil(t, err)
+	defer audienceConn.Close()
+	audienceWs := websocket.NewTestWebsocket(audienceConn)
+	readWebsocketMultiple(t, audienceWs, 9)
+
+	ws.Write("playSound", "resume")
+	assert.Equal(t, "resume", readWebsocketType(t, audienceWs, "playSound"))
 }

web/web.go

@@ -13,6 +13,7 @@ import (
 	"log"
 	"net/http"
 	"path/filepath"
+	"strings"
 	"text/template"
 )
 
@@ -59,6 +60,9 @@ func NewWeb(arena *field.Arena) *Web {
 			}
 			return seq
 		},
+		"toUpper": func(str string) string {
+			return strings.ToUpper(str)
+		},
 	}
 
 	return web