f u wannabe cors

cmd/server/games.go

@@ -11,6 +11,7 @@ import (
 	"slices"
 	"strings"
 	"time"
+	"unicode"
 
 	"github.com/google/uuid"
 )
@@ -102,6 +103,19 @@ func (games Games) UserName(ctx context.Context, id string) (string, error) {
 	return result, err
 }
 
+func (games Games) UserByName(ctx context.Context, gid, name string) (string, error) {
+	result := ""
+	err := games.db.Query(ctx, func(rows *sql.Rows) error {
+		return rows.Scan(&result)
+	}, `
+		SELECT users.uuid
+      FROM players
+      JOIN users ON players.user_uuid=users.uuid
+		WHERE players.game_uuid=? AND users.name=?
+	`, gid, name)
+	return result, err
+}
+
 func (a KillWord) Empty() bool {
 	return a == (KillWord{})
 }
@@ -156,9 +170,13 @@ func (games Games) GameByName(ctx context.Context, name string) (string, error)
 
 type (
 	GameState struct {
+		ID        string
 		Started   bool
 		Completed time.Time
-		Players   map[string]PlayerState
+
+		Players map[string]PlayerState
+
+		Trial Trial
 	}
 
 	PlayerState struct {
@@ -173,7 +191,7 @@ type (
 	}
 
 	KillWords struct {
-		Global KillWord
+		Codename Codename
 
 		Assigned time.Time
 		Assignee string
@@ -181,6 +199,11 @@ type (
 		Assignment Assignment
 	}
 
+	Codename struct {
+		KillWord KillWord
+		Consumed bool
+	}
+
 	Assignment struct {
 		Public  []KillWord
 		Private []KillWord
@@ -191,6 +214,12 @@ type (
 		Points int
 	}
 
+	Trial struct {
+		Prosecutor string
+		Defendant  string
+		Word       string
+	}
+
 	EventType int
 
 	EventPlayerJoin struct {
@@ -215,6 +244,29 @@ type (
 		KillWord     KillWord
 		AllKillWords AllKillWords
 	}
+	EventGameReset struct {
+		Type      EventType
+		Timestamp time.Time
+		ID        string
+	}
+	EventCodenameAccusal struct {
+		Type       EventType
+		Timestamp  time.Time
+		Prosecutor string
+		Defendant  string
+		Word       string
+	}
+	EventCodenameTrial struct {
+		Type      EventType
+		Timestamp time.Time
+		Guilty    bool
+	}
+	EventNotification struct {
+		Type      EventType
+		Timestamp time.Time
+		Recipient string
+		Message   string
+	}
 	AllKillWords map[string]KillWords
 )
 
@@ -223,6 +275,10 @@ const (
 	PlayerLeave
 	GameComplete
 	AssignmentRotation
+	GameReset
+	CodenameAccusal
+	CodenameTrial
+	Notification
 )
 
 type Event interface{ event() }
@@ -231,6 +287,10 @@ func (EventPlayerJoin) event()         {}
 func (EventPlayerLeave) event()        {}
 func (EventGameComplete) event()       {}
 func (EventAssignmentRotation) event() {}
+func (EventGameReset) event()          {}
+func (EventCodenameAccusal) event()    {}
+func (EventCodenameTrial) event()      {}
+func (EventNotification) event()       {}
 
 func EventWithTime(event Event, t time.Time) Event {
 	switch e := event.(type) {
@@ -246,6 +306,18 @@ func EventWithTime(event Event, t time.Time) Event {
 	case EventAssignmentRotation:
 		e.Timestamp = t
 		event = e
+	case EventGameReset:
+		e.Timestamp = t
+		event = e
+	case EventCodenameAccusal:
+		e.Timestamp = t
+		event = e
+	case EventCodenameTrial:
+		e.Timestamp = t
+		event = e
+	case EventNotification:
+		e.Timestamp = t
+		event = e
 	}
 	return event
 }
@@ -296,12 +368,28 @@ func parseEvent(b []byte, timestamp time.Time) (Event, error) {
 		var v EventAssignmentRotation
 		err := json.Unmarshal(b, &v)
 		return EventWithTime(v, timestamp), err
+	case GameReset:
+		var v EventGameReset
+		err := json.Unmarshal(b, &v)
+		return EventWithTime(v, timestamp), err
+	case CodenameAccusal:
+		var v EventCodenameAccusal
+		err := json.Unmarshal(b, &v)
+		return EventWithTime(v, timestamp), err
+	case CodenameTrial:
+		var v EventCodenameTrial
+		err := json.Unmarshal(b, &v)
+		return EventWithTime(v, timestamp), err
+	case Notification:
+		var v EventNotification
+		err := json.Unmarshal(b, &v)
+		return EventWithTime(v, timestamp), err
 	}
 	return nil, fmt.Errorf("unknown event type %d: %s", peek.Type, b)
 }
 
 func (games Games) GameState(ctx context.Context, id string) (GameState, error) {
-	result := GameState{Players: map[string]PlayerState{}}
+	result := GameState{ID: id, Players: map[string]PlayerState{}}
 
 	events, err := games.GameEvents(ctx, id, time.Time{})
 	if err != nil {
@@ -309,19 +397,16 @@ func (games Games) GameState(ctx context.Context, id string) (GameState, error)
 	}
 
 	for _, event := range events {
-		switch event.(type) {
+		switch e := event.(type) {
 		case EventPlayerJoin:
-			playerJoin := event.(EventPlayerJoin)
+			result.Players[e.ID] = PlayerState{}
-			result.Players[playerJoin.ID] = PlayerState{}
 		case EventPlayerLeave:
-			playerLeave := event.(EventPlayerLeave)
+			delete(result.Players, e.ID)
-			delete(result.Players, playerLeave.ID)
 		case EventGameComplete:
-			gameComplete := event.(EventGameComplete)
+			result.Completed = e.Timestamp
-			result.Completed = gameComplete.Timestamp
 		case EventAssignmentRotation:
 			result.Started = true
-			assignmentRotation := event.(EventAssignmentRotation)
+			assignmentRotation := e
 
 			if killer, ok := result.Players[assignmentRotation.Killer]; !ok {
 			} else if _, ok := result.Players[assignmentRotation.Victim]; !ok {
@@ -344,6 +429,48 @@ func (games Games) GameState(ctx context.Context, id string) (GameState, error)
 				player.KillWords = v
 				result.Players[k] = player
 			}
+		case EventCodenameAccusal:
+			if actual := result.Players[e.Defendant].KillWords.Codename; !actual.Consumed {
+				result.Trial.Prosecutor = e.Prosecutor
+				result.Trial.Defendant = e.Defendant
+				result.Trial.Word = e.Word
+
+				if !basicallyTheSame(actual.KillWord.Word, e.Word) {
+				} else if err := games.CreateEventCodenameTrial(ctx, id, true); err != nil { // TODO cannot be in State loop
+					return GameState{}, err
+				}
+			}
+		case EventCodenameTrial:
+			if result.Trial == (Trial{}) {
+			} else if e.Guilty {
+				if err := games.CreateEventNotification(ctx, id, fmt.Sprintf(`%s revealed %s is %s and collected %s's bounty.`, result.Trial.Prosecutor, result.Trial.Defendant, result.Trial.Word, result.Trial.Defendant)); err != nil { // TODO not in this loop
+					return GameState{}, err
+				}
+				return GameState{}, fmt.Errorf("not impl: trial: guilty: %+v", e)
+			} else {
+				v := result.Players[result.Trial.Prosecutor]
+				v.KillWords.Codename.Consumed = true
+				v.Kills = append(v.Kills, Kill{
+					Timestamp: e.Timestamp,
+					Victim:    result.Trial.Defendant,
+					KillWord: KillWord{
+						Word:   result.Trial.Word,
+						Points: -200,
+					},
+				})
+				result.Players[result.Trial.Prosecutor] = v
+
+				v = result.Players[result.Trial.Defendant]
+				v.KillWords.Codename.KillWord.Word = "" // TODO
+
+				return GameState{}, fmt.Errorf("creating state CANNOT create events because it will eval every loop")
+				if err := games.CreateEventNotification(ctx, id, fmt.Sprintf(`%s accused the innocent %s of being %s. %s will get a new codename.`, result.Trial.Prosecutor, result.Trial.Defendant, result.Trial.Word, result.Trial.Defendant)); err != nil {
+					return GameState{}, err
+				}
+			}
+			result.Trial = Trial{}
+		case EventGameReset:
+			return games.GameState(ctx, e.ID)
 		default:
 			return GameState{}, fmt.Errorf("unknown event type %T", event)
 		}
@@ -352,6 +479,20 @@ func (games Games) GameState(ctx context.Context, id string) (GameState, error)
 	return result, err
 }
 
+func basicallyTheSame(a, b string) bool {
+	simplify := func(s string) string {
+		s = strings.TrimSpace(strings.ToLower(s))
+		s2 := ""
+		for _, c := range s {
+			if unicode.IsLetter(c) {
+				s2 = fmt.Sprintf("%s%c", s2, c)
+			}
+		}
+		return s2
+	}
+	return simplify(a) == simplify(b)
+}
+
 func (games Games) CreateGame(ctx context.Context, name string) (string, error) {
 	var exists string
 	if err := games.db.Query(ctx,
@@ -378,14 +519,8 @@ func (games Games) CreateGame(ctx context.Context, name string) (string, error)
 	`, id, time.Now(), name)
 }
 
-func (games Games) CreateEventPlayerJoin(ctx context.Context, id string, player, name string) error {
+func (games Games) CreateEventPlayerJoin(ctx context.Context, id string, player string) error {
-	if err := games.db.Exec(ctx, `
+	if _, err := games.UserName(ctx, player); err != nil {
-		INSERT INTO users (
-			uuid,
-			name
-		) VALUES (?, ?)
-		ON CONFLICT DO UPDATE SET name=? WHERE uuid=?;
-	`, player, name, name, player); err != nil {
 		return err
 	}
 	if err := games.db.Exec(ctx, `
@@ -419,10 +554,7 @@ func (games Games) CreateEventAssignmentRotation(ctx context.Context, id string,
 		},
 	}
 
-	prevAllKillWords := make(AllKillWords)
+	prevAllKillWords := state.AllKillWords()
-	for k, v := range state.Players {
-		prevAllKillWords[k] = v.KillWords
-	}
 
 	event.AllKillWords = prevAllKillWords.ShuffleAssignees(killer, victim, word)
 	event.AllKillWords = event.AllKillWords.FillKillWords()
@@ -430,8 +562,42 @@ func (games Games) CreateEventAssignmentRotation(ctx context.Context, id string,
 	return games.createEvent(ctx, id, event)
 }
 
+func (state GameState) AllKillWords() AllKillWords {
+	m := make(AllKillWords)
+	for k, v := range state.Players {
+		m[k] = v.KillWords
+	}
+	return m
+}
+
+func (games Games) CreateEventGameReset(ctx context.Context, gid string) error {
+	state, err := games.GameState(ctx, gid)
+	if err != nil {
+		return err
+	}
+	name, err := games.GameName(ctx, gid)
+	if err != nil {
+		return err
+	}
+	gid2, err := games.CreateGame(ctx, name)
+	if err != nil {
+		return err
+	}
+	for p := range state.Players {
+		if err := games.CreateEventPlayerJoin(ctx, gid2, p); err != nil {
+			return err
+		}
+	}
+	event := EventGameReset{
+		Type:      GameReset,
+		Timestamp: time.Now(),
+		ID:        gid2,
+	}
+	return games.createEvent(ctx, gid, event)
+}
+
 func (words KillWords) Empty() bool {
-	return words.Global == (KillWord{}) && words.Assigned.IsZero() && words.Assignee == "" && words.Assignment.Empty()
+	return words.Codename == (Codename{}) && words.Assigned.IsZero() && words.Assignee == "" && words.Assignment.Empty()
 }
 
 func (words KillWords) Privates() []KillWord {
@@ -502,7 +668,7 @@ func (m AllKillWords) withoutAssignees() AllKillWords {
 	result := make(AllKillWords)
 	for k := range m {
 		result[k] = KillWords{
-			Global:     m[k].Global,
+			Codename:   m[k].Codename,
 			Assigned:   now,
 			Assignee:   "",
 			Assignment: m[k].Assignment,
@@ -551,7 +717,7 @@ func (m AllKillWords) FillKillWords() AllKillWords {
 }
 
 func (m AllKillWords) fillKillWords(
-	poolGlobal []string,
+	poolCodename []string,
 	nPublic int,
 	poolPublic []string,
 	nPrivate int,
@@ -560,8 +726,8 @@ func (m AllKillWords) fillKillWords(
 	result := maps.Clone(m)
 	m = result
 	for k, v := range m {
-		if v.Global.Word == "" {
+		if v.Codename.KillWord.Word == "" {
-			v.Global = KillWord{Word: m.unusedGlobal(poolGlobal), Points: -1}
+			v.Codename = Codename{KillWord: KillWord{Word: m.unusedCodename(poolCodename), Points: 200}}
 			m[k] = v
 		}
 		if len(v.Assignment.Public) == 0 {
@@ -582,11 +748,11 @@ func (m AllKillWords) fillKillWords(
 	return m
 }
 
-func (m AllKillWords) unusedGlobal(pool []string) string {
+func (m AllKillWords) unusedCodename(pool []string) string {
 	inUse := func() []string {
 		result := []string{}
 		for _, killWords := range m {
-			result = append(result, killWords.Global.Word)
+			result = append(result, killWords.Codename.KillWord.Word)
 		}
 		return result
 	}
@@ -645,6 +811,23 @@ func (games Games) CreateEventGameComplete(ctx context.Context, id string) error
 	return games.createEvent(ctx, id, EventGameComplete{Type: GameComplete})
 }
 
+func (games Games) CreateEventCodenameAccusal(ctx context.Context, gid, prosecutor, defendant, codename string) error {
+	return fmt.Errorf("not impl: x accused y")
+	return fmt.Errorf("not impl: x caught by y")
+}
+
+func (games Games) CreateEventCodenameTrial(ctx context.Context, gid string, guilty bool) error {
+	return fmt.Errorf("not impl: x found guilty/notguilty")
+}
+
+func (games Games) CreateEventNotification(ctx context.Context, gid, msg string) error {
+	return games.CreateEventNotificationTo(ctx, gid, "", msg)
+}
+
+func (games Games) CreateEventNotificationTo(ctx context.Context, gid, uid, msg string) error {
+	return fmt.Errorf("not impl: simple")
+}
+
 func (games Games) createEvent(ctx context.Context, id string, v any) error {
 	payload, err := json.Marshal(v)
 	if err != nil {

cmd/server/games_test.go

@@ -56,7 +56,7 @@ func TestGames(t *testing.T) {
 			t.Fatal("redundant create game didnt return same id:", id2)
 		}
 
-		if err := games.CreateEventPlayerJoin(ctx, id, "p0", "player zero"); err != nil {
+		if err := games.CreateEventPlayerJoin(ctx, id, "p0"); err != nil {
 			t.Fatal("err creating event player join:", err)
 		} else if err := games.CreateEventPlayerLeave(ctx, id, "p0"); err != nil {
 			t.Fatal("err creating event player leave:", err)
@@ -64,12 +64,12 @@ func TestGames(t *testing.T) {
 
 		for i := 0; i < 4; i++ {
 			p := fmt.Sprintf("p%d", i+1)
-			if err := games.CreateEventPlayerJoin(ctx, id, p, "player "+p); err != nil {
+			if err := games.CreateEventPlayerJoin(ctx, id, p); err != nil {
 				t.Fatal(p, "err creating event player join", err)
 			}
 			if name, err := games.UserName(ctx, p); err != nil {
 				t.Fatal(p, "err getting user name", err)
-			} else if name != "player "+p {
+			} else if name == "" {
 				t.Fatal("name wrong", name)
 			}
 			if err := games.UpdateUserName(ctx, p, "player! "+p); err != nil {
@@ -128,8 +128,8 @@ func TestGames(t *testing.T) {
 				if v.Players[p].Points() != 0 {
 					t.Error("nonzero points after zero kills:", v.Players[p].Points())
 				}
-				if v.Players[p].KillWords.Global.Word == "" {
+				if v.Players[p].KillWords.Codename.KillWord.Word == "" {
-					t.Error(p, "no killwords.global")
+					t.Error(p, "no killwords.Codename")
 				} else if v.Players[p].KillWords.Assigned.IsZero() {
 					t.Error(p, "no killwords.assigned")
 				} else if v.Players[p].KillWords.Assignee == "" {
@@ -149,6 +149,28 @@ func TestGames(t *testing.T) {
 		} else if state.Completed.IsZero() {
 			t.Fatal("state.Completed is zero")
 		}
+
+		if err := games.CreateEventGameReset(ctx, id); err != nil {
+			t.Fatal(err)
+		} else if state, err := games.GameState(ctx, id); err != nil {
+			t.Fatal(err)
+		} else if state.ID == id {
+			t.Fatal("getting state for reset game didnt return state for new game")
+		} else if state.Started {
+			t.Fatal("reset game is started", state.Started)
+		} else if !state.Completed.IsZero() {
+			t.Fatal("reset game is complete", state.Completed)
+		} else if len(state.Players) != 4 {
+			t.Fatal("reset game doesnt have all players", len(state.Players))
+		} else if p := state.Players["p1"]; !p.Empty() {
+			t.Fatal("reset game missing p1", p)
+		} else if p := state.Players["p2"]; !p.Empty() {
+			t.Fatal("reset game missing p2", p)
+		} else if p := state.Players["p3"]; !p.Empty() {
+			t.Fatal("reset game missing p3", p)
+		} else if p := state.Players["p4"]; !p.Empty() {
+			t.Fatal("reset game missing p4", p)
+		}
 	})
 }
 
@@ -177,10 +199,10 @@ func TestParseEvent(t *testing.T) {
 			},
 			AllKillWords: map[string]KillWords{
 				"x": KillWords{
-					Global: KillWord{
+					Codename: Codename{KillWord: KillWord{
 						Word:   "a",
-						Points: -1,
+						Points: 200,
-					},
+					}},
 					Assignee: "z",
 					Assigned: now,
 					Assignment: Assignment{
@@ -238,48 +260,48 @@ func TestAllKillWordsFill(t *testing.T) {
 	}{
 		"full": {
 			given: KillWords{
-				Global:     kw(-1, "global"),
+				Codename:   Codename{KillWord: kw(200, "global")},
 				Assignment: ass("pub", "pri"),
 			},
 			expect: KillWords{
-				Global:     kw(-1, "global"),
+				Codename:   Codename{KillWord: kw(200, "global")},
 				Assignment: ass("pub", "pri"),
 			},
 		},
 		"no ass": {
 			given: KillWords{
-				Global:     kw(-1, "global"),
+				Codename:   Codename{KillWord: kw(200, "global")},
 				Assignment: Assignment{},
 			},
 			expect: KillWords{
-				Global:     kw(-1, "global"),
+				Codename:   Codename{KillWord: kw(200, "global")},
 				Assignment: ass("filled-public", "filled-private"),
 			},
 		},
 		"no pub": {
 			given: KillWords{
-				Global:     kw(-1, "global"),
+				Codename:   Codename{KillWord: kw(200, "global")},
 				Assignment: ass("", "pri"),
 			},
 			expect: KillWords{
-				Global:     kw(-1, "global"),
+				Codename:   Codename{KillWord: kw(200, "global")},
 				Assignment: ass("filled-public", "pri"),
 			},
 		},
 		"no pri": {
 			given: KillWords{
-				Global:     kw(-1, "global"),
+				Codename:   Codename{KillWord: kw(200, "global")},
 				Assignment: ass("pub", ""),
 			},
 			expect: KillWords{
-				Global:     kw(-1, "global"),
+				Codename:   Codename{KillWord: kw(200, "global")},
 				Assignment: ass("pub", "filled-private"),
 			},
 		},
 		"empty": {
 			given: KillWords{},
 			expect: KillWords{
-				Global:     kw(-1, "filled-global"),
+				Codename:   Codename{KillWord: kw(200, "filled-global")},
 				Assignment: ass("filled-public", "filled-private"),
 			},
 		},
@@ -288,7 +310,7 @@ func TestAllKillWordsFill(t *testing.T) {
 				Assignment: ass("pub", "pri"),
 			},
 			expect: KillWords{
-				Global:     kw(-1, "filled-global"),
+				Codename:   Codename{KillWord: kw(200, "filled-global")},
 				Assignment: ass("pub", "pri"),
 			},
 		},
@@ -332,7 +354,7 @@ func TestAllKillWordsUnused(t *testing.T) {
 			t.Error("empty playerbase didnt think only option was unused")
 		}
 
-		if got := akw.unusedGlobal([]string{"x"}); got != "x" {
+		if got := akw.unusedCodename([]string{"x"}); got != "x" {
 			t.Error("empty playerbase didnt think only option was unused")
 		}
 	})
@@ -341,7 +363,7 @@ func TestAllKillWordsUnused(t *testing.T) {
 		t.Run("private", func(t *testing.T) {
 			akw := make(AllKillWords)
 			akw["k"] = KillWords{
-				Global: KillWord{Word: "x"},
+				Codename: Codename{KillWord: KillWord{Word: "x"}},
 				Assignment: Assignment{
 					Private: []KillWord{{}, {Word: "y"}},
 					Public:  []KillWord{{}, {Word: "x"}},
@@ -355,13 +377,13 @@ func TestAllKillWordsUnused(t *testing.T) {
 		t.Run("global", func(t *testing.T) {
 			akw := make(AllKillWords)
 			akw["k"] = KillWords{
-				Global: KillWord{Word: "y"},
+				Codename: Codename{KillWord: KillWord{Word: "y"}},
 				Assignment: Assignment{
 					Private: []KillWord{{}, {Word: "x"}},
 					Public:  []KillWord{{}, {Word: "x"}},
 				},
 			}
-			got := akw.unusedGlobal([]string{"x", "y"})
+			got := akw.unusedCodename([]string{"x", "y"})
 			if got != "x" {
 				t.Error("didnt return only unused option")
 			}
@@ -369,7 +391,7 @@ func TestAllKillWordsUnused(t *testing.T) {
 		t.Run("public", func(t *testing.T) {
 			akw := make(AllKillWords)
 			akw["k"] = KillWords{
-				Global: KillWord{Word: "x"},
+				Codename: Codename{KillWord: KillWord{Word: "x"}},
 				Assignment: Assignment{
 					Private: []KillWord{{}, {Word: "x"}},
 					Public:  []KillWord{{}, {Word: "y"}},
@@ -402,5 +424,15 @@ func TestGenerateUserName(t *testing.T) {
 		t.Fatal(name2)
 	}
 
+	if err := games.CreateEventPlayerJoin(context.Background(), "gid", "id"); err != nil {
+		t.Fatal("err creating event player join:", err)
+	}
+
+	if id, err := games.UserByName(context.Background(), "gid", name); err != nil {
+		t.Fatal("err getting user by name:", err)
+	} else if id != "id" {
+		t.Fatal("getting user by name yielded wrong id:", id)
+	}
+
 	t.Log(name)
 }

cmd/server/server.go

@@ -59,13 +59,19 @@ type Session struct {
 }
 
 func (s *S) injectContext(w http.ResponseWriter, r *http.Request) error {
-	id, err := r.Cookie("uuid")
+	id := r.Header.Get("uuid")
-	if err != nil || id.Value == "" {
+	if id == "" {
+		c, _ := r.Cookie("uuid")
+		if c != nil {
+			id = c.Value
+		}
+	}
+	if id == "" {
 		return io.EOF
 	}
 	ctx := r.Context()
 	ctx = context.WithValue(ctx, "session", Session{
-		ID: id.Value,
+		ID: id,
 	})
 	*r = *r.WithContext(ctx)
 	return nil

cmd/server/usergameserver.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"slices"
 	"time"
 )
 
@@ -79,7 +80,34 @@ func (ugs *UserGameServer) listen(ctx context.Context, reader func(context.Conte
 				return err
 			}
 		} else if killOccurred := m["k"] != ""; killOccurred {
-			return fmt.Errorf("not impl: a kill occurred: %+v", m)
+			victimName := m["name"]
+			word := m["k"]
+			if word == "" {
+				return fmt.Errorf("expected .k")
+			}
+
+			killer := ugs.Session.ID
+			victim, err := ugs.games.UserByName(ctx, ugs.ID, victimName)
+			if err != nil {
+				return err
+			}
+
+			var points int
+			if gameState, err := ugs.games.GameState(ctx, ugs.ID); err != nil {
+				return err
+			} else if codename := gameState.Players[killer].KillWords.Codename.KillWord; codename.Word == word {
+				points = codename.Points
+			} else if matches := slices.DeleteFunc(gameState.Players[victim].KillWords.Publics(), func(kw KillWord) bool { return kw.Word != word }); len(matches) > 0 {
+				points = matches[0].Points
+			} else if matches := slices.DeleteFunc(gameState.Players[victim].KillWords.Privates(), func(kw KillWord) bool { return kw.Word != word }); len(matches) > 0 {
+				points = matches[0].Points
+			} else {
+				return fmt.Errorf("refusing unexpected .k")
+			}
+
+			if err := ugs.games.CreateEventAssignmentRotation(ctx, ugs.ID, killer, victim, word, points); err != nil {
+				return err
+			}
 		} else if isRename := m["name"] != ""; isRename {
 			if err := ugs.games.UpdateUserName(ctx, ugs.Session.ID, m["name"]); err != nil {
 				return err
@@ -88,8 +116,8 @@ func (ugs *UserGameServer) listen(ctx context.Context, reader func(context.Conte
 			if gameState, err := ugs.games.GameState(ctx, ugs.ID); err != nil {
 				return err
 			} else if gameState.Completed.IsZero() {
-			} else {
+			} else if err := ugs.games.CreateEventGameReset(ctx, ugs.ID); err != nil {
-				return fmt.Errorf("not impl: new game: %+v", m)
+				return err
 			}
 		} else {
 			return fmt.Errorf("UNKNOWN: %+v", m)
@@ -105,6 +133,7 @@ func (ugs *UserGameServer) State(ctx context.Context) (UserGameState, error) {
 	if err != nil {
 		return UserGameState{}, err
 	}
+	ugs.ID = gameState.ID
 
 	if complete := !gameState.Completed.IsZero(); complete {
 		return UserGameState(gameState), nil
@@ -122,7 +151,7 @@ func (ugs *UserGameServer) State(ctx context.Context) (UserGameState, error) {
 		if isSelf := k == ugs.Session.ID; isSelf {
 			v.KillWords.Assignment = Assignment{}
 		} else {
-			v.KillWords.Global = KillWord{}
+			v.KillWords.Codename = Codename{}
 			v.KillWords.Assignee = ""
 			for i := range v.Kills {
 				v.Kills[i].Victim = ""

cmd/server/usergameserver_test.go

@@ -18,7 +18,7 @@ func TestUserGameServer(t *testing.T) {
 	pids := []string{}
 	for i := 0; i < 4; i++ {
 		pid := fmt.Sprintf("p%d", i+1)
-		if err := games.CreateEventPlayerJoin(ctx, gid, pid, "player "+pid); err != nil {
+		if err := games.CreateEventPlayerJoin(ctx, gid, pid); err != nil {
 			t.Fatal(err)
 		}
 		pids = append(pids, pid)
@@ -83,8 +83,8 @@ func TestUserGameServer(t *testing.T) {
 			}
 
 			if isSelf := pid == ugs.Session.ID; isSelf {
-				if p.KillWords.Global.Word == "" || p.KillWords.Global.Points == 0 {
+				if p.KillWords.Codename.KillWord.Word == "" || p.KillWords.Codename.KillWord.Points == 0 {
-					t.Error("self global missing field")
+					t.Error("self codename missing field")
 				}
 				if p.KillWords.Assignee == "" {
 					t.Error("assignee is empty")
@@ -96,8 +96,8 @@ func TestUserGameServer(t *testing.T) {
 					t.Error("self knows its own private")
 				}
 			} else {
-				if !p.KillWords.Global.Empty() {
+				if !p.KillWords.Codename.KillWord.Empty() {
-					t.Error("can see not self global")
+					t.Error("can see not self Codename")
 				}
 				if p.KillWords.Assignee != "" {
 					t.Error("can see other player's assignee")
@@ -167,8 +167,8 @@ func TestUserGameServer(t *testing.T) {
 				} else if kill.KillWord.Word == "" {
 					t.Errorf("dont know own kill word")
 				}
-				if p.KillWords.Global.Word == "" || p.KillWords.Global.Points == 0 {
+				if p.KillWords.Codename.KillWord.Word == "" || p.KillWords.Codename.KillWord.Points == 0 {
-					t.Error("self global missing field")
+					t.Error("self Codename missing field")
 				}
 				if p.KillWords.Assignee == "" {
 					t.Error("assignee is empty")
@@ -190,8 +190,8 @@ func TestUserGameServer(t *testing.T) {
 				} else if kill.KillWord.Word != "" {
 					t.Errorf("know other's kill word")
 				}
-				if !p.KillWords.Global.Empty() {
+				if !p.KillWords.Codename.KillWord.Empty() {
-					t.Error("can see not self global")
+					t.Error("can see not self Codename")
 				}
 				if p.KillWords.Assignee != "" {
 					t.Error("can see other player's assignee")
@@ -248,8 +248,8 @@ func TestUserGameServer(t *testing.T) {
 				} else if kill.KillWord.Word == "" {
 					t.Errorf("dont know own kill word")
 				}
-				if p.KillWords.Global.Word == "" || p.KillWords.Global.Points == 0 {
+				if p.KillWords.Codename.KillWord.Word == "" || p.KillWords.Codename.KillWord.Points == 0 {
-					t.Error("self global missing field")
+					t.Error("self Codename missing field")
 				}
 				if p.KillWords.Assignee == "" {
 					t.Error("assignee is empty")
@@ -271,8 +271,8 @@ func TestUserGameServer(t *testing.T) {
 				} else if kill.KillWord.Word == "" {
 					t.Errorf("dont know other's kill word")
 				}
-				if p.KillWords.Global.Empty() {
+				if p.KillWords.Codename.KillWord.Empty() {
-					t.Error("cannot see not self global")
+					t.Error("cannot see not self Codename")
 				}
 				if p.KillWords.Assignee == "" {
 					t.Error("cannot see other player's assignee")

cmd/server/v1.go

@@ -46,11 +46,6 @@ func (s *S) serveV1(w http.ResponseWriter, r *http.Request) error {
 }
 
 func (s *S) serveV1PutParty(w http.ResponseWriter, r *http.Request) error {
-	userName, err := s.games.UserName(r.Context(), s.Session(r.Context()).ID)
-	if err != nil {
-		return err
-	}
-
 	party, err := io.ReadAll(r.Body)
 	if err != nil {
 		return err
@@ -73,5 +68,5 @@ func (s *S) serveV1PutParty(w http.ResponseWriter, r *http.Request) error {
 	if slices.Contains(games, gid) {
 		return nil
 	}
-	return s.games.CreateEventPlayerJoin(r.Context(), gid, s.Session(r.Context()).ID, userName)
+	return s.games.CreateEventPlayerJoin(r.Context(), gid, s.Session(r.Context()).ID)
 }

cmd/server/ws.go

@@ -191,10 +191,8 @@ func (ws WS) inProgressMsgItem(ctx context.Context, ugs *UserGameServer, gameSta
 
 	tags := []inProgressMsgItemTag{}
 
-	if hasBeenKilledWithGlobal := slices.ContainsFunc(self.Kills, func(a Kill) bool {
+	if canKillWithCodename := !self.KillWords.Codename.Consumed; canKillWithCodename {
-		return a.Victim == uid && a.KillWord.Word == self.KillWords.Global.Word
+		tags = append(tags, newInProgressMsgItemTag(self.KillWords.Codename.KillWord))
-	}); !hasBeenKilledWithGlobal {
-		tags = append(tags, newInProgressMsgItemTag(self.KillWords.Global))
 	}
 
 	for _, killWord := range append(

cmd/testapi/main.go

@@ -2,11 +2,11 @@ package main
 
 import (
 	"context"
-	"crypto/rand"
 	"flag"
 	"fmt"
 	"io"
 	"log"
+	"math/rand"
 	"net/http"
 	"os"
 	"os/signal"
@@ -72,6 +72,15 @@ func (s *S) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }
 
 func (s *S) serveHTTP(w http.ResponseWriter, r *http.Request) error {
+	w.Header().Set("Access-Control-Allow-Origin", "*")
+	w.Header().Set("Access-Control-Allow-Headers", "X-Auth-Token, content-type, Content-Type")
+	if r.Method == http.MethodOptions {
+		w.Header().Set("Content-Length", "0")
+		w.Header().Set("Content-Type", "text/plain")
+		w.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, OPTIONS, TRACE, PATCH, HEAD, DELETE")
+		w.WriteHeader(http.StatusOK)
+		return nil
+	}
 	if isV1(r) || isWS(r) {
 		return s.serveAPI(w, r)
 	}
@@ -113,13 +122,17 @@ type Session struct {
 }
 
 func (s *S) injectContext(w http.ResponseWriter, r *http.Request) error {
-	id, err := r.Cookie("uuid")
+	id := r.URL.Query().Get("uuid")
-	if err != nil || id.Value == "" {
+	if id == "" {
-		return io.EOF
+		c, err := r.Cookie("uuid")
+		if err != nil || c.Value == "" {
+			return io.EOF
+		}
+		id = c.Value
 	}
 	ctx := r.Context()
 	ctx = context.WithValue(ctx, "session", Session{
-		ID: id.Value,
+		ID: id,
 	})
 	*r = *r.WithContext(ctx)
 	return nil
@@ -133,7 +146,9 @@ func (s *S) Session(ctx context.Context) Session {
 func (s *S) serveWS(w http.ResponseWriter, r *http.Request) error {
 	ctx := r.Context()
 
-	c, err := websocket.Accept(w, r, nil)
+	c, err := websocket.Accept(w, r, &websocket.AcceptOptions{
+		InsecureSkipVerify: true,
+	})
 	if err != nil {
 		return err
 	}
@@ -177,12 +192,12 @@ func (s *S) serveV1(w http.ResponseWriter, r *http.Request) error {
 	switch r.Method + r.URL.Path {
 	case "GET/v1/state/" + s.Session(ctx).ID:
 		if rand.Int()%2 == 0 {
-			w.Write(`{"name": "foo"}`)
+			w.Write([]byte(`{"name": "foo"}`))
 		} else {
-			w.Write(`{"name": "bar", "party": "party name"}`)
+			w.Write([]byte(`{"name": "bar", "party": "party name"}`))
 		}
 	case "PUT/v1/state/" + s.Session(ctx).ID + "/party":
-		w.Write(`{}`)
+		w.Write([]byte(`{}`))
 	default:
 		http.NotFound(w, r)
 		return nil

cmd/testws/index.html

@@ -0,0 +1,16 @@
+<html>
+  <header>
+    <script>
+      function log(msg) {
+        console.log(msg)
+      }
+      const ws = new Websocket("wss://out-test.breel.dev/ws")
+      ws.onmessage = () => { console.log("got a message") }
+      ws.onerror = () => { console.log("got an error") }
+      ws.onclose = () => { console.log("closed") }
+    </script>
+  </header>
+  <body>
+    <div id="msg"></div>
+  </body>
+</html>

todo.yaml

@@ -1,12 +1,28 @@
 todo:
-- refactor ws.go into like WebSocketSession struct and stuff
+- global+public+private to public+private+CODENAME
+- accuse event which either ends in a successful codename call worth 100% points +
+  disables codename OR ends in a failed codename call costing 50% codename points
+- report system
+- how to generate word lists??
+- '"handler" system; there are both assassinations AND tenet-friendship-codeword systems
+  in-flight'
+- dont like other players points; just order by points so winner is at top of list
+- comeback/rebound system
+- kingkiller system, increased bounty for those who havent died recently + high scorers
 - test ws flow
 - notifications system with dismissal server-side so users see X got a kill
 - play mp3 on kill + shuffle
 - end condition; everyone has died
 - word lists; already got holidays
 - event driven woulda been nice
-- remake
+- leave game
-- quit
 scheduled: []
-done: []
+done:
+- todo: refactor ws.go into like WebSocketSession struct and stuff
+  ts: Sun Dec 15 14:28:29 MST 2024
+- todo: remake
+  ts: Sun Dec 15 14:28:29 MST 2024
+- todo: quit
+  ts: Sun Dec 15 14:28:34 MST 2024
+- todo: '"handler" system??'
+  ts: Sun Dec 15 16:43:34 MST 2024