y no ui

src/device/input/button/button.go

@@ -1,6 +1,12 @@
 package button
 
+import "fmt"
+
 type Button struct {
 	Char byte
 	Down bool
 }
+
+func (button Button) String() string {
+	return fmt.Sprintf("%c:%v", button.Char, button.Down)
+}

src/device/input/parse/v01/config.go

@@ -9,11 +9,16 @@ import (
 
 type (
 	config struct {
-		lock     *sync.Mutex
-		Feedback configFeedback
-		Users    map[string]configUser
-		Players  []configPlayer
-		Quiet    bool
+		lock      *sync.Mutex
+		Feedback  configFeedback
+		Users     map[string]configUser
+		Players   []configPlayer
+		Quiet     bool
+		Broadcast configBroadcast
+	}
+
+	configBroadcast struct {
+		Message string
 	}
 
 	configFeedback struct {

src/device/input/parse/v01/server.go

@@ -77,11 +77,28 @@ func (v01 *V01) serveHTTP(w http.ResponseWriter, r *http.Request) {
 }
 
 func (v01 *V01) getUserFeedback(w http.ResponseWriter, r *http.Request) {
-	user, ok := v01.cfg.Users[r.URL.Query().Get("user")]
-	if !ok {
-		user = v01.cfg.Users["broadcast"]
+	user := v01.cfg.Users[r.URL.Query().Get("user")]
+
+	msg := user.State.Message
+	if msg == "" {
+		msg = v01.cfg.Broadcast.Message
+	}
+
+	alias := user.State.GM.Alias
+	if alias == "" {
+		alias = user.State.GM.LastAlias
+	}
+	if alias != "" {
+		msg = fmt.Sprintf("%s (Your secret word is '%s'. Make **someone else** say it!)", msg, alias)
+	}
+
+	w.Write([]byte(msg + "\n\n"))
+	v01.serveGMStatus(w)
+
+	if v01.cfg.Quiet {
+		w.Write([]byte("\n\n"))
+		v01.serveGMVoteRead(w)
 	}
-	w.Write([]byte(user.State.Message))
 }
 
 func (v01 *V01) servePutBroadcast(w http.ResponseWriter, r *http.Request) {
@@ -90,9 +107,7 @@ func (v01 *V01) servePutBroadcast(w http.ResponseWriter, r *http.Request) {
 }
 
 func (v01 *V01) servePutBroadcastValue(v string) {
-	u := v01.cfg.Users["broadcast"]
-	u.State.Message = v
-	v01.cfg.Users["broadcast"] = u
+	v01.cfg.Broadcast.Message = v
 }
 
 func (v01 *V01) serveConfig(w http.ResponseWriter, r *http.Request) {
@@ -161,7 +176,7 @@ func (v01 *V01) serveGlobalQueryRefresh(r *http.Request) {
 func (v01 *V01) serveGM(w http.ResponseWriter, r *http.Request) {
 	switch r.URL.Path {
 	case "/gm/rpc/status":
-		v01.serveGMStatus(w, r)
+		v01.serveGMStatus(w)
 	case "/gm/rpc/broadcastSomeoneSaidAlias":
 		v01.serveGMSomeoneSaidAlias(w, r)
 	case "/gm/rpc/fillNonPlayerAliases":
@@ -183,25 +198,29 @@ func (v01 *V01) serveGM(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func (v01 *V01) serveGMStatus(w http.ResponseWriter, r *http.Request) {
-	users := map[string]struct {
-		Lag     time.Duration `yaml:"lag,omitempty"`
-		Player  int           `yaml:"player,omitempty"`
-		IdleFor time.Duration `yaml:"idle_for,omitempty"`
-	}{}
+func (v01 *V01) serveGMStatus(w io.Writer) {
+	users := map[string]string{}
 	for k, v := range v01.cfg.Users {
-		v2 := users[k]
-		v2.Lag = time.Duration(v.Meta.LastLag) * time.Millisecond
-		v2.Player = v.State.Player
-		if v.Meta.LastTSMS > 0 {
-			v2.IdleFor = time.Since(time.Unix(0, v.Meta.LastTSMS*int64(time.Millisecond)))
+		result := ""
+
+		if v.State.Player > 0 {
+			result += fmt.Sprintf("Player %v ", v.State.Player)
 		}
-		users[k] = v2
+
+		if ms := time.Duration(v.Meta.LastLag) * time.Millisecond; v.Meta.LastLag > 0 && ms < time.Minute {
+			result += fmt.Sprintf("%s ", ms.String())
+		}
+
+		if result == "" {
+			result = "..."
+		}
+		users[k] = result
 	}
-	yaml.NewEncoder(w).Encode(map[string]interface{}{
+	b, _ := yaml.Marshal(map[string]interface{}{
 		"Players": len(v01.cfg.Players),
 		"Users":   users,
 	})
+	w.Write(b)
 }
 
 func (v01 *V01) serveGMSomeoneSaidAlias(w http.ResponseWriter, r *http.Request) {
@@ -282,28 +301,36 @@ func (v01 *V01) serveGMElect(w http.ResponseWriter, r *http.Request) {
 func (v01 *V01) serveGMVote(w http.ResponseWriter, r *http.Request) {
 	switch r.URL.Query().Get("payload") {
 	case "":
-		counts := map[string]string{}
-		for k, v := range v01.cfg.Users {
-			if v.State.GM.Vote != "" {
-				counts[k] = "voted"
-			} else {
-				counts[k] = "voting"
-			}
-		}
-		yaml.NewEncoder(w).Encode(counts)
+		v01.serveGMVoteRead(w)
 	default:
-		voter := r.URL.Query().Get("user")
-		candidate := r.URL.Query().Get("payload")
-		v, ok := v01.cfg.Users[voter]
-		if _, ok2 := v01.cfg.Users[candidate]; !ok || !ok2 {
-			http.Error(w, "bad voter/candidate", http.StatusBadRequest)
-			return
-		}
-		v.State.GM.Vote = candidate
-		v01.cfg.Users[voter] = v
+		v01.serveGMVoteWrite(w, r)
 	}
 }
 
+func (v01 *V01) serveGMVoteRead(w io.Writer) {
+	counts := map[string]string{}
+	for k, v := range v01.cfg.Users {
+		if v.State.GM.Vote != "" {
+			counts[k] = "voted"
+		} else {
+			counts[k] = "voting"
+		}
+	}
+	yaml.NewEncoder(w).Encode(counts)
+}
+
+func (v01 *V01) serveGMVoteWrite(w http.ResponseWriter, r *http.Request) {
+	voter := r.URL.Query().Get("user")
+	candidate := r.URL.Query().Get("payload")
+	v, ok := v01.cfg.Users[voter]
+	if _, ok2 := v01.cfg.Users[candidate]; !ok || !ok2 {
+		http.Error(w, "bad voter/candidate", http.StatusBadRequest)
+		return
+	}
+	v.State.GM.Vote = candidate
+	v01.cfg.Users[voter] = v
+}
+
 func (v01 *V01) serveGMShuffle(r *http.Request) {
 	poolSize := len(v01.cfg.Users)
 	if altSize := len(v01.cfg.Players); altSize > poolSize {

src/device/input/parse/v01/server_test.go

@@ -183,10 +183,8 @@ func TestServeGM(t *testing.T) {
 				},
 				Message: "if someone else says 'driver', then you get to play",
 			}},
-			"broadcast": configUser{State: configUserState{
-				Message: ":)",
-			}},
 		}
+		v01.cfg.Broadcast.Message = ":)"
 		do(v01, "/gm/rpc/broadcastSomeoneSaidAlias", "")
 		if !v01.cfg.Quiet {
 			t.Error(v01.cfg.Quiet)
@@ -196,7 +194,7 @@ func TestServeGM(t *testing.T) {
 		} else if v.State.GM.LastAlias != "driver" {
 			t.Error(v.State.GM.LastAlias)
 		}
-		if bc := v01.cfg.Users["broadcast"]; bc.State.Message == ":)" {
+		if bc := v01.cfg.Broadcast.Message; bc == ":)" {
 			t.Error(bc)
 		}
 	})
@@ -342,8 +340,8 @@ func TestServeGM(t *testing.T) {
 			} else if v01.cfg.Users["zach"].State.Player != 1 {
 				t.Error(v01.cfg.Users["zach"].State.Player)
 			}
-			if v01.cfg.Users["broadcast"].State.Message != `bel is now player 0 and zach is now player 1` {
-				t.Error(v01.cfg.Users["broadcast"].State.Message)
+			if v01.cfg.Broadcast.Message != `bel is now player 0 and zach is now player 1` {
+				t.Error(v01.cfg.Broadcast)
 			}
 		})
 
@@ -367,8 +365,8 @@ func TestServeGM(t *testing.T) {
 			} else if result["zach"] != 1 {
 				t.Error(result)
 			}
-			if !strings.HasSuffix(v01.cfg.Users["broadcast"].State.Message, `is now player 1`) || strings.Contains(v01.cfg.Users["broadcast"].State.Message, ",") {
-				t.Error(v01.cfg.Users["broadcast"].State.Message)
+			if !strings.HasSuffix(v01.cfg.Broadcast.Message, `is now player 1`) || strings.Contains(v01.cfg.Broadcast.Message, ",") {
+				t.Error(v01.cfg.Broadcast.Message)
 			}
 			assignments := map[int]int{}
 			for _, v := range v01.cfg.Users {
@@ -376,7 +374,7 @@ func TestServeGM(t *testing.T) {
 			}
 			if len(assignments) != 2 {
 				t.Error(assignments)
-			} else if assignments[0] != 3 {
+			} else if assignments[0] != 2 {
 				t.Error(assignments[0])
 			} else if assignments[1] != 1 {
 				t.Error(assignments[1])
@@ -402,8 +400,8 @@ func TestServeGM(t *testing.T) {
 			} else if result["zach"] != 1 {
 				t.Error(result)
 			}
-			if !strings.HasSuffix(v01.cfg.Users["broadcast"].State.Message, `is now player 1`) || strings.Contains(v01.cfg.Users["broadcast"].State.Message, ",") {
-				t.Error(v01.cfg.Users["broadcast"].State.Message)
+			if bc := v01.cfg.Broadcast.Message; !strings.HasSuffix(bc, `is now player 1`) || strings.Contains(bc, ",") {
+				t.Error(bc)
 			}
 			assignments := map[int]int{}
 			for _, v := range v01.cfg.Users {
@@ -411,7 +409,7 @@ func TestServeGM(t *testing.T) {
 			}
 			if len(assignments) != 2 {
 				t.Error(assignments)
-			} else if assignments[0] != 2 {
+			} else if assignments[0] != 1 {
 				t.Error(assignments[0])
 			} else if assignments[1] != 1 {
 				t.Error(assignments[1])
@@ -433,7 +431,7 @@ func TestServeGM(t *testing.T) {
 				if v01.cfg.Quiet {
 					t.Error(v01.cfg.Quiet)
 				}
-				if len(v01.cfg.Users) != 3 {
+				if len(v01.cfg.Users) != 2 {
 					t.Error(v01.cfg.Users)
 				} else if len(v01.cfg.Players) != 2 {
 					t.Error(v01.cfg.Users)
@@ -482,7 +480,7 @@ func TestServeGM(t *testing.T) {
 					t.Error(v01.cfg.Quiet)
 				}
 
-				if len(v01.cfg.Users) != c.users+1 {
+				if len(v01.cfg.Users) != c.users {
 					t.Error(v01.cfg.Users)
 				} else if len(v01.cfg.Players) != c.players {
 					t.Error(v01.cfg.Users)

src/device/input/parse/v01/testdata/v01.yaml

@@ -1,6 +1,8 @@
 feedback:
   addr: :17071
   ttsurl: http://localhost:15002
+broadcast:
+  message: hi
 users:
   bel:
     state:

src/device/input/parse/v01/v01_exported_test.go

@@ -91,9 +91,8 @@ func TestV01Feedback(t *testing.T) {
           state:
             player: 2
             message: to bel
-        broadcast:
-          state:
-            message: to everyone
+      broadcast:
+        message: to everyone
       players:
       - transformation:
           w: t
@@ -124,8 +123,8 @@ func TestV01Feedback(t *testing.T) {
 		}
 		defer resp.Body.Close()
 		b, _ := io.ReadAll(resp.Body)
-		if string(b) != "to bel" {
-			t.Error(b)
+		if !strings.HasPrefix(string(b), "to bel") {
+			t.Error(string(b))
 		}
 	})
 
@@ -136,8 +135,8 @@ func TestV01Feedback(t *testing.T) {
 		}
 		defer resp.Body.Close()
 		b, _ := io.ReadAll(resp.Body)
-		if string(b) != "to everyone" {
-			t.Error(b)
+		if !strings.HasPrefix(string(b), "to everyone") {
+			t.Error(string(b))
 		}
 	})
 
@@ -156,7 +155,7 @@ func TestV01Feedback(t *testing.T) {
 		}
 		defer resp.Body.Close()
 		b, _ := io.ReadAll(resp.Body)
-		if string(b) != want {
+		if !strings.HasPrefix(string(b), want) {
 			t.Error(string(b))
 		}
 	})

src/main.go

@@ -50,6 +50,9 @@ func Main(ctx context.Context) error {
 				keys = append(keys, k)
 			}
 		}
+		if os.Getenv("DEBUG") == "true" {
+			log.Printf("src.Main.writer.Press(%+v) (from %+v)", keys, delta)
+		}
 		writer.Press(keys...)
 	}
 

todo.yaml

@@ -1,125 +0,0 @@
-todo:
-- trigger a vote
-- trigger an election
-- trigger a shuffle for init
-- assign aliases
-- display vote progress
-- single docker image to run all
-- trigger dolphin pause via query param mapping to a button that is a pause hotkey
-- todo: rotation triggers
-  subtasks:
-  - ui for election start, election votes, election end stuff
-  - todo: stdin
-    subtasks:
-    - minigame end
-  - todo: voice recognition of hotwords to vote who dun it
-    subtasks:
-    - random word from cur wikipedia page
-    - only spectators have hotwords and must get a player to speak it
-    - tribunal to vote who said it
-scheduled: []
-done:
-- todo: sticky keyboard input mode for enable/disable explicitly
-  ts: Thu Mar 23 20:55:52 MDT 2023
-- todo: case-sensitive
-  ts: Fri Mar 24 13:39:26 MDT 2023
-- todo: rusty configs have "name" for each client so "if name == server_broadcasted_name
-    { debug_print_in_gui(server_broadcasted_message) }
-  ts: Fri Mar 24 16:40:09 MDT 2023
-- todo: change from 'a','b','c' from rust to just 10,11,12 so playerName is known
-    implicitly but then gotta translate back to char for keyboard things somewhere;
-    space delimited?
-  ts: Fri Mar 24 17:00:55 MDT 2023
-- todo: '"Button" to interface or strings'
-  ts: Fri Mar 24 17:01:01 MDT 2023
-- todo: input.UDP as a raw provider
-  ts: Fri Mar 24 19:58:59 MDT 2023
-- todo: input.MayhemParty as a logical wrapper
-  ts: Fri Mar 24 19:58:59 MDT 2023
-- todo: change from 'a','b','c' from rust to just 11,21,31,41 so playerName is known
-    implicitly from %10 but then gotta translate back to char for keyboard things
-    somewhere; space delimited?
-  ts: Fri Mar 24 19:58:59 MDT 2023
-- todo: input."Button" to interface or strings
-  ts: Fri Mar 24 21:16:39 MDT 2023
-- todo: input.MayhemParty as a logical wrapper from %10 but then gotta translate back
-    to char for keyboard things somewhere; space delimited?
-  ts: Fri Mar 24 21:16:39 MDT 2023
-- todo: change from 'a','b','c' from rust to just 11,21,31,41 so playerName is known
-    implicitly
-  ts: Sat Mar 25 00:06:21 MDT 2023
-- todo: lag via UDP formatted inputs as space-delimited TS PID buttonIdx buttonIdx
-    buttonIdx
-  ts: Sat Mar 25 00:13:19 MDT 2023
-- todo: map keys triggered by user to player idx and their keys
-  ts: Sat Mar 25 00:44:19 MDT 2023
-- todo: use button.V01Cfg; map keys triggered by user to player idx and their keys
-  ts: Sat Mar 25 09:12:43 MDT 2023
-- todo: v01cfg includes messages to send per client and exposes tcp server for it
-  ts: Sat Mar 25 10:09:06 MDT 2023
-- todo: v01cfg includes messages to send per client and exposes http server for it
-  ts: Sat Mar 25 11:28:29 MDT 2023
-- todo: send clients messages to display
-  ts: Sat Mar 25 11:28:29 MDT 2023
-- todo: input.MayhemParty as a logical wrapper from mod10 but then gotta translate
-    back to char for keyboard things somewhere; space delimited?
-  ts: Sat Mar 25 11:28:40 MDT 2023
-- todo: rusty configs have "name" for each client
-  details: |
-    'if name == server_broadcasted_name { debug_print_in_gui(server_broadcasted_message) }'
-  ts: Sat Mar 25 11:28:40 MDT 2023
-- todo: rotation triggers
-  subtasks:
-  - minigame end
-  - random word from cur wikipedia page
-  - each person has their own hotword
-  - only spectators have hotwords and must get a player to speak it
-  - tribunal to vote who said it
-  ts: Sat Mar 25 11:29:52 MDT 2023
-- todo: we have 7 players oooooof
-  ts: Sat Mar 25 11:29:52 MDT 2023
-- todo: endpoint for v01 to start read-only mode so when hotword spoken, players are
-    dcd without losing players
-  ts: Sat Mar 25 23:16:47 MDT 2023
-- todo: tts for when someone said the word via larynx docker + http.get + https://pkg.go.dev/github.com/faiface/beep@v1.1.0/wav
-  ts: Sun Mar 26 09:57:02 MDT 2023
-- todo: endpoint for v01 to start read-only mode so when hotword spoken, players are
-    dcd without losing players; press a hotkey that is bound to dolphin emulator pause
-  ts: Sun Mar 26 14:28:46 MDT 2023
-- todo: game master to coordinate config change
-  ts: Mon Mar 27 11:01:10 MDT 2023
-- todo: rotation triggers
-  subtasks:
-  - todo: stdin
-    subtasks:
-    - minigame end
-  - todo: voice recognition of hotwords to vote who dun it
-    subtasks:
-    - random word from cur wikipedia page
-    - each person has their own hotword
-    - only spectators have hotwords and must get a player to speak it
-    - tribunal to vote who said it
-  ts: Mon Mar 27 11:04:56 MDT 2023
-- todo: clients can send STT via box
-  ts: Mon Mar 27 17:55:41 MDT 2023
-- todo: -venue needs to update for new env variables for GUI
-  ts: Mon Mar 27 21:43:40 MDT 2023
-- todo: -venue needs to udpate hits hotword path for new Users.[].State.GM.Alias
-  ts: Mon Mar 27 21:43:40 MDT 2023
-- todo: clients can vote
-  ts: Mon Mar 27 21:43:40 MDT 2023
-- todo: rotation triggers
-  subtasks:
-  - ui for election start, election votes, election end stuff
-  - todo: stdin
-    subtasks:
-    - minigame end
-  - todo: voice recognition of hotwords to vote who dun it
-    subtasks:
-    - random word from cur wikipedia page
-    - each person has their own hotword
-    - only spectators have hotwords and must get a player to speak it
-    - tribunal to vote who said it
-  ts: Mon Mar 27 21:43:40 MDT 2023
-- todo: https via home.blapointe and rproxy
-  ts: Mon Mar 27 21:43:53 MDT 2023